diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 6934354a70..610991591e 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,5 +1,5 @@ --- -name: Bug report +name: Old Bug report about: Create a report to help us fix issues. title: '' labels: 'Type: Bug' diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md deleted file mode 100644 index b3fc10a5c1..0000000000 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ /dev/null @@ -1,49 +0,0 @@ ---- -name: Bug report -about: Create a report to help us fix issues. -title: '' -labels: 'Type: Bug' -assignees: '' - ---- - - - -**Application version** -(The version of the application this issue occurs with.) - -**Platform** -(Information about the operating system the issue occurs on. Include at least the operating system and maybe GPU.) - -**Printer** -(Which printer was selected in Cura?) - -**Reproduction steps** -1. (Something you did.) -2. (Something you did next.) - -**Screenshot(s)** -(Image showing the problem, perhaps before/after images.) - -**Actual results** -(What happens after the above steps have been followed.) - -**Expected results** -(What should happen after the above steps have been followed.) - -**Project file** -(For slicing bugs, provide a project which clearly shows the bug, by going to File->Save Project. For big files you may need to use WeTransfer or similar file sharing sites. G-code files are not project files!) - -**Log file** -(See https://github.com/Ultimaker/Cura#logging-issues to find the log file to upload, or copy a relevant snippet from it.) - -**Additional information** -(Extra information relevant to the issue.) diff --git a/.github/ISSUE_TEMPLATE/bugreport.yaml b/.github/ISSUE_TEMPLATE/bugreport.yaml new file mode 100644 index 0000000000..87c82c982a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bugreport.yaml @@ -0,0 +1,82 @@ +name: Bug Report +description: Create a report to help us fix issues. +labels: "Type: Bug" +body: +- type: markdown + attributes: + value: | + **Thank you for using Cura and wanting to report a bug.** + + Before filing, please check if the issue already exists (either open or closed) by using the search bar on the issues page. If it does, comment there. Even if it's closed, we can reopen it based on your comment. + + Also, please note the application version in the title of the issue "For example (3.2.1) Cannot connect to 3rd-party printer". Please do not write things like **Request** or **BUG** in the title, this is what labels are for. +- type: input + attributes: + label: Application Version + description: The version of Cura this issue occurs with. + placeholder: 4.9.0 + validations: + required: true +- type: input + attributes: + label: Platform + description: Information about the operating system the issue occurs on. Include at least the operating system and maybe GPU. + placeholder: Windows 10 + validations: + required: true +- type: input + attributes: + label: Printer + description: Which printer was selected in Cura? + placeholder: Ultimaker S5 + validations: + required: true +- type: textarea + attributes: + label: Reproduction steps + description: Tell us what you did! + placeholder: | + 1. Something you did + 2. Something you did next + validations: + required: true +- type: textarea + attributes: + label: Actual results + description: What happens after the above steps have been followed. + validations: + required: true +- type: textarea + attributes: + label: Expected results + description: What should happen after the above steps have been followed. + validations: + required: true +- type: markdown + attributes: + value: | + Please be sure to add the following files: + * For slicing issues, upload a **project file** that clearly shows the bug. + To save a project file go to `File -> Save project`. Please make sure to .zip your project file. For big files you may need to use WeTransfer or similar file sharing sites. + G-code files are not project files! + * **Screenshots** of showing the problem, perhaps before/after images. + * A **log file** for crashes and similar issues. + You can find your log file here: + Windows: `%APPDATA%\cura\\cura.log` or usually `C:\Users\\\AppData\Roaming\cura\\cura.log` + MacOS: `$USER/Library/Application Support/cura//cura.log` + Ubuntu/Linus: `$USER/.local/share/cura//cura.log` + + If the Cura user interface still starts, you can also reach this directory from the application menu in Help -> Show settings folder +- type: checkboxes + attributes: + label: Checklist of files to include + options: + - label: Log file + - label: Project file +- type: textarea + attributes: + label: Additional information & file uploads + description: You can add these files and additional information that is relevant to the issue in the comments below. + validations: + required: true + diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000000..213a5e0bec --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: Have questions or need support? + url: https://community.ultimaker.com/ + about: Please get in touch on our Ultimaker Community Forum! \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index a10d664a04..0000000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project -title: '' -labels: 'Type: New Feature' -assignees: '' - ---- - -**Is your feature request related to a problem? Please describe.** -(A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]) - -**Describe the solution you'd like** -(A clear and concise description of what you want to happen. If possible, describe why you think this is a good solution.) - -**Describe alternatives you've considered** -(A clear and concise description of any alternative solutions or features you've considered. Again, if possible, think about why these alternatives are not working out.) - -**Affected users and/or printers** -(Who do you think will benefit from this? Is everyone going to benefit from these changes? Or specific kinds of users?) - -**Additional context** -(Add any other context or screenshots about the feature request here.) diff --git a/.github/ISSUE_TEMPLATE/featurerequest.yaml b/.github/ISSUE_TEMPLATE/featurerequest.yaml new file mode 100644 index 0000000000..83c448fe44 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/featurerequest.yaml @@ -0,0 +1,44 @@ +name: Feature Request +description: Suggest an idea for this project. +labels: "Type: New Feature" +body: +- type: markdown + attributes: + value: | + **Thank you for using Cura and wanting to suggest a new feature.** + + Before filing, please check if the feature request already exists (either open or closed) by using the search bar on the issues page. If it does, comment there. Even if it's closed, we can reopen it based on your comment. + + Please do not write things like **Request** or **BUG** in the title, this is what labels are for. +- type: textarea + attributes: + label: Is your feature request related to a problem? + description: Please describe a clear and concise description of what the problem is. + placeholder: I'm always frustrated when... + validations: + required: true +- type: textarea + attributes: + label: Describe the solution you'd like + description: A clear and concise description of what you want to happen. If possible, describe why you think this is a good solution. + placeholder: I believe this will solve... + validations: + required: true +- type: textarea + attributes: + label: Describe alternatives you've considered + description: A clear and concise description of any alternative solutions or features you've considered. If possible, think about why these alternatives are not working out. + placeholder: The alternatives I've considered are... + validations: + required: true +- type: textarea + attributes: + label: Affected users and/or printers + description: Who do you think will benefit from this? Is everyone going to benefit from these changes? Or specific kinds of users? + placeholder: It will affect... + validations: + required: true +- type: textarea + attributes: + label: Additional information & file uploads + description: You can add pictures or files to visualize your feature request in the comments below. \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 3993d76754..9bdd48c317 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ set(CURA_CLOUD_ACCOUNT_API_ROOT "" CACHE STRING "Alternative Cura cloud account set(CURA_MARKETPLACE_ROOT "" CACHE STRING "Alternative Marketplace location") set(CURA_DIGITAL_FACTORY_URL "" CACHE STRING "Alternative Digital Factory location") -configure_file(${CMAKE_SOURCE_DIR}/cura.desktop.in ${CMAKE_BINARY_DIR}/cura.desktop @ONLY) +configure_file(${CMAKE_SOURCE_DIR}/com.ultimaker.cura.desktop.in ${CMAKE_BINARY_DIR}/com.ultimaker.cura.desktop @ONLY) configure_file(cura/CuraVersion.py.in CuraVersion.py @ONLY) @@ -82,11 +82,11 @@ if(NOT APPLE AND NOT WIN32) install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py DESTINATION lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages/cura) endif() - install(FILES ${CMAKE_BINARY_DIR}/cura.desktop + install(FILES ${CMAKE_BINARY_DIR}/com.ultimaker.cura.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) install(FILES ${CMAKE_SOURCE_DIR}/resources/images/cura-icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps/) - install(FILES cura.appdata.xml + install(FILES com.ultimaker.cura.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo) install(FILES cura.sharedmimeinfo DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages/ diff --git a/README.md b/README.md index 1ba2b3c277..345a55d12f 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,13 @@ For crashes and similar issues, please attach the following information: * (On Windows) The log as produced by dxdiag (start -> run -> dxdiag -> save output) * The Cura GUI log file, located at - * `%APPDATA%\cura\\cura.log` (Windows), or usually `C:\Users\\\AppData\Roaming\cura\\cura.log` - * `$USER/Library/Application Support/cura//cura.log` (OSX) - * `$USER/.local/share/cura//cura.log` (Ubuntu/Linux) + * `%APPDATA%\cura\\cura.log` (Windows), or usually `C:\Users\\AppData\Roaming\cura\\cura.log` + * `$HOME/Library/Application Support/cura//cura.log` (OSX) + * `$HOME/.local/share/cura//cura.log` (Ubuntu/Linux) If the Cura user interface still starts, you can also reach this directory from the application menu in Help -> Show settings folder -For additional support, you could also ask in the #cura channel on FreeNode IRC. For help with development, there is also the #cura-dev channel. +For additional support, you could also ask in the [#cura channel](https://web.libera.chat/#cura) on [libera.chat](https://libera.chat/). For help with development, there is also the [#cura-dev channel](https://web.libera.chat/#cura-dev). Dependencies ------------ @@ -26,9 +26,15 @@ Dependencies * [PySerial](https://github.com/pyserial/pyserial) Only required for USB printing support. * [python-zeroconf](https://github.com/jstasiak/python-zeroconf) Only required to detect mDNS-enabled printers. +For a list of required Python packages, with their recommended version, see `requirements.txt`. + +This list is not exhaustive at the moment, please check the links in the next section for more details. + Build scripts ------------- -Please checkout [cura-build](https://github.com/Ultimaker/cura-build) for detailed building instructions. +Please check out [cura-build](https://github.com/Ultimaker/cura-build) for detailed building instructions. + +If you want to build the entire environment from scratch before building Cura as well, [cura-build-environment](https://github.com/Ultimaker/cura-build) might be a starting point before cura-build. (Again, see cura-build for more details.) Running from Source ------------- diff --git a/cura.appdata.xml b/com.ultimaker.cura.appdata.xml similarity index 88% rename from cura.appdata.xml rename to com.ultimaker.cura.appdata.xml index 6274532ac9..781631e84a 100644 --- a/cura.appdata.xml +++ b/com.ultimaker.cura.appdata.xml @@ -1,7 +1,7 @@ - cura.desktop + com.ultimaker.cura.desktop CC0-1.0 LGPL-3.0 and CC-BY-SA-4.0 Cura @@ -24,7 +24,9 @@ - http://software.ultimaker.com/Cura.png + + https://raw.githubusercontent.com/Ultimaker/Cura/master/screenshot.png + https://ultimaker.com/en/products/cura-software?utm_source=cura&utm_medium=software&utm_campaign=resources Cura diff --git a/cura.desktop.in b/com.ultimaker.cura.desktop.in similarity index 100% rename from cura.desktop.in rename to com.ultimaker.cura.desktop.in diff --git a/cura/API/Account.py b/cura/API/Account.py index 15bccb71e1..884c2885e4 100644 --- a/cura/API/Account.py +++ b/cura/API/Account.py @@ -40,7 +40,7 @@ class Account(QObject): """ # The interval in which sync services are automatically triggered - SYNC_INTERVAL = 30.0 # seconds + SYNC_INTERVAL = 60.0 # seconds Q_ENUMS(SyncState) loginStateChanged = pyqtSignal(bool) @@ -58,6 +58,11 @@ class Account(QObject): manualSyncEnabledChanged = pyqtSignal(bool) updatePackagesEnabledChanged = pyqtSignal(bool) + CLIENT_SCOPES = "account.user.read drive.backup.read drive.backup.write packages.download " \ + "packages.rating.read packages.rating.write connect.cluster.read connect.cluster.write " \ + "library.project.read library.project.write cura.printjob.read cura.printjob.write " \ + "cura.mesh.read cura.mesh.write" + def __init__(self, application: "CuraApplication", parent = None) -> None: super().__init__(parent) self._application = application @@ -79,9 +84,7 @@ class Account(QObject): CALLBACK_PORT=self._callback_port, CALLBACK_URL="http://localhost:{}/callback".format(self._callback_port), CLIENT_ID="um----------------------------ultimaker_cura", - CLIENT_SCOPES="account.user.read drive.backup.read drive.backup.write packages.download " - "packages.rating.read packages.rating.write connect.cluster.read connect.cluster.write " - "cura.printjob.read cura.printjob.write cura.mesh.read cura.mesh.write", + CLIENT_SCOPES=self.CLIENT_SCOPES, AUTH_DATA_PREFERENCE_KEY="general/ultimaker_auth_data", AUTH_SUCCESS_REDIRECT="{}/app/auth-success".format(self._oauth_root), AUTH_FAILED_REDIRECT="{}/app/auth-error".format(self._oauth_root) @@ -106,7 +109,6 @@ class Account(QObject): self._authorization_service.accessTokenChanged.connect(self._onAccessTokenChanged) self._authorization_service.loadAuthDataFromPreferences() - @pyqtProperty(int, notify=syncStateChanged) def syncState(self): return self._sync_state @@ -175,6 +177,7 @@ class Account(QObject): if error_message: if self._error_message: self._error_message.hide() + Logger.log("w", "Failed to login: %s", error_message) self._error_message = Message(error_message, title = i18n_catalog.i18nc("@info:title", "Login failed")) self._error_message.show() self._logged_in = False @@ -206,7 +209,7 @@ class Account(QObject): if self._update_timer.isActive(): self._update_timer.stop() elif self._sync_state == SyncState.SYNCING: - Logger.warning("Starting a new sync while previous sync was not completed\n{}", str(self._sync_services)) + Logger.debug("Starting a new sync while previous sync was not completed") self.syncRequested.emit() diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py index 2e15d60a93..a23bc9332e 100644 --- a/cura/ApplicationMetadata.py +++ b/cura/ApplicationMetadata.py @@ -13,7 +13,7 @@ DEFAULT_CURA_DEBUG_MODE = False # Each release has a fixed SDK version coupled with it. It doesn't make sense to make it configurable because, for # example Cura 3.2 with SDK version 6.1 will not work. So the SDK version is hard-coded here and left out of the # CuraVersion.py.in template. -CuraSDKVersion = "7.4.0" +CuraSDKVersion = "7.6.0" try: from cura.CuraVersion import CuraAppName # type: ignore diff --git a/cura/Arranging/ArrangeObjectsJob.py b/cura/Arranging/ArrangeObjectsJob.py index 46b1aa2d71..e65a442acb 100644 --- a/cura/Arranging/ArrangeObjectsJob.py +++ b/cura/Arranging/ArrangeObjectsJob.py @@ -39,6 +39,7 @@ class ArrangeObjectsJob(Job): no_full_solution_message = Message( i18n_catalog.i18nc("@info:status", "Unable to find a location within the build volume for all objects"), - title = i18n_catalog.i18nc("@info:title", "Can't Find Location")) + title = i18n_catalog.i18nc("@info:title", "Can't Find Location"), + message_type = Message.MessageType.ERROR) no_full_solution_message.show() self.finished.emit(self) diff --git a/cura/Arranging/Nest2DArrange.py b/cura/Arranging/Nest2DArrange.py index cdf590232c..fdac63cd9d 100644 --- a/cura/Arranging/Nest2DArrange.py +++ b/cura/Arranging/Nest2DArrange.py @@ -36,6 +36,7 @@ def findNodePlacement(nodes_to_arrange: List["SceneNode"], build_volume: "BuildV found_solution_for_all: Whether the algorithm found a place on the buildplate for all the objects node_items: A list of the nodes return by libnest2d, which contain the new positions on the buildplate """ + spacing = int(1.5 * factor) # 1.5mm spacing. machine_width = build_volume.getWidth() machine_depth = build_volume.getDepth() @@ -75,7 +76,7 @@ def findNodePlacement(nodes_to_arrange: List["SceneNode"], build_volume: "BuildV # Clip the disallowed areas so that they don't overlap the bounding box (The arranger chokes otherwise) clipped_area = area.intersectionConvexHulls(build_plate_polygon) - if clipped_area.getPoints() is not None: # numpy array has to be explicitly checked against None + if clipped_area.getPoints() is not None and len(clipped_area.getPoints()) > 2: # numpy array has to be explicitly checked against None for point in clipped_area.getPoints(): converted_points.append(Point(int(point[0] * factor), int(point[1] * factor))) @@ -88,7 +89,7 @@ def findNodePlacement(nodes_to_arrange: List["SceneNode"], build_volume: "BuildV converted_points = [] hull_polygon = node.callDecoration("getConvexHull") - if hull_polygon is not None and hull_polygon.getPoints() is not None: # numpy array has to be explicitly checked against None + if hull_polygon is not None and hull_polygon.getPoints() is not None and len(hull_polygon.getPoints()) > 2: # numpy array has to be explicitly checked against None for point in hull_polygon.getPoints(): converted_points.append(Point(point[0] * factor, point[1] * factor)) item = Item(converted_points) @@ -99,7 +100,7 @@ def findNodePlacement(nodes_to_arrange: List["SceneNode"], build_volume: "BuildV config = NfpConfig() config.accuracy = 1.0 - num_bins = nest(node_items, build_plate_bounding_box, 10000, config) + num_bins = nest(node_items, build_plate_bounding_box, spacing, config) # Strip the fixed items (previously placed) and the disallowed areas from the results again. node_items = list(filter(lambda item: not item.isFixed(), node_items)) diff --git a/cura/Arranging/ShapeArray.py b/cura/Arranging/ShapeArray.py index 840f9731c2..5607c03663 100644 --- a/cura/Arranging/ShapeArray.py +++ b/cura/Arranging/ShapeArray.py @@ -3,7 +3,7 @@ import numpy import copy -from typing import Optional, Tuple, TYPE_CHECKING +from typing import Optional, Tuple, TYPE_CHECKING, Union from UM.Math.Polygon import Polygon @@ -14,14 +14,14 @@ if TYPE_CHECKING: class ShapeArray: """Polygon representation as an array for use with :py:class:`cura.Arranging.Arrange.Arrange`""" - def __init__(self, arr: numpy.array, offset_x: float, offset_y: float, scale: float = 1) -> None: + def __init__(self, arr: numpy.ndarray, offset_x: float, offset_y: float, scale: float = 1) -> None: self.arr = arr self.offset_x = offset_x self.offset_y = offset_y self.scale = scale @classmethod - def fromPolygon(cls, vertices: numpy.array, scale: float = 1) -> "ShapeArray": + def fromPolygon(cls, vertices: numpy.ndarray, scale: float = 1) -> "ShapeArray": """Instantiate from a bunch of vertices :param vertices: @@ -98,7 +98,7 @@ class ShapeArray: return offset_shape_arr, hull_shape_arr @classmethod - def arrayFromPolygon(cls, shape: Tuple[int, int], vertices: numpy.array) -> numpy.array: + def arrayFromPolygon(cls, shape: Union[Tuple[int, int], numpy.ndarray], vertices: numpy.ndarray) -> numpy.ndarray: """Create :py:class:`numpy.ndarray` with dimensions defined by shape Fills polygon defined by vertices with ones, all other values zero @@ -110,7 +110,7 @@ class ShapeArray: :return: numpy array with dimensions defined by shape """ - base_array = numpy.zeros(shape, dtype = numpy.int32) # Initialize your array of zeros + base_array = numpy.zeros(shape, dtype = numpy.int32) # type: ignore # Initialize your array of zeros fill = numpy.ones(base_array.shape) * True # Initialize boolean array defining shape fill @@ -126,7 +126,7 @@ class ShapeArray: return base_array @classmethod - def _check(cls, p1: numpy.array, p2: numpy.array, base_array: numpy.array) -> Optional[numpy.array]: + def _check(cls, p1: numpy.ndarray, p2: numpy.ndarray, base_array: numpy.ndarray) -> Optional[numpy.ndarray]: """Return indices that mark one side of the line, used by arrayFromPolygon Uses the line defined by p1 and p2 to check array of diff --git a/cura/AutoSave.py b/cura/AutoSave.py index d80e34771e..3205f48af1 100644 --- a/cura/AutoSave.py +++ b/cura/AutoSave.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import QTimer @@ -6,6 +6,8 @@ from typing import Any, TYPE_CHECKING from UM.Logger import Logger +import time + if TYPE_CHECKING: from cura.CuraApplication import CuraApplication @@ -56,8 +58,8 @@ class AutoSave: def _onTimeout(self) -> None: self._saving = True # To prevent the save process from triggering another autosave. - Logger.log("d", "Autosaving preferences, instances and profiles") + save_start_time = time.time() self._application.saveSettings() - + Logger.log("d", "Autosaving preferences, instances and profiles took %s seconds", time.time() - save_start_time) self._saving = False diff --git a/cura/Backups/Backup.py b/cura/Backups/Backup.py index 011eb97310..1f6a961733 100644 --- a/cura/Backups/Backup.py +++ b/cura/Backups/Backup.py @@ -5,14 +5,16 @@ import io import os import re import shutil +from copy import deepcopy from zipfile import ZipFile, ZIP_DEFLATED, BadZipfile -from typing import Dict, Optional, TYPE_CHECKING +from typing import Dict, Optional, TYPE_CHECKING, List from UM import i18nCatalog from UM.Logger import Logger from UM.Message import Message from UM.Platform import Platform from UM.Resources import Resources +from UM.Version import Version if TYPE_CHECKING: from cura.CuraApplication import CuraApplication @@ -27,6 +29,11 @@ class Backup: IGNORED_FILES = [r"cura\.log", r"plugins\.json", r"cache", r"__pycache__", r"\.qmlc", r"\.pyc"] """These files should be ignored when making a backup.""" + IGNORED_FOLDERS = [] # type: List[str] + + SECRETS_SETTINGS = ["general/ultimaker_auth_data"] + """Secret preferences that need to obfuscated when making a backup of Cura""" + catalog = i18nCatalog("cura") """Re-use translation catalog""" @@ -43,6 +50,9 @@ class Backup: Logger.log("d", "Creating backup for Cura %s, using folder %s", cura_release, version_data_dir) + # obfuscate sensitive secrets + secrets = self._obfuscate() + # Ensure all current settings are saved. self._application.saveSettings() @@ -67,8 +77,9 @@ class Backup: machine_count = max(len([s for s in files if "machine_instances/" in s]) - 1, 0) # If people delete their profiles but not their preferences, it can still make a backup, and report -1 profiles. Server crashes on this. material_count = max(len([s for s in files if "materials/" in s]) - 1, 0) profile_count = max(len([s for s in files if "quality_changes/" in s]) - 1, 0) - plugin_count = len([s for s in files if "plugin.json" in s]) - + # We don't store plugins anymore, since if you can make backups, you have an account (and the plugins are + # on the marketplace anyway) + plugin_count = 0 # Store the archive and metadata so the BackupManager can fetch them when needed. self.zip_file = buffer.getvalue() self.meta_data = { @@ -78,6 +89,8 @@ class Backup: "profile_count": str(profile_count), "plugin_count": str(plugin_count) } + # Restore the obfuscated settings + self._illuminate(**secrets) def _makeArchive(self, buffer: "io.BytesIO", root_path: str) -> Optional[ZipFile]: """Make a full archive from the given root path with the given name. @@ -85,8 +98,7 @@ class Backup: :param root_path: The root directory to archive recursively. :return: The archive as bytes. """ - - ignore_string = re.compile("|".join(self.IGNORED_FILES)) + ignore_string = re.compile("|".join(self.IGNORED_FILES + self.IGNORED_FOLDERS)) try: archive = ZipFile(buffer, "w", ZIP_DEFLATED) for root, folders, files in os.walk(root_path): @@ -123,8 +135,8 @@ class Backup: "Tried to restore a Cura backup without having proper data or meta data.")) return False - current_version = self._application.getVersion() - version_to_restore = self.meta_data.get("cura_release", "master") + current_version = Version(self._application.getVersion()) + version_to_restore = Version(self.meta_data.get("cura_release", "master")) if current_version < version_to_restore: # Cannot restore version newer than current because settings might have changed. @@ -134,8 +146,16 @@ class Backup: "Tried to restore a Cura backup that is higher than the current version.")) return False + # Get the current secrets and store since the back-up doesn't contain those + secrets = self._obfuscate() + version_data_dir = Resources.getDataStoragePath() - archive = ZipFile(io.BytesIO(self.zip_file), "r") + try: + archive = ZipFile(io.BytesIO(self.zip_file), "r") + except LookupError as e: + Logger.log("d", f"The following error occurred while trying to restore a Cura backup: {str(e)}") + self._showMessage(self.catalog.i18nc("@info:backup_failed", "The following error occurred while trying to restore a Cura backup:") + str(e)) + return False extracted = self._extractArchive(archive, version_data_dir) # Under Linux, preferences are stored elsewhere, so we copy the file to there. @@ -146,6 +166,12 @@ class Backup: Logger.log("d", "Moving preferences file from %s to %s", backup_preferences_file, preferences_file) shutil.move(backup_preferences_file, preferences_file) + # Read the preferences from the newly restored configuration (or else the cached Preferences will override the restored ones) + self._application.readPreferencesFromConfiguration() + + # Restore the obfuscated settings + self._illuminate(**secrets) + return extracted @staticmethod @@ -167,9 +193,36 @@ class Backup: Logger.log("d", "Removing current data in location: %s", target_path) Resources.factoryReset() Logger.log("d", "Extracting backup to location: %s", target_path) - try: - archive.extractall(target_path) - except (PermissionError, EnvironmentError): - Logger.logException("e", "Unable to extract the backup due to permission or file system errors.") - return False + name_list = archive.namelist() + for archive_filename in name_list: + try: + archive.extract(archive_filename, target_path) + except (PermissionError, EnvironmentError): + Logger.logException("e", f"Unable to extract the file {archive_filename} from the backup due to permission or file system errors.") + CuraApplication.getInstance().processEvents() return True + + def _obfuscate(self) -> Dict[str, str]: + """ + Obfuscate and remove the secret preferences that are specified in SECRETS_SETTINGS + + :return: a dictionary of the removed secrets. Note: the '/' is replaced by '__' + """ + preferences = self._application.getPreferences() + secrets = {} + for secret in self.SECRETS_SETTINGS: + secrets[secret.replace("/", "__")] = deepcopy(preferences.getValue(secret)) + preferences.setValue(secret, None) + self._application.savePreferences() + return secrets + + def _illuminate(self, **kwargs) -> None: + """ + Restore the obfuscated settings + + :param kwargs: a dict of obscured preferences. Note: the '__' of the keys will be replaced by '/' + """ + preferences = self._application.getPreferences() + for key, value in kwargs.items(): + preferences.setValue(key.replace("__", "/"), value) + self._application.savePreferences() diff --git a/cura/Backups/BackupsManager.py b/cura/Backups/BackupsManager.py index fb758455c1..6c4670edb6 100644 --- a/cura/Backups/BackupsManager.py +++ b/cura/Backups/BackupsManager.py @@ -4,6 +4,7 @@ from typing import Dict, Optional, Tuple, TYPE_CHECKING from UM.Logger import Logger +from UM.Version import Version from cura.Backups.Backup import Backup if TYPE_CHECKING: @@ -52,6 +53,7 @@ class BackupsManager: backup = Backup(self._application, zip_file = zip_file, meta_data = meta_data) restored = backup.restore() + if restored: # At this point, Cura will need to restart for the changes to take effect. # We don't want to store the data at this point as that would override the just-restored backup. diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 7c843fcdea..cf397e395e 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import numpy @@ -95,9 +95,11 @@ class BuildVolume(SceneNode): self._edge_disallowed_size = None self._build_volume_message = Message(catalog.i18nc("@info:status", - "The build volume height has been reduced due to the value of the" - " \"Print Sequence\" setting to prevent the gantry from colliding" - " with printed models."), title = catalog.i18nc("@info:title", "Build Volume")) + "The build volume height has been reduced due to the value of the" + " \"Print Sequence\" setting to prevent the gantry from colliding" + " with printed models."), + title = catalog.i18nc("@info:title", "Build Volume"), + message_type = Message.MessageType.WARNING) self._global_container_stack = None # type: Optional[GlobalStack] @@ -281,7 +283,7 @@ class BuildVolume(SceneNode): continue # If the entire node is below the build plate, still mark it as outside. node_bounding_box = node.getBoundingBox() - if node_bounding_box and node_bounding_box.top < 0: + if node_bounding_box and node_bounding_box.top < 0 and not node.getParent().callDecoration("isGroup"): node.setOutsideBuildArea(True) continue # Mark the node as outside build volume if the set extruder is disabled @@ -344,7 +346,12 @@ class BuildVolume(SceneNode): # Mark the node as outside build volume if the set extruder is disabled extruder_position = node.callDecoration("getActiveExtruderPosition") - if not self._global_container_stack.extruderList[int(extruder_position)].isEnabled: + try: + if not self._global_container_stack.extruderList[int(extruder_position)].isEnabled: + node.setOutsideBuildArea(True) + return + except IndexError: + # If the extruder doesn't exist, also mark it as unprintable. node.setOutsideBuildArea(True) return @@ -911,6 +918,8 @@ class BuildVolume(SceneNode): return {} for area in self._global_container_stack.getProperty("machine_disallowed_areas", "value"): + if len(area) == 0: + continue # Numpy doesn't deal well with 0-length arrays, since it can't determine the dimensionality of them. polygon = Polygon(numpy.array(area, numpy.float32)) polygon = polygon.getMinkowskiHull(Polygon.approximatedCircle(border_size)) machine_disallowed_polygons.append(polygon) @@ -1063,7 +1072,14 @@ class BuildVolume(SceneNode): adhesion_type = adhesion_override if adhesion_type is None: adhesion_type = container_stack.getProperty("adhesion_type", "value") - skirt_brim_line_width = self._global_container_stack.getProperty("skirt_brim_line_width", "value") + + # Skirt_brim_line_width is a bit of an odd one out. The primary bit of the skirt/brim is printed + # with the adhesion extruder, but it also prints one extra line by all other extruders. As such, the + # setting does *not* have a limit_to_extruder setting (which means that we can't ask the global extruder what + # the value is. + adhesion_extruder = self._global_container_stack.getProperty("adhesion_extruder_nr", "value") + skirt_brim_line_width = self._global_container_stack.extruderList[int(adhesion_extruder)].getProperty("skirt_brim_line_width", "value") + initial_layer_line_width_factor = self._global_container_stack.getProperty("initial_layer_line_width_factor", "value") # Use brim width if brim is enabled OR the prime tower has a brim. if adhesion_type == "brim": diff --git a/cura/CuraActions.py b/cura/CuraActions.py index d6e5add912..4d121338d8 100644 --- a/cura/CuraActions.py +++ b/cura/CuraActions.py @@ -67,11 +67,15 @@ class CuraActions(QObject): current_node = parent_node parent_node = current_node.getParent() - # This was formerly done with SetTransformOperation but because of - # unpredictable matrix deconstruction it was possible that mirrors - # could manifest as rotations. Centering is therefore done by - # moving the node to negative whatever its position is: - center_operation = TranslateOperation(current_node, -current_node._position) + # Find out where the bottom of the object is + bbox = current_node.getBoundingBox() + if bbox: + center_y = current_node.getWorldPosition().y - bbox.bottom + else: + center_y = 0 + + # Move the object so that it's bottom is on to of the buildplate + center_operation = TranslateOperation(current_node, Vector(0, center_y, 0), set_position = True) operation.addOperation(center_operation) operation.push() diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index f0c69d5a61..c8570c33e6 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1,8 +1,9 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import os import sys +import tempfile import time from typing import cast, TYPE_CHECKING, Optional, Callable, List, Any, Dict @@ -30,6 +31,7 @@ from UM.Operations.SetTransformOperation import SetTransformOperation from UM.Platform import Platform from UM.PluginError import PluginNotFoundError from UM.Preferences import Preferences +from UM.Qt.Bindings.FileProviderModel import FileProviderModel from UM.Qt.QtApplication import QtApplication # The class we're inheriting from. from UM.Resources import Resources from UM.Scene.Camera import Camera @@ -127,7 +129,7 @@ class CuraApplication(QtApplication): # SettingVersion represents the set of settings available in the machine/extruder definitions. # You need to make sure that this version number needs to be increased if there is any non-backwards-compatible # changes of the settings. - SettingVersion = 16 + SettingVersion = 17 Created = False @@ -255,6 +257,9 @@ class CuraApplication(QtApplication): from cura.CuraPackageManager import CuraPackageManager self._package_manager_class = CuraPackageManager + from UM.CentralFileStorage import CentralFileStorage + CentralFileStorage.setIsEnterprise(ApplicationMetadata.IsEnterpriseVersion) + @pyqtProperty(str, constant=True) def ultimakerCloudApiRootUrl(self) -> str: return UltimakerCloudConstants.CuraCloudAPIRoot @@ -456,15 +461,16 @@ class CuraApplication(QtApplication): self._version_upgrade_manager.setCurrentVersions( { - ("quality", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.QualityInstanceContainer, "application/x-uranium-instancecontainer"), - ("quality_changes", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.QualityChangesInstanceContainer, "application/x-uranium-instancecontainer"), - ("intent", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.IntentInstanceContainer, "application/x-uranium-instancecontainer"), - ("machine_stack", GlobalStack.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.MachineStack, "application/x-cura-globalstack"), - ("extruder_train", ExtruderStack.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.ExtruderStack, "application/x-cura-extruderstack"), - ("preferences", Preferences.Version * 1000000 + self.SettingVersion): (Resources.Preferences, "application/x-uranium-preferences"), - ("user", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.UserInstanceContainer, "application/x-uranium-instancecontainer"), - ("definition_changes", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.DefinitionChangesContainer, "application/x-uranium-instancecontainer"), - ("variant", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.VariantInstanceContainer, "application/x-uranium-instancecontainer"), + ("quality", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.QualityInstanceContainer, "application/x-uranium-instancecontainer"), + ("quality_changes", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.QualityChangesInstanceContainer, "application/x-uranium-instancecontainer"), + ("intent", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.IntentInstanceContainer, "application/x-uranium-instancecontainer"), + ("machine_stack", GlobalStack.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.MachineStack, "application/x-cura-globalstack"), + ("extruder_train", ExtruderStack.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.ExtruderStack, "application/x-cura-extruderstack"), + ("preferences", Preferences.Version * 1000000 + self.SettingVersion): (Resources.Preferences, "application/x-uranium-preferences"), + ("user", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.UserInstanceContainer, "application/x-uranium-instancecontainer"), + ("definition_changes", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.DefinitionChangesContainer, "application/x-uranium-instancecontainer"), + ("variant", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.VariantInstanceContainer, "application/x-uranium-instancecontainer"), + ("setting_visibility", SettingVisibilityPresetsModel.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.SettingVisibilityPreset, "application/x-uranium-preferences"), } ) @@ -601,6 +607,15 @@ class CuraApplication(QtApplication): @pyqtSlot() def closeApplication(self) -> None: Logger.log("i", "Close application") + + # Workaround: Before closing the window, remove the global stack. + # This is necessary because as the main window gets closed, hundreds of QML elements get updated which often + # request the global stack. However as the Qt-side of the Machine Manager is being dismantled, the conversion of + # the Global Stack to a QObject fails. + # If instead we first take down the global stack, PyQt will just convert `None` to `null` which succeeds, and + # the QML code then gets `null` as the global stack and can deal with that as it deems fit. + self.getMachineManager().setActiveMachine(None) + main_window = self.getMainWindow() if main_window is not None: main_window.close() @@ -693,6 +708,8 @@ class CuraApplication(QtApplication): @pyqtSlot(str) def discardOrKeepProfileChangesClosed(self, option: str) -> None: global_stack = self.getGlobalContainerStack() + if global_stack is None: + return if option == "discard": for extruder in global_stack.extruderList: extruder.userChanges.clear() @@ -822,6 +839,9 @@ class CuraApplication(QtApplication): self._add_printer_pages_model_without_cancel.initialize(cancellable = False) self._whats_new_pages_model.initialize() + # Initialize the FileProviderModel + self._file_provider_model.initialize(self._onFileProviderEnabledChanged) + # Detect in which mode to run and execute that mode if self._is_headless: self.runWithoutGUI() @@ -889,14 +909,14 @@ class CuraApplication(QtApplication): diagonal = self.getBuildVolume().getDiagonalSize() if diagonal < 1: #No printer added yet. Set a default camera distance for normal-sized printers. diagonal = 375 - camera.setPosition(Vector(-80, 250, 700) * diagonal / 375) + camera.setPosition(Vector(-80, 180, 700) * diagonal / 375) camera.lookAt(Vector(0, 0, 0)) controller.getScene().setActiveCamera("3d") # Initialize camera tool camera_tool = controller.getTool("CameraTool") if camera_tool: - camera_tool.setOrigin(Vector(0, 100, 0)) + camera_tool.setOrigin(Vector(0, 30, 0)) camera_tool.setZoomRange(0.1, 2000) # Initialize camera animations @@ -1051,6 +1071,13 @@ class CuraApplication(QtApplication): self._simple_mode_settings_manager = SimpleModeSettingsManager() return self._simple_mode_settings_manager + @pyqtSlot(result = QObject) + def getFileProviderModel(self) -> FileProviderModel: + return self._file_provider_model + + def _onFileProviderEnabledChanged(self): + self._file_provider_model.update() + def event(self, event): """Handle Qt events""" @@ -1256,10 +1283,11 @@ class CuraApplication(QtApplication): if other_bb is not None: scene_bounding_box = scene_bounding_box + node.getBoundingBox() - if print_information: print_information.setPreSliced(is_block_slicing_node) + self.getWorkspaceFileHandler().setEnabled(not is_block_slicing_node) + if not scene_bounding_box: scene_bounding_box = AxisAlignedBox.Null @@ -1466,7 +1494,8 @@ class CuraApplication(QtApplication): for file_name, nodes in objects_in_filename.items(): for node in nodes: - job = ReadMeshJob(file_name) + file_path = os.path.normpath(os.path.dirname(file_name)) + job = ReadMeshJob(file_name, add_to_recent_files = file_path != tempfile.gettempdir()) # Don't add temp files to the recent files list job._node = node # type: ignore job.finished.connect(self._reloadMeshFinished) if has_merged_nodes: @@ -1502,12 +1531,8 @@ class CuraApplication(QtApplication): # Compute the center of the objects object_centers = [] - # Forget about the translation that the original objects have - zero_translation = Matrix(data=numpy.zeros(3)) for mesh, node in zip(meshes, group_node.getChildren()): - transformation = node.getLocalTransformation() - transformation.setTranslation(zero_translation) - transformed_mesh = mesh.getTransformed(transformation) + transformed_mesh = mesh.getTransformed(Matrix()) # Forget about the transformations that the original object had. center = transformed_mesh.getCenterPosition() if center is not None: object_centers.append(center) @@ -1522,7 +1547,7 @@ class CuraApplication(QtApplication): # Move each node to the same position. for mesh, node in zip(meshes, group_node.getChildren()): - node.setTransformation(Matrix()) + node.setTransformation(Matrix()) # Removes any changes in position and rotation. # Align the object around its zero position # and also apply the offset to center it inside the group. node.setPosition(-mesh.getZeroPosition() - offset) @@ -1720,15 +1745,17 @@ class CuraApplication(QtApplication): def log(self, msg): Logger.log("d", msg) - openProjectFile = pyqtSignal(QUrl, arguments = ["project_file"]) # Emitted when a project file is about to open. + openProjectFile = pyqtSignal(QUrl, bool, arguments = ["project_file", "add_to_recent_files"]) # Emitted when a project file is about to open. + @pyqtSlot(QUrl, str, bool) @pyqtSlot(QUrl, str) @pyqtSlot(QUrl) - def readLocalFile(self, file: QUrl, project_mode: Optional[str] = None): + def readLocalFile(self, file: QUrl, project_mode: Optional[str] = None, add_to_recent_files: bool = True): """Open a local file :param project_mode: How to handle project files. Either None(default): Follow user preference, "open_as_model" or "open_as_project". This parameter is only considered if the file is a project file. + :param add_to_recent_files: Whether or not to add the file as an option to the Recent Files list. """ Logger.log("i", "Attempting to read file %s", file.toString()) if not file.isValid(): @@ -1749,12 +1776,12 @@ class CuraApplication(QtApplication): if is_project_file and project_mode == "open_as_project": # open as project immediately without presenting a dialog workspace_handler = self.getWorkspaceFileHandler() - workspace_handler.readLocalFile(file) + workspace_handler.readLocalFile(file, add_to_recent_files_hint = add_to_recent_files) return if is_project_file and project_mode == "always_ask": # present a dialog asking to open as project or import models - self.callLater(self.openProjectFile.emit, file) + self.callLater(self.openProjectFile.emit, file, add_to_recent_files) return # Either the file is a model file or we want to load only models from project. Continue to load models. @@ -1790,7 +1817,7 @@ class CuraApplication(QtApplication): if extension in self._non_sliceable_extensions: self.deleteAll(only_selectable = False) - job = ReadMeshJob(f) + job = ReadMeshJob(f, add_to_recent_files = add_to_recent_files) job.finished.connect(self._readMeshFinished) job.start() @@ -1841,6 +1868,7 @@ class CuraApplication(QtApplication): else: node = CuraSceneNode() node.setMeshData(original_node.getMeshData()) + node.source_mime_type = original_node.source_mime_type # Setting meshdata does not apply scaling. if original_node.getScale() != Vector(1.0, 1.0, 1.0): @@ -1905,6 +1933,11 @@ class CuraApplication(QtApplication): arrange(nodes_to_arrange, self.getBuildVolume(), fixed_nodes) except: Logger.logException("e", "Failed to arrange the models") + + # Ensure that we don't have any weird floaty objects (CURA-7855) + for node in nodes_to_arrange: + node.translate(Vector(0, -node.getBoundingBox().bottom, 0), SceneNode.TransformSpace.World) + self.fileCompleted.emit(file_name) def addNonSliceableExtension(self, extension): @@ -1921,7 +1954,7 @@ class CuraApplication(QtApplication): try: result = workspace_reader.preRead(file_path, show_dialog=False) return result == WorkspaceReader.PreReadResult.accepted - except Exception: + except: Logger.logException("e", "Could not check file %s", file_url) return False diff --git a/cura/LayerPolygon.py b/cura/LayerPolygon.py index 6e518e984a..7f62a0a8fa 100644 --- a/cura/LayerPolygon.py +++ b/cura/LayerPolygon.py @@ -65,7 +65,7 @@ class LayerPolygon: # When type is used as index returns true if type == LayerPolygon.InfillType or type == LayerPolygon.SkinType or type == LayerPolygon.SupportInfillType # Should be generated in better way, not hardcoded. - self._is_infill_or_skin_type_map = numpy.array([0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0], dtype = numpy.bool) + self._is_infill_or_skin_type_map = numpy.array([0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0], dtype = bool) self._build_cache_line_mesh_mask = None # type: Optional[numpy.ndarray] self._build_cache_needed_points = None # type: Optional[numpy.ndarray] @@ -73,18 +73,17 @@ class LayerPolygon: def buildCache(self) -> None: # For the line mesh we do not draw Infill or Jumps. Therefore those lines are filtered out. self._build_cache_line_mesh_mask = numpy.ones(self._jump_mask.shape, dtype = bool) - mesh_line_count = numpy.sum(self._build_cache_line_mesh_mask) self._index_begin = 0 - self._index_end = mesh_line_count + self._index_end = cast(int, numpy.sum(self._build_cache_line_mesh_mask)) - self._build_cache_needed_points = numpy.ones((len(self._types), 2), dtype = numpy.bool) + self._build_cache_needed_points = numpy.ones((len(self._types), 2), dtype = bool) # Only if the type of line segment changes do we need to add an extra vertex to change colors self._build_cache_needed_points[1:, 0][:, numpy.newaxis] = self._types[1:] != self._types[:-1] # Mark points as unneeded if they are of types we don't want in the line mesh according to the calculated mask numpy.logical_and(self._build_cache_needed_points, self._build_cache_line_mesh_mask, self._build_cache_needed_points ) self._vertex_begin = 0 - self._vertex_end = numpy.sum( self._build_cache_needed_points ) + self._vertex_end = cast(int, numpy.sum(self._build_cache_needed_points)) def build(self, vertex_offset: int, index_offset: int, vertices: numpy.ndarray, colors: numpy.ndarray, line_dimensions: numpy.ndarray, feedrates: numpy.ndarray, extruders: numpy.ndarray, line_types: numpy.ndarray, indices: numpy.ndarray) -> None: """Set all the arrays provided by the function caller, representing the LayerPolygon diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index c78c6aff03..18db7d982d 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -88,8 +88,10 @@ class MaterialNode(ContainerNode): variant = self.variant.variant_name) else: qualities_any_material = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition) - for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", material = my_material_type): - qualities.extend((quality for quality in qualities_any_material if quality.get("material") == material_metadata["base_file"])) + + all_material_base_files = {material_metadata["base_file"] for material_metadata in container_registry.findInstanceContainersMetadata(type = "material", material = my_material_type)} + + qualities.extend((quality for quality in qualities_any_material if quality.get("material") in all_material_base_files)) if not qualities: # No quality profiles found. Go by GUID then. my_guid = self.guid diff --git a/cura/Machines/Models/ExtrudersModel.py b/cura/Machines/Models/ExtrudersModel.py index 98865ed37e..1aba1d871a 100644 --- a/cura/Machines/Models/ExtrudersModel.py +++ b/cura/Machines/Models/ExtrudersModel.py @@ -53,6 +53,9 @@ class ExtrudersModel(ListModel): EnabledRole = Qt.UserRole + 11 """Is the extruder enabled?""" + MaterialTypeRole = Qt.UserRole + 12 + """The type of the material (e.g. PLA, ABS, PETG, etc.).""" + defaultColors = ["#ffc924", "#86ec21", "#22eeee", "#245bff", "#9124ff", "#ff24c8"] """List of colours to display if there is no material or the material has no known colour. """ @@ -75,6 +78,7 @@ class ExtrudersModel(ListModel): self.addRoleName(self.StackRole, "stack") self.addRoleName(self.MaterialBrandRole, "material_brand") self.addRoleName(self.ColorNameRole, "color_name") + self.addRoleName(self.MaterialTypeRole, "material_type") self._update_extruder_timer = QTimer() self._update_extruder_timer.setInterval(100) self._update_extruder_timer.setSingleShot(True) @@ -193,7 +197,8 @@ class ExtrudersModel(ListModel): "variant": extruder.variant.getName() if extruder.variant else "", # e.g. print core "stack": extruder, "material_brand": material_brand, - "color_name": color_name + "color_name": color_name, + "material_type": extruder.material.getMetaDataEntry("material") if extruder.material else "", } items.append(item) @@ -210,7 +215,7 @@ class ExtrudersModel(ListModel): "id": "", "name": catalog.i18nc("@menuitem", "Not overridden"), "enabled": True, - "color": "#ffffff", + "color": "transparent", "index": -1, "definition": "", "material": "", @@ -218,6 +223,7 @@ class ExtrudersModel(ListModel): "stack": None, "material_brand": "", "color_name": "", + "material_type": "", } items.append(item) if self._items != items: diff --git a/cura/Machines/Models/MachineModelUtils.py b/cura/Machines/Models/MachineModelUtils.py index a23b1ff3a5..b4fff37724 100644 --- a/cura/Machines/Models/MachineModelUtils.py +++ b/cura/Machines/Models/MachineModelUtils.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from typing import TYPE_CHECKING @@ -34,4 +34,4 @@ def fetchLayerHeight(quality_group: "QualityGroup") -> float: if isinstance(layer_height, SettingFunction): layer_height = layer_height(global_stack) - return float(layer_height) + return round(float(layer_height), 3) diff --git a/cura/Machines/Models/MaterialManagementModel.py b/cura/Machines/Models/MaterialManagementModel.py index 4a696ec974..6663dbdae1 100644 --- a/cura/Machines/Models/MaterialManagementModel.py +++ b/cura/Machines/Models/MaterialManagementModel.py @@ -1,10 +1,11 @@ -# Copyright (c) 2019 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import copy # To duplicate materials. -from PyQt5.QtCore import QObject, pyqtSignal, pyqtSlot # To allow the preference page proxy to be used from the actual preferences page. +from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject, QUrl from typing import Any, Dict, Optional, TYPE_CHECKING import uuid # To generate new GUIDs for new materials. +import zipfile # To export all materials in a .zip archive. from UM.i18n import i18nCatalog from UM.Logger import Logger @@ -20,11 +21,6 @@ if TYPE_CHECKING: catalog = i18nCatalog("cura") class MaterialManagementModel(QObject): - """Proxy class to the materials page in the preferences. - - This class handles the actions in that page, such as creating new materials, renaming them, etc. - """ - favoritesChanged = pyqtSignal(str) """Triggered when a favorite is added or removed. @@ -79,6 +75,7 @@ class MaterialManagementModel(QObject): :param material_node: The material to remove. """ + Logger.info(f"Removing material {material_node.container_id}") container_registry = CuraContainerRegistry.getInstance() materials_this_base_file = container_registry.findContainersMetadata(base_file = material_node.base_file) @@ -194,6 +191,7 @@ class MaterialManagementModel(QObject): :return: The root material ID of the duplicate material. """ + Logger.info(f"Duplicating material {material_node.base_file} to {new_base_id}") return self.duplicateMaterialByBaseFile(material_node.base_file, new_base_id, new_metadata) @pyqtSlot(result = str) @@ -262,3 +260,40 @@ class MaterialManagementModel(QObject): self.favoritesChanged.emit(material_base_file) except ValueError: # Material was not in the favorites list. Logger.log("w", "Material {material_base_file} was already not a favorite material.".format(material_base_file = material_base_file)) + + @pyqtSlot(result = QUrl) + def getPreferredExportAllPath(self) -> QUrl: + """ + Get the preferred path to export materials to. + + If there is a removable drive, that should be the preferred path. Otherwise it should be the most recent local + file path. + :return: The preferred path to export all materials to. + """ + cura_application = cura.CuraApplication.CuraApplication.getInstance() + device_manager = cura_application.getOutputDeviceManager() + devices = device_manager.getOutputDevices() + for device in devices: + if device.__class__.__name__ == "RemovableDriveOutputDevice": + return QUrl.fromLocalFile(device.getId()) + else: # No removable drives? Use local path. + return cura_application.getDefaultPath("dialog_material_path") + + @pyqtSlot(QUrl) + def exportAll(self, file_path: QUrl) -> None: + """ + Export all materials to a certain file path. + :param file_path: The path to export the materials to. + """ + registry = CuraContainerRegistry.getInstance() + + archive = zipfile.ZipFile(file_path.toLocalFile(), "w", compression = zipfile.ZIP_DEFLATED) + for metadata in registry.findInstanceContainersMetadata(type = "material"): + if metadata["base_file"] != metadata["id"]: # Only process base files. + continue + if metadata["id"] == "empty_material": # Don't export the empty material. + continue + material = registry.findContainers(id = metadata["id"])[0] + suffix = registry.getMimeTypeForContainer(type(material)).preferredSuffix + filename = metadata["id"] + "." + suffix + archive.writestr(filename, material.serialize()) diff --git a/cura/Machines/Models/QualitySettingsModel.py b/cura/Machines/Models/QualitySettingsModel.py index 43f5c71e15..89a996fba1 100644 --- a/cura/Machines/Models/QualitySettingsModel.py +++ b/cura/Machines/Models/QualitySettingsModel.py @@ -99,7 +99,7 @@ class QualitySettingsModel(ListModel): if self._selected_position == self.GLOBAL_STACK_POSITION: quality_node = quality_group.node_for_global else: - quality_node = quality_group.nodes_for_extruders.get(str(self._selected_position)) + quality_node = quality_group.nodes_for_extruders.get(self._selected_position) settings_keys = quality_group.getAllKeys() quality_containers = [] if quality_node is not None and quality_node.container is not None: @@ -114,10 +114,13 @@ class QualitySettingsModel(ListModel): global_container = None if len(global_containers) == 0 else global_containers[0] extruders_containers = {pos: container_registry.findContainers(id = quality_changes_group.metadata_per_extruder[pos]["id"]) for pos in quality_changes_group.metadata_per_extruder} extruders_container = {pos: None if not containers else containers[0] for pos, containers in extruders_containers.items()} + quality_changes_metadata = None if self._selected_position == self.GLOBAL_STACK_POSITION and global_container: quality_changes_metadata = global_container.getMetaData() else: - quality_changes_metadata = extruders_container.get(str(self._selected_position)) + extruder = extruders_container.get(self._selected_position) + if extruder: + quality_changes_metadata = extruder.getMetaData() if quality_changes_metadata is not None: # It can be None if number of extruders are changed during runtime. container = container_registry.findContainers(id = quality_changes_metadata["id"]) if container: diff --git a/cura/Machines/Models/SettingVisibilityPresetsModel.py b/cura/Machines/Models/SettingVisibilityPresetsModel.py index 6b5766c127..d268774850 100644 --- a/cura/Machines/Models/SettingVisibilityPresetsModel.py +++ b/cura/Machines/Models/SettingVisibilityPresetsModel.py @@ -19,6 +19,8 @@ class SettingVisibilityPresetsModel(QObject): onItemsChanged = pyqtSignal() activePresetChanged = pyqtSignal() + Version = 2 + def __init__(self, preferences: Preferences, parent = None) -> None: super().__init__(parent) diff --git a/cura/OAuth2/AuthorizationHelpers.py b/cura/OAuth2/AuthorizationHelpers.py index f7fe6958a1..5b95b3a3bb 100644 --- a/cura/OAuth2/AuthorizationHelpers.py +++ b/cura/OAuth2/AuthorizationHelpers.py @@ -1,12 +1,12 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. + from datetime import datetime import json import random from hashlib import sha512 from base64 import b64encode -from typing import Optional, Any, Dict, Tuple - +from typing import Optional import requests from UM.i18n import i18nCatalog @@ -58,7 +58,7 @@ class AuthorizationHelpers: :return: An AuthenticationResponse object. """ - Logger.log("d", "Refreshing the access token.") + Logger.log("d", "Refreshing the access token for [%s]", self._settings.OAUTH_SERVER_URL) data = { "client_id": self._settings.CLIENT_ID if self._settings.CLIENT_ID is not None else "", "redirect_uri": self._settings.CALLBACK_URL if self._settings.CALLBACK_URL is not None else "", @@ -69,7 +69,9 @@ class AuthorizationHelpers: try: return self.parseTokenResponse(requests.post(self._token_url, data = data)) # type: ignore except requests.exceptions.ConnectionError: - return AuthenticationResponse(success=False, err_message="Unable to connect to remote server") + return AuthenticationResponse(success = False, err_message = "Unable to connect to remote server") + except OSError as e: + return AuthenticationResponse(success = False, err_message = "Operating system is unable to set up a secure connection: {err}".format(err = str(e))) @staticmethod def parseTokenResponse(token_response: requests.models.Response) -> "AuthenticationResponse": @@ -108,10 +110,12 @@ class AuthorizationHelpers: """ try: - token_request = requests.get("{}/check-token".format(self._settings.OAUTH_SERVER_URL), headers = { + check_token_url = "{}/check-token".format(self._settings.OAUTH_SERVER_URL) + Logger.log("d", "Checking the access token for [%s]", check_token_url) + token_request = requests.get(check_token_url, headers = { "Authorization": "Bearer {}".format(access_token) }) - except requests.exceptions.ConnectionError: + except (requests.exceptions.ConnectionError, requests.exceptions.Timeout): # Connection was suddenly dropped. Nothing we can do about that. Logger.logException("w", "Something failed while attempting to parse the JWT token") return None diff --git a/cura/OAuth2/AuthorizationService.py b/cura/OAuth2/AuthorizationService.py index 9a5c81ae55..96091f9c11 100644 --- a/cura/OAuth2/AuthorizationService.py +++ b/cura/OAuth2/AuthorizationService.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import json @@ -113,8 +113,10 @@ class AuthorizationService: # The token could not be refreshed using the refresh token. We should login again. return None # Ensure it gets stored as otherwise we only have it in memory. The stored refresh token has been deleted - # from the server already. - self._storeAuthData(self._auth_data) + # from the server already. Do not store the auth_data if we could not get new auth_data (eg due to a + # network error), since this would cause an infinite loop trying to get new auth-data + if self._auth_data.success: + self._storeAuthData(self._auth_data) return self._auth_helpers.parseJWT(self._auth_data.access_token) def getAccessToken(self) -> Optional[str]: @@ -241,13 +243,13 @@ class AuthorizationService: self._unable_to_get_data_message = Message(i18n_catalog.i18nc("@info", "Unable to reach the Ultimaker account server."), title = i18n_catalog.i18nc("@info:title", "Warning")) self._unable_to_get_data_message.show() - except ValueError: + except (ValueError, TypeError): Logger.logException("w", "Could not load auth data from preferences") def _storeAuthData(self, auth_data: Optional[AuthenticationResponse] = None) -> None: """Store authentication data in preferences.""" - Logger.log("d", "Attempting to store the auth data") + Logger.log("d", "Attempting to store the auth data for [%s]", self._settings.OAUTH_SERVER_URL) if self._preferences is None: Logger.log("e", "Unable to save authentication data, since no preference has been set!") return @@ -255,10 +257,9 @@ class AuthorizationService: self._auth_data = auth_data if auth_data: self._user_profile = self.getUserProfile() - self._preferences.setValue(self._settings.AUTH_DATA_PREFERENCE_KEY, json.dumps(vars(auth_data))) + self._preferences.setValue(self._settings.AUTH_DATA_PREFERENCE_KEY, json.dumps(auth_data.dump())) else: self._user_profile = None self._preferences.resetPreference(self._settings.AUTH_DATA_PREFERENCE_KEY) self.accessTokenChanged.emit() - diff --git a/cura/OAuth2/KeyringAttribute.py b/cura/OAuth2/KeyringAttribute.py new file mode 100644 index 0000000000..9bb6e3c267 --- /dev/null +++ b/cura/OAuth2/KeyringAttribute.py @@ -0,0 +1,83 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from typing import Type, TYPE_CHECKING, Optional, List + +import keyring +from keyring.backend import KeyringBackend +from keyring.errors import NoKeyringError, PasswordSetError, KeyringLocked + +from UM.Logger import Logger + +if TYPE_CHECKING: + from cura.OAuth2.Models import BaseModel + +# Need to do some extra workarounds on windows: +import sys +from UM.Platform import Platform +if Platform.isWindows() and hasattr(sys, "frozen"): + import win32timezone + from keyring.backends.Windows import WinVaultKeyring + keyring.set_keyring(WinVaultKeyring()) +if Platform.isOSX() and hasattr(sys, "frozen"): + from keyring.backends.macOS import Keyring + keyring.set_keyring(Keyring()) + +# Even if errors happen, we don't want this stored locally: +DONT_EVER_STORE_LOCALLY: List[str] = ["refresh_token"] + + +class KeyringAttribute: + """ + Descriptor for attributes that need to be stored in the keyring. With Fallback behaviour to the preference cfg file + """ + def __get__(self, instance: "BaseModel", owner: type) -> Optional[str]: + if self._store_secure: # type: ignore + try: + value = keyring.get_password("cura", self._keyring_name) + return value if value != "" else None + except NoKeyringError: + self._store_secure = False + Logger.logException("w", "No keyring backend present") + return getattr(instance, self._name) + except KeyringLocked: + self._store_secure = False + Logger.log("i", "Access to the keyring was denied.") + return getattr(instance, self._name) + else: + return getattr(instance, self._name) + + def __set__(self, instance: "BaseModel", value: Optional[str]): + if self._store_secure: + setattr(instance, self._name, None) + if value is not None: + try: + keyring.set_password("cura", self._keyring_name, value) + except (PasswordSetError, KeyringLocked): + self._store_secure = False + if self._name not in DONT_EVER_STORE_LOCALLY: + setattr(instance, self._name, value) + Logger.logException("w", "Keyring access denied") + except NoKeyringError: + self._store_secure = False + if self._name not in DONT_EVER_STORE_LOCALLY: + setattr(instance, self._name, value) + Logger.logException("w", "No keyring backend present") + except BaseException as e: + # A BaseException can occur in Windows when the keyring attempts to write a token longer than 1024 + # characters in the Windows Credentials Manager. + self._store_secure = False + if self._name not in DONT_EVER_STORE_LOCALLY: + setattr(instance, self._name, value) + Logger.log("w", "Keyring failed: {}".format(e)) + else: + setattr(instance, self._name, value) + + def __set_name__(self, owner: type, name: str): + self._name = "_{}".format(name) + self._keyring_name = name + self._store_secure = False + try: + self._store_secure = KeyringBackend.viable + except NoKeyringError: + Logger.logException("w", "Could not use keyring") + setattr(owner, self._name, None) diff --git a/cura/OAuth2/LocalAuthorizationServer.py b/cura/OAuth2/LocalAuthorizationServer.py index ac14b00985..219191c295 100644 --- a/cura/OAuth2/LocalAuthorizationServer.py +++ b/cura/OAuth2/LocalAuthorizationServer.py @@ -54,6 +54,7 @@ class LocalAuthorizationServer: if self._web_server: # If the server is already running (because of a previously aborted auth flow), we don't have to start it. # We still inject the new verification code though. + Logger.log("d", "Auth web server was already running. Updating the verification code") self._web_server.setVerificationCode(verification_code) return @@ -85,6 +86,7 @@ class LocalAuthorizationServer: except OSError: # OS error can happen if the socket was already closed. We really don't care about that case. pass + Logger.log("d", "Local oauth2 web server was shut down") self._web_server = None self._web_server_thread = None @@ -96,12 +98,13 @@ class LocalAuthorizationServer: :return: None """ + Logger.log("d", "Local web server for authorization has started") if self._web_server: if sys.platform == "win32": try: self._web_server.serve_forever() - except OSError as e: - Logger.warning(str(e)) + except OSError: + Logger.logException("w", "An exception happened while serving the auth server") else: # Leave the default behavior in non-windows platforms self._web_server.serve_forever() diff --git a/cura/OAuth2/Models.py b/cura/OAuth2/Models.py index f49fdc1421..4c84872a09 100644 --- a/cura/OAuth2/Models.py +++ b/cura/OAuth2/Models.py @@ -1,6 +1,8 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Optional, Dict, Any, List +from typing import Optional, Dict, Any, List, Union +from copy import deepcopy +from cura.OAuth2.KeyringAttribute import KeyringAttribute class BaseModel: @@ -37,12 +39,29 @@ class AuthenticationResponse(BaseModel): # Data comes from the token response with success flag and error message added. success = True # type: bool token_type = None # type: Optional[str] - access_token = None # type: Optional[str] - refresh_token = None # type: Optional[str] expires_in = None # type: Optional[str] scope = None # type: Optional[str] err_message = None # type: Optional[str] received_at = None # type: Optional[str] + access_token = KeyringAttribute() + refresh_token = KeyringAttribute() + + def __init__(self, **kwargs: Any) -> None: + self.access_token = kwargs.pop("access_token", None) + self.refresh_token = kwargs.pop("refresh_token", None) + super(AuthenticationResponse, self).__init__(**kwargs) + + def dump(self) -> Dict[str, Union[bool, Optional[str]]]: + """ + Dumps the dictionary of Authentication attributes. KeyringAttributes are transformed to public attributes + If the keyring was used, these will have a None value, otherwise they will have the secret value + + :return: Dictionary of Authentication attributes + """ + dumped = deepcopy(vars(self)) + dumped["access_token"] = dumped.pop("_access_token") + dumped["refresh_token"] = dumped.pop("_refresh_token") + return dumped class ResponseStatus(BaseModel): diff --git a/cura/Scene/CuraSceneNode.py b/cura/Scene/CuraSceneNode.py index 93a1511681..5fbaded650 100644 --- a/cura/Scene/CuraSceneNode.py +++ b/cura/Scene/CuraSceneNode.py @@ -119,21 +119,23 @@ class CuraSceneNode(SceneNode): self._aabb = None if self._mesh_data: self._aabb = self._mesh_data.getExtents(self.getWorldTransformation(copy = False)) - else: # If there is no mesh_data, use a bounding box that encompasses the local (0,0,0) - position = self.getWorldPosition() - self._aabb = AxisAlignedBox(minimum = position, maximum = position) for child in self.getAllChildren(): if child.callDecoration("isNonPrintingMesh"): # Non-printing-meshes inside a group should not affect push apart or drop to build plate continue - if not child.getMeshData(): - # Nodes without mesh data should not affect bounding boxes of their parents. + child_bb = child.getBoundingBox() + if child_bb is None or child_bb.minimum == child_bb.maximum: + # Child had a degenerate bounding box, such as an empty group. Don't count it along. continue if self._aabb is None: - self._aabb = child.getBoundingBox() + self._aabb = child_bb else: - self._aabb = self._aabb + child.getBoundingBox() + self._aabb = self._aabb + child_bb + + if self._aabb is None: # No children that should be included? Just use your own position then, but it's an invalid AABB. + position = self.getWorldPosition() + self._aabb = AxisAlignedBox(minimum = position, maximum = position) def __deepcopy__(self, memo: Dict[int, object]) -> "CuraSceneNode": """Taken from SceneNode, but replaced SceneNode with CuraSceneNode""" @@ -142,6 +144,7 @@ class CuraSceneNode(SceneNode): copy.setTransformation(self.getLocalTransformation(copy= False)) copy.setMeshData(self._mesh_data) copy.setVisible(cast(bool, deepcopy(self._visible, memo))) + copy.source_mime_type = cast(str, deepcopy(self.source_mime_type, memo)) copy._selectable = cast(bool, deepcopy(self._selectable, memo)) copy._name = cast(str, deepcopy(self._name, memo)) for decorator in self._decorators: diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index 08fdf707cf..45f2edab20 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import os @@ -221,6 +221,7 @@ class ContainerManager(QObject): except OSError: return {"status": "error", "message": "Unable to write to this location.", "path": file_url} + Logger.info("Successfully exported container to {path}".format(path = file_url)) return {"status": "success", "message": "Successfully exported container", "path": file_url} @pyqtSlot(QUrl, result = "QVariantMap") @@ -240,6 +241,7 @@ class ContainerManager(QObject): file_url = file_url_or_string.toLocalFile() else: file_url = file_url_or_string + Logger.info(f"Importing material from {file_url}") if not file_url or not os.path.exists(file_url): return {"status": "error", "message": "Invalid path"} diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index 24b7436bad..7e6c3f5d20 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import os @@ -381,9 +381,10 @@ class CuraContainerRegistry(ContainerRegistry): if profile_count > 1: continue # Only one profile found, this should not ever be the case, so that profile needs to be removed! - Logger.log("d", "Found an invalid quality_changes profile with the name %s. Going to remove that now", profile_name) invalid_quality_changes = ContainerRegistry.getInstance().findContainersMetadata(name=profile_name) - self.removeContainer(invalid_quality_changes[0]["id"]) + if invalid_quality_changes: + Logger.log("d", "Found an invalid quality_changes profile with the name %s. Going to remove that now", profile_name) + self.removeContainer(invalid_quality_changes[0]["id"]) @override(ContainerRegistry) def _isMetadataValid(self, metadata: Optional[Dict[str, Any]]) -> bool: @@ -400,7 +401,9 @@ class CuraContainerRegistry(ContainerRegistry): try: if int(metadata["setting_version"]) != cura.CuraApplication.CuraApplication.SettingVersion: return False - except ValueError: #Not parsable as int. + except ValueError: # Not parsable as int. + return False + except TypeError: # Expecting string input here, not e.g. list or anything. return False return True diff --git a/cura/Settings/GlobalStack.py b/cura/Settings/GlobalStack.py index 2c7cbf5e25..282034c0ee 100755 --- a/cura/Settings/GlobalStack.py +++ b/cura/Settings/GlobalStack.py @@ -86,6 +86,14 @@ class GlobalStack(CuraContainerStack): def supportsNetworkConnection(self): return self.getMetaDataEntry("supports_network_connection", False) + @pyqtProperty(bool, constant = True) + def supportsMaterialExport(self): + """ + Whether the printer supports Cura's export format of material profiles. + :return: ``True`` if it supports it, or ``False`` if not. + """ + return self.getMetaDataEntry("supports_material_export", False) + @classmethod def getLoadingPriority(cls) -> int: return 2 diff --git a/cura/Settings/MachineNameValidator.py b/cura/Settings/MachineNameValidator.py index c3ca4ed369..99a5c7da0a 100644 --- a/cura/Settings/MachineNameValidator.py +++ b/cura/Settings/MachineNameValidator.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import pyqtSlot, pyqtProperty, QObject, pyqtSignal, QRegExp @@ -23,7 +23,7 @@ class MachineNameValidator(QObject): #Compute the validation regex for printer names. This is limited by the maximum file name length. try: filename_max_length = os.statvfs(Resources.getDataStoragePath()).f_namemax - except AttributeError: #Doesn't support statvfs. Probably because it's not a Unix system. + except (AttributeError, EnvironmentError): # Doesn't support statvfs. Probably because it's not a Unix system. Or perhaps there is no permission or it doesn't exist. filename_max_length = 255 #Assume it's Windows on NTFS. machine_name_max_length = filename_max_length - len("_current_settings.") - len(ContainerRegistry.getMimeTypeForContainer(InstanceContainer).preferredSuffix) # Characters that urllib.parse.quote_plus escapes count for 12! So now diff --git a/cura/Snapshot.py b/cura/Snapshot.py index 6f12aa88ba..ca9c442fb5 100644 --- a/cura/Snapshot.py +++ b/cura/Snapshot.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import numpy @@ -25,8 +25,8 @@ class Snapshot: pixels = numpy.frombuffer(pixel_array, dtype=numpy.uint8).reshape([height, width, 4]) # Find indices of non zero pixels nonzero_pixels = numpy.nonzero(pixels) - min_y, min_x, min_a_ = numpy.amin(nonzero_pixels, axis=1) - max_y, max_x, max_a_ = numpy.amax(nonzero_pixels, axis=1) + min_y, min_x, min_a_ = numpy.amin(nonzero_pixels, axis=1) # type: ignore + max_y, max_x, max_a_ = numpy.amax(nonzero_pixels, axis=1) # type: ignore return min_x, max_x, min_y, max_y @@ -42,8 +42,8 @@ class Snapshot: """ scene = Application.getInstance().getController().getScene() - active_camera = scene.getActiveCamera() - render_width, render_height = active_camera.getWindowSize() + active_camera = scene.getActiveCamera() or scene.findCamera("3d") + render_width, render_height = (width, height) if active_camera is None else active_camera.getWindowSize() render_width = int(render_width) render_height = int(render_height) preview_pass = PreviewPass(render_width, render_height) diff --git a/cura/UI/ObjectsModel.py b/cura/UI/ObjectsModel.py index 02d4096278..0c109d7a4a 100644 --- a/cura/UI/ObjectsModel.py +++ b/cura/UI/ObjectsModel.py @@ -132,9 +132,26 @@ class ObjectsModel(ListModel): is_group = bool(node.callDecoration("isGroup")) + name_handled_as_group = False force_rename = False - if not is_group: - # Handle names for individual nodes + if is_group: + # Handle names for grouped nodes + original_name = self._group_name_prefix + + current_name = node.getName() + if current_name.startswith(self._group_name_prefix): + # This group has a standard group name, but we may need to renumber it + name_index = int(current_name.split("#")[-1]) + name_handled_as_group = True + elif not current_name: + # Force rename this group because this node has not been named as a group yet, probably because + # it's a newly created group. + name_index = 0 + force_rename = True + name_handled_as_group = True + + if not is_group or not name_handled_as_group: + # Handle names for individual nodes or groups that already have a non-group name name = node.getName() name_match = self._naming_regex.fullmatch(name) @@ -144,18 +161,6 @@ class ObjectsModel(ListModel): else: original_name = name_match.groups()[0] name_index = int(name_match.groups()[1]) - else: - # Handle names for grouped nodes - original_name = self._group_name_prefix - - current_name = node.getName() - if current_name.startswith(self._group_name_prefix): - name_index = int(current_name.split("#")[-1]) - else: - # Force rename this group because this node has not been named as a group yet, probably because - # it's a newly created group. - name_index = 0 - force_rename = True if original_name not in name_to_node_info_dict: # Keep track of 2 things: diff --git a/cura/UI/PrintInformation.py b/cura/UI/PrintInformation.py index 22710165b3..d6bd336558 100644 --- a/cura/UI/PrintInformation.py +++ b/cura/UI/PrintInformation.py @@ -4,7 +4,6 @@ import json import math import os -import unicodedata from typing import Dict, List, Optional, TYPE_CHECKING from PyQt5.QtCore import QObject, pyqtSignal, pyqtProperty, pyqtSlot, QTimer @@ -301,10 +300,11 @@ class PrintInformation(QObject): if self._base_name == "": self._job_name = self.UNTITLED_JOB_NAME self._is_user_specified_job_name = False + self._application.getController().getScene().clearMetaData() self.jobNameChanged.emit() return - base_name = self._stripAccents(self._base_name) + base_name = self._base_name self._defineAbbreviatedMachineName() # Only update the job name when it's not user-specified. @@ -400,11 +400,6 @@ class PrintInformation(QObject): self._abbr_machine = self._application.getMachineManager().getAbbreviatedMachineName(active_machine_type_name) - def _stripAccents(self, to_strip: str) -> str: - """Utility method that strips accents from characters (eg: â -> a)""" - - return ''.join(char for char in unicodedata.normalize('NFD', to_strip) if unicodedata.category(char) != 'Mn') - @pyqtSlot(result = "QVariantMap") def getFeaturePrintTimes(self) -> Dict[str, Duration]: result = {} diff --git a/cura/UI/TextManager.py b/cura/UI/TextManager.py index dbe7940f26..e45689936b 100644 --- a/cura/UI/TextManager.py +++ b/cura/UI/TextManager.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import collections @@ -6,9 +6,11 @@ from typing import Optional, Dict, List, cast from PyQt5.QtCore import QObject, pyqtSlot +from UM.i18n import i18nCatalog from UM.Resources import Resources from UM.Version import Version +catalog = i18nCatalog("cura") # # This manager provides means to load texts to QML. @@ -30,30 +32,33 @@ class TextManager(QObject): # Load change log texts and organize them with a dict try: file_path = Resources.getPath(Resources.Texts, "change_log.txt") - except FileNotFoundError: + except FileNotFoundError as e: # I have no idea how / when this happens, but we're getting crash reports about it. - return "" + return catalog.i18nc("@text:window", "The release notes could not be opened.") + "
" + str(e) change_logs_dict = {} # type: Dict[Version, Dict[str, List[str]]] - with open(file_path, "r", encoding = "utf-8") as f: - open_version = None # type: Optional[Version] - open_header = "" # Initialise to an empty header in case there is no "*" in the first line of the changelog - for line in f: - line = line.replace("\n", "") - if "[" in line and "]" in line: - line = line.replace("[", "") - line = line.replace("]", "") - open_version = Version(line) - if open_version > Version([14, 99, 99]): # Bit of a hack: We released the 15.x.x versions before 2.x - open_version = Version([0, open_version.getMinor(), open_version.getRevision(), open_version.getPostfixVersion()]) - open_header = "" - change_logs_dict[open_version] = collections.OrderedDict() - elif line.startswith("*"): - open_header = line.replace("*", "") - change_logs_dict[cast(Version, open_version)][open_header] = [] - elif line != "": - if open_header not in change_logs_dict[cast(Version, open_version)]: + try: + with open(file_path, "r", encoding = "utf-8") as f: + open_version = None # type: Optional[Version] + open_header = "" # Initialise to an empty header in case there is no "*" in the first line of the changelog + for line in f: + line = line.replace("\n", "") + if "[" in line and "]" in line: + line = line.replace("[", "") + line = line.replace("]", "") + open_version = Version(line) + if open_version > Version([14, 99, 99]): # Bit of a hack: We released the 15.x.x versions before 2.x + open_version = Version([0, open_version.getMinor(), open_version.getRevision(), open_version.getPostfixVersion()]) + open_header = "" + change_logs_dict[open_version] = collections.OrderedDict() + elif line.startswith("*"): + open_header = line.replace("*", "") change_logs_dict[cast(Version, open_version)][open_header] = [] - change_logs_dict[cast(Version, open_version)][open_header].append(line) + elif line != "": + if open_header not in change_logs_dict[cast(Version, open_version)]: + change_logs_dict[cast(Version, open_version)][open_header] = [] + change_logs_dict[cast(Version, open_version)][open_header].append(line) + except EnvironmentError as e: + return catalog.i18nc("@text:window", "The release notes could not be opened.") + "
" + str(e) # Format changelog text content = "" diff --git a/cura/UI/WelcomePagesModel.py b/cura/UI/WelcomePagesModel.py index b816833d67..3c2d0503ab 100644 --- a/cura/UI/WelcomePagesModel.py +++ b/cura/UI/WelcomePagesModel.py @@ -239,9 +239,6 @@ class WelcomePagesModel(ListModel): {"id": "user_agreement", "page_url": self._getBuiltinWelcomePagePath("UserAgreementContent.qml"), }, - {"id": "whats_new", - "page_url": self._getBuiltinWelcomePagePath("WhatsNewContent.qml"), - }, {"id": "data_collections", "page_url": self._getBuiltinWelcomePagePath("DataCollectionsContent.qml"), }, @@ -259,13 +256,21 @@ class WelcomePagesModel(ListModel): }, {"id": "add_cloud_printers", "page_url": self._getBuiltinWelcomePagePath("AddCloudPrintersView.qml"), - "is_final_page": True, # If we end up in this page, the next button will close the dialog - "next_page_button_text": self._catalog.i18nc("@action:button", "Finish"), + "next_page_button_text": self._catalog.i18nc("@action:button", "Next"), + "next_page_id": "whats_new", }, {"id": "machine_actions", "page_url": self._getBuiltinWelcomePagePath("FirstStartMachineActionsContent.qml"), "should_show_function": self.shouldShowMachineActions, }, + {"id": "whats_new", + "page_url": self._getBuiltinWelcomePagePath("WhatsNewContent.qml"), + "next_page_button_text": self._catalog.i18nc("@action:button", "Skip"), + }, + {"id": "changelog", + "page_url": self._getBuiltinWelcomePagePath("ChangelogContent.qml"), + "next_page_button_text": self._catalog.i18nc("@action:button", "Finish"), + }, ] pages_to_show = all_pages_list diff --git a/cura/UI/WhatsNewPagesModel.py b/cura/UI/WhatsNewPagesModel.py index 5b968ae574..11320a0ebb 100644 --- a/cura/UI/WhatsNewPagesModel.py +++ b/cura/UI/WhatsNewPagesModel.py @@ -1,8 +1,12 @@ -# Copyright (c) 2019 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. - from .WelcomePagesModel import WelcomePagesModel +import os +from typing import Optional, Dict, List, Tuple +from PyQt5.QtCore import pyqtProperty, pyqtSlot +from UM.Logger import Logger +from UM.Resources import Resources # # This Qt ListModel is more or less the same the WelcomePagesModel, except that this model is only for showing the @@ -10,13 +14,84 @@ from .WelcomePagesModel import WelcomePagesModel # class WhatsNewPagesModel(WelcomePagesModel): + image_formats = [".png", ".jpg", ".jpeg", ".gif", ".svg"] + text_formats = [".txt", ".htm", ".html"] + image_key = "image" + text_key = "text" + + @staticmethod + def _collectOrdinalFiles(resource_type: int, include: List[str]) -> Tuple[Dict[int, str], int]: + result = {} #type: Dict[int, str] + highest = -1 + try: + folder_path = Resources.getPath(resource_type, "whats_new") + for _, _, files in os.walk(folder_path): + for filename in files: + basename = os.path.basename(filename) + base, ext = os.path.splitext(basename) + if ext.lower() not in include or not base.isdigit(): + continue + page_no = int(base) + highest = max(highest, page_no) + result[page_no] = os.path.join(folder_path, filename) + except FileNotFoundError: + Logger.logException("w", "Could not find 'whats_new' folder for resource-type {0}".format(resource_type)) + return result, highest + + @staticmethod + def _loadText(filename: str) -> str: + result = "" + try: + with open(filename, "r", encoding="utf-8") as file: + result = file.read() + except OSError: + Logger.logException("w", "Could not open {0}".format(filename)) + return result + def initialize(self) -> None: self._pages = [] self._pages.append({"id": "whats_new", "page_url": self._getBuiltinWelcomePagePath("WhatsNewContent.qml"), + "next_page_button_text": self._catalog.i18nc("@action:button", "Skip"), + "next_page_id": "changelog" + }) + self._pages.append({"id": "changelog", + "page_url": self._getBuiltinWelcomePagePath("ChangelogContent.qml"), "next_page_button_text": self._catalog.i18nc("@action:button", "Close"), }) self.setItems(self._pages) + images, max_image = WhatsNewPagesModel._collectOrdinalFiles(Resources.Images, WhatsNewPagesModel.image_formats) + texts, max_text = WhatsNewPagesModel._collectOrdinalFiles(Resources.Texts, WhatsNewPagesModel.text_formats) + highest = max(max_image, max_text) + + self._subpages = [] #type: List[Dict[str, Optional[str]]] + for n in range(0, highest + 1): + self._subpages.append({ + WhatsNewPagesModel.image_key: None if n not in images else images[n], + WhatsNewPagesModel.text_key: None if n not in texts else self._loadText(texts[n]) + }) + if len(self._subpages) == 0: + self._subpages.append({WhatsNewPagesModel.text_key: "~ There Is Nothing New Under The Sun ~"}) + + def _getSubpageItem(self, page: int, item: str) -> Optional[str]: + if 0 <= page < self.subpageCount and item in self._subpages[page]: + return self._subpages[page][item] + else: + return None + + @pyqtProperty(int, constant = True) + def subpageCount(self) -> int: + return len(self._subpages) + + @pyqtSlot(int, result = str) + def getSubpageImageSource(self, page: int) -> str: + result = self._getSubpageItem(page, WhatsNewPagesModel.image_key) + return "file:///" + (result if result else Resources.getPath(Resources.Images, "cura-icon.png")) + + @pyqtSlot(int, result = str) + def getSubpageText(self, page: int) -> str: + result = self._getSubpageItem(page, WhatsNewPagesModel.text_key) + return result if result else "* * *" __all__ = ["WhatsNewPagesModel"] diff --git a/cura_app.py b/cura_app.py index cc8a1d575c..57692ec0ae 100755 --- a/cura_app.py +++ b/cura_app.py @@ -16,14 +16,6 @@ import argparse import faulthandler import os -# Workaround for a race condition on certain systems where there -# is a race condition between Arcus and PyQt. Importing Arcus -# first seems to prevent Sip from going into a state where it -# tries to create PyQt objects on a non-main thread. -import Arcus # @UnusedImport -import Savitar # @UnusedImport -import pynest2d # @UnusedImport - from PyQt5.QtNetwork import QSslConfiguration, QSslSocket from UM.Platform import Platform @@ -226,6 +218,12 @@ if Platform.isLinux() and getattr(sys, "frozen", False): import trimesh.exchange.load os.environ["LD_LIBRARY_PATH"] = old_env +# WORKAROUND: Cura#5488 +# When using the KDE qqc2-desktop-style, the UI layout is completely broken, and +# even worse, it crashes when switching to the "Preview" pane. +if Platform.isLinux(): + os.environ["QT_QUICK_CONTROLS_STYLE"] = "default" + if ApplicationMetadata.CuraDebugMode: ssl_conf = QSslConfiguration.defaultConfiguration() ssl_conf.setPeerVerifyMode(QSslSocket.VerifyNone) diff --git a/docker/build.sh b/docker/build.sh index be1c5f9be3..990d28d2e8 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -7,7 +7,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" PROJECT_DIR="$( cd "${SCRIPT_DIR}/.." && pwd )" # Make sure that environment variables are set properly -source /opt/rh/devtoolset-7/enable +source /opt/rh/devtoolset-8/enable export PATH="${CURA_BUILD_ENV_PATH}/bin:${PATH}" export PKG_CONFIG_PATH="${CURA_BUILD_ENV_PATH}/lib/pkgconfig:${PKG_CONFIG_PATH}" diff --git a/docs/How_to_use_the_flame_graph_profiler.md b/docs/How_to_use_the_flame_graph_profiler.md index b1cdaf358e..b40a86bb24 100644 --- a/docs/How_to_use_the_flame_graph_profiler.md +++ b/docs/How_to_use_the_flame_graph_profiler.md @@ -27,7 +27,7 @@ Note: The profiler front-end itself is quite "heavy" (ok, not optimised). It run What the Profiler Sees ---------------------- -The profiler doesn't capture every function call in Cura. It hooks into a number of important systems which give a good picture of activity without too much run time overhead. The most important system is Uranium's signal mechanism and PyQt5 slots. Functions which are called via the signal mechanism are recorded and thier names appear in the results. PyQt5 slots appear in the results with the prefix `[SLOT]`. +The profiler doesn't capture every function call in Cura. It hooks into a number of important systems which give a good picture of activity without too much run time overhead. The most important system is Uranium's signal mechanism and PyQt5 slots. Functions which are called via the signal mechanism are recorded and their names appear in the results. PyQt5 slots appear in the results with the prefix `[SLOT]`. Note that not all slots are captured. Only those slots which belong to classes which use the `pyqtSlot` decorator from the `UM.FlameProfiler` module. diff --git a/docs/scene/images/components_interacting_with_scene.jpg b/docs/scene/images/components_interacting_with_scene.jpg new file mode 100644 index 0000000000..34e34e25af Binary files /dev/null and b/docs/scene/images/components_interacting_with_scene.jpg differ diff --git a/docs/scene/images/components_interacting_with_scene.png b/docs/scene/images/components_interacting_with_scene.png new file mode 100644 index 0000000000..a01a138811 Binary files /dev/null and b/docs/scene/images/components_interacting_with_scene.png differ diff --git a/docs/scene/images/layer_data_scene_node.jpg b/docs/scene/images/layer_data_scene_node.jpg new file mode 100644 index 0000000000..313b409ddf Binary files /dev/null and b/docs/scene/images/layer_data_scene_node.jpg differ diff --git a/docs/scene/images/mirror_tool.jpg b/docs/scene/images/mirror_tool.jpg new file mode 100644 index 0000000000..e3d485008e Binary files /dev/null and b/docs/scene/images/mirror_tool.jpg differ diff --git a/docs/scene/images/per_objectsettings_tool.jpg b/docs/scene/images/per_objectsettings_tool.jpg new file mode 100644 index 0000000000..0634177d4b Binary files /dev/null and b/docs/scene/images/per_objectsettings_tool.jpg differ diff --git a/docs/scene/images/rotate_tool.jpg b/docs/scene/images/rotate_tool.jpg new file mode 100644 index 0000000000..4e10569678 Binary files /dev/null and b/docs/scene/images/rotate_tool.jpg differ diff --git a/docs/scene/images/scale_tool.jpg b/docs/scene/images/scale_tool.jpg new file mode 100644 index 0000000000..c413aa0caf Binary files /dev/null and b/docs/scene/images/scale_tool.jpg differ diff --git a/docs/scene/images/scene_example.jpg b/docs/scene/images/scene_example.jpg new file mode 100644 index 0000000000..5e787c4420 Binary files /dev/null and b/docs/scene/images/scene_example.jpg differ diff --git a/docs/scene/images/scene_example_scene_graph.jpg b/docs/scene/images/scene_example_scene_graph.jpg new file mode 100644 index 0000000000..da8c10169d Binary files /dev/null and b/docs/scene/images/scene_example_scene_graph.jpg differ diff --git a/docs/scene/images/selection_tool.jpg b/docs/scene/images/selection_tool.jpg new file mode 100644 index 0000000000..c9058de526 Binary files /dev/null and b/docs/scene/images/selection_tool.jpg differ diff --git a/docs/scene/images/support_blocker_tool.jpg b/docs/scene/images/support_blocker_tool.jpg new file mode 100644 index 0000000000..bdc4b118c2 Binary files /dev/null and b/docs/scene/images/support_blocker_tool.jpg differ diff --git a/docs/scene/images/tools_tool-handles_class_diagram.jpg b/docs/scene/images/tools_tool-handles_class_diagram.jpg new file mode 100644 index 0000000000..cd58fad066 Binary files /dev/null and b/docs/scene/images/tools_tool-handles_class_diagram.jpg differ diff --git a/docs/scene/images/translate_tool.jpg b/docs/scene/images/translate_tool.jpg new file mode 100644 index 0000000000..80886a7f17 Binary files /dev/null and b/docs/scene/images/translate_tool.jpg differ diff --git a/docs/scene/operations.md b/docs/scene/operations.md new file mode 100644 index 0000000000..fe625514be --- /dev/null +++ b/docs/scene/operations.md @@ -0,0 +1,113 @@ +# Operations and the OperationStack + +Cura supports an operation stack. The `OperationStack` class maintains a history of the operations performed in Cura, which allows for undo and redo actions. Every operation registers itself in the stack. The OperationStuck supports the following functions: + + * `push(operation)`: Pushes an operation in the stack and applies the operation. This function is called when an operation pushes itself in the stack. + * `undo()`: Reverses the actions performed by the last operation and reduces the current index of the stack. + * `redo()`: Applies the actions performed by the next operation in the stack and increments the current index of the stack. + * `getOperations()`: Returns a list of all the operations that are currently inside the OperationStack + * `canUndo()`: Indicates whether the index of the operation stack has reached the bottom of the stack, which means that there are no more operations to be undone. + * `canRedo()`: Indicates whether the index of the operation stack has reached the top of the stack, which means that there are no more operations to be redone. + +**Note 1:** When consecutive operations are performed very quickly after each other, they are merged together at the top of the stack. This action ensures that these minor operation will be undone with one Undo keystroke (e.g. when moving the object around and you press and release the left mouse button really fast, it is considered as one move operation). + +**Note 2:** When an operation is pushed in the middle of the stack, all operations above it are removed from the stack. This ensures that there won't be any "history branches" created. + +### Operations + +Every action that happens in the scene and affects one or multiple models is associated with a subclass of the `Operation` class and is it added to the `OperationStack`. The subclassed operations that can be found in Cura (excluding the ones from downloadable plugins) are the following: + + * [GroupedOperation](#groupedoperation) + * [AddSceneNodeOperation](#addscenenodeoperation) + * [RemoveSceneNodeOperation](#removescenenodeoperation) + * [SetParentOperation](#setparentoperation) + * [SetTransformOperation](#settransformoperation) + * [SetObjectExtruderOperation](#setobjectextruderoperation) + * [GravityOperation](#gravityoperation) + * [PlatformPhysicsOperation](#platformphysicsoperation) + * [TranslateOperation](#translateoperation) + * [ScaleOperation](#scaleoperation) + * [RotateOperation](#rotateoperation) + * [MirrorOperation](#mirroroperation) + * [LayFlatOperation](#layflatoperation) + * [SetBuildPlateNumberOperation]() + +### GroupedOperation + +The `GroupedOperation` is an operation that groups several other operations together. The intent of this operation is to hide an underlying chain of operations from the user if they correspond to only one interaction with the user, such as an operation applied to multiple scene nodes or a re-arrangement of multiple items in the scene. + +Once a `GroupedOperation` is pushed into the stack, it applies all of its children operations in one go. Similarly, when it is undone, it reverses all its children operations at once. + + +### AddSceneNodeOperation + +The `AddSceneNodeOperation` is added to the stack whenever a mesh is loaded inside the `Scene`, either by a `FileReader` or by inserting a [Support Blocker](tools.md#supporteraser-tool) in an object. + +### RemoveSceneNodeOperation + +The `RemoveSceneNodeOperation` is added to the stack whenever a mesh is removed from the Scene by the user or when the user requests to clear the build plate (_Ctrl+D_). + +### SetParentOperation + +The `SetParentOperation` changes the parent of a node. It is primarily used when grouping (the group node is set as the nodes' parent) and ungrouping (the group's children's parent is set to the group's parent before the group node is deleted), or when a SupportEraser node is added to the scene (to set the selected object as the Eraser's parent). + +### SetTransformOperation + +The `SetTransformOperation` translates, rotates, and scales a node all at once. This operation accepts a transformation matrix, an orientation matrix, and a scale matrix, and it is used by the _"Reset All Model Positions"_ and _"Reset All Model Transformations"_ options in the right-click (context) menu. + +### SetObjectExtruderOperation + +This operation is used to set the extruder with which a certain object should be printed with. It adds a [SettingOverrideDecorator](scene.md#settingoverridedecorator) to the object (if it doesn't have any) and then sets the extruder number via the decoration function `node.callDecoration("setActiveExtruder", extruder_id)`. + +### GravityOperation + +The `GravityOperation` moves a scene node down to 0 on the y-axis. It is currently used by the _"Lay flat"_ and _"Select face to align to the build plate"_ actions of the `RotationTool` to ensure that the object will end up touching the build plate after the corresponding rotation operations have be done. + +### PlatformPhysicsOperation + +The `PlatformPhysicsOperation` is generated by the `PlatformPhysics` class and it is associated with the preferences _"Ensure models are kept apart"_ and _"Automatically drop models to the build plate"_. If any of these preferences is set to true, the `PlatformPhysics` class periodically checks to make sure that the two conditions are met and if not, it calculates the move vector for each of the nodes that will satisfy the conditions. + +Once the move vectors have been computed, they are applied to the nodes through consecutive `PlatformPhysicsOperations`, whose job is to use the `translate` function on the nodes. + +**Note:** When there are multiple nodes, multiple `PlatformPhysicsOperations` may be generated (all models may be moved to ensure they are kept apart). These operations eventually get merged together by the `OperationStack` due to the fact that the individual operations are applied very fast one after the other. + +### TranslateOperation + +The `TranslateOperation` applies a linear transformation on a node, moving the node in the scene. This operation is primarily linked to the [TranslateTool](tools.md#translatetool) but it is also used in other places around Cura, such as arranging objects on the build plate (Ctrl+R) and centering an object to the build plate (via the right-click context menu's _"Center Selected Model"_ option). + +When an object is moved using the move tool handles, multiple translate operations are generated to make sure that the object is rendered properly while it is moved. These translate operations are merged together once the user releases the tool handle. + +**Note:** Some functionalities may move (translate) nodes without generating a TranslateOperation (such as when a model with is imported from a 3mf into a certain position). This ensures that the moving of the object cannot be accidentally undone by the user. + +### ScaleOperation + +The `ScaleOperation` scales the selected scene node uniformly or non-uniformly. This operation is primarily generated by the [ScaleTool](tools.md#scaletool). + +When an object is scaled using the scale tool handles, multiple scale operations are generated to make sure that the object is rendered properly while it is being resized. These scale operations are merged together once the user releases the tool handle. + +**Note:** When the _"Scale extremely small models"_ or the _"Scale large models"_ preferences are enabled the model is scaled when it is inserted into the build plate but it **DOES NOT** generate a `ScaleOperation`. This ensures that Cura doesn't register the scaling as an action that can be undone and the user doesn't accidentally end up with a very big or very small model. + + +### RotateOperation + +The `RotateOperation` rotates the selected scene node(s) according to a given rotation quaternion and, optionally, around a given point. This operation is primarily generated by the [RotationTool](tools.md#rotatetool). It is also used by the arrange algorithm, which may rotate some models to fit them in the build plate. + +When an object is rotated using the rotate tool handles, multiple rotate operations are generated to make sure that the object is rendered properly while it is being rotated. These operations are merged together once the user releases the tool handle. + +### MirrorOperation + +The `MirrorOperation` mirrors the selected object. It is primarily associated with the [MirrorTool](tools.md#mirrortool) and allows for mirroring the object in a certain direction, using the `MirrorToolHandles`. + +The `MirrorOperation` accepts a transformation matrix that should only define values on the diagonal of the matrix, and only the values 1 or -1. It allows for mirroring around the center of the object or around the axis origin. The latter isn't used that often. + +### LayFlatOperation + +The `LayFlatOperation` computes some orientation to hopefully lay the object flat on the build plate. It is generated by the `layFlat()` function of the [RotateTool](tools.md#rotatetool). Contrary to the other operations, the `LayFlatOperation` is computed in a separate thread through the `LayFlatJob` since it can be quite computationally expensive. + + +### SetBuildPlateNumberOperation + +The `SetBuildPlateNumberOperation` is linked to a legacy feature which allowed the user to have multiple build plates open in Cura at the same time. With this operation it was possible to transfer a node to another build plate through the node's [BuildPlateDecorator](scene.md#buildplatedecorator) by calling the decoration `node.callDecoration("setBuildPlateNumber", new_build_plate_nr)`. + +**Note:** Changing the active build plate is a disabled feature in Cura and it is intended to be completely removed (internal ticket: CURA-4975), along with the `SetBuildPlateNumberOperation`. + diff --git a/docs/scene/scene.md b/docs/scene/scene.md index 5539df4a67..265554264c 100644 --- a/docs/scene/scene.md +++ b/docs/scene/scene.md @@ -8,19 +8,209 @@ Cura's scene graph is a mere tree data structure. This tree contains all scene n The main idea behind the scene tree is that each scene node has a transformation applied to it. The scene nodes can be nested beneath other scene nodes. The transformation of the parents is then also applied to the children. This way you can have scene nodes grouped together and transform the group as a whole. Since the transformations are all linear, this ensures that the elements of this group stay in the same relative position and orientation. It will look as if the whole group is a single object. This idea is very common for games where objects are often composed of multiple 3D models but need to move together as a whole. For Cura it is used to group objects together and to transform the collision area correctly. +Class Diagram +---- + +The following class diagram depicts the classes that interact with the Scene + +![alt text](images/components_interacting_with_scene.jpg) + +The scene lives in the Controller of the Application, and it is primarily interacting with SceneNode objects, which are the components of the Scene Graph. + + A Typical Scene ---- -Cura's scene has a few nodes that are always present, and a few nodes that are repeated for every object that the user loads onto their build plate. To give an idea of how a scene normally looks, this is an overview of a typical scene tree for Cura. +Cura's scene has a few nodes that are always present, and a few nodes that are repeated for every object that the user loads onto their build plate. The root of the scene graph is a SceneNode that lives inside the Scene and contains all the other children SceneNodes of the scene. Typically, inside the root you can find the SceneNodes that are always loaded (the Cameras, the [BuildVolume](build_volume.md), and the Platform), the objects that are loaded on the platform, and finally a ConvexHullNode for each object and each group of objects in the Scene. -* Root - * Camera - * [Build volume](build_volume.md) - * Platform - * Object 1 - * Group 1 - * Object 2 - * Object 3 - * Object 1 convex hull node - * Object 2 convex hull node - * Object 3 convex hull node - * Group 1 convex hull node \ No newline at end of file +Let's take the following example Scene: + +![scene_example.png](images/scene_example.jpg) + +The scene graph in this case is the following: + + +![scene_example_scene_graph.png](images/scene_example_scene_graph.jpg) + +**Note 1:** The Platform is actually a child of the BuildVolume. + +**Note 2:** The ConvexHullNodes are not actually named after the object they decorate. Their names are used in the image to convey how the ConvexHullNodes are related to the objects in the scene. + +**Note 3:** The CuraSceneNode that holds the layer data (inside the BuildVolume) is created and destroyed according to the availability of sliced layer data provided by the CuraEngine. See the [LayerDataDecorator](#layerdatadecorator) for more information. + +Accessing SceneNodes in the Scene +---- + +SceneNodes can be accessed using a `BreadthFirstIterator` or a `DepthFirstIterator`. Each iterator traverses the scene graph and returns a Python iterator, which yields all the SceneNodes and their children. + +``` python +for node in BreadthFirstIterator(scene.getRoot()): + # do stuff with the node +``` + +Example result when iterating the above scene graph: + +```python +[i for i in BreadthFirstIterator(CuraApplication.getInstance().getController().getScene().getRoot()] +``` + * 00 = {SceneNode} + * 01 = {BuildVolume} + * 02 = {Camera} + * 03 = {CuraSceneNode} + * 04 = {CuraSceneNode} + * 05 = {Camera} + * 06 = {CuraSceneNode} + * 07 = {ConvexHullNode} + * 08 = {ConvexHullNode} + * 09 = {ConvexHullNode} + * 10 = {ConvexHullNode} + * 11 = {ConvexHullNode} + * 12 = {ConvexHullNode} + * 13 = {ConvexHullNode} + * 14 = {Platform} + * 15 = {CuraSceneNode} + * 16 = {CuraSceneNode} + * 17 = {CuraSceneNode} + * 18 = {CuraSceneNode} + +SceneNodeDecorators +---- + +SceneNodeDecorators are decorators that can be added to the nodes of the scene to provide them with additional functions. + +Cura provides the following classes derived from the SceneNodeDecorator class: + 1. [GroupDecorator](#groupdecorator) + 2. [ConvexHullDecorator](#convexhulldecorator) + 3. [SettingOverrideDecorator](#settingoverridedecorator) + 4. [SliceableObjectDecorator](#sliceableobjectdecorator) + 5. [LayerDataDecorator](#layerdatadecorator) + 6. [ZOffsetDecorator](#zoffsetdecorator) + 7. [BlockSlicingDecorator](#blockslicingdecorator) + 8. [GCodeListDecorator](#gcodelistdecorator) + 9. [BuildPlateDecorator](#buildplatedecorator) + +GroupDecorator +---- + +Whenever objects on the build plate are grouped together, a new node is added in the scene as the parent of the grouped objects. Group nodes can be identified when traversing the SceneGraph by running the following: + +```python +node.callDecoration("isGroup") == True +``` + +Group nodes decorated by GroupDecorators are added in the scene either by reading project files which contain grouped objects, or when the user selects multiple objects and groups them together (Ctrl + G). + +Group nodes that are left with only one child are removed from the scene, making their only child a child of the group's parent. In addition, group nodes without any remaining children are removed from the scene. + +ConvexHullDecorator +---- + +As seen in the scene graph of the scene example, each CuraSceneNode that represents an object on the build plate is linked to a ConvexHullNode which is rendered as the object's shadow on the build plate. The ConvexHullDecorator is the link between these two nodes. + +In essence, the CuraSceneNode has a ConvexHullDecorator which points to the ConvexHullNode of the object. The data of the object's convex hull can be accessed via + +```python +convex_hull_polygon = object_node.callDecoration("getConvexHull") +``` + +The ConvexHullDecorator also provides convex hulls that include the head, the fans, and the adhesion of the object. These are primarily used and rendered when One-at-a-time mode is activated. + +For more information on the functions added to the node by this decorator, visit the [ConvexHullDecorator.py](https://github.com/Ultimaker/Cura/blob/master/cura/Scene/ConvexHullDecorator.py). + +SettingOverrideDecorator +---- + +SettingOverrideDecorators are primarily used for modifier meshes such as support meshes, cutting meshes, infill meshes, and anti-overhang meshes. When a user converts an object to a modifier mesh, the object's node is decorated by a SettingOverrideDecorator. This decorator adds a PerObjectContainerStack to the CuraSceneNode, which allows the user to modify the settings of the specific model. + +For more information on the functions added to the node by this decorator, visit the [SettingOverrideDecorator.py](https://github.com/Ultimaker/Cura/blob/master/cura/Settings/SettingOverrideDecorator.py). + + +SliceableObjectDecorator +---- + +This is a convenience decorator that allows us to easily identify the nodes which can be sliced. All **individual** objects (meshes) added to the build plate receive this decorator, apart from the nodes loaded from GCode files (.gcode, .g, .gz, .ufp). + +The SceneNodes that do not receive this decorator are: + + - Cameras + - BuildVolume + - Platform + - ConvexHullNodes + - CuraSceneNodes that serve as group nodes (these have a GroupDecorator instead) + - The CuraSceneNode that serves as the layer data node + - ToolHandles + - NozzleNode + - Nodes that contain GCode data. See the [BlockSlicingDecorator](#blockslicingdecorator) for more information on that. + +This decorator provides the following function to the node: + +```python +node.callDecoration("isSliceable") +``` + +LayerDataDecorator +---- + +Once the Slicing has completed and the CuraEngine has returned the slicing data, Cura creates a CuraSceneNode inside the BuildVolume which is decorated by a LayerDataDecorator. This decorator holds the layer data of the scene. + +![Layer Data Scene Node](images/layer_data_scene_node.jpg) + +The layer data can be accessed through the function given to the aforementioned CuraSceneNode by the LayerDataDecorator: + +```python +node.callDecoration("getLayerData") +``` + +This CuraSceneNode is created once Cura has completed processing the Layer data (after the user clicks on the Preview tab after slicing). The CuraSceneNode then is destroyed once any action that changes the Scene occurs (e.g. if the user moves/rotates/scales an object or changes a setting value), indicating that the layer data is no longer available. When that happens, the "Slice" button becomes available again. + +ZOffsetDecorator +---- + +The ZOffsetDecorator is added to an object in the scene when that object is moved below the build plate. It is primarily used when the "Automatically drop models to the build plate" preference is enabled, in order to make sure that the GravityOperation, which drops the mode on the build plate, is not applied when the object is moved under the build plate. + +The amount the object is moved under the build plate can be retrieved by calling the "getZOffset" decoration on the node: + +```python +z_offset = node.callDecoration("getZOffset") +``` + +The ZOffsetDecorator is removed from the node when the node is move above the build plate. + +BlockSlicingDecorator +---- + +The BlockSlicingDecorator is the opposite of the SliceableObjectDecorator. It is added on objects loaded on the scene which should not be sliced. This decorator is primarily added on objects loaded from ".gcode", ".ufp", ".g", and ".gz" files. Such an object already contains all the slice information and therefore should not allow Cura to slice it. + +If an object with a BlockSlicingDecorator appears in the scene, the backend (CuraEngine) and the print setup (changing print settings) become disabled, considering that G-code files cannot be modified. + +The BlockSlicingDecorator adds the following decoration function to the node: + +```python +node.callDecoration("isBlockSlicing") +``` + +GCodeListDecorator +---- + +The GCodeListDecorator is also added only when a file containing GCode is loaded in the scene. It's purpose is to hold a list of all the GCode data of the loaded object. +The GCode list data is stored in the scene's gcode_dict attribute which then is used in other places in the Cura code, e.g. to provide the GCode to the GCodeWriter or to the PostProcessingPlugin. + +The GCode data becomes available by calling the "getGCodeList" decoration of the node: + +```python +gcode_list = node.callDecoration("getGCodeList") +``` + +The CuraSceneNode with the GCodeListDecorator is destroyed when another object or project file is loaded in the Scene. + +BuildPlateDecorator +---- + +The BuildPlateDecorator is added to all the CuraSceneNodes. This decorator is linked to a legacy feature which allowed the user to have multiple build plates open in Cura at the same time. With this decorator it was possible to determine which nodes are present on each build plate, and therefore, which objects should be visible in the currently active build plate. It indicates the number of the build plate this scene node belongs to, which currently is always the build plate -1. + +This decorator provides a function to the node that returns the number of the build plate it belongs to: + +```python +node.callDecoration("getBuildPlateNumber") +``` + +**Note:** Changing the active build plate is a disabled feature in Cura and it is intended to be completely removed (internal ticket: CURA-4975). diff --git a/docs/scene/tools.md b/docs/scene/tools.md new file mode 100644 index 0000000000..0418bf4a97 --- /dev/null +++ b/docs/scene/tools.md @@ -0,0 +1,86 @@ +# Tools + +Tools are plugin objects which are used to manipulate or interact with the scene and the objects (node) in the scene. + +![Class diagram of tools in the scene](images/tools_tool-handles_class_diagram.jpg) + +Tools live inside the Controller of the Application and may be associated with ToolHandles. Some of them interact with the scene as a whole (such as the Camera), while others interact with the objects (nodes) in the Scene (selection tool, rotate tool, scale tool etc.). The tools that are available in Cura (excluding the ones provided by downloadable plugins) are the following: + + * [CameraTool](#cameratool) + * [SelectionTool](#selectiontool) + * [TranslateTool](#translatetool) + * [ScaleTool](#scaletool) + * [RotateTool](#rotatetool) + * [MirrorTool](#mirrortool) + * [PerObjectSettingsTool](#perobjectsettingstool) + * [SupportEraserTool](#supporteraser) + +***** + +### CameraTool + +The CameraTool is the tool that allows the user to manipulate the Camera. It provides the functions of moving, zooming, and rotating the Camera. This tool does not contain a handle. + +### SelectionTool +This tool allows the user to select objects and groups of objects in the scene. The selected objects gain a blue outline and become available in the code through the Selection class. + +![Selection Tool](images/selection_tool.jpg) + +This tool does not contain a handle. + +### TranslateTool + +This tool allows the user to move the object around the build plate. The TranslateTool is activated once the user presses the Move icon in the tool sidebar or hits the shortcut (T) while an object is selected. + +![Translate Tool](images/translate_tool.jpg) + +The TranslateTool contains the TranslateToolHandle, which draws the arrow handles on the selected object(s). The TranslateTool generates TranslateOperations whenever the object is moved around the build plate. + + +### ScaleTool + +This tool allows the user to scale the selected object(s). The ScaleTool is activated once the user presses the Scale icon in the tool sidebar or hits the shortcut (S) while an object is selected. + +![Scale Tool](images/scale_tool.jpg) + +The ScaleTool contains the ScaleToolHandle, which draws the box handles on the selected object(s). The ScaleTool generates ScaleOperations whenever the object is scaled. + +### RotateTool + +This tool allows the user to rotate the selected object(s). The RotateTool is activated once the user presses the Rotate icon in the tool sidebar or hits the shortcut (R) while an object is selected. + +![Rotate Tool](images/rotate_tool.jpg) + +The RotateTool contains the RotateToolHandle, which draws the donuts (tori) and arrow handles on the selected object(s). The RotateTool generates RotateOperations whenever the object is rotated or if a face is selected to be laid flat on the build plate. It also contains the `layFlat()` action, which generates the [LayFlatOperation](operations.md#layflatoperation). + + +### MirrorTool + +This tool allows the user to mirror the selected object(s) in the required direction. The MirrorTool is activated once the user presses the Mirror icon in the tool sidebar or hits the shortcut (M) while an object is selected. + +![Mirror Tool](images/mirror_tool.jpg) + +The MirrorTool contains the MirrorToolHandle, which draws pyramid handles on the selected object(s). The MirrorTool generates MirrorOperations whenever the object is mirrored against an axis. + +### PerObjectSettingsTool + +This tool allows the user to change the mesh type of the object into one of the following: + + * Normal Model + * Print as support + * Modify settings for overlaps + - Infill mesh only + - Cutting mesh + * Don't support overlaps + +![Per object settings tool](images/per_objectsettings_tool.jpg) + +Contrary to other tools, this tool doesn't have any handles and it does not generate any operations. This means that once an object's type is changed it cannot be undone/redone using the OperationStack. This tool adds a [SettingOverrideDecorator](scene.md#settingoverridedecorator) on the object's node instead, which allows the user to change certain settings only for this mesh. + +### SupportEraser tool + +This tool allows the user to add support blockers on the selected model. The SupportEraserTool is activated once the user pressed the Support Blocker icon in the tool sidebar or hits the shortcut (E) while an object is selected. With this tool active, the user can add support blockers (cubes) on the object by clicking on various places on the selected mesh. + +![Support Eraser Tool](images/support_blocker_tool.jpg) + +The SupportEraser uses a GroupOperation to add a new CuraSceneNode (the eraser) in the scene and set the selected model as the parent of the eraser. This means that the addition of Erasers in the scene can be undone/redone. The SupportEraser does not have any tool handles. \ No newline at end of file diff --git a/plugins/3MFReader/ThreeMFReader.py b/plugins/3MFReader/ThreeMFReader.py index 2e3f5630c1..37ca1e98aa 100755 --- a/plugins/3MFReader/ThreeMFReader.py +++ b/plugins/3MFReader/ThreeMFReader.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import os.path @@ -51,6 +51,10 @@ class ThreeMFReader(MeshReader): self._root = None self._base_name = "" self._unit = None + self._empty_project = False + + def emptyFileHintSet(self) -> bool: + return self._empty_project def _createMatrixFromTransformationString(self, transformation: str) -> Matrix: if transformation == "": @@ -159,9 +163,9 @@ class ThreeMFReader(MeshReader): um_node.callDecoration("getStack").getTop().setDefinition(definition_id) setting_container = um_node.callDecoration("getStack").getTop() - + known_setting_keys = um_node.callDecoration("getStack").getAllKeys() for key in settings: - setting_value = settings[key] + setting_value = settings[key].value # Extruder_nr is a special case. if key == "extruder_nr": @@ -171,7 +175,10 @@ class ThreeMFReader(MeshReader): else: Logger.log("w", "Unable to find extruder in position %s", setting_value) continue - setting_container.setProperty(key, "value", setting_value) + if key in known_setting_keys: + setting_container.setProperty(key, "value", setting_value) + else: + um_node.metadata[key] = settings[key] if len(um_node.getChildren()) > 0 and um_node.getMeshData() is None: if len(um_node.getAllChildren()) == 1: @@ -193,6 +200,7 @@ class ThreeMFReader(MeshReader): return um_node def _read(self, file_name: str) -> Union[SceneNode, List[SceneNode]]: + self._empty_project = False result = [] # The base object of 3mf is a zipped archive. try: @@ -201,6 +209,10 @@ class ThreeMFReader(MeshReader): parser = Savitar.ThreeMFParser() scene_3mf = parser.parse(archive.open("3D/3dmodel.model").read()) self._unit = scene_3mf.getUnit() + + for key, value in scene_3mf.getMetadata().items(): + CuraApplication.getInstance().getController().getScene().setMetaDataEntry(key, value) + for node in scene_3mf.getSceneNodes(): um_node = self._convertSavitarNodeToUMNode(node, file_name) if um_node is None: @@ -257,6 +269,9 @@ class ThreeMFReader(MeshReader): result.append(um_node) + if len(result) == 0: + self._empty_project = True + except Exception: Logger.logException("e", "An exception occurred in 3mf reader.") return [] diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 1c0088dd98..d0442e083b 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from configparser import ConfigParser @@ -412,7 +412,12 @@ class ThreeMFWorkspaceReader(WorkspaceReader): quality_container_id = parser["containers"][str(_ContainerIndexes.Quality)] quality_type = "empty_quality" if quality_container_id not in ("empty", "empty_quality"): - quality_type = instance_container_info_dict[quality_container_id].parser["metadata"]["quality_type"] + if quality_container_id in instance_container_info_dict: + quality_type = instance_container_info_dict[quality_container_id].parser["metadata"]["quality_type"] + else: # If a version upgrade changed the quality profile in the stack, we'll need to look for it in the built-in profiles instead of the workspace. + quality_matches = ContainerRegistry.getInstance().findContainersMetadata(id = quality_container_id) + if quality_matches: # If there's no profile with this ID, leave it empty_quality. + quality_type = quality_matches[0]["quality_type"] # Get machine info serialized = archive.open(global_stack_file).read().decode("utf-8") @@ -1157,7 +1162,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): return machine_manager.setQualityChangesGroup(quality_changes_group, no_dialog = True) else: - self._quality_type_to_apply = self._quality_type_to_apply.lower() + self._quality_type_to_apply = self._quality_type_to_apply.lower() if self._quality_type_to_apply else None quality_group_dict = container_tree.getCurrentQualityGroups() if self._quality_type_to_apply in quality_group_dict: quality_group = quality_group_dict[self._quality_type_to_apply] diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index 1fd20a3534..450f01fbd5 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -419,7 +419,7 @@ UM.Dialog width: warningLabel.height height: width - source: UM.Theme.getIcon("notice") + source: UM.Theme.getIcon("Information") color: palette.text } diff --git a/plugins/3MFReader/plugin.json b/plugins/3MFReader/plugin.json index b80d83ae01..09fcf6c573 100644 --- a/plugins/3MFReader/plugin.json +++ b/plugins/3MFReader/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides support for reading 3MF files.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py index 6c02935080..c85eca88bf 100644 --- a/plugins/3MFWriter/ThreeMFWriter.py +++ b/plugins/3MFWriter/ThreeMFWriter.py @@ -14,6 +14,7 @@ from cura.CuraApplication import CuraApplication import Savitar import numpy +import datetime MYPY = False try: @@ -108,7 +109,11 @@ class ThreeMFWriter(MeshWriter): # Get values for all changed settings & save them. for key in changed_setting_keys: - savitar_node.setSetting(key, str(stack.getProperty(key, "value"))) + savitar_node.setSetting("cura:" + key, str(stack.getProperty(key, "value"))) + + # Store the metadata. + for key, value in um_node.metadata.items(): + savitar_node.setSetting(key, value) for child_node in um_node.getChildren(): # only save the nodes on the active build plate @@ -145,6 +150,22 @@ class ThreeMFWriter(MeshWriter): model_relation_element = ET.SubElement(relations_element, "Relationship", Target = "/3D/3dmodel.model", Id = "rel0", Type = "http://schemas.microsoft.com/3dmanufacturing/2013/01/3dmodel") savitar_scene = Savitar.Scene() + + metadata_to_store = CuraApplication.getInstance().getController().getScene().getMetaData() + + for key, value in metadata_to_store.items(): + savitar_scene.setMetaDataEntry(key, value) + + current_time_string = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") + if "Application" not in metadata_to_store: + # This might sound a bit strange, but this field should store the original application that created + # the 3mf. So if it was already set, leave it to whatever it was. + savitar_scene.setMetaDataEntry("Application", CuraApplication.getInstance().getApplicationDisplayName()) + if "CreationDate" not in metadata_to_store: + savitar_scene.setMetaDataEntry("CreationDate", current_time_string) + + savitar_scene.setMetaDataEntry("ModificationDate", current_time_string) + transformation_matrix = Matrix() transformation_matrix._data[1, 1] = 0 transformation_matrix._data[1, 2] = -1 diff --git a/plugins/3MFWriter/plugin.json b/plugins/3MFWriter/plugin.json index 18611f84f0..8e6a5785a7 100644 --- a/plugins/3MFWriter/plugin.json +++ b/plugins/3MFWriter/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides support for writing 3MF files.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/AMFReader/AMFReader.py b/plugins/AMFReader/AMFReader.py index ef785f2f53..5bbd25df1b 100644 --- a/plugins/AMFReader/AMFReader.py +++ b/plugins/AMFReader/AMFReader.py @@ -157,22 +157,22 @@ class AMFReader(MeshReader): tri_faces = tri_node.faces tri_vertices = tri_node.vertices - indices = [] - vertices = [] + indices_list = [] + vertices_list = [] index_count = 0 face_count = 0 for tri_face in tri_faces: face = [] for tri_index in tri_face: - vertices.append(tri_vertices[tri_index]) + vertices_list.append(tri_vertices[tri_index]) face.append(index_count) index_count += 1 - indices.append(face) + indices_list.append(face) face_count += 1 - vertices = numpy.asarray(vertices, dtype = numpy.float32) - indices = numpy.asarray(indices, dtype = numpy.int32) + vertices = numpy.asarray(vertices_list, dtype = numpy.float32) + indices = numpy.asarray(indices_list, dtype = numpy.int32) normals = calculateNormalsFromIndexedVertices(vertices, indices, face_count) mesh_data = MeshData(vertices = vertices, indices = indices, normals = normals,file_name = file_name) diff --git a/plugins/AMFReader/plugin.json b/plugins/AMFReader/plugin.json index 632a2dcd7e..40b4917b97 100644 --- a/plugins/AMFReader/plugin.json +++ b/plugins/AMFReader/plugin.json @@ -3,5 +3,5 @@ "author": "fieldOfView", "version": "1.0.0", "description": "Provides support for reading AMF files.", - "api": "7.4.0" + "api": 7 } diff --git a/plugins/CuraDrive/plugin.json b/plugins/CuraDrive/plugin.json index 14c3b45b6d..62a23e5882 100644 --- a/plugins/CuraDrive/plugin.json +++ b/plugins/CuraDrive/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "description": "Backup and restore your configuration.", "version": "1.2.0", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/CuraDrive/src/CreateBackupJob.py b/plugins/CuraDrive/src/CreateBackupJob.py index d427f03573..ab1989f382 100644 --- a/plugins/CuraDrive/src/CreateBackupJob.py +++ b/plugins/CuraDrive/src/CreateBackupJob.py @@ -5,7 +5,6 @@ import threading from datetime import datetime from typing import Any, Dict, Optional -import sentry_sdk from PyQt5.QtNetwork import QNetworkReply from UM.Job import Job @@ -99,13 +98,7 @@ class CreateBackupJob(Job): if HttpRequestManager.safeHttpStatus(reply) == 400: errors = json.loads(replyText)["errors"] if "moreThanMaximum" in [error["code"] for error in errors if error["meta"] and error["meta"]["field_name"] == "backup_size"]: - if self._backup_zip is None: # will never happen; keep mypy happy - zip_error = "backup is None." - else: - zip_error = "{} exceeds max size.".format(str(len(self._backup_zip))) - sentry_sdk.capture_message("backup failed: {}".format(zip_error), level ="warning") self.backup_upload_error_message = catalog.i18nc("@error:file_size", "The backup exceeds the maximum file size.") - from sentry_sdk import capture_message self._job_done.set() return diff --git a/plugins/CuraDrive/src/DriveApiService.py b/plugins/CuraDrive/src/DriveApiService.py index 2248b64389..6dd6f02b97 100644 --- a/plugins/CuraDrive/src/DriveApiService.py +++ b/plugins/CuraDrive/src/DriveApiService.py @@ -43,6 +43,10 @@ class DriveApiService: return backup_list_response = HttpRequestManager.readJSON(reply) + if backup_list_response is None: + Logger.error("List of back-ups can't be parsed.") + changed([]) + return if "data" not in backup_list_response: Logger.log("w", "Could not get backups from remote, actual response body was: %s", str(backup_list_response)) @@ -89,7 +93,7 @@ class DriveApiService: def _onRestoreFinished(self, job: "RestoreBackupJob") -> None: if job.restore_backup_error_message != "": # If the job contains an error message we pass it along so the UI can display it. - self.restoringStateChanged.emit(is_restoring=False) + self.restoringStateChanged.emit(is_restoring = False) else: self.restoringStateChanged.emit(is_restoring = False, error_message = job.restore_backup_error_message) diff --git a/plugins/CuraDrive/src/DrivePluginExtension.py b/plugins/CuraDrive/src/DrivePluginExtension.py index 8de4876f52..3a7a59a172 100644 --- a/plugins/CuraDrive/src/DrivePluginExtension.py +++ b/plugins/CuraDrive/src/DrivePluginExtension.py @@ -34,6 +34,9 @@ class DrivePluginExtension(QObject, Extension): # Signal emitted when preferences changed (like auto-backup). preferencesChanged = pyqtSignal() + # Signal emitted when the id of the backup-to-be-restored is changed + backupIdBeingRestoredChanged = pyqtSignal(arguments = ["backup_id_being_restored"]) + DATE_FORMAT = "%d/%m/%Y %H:%M:%S" def __init__(self) -> None: @@ -45,6 +48,7 @@ class DrivePluginExtension(QObject, Extension): self._backups = [] # type: List[Dict[str, Any]] self._is_restoring_backup = False self._is_creating_backup = False + self._backup_id_being_restored = "" # Initialize services. preferences = CuraApplication.getInstance().getPreferences() @@ -52,6 +56,7 @@ class DrivePluginExtension(QObject, Extension): # Attach signals. CuraApplication.getInstance().getCuraAPI().account.loginStateChanged.connect(self._onLoginStateChanged) + CuraApplication.getInstance().applicationShuttingDown.connect(self._onApplicationShuttingDown) self._drive_api_service.restoringStateChanged.connect(self._onRestoringStateChanged) self._drive_api_service.creatingStateChanged.connect(self._onCreatingStateChanged) @@ -75,6 +80,10 @@ class DrivePluginExtension(QObject, Extension): if self._drive_window: self._drive_window.show() + def _onApplicationShuttingDown(self): + if self._drive_window: + self._drive_window.hide() + def _autoBackup(self) -> None: preferences = CuraApplication.getInstance().getPreferences() if preferences.getValue(Settings.AUTO_BACKUP_ENABLED_PREFERENCE_KEY) and self._isLastBackupTooLongAgo(): @@ -100,10 +109,11 @@ class DrivePluginExtension(QObject, Extension): if logged_in: self.refreshBackups() - def _onRestoringStateChanged(self, is_restoring: bool = False, error_message: str = None) -> None: + def _onRestoringStateChanged(self, is_restoring: bool = False, error_message: Optional[str] = None) -> None: self._is_restoring_backup = is_restoring self.restoringStateChanged.emit() if error_message: + self.backupIdBeingRestored = "" Message(error_message, title = catalog.i18nc("@info:title", "Backup")).show() def _onCreatingStateChanged(self, is_creating: bool = False, error_message: str = None) -> None: @@ -152,6 +162,7 @@ class DrivePluginExtension(QObject, Extension): for backup in self._backups: if backup.get("backup_id") == backup_id: self._drive_api_service.restoreBackup(backup) + self.setBackupIdBeingRestored(backup_id) return Logger.log("w", "Unable to find backup with the ID %s", backup_id) @@ -166,3 +177,12 @@ class DrivePluginExtension(QObject, Extension): def _backupDeletedCallback(self, success: bool): if success: self.refreshBackups() + + def setBackupIdBeingRestored(self, backup_id_being_restored: str) -> None: + if backup_id_being_restored != self._backup_id_being_restored: + self._backup_id_being_restored = backup_id_being_restored + self.backupIdBeingRestoredChanged.emit() + + @pyqtProperty(str, fset = setBackupIdBeingRestored, notify = backupIdBeingRestoredChanged) + def backupIdBeingRestored(self) -> str: + return self._backup_id_being_restored diff --git a/plugins/CuraDrive/src/RestoreBackupJob.py b/plugins/CuraDrive/src/RestoreBackupJob.py index c60de116e0..f59acbc8b7 100644 --- a/plugins/CuraDrive/src/RestoreBackupJob.py +++ b/plugins/CuraDrive/src/RestoreBackupJob.py @@ -1,3 +1,6 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + import base64 import hashlib import threading @@ -56,14 +59,20 @@ class RestoreBackupJob(Job): return # We store the file in a temporary path fist to ensure integrity. - temporary_backup_file = NamedTemporaryFile(delete = False) - with open(temporary_backup_file.name, "wb") as write_backup: - app = CuraApplication.getInstance() - bytes_read = reply.read(self.DISK_WRITE_BUFFER_SIZE) - while bytes_read: - write_backup.write(bytes_read) + try: + temporary_backup_file = NamedTemporaryFile(delete = False) + with open(temporary_backup_file.name, "wb") as write_backup: + app = CuraApplication.getInstance() bytes_read = reply.read(self.DISK_WRITE_BUFFER_SIZE) - app.processEvents() + while bytes_read: + write_backup.write(bytes_read) + bytes_read = reply.read(self.DISK_WRITE_BUFFER_SIZE) + app.processEvents() + except EnvironmentError as e: + Logger.log("e", f"Unable to save backed up files due to computer limitations: {str(e)}") + self.restore_backup_error_message = self.DEFAULT_ERROR_MESSAGE + self._job_done.set() + return if not self._verifyMd5Hash(temporary_backup_file.name, self._backup.get("md5_hash", "")): # Don't restore the backup if the MD5 hashes do not match. diff --git a/plugins/CuraDrive/src/qml/components/BackupListFooter.qml b/plugins/CuraDrive/src/qml/components/BackupListFooter.qml index 8decdc5c27..15af7521ed 100644 --- a/plugins/CuraDrive/src/qml/components/BackupListFooter.qml +++ b/plugins/CuraDrive/src/qml/components/BackupListFooter.qml @@ -20,7 +20,7 @@ RowLayout { id: infoButton text: catalog.i18nc("@button", "Want more?") - iconSource: UM.Theme.getIcon("info") + iconSource: UM.Theme.getIcon("Information") onClicked: Qt.openUrlExternally("https://goo.gl/forms/QACEP8pP3RV60QYG2") visible: backupListFooter.showInfoButton } @@ -29,7 +29,7 @@ RowLayout { id: createBackupButton text: catalog.i18nc("@button", "Backup Now") - iconSource: UM.Theme.getIcon("plus") + iconSource: UM.Theme.getIcon("Plus") enabled: !CuraDrive.isCreatingBackup && !CuraDrive.isRestoringBackup onClicked: CuraDrive.createBackup() busy: CuraDrive.isCreatingBackup diff --git a/plugins/CuraDrive/src/qml/components/BackupListItem.qml b/plugins/CuraDrive/src/qml/components/BackupListItem.qml index 5cdb500b4e..e35c8351b7 100644 --- a/plugins/CuraDrive/src/qml/components/BackupListItem.qml +++ b/plugins/CuraDrive/src/qml/components/BackupListItem.qml @@ -38,7 +38,7 @@ Item height: UM.Theme.getSize("section_icon").height color: UM.Theme.getColor("small_button_text") hoverColor: UM.Theme.getColor("small_button_text_hover") - iconSource: UM.Theme.getIcon("info") + iconSource: UM.Theme.getIcon("Information") onClicked: backupListItem.showDetails = !backupListItem.showDetails } @@ -71,6 +71,7 @@ Item text: catalog.i18nc("@button", "Restore") enabled: !CuraDrive.isCreatingBackup && !CuraDrive.isRestoringBackup onClicked: confirmRestoreDialog.visible = true + busy: CuraDrive.backupIdBeingRestored == modelData.backup_id && CuraDrive.isRestoringBackup } UM.SimpleButton @@ -79,7 +80,7 @@ Item height: UM.Theme.getSize("message_close").height color: UM.Theme.getColor("small_button_text") hoverColor: UM.Theme.getColor("small_button_text_hover") - iconSource: UM.Theme.getIcon("cross1") + iconSource: UM.Theme.getIcon("Cancel") onClicked: confirmDeleteDialog.visible = true } } diff --git a/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml b/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml index 4da15c6f16..a4f30edd19 100644 --- a/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml +++ b/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 @@ -17,7 +17,7 @@ ColumnLayout // Cura version BackupListItemDetailsRow { - iconSource: UM.Theme.getIcon("application") + iconSource: UM.Theme.getIcon("UltimakerCura") label: catalog.i18nc("@backuplist:label", "Cura Version") value: backupDetailsData.metadata.cura_release } @@ -25,7 +25,7 @@ ColumnLayout // Machine count. BackupListItemDetailsRow { - iconSource: UM.Theme.getIcon("printer_single") + iconSource: UM.Theme.getIcon("Printer") label: catalog.i18nc("@backuplist:label", "Machines") value: backupDetailsData.metadata.machine_count } @@ -33,7 +33,7 @@ ColumnLayout // Material count BackupListItemDetailsRow { - iconSource: UM.Theme.getIcon("category_material") + iconSource: UM.Theme.getIcon("Spool") label: catalog.i18nc("@backuplist:label", "Materials") value: backupDetailsData.metadata.material_count } @@ -41,7 +41,7 @@ ColumnLayout // Profile count. BackupListItemDetailsRow { - iconSource: UM.Theme.getIcon("settings") + iconSource: UM.Theme.getIcon("Sliders") label: catalog.i18nc("@backuplist:label", "Profiles") value: backupDetailsData.metadata.profile_count } @@ -49,7 +49,7 @@ ColumnLayout // Plugin count. BackupListItemDetailsRow { - iconSource: UM.Theme.getIcon("plugin") + iconSource: UM.Theme.getIcon("Plugin") label: catalog.i18nc("@backuplist:label", "Plugins") value: backupDetailsData.metadata.plugin_count } diff --git a/plugins/CuraDrive/src/qml/pages/BackupsPage.qml b/plugins/CuraDrive/src/qml/pages/BackupsPage.qml index c337294744..bb17cea973 100644 --- a/plugins/CuraDrive/src/qml/pages/BackupsPage.qml +++ b/plugins/CuraDrive/src/qml/pages/BackupsPage.qml @@ -69,7 +69,7 @@ Item BackupListFooter { id: backupListFooter - showInfoButton: backupList.model.length > 4 + } } } diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 4b196f7b5d..fa9a8c5474 100755 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -1,14 +1,16 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import argparse #To run the engine in debug mode if the front-end is in debug mode. from collections import defaultdict import os -from PyQt5.QtCore import QObject, QTimer, pyqtSlot +from PyQt5.QtCore import QObject, QTimer, QUrl, pyqtSlot import sys from time import time from typing import Any, cast, Dict, List, Optional, Set, TYPE_CHECKING +from PyQt5.QtGui import QDesktopServices, QImage + from UM.Backend.Backend import Backend, BackendState from UM.Scene.SceneNode import SceneNode from UM.Signal import Signal @@ -24,6 +26,8 @@ from UM.Tool import Tool #For typing. from cura.CuraApplication import CuraApplication from cura.Settings.ExtruderManager import ExtruderManager +from cura.Snapshot import Snapshot +from cura.Utils.Threading import call_on_qt_thread from .ProcessSlicedLayersJob import ProcessSlicedLayersJob from .StartSliceJob import StartSliceJob, StartJobResult @@ -153,6 +157,20 @@ class CuraEngineBackend(QObject, Backend): self.determineAutoSlicing() application.getPreferences().preferenceChanged.connect(self._onPreferencesChanged) + self._slicing_error_message = Message( + text = catalog.i18nc("@message", "Slicing failed with an unexpected error. Please consider reporting a bug on our issue tracker."), + title = catalog.i18nc("@message:title", "Slicing failed") + ) + self._slicing_error_message.addAction( + action_id = "report_bug", + name = catalog.i18nc("@message:button", "Report a bug"), + description = catalog.i18nc("@message:description", "Report a bug on Ultimaker Cura's issue tracker."), + icon = "[no_icon]" + ) + self._slicing_error_message.actionTriggered.connect(self._reportBackendError) + + self._snapshot = None #type: Optional[QImage] + application.initializationFinished.connect(self.initialize) def initialize(self) -> None: @@ -241,9 +259,27 @@ class CuraEngineBackend(QObject, Backend): self.markSliceAll() self.slice() + @call_on_qt_thread # must be called from the main thread because of OpenGL + def _createSnapshot(self) -> None: + self._snapshot = None + if not CuraApplication.getInstance().isVisible: + Logger.log("w", "Can't create snapshot when renderer not initialized.") + return + Logger.log("i", "Creating thumbnail image (just before slice)...") + try: + self._snapshot = Snapshot.snapshot(width = 300, height = 300) + except: + Logger.logException("w", "Failed to create snapshot image") + self._snapshot = None # Failing to create thumbnail should not fail creation of UFP + + def getLatestSnapshot(self) -> Optional[QImage]: + return self._snapshot + def slice(self) -> None: """Perform a slice of the scene.""" + self._createSnapshot() + Logger.log("i", "Starting to slice...") self._slice_start_time = time() if not self._build_plates_to_be_sliced: @@ -331,7 +367,6 @@ class CuraEngineBackend(QObject, Backend): def _onStartSliceCompleted(self, job: StartSliceJob) -> None: """Event handler to call when the job to initiate the slicing process is - completed. When the start slice job is successfully completed, it will be happily @@ -899,9 +934,22 @@ class CuraEngineBackend(QObject, Backend): if not self._restart: if self._process: # type: ignore - Logger.log("d", "Backend quit with return code %s. Resetting process and socket.", self._process.wait()) # type: ignore + return_code = self._process.wait() + if return_code != 0: + Logger.log("e", f"Backend exited abnormally with return code {return_code}!") + self._slicing_error_message.show() + self.setState(BackendState.Error) + self.stopSlicing() + else: + Logger.log("d", "Backend finished slicing. Resetting process and socket.") self._process = None # type: ignore + def _reportBackendError(self, _message_id: str, _action_id: str) -> None: + """ + Triggered when the user wants to report an error in the back-end. + """ + QDesktopServices.openUrl(QUrl("https://github.com/Ultimaker/Cura/issues/new/choose")) + def _onGlobalStackChanged(self) -> None: """Called when the global container stack changes""" diff --git a/plugins/CuraEngineBackend/plugin.json b/plugins/CuraEngineBackend/plugin.json index d87cb1b34a..e3e9324315 100644 --- a/plugins/CuraEngineBackend/plugin.json +++ b/plugins/CuraEngineBackend/plugin.json @@ -2,7 +2,7 @@ "name": "CuraEngine Backend", "author": "Ultimaker B.V.", "description": "Provides the link to the CuraEngine slicing backend.", - "api": "7.4.0", + "api": 7, "version": "1.0.1", "i18n-catalog": "cura" } diff --git a/plugins/CuraProfileReader/plugin.json b/plugins/CuraProfileReader/plugin.json index ad68c08a17..e4f26532a5 100644 --- a/plugins/CuraProfileReader/plugin.json +++ b/plugins/CuraProfileReader/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides support for importing Cura profiles.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/CuraProfileWriter/plugin.json b/plugins/CuraProfileWriter/plugin.json index 6dd815ed21..0dc4453329 100644 --- a/plugins/CuraProfileWriter/plugin.json +++ b/plugins/CuraProfileWriter/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides support for exporting Cura profiles.", - "api": "7.4.0", + "api": 7, "i18n-catalog":"cura" } diff --git a/plugins/DigitalLibrary/__init__.py b/plugins/DigitalLibrary/__init__.py new file mode 100644 index 0000000000..968aef66ee --- /dev/null +++ b/plugins/DigitalLibrary/__init__.py @@ -0,0 +1,17 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from UM.MimeTypeDatabase import MimeType, MimeTypeDatabase +from .src import DigitalFactoryFileProvider, DigitalFactoryOutputDevicePlugin, DigitalFactoryController + + +def getMetaData(): + return {} + + +def register(app): + df_controller = DigitalFactoryController.DigitalFactoryController(app) + return { + "file_provider": DigitalFactoryFileProvider.DigitalFactoryFileProvider(df_controller), + "output_device": DigitalFactoryOutputDevicePlugin.DigitalFactoryOutputDevicePlugin(df_controller) + } diff --git a/plugins/DigitalLibrary/plugin.json b/plugins/DigitalLibrary/plugin.json new file mode 100644 index 0000000000..848346704f --- /dev/null +++ b/plugins/DigitalLibrary/plugin.json @@ -0,0 +1,8 @@ +{ + "name": "Ultimaker Digital Library", + "author": "Ultimaker B.V.", + "description": "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library.", + "version": "1.0.0", + "api": 7, + "i18n-catalog": "cura" +} diff --git a/plugins/DigitalLibrary/resources/images/arrow_down.svg b/plugins/DigitalLibrary/resources/images/arrow_down.svg new file mode 100644 index 0000000000..d11d6a63fd --- /dev/null +++ b/plugins/DigitalLibrary/resources/images/arrow_down.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/plugins/DigitalLibrary/resources/images/digital_factory.svg b/plugins/DigitalLibrary/resources/images/digital_factory.svg new file mode 100644 index 0000000000..d8c30f62f2 --- /dev/null +++ b/plugins/DigitalLibrary/resources/images/digital_factory.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/plugins/DigitalLibrary/resources/images/placeholder.svg b/plugins/DigitalLibrary/resources/images/placeholder.svg new file mode 100644 index 0000000000..cc674a4b38 --- /dev/null +++ b/plugins/DigitalLibrary/resources/images/placeholder.svg @@ -0,0 +1,3 @@ + + + diff --git a/plugins/DigitalLibrary/resources/images/projects_not_found.svg b/plugins/DigitalLibrary/resources/images/projects_not_found.svg new file mode 100644 index 0000000000..ba118ebc0a --- /dev/null +++ b/plugins/DigitalLibrary/resources/images/projects_not_found.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/DigitalLibrary/resources/images/update.svg b/plugins/DigitalLibrary/resources/images/update.svg new file mode 100644 index 0000000000..4a1aecab81 --- /dev/null +++ b/plugins/DigitalLibrary/resources/images/update.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml b/plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml new file mode 100644 index 0000000000..a7297c12fb --- /dev/null +++ b/plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml @@ -0,0 +1,159 @@ +// Copyright (C) 2021 Ultimaker B.V. + +import QtQuick 2.10 +import QtQuick.Window 2.2 +import QtQuick.Controls 1.4 as OldControls // TableView doesn't exist in the QtQuick Controls 2.x in 5.10, so use the old one +import QtQuick.Controls 2.3 +import QtQuick.Controls.Styles 1.4 + +import UM 1.2 as UM +import Cura 1.6 as Cura + +import DigitalFactory 1.0 as DF + + +Popup +{ + id: base + + padding: UM.Theme.getSize("default_margin").width + + closePolicy: Popup.CloseOnEscape + focus: true + modal: true + background: Cura.RoundedRectangle + { + cornerSide: Cura.RoundedRectangle.Direction.All + border.color: UM.Theme.getColor("lining") + border.width: UM.Theme.getSize("default_lining").width + radius: UM.Theme.getSize("default_radius").width + width: parent.width + height: parent.height + color: UM.Theme.getColor("main_background") + } + + Connections + { + target: manager + + function onCreatingNewProjectStatusChanged(status) + { + if (status == DF.RetrievalStatus.Success) + { + base.close(); + } + } + } + + onOpened: + { + newProjectNameTextField.text = "" + newProjectNameTextField.focus = true + } + + Label + { + id: createNewLibraryProjectLabel + text: "Create new Library project" + font: UM.Theme.getFont("medium") + color: UM.Theme.getColor("small_button_text") + anchors + { + top: parent.top + left: parent.left + right: parent.right + } + } + + Label + { + id: projectNameLabel + text: "Project Name" + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + anchors + { + top: createNewLibraryProjectLabel.bottom + topMargin: UM.Theme.getSize("default_margin").width + left: parent.left + right: parent.right + } + } + + Cura.TextField + { + id: newProjectNameTextField + width: parent.width + anchors + { + top: projectNameLabel.bottom + topMargin: UM.Theme.getSize("thin_margin").width + left: parent.left + right: parent.right + } + validator: RegExpValidator + { + regExp: /^[^\\\/\*\?\|\[\]]{0,99}$/ + } + + text: PrintInformation.jobName + font: UM.Theme.getFont("default") + placeholderText: "Enter a name for your new project." + onAccepted: + { + if (verifyProjectCreationButton.enabled) + { + verifyProjectCreationButton.clicked() + } + } + } + + Label + { + id: errorWhileCreatingProjectLabel + text: manager.projectCreationErrorText + width: parent.width + wrapMode: Text.WordWrap + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("error") + visible: manager.creatingNewProjectStatus == DF.RetrievalStatus.Failed + anchors + { + top: newProjectNameTextField.bottom + left: parent.left + right: parent.right + } + } + + Cura.SecondaryButton + { + id: cancelProjectCreationButton + + anchors.bottom: parent.bottom + anchors.left: parent.left + + text: "Cancel" + + onClicked: + { + base.close() + } + busy: false + } + + Cura.PrimaryButton + { + id: verifyProjectCreationButton + + anchors.bottom: parent.bottom + anchors.right: parent.right + text: "Create" + enabled: newProjectNameTextField.text.length >= 2 && !busy + + onClicked: + { + manager.createLibraryProjectAndSetAsPreselected(newProjectNameTextField.text) + } + busy: manager.creatingNewProjectStatus == DF.RetrievalStatus.InProgress + } +} diff --git a/plugins/DigitalLibrary/resources/qml/DigitalFactoryOpenDialog.qml b/plugins/DigitalLibrary/resources/qml/DigitalFactoryOpenDialog.qml new file mode 100644 index 0000000000..58958e0069 --- /dev/null +++ b/plugins/DigitalLibrary/resources/qml/DigitalFactoryOpenDialog.qml @@ -0,0 +1,61 @@ +// Copyright (C) 2021 Ultimaker B.V. + +import QtQuick 2.10 +import QtQuick.Window 2.2 +import QtQuick.Controls 1.4 as OldControls // TableView doesn't exist in the QtQuick Controls 2.x in 5.10, so use the old one +import QtQuick.Controls 2.3 +import QtQuick.Controls.Styles 1.4 + +import UM 1.2 as UM +import Cura 1.6 as Cura + +import DigitalFactory 1.0 as DF + +Window +{ + id: digitalFactoryOpenDialogBase + title: "Open file from Library" + + modality: Qt.ApplicationModal + width: 800 * screenScaleFactor + height: 600 * screenScaleFactor + minimumWidth: 800 * screenScaleFactor + minimumHeight: 600 * screenScaleFactor + + Shortcut + { + sequence: "Esc" + onActivated: digitalFactoryOpenDialogBase.close() + } + color: UM.Theme.getColor("main_background") + + SelectProjectPage + { + visible: manager.selectedProjectIndex == -1 + createNewProjectButtonVisible: false + } + + OpenProjectFilesPage + { + visible: manager.selectedProjectIndex >= 0 + onOpenFilePressed: digitalFactoryOpenDialogBase.close() + } + + + BusyIndicator + { + // Shows up while Cura is waiting to receive the user's projects from the digital factory library + id: retrievingProjectsBusyIndicator + + anchors { + verticalCenter: parent.verticalCenter + horizontalCenter: parent.horizontalCenter + } + + width: parent.width / 4 + height: width + visible: manager.retrievingProjectsStatus == DF.RetrievalStatus.InProgress + running: visible + palette.dark: UM.Theme.getColor("text") + } +} diff --git a/plugins/DigitalLibrary/resources/qml/DigitalFactorySaveDialog.qml b/plugins/DigitalLibrary/resources/qml/DigitalFactorySaveDialog.qml new file mode 100644 index 0000000000..6d870d0c78 --- /dev/null +++ b/plugins/DigitalLibrary/resources/qml/DigitalFactorySaveDialog.qml @@ -0,0 +1,62 @@ +// Copyright (C) 2021 Ultimaker B.V. + +import QtQuick 2.10 +import QtQuick.Window 2.2 +import QtQuick.Controls 1.4 as OldControls // TableView doesn't exist in the QtQuick Controls 2.x in 5.10, so use the old one +import QtQuick.Controls 2.3 +import QtQuick.Controls.Styles 1.4 + +import UM 1.2 as UM +import Cura 1.6 as Cura + +import DigitalFactory 1.0 as DF + +Window +{ + id: digitalFactorySaveDialogBase + title: "Save Cura project to Library" + + modality: Qt.ApplicationModal + width: 800 * screenScaleFactor + height: 600 * screenScaleFactor + minimumWidth: 800 * screenScaleFactor + minimumHeight: 600 * screenScaleFactor + + Shortcut + { + sequence: "Esc" + onActivated: digitalFactorySaveDialogBase.close() + } + color: UM.Theme.getColor("main_background") + + SelectProjectPage + { + visible: manager.selectedProjectIndex == -1 + createNewProjectButtonVisible: true + } + + SaveProjectFilesPage + { + visible: manager.selectedProjectIndex >= 0 + onSavePressed: digitalFactorySaveDialogBase.close() + onSelectDifferentProjectPressed: manager.clearProjectSelection() + } + + + BusyIndicator + { + // Shows up while Cura is waiting to receive the user's projects from the digital factory library + id: retrievingProjectsBusyIndicator + + anchors { + verticalCenter: parent.verticalCenter + horizontalCenter: parent.horizontalCenter + } + + width: parent.width / 4 + height: width + visible: manager.retrievingProjectsStatus == DF.RetrievalStatus.InProgress + running: visible + palette.dark: UM.Theme.getColor("text") + } +} diff --git a/plugins/DigitalLibrary/resources/qml/LoadMoreProjectsCard.qml b/plugins/DigitalLibrary/resources/qml/LoadMoreProjectsCard.qml new file mode 100644 index 0000000000..45a0c6886d --- /dev/null +++ b/plugins/DigitalLibrary/resources/qml/LoadMoreProjectsCard.qml @@ -0,0 +1,129 @@ +// Copyright (C) 2021 Ultimaker B.V. +import QtQuick 2.10 +import QtQuick.Controls 2.3 + +import UM 1.2 as UM +import Cura 1.6 as Cura + +Cura.RoundedRectangle +{ + id: base + cornerSide: Cura.RoundedRectangle.Direction.All + border.color: UM.Theme.getColor("lining") + border.width: UM.Theme.getSize("default_lining").width + radius: UM.Theme.getSize("default_radius").width + signal clicked() + property var hasMoreProjectsToLoad + enabled: hasMoreProjectsToLoad + color: UM.Theme.getColor("main_background") + + MouseArea + { + id: cardMouseArea + anchors.fill: parent + hoverEnabled: true + } + + Row + { + id: projectInformationRow + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + + UM.RecolorImage + { + id: projectImage + anchors.verticalCenter: parent.verticalCenter + width: UM.Theme.getSize("section").height + height: width + color: UM.Theme.getColor("text_link") + source: "../images/arrow_down.svg" + } + + Label + { + id: displayNameLabel + anchors.verticalCenter: parent.verticalCenter + text: "Load more projects" + color: UM.Theme.getColor("text_link") + font: UM.Theme.getFont("medium_bold") + } + } + + Component.onCompleted: + { + cardMouseArea.clicked.connect(base.clicked) + } + + states: + [ + State + { + name: "canLoadMoreProjectsAndHovered"; + when: base.hasMoreProjectsToLoad && cardMouseArea.containsMouse + PropertyChanges + { + target: projectImage + color: UM.Theme.getColor("text_link") + source: "../images/arrow_down.svg" + } + PropertyChanges + { + target: displayNameLabel + color: UM.Theme.getColor("text_link") + text: "Load more projects" + } + PropertyChanges + { + target: base + color: UM.Theme.getColor("action_button_hovered") + } + }, + + State + { + name: "canLoadMoreProjectsAndNotHovered"; + when: base.hasMoreProjectsToLoad && !cardMouseArea.containsMouse + PropertyChanges + { + target: projectImage + color: UM.Theme.getColor("text_link") + source: "../images/arrow_down.svg" + } + PropertyChanges + { + target: displayNameLabel + color: UM.Theme.getColor("text_link") + text: "Load more projects" + } + PropertyChanges + { + target: base + color: UM.Theme.getColor("main_background") + } + }, + + State + { + name: "noMoreProjectsToLoad" + when: !base.hasMoreProjectsToLoad + PropertyChanges + { + target: projectImage + color: UM.Theme.getColor("action_button_disabled_text") + source: "../images/update.svg" + } + PropertyChanges + { + target: displayNameLabel + color: UM.Theme.getColor("action_button_disabled_text") + text: "No more projects to load" + } + PropertyChanges + { + target: base + color: UM.Theme.getColor("action_button_disabled") + } + } + ] +} \ No newline at end of file diff --git a/plugins/DigitalLibrary/resources/qml/OpenProjectFilesPage.qml b/plugins/DigitalLibrary/resources/qml/OpenProjectFilesPage.qml new file mode 100644 index 0000000000..5b237a3e48 --- /dev/null +++ b/plugins/DigitalLibrary/resources/qml/OpenProjectFilesPage.qml @@ -0,0 +1,203 @@ +// Copyright (C) 2021 Ultimaker B.V. + +import QtQuick 2.10 +import QtQuick.Window 2.2 +import QtQuick.Controls 1.4 as OldControls // TableView doesn't exist in the QtQuick Controls 2.x in 5.10, so use the old one +import QtQuick.Controls 2.3 +import QtQuick.Controls.Styles 1.4 + +import UM 1.2 as UM +import Cura 1.6 as Cura + +import DigitalFactory 1.0 as DF + + +Item +{ + id: base + width: parent.width + height: parent.height + + property var fileModel: manager.digitalFactoryFileModel + + signal openFilePressed() + signal selectDifferentProjectPressed() + + anchors + { + fill: parent + margins: UM.Theme.getSize("default_margin").width + } + + ProjectSummaryCard + { + id: projectSummaryCard + + anchors.top: parent.top + + property var selectedItem: manager.digitalFactoryProjectModel.getItem(manager.selectedProjectIndex) + + imageSource: selectedItem.thumbnailUrl || "../images/placeholder.svg" + projectNameText: selectedItem.displayName || "" + projectUsernameText: selectedItem.username || "" + projectLastUpdatedText: "Last updated: " + selectedItem.lastUpdated + cardMouseAreaEnabled: false + } + + Rectangle + { + id: projectFilesContent + width: parent.width + anchors.top: projectSummaryCard.bottom + anchors.topMargin: UM.Theme.getSize("default_margin").width + anchors.bottom: selectDifferentProjectButton.top + anchors.bottomMargin: UM.Theme.getSize("default_margin").width + + color: UM.Theme.getColor("main_background") + border.width: UM.Theme.getSize("default_lining").width + border.color: UM.Theme.getColor("lining") + + + Cura.TableView + { + id: filesTableView + anchors.fill: parent + model: manager.digitalFactoryFileModel + visible: model.count != 0 && manager.retrievingFileStatus != DF.RetrievalStatus.InProgress + selectionMode: OldControls.SelectionMode.SingleSelection + onDoubleClicked: + { + manager.setSelectedFileIndices([row]); + openFilesButton.clicked(); + } + + OldControls.TableViewColumn + { + id: fileNameColumn + role: "fileName" + title: "Name" + width: Math.round(filesTableView.width / 3) + } + + OldControls.TableViewColumn + { + id: usernameColumn + role: "username" + title: "Uploaded by" + width: Math.round(filesTableView.width / 3) + } + + OldControls.TableViewColumn + { + role: "uploadedAt" + title: "Uploaded at" + } + + Connections + { + target: filesTableView.selection + function onSelectionChanged() + { + let newSelection = []; + filesTableView.selection.forEach(function(rowIndex) { newSelection.push(rowIndex); }); + manager.setSelectedFileIndices(newSelection); + } + } + } + + Label + { + id: emptyProjectLabel + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + text: "Select a project to view its files." + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("setting_category_text") + + Connections + { + target: manager + function onSelectedProjectIndexChanged(newProjectIndex) + { + emptyProjectLabel.visible = (newProjectIndex == -1) + } + } + } + + Label + { + id: noFilesInProjectLabel + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + visible: (manager.digitalFactoryFileModel.count == 0 && !emptyProjectLabel.visible && !retrievingFilesBusyIndicator.visible) + text: "No supported files in this project." + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("setting_category_text") + } + + BusyIndicator + { + // Shows up while Cura is waiting to receive the files of a project from the digital factory library + id: retrievingFilesBusyIndicator + + anchors + { + verticalCenter: parent.verticalCenter + horizontalCenter: parent.horizontalCenter + } + + width: parent.width / 4 + height: width + visible: manager.retrievingFilesStatus == DF.RetrievalStatus.InProgress + running: visible + palette.dark: UM.Theme.getColor("text") + } + + Connections + { + target: manager.digitalFactoryFileModel + + function onItemsChanged() + { + // Make sure no files are selected when the file model changes + filesTableView.currentRow = -1 + filesTableView.selection.clear() + } + } + } + Cura.SecondaryButton + { + id: selectDifferentProjectButton + + anchors.bottom: parent.bottom + anchors.left: parent.left + text: "Change Library project" + + onClicked: + { + manager.clearProjectSelection() + } + busy: false + } + + Cura.PrimaryButton + { + id: openFilesButton + + anchors.bottom: parent.bottom + anchors.right: parent.right + text: "Open" + enabled: filesTableView.selection.count > 0 + onClicked: + { + manager.openSelectedFiles() + } + busy: false + } + + Component.onCompleted: + { + openFilesButton.clicked.connect(base.openFilePressed) + selectDifferentProjectButton.clicked.connect(base.selectDifferentProjectPressed) + } +} \ No newline at end of file diff --git a/plugins/DigitalLibrary/resources/qml/ProjectSummaryCard.qml b/plugins/DigitalLibrary/resources/qml/ProjectSummaryCard.qml new file mode 100644 index 0000000000..4374b2f998 --- /dev/null +++ b/plugins/DigitalLibrary/resources/qml/ProjectSummaryCard.qml @@ -0,0 +1,92 @@ +// Copyright (C) 2021 Ultimaker B.V. +import QtQuick 2.10 +import QtQuick.Controls 2.3 + +import UM 1.2 as UM +import Cura 1.6 as Cura + +Cura.RoundedRectangle +{ + id: base + width: parent.width + height: projectImage.height + 2 * UM.Theme.getSize("default_margin").width + cornerSide: Cura.RoundedRectangle.Direction.All + border.color: UM.Theme.getColor("lining") + border.width: UM.Theme.getSize("default_lining").width + radius: UM.Theme.getSize("default_radius").width + color: UM.Theme.getColor("main_background") + signal clicked() + property alias imageSource: projectImage.source + property alias projectNameText: displayNameLabel.text + property alias projectUsernameText: usernameLabel.text + property alias projectLastUpdatedText: lastUpdatedLabel.text + property alias cardMouseAreaEnabled: cardMouseArea.enabled + + onVisibleChanged: color = UM.Theme.getColor("main_background") + + MouseArea + { + id: cardMouseArea + anchors.fill: parent + hoverEnabled: true + onEntered: base.color = UM.Theme.getColor("action_button_hovered") + onExited: base.color = UM.Theme.getColor("main_background") + onClicked: base.clicked() + } + Row + { + id: projectInformationRow + width: parent.width + padding: UM.Theme.getSize("default_margin").width + spacing: UM.Theme.getSize("default_margin").width + + Image + { + id: projectImage + anchors.verticalCenter: parent.verticalCenter + width: UM.Theme.getSize("toolbox_thumbnail_small").width + height: Math.round(width * 3/4) + sourceSize.width: width + sourceSize.height: height + fillMode: Image.PreserveAspectFit + mipmap: true + } + Column + { + id: projectLabelsColumn + height: projectImage.height + width: parent.width - x - UM.Theme.getSize("default_margin").width + anchors.verticalCenter: parent.verticalCenter + + Label + { + id: displayNameLabel + width: parent.width + height: Math.round(parent.height / 3) + elide: Text.ElideRight + color: UM.Theme.getColor("text") + font: UM.Theme.getFont("default_bold") + } + + Label + { + id: usernameLabel + width: parent.width + height: Math.round(parent.height / 3) + elide: Text.ElideRight + color: UM.Theme.getColor("small_button_text") + font: UM.Theme.getFont("default") + } + + Label + { + id: lastUpdatedLabel + width: parent.width + height: Math.round(parent.height / 3) + elide: Text.ElideRight + color: UM.Theme.getColor("small_button_text") + font: UM.Theme.getFont("default") + } + } + } +} \ No newline at end of file diff --git a/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml b/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml new file mode 100644 index 0000000000..30e3513019 --- /dev/null +++ b/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml @@ -0,0 +1,259 @@ +// Copyright (C) 2021 Ultimaker B.V. + +import QtQuick 2.10 +import QtQuick.Window 2.2 +import QtQuick.Controls 1.4 as OldControls // TableView doesn't exist in the QtQuick Controls 2.x in 5.10, so use the old one +import QtQuick.Controls 2.3 +import QtQuick.Controls.Styles 1.4 + +import UM 1.2 as UM +import Cura 1.6 as Cura + +import DigitalFactory 1.0 as DF + + +Item +{ + id: base + width: parent.width + height: parent.height + property var fileModel: manager.digitalFactoryFileModel + + signal savePressed() + signal selectDifferentProjectPressed() + + anchors + { + fill: parent + margins: UM.Theme.getSize("default_margin").width + } + + ProjectSummaryCard + { + id: projectSummaryCard + + anchors.top: parent.top + + property var selectedItem: manager.digitalFactoryProjectModel.getItem(manager.selectedProjectIndex) + + imageSource: selectedItem.thumbnailUrl || "../images/placeholder.svg" + projectNameText: selectedItem.displayName || "" + projectUsernameText: selectedItem.username || "" + projectLastUpdatedText: "Last updated: " + selectedItem.lastUpdated + cardMouseAreaEnabled: false + } + + Label + { + id: fileNameLabel + anchors.top: projectSummaryCard.bottom + anchors.topMargin: UM.Theme.getSize("default_margin").height + text: "Cura project name" + font: UM.Theme.getFont("medium") + color: UM.Theme.getColor("text") + } + + + Cura.TextField + { + id: dfFilenameTextfield + width: parent.width + anchors.left: parent.left + anchors.top: fileNameLabel.bottom + anchors.topMargin: UM.Theme.getSize("thin_margin").height + validator: RegExpValidator + { + regExp: /^[\w\-\. ()]{0,255}$/ + } + + text: PrintInformation.jobName + font: UM.Theme.getFont("medium") + placeholderText: "Enter the name of the file." + onAccepted: { if (saveButton.enabled) {saveButton.clicked()}} + } + + + Rectangle + { + id: projectFilesContent + width: parent.width + anchors.top: dfFilenameTextfield.bottom + anchors.topMargin: UM.Theme.getSize("wide_margin").height + anchors.bottom: selectDifferentProjectButton.top + anchors.bottomMargin: UM.Theme.getSize("default_margin").width + + color: UM.Theme.getColor("main_background") + border.width: UM.Theme.getSize("default_lining").width + border.color: UM.Theme.getColor("lining") + + + Cura.TableView + { + id: filesTableView + anchors.fill: parent + model: manager.digitalFactoryFileModel + visible: model.count != 0 && manager.retrievingFileStatus != DF.RetrievalStatus.InProgress + selectionMode: OldControls.SelectionMode.NoSelection + + OldControls.TableViewColumn + { + id: fileNameColumn + role: "fileName" + title: "@tableViewColumn:title", "Name" + width: Math.round(filesTableView.width / 3) + } + + OldControls.TableViewColumn + { + id: usernameColumn + role: "username" + title: "Uploaded by" + width: Math.round(filesTableView.width / 3) + } + + OldControls.TableViewColumn + { + role: "uploadedAt" + title: "Uploaded at" + } + } + + Label + { + id: emptyProjectLabel + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + text: "Select a project to view its files." + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("setting_category_text") + + Connections + { + target: manager + function onSelectedProjectIndexChanged() + { + emptyProjectLabel.visible = (manager.newProjectIndex == -1) + } + } + } + + Label + { + id: noFilesInProjectLabel + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + visible: (manager.digitalFactoryFileModel.count == 0 && !emptyProjectLabel.visible && !retrievingFilesBusyIndicator.visible) + text: "No supported files in this project." + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("setting_category_text") + } + + BusyIndicator + { + // Shows up while Cura is waiting to receive the files of a project from the digital factory library + id: retrievingFilesBusyIndicator + + anchors + { + verticalCenter: parent.verticalCenter + horizontalCenter: parent.horizontalCenter + } + + width: parent.width / 4 + height: width + visible: manager.retrievingFilesStatus == DF.RetrievalStatus.InProgress + running: visible + palette.dark: UM.Theme.getColor("text") + } + + Connections + { + target: manager.digitalFactoryFileModel + + function onItemsChanged() + { + // Make sure no files are selected when the file model changes + filesTableView.currentRow = -1 + filesTableView.selection.clear() + } + } + } + Cura.SecondaryButton + { + id: selectDifferentProjectButton + + anchors.bottom: parent.bottom + anchors.left: parent.left + text: "Change Library project" + + onClicked: + { + manager.selectedProjectIndex = -1 + } + busy: false + } + + Cura.PrimaryButton + { + id: saveButton + + anchors.bottom: parent.bottom + anchors.right: parent.right + text: "Save" + enabled: (asProjectCheckbox.checked || asSlicedCheckbox.checked) && dfFilenameTextfield.text.length >= 1 + + onClicked: + { + let saveAsFormats = []; + if (asProjectCheckbox.checked) + { + saveAsFormats.push("3mf"); + } + if (asSlicedCheckbox.checked) + { + saveAsFormats.push("ufp"); + } + manager.saveFileToSelectedProject(dfFilenameTextfield.text, saveAsFormats); + } + busy: false + } + + Row + { + + id: saveAsFormatRow + anchors.verticalCenter: saveButton.verticalCenter + anchors.right: saveButton.left + anchors.rightMargin: UM.Theme.getSize("thin_margin").height + width: childrenRect.width + spacing: UM.Theme.getSize("default_margin").width + + Cura.CheckBox + { + id: asProjectCheckbox + height: UM.Theme.getSize("checkbox").height + anchors.verticalCenter: parent.verticalCenter + checked: true + text: "Save Cura project" + font: UM.Theme.getFont("medium") + } + + Cura.CheckBox + { + id: asSlicedCheckbox + height: UM.Theme.getSize("checkbox").height + anchors.verticalCenter: parent.verticalCenter + + enabled: UM.Backend.state == UM.Backend.Done + checked: UM.Backend.state == UM.Backend.Done + text: "Save print file" + font: UM.Theme.getFont("medium") + } + } + + Component.onCompleted: + { + saveButton.clicked.connect(base.savePressed) + selectDifferentProjectButton.clicked.connect(base.selectDifferentProjectPressed) + } +} diff --git a/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml b/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml new file mode 100644 index 0000000000..8b919e299d --- /dev/null +++ b/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml @@ -0,0 +1,231 @@ +// Copyright (C) 2021 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.10 +import QtQuick.Window 2.2 +import QtQuick.Controls 1.4 as OldControls // TableView doesn't exist in the QtQuick Controls 2.x in 5.10, so use the old one +import QtQuick.Controls 2.3 +import QtQuick.Controls.Styles 1.4 +import QtQuick.Layouts 1.1 + +import UM 1.2 as UM +import Cura 1.6 as Cura + +import DigitalFactory 1.0 as DF + + +Item +{ + id: base + + width: parent.width + height: parent.height + property bool createNewProjectButtonVisible: true + + anchors + { + top: parent.top + bottom: parent.bottom + left: parent.left + right: parent.right + margins: UM.Theme.getSize("default_margin").width + } + + RowLayout + { + id: headerRow + + anchors + { + top: parent.top + left: parent.left + right: parent.right + } + height: childrenRect.height + spacing: UM.Theme.getSize("default_margin").width + + Cura.TextField + { + id: searchBar + Layout.fillWidth: true + implicitHeight: createNewProjectButton.height + + onTextEdited: manager.projectFilter = text //Update the search filter when editing this text field. + + leftIcon: UM.Theme.getIcon("Magnifier") + placeholderText: "Search" + } + + Cura.SecondaryButton + { + id: createNewProjectButton + + text: "New Library project" + visible: createNewProjectButtonVisible && manager.userAccountCanCreateNewLibraryProject && (manager.retrievingProjectsStatus == DF.RetrievalStatus.Success || manager.retrievingProjectsStatus == DF.RetrievalStatus.Failed) + + onClicked: + { + createNewProjectPopup.open() + } + busy: manager.creatingNewProjectStatus == DF.RetrievalStatus.InProgress + } + + + Cura.SecondaryButton + { + id: upgradePlanButton + + text: "Upgrade plan" + iconSource: UM.Theme.getIcon("LinkExternal") + visible: createNewProjectButtonVisible && !manager.userAccountCanCreateNewLibraryProject && (manager.retrievingProjectsStatus == DF.RetrievalStatus.Success || manager.retrievingProjectsStatus == DF.RetrievalStatus.Failed) + tooltip: "You have reached the maximum number of projects allowed by your subscription. Please upgrade to the Professional subscription to create more projects." + tooltipWidth: parent.width * 0.5 + + onClicked: Qt.openUrlExternally("https://ultimaker.com/software/ultimaker-essentials/sign-up-cura?utm_source=cura&utm_medium=software&utm_campaign=lib-max") + } + } + + Item + { + id: noLibraryProjectsContainer + anchors + { + top: parent.top + bottom: parent.bottom + left: parent.left + right: parent.right + } + visible: manager.digitalFactoryProjectModel.count == 0 && (manager.retrievingProjectsStatus == DF.RetrievalStatus.Success || manager.retrievingProjectsStatus == DF.RetrievalStatus.Failed) + + Column + { + anchors.centerIn: parent + spacing: UM.Theme.getSize("thin_margin").height + Image + { + id: digitalFactoryImage + anchors.horizontalCenter: parent.horizontalCenter + source: searchBar.text === "" ? "../images/digital_factory.svg" : "../images/projects_not_found.svg" + fillMode: Image.PreserveAspectFit + width: parent.width - 2 * UM.Theme.getSize("thick_margin").width + } + + Label + { + id: noLibraryProjectsLabel + anchors.horizontalCenter: parent.horizontalCenter + text: searchBar.text === "" ? "It appears that you don't have any projects in the Library yet." : "No projects found that match the search query." + font: UM.Theme.getFont("medium") + color: UM.Theme.getColor("text") + } + + Cura.TertiaryButton + { + id: visitDigitalLibraryButton + anchors.horizontalCenter: parent.horizontalCenter + text: "Visit Digital Library" + onClicked: Qt.openUrlExternally(CuraApplication.ultimakerDigitalFactoryUrl + "/app/library") + visible: searchBar.text === "" //Show the link to Digital Library when there are no projects in the user's Library. + } + } + } + + Item + { + id: projectListContainer + anchors + { + top: headerRow.bottom + topMargin: UM.Theme.getSize("default_margin").height + bottom: parent.bottom + left: parent.left + right: parent.right + } + visible: manager.digitalFactoryProjectModel.count > 0 + + // Use a flickable and a column with a repeater instead of a ListView in a ScrollView, because the ScrollView cannot + // have additional children (aside from the view inside it), which wouldn't allow us to add the LoadMoreProjectsCard + // in it. + Flickable + { + id: flickableView + clip: true + contentWidth: parent.width + contentHeight: projectsListView.implicitHeight + anchors.fill: parent + + ScrollBar.vertical: ScrollBar + { + // Vertical ScrollBar, styled similarly to the scrollBar in the settings panel + id: verticalScrollBar + visible: flickableView.contentHeight > flickableView.height + + background: Rectangle + { + implicitWidth: UM.Theme.getSize("scrollbar").width + radius: Math.round(implicitWidth / 2) + color: UM.Theme.getColor("scrollbar_background") + } + + contentItem: Rectangle + { + id: scrollViewHandle + implicitWidth: UM.Theme.getSize("scrollbar").width + radius: Math.round(implicitWidth / 2) + + color: verticalScrollBar.pressed ? UM.Theme.getColor("scrollbar_handle_down") : verticalScrollBar.hovered ? UM.Theme.getColor("scrollbar_handle_hover") : UM.Theme.getColor("scrollbar_handle") + Behavior on color { ColorAnimation { duration: 50; } } + } + } + + Column + { + id: projectsListView + width: verticalScrollBar.visible ? parent.width - verticalScrollBar.width - UM.Theme.getSize("default_margin").width : parent.width + anchors.top: parent.top + spacing: UM.Theme.getSize("narrow_margin").width + + Repeater + { + model: manager.digitalFactoryProjectModel + delegate: ProjectSummaryCard + { + id: projectSummaryCard + imageSource: model.thumbnailUrl || "../images/placeholder.svg" + projectNameText: model.displayName + projectUsernameText: model.username + projectLastUpdatedText: "Last updated: " + model.lastUpdated + + onClicked: + { + manager.selectedProjectIndex = index + } + } + } + + LoadMoreProjectsCard + { + id: loadMoreProjectsCard + height: UM.Theme.getSize("toolbox_thumbnail_small").height + width: parent.width + visible: manager.digitalFactoryProjectModel.count > 0 + hasMoreProjectsToLoad: manager.hasMoreProjectsToLoad + + onClicked: + { + manager.loadMoreProjects() + } + } + } + } + } + + CreateNewProjectPopup + { + id: createNewProjectPopup + width: 400 * screenScaleFactor + height: 220 * screenScaleFactor + x: Math.round((parent.width - width) / 2) + y: Math.round((parent.height - height) / 2) + } +} \ No newline at end of file diff --git a/plugins/DigitalLibrary/src/BaseModel.py b/plugins/DigitalLibrary/src/BaseModel.py new file mode 100644 index 0000000000..5bfd14feba --- /dev/null +++ b/plugins/DigitalLibrary/src/BaseModel.py @@ -0,0 +1,74 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from datetime import datetime, timezone +from typing import TypeVar, Dict, List, Any, Type, Union + + +# Type variable used in the parse methods below, which should be a subclass of BaseModel. +T = TypeVar("T", bound="BaseModel") + + +class BaseModel: + + def __init__(self, **kwargs) -> None: + self.__dict__.update(kwargs) + self.validate() + + # Validates the model, raising an exception if the model is invalid. + def validate(self) -> None: + pass + + def __eq__(self, other): + """Checks whether the two models are equal. + + :param other: The other model. + :return: True if they are equal, False if they are different. + """ + return type(self) == type(other) and self.toDict() == other.toDict() + + def __ne__(self, other) -> bool: + """Checks whether the two models are different. + + :param other: The other model. + :return: True if they are different, False if they are the same. + """ + return type(self) != type(other) or self.toDict() != other.toDict() + + def toDict(self) -> Dict[str, Any]: + """Converts the model into a serializable dictionary""" + + return self.__dict__ + + @staticmethod + def parseModel(model_class: Type[T], values: Union[T, Dict[str, Any]]) -> T: + """Parses a single model. + + :param model_class: The model class. + :param values: The value of the model, which is usually a dictionary, but may also be already parsed. + :return: An instance of the model_class given. + """ + if isinstance(values, dict): + return model_class(**values) + return values + + @classmethod + def parseModels(cls, model_class: Type[T], values: List[Union[T, Dict[str, Any]]]) -> List[T]: + """Parses a list of models. + + :param model_class: The model class. + :param values: The value of the list. Each value is usually a dictionary, but may also be already parsed. + :return: A list of instances of the model_class given. + """ + return [cls.parseModel(model_class, value) for value in values] + + @staticmethod + def parseDate(date: Union[str, datetime]) -> datetime: + """Parses the given date string. + + :param date: The date to parse. + :return: The parsed date. + """ + if isinstance(date, datetime): + return date + return datetime.strptime(date, "%Y-%m-%dT%H:%M:%S.%fZ").replace(tzinfo=timezone.utc) diff --git a/plugins/DigitalLibrary/src/CloudError.py b/plugins/DigitalLibrary/src/CloudError.py new file mode 100644 index 0000000000..3c3f5eece2 --- /dev/null +++ b/plugins/DigitalLibrary/src/CloudError.py @@ -0,0 +1,31 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from typing import Dict, Optional, Any + +from .BaseModel import BaseModel + + +class CloudError(BaseModel): + """Class representing errors generated by the servers, according to the JSON-API standard.""" + + def __init__(self, id: str, code: str, title: str, http_status: str, detail: Optional[str] = None, + meta: Optional[Dict[str, Any]] = None, **kwargs) -> None: + """Creates a new error object. + + :param id: Unique identifier for this particular occurrence of the problem. + :param title: A short, human-readable summary of the problem that SHOULD NOT change from occurrence to occurrence + of the problem, except for purposes of localization. + :param code: An application-specific error code, expressed as a string value. + :param detail: A human-readable explanation specific to this occurrence of the problem. Like title, this field's + value can be localized. + :param http_status: The HTTP status code applicable to this problem, converted to string. + :param meta: Non-standard meta-information about the error, depending on the error code. + """ + + self.id = id + self.code = code + self.http_status = http_status + self.title = title + self.detail = detail + self.meta = meta + super().__init__(**kwargs) diff --git a/plugins/DigitalLibrary/src/DFFileExportAndUploadManager.py b/plugins/DigitalLibrary/src/DFFileExportAndUploadManager.py new file mode 100644 index 0000000000..69163f9cdf --- /dev/null +++ b/plugins/DigitalLibrary/src/DFFileExportAndUploadManager.py @@ -0,0 +1,373 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +import json +import threading +from json import JSONDecodeError +from typing import List, Dict, Any, Callable, Union, Optional + +from PyQt5.QtCore import QUrl +from PyQt5.QtGui import QDesktopServices +from PyQt5.QtNetwork import QNetworkReply + +from UM.FileHandler.FileHandler import FileHandler +from UM.Logger import Logger +from UM.Message import Message +from UM.Scene.SceneNode import SceneNode +from cura.CuraApplication import CuraApplication +from .DFLibraryFileUploadRequest import DFLibraryFileUploadRequest +from .DFLibraryFileUploadResponse import DFLibraryFileUploadResponse +from .DFPrintJobUploadRequest import DFPrintJobUploadRequest +from .DFPrintJobUploadResponse import DFPrintJobUploadResponse +from .DigitalFactoryApiClient import DigitalFactoryApiClient +from .ExportFileJob import ExportFileJob + + +class DFFileExportAndUploadManager: + """ + Class responsible for exporting the scene and uploading the exported data to the Digital Factory Library. Since 3mf + and UFP files may need to be uploaded at the same time, this class keeps a single progress and success message for + both files and updates those messages according to the progress of both the file job uploads. + """ + def __init__(self, file_handlers: Dict[str, FileHandler], + nodes: List[SceneNode], + library_project_id: str, + library_project_name: str, + file_name: str, + formats: List[str], + on_upload_error: Callable[[], Any], + on_upload_success: Callable[[], Any], + on_upload_finished: Callable[[], Any] , + on_upload_progress: Callable[[int], Any]) -> None: + + self._file_handlers = file_handlers # type: Dict[str, FileHandler] + self._nodes = nodes # type: List[SceneNode] + self._library_project_id = library_project_id # type: str + self._library_project_name = library_project_name # type: str + self._file_name = file_name # type: str + self._upload_jobs = [] # type: List[ExportFileJob] + self._formats = formats # type: List[str] + self._api = DigitalFactoryApiClient(application = CuraApplication.getInstance(), on_error = lambda error: Logger.log("e", str(error))) + + # Functions of the parent class that should be called based on the upload process output + self._on_upload_error = on_upload_error + self._on_upload_success = on_upload_success + self._on_upload_finished = on_upload_finished + self._on_upload_progress = on_upload_progress + + # Lock used for updating the progress message (since the progress is changed by two parallel upload jobs) or + # show the success message (once both upload jobs are done) + self._message_lock = threading.Lock() + + self._file_upload_job_metadata = self.initializeFileUploadJobMetadata() # type: Dict[str, Dict[str, Any]] + + self.progress_message = Message( + title = "Uploading...", + text = "Uploading files to '{}'".format(self._library_project_name), + progress = -1, + lifetime = 0, + dismissable = False, + use_inactivity_timer = False + ) + + self._generic_success_message = Message( + text = "Your {} uploaded to '{}'.".format("file was" if len(self._file_upload_job_metadata) <= 1 else "files were", self._library_project_name), + title = "Upload successful", + lifetime = 0, + ) + self._generic_success_message.addAction( + "open_df_project", + "Open project", + "open-folder", "Open the project containing the file in Digital Library" + ) + self._generic_success_message.actionTriggered.connect(self._onMessageActionTriggered) + + + + def _onCuraProjectFileExported(self, job: ExportFileJob) -> None: + """Handler for when the DF Library workspace file (3MF) has been created locally. + + It can now be sent over the Digital Factory API. + """ + if not job.getOutput(): + self._onJobExportError(job.getFileName()) + return + self._file_upload_job_metadata[job.getFileName()]["export_job_output"] = job.getOutput() + request = DFLibraryFileUploadRequest( + content_type = job.getMimeType(), + file_name = job.getFileName(), + file_size = len(job.getOutput()), + library_project_id = self._library_project_id + ) + self._api.requestUpload3MF(request, on_finished = self._uploadFileData, on_error = self._onRequestUploadCuraProjectFileFailed) + + def _onPrintFileExported(self, job: ExportFileJob) -> None: + """Handler for when the DF Library print job file (UFP) has been created locally. + + It can now be sent over the Digital Factory API. + """ + if not job.getOutput(): + self._onJobExportError(job.getFileName()) + return + self._file_upload_job_metadata[job.getFileName()]["export_job_output"] = job.getOutput() + request = DFPrintJobUploadRequest( + content_type = job.getMimeType(), + job_name = job.getFileName(), + file_size = len(job.getOutput()), + library_project_id = self._library_project_id + ) + self._api.requestUploadUFP(request, on_finished = self._uploadFileData, on_error = self._onRequestUploadPrintFileFailed) + + def _uploadFileData(self, file_upload_response: Union[DFLibraryFileUploadResponse, DFPrintJobUploadResponse]) -> None: + """Uploads the exported file data after the file or print job upload has been registered at the Digital Factory + Library API. + + :param file_upload_response: The response received from the Digital Factory Library API. + """ + if isinstance(file_upload_response, DFLibraryFileUploadResponse): + file_name = file_upload_response.file_name + elif isinstance(file_upload_response, DFPrintJobUploadResponse): + file_name = file_upload_response.job_name if file_upload_response.job_name is not None else "" + else: + Logger.log("e", "Wrong response type received. Aborting uploading file to the Digital Library") + return + with self._message_lock: + self.progress_message.show() + self._file_upload_job_metadata[file_name]["file_upload_response"] = file_upload_response + job_output = self._file_upload_job_metadata[file_name]["export_job_output"] + + with self._message_lock: + self._file_upload_job_metadata[file_name]["upload_status"] = "uploading" + + self._api.uploadExportedFileData(file_upload_response, + job_output, + on_finished = self._onFileUploadFinished, + on_success = self._onUploadSuccess, + on_progress = self._onUploadProgress, + on_error = self._onUploadError) + + def _onUploadProgress(self, filename: str, progress: int) -> None: + """ + Updates the progress message according to the total progress of the two files and displays it to the user. It is + made thread-safe with a lock, since the progress can be updated by two separate upload jobs + + :param filename: The name of the file for which we have progress (including the extension). + :param progress: The progress percentage + """ + with self._message_lock: + self._file_upload_job_metadata[filename]["upload_progress"] = progress + self._file_upload_job_metadata[filename]["upload_status"] = "uploading" + total_progress = self.getTotalProgress() + self.progress_message.setProgress(total_progress) + self.progress_message.show() + self._on_upload_progress(progress) + + def _onUploadSuccess(self, filename: str) -> None: + """ + Sets the upload status to success and the progress of the file with the given filename to 100%. This function is + should be called only if the file has uploaded all of its data successfully (i.e. no error occurred during the + upload process). + + :param filename: The name of the file that was uploaded successfully (including the extension). + """ + with self._message_lock: + self._file_upload_job_metadata[filename]["upload_status"] = "success" + self._file_upload_job_metadata[filename]["upload_progress"] = 100 + self._on_upload_success() + + def _onFileUploadFinished(self, filename: str) -> None: + """ + Callback that makes sure the correct messages are displayed according to the statuses of the individual jobs. + + This function is called whenever an upload job has finished, regardless if it had errors or was successful. + Both jobs have to have finished for the messages to show. + + :param filename: The name of the file that has finished uploading (including the extension). + """ + with self._message_lock: + + # All files have finished their uploading process + if all([(file_upload_job["upload_progress"] == 100 and file_upload_job["upload_status"] != "uploading") for file_upload_job in self._file_upload_job_metadata.values()]): + + # Reset and hide the progress message + self.progress_message.setProgress(-1) + self.progress_message.hide() + + # All files were successfully uploaded. + if all([(file_upload_job["upload_status"] == "success") for file_upload_job in self._file_upload_job_metadata.values()]): + # Show a single generic success message for all files + self._generic_success_message.show() + else: # One or more files failed to upload. + # Show individual messages for each file, according to their statuses + for filename, upload_job_metadata in self._file_upload_job_metadata.items(): + if upload_job_metadata["upload_status"] == "success": + upload_job_metadata["file_upload_success_message"].show() + else: + upload_job_metadata["file_upload_failed_message"].show() + + # Call the parent's finished function + self._on_upload_finished() + + def _onJobExportError(self, filename: str) -> None: + """ + Displays an appropriate message when the process to export a file fails. + + :param filename: The name of the file that failed to be exported (including the extension). + """ + Logger.log("d", "Error while exporting file '{}'".format(filename)) + with self._message_lock: + # Set the progress to 100% when the upload job fails, to avoid having the progress message stuck + self._file_upload_job_metadata[filename]["upload_status"] = "failed" + self._file_upload_job_metadata[filename]["upload_progress"] = 100 + self._file_upload_job_metadata[filename]["file_upload_failed_message"] = Message( + text = "Failed to export the file '{}'. The upload process is aborted.".format(filename), + title = "Export error", + lifetime = 0 + ) + self._on_upload_error() + self._onFileUploadFinished(filename) + + def _onRequestUploadCuraProjectFileFailed(self, reply: "QNetworkReply", network_error: "QNetworkReply.NetworkError") -> None: + """ + Displays an appropriate message when the request to upload the Cura project file (.3mf) to the Digital Library fails. + This means that something went wrong with the initial request to create a "file" entry in the digital library. + """ + reply_string = bytes(reply.readAll()).decode() + filename_3mf = self._file_name + ".3mf" + Logger.log("d", "An error occurred while uploading the Cura project file '{}' to the Digital Library project '{}': {}".format(filename_3mf, self._library_project_id, reply_string)) + with self._message_lock: + # Set the progress to 100% when the upload job fails, to avoid having the progress message stuck + self._file_upload_job_metadata[filename_3mf]["upload_status"] = "failed" + self._file_upload_job_metadata[filename_3mf]["upload_progress"] = 100 + + human_readable_error = self.extractErrorTitle(reply_string) + self._file_upload_job_metadata[filename_3mf]["file_upload_failed_message"] = Message( + text = "Failed to upload the file '{}' to '{}'. {}".format(filename_3mf, self._library_project_name, human_readable_error), + title = "File upload error", + lifetime = 0 + ) + self._on_upload_error() + self._onFileUploadFinished(filename_3mf) + + def _onRequestUploadPrintFileFailed(self, reply: "QNetworkReply", network_error: "QNetworkReply.NetworkError") -> None: + """ + Displays an appropriate message when the request to upload the print file (.ufp) to the Digital Library fails. + This means that something went wrong with the initial request to create a "file" entry in the digital library. + """ + reply_string = bytes(reply.readAll()).decode() + filename_ufp = self._file_name + ".ufp" + Logger.log("d", "An error occurred while uploading the print job file '{}' to the Digital Library project '{}': {}".format(filename_ufp, self._library_project_id, reply_string)) + with self._message_lock: + # Set the progress to 100% when the upload job fails, to avoid having the progress message stuck + self._file_upload_job_metadata[filename_ufp]["upload_status"] = "failed" + self._file_upload_job_metadata[filename_ufp]["upload_progress"] = 100 + + human_readable_error = self.extractErrorTitle(reply_string) + self._file_upload_job_metadata[filename_ufp]["file_upload_failed_message"] = Message( + title = "File upload error", + text = "Failed to upload the file '{}' to '{}'. {}".format(filename_ufp, self._library_project_name, human_readable_error), + lifetime = 0 + ) + self._on_upload_error() + self._onFileUploadFinished(filename_ufp) + + @staticmethod + def extractErrorTitle(reply_body: Optional[str]) -> str: + error_title = "" + if reply_body: + try: + reply_dict = json.loads(reply_body) + except JSONDecodeError: + Logger.logException("w", "Unable to extract title from reply body") + return error_title + if "errors" in reply_dict and len(reply_dict["errors"]) >= 1 and "title" in reply_dict["errors"][0]: + error_title = reply_dict["errors"][0]["title"] + return error_title + + def _onUploadError(self, filename: str, reply: "QNetworkReply", error: "QNetworkReply.NetworkError") -> None: + """ + Displays the given message if uploading the mesh has failed due to a generic error (i.e. lost connection). + If one of the two files fail, this error function will set its progress as finished, to make sure that the + progress message doesn't get stuck. + + :param filename: The name of the file that failed to upload (including the extension). + """ + reply_string = bytes(reply.readAll()).decode() + Logger.log("d", "Error while uploading '{}' to the Digital Library project '{}'. Reply: {}".format(filename, self._library_project_id, reply_string)) + with self._message_lock: + # Set the progress to 100% when the upload job fails, to avoid having the progress message stuck + self._file_upload_job_metadata[filename]["upload_status"] = "failed" + self._file_upload_job_metadata[filename]["upload_progress"] = 100 + human_readable_error = self.extractErrorTitle(reply_string) + self._file_upload_job_metadata[filename]["file_upload_failed_message"] = Message( + title = "File upload error", + text = "Failed to upload the file '{}' to '{}'. {}".format(self._file_name, self._library_project_name, human_readable_error), + lifetime = 0 + ) + + self._on_upload_error() + + def getTotalProgress(self) -> int: + """ + Returns the total upload progress of all the upload jobs + + :return: The average progress percentage + """ + return int(sum([file_upload_job["upload_progress"] for file_upload_job in self._file_upload_job_metadata.values()]) / len(self._file_upload_job_metadata.values())) + + def _onMessageActionTriggered(self, message, action): + if action == "open_df_project": + project_url = "{}/app/library/project/{}?wait_for_new_files=true".format(CuraApplication.getInstance().ultimakerDigitalFactoryUrl, self._library_project_id) + QDesktopServices.openUrl(QUrl(project_url)) + message.hide() + + def start(self) -> None: + for job in self._upload_jobs: + job.start() + + def initializeFileUploadJobMetadata(self) -> Dict[str, Any]: + metadata = {} + self._upload_jobs = [] + if "3mf" in self._formats and "3mf" in self._file_handlers and self._file_handlers["3mf"]: + filename_3mf = self._file_name + ".3mf" + metadata[filename_3mf] = { + "export_job_output" : None, + "upload_progress" : -1, + "upload_status" : "", + "file_upload_response": None, + "file_upload_success_message": Message( + text = "'{}' was uploaded to '{}'.".format(filename_3mf, self._library_project_name), + title = "Upload successful", + lifetime = 0, + ), + "file_upload_failed_message": Message( + text = "Failed to upload the file '{}' to '{}'.".format(filename_3mf, self._library_project_name), + title = "File upload error", + lifetime = 0 + ) + } + job_3mf = ExportFileJob(self._file_handlers["3mf"], self._nodes, self._file_name, "3mf") + job_3mf.finished.connect(self._onCuraProjectFileExported) + self._upload_jobs.append(job_3mf) + + if "ufp" in self._formats and "ufp" in self._file_handlers and self._file_handlers["ufp"]: + filename_ufp = self._file_name + ".ufp" + metadata[filename_ufp] = { + "export_job_output" : None, + "upload_progress" : -1, + "upload_status" : "", + "file_upload_response": None, + "file_upload_success_message": Message( + text = "'{}' was uploaded to '{}'.".format(filename_ufp, self._library_project_name), + title = "Upload successful", + lifetime = 0, + ), + "file_upload_failed_message": Message( + text = "Failed to upload the file '{}' to '{}'.".format(filename_ufp, self._library_project_name), + title = "File upload error", + lifetime = 0 + ) + } + job_ufp = ExportFileJob(self._file_handlers["ufp"], self._nodes, self._file_name, "ufp") + job_ufp.finished.connect(self._onPrintFileExported) + self._upload_jobs.append(job_ufp) + return metadata diff --git a/plugins/DigitalLibrary/src/DFFileUploader.py b/plugins/DigitalLibrary/src/DFFileUploader.py new file mode 100644 index 0000000000..10fee03c4c --- /dev/null +++ b/plugins/DigitalLibrary/src/DFFileUploader.py @@ -0,0 +1,149 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply +from typing import Callable, Any, cast, Optional, Union + +from UM.Logger import Logger +from UM.TaskManagement.HttpRequestManager import HttpRequestManager +from .DFLibraryFileUploadResponse import DFLibraryFileUploadResponse +from .DFPrintJobUploadResponse import DFPrintJobUploadResponse + + +class DFFileUploader: + """Class responsible for uploading meshes to the the digital factory library in separate requests.""" + + # The maximum amount of times to retry if the server returns one of the RETRY_HTTP_CODES + MAX_RETRIES = 10 + + # The HTTP codes that should trigger a retry. + RETRY_HTTP_CODES = {500, 502, 503, 504} + + def __init__(self, + http: HttpRequestManager, + df_file: Union[DFLibraryFileUploadResponse, DFPrintJobUploadResponse], + data: bytes, + on_finished: Callable[[str], Any], + on_success: Callable[[str], Any], + on_progress: Callable[[str, int], Any], + on_error: Callable[[str, "QNetworkReply", "QNetworkReply.NetworkError"], Any] + ) -> None: + """Creates a mesh upload object. + + :param http: The network access manager that will handle the HTTP requests. + :param df_file: The file response that was received by the Digital Factory after registering the upload. + :param data: The mesh bytes to be uploaded. + :param on_finished: The method to be called when done. + :param on_success: The method to be called when the upload is successful. + :param on_progress: The method to be called when the progress changes (receives a percentage 0-100). + :param on_error: The method to be called when an error occurs. + """ + + self._http = http # type: HttpRequestManager + self._df_file = df_file # type: Union[DFLibraryFileUploadResponse, DFPrintJobUploadResponse] + self._file_name = "" + if isinstance(self._df_file, DFLibraryFileUploadResponse): + self._file_name = self._df_file.file_name + elif isinstance(self._df_file, DFPrintJobUploadResponse): + if self._df_file.job_name is not None: + self._file_name = self._df_file.job_name + else: + self._file_name = "" + else: + raise TypeError("Incorrect input type") + self._data = data # type: bytes + + self._on_finished = on_finished + self._on_success = on_success + self._on_progress = on_progress + self._on_error = on_error + + self._retries = 0 + self._finished = False + + def start(self) -> None: + """Starts uploading the mesh.""" + + if self._finished: + # reset state. + self._retries = 0 + self._finished = False + self._upload() + + def stop(self): + """Stops uploading the mesh, marking it as finished.""" + + Logger.log("i", "Finished uploading") + self._finished = True # Signal to any ongoing retries that we should stop retrying. + self._on_finished(self._file_name) + + def _upload(self) -> None: + """ + Uploads the file to the Digital Factory Library project + """ + if self._finished: + raise ValueError("The upload is already finished") + if isinstance(self._df_file, DFLibraryFileUploadResponse): + Logger.log("i", "Uploading Cura project file '{file_name}' via link '{upload_url}'".format(file_name = self._df_file.file_name, upload_url = self._df_file.upload_url)) + elif isinstance(self._df_file, DFPrintJobUploadResponse): + Logger.log("i", "Uploading Cura print file '{file_name}' via link '{upload_url}'".format(file_name = self._df_file.job_name, upload_url = self._df_file.upload_url)) + self._http.put( + url = cast(str, self._df_file.upload_url), + headers_dict = {"Content-Type": cast(str, self._df_file.content_type)}, + data = self._data, + callback = self._onUploadFinished, + error_callback = self._onUploadError, + upload_progress_callback = self._onUploadProgressChanged + ) + + def _onUploadProgressChanged(self, bytes_sent: int, bytes_total: int) -> None: + """Handles an update to the upload progress + + :param bytes_sent: The amount of bytes sent in the current request. + :param bytes_total: The amount of bytes to send in the current request. + """ + Logger.debug("Cloud upload progress %s / %s", bytes_sent, bytes_total) + if bytes_total: + self._on_progress(self._file_name, int(bytes_sent / len(self._data) * 100)) + + def _onUploadError(self, reply: QNetworkReply, error: QNetworkReply.NetworkError) -> None: + """Handles an error uploading.""" + + body = bytes(reply.peek(reply.bytesAvailable())).decode() + Logger.log("e", "Received error while uploading: %s", body) + self._on_error(self._file_name, reply, error) + self.stop() + + def _onUploadFinished(self, reply: QNetworkReply) -> None: + """ + Checks whether a chunk of data was uploaded successfully, starting the next chunk if needed. + """ + + Logger.log("i", "Finished callback %s %s", + reply.attribute(QNetworkRequest.HttpStatusCodeAttribute), reply.url().toString()) + + status_code = reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) # type: Optional[int] + if not status_code: + Logger.log("e", "Reply contained no status code.") + self._onUploadError(reply, None) + return + + # check if we should retry the last chunk + if self._retries < self.MAX_RETRIES and status_code in self.RETRY_HTTP_CODES: + self._retries += 1 + Logger.log("i", "Retrying %s/%s request %s", self._retries, self.MAX_RETRIES, reply.url().toString()) + try: + self._upload() + except ValueError: # Asynchronously it could have completed in the meanwhile. + pass + return + + # Http codes that are not to be retried are assumed to be errors. + if status_code > 308: + self._onUploadError(reply, None) + return + + Logger.log("d", "status_code: %s, Headers: %s, body: %s", status_code, + [bytes(header).decode() for header in reply.rawHeaderList()], bytes(reply.readAll()).decode()) + self._on_success(self._file_name) + self.stop() diff --git a/plugins/DigitalLibrary/src/DFLibraryFileUploadRequest.py b/plugins/DigitalLibrary/src/DFLibraryFileUploadRequest.py new file mode 100644 index 0000000000..d9f1af1490 --- /dev/null +++ b/plugins/DigitalLibrary/src/DFLibraryFileUploadRequest.py @@ -0,0 +1,16 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +# Model that represents the request to upload a file to a DF Library project +from .BaseModel import BaseModel + + +class DFLibraryFileUploadRequest(BaseModel): + + def __init__(self, content_type: str, file_name: str, file_size: int, library_project_id: str, **kwargs) -> None: + + self.content_type = content_type + self.file_name = file_name + self.file_size = file_size + self.library_project_id = library_project_id + super().__init__(**kwargs) diff --git a/plugins/DigitalLibrary/src/DFLibraryFileUploadResponse.py b/plugins/DigitalLibrary/src/DFLibraryFileUploadResponse.py new file mode 100644 index 0000000000..3093c39076 --- /dev/null +++ b/plugins/DigitalLibrary/src/DFLibraryFileUploadResponse.py @@ -0,0 +1,49 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from datetime import datetime +from typing import Optional + +from .BaseModel import BaseModel + + +class DFLibraryFileUploadResponse(BaseModel): + """ + Model that represents the response received from the Digital Factory after requesting to upload a file in a Library project + """ + + def __init__(self, client_id: str, content_type: str, file_id: str, file_name: str, library_project_id: str, + status: str, uploaded_at: str, user_id: str, username: str, download_url: Optional[str] = None, + file_size: Optional[int] = None, status_description: Optional[str] = None, + upload_url: Optional[str] = None, **kwargs) -> None: + + """ + :param client_id: The ID of the OAuth2 client that uploaded this file + :param content_type: The content type of the Digital Library project file + :param file_id: The ID of the library project file + :param file_name: The name of the file + :param library_project_id: The ID of the library project, in which the file will be uploaded + :param status: The status of the Digital Library project file + :param uploaded_at: The time on which the file was uploaded + :param user_id: The ID of the user that uploaded this file + :param username: The user's unique username + :param download_url: A signed URL to download the resulting file. Only available when the job is finished + :param file_size: The size of the uploaded file (in bytes) + :param status_description: Contains more details about the status, e.g. the cause of failures + :param upload_url: The one-time use URL where the file must be uploaded to (only if status is uploading) + :param kwargs: Other keyword arguments that may be included in the response + """ + + self.client_id = client_id # type: str + self.content_type = content_type # type: str + self.file_id = file_id # type: str + self.file_name = file_name # type: str + self.library_project_id = library_project_id # type: str + self.status = status # type: str + self.uploaded_at = self.parseDate(uploaded_at) # type: datetime + self.user_id = user_id # type: str + self.username = username # type: str + self.download_url = download_url # type: Optional[str] + self.file_size = file_size # type: Optional[int] + self.status_description = status_description # type: Optional[str] + self.upload_url = upload_url # type: Optional[str] + super().__init__(**kwargs) diff --git a/plugins/DigitalLibrary/src/DFPrintJobUploadRequest.py b/plugins/DigitalLibrary/src/DFPrintJobUploadRequest.py new file mode 100644 index 0000000000..ab434e3f04 --- /dev/null +++ b/plugins/DigitalLibrary/src/DFPrintJobUploadRequest.py @@ -0,0 +1,21 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from .BaseModel import BaseModel + + +# Model that represents the request to upload a print job to the cloud +class DFPrintJobUploadRequest(BaseModel): + + def __init__(self, job_name: str, file_size: int, content_type: str, library_project_id: str, **kwargs) -> None: + """Creates a new print job upload request. + + :param job_name: The name of the print job. + :param file_size: The size of the file in bytes. + :param content_type: The content type of the print job (e.g. text/plain or application/gzip) + """ + + self.job_name = job_name + self.file_size = file_size + self.content_type = content_type + self.library_project_id = library_project_id + super().__init__(**kwargs) diff --git a/plugins/DigitalLibrary/src/DFPrintJobUploadResponse.py b/plugins/DigitalLibrary/src/DFPrintJobUploadResponse.py new file mode 100644 index 0000000000..35819645de --- /dev/null +++ b/plugins/DigitalLibrary/src/DFPrintJobUploadResponse.py @@ -0,0 +1,35 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from typing import Optional + +from .BaseModel import BaseModel + + +# Model that represents the response received from the cloud after requesting to upload a print job +class DFPrintJobUploadResponse(BaseModel): + + def __init__(self, job_id: str, status: str, download_url: Optional[str] = None, job_name: Optional[str] = None, + upload_url: Optional[str] = None, content_type: Optional[str] = None, + status_description: Optional[str] = None, slicing_details: Optional[dict] = None, **kwargs) -> None: + """Creates a new print job response model. + + :param job_id: The job unique ID, e.g. 'kBEeZWEifXbrXviO8mRYLx45P8k5lHVGs43XKvRniPg='. + :param status: The status of the print job. + :param status_description: Contains more details about the status, e.g. the cause of failures. + :param download_url: A signed URL to download the resulting status. Only available when the job is finished. + :param job_name: The name of the print job. + :param slicing_details: Model for slice information. + :param upload_url: The one-time use URL where the toolpath must be uploaded to (only if status is uploading). + :param content_type: The content type of the print job (e.g. text/plain or application/gzip) + :param generated_time: The datetime when the object was generated on the server-side. + """ + + self.job_id = job_id + self.status = status + self.download_url = download_url + self.job_name = job_name + self.upload_url = upload_url + self.content_type = content_type + self.status_description = status_description + self.slicing_details = slicing_details + super().__init__(**kwargs) diff --git a/plugins/DigitalLibrary/src/DigitalFactoryApiClient.py b/plugins/DigitalLibrary/src/DigitalFactoryApiClient.py new file mode 100644 index 0000000000..ad87ea9b8a --- /dev/null +++ b/plugins/DigitalLibrary/src/DigitalFactoryApiClient.py @@ -0,0 +1,381 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +import json +from json import JSONDecodeError +import re +from time import time +from typing import List, Any, Optional, Union, Type, Tuple, Dict, cast, TypeVar, Callable + +from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest + +from UM.Logger import Logger +from UM.TaskManagement.HttpRequestManager import HttpRequestManager +from UM.TaskManagement.HttpRequestScope import JsonDecoratorScope +from cura.CuraApplication import CuraApplication +from cura.UltimakerCloud import UltimakerCloudConstants +from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope +from .DFPrintJobUploadResponse import DFPrintJobUploadResponse +from .BaseModel import BaseModel +from .CloudError import CloudError +from .DFFileUploader import DFFileUploader +from .DFLibraryFileUploadRequest import DFLibraryFileUploadRequest +from .DFLibraryFileUploadResponse import DFLibraryFileUploadResponse +from .DFPrintJobUploadRequest import DFPrintJobUploadRequest +from .DigitalFactoryFeatureBudgetResponse import DigitalFactoryFeatureBudgetResponse +from .DigitalFactoryFileResponse import DigitalFactoryFileResponse +from .DigitalFactoryProjectResponse import DigitalFactoryProjectResponse +from .PaginationLinks import PaginationLinks +from .PaginationManager import PaginationManager + +CloudApiClientModel = TypeVar("CloudApiClientModel", bound=BaseModel) +"""The generic type variable used to document the methods below.""" + + +class DigitalFactoryApiClient: + # The URL to access the digital factory. + ROOT_PATH = UltimakerCloudConstants.CuraCloudAPIRoot + CURA_API_ROOT = "{}/cura/v1".format(ROOT_PATH) + + DEFAULT_REQUEST_TIMEOUT = 10 # seconds + + # In order to avoid garbage collection we keep the callbacks in this list. + _anti_gc_callbacks = [] # type: List[Callable[[Any], None]] + + def __init__(self, application: CuraApplication, on_error: Callable[[List[CloudError]], None], projects_limit_per_page: Optional[int] = None) -> None: + """Initializes a new digital factory API client. + + :param application: + :param on_error: The callback to be called whenever we receive errors from the server. + """ + super().__init__() + self._application = application + self._account = application.getCuraAPI().account + self._scope = JsonDecoratorScope(UltimakerCloudScope(application)) + self._http = HttpRequestManager.getInstance() + self._on_error = on_error + self._file_uploader = None # type: Optional[DFFileUploader] + self._library_max_private_projects: Optional[int] = None + + self._projects_pagination_mgr = PaginationManager(limit = projects_limit_per_page) if projects_limit_per_page else None # type: Optional[PaginationManager] + + def checkUserHasAccess(self, callback: Callable) -> None: + """Checks if the user has any sort of access to the digital library. + A user is considered to have access if the max-# of private projects is greater then 0 (or -1 for unlimited). + """ + + def callbackWrap(response: Optional[Any] = None, *args, **kwargs) -> None: + if (response is not None and isinstance(response, DigitalFactoryFeatureBudgetResponse) and + response.library_max_private_projects is not None): + callback( + response.library_max_private_projects == -1 or # Note: -1 is unlimited + response.library_max_private_projects > 0) + self._library_max_private_projects = response.library_max_private_projects + else: + Logger.warning(f"Digital Factory: Response is not a feature budget, likely an error: {str(response)}") + callback(False) + + self._http.get(f"{self.CURA_API_ROOT}/feature_budgets", + scope = self._scope, + callback = self._parseCallback(callbackWrap, DigitalFactoryFeatureBudgetResponse, callbackWrap), + error_callback = callbackWrap, + timeout = self.DEFAULT_REQUEST_TIMEOUT) + + def checkUserCanCreateNewLibraryProject(self, callback: Callable) -> None: + """ + Checks if the user is allowed to create new library projects. + A user is allowed to create new library projects if the haven't reached their maximum allowed private projects. + """ + + def callbackWrap(response: Optional[Any] = None, *args, **kwargs) -> None: + if response is not None: + if isinstance(response, DigitalFactoryProjectResponse): # The user has only one private project + callback(True) + elif isinstance(response, list) and all(isinstance(r, DigitalFactoryProjectResponse) for r in response): + callback(len(response) < cast(int, self._library_max_private_projects)) + else: + Logger.warning(f"Digital Factory: Incorrect response type received when requesting private projects: {str(response)}") + callback(False) + else: + Logger.warning(f"Digital Factory: Response is empty, likely an error: {str(response)}") + callback(False) + + if self._library_max_private_projects is not None and self._library_max_private_projects > 0: + # The user has a limit in the number of private projects they can create. Check whether they have already + # reached that limit. + # Note: Set the pagination manager to None when doing this get request, or else the next/previous links + # of the pagination will become corrupted + url = f"{self.CURA_API_ROOT}/projects?shared=false&limit={self._library_max_private_projects}" + self._http.get(url, + scope = self._scope, + callback = self._parseCallback(callbackWrap, DigitalFactoryProjectResponse, callbackWrap, pagination_manager = None), + error_callback = callbackWrap, + timeout = self.DEFAULT_REQUEST_TIMEOUT) + else: + # If the limit is -1, then the user is allowed unlimited projects. If its 0 then they are not allowed to + # create any projects + callback(self._library_max_private_projects == -1) + + def getProject(self, library_project_id: str, on_finished: Callable[[DigitalFactoryProjectResponse], Any], failed: Callable) -> None: + """ + Retrieves a digital factory project by its library project id. + + :param library_project_id: The id of the library project + :param on_finished: The function to be called after the result is parsed. + :param failed: The function to be called if the request fails. + """ + url = "{}/projects/{}".format(self.CURA_API_ROOT, library_project_id) + + self._http.get(url, + scope = self._scope, + callback = self._parseCallback(on_finished, DigitalFactoryProjectResponse, failed), + error_callback = failed, + timeout = self.DEFAULT_REQUEST_TIMEOUT) + + def getProjectsFirstPage(self, search_filter: str, on_finished: Callable[[List[DigitalFactoryProjectResponse]], Any], failed: Callable) -> None: + """ + Retrieves digital factory projects for the user that is currently logged in. + + If a projects pagination manager exists, then it attempts to get the first page of the paginated projects list, + according to the limit set in the pagination manager. If there is no projects pagination manager, this function + leaves the project limit to the default set on the server side (999999). + + :param search_filter: Text to filter the search results. If given an empty string, results are not filtered. + :param on_finished: The function to be called after the result is parsed. + :param failed: The function to be called if the request fails. + """ + url = f"{self.CURA_API_ROOT}/projects" + query_character = "?" + if self._projects_pagination_mgr: + self._projects_pagination_mgr.reset() # reset to clear all the links and response metadata + url += f"{query_character}limit={self._projects_pagination_mgr.limit}" + query_character = "&" + if search_filter != "": + url += f"{query_character}search={search_filter}" + + self._http.get(url, + scope = self._scope, + callback = self._parseCallback(on_finished, DigitalFactoryProjectResponse, failed, pagination_manager = self._projects_pagination_mgr), + error_callback = failed, + timeout = self.DEFAULT_REQUEST_TIMEOUT) + + def getMoreProjects(self, + on_finished: Callable[[List[DigitalFactoryProjectResponse]], Any], + failed: Callable) -> None: + """Retrieves the next page of the paginated projects list from the API, provided that there is any. + + :param on_finished: The function to be called after the result is parsed. + :param failed: The function to be called if the request fails. + """ + + if self.hasMoreProjectsToLoad(): + url = cast(PaginationLinks, cast(PaginationManager, self._projects_pagination_mgr).links).next_page + self._http.get(url, + scope = self._scope, + callback = self._parseCallback(on_finished, DigitalFactoryProjectResponse, failed, pagination_manager = self._projects_pagination_mgr), + error_callback = failed, + timeout = self.DEFAULT_REQUEST_TIMEOUT) + else: + Logger.log("d", "There are no more projects to load.") + + def hasMoreProjectsToLoad(self) -> bool: + """ + Determines whether the client can get more pages of projects list from the API. + + :return: Whether there are more pages in the projects list available to be retrieved from the API. + """ + return self._projects_pagination_mgr is not None and self._projects_pagination_mgr.links is not None and self._projects_pagination_mgr.links.next_page is not None + + def getListOfFilesInProject(self, library_project_id: str, on_finished: Callable[[List[DigitalFactoryFileResponse]], Any], failed: Callable) -> None: + """Retrieves the list of files contained in the project with library_project_id from the Digital Factory Library. + + :param library_project_id: The id of the digital factory library project in which the files are included + :param on_finished: The function to be called after the result is parsed. + :param failed: The function to be called if the request fails. + """ + + url = "{}/projects/{}/files".format(self.CURA_API_ROOT, library_project_id) + self._http.get(url, + scope = self._scope, + callback = self._parseCallback(on_finished, DigitalFactoryFileResponse, failed), + error_callback = failed, + timeout = self.DEFAULT_REQUEST_TIMEOUT) + + def _parseCallback(self, + on_finished: Union[Callable[[CloudApiClientModel], Any], + Callable[[List[CloudApiClientModel]], Any]], + model: Type[CloudApiClientModel], + on_error: Optional[Callable] = None, + pagination_manager: Optional[PaginationManager] = None) -> Callable[[QNetworkReply], None]: + + """ + Creates a callback function so that it includes the parsing of the response into the correct model. + The callback is added to the 'finished' signal of the reply. If a paginated request was made and a pagination + manager is given, the pagination metadata will be held there. + + :param on_finished: The callback in case the response is successful. Depending on the endpoint it will be either + a list or a single item. + :param model: The type of the model to convert the response to. + :param on_error: The callback in case the response is ... less successful. + :param pagination_manager: Holds the pagination links and metadata contained in paginated responses. + If no pagination manager is provided, the pagination metadata is ignored. + """ + + def parse(reply: QNetworkReply) -> None: + + self._anti_gc_callbacks.remove(parse) + + # Don't try to parse the reply if we didn't get one + if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) is None: + if on_error is not None: + on_error() + return + + status_code, response = self._parseReply(reply) + if status_code >= 300 and on_error is not None: + on_error() + else: + self._parseModels(response, on_finished, model, pagination_manager = pagination_manager) + + self._anti_gc_callbacks.append(parse) + return parse + + @staticmethod + def _parseReply(reply: QNetworkReply) -> Tuple[int, Dict[str, Any]]: + """Parses the given JSON network reply into a status code and a dictionary, handling unexpected errors as well. + + :param reply: The reply from the server. + :return: A tuple with a status code and a dictionary. + """ + + status_code = reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) + try: + response = bytes(reply.readAll()).decode() + return status_code, json.loads(response) + except (UnicodeDecodeError, JSONDecodeError, ValueError) as err: + error = CloudError(code = type(err).__name__, title = str(err), http_code = str(status_code), + id = str(time()), http_status = "500") + Logger.logException("e", "Could not parse the stardust response: %s", error.toDict()) + return status_code, {"errors": [error.toDict()]} + + def _parseModels(self, + response: Dict[str, Any], + on_finished: Union[Callable[[CloudApiClientModel], Any], + Callable[[List[CloudApiClientModel]], Any]], + model_class: Type[CloudApiClientModel], + pagination_manager: Optional[PaginationManager] = None) -> None: + """Parses the given models and calls the correct callback depending on the result. + + :param response: The response from the server, after being converted to a dict. + :param on_finished: The callback in case the response is successful. + :param model_class: The type of the model to convert the response to. It may either be a single record or a list. + :param pagination_manager: Holds the pagination links and metadata contained in paginated responses. + If no pagination manager is provided, the pagination metadata is ignored. + """ + + if "data" in response: + data = response["data"] + if "meta" in response and pagination_manager: + pagination_manager.setResponseMeta(response["meta"]) + if "links" in response and pagination_manager: + pagination_manager.setLinks(response["links"]) + if isinstance(data, list): + results = [model_class(**c) for c in data] # type: List[CloudApiClientModel] + on_finished_list = cast(Callable[[List[CloudApiClientModel]], Any], on_finished) + on_finished_list(results) + else: + result = model_class(**data) # type: CloudApiClientModel + on_finished_item = cast(Callable[[CloudApiClientModel], Any], on_finished) + on_finished_item(result) + elif "errors" in response: + self._on_error([CloudError(**error) for error in response["errors"]]) + else: + Logger.log("e", "Cannot find data or errors in the cloud response: %s", response) + + def requestUpload3MF(self, request: DFLibraryFileUploadRequest, + on_finished: Callable[[DFLibraryFileUploadResponse], Any], + on_error: Optional[Callable[["QNetworkReply", "QNetworkReply.NetworkError"], None]] = None) -> None: + + """Requests the Digital Factory to register the upload of a file in a library project. + + :param request: The request object. + :param on_finished: The function to be called after the result is parsed. + :param on_error: The callback in case the request fails. + """ + + url = "{}/files/upload".format(self.CURA_API_ROOT) + data = json.dumps({"data": request.toDict()}).encode() + + self._http.put(url, + scope = self._scope, + data = data, + callback = self._parseCallback(on_finished, DFLibraryFileUploadResponse), + error_callback = on_error, + timeout = self.DEFAULT_REQUEST_TIMEOUT) + + def requestUploadUFP(self, request: DFPrintJobUploadRequest, + on_finished: Callable[[DFPrintJobUploadResponse], Any], + on_error: Optional[Callable[["QNetworkReply", "QNetworkReply.NetworkError"], None]] = None) -> None: + """Requests the Digital Factory to register the upload of a file in a library project. + + :param request: The request object. + :param on_finished: The function to be called after the result is parsed. + :param on_error: The callback in case the request fails. + """ + + url = "{}/jobs/upload".format(self.CURA_API_ROOT) + data = json.dumps({"data": request.toDict()}).encode() + + self._http.put(url, + scope = self._scope, + data = data, + callback = self._parseCallback(on_finished, DFPrintJobUploadResponse), + error_callback = on_error, + timeout = self.DEFAULT_REQUEST_TIMEOUT) + + def uploadExportedFileData(self, + df_file_upload_response: Union[DFLibraryFileUploadResponse, DFPrintJobUploadResponse], + mesh: bytes, + on_finished: Callable[[str], Any], + on_success: Callable[[str], Any], + on_progress: Callable[[str, int], Any], + on_error: Callable[[str, "QNetworkReply", "QNetworkReply.NetworkError"], Any]) -> None: + + """Uploads an exported file (in bytes) to the Digital Factory Library. + + :param df_file_upload_response: The response received after requesting an upload with `self.requestUpload`. + :param mesh: The mesh data (in bytes) to be uploaded. + :param on_finished: The function to be called after the upload has finished. Called both after on_success and on_error. + It receives the name of the file that has finished uploading. + :param on_success: The function to be called if the upload was successful. + It receives the name of the file that was uploaded successfully. + :param on_progress: A function to be called during upload progress. It receives a percentage (0-100). + It receives the name of the file for which the upload progress should be updated. + :param on_error: A function to be called if the upload fails. + It receives the name of the file that produced errors during the upload process. + """ + + self._file_uploader = DFFileUploader(self._http, df_file_upload_response, mesh, on_finished, on_success, on_progress, on_error) + self._file_uploader.start() + + def createNewProject(self, project_name: str, on_finished: Callable[[DigitalFactoryProjectResponse], Any], on_error: Callable) -> None: + """ Create a new project in the Digital Factory. + + :param project_name: Name of the new to be created project. + :param on_finished: The function to be called after the result is parsed. + :param on_error: The function to be called if anything goes wrong. + """ + Logger.log("i", "Attempt to create new DF project '{}'.".format(project_name)) + + url = "{}/projects".format(self.CURA_API_ROOT) + data = json.dumps({"data": {"display_name": project_name}}).encode() + self._http.put(url, + scope = self._scope, + data = data, + callback = self._parseCallback(on_finished, DigitalFactoryProjectResponse), + error_callback = on_error, + timeout = self.DEFAULT_REQUEST_TIMEOUT) + + def clear(self) -> None: + if self._projects_pagination_mgr is not None: + self._projects_pagination_mgr.reset() diff --git a/plugins/DigitalLibrary/src/DigitalFactoryController.py b/plugins/DigitalLibrary/src/DigitalFactoryController.py new file mode 100644 index 0000000000..cd0f0be638 --- /dev/null +++ b/plugins/DigitalLibrary/src/DigitalFactoryController.py @@ -0,0 +1,620 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +import json +import math +import os +import tempfile +import threading +from enum import IntEnum +from pathlib import Path +from typing import Optional, List, Dict, Any, cast + +from PyQt5.QtCore import pyqtSignal, QObject, pyqtSlot, pyqtProperty, Q_ENUMS, QTimer, QUrl +from PyQt5.QtNetwork import QNetworkReply +from PyQt5.QtQml import qmlRegisterType, qmlRegisterUncreatableType + +from UM.FileHandler.FileHandler import FileHandler +from UM.Logger import Logger +from UM.Message import Message +from UM.Scene.SceneNode import SceneNode +from UM.Signal import Signal +from UM.TaskManagement.HttpRequestManager import HttpRequestManager +from cura.API import Account +from cura.CuraApplication import CuraApplication +from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope +from .DFFileExportAndUploadManager import DFFileExportAndUploadManager +from .DigitalFactoryApiClient import DigitalFactoryApiClient +from .DigitalFactoryFileModel import DigitalFactoryFileModel +from .DigitalFactoryFileResponse import DigitalFactoryFileResponse +from .DigitalFactoryProjectModel import DigitalFactoryProjectModel +from .DigitalFactoryProjectResponse import DigitalFactoryProjectResponse + + +class RetrievalStatus(IntEnum): + """ + The status of an http get request. + + This is not an enum, because we want to use it in QML and QML doesn't recognize Python enums. + """ + Idle = 0 + InProgress = 1 + Success = 2 + Failed = 3 + + +class DFRetrievalStatus(QObject): + """ + Used as an intermediate QObject that registers the RetrievalStatus as a recognizable enum in QML, so that it can + be used within QML objects as DigitalFactory.RetrievalStatus. + """ + + Q_ENUMS(RetrievalStatus) + + +class DigitalFactoryController(QObject): + + DISK_WRITE_BUFFER_SIZE = 256 * 1024 # 256 KB + + selectedProjectIndexChanged = pyqtSignal(int, arguments = ["newProjectIndex"]) + """Signal emitted whenever the selected project is changed in the projects dropdown menu""" + + selectedFileIndicesChanged = pyqtSignal("QList", arguments = ["newFileIndices"]) + """Signal emitted whenever the selected file is changed in the files table""" + + retrievingProjectsStatusChanged = pyqtSignal(int, arguments = ["status"]) + """Signal emitted whenever the status of the 'retrieving projects' http get request is changed""" + + retrievingFilesStatusChanged = pyqtSignal(int, arguments = ["status"]) + """Signal emitted whenever the status of the 'retrieving files in project' http get request is changed""" + + creatingNewProjectStatusChanged = pyqtSignal(int, arguments = ["status"]) + """Signal emitted whenever the status of the 'create new library project' http get request is changed""" + + hasMoreProjectsToLoadChanged = pyqtSignal() + """Signal emitted whenever the variable hasMoreProjectsToLoad is changed. This variable is used to determine if + the paginated list of projects has more pages to show""" + + preselectedProjectChanged = pyqtSignal() + """Signal emitted whenever a preselected project is set. Whenever there is a preselected project, it means that it is + the only project in the ProjectModel. When the preselected project is invalidated, the ProjectsModel needs to be + retrieved again.""" + + projectCreationErrorTextChanged = pyqtSignal() + """Signal emitted whenever the creation of a new project fails and a specific error message is returned from the + server.""" + + """Signals to inform about the process of the file upload""" + uploadStarted = Signal() + uploadFileProgress = Signal() + uploadFileSuccess = Signal() + uploadFileError = Signal() + uploadFileFinished = Signal() + + """Signal to inform about the state of user access.""" + userAccessStateChanged = pyqtSignal(bool) + + """Signal to inform whether the user is allowed to create more Library projects.""" + userCanCreateNewLibraryProjectChanged = pyqtSignal(bool) + + def __init__(self, application: CuraApplication) -> None: + super().__init__(parent = None) + + self._application = application + self._dialog = None # type: Optional["QObject"] + + self.file_handlers = {} # type: Dict[str, FileHandler] + self.nodes = None # type: Optional[List[SceneNode]] + self.file_upload_manager = None # type: Optional[DFFileExportAndUploadManager] + self._has_preselected_project = False # type: bool + + self._api = DigitalFactoryApiClient(self._application, on_error = lambda error: Logger.log("e", str(error)), projects_limit_per_page = 20) + + # Indicates whether there are more pages of projects that can be loaded from the API + self._has_more_projects_to_load = False + + self._account = self._application.getInstance().getCuraAPI().account # type: Account + self._account.loginStateChanged.connect(self._onLoginStateChanged) + self._current_workspace_information = CuraApplication.getInstance().getCurrentWorkspaceInformation() + + # Initialize the project model + self._project_model = DigitalFactoryProjectModel() + self._selected_project_idx = -1 + self._project_creation_error_text = "Something went wrong while creating a new project. Please try again." + self._project_filter = "" + self._project_filter_change_timer = QTimer() + self._project_filter_change_timer.setInterval(200) + self._project_filter_change_timer.setSingleShot(True) + self._project_filter_change_timer.timeout.connect(self._applyProjectFilter) + + # Initialize the file model + self._file_model = DigitalFactoryFileModel() + self._selected_file_indices = [] # type: List[int] + + # Filled after the application has been initialized + self._supported_file_types = {} # type: Dict[str, str] + + # For cleaning up the files afterwards: + self._erase_temp_files_lock = threading.Lock() + + # The statuses which indicate whether Cura is waiting for a response from the DigitalFactory API + self.retrieving_files_status = RetrievalStatus.Idle + self.retrieving_projects_status = RetrievalStatus.Idle + self.creating_new_project_status = RetrievalStatus.Idle + + self._application.engineCreatedSignal.connect(self._onEngineCreated) + self._application.initializationFinished.connect(self._applicationInitializationFinished) + + self._user_has_access = False + self._user_account_can_create_new_project = False + + def clear(self) -> None: + self._project_model.clearProjects() + self._api.clear() + self._has_preselected_project = False + self.preselectedProjectChanged.emit() + + self.setRetrievingFilesStatus(RetrievalStatus.Idle) + self.setRetrievingProjectsStatus(RetrievalStatus.Idle) + self.setCreatingNewProjectStatus(RetrievalStatus.Idle) + + self.setSelectedProjectIndex(-1) + + def _onLoginStateChanged(self, logged_in: bool) -> None: + def callback(has_access, **kwargs): + self._user_has_access = has_access + self.userAccessStateChanged.emit(logged_in) + + self._api.checkUserHasAccess(callback) + + def userAccountHasLibraryAccess(self) -> bool: + """ + Checks whether the currently logged in user account has access to the Digital Library + + :return: True if the user account has Digital Library access, else False + """ + if self._user_has_access: + self._api.checkUserCanCreateNewLibraryProject(callback = self.setCanCreateNewLibraryProject) + return self._user_has_access + + def initialize(self, preselected_project_id: Optional[str] = None) -> None: + self.clear() + + if self._account.isLoggedIn and self.userAccountHasLibraryAccess(): + self.setRetrievingProjectsStatus(RetrievalStatus.InProgress) + if preselected_project_id: + self._api.getProject(preselected_project_id, on_finished = self.setProjectAsPreselected, failed = self._onGetProjectFailed) + else: + self._api.getProjectsFirstPage(search_filter = self._project_filter, on_finished = self._onGetProjectsFirstPageFinished, failed = self._onGetProjectsFailed) + + def setProjectAsPreselected(self, df_project: DigitalFactoryProjectResponse) -> None: + """ + Sets the received df_project as the preselected one. When a project is preselected, it should be the only + project inside the model, so this function first makes sure to clear the projects model. + + :param df_project: The library project intended to be set as preselected + """ + self._project_model.clearProjects() + self._project_model.setProjects([df_project]) + self.setSelectedProjectIndex(0) + self.setHasPreselectedProject(True) + self.setRetrievingProjectsStatus(RetrievalStatus.Success) + self.setCreatingNewProjectStatus(RetrievalStatus.Success) + + def _onGetProjectFailed(self, reply: QNetworkReply, error: QNetworkReply.NetworkError) -> None: + reply_string = bytes(reply.readAll()).decode() + self.setHasPreselectedProject(False) + Logger.log("w", "Something went wrong while trying to retrieve a the preselected Digital Library project. Error: {}".format(reply_string)) + + def _onGetProjectsFirstPageFinished(self, df_projects: List[DigitalFactoryProjectResponse]) -> None: + """ + Set the first page of projects received from the digital factory library in the project model. Called whenever + the retrieval of the first page of projects is successful. + + :param df_projects: A list of all the Digital Factory Library projects linked to the user's account + """ + self.setHasMoreProjectsToLoad(self._api.hasMoreProjectsToLoad()) + self._project_model.setProjects(df_projects) + self.setRetrievingProjectsStatus(RetrievalStatus.Success) + + @pyqtSlot() + def loadMoreProjects(self) -> None: + """ + Initiates the process of retrieving the next page of the projects list from the API. + """ + self._api.getMoreProjects(on_finished = self.loadMoreProjectsFinished, failed = self._onGetProjectsFailed) + self.setRetrievingProjectsStatus(RetrievalStatus.InProgress) + + def loadMoreProjectsFinished(self, df_projects: List[DigitalFactoryProjectResponse]) -> None: + """ + Set the projects received from the digital factory library in the project model. Called whenever the retrieval + of the projects is successful. + + :param df_projects: A list of all the Digital Factory Library projects linked to the user's account + """ + self.setHasMoreProjectsToLoad(self._api.hasMoreProjectsToLoad()) + self._project_model.extendProjects(df_projects) + self.setRetrievingProjectsStatus(RetrievalStatus.Success) + + def _onGetProjectsFailed(self, reply: QNetworkReply, error: QNetworkReply.NetworkError) -> None: + """ + Error function, called whenever the retrieval of projects fails. + """ + self.setRetrievingProjectsStatus(RetrievalStatus.Failed) + Logger.log("w", "Failed to retrieve the list of projects from the Digital Library. Error encountered: {}".format(error)) + + def getProjectFilesFinished(self, df_files_in_project: List[DigitalFactoryFileResponse]) -> None: + """ + Set the files received from the digital factory library in the file model. The files are filtered to only + contain the files which can be opened by Cura. + Called whenever the retrieval of the files is successful. + + :param df_files_in_project: A list of all the Digital Factory Library files that exist in a library project + """ + # Filter to show only the files that can be opened in Cura + self._file_model.setFilters({"file_name": lambda x: Path(x).suffix[1:].lower() in self._supported_file_types}) # the suffix is in format '.xyz', so omit the dot at the start + self._file_model.setFiles(df_files_in_project) + self.setRetrievingFilesStatus(RetrievalStatus.Success) + + def getProjectFilesFailed(self, reply: QNetworkReply, error: QNetworkReply.NetworkError) -> None: + """ + Error function, called whenever the retrieval of the files in a library project fails. + """ + Logger.log("w", "Failed to retrieve the list of files in project '{}' from the Digital Library".format(self._project_model._projects[self._selected_project_idx])) + self.setRetrievingFilesStatus(RetrievalStatus.Failed) + + @pyqtSlot() + def clearProjectSelection(self) -> None: + """ + Clear the selected project. + """ + if self._has_preselected_project: + self.setHasPreselectedProject(False) + else: + self.setSelectedProjectIndex(-1) + + @pyqtSlot(int) + def setSelectedProjectIndex(self, project_idx: int) -> None: + """ + Sets the index of the project which is currently selected in the dropdown menu. Then, it uses the project_id of + that project to retrieve the list of files included in that project and display it in the interface. + + :param project_idx: The index of the currently selected project + """ + if project_idx < -1 or project_idx >= len(self._project_model.items): + Logger.log("w", "The selected project index is invalid.") + project_idx = -1 # -1 is a valid index for the combobox and it is handled as "nothing is selected" + self._selected_project_idx = project_idx + self.selectedProjectIndexChanged.emit(project_idx) + + # Clear the files from the previously-selected project and refresh the files model with the newly-selected- + # project's files + self._file_model.clearFiles() + self.selectedFileIndicesChanged.emit([]) + if 0 <= project_idx < len(self._project_model.items): + library_project_id = self._project_model.items[project_idx]["libraryProjectId"] + self.setRetrievingFilesStatus(RetrievalStatus.InProgress) + self._api.getListOfFilesInProject(library_project_id, on_finished = self.getProjectFilesFinished, failed = self.getProjectFilesFailed) + + @pyqtProperty(int, fset = setSelectedProjectIndex, notify = selectedProjectIndexChanged) + def selectedProjectIndex(self) -> int: + return self._selected_project_idx + + @pyqtSlot("QList") + def setSelectedFileIndices(self, file_indices: List[int]) -> None: + """ + Sets the index of the file which is currently selected in the list of files. + + :param file_indices: The index of the currently selected file + """ + if file_indices != self._selected_file_indices: + self._selected_file_indices = file_indices + self.selectedFileIndicesChanged.emit(file_indices) + + def setProjectFilter(self, new_filter: str) -> None: + """ + Called when the user wants to change the search filter for projects. + + The filter is not immediately applied. There is some delay to allow the user to finish typing. + :param new_filter: The new filter that the user wants to apply. + """ + self._project_filter = new_filter + self._project_filter_change_timer.start() + + """ + Signal to notify Qt that the applied filter has changed. + """ + projectFilterChanged = pyqtSignal() + + @pyqtProperty(str, notify = projectFilterChanged, fset = setProjectFilter) + def projectFilter(self) -> str: + """ + The current search filter being applied to the project list. + :return: The current search filter being applied to the project list. + """ + return self._project_filter + + def _applyProjectFilter(self) -> None: + """ + Actually apply the current filter to search for projects with the user-defined search string. + :return: + """ + self.clear() + self.projectFilterChanged.emit() + self._api.getProjectsFirstPage(search_filter = self._project_filter, on_finished = self._onGetProjectsFirstPageFinished, failed = self._onGetProjectsFailed) + + @pyqtProperty(QObject, constant = True) + def digitalFactoryProjectModel(self) -> "DigitalFactoryProjectModel": + return self._project_model + + @pyqtProperty(QObject, constant = True) + def digitalFactoryFileModel(self) -> "DigitalFactoryFileModel": + return self._file_model + + def setHasMoreProjectsToLoad(self, has_more_projects_to_load: bool) -> None: + """ + Set the value that indicates whether there are more pages of projects that can be loaded from the API + + :param has_more_projects_to_load: Whether there are more pages of projects + """ + if has_more_projects_to_load != self._has_more_projects_to_load: + self._has_more_projects_to_load = has_more_projects_to_load + self.hasMoreProjectsToLoadChanged.emit() + + @pyqtProperty(bool, fset = setHasMoreProjectsToLoad, notify = hasMoreProjectsToLoadChanged) + def hasMoreProjectsToLoad(self) -> bool: + """ + :return: whether there are more pages for projects that can be loaded from the API + """ + return self._has_more_projects_to_load + + @pyqtSlot(str) + def createLibraryProjectAndSetAsPreselected(self, project_name: Optional[str]) -> None: + """ + Creates a new project with the given name in the Digital Library. + + :param project_name: The name that will be used for the new project + """ + if project_name: + self._api.createNewProject(project_name, self.setProjectAsPreselected, self._createNewLibraryProjectFailed) + self.setCreatingNewProjectStatus(RetrievalStatus.InProgress) + else: + Logger.log("w", "No project name provided while attempting to create a new project. Aborting the project creation.") + + def _createNewLibraryProjectFailed(self, reply: QNetworkReply, error: QNetworkReply.NetworkError) -> None: + reply_string = bytes(reply.readAll()).decode() + + self._project_creation_error_text = "Something went wrong while creating the new project. Please try again." + if reply_string: + reply_dict = json.loads(reply_string) + if "errors" in reply_dict and len(reply_dict["errors"]) >= 1 and "title" in reply_dict["errors"][0]: + self._project_creation_error_text = "Error while creating the new project: {}".format(reply_dict["errors"][0]["title"]) + self.projectCreationErrorTextChanged.emit() + + self.setCreatingNewProjectStatus(RetrievalStatus.Failed) + Logger.log("e", "Something went wrong while trying to create a new a project. Error: {}".format(reply_string)) + + def setRetrievingProjectsStatus(self, new_status: RetrievalStatus) -> None: + """ + Sets the status of the "retrieving library projects" http call. + + :param new_status: The new status + """ + self.retrieving_projects_status = new_status + self.retrievingProjectsStatusChanged.emit(int(new_status)) + + @pyqtProperty(int, fset = setRetrievingProjectsStatus, notify = retrievingProjectsStatusChanged) + def retrievingProjectsStatus(self) -> int: + return int(self.retrieving_projects_status) + + def setRetrievingFilesStatus(self, new_status: RetrievalStatus) -> None: + """ + Sets the status of the "retrieving files list in the selected library project" http call. + + :param new_status: The new status + """ + self.retrieving_files_status = new_status + self.retrievingFilesStatusChanged.emit(int(new_status)) + + @pyqtProperty(int, fset = setRetrievingFilesStatus, notify = retrievingFilesStatusChanged) + def retrievingFilesStatus(self) -> int: + return int(self.retrieving_files_status) + + def setCreatingNewProjectStatus(self, new_status: RetrievalStatus) -> None: + """ + Sets the status of the "creating new library project" http call. + + :param new_status: The new status + """ + self.creating_new_project_status = new_status + self.creatingNewProjectStatusChanged.emit(int(new_status)) + + @pyqtProperty(int, fset = setCreatingNewProjectStatus, notify = creatingNewProjectStatusChanged) + def creatingNewProjectStatus(self) -> int: + return int(self.creating_new_project_status) + + @staticmethod + def _onEngineCreated() -> None: + qmlRegisterUncreatableType(DFRetrievalStatus, "DigitalFactory", 1, 0, "RetrievalStatus", "Could not create RetrievalStatus enum type") + + def _applicationInitializationFinished(self) -> None: + self._supported_file_types = self._application.getInstance().getMeshFileHandler().getSupportedFileTypesRead() + + # Although Cura supports these, it's super confusing in this context to show them. + for extension in ["jpg", "jpeg", "png", "bmp", "gif"]: + if extension in self._supported_file_types: + del self._supported_file_types[extension] + + @pyqtSlot() + def openSelectedFiles(self) -> None: + """ Downloads, then opens all files selected in the Qt frontend open dialog. + """ + + temp_dir = tempfile.mkdtemp() + if temp_dir is None or temp_dir == "": + Logger.error("Digital Library: Couldn't create temporary directory to store to-be downloaded files.") + return + + if self._selected_project_idx < 0 or len(self._selected_file_indices) < 1: + Logger.error("Digital Library: No project or no file selected on open action.") + return + + to_erase_on_done_set = { + os.path.join(temp_dir, self._file_model.getItem(i)["fileName"]).replace('\\', '/') + for i in self._selected_file_indices} + + def onLoadedCallback(filename_done: str) -> None: + filename_done = os.path.join(temp_dir, filename_done).replace('\\', '/') + with self._erase_temp_files_lock: + if filename_done in to_erase_on_done_set: + try: + os.remove(filename_done) + to_erase_on_done_set.remove(filename_done) + if len(to_erase_on_done_set) < 1 and os.path.exists(temp_dir): + os.rmdir(temp_dir) + except (IOError, OSError) as ex: + Logger.error("Can't erase temporary (in) {0} because {1}.", temp_dir, str(ex)) + + # Save the project id to make sure it will be preselected the next time the user opens the save dialog + CuraApplication.getInstance().getCurrentWorkspaceInformation().setEntryToStore("digital_factory", "library_project_id", library_project_id) + + # Disconnect the signals so that they are not fired every time another (project) file is loaded + app.fileLoaded.disconnect(onLoadedCallback) + app.workspaceLoaded.disconnect(onLoadedCallback) + + app = CuraApplication.getInstance() + app.fileLoaded.connect(onLoadedCallback) # fired when non-project files are loaded + app.workspaceLoaded.connect(onLoadedCallback) # fired when project files are loaded + + project_name = self._project_model.getItem(self._selected_project_idx)["displayName"] + for file_index in self._selected_file_indices: + file_item = self._file_model.getItem(file_index) + file_name = file_item["fileName"] + download_url = file_item["downloadUrl"] + library_project_id = file_item["libraryProjectId"] + self._openSelectedFile(temp_dir, project_name, file_name, download_url) + + def _openSelectedFile(self, temp_dir: str, project_name: str, file_name: str, download_url: str) -> None: + """ Downloads, then opens, the single specified file. + + :param temp_dir: The already created temporary directory where the files will be stored. + :param project_name: Name of the project the file belongs to (used for error reporting). + :param file_name: Name of the file to be downloaded and opened (used for error reporting). + :param download_url: This url will be downloaded, then the downloaded file will be opened in Cura. + """ + if not download_url: + Logger.log("e", "No download url for file '{}'".format(file_name)) + return + + progress_message = Message(text = "{0}/{1}".format(project_name, file_name), dismissable = False, lifetime = 0, + progress = 0, title = "Downloading...") + progress_message.setProgress(0) + progress_message.show() + + def progressCallback(rx: int, rt: int) -> None: + progress_message.setProgress(math.floor(rx * 100.0 / rt)) + + def finishedCallback(reply: QNetworkReply) -> None: + progress_message.hide() + try: + with open(os.path.join(temp_dir, file_name), "wb+") as temp_file: + bytes_read = reply.read(self.DISK_WRITE_BUFFER_SIZE) + while bytes_read: + temp_file.write(bytes_read) + bytes_read = reply.read(self.DISK_WRITE_BUFFER_SIZE) + CuraApplication.getInstance().processEvents() + temp_file_name = temp_file.name + except IOError as ex: + Logger.logException("e", "Can't write Digital Library file {0}/{1} download to temp-directory {2}.", + ex, project_name, file_name, temp_dir) + Message( + text = "Failed to write to temporary file for '{}'.".format(file_name), + title = "File-system error", + lifetime = 10 + ).show() + return + + CuraApplication.getInstance().readLocalFile( + QUrl.fromLocalFile(temp_file_name), add_to_recent_files = False) + + def errorCallback(reply: QNetworkReply, error: QNetworkReply.NetworkError, p = project_name, + f = file_name) -> None: + progress_message.hide() + Logger.error("An error {0} {1} occurred while downloading {2}/{3}".format(str(error), str(reply), p, f)) + Message( + text = "Failed Digital Library download for '{}'.".format(f), + title = "Network error {}".format(error), + lifetime = 10 + ).show() + + download_manager = HttpRequestManager.getInstance() + download_manager.get(download_url, callback = finishedCallback, download_progress_callback = progressCallback, + error_callback = errorCallback, scope = UltimakerCloudScope(CuraApplication.getInstance())) + + def setHasPreselectedProject(self, new_has_preselected_project: bool) -> None: + if not new_has_preselected_project: + # The preselected project was the only one in the model, at index 0, so when we set the has_preselected_project to + # false, we also need to clean it from the projects model + self._project_model.clearProjects() + self.setSelectedProjectIndex(-1) + self._api.getProjectsFirstPage(search_filter = self._project_filter, on_finished = self._onGetProjectsFirstPageFinished, failed = self._onGetProjectsFailed) + self._api.checkUserCanCreateNewLibraryProject(callback = self.setCanCreateNewLibraryProject) + self.setRetrievingProjectsStatus(RetrievalStatus.InProgress) + self._has_preselected_project = new_has_preselected_project + self.preselectedProjectChanged.emit() + + @pyqtProperty(bool, fset = setHasPreselectedProject, notify = preselectedProjectChanged) + def hasPreselectedProject(self) -> bool: + return self._has_preselected_project + + def setCanCreateNewLibraryProject(self, can_create_new_library_project: bool) -> None: + self._user_account_can_create_new_project = can_create_new_library_project + self.userCanCreateNewLibraryProjectChanged.emit(self._user_account_can_create_new_project) + + @pyqtProperty(bool, fset = setCanCreateNewLibraryProject, notify = userCanCreateNewLibraryProjectChanged) + def userAccountCanCreateNewLibraryProject(self) -> bool: + return self._user_account_can_create_new_project + + @pyqtSlot(str, "QStringList") + def saveFileToSelectedProject(self, filename: str, formats: List[str]) -> None: + """ + Function triggered whenever the Save button is pressed. + + :param filename: The name (without the extension) that will be used for the files + :param formats: List of the formats the scene will be exported to. Can include 3mf, ufp, or both + """ + if self._selected_project_idx == -1: + Logger.log("e", "No DF Library project is selected.") + return + + if filename == "": + Logger.log("w", "The file name cannot be empty.") + Message(text = "Cannot upload file with an empty name to the Digital Library", title = "Empty file name provided", lifetime = 0).show() + return + + self._saveFileToSelectedProjectHelper(filename, formats) + + def _saveFileToSelectedProjectHelper(self, filename: str, formats: List[str]) -> None: + # Indicate we have started sending a job. + self.uploadStarted.emit() + + library_project_id = self._project_model.items[self._selected_project_idx]["libraryProjectId"] + library_project_name = self._project_model.items[self._selected_project_idx]["displayName"] + + # Use the file upload manager to export and upload the 3mf and/or ufp files to the DF Library project + self.file_upload_manager = DFFileExportAndUploadManager(file_handlers = self.file_handlers, nodes = cast(List[SceneNode], self.nodes), + library_project_id = library_project_id, + library_project_name = library_project_name, + file_name = filename, formats = formats, + on_upload_error = self.uploadFileError.emit, + on_upload_success = self.uploadFileSuccess.emit, + on_upload_finished = self.uploadFileFinished.emit, + on_upload_progress = self.uploadFileProgress.emit) + self.file_upload_manager.start() + + # Save the project id to make sure it will be preselected the next time the user opens the save dialog + self._current_workspace_information.setEntryToStore("digital_factory", "library_project_id", library_project_id) + + @pyqtProperty(str, notify = projectCreationErrorTextChanged) + def projectCreationErrorText(self) -> str: + return self._project_creation_error_text diff --git a/plugins/DigitalLibrary/src/DigitalFactoryFeatureBudgetResponse.py b/plugins/DigitalLibrary/src/DigitalFactoryFeatureBudgetResponse.py new file mode 100644 index 0000000000..192f58685a --- /dev/null +++ b/plugins/DigitalLibrary/src/DigitalFactoryFeatureBudgetResponse.py @@ -0,0 +1,43 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from .BaseModel import BaseModel +from typing import Optional + + +class DigitalFactoryFeatureBudgetResponse(BaseModel): + """Class representing the capabilities of a user account for Digital Library. + NOTE: For each max_..._projects fields, '-1' means unlimited! + """ + + def __init__(self, + library_can_use_business_value: Optional[bool] = False, + library_can_use_comments: Optional[bool] = False, + library_can_use_status: Optional[bool] = False, + library_can_use_tags: Optional[bool] = False, + library_can_use_technical_requirements: Optional[bool] = False, + library_max_organization_shared_projects: Optional[int] = None, # -1 means unlimited + library_max_private_projects: Optional[int] = None, # -1 means unlimited + library_max_team_shared_projects: Optional[int] = None, # -1 means unlimited + **kwargs) -> None: + + self.library_can_use_business_value = library_can_use_business_value + self.library_can_use_comments = library_can_use_comments + self.library_can_use_status = library_can_use_status + self.library_can_use_tags = library_can_use_tags + self.library_can_use_technical_requirements = library_can_use_technical_requirements + self.library_max_organization_shared_projects = library_max_organization_shared_projects # -1 means unlimited + self.library_max_private_projects = library_max_private_projects # -1 means unlimited + self.library_max_team_shared_projects = library_max_team_shared_projects # -1 means unlimited + super().__init__(**kwargs) + + def __repr__(self) -> str: + return "max private: {}, max org: {}, max team: {}".format( + self.library_max_private_projects, + self.library_max_organization_shared_projects, + self.library_max_team_shared_projects) + + # Validates the model, raising an exception if the model is invalid. + def validate(self) -> None: + super().validate() + # No validation for now, as the response can be "data: []", which should be interpreted as all False and 0's diff --git a/plugins/DigitalLibrary/src/DigitalFactoryFileModel.py b/plugins/DigitalLibrary/src/DigitalFactoryFileModel.py new file mode 100644 index 0000000000..535cce0e8f --- /dev/null +++ b/plugins/DigitalLibrary/src/DigitalFactoryFileModel.py @@ -0,0 +1,116 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from typing import List, Dict, Callable + +from PyQt5.QtCore import Qt, pyqtSignal + +from UM.Logger import Logger +from UM.Qt.ListModel import ListModel +from .DigitalFactoryFileResponse import DigitalFactoryFileResponse + + +DIGITAL_FACTORY_DISPLAY_DATETIME_FORMAT = "%d-%m-%Y %H:%M" + + +class DigitalFactoryFileModel(ListModel): + FileNameRole = Qt.UserRole + 1 + FileIdRole = Qt.UserRole + 2 + FileSizeRole = Qt.UserRole + 3 + LibraryProjectIdRole = Qt.UserRole + 4 + DownloadUrlRole = Qt.UserRole + 5 + UsernameRole = Qt.UserRole + 6 + UploadedAtRole = Qt.UserRole + 7 + + dfFileModelChanged = pyqtSignal() + + def __init__(self, parent = None): + super().__init__(parent) + + self.addRoleName(self.FileNameRole, "fileName") + self.addRoleName(self.FileIdRole, "fileId") + self.addRoleName(self.FileSizeRole, "fileSize") + self.addRoleName(self.LibraryProjectIdRole, "libraryProjectId") + self.addRoleName(self.DownloadUrlRole, "downloadUrl") + self.addRoleName(self.UsernameRole, "username") + self.addRoleName(self.UploadedAtRole, "uploadedAt") + + self._files = [] # type: List[DigitalFactoryFileResponse] + self._filters = {} # type: Dict[str, Callable] + + def setFiles(self, df_files_in_project: List[DigitalFactoryFileResponse]) -> None: + if self._files == df_files_in_project: + return + self.clear() + self._files = df_files_in_project + self._update() + + def clearFiles(self) -> None: + self.clear() + self._files.clear() + self.dfFileModelChanged.emit() + + def _update(self) -> None: + filtered_files_list = self.getFilteredFilesList() + + for file in filtered_files_list: + self.appendItem({ + "fileName" : file.file_name, + "fileId" : file.file_id, + "fileSize": file.file_size, + "libraryProjectId": file.library_project_id, + "downloadUrl": file.download_url, + "username": file.username, + "uploadedAt": file.uploaded_at.strftime(DIGITAL_FACTORY_DISPLAY_DATETIME_FORMAT) + }) + + self.dfFileModelChanged.emit() + + def setFilters(self, filters: Dict[str, Callable]) -> None: + """ + Sets the filters and updates the files model to contain only the files that meet all of the filters. + + :param filters: The filters to be applied + example: + { + "attribute_name1": function_to_be_applied_on_DigitalFactoryFileResponse_attribute1, + "attribute_name2": function_to_be_applied_on_DigitalFactoryFileResponse_attribute2 + } + """ + self.clear() + self._filters = filters + self._update() + + def clearFilters(self) -> None: + """ + Clears all the model filters + """ + self.setFilters({}) + + def getFilteredFilesList(self) -> List[DigitalFactoryFileResponse]: + """ + Lists the files that meet all the filters specified in the self._filters. This is achieved by applying each + filter function on the corresponding attribute for all the filters in the self._filters. If all of them are + true, the file is added to the filtered files list. + In order for this to work, the self._filters should be in the format: + { + "attribute_name": function_to_be_applied_on_the_DigitalFactoryFileResponse_attribute + } + + :return: The list of files that meet all the specified filters + """ + if not self._filters: + return self._files + + filtered_files_list = [] + for file in self._files: + filter_results = [] + for attribute, filter_func in self._filters.items(): + try: + filter_results.append(filter_func(getattr(file, attribute))) + except AttributeError: + Logger.log("w", "Attribute '{}' doesn't exist in objects of type '{}'".format(attribute, type(file))) + all_filters_met = all(filter_results) + if all_filters_met: + filtered_files_list.append(file) + + return filtered_files_list diff --git a/plugins/DigitalLibrary/src/DigitalFactoryFileProvider.py b/plugins/DigitalLibrary/src/DigitalFactoryFileProvider.py new file mode 100644 index 0000000000..65a727e21a --- /dev/null +++ b/plugins/DigitalLibrary/src/DigitalFactoryFileProvider.py @@ -0,0 +1,62 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +import os + +from UM.FileProvider import FileProvider +from UM.Logger import Logger +from cura.API import Account +from cura.CuraApplication import CuraApplication +from .DigitalFactoryController import DigitalFactoryController + + +class DigitalFactoryFileProvider(FileProvider): + + def __init__(self, df_controller: DigitalFactoryController) -> None: + super().__init__() + self._controller = df_controller + + self.menu_item_display_text = "From Digital Library" + self.shortcut = "Ctrl+Shift+O" + plugin_path = os.path.dirname(os.path.dirname(__file__)) + self._dialog_path = os.path.join(plugin_path, "resources", "qml", "DigitalFactoryOpenDialog.qml") + self._dialog = None + + self._account = CuraApplication.getInstance().getCuraAPI().account # type: Account + self._controller.userAccessStateChanged.connect(self._onUserAccessStateChanged) + self.enabled = self._account.isLoggedIn and self._controller.userAccountHasLibraryAccess() + self.priority = 10 + + def run(self) -> None: + """ + Function called every time the 'From Digital Factory' option of the 'Open File(s)' submenu is triggered + """ + self.loadWindow() + + if self._account.isLoggedIn and self._controller.userAccountHasLibraryAccess(): + self._controller.initialize() + + if not self._dialog: + Logger.log("e", "Unable to create the Digital Library Open dialog.") + return + self._dialog.show() + + def loadWindow(self) -> None: + """ + Create the GUI window for the Digital Library Open dialog. If the window is already open, bring the focus on it. + """ + + if self._dialog: # Dialogue is already open. + self._dialog.requestActivate() # Bring the focus on the dialogue. + return + + self._dialog = CuraApplication.getInstance().createQmlComponent(self._dialog_path, {"manager": self._controller}) + if not self._dialog: + Logger.log("e", "Unable to create the Digital Library Open dialog.") + + def _onUserAccessStateChanged(self, logged_in: bool) -> None: + """ + Sets the enabled status of the DigitalFactoryFileProvider according to the account's login status + :param logged_in: The new login status + """ + self.enabled = logged_in and self._controller.userAccountHasLibraryAccess() + self.enabledChanged.emit() diff --git a/plugins/DigitalLibrary/src/DigitalFactoryFileResponse.py b/plugins/DigitalLibrary/src/DigitalFactoryFileResponse.py new file mode 100644 index 0000000000..eb7e71fbb6 --- /dev/null +++ b/plugins/DigitalLibrary/src/DigitalFactoryFileResponse.py @@ -0,0 +1,57 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from datetime import datetime +from typing import Optional + +from .BaseModel import BaseModel + +DIGITAL_FACTORY_RESPONSE_DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%fZ" + + +class DigitalFactoryFileResponse(BaseModel): + """Class representing a file in a digital factory project.""" + + def __init__(self, client_id: str, content_type: str, file_id: str, file_name: str, library_project_id: str, + status: str, user_id: str, username: str, uploaded_at: str, download_url: Optional[str] = "", status_description: Optional[str] = "", + file_size: Optional[int] = 0, upload_url: Optional[str] = "", **kwargs) -> None: + """ + Creates a new DF file response object + + :param client_id: + :param content_type: + :param file_id: + :param file_name: + :param library_project_id: + :param status: + :param user_id: + :param username: + :param download_url: + :param status_description: + :param file_size: + :param upload_url: + :param kwargs: + """ + + self.client_id = client_id + self.content_type = content_type + self.download_url = download_url + self.file_id = file_id + self.file_name = file_name + self.file_size = file_size + self.library_project_id = library_project_id + self.status = status + self.status_description = status_description + self.upload_url = upload_url + self.user_id = user_id + self.username = username + self.uploaded_at = datetime.strptime(uploaded_at, DIGITAL_FACTORY_RESPONSE_DATETIME_FORMAT) + super().__init__(**kwargs) + + def __repr__(self) -> str: + return "File: {}, from: {}, File ID: {}, Project ID: {}, Download URL: {}".format(self.file_name, self.username, self.file_id, self.library_project_id, self.download_url) + + # Validates the model, raising an exception if the model is invalid. + def validate(self) -> None: + super().validate() + if not self.file_id: + raise ValueError("file_id is required in Digital Library file") diff --git a/plugins/DigitalLibrary/src/DigitalFactoryOutputDevice.py b/plugins/DigitalLibrary/src/DigitalFactoryOutputDevice.py new file mode 100644 index 0000000000..70e3ac34f2 --- /dev/null +++ b/plugins/DigitalLibrary/src/DigitalFactoryOutputDevice.py @@ -0,0 +1,118 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Uranium is released under the terms of the LGPLv3 or higher. +import os +from typing import Optional, List + +from UM.FileHandler.FileHandler import FileHandler +from UM.Logger import Logger +from UM.OutputDevice import OutputDeviceError +from UM.OutputDevice.ProjectOutputDevice import ProjectOutputDevice +from UM.Scene.SceneNode import SceneNode +from cura.API import Account +from cura.CuraApplication import CuraApplication +from .DigitalFactoryController import DigitalFactoryController + + +class DigitalFactoryOutputDevice(ProjectOutputDevice): + """Implements an OutputDevice that supports saving to the digital factory library.""" + + def __init__(self, plugin_id, df_controller: DigitalFactoryController, add_to_output_devices: bool = False, parent = None) -> None: + super().__init__(device_id = "digital_factory", add_to_output_devices = add_to_output_devices, parent = parent) + + self.setName("Digital Library") # Doesn't need to be translated + self.setShortDescription("Save to Library") + self.setDescription("Save to Library") + self.setIconName("save") + self.menu_entry_text = "To Digital Library" + self.shortcut = "Ctrl+Shift+S" + self._plugin_id = plugin_id + self._controller = df_controller + + plugin_path = os.path.dirname(os.path.dirname(__file__)) + self._dialog_path = os.path.join(plugin_path, "resources", "qml", "DigitalFactorySaveDialog.qml") + self._dialog = None + + # Connect the write signals + self._controller.uploadStarted.connect(self._onWriteStarted) + self._controller.uploadFileProgress.connect(self.writeProgress.emit) + self._controller.uploadFileError.connect(self._onWriteError) + self._controller.uploadFileSuccess.connect(self.writeSuccess.emit) + self._controller.uploadFileFinished.connect(self._onWriteFinished) + + self._priority = -1 # Negative value to ensure that it will have less priority than the LocalFileOutputDevice (which has 0) + self._application = CuraApplication.getInstance() + + self._writing = False + + self._account = CuraApplication.getInstance().getCuraAPI().account # type: Account + self._controller.userAccessStateChanged.connect(self._onUserAccessStateChanged) + self.enabled = self._account.isLoggedIn and self._controller.userAccountHasLibraryAccess() + + self._current_workspace_information = CuraApplication.getInstance().getCurrentWorkspaceInformation() + + def requestWrite(self, nodes: List[SceneNode], file_name: Optional[str] = None, limit_mimetypes: bool = False, file_handler: Optional[FileHandler] = None, **kwargs) -> None: + """Request the specified nodes to be written. + + Function called every time the 'To Digital Factory' option of the 'Save Project' submenu is triggered or when the + "Save to Library" action button is pressed (upon slicing). + + :param nodes: A collection of scene nodes that should be written to the file. + :param file_name: A suggestion for the file name to write to. + :param limit_mimetypes: Limit the possible mimetypes to use for writing to these types. + :param file_handler: The handler responsible for reading and writing mesh files. + :param kwargs: Keyword arguments. + """ + + if self._writing: + raise OutputDeviceError.DeviceBusyError() + self.loadWindow() + + if self._account.isLoggedIn and self._controller.userAccountHasLibraryAccess(): + self._controller.nodes = nodes + + df_workspace_information = self._current_workspace_information.getPluginMetadata("digital_factory") + self._controller.initialize(preselected_project_id = df_workspace_information.get("library_project_id")) + + if not self._dialog: + Logger.log("e", "Unable to create the Digital Library Save dialog.") + return + self._dialog.show() + + def loadWindow(self) -> None: + """ + Create the GUI window for the Digital Library Save dialog. If the window is already open, bring the focus on it. + """ + + if self._dialog: # Dialogue is already open. + self._dialog.requestActivate() # Bring the focus on the dialogue. + return + + if not self._controller.file_handlers: + self._controller.file_handlers = { + "3mf": CuraApplication.getInstance().getWorkspaceFileHandler(), + "ufp": CuraApplication.getInstance().getMeshFileHandler() + } + + self._dialog = CuraApplication.getInstance().createQmlComponent(self._dialog_path, {"manager": self._controller}) + if not self._dialog: + Logger.log("e", "Unable to create the Digital Library Save dialog.") + + def _onUserAccessStateChanged(self, logged_in: bool) -> None: + """ + Sets the enabled status of the DigitalFactoryOutputDevice according to the account's login status + :param logged_in: The new login status + """ + self.enabled = logged_in and self._controller.userAccountHasLibraryAccess() + self.enabledChanged.emit() + + def _onWriteStarted(self) -> None: + self._writing = True + self.writeStarted.emit(self) + + def _onWriteFinished(self) -> None: + self._writing = False + self.writeFinished.emit(self) + + def _onWriteError(self) -> None: + self._writing = False + self.writeError.emit(self) diff --git a/plugins/DigitalLibrary/src/DigitalFactoryOutputDevicePlugin.py b/plugins/DigitalLibrary/src/DigitalFactoryOutputDevicePlugin.py new file mode 100644 index 0000000000..1a0e4f2772 --- /dev/null +++ b/plugins/DigitalLibrary/src/DigitalFactoryOutputDevicePlugin.py @@ -0,0 +1,18 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Uranium is released under the terms of the LGPLv3 or higher. + +from UM.OutputDevice.OutputDevicePlugin import OutputDevicePlugin +from .DigitalFactoryOutputDevice import DigitalFactoryOutputDevice +from .DigitalFactoryController import DigitalFactoryController + + +class DigitalFactoryOutputDevicePlugin(OutputDevicePlugin): + def __init__(self, df_controller: DigitalFactoryController) -> None: + super().__init__() + self.df_controller = df_controller + + def start(self) -> None: + self.getOutputDeviceManager().addProjectOutputDevice(DigitalFactoryOutputDevice(plugin_id = self.getPluginId(), df_controller = self.df_controller, add_to_output_devices = True)) + + def stop(self) -> None: + self.getOutputDeviceManager().removeProjectOutputDevice("digital_factory") diff --git a/plugins/DigitalLibrary/src/DigitalFactoryProjectModel.py b/plugins/DigitalLibrary/src/DigitalFactoryProjectModel.py new file mode 100644 index 0000000000..d76774cab1 --- /dev/null +++ b/plugins/DigitalLibrary/src/DigitalFactoryProjectModel.py @@ -0,0 +1,64 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from typing import List, Optional + +from PyQt5.QtCore import Qt, pyqtSignal + +from UM.Logger import Logger +from UM.Qt.ListModel import ListModel +from .DigitalFactoryProjectResponse import DigitalFactoryProjectResponse + +PROJECT_UPDATED_AT_DATETIME_FORMAT = "%d-%m-%Y" + + +class DigitalFactoryProjectModel(ListModel): + DisplayNameRole = Qt.UserRole + 1 + LibraryProjectIdRole = Qt.UserRole + 2 + DescriptionRole = Qt.UserRole + 3 + ThumbnailUrlRole = Qt.UserRole + 5 + UsernameRole = Qt.UserRole + 6 + LastUpdatedRole = Qt.UserRole + 7 + + dfProjectModelChanged = pyqtSignal() + + def __init__(self, parent = None) -> None: + super().__init__(parent) + self.addRoleName(self.DisplayNameRole, "displayName") + self.addRoleName(self.LibraryProjectIdRole, "libraryProjectId") + self.addRoleName(self.DescriptionRole, "description") + self.addRoleName(self.ThumbnailUrlRole, "thumbnailUrl") + self.addRoleName(self.UsernameRole, "username") + self.addRoleName(self.LastUpdatedRole, "lastUpdated") + self._projects = [] # type: List[DigitalFactoryProjectResponse] + + def setProjects(self, df_projects: List[DigitalFactoryProjectResponse]) -> None: + if self._projects == df_projects: + return + self._items.clear() + self._projects = df_projects + # self.sortProjectsBy("display_name") + self._update(df_projects) + + def extendProjects(self, df_projects: List[DigitalFactoryProjectResponse]) -> None: + if not df_projects: + return + self._projects.extend(df_projects) + # self.sortProjectsBy("display_name") + self._update(df_projects) + + def clearProjects(self) -> None: + self.clear() + self._projects.clear() + self.dfProjectModelChanged.emit() + + def _update(self, df_projects: List[DigitalFactoryProjectResponse]) -> None: + for project in df_projects: + self.appendItem({ + "displayName" : project.display_name, + "libraryProjectId" : project.library_project_id, + "description": project.description, + "thumbnailUrl": project.thumbnail_url, + "username": project.username, + "lastUpdated": project.last_updated.strftime(PROJECT_UPDATED_AT_DATETIME_FORMAT) if project.last_updated else "", + }) + self.dfProjectModelChanged.emit() diff --git a/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py b/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py new file mode 100644 index 0000000000..a511a11bd5 --- /dev/null +++ b/plugins/DigitalLibrary/src/DigitalFactoryProjectResponse.py @@ -0,0 +1,65 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from datetime import datetime +from typing import Optional, List, Dict, Any + +from .BaseModel import BaseModel +from .DigitalFactoryFileResponse import DIGITAL_FACTORY_RESPONSE_DATETIME_FORMAT + + +class DigitalFactoryProjectResponse(BaseModel): + """Class representing a cloud project.""" + + def __init__(self, + library_project_id: str, + display_name: str, + username: str, + organization_shared: bool, + last_updated: Optional[str] = None, + created_at: Optional[str] = None, + thumbnail_url: Optional[str] = None, + organization_id: Optional[str] = None, + created_by_user_id: Optional[str] = None, + description: Optional[str] = "", + tags: Optional[List[str]] = None, + team_ids: Optional[List[str]] = None, + status: Optional[str] = None, + technical_requirements: Optional[Dict[str, Any]] = None, + **kwargs) -> None: + """ + Creates a new digital factory project response object + :param library_project_id: + :param display_name: + :param username: + :param organization_shared: + :param thumbnail_url: + :param created_by_user_id: + :param description: + :param tags: + :param kwargs: + """ + + self.library_project_id = library_project_id + self.display_name = display_name + self.description = description + self.username = username + self.organization_shared = organization_shared + self.organization_id = organization_id + self.created_by_user_id = created_by_user_id + self.thumbnail_url = thumbnail_url + self.tags = tags + self.team_ids = team_ids + self.created_at = datetime.strptime(created_at, DIGITAL_FACTORY_RESPONSE_DATETIME_FORMAT) if created_at else None + self.last_updated = datetime.strptime(last_updated, DIGITAL_FACTORY_RESPONSE_DATETIME_FORMAT) if last_updated else None + self.status = status + self.technical_requirements = technical_requirements + super().__init__(**kwargs) + + def __str__(self) -> str: + return "Project: {}, Id: {}, from: {}".format(self.display_name, self.library_project_id, self.username) + + # Validates the model, raising an exception if the model is invalid. + def validate(self) -> None: + super().validate() + if not self.library_project_id: + raise ValueError("library_project_id is required on cloud project") diff --git a/plugins/DigitalLibrary/src/ExportFileJob.py b/plugins/DigitalLibrary/src/ExportFileJob.py new file mode 100644 index 0000000000..3e4c6dfea2 --- /dev/null +++ b/plugins/DigitalLibrary/src/ExportFileJob.py @@ -0,0 +1,55 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +import io +from typing import List, Optional, Union + +from UM.FileHandler.FileHandler import FileHandler +from UM.FileHandler.FileWriter import FileWriter +from UM.FileHandler.WriteFileJob import WriteFileJob +from UM.Logger import Logger +from UM.MimeTypeDatabase import MimeTypeDatabase +from UM.OutputDevice import OutputDeviceError +from UM.Scene.SceneNode import SceneNode + + +class ExportFileJob(WriteFileJob): + """Job that exports the build plate to the correct file format for the Digital Factory Library project.""" + + def __init__(self, file_handler: FileHandler, nodes: List[SceneNode], job_name: str, extension: str) -> None: + file_types = file_handler.getSupportedFileTypesWrite() + if len(file_types) == 0: + Logger.log("e", "There are no file types available to write with!") + raise OutputDeviceError.WriteRequestFailedError("There are no file types available to write with!") + + mode = None + file_writer = None + for file_type in file_types: + if file_type["extension"] == extension: + file_writer = file_handler.getWriter(file_type["id"]) + mode = file_type.get("mode") + super().__init__(file_writer, self.createStream(mode = mode), nodes, mode) + + # Determine the filename. + self.setFileName("{}.{}".format(job_name, extension)) + + def getOutput(self) -> bytes: + """Get the job result as bytes as that is what we need to upload to the Digital Factory Library.""" + + output = self.getStream().getvalue() + if isinstance(output, str): + output = output.encode("utf-8") + return output + + def getMimeType(self) -> str: + """Get the mime type of the selected export file type.""" + return MimeTypeDatabase.getMimeTypeForFile(self.getFileName()).name + + @staticmethod + def createStream(mode) -> Union[io.BytesIO, io.StringIO]: + """Creates the right kind of stream based on the preferred format.""" + + if mode == FileWriter.OutputMode.TextMode: + return io.StringIO() + else: + return io.BytesIO() diff --git a/plugins/DigitalLibrary/src/PaginationLinks.py b/plugins/DigitalLibrary/src/PaginationLinks.py new file mode 100644 index 0000000000..06ed183944 --- /dev/null +++ b/plugins/DigitalLibrary/src/PaginationLinks.py @@ -0,0 +1,30 @@ +# Copyright (c) 2021 Ultimaker B.V. + +from typing import Optional + + +class PaginationLinks: + """Model containing pagination links.""" + + def __init__(self, + first: Optional[str] = None, + last: Optional[str] = None, + next: Optional[str] = None, + prev: Optional[str] = None, + **kwargs) -> None: + """ + Creates a new digital factory project response object + :param first: The URL for the first page. + :param last: The URL for the last page. + :param next: The URL for the next page. + :param prev: The URL for the prev page. + :param kwargs: + """ + + self.first_page = first + self.last_page = last + self.next_page = next + self.prev_page = prev + + def __str__(self) -> str: + return "Pagination Links | First: {}, Last: {}, Next: {}, Prev: {}".format(self.first_page, self.last_page, self.next_page, self.prev_page) diff --git a/plugins/DigitalLibrary/src/PaginationManager.py b/plugins/DigitalLibrary/src/PaginationManager.py new file mode 100644 index 0000000000..f2b7c8f5bd --- /dev/null +++ b/plugins/DigitalLibrary/src/PaginationManager.py @@ -0,0 +1,43 @@ +# Copyright (c) 2021 Ultimaker B.V. + +from typing import Optional, Dict, Any + +from .PaginationLinks import PaginationLinks +from .PaginationMetadata import PaginationMetadata +from .ResponseMeta import ResponseMeta + + +class PaginationManager: + + def __init__(self, limit: int) -> None: + self.limit = limit # The limit of items per page + self.meta = None # type: Optional[ResponseMeta] # The metadata of the paginated response + self.links = None # type: Optional[PaginationLinks] # The pagination-related links + + def setResponseMeta(self, meta: Optional[Dict[str, Any]]) -> None: + self.meta = None + + if meta: + page = None + if "page" in meta: + page = PaginationMetadata(**meta["page"]) + self.meta = ResponseMeta(page) + + def setLinks(self, links: Optional[Dict[str, str]]) -> None: + self.links = PaginationLinks(**links) if links else None + + def setLimit(self, new_limit: int) -> None: + """ + Sets the limit of items per page. + + :param new_limit: The new limit of items per page + """ + self.limit = new_limit + self.reset() + + def reset(self) -> None: + """ + Sets the metadata and links to None. + """ + self.meta = None + self.links = None diff --git a/plugins/DigitalLibrary/src/PaginationMetadata.py b/plugins/DigitalLibrary/src/PaginationMetadata.py new file mode 100644 index 0000000000..7f11e43d30 --- /dev/null +++ b/plugins/DigitalLibrary/src/PaginationMetadata.py @@ -0,0 +1,25 @@ +# Copyright (c) 2021 Ultimaker B.V. + +from typing import Optional + + +class PaginationMetadata: + """Class representing the metadata related to pagination.""" + + def __init__(self, + total_count: Optional[int] = None, + total_pages: Optional[int] = None, + **kwargs) -> None: + """ + Creates a new digital factory project response object + :param total_count: The total count of items. + :param total_pages: The total number of pages when pagination is applied. + :param kwargs: + """ + + self.total_count = total_count + self.total_pages = total_pages + self.__dict__.update(kwargs) + + def __str__(self) -> str: + return "PaginationMetadata | Total Count: {}, Total Pages: {}".format(self.total_count, self.total_pages) diff --git a/plugins/DigitalLibrary/src/ResponseMeta.py b/plugins/DigitalLibrary/src/ResponseMeta.py new file mode 100644 index 0000000000..a1dbc949db --- /dev/null +++ b/plugins/DigitalLibrary/src/ResponseMeta.py @@ -0,0 +1,24 @@ +# Copyright (c) 2021 Ultimaker B.V. + +from typing import Optional + +from .PaginationMetadata import PaginationMetadata + + +class ResponseMeta: + """Class representing the metadata included in a Digital Library response (if any)""" + + def __init__(self, + page: Optional[PaginationMetadata] = None, + **kwargs) -> None: + """ + Creates a new digital factory project response object + :param page: Metadata related to pagination + :param kwargs: + """ + + self.page = page + self.__dict__.update(kwargs) + + def __str__(self) -> str: + return "Response Meta | {}".format(self.page) diff --git a/plugins/DigitalLibrary/src/__init__.py b/plugins/DigitalLibrary/src/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/plugins/DigitalLibrary/tests/TestDFFileExportAndUploadManager.py b/plugins/DigitalLibrary/tests/TestDFFileExportAndUploadManager.py new file mode 100644 index 0000000000..2fb0ae4142 --- /dev/null +++ b/plugins/DigitalLibrary/tests/TestDFFileExportAndUploadManager.py @@ -0,0 +1,48 @@ +from unittest.mock import MagicMock, patch + +import pytest +from src.DFFileExportAndUploadManager import DFFileExportAndUploadManager + + +@pytest.fixture +def upload_manager(): + file_handler = MagicMock(name = "file_handler") + file_handler.getSupportedFileTypesWrite = MagicMock(return_value = [{ + "id": "test", + "extension": ".3mf", + "description": "nope", + "mime_type": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml", + "mode": "binary", + "hide_in_file_dialog": True, + }]) + node = MagicMock(name = "SceneNode") + application = MagicMock(name = "CuraApplication") + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): + return DFFileExportAndUploadManager(file_handlers = {"3mf": file_handler}, + nodes = [node], + library_project_id = "test_library_project_id", + library_project_name = "test_library_project_name", + file_name = "file_name", + formats = ["3mf"], + on_upload_error = MagicMock(), + on_upload_success = MagicMock(), + on_upload_finished = MagicMock(), + on_upload_progress = MagicMock()) + + +@pytest.mark.parametrize("input,expected_result", + [("", ""), + ("invalid json! {}", ""), + ("{\"errors\": [{}]}", ""), + ("{\"errors\": [{\"title\": \"some title\"}]}", "some title")]) +def test_extractErrorTitle(upload_manager, input, expected_result): + assert upload_manager.extractErrorTitle(input) == expected_result + + +def test_exportJobError(upload_manager): + mocked_application = MagicMock() + with patch("UM.Application.Application.getInstance", MagicMock(return_value = mocked_application)): + upload_manager._onJobExportError("file_name.3mf") + + # Ensure that message was displayed + mocked_application.showMessageSignal.emit.assert_called_once() diff --git a/plugins/DigitalLibrary/tests/TestDigitalFactoryFileModel.py b/plugins/DigitalLibrary/tests/TestDigitalFactoryFileModel.py new file mode 100644 index 0000000000..7817d03516 --- /dev/null +++ b/plugins/DigitalLibrary/tests/TestDigitalFactoryFileModel.py @@ -0,0 +1,73 @@ +from pathlib import Path + +from src.DigitalFactoryFileModel import DigitalFactoryFileModel +from src.DigitalFactoryFileResponse import DigitalFactoryFileResponse + + +file_1 = DigitalFactoryFileResponse(client_id = "client_id_1", + content_type = "zomg", + file_name = "file_1.3mf", + file_id = "file_id_1", + library_project_id = "project_id_1", + status = "test", + user_id = "user_id_1", + username = "username_1", + uploaded_at = "2021-04-07T10:33:25.000Z") + +file_2 = DigitalFactoryFileResponse(client_id ="client_id_2", + content_type = "zomg", + file_name = "file_2.3mf", + file_id = "file_id_2", + library_project_id = "project_id_2", + status = "test", + user_id = "user_id_2", + username = "username_2", + uploaded_at = "2021-02-06T09:33:22.000Z") + +file_wtf = DigitalFactoryFileResponse(client_id ="client_id_1", + content_type = "zomg", + file_name = "file_3.wtf", + file_id = "file_id_3", + library_project_id = "project_id_1", + status = "test", + user_id = "user_id_1", + username = "username_1", + uploaded_at = "2021-04-06T12:33:25.000Z") + + +def test_setFiles(): + model = DigitalFactoryFileModel() + + assert model.count == 0 + + model.setFiles([file_1, file_2]) + assert model.count == 2 + + assert model.getItem(0)["fileName"] == "file_1.3mf" + assert model.getItem(1)["fileName"] == "file_2.3mf" + + +def test_clearProjects(): + model = DigitalFactoryFileModel() + model.setFiles([file_1, file_2]) + model.clearFiles() + assert model.count == 0 + + +def test_setProjectMultipleTimes(): + model = DigitalFactoryFileModel() + model.setFiles([file_1, file_2]) + model.setFiles([file_2]) + assert model.count == 1 + assert model.getItem(0)["fileName"] == "file_2.3mf" + + +def test_setFilter(): + model = DigitalFactoryFileModel() + + model.setFiles([file_1, file_2, file_wtf]) + model.setFilters({"file_name": lambda x: Path(x).suffix[1:].lower() in ["3mf"]}) + assert model.count == 2 + + model.clearFilters() + assert model.count == 3 diff --git a/plugins/DigitalLibrary/tests/TestDigitalFactoryProjectModel.py b/plugins/DigitalLibrary/tests/TestDigitalFactoryProjectModel.py new file mode 100644 index 0000000000..890f62f3f6 --- /dev/null +++ b/plugins/DigitalLibrary/tests/TestDigitalFactoryProjectModel.py @@ -0,0 +1,55 @@ + +from src.DigitalFactoryProjectModel import DigitalFactoryProjectModel +from src.DigitalFactoryProjectResponse import DigitalFactoryProjectResponse + + +project_1 = DigitalFactoryProjectResponse(library_project_id = "omg", + display_name = "zomg", + username = "nope", + organization_shared = True) + +project_2 = DigitalFactoryProjectResponse(library_project_id = "omg2", + display_name = "zomg2", + username = "nope", + organization_shared = False) + + +def test_setProjects(): + model = DigitalFactoryProjectModel() + + assert model.count == 0 + + model.setProjects([project_1, project_2]) + assert model.count == 2 + + assert model.getItem(0)["displayName"] == "zomg" + assert model.getItem(1)["displayName"] == "zomg2" + + +def test_clearProjects(): + model = DigitalFactoryProjectModel() + model.setProjects([project_1, project_2]) + model.clearProjects() + assert model.count == 0 + + +def test_setProjectMultipleTimes(): + model = DigitalFactoryProjectModel() + model.setProjects([project_1, project_2]) + model.setProjects([project_2]) + assert model.count == 1 + assert model.getItem(0)["displayName"] == "zomg2" + + +def test_extendProjects(): + model = DigitalFactoryProjectModel() + + assert model.count == 0 + + model.setProjects([project_1]) + assert model.count == 1 + + model.extendProjects([project_2]) + assert model.count == 2 + assert model.getItem(0)["displayName"] == "zomg" + assert model.getItem(1)["displayName"] == "zomg2" diff --git a/plugins/DigitalLibrary/tests/TestDigitalLibraryApiClient.py b/plugins/DigitalLibrary/tests/TestDigitalLibraryApiClient.py new file mode 100644 index 0000000000..9751838ddf --- /dev/null +++ b/plugins/DigitalLibrary/tests/TestDigitalLibraryApiClient.py @@ -0,0 +1,89 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from unittest.mock import MagicMock + +import pytest + +from cura.CuraApplication import CuraApplication +from src.DigitalFactoryApiClient import DigitalFactoryApiClient +from src.PaginationManager import PaginationManager + + +@pytest.fixture +def application(): + app = MagicMock(spec=CuraApplication, name = "Mocked Cura Application") + return app + + +@pytest.fixture +def pagination_manager(): + manager = MagicMock(name = "Mocked Pagination Manager") + return manager + + +@pytest.fixture +def api_client(application, pagination_manager): + api_client = DigitalFactoryApiClient(application, MagicMock()) + api_client._projects_pagination_mgr = pagination_manager + return api_client + + +def test_getProjectsFirstPage(api_client): + # setup + http_manager = MagicMock() + api_client._http = http_manager + pagination_manager = api_client._projects_pagination_mgr + pagination_manager.limit = 20 + + finished_callback = MagicMock() + failed_callback = MagicMock() + + # Call + api_client.getProjectsFirstPage(search_filter = "filter", on_finished = finished_callback, failed = failed_callback) + + # Asserts + pagination_manager.reset.assert_called_once() # Should be called since we asked for new set of projects + http_manager.get.assert_called_once() + args = http_manager.get.call_args_list[0] + + # Ensure that it's called with the right limit + assert args[0][0] == "https://api.ultimaker.com/cura/v1/projects?limit=20&search=filter" + + # Change the limit & try again + http_manager.get.reset_mock() + pagination_manager.limit = 80 + api_client.getProjectsFirstPage(search_filter = "filter", on_finished = finished_callback, failed = failed_callback) + args = http_manager.get.call_args_list[0] + + # Ensure that it's called with the right limit + assert args[0][0] == "https://api.ultimaker.com/cura/v1/projects?limit=80&search=filter" + + +def test_getMoreProjects_noNewProjects(api_client): + api_client.hasMoreProjectsToLoad = MagicMock(return_value = False) + http_manager = MagicMock() + api_client._http = http_manager + + finished_callback = MagicMock() + failed_callback = MagicMock() + api_client.getMoreProjects(finished_callback, failed_callback) + + http_manager.get.assert_not_called() + + +def test_getMoreProjects_hasNewProjects(api_client): + api_client.hasMoreProjectsToLoad = MagicMock(return_value = True) + http_manager = MagicMock() + api_client._http = http_manager + + finished_callback = MagicMock() + failed_callback = MagicMock() + api_client.getMoreProjects(finished_callback, failed_callback) + + http_manager.get.assert_called_once() + + +def test_clear(api_client): + api_client.clear() + api_client._projects_pagination_mgr.reset.assert_called_once() diff --git a/plugins/DigitalLibrary/tests/conftest.py b/plugins/DigitalLibrary/tests/conftest.py new file mode 100644 index 0000000000..2afda2a171 --- /dev/null +++ b/plugins/DigitalLibrary/tests/conftest.py @@ -0,0 +1,5 @@ + +# Ensure that the importing for all tests work +import sys +import os +sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..")) diff --git a/plugins/FirmwareUpdateChecker/plugin.json b/plugins/FirmwareUpdateChecker/plugin.json index 61764e4d3c..d979e7f3a5 100644 --- a/plugins/FirmwareUpdateChecker/plugin.json +++ b/plugins/FirmwareUpdateChecker/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Checks for firmware updates.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/FirmwareUpdater/plugin.json b/plugins/FirmwareUpdater/plugin.json index c59208a555..fc42e11973 100644 --- a/plugins/FirmwareUpdater/plugin.json +++ b/plugins/FirmwareUpdater/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides a machine actions for updating firmware.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/GCodeGzReader/plugin.json b/plugins/GCodeGzReader/plugin.json index f7e63e5a9c..d91b7278ec 100644 --- a/plugins/GCodeGzReader/plugin.json +++ b/plugins/GCodeGzReader/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Reads g-code from a compressed archive.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/GCodeGzWriter/plugin.json b/plugins/GCodeGzWriter/plugin.json index 97a0be0c82..2cb72459a4 100644 --- a/plugins/GCodeGzWriter/plugin.json +++ b/plugins/GCodeGzWriter/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Writes g-code to a compressed archive.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/GCodeProfileReader/plugin.json b/plugins/GCodeProfileReader/plugin.json index ebb124e401..4447650d36 100644 --- a/plugins/GCodeProfileReader/plugin.json +++ b/plugins/GCodeProfileReader/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides support for importing profiles from g-code files.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/GCodeReader/plugin.json b/plugins/GCodeReader/plugin.json index 213c900890..0c5e3d6247 100644 --- a/plugins/GCodeReader/plugin.json +++ b/plugins/GCodeReader/plugin.json @@ -3,6 +3,6 @@ "author": "Victor Larchenko, Ultimaker B.V.", "version": "1.0.1", "description": "Allows loading and displaying G-code files.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/GCodeWriter/plugin.json b/plugins/GCodeWriter/plugin.json index c924f3ebcd..cf28e3a792 100644 --- a/plugins/GCodeWriter/plugin.json +++ b/plugins/GCodeWriter/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Writes g-code to a file.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/ImageReader/ConfigUI.qml b/plugins/ImageReader/ConfigUI.qml index a7dbc5f748..a3dceed50d 100644 --- a/plugins/ImageReader/ConfigUI.qml +++ b/plugins/ImageReader/ConfigUI.qml @@ -43,7 +43,7 @@ UM.Dialog TextField { id: peak_height objectName: "Peak_Height" - validator: RegExpValidator {regExp: /^\d{1,3}([\,|\.]\d*)?$/} + validator: RegExpValidator {regExp: /^\d{0,3}([\,|\.]\d*)?$/} width: 180 * screenScaleFactor onTextChanged: { manager.onPeakHeightChanged(text) } } @@ -66,7 +66,7 @@ UM.Dialog TextField { id: base_height objectName: "Base_Height" - validator: RegExpValidator {regExp: /^\d{1,3}([\,|\.]\d*)?$/} + validator: RegExpValidator {regExp: /^\d{0,3}([\,|\.]\d*)?$/} width: 180 * screenScaleFactor onTextChanged: { manager.onBaseHeightChanged(text) } } diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py index 1bab15e9d6..4a32ed71f1 100644 --- a/plugins/ImageReader/ImageReader.py +++ b/plugins/ImageReader/ImageReader.py @@ -52,11 +52,8 @@ class ImageReader(MeshReader): def _generateSceneNode(self, file_name, xz_size, height_from_base, base_height, blur_iterations, max_size, lighter_is_higher, use_transparency_model, transmittance_1mm): scene_node = SceneNode() - mesh = MeshBuilder() - img = QImage(file_name) - if img.isNull(): Logger.log("e", "Image is corrupt.") return None @@ -70,11 +67,10 @@ class ImageReader(MeshReader): height_from_base = max(height_from_base, 0) base_height = max(base_height, 0) - peak_height = base_height + height_from_base xz_size = max(xz_size, 1) - scale_vector = Vector(xz_size, peak_height, xz_size) + scale_vector = Vector(xz_size, height_from_base, xz_size) if width > height: scale_vector = scale_vector.set(z=scale_vector.z * aspect) @@ -132,7 +128,7 @@ class ImageReader(MeshReader): if use_transparency_model: divisor = 1.0 / math.log(transmittance_1mm / 100.0) # log-base doesn't matter here. Precompute this value for faster computation of each pixel. - min_luminance = (transmittance_1mm / 100.0) ** (peak_height - base_height) + min_luminance = (transmittance_1mm / 100.0) ** height_from_base for (y, x) in numpy.ndindex(height_data.shape): mapped_luminance = min_luminance + (1.0 - min_luminance) * height_data[y, x] height_data[y, x] = base_height + divisor * math.log(mapped_luminance) # use same base as a couple lines above this diff --git a/plugins/ImageReader/plugin.json b/plugins/ImageReader/plugin.json index ee871f2694..90ead02b89 100644 --- a/plugins/ImageReader/plugin.json +++ b/plugins/ImageReader/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Enables ability to generate printable geometry from 2D image files.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/LegacyProfileReader/plugin.json b/plugins/LegacyProfileReader/plugin.json index 90c5ccd4ca..9611da5a4c 100644 --- a/plugins/LegacyProfileReader/plugin.json +++ b/plugins/LegacyProfileReader/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides support for importing profiles from legacy Cura versions.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml index c2cb30c14b..8c4c00a3a5 100644 --- a/plugins/MachineSettingsAction/MachineSettingsAction.qml +++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml @@ -27,7 +27,7 @@ Cura.MachineAction Connections { target: extrudersModel - onItemsChanged: tabNameModel.update() + function onItemsChanged() { tabNameModel.update() } } ListModel diff --git a/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml b/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml index 902388b669..293e7386b2 100644 --- a/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml @@ -137,6 +137,7 @@ Item labelWidth: base.labelWidth controlWidth: base.controlWidth unitText: "" + decimals: 0 forceUpdateOnChangeFunction: forceUpdateFunction } } diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml index 758efd2e4e..db581e8cf5 100644 --- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml @@ -326,10 +326,29 @@ Item Connections { target: Cura.MachineManager - onGlobalContainerChanged: extruderCountModel.update() + function onGlobalContainerChanged() { extruderCountModel.update() } } } + /* + - Fix for this issue: https://github.com/Ultimaker/Cura/issues/9167 + - Allows user to toggle if GCODE coordinates are affected by the extruder offset. + - Machine wide setting. CuraEngine/src/gcodeExport.cpp is not set up to evaluate per extruder currently. + - If it is moved to per-extruder (unlikely), then this should be moved to the extruder tab. + */ + Cura.SimpleCheckBox // "GCode Affected By Extruder Offsets" + { + id: applyExtruderOffsetsCheckbox + containerStackId: machineStackId + settingKey: "machine_use_extruder_offset_to_offset_coords" + settingStoreIndex: propertyStoreIndex + labelText: catalog.i18nc("@label", "Apply Extruder offsets to GCode") + labelFont: base.labelFont + labelWidth: base.labelWidth + forceUpdateOnChangeFunction: forceUpdateFunction + } + + /* The "Shared Heater" feature is temporarily disabled because its implementation is incomplete. Printers with multiple filaments going into one nozzle will keep the inactive filaments retracted at the diff --git a/plugins/MachineSettingsAction/plugin.json b/plugins/MachineSettingsAction/plugin.json index d9a01a80ae..51d88020ae 100644 --- a/plugins/MachineSettingsAction/plugin.json +++ b/plugins/MachineSettingsAction/plugin.json @@ -3,6 +3,6 @@ "author": "fieldOfView, Ultimaker B.V.", "version": "1.0.1", "description": "Provides a way to change machine settings (such as build volume, nozzle size, etc.).", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/ModelChecker/plugin.json b/plugins/ModelChecker/plugin.json index 664d7c1b9f..bf546879c7 100644 --- a/plugins/ModelChecker/plugin.json +++ b/plugins/ModelChecker/plugin.json @@ -2,7 +2,7 @@ "name": "Model Checker", "author": "Ultimaker B.V.", "version": "1.0.1", - "api": "7.4.0", + "api": 7, "description": "Checks models and print configuration for possible printing issues and give suggestions.", "i18n-catalog": "cura" } diff --git a/plugins/MonitorStage/MonitorMain.qml b/plugins/MonitorStage/MonitorMain.qml index 56f916dc25..cb16b91cb8 100644 --- a/plugins/MonitorStage/MonitorMain.qml +++ b/plugins/MonitorStage/MonitorMain.qml @@ -137,7 +137,7 @@ Rectangle id: externalLinkIcon anchors.verticalCenter: parent.verticalCenter color: UM.Theme.getColor("text_link") - source: UM.Theme.getIcon("external_link") + source: UM.Theme.getIcon("LinkExternal") width: UM.Theme.getSize("monitor_external_link_icon").width height: UM.Theme.getSize("monitor_external_link_icon").height } @@ -164,5 +164,16 @@ Rectangle onExited: manageQueueText.font.underline = false } } + Label + { + id: noConnectionLabel + anchors.horizontalCenter: parent.horizontalCenter + visible: !isNetworkConfigurable + text: catalog.i18nc("@info", "In order to monitor your print from Cura, please connect the printer.") + font: UM.Theme.getFont("medium") + color: UM.Theme.getColor("text") + wrapMode: Text.WordWrap + width: contentWidth + } } } diff --git a/plugins/MonitorStage/plugin.json b/plugins/MonitorStage/plugin.json index a8100cb2a3..bcf42763dc 100644 --- a/plugins/MonitorStage/plugin.json +++ b/plugins/MonitorStage/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides a monitor stage in Cura.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } \ No newline at end of file diff --git a/plugins/PerObjectSettingsTool/PerObjectCategory.qml b/plugins/PerObjectSettingsTool/PerObjectCategory.qml index 4ca12f657e..58192f0acd 100644 --- a/plugins/PerObjectSettingsTool/PerObjectCategory.qml +++ b/plugins/PerObjectSettingsTool/PerObjectCategory.qml @@ -24,7 +24,7 @@ Button { anchors.verticalCenter: parent.verticalCenter height: (label.height / 2) | 0 width: height - source: control.checked ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right"); + source: control.checked ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight"); color: control.hovered ? palette.highlight : palette.buttonText } UM.RecolorImage diff --git a/plugins/PerObjectSettingsTool/PerObjectItem.qml b/plugins/PerObjectSettingsTool/PerObjectItem.qml index 7c6ece12db..bb1c31e1f3 100644 --- a/plugins/PerObjectSettingsTool/PerObjectItem.qml +++ b/plugins/PerObjectSettingsTool/PerObjectItem.qml @@ -35,7 +35,7 @@ UM.TooltipArea Connections { target: addedSettingsModel - onVisibleCountChanged: + function onVisibleCountChanged() { check.checked = addedSettingsModel.getVisible(model.key) } diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py b/plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py index 445f7ff676..401396f2b8 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py +++ b/plugins/PerObjectSettingsTool/PerObjectSettingVisibilityHandler.py @@ -73,38 +73,40 @@ class PerObjectSettingVisibilityHandler(UM.Settings.Models.SettingVisibilityHand # Add all instances that are not added, but are in visibility list for item in visible: - if settings.getInstance(item) is None: # Setting was not added already. - definition = self._stack.getSettingDefinition(item) - if definition: - new_instance = SettingInstance(definition, settings) + if settings.getInstance(item) is not None: # Setting was added already. + continue + definition = self._stack.getSettingDefinition(item) + if not definition: + Logger.log("w", f"Unable to add instance ({item}) to per-object visibility because we couldn't find the matching definition.") + continue + + new_instance = SettingInstance(definition, settings) + stack_nr = -1 + stack = None + # Check from what stack we should copy the raw property of the setting from. + if self._stack.getProperty("machine_extruder_count", "value") > 1: + if definition.limit_to_extruder != "-1": + # A limit to extruder function was set and it's a multi extrusion machine. Check what stack we do need to use. + stack_nr = str(int(round(float(self._stack.getProperty(item, "limit_to_extruder"))))) + + # Check if the found stack_number is in the extruder list of extruders. + if stack_nr not in ExtruderManager.getInstance().extruderIds and self._stack.getProperty("extruder_nr", "value") is not None: stack_nr = -1 - stack = None - # Check from what stack we should copy the raw property of the setting from. - if self._stack.getProperty("machine_extruder_count", "value") > 1: - if definition.limit_to_extruder != "-1": - # A limit to extruder function was set and it's a multi extrusion machine. Check what stack we do need to use. - stack_nr = str(int(round(float(self._stack.getProperty(item, "limit_to_extruder"))))) - # Check if the found stack_number is in the extruder list of extruders. - if stack_nr not in ExtruderManager.getInstance().extruderIds and self._stack.getProperty("extruder_nr", "value") is not None: - stack_nr = -1 + # Use the found stack number to get the right stack to copy the value from. + if stack_nr in ExtruderManager.getInstance().extruderIds: + stack = ContainerRegistry.getInstance().findContainerStacks(id = ExtruderManager.getInstance().extruderIds[stack_nr])[0] + else: + stack = self._stack - # Use the found stack number to get the right stack to copy the value from. - if stack_nr in ExtruderManager.getInstance().extruderIds: - stack = ContainerRegistry.getInstance().findContainerStacks(id = ExtruderManager.getInstance().extruderIds[stack_nr])[0] - else: - stack = self._stack - - # Use the raw property to set the value (so the inheritance doesn't break) - if stack is not None: - new_instance.setProperty("value", stack.getRawProperty(item, "value")) - else: - new_instance.setProperty("value", None) - new_instance.resetState() # Ensure that the state is not seen as a user state. - settings.addInstance(new_instance) - visibility_changed = True - else: - Logger.log("w", "Unable to add instance (%s) to per-object visibility because we couldn't find the matching definition", item) + # Use the raw property to set the value (so the inheritance doesn't break) + if stack is not None: + new_instance.setProperty("value", stack.getRawProperty(item, "value")) + else: + new_instance.setProperty("value", None) + new_instance.resetState() # Ensure that the state is not seen as a user state. + settings.addInstance(new_instance) + visibility_changed = True if visibility_changed: self.visibilityChanged.emit() diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml index e834372ae9..e96337e6bb 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2017 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Uranium is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -80,7 +80,7 @@ Item { id: normalButton text: catalog.i18nc("@label", "Normal model") - iconSource: UM.Theme.getIcon("pos_normal"); + iconSource: UM.Theme.getIcon("Infill0"); property bool needBorder: true checkable: true onClicked: setMeshType(normalMeshType); @@ -92,7 +92,7 @@ Item { id: supportMeshButton text: catalog.i18nc("@label", "Print as support") - iconSource: UM.Theme.getIcon("pos_print_as_support"); + iconSource: UM.Theme.getIcon("MeshTypeSupport"); property bool needBorder: true checkable:true onClicked: setMeshType(supportMeshType) @@ -104,7 +104,7 @@ Item { id: overlapMeshButton text: catalog.i18nc("@label", "Modify settings for overlaps") - iconSource: UM.Theme.getIcon("pos_modify_overlaps"); + iconSource: UM.Theme.getIcon("MeshTypeIntersect"); property bool needBorder: true checkable:true onClicked: setMeshType(infillMeshType) @@ -116,7 +116,7 @@ Item { id: antiOverhangMeshButton text: catalog.i18nc("@label", "Don't support overlaps") - iconSource: UM.Theme.getIcon("pos_modify_dont_support_overlap"); + iconSource: UM.Theme.getIcon("BlockSupportOverlaps"); property bool needBorder: true checkable: true onClicked: setMeshType(antiOverhangMeshType) @@ -136,10 +136,12 @@ Item } - ComboBox + Cura.ComboBox { id: infillOnlyComboBox width: parent.width / 2 - UM.Theme.getSize("default_margin").width + height: UM.Theme.getSize("setting_control").height + textRole: "text" model: ListModel { @@ -237,7 +239,7 @@ Item id: settingLoader width: UM.Theme.getSize("setting").width height: UM.Theme.getSize("section").height - + enabled: provider.properties.enabled === "True" property var definition: model property var settingDefinitionsModel: addedSettingsModel property var propertyProvider: provider @@ -304,7 +306,7 @@ Item height: width sourceSize.height: width color: control.hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button") - source: UM.Theme.getIcon("minus") + source: UM.Theme.getIcon("Minus") } } } @@ -334,13 +336,13 @@ Item Connections { target: inheritStackProvider - onPropertiesChanged: provider.forcePropertiesChanged() + function onPropertiesChanged() { provider.forcePropertiesChanged() } } Connections { target: UM.ActiveTool - onPropertiesChanged: + function onPropertiesChanged() { // the values cannot be bound with UM.ActiveTool.properties.getValue() calls, // so here we connect to the signal and update the those values. diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py b/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py index ab2bcaad5b..e80acc8d94 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from UM.Logger import Logger @@ -103,20 +103,27 @@ class PerObjectSettingsTool(Tool): new_instance.resetState() # Ensure that the state is not seen as a user state. settings.addInstance(new_instance) - for property_key in ["top_bottom_thickness", "wall_thickness", "wall_line_count"]: + # Override some settings to ensure that the infill mesh by default adds no skin or walls. Or remove them if not an infill mesh. + specialized_settings = { + "top_bottom_thickness": 0, + "top_thickness": "=top_bottom_thickness", + "bottom_thickness": "=top_bottom_thickness", + "top_layers": "=0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))", + "bottom_layers": "=0 if infill_sparse_density == 100 else math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))", + "wall_thickness": 0, + "wall_line_count": "=max(1, round((wall_thickness - wall_line_width_0) / wall_line_width_x) + 1) if wall_thickness != 0 else 0" + } + for property_key in specialized_settings: if mesh_type == "infill_mesh": if settings.getInstance(property_key) is None: definition = stack.getSettingDefinition(property_key) new_instance = SettingInstance(definition, settings) - # We just want the wall_line count to be there in case it was overriden in the global stack. - # as such, we don't need to set a value. - if property_key != "wall_line_count": - new_instance.setProperty("value", 0) + new_instance.setProperty("value", specialized_settings[property_key]) new_instance.resetState() # Ensure that the state is not seen as a user state. settings.addInstance(new_instance) settings_visibility_changed = True - elif old_mesh_type == "infill_mesh" and settings.getInstance(property_key) and (settings.getProperty(property_key, "value") == 0 or property_key == "wall_line_count"): + elif old_mesh_type == "infill_mesh" and settings.getInstance(property_key) and property_key in specialized_settings: settings.removeInstance(property_key) settings_visibility_changed = True diff --git a/plugins/PerObjectSettingsTool/__init__.py b/plugins/PerObjectSettingsTool/__init__.py index acfc35815e..d3c6d236ef 100644 --- a/plugins/PerObjectSettingsTool/__init__.py +++ b/plugins/PerObjectSettingsTool/__init__.py @@ -13,7 +13,7 @@ def getMetaData(): "tool": { "name": i18n_catalog.i18nc("@label", "Per Model Settings"), "description": i18n_catalog.i18nc("@info:tooltip", "Configure Per Model Settings"), - "icon": "tool_icon.svg", + "icon": "MeshType", "tool_panel": "PerObjectSettingsPanel.qml", "weight": 3 }, diff --git a/plugins/PerObjectSettingsTool/plugin.json b/plugins/PerObjectSettingsTool/plugin.json index 15db31401e..2a44d6840e 100644 --- a/plugins/PerObjectSettingsTool/plugin.json +++ b/plugins/PerObjectSettingsTool/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides the Per Model Settings.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/PerObjectSettingsTool/tool_icon.svg b/plugins/PerObjectSettingsTool/tool_icon.svg deleted file mode 100644 index 41e49cae07..0000000000 --- a/plugins/PerObjectSettingsTool/tool_icon.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - per_model_settings - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.py b/plugins/PostProcessingPlugin/PostProcessingPlugin.py index 075f947622..8968e2c547 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.py +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.py @@ -142,7 +142,9 @@ class PostProcessingPlugin(QObject, Extension): # The PostProcessingPlugin path is for built-in scripts. # The Resources path is where the user should store custom scripts. # The Preferences path is legacy, where the user may previously have stored scripts. - for root in [PluginRegistry.getInstance().getPluginPath("PostProcessingPlugin"), Resources.getStoragePath(Resources.Resources), Resources.getStoragePath(Resources.Preferences)]: + resource_folders = [PluginRegistry.getInstance().getPluginPath("PostProcessingPlugin"), Resources.getStoragePath(Resources.Preferences)] + resource_folders.extend(Resources.getAllPathsForType(Resources.Resources)) + for root in resource_folders: if root is None: continue path = os.path.join(root, "scripts") diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml index f94c0a1cca..7397ec8196 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml @@ -3,7 +3,9 @@ import QtQuick 2.2 import QtQuick.Controls 1.1 +import QtQuick.Controls 2.15 as QQC2 import QtQuick.Controls.Styles 1.1 +import QtQml.Models 2.15 as Models import QtQuick.Layouts 1.1 import QtQuick.Dialogs 1.1 import QtQuick.Window 2.2 @@ -152,7 +154,7 @@ UM.Dialog height: Math.round(control.height / 2.7) sourceSize.height: width color: palette.text - source: UM.Theme.getIcon("cross1") + source: UM.Theme.getIcon("Cancel") } } } @@ -186,7 +188,7 @@ UM.Dialog height: Math.round(control.height / 2.5) sourceSize.height: width color: control.enabled ? palette.text : disabledPalette.text - source: UM.Theme.getIcon("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") } } } @@ -220,7 +222,7 @@ UM.Dialog height: Math.round(control.height / 2.5) sourceSize.height: width color: control.enabled ? palette.text : disabledPalette.text - source: UM.Theme.getIcon("arrow_top") + source: UM.Theme.getIcon("ChevronSingleUp") } } } @@ -235,7 +237,7 @@ UM.Dialog anchors.leftMargin: base.textMargin anchors.top: activeScriptsList.bottom anchors.topMargin: base.textMargin - menu: scriptsMenu + onClicked: scriptsMenu.open() style: ButtonStyle { label: Label @@ -244,15 +246,16 @@ UM.Dialog } } } - Menu + QQC2.Menu { id: scriptsMenu + width: parent.width - Instantiator + Models.Instantiator { model: manager.loadedScriptList - MenuItem + QQC2.MenuItem { text: manager.getScriptLabelByKey(modelData.toString()) onTriggered: manager.addScriptToList(modelData.toString()) @@ -414,7 +417,7 @@ UM.Dialog { target: item - onShowTooltip: + function onShowTooltip(text) { tooltip.text = text var position = settingLoader.mapToItem(settingsPanel, settingsPanel.x, 0) @@ -422,7 +425,7 @@ UM.Dialog tooltip.target.x = position.x + 1 } - onHideTooltip: tooltip.hide() + function onHideTooltip() { tooltip.hide() } } } } @@ -514,7 +517,7 @@ UM.Dialog } toolTipContentAlignment: Cura.ToolTip.ContentAlignment.AlignLeft onClicked: dialog.show() - iconSource: "postprocessing.svg" + iconSource: "Script.svg" fixedWidthMode: false } @@ -533,4 +536,4 @@ UM.Dialog labelText: activeScriptsList.count } } -} \ No newline at end of file +} diff --git a/plugins/PostProcessingPlugin/Script.svg b/plugins/PostProcessingPlugin/Script.svg new file mode 100755 index 0000000000..33042b4124 --- /dev/null +++ b/plugins/PostProcessingPlugin/Script.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/plugins/PostProcessingPlugin/__init__.py b/plugins/PostProcessingPlugin/__init__.py index 019627ebd5..4b3045021f 100644 --- a/plugins/PostProcessingPlugin/__init__.py +++ b/plugins/PostProcessingPlugin/__init__.py @@ -1,14 +1,6 @@ # Copyright (c) 2020 Jaime van Kessel, Ultimaker B.V. # The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. -# Workaround for a race condition on certain systems where there -# is a race condition between Arcus and PyQt. Importing Arcus -# first seems to prevent Sip from going into a state where it -# tries to create PyQt objects on a non-main thread. -import Arcus # @UnusedImport -import Savitar # @UnusedImport -import pynest2d # @UnusedImport - from . import PostProcessingPlugin diff --git a/plugins/PostProcessingPlugin/plugin.json b/plugins/PostProcessingPlugin/plugin.json index a71b5cda78..d5b6727962 100644 --- a/plugins/PostProcessingPlugin/plugin.json +++ b/plugins/PostProcessingPlugin/plugin.json @@ -2,7 +2,7 @@ "name": "Post Processing", "author": "Ultimaker", "version": "2.2.1", - "api": "7.4.0", + "api": 7, "description": "Extension that allows for user created scripts for post processing", "catalog": "cura" } \ No newline at end of file diff --git a/plugins/PostProcessingPlugin/postprocessing.svg b/plugins/PostProcessingPlugin/postprocessing.svg deleted file mode 100644 index f55face4a9..0000000000 --- a/plugins/PostProcessingPlugin/postprocessing.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py index b4036f7ff2..a23e52b750 100644 --- a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py +++ b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py @@ -774,15 +774,15 @@ class ChangeAtZProcessor: # looking for wait for bed temp if "bedTemp" in values: - codes.append("BedTemp: " + str(values["bedTemp"])) + codes.append("BedTemp: " + str(round(values["bedTemp"]))) # set our extruder one temp (if specified) if "extruderOne" in values: - codes.append("Extruder 1 Temp: " + str(values["extruderOne"])) + codes.append("Extruder 1 Temp: " + str(round(values["extruderOne"]))) # set our extruder two temp (if specified) if "extruderTwo" in values: - codes.append("Extruder 2 Temp: " + str(values["extruderTwo"])) + codes.append("Extruder 2 Temp: " + str(round(values["extruderTwo"]))) # set global flow rate if "flowrate" in values: diff --git a/plugins/PostProcessingPlugin/scripts/CreateThumbnail.py b/plugins/PostProcessingPlugin/scripts/CreateThumbnail.py new file mode 100644 index 0000000000..0ce6ac6eff --- /dev/null +++ b/plugins/PostProcessingPlugin/scripts/CreateThumbnail.py @@ -0,0 +1,109 @@ +import base64 + +from UM.Logger import Logger +from cura.Snapshot import Snapshot +from PyQt5.QtCore import QByteArray, QIODevice, QBuffer + +from ..Script import Script + + +class CreateThumbnail(Script): + def __init__(self): + super().__init__() + + def _createSnapshot(self, width, height): + Logger.log("d", "Creating thumbnail image...") + try: + return Snapshot.snapshot(width, height) + except Exception: + Logger.logException("w", "Failed to create snapshot image") + + def _encodeSnapshot(self, snapshot): + Logger.log("d", "Encoding thumbnail image...") + try: + thumbnail_buffer = QBuffer() + thumbnail_buffer.open(QBuffer.ReadWrite) + thumbnail_image = snapshot + thumbnail_image.save(thumbnail_buffer, "PNG") + base64_bytes = base64.b64encode(thumbnail_buffer.data()) + base64_message = base64_bytes.decode('ascii') + thumbnail_buffer.close() + return base64_message + except Exception: + Logger.logException("w", "Failed to encode snapshot image") + + def _convertSnapshotToGcode(self, encoded_snapshot, width, height, chunk_size=78): + gcode = [] + + encoded_snapshot_length = len(encoded_snapshot) + gcode.append(";") + gcode.append("; thumbnail begin {} {} {}".format( + width, height, encoded_snapshot_length)) + + chunks = ["; {}".format(encoded_snapshot[i:i+chunk_size]) + for i in range(0, len(encoded_snapshot), chunk_size)] + gcode.extend(chunks) + + gcode.append("; thumbnail end") + gcode.append(";") + gcode.append("") + + return gcode + + def getSettingDataString(self): + return """{ + "name": "Create Thumbnail", + "key": "CreateThumbnail", + "metadata": {}, + "version": 2, + "settings": + { + "width": + { + "label": "Width", + "description": "Width of the generated thumbnail", + "unit": "px", + "type": "int", + "default_value": 32, + "minimum_value": "0", + "minimum_value_warning": "12", + "maximum_value_warning": "800" + }, + "height": + { + "label": "Height", + "description": "Height of the generated thumbnail", + "unit": "px", + "type": "int", + "default_value": 32, + "minimum_value": "0", + "minimum_value_warning": "12", + "maximum_value_warning": "600" + } + } + }""" + + def execute(self, data): + width = self.getSettingValueByKey("width") + height = self.getSettingValueByKey("height") + + snapshot = self._createSnapshot(width, height) + if snapshot: + encoded_snapshot = self._encodeSnapshot(snapshot) + snapshot_gcode = self._convertSnapshotToGcode( + encoded_snapshot, width, height) + + for layer in data: + layer_index = data.index(layer) + lines = data[layer_index].split("\n") + for line in lines: + if line.startswith(";Generated with Cura"): + line_index = lines.index(line) + insert_index = line_index + 1 + lines[insert_index:insert_index] = snapshot_gcode + break + + final_lines = "\n".join(lines) + data[layer_index] = final_lines + + return data diff --git a/plugins/PostProcessingPlugin/scripts/DisplayProgressOnLCD.py b/plugins/PostProcessingPlugin/scripts/DisplayProgressOnLCD.py index e39e69eff0..fd1c8af004 100644 --- a/plugins/PostProcessingPlugin/scripts/DisplayProgressOnLCD.py +++ b/plugins/PostProcessingPlugin/scripts/DisplayProgressOnLCD.py @@ -77,7 +77,7 @@ class DisplayProgressOnLCD(Script): current_time_string = "{:d}h{:02d}m{:02d}s".format(int(h), int(m), int(s)) # And now insert that into the GCODE lines.insert(line_index, "M117 Time Left {}".format(current_time_string)) - else: # Must be m73. + else: mins = int(60 * h + m + s / 30) lines.insert(line_index, "M73 R{}".format(mins)) diff --git a/plugins/PostProcessingPlugin/scripts/FilamentChange.py b/plugins/PostProcessingPlugin/scripts/FilamentChange.py index 74b9687f8c..17ff045b8d 100644 --- a/plugins/PostProcessingPlugin/scripts/FilamentChange.py +++ b/plugins/PostProcessingPlugin/scripts/FilamentChange.py @@ -1,6 +1,9 @@ -# Copyright (c) 2019 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. +# Modification 06.09.2020 +# add checkbox, now you can choose and use configuration from the firmware itself. + from typing import List from ..Script import Script @@ -13,7 +16,7 @@ class FilamentChange(Script): def getSettingDataString(self): return """{ - "name":"Filament Change", + "name": "Filament Change", "key": "FilamentChange", "metadata": {}, "version": 2, @@ -27,14 +30,21 @@ class FilamentChange(Script): "type": "str", "default_value": "1" }, - + "firmware_config": + { + "label": "Use Firmware Configuration", + "description": "Use the settings in your firmware, or customise the parameters of the filament change here.", + "type": "bool", + "default_value": false + }, "initial_retract": { "label": "Initial Retraction", "description": "Initial filament retraction distance. The filament will be retracted with this amount before moving the nozzle away from the ongoing print.", "unit": "mm", "type": "float", - "default_value": 30.0 + "default_value": 30.0, + "enabled": "not firmware_config" }, "later_retract": { @@ -42,7 +52,8 @@ class FilamentChange(Script): "description": "Later filament retraction distance for removal. The filament will be retracted all the way out of the printer so that you can change the filament.", "unit": "mm", "type": "float", - "default_value": 300.0 + "default_value": 300.0, + "enabled": "not firmware_config" }, "x_position": { @@ -50,7 +61,8 @@ class FilamentChange(Script): "description": "Extruder X position. The print head will move here for filament change.", "unit": "mm", "type": "float", - "default_value": 0 + "default_value": 0, + "enabled": "not firmware_config" }, "y_position": { @@ -58,7 +70,17 @@ class FilamentChange(Script): "description": "Extruder Y position. The print head will move here for filament change.", "unit": "mm", "type": "float", - "default_value": 0 + "default_value": 0, + "enabled": "not firmware_config" + }, + "z_position": + { + "label": "Z Position (relative)", + "description": "Extruder relative Z position. Move the print head up for filament change.", + "unit": "mm", + "type": "float", + "default_value": 0, + "minimum_value": 0 } } }""" @@ -74,20 +96,26 @@ class FilamentChange(Script): later_retract = self.getSettingValueByKey("later_retract") x_pos = self.getSettingValueByKey("x_position") y_pos = self.getSettingValueByKey("y_position") + z_pos = self.getSettingValueByKey("z_position") + firmware_config = self.getSettingValueByKey("firmware_config") color_change = "M600" - if initial_retract is not None and initial_retract > 0.: - color_change = color_change + (" E%.2f" % initial_retract) + if not firmware_config: + if initial_retract is not None and initial_retract > 0.: + color_change = color_change + (" E%.2f" % initial_retract) - if later_retract is not None and later_retract > 0.: - color_change = color_change + (" L%.2f" % later_retract) + if later_retract is not None and later_retract > 0.: + color_change = color_change + (" L%.2f" % later_retract) - if x_pos is not None: - color_change = color_change + (" X%.2f" % x_pos) - - if y_pos is not None: - color_change = color_change + (" Y%.2f" % y_pos) + if x_pos is not None: + color_change = color_change + (" X%.2f" % x_pos) + + if y_pos is not None: + color_change = color_change + (" Y%.2f" % y_pos) + + if z_pos is not None and z_pos > 0.: + color_change = color_change + (" Z%.2f" % z_pos) color_change = color_change + " ; Generated by FilamentChange plugin\n" @@ -101,4 +129,4 @@ class FilamentChange(Script): if 0 < layer_num < len(data): data[layer_num] = color_change + data[layer_num] - return data \ No newline at end of file + return data diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py index fc7bfec60a..5c28073fb1 100644 --- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from ..Script import Script @@ -182,8 +182,7 @@ class PauseAtHeight(Script): "Repetier": "Repetier" }, "default_value": "RepRap (Marlin/Sprinter)", - "enabled": false, - "default_value": "" + "enabled": false }, "custom_gcode_before_pause": { @@ -339,11 +338,6 @@ class PauseAtHeight(Script): if current_layer < pause_layer - nbr_negative_layers: continue - # Get X and Y from the next layer (better position for - # the nozzle) - next_layer = data[index + 1] - x, y = self.getNextXY(next_layer) - prev_layer = data[index - 1] prev_lines = prev_layer.split("\n") current_e = 0. @@ -354,6 +348,13 @@ class PauseAtHeight(Script): current_e = self.getValue(prevLine, "E", -1) if current_e >= 0: break + # and also find last X,Y + for prevLine in reversed(prev_lines): + if prevLine.startswith(("G0", "G1", "G2", "G3")): + if self.getValue(prevLine, "X") is not None and self.getValue(prevLine, "Y") is not None: + x = self.getValue(prevLine, "X") + y = self.getValue(prevLine, "Y") + break # Maybe redo the last layer. if redo_layer: @@ -386,7 +387,7 @@ class PauseAtHeight(Script): #Retraction prepend_gcode += self.putValue(M = 83) + " ; switch to relative E values for any needed retraction\n" if retraction_amount != 0: - prepend_gcode += self.putValue(G = 1, E = retraction_amount, F = 6000) + "\n" + prepend_gcode += self.putValue(G = 1, E = -retraction_amount, F = 6000) + "\n" #Move the head away prepend_gcode += self.putValue(G = 1, Z = current_z + 1, F = 300) + " ; move up a millimeter to get out of the way\n" @@ -455,7 +456,7 @@ class PauseAtHeight(Script): prepend_gcode += self.putValue(G = 1, E = -retraction_amount, F = 6000) + "\n" #Move the head back - prepend_gcode += self.putValue(G = 1, Z = current_z + 1, F = 300) + "\n" + prepend_gcode += self.putValue(G = 1, Z = current_z, F = 300) + "\n" prepend_gcode += self.putValue(G = 1, X = x, Y = y, F = 9000) + "\n" if retraction_amount != 0: prepend_gcode += self.putValue(G = 1, E = retraction_amount, F = 6000) + "\n" @@ -506,10 +507,23 @@ class PauseAtHeight(Script): else: Logger.log("w", "No previous feedrate found in gcode, feedrate for next layer(s) might be incorrect") - prepend_gcode += self.putValue(M = 82) + " ; switch back to absolute E values\n" + extrusion_mode_string = "absolute" + extrusion_mode_numeric = 82 - # reset extrude value to pre pause value - prepend_gcode += self.putValue(G = 92, E = current_e) + "\n" + relative_extrusion = Application.getInstance().getGlobalContainerStack().getProperty("relative_extrusion", "value") + if relative_extrusion: + extrusion_mode_string = "relative" + extrusion_mode_numeric = 83 + + prepend_gcode += self.putValue(M = extrusion_mode_numeric) + " ; switch back to " + extrusion_mode_string + " E values\n" + + # reset extrude value to pre pause value + prepend_gcode += self.putValue(G = 92, E = current_e) + "\n" + + elif redo_layer: + # All other options reset the E value to what it was before the pause because E things were added. + # If it's not yet reset, it still needs to be reset if there were any redo layers. + prepend_gcode += self.putValue(G = 92, E = current_e) + "\n" layer = prepend_gcode + layer diff --git a/plugins/PostProcessingPlugin/scripts/TimeLapse.py b/plugins/PostProcessingPlugin/scripts/TimeLapse.py index 41fd4a5805..210199e087 100644 --- a/plugins/PostProcessingPlugin/scripts/TimeLapse.py +++ b/plugins/PostProcessingPlugin/scripts/TimeLapse.py @@ -66,6 +66,22 @@ class TimeLapse(Script): "type": "float", "default_value": 9000, "enabled": "park_print_head" + }, + "retract": + { + "label": "Retraction Distance", + "description": "Filament retraction distance for camera trigger.", + "unit": "mm", + "type": "int", + "default_value": 0 + }, + "zhop": + { + "label": "Z-Hop Height When Parking", + "description": "Z-hop length before parking", + "unit": "mm", + "type": "float", + "default_value": 0 } } }""" @@ -77,9 +93,12 @@ class TimeLapse(Script): y_park = self.getSettingValueByKey("head_park_y") trigger_command = self.getSettingValueByKey("trigger_command") pause_length = self.getSettingValueByKey("pause_length") + retract = int(self.getSettingValueByKey("retract")) + zhop = self.getSettingValueByKey("zhop") gcode_to_append = ";TimeLapse Begin\n" last_x = 0 last_y = 0 + last_z = 0 if park_print_head: gcode_to_append += self.putValue(G=1, F=feed_rate, @@ -90,16 +109,35 @@ class TimeLapse(Script): for idx, layer in enumerate(data): for line in layer.split("\n"): - if self.getValue(line, "G") in {0, 1}: # Track X,Y location. + if self.getValue(line, "G") in {0, 1}: # Track X,Y,Z location. last_x = self.getValue(line, "X", last_x) last_y = self.getValue(line, "Y", last_y) + last_z = self.getValue(line, "Z", last_z) # Check that a layer is being printed lines = layer.split("\n") for line in lines: if ";LAYER:" in line: + if retract != 0: # Retract the filament so no stringing happens + layer += self.putValue(M=83) + " ;Extrude Relative\n" + layer += self.putValue(G=1, E=-retract, F=3000) + " ;Retract filament\n" + layer += self.putValue(M=82) + " ;Extrude Absolute\n" + layer += self.putValue(M=400) + " ;Wait for moves to finish\n" # Wait to fully retract before hopping + + if zhop != 0: + layer += self.putValue(G=1, Z=last_z+zhop, F=3000) + " ;Z-Hop\n" + layer += gcode_to_append - layer += "G0 X%s Y%s\n" % (last_x, last_y) + if zhop != 0: + layer += self.putValue(G=0, X=last_x, Y=last_y, Z=last_z) + "; Restore position \n" + else: + layer += self.putValue(G=0, X=last_x, Y=last_y) + "; Restore position \n" + + if retract != 0: + layer += self.putValue(M=400) + " ;Wait for moves to finish\n" + layer += self.putValue(M=83) + " ;Extrude Relative\n" + layer += self.putValue(G=1, E=retract, F=3000) + " ;Retract filament\n" + layer += self.putValue(M=82) + " ;Extrude Absolute\n" data[idx] = layer break diff --git a/plugins/PrepareStage/PrepareMenu.qml b/plugins/PrepareStage/PrepareMenu.qml index 87d7c5f35c..cf7665bda6 100644 --- a/plugins/PrepareStage/PrepareMenu.qml +++ b/plugins/PrepareStage/PrepareMenu.qml @@ -1,19 +1,20 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.7 +import QtQuick 2.9 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.3 import UM 1.3 as UM import Cura 1.1 as Cura -import QtGraphicalEffects 1.0 // For the dropshadow Item { id: prepareMenu + property var fileProviderModel: CuraApplication.getFileProviderModel() + UM.I18nCatalog { id: catalog @@ -24,60 +25,44 @@ Item { left: parent.left right: parent.right - leftMargin: UM.Theme.getSize("wide_margin").width - rightMargin: UM.Theme.getSize("wide_margin").width + leftMargin: UM.Theme.getSize("wide_margin").width * 2 + rightMargin: UM.Theme.getSize("wide_margin").width * 2 } // Item to ensure that all of the buttons are nicely centered. Item { - anchors.horizontalCenter: parent.horizontalCenter - width: parent.width - 2 * UM.Theme.getSize("wide_margin").width - height: parent.height + anchors.fill: parent RowLayout { id: itemRow - anchors.left: openFileButton.right + anchors.left: parent.left anchors.right: parent.right - anchors.leftMargin: UM.Theme.getSize("default_margin").width + anchors.leftMargin: UM.Theme.getSize("default_margin").width + openFileButton.width + openFileMenu.width + property int machineSelectorWidth: Math.round((width - printSetupSelectorItem.width) / 3) height: parent.height - spacing: 0 + // This is a trick to make sure that the borders of the two adjacent buttons' borders overlap. Otherwise + // there will be double border (one from each button) + spacing: -UM.Theme.getSize("default_lining").width Cura.MachineSelector { id: machineSelection headerCornerSide: Cura.RoundedRectangle.Direction.Left - Layout.minimumWidth: UM.Theme.getSize("machine_selector_widget").width - Layout.maximumWidth: UM.Theme.getSize("machine_selector_widget").width + Layout.preferredWidth: parent.machineSelectorWidth Layout.fillWidth: true Layout.fillHeight: true } - // Separator line - Rectangle - { - height: parent.height - width: UM.Theme.getSize("default_lining").width - color: UM.Theme.getColor("lining") - } - Cura.ConfigurationMenu { id: printerSetup Layout.fillHeight: true Layout.fillWidth: true - Layout.preferredWidth: itemRow.width - machineSelection.width - printSetupSelectorItem.width - 2 * UM.Theme.getSize("default_lining").width - } - - // Separator line - Rectangle - { - height: parent.height - width: UM.Theme.getSize("default_lining").width - color: UM.Theme.getColor("lining") + Layout.preferredWidth: parent.machineSelectorWidth * 2 } Item @@ -91,22 +76,116 @@ Item } } + //Pop-up shown when there are multiple items to select from. + Cura.ExpandablePopup + { + id: openFileMenu + visible: prepareMenu.fileProviderModel.count > 1 + + contentAlignment: Cura.ExpandablePopup.ContentAlignment.AlignLeft + headerCornerSide: Cura.RoundedRectangle.Direction.All + headerPadding: Math.round((parent.height - UM.Theme.getSize("button_icon").height) / 2) + contentPadding: UM.Theme.getSize("default_lining").width + enabled: visible + + height: parent.height + width: visible ? (headerPadding * 3 + UM.Theme.getSize("button_icon").height + iconSize) : 0 + + headerItem: UM.RecolorImage + { + id: menuIcon + source: UM.Theme.getIcon("Folder", "medium") + color: UM.Theme.getColor("icon") + + sourceSize.height: height + } + + contentItem: Item + { + id: popup + + Column + { + id: openProviderColumn + + //The column doesn't automatically listen to its children rect if the children change internally, so we need to explicitly update the size. + onChildrenRectChanged: + { + popup.height = childrenRect.height + popup.width = childrenRect.width + } + onPositioningComplete: + { + popup.height = childrenRect.height + popup.width = childrenRect.width + } + + Repeater + { + model: prepareMenu.fileProviderModel + delegate: Button + { + leftPadding: UM.Theme.getSize("default_margin").width + rightPadding: UM.Theme.getSize("default_margin").width + width: contentItem.width + leftPadding + rightPadding + height: UM.Theme.getSize("action_button").height + hoverEnabled: true + + contentItem: Label + { + text: model.displayText + color: UM.Theme.getColor("text") + font: UM.Theme.getFont("medium") + renderType: Text.NativeRendering + verticalAlignment: Text.AlignVCenter + + width: contentWidth + height: parent.height + } + + onClicked: + { + if(model.index == 0) //The 0th element is the "From Disk" option, which should activate the open local file dialog. + { + Cura.Actions.open.trigger(); + } + else + { + prepareMenu.fileProviderModel.trigger(model.name); + } + } + + background: Rectangle + { + color: parent.hovered ? UM.Theme.getColor("action_button_hovered") : "transparent" + radius: UM.Theme.getSize("action_button_radius").width + width: popup.width + } + } + } + } + } + } + + //If there is just a single item, show a button instead that directly chooses the one option. Button { id: openFileButton - height: UM.Theme.getSize("stage_menu").height - width: UM.Theme.getSize("stage_menu").height + visible: prepareMenu.fileProviderModel.count <= 1 + + height: parent.height + width: visible ? height : 0 //Square button (and don't take up space if invisible). onClicked: Cura.Actions.open.trigger() + enabled: visible && prepareMenu.fileProviderModel.count > 0 hoverEnabled: true contentItem: Item { - anchors.fill: parent UM.RecolorImage { id: buttonIcon + source: UM.Theme.getIcon("Folder", "medium") anchors.centerIn: parent - source: UM.Theme.getIcon("load") width: UM.Theme.getSize("button_icon").width height: UM.Theme.getSize("button_icon").height color: UM.Theme.getColor("icon") @@ -118,26 +197,14 @@ Item background: Rectangle { id: background - height: UM.Theme.getSize("stage_menu").height - width: UM.Theme.getSize("stage_menu").height + height: parent.height + width: parent.width + border.color: UM.Theme.getColor("lining") + border.width: UM.Theme.getSize("default_lining").width radius: UM.Theme.getSize("default_radius").width color: openFileButton.hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button") } - - DropShadow - { - id: shadow - // Don't blur the shadow - radius: 0 - anchors.fill: background - source: background - verticalOffset: 2 - visible: true - color: UM.Theme.getColor("action_button_shadow") - // Should always be drawn behind the background. - z: background.z - 1 - } } } } diff --git a/plugins/PrepareStage/plugin.json b/plugins/PrepareStage/plugin.json index 3a80523682..603ed49359 100644 --- a/plugins/PrepareStage/plugin.json +++ b/plugins/PrepareStage/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides a prepare stage in Cura.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } \ No newline at end of file diff --git a/plugins/PreviewStage/PreviewMenu.qml b/plugins/PreviewStage/PreviewMenu.qml index ff1ccff75f..9e039896c6 100644 --- a/plugins/PreviewStage/PreviewMenu.qml +++ b/plugins/PreviewStage/PreviewMenu.qml @@ -24,54 +24,36 @@ Item { left: parent.left right: parent.right - leftMargin: UM.Theme.getSize("wide_margin").width - rightMargin: UM.Theme.getSize("wide_margin").width + leftMargin: UM.Theme.getSize("wide_margin").width * 2 + rightMargin: UM.Theme.getSize("wide_margin").width * 2 } Row { id: stageMenuRow - anchors.horizontalCenter: parent.horizontalCenter - width: parent.width - 2 * UM.Theme.getSize("wide_margin").width - height: parent.height + anchors.fill: parent + // This is a trick to make sure that the borders of the two adjacent buttons' borders overlap. Otherwise + // there will be double border (one from each button) + spacing: -UM.Theme.getSize("default_lining").width Cura.ViewsSelector { id: viewsSelector height: parent.height - width: UM.Theme.getSize("views_selector").width + width: Math.max(Math.round((parent.width - printSetupSelectorItem.width) / 3), UM.Theme.getSize("views_selector").width) headerCornerSide: Cura.RoundedRectangle.Direction.Left } - // Separator line - Rectangle - { - height: parent.height - // If there is no viewPanel, we only need a single spacer, so hide this one. - visible: viewPanel.source != "" - width: visible ? UM.Theme.getSize("default_lining").width : 0 - - color: UM.Theme.getColor("lining") - } - // This component will grow freely up to complete the width of the row. Loader { id: viewPanel height: parent.height - width: source != "" ? (previewMenu.width - viewsSelector.width - printSetupSelectorItem.width - 2 * (UM.Theme.getSize("wide_margin").width + UM.Theme.getSize("default_lining").width)) : 0 + width: source != "" ? (parent.width - viewsSelector.width - printSetupSelectorItem.width) : 0 source: UM.Controller.activeView != null && UM.Controller.activeView.stageMenuComponent != null ? UM.Controller.activeView.stageMenuComponent : "" } - // Separator line - Rectangle - { - height: parent.height - width: UM.Theme.getSize("default_lining").width - color: UM.Theme.getColor("lining") - } - Item { id: printSetupSelectorItem diff --git a/plugins/PreviewStage/plugin.json b/plugins/PreviewStage/plugin.json index d2badeeb7e..f0341d20ea 100644 --- a/plugins/PreviewStage/plugin.json +++ b/plugins/PreviewStage/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides a preview stage in Cura.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } \ No newline at end of file diff --git a/plugins/README_plugins.txt b/plugins/README_plugins.txt new file mode 100644 index 0000000000..47a639818c --- /dev/null +++ b/plugins/README_plugins.txt @@ -0,0 +1,11 @@ +This is the folder for _bundled_ plugins. If you place any other plugins here, +they will not be seen or upgraded by any next version of Cura. + +If you want your (unbundled) plugins to work after an upgrade, +please don't put them here, but install them either; + - via the Marketplace (recommended if available for that plugin), + - by dragging a `.curapackage` file onto Cura, + - or place it in the plugin folder in the configuration folder* for Cura. + +*) The plugin sub-folder of the configuration folder can be found by: + Open up Help -> Show Configuration Folder -> Navigate to the plugins folder. diff --git a/plugins/RemovableDriveOutputDevice/plugin.json b/plugins/RemovableDriveOutputDevice/plugin.json index d862257e69..b1dae2d182 100644 --- a/plugins/RemovableDriveOutputDevice/plugin.json +++ b/plugins/RemovableDriveOutputDevice/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "description": "Provides removable drive hotplugging and writing support.", "version": "1.0.1", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/SentryLogger/plugin.json b/plugins/SentryLogger/plugin.json index 3ba76d166e..e765e45e0f 100644 --- a/plugins/SentryLogger/plugin.json +++ b/plugins/SentryLogger/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.0", "description": "Logs certain events so that they can be used by the crash reporter", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/SimulationView/SimulationPass.py b/plugins/SimulationView/SimulationPass.py index 93485eb3a3..2754fb5d94 100644 --- a/plugins/SimulationView/SimulationPass.py +++ b/plugins/SimulationView/SimulationPass.py @@ -15,9 +15,10 @@ from UM.View.RenderBatch import RenderBatch from UM.View.GL.OpenGL import OpenGL from cura.Settings.ExtruderManager import ExtruderManager - +from cura.LayerPolygon import LayerPolygon import os.path +import numpy ## RenderPass used to display g-code paths. from .NozzleNode import NozzleNode @@ -35,7 +36,7 @@ class SimulationPass(RenderPass): self._disabled_shader = None self._old_current_layer = 0 self._old_current_path = 0 - self._switching_layers = True # It tracks when the user is moving the layers' slider + self._switching_layers = True # Tracking whether the user is moving across layers (True) or across paths (False). If false, lower layers render as shadowy. self._gl = OpenGL.getInstance().getBindingsObject() self._scene = Application.getInstance().getController().getScene() self._extruder_manager = ExtruderManager.getInstance() @@ -43,6 +44,8 @@ class SimulationPass(RenderPass): self._layer_view = None self._compatibility_mode = None + self._scene.sceneChanged.connect(self._onSceneChanged) + def setSimulationView(self, layerview): self._layer_view = layerview self._compatibility_mode = layerview.getCompatibilityMode() @@ -60,29 +63,42 @@ class SimulationPass(RenderPass): self._current_shader = self._layer_shader # Use extruder 0 if the extruder manager reports extruder index -1 (for single extrusion printers) self._layer_shader.setUniformValue("u_active_extruder", float(max(0, self._extruder_manager.activeExtruderIndex))) + if not self._compatibility_mode: + self._layer_shader.setUniformValue("u_starts_color", Color(*Application.getInstance().getTheme().getColor("layerview_starts").getRgb())) + if self._layer_view: self._layer_shader.setUniformValue("u_max_feedrate", self._layer_view.getMaxFeedrate()) self._layer_shader.setUniformValue("u_min_feedrate", self._layer_view.getMinFeedrate()) self._layer_shader.setUniformValue("u_max_thickness", self._layer_view.getMaxThickness()) self._layer_shader.setUniformValue("u_min_thickness", self._layer_view.getMinThickness()) + self._layer_shader.setUniformValue("u_max_line_width", self._layer_view.getMaxLineWidth()) + self._layer_shader.setUniformValue("u_min_line_width", self._layer_view.getMinLineWidth()) + self._layer_shader.setUniformValue("u_max_flow_rate", self._layer_view.getMaxFlowRate()) + self._layer_shader.setUniformValue("u_min_flow_rate", self._layer_view.getMinFlowRate()) self._layer_shader.setUniformValue("u_layer_view_type", self._layer_view.getSimulationViewType()) self._layer_shader.setUniformValue("u_extruder_opacity", self._layer_view.getExtruderOpacities()) self._layer_shader.setUniformValue("u_show_travel_moves", self._layer_view.getShowTravelMoves()) self._layer_shader.setUniformValue("u_show_helpers", self._layer_view.getShowHelpers()) self._layer_shader.setUniformValue("u_show_skin", self._layer_view.getShowSkin()) self._layer_shader.setUniformValue("u_show_infill", self._layer_view.getShowInfill()) + self._layer_shader.setUniformValue("u_show_starts", self._layer_view.getShowStarts()) else: #defaults self._layer_shader.setUniformValue("u_max_feedrate", 1) self._layer_shader.setUniformValue("u_min_feedrate", 0) self._layer_shader.setUniformValue("u_max_thickness", 1) self._layer_shader.setUniformValue("u_min_thickness", 0) + self._layer_shader.setUniformValue("u_max_flow_rate", 1) + self._layer_shader.setUniformValue("u_min_flow_rate", 0) + self._layer_shader.setUniformValue("u_max_line_width", 1) + self._layer_shader.setUniformValue("u_min_line_width", 0) self._layer_shader.setUniformValue("u_layer_view_type", 1) self._layer_shader.setUniformValue("u_extruder_opacity", [[1, 1, 1, 1], [1, 1, 1, 1], [1, 1, 1, 1], [1, 1, 1, 1]]) self._layer_shader.setUniformValue("u_show_travel_moves", 0) self._layer_shader.setUniformValue("u_show_helpers", 1) self._layer_shader.setUniformValue("u_show_skin", 1) self._layer_shader.setUniformValue("u_show_infill", 1) + self._layer_shader.setUniformValue("u_show_starts", 1) if not self._tool_handle_shader: self._tool_handle_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "toolhandle.shader")) @@ -161,6 +177,13 @@ class SimulationPass(RenderPass): self._current_shader = self._layer_shader self._switching_layers = True + # The first line does not have a previous line: add a MoveCombingType in front for start detection + # this way the first start of the layer can also be drawn + prev_line_types = numpy.concatenate([numpy.asarray([LayerPolygon.MoveCombingType], dtype = numpy.float32), layer_data._attributes["line_types"]["value"]]) + # Remove the last element + prev_line_types = prev_line_types[0:layer_data._attributes["line_types"]["value"].size] + layer_data._attributes["prev_line_types"] = {'opengl_type': 'float', 'value': prev_line_types, 'opengl_name': 'a_prev_line_type'} + layers_batch = RenderBatch(self._current_shader, type = RenderBatch.RenderType.Solid, mode = RenderBatch.RenderMode.Lines, range = (start, end), backface_cull = True) layers_batch.addItem(node.getWorldTransformation(), layer_data) layers_batch.render(self._scene.getActiveCamera()) @@ -202,3 +225,9 @@ class SimulationPass(RenderPass): tool_handle_batch.render(self._scene.getActiveCamera()) self.release() + + def _onSceneChanged(self, changed_object: SceneNode): + if changed_object.callDecoration("getLayerData"): # Any layer data has changed. + self._switching_layers = True + self._old_current_layer = 0 + self._old_current_path = 0 diff --git a/plugins/SimulationView/SimulationView.py b/plugins/SimulationView/SimulationView.py index 349426d463..57209f2678 100644 --- a/plugins/SimulationView/SimulationView.py +++ b/plugins/SimulationView/SimulationView.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import sys @@ -30,6 +30,7 @@ from UM.View.GL.ShaderProgram import ShaderProgram from UM.i18n import i18nCatalog from cura.CuraView import CuraView +from cura.LayerPolygon import LayerPolygon # To distinguish line types. from cura.Scene.ConvexHullNode import ConvexHullNode from cura.CuraApplication import CuraApplication @@ -91,6 +92,10 @@ class SimulationView(CuraView): self._min_feedrate = sys.float_info.max self._max_thickness = sys.float_info.min self._min_thickness = sys.float_info.max + self._max_line_width = sys.float_info.min + self._min_line_width = sys.float_info.max + self._min_flow_rate = sys.float_info.max + self._max_flow_rate = sys.float_info.min self._global_container_stack = None # type: Optional[ContainerStack] self._proxy = None @@ -104,14 +109,16 @@ class SimulationView(CuraView): Application.getInstance().getPreferences().addPreference("view/only_show_top_layers", False) Application.getInstance().getPreferences().addPreference("view/force_layer_view_compatibility_mode", False) - Application.getInstance().getPreferences().addPreference("layerview/layer_view_type", 0) + Application.getInstance().getPreferences().addPreference("layerview/layer_view_type", 1) # Default to "Line Type". Application.getInstance().getPreferences().addPreference("layerview/extruder_opacities", "") Application.getInstance().getPreferences().addPreference("layerview/show_travel_moves", False) Application.getInstance().getPreferences().addPreference("layerview/show_helpers", True) Application.getInstance().getPreferences().addPreference("layerview/show_skin", True) Application.getInstance().getPreferences().addPreference("layerview/show_infill", True) + Application.getInstance().getPreferences().addPreference("layerview/show_starts", True) + self.visibleStructuresChanged.connect(self.calculateColorSchemeLimits) self._updateWithPreferences() self._solid_layers = int(Application.getInstance().getPreferences().getValue("view/top_layer_count")) @@ -146,6 +153,7 @@ class SimulationView(CuraView): self._show_helpers = True self._show_skin = True self._show_infill = True + self._show_starts = True self.resetLayerData() def getActivity(self) -> bool: @@ -194,6 +202,7 @@ class SimulationView(CuraView): if node.getMeshData() is None: return self.setActivity(False) + self.calculateColorSchemeLimits() self.calculateMaxLayers() self.calculateMaxPathsOnLayer(self._current_layer_num) @@ -214,10 +223,6 @@ class SimulationView(CuraView): def resetLayerData(self) -> None: self._current_layer_mesh = None self._current_layer_jumps = None - self._max_feedrate = sys.float_info.min - self._min_feedrate = sys.float_info.max - self._max_thickness = sys.float_info.min - self._min_thickness = sys.float_info.max def beginRendering(self) -> None: scene = self.getController().getScene() @@ -242,58 +247,59 @@ class SimulationView(CuraView): renderer.queueNode(node, transparent = True, shader = self._ghost_shader) def setLayer(self, value: int) -> None: + """ + Set the upper end of the range of visible layers. + + If setting it below the lower end of the range, the lower end is lowered so that 1 layer stays visible. + :param value: The new layer number to show, 0-indexed. + """ if self._current_layer_num != value: - self._current_layer_num = value - if self._current_layer_num < 0: - self._current_layer_num = 0 - if self._current_layer_num > self._max_layers: - self._current_layer_num = self._max_layers - if self._current_layer_num < self._minimum_layer_num: - self._minimum_layer_num = self._current_layer_num + self._current_layer_num = min(max(value, 0), self._max_layers) + self._minimum_layer_num = min(self._current_layer_num, self._minimum_layer_num) self._startUpdateTopLayers() - self.currentLayerNumChanged.emit() def setMinimumLayer(self, value: int) -> None: + """ + Set the lower end of the range of visible layers. + + If setting it above the upper end of the range, the upper end is increased so that 1 layer stays visible. + :param value: The new lower end of the range of visible layers, 0-indexed. + """ if self._minimum_layer_num != value: - self._minimum_layer_num = value - if self._minimum_layer_num < 0: - self._minimum_layer_num = 0 - if self._minimum_layer_num > self._max_layers: - self._minimum_layer_num = self._max_layers - if self._minimum_layer_num > self._current_layer_num: - self._current_layer_num = self._minimum_layer_num + self._minimum_layer_num = min(max(value, 0), self._max_layers) + self._current_layer_num = max(self._current_layer_num, self._minimum_layer_num) self._startUpdateTopLayers() - self.currentLayerNumChanged.emit() def setPath(self, value: int) -> None: + """ + Set the upper end of the range of visible paths on the current layer. + + If setting it below the lower end of the range, the lower end is lowered so that 1 path stays visible. + :param value: The new path index to show, 0-indexed. + """ if self._current_path_num != value: - self._current_path_num = value - if self._current_path_num < 0: - self._current_path_num = 0 - if self._current_path_num > self._max_paths: - self._current_path_num = self._max_paths - if self._current_path_num < self._minimum_path_num: - self._minimum_path_num = self._current_path_num + self._current_path_num = min(max(value, 0), self._max_paths) + self._minimum_path_num = min(self._minimum_path_num, self._current_path_num) self._startUpdateTopLayers() self.currentPathNumChanged.emit() def setMinimumPath(self, value: int) -> None: + """ + Set the lower end of the range of visible paths on the current layer. + + If setting it above the upper end of the range, the upper end is increased so that 1 path stays visible. + :param value: The new lower end of the range of visible paths, 0-indexed. + """ if self._minimum_path_num != value: - self._minimum_path_num = value - if self._minimum_path_num < 0: - self._minimum_path_num = 0 - if self._minimum_path_num > self._max_layers: - self._minimum_path_num = self._max_layers - if self._minimum_path_num > self._current_path_num: - self._current_path_num = self._minimum_path_num + self._minimum_path_num = min(max(value, 0), self._max_paths) + self._current_path_num = max(self._current_path_num, self._minimum_path_num) self._startUpdateTopLayers() - self.currentPathNumChanged.emit() def setSimulationViewType(self, layer_view_type: int) -> None: @@ -327,34 +333,56 @@ class SimulationView(CuraView): # If more than 16 extruders are called for, this should be converted to a sampler1d. return Matrix(self._extruder_opacity) - def setShowTravelMoves(self, show): + def setShowTravelMoves(self, show: bool) -> None: + if show == self._show_travel_moves: + return self._show_travel_moves = show self.currentLayerNumChanged.emit() + self.visibleStructuresChanged.emit() - def getShowTravelMoves(self): + def getShowTravelMoves(self) -> bool: return self._show_travel_moves def setShowHelpers(self, show: bool) -> None: + if show == self._show_helpers: + return self._show_helpers = show self.currentLayerNumChanged.emit() + self.visibleStructuresChanged.emit() def getShowHelpers(self) -> bool: return self._show_helpers def setShowSkin(self, show: bool) -> None: + if show == self._show_skin: + return self._show_skin = show self.currentLayerNumChanged.emit() + self.visibleStructuresChanged.emit() def getShowSkin(self) -> bool: return self._show_skin def setShowInfill(self, show: bool) -> None: + if show == self._show_infill: + return self._show_infill = show self.currentLayerNumChanged.emit() + self.visibleStructuresChanged.emit() def getShowInfill(self) -> bool: return self._show_infill + def setShowStarts(self, show: bool) -> None: + if show == self._show_starts: + return + self._show_starts = show + self.currentLayerNumChanged.emit() + self.visibleStructuresChanged.emit() + + def getShowStarts(self) -> bool: + return self._show_starts + def getCompatibilityMode(self) -> bool: return self._compatibility_mode @@ -377,12 +405,31 @@ class SimulationView(CuraView): def getMaxThickness(self) -> float: return self._max_thickness + def getMaxLineWidth(self) -> float: + return self._max_line_width + + def getMinLineWidth(self) -> float: + if abs(self._min_line_width - sys.float_info.max) < 10: # Some lenience due to floating point rounding. + return 0.0 # If it's still max-float, there are no measurements. Use 0 then. + return self._min_line_width + + def getMaxFlowRate(self) -> float: + return self._max_flow_rate + + def getMinFlowRate(self) -> float: + if abs(self._min_flow_rate - sys.float_info.max) < 10: # Some lenience due to floating point rounding. + return 0.0 # If it's still max-float, there are no measurements. Use 0 then. + return self._min_flow_rate + def calculateMaxLayers(self) -> None: + """ + Calculates number of layers, triggers signals if the number of layers changed and makes sure the top layers are + recalculated for legacy layer view. + """ scene = self.getController().getScene() self._old_max_layers = self._max_layers new_max_layers = -1 - """Recalculate num max layers""" for node in DepthFirstIterator(scene.getRoot()): # type: ignore layer_data = node.callDecoration("getLayerData") if not layer_data: @@ -397,17 +444,6 @@ class SimulationView(CuraView): if len(layer_data.getLayer(layer_id).polygons) < 1: continue - # Store the max and min feedrates and thicknesses for display purposes - for p in layer_data.getLayer(layer_id).polygons: - self._max_feedrate = max(float(p.lineFeedrates.max()), self._max_feedrate) - self._min_feedrate = min(float(p.lineFeedrates.min()), self._min_feedrate) - self._max_thickness = max(float(p.lineThicknesses.max()), self._max_thickness) - try: - self._min_thickness = min(float(p.lineThicknesses[numpy.nonzero(p.lineThicknesses)].min()), self._min_thickness) - except ValueError: - # Sometimes, when importing a GCode the line thicknesses are zero and so the minimum (avoiding - # the zero) can't be calculated - Logger.log("i", "Min thickness can't be calculated because all the values are zero") if max_layer_number < layer_id: max_layer_number = layer_id if min_layer_number > layer_id: @@ -431,6 +467,87 @@ class SimulationView(CuraView): self.maxLayersChanged.emit() self._startUpdateTopLayers() + def calculateColorSchemeLimits(self) -> None: + """ + Calculates the limits of the colour schemes, depending on the layer view data that is visible to the user. + """ + # Before we start, save the old values so that we can tell if any of the spectrums need to change. + old_min_feedrate = self._min_feedrate + old_max_feedrate = self._max_feedrate + old_min_linewidth = self._min_line_width + old_max_linewidth = self._max_line_width + old_min_thickness = self._min_thickness + old_max_thickness = self._max_thickness + old_min_flow_rate = self._min_flow_rate + old_max_flow_rate = self._max_flow_rate + + self._min_feedrate = sys.float_info.max + self._max_feedrate = sys.float_info.min + self._min_line_width = sys.float_info.max + self._max_line_width = sys.float_info.min + self._min_thickness = sys.float_info.max + self._max_thickness = sys.float_info.min + self._min_flow_rate = sys.float_info.max + self._max_flow_rate = sys.float_info.min + + # The colour scheme is only influenced by the visible lines, so filter the lines by if they should be visible. + visible_line_types = [] + if self.getShowSkin(): # Actually "shell". + visible_line_types.append(LayerPolygon.SkinType) + visible_line_types.append(LayerPolygon.Inset0Type) + visible_line_types.append(LayerPolygon.InsetXType) + if self.getShowInfill(): + visible_line_types.append(LayerPolygon.InfillType) + if self.getShowHelpers(): + visible_line_types.append(LayerPolygon.PrimeTowerType) + visible_line_types.append(LayerPolygon.SkirtType) + visible_line_types.append(LayerPolygon.SupportType) + visible_line_types.append(LayerPolygon.SupportInfillType) + visible_line_types.append(LayerPolygon.SupportInterfaceType) + visible_line_types_with_extrusion = visible_line_types.copy() # Copy before travel moves are added + if self.getShowTravelMoves(): + visible_line_types.append(LayerPolygon.MoveCombingType) + visible_line_types.append(LayerPolygon.MoveRetractionType) + + for node in DepthFirstIterator(self.getController().getScene().getRoot()): + layer_data = node.callDecoration("getLayerData") + if not layer_data: + continue + + for layer_index in layer_data.getLayers(): + for polyline in layer_data.getLayer(layer_index).polygons: + is_visible = numpy.isin(polyline.types, visible_line_types) + visible_indices = numpy.where(is_visible)[0] + visible_indicies_with_extrusion = numpy.where(numpy.isin(polyline.types, visible_line_types_with_extrusion))[0] + if visible_indices.size == 0: # No items to take maximum or minimum of. + continue + visible_feedrates = numpy.take(polyline.lineFeedrates, visible_indices) + visible_feedrates_with_extrusion = numpy.take(polyline.lineFeedrates, visible_indicies_with_extrusion) + visible_linewidths = numpy.take(polyline.lineWidths, visible_indices) + visible_linewidths_with_extrusion = numpy.take(polyline.lineWidths, visible_indicies_with_extrusion) + visible_thicknesses = numpy.take(polyline.lineThicknesses, visible_indices) + visible_thicknesses_with_extrusion = numpy.take(polyline.lineThicknesses, visible_indicies_with_extrusion) + self._max_feedrate = max(float(visible_feedrates.max()), self._max_feedrate) + if visible_feedrates_with_extrusion.size != 0: + flow_rates = visible_feedrates_with_extrusion * visible_linewidths_with_extrusion * visible_thicknesses_with_extrusion + self._min_flow_rate = min(float(flow_rates.min()), self._min_flow_rate) + self._max_flow_rate = max(float(flow_rates.max()), self._max_flow_rate) + self._min_feedrate = min(float(visible_feedrates.min()), self._min_feedrate) + self._max_line_width = max(float(visible_linewidths.max()), self._max_line_width) + self._min_line_width = min(float(visible_linewidths.min()), self._min_line_width) + self._max_thickness = max(float(visible_thicknesses.max()), self._max_thickness) + try: + self._min_thickness = min(float(visible_thicknesses[numpy.nonzero(visible_thicknesses)].min()), self._min_thickness) + except ValueError: + # Sometimes, when importing a GCode the line thicknesses are zero and so the minimum (avoiding the zero) can't be calculated. + Logger.log("w", "Min thickness can't be calculated because all the values are zero") + + if old_min_feedrate != self._min_feedrate or old_max_feedrate != self._max_feedrate \ + or old_min_linewidth != self._min_line_width or old_max_linewidth != self._max_line_width \ + or old_min_thickness != self._min_thickness or old_max_thickness != self._max_thickness \ + or old_min_flow_rate != self._min_flow_rate or old_max_flow_rate != self._max_flow_rate: + self.colorSchemeLimitsChanged.emit() + def calculateMaxPathsOnLayer(self, layer_num: int) -> None: # Update the currentPath scene = self.getController().getScene() @@ -457,6 +574,8 @@ class SimulationView(CuraView): preferencesChanged = Signal() busyChanged = Signal() activityChanged = Signal() + visibleStructuresChanged = Signal() + colorSchemeLimitsChanged = Signal() def getProxy(self, engine, script_engine): """Hackish way to ensure the proxy is already created @@ -488,6 +607,7 @@ class SimulationView(CuraView): Application.getInstance().getPreferences().preferenceChanged.connect(self._onPreferencesChanged) self._controller.getScene().getRoot().childrenChanged.connect(self._onSceneChanged) + self.calculateColorSchemeLimits() self.calculateMaxLayers() self.calculateMaxPathsOnLayer(self._current_layer_num) @@ -638,6 +758,7 @@ class SimulationView(CuraView): self.setShowHelpers(bool(Application.getInstance().getPreferences().getValue("layerview/show_helpers"))) self.setShowSkin(bool(Application.getInstance().getPreferences().getValue("layerview/show_skin"))) self.setShowInfill(bool(Application.getInstance().getPreferences().getValue("layerview/show_infill"))) + self.setShowStarts(bool(Application.getInstance().getPreferences().getValue("layerview/show_starts"))) self._startUpdateTopLayers() self.preferencesChanged.emit() @@ -653,6 +774,7 @@ class SimulationView(CuraView): "layerview/show_helpers", "layerview/show_skin", "layerview/show_infill", + "layerview/show_starts", }: return diff --git a/plugins/SimulationView/SimulationViewMainComponent.qml b/plugins/SimulationView/SimulationViewMainComponent.qml index bfd8799673..9232516673 100644 --- a/plugins/SimulationView/SimulationViewMainComponent.qml +++ b/plugins/SimulationView/SimulationViewMainComponent.qml @@ -55,8 +55,8 @@ Item Connections { target: UM.SimulationView - onMaxPathsChanged: pathSlider.setHandleValue(UM.SimulationView.currentPath) - onCurrentPathChanged: + function onMaxPathsChanged() { pathSlider.setHandleValue(UM.SimulationView.currentPath) } + function onCurrentPathChanged() { // Only pause the simulation when the layer was changed manually, not when the simulation is running if (pathSlider.manuallyChanged) @@ -78,7 +78,7 @@ Item UM.SimpleButton { id: playButton - iconSource: !isSimulationPlaying ? "./resources/simulation_resume.svg": "./resources/simulation_pause.svg" + iconSource: !isSimulationPlaying ? "./resources/Play.svg": "./resources/Pause.svg" width: UM.Theme.getSize("small_button").width height: UM.Theme.getSize("small_button").height hoverColor: UM.Theme.getColor("slider_handle_active") @@ -89,7 +89,7 @@ Item Connections { target: UM.Preferences - onPreferenceChanged: + function onPreferenceChanged(preference) { if (preference !== "view/only_show_top_layers" && preference !== "view/top_layer_count" && ! preference.match("layerview/")) { @@ -221,9 +221,9 @@ Item Connections { target: UM.SimulationView - onMaxLayersChanged: layerSlider.setUpperValue(UM.SimulationView.currentLayer) - onMinimumLayerChanged: layerSlider.setLowerValue(UM.SimulationView.minimumLayer) - onCurrentLayerChanged: + function onMaxLayersChanged() { layerSlider.setUpperValue(UM.SimulationView.currentLayer) } + function onMinimumLayerChanged() { layerSlider.setLowerValue(UM.SimulationView.minimumLayer) } + function onCurrentLayerChanged() { // Only pause the simulation when the layer was changed manually, not when the simulation is running if (layerSlider.manuallyChanged) @@ -241,4 +241,4 @@ Item layerSlider.setUpperValue(UM.SimulationView.currentLayer) } } -} \ No newline at end of file +} diff --git a/plugins/SimulationView/SimulationViewMenuComponent.qml b/plugins/SimulationView/SimulationViewMenuComponent.qml index ffb7eebc95..6dde44c8ae 100644 --- a/plugins/SimulationView/SimulationViewMenuComponent.qml +++ b/plugins/SimulationView/SimulationViewMenuComponent.qml @@ -22,7 +22,7 @@ Cura.ExpandableComponent Connections { target: UM.Preferences - onPreferenceChanged: + function onPreferenceChanged(preference) { if (preference !== "view/only_show_top_layers" && preference !== "view/top_layer_count" && ! preference.match("layerview/")) { @@ -82,12 +82,15 @@ Cura.ExpandableComponent property bool show_helpers: UM.Preferences.getValue("layerview/show_helpers") property bool show_skin: UM.Preferences.getValue("layerview/show_skin") property bool show_infill: UM.Preferences.getValue("layerview/show_infill") + property bool show_starts: UM.Preferences.getValue("layerview/show_starts") // If we are in compatibility mode, we only show the "line type" property bool show_legend: UM.SimulationView.compatibilityMode ? true : UM.Preferences.getValue("layerview/layer_view_type") == 1 property bool show_gradient: UM.SimulationView.compatibilityMode ? false : UM.Preferences.getValue("layerview/layer_view_type") == 2 || UM.Preferences.getValue("layerview/layer_view_type") == 3 property bool show_feedrate_gradient: show_gradient && UM.Preferences.getValue("layerview/layer_view_type") == 2 property bool show_thickness_gradient: show_gradient && UM.Preferences.getValue("layerview/layer_view_type") == 3 + property bool show_line_width_gradient: show_gradient && UM.Preferences.getValue("layerview/layer_view_type") == 4 + property bool show_flow_rate_gradient: show_gradient && UM.Preferences.getValue("layerview/layer_view_type") == 5 property bool only_show_top_layers: UM.Preferences.getValue("view/only_show_top_layers") property int top_layer_count: UM.Preferences.getValue("view/top_layer_count") @@ -116,9 +119,17 @@ Cura.ExpandableComponent type_id: 2 }) layerViewTypes.append({ - text: catalog.i18nc("@label:listbox", "Layer thickness"), + text: catalog.i18nc("@label:listbox", "Layer Thickness"), type_id: 3 // these ids match the switching in the shader }) + layerViewTypes.append({ + text: catalog.i18nc("@label:listbox", "Line Width"), + type_id: 4 + }) + layerViewTypes.append({ + text: catalog.i18nc("@label:listbox", "Flow"), + type_id: 5 + }) } ComboBox @@ -144,9 +155,13 @@ Cura.ExpandableComponent { // Update the visibility of the legends. viewSettings.show_legend = UM.SimulationView.compatibilityMode || (type_id == 1); - viewSettings.show_gradient = !UM.SimulationView.compatibilityMode && (type_id == 2 || type_id == 3); + viewSettings.show_gradient = !UM.SimulationView.compatibilityMode && + (type_id == 2 || type_id == 3 || type_id == 4 || type_id == 5) ; + viewSettings.show_feedrate_gradient = viewSettings.show_gradient && (type_id == 2); viewSettings.show_thickness_gradient = viewSettings.show_gradient && (type_id == 3); + viewSettings.show_line_width_gradient = viewSettings.show_gradient && (type_id == 4); + viewSettings.show_flow_rate_gradient = viewSettings.show_gradient && (type_id == 5); } } @@ -188,16 +203,16 @@ Cura.ExpandableComponent style: UM.Theme.styles.checkbox - - UM.RecolorImage + Rectangle { id: swatch anchors.verticalCenter: parent.verticalCenter anchors.right: extrudersModelCheckBox.right width: UM.Theme.getSize("layerview_legend_size").width height: UM.Theme.getSize("layerview_legend_size").height - source: UM.Theme.getIcon("extruder_button") color: model.color + border.width: UM.Theme.getSize("default_lining").width + border.color: UM.Theme.getColor("lining") } Label @@ -250,6 +265,15 @@ Cura.ExpandableComponent preference: "layerview/show_infill", colorId: "layerview_infill" }); + if (! UM.SimulationView.compatibilityMode) + { + typesLegendModel.append({ + label: catalog.i18nc("@label", "Starts"), + initialValue: viewSettings.show_starts, + preference: "layerview/show_starts", + colorId: "layerview_starts" + }); + } } } @@ -373,13 +397,24 @@ Cura.ExpandableComponent // Feedrate selected if (UM.Preferences.getValue("layerview/layer_view_type") == 2) { - return parseFloat(UM.SimulationView.getMinFeedrate()).toFixed(2) + return parseFloat(UM.SimulationView.minFeedrate).toFixed(2) } // Layer thickness selected if (UM.Preferences.getValue("layerview/layer_view_type") == 3) { - return parseFloat(UM.SimulationView.getMinThickness()).toFixed(2) + return parseFloat(UM.SimulationView.minThickness).toFixed(2) } + // Line width selected + if(UM.Preferences.getValue("layerview/layer_view_type") == 4) + { + return parseFloat(UM.SimulationView.minLineWidth).toFixed(2); + } + // Flow Rate selected + if(UM.Preferences.getValue("layerview/layer_view_type") == 5) + { + return parseFloat(UM.SimulationView.minFlowRate).toFixed(2); + } + } return catalog.i18nc("@label","min") } @@ -405,6 +440,16 @@ Cura.ExpandableComponent { return "mm" } + //Line width selected + if(UM.Preferences.getValue("layerview/layer_view_type") == 4) + { + return "mm" + } + // Flow Rate selected + if (UM.Preferences.getValue("layerview/layer_view_type") == 5) + { + return "mm³/s" + } } return "" } @@ -422,12 +467,22 @@ Cura.ExpandableComponent // Feedrate selected if (UM.Preferences.getValue("layerview/layer_view_type") == 2) { - return parseFloat(UM.SimulationView.getMaxFeedrate()).toFixed(2) + return parseFloat(UM.SimulationView.maxFeedrate).toFixed(2) } // Layer thickness selected if (UM.Preferences.getValue("layerview/layer_view_type") == 3) { - return parseFloat(UM.SimulationView.getMaxThickness()).toFixed(2) + return parseFloat(UM.SimulationView.maxThickness).toFixed(2) + } + //Line width selected + if(UM.Preferences.getValue("layerview/layer_view_type") == 4) + { + return parseFloat(UM.SimulationView.maxLineWidth).toFixed(2); + } + // Flow rate selected + if(UM.Preferences.getValue("layerview/layer_view_type") == 5) + { + return parseFloat(UM.SimulationView.maxFlowRate).toFixed(2); } } return catalog.i18nc("@label","max") @@ -443,7 +498,10 @@ Cura.ExpandableComponent Rectangle { id: feedrateGradient - visible: viewSettings.show_feedrate_gradient + visible: ( + viewSettings.show_feedrate_gradient || + viewSettings.show_line_width_gradient + ) anchors.left: parent.left anchors.right: parent.right height: Math.round(UM.Theme.getSize("layerview_row").height * 1.5) @@ -495,7 +553,9 @@ Cura.ExpandableComponent Rectangle { id: thicknessGradient - visible: viewSettings.show_thickness_gradient + visible: ( + viewSettings.show_thickness_gradient + ) anchors.left: parent.left anchors.right: parent.right height: Math.round(UM.Theme.getSize("layerview_row").height * 1.5) @@ -547,6 +607,85 @@ Cura.ExpandableComponent } } } + + // Gradient colors for flow (similar to jet colormap) + Rectangle + { + id: jetGradient + visible: ( + viewSettings.show_flow_rate_gradient + ) + anchors.left: parent.left + anchors.right: parent.right + height: Math.round(UM.Theme.getSize("layerview_row").height * 1.5) + border.width: UM.Theme.getSize("default_lining").width + border.color: UM.Theme.getColor("lining") + + LinearGradient + { + anchors + { + left: parent.left + leftMargin: UM.Theme.getSize("default_lining").width + right: parent.right + rightMargin: UM.Theme.getSize("default_lining").width + top: parent.top + topMargin: UM.Theme.getSize("default_lining").width + bottom: parent.bottom + bottomMargin: UM.Theme.getSize("default_lining").width + } + start: Qt.point(0, 0) + end: Qt.point(parent.width, 0) + gradient: Gradient + { + GradientStop + { + position: 0.0 + color: Qt.rgba(0, 0, 0.5, 1) + } + GradientStop + { + position: 0.125 + color: Qt.rgba(0, 0.0, 1.0, 1) + } + GradientStop + { + position: 0.25 + color: Qt.rgba(0, 0.5, 1.0, 1) + } + GradientStop + { + position: 0.375 + color: Qt.rgba(0.0, 1.0, 1.0, 1) + } + GradientStop + { + position: 0.5 + color: Qt.rgba(0.5, 1.0, 0.5, 1) + } + GradientStop + { + position: 0.625 + color: Qt.rgba(1.0, 1.0, 0.0, 1) + } + GradientStop + { + position: 0.75 + color: Qt.rgba(1.0, 0.5, 0, 1) + } + GradientStop + { + position: 0.875 + color: Qt.rgba(1.0, 0.0, 0, 1) + } + GradientStop + { + position: 1.0 + color: Qt.rgba(0.5, 0, 0, 1) + } + } + } + } } FontMetrics diff --git a/plugins/SimulationView/SimulationViewProxy.py b/plugins/SimulationView/SimulationViewProxy.py index ce2c336257..7d78e93ca5 100644 --- a/plugins/SimulationView/SimulationViewProxy.py +++ b/plugins/SimulationView/SimulationViewProxy.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from typing import TYPE_CHECKING @@ -28,6 +28,7 @@ class SimulationViewProxy(QObject): globalStackChanged = pyqtSignal() preferencesChanged = pyqtSignal() busyChanged = pyqtSignal() + colorSchemeLimitsChanged = pyqtSignal() @pyqtProperty(bool, notify=activityChanged) def layerActivity(self): @@ -101,22 +102,38 @@ class SimulationViewProxy(QObject): def getSimulationRunning(self): return self._simulation_view.isSimulationRunning() - @pyqtSlot(result=float) - def getMinFeedrate(self): + @pyqtProperty(float, notify = colorSchemeLimitsChanged) + def minFeedrate(self): return self._simulation_view.getMinFeedrate() - @pyqtSlot(result=float) - def getMaxFeedrate(self): + @pyqtProperty(float, notify = colorSchemeLimitsChanged) + def maxFeedrate(self): return self._simulation_view.getMaxFeedrate() - @pyqtSlot(result=float) - def getMinThickness(self): + @pyqtProperty(float, notify = colorSchemeLimitsChanged) + def minThickness(self): return self._simulation_view.getMinThickness() - @pyqtSlot(result=float) - def getMaxThickness(self): + @pyqtProperty(float, notify = colorSchemeLimitsChanged) + def maxThickness(self): return self._simulation_view.getMaxThickness() + @pyqtProperty(float, notify = colorSchemeLimitsChanged) + def maxLineWidth(self): + return self._simulation_view.getMaxLineWidth() + + @pyqtProperty(float, notify = colorSchemeLimitsChanged) + def minLineWidth(self): + return self._simulation_view.getMinLineWidth() + + @pyqtProperty(float, notify=colorSchemeLimitsChanged) + def maxFlowRate(self): + return self._simulation_view.getMaxFlowRate() + + @pyqtProperty(float, notify=colorSchemeLimitsChanged) + def minFlowRate(self): + return self._simulation_view.getMinFlowRate() + # Opacity 0..1 @pyqtSlot(int, float) def setExtruderOpacity(self, extruder_nr, opacity): @@ -145,6 +162,9 @@ class SimulationViewProxy(QObject): self.currentLayerChanged.emit() self._layerActivityChanged() + def _onColorSchemeLimitsChanged(self): + self.colorSchemeLimitsChanged.emit() + def _onPathChanged(self): self.currentPathChanged.emit() self._layerActivityChanged() @@ -174,6 +194,7 @@ class SimulationViewProxy(QObject): active_view = self._controller.getActiveView() if active_view == self._simulation_view: self._simulation_view.currentLayerNumChanged.connect(self._onLayerChanged) + self._simulation_view.colorSchemeLimitsChanged.connect(self._onColorSchemeLimitsChanged) self._simulation_view.currentPathNumChanged.connect(self._onPathChanged) self._simulation_view.maxLayersChanged.connect(self._onMaxLayersChanged) self._simulation_view.maxPathsChanged.connect(self._onMaxPathsChanged) @@ -186,6 +207,7 @@ class SimulationViewProxy(QObject): # Disconnect all of em again. self.is_simulationView_selected = False self._simulation_view.currentLayerNumChanged.disconnect(self._onLayerChanged) + self._simulation_view.colorSchemeLimitsChanged.connect(self._onColorSchemeLimitsChanged) self._simulation_view.currentPathNumChanged.disconnect(self._onPathChanged) self._simulation_view.maxLayersChanged.disconnect(self._onMaxLayersChanged) self._simulation_view.maxPathsChanged.disconnect(self._onMaxPathsChanged) diff --git a/plugins/SimulationView/layers3d.shader b/plugins/SimulationView/layers3d.shader index ceda09f9d5..f9d67f284c 100644 --- a/plugins/SimulationView/layers3d.shader +++ b/plugins/SimulationView/layers3d.shader @@ -10,6 +10,10 @@ vertex41core = uniform lowp float u_min_feedrate; uniform lowp float u_max_thickness; uniform lowp float u_min_thickness; + uniform lowp float u_max_line_width; + uniform lowp float u_min_line_width; + uniform lowp float u_max_flow_rate; + uniform lowp float u_min_flow_rate; uniform lowp int u_layer_view_type; uniform lowp mat4 u_extruder_opacity; // currently only for max 16 extruders, others always visible @@ -21,6 +25,7 @@ vertex41core = in highp vec4 a_normal; in highp vec2 a_line_dim; // line width and thickness in highp float a_extruder; + in highp float a_prev_line_type; in highp float a_line_type; in highp float a_feedrate; in highp float a_thickness; @@ -32,6 +37,7 @@ vertex41core = out lowp vec2 v_line_dim; out highp int v_extruder; out highp mat4 v_extruder_opacity; + out float v_prev_line_type; out float v_line_type; out lowp vec4 f_color; @@ -40,7 +46,15 @@ vertex41core = vec4 feedrateGradientColor(float abs_value, float min_value, float max_value) { - float value = (abs_value - min_value)/(max_value - min_value); + float value; + if(abs(max_value - min_value) < 0.0001) //Max and min are equal (barring floating point rounding errors). + { + value = 0.5; //Pick a colour in exactly the middle of the range. + } + else + { + value = (abs_value - min_value) / (max_value - min_value); + } float red = value; float green = 1-abs(1-4*value); if (value > 0.375) @@ -53,7 +67,15 @@ vertex41core = vec4 layerThicknessGradientColor(float abs_value, float min_value, float max_value) { - float value = (abs_value - min_value)/(max_value - min_value); + float value; + if(abs(max_value - min_value) < 0.0001) //Max and min are equal (barring floating point rounding errors). + { + value = 0.5; //Pick a colour in exactly the middle of the range. + } + else + { + value = (abs_value - min_value) / (max_value - min_value); + } float red = min(max(4*value-2, 0), 1); float green = min(1.5*value, 0.75); if (value > 0.75) @@ -64,6 +86,51 @@ vertex41core = return vec4(red, green, blue, 1.0); } + vec4 lineWidthGradientColor(float abs_value, float min_value, float max_value) + { + float value; + if(abs(max_value - min_value) < 0.0001) //Max and min are equal (barring floating point rounding errors). + { + value = 0.5; //Pick a colour in exactly the middle of the range. + } + else + { + value = (abs_value - min_value) / (max_value - min_value); + } + float red = value; + float green = 1 - abs(1 - 4 * value); + if(value > 0.375) + { + green = 0.5; + } + float blue = max(1 - 4 * value, 0); + return vec4(red, green, blue, 1.0); + } + + float clamp(float v) + { + float t = v < 0 ? 0 : v; + return t > 1.0 ? 1.0 : t; + } + + // Inspired by https://stackoverflow.com/a/46628410 + vec4 flowRateGradientColor(float abs_value, float min_value, float max_value) + { + float t; + if(abs(min_value - max_value) < 0.0001) + { + t = 0; + } + else + { + t = 2.0 * ((abs_value - min_value) / (max_value - min_value)) - 1; + } + float red = clamp(1.5 - abs(2.0 * t - 1.0)); + float green = clamp(1.5 - abs(2.0 * t)); + float blue = clamp(1.5 - abs(2.0 * t + 1.0)); + return vec4(red, green, blue, 1.0); + } + void main() { vec4 v1_vertex = a_vertex; @@ -86,12 +153,20 @@ vertex41core = case 3: // "Layer thickness" v_color = layerThicknessGradientColor(a_line_dim.y, u_min_thickness, u_max_thickness); break; + case 4: // "Line width" + v_color = lineWidthGradientColor(a_line_dim.x, u_min_line_width, u_max_line_width); + break; + case 5: // "Flow" + float flow_rate = a_line_dim.x * a_line_dim.y * a_feedrate; + v_color = flowRateGradientColor(flow_rate, u_min_flow_rate, u_max_flow_rate); + break; } v_vertex = world_space_vert.xyz; v_normal = (u_normalMatrix * normalize(a_normal)).xyz; v_line_dim = a_line_dim; v_extruder = int(a_extruder); + v_prev_line_type = a_prev_line_type; v_line_type = a_line_type; v_extruder_opacity = u_extruder_opacity; @@ -108,20 +183,24 @@ geometry41core = uniform highp mat4 u_viewMatrix; uniform highp mat4 u_projectionMatrix; + uniform lowp vec4 u_starts_color; + uniform int u_show_travel_moves; uniform int u_show_helpers; uniform int u_show_skin; uniform int u_show_infill; + uniform int u_show_starts; layout(lines) in; - layout(triangle_strip, max_vertices = 26) out; + layout(triangle_strip, max_vertices = 40) out; in vec4 v_color[]; in vec3 v_vertex[]; in vec3 v_normal[]; - in vec2 v_line_dim[]; + in lowp vec2 v_line_dim[]; in int v_extruder[]; in mat4 v_extruder_opacity[]; + in float v_prev_line_type[]; in float v_line_type[]; out vec4 f_color; @@ -177,17 +256,17 @@ geometry41core = } size_y = v_line_dim[1].y / 2 + 0.01; - g_vertex_delta = gl_in[1].gl_Position - gl_in[0].gl_Position; - g_vertex_normal_horz_head = normalize(vec3(-g_vertex_delta.x, -g_vertex_delta.y, -g_vertex_delta.z)); - g_vertex_offset_horz_head = vec4(g_vertex_normal_horz_head * size_x, 0.0); + g_vertex_delta = gl_in[1].gl_Position - gl_in[0].gl_Position; //Actual movement exhibited by the line. + g_vertex_normal_horz_head = normalize(vec3(-g_vertex_delta.x, -g_vertex_delta.y, -g_vertex_delta.z)); //Lengthwise normal vector pointing backwards. + g_vertex_offset_horz_head = vec4(g_vertex_normal_horz_head * size_x, 0.0); //Lengthwise offset vector pointing backwards. - g_vertex_normal_horz = normalize(vec3(g_vertex_delta.z, g_vertex_delta.y, -g_vertex_delta.x)); + g_vertex_normal_horz = normalize(vec3(g_vertex_delta.z, g_vertex_delta.y, -g_vertex_delta.x)); //Normal vector pointing right. + g_vertex_offset_horz = vec4(g_vertex_normal_horz * size_x, 0.0); //Offset vector pointing right. - g_vertex_offset_horz = vec4(g_vertex_normal_horz * size_x, 0.0); //size * g_vertex_normal_horz; - g_vertex_normal_vert = vec3(0.0, 1.0, 0.0); - g_vertex_offset_vert = vec4(g_vertex_normal_vert * size_y, 0.0); + g_vertex_normal_vert = vec3(0.0, 1.0, 0.0); //Upwards normal vector. + g_vertex_offset_vert = vec4(g_vertex_normal_vert * size_y, 0.0); //Upwards offset vector. Goes up by half the layer thickness. - if ((v_line_type[0] == 8) || (v_line_type[0] == 9)) { + if ((v_line_type[0] == 8) || (v_line_type[0] == 9)) { //Travel or retraction moves. vec4 va_head = viewProjectionMatrix * (gl_in[0].gl_Position + g_vertex_offset_horz_head + g_vertex_offset_vert); vec4 va_up = viewProjectionMatrix * (gl_in[0].gl_Position + g_vertex_offset_horz + g_vertex_offset_vert); vec4 va_down = viewProjectionMatrix * (gl_in[0].gl_Position - g_vertex_offset_horz + g_vertex_offset_vert); @@ -196,60 +275,60 @@ geometry41core = vec4 vb_up = viewProjectionMatrix * (gl_in[1].gl_Position + g_vertex_offset_horz + g_vertex_offset_vert); // Travels: flat plane with pointy ends - myEmitVertex(v_vertex[0], v_color[0], g_vertex_normal_vert, va_up); - myEmitVertex(v_vertex[0], v_color[0], g_vertex_normal_vert, va_head); - myEmitVertex(v_vertex[0], v_color[0], g_vertex_normal_vert, va_down); - myEmitVertex(v_vertex[0], v_color[0], g_vertex_normal_vert, va_up); + myEmitVertex(v_vertex[0], v_color[1], g_vertex_normal_vert, va_up); + myEmitVertex(v_vertex[0], v_color[1], g_vertex_normal_vert, va_head); + myEmitVertex(v_vertex[0], v_color[1], g_vertex_normal_vert, va_down); + myEmitVertex(v_vertex[0], v_color[1], g_vertex_normal_vert, va_up); myEmitVertex(v_vertex[1], v_color[1], g_vertex_normal_vert, vb_down); myEmitVertex(v_vertex[1], v_color[1], g_vertex_normal_vert, vb_up); myEmitVertex(v_vertex[1], v_color[1], g_vertex_normal_vert, vb_head); //And reverse so that the line is also visible from the back side. myEmitVertex(v_vertex[1], v_color[1], g_vertex_normal_vert, vb_up); myEmitVertex(v_vertex[1], v_color[1], g_vertex_normal_vert, vb_down); - myEmitVertex(v_vertex[0], v_color[0], g_vertex_normal_vert, va_up); - myEmitVertex(v_vertex[0], v_color[0], g_vertex_normal_vert, va_down); - myEmitVertex(v_vertex[0], v_color[0], g_vertex_normal_vert, va_head); - myEmitVertex(v_vertex[0], v_color[0], g_vertex_normal_vert, va_up); + myEmitVertex(v_vertex[0], v_color[1], g_vertex_normal_vert, va_up); + myEmitVertex(v_vertex[0], v_color[1], g_vertex_normal_vert, va_down); + myEmitVertex(v_vertex[0], v_color[1], g_vertex_normal_vert, va_head); + myEmitVertex(v_vertex[0], v_color[1], g_vertex_normal_vert, va_up); EndPrimitive(); } else { - vec4 va_m_horz = viewProjectionMatrix * (gl_in[0].gl_Position - g_vertex_offset_horz); - vec4 vb_m_horz = viewProjectionMatrix * (gl_in[1].gl_Position - g_vertex_offset_horz); - vec4 va_p_vert = viewProjectionMatrix * (gl_in[0].gl_Position + g_vertex_offset_vert); - vec4 vb_p_vert = viewProjectionMatrix * (gl_in[1].gl_Position + g_vertex_offset_vert); - vec4 va_p_horz = viewProjectionMatrix * (gl_in[0].gl_Position + g_vertex_offset_horz); - vec4 vb_p_horz = viewProjectionMatrix * (gl_in[1].gl_Position + g_vertex_offset_horz); - vec4 va_m_vert = viewProjectionMatrix * (gl_in[0].gl_Position - g_vertex_offset_vert); - vec4 vb_m_vert = viewProjectionMatrix * (gl_in[1].gl_Position - g_vertex_offset_vert); - vec4 va_head = viewProjectionMatrix * (gl_in[0].gl_Position + g_vertex_offset_horz_head); - vec4 vb_head = viewProjectionMatrix * (gl_in[1].gl_Position - g_vertex_offset_horz_head); + vec4 va_m_horz = viewProjectionMatrix * (gl_in[0].gl_Position - g_vertex_offset_horz); //Line start, left vertex. + vec4 vb_m_horz = viewProjectionMatrix * (gl_in[1].gl_Position - g_vertex_offset_horz); //Line end, left vertex. + vec4 va_p_vert = viewProjectionMatrix * (gl_in[0].gl_Position + g_vertex_offset_vert); //Line start, top vertex. + vec4 vb_p_vert = viewProjectionMatrix * (gl_in[1].gl_Position + g_vertex_offset_vert); //Line end, top vertex. + vec4 va_p_horz = viewProjectionMatrix * (gl_in[0].gl_Position + g_vertex_offset_horz); //Line start, right vertex. + vec4 vb_p_horz = viewProjectionMatrix * (gl_in[1].gl_Position + g_vertex_offset_horz); //Line end, right vertex. + vec4 va_m_vert = viewProjectionMatrix * (gl_in[0].gl_Position - g_vertex_offset_vert); //Line start, bottom vertex. + vec4 vb_m_vert = viewProjectionMatrix * (gl_in[1].gl_Position - g_vertex_offset_vert); //Line end, bottom vertex. + vec4 va_head = viewProjectionMatrix * (gl_in[0].gl_Position + g_vertex_offset_horz_head); //Line start, tip. + vec4 vb_head = viewProjectionMatrix * (gl_in[1].gl_Position - g_vertex_offset_horz_head); //Line end, tip. // All normal lines are rendered as 3d tubes. - myEmitVertex(v_vertex[0], v_color[0], -g_vertex_normal_horz, va_m_horz); + myEmitVertex(v_vertex[0], v_color[1], -g_vertex_normal_horz, va_m_horz); myEmitVertex(v_vertex[1], v_color[1], -g_vertex_normal_horz, vb_m_horz); - myEmitVertex(v_vertex[0], v_color[0], g_vertex_normal_vert, va_p_vert); + myEmitVertex(v_vertex[0], v_color[1], g_vertex_normal_vert, va_p_vert); myEmitVertex(v_vertex[1], v_color[1], g_vertex_normal_vert, vb_p_vert); - myEmitVertex(v_vertex[0], v_color[0], g_vertex_normal_horz, va_p_horz); + myEmitVertex(v_vertex[0], v_color[1], g_vertex_normal_horz, va_p_horz); myEmitVertex(v_vertex[1], v_color[1], g_vertex_normal_horz, vb_p_horz); - myEmitVertex(v_vertex[0], v_color[0], -g_vertex_normal_vert, va_m_vert); + myEmitVertex(v_vertex[0], v_color[1], -g_vertex_normal_vert, va_m_vert); myEmitVertex(v_vertex[1], v_color[1], -g_vertex_normal_vert, vb_m_vert); - myEmitVertex(v_vertex[0], v_color[0], -g_vertex_normal_horz, va_m_horz); + myEmitVertex(v_vertex[0], v_color[1], -g_vertex_normal_horz, va_m_horz); myEmitVertex(v_vertex[1], v_color[1], -g_vertex_normal_horz, vb_m_horz); EndPrimitive(); // left side - myEmitVertex(v_vertex[0], v_color[0], -g_vertex_normal_horz, va_m_horz); - myEmitVertex(v_vertex[0], v_color[0], g_vertex_normal_vert, va_p_vert); - myEmitVertex(v_vertex[0], v_color[0], g_vertex_normal_horz_head, va_head); - myEmitVertex(v_vertex[0], v_color[0], g_vertex_normal_horz, va_p_horz); + myEmitVertex(v_vertex[0], v_color[1], -g_vertex_normal_horz, va_m_horz); + myEmitVertex(v_vertex[0], v_color[1], g_vertex_normal_vert, va_p_vert); + myEmitVertex(v_vertex[0], v_color[1], g_vertex_normal_horz_head, va_head); + myEmitVertex(v_vertex[0], v_color[1], g_vertex_normal_horz, va_p_horz); EndPrimitive(); - myEmitVertex(v_vertex[0], v_color[0], g_vertex_normal_horz, va_p_horz); - myEmitVertex(v_vertex[0], v_color[0], -g_vertex_normal_vert, va_m_vert); - myEmitVertex(v_vertex[0], v_color[0], g_vertex_normal_horz_head, va_head); - myEmitVertex(v_vertex[0], v_color[0], -g_vertex_normal_horz, va_m_horz); + myEmitVertex(v_vertex[0], v_color[1], g_vertex_normal_horz, va_p_horz); + myEmitVertex(v_vertex[0], v_color[1], -g_vertex_normal_vert, va_m_vert); + myEmitVertex(v_vertex[0], v_color[1], g_vertex_normal_horz_head, va_head); + myEmitVertex(v_vertex[0], v_color[1], -g_vertex_normal_horz, va_m_horz); EndPrimitive(); @@ -268,6 +347,28 @@ geometry41core = EndPrimitive(); } + + if ((u_show_starts == 1) && (v_prev_line_type[0] != 1) && (v_line_type[0] == 1)) { + float w = size_x; + float h = size_y; + + myEmitVertex(v_vertex[0] + vec3( w, h, w), u_starts_color, normalize(vec3( 1.0, 1.0, 1.0)), viewProjectionMatrix * (gl_in[0].gl_Position + vec4( w, h, w, 0.0))); // Front-top-left + myEmitVertex(v_vertex[0] + vec3(-w, h, w), u_starts_color, normalize(vec3(-1.0, 1.0, 1.0)), viewProjectionMatrix * (gl_in[0].gl_Position + vec4(-w, h, w, 0.0))); // Front-top-right + myEmitVertex(v_vertex[0] + vec3( w, -h, w), u_starts_color, normalize(vec3( 1.0, -1.0, 1.0)), viewProjectionMatrix * (gl_in[0].gl_Position + vec4( w, -h, w, 0.0))); // Front-bottom-left + myEmitVertex(v_vertex[0] + vec3(-w, -h, w), u_starts_color, normalize(vec3(-1.0, -1.0, 1.0)), viewProjectionMatrix * (gl_in[0].gl_Position + vec4(-w, -h, w, 0.0))); // Front-bottom-right + myEmitVertex(v_vertex[0] + vec3(-w, -h, -w), u_starts_color, normalize(vec3(-1.0, -1.0, -1.0)), viewProjectionMatrix * (gl_in[0].gl_Position + vec4(-w, -h, -w, 0.0))); // Back-bottom-right + myEmitVertex(v_vertex[0] + vec3(-w, h, w), u_starts_color, normalize(vec3(-1.0, 1.0, 1.0)), viewProjectionMatrix * (gl_in[0].gl_Position + vec4(-w, h, w, 0.0))); // Front-top-right + myEmitVertex(v_vertex[0] + vec3(-w, h, -w), u_starts_color, normalize(vec3(-1.0, 1.0, -1.0)), viewProjectionMatrix * (gl_in[0].gl_Position + vec4(-w, h, -w, 0.0))); // Back-top-right + myEmitVertex(v_vertex[0] + vec3( w, h, w), u_starts_color, normalize(vec3( 1.0, 1.0, 1.0)), viewProjectionMatrix * (gl_in[0].gl_Position + vec4( w, h, w, 0.0))); // Front-top-left + myEmitVertex(v_vertex[0] + vec3( w, h, -w), u_starts_color, normalize(vec3( 1.0, 1.0, -1.0)), viewProjectionMatrix * (gl_in[0].gl_Position + vec4( w, h, -w, 0.0))); // Back-top-left + myEmitVertex(v_vertex[0] + vec3( w, -h, w), u_starts_color, normalize(vec3( 1.0, -1.0, 1.0)), viewProjectionMatrix * (gl_in[0].gl_Position + vec4( w, -h, w, 0.0))); // Front-bottom-left + myEmitVertex(v_vertex[0] + vec3( w, -h, -w), u_starts_color, normalize(vec3( 1.0, -1.0, -1.0)), viewProjectionMatrix * (gl_in[0].gl_Position + vec4( w, -h, -w, 0.0))); // Back-bottom-left + myEmitVertex(v_vertex[0] + vec3(-w, -h, -w), u_starts_color, normalize(vec3(-1.0, -1.0, -1.0)), viewProjectionMatrix * (gl_in[0].gl_Position + vec4(-w, -h, -w, 0.0))); // Back-bottom-right + myEmitVertex(v_vertex[0] + vec3( w, h, -w), u_starts_color, normalize(vec3( 1.0, 1.0, -1.0)), viewProjectionMatrix * (gl_in[0].gl_Position + vec4( w, h, -w, 0.0))); // Back-top-left + myEmitVertex(v_vertex[0] + vec3(-w, h, -w), u_starts_color, normalize(vec3(-1.0, 1.0, -1.0)), viewProjectionMatrix * (gl_in[0].gl_Position + vec4(-w, h, -w, 0.0))); // Back-top-right + + EndPrimitive(); + } } fragment41core = @@ -312,10 +413,13 @@ u_diffuseColor = [1.0, 0.79, 0.14, 1.0] u_minimumAlbedo = [0.1, 0.1, 0.1, 1.0] u_shininess = 20.0 +u_starts_color = [1.0, 1.0, 1.0, 1.0] + u_show_travel_moves = 0 u_show_helpers = 1 u_show_skin = 1 u_show_infill = 1 +u_show_starts = 1 u_min_feedrate = 0 u_max_feedrate = 1 @@ -337,6 +441,7 @@ a_normal = normal a_line_dim = line_dim a_extruder = extruder a_material_color = material_color +a_prev_line_type = prev_line_type a_line_type = line_type a_feedrate = feedrate a_thickness = thickness diff --git a/plugins/SimulationView/plugin.json b/plugins/SimulationView/plugin.json index 56275498ca..5ea5e20596 100644 --- a/plugins/SimulationView/plugin.json +++ b/plugins/SimulationView/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides the Simulation view.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/SimulationView/resources/Pause.svg b/plugins/SimulationView/resources/Pause.svg new file mode 100755 index 0000000000..6bc491e387 --- /dev/null +++ b/plugins/SimulationView/resources/Pause.svg @@ -0,0 +1,4 @@ + + + + diff --git a/plugins/SimulationView/resources/Play.svg b/plugins/SimulationView/resources/Play.svg new file mode 100755 index 0000000000..1b2510513d --- /dev/null +++ b/plugins/SimulationView/resources/Play.svg @@ -0,0 +1,5 @@ + + + + diff --git a/plugins/SimulationView/resources/simulation_pause.svg b/plugins/SimulationView/resources/simulation_pause.svg deleted file mode 100644 index 652434bd44..0000000000 --- a/plugins/SimulationView/resources/simulation_pause.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/plugins/SimulationView/resources/simulation_resume.svg b/plugins/SimulationView/resources/simulation_resume.svg deleted file mode 100644 index 912a2ac418..0000000000 --- a/plugins/SimulationView/resources/simulation_resume.svg +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/plugins/SliceInfoPlugin/SliceInfo.py b/plugins/SliceInfoPlugin/SliceInfo.py index 6eed649cc7..02e71207e0 100755 --- a/plugins/SliceInfoPlugin/SliceInfo.py +++ b/plugins/SliceInfoPlugin/SliceInfo.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import json @@ -87,8 +87,12 @@ class SliceInfo(QObject, Extension): return None file_path = os.path.join(plugin_path, "example_data.html") if file_path: - with open(file_path, "r", encoding = "utf-8") as f: - self._example_data_content = f.read() + try: + with open(file_path, "r", encoding = "utf-8") as f: + self._example_data_content = f.read() + except EnvironmentError as e: + Logger.error(f"Unable to read example slice info data to show to the user: {e}") + self._example_data_content = "" + catalog.i18nc("@text", "Unable to read example data file.") + "" return self._example_data_content @pyqtSlot(bool) @@ -229,6 +233,11 @@ class SliceInfo(QObject, Extension): model["model_settings"] = model_settings + if node.source_mime_type is None: + model["mime_type"] = "" + else: + model["mime_type"] = node.source_mime_type.name + data["models"].append(model) print_times = print_information.printTimes() diff --git a/plugins/SliceInfoPlugin/example_data.html b/plugins/SliceInfoPlugin/example_data.html index b349ec328d..5b97f1cba6 100644 --- a/plugins/SliceInfoPlugin/example_data.html +++ b/plugins/SliceInfoPlugin/example_data.html @@ -54,6 +54,7 @@
  • Bounding Box: [minimum x, y, z; maximum x, y, z]
  • Is Helper Mesh: no
  • Helper Mesh Type: support mesh
    • +
  • File type: STL
    • diff --git a/plugins/SliceInfoPlugin/plugin.json b/plugins/SliceInfoPlugin/plugin.json index 3aa4ba0e0d..eba604c47f 100644 --- a/plugins/SliceInfoPlugin/plugin.json +++ b/plugins/SliceInfoPlugin/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Submits anonymous slice info. Can be disabled through preferences.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/SolidView/SolidView.py b/plugins/SolidView/SolidView.py index 08085871c0..3ecc84eb37 100644 --- a/plugins/SolidView/SolidView.py +++ b/plugins/SolidView/SolidView.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import os.path @@ -6,8 +6,8 @@ from UM.View.View import View from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator from UM.Scene.Selection import Selection from UM.Resources import Resources -from PyQt5.QtGui import QOpenGLContext, QImage -from PyQt5.QtCore import QSize +from PyQt5.QtGui import QOpenGLContext, QDesktopServices, QImage +from PyQt5.QtCore import QSize, QUrl import numpy as np import time @@ -56,7 +56,8 @@ class SolidView(View): self._extruders_model = None self._theme = None - self._support_angle = 90 + self._support_angle = self._retrieveSupportAngle() + self._lowest_printable_height = self._retrieveLowestPrintHeight() self._global_stack = None @@ -67,20 +68,27 @@ class SolidView(View): self._xray_checking_update_time = 30.0 # seconds self._xray_warning_cooldown = 60 * 10 # reshow Model error message every 10 minutes self._xray_warning_message = Message( - catalog.i18nc("@info:status", "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces."), + catalog.i18nc("@info:status", "The highlighted areas indicate either missing or extraneous surfaces. Fix your model and open it again into Cura."), lifetime = 60 * 5, # leave message for 5 minutes - title = catalog.i18nc("@info:title", "Model errors"), + title = catalog.i18nc("@info:title", "Model Errors"), option_text = catalog.i18nc("@info:option_text", "Do not show this message again"), option_state = False ) self._xray_warning_message.optionToggled.connect(self._onDontAskMeAgain) application.getPreferences().addPreference(self._show_xray_warning_preference, True) + self._xray_warning_message.addAction("manifold", catalog.i18nc("@action:button", "Learn more"), "[no_icon]", "[no_description]", + button_style = Message.ActionButtonStyle.LINK, + button_align = Message.ActionButtonAlignment.ALIGN_LEFT) + self._xray_warning_message.actionTriggered.connect(self._onNonManifoldLearnMoreClicked) application.engineCreatedSignal.connect(self._onGlobalContainerChanged) def _onDontAskMeAgain(self, checked: bool) -> None: Application.getInstance().getPreferences().setValue(self._show_xray_warning_preference, not checked) + def _onNonManifoldLearnMoreClicked(self, action, message) -> None: + QDesktopServices.openUrl(QUrl("https://support.ultimaker.com/hc/en-us/articles/360014055959")) + def _onGlobalContainerChanged(self) -> None: if self._global_stack: try: @@ -95,12 +103,20 @@ class SolidView(View): self._global_stack.propertyChanged.connect(self._onPropertyChanged) for extruder_stack in ExtruderManager.getInstance().getActiveExtruderStacks(): extruder_stack.propertyChanged.connect(self._onPropertyChanged) - self._onPropertyChanged("support_angle", "value") # Force an re-evaluation + # Force re-evaluation: + self._support_angle = self._retrieveSupportAngle() + self._lowest_printable_height = self._retrieveLowestPrintHeight() def _onPropertyChanged(self, key: str, property_name: str) -> None: - if key != "support_angle" or property_name != "value": + if property_name != "value": return # As the rendering is called a *lot* we really, dont want to re-evaluate the property every time. So we store em! + if key == "support_angle": + self._support_angle = self._retrieveSupportAngle() + elif key == "layer_height_0" or key == "slicing_tolerance": + self._lowest_printable_height = self._retrieveLowestPrintHeight() + + def _retrieveSupportAngle(self) -> float: global_container_stack = Application.getInstance().getGlobalContainerStack() if global_container_stack: support_extruder_nr = int(global_container_stack.getExtruderPositionValueWithDefault("support_extruder_nr")) @@ -111,7 +127,18 @@ class SolidView(View): else: angle = support_angle_stack.getProperty("support_angle", "value") if angle is not None: - self._support_angle = angle + return angle + return 90.0 + + def _retrieveLowestPrintHeight(self) -> float: + min_height = 0.0 + for extruder in Application.getInstance().getExtruderManager().getActiveExtruderStacks(): + init_layer_height = extruder.getProperty("layer_height_0", "value") + tolerance_setting = extruder.getProperty("slicing_tolerance", "value") + if tolerance_setting == "middle": + init_layer_height /= 2.0 + min_height = max(min_height, init_layer_height) + return min_height def _checkSetup(self): if not self._extruders_model: @@ -194,6 +221,7 @@ class SolidView(View): self._enabled_shader.setUniformValue("u_overhangAngle", math.cos(math.radians(0))) #Overhang angle of 0 causes no area at all to be marked as overhang. else: self._enabled_shader.setUniformValue("u_overhangAngle", math.cos(math.radians(0))) + self._enabled_shader.setUniformValue("u_lowestPrintableHeight", self._lowest_printable_height) disabled_batch = renderer.createRenderBatch(shader = self._disabled_shader) normal_object_batch = renderer.createRenderBatch(shader = self._enabled_shader) renderer.addRenderBatch(disabled_batch) diff --git a/plugins/SolidView/plugin.json b/plugins/SolidView/plugin.json index 42f3fe3f34..fa4180ff61 100644 --- a/plugins/SolidView/plugin.json +++ b/plugins/SolidView/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides a normal solid mesh view.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } \ No newline at end of file diff --git a/plugins/SupportEraser/__init__.py b/plugins/SupportEraser/__init__.py index 2ed7521808..30b6fe4a52 100644 --- a/plugins/SupportEraser/__init__.py +++ b/plugins/SupportEraser/__init__.py @@ -11,7 +11,7 @@ def getMetaData(): "tool": { "name": i18n_catalog.i18nc("@label", "Support Blocker"), "description": i18n_catalog.i18nc("@info:tooltip", "Create a volume in which supports are not printed."), - "icon": "tool_icon.svg", + "icon": "SupportBlocker", "weight": 4 } } diff --git a/plugins/SupportEraser/plugin.json b/plugins/SupportEraser/plugin.json index 8aa09d7526..f6259ad70e 100644 --- a/plugins/SupportEraser/plugin.json +++ b/plugins/SupportEraser/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Creates an eraser mesh to block the printing of support in certain places", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/SupportEraser/tool_icon.svg b/plugins/SupportEraser/tool_icon.svg deleted file mode 100644 index fee69e0715..0000000000 --- a/plugins/SupportEraser/tool_icon.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - support_blocker - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/plugins/Toolbox/plugin.json b/plugins/Toolbox/plugin.json index bd94f1a3e5..ed4a3eae97 100644 --- a/plugins/Toolbox/plugin.json +++ b/plugins/Toolbox/plugin.json @@ -2,6 +2,6 @@ "name": "Toolbox", "author": "Ultimaker B.V.", "version": "1.0.1", - "api": "7.4.0", + "api": 7, "description": "Find, manage and install new Cura packages." } diff --git a/plugins/Toolbox/resources/images/Shop.svg b/plugins/Toolbox/resources/images/Shop.svg new file mode 100755 index 0000000000..5056a25c51 --- /dev/null +++ b/plugins/Toolbox/resources/images/Shop.svg @@ -0,0 +1,6 @@ + + + + diff --git a/plugins/Toolbox/resources/images/shop.svg b/plugins/Toolbox/resources/images/shop.svg deleted file mode 100644 index 64862834b0..0000000000 --- a/plugins/Toolbox/resources/images/shop.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/plugins/Toolbox/resources/qml/Toolbox.qml b/plugins/Toolbox/resources/qml/Toolbox.qml index bb487e86b1..b67d175194 100644 --- a/plugins/Toolbox/resources/qml/Toolbox.qml +++ b/plugins/Toolbox/resources/qml/Toolbox.qml @@ -100,8 +100,8 @@ Window Connections { target: toolbox - onShowLicenseDialog: { licenseDialog.show() } - onCloseLicenseDialog: { licenseDialog.close() } + function onShowLicenseDialog() { licenseDialog.show() } + function onCloseLicenseDialog() { licenseDialog.close() } } ToolboxLicenseDialog diff --git a/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml b/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml index 5514e555eb..9874a977f5 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml @@ -41,7 +41,7 @@ Item height: height } color: button.enabled ? (button.hovered ? UM.Theme.getColor("primary") : UM.Theme.getColor("text")) : UM.Theme.getColor("text_inactive") - source: UM.Theme.getIcon("arrow_left") + source: UM.Theme.getIcon("ChevronSingleLeft") } width: UM.Theme.getSize("toolbox_back_button").width height: UM.Theme.getSize("toolbox_back_button").height diff --git a/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml b/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml index 868b5971c0..d683877605 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml @@ -112,8 +112,8 @@ Column Connections { target: toolbox - onInstallChanged: installed = toolbox.isInstalled(model.id) - onFilterChanged: + function onInstallChanged() { installed = toolbox.isInstalled(model.id) } + function onFilterChanged() { installed = toolbox.isInstalled(model.id) } diff --git a/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcaseTile.qml b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcaseTile.qml index d5b1b1a7e6..6695921126 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcaseTile.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcaseTile.qml @@ -4,7 +4,7 @@ import QtQuick 2.10 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 -import QtGraphicalEffects 1.0 + import UM 1.1 as UM Rectangle diff --git a/plugins/Toolbox/resources/qml/components/ToolboxFooter.qml b/plugins/Toolbox/resources/qml/components/ToolboxFooter.qml index 293e918d92..9863bd9a93 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxFooter.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxFooter.qml @@ -44,7 +44,11 @@ Item } height: UM.Theme.getSize("toolbox_footer_button").height text: catalog.i18nc("@info:button, %1 is the application name", "Quit %1").arg(CuraApplication.applicationDisplayName) - onClicked: toolbox.restart() + onClicked: + { + base.hide() + toolbox.restart() + } } ToolboxShadow diff --git a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml index 3cba9a9ece..1bdfa80b79 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml @@ -90,11 +90,12 @@ Item rightMargin: UM.Theme.getSize("default_margin").width verticalCenter: parent.verticalCenter } + acceptedButtons: Qt.LeftButton onClicked: Qt.openUrlExternally(toolbox.getWebMarketplaceUrl("plugins")) UM.RecolorImage { id: cloudMarketplaceButton - source: "../../images/shop.svg" + source: "../../images/Shop.svg" color: UM.Theme.getColor(webMarketplaceButtonTooltipArea.containsMouse ? "primary" : "text") height: parent.height / 2 width: height diff --git a/plugins/Toolbox/resources/qml/components/ToolboxInstalledTile.qml b/plugins/Toolbox/resources/qml/components/ToolboxInstalledTile.qml index a73e745ddb..e5c94fc996 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxInstalledTile.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxInstalledTile.qml @@ -117,7 +117,7 @@ Item Connections { target: toolbox - onEnabledChanged: isEnabled = toolbox.isEnabled(model.id) + function onToolboxEnabledChanged() { isEnabled = toolbox.isEnabled(model.id) } } } } diff --git a/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml b/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml index db30b1caf5..1726497c00 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml @@ -81,7 +81,7 @@ Column Connections { target: toolbox - onMetadataChanged: + function onMetadataChanged() { canDowngrade = toolbox.canDowngrade(model.id) } diff --git a/plugins/Toolbox/src/AuthorsModel.py b/plugins/Toolbox/src/AuthorsModel.py index 9a8e7f5dfe..04c8ed3a40 100644 --- a/plugins/Toolbox/src/AuthorsModel.py +++ b/plugins/Toolbox/src/AuthorsModel.py @@ -2,7 +2,7 @@ # Cura is released under the terms of the LGPLv3 or higher. import re -from typing import Dict, List, Optional, Union +from typing import Dict, List, Optional, Union, cast from PyQt5.QtCore import Qt, pyqtProperty @@ -68,7 +68,7 @@ class AuthorsModel(ListModel): # Execute all filters. filtered_items = list(items) - filtered_items.sort(key = lambda k: k["name"]) + filtered_items.sort(key = lambda k: cast(str, k["name"])) self.setItems(filtered_items) def setFilter(self, filter_dict: Dict[str, str]) -> None: diff --git a/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py b/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py index 5693b82ded..a85c13f639 100644 --- a/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py +++ b/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py @@ -1,3 +1,6 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + import os from typing import List, Dict, Any, cast @@ -96,7 +99,10 @@ class SyncOrchestrator(Extension): else: self._cloud_api.unsubscribe(item["package_id"]) # delete temp file - os.remove(item["package_path"]) + try: + os.remove(item["package_path"]) + except EnvironmentError as e: # File was already removed, no access rights, etc. + Logger.error("Can't delete temporary package file: {err}".format(err = str(e))) if has_changes: self._restart_presenter.present() diff --git a/plugins/Toolbox/src/PackagesModel.py b/plugins/Toolbox/src/PackagesModel.py index 282f63a12e..b11661c51e 100644 --- a/plugins/Toolbox/src/PackagesModel.py +++ b/plugins/Toolbox/src/PackagesModel.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import re @@ -91,7 +91,7 @@ class PackagesModel(ListModel): items.append({ "id": package["package_id"], "type": package["package_type"], - "name": package["display_name"], + "name": package["display_name"].strip(), "version": package["package_version"], "author_id": package["author"]["author_id"], "author_name": package["author"]["display_name"], diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index 98054c26e9..625289635a 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -46,8 +46,6 @@ class Toolbox(QObject, Extension): self._application = application # type: CuraApplication - self._sdk_version = ApplicationMetadata.CuraSDKVersion # type: Union[str, int] - # Network: self._download_request_data = None # type: Optional[HttpRequestData] self._download_progress = 0 # type: float @@ -124,7 +122,7 @@ class Toolbox(QObject, Extension): onIsDownloadingChanged = pyqtSignal() restartRequiredChanged = pyqtSignal() installChanged = pyqtSignal() - enabledChanged = pyqtSignal() + toolboxEnabledChanged = pyqtSignal() # UI changes viewChanged = pyqtSignal() @@ -210,7 +208,7 @@ class Toolbox(QObject, Extension): self._dialog.show() # Apply enabled/disabled state to installed plugins - self.enabledChanged.emit() + self.toolboxEnabledChanged.emit() def _createDialog(self, qml_name: str) -> Optional[QObject]: Logger.log("d", "Marketplace: Creating dialog [%s].", qml_name) @@ -444,7 +442,7 @@ class Toolbox(QObject, Extension): @pyqtSlot(str) def enable(self, plugin_id: str) -> None: self._plugin_registry.enablePlugin(plugin_id) - self.enabledChanged.emit() + self.toolboxEnabledChanged.emit() Logger.log("i", "%s was set as 'active'.", plugin_id) self._restart_required = True self.restartRequiredChanged.emit() @@ -452,7 +450,7 @@ class Toolbox(QObject, Extension): @pyqtSlot(str) def disable(self, plugin_id: str) -> None: self._plugin_registry.disablePlugin(plugin_id) - self.enabledChanged.emit() + self.toolboxEnabledChanged.emit() Logger.log("i", "%s was set as 'deactive'.", plugin_id) self._restart_required = True self.restartRequiredChanged.emit() @@ -610,7 +608,7 @@ class Toolbox(QObject, Extension): # Check for errors: if "errors" in json_data: for error in json_data["errors"]: - Logger.log("e", "Request type [%s] got response showing error: %s", error["title"]) + Logger.log("e", "Request type [%s] got response showing error: %s", error.get("title", "No error title found")) self.setViewPage("errored") return diff --git a/plugins/TrimeshReader/TrimeshReader.py b/plugins/TrimeshReader/TrimeshReader.py index cbec2e2482..6aea321f15 100644 --- a/plugins/TrimeshReader/TrimeshReader.py +++ b/plugins/TrimeshReader/TrimeshReader.py @@ -145,22 +145,22 @@ class TrimeshReader(MeshReader): tri_faces = tri_node.faces tri_vertices = tri_node.vertices - indices = [] - vertices = [] + indices_list = [] + vertices_list = [] index_count = 0 face_count = 0 for tri_face in tri_faces: face = [] for tri_index in tri_face: - vertices.append(tri_vertices[tri_index]) + vertices_list.append(tri_vertices[tri_index]) face.append(index_count) index_count += 1 - indices.append(face) + indices_list.append(face) face_count += 1 - vertices = numpy.asarray(vertices, dtype = numpy.float32) - indices = numpy.asarray(indices, dtype = numpy.int32) + vertices = numpy.asarray(vertices_list, dtype = numpy.float32) + indices = numpy.asarray(indices_list, dtype = numpy.int32) normals = calculateNormalsFromIndexedVertices(vertices, indices, face_count) mesh_data = MeshData(vertices = vertices, indices = indices, normals = normals, file_name = file_name) diff --git a/plugins/TrimeshReader/plugin.json b/plugins/TrimeshReader/plugin.json index f8d496fbf7..7bf60eefc6 100644 --- a/plugins/TrimeshReader/plugin.json +++ b/plugins/TrimeshReader/plugin.json @@ -3,5 +3,5 @@ "author": "Ultimaker B.V.", "version": "1.0.0", "description": "Provides support for reading model files.", - "api": "7.4.0" + "api": 7 } diff --git a/plugins/UFPReader/plugin.json b/plugins/UFPReader/plugin.json index ce7668ea2f..389b555b95 100644 --- a/plugins/UFPReader/plugin.json +++ b/plugins/UFPReader/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.0", "description": "Provides support for reading Ultimaker Format Packages.", - "supported_sdk_versions": ["7.4.0"], + "supported_sdk_versions": ["7.6.0"], "i18n-catalog": "cura" } \ No newline at end of file diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index 6179872b2d..455a7c3c36 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -1,22 +1,23 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from typing import cast, List, Dict from Charon.VirtualFile import VirtualFile # To open UFP files. from Charon.OpenMode import OpenMode # To indicate that we want to write to UFP files. +from Charon.filetypes.OpenPackagingConvention import OPCError from io import StringIO # For converting g-code to bytes. +from PyQt5.QtCore import QBuffer + from UM.Logger import Logger from UM.Mesh.MeshWriter import MeshWriter # The writer we need to implement. from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType from UM.PluginRegistry import PluginRegistry # To get the g-code writer. -from PyQt5.QtCore import QBuffer from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator from UM.Scene.SceneNode import SceneNode from cura.CuraApplication import CuraApplication -from cura.Snapshot import Snapshot from cura.Utils.Threading import call_on_qt_thread from UM.i18n import i18nCatalog @@ -38,17 +39,6 @@ class UFPWriter(MeshWriter): ) ) - self._snapshot = None - - def _createSnapshot(self, *args): - # must be called from the main thread because of OpenGL - Logger.log("d", "Creating thumbnail image...") - try: - self._snapshot = Snapshot.snapshot(width = 300, height = 300) - except Exception: - Logger.logException("w", "Failed to create snapshot image") - self._snapshot = None # Failing to create thumbnail should not fail creation of UFP - # This needs to be called on the main thread (Qt thread) because the serialization of material containers can # trigger loading other containers. Because those loaded containers are QtObjects, they must be created on the # Qt thread. The File read/write operations right now are executed on separated threads because they are scheduled @@ -58,38 +48,55 @@ class UFPWriter(MeshWriter): archive = VirtualFile() archive.openStream(stream, "application/x-ufp", OpenMode.WriteOnly) - self._writeObjectList(archive) + try: + self._writeObjectList(archive) - # Store the g-code from the scene. - archive.addContentType(extension = "gcode", mime_type = "text/x-gcode") + # Store the g-code from the scene. + archive.addContentType(extension = "gcode", mime_type = "text/x-gcode") + except EnvironmentError as e: + error_msg = catalog.i18nc("@info:error", "Can't write to UFP file:") + " " + str(e) + self.setInformation(error_msg) + Logger.error(error_msg) + return False gcode_textio = StringIO() # We have to convert the g-code into bytes. gcode_writer = cast(MeshWriter, PluginRegistry.getInstance().getPluginObject("GCodeWriter")) success = gcode_writer.write(gcode_textio, None) if not success: # Writing the g-code failed. Then I can also not write the gzipped g-code. self.setInformation(gcode_writer.getInformation()) return False - gcode = archive.getStream("/3D/model.gcode") - gcode.write(gcode_textio.getvalue().encode("UTF-8")) - archive.addRelation(virtual_path = "/3D/model.gcode", relation_type = "http://schemas.ultimaker.org/package/2018/relationships/gcode") + try: + gcode = archive.getStream("/3D/model.gcode") + gcode.write(gcode_textio.getvalue().encode("UTF-8")) + archive.addRelation(virtual_path = "/3D/model.gcode", relation_type = "http://schemas.ultimaker.org/package/2018/relationships/gcode") + except EnvironmentError as e: + error_msg = catalog.i18nc("@info:error", "Can't write to UFP file:") + " " + str(e) + self.setInformation(error_msg) + Logger.error(error_msg) + return False - self._createSnapshot() + # Attempt to store the thumbnail, if any: + backend = CuraApplication.getInstance().getBackend() + snapshot = None if getattr(backend, "getLatestSnapshot", None) is None else backend.getLatestSnapshot() + if snapshot: + try: + archive.addContentType(extension = "png", mime_type = "image/png") + thumbnail = archive.getStream("/Metadata/thumbnail.png") - # Store the thumbnail. - if self._snapshot: - archive.addContentType(extension = "png", mime_type = "image/png") - thumbnail = archive.getStream("/Metadata/thumbnail.png") + thumbnail_buffer = QBuffer() + thumbnail_buffer.open(QBuffer.ReadWrite) + snapshot.save(thumbnail_buffer, "PNG") - thumbnail_buffer = QBuffer() - thumbnail_buffer.open(QBuffer.ReadWrite) - thumbnail_image = self._snapshot - thumbnail_image.save(thumbnail_buffer, "PNG") - - thumbnail.write(thumbnail_buffer.data()) - archive.addRelation(virtual_path = "/Metadata/thumbnail.png", - relation_type = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail", - origin = "/3D/model.gcode") + thumbnail.write(thumbnail_buffer.data()) + archive.addRelation(virtual_path = "/Metadata/thumbnail.png", + relation_type = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail", + origin = "/3D/model.gcode") + except EnvironmentError as e: + error_msg = catalog.i18nc("@info:error", "Can't write to UFP file:") + " " + str(e) + self.setInformation(error_msg) + Logger.error(error_msg) + return False else: - Logger.log("d", "Thumbnail not created, cannot save it") + Logger.log("w", "Thumbnail not created, cannot save it") # Store the material. application = CuraApplication.getInstance() @@ -102,7 +109,7 @@ class UFPWriter(MeshWriter): try: archive.addContentType(extension = material_extension, mime_type = material_mime_type) - except: + except OPCError: Logger.log("w", "The material extension: %s was already added", material_extension) added_materials = [] @@ -132,17 +139,23 @@ class UFPWriter(MeshWriter): Logger.log("e", "Unable serialize material container with root id: %s", material_root_id) return False - material_file = archive.getStream(material_file_name) - material_file.write(serialized_material.encode("UTF-8")) - archive.addRelation(virtual_path = material_file_name, - relation_type = "http://schemas.ultimaker.org/package/2018/relationships/material", - origin = "/3D/model.gcode") + try: + material_file = archive.getStream(material_file_name) + material_file.write(serialized_material.encode("UTF-8")) + archive.addRelation(virtual_path = material_file_name, + relation_type = "http://schemas.ultimaker.org/package/2018/relationships/material", + origin = "/3D/model.gcode") + except EnvironmentError as e: + error_msg = catalog.i18nc("@info:error", "Can't write to UFP file:") + " " + str(e) + self.setInformation(error_msg) + Logger.error(error_msg) + return False added_materials.append(material_file_name) try: archive.close() - except OSError as e: + except EnvironmentError as e: error_msg = catalog.i18nc("@info:error", "Can't write to UFP file:") + " " + str(e) self.setInformation(error_msg) Logger.error(error_msg) diff --git a/plugins/UFPWriter/plugin.json b/plugins/UFPWriter/plugin.json index 7b366f1591..6d27d250cf 100644 --- a/plugins/UFPWriter/plugin.json +++ b/plugins/UFPWriter/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides support for writing Ultimaker Format Packages.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/plugin.json b/plugins/UM3NetworkPrinting/plugin.json index 786be68b6a..8a7a0e5b43 100644 --- a/plugins/UM3NetworkPrinting/plugin.json +++ b/plugins/UM3NetworkPrinting/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "description": "Manages network connections to Ultimaker networked printers.", "version": "2.0.0", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml b/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml index 2e3d17ceb0..8dca61ec38 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml @@ -1,23 +1,26 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.3 -import QtQuick.Controls 1.4 +import QtQuick.Controls 2.4 import QtQuick.Controls.Styles 1.3 import UM 1.3 as UM import Cura 1.0 as Cura -Rectangle +Button { - id: base - - property var enabled: true - property var iconSource: null - color: enabled ? UM.Theme.getColor("monitor_icon_primary") : UM.Theme.getColor("monitor_icon_disabled") - height: width - radius: Math.round(0.5 * width) - width: 24 * screenScaleFactor + width: UM.Theme.getSize("button").width * 0.75 //Matching the size of the content of tool buttons. + height: UM.Theme.getSize("button").height * 0.75 + + hoverEnabled: true + + background: Rectangle + { + anchors.fill: parent + radius: 0.5 * width + color: parent.enabled ? (parent.hovered ? UM.Theme.getColor("monitor_secondary_button_hover") : "transparent") : UM.Theme.getColor("monitor_icon_disabled") + } UM.RecolorImage { @@ -27,30 +30,21 @@ Rectangle horizontalCenter: parent.horizontalCenter verticalCenter: parent.verticalCenter } - color: UM.Theme.getColor("monitor_icon_accent") + color: UM.Theme.getColor("primary") height: width source: iconSource width: Math.round(parent.width / 2) } - MouseArea + onClicked: { - id: clickArea - anchors.fill: parent - hoverEnabled: base.enabled - onClicked: + if (OutputDevice.activeCameraUrl != "") { - if (base.enabled) - { - if (OutputDevice.activeCameraUrl != "") - { - OutputDevice.setActiveCameraUrl("") - } - else - { - OutputDevice.setActiveCameraUrl(modelData.cameraUrl) - } - } + OutputDevice.setActiveCameraUrl("") + } + else + { + OutputDevice.setActiveCameraUrl(modelData.cameraUrl) } } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml index 2034c23abe..0f4aec5424 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml @@ -50,8 +50,8 @@ Item id: buildplateIcon anchors.centerIn: parent color: UM.Theme.getColor("monitor_icon_primary") - height: parent.height - source: "../svg/icons/buildplate.svg" + height: UM.Theme.getSize("medium_button_icon").width + source: "../svg/icons/Buildplate.svg" width: height visible: buildplate } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml index 56e39bd477..a42dc0d12a 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml @@ -98,7 +98,7 @@ Item sourceSize.width: width // TODO: Theme! sourceSize.height: width // TODO: Theme! color: UM.Theme.getColor("text") - source: UM.Theme.getIcon("arrow_left") + source: UM.Theme.getIcon("ChevronSingleLeft") } } } @@ -177,7 +177,7 @@ Item sourceSize.width: width // TODO: Theme! sourceSize.height: width // TODO: Theme! color: UM.Theme.getColor("text") - source: UM.Theme.getIcon("arrow_right") + source: UM.Theme.getIcon("ChevronSingleRight") } } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml index ac5f588db3..2720e6896a 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml @@ -5,6 +5,8 @@ import QtQuick 2.2 import QtQuick.Controls 2.0 import UM 1.3 as UM +import Cura 1.6 as Cura + /** * This component comprises a colored extruder icon, the material name, and the * print core name. It is used by the MonitorPrinterConfiguration component with @@ -18,10 +20,10 @@ import UM 1.3 as UM Item { // The material color - property alias color: extruderIcon.color + property alias color: extruderIcon.materialColor - // The extruder position; NOTE: Decent human beings count from 0 - property alias position: extruderIcon.position + // The extruder position + property int position // The material name property alias material: materialLabel.text @@ -32,12 +34,13 @@ Item // Height is 2 x 18px labels, plus 4px spacing between them height: 40 * screenScaleFactor // TODO: Theme! width: childrenRect.width + opacity: material != "" && material != "Empty" && position >= 0 ? 1 : 0.4 - MonitorIconExtruder + Cura.ExtruderIcon { id: extruderIcon - color: UM.Theme.getColor("monitor_skeleton_loading") - position: 0 + materialColor: UM.Theme.getColor("monitor_skeleton_loading") + anchors.verticalCenter: parent.verticalCenter } Rectangle @@ -46,16 +49,18 @@ Item anchors { left: extruderIcon.right - leftMargin: 12 * screenScaleFactor // TODO: Theme! + leftMargin: UM.Theme.getSize("default_margin").width + verticalCenter: extruderIcon.verticalCenter } color: materialLabel.visible > 0 ? "transparent" : UM.Theme.getColor("monitor_skeleton_loading") - height: 18 * screenScaleFactor // TODO: Theme! + height: childrenRect.height width: Math.max(materialLabel.contentWidth, 60 * screenScaleFactor) // TODO: Theme! radius: 2 * screenScaleFactor // TODO: Theme! Label { id: materialLabel + anchors.top: parent.top color: UM.Theme.getColor("text") elide: Text.ElideRight @@ -63,29 +68,13 @@ Item text: "" visible: text !== "" - // FIXED-LINE-HEIGHT: - height: parent.height - verticalAlignment: Text.AlignVCenter renderType: Text.NativeRendering } - } - - Rectangle - { - id: printCoreLabelWrapper - anchors - { - left: materialLabelWrapper.left - bottom: parent.bottom - } - color: printCoreLabel.visible > 0 ? "transparent" : UM.Theme.getColor("monitor_skeleton_loading") - height: 18 * screenScaleFactor // TODO: Theme! - width: Math.max(printCoreLabel.contentWidth, 36 * screenScaleFactor) // TODO: Theme! - radius: 2 * screenScaleFactor // TODO: Theme! Label { id: printCoreLabel + anchors.top: materialLabel.bottom color: UM.Theme.getColor("text") elide: Text.ElideRight @@ -93,9 +82,6 @@ Item text: "" visible: text !== "" - // FIXED-LINE-HEIGHT: - height: parent.height - verticalAlignment: Text.AlignVCenter renderType: Text.NativeRendering } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml index 8c6f28d3e1..ad0e8a6777 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml @@ -22,7 +22,7 @@ Item property int size: 32 * screenScaleFactor // TODO: Theme! // THe extruder icon source; NOTE: This shouldn't need to be changed - property string iconSource: "../svg/icons/extruder.svg" + property string iconSource: "../svg/icons/Extruder.svg" height: size width: size @@ -38,6 +38,7 @@ Item Label { id: positionLabel + anchors.centerIn: icon font: UM.Theme.getFont("small") color: UM.Theme.getColor("text") height: Math.round(size / 2) @@ -45,8 +46,6 @@ Item text: position + 1 verticalAlignment: Text.AlignVCenter width: Math.round(size / 2) - x: Math.round(size * 0.25) - y: Math.round(size * 0.15625) visible: position >= 0 renderType: Text.NativeRendering } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml index 7492b4e8e4..cf2239201f 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml @@ -71,20 +71,20 @@ Item } if (printJob.configurationChanges.length > 0) { - return "../svg/warning-icon.svg" + return "../svg/Warning.svg" } switch(printJob.state) { case "error": - return "../svg/aborted-icon.svg" + return "../svg/CancelCircle.svg" case "wait_cleanup": - return printJob.timeTotal > printJob.timeElapsed ? "../svg/aborted-icon.svg" : "" + return printJob.timeTotal > printJob.timeElapsed ? "../svg/CancelCircle.svg" : "" case "pausing": - return "../svg/paused-icon.svg" + return "../svg/PauseCircle.svg" case "paused": - return "../svg/paused-icon.svg" + return "../svg/PauseCircle.svg" case "resuming": - return "../svg/paused-icon.svg" + return "../svg/PauseCircle.svg" default: return "" } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index 05ad8d9929..7dbb78e8fb 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml @@ -164,7 +164,7 @@ Item verticalCenter: managePrinterText.verticalCenter } color: UM.Theme.getColor("text_link") - source: UM.Theme.getIcon("external_link") + source: UM.Theme.getIcon("LinkExternal") width: 12 * screenScaleFactor height: 12 * screenScaleFactor } @@ -265,7 +265,7 @@ Item bottom: parent.bottom bottomMargin: 20 * screenScaleFactor // TODO: Theme! } - iconSource: "../svg/icons/camera.svg" + iconSource: "../svg/icons/CameraPhoto.svg" enabled: !cloudConnection visible: printer } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml index 9f159102e2..1b94625bf0 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml @@ -48,7 +48,7 @@ Item id: externalLinkIcon anchors.verticalCenter: manageQueueLabel.verticalCenter color: UM.Theme.getColor("text_link") - source: UM.Theme.getIcon("external_link") + source: UM.Theme.getIcon("LinkExternal") width: 16 * screenScaleFactor // TODO: Theme! (Y U NO USE 18 LIKE ALL OTHER ICONS?!) height: 16 * screenScaleFactor // TODO: Theme! (Y U NO USE 18 LIKE ALL OTHER ICONS?!) } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml index dc69d89fed..5d5b3ceab4 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml @@ -6,7 +6,6 @@ import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import UM 1.3 as UM import Cura 1.0 as Cura -import QtGraphicalEffects 1.0 // This is the root component for the monitor stage. Component diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml b/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml index cfbb30fdfb..291e2a14f5 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml @@ -30,7 +30,7 @@ Item { top: cameraImage.top topMargin: UM.Theme.getSize("default_margin").height } - iconSource: UM.Theme.getIcon("cross1"); + iconSource: UM.Theme.getIcon("Cancel"); z: 999; } diff --git a/plugins/UM3NetworkPrinting/resources/svg/Camera.svg b/plugins/UM3NetworkPrinting/resources/svg/Camera.svg new file mode 100755 index 0000000000..341d90e940 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/Camera.svg @@ -0,0 +1,5 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/CancelCircle.svg b/plugins/UM3NetworkPrinting/resources/svg/CancelCircle.svg new file mode 100755 index 0000000000..40423ffd8d --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/CancelCircle.svg @@ -0,0 +1,6 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/Check.svg b/plugins/UM3NetworkPrinting/resources/svg/Check.svg new file mode 100755 index 0000000000..c64667efd8 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/Check.svg @@ -0,0 +1,4 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/CheckCircle.svg b/plugins/UM3NetworkPrinting/resources/svg/CheckCircle.svg new file mode 100755 index 0000000000..c364a1ecb9 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/CheckCircle.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/PauseCircle.svg b/plugins/UM3NetworkPrinting/resources/svg/PauseCircle.svg new file mode 100755 index 0000000000..3da1179f41 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/PauseCircle.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/Prohibition.svg b/plugins/UM3NetworkPrinting/resources/svg/Prohibition.svg new file mode 100755 index 0000000000..18e0058fed --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/Prohibition.svg @@ -0,0 +1,6 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/Warning.svg b/plugins/UM3NetworkPrinting/resources/svg/Warning.svg new file mode 100755 index 0000000000..828e866435 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/Warning.svg @@ -0,0 +1,5 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/aborted-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/aborted-icon.svg deleted file mode 100644 index 7ef82c8911..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/aborted-icon.svg +++ /dev/null @@ -1 +0,0 @@ -aborted-icon \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/action-required-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/action-required-icon.svg deleted file mode 100644 index e7768849c6..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/action-required-icon.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/plugins/UM3NetworkPrinting/resources/svg/approved-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/approved-icon.svg deleted file mode 100644 index 671957d709..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/approved-icon.svg +++ /dev/null @@ -1 +0,0 @@ -approved-icon \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/blocked-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/blocked-icon.svg deleted file mode 100644 index eba3efdab9..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/blocked-icon.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/plugins/UM3NetworkPrinting/resources/svg/camera-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/camera-icon.svg deleted file mode 100644 index 66bed04508..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/camera-icon.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - Created with Sketch. - - - - - \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/checkmark-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/checkmark-icon.svg deleted file mode 100644 index 9d4507e551..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/checkmark-icon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg new file mode 100755 index 0000000000..5201926675 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg @@ -0,0 +1,5 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/CameraPhoto.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/CameraPhoto.svg new file mode 100755 index 0000000000..b39aa7c3de --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/icons/CameraPhoto.svg @@ -0,0 +1,6 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/Extruder.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/Extruder.svg new file mode 100644 index 0000000000..45d2fdcf8d --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/icons/Extruder.svg @@ -0,0 +1,5 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/buildplate.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/buildplate.svg deleted file mode 100644 index bcb278a8ca..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/icons/buildplate.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/camera.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/camera.svg deleted file mode 100644 index 2eaebb812d..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/icons/camera.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/extruder.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/extruder.svg deleted file mode 100644 index 235cb432e9..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/icons/extruder.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/paused-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/paused-icon.svg deleted file mode 100644 index a66217d662..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/paused-icon.svg +++ /dev/null @@ -1 +0,0 @@ -paused-icon \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/warning-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/warning-icon.svg deleted file mode 100644 index 064d0783e0..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/warning-icon.svg +++ /dev/null @@ -1,4 +0,0 @@ - - warning-icon - - \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py index 82b8c1da62..9eaa133ef5 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from time import time @@ -104,6 +104,7 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): # Reference to the uploaded print job / mesh # We do this to prevent re-uploading the same file multiple times. self._tool_path = None # type: Optional[bytes] + self._pre_upload_print_job = None # type: Optional[CloudPrintJobResponse] self._uploaded_print_job = None # type: Optional[CloudPrintJobResponse] def connect(self) -> None: @@ -130,6 +131,7 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): """Resets the print job that was uploaded to force a new upload, runs whenever the user re-slices.""" self._tool_path = None + self._pre_upload_print_job = None self._uploaded_print_job = None def matchesNetworkKey(self, network_key: str) -> bool: @@ -189,6 +191,7 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): if self._progress.visible: PrintJobUploadBlockedMessage().show() return + self._progress.show() # Indicate we have started sending a job. self.writeStarted.emit(self) @@ -196,6 +199,7 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): # The mesh didn't change, let's not upload it to the cloud again. # Note that self.writeFinished is called in _onPrintUploadCompleted as well. if self._uploaded_print_job: + Logger.log("i", "Current mesh is already attached to a print-job, immediately request reprint.") self._api.requestPrint(self.key, self._uploaded_print_job.job_id, self._onPrintUploadCompleted, self._onPrintUploadSpecificError) return @@ -226,8 +230,7 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): """ if not self._tool_path: return self._onUploadError() - self._progress.show() - self._uploaded_print_job = job_response # store the last uploaded job to prevent re-upload of the same file + self._pre_upload_print_job = job_response # store the last uploaded job to prevent re-upload of the same file self._api.uploadToolPath(job_response, self._tool_path, self._onPrintJobUploaded, self._progress.update, self._onUploadError) @@ -238,9 +241,11 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): """ self._progress.update(100) - print_job = cast(CloudPrintJobResponse, self._uploaded_print_job) - if not print_job: # It's possible that another print job is requested in the meanwhile, which then fails to upload with an error, which sets self._uploaded_print_job to `None`. - # TODO: Maybe _onUploadError shouldn't set the _uploaded_print_job to None or we need to prevent such asynchronous cases. + print_job = cast(CloudPrintJobResponse, self._pre_upload_print_job) + if not print_job: # It's possible that another print job is requested in the meanwhile, which then fails to upload with an error, which sets self._pre_uploaded_print_job to `None`. + self._pre_upload_print_job = None + self._uploaded_print_job = None + Logger.log("w", "Interference from another job uploaded at roughly the same time, not uploading print!") return # Prevent a crash. self._api.requestPrint(self.key, print_job.job_id, self._onPrintUploadCompleted, self._onPrintUploadSpecificError) @@ -249,8 +254,18 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): :param response: The response from the cloud API. """ + self._uploaded_print_job = self._pre_upload_print_job self._progress.hide() - PrintJobUploadSuccessMessage().show() + message = PrintJobUploadSuccessMessage() + message.addAction("monitor print", + name=I18N_CATALOG.i18nc("@action:button", "Monitor print"), + icon="", + description=I18N_CATALOG.i18nc("@action:tooltip", "Track the print in Ultimaker Digital Factory"), + button_align=message.ActionButtonAlignment.ALIGN_RIGHT) + df_url = f"https://digitalfactory.ultimaker.com/app/jobs/{self._cluster.cluster_id}?utm_source=cura&utm_medium=software&utm_campaign=monitor-button" + message.pyQtActionTriggered.connect(lambda message, action: (QDesktopServices.openUrl(QUrl(df_url)), message.hide())) + + message.show() self.writeFinished.emit() def _onPrintUploadSpecificError(self, reply: "QNetworkReply", _: "QNetworkReply.NetworkError"): @@ -263,7 +278,10 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): else: PrintJobUploadErrorMessage(I18N_CATALOG.i18nc("@error:send", "Unknown error code when uploading print job: {0}", error_code)).show() + Logger.log("w", "Upload of print job failed specifically with error code {}".format(error_code)) + self._progress.hide() + self._pre_upload_print_job = None self._uploaded_print_job = None self.writeError.emit() @@ -272,7 +290,10 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): Displays the given message if uploading the mesh has failed due to a generic error (i.e. lost connection). :param message: The message to display. """ + Logger.log("w", "Upload error with message {}".format(message)) + self._progress.hide() + self._pre_upload_print_job = None self._uploaded_print_job = None PrintJobUploadErrorMessage(message).show() self.writeError.emit() @@ -287,7 +308,7 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): firmware_version = Version([version_number[0], version_number[1], version_number[2]]) return firmware_version >= self.PRINT_JOB_ACTIONS_MIN_VERSION - @pyqtProperty(bool) + @pyqtProperty(bool, constant = True) def supportsPrintJobQueue(self) -> bool: """Gets whether the printer supports a queue""" diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py index 586c711de9..ac95624421 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py @@ -399,7 +399,7 @@ class CloudOutputDeviceManager: output_device_manager = CuraApplication.getInstance().getOutputDeviceManager() stored_cluster_id = active_machine.getMetaDataEntry(self.META_CLUSTER_ID) local_network_key = active_machine.getMetaDataEntry(self.META_NETWORK_KEY) - for device in self._remote_clusters.values(): + for device in list(self._remote_clusters.values()): # Make a copy of the remote devices list, to prevent modifying the list while iterating, if a device gets added asynchronously. if device.key == stored_cluster_id: # Connect to it if the stored ID matches. self._connectToOutputDevice(device, active_machine) diff --git a/plugins/UM3NetworkPrinting/src/ExportFileJob.py b/plugins/UM3NetworkPrinting/src/ExportFileJob.py index 6fde08cc5f..953b167a6e 100644 --- a/plugins/UM3NetworkPrinting/src/ExportFileJob.py +++ b/plugins/UM3NetworkPrinting/src/ExportFileJob.py @@ -1,3 +1,7 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +import re # Filtering out invalid characters. from typing import List, Optional from UM.FileHandler.FileHandler import FileHandler @@ -24,6 +28,7 @@ class ExportFileJob(WriteFileJob): # Determine the filename. job_name = CuraApplication.getInstance().getPrintInformation().jobName + job_name = re.sub("[^\w\-. ()]", "-", job_name) extension = self._mesh_format_handler.preferred_format.get("extension", "") self.setFileName("{}.{}".format(job_name, extension)) diff --git a/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadErrorMessage.py b/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadErrorMessage.py index 5145844ea7..9feb4b4970 100644 --- a/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadErrorMessage.py +++ b/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadErrorMessage.py @@ -13,6 +13,5 @@ class PrintJobUploadErrorMessage(Message): def __init__(self, message: str = None) -> None: super().__init__( text = message or I18N_CATALOG.i18nc("@info:text", "Could not upload the data to the printer."), - title = I18N_CATALOG.i18nc("@info:title", "Network error"), - lifetime = 10 + title = I18N_CATALOG.i18nc("@info:title", "Network error") ) diff --git a/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadSuccessMessage.py b/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadSuccessMessage.py index aa64f338dd..aa3d72ccd8 100644 --- a/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadSuccessMessage.py +++ b/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadSuccessMessage.py @@ -13,6 +13,5 @@ class PrintJobUploadSuccessMessage(Message): def __init__(self) -> None: super().__init__( text = I18N_CATALOG.i18nc("@info:status", "Print job was successfully sent to the printer."), - title = I18N_CATALOG.i18nc("@info:title", "Data Sent"), - lifetime = 5 + title = I18N_CATALOG.i18nc("@info:title", "Data Sent") ) diff --git a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobConstraint.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobConstraints.py similarity index 94% rename from plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobConstraint.py rename to plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobConstraints.py index 5271130dd6..b72e9ecb1e 100644 --- a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobConstraint.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobConstraints.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from typing import Optional diff --git a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py index 6e46c12cf0..987ca9fab1 100644 --- a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from typing import List, Optional, Union, Dict, Any @@ -8,7 +8,7 @@ from .ClusterBuildPlate import ClusterBuildPlate from .ClusterPrintJobConfigurationChange import ClusterPrintJobConfigurationChange from .ClusterPrintJobImpediment import ClusterPrintJobImpediment from .ClusterPrintCoreConfiguration import ClusterPrintCoreConfiguration -from .ClusterPrintJobConstraint import ClusterPrintJobConstraints +from .ClusterPrintJobConstraints import ClusterPrintJobConstraints from ..UM3PrintJobOutputModel import UM3PrintJobOutputModel from ..ConfigurationChangeModel import ConfigurationChangeModel from ..BaseModel import BaseModel @@ -18,13 +18,24 @@ from ...ClusterOutputController import ClusterOutputController class ClusterPrintJobStatus(BaseModel): """Model for the status of a single print job in a cluster.""" - def __init__(self, created_at: str, force: bool, machine_variant: str, name: str, started: bool, status: str, - time_total: int, uuid: str, + def __init__(self, + created_at: str, + force: bool, + machine_variant: str, + name: str, + started: bool, + status: str, + time_total: int, + uuid: str, configuration: List[Union[Dict[str, Any], ClusterPrintCoreConfiguration]], - constraints: List[Union[Dict[str, Any], ClusterPrintJobConstraints]], - last_seen: Optional[float] = None, network_error_count: Optional[int] = None, - owner: Optional[str] = None, printer_uuid: Optional[str] = None, time_elapsed: Optional[int] = None, - assigned_to: Optional[str] = None, deleted_at: Optional[str] = None, + constraints: Optional[Union[Dict[str, Any], ClusterPrintJobConstraints]] = None, + last_seen: Optional[float] = None, + network_error_count: Optional[int] = None, + owner: Optional[str] = None, + printer_uuid: Optional[str] = None, + time_elapsed: Optional[int] = None, + assigned_to: Optional[str] = None, + deleted_at: Optional[str] = None, printed_on_uuid: Optional[str] = None, configuration_changes_required: List[ Union[Dict[str, Any], ClusterPrintJobConfigurationChange]] = None, @@ -63,10 +74,9 @@ class ClusterPrintJobStatus(BaseModel): printer :param preview_url: URL to the preview image (same as wou;d've been included in the ufp). """ - self.assigned_to = assigned_to self.configuration = self.parseModels(ClusterPrintCoreConfiguration, configuration) - self.constraints = self.parseModels(ClusterPrintJobConstraints, constraints) + self.constraints = self.parseModel(ClusterPrintJobConstraints, constraints) if constraints else None self.created_at = created_at self.force = force self.last_seen = last_seen @@ -83,7 +93,6 @@ class ClusterPrintJobStatus(BaseModel): self.deleted_at = deleted_at self.printed_on_uuid = printed_on_uuid self.preview_url = preview_url - self.configuration_changes_required = self.parseModels(ClusterPrintJobConfigurationChange, configuration_changes_required) \ if configuration_changes_required else [] diff --git a/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py b/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py index 28f6b29dd9..96a2b78e8f 100644 --- a/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py +++ b/plugins/UM3NetworkPrinting/src/Network/SendMaterialJob.py @@ -7,26 +7,34 @@ from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest from UM.Job import Job from UM.Logger import Logger from cura.CuraApplication import CuraApplication +from cura.Utils.Threading import call_on_qt_thread from ..Models.Http.ClusterMaterial import ClusterMaterial from ..Models.LocalMaterial import LocalMaterial from ..Messages.MaterialSyncMessage import MaterialSyncMessage +import time +import threading + if TYPE_CHECKING: from .LocalClusterOutputDevice import LocalClusterOutputDevice class SendMaterialJob(Job): + """Asynchronous job to send material profiles to the printer. This way it won't freeze up the interface while sending those materials. """ - - def __init__(self, device: "LocalClusterOutputDevice") -> None: super().__init__() self.device = device # type: LocalClusterOutputDevice + self._send_material_thread = threading.Thread(target = self._sendMissingMaterials) + self._send_material_thread.setDaemon(True) + + self._remote_materials = {} # type: Dict[str, ClusterMaterial] + def run(self) -> None: """Send the request to the printer and register a callback""" @@ -36,9 +44,15 @@ class SendMaterialJob(Job): """Callback for when the remote materials were returned.""" remote_materials_by_guid = {material.guid: material for material in materials} - self._sendMissingMaterials(remote_materials_by_guid) + self._remote_materials = remote_materials_by_guid + # It's not the nicest way to do it, but if we don't handle this in a thread + # we are blocking the main interface (even though the original call was done in a job) + # This should really be refactored so that calculating the list of materials that need to be sent + # to the printer is done outside of the job (and running the job actually sends the materials) + # TODO: Fix this hack that was introduced for 4.9.1 + self._send_material_thread.start() - def _sendMissingMaterials(self, remote_materials_by_guid: Dict[str, ClusterMaterial]) -> None: + def _sendMissingMaterials(self) -> None: """Determine which materials should be updated and send them to the printer. :param remote_materials_by_guid: The remote materials by GUID. @@ -47,7 +61,7 @@ class SendMaterialJob(Job): if len(local_materials_by_guid) == 0: Logger.log("d", "There are no local materials to synchronize with the printer.") return - material_ids_to_send = self._determineMaterialsToSend(local_materials_by_guid, remote_materials_by_guid) + material_ids_to_send = self._determineMaterialsToSend(local_materials_by_guid, self._remote_materials) if len(material_ids_to_send) == 0: Logger.log("d", "There are no remote materials to update.") return @@ -96,7 +110,11 @@ class SendMaterialJob(Job): file_name = os.path.basename(file_path) self._sendMaterialFile(file_path, file_name, root_material_id) + time.sleep(1) # Throttle the sending a bit. + # This needs to be called on the QT thread since the onFinished needs to happen + # in the same thread as where the network manager is located (aka; main thread) + @call_on_qt_thread def _sendMaterialFile(self, file_path: str, file_name: str, material_id: str) -> None: """Send a single material file to the printer. diff --git a/plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py b/plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py index ce5d9ce868..7b33ecabea 100644 --- a/plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py +++ b/plugins/UM3NetworkPrinting/src/Network/ZeroConfClient.py @@ -129,16 +129,16 @@ class ZeroConfClient: for record in zero_conf.cache.entries_with_name(info.server): info.update_record(zero_conf, time(), record) - if info.addresses: + if hasattr(info, "addresses") and info.addresses: break # Request more data if info is not complete - if not info.addresses: + if not hasattr(info, "addresses") or not info.addresses: new_info = zero_conf.get_service_info(service_type, name) if new_info is not None: info = new_info - if info and info.addresses: + if info and hasattr(info, "addresses") and info.addresses: type_of_device = info.properties.get(b"type", None) if type_of_device: if type_of_device == b"printer": diff --git a/plugins/UM3NetworkPrinting/src/__init__.py b/plugins/UM3NetworkPrinting/src/__init__.py index 659263c0d6..d5641e902f 100644 --- a/plugins/UM3NetworkPrinting/src/__init__.py +++ b/plugins/UM3NetworkPrinting/src/__init__.py @@ -1,9 +1,2 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. - -# Workaround for a race condition on certain systems where there -# is a race condition between Arcus and PyQt. Importing Arcus -# first seems to prevent Sip from going into a state where it -# tries to create PyQt objects on a non-main thread. -import Arcus #@UnusedImport -import Savitar #@UnusedImport \ No newline at end of file diff --git a/plugins/USBPrinting/AutoDetectBaudJob.py b/plugins/USBPrinting/AutoDetectBaudJob.py index c74935dbff..1ebd74af4f 100644 --- a/plugins/USBPrinting/AutoDetectBaudJob.py +++ b/plugins/USBPrinting/AutoDetectBaudJob.py @@ -70,7 +70,10 @@ class AutoDetectBaudJob(Job): timeout_time = time() + wait_response_timeout while timeout_time > time(): - line = serial.readline() + # If baudrate is wrong, then readline() might never + # return, even with timeouts set. Using read_until + # with size limit seems to fix this. + line = serial.read_until(size = 100) if b"ok" in line and b"T:" in line: self.setResult(baud_rate) Logger.log("d", "Detected baud rate {baud_rate} on serial {serial} on retry {retry} with after {time_elapsed:0.2f} seconds.".format( diff --git a/plugins/USBPrinting/USBPrinterOutputDevice.py b/plugins/USBPrinting/USBPrinterOutputDevice.py index 30694b074b..70a1f4333e 100644 --- a/plugins/USBPrinting/USBPrinterOutputDevice.py +++ b/plugins/USBPrinting/USBPrinterOutputDevice.py @@ -211,6 +211,8 @@ class USBPrinterOutputDevice(PrinterOutputDevice): def _onGlobalContainerStackChanged(self): container_stack = CuraApplication.getInstance().getGlobalContainerStack() + if container_stack is None: + return num_extruders = container_stack.getProperty("machine_extruder_count", "value") # Ensure that a printer is created. controller = GenericOutputController(self) diff --git a/plugins/USBPrinting/plugin.json b/plugins/USBPrinting/plugin.json index 9cf4f41491..21e5fd4160 100644 --- a/plugins/USBPrinting/plugin.json +++ b/plugins/USBPrinting/plugin.json @@ -2,7 +2,7 @@ "name": "USB printing", "author": "Ultimaker B.V.", "version": "1.0.2", - "api": "7.4.0", + "api": 7, "description": "Accepts G-Code and sends them to a printer. Plugin can also update firmware.", "i18n-catalog": "cura" } diff --git a/plugins/UltimakerMachineActions/plugin.json b/plugins/UltimakerMachineActions/plugin.json index 6aee045a8b..c216c74f8f 100644 --- a/plugins/UltimakerMachineActions/plugin.json +++ b/plugins/UltimakerMachineActions/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.).", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade21to22/plugin.json b/plugins/VersionUpgrade/VersionUpgrade21to22/plugin.json index d073cab35d..7f9b57c6e5 100644 --- a/plugins/VersionUpgrade/VersionUpgrade21to22/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade21to22/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Upgrades configurations from Cura 2.1 to Cura 2.2.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade22to24/plugin.json b/plugins/VersionUpgrade/VersionUpgrade22to24/plugin.json index 12deeb6633..e179fdc051 100644 --- a/plugins/VersionUpgrade/VersionUpgrade22to24/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade22to24/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Upgrades configurations from Cura 2.2 to Cura 2.4.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade25to26/plugin.json b/plugins/VersionUpgrade/VersionUpgrade25to26/plugin.json index e1845c35bd..efee6fb666 100644 --- a/plugins/VersionUpgrade/VersionUpgrade25to26/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade25to26/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Upgrades configurations from Cura 2.5 to Cura 2.6.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade26to27/plugin.json b/plugins/VersionUpgrade/VersionUpgrade26to27/plugin.json index dccb398331..03e19bb61e 100644 --- a/plugins/VersionUpgrade/VersionUpgrade26to27/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade26to27/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Upgrades configurations from Cura 2.6 to Cura 2.7.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade27to30/plugin.json b/plugins/VersionUpgrade/VersionUpgrade27to30/plugin.json index 9cac20968e..f2984809ac 100644 --- a/plugins/VersionUpgrade/VersionUpgrade27to30/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade27to30/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Upgrades configurations from Cura 2.7 to Cura 3.0.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade30to31/plugin.json b/plugins/VersionUpgrade/VersionUpgrade30to31/plugin.json index 0d5b15d236..2404b3e474 100644 --- a/plugins/VersionUpgrade/VersionUpgrade30to31/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade30to31/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Upgrades configurations from Cura 3.0 to Cura 3.1.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade32to33/plugin.json b/plugins/VersionUpgrade/VersionUpgrade32to33/plugin.json index 1b2838a01b..6326ea2657 100644 --- a/plugins/VersionUpgrade/VersionUpgrade32to33/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade32to33/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Upgrades configurations from Cura 3.2 to Cura 3.3.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade33to34/plugin.json b/plugins/VersionUpgrade/VersionUpgrade33to34/plugin.json index 445380ae09..a25bd36f5a 100644 --- a/plugins/VersionUpgrade/VersionUpgrade33to34/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade33to34/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Upgrades configurations from Cura 3.3 to Cura 3.4.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade34to35/plugin.json b/plugins/VersionUpgrade/VersionUpgrade34to35/plugin.json index b17ab0f95f..345578ff11 100644 --- a/plugins/VersionUpgrade/VersionUpgrade34to35/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade34to35/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Upgrades configurations from Cura 3.4 to Cura 3.5.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade35to40/plugin.json b/plugins/VersionUpgrade/VersionUpgrade35to40/plugin.json index 67ac5f852d..4ac9de08c5 100644 --- a/plugins/VersionUpgrade/VersionUpgrade35to40/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade35to40/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.0", "description": "Upgrades configurations from Cura 3.5 to Cura 4.0.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade40to41/plugin.json b/plugins/VersionUpgrade/VersionUpgrade40to41/plugin.json index 15a52ba484..1b0ee2b162 100644 --- a/plugins/VersionUpgrade/VersionUpgrade40to41/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade40to41/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Upgrades configurations from Cura 4.0 to Cura 4.1.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade41to42/plugin.json b/plugins/VersionUpgrade/VersionUpgrade41to42/plugin.json index 87746e87fd..e8b3e3c846 100644 --- a/plugins/VersionUpgrade/VersionUpgrade41to42/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade41to42/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.0", "description": "Upgrades configurations from Cura 4.1 to Cura 4.2.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade42to43/plugin.json b/plugins/VersionUpgrade/VersionUpgrade42to43/plugin.json index 36df1bc0c3..ce0a7aee60 100644 --- a/plugins/VersionUpgrade/VersionUpgrade42to43/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade42to43/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.0", "description": "Upgrades configurations from Cura 4.2 to Cura 4.3.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade43to44/plugin.json b/plugins/VersionUpgrade/VersionUpgrade43to44/plugin.json index ba3f4bacd2..bd6658ff3c 100644 --- a/plugins/VersionUpgrade/VersionUpgrade43to44/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade43to44/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.0", "description": "Upgrades configurations from Cura 4.3 to Cura 4.4.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade44to45/plugin.json b/plugins/VersionUpgrade/VersionUpgrade44to45/plugin.json index 39f01247a0..a0ea2b1f1e 100644 --- a/plugins/VersionUpgrade/VersionUpgrade44to45/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade44to45/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.0", "description": "Upgrades configurations from Cura 4.4 to Cura 4.5.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade45to46/plugin.json b/plugins/VersionUpgrade/VersionUpgrade45to46/plugin.json index 2276a1b09d..8a82a74487 100644 --- a/plugins/VersionUpgrade/VersionUpgrade45to46/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade45to46/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.0", "description": "Upgrades configurations from Cura 4.5 to Cura 4.6.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade460to462/plugin.json b/plugins/VersionUpgrade/VersionUpgrade460to462/plugin.json index 5dd4596f54..39947ee226 100644 --- a/plugins/VersionUpgrade/VersionUpgrade460to462/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade460to462/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.0", "description": "Upgrades configurations from Cura 4.6.0 to Cura 4.6.2.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade462to47/plugin.json b/plugins/VersionUpgrade/VersionUpgrade462to47/plugin.json index fa9a209e3a..5168912651 100644 --- a/plugins/VersionUpgrade/VersionUpgrade462to47/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade462to47/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.0", "description": "Upgrades configurations from Cura 4.6.2 to Cura 4.7.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade47to48/plugin.json b/plugins/VersionUpgrade/VersionUpgrade47to48/plugin.json index 674a25f8ad..908db388b9 100644 --- a/plugins/VersionUpgrade/VersionUpgrade47to48/plugin.json +++ b/plugins/VersionUpgrade/VersionUpgrade47to48/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.0", "description": "Upgrades configurations from Cura 4.7 to Cura 4.8.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade48to49/VersionUpgrade48to49.py b/plugins/VersionUpgrade/VersionUpgrade48to49/VersionUpgrade48to49.py new file mode 100644 index 0000000000..4595e66ed3 --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade48to49/VersionUpgrade48to49.py @@ -0,0 +1,119 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +import configparser +from typing import Tuple, List +import io +import json + +from UM.VersionUpgrade import VersionUpgrade +from cura.API import Account + + +class VersionUpgrade48to49(VersionUpgrade): + _moved_visibility_settings = ["top_bottom_extruder_nr", "top_bottom_thickness", "top_thickness", "top_layers", + "bottom_thickness", "bottom_layers", "ironing_enabled"] + + def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: + """ + Upgrades preferences to have the new version number. + :param serialized: The original contents of the preferences file. + :param filename: The file name of the preferences file. + :return: A list of new file names, and a list of the new contents for + those files. + """ + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialized) + + # Update version number. + parser["general"]["version"] = "7" + + # Update visibility settings to include new top_bottom category + parser["general"]["visible_settings"] += ";top_bottom" + + if "categories_expanded" in parser["cura"] and any([setting in parser["cura"]["categories_expanded"] for setting in self._moved_visibility_settings]): + parser["cura"]["categories_expanded"] += ";top_bottom" + + # If the account scope in 4.8 is outdated, delete it so that the user is enforced to log in again and get the + # correct permissions. + if "ultimaker_auth_data" in parser["general"]: + ultimaker_auth_data = json.loads(parser["general"]["ultimaker_auth_data"]) + if set(Account.CLIENT_SCOPES.split(" ")) - set(ultimaker_auth_data["scope"].split(" ")): + parser["general"]["ultimaker_auth_data"] = "{}" + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] + + def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: + """ + Upgrades stacks to have the new version number. + + This updates the post-processing scripts with new parameters. + :param serialized: The original contents of the stack. + :param filename: The original file name of the stack. + :return: A list of new file names, and a list of the new contents for + those files. + """ + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialized) + + # Update version number. + if "general" not in parser: + parser["general"] = {} + parser["general"]["version"] = "5" + + # Update Display Progress on LCD script parameters if present. + if "post_processing_scripts" in parser["metadata"]: + new_scripts_entries = [] + for script_str in parser["metadata"]["post_processing_scripts"].split("\n"): + if not script_str: + continue + script_str = script_str.replace(r"\\\n", "\n").replace(r"\\\\", "\\\\") # Unescape escape sequences. + script_parser = configparser.ConfigParser(interpolation=None) + script_parser.optionxform = str # type: ignore # Don't transform the setting keys as they are case-sensitive. + script_parser.read_string(script_str) + + # Update Display Progress on LCD parameters. + script_id = script_parser.sections()[0] + if script_id == "DisplayProgressOnLCD": + script_parser[script_id]["time_remaining_method"] = "m117" if script_parser[script_id]["time_remaining"] == "True" else "none" + + script_io = io.StringIO() + script_parser.write(script_io) + script_str = script_io.getvalue() + script_str = script_str.replace("\\\\", r"\\\\").replace("\n", r"\\\n") # Escape newlines because configparser sees those as section delimiters. + new_scripts_entries.append(script_str) + parser["metadata"]["post_processing_scripts"] = "\n".join(new_scripts_entries) + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] + + def upgradeSettingVisibility(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: + """ + Upgrades setting visibility to have a version number and move moved settings to a different category + + :param serialized: The original contents of the stack. + :param filename: The original file name of the stack. + :return: A list of new file names, and a list of the new contents for + those files. + """ + parser = configparser.ConfigParser(interpolation = None, allow_no_value=True) + parser.read_string(serialized) + + # add version number for the first time + parser["general"]["version"] = "2" + + if "top_bottom" not in parser: + parser["top_bottom"] = {} + + if "shell" in parser: + for setting in parser["shell"]: + if setting in self._moved_visibility_settings: + parser["top_bottom"][setting] = None # type: ignore + del parser["shell"][setting] + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] diff --git a/plugins/VersionUpgrade/VersionUpgrade48to49/__init__.py b/plugins/VersionUpgrade/VersionUpgrade48to49/__init__.py new file mode 100644 index 0000000000..fd46dd8123 --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade48to49/__init__.py @@ -0,0 +1,44 @@ +# Copyright (c) 2020 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from typing import Any, Dict, TYPE_CHECKING + +from . import VersionUpgrade48to49 + +if TYPE_CHECKING: + from UM.Application import Application + +upgrade = VersionUpgrade48to49.VersionUpgrade48to49() + +def getMetaData() -> Dict[str, Any]: + return { + "version_upgrade": { + # From To Upgrade function + ("preferences", 6000016): ("preferences", 7000016, upgrade.upgradePreferences), + ("machine_stack", 4000016): ("machine_stack", 5000016, upgrade.upgradeStack), + ("extruder_train", 4000016): ("extruder_train", 5000016, upgrade.upgradeStack), + ("setting_visibility", 1000000): ("setting_visibility", 2000016, upgrade.upgradeSettingVisibility), + }, + "sources": { + "preferences": { + "get_version": upgrade.getCfgVersion, + "location": {"."} + }, + "machine_stack": { + "get_version": upgrade.getCfgVersion, + "location": {"./machine_instances"} + }, + "extruder_train": { + "get_version": upgrade.getCfgVersion, + "location": {"./extruders"} + }, + "setting_visibility": { + "get_version": upgrade.getCfgVersion, + "location": {"./setting_visibility"} + } + } + } + + +def register(app: "Application") -> Dict[str, Any]: + return {"version_upgrade": upgrade} diff --git a/plugins/VersionUpgrade/VersionUpgrade48to49/plugin.json b/plugins/VersionUpgrade/VersionUpgrade48to49/plugin.json new file mode 100644 index 0000000000..19de9f1e03 --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade48to49/plugin.json @@ -0,0 +1,8 @@ +{ + "name": "Version Upgrade 4.8 to 4.9", + "author": "Ultimaker B.V.", + "version": "1.0.0", + "description": "Upgrades configurations from Cura 4.8 to Cura 4.9.", + "api": 7, + "i18n-catalog": "cura" +} diff --git a/plugins/VersionUpgrade/VersionUpgrade49to410/VersionUpgrade49to410.py b/plugins/VersionUpgrade/VersionUpgrade49to410/VersionUpgrade49to410.py new file mode 100644 index 0000000000..7d9186e06b --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade49to410/VersionUpgrade49to410.py @@ -0,0 +1,178 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +import configparser +import io +import os.path # To get the file ID. +from typing import Dict, List, Tuple + +from UM.VersionUpgrade import VersionUpgrade + + +class VersionUpgrade49to410(VersionUpgrade): + """ + Upgrades configurations from the state they were in at version 4.9 to the state they should be in at version 4.10. + """ + + _renamed_profiles = { + # Definitions. + "twotrees_bluer" : "two_trees_bluer", + + # Upgrade for people who had the original TwoTrees Bluer profiles from 4.9 and earlier. + "twotrees_bluer_extruder_0": "two_trees_base_extruder_0", + "twotrees_bluer_extruder_1": "two_trees_base_extruder_0" + } + + _quality_changes_to_two_trees_base = { + "twotrees_bluer_extruder_0", + "twotrees_bluer_extruder_1", + "twotrees_bluer" + } + + # Default variant to select for legacy TwoTrees printers, now that we have variants. + _default_variants = { + "twotrees_bluer_extruder_0" : "two_trees_bluer_0.4", + "twotrees_bluer_extruder_1" : "two_trees_bluer_0.4" + } + + _two_trees_bluer_quality_type_conversion = { + "high" : "ultra", + "normal" : "super", + "fast" : "standard", + "draft" : "standard", + "extra_fast" : "low", + "coarse" : "draft", + "extra_coarse": "draft" + } + + _two_trees_quality_per_material = { + # Since legacy TwoTrees printers didn't have different variants, we always pick the 0.4mm variant. + "generic_abs_175" : { + "high" : "two_trees_0.4_ABS_super", + "normal" : "two_trees_0.4_ABS_super", + "fast" : "two_trees_0.4_ABS_super", + "draft" : "two_trees_0.4_ABS_standard", + "extra_fast" : "two_trees_0.4_ABS_low", + "coarse" : "two_trees_0.4_ABS_low", + "extra_coarse": "two_trees_0.4_ABS_low" + }, + "generic_petg_175": { + "high" : "two_trees_0.4_PETG_super", + "normal" : "two_trees_0.4_PETG_super", + "fast" : "two_trees_0.4_PETG_super", + "draft" : "two_trees_0.4_PETG_standard", + "extra_fast" : "two_trees_0.4_PETG_low", + "coarse" : "two_trees_0.4_PETG_low", + "extra_coarse": "two_trees_0.4_PETG_low" + }, + "generic_pla_175" : { + "high" : "two_trees_0.4_PLA_super", + "normal" : "two_trees_0.4_PLA_super", + "fast" : "two_trees_0.4_PLA_super", + "draft" : "two_trees_0.4_PLA_standard", + "extra_fast" : "two_trees_0.4_PLA_low", + "coarse" : "two_trees_0.4_PLA_low", + "extra_coarse": "two_trees_0.4_PLA_low" + }, + "generic_tpu_175" : { + "high" : "two_trees_0.4_TPU_super", + "normal" : "two_trees_0.4_TPU_super", + "fast" : "two_trees_0.4_TPU_super", + "draft" : "two_trees_0.4_TPU_standard", + "extra_fast" : "two_trees_0.4_TPU_standard", + "coarse" : "two_trees_0.4_TPU_standard", + "extra_coarse": "two_trees_0.4_TPU_standard" + }, + "empty_material" : { # For the global stack. + "high" : "two_trees_global_super", + "normal" : "two_trees_global_super", + "fast" : "two_trees_global_super", + "draft" : "two_trees_global_standard", + "extra_fast" : "two_trees_global_low", + "coarse" : "two_trees_global_low", + "extra_coarse": "two_trees_global_low" + } + } + + _deltacomb_quality_type_conversion = { + "a" : "D005", + "b" : "D010", + "c" : "D015", + "d" : "D020", + "e" : "D030", + "f" : "D045", + "g" : "D060" + } + + def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: + """Upgrades instance containers to have the new version number. + + This renames the renamed settings in the containers. + """ + parser = configparser.ConfigParser(interpolation = None, comment_prefixes = ()) + parser.read_string(serialized) + + # Update setting version number. + if "metadata" not in parser: + parser["metadata"] = {} + parser["metadata"]["setting_version"] = "17" + + if "general" not in parser: + parser["general"] = {} + # Certain instance containers (such as definition changes) reference to a certain definition container + # Since a number of those changed name, we also need to update those. + old_definition = parser.get("general", "definition", fallback = "") + if old_definition in self._renamed_profiles: + parser["general"]["definition"] = self._renamed_profiles[old_definition] + + # For quality-changes profiles made for TwoTrees Bluer printers, change the definition to the two_trees_base and make sure that the quality is something we have a profile for. + if parser.get("metadata", "type", fallback = "") == "quality_changes": + for possible_printer in self._quality_changes_to_two_trees_base: + if os.path.basename(filename).startswith(possible_printer + "_"): + parser["general"]["definition"] = "two_trees_base" + parser["metadata"]["quality_type"] = self._two_trees_bluer_quality_type_conversion.get(parser.get("metadata", "quality_type", fallback = "fast"), "standard") + break + + if os.path.basename(filename).startswith("deltacomb_"): + parser["general"]["definition"] = "deltacomb_base" + parser["metadata"]["quality_type"] = self._deltacomb_quality_type_conversion.get(parser.get("metadata", "quality_type", fallback = "c"), "D015") + break + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] + + def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: + """Upgrades stacks to have the new version number.""" + + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialized) + + # Update setting version number. + if "metadata" not in parser: + parser["metadata"] = {} + parser["metadata"]["setting_version"] = "17" + + # Change renamed profiles. + if "containers" in parser: + definition_id = parser["containers"]["7"] + if definition_id in self._quality_changes_to_two_trees_base: + material_id = parser["containers"]["4"] + old_quality_id = parser["containers"]["3"] + if parser["metadata"].get("type", "machine") == "extruder_train": + if parser["containers"]["5"] == "empty_variant": + if definition_id in self._default_variants: + parser["containers"]["5"] = self._default_variants[definition_id] # For legacy TwoTrees printers, change the variant to 0.4. + + # Also change the quality to go along with it. + if material_id in self._two_trees_quality_per_material and old_quality_id in self._two_trees_quality_per_material[material_id]: + parser["containers"]["3"] = self._two_trees_quality_per_material[material_id][old_quality_id] + stack_copy = {} # type: Dict[str, str] # Make a copy so that we don't modify the dict we're iterating over. + stack_copy.update(parser["containers"]) + for position, profile_id in stack_copy.items(): + if profile_id in self._renamed_profiles: + parser["containers"][position] = self._renamed_profiles[profile_id] + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] diff --git a/plugins/VersionUpgrade/VersionUpgrade49to410/__init__.py b/plugins/VersionUpgrade/VersionUpgrade49to410/__init__.py new file mode 100644 index 0000000000..0d5128473f --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade49to410/__init__.py @@ -0,0 +1,55 @@ +# Copyright (c) 2020 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from typing import Any, Dict, TYPE_CHECKING + +from . import VersionUpgrade49to410 + +if TYPE_CHECKING: + from UM.Application import Application + +upgrade = VersionUpgrade49to410.VersionUpgrade49to410() + + +def getMetaData() -> Dict[str, Any]: + return { + "version_upgrade": { + # From To Upgrade function + ("machine_stack", 5000016): ("machine_stack", 5000017, upgrade.upgradeStack), + ("extruder_train", 5000016): ("extruder_train", 5000017, upgrade.upgradeStack), + ("definition_changes", 4000016): ("definition_changes", 4000017, upgrade.upgradeInstanceContainer), + ("quality_changes", 4000016): ("quality_changes", 4000017, upgrade.upgradeInstanceContainer), + ("quality", 4000016): ("quality", 4000017, upgrade.upgradeInstanceContainer), + ("user", 4000016): ("user", 4000017, upgrade.upgradeInstanceContainer), + }, + "sources": { + "machine_stack": { + "get_version": upgrade.getCfgVersion, + "location": {"./machine_instances"} + }, + "extruder_train": { + "get_version": upgrade.getCfgVersion, + "location": {"./extruders"} + }, + "definition_changes": { + "get_version": upgrade.getCfgVersion, + "location": {"./definition_changes"} + }, + "quality_changes": { + "get_version": upgrade.getCfgVersion, + "location": {"./quality_changes"} + }, + "quality": { + "get_version": upgrade.getCfgVersion, + "location": {"./quality"} + }, + "user": { + "get_version": upgrade.getCfgVersion, + "location": {"./user"} + } + } + } + + +def register(app: "Application") -> Dict[str, Any]: + return {"version_upgrade": upgrade} diff --git a/plugins/VersionUpgrade/VersionUpgrade49to410/plugin.json b/plugins/VersionUpgrade/VersionUpgrade49to410/plugin.json new file mode 100644 index 0000000000..9a36c5989c --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade49to410/plugin.json @@ -0,0 +1,8 @@ +{ + "name": "Version Upgrade 4.9 to 4.10", + "author": "Ultimaker B.V.", + "version": "1.0.0", + "description": "Upgrades configurations from Cura 4.9 to Cura 4.10.", + "api": 7, + "i18n-catalog": "cura" +} diff --git a/plugins/X3DReader/plugin.json b/plugins/X3DReader/plugin.json index 3cbf193645..0ceaf4327c 100644 --- a/plugins/X3DReader/plugin.json +++ b/plugins/X3DReader/plugin.json @@ -3,6 +3,6 @@ "author": "Seva Alekseyev, Ultimaker B.V.", "version": "1.0.1", "description": "Provides support for reading X3D files.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/XRayView/plugin.json b/plugins/XRayView/plugin.json index 62592f1ceb..11a2556339 100644 --- a/plugins/XRayView/plugin.json +++ b/plugins/XRayView/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides the X-Ray view.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 70e702d0bf..ce0bb06d8d 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -151,7 +151,7 @@ class XmlMaterialProfile(InstanceContainer): "version": self.CurrentFdmMaterialVersion}) ## Begin Metadata Block - builder.start("metadata") # type: ignore + builder.start("metadata", {}) # type: ignore metadata = copy.deepcopy(self.getMetaData()) # setting_version is derived from the "version" tag in the schema, so don't serialize it into a file @@ -165,21 +165,21 @@ class XmlMaterialProfile(InstanceContainer): properties = metadata.pop("properties", {}) ## Begin Name Block - builder.start("name") # type: ignore + builder.start("name", {}) # type: ignore - builder.start("brand") # type: ignore + builder.start("brand", {}) # type: ignore builder.data(metadata.pop("brand", "")) builder.end("brand") - builder.start("material") # type: ignore + builder.start("material", {}) # type: ignore builder.data(metadata.pop("material", "")) builder.end("material") - builder.start("color") # type: ignore + builder.start("color", {}) # type: ignore builder.data(metadata.pop("color_name", "")) builder.end("color") - builder.start("label") # type: ignore + builder.start("label", {}) # type: ignore builder.data(self.getName()) builder.end("label") @@ -190,7 +190,7 @@ class XmlMaterialProfile(InstanceContainer): key_to_use = key if key in self._metadata_tags_that_have_cura_namespace: key_to_use = "cura:" + key_to_use - builder.start(key_to_use) # type: ignore + builder.start(key_to_use, {}) # type: ignore if value is not None: #Nones get handled well by the builder. #Otherwise the builder always expects a string. #Deserialize expects the stringified version. @@ -202,10 +202,10 @@ class XmlMaterialProfile(InstanceContainer): ## End Metadata Block ## Begin Properties Block - builder.start("properties") # type: ignore + builder.start("properties", {}) # type: ignore for key, value in properties.items(): - builder.start(key) # type: ignore + builder.start(key, {}) # type: ignore builder.data(value) builder.end(key) @@ -213,7 +213,7 @@ class XmlMaterialProfile(InstanceContainer): ## End Properties Block ## Begin Settings Block - builder.start("settings") # type: ignore + builder.start("settings", {}) # type: ignore if self.getMetaDataEntry("definition") == "fdmprinter": for instance in self.findInstances(): @@ -258,7 +258,7 @@ class XmlMaterialProfile(InstanceContainer): product = product_name break - builder.start("machine") # type: ignore + builder.start("machine", {}) # type: ignore builder.start("machine_identifier", { "manufacturer": container.getMetaDataEntry("machine_manufacturer", definition_metadata.get("manufacturer", "Unknown")), diff --git a/plugins/XmlMaterialProfile/plugin.json b/plugins/XmlMaterialProfile/plugin.json index 2c2b0590a2..75a42b8edc 100644 --- a/plugins/XmlMaterialProfile/plugin.json +++ b/plugins/XmlMaterialProfile/plugin.json @@ -3,6 +3,6 @@ "author": "Ultimaker B.V.", "version": "1.0.1", "description": "Provides capabilities to read and write XML-based material profiles.", - "api": "7.4.0", + "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/XmlMaterialProfile/tests/TestXmlMaterialProfile.py b/plugins/XmlMaterialProfile/tests/TestXmlMaterialProfile.py index 651fd5a985..05986dc033 100644 --- a/plugins/XmlMaterialProfile/tests/TestXmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/tests/TestXmlMaterialProfile.py @@ -1,9 +1,5 @@ from unittest.mock import patch, MagicMock -# Prevents error: "PyCapsule_GetPointer called with incorrect name" with conflicting SIP configurations between Arcus and PyQt: Import custom Sip bindings first! -import Savitar # Dont remove this line -import Arcus # No really. Don't. It needs to be there! -import pynest2d # Really! from UM.Qt.QtApplication import QtApplication # QtApplication import is required, even though it isn't used. import pytest diff --git a/requirements.txt b/requirements.txt index b13e160868..59cfd3eccd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,18 @@ +cffi==1.14.1 colorlog +cryptography==3.4.6 +importlib-metadata==3.7.2 mypy==0.740 -PyQt5==5.10 -numpy==1.15.4 -scipy==1.2.0 -shapely[vectorized]==1.6.4.post2 +numpy==1.20.2 +PyQt5==5.15.2 +PyQt5-sip==12.8.1 +scipy==1.6.1 +shapely[vectorized]==1.7.1 +twisted==21.2.0 +typing appdirs==1.4.3 certifi==2019.11.28 -cffi==1.13.1 chardet==3.0.4 -cryptography==2.8 decorator==4.4.0 idna==2.8 netifaces==0.10.9 @@ -26,9 +30,8 @@ requests==2.22.0 sentry-sdk==0.13.5 six==1.12.0 trimesh==3.2.33 -typing==3.7.4 -twisted==19.10.0 urllib3==1.25.6 -PyYAML==5.1.2 zeroconf==0.24.1 comtypes==1.1.7 +pywin32==300 +keyring==23.0.1 diff --git a/resources/README_resources.txt b/resources/README_resources.txt new file mode 100644 index 0000000000..17124bc0d5 --- /dev/null +++ b/resources/README_resources.txt @@ -0,0 +1,11 @@ +This is the folder for _bundled_ resources. If you place, or tinker with, +any resources here, they will not be seen or upgraded by next versions of Cura. + +If you want your (unbundled or altered) resources to work after an upgrade, +please don't put them here, but install them either; + - for materials: via the Marketplace (recommended if avialable), + - by dragging a `.curapackage` file onto Cura, + - or place it in the right sub-folder in the configuration folder* for Cura. + +*) The configuration folder can be found by: + Open up Help -> Show Configuration Folder diff --git a/resources/bundled_packages/cura.json b/resources/bundled_packages/cura.json index 6e191a1665..42f4b12a0b 100644 --- a/resources/bundled_packages/cura.json +++ b/resources/bundled_packages/cura.json @@ -6,7 +6,7 @@ "display_name": "3MF Reader", "description": "Provides support for reading 3MF files.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -23,7 +23,7 @@ "display_name": "3MF Writer", "description": "Provides support for writing 3MF files.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -40,7 +40,7 @@ "display_name": "AMF Reader", "description": "Provides support for reading AMF files.", "package_version": "1.0.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "fieldOfView", @@ -57,7 +57,7 @@ "display_name": "Cura Backups", "description": "Backup and restore your configuration.", "package_version": "1.2.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -74,7 +74,7 @@ "display_name": "CuraEngine Backend", "description": "Provides the link to the CuraEngine slicing backend.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -91,7 +91,7 @@ "display_name": "Cura Profile Reader", "description": "Provides support for importing Cura profiles.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -108,7 +108,24 @@ "display_name": "Cura Profile Writer", "description": "Provides support for exporting Cura profiles.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", + "website": "https://ultimaker.com", + "author": { + "author_id": "UltimakerPackages", + "display_name": "Ultimaker B.V.", + "email": "plugins@ultimaker.com", + "website": "https://ultimaker.com" + } + } + }, + "DigitalLibrary": { + "package_info": { + "package_id": "DigitalLibrary", + "package_type": "plugin", + "display_name": "Ultimaker Digital Library", + "description": "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library.", + "package_version": "1.0.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -125,7 +142,7 @@ "display_name": "Firmware Update Checker", "description": "Checks for firmware updates.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -142,7 +159,7 @@ "display_name": "Firmware Updater", "description": "Provides a machine actions for updating firmware.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -159,7 +176,7 @@ "display_name": "Compressed G-code Reader", "description": "Reads g-code from a compressed archive.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -176,7 +193,7 @@ "display_name": "Compressed G-code Writer", "description": "Writes g-code to a compressed archive.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -193,7 +210,7 @@ "display_name": "G-Code Profile Reader", "description": "Provides support for importing profiles from g-code files.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -210,7 +227,7 @@ "display_name": "G-Code Reader", "description": "Allows loading and displaying G-code files.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "VictorLarchenko", @@ -227,7 +244,7 @@ "display_name": "G-Code Writer", "description": "Writes g-code to a file.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -244,7 +261,7 @@ "display_name": "Image Reader", "description": "Enables ability to generate printable geometry from 2D image files.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -261,7 +278,7 @@ "display_name": "Legacy Cura Profile Reader", "description": "Provides support for importing profiles from legacy Cura versions.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -278,7 +295,7 @@ "display_name": "Machine Settings Action", "description": "Provides a way to change machine settings (such as build volume, nozzle size, etc.).", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "fieldOfView", @@ -295,7 +312,7 @@ "display_name": "Model Checker", "description": "Checks models and print configuration for possible printing issues and give suggestions.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -312,7 +329,7 @@ "display_name": "Monitor Stage", "description": "Provides a monitor stage in Cura.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -329,7 +346,7 @@ "display_name": "Per-Object Settings Tool", "description": "Provides the per-model settings.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -346,7 +363,7 @@ "display_name": "Post Processing", "description": "Extension that allows for user created scripts for post processing.", "package_version": "2.2.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -363,7 +380,7 @@ "display_name": "Prepare Stage", "description": "Provides a prepare stage in Cura.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -380,7 +397,7 @@ "display_name": "Preview Stage", "description": "Provides a preview stage in Cura.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -397,7 +414,7 @@ "display_name": "Removable Drive Output Device", "description": "Provides removable drive hotplugging and writing support.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -414,7 +431,7 @@ "display_name": "Sentry Logger", "description": "Logs certain events so that they can be used by the crash reporter", "package_version": "1.0.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -431,7 +448,7 @@ "display_name": "Simulation View", "description": "Provides the Simulation view.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -448,7 +465,7 @@ "display_name": "Slice Info", "description": "Submits anonymous slice info. Can be disabled through preferences.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -465,7 +482,7 @@ "display_name": "Solid View", "description": "Provides a normal solid mesh view.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -482,7 +499,7 @@ "display_name": "Support Eraser Tool", "description": "Creates an eraser mesh to block the printing of support in certain places.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -499,7 +516,7 @@ "display_name": "Trimesh Reader", "description": "Provides support for reading model files.", "package_version": "1.0.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -516,7 +533,7 @@ "display_name": "Toolbox", "description": "Find, manage and install new Cura packages.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -533,7 +550,7 @@ "display_name": "UFP Reader", "description": "Provides support for reading Ultimaker Format Packages.", "package_version": "1.0.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -550,7 +567,7 @@ "display_name": "UFP Writer", "description": "Provides support for writing Ultimaker Format Packages.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -567,7 +584,7 @@ "display_name": "Ultimaker Machine Actions", "description": "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.).", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -584,7 +601,7 @@ "display_name": "UM3 Network Printing", "description": "Manages network connections to Ultimaker 3 printers.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -601,7 +618,7 @@ "display_name": "USB Printing", "description": "Accepts G-Code and sends them to a printer. Plugin can also update firmware.", "package_version": "1.0.2", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -618,7 +635,7 @@ "display_name": "Version Upgrade 2.1 to 2.2", "description": "Upgrades configurations from Cura 2.1 to Cura 2.2.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -635,7 +652,7 @@ "display_name": "Version Upgrade 2.2 to 2.4", "description": "Upgrades configurations from Cura 2.2 to Cura 2.4.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -652,7 +669,7 @@ "display_name": "Version Upgrade 2.5 to 2.6", "description": "Upgrades configurations from Cura 2.5 to Cura 2.6.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -669,7 +686,7 @@ "display_name": "Version Upgrade 2.6 to 2.7", "description": "Upgrades configurations from Cura 2.6 to Cura 2.7.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -686,7 +703,7 @@ "display_name": "Version Upgrade 2.7 to 3.0", "description": "Upgrades configurations from Cura 2.7 to Cura 3.0.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -703,7 +720,7 @@ "display_name": "Version Upgrade 3.0 to 3.1", "description": "Upgrades configurations from Cura 3.0 to Cura 3.1.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -720,7 +737,7 @@ "display_name": "Version Upgrade 3.2 to 3.3", "description": "Upgrades configurations from Cura 3.2 to Cura 3.3.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -737,7 +754,7 @@ "display_name": "Version Upgrade 3.3 to 3.4", "description": "Upgrades configurations from Cura 3.3 to Cura 3.4.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -754,7 +771,7 @@ "display_name": "Version Upgrade 3.4 to 3.5", "description": "Upgrades configurations from Cura 3.4 to Cura 3.5.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -771,7 +788,7 @@ "display_name": "Version Upgrade 3.5 to 4.0", "description": "Upgrades configurations from Cura 3.5 to Cura 4.0.", "package_version": "1.0.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -788,7 +805,7 @@ "display_name": "Version Upgrade 4.0 to 4.1", "description": "Upgrades configurations from Cura 4.0 to Cura 4.1.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -805,7 +822,7 @@ "display_name": "Version Upgrade 4.1 to 4.2", "description": "Upgrades configurations from Cura 4.1 to Cura 4.2.", "package_version": "1.0.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -822,7 +839,7 @@ "display_name": "Version Upgrade 4.2 to 4.3", "description": "Upgrades configurations from Cura 4.2 to Cura 4.3.", "package_version": "1.0.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -839,7 +856,7 @@ "display_name": "Version Upgrade 4.3 to 4.4", "description": "Upgrades configurations from Cura 4.3 to Cura 4.4.", "package_version": "1.0.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -856,7 +873,7 @@ "display_name": "Version Upgrade 4.4 to 4.5", "description": "Upgrades configurations from Cura 4.4 to Cura 4.5.", "package_version": "1.0.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -873,7 +890,7 @@ "display_name": "Version Upgrade 4.5 to 4.6", "description": "Upgrades configurations from Cura 4.5 to Cura 4.6.", "package_version": "1.0.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -890,7 +907,7 @@ "display_name": "Version Upgrade 4.6.0 to 4.6.2", "description": "Upgrades configurations from Cura 4.6.0 to Cura 4.6.2.", "package_version": "1.0.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -907,7 +924,59 @@ "display_name": "Version Upgrade 4.6.2 to 4.7", "description": "Upgrades configurations from Cura 4.6.2 to Cura 4.7.", "package_version": "1.0.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", + "website": "https://ultimaker.com", + "author": { + "author_id": "UltimakerPackages", + "display_name": "Ultimaker B.V.", + "email": "plugins@ultimaker.com", + "website": "https://ultimaker.com" + } + } + }, + "VersionUpgrade47to48": { + "package_info": { + "package_id": "VersionUpgrade47to48", + "package_type": "plugin", + "display_name": "Version Upgrade 4.7.0 to 4.8.0", + "description": "Upgrades configurations from Cura 4.7.0 to Cura 4.8.0", + "package_version": "1.0.0", + "sdk_version": "7.6.0", + "website": "https://ultimaker.com", + "author": { + "author_id": "UltimakerPackages", + "display_name": "Ultimaker B.V.", + "email": "plugins@ultimaker.com", + "website": "https://ultimaker.com" + } + } + }, + "VersionUpgrade48to49": { + "package_info": { + "package_id": "VersionUpgrade48to49", + "package_type": "plugin", + "display_name": "Version Upgrade 4.8.0 to 4.9.0", + "description": "Upgrades configurations from Cura 4.8.0 to Cura 4.9.0", + "package_version": "1.0.0", + "sdk_version": "7.6.0", + "website": "https://ultimaker.com", + "author": { + "author_id": "UltimakerPackages", + "display_name": "Ultimaker B.V.", + "email": "plugins@ultimaker.com", + "website": "https://ultimaker.com" + } + } + }, + "VersionUpgrade49to410": { + "package_info": { + "package_id": "VersionUpgrade49to410", + "package_type": "plugin", + "display_name": "Version Upgrade 4.9 to 4.10", + "description": "Upgrades configurations from Cura 4.9 to Cura 4.10", + "package_version": "1.0.0", + "sdk_version": 7, + "sdk_version_semver": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -924,7 +993,7 @@ "display_name": "X3D Reader", "description": "Provides support for reading X3D files.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "SevaAlekseyev", @@ -941,7 +1010,7 @@ "display_name": "XML Material Profiles", "description": "Provides capabilities to read and write XML-based material profiles.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -958,7 +1027,7 @@ "display_name": "X-Ray View", "description": "Provides the X-Ray view.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com", "author": { "author_id": "UltimakerPackages", @@ -975,7 +1044,7 @@ "display_name": "Generic ABS", "description": "The generic ABS profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -993,7 +1062,7 @@ "display_name": "Generic BAM", "description": "The generic BAM profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1011,7 +1080,7 @@ "display_name": "Generic CFF CPE", "description": "The generic CFF CPE profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1029,7 +1098,7 @@ "display_name": "Generic CFF PA", "description": "The generic CFF PA profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1047,7 +1116,7 @@ "display_name": "Generic CPE", "description": "The generic CPE profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1065,7 +1134,7 @@ "display_name": "Generic CPE+", "description": "The generic CPE+ profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1083,7 +1152,7 @@ "display_name": "Generic GFF CPE", "description": "The generic GFF CPE profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1101,7 +1170,7 @@ "display_name": "Generic GFF PA", "description": "The generic GFF PA profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1119,7 +1188,7 @@ "display_name": "Generic HIPS", "description": "The generic HIPS profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1137,7 +1206,7 @@ "display_name": "Generic Nylon", "description": "The generic Nylon profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1155,7 +1224,7 @@ "display_name": "Generic PC", "description": "The generic PC profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1173,7 +1242,7 @@ "display_name": "Generic PETG", "description": "The generic PETG profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1191,7 +1260,7 @@ "display_name": "Generic PLA", "description": "The generic PLA profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1209,7 +1278,7 @@ "display_name": "Generic PP", "description": "The generic PP profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1227,7 +1296,7 @@ "display_name": "Generic PVA", "description": "The generic PVA profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1245,7 +1314,7 @@ "display_name": "Generic Tough PLA", "description": "The generic Tough PLA profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1263,7 +1332,7 @@ "display_name": "Generic TPU", "description": "The generic TPU profile which other profiles can be based upon.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://github.com/Ultimaker/fdm_materials", "author": { "author_id": "Generic", @@ -1281,7 +1350,7 @@ "display_name": "Dagoma Chromatik PLA", "description": "Filament testé et approuvé pour les imprimantes 3D Dagoma. Chromatik est l'idéal pour débuter et suivre les tutoriels premiers pas. Il vous offre qualité et résistance pour chacune de vos impressions.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://dagoma.fr/boutique/filaments.html", "author": { "author_id": "Dagoma", @@ -1298,7 +1367,7 @@ "display_name": "FABtotum ABS", "description": "This material is easy to be extruded but it is not the simplest to use. It is one of the most used in 3D printing to get very well finished objects. It is not sustainable and its smoke can be dangerous if inhaled. The reason to prefer this filament to PLA is mainly because of its precision and mechanical specs. ABS (for plastic) stands for Acrylonitrile Butadiene Styrene and it is a thermoplastic which is widely used in everyday objects. It can be printed with any FFF 3D printer which can get to high temperatures as it must be extruded in a range between 220° and 245°, so it’s compatible with all versions of the FABtotum Personal fabricator.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=40", "author": { "author_id": "FABtotum", @@ -1315,7 +1384,7 @@ "display_name": "FABtotum Nylon", "description": "When 3D printing started this material was not listed among the extrudable filaments. It is flexible as well as resistant to tractions. It is well known for its uses in textile but also in industries which require a strong and flexible material. There are different kinds of Nylon: 3D printing mostly uses Nylon 6 and Nylon 6.6, which are the most common. It requires higher temperatures to be printed, so a 3D printer must be able to reach them (around 240°C): the FABtotum, of course, can.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=53", "author": { "author_id": "FABtotum", @@ -1332,7 +1401,7 @@ "display_name": "FABtotum PLA", "description": "It is the most common filament used for 3D printing. It is studied to be bio-degradable as it comes from corn starch’s sugar mainly. It is completely made of renewable sources and has no footprint on polluting. PLA stands for PolyLactic Acid and it is a thermoplastic that today is still considered the easiest material to be 3D printed. It can be extruded at lower temperatures: the standard range of FABtotum’s one is between 185° and 195°.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=39", "author": { "author_id": "FABtotum", @@ -1349,7 +1418,7 @@ "display_name": "FABtotum TPU Shore 98A", "description": "", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://store.fabtotum.com/eu/products/filaments.html?filament_type=66", "author": { "author_id": "FABtotum", @@ -1366,7 +1435,7 @@ "display_name": "Fiberlogy HD PLA", "description": "With our HD PLA you have many more options. You can use this material in two ways. Choose the one you like best. You can use it as a normal PLA and get prints characterized by a very good adhesion between the layers and high precision. You can also make your prints acquire similar properties to that of ABS – better impact resistance and high temperature resistance. All you need is an oven. Yes, an oven! By annealing our HD PLA in an oven, in accordance with the manual, you will avoid all the inconveniences of printing with ABS, such as unpleasant odour or hazardous fumes.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "http://fiberlogy.com/en/fiberlogy-filaments/filament-hd-pla/", "author": { "author_id": "Fiberlogy", @@ -1383,7 +1452,7 @@ "display_name": "Filo3D PLA", "description": "Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://dagoma.fr", "author": { "author_id": "Dagoma", @@ -1400,7 +1469,7 @@ "display_name": "IMADE3D JellyBOX PETG", "description": "", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "http://shop.imade3d.com/filament.html", "author": { "author_id": "IMADE3D", @@ -1417,7 +1486,7 @@ "display_name": "IMADE3D JellyBOX PLA", "description": "", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "http://shop.imade3d.com/filament.html", "author": { "author_id": "IMADE3D", @@ -1434,7 +1503,7 @@ "display_name": "Octofiber PLA", "description": "PLA material from Octofiber.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://nl.octofiber.com/3d-printing-filament/pla.html", "author": { "author_id": "Octofiber", @@ -1451,7 +1520,7 @@ "display_name": "PolyFlex™ PLA", "description": "PolyFlex™ is a highly flexible yet easy to print 3D printing material. Featuring good elasticity and a large strain-to- failure, PolyFlex™ opens up a completely new realm of applications.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "http://www.polymaker.com/shop/polyflex/", "author": { "author_id": "Polymaker", @@ -1468,7 +1537,7 @@ "display_name": "PolyMax™ PLA", "description": "PolyMax™ PLA is a 3D printing material with excellent mechanical properties and printing quality. PolyMax™ PLA has an impact resistance of up to nine times that of regular PLA, and better overall mechanical properties than ABS.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "http://www.polymaker.com/shop/polymax/", "author": { "author_id": "Polymaker", @@ -1485,7 +1554,7 @@ "display_name": "PolyPlus™ PLA True Colour", "description": "PolyPlus™ PLA is a premium PLA designed for all desktop FDM/FFF 3D printers. It is produced with our patented Jam-Free™ technology that ensures consistent extrusion and prevents jams.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "http://www.polymaker.com/shop/polyplus-true-colour/", "author": { "author_id": "Polymaker", @@ -1502,7 +1571,7 @@ "display_name": "PolyWood™ PLA", "description": "PolyWood™ is a wood mimic printing material that contains no actual wood ensuring a clean Jam-Free™ printing experience.", "package_version": "1.0.1", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "http://www.polymaker.com/shop/polywood/", "author": { "author_id": "Polymaker", @@ -1519,7 +1588,7 @@ "display_name": "Ultimaker ABS", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", @@ -1538,7 +1607,7 @@ "display_name": "Ultimaker Breakaway", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com/products/materials/breakaway", "author": { "author_id": "UltimakerPackages", @@ -1557,7 +1626,7 @@ "display_name": "Ultimaker CPE", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", @@ -1576,7 +1645,7 @@ "display_name": "Ultimaker CPE+", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com/products/materials/cpe", "author": { "author_id": "UltimakerPackages", @@ -1595,7 +1664,7 @@ "display_name": "Ultimaker Nylon", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", @@ -1614,7 +1683,7 @@ "display_name": "Ultimaker PC", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com/products/materials/pc", "author": { "author_id": "UltimakerPackages", @@ -1633,7 +1702,7 @@ "display_name": "Ultimaker PLA", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", @@ -1652,7 +1721,7 @@ "display_name": "Ultimaker PP", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com/products/materials/pp", "author": { "author_id": "UltimakerPackages", @@ -1671,7 +1740,7 @@ "display_name": "Ultimaker PVA", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com/products/materials/abs", "author": { "author_id": "UltimakerPackages", @@ -1690,7 +1759,7 @@ "display_name": "Ultimaker TPU 95A", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com/products/materials/tpu-95a", "author": { "author_id": "UltimakerPackages", @@ -1709,7 +1778,7 @@ "display_name": "Ultimaker Tough PLA", "description": "Example package for material and quality profiles for Ultimaker materials.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://ultimaker.com/products/materials/tough-pla", "author": { "author_id": "UltimakerPackages", @@ -1728,7 +1797,7 @@ "display_name": "Vertex Delta ABS", "description": "ABS material and quality files for the Delta Vertex K8800.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://vertex3dprinter.eu", "author": { "author_id": "Velleman", @@ -1745,7 +1814,7 @@ "display_name": "Vertex Delta PET", "description": "ABS material and quality files for the Delta Vertex K8800.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://vertex3dprinter.eu", "author": { "author_id": "Velleman", @@ -1762,7 +1831,7 @@ "display_name": "Vertex Delta PLA", "description": "ABS material and quality files for the Delta Vertex K8800.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://vertex3dprinter.eu", "author": { "author_id": "Velleman", @@ -1779,7 +1848,7 @@ "display_name": "Vertex Delta TPU", "description": "ABS material and quality files for the Delta Vertex K8800.", "package_version": "1.4.0", - "sdk_version": "7.4.0", + "sdk_version": "7.6.0", "website": "https://vertex3dprinter.eu", "author": { "author_id": "Velleman", @@ -1789,4 +1858,4 @@ } } } -} \ No newline at end of file +} diff --git a/resources/definitions/SV01.def.json b/resources/definitions/SV01.def.json index 02347a8e3b..439ced7d38 100644 --- a/resources/definitions/SV01.def.json +++ b/resources/definitions/SV01.def.json @@ -65,6 +65,6 @@ "retraction_speed": { "default_value": 50}, "adhesion_type": { "value": "'skirt'" }, "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" }, - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X0 Y240 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" } + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X0 Y240 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" } } -} \ No newline at end of file +} diff --git a/resources/definitions/SV03.def.json b/resources/definitions/SV03.def.json new file mode 100644 index 0000000000..5968a82c0d --- /dev/null +++ b/resources/definitions/SV03.def.json @@ -0,0 +1,70 @@ +{ + "version": 2, + "name": "Sovol-SV03", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Sovol", + "manufacturer": "Sovol 3D", + "file_formats": "text/x-gcode", + "has_variants": false, + "has_machine_quality": false, + "preferred_quality_type": "draft", + "machine_extruder_trains": { + "0": "SV03_extruder_0" + } + }, + + "overrides": { + "machine_name": { "default_value": "SV03" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_width": { "default_value": 350 }, + "machine_depth": { "default_value": 350 }, + "machine_height": { "default_value": 400 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_feedrate_e": { "value": 50 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_acceleration": { "value": 500 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_heated_bed": { "default_value": true }, + "material_diameter": { "default_value": 1.75 }, + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, + "jerk_print": { "value": 8 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "acceleration_enabled": { "value": false }, + "jerk_enabled": { "value": false }, + "speed_print": { "value": 50.0 } , + "speed_infill": { "value": "speed_print" }, + "skirt_brim_speed": { "value": "speed_layer_0" }, + "line_width": { "value": "machine_nozzle_size" }, + "optimize_wall_printing_order": { "value": "True" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_flow": { "value": 100 }, + "z_seam_type": { "value": "'back'" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, + "infill_sparse_density": { "value": "20" }, + "infill_pattern": { "value": "'lines'" }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "skin_overlap": { "value": 10.0 }, + "infill_wipe_dist": { "value": 0.0 }, + "wall_0_wipe_dist": { "value": 0.0 }, + "retraction_amount": { "default_value": 3}, + "retraction_speed": { "default_value": 50}, + "adhesion_type": { "value": "'skirt'" }, + "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nG29 ;Automatic Leveling\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" }, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X0 Y240 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" } + } +} diff --git a/resources/definitions/abax_pri3.def.json b/resources/definitions/abax_pri3.def.json index 8f0d1a97d8..914dc4d3e0 100644 --- a/resources/definitions/abax_pri3.def.json +++ b/resources/definitions/abax_pri3.def.json @@ -1,11 +1,11 @@ { - "name": "ABAX PRi3", + "name": "Abax PRi3", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "ABAX 3d Technologies", - "manufacturer": "ABAX 3d Technologies", + "author": "Abax 3D Technologies", + "manufacturer": "Abax 3D Technologies", "file_formats": "text/x-gcode", "machine_extruder_trains": { diff --git a/resources/definitions/abax_pri5.def.json b/resources/definitions/abax_pri5.def.json index 5730cc6e05..cb6566e08c 100644 --- a/resources/definitions/abax_pri5.def.json +++ b/resources/definitions/abax_pri5.def.json @@ -1,11 +1,11 @@ { - "name": "ABAX PRi5", + "name": "Abax PRi5", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "ABAX 3d Technologies", - "manufacturer": "ABAX 3d Technologies", + "author": "Abax 3D Technologies", + "manufacturer": "Abax 3D Technologies", "file_formats": "text/x-gcode", "machine_extruder_trains": { diff --git a/resources/definitions/abax_titan.def.json b/resources/definitions/abax_titan.def.json index dc5dd3b14f..0b22634e1f 100644 --- a/resources/definitions/abax_titan.def.json +++ b/resources/definitions/abax_titan.def.json @@ -1,11 +1,11 @@ { - "name": "ABAX Titan", + "name": "Abax Titan", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "ABAX 3d Technologies", - "manufacturer": "ABAX 3d Technologies", + "author": "Abax 3D Technologies", + "manufacturer": "Abax 3D Technologies", "file_formats": "text/x-gcode", "machine_extruder_trains": { diff --git a/resources/definitions/alya3dp.def.json b/resources/definitions/alya3dp.def.json index 4c220fb98b..f335285cfb 100644 --- a/resources/definitions/alya3dp.def.json +++ b/resources/definitions/alya3dp.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "ALYA", + "name": "Alya", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "ALYA", + "author": "Alya", "manufacturer": "Kati Hal ARGE", "file_formats": "text/x-gcode", "platform": "alya_platform.3mf", diff --git a/resources/definitions/alyanx3dp.def.json b/resources/definitions/alyanx3dp.def.json index 627b251706..76ce87445b 100644 --- a/resources/definitions/alyanx3dp.def.json +++ b/resources/definitions/alyanx3dp.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "ALYA NX", + "name": "Alya NX", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "ALYA", + "author": "Alya", "manufacturer": "Kati Hal ARGE", "file_formats": "text/x-gcode", "platform": "alya_nx_platform.3mf", diff --git a/resources/definitions/anet3d_a2_plus.def.json b/resources/definitions/anet3d_a2_plus.def.json index cad4492205..8c766577ac 100644 --- a/resources/definitions/anet3d_a2_plus.def.json +++ b/resources/definitions/anet3d_a2_plus.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Anet A2 PLUS", + "name": "Anet A2 Plus", "inherits": "anet3d", "metadata": { "visible": true, @@ -11,7 +11,7 @@ }, "overrides": { - "machine_name": { "default_value": "Anet A2 PLUS" }, + "machine_name": { "default_value": "Anet A2 Plus" }, "machine_width": { "default_value": 220 }, diff --git a/resources/definitions/anet3d_a8_plus.def.json b/resources/definitions/anet3d_a8_plus.def.json index 8e50f50663..baafd53710 100644 --- a/resources/definitions/anet3d_a8_plus.def.json +++ b/resources/definitions/anet3d_a8_plus.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Anet A8 PLUS", + "name": "Anet A8 Plus", "inherits": "anet3d", "metadata": { "visible": true, @@ -11,7 +11,7 @@ }, "overrides": { - "machine_name": { "default_value": "Anet A8 PLUS" }, + "machine_name": { "default_value": "Anet A8 Plus" }, "machine_width": { "default_value": 300 }, diff --git a/resources/definitions/anet3d_et4_pro.def.json b/resources/definitions/anet3d_et4_pro.def.json index 5a6b660044..47cd08f50f 100644 --- a/resources/definitions/anet3d_et4_pro.def.json +++ b/resources/definitions/anet3d_et4_pro.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Anet ET4 PRO", + "name": "Anet ET4 Pro", "inherits": "anet3d", "metadata": { "visible": true, @@ -11,7 +11,7 @@ }, "overrides": { - "machine_name": { "default_value": "Anet ET4 PRO" }, + "machine_name": { "default_value": "Anet ET4 Pro" }, "machine_width": { "default_value": 220 }, diff --git a/resources/definitions/anycubic_i3_mega_s.def.json b/resources/definitions/anycubic_i3_mega_s.def.json new file mode 100644 index 0000000000..a0e83627c4 --- /dev/null +++ b/resources/definitions/anycubic_i3_mega_s.def.json @@ -0,0 +1,144 @@ +{ + "version": 2, + "name": "Anycubic i3 Mega (S, Pro)", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Nils Hendrik Rottgardt", + "manufacturer": "Anycubic", + "file_formats": "text/x-gcode", + "platform": "anycubic_i3_mega_s_platform.3mf", + "has_materials": true, + "has_variants": false, + "has_machine_quality": true, + "preferred_quality_type": "normal", + "machine_extruder_trains": + { + "0": "anycubic_i3_mega_s_extruder_0" + } + }, + + "overrides": + { + "machine_name": { "default_value": "Anycubic i3 Mega (S, Pro)" }, + "machine_heated_bed": { "default_value": true }, + "machine_width": { "default_value": 210 }, + "machine_height": { "default_value": 205 }, + "machine_depth": { "default_value": 210 }, + "machine_center_is_zero": { "default_value": false }, + "gantry_height": { "value": "0" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { "default_value": "G21 ; metric values \nG90 ; absolute positioning \nM82 ; set extruder to absolute mode \nM107 ; start with the fan off \nM140 S{material_bed_temperature_layer_0} ; Start heating the bed \nG4 S60 ; wait 1 minute \nM104 S{material_initial_print_temperature} ; start heating the hot end \nM190 S{material_bed_temperature_layer_0} ; wait for bed \nM109 S{material_initial_print_temperature} ; wait for hotend \nM300 S1000 P500 ; BEEP heating done \nG28 X0 Y10 Z0 ; move X/Y to min endstops \nM420 S1 ; Enable leveling \nM420 Z2.0 ; Set leveling fading height to 2 mm \nG0 Z0.15 ; lift nozzle a bit \nG92 E0 ; zero the extruded length \nG1 X50 E25 F500 ; Extrude 25mm of filament in a 5cm line. \nG92 E0 ; zero the extruded length again \nG1 E-2 F500 ; Retract a little \nG1 X120 F4000 ; Quickly wipe away from the filament line`" }, + "machine_end_gcode": { "default_value": "M104 S0 ; Extruder off \nM140 S0 ; Heatbed off \nM107 ; Fan off \nG91 ; relative positioning \nG1 E-5 F300 ; retract a little \nG1 Z+10 E-5 ; X-20 Y-20 F{travel_xy_speed} ; lift print head \nG28 X0 Y0 ; homing \nG1 Y180 F2000 ; reset feedrate \nM84 ; disable stepper motors \nG90 ; absolute positioning \nM300 S440 P200 ; Make Print Completed Tones \nM300 S660 P250 ; beep \nM300 S880 P300 ; beep" }, + + "machine_max_acceleration_x": { "value": 3000 }, + "machine_max_acceleration_y": { "value": 3000 }, + "machine_max_acceleration_z": { "value": 3000 }, + "machine_max_acceleration_e": { "value": 3000 }, + "machine_acceleration": { "value": 3000 }, + + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_max_jerk_e": { "value": 5 }, + + "material_diameter": { "default_value": 1.75 }, + + "acceleration_print": { "value": 1800 }, + "acceleration_travel": { "value": 3000 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, + + "jerk_print": { "value": 8 }, + "jerk_travel": { "value": 10 }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + + "acceleration_enabled": { "value": false }, + "jerk_enabled": { "value": true }, + + "speed_print": { "value": 50.0 } , + "speed_infill": { "value": "speed_print" }, + "speed_wall": { "value": "speed_print / 2" }, + "speed_wall_0": { "value": "speed_wall" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_topbottom": { "value": "speed_print / 2" }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_travel": { "value": 100.0, "maximum_value_warning": 150.0 }, + "speed_layer_0": { "value": 20.0 }, + "speed_print_layer_0": { "value": "speed_layer_0" }, + "speed_travel_layer_0": { "value": 100.0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + + "skirt_brim_speed": { "value": "speed_layer_0" }, + + "optimize_wall_printing_order": { "value": "True" }, + + "material_initial_print_temperature": { "value": "material_print_temperature + 10" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_flow": { "value": 100 }, + "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, + + "infill_sparse_density": { "value": 25 }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 15.0 }, + + + "retraction_speed": { "value": 25, "maximum_value": 40 }, + "retraction_retract_speed": { "maximum_value": 40 }, + "retraction_prime_speed": { "maximum_value": 40 }, + + "retraction_hop_enabled": { "value": true }, + "retraction_hop": { "value": 0.075 }, + "retraction_hop_only_when_collides": { "value": true }, + + "retraction_combing": { "value": "'off'" }, + "retraction_combing_max_distance": { "value": 30 }, + "travel_avoid_other_parts": { "value": true }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + + "retraction_amount": { "value": 6 }, + "retraction_enable": { "value": true }, + "retraction_min_travel": { "value": 1.5 }, + + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_fan_speed": { "value": 70 }, + "cool_fan_speed_0": { "value": 30 }, + + "cool_fan_enabled": { "value": true }, + "cool_min_layer_time": { "value": 10 }, + + "adhesion_type": { "value": "'none' if support_enable else 'skirt'" }, + "brim_replaces_support": { "value": false }, + "skirt_gap": { "value": 5.0 }, + "skirt_line_count": { "value": 4 }, + + "meshfix_maximum_deviation": { "value": 0.05 }, + + "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" }, + "support_pattern": { "value": "'zigzag'" }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_use_towers": { "value": false }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_wall_count": { "value": 1 }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 4 }, + + "support_interface_enable": { "value": true }, + "support_structure": { "value": "'tree'" }, + "support_type": { "value": "'buildplate' if support_structure == 'tree' else 'everywhere'" }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "minimum_support_area": { "value": 2 }, + "minimum_interface_area": { "value": 10 }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * math.floor(1.2 / layer_height)" }, + "wall_thickness": { "value": "line_width * 3" } + } +} diff --git a/resources/definitions/anycubic_i3_mega_x.def.json b/resources/definitions/anycubic_i3_mega_x.def.json new file mode 100644 index 0000000000..eb70c60c98 --- /dev/null +++ b/resources/definitions/anycubic_i3_mega_x.def.json @@ -0,0 +1,17 @@ +{ + "version": 2, + "name": "Anycubic i3 Mega X", + "inherits": "anycubic_i3_mega_s", + "metadata": + { + "quality_definition": "anycubic_i3_mega_s", + "platform": "anycubic_i3_mega_x_platform.stl" + }, + "overrides": + { + "machine_name": { "default_value": "Anycubic i3 Mega X" }, + "machine_width": { "default_value": 300 }, + "machine_height": { "default_value": 305 }, + "machine_depth": { "default_value": 300 } + } +} diff --git a/resources/definitions/anycubic_kossel_linear_plus.def.json b/resources/definitions/anycubic_kossel_linear_plus.def.json index a4aeac75a0..9683cf61cf 100644 --- a/resources/definitions/anycubic_kossel_linear_plus.def.json +++ b/resources/definitions/anycubic_kossel_linear_plus.def.json @@ -5,6 +5,7 @@ "metadata": { "visible": true, "platform": "kossel_pro_build_platform.3mf", + "platform_offset": [0, -0.25, 0], "machine_extruder_trains": { "0": "anycubic_kossel_extruder_0" } diff --git a/resources/definitions/anycubic_mega_zero.def.json b/resources/definitions/anycubic_mega_zero.def.json index a17fddc4b4..b0c3132858 100644 --- a/resources/definitions/anycubic_mega_zero.def.json +++ b/resources/definitions/anycubic_mega_zero.def.json @@ -59,7 +59,7 @@ }, "machine_end_gcode": { - "default_value": "M117 Cooling down...\nM104 S0 ; turn off extruder\nM84 ; disable motors\nM107 ; Fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;move X to min endstops, so the head is out of the way\nG90 ;Absolute positionning\nG1 Y200 F3000 ;Present print\nM84 ;steppers off\nM300 P300 S4000\nM117 Finished.\n" + "default_value": "M117 Cooling down...\nM104 S0 ; turn off extruder\nM84 ; disable motors\nM107 ; Fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;move X to min endstops, so the head is out of the way\nG90 ;Absolute positioning\nG1 Y200 F3000 ;Present print\nM84 ;steppers off\nM300 P300 S4000\nM117 Finished.\n" }, "machine_max_feedrate_x": { "value": 500 }, "machine_max_feedrate_y": { "value": 500 }, diff --git a/resources/definitions/arjun300.def.json b/resources/definitions/arjun300.def.json new file mode 100644 index 0000000000..94c1889fd3 --- /dev/null +++ b/resources/definitions/arjun300.def.json @@ -0,0 +1,52 @@ +{ + "version": 2, + "name": "Arjun 300", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Venkat Kamesh", + "manufacturer": "Sri Vignan Technologies", + "weight": 3, + "file_formats": "text/x-gcode", + "platform": "arjun300_platform.stl", + "platform_offset": [-155, -6, 190], + "has_material": true, + "has_variants": true, + "preferred_variant_name": "0.4 mm Nozzle", + "machine_extruder_trains": + { + "0": "arjun_extruder_0", + "1": "arjun_extruder_1" + } + }, + + "overrides": { + "machine_name": { "default_value": "Arjun 300" }, + "machine_width": { "default_value": 317 }, + "machine_height": { "default_value": 290 }, + "machine_depth": { "default_value": 310 }, + "machine_center_is_zero": {"default_value": false}, + "machine_heated_bed": { "default_value": true }, + "machine_nozzle_size": {"default_value": 0.4}, + "machine_show_variants": {"default_value": true}, + "machine_acceleration": {"default_value": 2000}, + "machine_max_feedrate_x": { "value": 300 }, + "machine_max_feedrate_y": { "value": 300 }, + "machine_max_feedrate_z": { "value": 15 }, + "machine_max_feedrate_e": { "value": 150 }, + "machine_use_extruder_offset_to_offset_coords": {"default_value": false}, + "line_width": {"value": "machine_nozzle_size"}, + "speed_travel": {"maximum_value": "300", "value": "200"}, + "optimize_wall_printing_order": { "value": "True" }, + "material_diameter": { "default_value": 1.75}, + "retraction_amount": {"default_value": 6.5}, + "retraction_speed": { "default_value": 30}, + + "adhesion_type": { "default_value": "skirt" }, + "machine_gcode_flavor": { "default_value": "Marlin"}, + "ironing_enabled":{"default_value": true}, + "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28\nG1 Z0.3 F150\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n"}, + "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84"}, + "machine_extruder_count": { "default_value": 2 } + } +} diff --git a/resources/definitions/arjun_duplication.def.json b/resources/definitions/arjun_duplication.def.json new file mode 100644 index 0000000000..d5a4b2ee72 --- /dev/null +++ b/resources/definitions/arjun_duplication.def.json @@ -0,0 +1,49 @@ +{ + "version": 2, + "name": "Arjun 300 Duplication", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Venkat Kamesh", + "manufacturer": "Sri Vignan Technologies", + "weight": 3, + "file_formats": "text/x-gcode", + "has_material": true, + "has_variants": true, + "preferred_variant_name": "0.4 mm Nozzle", + "machine_extruder_trains": + { + "0": "arjun_dm_extruder" + } + }, + + "overrides": { + "machine_name": { "default_value": "Arjun 300 Duplication" }, + "machine_width": { "default_value": 158.5 }, + "machine_height": { "default_value": 290 }, + "machine_depth": { "default_value": 310 }, + "machine_center_is_zero": {"default_value": false}, + "machine_heated_bed": { "default_value": true }, + "machine_nozzle_size": {"default_value": 0.4}, + "machine_show_variants": {"default_value": true}, + "machine_acceleration": {"default_value": 2000}, + "machine_max_feedrate_x": { "value": 300 }, + "machine_max_feedrate_y": { "value": 300 }, + "machine_max_feedrate_z": { "value": 15 }, + "machine_max_feedrate_e": { "value": 150 }, + "machine_use_extruder_offset_to_offset_coords": {"default_value": false}, + "line_width": {"value": "machine_nozzle_size"}, + "speed_travel": {"maximum_value": "300", "value": "200"}, + "optimize_wall_printing_order": { "value": "True" }, + "material_diameter": { "default_value": 1.75}, + "retraction_amount": {"default_value": 6.5}, + "retraction_speed": { "default_value": 30}, + + "adhesion_type": { "default_value": "skirt" }, + "machine_gcode_flavor": { "default_value": "Marlin"}, + "ironing_enabled":{"default_value": true}, + "machine_start_gcode": {"default_value": "M605 S2 R0 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n"}, + "machine_end_gcode": {"default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84"}, + "machine_extruder_count": { "default_value": 1 } + } +} diff --git a/resources/definitions/arjun_mirrored.def.json b/resources/definitions/arjun_mirrored.def.json new file mode 100644 index 0000000000..a4c0f3d3d1 --- /dev/null +++ b/resources/definitions/arjun_mirrored.def.json @@ -0,0 +1,49 @@ +{ + "version": 2, + "name": "Arjun 300 Mirror", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Venkat Kamesh", + "manufacturer": "Sri Vignan Technologies", + "weight": 3, + "file_formats": "text/x-gcode", + "has_material": true, + "has_variants": true, + "preferred_variant_name": "0.4 mm Nozzle", + "machine_extruder_trains": + { + "0": "arjun_mm_extruder" + } + }, + + "overrides": { + "machine_name": { "default_value": "Arjun 300 Mirror" }, + "machine_width": { "default_value": 158.5 }, + "machine_height": { "default_value": 290 }, + "machine_depth": { "default_value": 310 }, + "machine_center_is_zero": {"default_value": false}, + "machine_heated_bed": { "default_value": true }, + "machine_nozzle_size": {"default_value": 0.4}, + "machine_show_variants": {"default_value": true}, + "machine_acceleration": {"default_value": 2000}, + "machine_max_feedrate_x": { "value": 300 }, + "machine_max_feedrate_y": { "value": 300 }, + "machine_max_feedrate_z": { "value": 15 }, + "machine_max_feedrate_e": { "value": 150 }, + "machine_use_extruder_offset_to_offset_coords": {"default_value": false}, + "line_width": {"value": "machine_nozzle_size"}, + "speed_travel": {"maximum_value": "300", "value": "200"}, + "optimize_wall_printing_order": { "value": "True" }, + "material_diameter": { "default_value": 1.75}, + "retraction_amount": {"default_value": 6.5}, + "retraction_speed": { "default_value": 30}, + + "adhesion_type": { "default_value": "skirt" }, + "machine_gcode_flavor": { "default_value": "Marlin"}, + "ironing_enabled":{"default_value": true}, + "machine_start_gcode": {"default_value": "M605 S2 R0 X155\nM605 S3 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n"}, + "machine_end_gcode": {"default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84"}, + "machine_extruder_count": { "default_value": 1 } + } +} diff --git a/resources/definitions/atom2.def.json b/resources/definitions/atom2.def.json new file mode 100644 index 0000000000..d7a26546d8 --- /dev/null +++ b/resources/definitions/atom2.def.json @@ -0,0 +1,35 @@ +{ + "name": "Atom 2", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Victor (Yu Chieh) Lin", + "manufacturer": "Layer One", + "file_formats": "text/x-gcode", + "platform_offset": [0,0,0], + "machine_extruder_trains": { "0": "atom2_extruder_0" + } + }, + + "overrides": { + "machine_name": { "default_value": "Atom 2" }, + "machine_shape": { "default_value": "elliptic" }, + "machine_width": { "default_value": 210 }, + "machine_depth": { "default_value": 210 }, + "machine_height": { "default_value": 320 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": false }, + "machine_center_is_zero": { "default_value": true }, + + "machine_start_gcode": { "default_value": "G21\nG90 \nM107\nG28\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_end_gcode": { "default_value": "M104 S0\nG28\nG91\nG1 E-6 F300\nM84\nG90" }, + + "layer_height": { "default_value": 0.2 }, + "default_material_print_temperature": { "default_value": 210 }, + "speed_print": { "default_value": 32 }, + "optimize_wall_printing_order": { "value": "True" }, + "infill_sparse_density": { "default_value": 10 }, + "brim_width": { "default_value": 4 } + } +} diff --git a/resources/definitions/atom3.def.json b/resources/definitions/atom3.def.json new file mode 100644 index 0000000000..2483b81155 --- /dev/null +++ b/resources/definitions/atom3.def.json @@ -0,0 +1,159 @@ +{ + "version": 2, + "name": "Atom 3", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Daniel Kurth", + "manufacturer": "Layer One", + "platform_offset": [0, 0, 0], + "has_machine_quality": false, + "has_materials": true, + "preferred_material": "layer_one_dark_gray_pla", + "has_variants": true, + "preferred_variant_name": "PTFE hotend + 0.4mm brass nozzle", + "preferred_quality_type": "normal", + "variants_name": "Tool:", + "platform": "Atom 3 bed.3mf", + "machine_extruder_trains": + { + "0": "atom3_extruder_0" + } + }, + + + + + "overrides": { + + "machine_name": { "default_value": "Atom 3" }, + "machine_show_variants": { "default_value": true}, + "machine_shape": { "default_value": "elliptic" }, + "machine_width": { "default_value": 270}, + "machine_depth": { "default_value": 270}, + "machine_height": { "default_value": 340}, + "machine_center_is_zero": { "default_value": true}, + "machine_nozzle_head_distance": { "default_value": 6}, + "machine_head_with_fans_polygon": + { + "default_value":[ + [-23.82, 51.25], + [23.82, 51.25], + [56.292 , -5.00], + [32.476, -46.250], + [-32.476, -46.25], + [-56.292, -5.00] + ] + }, + "machine_gcode_flavor": { "RepRap (Marlin/Sprinter)": "Marlin" }, + "machine_heated_bed": { "default_value": true }, + "material_diameter": { "default_value": 1.75}, + "machine_start_gcode": { + "default_value": ";MACHINE START CODE\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;home\nG1 Z5 F9000\n;MACHINE START CODE" + }, + "machine_end_gcode": { + "default_value": ";MACHINE END CODE\nG91 ;relative positioning\nG1 E-1 F300 ;retract filament release pressure\nG1 Z+1.0 E-5 F9000 ;move up a and retract more\nG90 ;absolute positioning\nG28; home\nM84 ;steppers off\n;MACHINE END CODE" + }, + + + + + "layer_height": {"default_value": 0.2 }, + "layer_height_0": { + "default_value": 0.2, + "value": "layer_height" + }, + "line_width": { "value": "machine_nozzle_size"}, + "infill_line_width": { "value":"line_width"}, + "initial_layer_line_width_factor": { "default_value": 100}, + + + + + "top_bottom_thickness": { "default_value": 1.0}, + + + + + "infill_sparse_density": { "default_value": 17}, + "infill_before_walls": { "value": false}, + "zig_zaggify_infill": { "value": true}, + + + + + "default_material_print_temperature": { "default_value": 200 }, + "material_print_temperature_layer_0": { "value": "material_print_temperature + 0"}, + "material_initial_print_temperature": { "value": "material_print_temperature_layer_0"}, + "material_final_print_temperature": { "value": "material_print_temperature"}, + "default_material_bed_temperature": { + "default_value": 60, + "minimum_value": "0", + "minimum_value_warning": "build_volume_temperature", + "maximum_value_warning": "115", + "maximum_value": "120" + }, + "material_bed_temperature": + { + "value": "round(default_material_bed_temperature-((-0.202*default_material_bed_temperature)+7.16)) if default_material_bed_temperature > 40 else default_material_bed_temperature", + "minimum_value": "0", + "minimum_value_warning": "build_volume_temperature", + "maximum_value_warning": "115", + "maximum_value": "120" + }, + + + + + "speed_print": { "default_value": 40}, + "speed_wall": { "value": "speed_print * 0.75"}, + "speed_wall_0": { "value": "speed_print * 0.5"}, + "speed_wall_x": { "value": "speed_print * 0.75"}, + "speed_layer_0": { "value": "20"}, + "speed_slowdown_layers": { "default_value": 1}, + + + + + "retraction_amount": { + "default_value": 7, + "maximum_value_warning": 9 }, + "retraction_speed": { + "default_value": 70, + "maximum_value_warning": 80 + }, + "retraction_hop_enabled": { "default_value": true}, + "retraction_hop": { "default_value": 0.5}, + + + + + "cool_min_layer_time": { "default_value": 5}, + "cool_min_speed": { "default_value": 10}, + "cool_lift_head": { "default_value": false}, + + + + + "support_type": { "default_value": "everywhere"}, + "support_angle": { "default_value": 60}, + "support_z_distance": { "value": "layer_height"}, + "support_xy_distance_overhang":{"value": "machine_nozzle_size"}, + + + + + "adhesion_type": { "default_value": "skirt"}, + "skirt_brim_minimal_length": { + "default_value": 750, + "value": "60/(layer_height_0*line_width)", + "minimum_value": "0", + "minimum_value_warning": "25", + "maximum_value_warning": "4000" + }, + "skirt_gap": { + "default_value": "1`", + "value": "3*wall_line_width_0" + } + } +} \ No newline at end of file diff --git a/resources/definitions/atom3_lite.def.json b/resources/definitions/atom3_lite.def.json new file mode 100644 index 0000000000..69808e7ad3 --- /dev/null +++ b/resources/definitions/atom3_lite.def.json @@ -0,0 +1,62 @@ +{ + "version": 2, + "name": "Atom 3 Lite", + "inherits": "atom3", + "metadata": { + "author": "Daniel Kurth", + "manufacturer": "Layer One", + "platform_offset": [0, 0, 0], + "preferred_variant_name": "PTFE hotend + 0.4mm brass nozzle", + "platform": "Atom 3 lite bed.3mf" + }, + + + + + "overrides": { + "machine_head_with_fans_polygon": + { + "default_value": + [ + [-23.82, 41.25], + [23.82, 41.25], + [38.105, 16.5], + [57.631 , 16.5], + + [57.631 , -16.5], + [38.105, -16.5], + [23.82, -41.25], + [-23.82, -41.25], + + [-38.105, -16.5], + [-57.631 , -16.5], + [-57.631 , 16.5], + [-38.105, 16.5], + [-23.82, 41.25] + ] + }, + + + + + "retraction_amount": { "default_value": 7 }, + "retraction_speed": { + "default_value": 70, + "maximum_value_warning": "90" + }, + + + + + "cool_min_layer_time": { "default_value": 15}, + "cool_min_speed": { "default_value": 5}, + "cool_lift_head": { "default_value": false}, + + + + + "support_angle": { "default_value": 45} + } +} + + \ No newline at end of file diff --git a/resources/definitions/bibo2_dual.def.json b/resources/definitions/bibo2_dual.def.json index b9b1164e9d..dad08603aa 100644 --- a/resources/definitions/bibo2_dual.def.json +++ b/resources/definitions/bibo2_dual.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "BIBO2 dual", + "name": "Bibo 2 dual", "inherits": "fdmprinter", "metadata": { "visible": true, @@ -71,7 +71,7 @@ "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z2.0 F400 ;move the platform down 15mm\nT0\nG92 E0\nG28\nG1 Y0 F1200 E0\nG92 E0\nM117 BIBO Printing..." + "default_value": "M104 T0 165\nM104 T1 165\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z2.0 F400 ;move the platform down 2mm\nT0\nG92 E0\nG28\nG1 Y0 F1200 E0\nG92 E0\nT{initial_extruder_nr}\nM117 BIBO Printing..." }, "machine_end_gcode": { "default_value": ";End GCode\nM104 T0 S0 ;extruder heater off\nM104 T1 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91\nG1 Z1 F100 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-2 X-20 Y-20 F300 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" diff --git a/resources/definitions/biqu_b1.def.json b/resources/definitions/biqu_b1.def.json index 1ed42367bd..d60e229152 100755 --- a/resources/definitions/biqu_b1.def.json +++ b/resources/definitions/biqu_b1.def.json @@ -1,5 +1,5 @@ { - "name": "BIQU B1", + "name": "Biqu B1", "version": 2, "inherits": "biqu_base", "metadata": { diff --git a/resources/definitions/biqu_b1_abl.def.json b/resources/definitions/biqu_b1_abl.def.json index e43d50deeb..11876ae80b 100755 --- a/resources/definitions/biqu_b1_abl.def.json +++ b/resources/definitions/biqu_b1_abl.def.json @@ -1,5 +1,5 @@ { - "name": "BIQU B1 ABL", + "name": "Biqu B1 ABL", "version": 2, "inherits": "biqu_base", "metadata": { diff --git a/resources/definitions/biqu_base.def.json b/resources/definitions/biqu_base.def.json index 1077b864b8..29aa69ec54 100755 --- a/resources/definitions/biqu_base.def.json +++ b/resources/definitions/biqu_base.def.json @@ -5,7 +5,7 @@ "metadata": { "visible": false, "author": "Luke Harrison", - "manufacturer": "BIQU", + "manufacturer": "Biqu", "file_formats": "text/x-gcode", "first_start_actions": ["MachineSettingsAction"], @@ -25,7 +25,7 @@ "overrides": { "machine_name": { "default_value": "BIQU Base Printer" }, "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" }, - "machine_end_gcode": { "default_value": " ;BIQU Default End Gcode\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract a bit more and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z by 10mm\nG90 ;Return to absolute positionning\n\nG1 X0 Y{machine_depth} ;TaDaaaa\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, + "machine_end_gcode": { "default_value": " ;BIQU Default End Gcode\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract a bit more and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z by 10mm\nG90 ;Return to absolute positioning\n\nG1 X0 Y{machine_depth} ;TaDaaaa\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, "machine_max_feedrate_x": { "value": 500 }, "machine_max_feedrate_y": { "value": 500 }, @@ -85,8 +85,8 @@ "material_flow": { "value": 100 }, "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, - "z_seam_type": { "value": "'back'" }, - "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, + "z_seam_type": { "value": "'sharpest_corner'" }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, "infill_line_width": { "value": "line_width * 1.2" }, "infill_sparse_density": { "value": "20" }, @@ -156,7 +156,7 @@ "support_interface_enable": { "value": true }, "support_interface_height": { "value": "layer_height * 4" }, - "support_interface_density": { "value": 33.333 }, + "support_interface_density": { "value": 75 }, "support_interface_pattern": { "value": "'grid'" }, "support_interface_skip_height": { "value": 0.2 }, "minimum_support_area": { "value": 2 }, diff --git a/resources/definitions/biqu_bx_abl.def.json b/resources/definitions/biqu_bx_abl.def.json new file mode 100755 index 0000000000..3b6b60c2e4 --- /dev/null +++ b/resources/definitions/biqu_bx_abl.def.json @@ -0,0 +1,51 @@ +{ + "name": "Biqu BX", + "version": 2, + "inherits": "biqu_base", + "metadata": { + "quality_definition": "biqu_base", + "visible": true, + "has_machine_materials": true, + "platform": "BIQU_BX_PLATE.stl", + "platform_offset": [ + 7, + -7.4, + -3 + ] + }, + "overrides": { + "coasting_enable": { "value": false }, + "retraction_amount": { "value": 1 }, + "retraction_speed": { "value": 40 }, + "retraction_extrusion_window": { "value": 1 }, + "retract_at_layer_change": { "value": true }, + "support_enable": { "value": false }, + "support_structure": { "value": "'normal'" }, + "support_type": { "value": "'buildplate'" }, + "support_angle": { "value": 45 }, + "support_infill_rate": { "value": 15 }, + "infill_overlap": { "value": 15.0 }, + "skin_overlap": { "value": 20.0 }, + "fill_outline_gaps": { "value": true }, + "filter_out_tiny_gaps": { "value": true }, + "roofing_layer_count": { "value": 2 }, + "xy_offset_layer_0": { "value": -0.1 }, + "speed_print": { "value": 50 }, + "machine_name": { "default_value": "Biqu BX" }, + "machine_width": { "value": 250 }, + "machine_depth": { "value": 250 }, + "machine_height": { "value": 250 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-33, 35], + [-33, -23], + [33, -23], + [33, 35] + ] + }, + "machine_start_gcode": { + "default_value": "; BIQU BX Start G-code\r\n; For information on how to tune this profile and get the\r\n; most out of your BX visit: https:\/\/github.com\/looxonline\/Marlin\r\n; For the official github site visit: https:\/\/github.com\/bigtreetech\/BIQU-BX\r\n\r\nM117 Initial homing sequence. ; Home so that the probe is positioned to heat\r\nG28\r\n\r\nM117 Probe heating position\r\nG0 X65 Y5 Z1 ; Move the probe to the heating position.\r\n\r\nM117 Getting the heaters up to temp!\r\nM104 S140 ; Set Extruder temperature, no wait\r\nM140 S60 ; Set Heat Bed temperature\r\nM190 S60 ; Wait for Heat Bed temperature\r\n\r\nM117 Waiting for probe to warm! ; Wait another 90s for the probe to absorb heat.\r\nG4 S90 \r\n\r\nM117 Post warming re-home\r\nG28 ; Home all axes again after warming\r\n\r\nM117 Z-Dance of my people\r\nG34\r\n\r\nM117 ABL Probing\r\nG29\r\n\r\nM900 K0 L0 T0 ;Edit the K and L values if you have calibrated a k factor for your filament\r\nM900 T0 S0\r\n\r\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\r\nG1 X4.1 Y10 Z0.3 F5000.0 ; Move to start position\r\n\r\nM117 Getting the extruder up to temp\r\nM140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature\r\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\r\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\r\nM190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature\r\n\r\nG92 E0 ; Reset Extruder\r\nM117 Purging\r\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\r\nG1 X4.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\r\nG1 X4.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\r\nG92 E0 ; Reset Extruder\r\nM117 Lets make\r\nG1 X8 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" + }, + + "gantry_height": { "value": 27.5 } + } +} diff --git a/resources/definitions/blv_mgn_cube_300.def.json b/resources/definitions/blv_mgn_cube_300.def.json index 4754bb962d..c23eeb0598 100644 --- a/resources/definitions/blv_mgn_cube_300.def.json +++ b/resources/definitions/blv_mgn_cube_300.def.json @@ -1,10 +1,10 @@ { - "name": "BLV mgn Cube 300", + "name": "BLV MGN Cube 300", "version": 2, "inherits": "blv_mgn_cube_base", "metadata": { "visible": true, - "setting_version": 16, + "setting_version": 17, "author": "wolfgangmauer", "manufacturer": "BLV", "file_formats": "text/x-gcode", diff --git a/resources/definitions/blv_mgn_cube_350.def.json b/resources/definitions/blv_mgn_cube_350.def.json index 1c8a894af0..d0c4dcd9e6 100644 --- a/resources/definitions/blv_mgn_cube_350.def.json +++ b/resources/definitions/blv_mgn_cube_350.def.json @@ -1,10 +1,10 @@ { - "name": "BLV mgn Cube 350", + "name": "BLV MGN Cube 350", "version": 2, "inherits": "blv_mgn_cube_base", "metadata": { "visible": true, - "setting_version": 16, + "setting_version": 17, "author": "wolfgangmauer", "manufacturer": "BLV", "file_formats": "text/x-gcode", diff --git a/resources/definitions/blv_mgn_cube_base.def.json b/resources/definitions/blv_mgn_cube_base.def.json index 47b7d12f97..c97bd97063 100644 --- a/resources/definitions/blv_mgn_cube_base.def.json +++ b/resources/definitions/blv_mgn_cube_base.def.json @@ -1,5 +1,5 @@ { - "name": "BLV mgn Cube Base", + "name": "BLV MGN Cube Base", "version": 2, "inherits": "anet3d", "metadata": { diff --git a/resources/definitions/creality_base.def.json b/resources/definitions/creality_base.def.json index b56d2b7c06..ccf085bb11 100644 --- a/resources/definitions/creality_base.def.json +++ b/resources/definitions/creality_base.def.json @@ -1,5 +1,5 @@ { - "name": "Creawsome Base Printer", + "name": "Creality Base Printer", "version": 2, "inherits": "fdmprinter", "metadata": { @@ -125,7 +125,7 @@ "overrides": { "machine_name": { "default_value": "Creawsome Base Printer" }, "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" }, - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, "machine_max_feedrate_x": { "value": 500 }, "machine_max_feedrate_y": { "value": 500 }, diff --git a/resources/definitions/creality_ender4.def.json b/resources/definitions/creality_ender4.def.json index 9c13797c92..6fd02d879f 100644 --- a/resources/definitions/creality_ender4.def.json +++ b/resources/definitions/creality_ender4.def.json @@ -4,9 +4,9 @@ "inherits": "creality_base", "overrides": { "machine_name": { "default_value": "Creality Ender-4" }, - "machine_width": { "default_value": 452 }, - "machine_depth": { "default_value": 468 }, - "machine_height": { "default_value": 482 }, + "machine_width": { "default_value": 220 }, + "machine_depth": { "default_value": 220 }, + "machine_height": { "default_value": 300 }, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], @@ -24,4 +24,4 @@ "quality_definition": "creality_base", "visible": true } -} \ No newline at end of file +} diff --git a/resources/definitions/creality_ender5.def.json b/resources/definitions/creality_ender5.def.json index 1b4be4d71f..896f532c81 100644 --- a/resources/definitions/creality_ender5.def.json +++ b/resources/definitions/creality_ender5.def.json @@ -4,7 +4,7 @@ "inherits": "creality_base", "overrides": { "machine_name": { "default_value": "Creality Ender-5" }, - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, "machine_width": { "default_value": 220 }, "machine_depth": { "default_value": 220 }, "machine_height": { "default_value": 300 }, @@ -25,4 +25,4 @@ "quality_definition": "creality_base", "visible": true } -} \ No newline at end of file +} diff --git a/resources/definitions/creasee_cs20.def.json b/resources/definitions/creasee_cs20.def.json new file mode 100644 index 0000000000..ab30f3dd1c --- /dev/null +++ b/resources/definitions/creasee_cs20.def.json @@ -0,0 +1,32 @@ +{ + "version": 2, + "name": "Creasee CS20", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "manufacturer": "Creasee", + "machine_extruder_trains": + { + "0": "creasee_extruder_0" + } + }, + + "overrides": { + "machine_name": { "default_value": "Creasee CS20" }, + "machine_width": { + "default_value": 220 + }, + "machine_depth": { + "default_value": 220 + }, + "machine_height": { + "default_value": 250 + }, + "machine_start_gcode": { + "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" + }, + "machine_end_gcode": { + "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" + } + } +} diff --git a/resources/definitions/creasee_cs30.def.json b/resources/definitions/creasee_cs30.def.json new file mode 100644 index 0000000000..7d6a5090bb --- /dev/null +++ b/resources/definitions/creasee_cs30.def.json @@ -0,0 +1,32 @@ +{ + "version": 2, + "name": "Creasee CS30", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "manufacturer": "Creasee", + "machine_extruder_trains": + { + "0": "creasee_extruder_1" + } + }, + + "overrides": { + "machine_name": { "default_value": "Creasee CS30" }, + "machine_width": { + "default_value": 300 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_height": { + "default_value": 400 + }, + "machine_start_gcode": { + "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" + }, + "machine_end_gcode": { + "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" + } + } +} diff --git a/resources/definitions/cubicon_style_neo_a22.def.json b/resources/definitions/cubicon_style_neo_a22.def.json index 95d6b5e933..01763524a4 100644 --- a/resources/definitions/cubicon_style_neo_a22.def.json +++ b/resources/definitions/cubicon_style_neo_a22.def.json @@ -22,7 +22,7 @@ "default_value": "Cubicon Style Neo-A22" }, "machine_start_gcode": { - "default_value": "M911 Style Neo-A22\nM201 X400 Y400\nM202 X400 Y400\nG28 ; Home\nG1 Z15.0 F6000 ;move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" + "default_value": "M911 Style Neo-A22\nM201 X400 Y400\nM202 X400 Y400\nG28 ; Home\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" }, "machine_width": { "default_value": 220 diff --git a/resources/definitions/cubicon_style_neo_a31.def.json b/resources/definitions/cubicon_style_neo_a31.def.json new file mode 100644 index 0000000000..d41b6fc17e --- /dev/null +++ b/resources/definitions/cubicon_style_neo_a31.def.json @@ -0,0 +1,40 @@ +{ + "version": 2, + "name": "Cubicon Style Neo-A31", + "inherits": "cubicon_common", + "metadata": { + "author": "Cubicon R&D Center", + "manufacturer": "Cubicon", + "visible": true, + "file_formats": "text/x-gcode", + "supports_usb_connection": false, + "machine_extruder_trains": { + "0": "cubicon_style_neo_a31_extruder_0" + }, + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "Cubicon Style Neo-A31" + }, + "machine_start_gcode": { + "default_value": "M911 Style Neo-A31\nM201 X400 Y400\nM202 X400 Y400\nG28 ; Home\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" + }, + "machine_width": { + "default_value": 310 + }, + "machine_depth": { + "default_value": 310 + }, + "machine_height": { + "default_value": 310 + }, + "material_bed_temp_wait":{ + "default_value": false + } + } +} diff --git a/resources/definitions/cubicon_style_plus_a15.def.json b/resources/definitions/cubicon_style_plus_a15.def.json index a55d5aa791..b7e3dfd123 100644 --- a/resources/definitions/cubicon_style_plus_a15.def.json +++ b/resources/definitions/cubicon_style_plus_a15.def.json @@ -22,7 +22,7 @@ "default_value": "Cubicon Style Plus-A15" }, "machine_start_gcode": { - "default_value": "M911 Style Plus-A15\nM201 X400 Y400\nM202 X400 Y400\nG28 ; Home\nG1 Z15.0 F6000 ;move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" + "default_value": "M911 Style Plus-A15\nM201 X400 Y400\nM202 X400 Y400\nG28 ; Home\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" }, "machine_width": { "default_value": 150 diff --git a/resources/definitions/dagoma_disco.def.json b/resources/definitions/dagoma_disco.def.json index bf098b8b4a..89773d9c0e 100644 --- a/resources/definitions/dagoma_disco.def.json +++ b/resources/definitions/dagoma_disco.def.json @@ -73,6 +73,7 @@ "machine_steps_per_mm_x": { "default_value": 80 }, "machine_steps_per_mm_y": { "default_value": 80 }, "machine_steps_per_mm_z": { "default_value": 2560 }, - "machine_steps_per_mm_e": { "default_value": 98 } + "machine_steps_per_mm_e": { "default_value": 98 }, + "speed_z_hop": {"default_value": 4} } } diff --git a/resources/definitions/deltacomb_base.def.json b/resources/definitions/deltacomb_base.def.json old mode 100755 new mode 100644 index e1f66ee8df..254257036a --- a/resources/definitions/deltacomb_base.def.json +++ b/resources/definitions/deltacomb_base.def.json @@ -13,7 +13,7 @@ "has_variants": true, "variants_name": "Head", - "preferred_quality_type": "d", + "preferred_quality_type": "D020", "preferred_material": "generic_pla", "machine_extruder_trains": { @@ -29,7 +29,7 @@ "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": true }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { "default_value": ";---------------------------------------\n;Deltacomb start script\n;---------------------------------------\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG92 E0 ;zero the extruded length\nG1 Z15.0 F9000 ;move to the platform down 15mm\nG1 F9000\n\n;Put printing message on LCD screen\nM117 Printing...\n;---------------------------------------"}, + "machine_start_gcode": { "default_value": ";---------------------------------------\n;Deltacomb start script\n;---------------------------------------\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nM420 S1; Bed Level Enable\nG92 E0 ;zero the extruded length\nG1 Z15.0 F9000 ;move to the platform down 15mm\nG1 F9000\n\n;Put printing message on LCD screen\nM117 In stampa...\nM140 S{print_bed_temperature} ;set the target bed temperature\n;---------------------------------------"}, "machine_end_gcode": { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 F15000 X8.0 E-4.5 ;Wipe filament+material retraction\nG1 F15000 E4.0 Z1 ;Retraction compensation\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\n" }, "machine_shape": { "default_value": "elliptic" }, @@ -60,25 +60,32 @@ "jerk_infill": { "value": "10" }, "jerk_travel": { "value": "10" }, - "retraction_hop_enabled": { "default_value": true }, - "retraction_hop": { "default_value": 0.5 }, - "retraction_amount" : { "default_value": 3.5 }, - "retraction_speed" : { "default_value": 70 }, - "retraction_combing" : { "default_value": "noskin" }, - "travel_avoid_distance": { "value": "1" }, + "retraction_hop_enabled": { "default_value": true }, + "retraction_hop": { "default_value": 1.0 }, + "retraction_amount" : { "default_value": 3.5 }, + "retraction_speed" : { "default_value": 40 }, + "retraction_combing" : { "default_value": "noskin" }, + "travel_avoid_distance": { "value": "1" }, + "travel_avoid_supports": { "value": "True" }, + "retraction_hop_only_when_collides": { "value": "1" }, + + "switch_extruder_retraction_amount": { "value": 10}, + "switch_extruder_retraction_speeds": { "default_value": 70 }, "top_bottom_thickness": { "default_value": 0.8 }, "roofing_layer_count": { "value": "1" }, "roofing_line_width": { "value": "line_width * 0.75" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, "infill_sparse_density": { "default_value": 30 }, "infill_pattern": { "value": "'cubic'" }, "infill_before_walls": { "default_value": false }, - "support_z_distance": { "value": "layer_height * 2" }, + "support_z_distance": { "value": "layer_height" }, "support_bottom_distance": { "value": "layer_height" }, - "support_use_towers" : { "default_value": false }, - "support_bottom_enable" : { "value": "0" }, + "support_use_towers": { "default_value": false }, + "support_bottom_enable": { "value": false }, + "support_wall_count": { "value": "1" }, "skirt_brim_speed": { "value": "speed_layer_0" }, "skirt_line_count": { "default_value": 3 }, @@ -86,7 +93,8 @@ "brim_width": { "value": "3" }, "prime_tower_size": { "value": "math.sqrt(extruders_enabled_count * prime_tower_min_volume / layer_height / math.pi) * 2"}, - "prime_tower_position_x": { "value": "prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0)" }, + "prime_tower_brim_enable": { "value": false }, + "prime_tower_position_x": { "value": "prime_tower_size / 2" }, "prime_tower_position_y": { "value": "machine_depth / 2 - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" } } } diff --git a/resources/definitions/deltacomb_dc20.def.json b/resources/definitions/deltacomb_dc20.def.json old mode 100755 new mode 100644 diff --git a/resources/definitions/deltacomb_dc20dual.def.json b/resources/definitions/deltacomb_dc20dual.def.json old mode 100755 new mode 100644 index a78415331c..77b228fdc0 --- a/resources/definitions/deltacomb_dc20dual.def.json +++ b/resources/definitions/deltacomb_dc20dual.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Deltacomb DC-20 DUAL", + "name": "Deltacomb DC-20 Dual", "inherits": "deltacomb_base", "metadata": { @@ -19,6 +19,20 @@ "machine_extruder_count": { "default_value": 2, "maximum_value": "2" }, "machine_width": { "default_value": 190 }, "machine_depth": { "default_value": 190 }, - "machine_height": { "default_value": 250 } + "machine_height": { "default_value": 250 }, + "machine_disallowed_areas":{ "default_value": [ + [[ 53, 78], [ 63, 78], [ 73, 70], [ 62, 70]], + [[ 62, 70], [ 73, 70], [ 81, 61], [ 70, 61]], + [[ 70, 61], [ 81, 61], [ 88, 51], [ 76, 51]], + [[ 76, 51], [ 88, 51], [ 93, 40], [ 81, 40]], + [[ 81, 40], [ 93, 40], [ 97, 29], [ 85, 29]], + [[ 85, 29], [ 97, 29], [ 101, 17], [ 88, 17]], + [[-37, 78], [-47, 78], [-57, 70], [-46, 70]], + [[-46, 70], [-57, 70], [-69, 61], [-54, 61]], + [[-54, 61], [-69, 61], [-72, 51], [-60, 51]], + [[-60, 51], [-72, 51], [-77, 40], [-65, 40]], + [[-65, 40], [-77, 40], [-81, 29], [-69, 29]], + [[-69, 29], [-81, 29], [-85, 17], [-72, 17]] + ]} } } diff --git a/resources/definitions/deltacomb_dc20flux.def.json b/resources/definitions/deltacomb_dc20flux.def.json index fdd4f77942..fa6fdb0ca7 100644 --- a/resources/definitions/deltacomb_dc20flux.def.json +++ b/resources/definitions/deltacomb_dc20flux.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Deltacomb DC-20 FLUX", + "name": "Deltacomb DC-20 Flux", "inherits": "deltacomb_base", "metadata": { @@ -22,8 +22,12 @@ "machine_depth": { "default_value": 190 }, "machine_height": { "default_value": 250 }, "machine_extruder_count": { "default_value": 2, "maximum_value": "4" }, + "machine_end_gcode": { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 X8.0 E-10 F6000 ;wipe filament+material retraction\nG1 Z2 E9 ;Lift and start filament shaping\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG28 ;home all axes (max endstops)\nM84 ;steppers off" }, "switch_extruder_retraction_amount": { "value": "0" }, - "prime_tower_min_volume": { "value": "45" }, - "prime_tower_enable": { "value": "1" } + "prime_tower_min_volume": { "value": "50" }, + "prime_tower_enable": { "value": "1" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_standby_temperature": { "value": "material_print_temperature" } } } diff --git a/resources/definitions/deltacomb_dc21.def.json b/resources/definitions/deltacomb_dc21.def.json old mode 100755 new mode 100644 diff --git a/resources/definitions/deltacomb_dc21dual.def.json b/resources/definitions/deltacomb_dc21dual.def.json old mode 100755 new mode 100644 index d173888f7a..97cc057944 --- a/resources/definitions/deltacomb_dc21dual.def.json +++ b/resources/definitions/deltacomb_dc21dual.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Deltacomb DC-21 DUAL", + "name": "Deltacomb DC-21 Dual", "inherits": "deltacomb_base", "metadata": { diff --git a/resources/definitions/deltacomb_dc21flux.def.json b/resources/definitions/deltacomb_dc21flux.def.json index c6d20cb301..f2b7941518 100644 --- a/resources/definitions/deltacomb_dc21flux.def.json +++ b/resources/definitions/deltacomb_dc21flux.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Deltacomb DC-21 FLUX", + "name": "Deltacomb DC-21 Flux", "inherits": "deltacomb_base", "metadata": { @@ -17,13 +17,17 @@ }, "overrides": { - "machine_name": { "default_value": "Deltacomb DC-20 FLUX" }, + "machine_name": { "default_value": "Deltacomb DC-21 FLUX" }, "machine_width": { "default_value": 190 }, "machine_depth": { "default_value": 190 }, "machine_height": { "default_value": 400 }, "machine_extruder_count": { "default_value": 2, "maximum_value": "4" }, + "machine_end_gcode": { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 X8.0 E-10 F6000 ;wipe filament+material retraction\nG1 Z2 E9 ;Lift and start filament shaping\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG28 ;home all axes (max endstops)\nM84 ;steppers off" }, "switch_extruder_retraction_amount": { "value": "0" }, - "prime_tower_min_volume": { "value": "45" }, - "prime_tower_enable": { "value": "1" } + "prime_tower_min_volume": { "value": "50" }, + "prime_tower_enable": { "value": "1" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_standby_temperature": { "value": "material_print_temperature" } } -} +} \ No newline at end of file diff --git a/resources/definitions/deltacomb_dc30.def.json b/resources/definitions/deltacomb_dc30.def.json old mode 100755 new mode 100644 diff --git a/resources/definitions/deltacomb_dc30dual.def.json b/resources/definitions/deltacomb_dc30dual.def.json old mode 100755 new mode 100644 index 4ac2c185b7..97ad1bd102 --- a/resources/definitions/deltacomb_dc30dual.def.json +++ b/resources/definitions/deltacomb_dc30dual.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Deltacomb DC-30 DUAL", + "name": "Deltacomb DC-30 Dual", "inherits": "deltacomb_base", "metadata": { diff --git a/resources/definitions/deltacomb_dc30flux.def.json b/resources/definitions/deltacomb_dc30flux.def.json index 3b2148d9b8..6bf095701c 100644 --- a/resources/definitions/deltacomb_dc30flux.def.json +++ b/resources/definitions/deltacomb_dc30flux.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Deltacomb DC-30 FLUX", + "name": "Deltacomb DC-30 Flux", "inherits": "deltacomb_base", "metadata": { @@ -22,8 +22,12 @@ "machine_depth": { "default_value": 290 }, "machine_height": { "default_value": 300 }, "machine_extruder_count": { "default_value": 2, "maximum_value": "4" }, + "machine_end_gcode": { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 X8.0 E-10 F6000 ;wipe filament+material retraction\nG1 Z2 E9 ;Lift and start filament shaping\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG28 ;home all axes (max endstops)\nM84 ;steppers off" }, "switch_extruder_retraction_amount": { "value": "0" }, - "prime_tower_min_volume": { "value": "45" }, - "prime_tower_enable": { "value": "1" } + "prime_tower_min_volume": { "value": "50" }, + "prime_tower_enable": { "value": "1" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_standby_temperature": { "value": "material_print_temperature" } } } diff --git a/resources/definitions/diy220.def.json b/resources/definitions/diy220.def.json index 5527289f2e..5c3b26be02 100644 --- a/resources/definitions/diy220.def.json +++ b/resources/definitions/diy220.def.json @@ -8,12 +8,13 @@ "manufacturer": "Sri Vignan Technologies", "weight": 3, "file_formats": "text/x-gcode", - "platform": "ultimaker3_platform.obj", + "platform": "diy220_platform.obj", + "platform_texture": "svtbacktext.png", "platform_offset": [0, 0, 0], "has_materials": true, "has_variants": true, - "preferred_variant_name": "0.4 mm", + "preferred_variant_name": "0.4 mm Nozzle", "machine_extruder_trains": { "0": "diy220_extruder_0" @@ -21,12 +22,14 @@ }, "overrides": { "machine_name": { "default_value": "Diytech 220" }, - "machine_start_gcode" : { - "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nG28 Z0 ;move Z to bottom endstops\\nG28 X0 Y0 ;move X/Y to endstops\\nG1 X15 Y0 F4000 ;move X/Y to front of printer\\nG1 Z15.0 F9000 ;move the platform to 15mm\\nG92 E0 ;zero the extruded length\\nG1 F200 E50 ;extrude 10 mm of feed stock\\nG92 E0 ;zero the extruded length again\\nG1 F9000\\n;Put printing message on LCD screen\\nM117 Printing...\"" - }, - "machine_end_gcode" : { - "value": "\";Version _2.6 of the firmware can abort the print too early if the file ends\\n;too soon. However if the file hasn't ended yet because there are comments at\\n;the end of the file, it won't abort yet. Therefore we have to put at least 512\\n;bytes at the end of the g-code so that the file is not yet finished by the\\n;time that the motion planner gets flushed. With firmware version _3.3 this\\n;should be fixed, so this comment wouldn't be necessary any more. Now we have\\n;to pad this text to make precisely 512 bytes.\" if machine_gcode_flavor == \"UltiGCode\" else \"M104 S0 ;extruder heater off\\nM140 S0 ;heated bed heater off (if you have it)\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning\\n;Version _2.6 of the firmware can abort the print too early if the file ends\\n;too soon. However if the file hasn't ended yet because there are comments at\\n;the end of the file, it won't abort yet. Therefore we have to put at least 512\\n;bytes at the end of the g-code so that the file is not yet finished by the\\n;time that the motion planner gets flushed. With firmware version _3.3 this\\n;should be fixed, so this comment wouldn't be necessary any more. Now we have\\n;to pad this text to make precisely 512 bytes.\"" + "machine_start_gcode": { + "default_value": "G21\nG90\nM82\nM107\nG28\nG1 Z15 F200\nT0\nG92 E0\nG1 E16 F250\nG92 E0\n" }, + "machine_end_gcode": { + "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nM84" + }, + + "machine_width": { "default_value": 220 }, @@ -39,15 +42,7 @@ "machine_heated_bed": { "default_value": true }, - "machine_head_with_fans_polygon": - { - "default_value": [ - [ -42, 12 ], - [ -42, -32 ], - [ 62, 12 ], - [ 62, -32 ] - ] - }, + "machine_center_is_zero": { "default_value": false }, @@ -60,13 +55,7 @@ "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_disallowed_areas": { - "default_value": [ - [[-115, 112.5], [ -82, 112.5], [ -84, 102.5], [-115, 102.5]], - [[ 115, 112.5], [ 115, 102.5], [ 110, 102.5], [ 108, 112.5]], - [[-115, -112.5], [-115, -104.5], [ -84, -104.5], [ -82, -112.5]], - [[ 115, -112.5], [ 108, -112.5], [ 110, -104.5], [ 115, -104.5]] - ]}, + "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, diff --git a/resources/definitions/eryone_er20.def.json b/resources/definitions/eryone_er20.def.json new file mode 100644 index 0000000000..236ef63188 --- /dev/null +++ b/resources/definitions/eryone_er20.def.json @@ -0,0 +1,241 @@ +{ + "version": 2, + "name": "Eryone ER20", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Eryone3d", + "manufacturer": "Eryone", + "file_formats": "text/x-gcode", + "platform": "eryone_er20_plateform.stl", + "has_machine_quality": true, + "preferred_quality_type": "high", + "machine_extruder_trains": + { + "0": "eryone_er20_extruder_0" + } + }, + + "overrides": { + "machine_name": { + "default_value": "Eryone ER20" + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_width": { + "default_value": 250 + }, + "machine_height": { + "default_value": 200 + }, + "machine_depth": { + "default_value": 220 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_head_with_fans_polygon": { + "default_value": [ + [-10, -10], + [-10, 10], + [10, 10], + [10, -10] + ] + }, + "gantry_height":{ "value": "0" }, + "machine_start_gcode": { + "default_value": "G90 ; use absolute coordinates\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling/ABL\nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0.0\nG1 Y-2.0 X150 F2400G1 Z3 F720\nM109 S[first_layer_temperature] ; wait for extruder temp\nG1 X150 F1000\nG1 Z0.2 F720\nG1 X80.0 E8.0 F900\nG1 X20.0 E10.0 F700\nG92 E0.0\nM221 S95 ; set flow\n" + }, + "machine_end_gcode": { + "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000" + }, + "material_print_temperature": { + "value": 205 + }, + "material_print_temperature_layer_0": { + "value": 215 + }, + "material_initial_print_temperature": { + "value": 205 + }, + "material_final_print_temperature": { + "value": 205 + }, + "acceleration_enabled": { + "value": true + }, + "acceleration_travel": { + "value": 1800 + }, + "adhesion_type": { + "value": "'brim'" + }, + "brim_width": { + "value": 5 + }, + "cool_fan_full_at_height": { + "value": 0.5 + }, + "cool_fan_speed": { + "value": 100 + }, + "cool_fan_speed_0": { + "value": 100 + }, + "infill_overlap": { + "value": "25 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0", + "maximum_value_warning": 100, + "minimum_value_warning": -50 + }, + "infill_pattern": { + "value": "'grid'" + }, + "infill_sparse_density": { + "value": 20 + }, + "initial_layer_line_width_factor": { + "value": 105 + }, + "infill_before_walls": { + "value": false + }, + "material_bed_temperature": { + "value": 60 + }, + "material_bed_temperature_layer_0": { + "value": 65 + }, + "optimize_wall_printing_order": { + "default_value": true + }, + "retract_at_layer_change": { + "value": true + }, + "retraction_amount": { + "default_value": 4 + }, + "retraction_hop": { + "value": 0.075 + }, + "retraction_hop_enabled": { + "value": false + }, + "retraction_hop_only_when_collides": { + "value": true + }, + "retraction_min_travel": { + "value": 1.5 + }, + "retraction_speed": { + "default_value": 85, + "maximum_value_warning": 100 + }, + "retraction_retract_speed": { + "maximum_value_warning": 130 + }, + "retraction_prime_speed": { + "value": "math.ceil(retraction_speed * 0.4)", + "maximum_value_warning": 130 + }, + "retraction_combing": { + "value": "'noskin'" + }, + "skin_overlap": { + "value": 10 + }, + "skirt_brim_speed": { + "value": 40 + }, + "skirt_gap": { + "value": 5 + }, + "skirt_line_count": { + "value": 3 + }, + "speed_infill": { + "value": "speed_print" + }, + "speed_topbottom": { + "value": "math.ceil(speed_print * 20 / 50)" + }, + "speed_travel": { + "value": "150" + }, + "speed_layer_0": { + "value": "20" + }, + "speed_wall": { + "value": "speed_print" + }, + "speed_wall_0": { + "value": "math.ceil(speed_print * 30 / 50)" + }, + "speed_wall_x": { + "value": "speed_print" + }, + "support_angle": { + "value": 50 + }, + "support_enable": { + "default_value": false + }, + "support_interface_enable": { + "value": true + }, + "support_pattern": { + "value": "'triangles'" + }, + "support_roof_enable": { + "value": true + }, + "support_type": { + "value": "'everywhere'" + }, + "support_use_towers": { + "value": false + }, + "support_z_distance": { + "value": 0.3 + }, + "support_xy_distance": { + "value": 0.7 + }, + "support_xy_distance_overhang": { + "value": 0.2 + }, + "smooth_spiralized_contours": { + "value": false + }, + "travel_retract_before_outer_wall": { + "value": true + }, + "wall_line_count": { + "value": 3 + }, + "wall_thickness": { + "value": "1.2" + }, + "bottom_layers": { + "value": "4" + }, + "bottom_thickness":{ + "value": "layer_height * 4" + }, + "top_thickness":{ + "value": "layer_height * 5" + }, + "top_layers": { + "value": "5" + }, + "z_seam_type": { + "value": "'shortest'" + }, + "z_seam_corner": { + "value": "'z_seam_corner_inner'" + } + } +} diff --git a/resources/definitions/eryone_thinker.def.json b/resources/definitions/eryone_thinker.def.json new file mode 100644 index 0000000000..6534b8c471 --- /dev/null +++ b/resources/definitions/eryone_thinker.def.json @@ -0,0 +1,253 @@ +{ + "version": 2, + "name": "Eryone Thinker Series", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Demetrius Apostolopoulos", + "manufacturer": "Eryone", + "file_formats": "text/x-gcode", + "platform": "eryone_thinker_platform.obj", + "platform_texture": "eryone_thinker_plate.png", + "platform_offset": [0, -120, 0], + "has_materials": true, + "preferred_material": "generic_pla", + "has_machine_quality": true, + "preferred_quality_type": "normal", + "machine_extruder_trains": + { + "0": "eryone_thinker_extruder_0" + }, + "first_start_actions": ["MachineSettingsAction"] + }, + + "overrides": + { + "machine_name": { + "default_value": "Eryone Thinker Series" + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_width": { + "default_value": 300 + }, + "machine_height": { + "default_value": 400 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_head_with_fans_polygon": { + "default_value": [ + [-20, 30], + [-20, -20], + [20, -20], + [20, 30] + ] + }, + "gantry_height": { + "value": 30 + }, + "machine_gcode_flavor": { + "default_value": "Marlin" + }, + "machine_start_gcode": { + "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z10.0 F600 ;move the platform down 10mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Y-3 F1200 ;move to prime\nG1 X10 F1200 ;\nG1 Z0.1 F600 ;get ready to prime\nG1 X120 E15 F1200 ;prime nozzle \nG1 X120 F3600 ;quick wipe\nG92 E0 ;zero the extruded length\nG5 ;enable resume from power failure\nM117 Printing..." + }, + "machine_end_gcode": { + "default_value": "M104 S0 ;turn off extruder\nM140 S0 ;turn off bed\nM107 ;turn off all fans\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 E-5 F300\nG1 Z+0.5 E-5 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y250 F4800 ; position for easy part removal\nM84 ;steppers off" + }, + "acceleration_enabled": { + "value": true + }, + "acceleration_print": { + "value": 750 + }, + "acceleration_travel": { + "value": 1500 + }, + "adhesion_type": { + "value": "'skirt'" + }, + "brim_width": { + "value": 5 + }, + "cool_fan_full_at_height": { + "value": 0.5 + }, + "cool_fan_speed": { + "value": 100 + }, + "cool_fan_speed_0": { + "value": 0 + }, + "infill_overlap": { + "value": "25 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0", + "maximum_value_warning": 100, + "minimum_value_warning": -50 + }, + "infill_pattern": { + "value": "'lines' if infill_sparse_density > 25 else 'grid'" + }, + "infill_sparse_density": { + "value": 20 + }, + "initial_layer_line_width_factor": { + "value": 120 + }, + "infill_before_walls": { + "value": false + }, + "jerk_enabled": { + "value": true + }, + "jerk_print": { + "value": 10 + }, + "jerk_travel": { + "value": 15 + }, + "material_bed_temperature": { + "maximum_value_warning": 100 + }, + "material_print_temperature": { + "maximum_value_warning": 250 + }, + "optimize_wall_printing_order": { + "default_value": true + }, + "outer_inset_first": { + "default_value": false + }, + "retract_at_layer_change": { + "value": true + }, + "retraction_amount": { + "default_value": 4 + }, + "retraction_hop": { + "value": 0.075 + }, + "retraction_hop_enabled": { + "value": false + }, + "retraction_hop_only_when_collides": { + "value": true + }, + "retraction_min_travel": { + "value": 1.5 + }, + "retraction_speed": { + "default_value": 85, + "maximum_value_warning": 100 + }, + "retraction_retract_speed": { + "maximum_value_warning": 130 + }, + "retraction_prime_speed": { + "value": "math.ceil(retraction_speed * 0.4)", + "maximum_value_warning": 130 + }, + "retraction_combing": { + "value": "'off' if retraction_hop_enabled else 'noskin'" + }, + "skin_overlap": { + "value": 10 + }, + "skirt_brim_speed": { + "value": 40 + }, + "skirt_gap": { + "value": 5 + }, + "skirt_line_count": { + "value": 3 + }, + "speed_infill": { + "value": "speed_print" + }, + "speed_topbottom": { + "value": "math.ceil(speed_print * 20 / 50)" + }, + "speed_travel": { + "value": "120" + }, + "speed_layer_0": { + "value": "math.ceil(speed_print * 30 / 50)" + }, + "speed_wall": { + "value": "speed_print" + }, + "speed_wall_0": { + "value": "math.ceil(speed_print * 30 / 50)" + }, + "speed_wall_x": { + "value": "speed_print" + }, + "support_angle": { + "value": 50 + }, + "support_enable": { + "default_value": false + }, + "support_interface_enable": { + "value": true + }, + "support_pattern": { + "value": "'triangles'" + }, + "support_roof_enable": { + "value": true + }, + "support_type": { + "value": "'everywhere'" + }, + "support_use_towers": { + "value": false + }, + "support_z_distance": { + "value": 0.3 + }, + "support_xy_distance": { + "value": 0.7 + }, + "support_xy_distance_overhang": { + "value": 0.2 + }, + "smooth_spiralized_contours": { + "value": false + }, + "travel_retract_before_outer_wall": { + "value": true + }, + "wall_line_count": { + "value": 3 + }, + "wall_thickness": { + "value": "1.2" + }, + "bottom_layers": { + "value": "4" + }, + "bottom_thickness":{ + "value": "layer_height * bottom_layers" + }, + "top_layers": { + "value": "6" + }, + "top_thickness":{ + "value": "layer_height * top_layers" + }, + "z_seam_type": { + "value": "'shortest'" + }, + "z_seam_corner": { + "value": "'z_seam_corner_inner'" + } + } +} diff --git a/resources/definitions/fabtotum.def.json b/resources/definitions/fabtotum.def.json index 957dffaef9..1f2565803f 100644 --- a/resources/definitions/fabtotum.def.json +++ b/resources/definitions/fabtotum.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "FABtotum Personal Fabricator", + "name": "Fabtotum Personal Fabricator", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "FABtotum", - "manufacturer": "FABtotum", + "author": "Fabtotum", + "manufacturer": "Fabtotum", "file_formats": "text/x-gcode", "platform": "fabtotum_platform.3mf", "has_machine_quality": true, diff --git a/resources/definitions/farm2.def.json b/resources/definitions/farm2.def.json new file mode 100644 index 0000000000..382e1841d0 --- /dev/null +++ b/resources/definitions/farm2.def.json @@ -0,0 +1,57 @@ +{ + "version": 2, + "name": "Farm 2", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Farm3D", + "manufacturer": "Farm3D LLC", + "file_formats": "text/x-gcode", + "platform": "farm2_platform.obj", + "platform_texture": "farm2plate.png", + "platform_offset": [-7, 0, -4], + "has_variants": true, + "preferred_variant_name": "PrintHead 0.4 mm", + "variants_name": "PrintHead type", + "has_materials": true, + "preferred_material": "generic_pla", + "has_machine_quality": false, + "machine_extruder_trains": + { + "0": "farm2_extruder_1" + + } + + }, + "overrides": { + "machine_name": { "default_value": "Farm 2" }, + "machine_start_gcode" : { + "default_value": "G28 ;Home\nG1 Y0 Z3.0 F4000 ;Move the platform\nG92 E0\nG1 F1000 Z0.2\nG1 X190 F1000 E50 Z0.2\nG92 E0" + }, + "machine_end_gcode" : { + "default_value": "M104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28\nM84\nM81" + }, + "machine_width": { + "default_value": 203 + }, + "machine_depth": { + "default_value": 199 + }, + "machine_height": { + "default_value": 197 + }, + "machine_heated_bed": { + "default_value": true + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_gcode_flavor": { + "default_value": "RepRap (RepRap)" + } + + } +} diff --git a/resources/definitions/farm2_ce.def.json b/resources/definitions/farm2_ce.def.json new file mode 100644 index 0000000000..bb7f14d84a --- /dev/null +++ b/resources/definitions/farm2_ce.def.json @@ -0,0 +1,57 @@ +{ + "version": 2, + "name": "Farm 2CE", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Farm3D", + "manufacturer": "Farm3D LLC", + "file_formats": "text/x-gcode", + "platform": "farm2_platform.obj", + "platform_texture": "farm2ceplate.png", + "platform_offset": [-7, 0, -4], + "has_variants": true, + "preferred_variant_name": "PrintHead 0.4 mm", + "variants_name": "PrintHead type", + "has_materials": true, + "preferred_material": "generic_pla", + "has_machine_quality": false, + "machine_extruder_trains": + { + "0": "farm2_ce_extruder_1" + + } + + }, + "overrides": { + "machine_name": { "default_value": "Farm 2CE" }, + "machine_start_gcode" : { + "default_value": "G28\nG29 S0\nG92 E0\nG1 X0 Y0 F4000 Z0.1\nG1 Y0 X190 F1000 E50 Z0.3\nG1 Z0" + }, + "machine_end_gcode" : { + "default_value": "M104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28\nM84" + }, + "machine_width": { + "default_value": 209 + }, + "machine_depth": { + "default_value": 199 + }, + "machine_height": { + "default_value": 213 + }, + "machine_heated_bed": { + "default_value": true + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_gcode_flavor": { + "default_value": "RepRap (RepRap)" + } + + } +} diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index 9377b99df8..7dbd775b49 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -6,7 +6,7 @@ "type": "extruder", "author": "Ultimaker", "manufacturer": "Unknown", - "setting_version": 16, + "setting_version": 17, "visible": false, "position": "0" }, @@ -197,7 +197,7 @@ { "label": "Build Plate Adhesion", "type": "category", - "icon": "category_adhesion", + "icon": "Adhesion", "description": "Adhesion", "children": { @@ -232,7 +232,7 @@ "material": { "label": "Material", - "icon": "category_material", + "icon": "Spool", "description": "Material", "type": "category", "children": diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index b4d6f4a44a..dca63aaa5e 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6,7 +6,7 @@ "type": "machine", "author": "Ultimaker", "manufacturer": "Unknown", - "setting_version": 16, + "setting_version": 17, "file_formats": "text/x-gcode;model/stl;application/x-wavefront-obj;application/x3g", "visible": false, "has_materials": true, @@ -28,7 +28,7 @@ "label": "Machine", "type": "category", "description": "Machine specific settings", - "icon": "category_machine", + "icon": "Printer", "children": { "machine_name": @@ -398,6 +398,29 @@ "settable_per_extruder": false, "settable_per_meshgroup": false }, + "machine_extruders_share_nozzle": + { + "label": "Extruders Share Nozzle", + "description": "Whether the extruders share a single nozzle rather than each extruder having its own nozzle. When set to true, it is expected that the printer-start gcode script properly sets up all extruders in an initial retraction state that is known and mutually compatible (either zero or one filament not retracted); in that case the initial retraction status is described, per extruder, by the 'machine_extruders_shared_nozzle_initial_retraction' parameter.", + "type": "bool", + "default_value": false, + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, + "machine_extruders_shared_nozzle_initial_retraction": + { + "label": "Shared Nozzle Initial Retraction", + "description": "How much the filament of each extruder is assumed to have been retracted from the shared nozzle tip at the completion of the printer-start gcode script; the value should be equal to or greater than the length of the common part of the nozzle's ducts.", + "unit": "mm", + "default_value": 0, + "minimum_value": "0", + "type": "float", + "enabled": "machine_extruders_share_nozzle", + "settable_per_mesh": false, + "settable_per_extruder": true, + "settable_per_meshgroup": false + }, "machine_disallowed_areas": { "label": "Disallowed Areas", @@ -485,7 +508,7 @@ "machine_use_extruder_offset_to_offset_coords": { "label": "Offset with Extruder", - "description": "Apply the extruder offset to the coordinate system.", + "description": "Apply the extruder offset to the coordinate system. Affects all extruders.", "type": "bool", "default_value": true, "settable_per_mesh": false, @@ -652,7 +675,7 @@ { "label": "Steps per Millimeter (X)", "description": "How many steps of the stepper motor will result in one millimeter of movement in the X direction.", - "type": "int", + "type": "float", "default_value": 50, "minimum_value": "0.0000001", "settable_per_mesh": false, @@ -662,7 +685,7 @@ { "label": "Steps per Millimeter (Y)", "description": "How many steps of the stepper motor will result in one millimeter of movement in the Y direction.", - "type": "int", + "type": "float", "default_value": 50, "minimum_value": "0.0000001", "settable_per_mesh": false, @@ -672,7 +695,7 @@ { "label": "Steps per Millimeter (Z)", "description": "How many steps of the stepper motor will result in one millimeter of movement in the Z direction.", - "type": "int", + "type": "float", "default_value": 50, "minimum_value": "0.0000001", "settable_per_mesh": false, @@ -681,8 +704,8 @@ "machine_steps_per_mm_e": { "label": "Steps per Millimeter (E)", - "description": "How many steps of the stepper motors will result in one millimeter of extrusion.", - "type": "int", + "description": "How many steps of the stepper motors will result in moving the feeder wheel by one millimeter around its circumference.", + "type": "float", "default_value": 1600, "minimum_value": "0.0000001", "settable_per_mesh": false, @@ -742,7 +765,7 @@ { "label": "Quality", "type": "category", - "icon": "category_layer_height", + "icon": "PrintQuality", "description": "All settings that influence the resolution of the print. These settings have a large impact on the quality (and print time)", "children": { @@ -873,7 +896,7 @@ "default_value": 0.4, "type": "float", "value": "line_width", - "enabled": "resolveOrValue('adhesion_type') == 'skirt' or resolveOrValue('adhesion_type') == 'brim' or resolveOrValue('prime_tower_brim_enable')", + "enabled": "resolveOrValue('adhesion_type') == 'skirt' or resolveOrValue('adhesion_type') == 'brim' or resolveOrValue('prime_tower_brim_enable') or resolveOrValue('draft_shield_enabled') or resolveOrValue('ooze_shield_enabled')", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -977,8 +1000,8 @@ }, "shell": { - "label": "Shell", - "icon": "category_shell", + "label": "Walls", + "icon": "PrintShell", "description": "Shell", "type": "category", "children": @@ -1066,184 +1089,6 @@ "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, - "roofing_extruder_nr": - { - "label": "Top Surface Skin Extruder", - "description": "The extruder train used for printing the top most skin. This is used in multi-extrusion.", - "type": "optional_extruder", - "default_value": "-1", - "value": "top_bottom_extruder_nr", - "settable_per_mesh": false, - "settable_per_extruder": false, - "settable_per_meshgroup": true, - "settable_globally": true, - "enabled": "extruders_enabled_count > 1 and max(extruderValues('roofing_layer_count')) > 0 and max(extruderValues('top_layers')) > 0" - }, - "roofing_layer_count": - { - "label": "Top Surface Skin Layers", - "description": "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces.", - "default_value": 0, - "minimum_value": "0", - "maximum_value_warning": "top_layers - 1", - "type": "int", - "value": "0", - "limit_to_extruder": "roofing_extruder_nr", - "settable_per_mesh": true, - "enabled": "top_layers > 0" - }, - "top_bottom_extruder_nr": - { - "label": "Top/Bottom Extruder", - "description": "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion.", - "type": "optional_extruder", - "default_value": "-1", - "settable_per_mesh": false, - "settable_per_extruder": false, - "settable_per_meshgroup": true, - "settable_globally": true, - "enabled": "extruders_enabled_count > 1" - }, - "top_bottom_thickness": - { - "label": "Top/Bottom Thickness", - "description": "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers.", - "unit": "mm", - "default_value": 0.8, - "minimum_value": "0", - "minimum_value_warning": "0.6", - "maximum_value": "machine_height", - "type": "float", - "limit_to_extruder": "top_bottom_extruder_nr", - "settable_per_mesh": true, - "children": - { - "top_thickness": - { - "label": "Top Thickness", - "description": "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers.", - "unit": "mm", - "default_value": 0.8, - "minimum_value": "0", - "minimum_value_warning": "0.2 + resolveOrValue('layer_height')", - "maximum_value": "machine_height", - "type": "float", - "value": "top_bottom_thickness", - "limit_to_extruder": "top_bottom_extruder_nr", - "settable_per_mesh": true, - "children": - { - "top_layers": - { - "label": "Top Layers", - "description": "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number.", - "default_value": 8, - "minimum_value": "0", - "maximum_value_warning": "100", - "type": "int", - "minimum_value_warning": "2", - "value": "0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))", - "limit_to_extruder": "top_bottom_extruder_nr", - "settable_per_mesh": true - } - } - }, - "bottom_thickness": - { - "label": "Bottom Thickness", - "description": "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers.", - "unit": "mm", - "default_value": 0.6, - "minimum_value": "0", - "minimum_value_warning": "0.2 + resolveOrValue('layer_height')", - "type": "float", - "value": "top_bottom_thickness", - "maximum_value": "machine_height", - "limit_to_extruder": "top_bottom_extruder_nr", - "settable_per_mesh": true, - "children": - { - "bottom_layers": - { - "label": "Bottom Layers", - "description": "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number.", - "minimum_value": "0", - "minimum_value_warning": "2", - "default_value": 6, - "type": "int", - "value": "999999 if infill_sparse_density == 100 else math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))", - "limit_to_extruder": "top_bottom_extruder_nr", - "settable_per_mesh": true - }, - "initial_bottom_layers": - { - "label": "Initial Bottom Layers", - "description": "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number.", - "minimum_value": "0", - "minimum_value_warning": "2", - "default_value": 6, - "type": "int", - "value": "bottom_layers", - "limit_to_extruder": "top_bottom_extruder_nr", - "settable_per_mesh": true - } - } - } - } - }, - "top_bottom_pattern": - { - "label": "Top/Bottom Pattern", - "description": "The pattern of the top/bottom layers.", - "type": "enum", - "options": - { - "lines": "Lines", - "concentric": "Concentric", - "zigzag": "Zig Zag" - }, - "default_value": "lines", - "enabled": "top_layers > 0 or bottom_layers > 0", - "limit_to_extruder": "top_bottom_extruder_nr", - "settable_per_mesh": true - }, - "top_bottom_pattern_0": - { - "label": "Bottom Pattern Initial Layer", - "description": "The pattern on the bottom of the print on the first layer.", - "type": "enum", - "options": - { - "lines": "Lines", - "concentric": "Concentric", - "zigzag": "Zig Zag" - }, - "default_value": "lines", - "enabled": "top_layers > 0 or bottom_layers > 0", - "value": "top_bottom_pattern", - "limit_to_extruder": "top_bottom_extruder_nr", - "settable_per_mesh": true - }, - "connect_skin_polygons": - { - "label": "Connect Top/Bottom Polygons", - "description": "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality.", - "type": "bool", - "default_value": false, - "enabled": "((top_layers > 0 or bottom_layers > 0) and top_bottom_pattern == 'concentric') or (roofing_layer_count > 0 and roofing_pattern == 'concentric')", - "limit_to_extruder": "top_bottom_extruder_nr", - "settable_per_mesh": true - }, - "skin_angles": - { - "label": "Top/Bottom Line Directions", - "description": "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees).", - "type": "[int]", - "default_value": "[ ]", - "enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern != 'concentric'", - "limit_to_extruder": "top_bottom_extruder_nr", - "settable_per_mesh": true - }, "wall_0_inset": { "label": "Outer Wall Inset", @@ -1495,6 +1340,194 @@ "enabled": "z_seam_type == 'back'", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true + } + } + }, + "top_bottom": + { + "label": "Top/Bottom", + "icon": "PrintTopBottom", + "description": "Top/Bottom", + "type": "category", + "children": + { + "roofing_extruder_nr": + { + "label": "Top Surface Skin Extruder", + "description": "The extruder train used for printing the top most skin. This is used in multi-extrusion.", + "type": "optional_extruder", + "default_value": "-1", + "value": "top_bottom_extruder_nr", + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": true, + "settable_globally": true, + "enabled": "extruders_enabled_count > 1 and max(extruderValues('roofing_layer_count')) > 0 and max(extruderValues('top_layers')) > 0" + }, + "roofing_layer_count": + { + "label": "Top Surface Skin Layers", + "description": "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces.", + "default_value": 0, + "minimum_value": "0", + "maximum_value_warning": "top_layers - 1", + "type": "int", + "value": "0", + "limit_to_extruder": "roofing_extruder_nr", + "settable_per_mesh": true, + "enabled": "top_layers > 0" + }, + "top_bottom_extruder_nr": + { + "label": "Top/Bottom Extruder", + "description": "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion.", + "type": "optional_extruder", + "default_value": "-1", + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": true, + "settable_globally": true, + "enabled": "extruders_enabled_count > 1" + }, + "top_bottom_thickness": + { + "label": "Top/Bottom Thickness", + "description": "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers.", + "unit": "mm", + "default_value": 0.8, + "minimum_value": "0", + "minimum_value_warning": "0.6", + "maximum_value": "machine_height", + "type": "float", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true, + "children": + { + "top_thickness": + { + "label": "Top Thickness", + "description": "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers.", + "unit": "mm", + "default_value": 0.8, + "minimum_value": "0", + "minimum_value_warning": "0.2 + resolveOrValue('layer_height')", + "maximum_value": "machine_height", + "type": "float", + "value": "top_bottom_thickness", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true, + "children": + { + "top_layers": + { + "label": "Top Layers", + "description": "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number.", + "default_value": 8, + "minimum_value": "0", + "maximum_value_warning": "100", + "type": "int", + "minimum_value_warning": "2", + "value": "0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true + } + } + }, + "bottom_thickness": + { + "label": "Bottom Thickness", + "description": "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers.", + "unit": "mm", + "default_value": 0.6, + "minimum_value": "0", + "minimum_value_warning": "0.2 + resolveOrValue('layer_height')", + "type": "float", + "value": "top_bottom_thickness", + "maximum_value": "machine_height", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true, + "children": + { + "bottom_layers": + { + "label": "Bottom Layers", + "description": "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number.", + "minimum_value": "0", + "minimum_value_warning": "2", + "default_value": 6, + "type": "int", + "value": "999999 if infill_sparse_density == 100 else math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true + }, + "initial_bottom_layers": + { + "label": "Initial Bottom Layers", + "description": "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number.", + "minimum_value": "0", + "minimum_value_warning": "2", + "default_value": 6, + "type": "int", + "value": "bottom_layers", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true + } + } + } + } + }, + "top_bottom_pattern": + { + "label": "Top/Bottom Pattern", + "description": "The pattern of the top/bottom layers.", + "type": "enum", + "options": + { + "lines": "Lines", + "concentric": "Concentric", + "zigzag": "Zig Zag" + }, + "default_value": "lines", + "enabled": "top_layers > 0 or bottom_layers > 0", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true + }, + "top_bottom_pattern_0": + { + "label": "Bottom Pattern Initial Layer", + "description": "The pattern on the bottom of the print on the first layer.", + "type": "enum", + "options": + { + "lines": "Lines", + "concentric": "Concentric", + "zigzag": "Zig Zag" + }, + "default_value": "lines", + "enabled": "top_layers > 0 or bottom_layers > 0", + "value": "top_bottom_pattern", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true + }, + "connect_skin_polygons": + { + "label": "Connect Top/Bottom Polygons", + "description": "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality.", + "type": "bool", + "default_value": false, + "enabled": "((top_layers > 0 or bottom_layers > 0) and top_bottom_pattern == 'concentric') or (initial_bottom_layers > 0 and top_bottom_pattern_0 == 'concentric') or (roofing_layer_count > 0 and roofing_pattern == 'concentric')", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true + }, + "skin_angles": + { + "label": "Top/Bottom Line Directions", + "description": "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees).", + "type": "[int]", + "default_value": "[ ]", + "enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern != 'concentric'", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true }, "skin_no_small_gaps_heuristic": { @@ -1666,13 +1699,130 @@ "settable_per_mesh": true } } + }, + "skin_preshrink": + { + "label": "Skin Removal Width", + "description": "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model.", + "unit": "mm", + "type": "float", + "default_value": 1, + "value": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x", + "minimum_value": "0", + "maximum_value_warning": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x", + "enabled": "top_layers > 0 or bottom_layers > 0", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true, + "children": + { + "top_skin_preshrink": + { + "label": "Top Skin Removal Width", + "description": "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model.", + "unit": "mm", + "type": "float", + "default_value": 1, + "value": "skin_preshrink", + "maximum_value_warning": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x", + "minimum_value": "0", + "enabled": "top_layers > 0 or bottom_layers > 0", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true + }, + "bottom_skin_preshrink": + { + "label": "Bottom Skin Removal Width", + "description": "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model.", + "unit": "mm", + "type": "float", + "default_value": 1, + "value": "skin_preshrink", + "maximum_value_warning": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x", + "minimum_value": "0", + "enabled": "top_layers > 0 or bottom_layers > 0", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true + } + } + }, + "expand_skins_expand_distance": + { + "label": "Skin Expand Distance", + "description": "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used.", + "unit": "mm", + "type": "float", + "default_value": 1, + "value": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x", + "minimum_value": "-skin_preshrink", + "limit_to_extruder": "top_bottom_extruder_nr", + "enabled": "top_layers > 0 or bottom_layers > 0", + "settable_per_mesh": true, + "children": + { + "top_skin_expand_distance": + { + "label": "Top Skin Expand Distance", + "description": "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used.", + "unit": "mm", + "type": "float", + "default_value": 1, + "value": "expand_skins_expand_distance", + "minimum_value": "-top_skin_preshrink", + "enabled": "top_layers > 0 or bottom_layers > 0", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true + }, + "bottom_skin_expand_distance": + { + "label": "Bottom Skin Expand Distance", + "description": "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used.", + "unit": "mm", + "type": "float", + "default_value": 1, + "value": "expand_skins_expand_distance", + "minimum_value": "-bottom_skin_preshrink", + "enabled": "top_layers > 0 or bottom_layers > 0", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true + } + } + }, + "max_skin_angle_for_expansion": + { + "label": "Maximum Skin Angle for Expansion", + "description": "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded.", + "unit": "°", + "type": "float", + "minimum_value": "0", + "minimum_value_warning": "2", + "maximum_value": "90", + "default_value": 90, + "enabled": "(top_layers > 0 or bottom_layers > 0) and (top_skin_expand_distance > 0 or bottom_skin_expand_distance > 0)", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true, + "children": + { + "min_skin_width_for_expansion": + { + "label": "Minimum Skin Width for Expansion", + "description": "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical.", + "unit": "mm", + "type": "float", + "default_value": 0, + "value": "top_layers * layer_height / math.tan(math.radians(max_skin_angle_for_expansion))", + "minimum_value": "0", + "enabled": "(top_layers > 0 or bottom_layers > 0) and (top_skin_expand_distance > 0 or bottom_skin_expand_distance > 0)", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true + } + } } } }, "infill": { "label": "Infill", - "icon": "category_infill", + "icon": "Infill1", "description": "Infill", "type": "category", "children": @@ -1975,123 +2125,6 @@ "limit_to_extruder": "infill_extruder_nr", "settable_per_mesh": true }, - "skin_preshrink": - { - "label": "Skin Removal Width", - "description": "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model.", - "unit": "mm", - "type": "float", - "default_value": 1, - "value": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x", - "minimum_value": "0", - "maximum_value_warning": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x", - "enabled": "top_layers > 0 or bottom_layers > 0", - "limit_to_extruder": "top_bottom_extruder_nr", - "settable_per_mesh": true, - "children": - { - "top_skin_preshrink": - { - "label": "Top Skin Removal Width", - "description": "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model.", - "unit": "mm", - "type": "float", - "default_value": 1, - "value": "skin_preshrink", - "maximum_value_warning": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x", - "minimum_value": "0", - "enabled": "top_layers > 0 or bottom_layers > 0", - "limit_to_extruder": "top_bottom_extruder_nr", - "settable_per_mesh": true - }, - "bottom_skin_preshrink": - { - "label": "Bottom Skin Removal Width", - "description": "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model.", - "unit": "mm", - "type": "float", - "default_value": 1, - "value": "skin_preshrink", - "maximum_value_warning": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x", - "minimum_value": "0", - "enabled": "top_layers > 0 or bottom_layers > 0", - "limit_to_extruder": "top_bottom_extruder_nr", - "settable_per_mesh": true - } - } - }, - "expand_skins_expand_distance": - { - "label": "Skin Expand Distance", - "description": "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used.", - "unit": "mm", - "type": "float", - "default_value": 1, - "value": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x", - "minimum_value": "-skin_preshrink", - "limit_to_extruder": "top_bottom_extruder_nr", - "enabled": "top_layers > 0 or bottom_layers > 0", - "settable_per_mesh": true, - "children": - { - "top_skin_expand_distance": - { - "label": "Top Skin Expand Distance", - "description": "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used.", - "unit": "mm", - "type": "float", - "default_value": 1, - "value": "expand_skins_expand_distance", - "minimum_value": "-top_skin_preshrink", - "enabled": "top_layers > 0 or bottom_layers > 0", - "limit_to_extruder": "top_bottom_extruder_nr", - "settable_per_mesh": true - }, - "bottom_skin_expand_distance": - { - "label": "Bottom Skin Expand Distance", - "description": "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used.", - "unit": "mm", - "type": "float", - "default_value": 1, - "value": "expand_skins_expand_distance", - "minimum_value": "-bottom_skin_preshrink", - "enabled": "top_layers > 0 or bottom_layers > 0", - "limit_to_extruder": "top_bottom_extruder_nr", - "settable_per_mesh": true - } - } - }, - "max_skin_angle_for_expansion": - { - "label": "Maximum Skin Angle for Expansion", - "description": "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded.", - "unit": "°", - "type": "float", - "minimum_value": "0", - "minimum_value_warning": "2", - "maximum_value": "90", - "default_value": 90, - "enabled": "(top_layers > 0 or bottom_layers > 0) and (top_skin_expand_distance > 0 or bottom_skin_expand_distance > 0)", - "limit_to_extruder": "top_bottom_extruder_nr", - "settable_per_mesh": true, - "children": - { - "min_skin_width_for_expansion": - { - "label": "Minimum Skin Width for Expansion", - "description": "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical.", - "unit": "mm", - "type": "float", - "default_value": 0, - "value": "top_layers * layer_height / math.tan(math.radians(max_skin_angle_for_expansion))", - "minimum_value": "0", - "enabled": "(top_layers > 0 or bottom_layers > 0) and (top_skin_expand_distance > 0 or bottom_skin_expand_distance > 0)", - "limit_to_extruder": "top_bottom_extruder_nr", - "settable_per_mesh": true - } - } - }, "skin_edge_support_thickness": { "label": "Skin Edge Support Thickness", @@ -2128,7 +2161,7 @@ "material": { "label": "Material", - "icon": "category_material", + "icon": "Spool", "description": "Material", "type": "category", "children": @@ -2614,7 +2647,7 @@ "minimum_value": "5", "minimum_value_warning": "50", "maximum_value_warning": "150", - "enabled": "resolveOrValue('adhesion_type') == 'skirt' or resolveOrValue('adhesion_type') == 'brim'", + "enabled": "resolveOrValue('adhesion_type') == 'skirt' or resolveOrValue('adhesion_type') == 'brim' or resolveOrValue('draft_shield_enabled') or resolveOrValue('ooze_shield_enabled')", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -2733,7 +2766,7 @@ "speed": { "label": "Speed", - "icon": "category_speed", + "icon": "SpeedOMeter", "description": "Speed", "type": "category", "children": @@ -2960,9 +2993,10 @@ "speed_layer_0": { "label": "Initial Layer Speed", - "description": "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate.", + "description": "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate. Does not affect the build plate adhesion structures themselves, like brim and raft.", "unit": "mm/s", "type": "float", + "enabled": "speed_slowdown_layers > 0", "default_value": 30, "value": "speed_print * 30 / 60", "minimum_value": "0.1", @@ -2977,6 +3011,7 @@ "description": "The speed of printing for the initial layer. A lower value is advised to improve adhesion to the build plate.", "unit": "mm/s", "type": "float", + "enabled": "speed_slowdown_layers > 0", "default_value": 30, "value": "speed_layer_0", "minimum_value": "0.1", @@ -2990,6 +3025,7 @@ "description": "The speed of travel moves in the initial layer. A lower value is advised to prevent pulling previously printed parts away from the build plate. The value of this setting can automatically be calculated from the ratio between the Travel Speed and the Print Speed.", "unit": "mm/s", "type": "float", + "enabled": "speed_slowdown_layers > 0", "default_value": 60, "value": "speed_layer_0 * speed_travel / speed_print", "minimum_value": "0.1", @@ -3025,7 +3061,6 @@ "default_value": 10, "minimum_value": "0", "maximum_value": "machine_max_feedrate_z", - "enabled": "retraction_enable and retraction_hop_enabled", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -3637,7 +3672,7 @@ "travel": { "label": "Travel", - "icon": "category_travel", + "icon": "PrintTravel", "description": "travel", "type": "category", "children": @@ -3806,7 +3841,7 @@ "retraction_combing_max_distance": { "label": "Max Comb Distance With No Retract", - "description": "When non-zero, combing travel moves that are longer than this distance will use retraction.", + "description": "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction.", "unit": "mm", "type": "float", "default_value": 0, @@ -3942,7 +3977,7 @@ "cooling": { "label": "Cooling", - "icon": "category_cool", + "icon": "Fan", "description": "Cooling", "type": "category", "children": @@ -4092,7 +4127,7 @@ { "label": "Support", "type": "category", - "icon": "category_support", + "icon": "Support", "description": "Support", "children": { @@ -4661,7 +4696,7 @@ "default_value": 0.0, "minimum_value": "0", "maximum_value_warning": "5", - "enabled": "support_enable and support_structure == 'normal'", + "enabled": "(support_enable or support_meshes_present) and support_structure == 'normal'", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": true }, @@ -5132,7 +5167,7 @@ { "label": "Build Plate Adhesion", "type": "category", - "icon": "category_adhesion", + "icon": "Adhesion", "description": "Adhesion", "children": { @@ -5786,7 +5821,7 @@ { "label": "Dual Extrusion", "type": "category", - "icon": "category_dual", + "icon": "DualExtrusion", "description": "Settings used for printing with multiple extruders.", "children": { @@ -6001,7 +6036,7 @@ { "label": "Mesh Fixes", "type": "category", - "icon": "category_fixes", + "icon": "Bandage", "description": "Make the meshes more suited for 3D printing.", "children": { @@ -6127,7 +6162,7 @@ { "label": "Special Modes", "type": "category", - "icon": "category_blackmagic", + "icon": "BlackMagic", "description": "Non-traditional ways to print your models.", "children": { @@ -6161,7 +6196,7 @@ "infill_mesh_order": { "label": "Mesh Processing Rank", - "description": "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes.", + "description": "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the highest rank. An infill mesh with a higher rank will modify the infill of infill meshes with lower rank and normal meshes.", "default_value": 0, "value": "1 if infill_mesh else 0", "minimum_value_warning": "1", @@ -6300,7 +6335,7 @@ { "label": "Experimental", "type": "category", - "icon": "category_experimental", + "icon": "Experiment", "description": "Features that haven't completely been fleshed out yet.", "children": { @@ -6518,6 +6553,17 @@ "default_value": 50, "enabled": "conical_overhang_enabled" }, + "conical_overhang_hole_size": + { + "label": "Maximum Overhang Hole Area", + "description": "The maximum area of a hole in the base of the model before it's removed by Make Overhang Printable. Holes smaller than this will be retained. A value of 0 mm² will fill all holes in the models base.", + "unit": "mm²", + "type": "float", + "minimum_value": "0", + "minimum_value_warning": "0", + "default_value": 0, + "enabled": "conical_overhang_enabled" + }, "coasting_enable": { "label": "Enable Coasting", diff --git a/resources/definitions/flashforge_base.def.json b/resources/definitions/flashforge_base.def.json new file mode 100644 index 0000000000..c41b03419f --- /dev/null +++ b/resources/definitions/flashforge_base.def.json @@ -0,0 +1,44 @@ +{ + "version": 2, + "name": "Dreamer NX", + "inherits": "fdmprinter", + "metadata": { + "visible": false, + "author": "Egon", + "manufacturer": "Flashforge", + "file_formats": "text/x-gcode", + "first_start_actions": ["MachineSettingsAction"], + "machine_extruder_trains": + { + "0": "flashforge_dreamernx_extruder_0" + }, + "has_materials": true, + "has_variants": true, + "has_machine_quality": true, + "preferred_variant_name": "0.4mm Nozzle", + "preferred_quality_type": "normal", + "preferred_material": "generic_pla", + "variants_name": "Nozzle Size" + }, + "overrides": { + "machine_heated_bed": {"default_value": true}, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_feedrate_e": { "value": 50 }, + "machine_max_acceleration_x": { "value": 1500 }, + "machine_max_acceleration_y": { "value": 1500 }, + "machine_max_acceleration_z": { "value": 500 }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_acceleration": { "value": 500 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_max_jerk_e": { "value": 5 } + }, + + + "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, + "machine_start_gcode": {"default_value": ";Start Gcode\nG90 ;absolute positioning\nM118 X25.00 Y25.00 Z20.00 T0\nM140 S{material_bed_temperature_layer_0} T0 ;Heat bed up to first layer temperature\nM104 S{material_print_temperature_layer_0} T0 ;Set nozzle temperature to first layer temperature\nM107 ;start with the fan off\nG90\nG28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651\nM907 X100 Y100 Z40 A100 B20 ;Digital potentiometer value\nM108 T0\n;Purge line\nG1 X-110.00 Y-60.00 F4800\nG1 Z{layer_height_0} F420\nG1 X-110.00 Y60.00 E17,4 F1200\n;Purge line end"}, + "machine_end_gcode": {"default_value": ";end gcode\nM104 S0 T0\nM140 S0 T0\nG162 Z F1800\nG28 X Y\nM652\nM132 X Y Z A B\nG91\nM18" + } + } diff --git a/resources/definitions/flashforge_dreamer_nx.def.json b/resources/definitions/flashforge_dreamer_nx.def.json new file mode 100644 index 0000000000..04eae33272 --- /dev/null +++ b/resources/definitions/flashforge_dreamer_nx.def.json @@ -0,0 +1,33 @@ +{ + "version": 2, + "name": "Dreamer NX", + "inherits": "flashforge_base", + "metadata": { + "visible": true, + "author": "Egon", + "manufacturer": "Flashforge", + "file_formats": "text/x-gcode", + "platform": "FlashForge_DreamerNX.obj", + "platform_offset": [0, 0, 0], + "quality_definition": "flashforge_base" + }, + + "overrides": { + "machine_name": { "default_value": "Dreamer NX" }, + "retraction_amount": { "default_value": 1.3 }, + "retraction_speed": { "default_value": 40 }, + "machine_width": {"default_value": 230}, + "machine_height": {"default_value": 140}, + "machine_depth": {"default_value": 150}, + "machine_center_is_zero": {"default_value": true}, + "machine_head_with_fans_polygon":{"default_value": [[ -15, -25 ],[ -15, 35 ],[ 40, 35 ],[ 40, -25 ]] + }, + "gantry_height": {"value": "30"}, + + + "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, + "machine_start_gcode": {"default_value": ";Start Gcode\nG90 ;absolute positioning\nM118 X25.00 Y25.00 Z20.00 T0\nM140 S{material_bed_temperature_layer_0} T0 ;Heat bed up to first layer temperature\nM104 S{material_print_temperature_layer_0} T0 ;Set nozzle temperature to first layer temperature\nM107 ;start with the fan off\nG90\nG28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651\nM907 X100 Y100 Z40 A100 B20 ;Digital potentiometer value\nM108 T0\n;Purge line\nG1 X-110.00 Y-60.00 F4800\nG1 Z{layer_height_0} F420\nG1 X-110.00 Y60.00 E17,4 F1200\n;Purge line end"}, + "machine_end_gcode": {"default_value": ";end gcode\nM104 S0 T0\nM140 S0 T0\nG162 Z F1800\nG28 X Y\nM652\nM132 X Y Z A B\nG91\nM18" + } + } +} diff --git a/resources/definitions/flsun_q5.def.json b/resources/definitions/flsun_q5.def.json new file mode 100644 index 0000000000..db52b54eb6 --- /dev/null +++ b/resources/definitions/flsun_q5.def.json @@ -0,0 +1,46 @@ +{ + "version": 2, + "name": "Flsun Q5", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "manufacturer": "Flsun", + "author": "Daniel Kreuzhofer", + "file_formats": "text/x-gcode", + "machine_extruder_trains": { + "0": "flsun_q5_extruder" + } + }, + "overrides": { + "machine_extruder_count": { + "default_value": 1 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_width": { + "default_value": 200 + }, + "machine_height": { + "default_value": 200 + }, + "machine_depth": { + "default_value": 200 + }, + "machine_center_is_zero": { + "default_value": true + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_start_gcode": { + "default_value": ";FLAVOR:Marlin\r\nM82 ;absolute extrusion mode\r\nG21\r\nG90\r\nM82\r\nM107 T0\r\nG28\r\nG92 E0\r\nG0 E3 F200\r\nG92 E0 ; reset extrusion distance\r\nM106 S255 ; Enable cooling fan full speed\r\nG1 X-98 Y0 Z0.4 F3000 ; move to arc start\r\nG3 X0 Y-98 I98 Z0.4 E40 F400 ; lay arc stripe 90deg\r\nG92 E0 ; reset extrusion distance\r\nG4 P500 ; wait for 0.5 sec\r\nG0 Z10 E-1 ; Lift 15mm and retract 1mm filament\r\nG4 P2000 ; wait for 5 sec\r\nG0 Z15\r\nM107 ; Disable cooling fan\r\nG1 X0 Y-85 Z4 E0 F3000 ; get off the bed" + }, + "machine_end_gcode": { + "default_value": "M104 S0\r\nM140 S0\r\nG92 E1\r\nG1 E-1 F300\r\nG28 X0 Y0\r\nM84\r\nM82 ;absolute extrusion mode\r\nM104 S0" + }, + "machine_shape": { + "default_value": "elliptic" + } + } +} diff --git a/resources/definitions/flsun_qq.def.json b/resources/definitions/flsun_qq.def.json index 02b3849c12..6c32fea5e3 100644 --- a/resources/definitions/flsun_qq.def.json +++ b/resources/definitions/flsun_qq.def.json @@ -1,10 +1,10 @@ { "version": 2, - "name": "FLSUN QQ", + "name": "Flsun QQ", "inherits": "fdmprinter", "metadata": { "visible": true, - "manufacturer": "FLSUN", + "manufacturer": "Flsun", "author": "Daniel Green", "file_formats": "text/x-gcode", "machine_extruder_trains": { diff --git a/resources/definitions/flsun_qq_s.def.json b/resources/definitions/flsun_qq_s.def.json index 241c399cf5..024531a28d 100644 --- a/resources/definitions/flsun_qq_s.def.json +++ b/resources/definitions/flsun_qq_s.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "FLSUN QQ-S", + "name": "Flsun QQ-S", "inherits": "fdmprinter", "metadata": { "visible": true, "author": "Cataldo URSO & Eddy Emck ", - "manufacturer": "FLSUN", + "manufacturer": "Flsun", "platform": "flsun_qq_s.3mf", "file_formats": "text/x-gcode", "has_materials": true, diff --git a/resources/definitions/flsun_sr.def.json b/resources/definitions/flsun_sr.def.json new file mode 100644 index 0000000000..9f68c129bd --- /dev/null +++ b/resources/definitions/flsun_sr.def.json @@ -0,0 +1,76 @@ +{ + "version": 2, + "name": "FlSun SuperRacer", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Thushan Fernando", + "manufacturer": "Flsun", + "platform": "flsun_sr.3mf", + "file_formats": "text/x-gcode", + "has_materials": true, + "has_machine_quality": false, + "preferred_quality_type": "fast", + "machine_extruder_trains": { + "0": "flsun_sr_extruder_0" + } + }, + "overrides": { + "machine_extruder_count": { + "default_value": 1 + }, + "retraction_enable": { + "default_value": true + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_width": { + "default_value": 260 + }, + "machine_depth": { + "default_value": 260 + }, + "machine_height": { + "default_value": 330 + }, + "machine_center_is_zero": { + "default_value": true + }, + "machine_head_with_fans_polygon": { + "default_value": [ + [0, 0], + [0, 0], + [0, 0], + [0, 0] + ] + }, + "z_seam_type": { + "value": "'back'" + }, + "gantry_height": { + "value": "0" + }, + "machine_shape": { + "default_value": "elliptic" + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + }, + "infill_sparse_density": { + "default_value": 15 + }, + "machine_start_gcode": { + "default_value": "G21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n" + }, + "machine_end_gcode": { + "default_value": "M107 T0\nM104 S0\nM104 S0 T1\nM140 S0\nG92 E0\nG91\nG1 E-1 F300 \nG1 Z+0.5 E-5 F6000\nG28 X0 Y0\nG90 ;absolute positioning\n" + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + } + } +} diff --git a/resources/definitions/flyingbear_base.def.json b/resources/definitions/flyingbear_base.def.json index 79a0b6ea89..a00a97deb6 100644 --- a/resources/definitions/flyingbear_base.def.json +++ b/resources/definitions/flyingbear_base.def.json @@ -22,11 +22,14 @@ "preferred_quality_type": "normal", "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", "chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "emotiontech_abs", "emotiontech_absx", + "emotiontech_acetate", "emotiontech_asax", "emotiontech_bvoh", "emotiontech_hips", @@ -150,9 +153,9 @@ "overrides": { "machine_name": { "default_value": "Flying Bear Base Printer" }, - "machine_start_gcode": { "default_value": "M220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\n;Code for nozzle cleaning and flow normalization\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.4 Y20 Z0.28 F5000.0\nG1 X10.4 Y170.0 Z0.28 F1500.0 E15\nG1 X10.1 Y170.0 Z0.28 F5000.0\nG1 X10.1 Y40 Z0.28 F1500.0 E30\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up" }, + "machine_start_gcode": { "default_value": "M220 S100 ;reset feedrate\nM221 S100 ;reset flowrate\nG90 ;use absolute coordinates\nM82 ;absolute extrusion mode\nG28 ;home\nG1 Z2 F1500 ;raise z\nG92 E0 ;reset extruder\n\nG1 X75 Y5 F5000 ;start position\nG1 Z0.28 F1500 ;lower z\nG1 E4 F500 ;prime the filament\nG1 X180 E10 F500 ;1st line\nG1 Y5.4 F5000\nG1 X75 E20 F500 ;2nd line\nG1 Z2 F1500 ;raise z\nG92 E0 ;reset extruder" }, - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract the filament\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG28 X0 Y0 ;Home X and Y\n\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" }, + "machine_end_gcode": { "default_value": "G91 ;use relative coordinates\nG1 E-4 F1500 ;retract the filament\nG1 X5 Y5 Z0.2 F5000 ;wipe\nG1 Z5 F1500 ;raise z\nG90 ;use absolute coordinates\nG1 X10 Y{machine_depth} F5000 ;park print head\n\nM107 ;turn off fan\nM104 S0 ;turn off hotend\nM140 S0 ;turn off heatbed\nM84 ;disable motors" }, "machine_heated_bed": { "default_value": true }, "machine_shape": { "default_value": "rectangular" }, @@ -256,4 +259,4 @@ "adaptive_layer_height_variation": { "value": 0.04 }, "adaptive_layer_height_variation_step": { "value": 0.04 } } -} \ No newline at end of file +} diff --git a/resources/definitions/flyingbear_ghost_4s.def.json b/resources/definitions/flyingbear_ghost_4s.def.json index 17f3578c16..08bd3a2d97 100644 --- a/resources/definitions/flyingbear_ghost_4s.def.json +++ b/resources/definitions/flyingbear_ghost_4s.def.json @@ -17,7 +17,7 @@ "machine_name": { "default_value": "Flying Bear Ghost 4S" }, "machine_width": { "default_value": 255 }, "machine_depth": { "default_value": 210 }, - "machine_height": { "default_value": 210 }, + "machine_height": { "default_value": 200 }, "machine_steps_per_mm_x": { "default_value": 80 }, "machine_steps_per_mm_y": { "default_value": 80 }, diff --git a/resources/definitions/flyingbear_ghost_5.def.json b/resources/definitions/flyingbear_ghost_5.def.json index c1cb9b0d5d..cd799f8591 100644 --- a/resources/definitions/flyingbear_ghost_5.def.json +++ b/resources/definitions/flyingbear_ghost_5.def.json @@ -15,10 +15,9 @@ "overrides": { "machine_name": { "default_value": "Flying Bear Ghost 5" }, - "machine_start_gcode": { "default_value": "M220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\n;Fix X0 Y0 being outside the bed after homing\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X1.3 Y4.8 ;Place the nozzle over the bed\nG92 X0 Y0 ;Set new X0 Y0\n\n;Code for nozzle cleaning and flow normalization\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.4 Y20 Z0.28 F5000.0\nG1 X10.4 Y170.0 Z0.28 F1500.0 E15\nG1 X10.1 Y170.0 Z0.28 F5000.0\nG1 X10.1 Y40 Z0.28 F1500.0 E30\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up" }, "machine_width": { "default_value": 255 }, "machine_depth": { "default_value": 210 }, - "machine_height": { "default_value": 210 }, + "machine_height": { "default_value": 200 }, "machine_steps_per_mm_x": { "default_value": 80 }, "machine_steps_per_mm_y": { "default_value": 80 }, diff --git a/resources/definitions/fusedform_300_doppia.def.json b/resources/definitions/fusedform_300_doppia.def.json index ed8fa719a6..6b13bc02ea 100644 --- a/resources/definitions/fusedform_300_doppia.def.json +++ b/resources/definitions/fusedform_300_doppia.def.json @@ -10,7 +10,7 @@ "overrides": { "machine_extruder_count": { "value": 2 }, "machine_name": { "default_value": "FF300 Doppia" }, - "machine_width": { "default_value": 320 }, + "machine_width": { "default_value": 360 }, "machine_depth": { "default_value": 300 }, "machine_height": { "default_value": 320 }, "machine_max_feedrate_x": { "default_value": 100 }, diff --git a/resources/definitions/fusedform_600plus_doppia.def.json b/resources/definitions/fusedform_600plus_doppia.def.json index 18959e8084..de3889c1a8 100644 --- a/resources/definitions/fusedform_600plus_doppia.def.json +++ b/resources/definitions/fusedform_600plus_doppia.def.json @@ -25,6 +25,9 @@ "machine_max_jerk_z": { "default_value": 0.3 }, "machine_max_jerk_e": { "default_value": 5 }, "acceleration_travel": {"value":900} + + + } } diff --git a/resources/definitions/fusedform_base.def.json b/resources/definitions/fusedform_base.def.json index b68ab1a449..24b841f704 100644 --- a/resources/definitions/fusedform_base.def.json +++ b/resources/definitions/fusedform_base.def.json @@ -54,7 +54,7 @@ "retraction_amount": { "default_value": 4 }, "retraction_speed": { "default_value": 70}, "retraction_min_travel": {"value":5 }, - "retraction_count_max": {"value":10 }, + "retraction_count_max": {"default_value":10 }, "retraction_extrusion_window": {"value":4 }, "retraction_hop": {"default_value":0.2}, "retraction_hop_enabled": {"value":true}, diff --git a/resources/definitions/fusedform_doppia_base.def.json b/resources/definitions/fusedform_doppia_base.def.json index 7513ea9fb4..ddee568e28 100644 --- a/resources/definitions/fusedform_doppia_base.def.json +++ b/resources/definitions/fusedform_doppia_base.def.json @@ -54,7 +54,7 @@ "retraction_amount": { "default_value": 4 }, "retraction_speed": { "default_value": 70}, "retraction_min_travel": {"value":5 }, - "retraction_count_max": {"value":10 }, + "retraction_count_max": {"default_value":10 }, "retraction_extrusion_window": {"value":4 }, "retraction_hop": {"default_value":0.2}, "retraction_hop_enabled": {"value":true}, @@ -77,7 +77,9 @@ "support_xy_distance": {"value": 0.5}, "support_z_distance": {"value": 0.3 }, + "adhesion_type": {"default_value":"skirt"}, - "adhesion_type": {"default_value":"skirt"} + "switch_extruder_retraction_amount": { "value": 6 }, + "switch_extruder_retraction_speeds": { "value": 60 } } } diff --git a/resources/definitions/geeetech_A10.def.json b/resources/definitions/geeetech_A10.def.json index c4c3eb700a..6b17223d7b 100644 --- a/resources/definitions/geeetech_A10.def.json +++ b/resources/definitions/geeetech_A10.def.json @@ -46,10 +46,10 @@ "machine_heated_bed": { "default_value": true }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { - "default_value": "G28 \nG1 Z15 F300\nM107\nG90\nM82\nM104 S215\nM140 S55\nG92 E0\nM109 S215\nM107\nG0 X10 Y20 F6000\nG1 Z0.8\nG1 F300 X180 E40\nG1 F1200 Z2\nG92 E0\nG28" + "default_value": "G28 ; Auto home\nG1 Z15 F300 ;Move up slightly\nM107 ;Off fans\nG90 ;Switch to absolute positioning\nM82 ;Extruder absolute mode\nG92 E0 ;Set position of extruder to 0\nG0 X10 Y20 F1500 ;Move to X10 Y20 at 1500mms\nG1 Z0.8 ;Move Z to 0.8\nG1 F300 X180 E40 ;Extrude a line of filament\nG1 F1200 Z2 ;Raise Z\nG92 E0 ;Set extruder position to zero\nG28 ;Auto home" }, "machine_end_gcode": { - "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" + "default_value": "G91 ;Switch to relative positioning\nG1 E-1 ;Retract filament to lower pressure\nG0 X0 Y200 ;Move hotend to left and bed forward\nM104 S0 ;Cooldown hotend\nG90 ;Switch to absolute mode\nG92 E0 ;Set extruder to zero\nM140 S0 ;Cooldown bed\nM84 ; Disable steppers" }, "machine_extruder_count": { "default_value": 1 diff --git a/resources/definitions/geeetech_a30.def.json b/resources/definitions/geeetech_a30.def.json index 1f08d37445..d4f7df139f 100644 --- a/resources/definitions/geeetech_a30.def.json +++ b/resources/definitions/geeetech_a30.def.json @@ -4,7 +4,7 @@ "inherits": "fdmprinter", "metadata": { "author": "William & Cataldo URSO", - "manufacturer": "Shenzhen Geeetech Technology", + "manufacturer": "Geeetech", "file_formats": "text/x-gcode", "visible": true, "has_materials": true, diff --git a/resources/definitions/hellbot_hidra.def.json b/resources/definitions/hellbot_hidra.def.json new file mode 100644 index 0000000000..87695dc9d0 --- /dev/null +++ b/resources/definitions/hellbot_hidra.def.json @@ -0,0 +1,59 @@ +{ + "version": 2, + "name": "Hellbot Hidra", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Hellbot Development Team", + "manufacturer": "Hellbot", + "file_formats": "text/x-gcode", + "platform": "hellbot_hidra.obj", + "platform_offset": [0, 0, 5], + "platform_texture": "hellbot_hidra.png", + "has_materials": true, + "machine_extruder_trains": + { + "0": "hellbot_hidra_extruder_0", + "1": "hellbot_hidra_extruder_1" + } + + }, + + "overrides": { + "machine_name": { "default_value": "Hellbot Hidra" }, + "machine_width": { + "default_value": 220 + }, + "machine_depth": { + "default_value": 220 + }, + "machine_height": { + "default_value": 250 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [ -75, 35 ], + [ -75, -18 ], + [ 18, 35 ], + [ 18, -18 ] + ] + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_start_gcode": { + "default_value": "G21; Unidades en Milimetro\nG90; Posicionamiento Absoluto\nM82; E Absoluto\nM107; Apagar Venitilador de capas\nG28; Llevar ejes a origen\nG1 Z15.0 F9000; Levantar Eje Z 15mm" + }, + "machine_end_gcode": { + "default_value": "M104 T0 S0; Apagar Extrusor E0\nM104 T1 S0; Apagar Extrusor E1\nM140 S0; Apagar Cama Caliente\nG92 E1; Posicionar Extrusor en 1mm\nG1 E-1 F300; Retraer Extrusor 1mm\nG28 X0 Y0; Llevar al origen ejes X e Y\nM84; Desactivar Motores " + } + + } +} diff --git a/resources/definitions/hellbot_hidra_plus.def.json b/resources/definitions/hellbot_hidra_plus.def.json new file mode 100644 index 0000000000..9ff7a40ecd --- /dev/null +++ b/resources/definitions/hellbot_hidra_plus.def.json @@ -0,0 +1,59 @@ +{ + "version": 2, + "name": "Hellbot Hidra Plus", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Hellbot Development Team", + "manufacturer": "Hellbot", + "file_formats": "text/x-gcode", + "platform": "hellbot_hidra_plus.obj", + "platform_offset": [0, 0, 5], + "platform_texture": "hellbot_hidra_plus.png", + "has_materials": true, + "machine_extruder_trains": + { + "0": "hellbot_hidra_plus_extruder_0", + "1": "hellbot_hidra_plus_extruder_1" + } + + }, + + "overrides": { + "machine_name": { "default_value": "Hellbot Hidra Plus" }, + "machine_width": { + "default_value": 305 + }, + "machine_depth": { + "default_value": 305 + }, + "machine_height": { + "default_value": 350 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [ -75, 35 ], + [ -75, -18 ], + [ 18, 35 ], + [ 18, -18 ] + ] + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_start_gcode": { + "default_value": "G21; Unidades en Milimetro\nG90; Posicionamiento Absoluto\nM82; E Absoluto\nM107; Apagar Venitilador de capas\nG28; Llevar ejes a origen\nG1 Z15.0 F9000; Levantar Eje Z 15mm" + }, + "machine_end_gcode": { + "default_value": "M104 T0 S0; Apagar Extrusor E0\nM104 T1 S0; Apagar Extrusor E1\nM140 S0; Apagar Cama Caliente\nG92 E1; Posicionar Extrusor en 1mm\nG1 E-1 F300; Retraer Extrusor 1mm\nG28 X0 Y0; Llevar al origen ejes X e Y\nM84; Desactivar Motores " + } + + } +} diff --git a/resources/definitions/hellbot_magna_2_230.def.json b/resources/definitions/hellbot_magna_2_230.def.json new file mode 100644 index 0000000000..0dedd0b71a --- /dev/null +++ b/resources/definitions/hellbot_magna_2_230.def.json @@ -0,0 +1,42 @@ +{ + "version": 2, + "name": "Hellbot Magna 2 230", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Hellbot Development Team", + "manufacturer": "Hellbot", + "file_formats": "text/x-gcode", + "platform": "Hellbot_Magna_2_230.obj", + "platform_texture": "Magna2_230.png", + "has_materials": true, + "machine_extruder_trains": + { + "0": "hellbot_magna_2_230_extruder_0" + } + + }, + + "overrides": { + "machine_name": { "default_value": "Hellbot Magna 2 230" }, + "machine_width": { + "default_value": 230 + }, + "machine_height": { + "default_value": 250 + }, + "machine_depth": { + "default_value": 230 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_extruder_count": { + "default_value": 1 + } + + } +} diff --git a/resources/definitions/hellbot_magna_2_230_dual.def.json b/resources/definitions/hellbot_magna_2_230_dual.def.json new file mode 100644 index 0000000000..ad15ddf264 --- /dev/null +++ b/resources/definitions/hellbot_magna_2_230_dual.def.json @@ -0,0 +1,49 @@ +{ + "version": 2, + "name": "Hellbot Magna 2 230 dual", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Hellbot Development Team", + "manufacturer": "Hellbot", + "file_formats": "text/x-gcode", + "platform": "Hellbot_Magna_2_230.obj", + "platform_texture": "Magna2_230.png", + "has_materials": true, + "machine_extruder_trains": + { + "0": "hellbot_magna_2_230_dual_extruder_0", + "1": "hellbot_magna_2_230_dual_extruder_1" + } + + }, + + "overrides": { + "machine_name": { "default_value": "Hellbot Magna 2 230 dual" }, + "machine_width": { + "default_value": 230 + }, + "machine_height": { + "default_value": 250 + }, + "machine_depth": { + "default_value": 230 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_start_gcode": { + "default_value": "G21\nG90\nM107\nG28 X0 Y0\nG28 Z0\nG1 Z15.0 F300\nT0\nG92 E0\nG1 F700 E-80\nT1\nG92 E0\nG1 F1000 X1 Y1 Z0.3\nG1 F600 X200 E60\nG1 F1000 Y3\nG1 F600 X1 E120\nT1\nG92 E0\nG28 X0 Y0\nG1 F700 E-80\nT0\nG92 E0" + }, + "machine_end_gcode": { + "default_value": "M104 T0 S0\nM104 T1 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" + } + + } +} diff --git a/resources/definitions/hellbot_magna_2_300.def.json b/resources/definitions/hellbot_magna_2_300.def.json new file mode 100644 index 0000000000..8fe65de581 --- /dev/null +++ b/resources/definitions/hellbot_magna_2_300.def.json @@ -0,0 +1,42 @@ +{ + "version": 2, + "name": "Hellbot Magna 2 300", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Hellbot Development Team", + "manufacturer": "Hellbot", + "file_formats": "text/x-gcode", + "platform": "Hellbot_Magna_2_300.obj", + "platform_texture": "Magna2_300.png", + "has_materials": true, + "machine_extruder_trains": + { + "0": "hellbot_magna_2_300_extruder_0" + } + + }, + + "overrides": { + "machine_name": { "default_value": "Hellbot Magna 2 300" }, + "machine_width": { + "default_value": 300 + }, + "machine_height": { + "default_value": 400 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_extruder_count": { + "default_value": 1 + } + + } +} diff --git a/resources/definitions/hellbot_magna_2_300_dual.def.json b/resources/definitions/hellbot_magna_2_300_dual.def.json new file mode 100644 index 0000000000..cd94d03100 --- /dev/null +++ b/resources/definitions/hellbot_magna_2_300_dual.def.json @@ -0,0 +1,49 @@ +{ + "version": 2, + "name": "Hellbot Magna 2 300 dual", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Hellbot Development Team", + "manufacturer": "Hellbot", + "file_formats": "text/x-gcode", + "platform": "Hellbot_Magna_2_300.obj", + "platform_texture": "Magna2_300.png", + "has_materials": true, + "machine_extruder_trains": + { + "0": "hellbot_magna_2_300_dual_extruder_0", + "1": "hellbot_magna_2_300_dual_extruder_1" + } + + }, + + "overrides": { + "machine_name": { "default_value": "Hellbot Magna 2 300 Dual" }, + "machine_width": { + "default_value": 300 + }, + "machine_height": { + "default_value": 400 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_start_gcode": { + "default_value": "G21\nG90\nM107\nG28 X0 Y0\nG28 Z0\nG1 Z15.0 F300\nT0\nG92 E0\nG1 F700 E-80\nT1\nG92 E0\nG1 F1000 X1 Y1 Z0.3\nG1 F600 X200 E60\nG1 F1000 Y3\nG1 F600 X1 E120\nT1\nG92 E0\nG28 X0 Y0\nG1 F700 E-80\nT0\nG92 E0" + }, + "machine_end_gcode": { + "default_value": "M104 T0 S0\nM104 T1 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" + } + + } +} diff --git a/resources/definitions/hellbot_magna_I.def.json b/resources/definitions/hellbot_magna_I.def.json index 453dcef718..777ed40954 100644 --- a/resources/definitions/hellbot_magna_I.def.json +++ b/resources/definitions/hellbot_magna_I.def.json @@ -4,7 +4,7 @@ "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "MUX team", + "author": "Hellbot Development Team", "manufacturer": "Hellbot", "file_formats": "text/x-gcode", "platform": "hellbot_magna.obj", @@ -19,6 +19,7 @@ "machine_name": { "default_value": "Hellbot Magna 1" }, + "machine_heated_bed": { "default_value": true }, "machine_width": { "default_value": 220 }, diff --git a/resources/definitions/hellbot_magna_dual.def.json b/resources/definitions/hellbot_magna_dual.def.json index 5ee36e0749..feaee38419 100644 --- a/resources/definitions/hellbot_magna_dual.def.json +++ b/resources/definitions/hellbot_magna_dual.def.json @@ -1,10 +1,10 @@ { "version": 2, - "name": "Hellbot Magna DUAL", + "name": "Hellbot Magna Dual", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "MUX team", + "author": "Hellbot Development Team", "manufacturer": "Hellbot", "file_formats": "text/x-gcode", "platform": "hellbot_magna.obj", @@ -26,6 +26,9 @@ "machine_depth": { "default_value": 220 }, + "machine_heated_bed": { + "default_value": true + }, "machine_height": { "default_value": 260 }, diff --git a/resources/definitions/helloBEEprusa.def.json b/resources/definitions/helloBEEprusa.def.json index 3ef938d7e3..ad1c9fd699 100644 --- a/resources/definitions/helloBEEprusa.def.json +++ b/resources/definitions/helloBEEprusa.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "Hello BEE Prusa", + "name": "Hello Bee Prusa", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "BEEVERYCREATIVE", - "manufacturer": "BEEVERYCREATIVE", + "author": "Beeverycreative", + "manufacturer": "Beeverycreative", "platform": "BEEVERYCREATIVE-helloBEEprusa.3mf", "platform_offset": [-226, -75, -196], "file_formats": "text/x-gcode", diff --git a/resources/definitions/ideagen3D_sapphire_plus.def.json b/resources/definitions/ideagen3D_sapphire_plus.def.json index 6a7e7d6bb0..55f471793a 100644 --- a/resources/definitions/ideagen3D_sapphire_plus.def.json +++ b/resources/definitions/ideagen3D_sapphire_plus.def.json @@ -1,12 +1,12 @@ { "version": 2, - "name": "ideagen3D Sapphire Plus", + "name": "Ideagen3D Sapphire Plus", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "ideagen3D", - "manufacturer": "ideagen3D", + "author": "Ideagen3D", + "manufacturer": "Ideagen3D", "file_formats": "text/x-gcode", "platform": "ideagen3D_sapphire_plus.3mf", "has_materials": true, @@ -21,14 +21,14 @@ "machine_depth": { "default_value": 300 }, "machine_height": { "default_value": 350 }, "machine_head_with_fans_polygon": { "default_value": [ - [-20, -10], - [-20, 10], - [10, -10], - [10, 10] + [-30, -20], + [-30, 40], + [30, -20], + [30, 40] ] }, - "machine_start_gcode": { "default_value": ";Start GCode by ideagen3D\n\nG1 Z15.0 F6000 ;Move the platform down 15mm\n\n;Initialize Temperature\nM140 S{material_bed_temperature_layer_0} ;heat bed and continue\nM104 S{material_print_temperature_layer_0} ;heat nozzle and continue\nM190 S{material_bed_temperature_layer_0} ;wait for bed temperature to reach inital layer temperature\nM109 S{material_print_temperature_layer_0} ;wait for hot end temperature to reach inital layer temperature\n\nG28 ;Home\n\n;Prime the extruder\nG92 E0\nG1 X1 Y280 Z0.2 ;Prepare to Purge\nG1 Y20 Z0.2 F1500.0 E15 ;Purge line\nG92 E0" }, + "machine_start_gcode": { "default_value": ";Start GCode by ideagen3D\n\nG1 Z15.0 F6000 ;Move the platform down 15mm\n\n;Initialize Temperature\nM140 S{material_bed_temperature_layer_0} ;heat bed and continue\nM104 S{material_print_temperature_layer_0} ;heat nozzle and continue\nM190 S{material_bed_temperature_layer_0} ;wait for bed temperature to reach inital layer temperature\nM109 S{material_print_temperature_layer_0} ;wait for hot end temperature to reach inital layer temperature\n\nG28 M420 S1 ; Home & Enable Bed Levelling\n\n;Prime the extruder\nG92 E0\nG1 X1 Y280 Z0.2 ;Prepare to Purge\nG1 Y20 Z0.2 F1500.0 E15 ;Purge line\nG92 E0" }, "machine_end_gcode": { "default_value": ";End GCode by ideagen3D\n\nM104 S0 ;Set nozzle temperature to 0\nM140 S0 ;Set Bed temperature to 0\n\nG92 E1 ;Prepare to retract filament\nG1 E-1 F300 ;Retract filament\nG28 X0 Y0 ;Home X and Y\nM84 ;Disable Steppers" }, - "gantry_height": { "value": 350 } + "gantry_height": { "value": 65 } } -} \ No newline at end of file +} diff --git a/resources/definitions/imade3d_jellybox.def.json b/resources/definitions/imade3d_jellybox.def.json index 9e481dbe0e..134ccc720c 100644 --- a/resources/definitions/imade3d_jellybox.def.json +++ b/resources/definitions/imade3d_jellybox.def.json @@ -1,10 +1,10 @@ { "version": 2, - "name": "IMADE3D JellyBOX Original", + "name": "Imade3D JellyBOX Original", "inherits": "imade3d_jellybox_root", "metadata": { "visible": true, - "author": "IMADE3D", + "author": "Imade3D", "platform": "imade3d_jellybox_platform.3mf", "platform_offset": [ 0, -0.3, 0], "preferred_variant_name": "0.4 mm", diff --git a/resources/definitions/imade3d_jellybox_2.def.json b/resources/definitions/imade3d_jellybox_2.def.json index 3cb035bdd1..1774da0b1c 100644 --- a/resources/definitions/imade3d_jellybox_2.def.json +++ b/resources/definitions/imade3d_jellybox_2.def.json @@ -1,10 +1,10 @@ { "version": 2, - "name": "IMADE3D JellyBOX 2", + "name": "Imade3D JellyBOX 2", "inherits": "imade3d_jellybox_root", "metadata": { "visible": true, - "author": "IMADE3D", + "author": "Imade3D", "platform": "imade3d_jellybox_2_platform.3mf", "platform_offset": [ 0, -10, 0], "preferred_variant_name": "0.4 mm", diff --git a/resources/definitions/imade3d_jellybox_root.def.json b/resources/definitions/imade3d_jellybox_root.def.json index f631fcb673..5de6d9dae1 100644 --- a/resources/definitions/imade3d_jellybox_root.def.json +++ b/resources/definitions/imade3d_jellybox_root.def.json @@ -3,8 +3,8 @@ "name": "imade3d_jellybox_root", "inherits": "fdmprinter", "metadata": { - "author": "IMADE3D", - "manufacturer": "IMADE3D", + "author": "Imade3D", + "manufacturer": "Imade3D", "visible": false, "file_formats": "text/x-gcode", "exclude_materials": [ diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json new file mode 100644 index 0000000000..974ae9ac5a --- /dev/null +++ b/resources/definitions/inat_base.def.json @@ -0,0 +1,469 @@ +{ + "name": "Inat Base description", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "author": "Inat s.r.o.", + "manufacturer": "Inat s.r.o.", + "file_formats": "text/x-gcode", + "visible": false, + "has_materials": true, + "has_variants": false, + "variants_name": "Extruder:", + "preferred_variant_name": "0.4mm", + "has_machine_quality": true, + "preferred_material": "generic_pla", + "preferred_quality_type": "standard", + "machine_extruder_trains": { + "0": "inat_extruder_0" + }, + "first_start_actions": [ + "MachineSettingsAction" + ] + }, + "overrides": { + "machine_start_gcode": { + "default_value": "G28 ;Home\nG0 X-2 Y150 F6000 ;Move to the side\nG0 Z0.3 F200 ;Move nozzle down\nM192 ; Wait for probe temperature to settle\nG28 Z\nG29\nG0 X0 Y0 Z30 F6000\nM84 E\nM0\nG1 Z15.0 F6000 ;Move the platform down 15mm\n" + }, + "machine_end_gcode": { + "default_value": "M400\nM104 S0\nM140 S0\nM107\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 R5 X\nG0 Y300 F3000\nM84\n" + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_shape": { + "default_value": "rectangular" + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_heated_build_volume": { + "default_value": false + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_head_with_fans_polygon": { + "default_value": [ + [ + -86, + 66 + ], + [ + 44, + 66 + ], + [ + 44, + -96 + ], + [ + -86, + -96 + ] + ] + }, + "gantry_height": { "value": 34 }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "machine_max_feedrate_x": { + "value": 200 + }, + "machine_max_feedrate_y": { + "value": 200 + }, + "machine_max_feedrate_z": { + "value": 10 + }, + "machine_max_feedrate_e": { + "value": 100 + }, + "machine_max_acceleration_x": { + "value": 500 + }, + "machine_max_acceleration_y": { + "value": 500 + }, + "machine_max_acceleration_z": { + "value": 200 + }, + "machine_max_acceleration_e": { + "value": 2000 + }, + "machine_acceleration": { + "value": 500 + }, + "machine_max_jerk_xy": { + "value": 8 + }, + "machine_max_jerk_z": { + "value": 2.0 + }, + "machine_max_jerk_e": { + "value": 5.0 + }, + "layer_height": { + "value": 0.2 + }, + "layer_height_0": { + "value": "machine_nozzle_size / 2.0" + }, + "line_width": { + "value": "1.05 * machine_nozzle_size", + "minimum_value_warning": "0.8 * machine_nozzle_size", + "maximum_value_warning": "1.6 * machine_nozzle_size" + }, + "wall_thickness": { + "value": "max(3*wall_line_width, 1)" + }, + "roofing_layer_count": { + "value": 2 + }, + "top_bottom_thickness": { + "value": 1.0 + }, + "top_bottom_pattern": { + "value": "'zigzag'" + }, + "optimize_wall_printing_order": { + "value": true + }, + "xy_offset_layer_0": { + "value": "-0.5*line_width" + }, + "skin_outline_count": { + "value": 2 + }, + "infill_sparse_density": { + "value": 30 + }, + "infill_pattern": { + "value": "'zigzag' if infill_sparse_density > 50 else 'cubic'" + }, + "infill_sparse_thickness": { + "value": "layer_height if (2*layer_height > 0.8*machine_nozzle_size) else 2*layer_height" + }, + "infill_before_walls": { + "value": false + }, + "expand_skins_expand_distance": { + "value": "4" + }, + "default_material_print_temperature": { + "maximum_value_warning": "470", + "maximum_value": "470" + }, + "material_print_temperature": { + "maximum_value_warning": "470", + "maximum_value": "470" + }, + "material_print_temperature_layer_0": { + "value": "material_print_temperature", + "maximum_value_warning": "470", + "maximum_value": "470" + }, + "material_initial_print_temperature": { + "value": "material_print_temperature", + "maximum_value_warning": "470", + "maximum_value": "470" + }, + "material_final_print_temperature": { + "value": "material_print_temperature", + "maximum_value_warning": "470", + "maximum_value": "470" + }, + "default_material_bed_temperature": { + "maximum_value_warning": "150", + "maximum_value": "150" + }, + "material_bed_temperature": { + "maximum_value_warning": "150", + "maximum_value": "150" + }, + "material_bed_temperature_layer_0": { + "maximum_value_warning": "150", + "maximum_value": "150" + }, + "speed_infill": { + "value": "speed_print" + }, + "speed_wall": { + "value": "speed_print" + }, + "speed_wall_0": { + "value": "0.5 * speed_wall" + }, + "speed_wall_x": { + "value": "speed_wall" + }, + "speed_roofing": { + "value": "speed_wall_0" + }, + "speed_topbottom": { + "value": "speed_print" + }, + "speed_travel": { + "value": "150" + }, + "speed_layer_0": { + "value": "30" + }, + "speed_travel_layer_0": { + "value": "0.5 * speed_travel" + }, + "speed_z_hop": { + "value": 10 + }, + "acceleration_print": { + "minimum_value_warning": "100", + "maximum_value_warning": "1500", + "value": 500 + }, + "acceleration_infill": { + "minimum_value_warning": "100", + "maximum_value_warning": "1500" + }, + "acceleration_wall": { + "minimum_value_warning": "100", + "maximum_value_warning": "1500" + }, + "acceleration_wall_0": { + "minimum_value_warning": "100", + "maximum_value_warning": "1500" + }, + "acceleration_wall_x": { + "minimum_value_warning": "100", + "maximum_value_warning": "1500" + }, + "acceleration_roofing": { + "minimum_value_warning": "100", + "maximum_value_warning": "1500" + }, + "acceleration_topbottom": { + "minimum_value_warning": "100", + "maximum_value_warning": "1500" + }, + "acceleration_support": { + "minimum_value_warning": "100", + "maximum_value_warning": "1500" + }, + "acceleration_support_infill": { + "minimum_value_warning": "100", + "maximum_value_warning": "1500" + }, + "acceleration_support_interface": { + "minimum_value_warning": "100", + "maximum_value_warning": "1500" + }, + "acceleration_support_roof": { + "minimum_value_warning": "100", + "maximum_value_warning": "1500" + }, + "acceleration_support_bottom": { + "minimum_value_warning": "100", + "maximum_value_warning": "1500" + }, + "acceleration_prime_tower": { + "minimum_value_warning": "100", + "maximum_value_warning": "1500" + }, + "acceleration_travel": { + "value": "acceleration_print", + "minimum_value_warning": "100", + "maximum_value_warning": "1500" + }, + "acceleration_layer_0": { + "minimum_value_warning": "100", + "maximum_value_warning": "1500" + }, + "acceleration_print_layer_0": { + "minimum_value_warning": "100", + "maximum_value_warning": "1500" + }, + "acceleration_travel_layer_0": { + "minimum_value_warning": "100", + "maximum_value_warning": "1500" + }, + "acceleration_skirt_brim": { + "minimum_value_warning": "100", + "maximum_value_warning": "1500" + }, + "jerk_print": { + "maximum_value_warning": "20", + "value": 8 + }, + "jerk_infill": { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_wall": { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_wall_0": { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_wall_x": { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_roofing": { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_topbottom": { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_support": { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_support_infill": { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_support_interface": { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_support_roof": { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_support_bottom": { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_prime_tower": { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_travel": { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_layer_0": { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_print_layer_0": { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_travel_layer_0": { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_skirt_brim": { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "retraction_amount": { + "value": 1.8, + "maximum_value_warning": "2.0" + }, + "retraction_speed": { + "value": 45 + }, + "retraction_combing": { + "value": "infill" + }, + "retraction_hop_enabled": { + "value": true + }, + "retraction_hop": { + "value": "3*layer_height" + }, + "cool_fan_speed_min": { + "value": "0.5*cool_fan_speed" + }, + "cool_min_layer_time_fan_speed_max": { + "value": 10 + }, + "support_angle": { + "value": 60 + }, + "support_wall_count": { + "value": "1 if (support_structure == 'tree') else 0" + }, + "support_infill_rate": { + "value": 10 + }, + "support_infill_angles": { + "value": "[45]" + }, + "support_z_distance": { + "value": "layer_height if (2*layer_height > 0.8*machine_nozzle_size) else (2*layer_height)" + }, + "support_join_distance": { + "value": 5.0 + }, + "support_offset": { + "value": 3.0 + }, + "support_infill_sparse_thickness": { + "value": "infill_sparse_thickness" + }, + "support_interface_enable": { + "value": true + }, + "support_interface_height": { + "value": 1.0 + }, + "support_interface_density": { + "value": 80 + }, + "support_interface_pattern": { + "value": "'grid'" + }, + "support_interface_offset": { + "value": "support_offset" + }, + "support_fan_enable": { + "value": true + }, + "support_use_towers": { + "value": false + }, + "support_tree_angle": { + "value": 60 + }, + "adhesion_type": { + "value": "'skirt'" + }, + "skirt_line_count": { + "value": 5 + }, + "skirt_brim_minimal_length": { + "value": 500 + }, + "skirt_gap": { + "value": 10 + }, + "brim_outside_only": { + "value": false + }, + "raft_margin": { + "value": 10 + }, + "raft_airgap": { + "value": "0.5 * layer_height" + }, + "raft_interface_thickness": { + "value": "0.8*machine_nozzle_size", + "maximum_value_warning": "0.8 * machine_nozzle_size" + }, + "raft_interface_line_width": { + "value": "line_width" + }, + "raft_base_line_width": { + "value": "raft_interface_line_width" + }, + "raft_base_speed": { + "value": "speed_layer_0" + } + } +} \ No newline at end of file diff --git a/resources/definitions/inat_proton_x_rail.def.json b/resources/definitions/inat_proton_x_rail.def.json new file mode 100644 index 0000000000..ffaca10bdf --- /dev/null +++ b/resources/definitions/inat_proton_x_rail.def.json @@ -0,0 +1,31 @@ +{ + + "name": "Proton X Rail", + "version": 2, + "inherits": "inat_base", + "metadata": { + "visible": true, + "quality_definition": "inat_base", + "platform": "inat_proton_x_buildplate.stl", + "platform_offset": [ 0, -1.1, 0] + }, + "overrides": { + "machine_name": { "default_value": "Proton X Rail" }, + "machine_width": { "default_value": 304 }, + "machine_depth": { "default_value": 304 }, + "machine_height": { "default_value": 300 }, + "machine_max_acceleration_x": { + "value": 500 + }, + "machine_max_acceleration_y": { + "value": 800 + }, + "machine_max_acceleration_z": { + "value": 200 + }, + "machine_max_jerk_xy": { + "value": 10 + } + + } +} \ No newline at end of file diff --git a/resources/definitions/inat_proton_x_rod.def.json b/resources/definitions/inat_proton_x_rod.def.json new file mode 100644 index 0000000000..1c3592bbd3 --- /dev/null +++ b/resources/definitions/inat_proton_x_rod.def.json @@ -0,0 +1,18 @@ +{ + + "name": "Proton X Rod", + "version": 2, + "inherits": "inat_base", + "metadata": { + "visible": true, + "quality_definition": "inat_base", + "platform": "inat_proton_x_buildplate.stl", + "platform_offset": [ 0, -1.1, 0] + }, + "overrides": { + "machine_name": { "default_value": "Proton X Rod" }, + "machine_width": { "default_value": 304 }, + "machine_depth": { "default_value": 304 }, + "machine_height": { "default_value": 300 } + } +} \ No newline at end of file diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json index a38bf98a5a..e930b994c3 100644 --- a/resources/definitions/innovo_inventor.def.json +++ b/resources/definitions/innovo_inventor.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Innovo INVENTOR", + "name": "Innovo Inventor", "inherits": "fdmprinter", "metadata": { "visible": true, diff --git a/resources/definitions/jgaurora_a6.def.json b/resources/definitions/jgaurora_a6.def.json new file mode 100644 index 0000000000..523285c8e5 --- /dev/null +++ b/resources/definitions/jgaurora_a6.def.json @@ -0,0 +1,48 @@ +{ + "version": 2, + "name": "JGAurora A6", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "CrissR", + "manufacturer": "JGAurora", + "file_formats": "text/x-gcode", + "platform": "jgaurora_a6_platform.stl", + "supports_usb_connection": true, + "supports_network_connection": false, + "has_machine_quality": true, + "quality_definition": "jgaurora_a6", + "has_variants": false, + "preferred_quality_type": "normal", + "machine_extruder_trains": + { + "0": "jgaurora_a6_extruder_0" + } + }, + + "overrides": { + "machine_name": { "default_value": "JGAurora A6" }, + "machine_heated_bed": { "default_value": true }, + "machine_width": { "default_value": 300 }, + "machine_height": { "default_value": 200 }, + "machine_depth": { "default_value": 200 }, + "machine_center_is_zero": { "default_value": false }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "layer_height": { "default_value": 0.16 }, + "layer_height_0": { "default_value": 0.2 }, + "retraction_enable": { "default_value": true }, + "retraction_amount": { "default_value": 4 }, + "retraction_speed": { "default_value": 45 }, + "adhesion_type": { "default_value": "skirt" }, + "speed_print": { "default_value": 60}, + "gantry_height": { "value": 10 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { + "default_value": "M190 S{print_bed_temperature} ;bed temperature line\nM109 S{print_temperature} ;temperature line\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{travel_speed} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nF200 E3;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{travel_speed}\nG1 Z0.0 F{travel_speed}\nM117 Printing... ;LCD Message" + }, + "machine_end_gcode": { + "default_value": "M104 S0 ;extruder heater off\nM140 S0;heated bed heater off\nG91;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\nG28 X0 Y0;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90;absolute positioning\nM104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X178 Y180 F4200 ; park print head\nM84 ; disable motors" + } + } +} diff --git a/resources/definitions/kemiq_q2_beta.def.json b/resources/definitions/kemiq_q2_beta.def.json index 8eb7954e69..8957e75a28 100644 --- a/resources/definitions/kemiq_q2_beta.def.json +++ b/resources/definitions/kemiq_q2_beta.def.json @@ -4,8 +4,8 @@ "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "KEMIQ", - "manufacturer": "KEMIQ", + "author": "Kemiq", + "manufacturer": "Kemiq", "file_formats": "text/x-gcode", "platform": "kemiq_q2.3mf", "has_machine_quality": true, diff --git a/resources/definitions/kemiq_q2_gama.def.json b/resources/definitions/kemiq_q2_gama.def.json index f30cce0311..6bb99125ef 100644 --- a/resources/definitions/kemiq_q2_gama.def.json +++ b/resources/definitions/kemiq_q2_gama.def.json @@ -4,8 +4,8 @@ "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "KEMIQ", - "manufacturer": "KEMIQ", + "author": "Kemiq", + "manufacturer": "Kemiq", "file_formats": "text/x-gcode", "platform": "kemiq_q2.3mf", "has_machine_quality": true, diff --git a/resources/definitions/kosher.def.json b/resources/definitions/kosher.def.json new file mode 100644 index 0000000000..f769d7c7a9 --- /dev/null +++ b/resources/definitions/kosher.def.json @@ -0,0 +1,53 @@ +{ + "version": 2, + "name": "Kosher", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Venkat Kamesh", + "manufacturer": "Sri Vignan Technologies", + "weight": 3, + "file_formats": "text/x-gcode", + "platform": "ultimaker3_platform.obj", + "platform_texture": "koshertext.png", + "platform_offset": [0, 0, 0], + "has_material": true, + "has_variants": true, + "preferred_variant_name": "0.4 mm Nozzle", + "machine_extruder_trains": + { + "0": "kosher_extruder_0", + "1": "kosher_extruder_1" + } + }, + + "overrides": { + "machine_name": { "default_value": "Kosher" }, + "machine_width": { "default_value": 220 }, + "machine_height": { "default_value": 300 }, + "machine_depth": { "default_value": 220 }, + "machine_heated_bed": { "default_value": true }, + "machine_acceleration": {"default_value": 3000}, + "machine_max_feedrate_x": { "value": 300 }, + "machine_max_feedrate_y": { "value": 300 }, + "machine_max_feedrate_z": { "value": 40 }, + "machine_max_feedrate_e": { "value": 150 }, + "machine_use_extruder_offset_to_offset_coords": {"default_value": false}, + "machine_center_is_zero": {"default_value": false}, + "gantry_height": {"value": "48"}, + "line_width": {"value": "machine_nozzle_size"}, + "speed_travel": {"maximum_value": "300", "value": "200"}, + "optimize_wall_printing_order": { "value": "True" }, + "material_diameter": { "default_value": 1.75}, + "retraction_amount": {"default_value": 6.5}, + "retraction_speed": { "default_value": 30}, + + "adhesion_type": { "default_value": "skirt" }, + "machine_gcode_flavor": { "default_value": "Marlin"}, + "ironing_enabled":{"default_value": true}, + + "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nG28\nT1\nG92 E0\nG1 E16 F210\nG92 E0\nT0\nG92 E0\nG1 E16 F210\nG92 E0\n" }, + "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nG28 X0 Y0\nT0\nM605 S1\nM84" }, + "machine_extruder_count": { "default_value": 2 } + } +} diff --git a/resources/definitions/kosher_duplication.def.json b/resources/definitions/kosher_duplication.def.json new file mode 100644 index 0000000000..f7add08a8b --- /dev/null +++ b/resources/definitions/kosher_duplication.def.json @@ -0,0 +1,51 @@ +{ + "version": 2, + "name": "Kosher Duplication", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Venkat Kamesh", + "manufacturer": "Sri Vignan Technologies", + "weight": 3, + "file_formats": "text/x-gcode", + "platform": "ultimaker3_platform.obj", + "platform_texture": "koshertext.png", + "platform_offset": [52.5, 0, 0], + "has_material": true, + "has_variants": true, + "preferred_variant_name": "0.4 mm Nozzle", + "machine_extruder_trains": + { + "0": "kosher_dm_extruder" + } + }, + + "overrides": { + "machine_name": { "default_value": "Kosher_Duplication" }, + "machine_width": { "default_value": 100 }, + "machine_height": { "default_value": 300 }, + "machine_depth": { "default_value": 220 }, + "machine_heated_bed": { "default_value": true }, + "machine_acceleration": {"default_value": 3000}, + "machine_max_feedrate_x": { "value": 300 }, + "machine_max_feedrate_y": { "value": 300 }, + "machine_max_feedrate_z": { "value": 40 }, + "machine_max_feedrate_e": { "value": 150 }, + "machine_use_extruder_offset_to_offset_coords": {"default_value": false}, + "machine_center_is_zero": {"default_value": false}, + "gantry_height": {"value": "48"}, + "line_width": {"value": "machine_nozzle_size"}, + "speed_travel": {"maximum_value": "300", "value": "200"}, + "optimize_wall_printing_order": { "value": "True" }, + "material_diameter": { "default_value": 1.75}, + "retraction_amount": {"default_value": 6.5}, + "retraction_speed": { "default_value": 30}, + + "adhesion_type": { "default_value": "skirt" }, + "ironing_enabled":{"default_value": true}, + "machine_gcode_flavor": { "default_value": "Marlin"}, + "machine_start_gcode": {"default_value": "M605 S0\nT0\nM605 S2 R0 X266\nG28 X\nG28 Y\nG1 X-30 F9000\nG1 Y20 F9000\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature};\nM105\nM109 S{material_print_temperature};\nG92 E0\nG1 E16 F210\nG92 E0\nM605 S2 X100\nG28 X\nG28 Z\n"}, + "machine_end_gcode": {"default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM605 S1\nG28 X\nM84"}, + "machine_extruder_count": { "default_value": 1 } + } +} diff --git a/resources/definitions/kosher_mirror.def.json b/resources/definitions/kosher_mirror.def.json new file mode 100644 index 0000000000..a7d5c6ced4 --- /dev/null +++ b/resources/definitions/kosher_mirror.def.json @@ -0,0 +1,51 @@ +{ + "version": 2, + "name": "Kosher Mirror", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Venkat Kamesh", + "manufacturer": "Sri Vignan Technologies", + "weight": 3, + "file_formats": "text/x-gcode", + "platform": "ultimaker3_platform.obj", + "platform_texture": "koshertext.png", + "platform_offset": [65, 0, 0], + "has_material": true, + "has_variants": true, + "preferred_variant_name": "0.4 mm Nozzle", + "machine_extruder_trains": + { + "0": "kosher_mm_extruder" + } + }, + + "overrides": { + "machine_name": { "default_value": "Kosher_Mirror" }, + "machine_width": { "default_value": 75 }, + "machine_height": { "default_value": 300 }, + "machine_depth": { "default_value": 220 }, + "machine_heated_bed": { "default_value": true }, + "machine_acceleration": {"default_value": 3000}, + "machine_max_feedrate_x": { "value": 300 }, + "machine_max_feedrate_y": { "value": 300 }, + "machine_max_feedrate_z": { "value": 40 }, + "machine_max_feedrate_e": { "value": 150 }, + "machine_use_extruder_offset_to_offset_coords": {"default_value": false}, + "machine_center_is_zero": {"default_value": false}, + "gantry_height": {"value": "48"}, + "line_width": {"value": "machine_nozzle_size"}, + "speed_travel": {"maximum_value": "300", "value": "200"}, + "optimize_wall_printing_order": { "value": "True" }, + "material_diameter": { "default_value": 1.75}, + "retraction_amount": {"default_value": 6.5}, + "retraction_speed": { "default_value": 30}, + + "adhesion_type": { "default_value": "skirt" }, + "ironing_enabled":{"default_value": true}, + "machine_gcode_flavor": { "default_value": "Marlin"}, + "machine_start_gcode": {"default_value": "M605 S0\nT0\nM605 S2 R0 X220\nM605 S3 X220\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature};\nM105\nM109 S{material_print_temperature};\nG28\nG1 X-50 F9000\nG92 E0\nG1 E16 F210\nG92 E0\n" }, + "machine_end_gcode": {"default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM605 S1\nG28 X\nM84"}, + "machine_extruder_count": { "default_value": 1 } + } +} diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json index bee92ac282..717c85f93b 100644 --- a/resources/definitions/kupido.def.json +++ b/resources/definitions/kupido.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "KUPIDO", + "name": "Kupido", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "ALYA", + "author": "Kupido", "manufacturer": "Kati Hal ARGE", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0], diff --git a/resources/definitions/liquid.def.json b/resources/definitions/liquid.def.json index 256968353e..744cbb9f3c 100644 --- a/resources/definitions/liquid.def.json +++ b/resources/definitions/liquid.def.json @@ -17,7 +17,7 @@ "preferred_variant_name": "VO 0.4", "preferred_quality_type": "normal", "variants_name": "Extruder", - "supports_usb_connection": false, + "supports_usb_connection": true, "nozzle_offsetting_for_disallowed_areas": false, "weight": -1, "machine_extruder_trains": @@ -102,9 +102,9 @@ "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" }, "brim_width": { "value": "3" }, "cool_fan_full_at_height": { "value": "layer_height_0 + 4 * layer_height" }, - "cool_fan_speed": { "value": "100" }, + "cool_fan_speed": { "value": "70" }, "cool_fan_speed_max": { "value": "100" }, - "cool_min_speed": { "value": "5" }, + "cool_min_speed": { "value": "30" }, "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'triangles'" }, @@ -132,14 +132,16 @@ "raft_speed": { "value": "25" }, "raft_surface_layers": { "value": "1" }, - "retraction_amount": { "value": "5" }, + "retraction_amount": { "value": "3" }, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, "retraction_hop_enabled": { "value": "True" }, "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, - "retraction_prime_speed": { "value": "15" }, + "retraction_speed": { "value": "35" }, + "retraction_retract_speed": { "value": "35" }, + "retraction_prime_speed": { "value": "35" }, "skin_overlap": { "value": "10" }, "speed_equalize_flow_enabled": { "value": "True" }, diff --git a/resources/definitions/longer_base.def.json b/resources/definitions/longer_base.def.json new file mode 100644 index 0000000000..c0d06ce135 --- /dev/null +++ b/resources/definitions/longer_base.def.json @@ -0,0 +1,170 @@ +{ + "name": "Longer Base Printer", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": false, + "author": "Longer", + "manufacturer": "Longer", + "file_formats": "text/x-gcode", + "first_start_actions": ["MachineSettingsAction"], + + "machine_extruder_trains": { + "0": "longer_base_extruder_0" + }, + + "has_materials": true, + "has_variants": true, + "has_machine_quality": true, + "variants_name": "Nozzle Size", + + "preferred_variant_name": "0.4mm Nozzle", + "preferred_quality_type": "standard", + "preferred_material": "generic_pla" + + }, + "overrides": { + "machine_name": { "default_value": "LONGER Base Printer" }, + "machine_start_gcode": { "default_value": "; LONGER Start G-code\nG21 ; metric values\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nM107 ; start with the fan off\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, + "machine_end_gcode": { "default_value": "; LONGER End G-code\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z\n" }, + + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_feedrate_e": { "value": 50 }, + + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_acceleration": { "value": 500 }, + + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_max_jerk_e": { "value": 5 }, + + "machine_heated_bed": { "default_value": true }, + + "material_diameter": { "default_value": 1.75 }, + + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, + + "jerk_print": { "value": 8 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + + "acceleration_enabled": { "value": false }, + "jerk_enabled": { "value": false }, + + "speed_print": { "value": 50.0 } , + "speed_infill": { "value": "speed_print" }, + "speed_wall": { "value": "speed_print / 2" }, + "speed_wall_0": { "value": "speed_wall" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_topbottom": { "value": "speed_print / 2" }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, + "speed_layer_0": { "value": 20.0 }, + "speed_print_layer_0": { "value": "speed_layer_0" }, + "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_z_hop": { "value": 5 }, + + "skirt_brim_speed": { "value": "speed_layer_0" }, + + "line_width": { "value": "machine_nozzle_size" }, + + "optimize_wall_printing_order": { "value": "True" }, + + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_flow": { "value": 100 }, + "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, + + "z_seam_type": { "value": "'back'" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, + + "infill_sparse_density": { "value": "20" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "skin_overlap": { "value": 10.0 }, + "infill_wipe_dist": { "value": 0.0 }, + "wall_0_wipe_dist": { "value": 0.0 }, + + "fill_perimeter_gaps": { "value": "'everywhere'" }, + "fill_outline_gaps": { "value": false }, + "filter_out_tiny_gaps": { "value": false }, + + "retraction_amount": { "default_value": 5 }, + "retraction_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": 200, + "default_value": 45 + }, + "retraction_retract_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": 200 + }, + "retraction_prime_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": 200 + }, + + "retraction_hop_enabled": { "value": "False" }, + "retraction_hop": { "value": 0.2 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, + "retraction_combing_max_distance": { "value": 30 }, + "travel_avoid_other_parts": { "value": true }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + + "retraction_enable": { "value": true }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_min_travel": { "value": 1.5 }, + + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_fan_enabled": { "value": true }, + "cool_min_layer_time": { "value": 10 }, + + "adhesion_type": { "value": "'raft'" }, + "brim_replaces_support": { "value": false }, + "skirt_gap": { "value": 10.0 }, + "skirt_line_count": { "value": 3 }, + + "adaptive_layer_height_variation": { "value": 0.04 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + + "meshfix_maximum_resolution": { "value": "0.25" }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + + "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" }, + "support_pattern": { "value": "'zigzag'" }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_use_towers": { "value": false }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_wall_count": { "value": 1 }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 4 }, + + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "minimum_support_area": { "value": 2 }, + "minimum_interface_area": { "value": 10 }, + "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, + "wall_thickness": {"value": "line_width * 2" } + + } +} diff --git a/resources/definitions/longer_cube2.def.json b/resources/definitions/longer_cube2.def.json new file mode 100644 index 0000000000..a971da6c54 --- /dev/null +++ b/resources/definitions/longer_cube2.def.json @@ -0,0 +1,34 @@ +{ + "name": "Longer Cube2", + "version": 2, + "inherits": "longer_base", + "metadata": { + "quality_definition": "longer_base", + "visible": true, + "platform": "longer_cube2_platform.stl", + "platform_offset": [-60, -3 ,70] + }, + "overrides": { + "machine_name": { "default_value": "LONGER Cube2" }, + "machine_start_gcode": { "default_value": "; LONGER Cube2 Start G-code\nG21 ; metric values\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nM107 ; start with the fan off\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y120.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y120.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, + "machine_end_gcode": { "default_value": "; LONGER Cube2 End G-code\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM84 X Y E ;Disable all steppers but Z\n" }, + + "machine_heated_bed": { "default_value": false }, + + "machine_width": { "default_value": 120 }, + "machine_depth": { "default_value": 140 }, + "machine_height": { "default_value": 105 }, + + "machine_head_with_fans_polygon": { "default_value": [ + [-22, 31], + [-22, -21], + [14, -21], + [14, 31] + ] + }, + + "gantry_height": { "value": 18 }, + + "speed_travel": { "value": 65 } + } +} diff --git a/resources/definitions/longer_lk1.def.json b/resources/definitions/longer_lk1.def.json new file mode 100644 index 0000000000..42cbb8a4d3 --- /dev/null +++ b/resources/definitions/longer_lk1.def.json @@ -0,0 +1,29 @@ +{ + "name": "Longer LK1", + "version": 2, + "inherits": "longer_base", + "metadata": { + "quality_definition": "longer_base", + "visible": true, + "platform": "longer_310mm_platform.stl", + "platform_offset": [-155, -3 ,155] + }, + "overrides": { + "machine_name": { "default_value": "LONGER LK1" }, + "machine_width": { "default_value": 300 }, + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 400 }, + + "machine_head_with_fans_polygon": { "default_value": [ + [-22, 39], + [-22, -34], + [58, -34], + [58, 39] + ] + }, + + "gantry_height": { "value": 33 }, + + "speed_travel": { "value": 65 } + } +} diff --git a/resources/definitions/longer_lk1plus.def.json b/resources/definitions/longer_lk1plus.def.json new file mode 100644 index 0000000000..46d5e424de --- /dev/null +++ b/resources/definitions/longer_lk1plus.def.json @@ -0,0 +1,29 @@ +{ + "name": "Longer LK1 Plus", + "version": 2, + "inherits": "longer_base", + "metadata": { + "quality_definition": "longer_base", + "visible": true, + "platform": "longer_415mm_platform.stl", + "platform_offset": [-207.5, -3 ,207.5] + }, + "overrides": { + "machine_name": { "default_value": "LONGER LK1 Plus" }, + "machine_width": { "default_value": 400 }, + "machine_depth": { "default_value": 400 }, + "machine_height": { "default_value": 500 }, + + "machine_head_with_fans_polygon": { "default_value": [ + [-22, 39], + [-22, -34], + [58, -34], + [58, 39] + ] + }, + + "gantry_height": { "value": 33 }, + + "speed_travel": { "value": 65 } + } +} diff --git a/resources/definitions/longer_lk1pro.def.json b/resources/definitions/longer_lk1pro.def.json new file mode 100644 index 0000000000..ee0a2e0ac7 --- /dev/null +++ b/resources/definitions/longer_lk1pro.def.json @@ -0,0 +1,27 @@ +{ + "name": "Longer LK1 Pro", + "version": 2, + "inherits": "longer_base", + "metadata": { + "quality_definition": "longer_base", + "visible": true, + "platform": "longer_310mm_platform.stl", + "platform_offset": [-155, -3 ,155] + }, + "overrides": { + "machine_name": { "default_value": "LONGER LK1 Pro" }, + "machine_width": { "default_value": 300 }, + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 400 }, + + "machine_head_with_fans_polygon": { "default_value": [ + [-22, 39], + [-22, -34], + [58, -34], + [58, 39] + ] + }, + + "gantry_height": { "value": 33 } + } +} diff --git a/resources/definitions/longer_lk4.def.json b/resources/definitions/longer_lk4.def.json new file mode 100644 index 0000000000..2639265014 --- /dev/null +++ b/resources/definitions/longer_lk4.def.json @@ -0,0 +1,29 @@ +{ + "name": "Longer LK4", + "version": 2, + "inherits": "longer_base", + "metadata": { + "quality_definition": "longer_base", + "visible": true, + "platform": "longer_235mm_platform.stl", + "platform_offset": [-117.5, -3 ,117.5] + }, + "overrides": { + "machine_name": { "default_value": "LONGER LK4" }, + "machine_width": { "default_value": 220 }, + "machine_depth": { "default_value": 220 }, + "machine_height": { "default_value": 250 }, + + "machine_head_with_fans_polygon": { "default_value": [ + [-22, 39], + [-22, -34], + [58, -34], + [58, 39] + ] + }, + + "gantry_height": { "value": 33 }, + + "speed_travel": { "value": 65 } + } +} diff --git a/resources/definitions/longer_lk4pro.def.json b/resources/definitions/longer_lk4pro.def.json new file mode 100644 index 0000000000..6cd83b6048 --- /dev/null +++ b/resources/definitions/longer_lk4pro.def.json @@ -0,0 +1,27 @@ +{ + "name": "Longer LK4 Pro", + "version": 2, + "inherits": "longer_base", + "metadata": { + "quality_definition": "longer_base", + "visible": true, + "platform": "longer_235mm_platform.stl", + "platform_offset": [-117.5, -3 ,117.5] + }, + "overrides": { + "machine_name": { "default_value": "LONGER LK4 Pro" }, + "machine_width": { "default_value": 220 }, + "machine_depth": { "default_value": 220 }, + "machine_height": { "default_value": 250 }, + + "machine_head_with_fans_polygon": { "default_value": [ + [-22, 39], + [-22, -34], + [58, -34], + [58, 39] + ] + }, + + "gantry_height": { "value": 33 } + } +} diff --git a/resources/definitions/longer_lk5.def.json b/resources/definitions/longer_lk5.def.json new file mode 100644 index 0000000000..a33026fe10 --- /dev/null +++ b/resources/definitions/longer_lk5.def.json @@ -0,0 +1,29 @@ +{ + "name": "Longer LK5", + "version": 2, + "inherits": "longer_base", + "metadata": { + "quality_definition": "longer_base", + "visible": true, + "platform": "longer_310mm_platform.stl", + "platform_offset": [-155, -3 ,155] + }, + "overrides": { + "machine_name": { "default_value": "LONGER LK5" }, + "machine_width": { "default_value": 300 }, + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 400 }, + + "machine_head_with_fans_polygon": { "default_value": [ + [-22, 39], + [-22, -34], + [58, -34], + [58, 39] + ] + }, + + "gantry_height": { "value": 33 }, + + "speed_travel": { "value": 65 } + } +} diff --git a/resources/definitions/longer_lk5pro.def.json b/resources/definitions/longer_lk5pro.def.json new file mode 100644 index 0000000000..e16038d4b7 --- /dev/null +++ b/resources/definitions/longer_lk5pro.def.json @@ -0,0 +1,27 @@ +{ + "name": "Longer LK5 Pro", + "version": 2, + "inherits": "longer_base", + "metadata": { + "quality_definition": "longer_base", + "visible": true, + "platform": "longer_310mm_platform.stl", + "platform_offset": [-155, -3 ,155] + }, + "overrides": { + "machine_name": { "default_value": "LONGER LK5 Pro" }, + "machine_width": { "default_value": 300 }, + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 400 }, + + "machine_head_with_fans_polygon": { "default_value": [ + [-22, 39], + [-22, -34], + [58, -34], + [58, 39] + ] + }, + + "gantry_height": { "value": 33 } + } +} diff --git a/resources/definitions/lotmaxx_sc60.def.json b/resources/definitions/lotmaxx_sc60.def.json index abbf68d75a..a18e197757 100644 --- a/resources/definitions/lotmaxx_sc60.def.json +++ b/resources/definitions/lotmaxx_sc60.def.json @@ -20,7 +20,7 @@ "default_value":"G28 ;Home\nG92 E0 ;Reset Extruder\nG1 Z4.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" }, "machine_end_gcode":{ - "default_value":"G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" + "default_value":"G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, "acceleration_print":{"value":1000}, "acceleration_travel":{"value":1000}, diff --git a/resources/definitions/lulzbot_mini_2_common.def.json b/resources/definitions/lulzbot_mini_2_common.def.json new file mode 100644 index 0000000000..0895a52e18 --- /dev/null +++ b/resources/definitions/lulzbot_mini_2_common.def.json @@ -0,0 +1,71 @@ +{ + "version": 2, + "name": "Lulzbot Mini 2", + "inherits": "fdmprinter", + "metadata": { + "author": "Tom Callaway ", + "manufacturer": "Fargo Additive Manufacturing Equipment 3D, LLC", + "visible": false, + "preferred_material": "generic_pla", + "exclude_materials": [ "structur3d_dap100silicone" ] + }, + "overrides": { + "machine_center_is_zero": + { + "default_value": false + }, + "machine_nozzle_size": + { + "default_value": 0.5 + }, + "machine_gcode_flavor": + { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_acceleration": + { + "default_value": 1000 + }, + "acceleration_print": + { + "default_value": 1000 + }, + "jerk_print": + { + "default_value": 20 + }, + "machine_max_feedrate_x": + { + "default_value": 800 + }, + "machine_max_feedrate_y": + { + "default_value": 800 + }, + "machine_max_feedrate_z": + { + "default_value": 8 + }, + "machine_max_feedrate_e": + { + "default_value": 40 + }, + "machine_max_acceleration_x": + { + "default_value": 9000 + }, + "machine_max_acceleration_y": + { + "default_value": 9000 + }, + "machine_max_acceleration_z": + { + "default_value": 100 + }, + "machine_max_acceleration_e": + { + "default_value": 1000 + } + } +} + diff --git a/resources/definitions/lulzbot_mini_2_se.def.json b/resources/definitions/lulzbot_mini_2_se.def.json new file mode 100644 index 0000000000..6cf43d8af4 --- /dev/null +++ b/resources/definitions/lulzbot_mini_2_se.def.json @@ -0,0 +1,38 @@ +{ + "version": 2, + "name": "Lulzbot Mini 2 | SE | 0.5 mm", + "inherits": "lulzbot_mini_2_common", + "metadata": { + "author": "Tom Callaway ", + "manufacturer": "Fargo Additive Manufacturing Equipment 3D, LLC", + "visible": true, + "file_formats": "text/x-gcode", + "platform": "lulzbot_mini.stl", + "platform_offset": [-100, -11, 100], + "machine_extruder_trains": { + "0": "lulzbot_mini_2_se_extruder" + } + }, + + "overrides": { + "machine_name": { "default_value": "Lulzbot Mini 2 | SE | 0.5 mm" }, + "machine_width": { "default_value": 162 }, + "machine_depth": { "default_value": 162 }, + "machine_height": { "default_value": 180 }, + "machine_heated_bed": { "default_value": true }, + "machine_start_gcode": { + "default_value": "; This G-Code has been generated specifically for the Lulzbot Mini 2 with SE 0.5 mm toolhead\nM73 P0 ; clear GLCD progress bar\nM75 ; start GLCD timer\nG26 ; clear potential 'probe fail' condition\nM107 ; disable fans\nM420 S0 ; disable leveling matrix\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder position to 0\nM140 S{material_bed_temperature_layer_0} ; start bed heating up\nG28 ; home all axes\nG0 X0 Y187 Z156 F200 ; move away from endstops\nM117 Mini 2 Wiping... ; progress indicator message on LCD\nM109 R{material_standby_temperature} ; soften material before retraction\nG1 E-15 F75 ; retract filament\nG1 X45 Y176 F11520 ; move above wiper pad\nG1 Z0 F1200 ; push nozzle into wiper\nG1 X45 Y178 Z-.5 F4000 ; wiping\nG1 X55 Y176 Z-.5 F4000 ; wiping\nG1 X45 Y177 Z0 F4000 ; wiping\nG1 X55 Y176 F4000 ; wiping\nG1 X45 Y178 F4000 ; wiping\nG1 X55 Y176 F4000 ; wiping\nG1 X45 Y178 F4000 ; wiping\nG1 X55 Y176 F4000 ; wiping\nG1 X60 Y178 F4000 ; wiping\nG1 X80 Y176 F4000 ; wiping\nG1 X60 Y178 F4000 ; wiping\nG1 X80 Y176 F4000 ; wiping\nG1 X60 Y178 F4000 ; wiping\nG1 X90 Y176 F4000 ; wiping\nG1 X80 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X80 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X80 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X110 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X110 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X110 Y178 F4000 ; wiping\nG1 X115 Y176 Z-0.5 F1000 ; wiping\nG1 Z10 ; raise extruder\nG28 X0 Y0 ; home X and Y\nM204 S300 ; set probing acceleration\nG29 ; start auto-leveling sequence\nM420 S1 ; enable leveling matrix\nM425 Z ; use measured Z backlash for compensation\nM425 Z F0 ; turn off measured Z backlash compensation by default\nM204 S2000 ; restore standard acceleration\nG1 X5 Y15 Z10 F5000 ; move up off last probe point\nG4 S1 ; pause\nM400 ; wait for moves to finish\nM117 Heating... ; progress indicator message on LCD\nM109 R{material_print_temperature_layer_0} ; wait for extruder to reach initial printing temp\nM190 R{material_bed_temperature_layer_0} ; wait for bed to reach printing temp\nG1 Z2 E0 F75 ; prime tiny bit of filament into the nozzle\nM117 Mini 2 Printing... ; progress indicator message on LCD\n" + }, + "machine_end_gcode": { + "default_value": "; part removal temp is hardcoded to 45\nM400 ; wait for moves to finish\nM140 S45 ; start bed cooling\nM104 S0 ; disable hotend\nM107 ; disable fans\nG92 E5 ; set extruder to 5mm for retract on print end\nM117 Cooling please wait ; progress indicator message on LCD\nG1 X5 Y5 Z183 E0 F3000 ; move to cooling position\nG1 E5 ; re-prime extruder\nM190 R45 ; wait for bed to cool down to removal temp\nG1 X145 F1000 ; move extruder out of the way\nG1 Y175 F1000 ; present finished print\nM140 S0 ; cool down\nM77 ; end LCD print timer\nG90 ; absolute positioning\nM18 X Y E ; turn off X Y and E axis\nM117 Print Complete. ; print complete message\n" + }, + "machine_disallowed_areas": { + "default_value": [ + [[ 85, 85], [ 85, 77], [ 77, 85]], + [[-85, 85], [-85, 77], [-77, 85]], + [[ 85,-85], [ 85,-77], [ 77,-85]], + [[-85,-85], [-85,-77], [-77,-85]] + ] + } + } +} diff --git a/resources/definitions/lulzbot_mini_2_sl.def.json b/resources/definitions/lulzbot_mini_2_sl.def.json new file mode 100644 index 0000000000..cecaca1541 --- /dev/null +++ b/resources/definitions/lulzbot_mini_2_sl.def.json @@ -0,0 +1,38 @@ +{ + "version": 2, + "name": "Lulzbot Mini 2 | SL | 0.25 mm (Micro)", + "inherits": "lulzbot_mini_2_common", + "metadata": { + "author": "Tom Callaway ", + "manufacturer": "Fargo Additive Manufacturing Equipment 3D, LLC", + "visible": true, + "file_formats": "text/x-gcode", + "platform": "lulzbot_mini.stl", + "platform_offset": [-100, -11, 100], + "machine_extruder_trains": { + "0": "lulzbot_mini_2_sl_extruder" + } + }, + + "overrides": { + "machine_name": { "default_value": "Lulzbot Mini 2 | SL | 0.25 mm (Micro)" }, + "machine_width": { "default_value": 162 }, + "machine_depth": { "default_value": 162 }, + "machine_height": { "default_value": 180 }, + "machine_heated_bed": { "default_value": true }, + "machine_start_gcode": { + "default_value": "; This G-Code has been generated specifically for the Lulzbot Mini 2 with SL 0.25 mm toolhead\nM73 P0 ; clear GLCD progress bar\nM75 ; start GLCD timer\nG26 ; clear potential 'probe fail' condition\nM107 ; disable fans\nM420 S0 ; disable leveling matrix\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder position to 0\nM140 S{material_bed_temperature_layer_0} ; start bed heating up\nG28 ; home all axes\nG0 X0 Y187 Z156 F200 ; move away from endstops\nM117 Mini 2 Wiping... ; progress indicator message on LCD\nM109 R{material_standby_temperature} ; soften material before retraction\nG1 E-15 F75 ; retract filament\nG1 X45 Y176 F11520 ; move above wiper pad\nG1 Z0 F1200 ; push nozzle into wiper\nG1 X45 Y178 Z-.5 F4000 ; wiping\nG1 X55 Y176 Z-.5 F4000 ; wiping\nG1 X45 Y177 Z0 F4000 ; wiping\nG1 X55 Y176 F4000 ; wiping\nG1 X45 Y178 F4000 ; wiping\nG1 X55 Y176 F4000 ; wiping\nG1 X45 Y178 F4000 ; wiping\nG1 X55 Y176 F4000 ; wiping\nG1 X60 Y178 F4000 ; wiping\nG1 X80 Y176 F4000 ; wiping\nG1 X60 Y178 F4000 ; wiping\nG1 X80 Y176 F4000 ; wiping\nG1 X60 Y178 F4000 ; wiping\nG1 X90 Y176 F4000 ; wiping\nG1 X80 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X80 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X80 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X110 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X110 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X110 Y178 F4000 ; wiping\nG1 X115 Y176 Z-0.5 F1000 ; wiping\nG1 Z10 ; raise extruder\nG28 X0 Y0 ; home X and Y\nM204 S300 ; set probing acceleration\nG29 ; start auto-leveling sequence\nM420 S1 ; enable leveling matrix\nM425 Z ; use measured Z backlash for compensation\nM425 Z F0 ; turn off measured Z backlash compensation by default\nM204 S2000 ; restore standard acceleration\nG1 X5 Y15 Z10 F5000 ; move up off last probe point\nG4 S1 ; pause\nM400 ; wait for moves to finish\nM117 Heating... ; progress indicator message on LCD\nM109 R{material_print_temperature_layer_0} ; wait for extruder to reach initial printing temp\nM190 R{material_bed_temperature_layer_0} ; wait for bed to reach printing temp\nG1 Z2 E0 F75 ; prime tiny bit of filament into the nozzle\nM117 Mini 2 Printing... ; progress indicator message on LCD\n" + }, + "machine_end_gcode": { + "default_value": "; part removal temp is hardcoded to 45\nM400 ; wait for moves to finish\nM140 S45 ; start bed cooling\nM104 S0 ; disable hotend\nM107 ; disable fans\nG92 E5 ; set extruder to 5mm for retract on print end\nM117 Cooling please wait ; progress indicator message on LCD\nG1 X5 Y5 Z183 E0 F3000 ; move to cooling position\nG1 E5 ; re-prime extruder\nM190 R45 ; wait for bed to cool down to removal temp\nG1 X145 F1000 ; move extruder out of the way\nG1 Y175 F1000 ; present finished print\nM140 S0 ; cool down\nM77 ; end LCD print timer\nG90 ; absolute positioning\nM18 X Y E ; turn off X Y and E axis\nM117 Print Complete. ; print complete message\n" + }, + "machine_disallowed_areas": { + "default_value": [ + [[ 85, 85], [ 85, 77], [ 77, 85]], + [[-85, 85], [-85, 77], [-77, 85]], + [[ 85,-85], [ 85,-77], [ 77,-85]], + [[-85,-85], [-85,-77], [-77,-85]] + ] + } + } +} diff --git a/resources/definitions/lulzbot_taz_pro_common.def.json b/resources/definitions/lulzbot_taz_pro_common.def.json new file mode 100644 index 0000000000..1e75322ae1 --- /dev/null +++ b/resources/definitions/lulzbot_taz_pro_common.def.json @@ -0,0 +1,84 @@ +{ + "version": 2, + "name": "Lulzbot TAZ Pro", + "inherits": "fdmprinter", + "metadata": { + "author": "Tom Callaway ", + "manufacturer": "Fargo Additive Manufacturing Equipment 3D, LLC", + "visible": false, + "preferred_material": "generic_pla", + "exclude_materials": [ "structur3d_dap100silicone" ] + }, + "overrides": { + "material_print_temperature": { + "minimum_value": "0" + }, + "material_bed_temperature": { + "minimum_value": "0", + "maximum_value_warning": "125" + }, + "material_bed_temperature_layer_0": + { + "maximum_value_warning": "125" + }, + "material_standby_temperature": { + "minimum_value": "0" + }, + "machine_center_is_zero": + { + "default_value": false + }, + "machine_nozzle_size": + { + "default_value": 0.5 + }, + "machine_gcode_flavor": + { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_acceleration": + { + "default_value": 500 + }, + "acceleration_print": + { + "default_value": 500 + }, + "jerk_print": + { + "default_value": 12 + }, + "machine_max_feedrate_x": + { + "default_value": 800 + }, + "machine_max_feedrate_y": + { + "default_value": 800 + }, + "machine_max_feedrate_z": + { + "default_value": 3 + }, + "machine_max_feedrate_e": + { + "default_value": 40 + }, + "machine_max_acceleration_x": + { + "default_value": 9000 + }, + "machine_max_acceleration_y": + { + "default_value": 9000 + }, + "machine_max_acceleration_z": + { + "default_value": 100 + }, + "machine_max_acceleration_e": + { + "default_value": 1000 + } + } +} diff --git a/resources/definitions/lulzbot_taz_pro_dual.def.json b/resources/definitions/lulzbot_taz_pro_dual.def.json new file mode 100644 index 0000000000..ba34e5a0ce --- /dev/null +++ b/resources/definitions/lulzbot_taz_pro_dual.def.json @@ -0,0 +1,34 @@ +{ + "version": 2, + "name": "Lulzbot TAZ Pro Dual Extruder", + "inherits": "lulzbot_taz_pro_common", + "metadata": { + "author": "Tom Callaway ", + "manufacturer": "Fargo Additive Manufacturing Equipment 3D, LLC", + "visible": true, + "file_formats": "text/x-gcode", + "platform": "lulzbot_taz_pro_bed.stl", + "platform_offset": [0, -10, 0], + "machine_extruder_trains": { + "0": "lulzbot_taz_pro_dual_extruder_0", + "1": "lulzbot_taz_pro_dual_extruder_1" + } + }, + + "overrides": { + "machine_name": { "default_value": "Lulzbot TAZ Pro" }, + "machine_width": { "default_value": 282 }, + "machine_depth": { "default_value": 286 }, + "machine_height": { "default_value": 286 }, + "machine_heated_bed": { "default_value": true }, + "machine_start_gcode": { + "default_value": "; This profile is designed specifically for the LulzBot TAZ Pro with Dual Extruder Tool Head\nM73 P0 ; clear GLCD progress bar\nM75 ; start GLCD timer\nM107 ; disable fans\nG90 ; absolute positioning\nM420 S0 ; disable previous leveling matrix\nM140 S{material_bed_temperature_layer_0} ; begin bed temping up\nM104 S{material_standby_temperature} T0 ; soften filament\nM104 S{material_standby_temperature} T1 ; soften filament\nG28 ; home\nM117 Heating... ; LCD status message\nM109 R{material_standby_temperature} T0 ; wait for temp\nM109 R{material_standby_temperature} T1 ; wait for temp\nT0 ; select this extruder first\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder to zero\nG1 E-10 F100 ; retract 10mm of filament on first extruder\nG0 X50 F1000 ; move over to switch extruders\nT1 ; switch extruders\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder to zero\nG1 E-10 F100 ; retract 10mm of filament on second extruder\nM104 S{material_standby_temperature} T0 ; set to wipe temp\nM104 S{material_standby_temperature} T1 ; set to wipe temp\nM106 ; turn on fans to speed cooling\nT0 ; select first extruder for probing\nG1 X-16.5 Y100 F2000 ; move above wiper pad\nM117 Cooling... ; LCD status message\nM109 R{material_standby_temperature} T0 ; wait for T0 to reach temp\nM109 R{material_standby_temperature} T1 ; wait for T1 to reach temp\nM107 ; turn off fan\nG1 Z 1.0 ; push nozzle into wiper\nG1 X -16.5 Y100 F1000 ; slow wipe\nG1 X -16.5 Y90 F1000 ; slow wipe\nG1 X -15.5 Y86 F2000 ; fast wipe\nG1 X -17.5 Y80 F2000 ; fast wipe\nG1 X -15.5 Y74 F2000 ; fast wipe\nG1 X -17.5 Y70 F2000 ; fast wipe\nG1 X -16.5 Y68 F1000 ; slow wipe\nG1 X -16.5 Y60 F1000 ; slow wipe\nG1 X -14.5 Y60 F1000 ; slow wipe\nG1 X -14.5 Y46 F1000 ; slow wipe\nG1 X -17.5 Y46 F1000 ; slow wipe\nG1 X -17.5 Y60 F1000 ; slow wipe\nG1 X -14.5 Y60 F1000 ; slow wipe\nG1 X -14.5 Y46 F1000 ; slow wipe\nG1 X -17.5 Y46 F1000 ; slow wipe\nG1 X -17.5 Y60 F1000 ; slow wipe\nG1 X -14.5 Y60 F1000 ; slow wipe\nG1 X -14.5 Y46 F1000 ; slow wipe\nG1 X -17.5 Y46 F1000 ; slow wipe\nG1 X -17.5 Y60 F1000 ; slow wipe\nG1 X -16.5 Y60 F1000 ; slow wipe\nG1 X -16.5 Y42 F1000 ; slow wipe\nG1 X -15.5 Y40 F2000 ; fast wipe\nG1 X -17.5 Y38 F2000 ; fast wipe\nG1 X -15.5 Y36 F2000 ; fast wipe\nG1 X -17.5 Y34 F2000 ; fast wipe\nG1 X -16.5 Y30 F1000 ; slow wipe\nG1 X -16.5 Y19 F1000 ; slow wipe\nG1 X -16.5 Y19 Z20 F1000 ; raise extruder\nM106 S255 ; turn on fan to blow away fuzzies\nG4 S5 ; wait 5 seconds\nM107 ; turn off fan\nG0 X50 F1000 ; move over to switch extruders\nT1 ; switch to second extruder\nG1 X296.5 Y100 F5000 ; move E2 above second wiper pad\nG1 Z 1.0 ; push nozzle into wiper\nG1 X 296.5 Y100 F1000 ; slow wipe\nG1 X 296.5 Y90 F1000 ; slow wipe\nG1 X 297.5 Y86 F2000 ; fast wipe\nG1 X 295.5 Y80 F2000 ; fast wipe\nG1 X 297.5 Y74 F2000 ; fast wipe\nG1 X 295.5 Y70 F2000 ; fast wipe\nG1 X 296.5 Y68 F1000 ; slow wipe\nG1 X 296.5 Y60 F1000 ; slow wipe\nG1 X 298 Y60 F1000 ; slow wipe\nG1 X 298 Y46 F1000 ; slow wipe\nG1 X 295 Y46 F1000 ; slow wipe\nG1 X 295 Y60 F1000 ; slow wipe\nG1 X 298 Y60 F1000 ; slow wipe\nG1 X 298 Y46 F1000 ; slow wipe\nG1 X 295 Y46 F1000 ; slow wipe\nG1 X 295 Y60 F1000 ; slow wipe\nG1 X 298 Y60 F1000 ; slow wipe\nG1 X 298 Y46 F1000 ; slow wipe\nG1 X 295 Y46 F1000 ; slow wipe\nG1 X 295 Y60 F1000 ; slow wipe\nG1 X 296.5 Y60 F1000 ; slow wipe\nG1 X 296.5 Y42 F1000 ; slow wipe\nG1 X 297.5 Y40 F2000 ; fast wipe\nG1 X 295.5 Y38 F2000 ; fast wipe\nG1 X 297.5 Y36 F2000 ; fast wipe\nG1 X 295.5 Y34 F2000 ; fast wipe\nG1 X 297.5 Y30 F1000 ; slow wipe\nG1 X 296.5 Y19 F1000 ; slow wipe\nG1 X 296.5 Y19 Z20 F1000 ; raise extruder\nM106 S255 ; turn on fan to blow away fuzzies\nG4 S5 ; wait 5 seconds\nM107 ; turn off fan\nG0 X247 F1000 ; move over to switch extruders\nT0 ; switch to first extruder\nM109 R{material_standby_temperature} ; heat to probe temp\nM204 S100 ; set accel for probing\nG29 ; probe sequence (for auto-leveling)\nM420 S1 ; enable leveling matrix\nM204 S500 ; set accel back to normal\nM104 S{material_print_temperature_layer_0} T0 ; set extruder temp\nM104 S{material_print_temperature_layer_0} T1 ; set extruder temp\nG1 X100 Y-29 Z0.5 F3000 ; move to open space\nM400 ; clear buffer\nM117 Heating... ; LCD status message\nM109 R{material_print_temperature_layer_0} T0 ; set extruder temp and wait\nM109 R{material_print_temperature_layer_0} T1 ; set extruder temp and wait\nM117 Purging... ; LCD status message\nT0 ; select this extruder first\nG1 E0 F100 ; undo retraction\nG92 E-30 ; set extruder negative amount to purge\nG1 E0 F100 ; purge XXmm of filament\nG1 E-3 F200 ; purge retraction\nG1 Z0.45 ; clear bed (barely)\nG1 X100 Y10 F4000 ; move above bed to shear off filament\nM106 S255 ; turn on fan\nG4 S7 ; wait 7 seconds\nM107 ; turn off fan\nG1 X180 Y-29 Z0.45 F3000 ; move to open space\nT1 ; set extruder\nG1 E0 F100 ; undo retraction\nG92 E-30 ; set extruder negative amount to purge\nG1 E0 F100 ; purge XXmm of filament\nG1 E-4 F200 ; purge retraction\nG1 Z0.35 ; clear bed (barely)\nG1 X180 Y10 F4000 ; move above bed to shear off filament\nT0 ; set extruder\nM190 R{material_bed_temperature_layer_0} ; get bed temping up during first layer\nG1 Z2 E0 F75 ; raise head and 0 extruder\nM82 ; set to absolute mode\nM400 ; clear buffer\nM117 TAZ Printing... ; LCD status message\n" + }, + "machine_end_gcode": { + "default_value": "; part removal temp is hardcoded to 45\nM400\nM104 S0 T0 ; T0 hotend off\nM104 S0 T1 ; T1 hotend off\nM107 ; fans off\nG91 ; relative positioning\nT0\nG1 E-1 F300 ; retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z20 E-1 X-20 Y-20 F2000 ; move Z up a bit and retract filament even more\nG1 E0 ; re-prime extruder 1\nT1\nG1 E-1 F300 ; retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 E0 ; re-prime extruder 2\nT0\nM117 Cooling please wait ; progress indicator message\nG90 ; absolute positioning\nG1 Y0 F3000 ; move to cooling position\nM190 R45 ; set bed to cool off\nG1 Y280 F3000 ; present finished print\nM140 S0 ; cool down\nM77 ; stop GLCD timer\nM18 X Y E ; turn off x y and e axis\nG90 ; absolute positioning\nM117 Print complete ; progress indicator message\n" + }, + "machine_extruder_count": { "default_value": 2 }, + "layer_start_x": { "value": 100 }, + "layer_start_y": { "value": 100 } + } +} diff --git a/resources/definitions/makeR_pegasus.def.json b/resources/definitions/makeR_pegasus.def.json index 5e3ab26a4f..a8fbf49875 100644 --- a/resources/definitions/makeR_pegasus.def.json +++ b/resources/definitions/makeR_pegasus.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "makeR Pegasus", + "name": "Maker Pegasus", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "makeR", - "manufacturer": "makeR", + "author": "Maker", + "manufacturer": "Maker", "file_formats": "text/x-gcode", "platform": "makeR_pegasus_platform.3mf", "platform_offset": [-200, -10, 200], diff --git a/resources/definitions/makeR_prusa_tairona_i3.def.json b/resources/definitions/makeR_prusa_tairona_i3.def.json index d722a96410..f56dc314a2 100644 --- a/resources/definitions/makeR_prusa_tairona_i3.def.json +++ b/resources/definitions/makeR_prusa_tairona_i3.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "makeR Prusa Tairona i3", + "name": "Maker Prusa Tairona i3", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "makeR", - "manufacturer": "makeR", + "author": "Maker", + "manufacturer": "Maker", "file_formats": "text/x-gcode", "platform": "makeR_prusa_tairona_i3_platform.3mf", "platform_offset": [-2, 0, 0], diff --git a/resources/definitions/makeit_pro_l.def.json b/resources/definitions/makeit_pro_l.def.json index 75479fd5cc..237a8ac09e 100644 --- a/resources/definitions/makeit_pro_l.def.json +++ b/resources/definitions/makeit_pro_l.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "MAKEiT Pro-L", + "name": "Makeit Pro-L", "inherits": "fdmprinter", "metadata": { "visible": true, "author": "unknown", - "manufacturer": "MAKEiT 3D", + "manufacturer": "Makeit 3D", "file_formats": "text/x-gcode", "has_materials": false, "machine_extruder_trains": diff --git a/resources/definitions/makeit_pro_m.def.json b/resources/definitions/makeit_pro_m.def.json index 812a4fe901..3eb0850555 100644 --- a/resources/definitions/makeit_pro_m.def.json +++ b/resources/definitions/makeit_pro_m.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "MAKEiT Pro-M", + "name": "Makeit Pro-M", "inherits": "fdmprinter", "metadata": { "visible": true, "author": "unknown", - "manufacturer": "MAKEiT 3D", + "manufacturer": "Makeit 3D", "file_formats": "text/x-gcode", "has_materials": false, "machine_extruder_trains": diff --git a/resources/definitions/makeit_pro_mx.def.json b/resources/definitions/makeit_pro_mx.def.json index 5f922dcd00..9322d2f510 100644 --- a/resources/definitions/makeit_pro_mx.def.json +++ b/resources/definitions/makeit_pro_mx.def.json @@ -1,11 +1,11 @@ { "version": 2, - "name": "MAKEiT Pro-MX", + "name": "Makeit Pro-MX", "inherits": "fdmprinter", "metadata": { "visible": true, "author": "unknown", - "manufacturer": "MAKEiT 3D", + "manufacturer": "Makeit 3D", "file_formats": "text/x-gcode", "has_materials": false, "machine_extruder_trains": diff --git a/resources/definitions/maker_made_300x.def.json b/resources/definitions/maker_made_300x.def.json new file mode 100644 index 0000000000..ae112af5d1 --- /dev/null +++ b/resources/definitions/maker_made_300x.def.json @@ -0,0 +1,149 @@ +{ + "version": 2, + "name": "Maker Made 300x", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "DragonJe", + "manufacturer": "Maker Made", + "file_formats": "text/x-gcode", + "platform_offset": [0, 0, 0], + "has_materials": true, + "has_variants": false, + "preferred_quality_type": "normal", + "has_machine_quality": false, + "preferred_material": "generic_pla", + "machine_extruder_trains": + { + "0": "maker_made_300x_extruder_0" + } + }, + + "overrides": { + "machine_name": {"default_value": "Maker Made 300x"}, + "machine_width": {"default_value": 300}, + "machine_height": {"default_value": 400}, + "machine_depth": {"default_value": 300}, + "machine_head_with_fans_polygon": {"default_value": [[-30, 34],[-30, -32],[30, -32],[30, 34]]}, + "gantry_height": {"value": "30"}, + "machine_heated_bed": {"default_value": true}, + "material_diameter": {"default_value": 1.75}, + "machine_gcode_flavor": {"default_value": " RepRap (Marlin/Sprinter)"}, + "machine_start_gcode": {"default_value": "G28 ;Home\n G29 ;Auto Level\n G92 E0 ;Reset Extruder\n G1 Z5.0 F3000 ;Move Z Axis up\n G1 X25 Y295.0 Z0.28 F3000.0 ;Move to extrude\n G1 X250 Y295.0 Z0.28 F1500.0 E15 ;Draw the first line\n G1 X25 Y290.0 Z0.28 F3000.0 ;Move to side a little\n G1 X250 Y290.0 Z0.28 F1500.0 E30 ;Draw the second line\n G92 E0 ;Reset Extruder\n G1 Z5.0 F3000 ;Move Z Axis up" }, + "machine_end_gcode": {"default_value": "M104 S0\n M140 S0\n ;Retract the filament\n G92 E1\n G1 E-1 F300\n G28 X0 Y0\n G1 Y300 F3000 ;Move bed forward\n M84" }, + + "layer_height": {"value": 0.16}, + "layer_height_0": {"value": 0.32}, + "line_width": {"value": 0.4}, + "wall_line_width_0": {"value": 0.4}, + "initial_layer_line_width_factor": {"value": 100}, + "wall_thickness": {"value": 0.8}, + "wall_0_wipe_dist": {"value": 0.2}, + "roofing_layer_count": {"value": 1}, + "top_bottom_thickness": {"value": 0.6}, + "top_thickness": {"value": 0.8}, + "top_layers": {"value": 5}, + "bottom_thickness": {"value": 0.6}, + "bottom_layers": {"value": 3}, + "top_bottom_pattern": {"value": "'lines'" }, + "top_bottom_pattern_0": {"value": "'lines'" }, + "wall_0_inset": {"value": 0}, + "optimize_wall_printing_order": {"value": false }, + "outer_inset_first": {"value": false }, + "alternate_extra_perimeter": {"value": false }, + "travel_compensate_overlapping_walls_enabled": {"value": true }, + "travel_compensate_overlapping_walls_0_enabled": {"value": true }, + "travel_compensate_overlapping_walls_x_enabled": {"value": true }, + "wall_min_flow": {"value": 0}, + "fill_perimeter_gaps": {"value": "'everywhere'" }, + "filter_out_tiny_gaps": {"value": true }, + "fill_outline_gaps": {"value": true }, + "xy_offset": {"value": 0}, + "skin_no_small_gaps_heuristic": {"value": true }, + "skin_outline_count": {"value": 1}, + "ironing_enabled": {"value": false }, + "infill_sparse_density": {"value": 20 }, + "zig_zaggify_infill": {"value": false }, + "infill_multiplier": {"value": 1}, + "infill_wall_line_count": {"value": 0}, + "infill_overlap": {"value": 10}, + "skin_overlap": {"value": 5}, + "infill_wipe_dist": {"value": 0.1}, + "gradual_infill_steps": {"value": 0}, + "infill_before_walls": {"value": false }, + "infill_support_enabled": {"value": false }, + "max_skin_angle_for_expansion": {"value": 90}, + "default_material_print_temperature": {"value": 220}, + "material_print_temperature": {"value": 220}, + "material_print_temperature_layer_0": {"value": 220}, + "material_initial_print_temperature": {"value": 220}, + "material_final_print_temperature": {"value": 220}, + "default_material_bed_temperature": {"value": 50}, + "material_bed_temperature": {"value": 50}, + "material_flow": {"value": 100}, + "retraction_enable": {"value": true }, + "retract_at_layer_change": {"value": false }, + "retraction_amount": {"value": 5}, + "retraction_speed": {"value": 45}, + "retraction_extra_prime_amount": {"value": 0}, + "retraction_min_travel": {"value": 0.8}, + "retraction_count_max": {"value": 90}, + "retraction_extrusion_window": {"value": 5}, + "limit_support_retractions": {"value": true }, + "switch_extruder_retraction_amount": {"value": 16}, + "switch_extruder_retraction_speeds": {"value": 20}, + "speed_print": {"value": 50}, + "speed_travel": {"value": 150}, + "speed_layer_0": {"value": 10}, + "speed_travel_layer_0": {"value": 50}, + "speed_slowdown_layers": {"value": 2}, + "speed_equalize_flow_enabled": {"value": false }, + "acceleration_enabled": {"value": false }, + "acceleration_roofing": {"value": 3000 }, + "jerk_enabled": {"value": false }, + "retraction_combing": {"value": "'within infill'" }, + "travel_retract_before_outer_wall": {"value": false }, + "travel_avoid_other_parts": {"value": true }, + "retraction_hop_enabled": {"value": false }, + "cool_fan_enabled": {"value": true }, + "cool_fan_speed": {"value": 100}, + "cool_fan_speed_0": {"value": 0}, + "cool_fan_full_at_height": {"value": 0.32 }, + "cool_lift_head": {"value": false }, + "support_enable": {"value": true }, + "support_type": {"value": "'everywhere'" }, + "support_angle": {"value": "50"}, + "support_pattern": {"value": "'grid'"}, + "support_wall_count": {"value": 0}, + "zig_zaggify_support": {"value": false }, + "support_infill_rate": {"value": "15 if support_enable else 0"}, + "support_brim_enable": {"value": true }, + "support_brim_line_count": {"value": 5}, + "support_z_distance": {"value": 0.2}, + "support_xy_distance": {"value": 0.7}, + "support_xy_distance_overhang": {"value": 0.2}, + "support_bottom_stair_step_height": {"value": 0.3}, + "support_bottom_stair_step_width": {"value": 5.0}, + "support_join_distance": {"value": 2.0}, + "support_offset": {"value": 0.2}, + "gradual_support_infill_steps": {"value": 0}, + "support_roof_enable": {"value": true }, + "support_bottom_enable": {"value": false }, + "support_roof_height": {"value": 0.45}, + "support_roof_density": {"value": 45}, + "support_roof_pattern": {"value": "'lines'" }, + "support_fan_enable": {"value": false }, + "support_use_towers": {"value": true }, + "support_tower_diameter": {"value": 3}, + "support_tower_roof_angle": {"value": "65"}, + "adhesion_type": {"value": "'skirt'"}, + "skirt_line_count": {"value": 2}, + "skirt_gap": {"value": 3}, + "meshfix_union_all": {"value": true }, + "meshfix_union_all_remove_holes": {"value": false }, + "meshfix_extensive_stitching": {"value": false }, + "meshfix_keep_open_polygons": {"value": false }, + "multiple_mesh_overlap": {"value": "0.16"}, + "carve_multiple_volumes": {"value": false } + } +} diff --git a/resources/definitions/malyan_m200.def.json b/resources/definitions/malyan_m200.def.json index c853f8f772..e9980724cb 100644 --- a/resources/definitions/malyan_m200.def.json +++ b/resources/definitions/malyan_m200.def.json @@ -80,6 +80,7 @@ "retraction_amount" : { "default_value": 4.5}, "retraction_speed" : { "default_value": 40}, "coasting_enable": { "default_value": true }, - "prime_tower_enable": { "default_value": false} + "prime_tower_enable": { "default_value": false}, + "speed_z_hop": {"default_value": 1.5} } } diff --git a/resources/definitions/mingda_base.def.json b/resources/definitions/mingda_base.def.json new file mode 100644 index 0000000000..1051e53c2a --- /dev/null +++ b/resources/definitions/mingda_base.def.json @@ -0,0 +1,264 @@ +{ + "name": "Mingda Base Printer", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": false, + "author": "Cataclism", + "manufacturer": "Mingda", + "file_formats": "text/x-gcode", + "first_start_actions": ["MachineSettingsAction"], + + "machine_extruder_trains": { + "0": "mingda_base_extruder_0" + }, + + "has_materials": true, + "has_variants": true, + "has_machine_quality": true, + "variants_name": "Nozzle Size", + + "preferred_variant_name": "0.4mm Nozzle", + "preferred_quality_type": "standard", + "preferred_material": "generic_pla", + "exclude_materials": [ + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_bam", + "generic_cffcpe", + "generic_cffpa", + "generic_cpe", + "generic_cpe_plus", + "generic_gffcpe", + "generic_gffpa", + "generic_hips", + "generic_nylon", + "generic_pc", + "generic_pp", + "generic_pva", + "generic_tough_pla", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "innofill_innoflex60_175", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_pla", + "tizyx_pla_bois", + "ultimaker_abs_black", + "ultimaker_abs_blue", + "ultimaker_abs_green", + "ultimaker_abs_grey", + "ultimaker_abs_orange", + "ultimaker_abs_pearl-gold", + "ultimaker_abs_red", + "ultimaker_abs_silver-metallic", + "ultimaker_abs_white", + "ultimaker_abs_yellow", + "ultimaker_bam", + "ultimaker_cpe_black", + "ultimaker_cpe_blue", + "ultimaker_cpe_dark-grey", + "ultimaker_cpe_green", + "ultimaker_cpe_light-grey", + "ultimaker_cpe_plus_black", + "ultimaker_cpe_plus_transparent", + "ultimaker_cpe_plus_white", + "ultimaker_cpe_red", + "ultimaker_cpe_transparent", + "ultimaker_cpe_white", + "ultimaker_cpe_yellow", + "ultimaker_nylon_black", + "ultimaker_nylon_transparent", + "ultimaker_pc_black", + "ultimaker_pc_transparent", + "ultimaker_pc_white", + "ultimaker_pla_black", + "ultimaker_pla_blue", + "ultimaker_pla_green", + "ultimaker_pla_magenta", + "ultimaker_pla_orange", + "ultimaker_pla_pearl-white", + "ultimaker_pla_red", + "ultimaker_pla_silver-metallic", + "ultimaker_pla_transparent", + "ultimaker_pla_white", + "ultimaker_pla_yellow", + "ultimaker_pp_transparent", + "ultimaker_pva", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "ultimaker_tpu_black", + "ultimaker_tpu_blue", + "ultimaker_tpu_red", + "ultimaker_tpu_white", + "verbatim_bvoh_175", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] + }, + "overrides": { + "machine_name": { "default_value": "MINGDA Base Printer" }, + "machine_start_gcode": { "default_value": "G28 ; home all axes\n M117 Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface\n G1 X2 Y20 Z0.3 F5000.0 ; move to start-line position\n G1 X2 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.0 Z0.4 F5000.0 ; move to side a little\n G1 X2 Y20 Z0.4 F1500.0 E30 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface"}, + "machine_end_gcode": { "default_value": "G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n G1 X0 Y200 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n G1 X0 Y300 F1000 ; prepare for part removal\n M84 ; disable motors\n M106 S0 ; turn off fan" }, + + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_feedrate_e": { "value": 50 }, + + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_acceleration": { "value": 500 }, + + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_max_jerk_e": { "value": 5 }, + + "machine_heated_bed": { "default_value": true }, + + "material_diameter": { "default_value": 1.75 }, + + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, + + "jerk_print": { "value": 8 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + + "acceleration_enabled": { "value": false }, + "jerk_enabled": { "value": false }, + + "speed_print": { "value": 60.0 } , + "speed_infill": { "value": "speed_print" }, + "speed_wall": { "value": "speed_print / 2" }, + "speed_wall_0": { "value": "speed_wall" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_topbottom": { "value": "speed_print / 2" }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, + "speed_layer_0": { "value": 20.0 }, + "speed_print_layer_0": { "value": "speed_layer_0" }, + "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_z_hop": { "value": 5 }, + + "skirt_brim_speed": { "value": "speed_layer_0" }, + + "line_width": { "value": "machine_nozzle_size * 1.1" }, + + "optimize_wall_printing_order": { "value": true }, + + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_flow": { "value": 100 }, + "travel_compensate_overlapping_walls_0_enabled": { "value": false }, + + "z_seam_type": { "value": "'back'" }, + "z_seam_corner": { "value": "'z_seam_corner_none'" }, + + "infill_sparse_density": { "value": "15" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "skin_overlap": { "value": 10.0 }, + "infill_wipe_dist": { "value": 0.0 }, + "wall_0_wipe_dist": { "value": 0.0 }, + + "fill_perimeter_gaps": { "value": "'everywhere'" }, + "fill_outline_gaps": { "value": false }, + "filter_out_tiny_gaps": { "value": false }, + + "retraction_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": 200 + }, + "retraction_retract_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": 200 + }, + "retraction_prime_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": 200 + }, + + "retraction_hop_enabled": { "value": true }, + "retraction_hop": { "value": "layer_height*2" }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" }, + "retraction_combing_max_distance": { "value": 30 }, + "travel_avoid_other_parts": { "value": true }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + + "retraction_amount": { "value": 2 }, + "retraction_enable": { "value": true }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_min_travel": { "value": 1.5 }, + + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_fan_enabled": { "value": true }, + "cool_min_layer_time": { "value": 10 }, + + "adhesion_type": { "value": "'none' if support_enable else 'skirt'" }, + "brim_replaces_support": { "value": false }, + "skirt_gap": { "value": 10.0 }, + "skirt_line_count": { "value": 4 }, + + "adaptive_layer_height_variation": { "value": 0.04 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + + "meshfix_maximum_resolution": { "value": "0.05" }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + + "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" }, + "support_pattern": { "value": "'zigzag'" }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_use_towers": { "value": false }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_wall_count": { "value": 1 }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 4 }, + + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "minimum_support_area": { "value": 2 }, + "minimum_interface_area": { "value": 10 }, + "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, + "wall_thickness": {"value": "line_width * 2" } + + } +} diff --git a/resources/definitions/mingda_d2.def.json b/resources/definitions/mingda_d2.def.json new file mode 100644 index 0000000000..d6278705ad --- /dev/null +++ b/resources/definitions/mingda_d2.def.json @@ -0,0 +1,19 @@ +{ + "name": "Mingda D2", + "version": 2, + "inherits": "mingda_base", + "overrides": { + "machine_name": { "default_value": "MINGDA D2" }, + "machine_width": { "default_value": 230 }, + "machine_depth": { "default_value": 230 }, + "machine_height": { "default_value": 260 }, + "gantry_height": { "value": 25 } + + }, + "metadata": { + "quality_definition": "mingda_base", + "visible": true, + "platform": "mingda_d2_base.stl", + "platform_offset": [ -205, -77, 65] + } +} diff --git a/resources/definitions/mingda_d3pro.def.json b/resources/definitions/mingda_d3pro.def.json new file mode 100644 index 0000000000..682cd88d88 --- /dev/null +++ b/resources/definitions/mingda_d3pro.def.json @@ -0,0 +1,21 @@ +{ + "name": "Mingda D3/Pro", + "version": 2, + "inherits": "mingda_base", + "overrides": { + "machine_name": { "default_value": "MINGDA D3/Pro" }, + "machine_width": { "default_value": 320 }, + "machine_depth": { "default_value": 320 }, + "machine_height": { "default_value": 400 }, + "gantry_height": { "value": 25 } + + + + }, + "metadata": { + "quality_definition": "mingda_base", + "visible": true, + "platform": "mingda_rock3_base.stl", + "platform_offset": [ -179, -108, 150] + } +} diff --git a/resources/definitions/mingda_d4pro.def.json b/resources/definitions/mingda_d4pro.def.json new file mode 100644 index 0000000000..00d316c925 --- /dev/null +++ b/resources/definitions/mingda_d4pro.def.json @@ -0,0 +1,20 @@ +{ + "name": "Mingda D4 Pro", + "version": 2, + "inherits": "mingda_base", + "overrides": { + "machine_name": { "default_value": "MINGDA D4 Pro" }, + "machine_start_gcode": { "default_value": "G28 ; home all axes\n G29; ABL\n M117 Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface\n G1 X2 Y20 Z0.3 F5000.0 ; move to start-line position\n G1 X2 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.0 Z0.4 F5000.0 ; move to side a little\n G1 X2 Y20 Z0.4 F1500.0 E30 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface"}, + "machine_width": { "default_value": 420 }, + "machine_depth": { "default_value": 420 }, + "machine_height": { "default_value": 400 }, + "gantry_height": { "value": 25 } + + }, + "metadata": { + "quality_definition": "mingda_base", + "visible": true, + "platform": "mingda_d4pro_base.stl", + "platform_offset": [ -177, -140, 170] + } +} \ No newline at end of file diff --git a/resources/definitions/mingda_rock3.def.json b/resources/definitions/mingda_rock3.def.json new file mode 100644 index 0000000000..c470d6e7e5 --- /dev/null +++ b/resources/definitions/mingda_rock3.def.json @@ -0,0 +1,19 @@ +{ + "name": "Mingda Rock3/Pro", + "version": 2, + "inherits": "mingda_base", + "overrides": { + "machine_name": { "default_value": "MINGDA Rock3/Pro" }, + "machine_width": { "default_value": 320 }, + "machine_depth": { "default_value": 320 }, + "machine_height": { "default_value": 400 }, + "gantry_height": { "value": 25 } + + }, + "metadata": { + "quality_definition": "mingda_base", + "visible": true, + "platform": "mingda_rock3_base.stl", + "platform_offset": [ -179, -108, 150] + } +} diff --git a/resources/definitions/mp_mini_delta.def.json b/resources/definitions/mp_mini_delta.def.json index bbdca2c8f8..eda45bb413 100644 --- a/resources/definitions/mp_mini_delta.def.json +++ b/resources/definitions/mp_mini_delta.def.json @@ -3,7 +3,7 @@ "name": "MP Mini Delta", "inherits": "fdmprinter", "metadata": { - "author": "MPMD Facebook Group", + "author": "MPMD V1 Facebook Group", "manufacturer": "Monoprice", "file_formats": "text/x-gcode", "platform": "mp_mini_delta_platform.3mf", @@ -25,7 +25,7 @@ "overrides": { "machine_start_gcode": { - "default_value": ";MPMD Basic Calibration Tutorial: \n; https://www.thingiverse.com/thing:3892011 \n; \n; If you want to put calibration values in your \n; Start Gcode, put them here. \n; \n;If on stock firmware, at minimum, consider adding \n;M665 R here since there is a firmware bug. \n; \n; Calibration part ends here \n; \nG90 ; switch to absolute positioning \nG92 E0 ; reset extrusion distance \nG1 E20 F200 ; purge 20mm of filament to prime nozzle. \nG92 E0 ; reset extrusion distance \nG4 S5 ; Pause for 5 seconds to allow time for removing extruded filament \nG28 ; start from home position \nG1 E-6 F900 ; retract 6mm of filament before starting the bed leveling process \nG92 E0 ; reset extrusion distance \nG4 S5 ; pause for 5 seconds to allow time for removing extruded filament \nG29 P2 Z0.28 ; Auto-level ; ADJUST Z higher or lower to set first layer height. Start with 0.02 adjustments. \nG1 Z30 ; raise Z 30mm to prepare for priming the nozzle \nG1 E5 F200 ; extrude 5mm of filament to help prime the nozzle just prior to the start of the print \nG92 E0 ; reset extrusion distance \nG4 S5 ; pause for 5 seconds to allow time for cleaning the nozzle and build plate if needed " + "default_value": ";MPMD V1 Basic Calibration Tutorial: \n; https://www.thingiverse.com/thing:3892011 \n; \n; If you want to put calibration values in your \n; Start Gcode, put them here. \n; \n;If on stock firmware, at minimum, consider adding \n;M665 R here since there is a firmware bug. \n; \n; Calibration part ends here \n; \nG90 ; switch to absolute positioning \nG92 E0 ; reset extrusion distance \nG1 E20 F200 ; purge 20mm of filament to prime nozzle. \nG92 E0 ; reset extrusion distance \nG4 S5 ; Pause for 5 seconds to allow time for removing extruded filament \nG28 ; start from home position \nG1 E-6 F900 ; retract 6mm of filament before starting the bed leveling process \nG92 E0 ; reset extrusion distance \nG4 S5 ; pause for 5 seconds to allow time for removing extruded filament \nG29 P2 Z0.28 ; Auto-level ; ADJUST Z higher or lower to set first layer height. Start with 0.02 adjustments. \nG1 Z30 ; raise Z 30mm to prepare for priming the nozzle \nG1 E5 F200 ; extrude 5mm of filament to help prime the nozzle just prior to the start of the print \nG92 E0 ; reset extrusion distance \nG4 S5 ; pause for 5 seconds to allow time for cleaning the nozzle and build plate if needed " }, "machine_end_gcode": { @@ -47,9 +47,9 @@ "default_value": 0.21 }, "material_bed_temperature": { "value": 40 }, - "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }, - "material_bed_temperature_layer_0": { "value": "material_bed_temperature + 5" }, + "line_width": { "value": "round(machine_nozzle_size, 2)" }, + "material_print_temperature_layer_0": { "value": "material_print_temperature" }, + "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_max_feedrate_x": { "default_value": 150 }, "machine_max_feedrate_y": { "default_value": 150 }, diff --git a/resources/definitions/mp_mini_delta_v2.def.json b/resources/definitions/mp_mini_delta_v2.def.json new file mode 100644 index 0000000000..30c7cb2823 --- /dev/null +++ b/resources/definitions/mp_mini_delta_v2.def.json @@ -0,0 +1,51 @@ +{ + "version": 2, + "name": "MP Mini Delta V2", + "inherits": "fdmprinter", + "metadata": { + "author": "mpminidelta subreddit", + "manufacturer": "Monoprice", + "file_formats": "text/x-gcode", + "platform": "mp_mini_delta_platform.3mf", + "supports_usb_connection": true, + "has_machine_quality": false, + "visible": true, + "platform_offset": [0, 0, 0], + "has_materials": true, + "has_variants": false, + "has_machine_materials": false, + "has_variant_materials": false, + "preferred_quality_type": "normal", + "machine_extruder_trains": + { + "0": "mp_mini_delta_v2_extruder_0" + } + }, + + "overrides": { + "machine_start_gcode": + { + "default_value": ";(**** start.gcode for MP Mini Delta V2****)\nG21\nG90\nM82\nM107\nM104 S170\nG28 X0 Y0\nG28 Z0\nG29 Z0.4\nG1 Z15 F300\nM109 S{material_print_temperature_layer_0}\nG92 E0\nG1 F200 E3\nG92 E0\nG1 F2000\n" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for MP Mini Delta V2****)\nG28;(Stick out the part)\nM190 S0;(Turn off heat bed, don't wait.)\nG92 E10;(Set extruder to 10)\nG1 E7 F200;(retract 3mm)\nM104 S0;(Turn off nozzle, don't wait)\nG4 S300;(Delay 5 minutes)\nM107;(Turn off part fan)\nM84;(Turn off stepper motors.)" + }, + "material_print_temp_prepend":{"default_value":false}, + "material_bed_temperature": { "value": 40 }, + "machine_width": { "default_value": 110 }, + "machine_depth": { "default_value": 110 }, + "machine_height": { "default_value": 120 }, + "machine_heated_bed": { "default_value": true }, + "machine_shape": { "default_value": "elliptic" }, + "machine_center_is_zero": { "default_value": true }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "line_width": { "value": "round(machine_nozzle_size, 2)" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "retraction_amount": { "default_value": 5 }, + "retraction_speed": { "default_value": 28 }, + "retraction_hop_enabled": { "default_value": false }, + "retract_at_layer_change": { "default_value": true } + } +} diff --git a/resources/definitions/nwa3d_a31.def.json b/resources/definitions/nwa3d_a31.def.json index 1cfd02fe7f..fef44ac16b 100644 --- a/resources/definitions/nwa3d_a31.def.json +++ b/resources/definitions/nwa3d_a31.def.json @@ -1,11 +1,11 @@ { - "name": "NWA3D A31", + "name": "Nwa3D A31", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, "author": "DragonJe", - "manufacturer": "NWA 3D LLC", + "manufacturer": "Nwa 3D LLC", "file_formats": "text/x-gcode", "platform_offset": [0, 0, 0], "has_materials": true, diff --git a/resources/definitions/nwa3d_a5.def.json b/resources/definitions/nwa3d_a5.def.json index 1631860d47..8c6b53b81e 100644 --- a/resources/definitions/nwa3d_a5.def.json +++ b/resources/definitions/nwa3d_a5.def.json @@ -1,11 +1,11 @@ { - "name": "NWA3D A5", + "name": "Nwa3D A5", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, "author": "DragonJe", - "manufacturer": "NWA 3D LLC", + "manufacturer": "Nwa 3D LLC", "file_formats": "text/x-gcode", "platform_offset": [0, 0, 0], "has_materials": true, diff --git a/resources/definitions/pbr3d_g1.def.json b/resources/definitions/pbr3d_g1.def.json new file mode 100644 index 0000000000..fbe1d5bfc6 --- /dev/null +++ b/resources/definitions/pbr3d_g1.def.json @@ -0,0 +1,45 @@ +{ + "version": 2, + "name": "PBR 3D Gen-I", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Kapil H. Sonone, Prof. Bahubali P. Fuladi", + "manufacturer": "PBR Research", + "file_formats": "text/x-gcode", + "platform": "pbr3d_g1_buildplate.stl", + "platform_offset": [0, -5, 0], + "machine_extruder_trains": + { + "0": "pbr3d_g1_extruder_0" + } + }, + + "overrides": { + "machine_name": { "default_value": "PBR 3D Gen-I" }, + "machine_heated_bed": { + "default_value": true + }, + "machine_width": { + "default_value": 200 + }, + "machine_height": { + "default_value": 200 + }, + "machine_depth": { + "default_value": 200 + }, + "machine_center_is_zero": { + "default_value": false + }, + "gantry_height": { + "value": "200" + }, + "machine_start_gcode": { + "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the Platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" + }, + "machine_end_gcode": { + "default_value": "M104 S0\nM140 S0\n;Retract the Filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" + } + } +} diff --git a/resources/definitions/printrbot_play.def.json b/resources/definitions/printrbot_play.def.json index e3c0c85d80..b1f7e72967 100644 --- a/resources/definitions/printrbot_play.def.json +++ b/resources/definitions/printrbot_play.def.json @@ -45,6 +45,7 @@ }, "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" - } + }, + "speed_z_hop": {"default_value": 5} } } diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index 892458cdcb..de6365c415 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -4,7 +4,7 @@ "inherits": "fdmprinter", "metadata": { "visible": false, - "author": "Ramazan UTKU", + "author": "Mehmet SUTAŞ", "manufacturer": "Rigid3D", "file_formats": "text/x-gcode", "has_materials": true, @@ -19,25 +19,12 @@ "preferred_material": "generic_pla_175", "exclude_materials": [ "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_asax", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", + "dsm_arnitel2045_175", "dsm_novamid1070_175", + "emotiontech_abs", "emotiontech_absx", "emotiontech_acetate", "emotiontech_bvoh", "emotiontech_asax", "emotiontech_hips", "emotiontech_petg", "emotiontech_pla", "emotiontech_pva-m", "emotiontech_pva-oks", "emotiontech_pva-s", "emotiontech_tpu98a", + "eSUN_PETG_Black", "eSUN_PETG_Grey", "eSUN_PETG_Purple", "eSUN_PLA_PRO_Black", "eSUN_PLA_PRO_Grey", "eSUN_PLA_PRO_Purple", "eSUN_PLA_PRO_White", + "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", + "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_abs", "generic_bam", "generic_cffcpe", @@ -55,84 +42,27 @@ "generic_pva", "generic_tough_pla", "generic_tpu", - "imade3d_petg_175", - "imade3d_pla_175", + "imade3d_petg_175", "imade3d_pla_175", "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", + "leapfrog_abs_natural", "leapfrog_epla_natural", "leapfrog_pva_natural", "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", + "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", + "redd_abs", "redd_asa", "redd_hips", "redd_nylon", "redd_petg", "redd_pla", "redd_tpe", "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "ultimaker_abs_black", - "ultimaker_abs_blue", - "ultimaker_abs_green", - "ultimaker_abs_grey", - "ultimaker_abs_orange", - "ultimaker_abs_pearl-gold", - "ultimaker_abs_red", - "ultimaker_abs_silver-metallic", - "ultimaker_abs_white", - "ultimaker_abs_yellow", + "tizyx_abs", "tizyx_flex", "tizyx_petg", "tizyx_pla", "tizyx_pla_bois", "tizyx_pva", + "ultimaker_abs_black", "ultimaker_abs_blue", "ultimaker_abs_green", "ultimaker_abs_grey", "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", "ultimaker_abs_white", "ultimaker_abs_yellow", "ultimaker_bam", - "ultimaker_cpe_black", - "ultimaker_cpe_blue", - "ultimaker_cpe_dark-grey", - "ultimaker_cpe_green", - "ultimaker_cpe_light-grey", - "ultimaker_cpe_plus_black", - "ultimaker_cpe_plus_transparent", - "ultimaker_cpe_plus_white", - "ultimaker_cpe_red", - "ultimaker_cpe_transparent", - "ultimaker_cpe_white", - "ultimaker_cpe_yellow", - "ultimaker_nylon_black", - "ultimaker_nylon_transparent", - "ultimaker_pc_black", - "ultimaker_pc_transparent", - "ultimaker_pc_white", - "ultimaker_pla_black", - "ultimaker_pla_blue", - "ultimaker_pla_green", - "ultimaker_pla_magenta", - "ultimaker_pla_orange", - "ultimaker_pla_pearl-white", - "ultimaker_pla_red", - "ultimaker_pla_silver-metallic", - "ultimaker_pla_transparent", - "ultimaker_pla_white", - "ultimaker_pla_yellow", + "ultimaker_cpe_black", "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", + "ultimaker_nylon_black", "ultimaker_nylon_transparent", + "ultimaker_pc_black", "ultimaker_pc_transparent", "ultimaker_pc_white", + "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", "ultimaker_pp_transparent", "ultimaker_pva", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "ultimaker_tpu_black", - "ultimaker_tpu_blue", - "ultimaker_tpu_red", - "ultimaker_tpu_white", + "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", + "ultimaker_tpu_black", "ultimaker_tpu_blue", "ultimaker_tpu_red", "ultimaker_tpu_white", "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" + "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_PLA_Glitter", "Vertex_Delta_PLA_Mat", "Vertex_Delta_PLA_Satin", "Vertex_Delta_PLA_Wood", "Vertex_Delta_TPU", + "zyyx_pro_flex", "zyyx_pro_pla" ] }, "overrides": { @@ -140,135 +70,84 @@ "material_diameter": { "default_value": 1.75 }, - "machine_max_feedrate_x": { "value": 500 }, - "machine_max_feedrate_y": { "value": 500 }, - "machine_max_feedrate_z": { "value": 500 }, - "machine_max_feedrate_e": { "value": 500 }, + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 8 }, + "machine_max_feedrate_e": { "value": 25 }, "machine_max_acceleration_x": { "value": 600 }, "machine_max_acceleration_y": { "value": 600 }, - "machine_max_acceleration_z": { "value": 100 }, - "machine_max_acceleration_e": { "value": 600 }, + "machine_max_acceleration_z": { "value": 10 }, + "machine_max_acceleration_e": { "value": 1000 }, "machine_acceleration": { "value": 600 }, "machine_max_jerk_xy": { "value": 10.0 }, "machine_max_jerk_z": { "value": 0.3 }, "machine_max_jerk_e": { "value": 5 }, + + + "wall_0_wipe_dist": { "value": 0.05 }, + "optimize_wall_printing_order": { "value": "True" }, + "travel_compensate_overlapping_walls_enabled": { "value": "False" }, + "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, + "travel_compensate_overlapping_walls_x_enabled": { "value": "False" }, + + "infill_sparse_density": { "value": 16 }, + "infill_wipe_dist": { "value": 0 }, + "infill_before_walls": { "value": "False" }, - "acceleration_print": { "value": 600 }, - + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, + + "wall_0_material_flow": { "value": 95 }, + + "speed_print": { "value": 40.0 } , + "speed_topbottom": { "value": "speed_print" }, + "speed_support_interface": { "value": "speed_support" }, + "speed_travel": { "value": 80.0 }, + "speed_layer_0": { "value": 25.0 }, + + "acceleration_print": { "value": 600 }, "acceleration_travel": { "value": 600 }, "acceleration_travel_layer_0": { "value": "acceleration_travel" }, - "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, "jerk_print": { "value": 10 }, "jerk_travel": { "value": "jerk_print" }, "jerk_travel_layer_0": { "value": "jerk_travel" }, - "acceleration_enabled": { "value": false }, - "jerk_enabled": { "value": false }, + "acceleration_enabled": { "value": "False" }, + "jerk_enabled": { "value": "False" }, - "speed_print": { "value": 40.0 } , - "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_print" }, - "speed_wall_x": { "value": "speed_print" }, - "speed_topbottom": { "value": "speed_print" }, - "speed_roofing": { "value": "speed_topbottom" }, - "speed_travel": { "value": "80.0" }, - "speed_layer_0": { "value": 15.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, - "speed_travel_layer_0": { "value": "speed_travel" }, - "speed_prime_tower": { "value": "speed_topbottom" }, - "speed_support": { "value": "speed_wall_0" }, - "speed_support_interface": { "value": "speed_topbottom" }, - "speed_z_hop": { "value": 5 }, - - "skirt_brim_speed": { "value": "speed_layer_0" }, - - "line_width": { "value": "machine_nozzle_size" }, - - "optimize_wall_printing_order": { "value": "True" }, - - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, - - "z_seam_type": { "value": "'shortest'" }, - "z_seam_corner": { "value": "'z_seam_corner_inner'" }, - - "infill_sparse_density": { "value": "15" }, - "wall_0_wipe_dist": { "value": 0.0 }, - - "retraction_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "value":30, - "maximum_value": 200 - }, - "retraction_retract_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "value":"retraction_speed", - "maximum_value": 200 - }, - "retraction_prime_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "value":"retraction_speed / 2", - "maximum_value": 200 - }, - - "retraction_hop_enabled": { "value": "False" }, - "retraction_hop": { "value": 0.2 }, - "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, - "retraction_amount" : { "default_value": 1.0}, - "retraction_combing_max_distance": { "value": 30 }, - "travel_avoid_other_parts": { "value": true }, - "travel_avoid_supports": { "value": true }, - "travel_retract_before_outer_wall": { "value": false }, - - "small_hole_max_size": { "value": 4.0 }, - - "retraction_enable": { "value": true }, + "retraction_amount": { "value": 1.50 }, + "retraction_prime_speed": { "value": 7 }, "retraction_count_max": { "value": 5 }, - "retraction_extrusion_window": { "value": "retraction_amount" }, - "retraction_min_travel": { "value": 0.5 }, - - "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, - "cool_min_layer_time": { "value": 10 }, - + "retraction_combing": { "value": "'noskin'" }, + "travel_avoid_other_parts": { "value": "False" }, + + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "support_interface_enable": { "value": "True" }, + "support_interface_density": { "value": 70 }, + "minimum_interface_area": { "value": 5.0 }, + "minimum_support_area": { "value": 5 }, + "support_brim_enable": { "value": "True" }, + "support_brim_width": { "value": 4 }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "adhesion_type": { "value": "'skirt'" }, "skirt_gap": { "value": 5.0 }, "skirt_line_count": { "value": 2 }, - "adaptive_layer_height_variation": { "value": 0.04 }, + "meshfix_maximum_deviation": { "value": 0.01 }, + + "adaptive_layer_height_variation": { "value": 0.16 }, "adaptive_layer_height_variation_step": { "value": 0.04 }, - "meshfix_maximum_resolution": { "value": "0.25" }, - "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, - - "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" }, - "support_pattern": { "value": "'zigzag'" }, - "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, - "support_use_towers": { "value": false }, - "support_xy_distance": { "value": "wall_line_width_0 * 2" }, - "support_xy_distance_overhang": { "value": "wall_line_width_0" }, - "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, - "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, - "support_wall_count": { "value": 1 }, - "support_brim_enable": { "value": true }, - "support_brim_width": { "value": 4 }, - - "support_interface_enable": { "value": true }, - "support_interface_height": { "value": "layer_height * 4" }, - "support_interface_density": { "value": 70 }, - "support_interface_pattern": { "value": "'grid'" }, - "support_interface_skip_height": { "value": 0.2 }, - "minimum_support_area": { "value": 5 }, - "minimum_interface_area": { "value": 10 }, "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, "wall_thickness": {"value": "line_width * 2" }, - - "layer_height_0": {"value": 0.2} + "speed_z_hop": {"default_value": 8} } } \ No newline at end of file diff --git a/resources/definitions/rigid3d_mucit2.def.json b/resources/definitions/rigid3d_mucit2.def.json new file mode 100644 index 0000000000..42499ba5e1 --- /dev/null +++ b/resources/definitions/rigid3d_mucit2.def.json @@ -0,0 +1,35 @@ +{ + "name": "Rigid3D Mucit2", + "version": 2, + "inherits": "rigid3d_base", + "metadata": { + "visible": true, + "quality_definition": "rigid3d_base", + "preferred_quality_type": "standard", + "platform": "rigid3d_mucit2_platform.3mf", + "platform_offset": [ 0, 0, 0], + + "preferred_material": "generic_pla_175" + }, + "overrides": { + "machine_name": { "default_value": "Rigid3D Mucit2" }, + + "machine_heated_bed": { "default_value": true }, + + "machine_width": { "default_value": 150 }, + "machine_depth": { "default_value": 150 }, + "machine_height": { "default_value": 150 }, + + "machine_center_is_zero": { "default_value": false }, + + "machine_start_gcode": {"default_value": "G21\nG28\nM420 S1\nM107\nG90\nM82\nG92 E0\n"}, + "machine_end_gcode": {"default_value": "G92 E0\nT0\nG1 F1800 E-2\nG27 P2\nM107\nM104 T0 S0\nM140 S0\nG90\nG92 E0\nM84\n"}, + + "machine_head_with_fans_polygon": { + "default_value": [ + [ -20, 40], [ -20, -65], [ 40, -65], [ 40, 40]] + }, + + "gantry_height": { "value": 30 } + } +} diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json index 2554689be4..f46213dde7 100644 --- a/resources/definitions/skriware_2.def.json +++ b/resources/definitions/skriware_2.def.json @@ -1,726 +1,732 @@ { - "name": "Skriware 2", - "version": 2, - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Skriware", - "manufacturer": "Skriware", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ], - "supports_usb_connection": false, - "platform": "skriware_2_platform.3mf", - "machine_extruder_trains": { - "0": "skriware_2_extruder_0", - "1": "skriware_2_extruder_1" - } - }, - "overrides": { - "raft_interface_thickness": { - "value": "0.2" - }, - "wipe_retraction_prime_speed": { - "value": "30" - }, - "support_skip_zag_per_mm": { - "default_value": 10 - }, - "material_bed_temperature": { - "value": "50" - }, - "raft_airgap": { - "default_value": 0.2 - }, - "top_layers": { - "value": "4" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "raft_surface_acceleration": { - "value": "400" - }, - "meshfix_maximum_travel_resolution": { - "value": "0.8" - }, - "machine_end_gcode": { - "default_value": "M59\nG92 E0\nG1 E-10 F300\nM104 T0 S0\nM104 T1 S0\nM140 S0\nG28 X0 Y0\nM84\nM106 S0\nM107" - }, - "wall_material_flow": { - "value": "99" - }, - "raft_interface_jerk": { - "value": "10" - }, - "acceleration_topbottom": { - "value": "400" - }, - "prime_tower_size": { - "default_value": 1 - }, - "max_skin_angle_for_expansion": { - "default_value": 50 - }, - "raft_acceleration": { - "value": "400" - }, - "support_xy_distance": { - "default_value": 0.6 - }, - "xy_offset_layer_0": { - "value": "-0.16" - }, - "raft_interface_fan_speed": { - "value": "40" - }, - "retraction_speed": { - "default_value": 30 - }, - "speed_print": { - "default_value": 20 - }, - "travel_avoid_supports": { - "default_value": true - }, - "infill_overlap_mm": { - "value": "0.0" - }, - "support_roof_height": { - "value": "0.4" - }, - "speed_travel_layer_0": { - "value": "120" - }, - "speed_wall_0": { - "value": "20" - }, - "acceleration_wall_x": { - "value": "400" - }, - "layer_0_z_overlap": { - "value": "0.1" - }, - "switch_extruder_retraction_speed": { - "value": "30" - }, - "travel_compensate_overlapping_walls_enabled": { - "default_value": false - }, - "raft_base_acceleration": { - "value": "400" - }, - "raft_base_speed": { - "value": "60" - }, - "wall_0_material_flow": { - "value": "99" - }, - "support_infill_rate": { - "value": "20" - }, - "raft_surface_layers": { - "default_value": 1 - }, - "machine_height": { - "default_value": 210 - }, - "retraction_prime_speed": { - "value": "60" - }, - "support_interface_material_flow": { - "value": "99" - }, - "raft_surface_fan_speed": { - "value": "80" - }, - "raft_base_line_width": { - "value": "0.4" - }, - "infill_line_distance": { - "value": "5.33" - }, - "default_material_print_temperature": { - "default_value": 200 - }, - "speed_roofing": { - "value": "20" - }, - "skin_material_flow": { - "value": "99" - }, - "cool_fan_full_layer": { - "value": "1" - }, - "material_break_preparation_temperature": { - "value": "195" - }, - "support_roof_density": { - "value": "70" - }, - "support_infill_sparse_thickness": { - "value": "0.2" - }, - "retraction_retract_speed": { - "value": "30" - }, - "speed_slowdown_layers": { - "default_value": 1 - }, - "support_line_distance": { - "value": "2" - }, - "cool_lift_head": { - "default_value": true - }, - "min_skin_width_for_expansion": { - "value": "0.67" - }, - "cool_min_speed": { - "default_value": 5 - }, - "switch_extruder_retraction_speeds": { - "default_value": 30 - }, - "raft_base_line_spacing": { - "value": "0.8" - }, - "speed_support": { - "value": "50" - }, - "skirt_brim_material_flow": { - "value": "99" - }, - "speed_infill": { - "value": "80" - }, - "support_initial_layer_line_distance": { - "value": "2" - }, - "support_use_towers": { - "default_value": false - }, - "skin_no_small_gaps_heuristic": { - "default_value": true - }, - "acceleration_roofing": { - "value": "400" - }, - "material_initial_print_temperature": { - "value": "195" - }, - "material_diameter": { - "default_value": 1.75 - }, - "xy_offset": { - "default_value": -0.16 - }, - "support_extruder_nr": { - "value": "0" - }, - "support_brim_line_count": { - "value": "16" - }, - "support_interface_extruder_nr": { - "value": "0" - }, - "support_roof_extruder_nr": { - "value": "0" - }, - "material_adhesion_tendency": { - "default_value": 0 - }, - "material_standby_temperature": { - "default_value": 195 - }, - "cool_fan_speed_0": { - "default_value": 100 - }, - "brim_line_count": { - "value": "17" - }, - "adhesion_type": { - "default_value": "raft" - }, - "switch_extruder_retraction_amount": { - "value": "16" - }, - "retraction_amount": { - "default_value": 3 - }, - "acceleration_travel": { - "value": "400" - }, - "jerk_print_layer_0": { - "value": "10" - }, - "raft_surface_thickness": { - "value": "0.2" - }, - "raft_base_jerk": { - "value": "10" - }, - "bottom_thickness": { - "value": "0.8" - }, - "roofing_material_flow": { - "value": "99" - }, - "top_skin_expand_distance": { - "value": "0.8" - }, - "speed_wall_x": { - "value": "20" - }, - "support_enable": { - "default_value": true - }, - "acceleration_print_layer_0": { - "value": "400" - }, - "jerk_prime_tower": { - "value": "5" - }, - "infill_before_walls": { - "default_value": false - }, - "raft_interface_line_spacing": { - "value": "0.4" - }, - "gantry_height": { - "value": "210" - }, - "material_print_temperature_layer_0": { - "value": "195" - }, - "raft_interface_line_width": { - "value": "0.4" - }, - "skirt_brim_line_width": { - "value": "0.5" - }, - "z_seam_y": { - "value": "180" - }, - "roofing_layer_count": { - "value": "1" - }, - "raft_margin": { - "default_value": 4 - }, - "cool_fan_full_at_height": { - "value": "0" - }, - "acceleration_support_interface": { - "value": "250" - }, - "retraction_min_travel": { - "value": "1" - }, - "acceleration_layer_0": { - "value": "400" - }, - "support_z_distance": { - "default_value": 0.2 - }, - "machine_heated_bed": { - "default_value": true - }, - "raft_jerk": { - "value": "10" - }, - "raft_surface_speed": { - "value": "60" - }, - "initial_layer_line_width_factor": { - "default_value": 120 - }, - "machine_start_gcode": { - "default_value": "G90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM420 S1 Z0.6 ;enable bed levelling\nG1 Z10 F250 ;move the platform down 10mm\nM107 ;fan off\nM42 P11 S255 ;turn on front fan\nM140 S{material_bed_temperature}\nM104 T0 S{material_print_temperature, 0}\nM104 T1 S{material_print_temperature, 1}\nG1 F2500 Y260 X0\nM190 S{material_bed_temperature}\nM109 T0 S{material_print_temperature, 0}\nM109 T1 S{material_print_temperature, 1}\nM60 ;enable E-FADE Algorithm\nM62 A ;filament sensor off\nG92 E0 ;zero the extruded length\nT1\nG92 E0;zero the extruded length\nG1 F300 Z0.3\nG1 F1200 X20\nG1 F1200 X180 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E11\nG1 F300 Z1.5\nG92 E0 ;zero the extruded length again\nT0\nG92 E0 ;zero the extruded length\nG1 F1200 Y258\nG1 F300 Z0.3\nG1 F1200 X40 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E11\nG1 Z1.5\nM61 A ;filament sensor reset\nM63 A ;filament sensor on\nG92 E0 ;zero the extruded length again\nM58 ;end of Start G-Code and signal retract management\nT{initial_extruder_nr}" - }, - "bottom_skin_preshrink": { - "value": "0.8" - }, - "ironing_inset": { - "value": "0.2 + (ironing_line_spacing - skin_line_width * (1.0 + ironing_flow / 100) / 2 if ironing_pattern == 'concentric' else skin_line_width * (1.0 - ironing_flow / 100) / 2)" - }, - "jerk_travel": { - "value": "10" - }, - "machine_depth": { - "default_value": 260 - }, - "jerk_skirt_brim": { - "value": "5" - }, - "infill_wipe_dist": { - "value": "0" - }, - "raft_interface_acceleration": { - "value": "400" - }, - "z_seam_x": { - "value": "115" - }, - "material_print_temperature": { - "value": "195" - }, - "material_bed_temperature_layer_0": { - "value": "50" - }, - "wipe_retraction_retract_speed": { - "value": "30" - }, - "jerk_travel_layer_0": { - "value": "10" - }, - "infill_overlap": { - "value": "0" - }, - "acceleration_support_infill": { - "value": "400" - }, - "travel_compensate_overlapping_walls_0_enabled": { - "value": "False" - }, - "support_bottom_material_flow": { - "value": "99" - }, - "jerk_support_roof": { - "value": "5" - }, - "wall_x_material_flow": { - "value": "99" - }, - "speed_support_interface": { - "value": "33.33" - }, - "jerk_layer_0": { - "value": "10" - }, - "support_angle": { - "default_value": 60 - }, - "infill_sparse_thickness": { - "value": "0.2" - }, - "prime_tower_position_y": { - "value": "1" - }, - "retraction_combing": { - "default_value": "infill" - }, - "acceleration_prime_tower": { - "value": "250" - }, - "acceleration_print": { - "default_value": 400 - }, - "acceleration_infill": { - "value": "500" - }, - "bridge_wall_speed": { - "value": "10.0" - }, - "acceleration_wall_0": { - "value": "400" - }, - "support_offset": { - "default_value": 0.2 - }, - "build_volume_temperature": { - "default_value": 28 - }, - "switch_extruder_prime_speed": { - "value": "60" - }, - "speed_prime_tower": { - "value": "20" - }, - "top_skin_preshrink": { - "value": "0.8" - }, - "jerk_ironing": { - "value": "5" - }, - "skin_outline_count": { - "value": 0 - }, - "skirt_brim_speed": { - "value": "10.0" - }, - "raft_base_thickness": { - "value": "0.2" - }, - "infill_sparse_density": { - "default_value": 15 - }, - "support_bottom_extruder_nr": { - "value": "0" - }, - "support_material_flow": { - "value": "98" - }, - "min_infill_area": { - "default_value": 1 - }, - "jerk_support": { - "value": "10" - }, - "bottom_skin_expand_distance": { - "value": "0.8" - }, - "retract_at_layer_change": { - "default_value": true - }, - "jerk_support_interface": { - "value": "5" - }, - "jerk_support_bottom": { - "value": "5" - }, - "optimize_wall_printing_order": { - "default_value": true - }, - "skirt_brim_minimal_length": { - "default_value": 50 - }, - "jerk_support_infill": { - "value": "10" - }, - "initial_bottom_layers": { - "value": "3" - }, - "prime_tower_position_x": { - "value": "1" - }, - "acceleration_support_bottom": { - "value": "250" - }, - "speed_support_roof": { - "value": "33.33" - }, - "speed_support_infill": { - "value": "80" - }, - "bridge_skin_speed_2": { - "value": "15" - }, - "raft_fan_speed": { - "default_value": 100 - }, - "wipe_retraction_amount": { - "value": "3" - }, - "skin_edge_support_thickness": { - "value": "0" - }, - "bottom_layers": { - "value": "3" - }, - "retraction_extrusion_window": { - "value": "3" - }, - "acceleration_ironing": { - "value": "250" - }, - "support_top_distance": { - "value": "0.2" - }, - "travel_retract_before_outer_wall": { - "default_value": true - }, - "material_flow": { - "default_value": 99 - }, - "support_bottom_distance": { - "value": "0.2" - }, - "expand_skins_expand_distance": { - "value": "0.8" - }, - "jerk_wall": { - "value": "10" - }, - "support_zag_skip_count": { - "value": "8" - }, - "connect_infill_polygons": { - "value": "False" - }, - "acceleration_skirt_brim": { - "value": "250" - }, - "z_seam_corner": { - "default_value": "z_seam_corner_weighted" - }, - "raft_surface_jerk": { - "value": "10" - }, - "cross_infill_pocket_size": { - "value": "5.33" - }, - "support_infill_extruder_nr": { - "value": "0" - }, - "acceleration_enabled": { - "default_value": true - }, - "jerk_wall_x": { - "value": "10" - }, - "skin_overlap": { - "value": "15" - }, - "infill_material_flow": { - "value": "99" - }, - "speed_equalize_flow_max": { - "default_value": 40 - }, - "skin_preshrink": { - "value": "0.8" - }, - "speed_wall": { - "value": "20" - }, - "support_tree_collision_resolution": { - "value": "0.2" - }, - "meshfix_maximum_deviation": { - "default_value": 0.003 - }, - "jerk_roofing": { - "value": "10" - }, - "fill_outline_gaps": { - "default_value": true - }, - "layer_height": { - "default_value": 0.2 - }, - "remove_empty_first_layers": { - "default_value": false - }, - "prime_tower_flow": { - "value": "99" - }, - "support_roof_line_distance": { - "value": "0.57" - }, - "wipe_retraction_speed": { - "value": "30" - }, - "support_extruder_nr_layer_0": { - "value": "0" - }, - "layer_height_0": { - "default_value": 0.2 - }, - "multiple_mesh_overlap": { - "default_value": 0 - }, - "ooze_shield_dist": { - "default_value": 4 - }, - "jerk_enabled": { - "default_value": true - }, - "acceleration_support": { - "value": "400" - }, - "adhesion_extruder_nr": { - "value": "0" - }, - "skirt_line_count": { - "default_value": 2 - }, - "travel_compensate_overlapping_walls_x_enabled": { - "value": "False" - }, - "jerk_wall_0": { - "value": "10" - }, - "raft_speed": { - "value": "60" - }, - "speed_layer_0": { - "value": "10.0" - }, - "machine_width": { - "default_value": 210 - }, - "acceleration_wall": { - "value": "400" - }, - "jerk_infill": { - "value": "10" - }, - "wipe_hop_enable": { - "value": "False" - }, - "acceleration_travel_layer_0": { - "value": "400" - }, - "raft_interface_speed": { - "value": "60" - }, - "skin_edge_support_layers": { - "value": "0" - }, - "support_xy_distance_overhang": { - "value": "0.5" - }, - "brim_width": { - "default_value": 10 - }, - "coasting_enable": { - "default_value": true - }, - "jerk_print": { - "default_value": 10 - }, - "acceleration_support_roof": { - "value": "250" - }, - "prime_tower_min_volume": { - "default_value": 4 - }, - "support_roof_material_flow": { - "value": "99" - }, - "wall_0_wipe_dist": { - "value": "0" - }, - "jerk_topbottom": { - "value": "10" - }, - "retraction_count_max": { - "default_value": 30 - }, - "skin_overlap_mm": { - "value": "0.06" - }, - "extruders_enabled_count": { - "value": "2" - }, - "speed_support_bottom": { - "value": "33.33" - }, - "support_skip_some_zags": { - "default_value": true - }, - "ooze_shield_angle": { - "default_value": 50 - }, - "wall_thickness": { - "value": "1.2" - }, - "speed_print_layer_0": { - "value": "10.0" - } + "name": "Skriware 2", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Skriware", + "manufacturer": "Skriware", + "file_formats": "text/x-gcode", + "has_machine_quality": true, + "platform_offset": [ + 0, + 0, + 0 + ], + "supports_usb_connection": false, + "platform": "skriware_2_platform.3mf", + "machine_extruder_trains": { + "0": "skriware_2_extruder_0", + "1": "skriware_2_extruder_1" } -} + }, + "overrides": { + "raft_interface_thickness": { + "value": "0.2" + }, + "wipe_retraction_prime_speed": { + "value": "30" + }, + "support_skip_zag_per_mm": { + "default_value": 10 + }, + "material_bed_temperature": { + "value": "50", + "minimum_value_warning": "30", + "resolve": "extruderValues('material_bed_temperature')[adhesion_extruder_nr] if resolveOrValue('adhesion_type') == 'raft' else max(extruderValues('material_bed_temperature'))" + }, + "raft_airgap": { + "default_value": 0.2 + }, + "top_layers": { + "value": "4" + }, + "machine_extruder_count": { + "default_value": 2 + }, + "raft_surface_acceleration": { + "value": "400" + }, + "meshfix_maximum_travel_resolution": { + "value": "0.8" + }, + "machine_end_gcode": { + "default_value": "M59\nG92 E0\nG1 E-10 F300\nM104 T0 S0\nM104 T1 S0\nM140 S0\nG28 X0 Y0\nM84\nM106 S0\nM107\nM220 S100" + }, + "wall_material_flow": { + "value": "99" + }, + "raft_interface_jerk": { + "value": "10" + }, + "acceleration_topbottom": { + "value": "200" + }, + "prime_tower_size": { + "default_value": 1 + }, + "max_skin_angle_for_expansion": { + "default_value": 50 + }, + "raft_acceleration": { + "value": "400" + }, + "support_xy_distance": { + "default_value": 0.6 + }, + "xy_offset_layer_0": { + "value": "0.0" + }, + "raft_interface_fan_speed": { + "value": "40" + }, + "retraction_speed": { + "default_value": 30 + }, + "speed_print": { + "default_value": 20 + }, + "travel_avoid_supports": { + "default_value": true + }, + "infill_overlap_mm": { + "value": "0.0" + }, + "support_roof_height": { + "value": "0.4" + }, + "speed_travel_layer_0": { + "value": "80" + }, + "speed_wall_0": { + "value": "20" + }, + "acceleration_wall_x": { + "value": "200" + }, + "layer_0_z_overlap": { + "value": "0.1" + }, + "switch_extruder_retraction_speed": { + "value": "30" + }, + "travel_compensate_overlapping_walls_enabled": { + "default_value": false + }, + "raft_base_acceleration": { + "value": "400" + }, + "raft_base_speed": { + "value": "60" + }, + "wall_0_material_flow": { + "value": "99" + }, + "support_infill_rate": { + "value": "20" + }, + "raft_surface_layers": { + "default_value": 1 + }, + "machine_height": { + "default_value": 210 + }, + "retraction_prime_speed": { + "value": "60" + }, + "support_interface_material_flow": { + "value": "99" + }, + "raft_surface_fan_speed": { + "value": "80" + }, + "raft_base_line_width": { + "value": "0.4" + }, + "infill_line_distance": { + "value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1))))" + }, + "default_material_print_temperature": { + "default_value": 200 + }, + "speed_roofing": { + "value": "20" + }, + "skin_material_flow": { + "value": "99" + }, + "cool_fan_full_layer": { + "value": "1" + }, + "material_break_preparation_temperature": { + "value": "195" + }, + "support_roof_density": { + "value": "70" + }, + "support_infill_sparse_thickness": { + "value": "0.2" + }, + "retraction_retract_speed": { + "value": "30" + }, + "speed_slowdown_layers": { + "default_value": 1 + }, + "support_line_distance": { + "value":"0 if support_infill_rate == 0 else (support_line_width * 100) / support_infill_rate * (2 if support_pattern == 'grid' else (3 if support_pattern == 'triangles' else 1))" + }, + "cool_lift_head": { + "default_value": true + }, + "min_skin_width_for_expansion": { + "value": "0.67" + }, + "cool_min_speed": { + "default_value": 5 + }, + "switch_extruder_retraction_speeds": { + "default_value": 30 + }, + "raft_base_line_spacing": { + "value": "0.8" + }, + "speed_support": { + "value": "50" + }, + "skirt_brim_material_flow": { + "value": "99" + }, + "speed_infill": { + "value": "80" + }, + "support_initial_layer_line_distance": { + "value": "2" + }, + "support_use_towers": { + "default_value": false + }, + "skin_no_small_gaps_heuristic": { + "default_value": true + }, + "acceleration_roofing": { + "value": "400" + }, + "material_initial_print_temperature": { + "value": "195" + }, + "material_diameter": { + "default_value": 1.75 + }, + "xy_offset": { + "default_value": 0.0 + }, + "support_extruder_nr": { + "value": "0" + }, + "support_brim_line_count": { + "value": "16" + }, + "support_interface_extruder_nr": { + "value": "0" + }, + "support_roof_extruder_nr": { + "value": "0" + }, + "material_adhesion_tendency": { + "default_value": 0 + }, + "material_standby_temperature": { + "default_value": 195 + }, + "cool_fan_speed_0": { + "default_value": 0, + "value": "cool_fan_speed if resolveOrValue('adhesion_type') == 'raft' else 0" + }, + "brim_line_count": { + "value": "17" + }, + "adhesion_type": { + "default_value": "raft" + }, + "switch_extruder_retraction_amount": { + "value": "20" + }, + "retraction_amount": { + "default_value": 3 + }, + "acceleration_travel": { + "value": "400" + }, + "jerk_print_layer_0": { + "value": "10" + }, + "raft_surface_thickness": { + "value": "0.2" + }, + "raft_base_jerk": { + "value": "10" + }, + "bottom_thickness": { + "value": "0.8" + }, + "roofing_material_flow": { + "value": "99" + }, + "top_skin_expand_distance": { + "value": "0.8" + }, + "speed_wall_x": { + "value": "20" + }, + "support_enable": { + "default_value": true + }, + "acceleration_print_layer_0": { + "value": "200" + }, + "jerk_prime_tower": { + "value": "5" + }, + "infill_before_walls": { + "default_value": false + }, + "raft_interface_line_spacing": { + "value": "0.4" + }, + "gantry_height": { + "value": "210" + }, + "material_print_temperature_layer_0": { + "value": "195" + }, + "raft_interface_line_width": { + "value": "0.4" + }, + "skirt_brim_line_width": { + "value": "0.5" + }, + "z_seam_y": { + "value": "180" + }, + "roofing_layer_count": { + "value": "1" + }, + "raft_margin": { + "default_value": 4 + }, + "cool_fan_full_at_height": { + "value": "0" + }, + "acceleration_support_interface": { + "value": "250" + }, + "retraction_min_travel": { + "value": "1" + }, + "acceleration_layer_0": { + "value": "200" + }, + "support_z_distance": { + "default_value": 0.2 + }, + "machine_heated_bed": { + "default_value": true + }, + "raft_jerk": { + "value": "10" + }, + "raft_surface_speed": { + "value": "60" + }, + "initial_layer_line_width_factor": { + "default_value": 120 + }, + "machine_start_gcode": { + "default_value": "G90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM420 S1 Z0.7 ;enable bed levelling\nG1 Z10 F250 ;move the platform down 10mm\nM107 ;fan off\nM42 P11 S255 ;turn on front fan\nM140 S{material_bed_temperature}\nM104 T0 S{material_print_temperature, 0}\nM104 T1 S{material_print_temperature, 1}\nG1 F2500 Y260 X0\nM190 S{material_bed_temperature}\nM109 T0 S{material_print_temperature, 0}\nM109 T1 S{material_print_temperature, 1}\nM60 ;enable E-FADE Algorithm\nM62 A ;filament sensor off\nG92 E0 ;zero the extruded length\nT1\nG92 E0;zero the extruded length\nG1 F300 Z0.3\nG1 F1200 X20\nG1 F1200 X180 E21 ;extrude 21 mm of feed stock\nG1 F1200 E11\nG1 F300 Z1.5\nG92 E0 ;zero the extruded length again\nT0\nG92 E0 ;zero the extruded length\nG1 F1200 Y258\nG1 F300 Z0.3\nG1 F1200 X40 E21 ;extrude 21 mm of feed stock\nG1 F1200 E11 ;retracting 10 mm\nG1 F300 Z1.5\nM63 A ;filament sensor reset\nM61 A ;filament sensor on\nG92 E0 ;zero the extruded length again\nM58 ;end of Start G-Code and signal retract management\nT{initial_extruder_nr}" + }, + "bottom_skin_preshrink": { + "value": "0.0" + }, + "ironing_inset": { + "value": "0.2 + (ironing_line_spacing - skin_line_width * (1.0 + ironing_flow / 100) / 2 if ironing_pattern == 'concentric' else skin_line_width * (1.0 - ironing_flow / 100) / 2)" + }, + "jerk_travel": { + "value": "10" + }, + "machine_depth": { + "default_value": 260 + }, + "jerk_skirt_brim": { + "value": "5" + }, + "infill_wipe_dist": { + "value": "0" + }, + "raft_interface_acceleration": { + "value": "400" + }, + "z_seam_x": { + "value": "115" + }, + "material_print_temperature": { + "value": "195" + }, + "material_bed_temperature_layer_0": { + "value": "50", + "minimum_value_warning": "30", + "resolve": "extruderValues('material_bed_temperature_layer_0')[adhesion_extruder_nr] if resolveOrValue('adhesion_type') == 'raft' else max(extruderValues('material_bed_temperature_layer_0'))" + }, + "wipe_retraction_retract_speed": { + "value": "30" + }, + "jerk_travel_layer_0": { + "value": "10" + }, + "infill_overlap": { + "value": "0" + }, + "acceleration_support_infill": { + "value": "400" + }, + "travel_compensate_overlapping_walls_0_enabled": { + "value": "False" + }, + "support_bottom_material_flow": { + "value": "99" + }, + "jerk_support_roof": { + "value": "5" + }, + "wall_x_material_flow": { + "value": "99" + }, + "speed_support_interface": { + "value": "33.33" + }, + "jerk_layer_0": { + "value": "5" + }, + "support_angle": { + "default_value": 60 + }, + "infill_sparse_thickness": { + "value": "0.2" + }, + "prime_tower_position_y": { + "value": "1" + }, + "retraction_combing": { + "default_value": "infill" + }, + "acceleration_prime_tower": { + "value": "250" + }, + "acceleration_print": { + "default_value": 200 + }, + "acceleration_infill": { + "value": "400" + }, + "bridge_wall_speed": { + "value": "10.0" + }, + "acceleration_wall_0": { + "value": "200" + }, + "support_offset": { + "default_value": 0.2 + }, + "build_volume_temperature": { + "default_value": 28 + }, + "switch_extruder_prime_speed": { + "value": "60" + }, + "speed_prime_tower": { + "value": "20" + }, + "top_skin_preshrink": { + "value": "0.0" + }, + "jerk_ironing": { + "value": "5" + }, + "skin_outline_count": { + "value": 0 + }, + "skirt_brim_speed": { + "value": "10.0" + }, + "raft_base_thickness": { + "value": "0.2" + }, + "infill_sparse_density": { + "default_value": 15 + }, + "support_bottom_extruder_nr": { + "value": "0" + }, + "support_material_flow": { + "value": "98" + }, + "min_infill_area": { + "default_value": 1 + }, + "jerk_support": { + "value": "10" + }, + "bottom_skin_expand_distance": { + "value": "0.8" + }, + "retract_at_layer_change": { + "default_value": true + }, + "jerk_support_interface": { + "value": "5" + }, + "jerk_support_bottom": { + "value": "5" + }, + "optimize_wall_printing_order": { + "default_value": true + }, + "skirt_brim_minimal_length": { + "default_value": 50 + }, + "jerk_support_infill": { + "value": "10" + }, + "initial_bottom_layers": { + "value": "3" + }, + "prime_tower_position_x": { + "value": "1" + }, + "acceleration_support_bottom": { + "value": "250" + }, + "speed_support_roof": { + "value": "33.33" + }, + "speed_support_infill": { + "value": "80" + }, + "bridge_skin_speed_2": { + "value": "15" + }, + "raft_fan_speed": { + "default_value": 40 + }, + "wipe_retraction_amount": { + "value": "3" + }, + "skin_edge_support_thickness": { + "value": "0" + }, + "bottom_layers": { + "value": "3" + }, + "retraction_extrusion_window": { + "value": "3" + }, + "acceleration_ironing": { + "value": "250" + }, + "support_top_distance": { + "value": "0.2" + }, + "travel_retract_before_outer_wall": { + "default_value": true + }, + "material_flow": { + "default_value": 99 + }, + "support_bottom_distance": { + "value": "0.2" + }, + "expand_skins_expand_distance": { + "value": "0.8" + }, + "jerk_wall": { + "value": "10" + }, + "support_zag_skip_count": { + "value": "8" + }, + "connect_infill_polygons": { + "value": "False" + }, + "acceleration_skirt_brim": { + "value": "250" + }, + "z_seam_corner": { + "default_value": "z_seam_corner_weighted" + }, + "raft_surface_jerk": { + "value": "10" + }, + "cross_infill_pocket_size": { + "value": "5.33" + }, + "support_infill_extruder_nr": { + "value": "0" + }, + "acceleration_enabled": { + "default_value": true + }, + "jerk_wall_x": { + "value": "10" + }, + "skin_overlap": { + "value": "15" + }, + "infill_material_flow": { + "value": "99" + }, + "speed_equalize_flow_max": { + "default_value": 40 + }, + "skin_preshrink": { + "value": "0.0" + }, + "speed_wall": { + "value": "20" + }, + "support_tree_collision_resolution": { + "value": "0.2" + }, + "meshfix_maximum_deviation": { + "default_value": 0.003 + }, + "jerk_roofing": { + "value": "10" + }, + "fill_outline_gaps": { + "default_value": true + }, + "layer_height": { + "default_value": 0.2 + }, + "remove_empty_first_layers": { + "default_value": false + }, + "prime_tower_flow": { + "value": "99" + }, + "support_roof_line_distance": { + "value": "0.57" + }, + "wipe_retraction_speed": { + "value": "30" + }, + "support_extruder_nr_layer_0": { + "value": "0" + }, + "layer_height_0": { + "default_value": 0.2 + }, + "multiple_mesh_overlap": { + "default_value": 0 + }, + "ooze_shield_dist": { + "default_value": 4 + }, + "jerk_enabled": { + "default_value": true + }, + "acceleration_support": { + "value": "200" + }, + "adhesion_extruder_nr": { + "value": "0" + }, + "skirt_line_count": { + "default_value": 2 + }, + "travel_compensate_overlapping_walls_x_enabled": { + "value": "False" + }, + "jerk_wall_0": { + "value": "5" + }, + "raft_speed": { + "value": "60" + }, + "speed_layer_0": { + "value": "20.0" + }, + "machine_width": { + "default_value": 210 + }, + "acceleration_wall": { + "value": "200" + }, + "jerk_infill": { + "value": "10" + }, + "wipe_hop_enable": { + "value": "False" + }, + "acceleration_travel_layer_0": { + "value": "400" + }, + "raft_interface_speed": { + "value": "60" + }, + "skin_edge_support_layers": { + "value": "0" + }, + "support_xy_distance_overhang": { + "value": "0.5" + }, + "brim_width": { + "default_value": 10 + }, + "coasting_enable": { + "default_value": true + }, + "jerk_print": { + "default_value": 10 + }, + "acceleration_support_roof": { + "value": "250" + }, + "prime_tower_min_volume": { + "default_value": 4 + }, + "support_roof_material_flow": { + "value": "99" + }, + "wall_0_wipe_dist": { + "value": "0" + }, + "jerk_topbottom": { + "value": "10" + }, + "retraction_count_max": { + "default_value": 30 + }, + "skin_overlap_mm": { + "value": "0.06" + }, + "extruders_enabled_count": { + "value": "2" + }, + "speed_support_bottom": { + "value": "33.33" + }, + "support_skip_some_zags": { + "default_value": true + }, + "ooze_shield_angle": { + "default_value": 50 + }, + "wall_thickness": { + "value": "1.2" + }, + "speed_print_layer_0": { + "value": "10.0" + } + } +} \ No newline at end of file diff --git a/resources/definitions/snapmaker2.def.json b/resources/definitions/snapmaker2.def.json new file mode 100644 index 0000000000..e4ad7e19df --- /dev/null +++ b/resources/definitions/snapmaker2.def.json @@ -0,0 +1,77 @@ +{ + "version": 2, + "name": "Snapmaker 2", + "inherits": "fdmprinter", + "metadata": { + "visible": false, + "manufacturer": "Snapmaker", + "file_formats": "text/x-gcode", + "machine_extruder_trains": { + "0": "snapmaker_extruder_0" + }, + "has_materials": true, + "has_machine_quality": true, + "preferred_quality_type": "normal", + "preferred_material": "generic_pla", + "exclude_materials": [ ] + }, + "overrides": { + "machine_name": { + "default_value": "Snapmaker" + }, + "machine_buildplate_type": { + "default_value": "aluminum" + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_start_gcode": { + "default_value": "M104 S{material_print_temperature} ;Set Hotend Temperature\nM140 S{material_bed_temperature} ;Set Bed Temperature\nG28 ;home\nG90 ;absolute positioning\nG1 X-10 Y-10 F3000 ;Move to corner \nG1 Z0 F1800 ;Go to zero offset\nM109 S{material_print_temperature} ;Wait for Hotend Temperature\nM190 S{material_bed_temperature} ;Wait for Bed Temperature\nG92 E0 ;Zero set extruder position\nG1 E20 F200 ;Feed filament to clear nozzle\nG92 E0 ;Zero set extruder position" + }, + "machine_end_gcode": { + "default_value": "M104 S0 ;Extruder heater off\nM140 S0 ;Heated bed heater off\nG90 ;absolute positioning\nG92 E0 ;Retract the filament\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z{machine_width} E-1 F3000 ;move Z up a bit and retract filament even more\nG1 X0 F3000 ;move X to min endstops, so the head is out of the way\nG1 Y{machine_depth} F3000 ;so the head is out of the way and Plate is moved forward" + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_max_acceleration_x": { + "default_value": 1000 + }, + "machine_max_acceleration_y": { + "default_value": 1000 + }, + "machine_max_acceleration_z": { + "default_value": 1000 + }, + "machine_max_acceleration_e": { + "default_value": 1000 + }, + "machine_acceleration": { + "default_value": 1000 + }, + "material_print_temp_prepend": { + "default_value": false + }, + "material_bed_temp_prepend": { + "default_value": false + }, + "default_material_print_temperature": { + "default_value": 205 + }, + "retraction_enable": { + "default_value": true + }, + "retraction_amount": { + "default_value": 5 + }, + "retraction_speed": { + "default_value": 60 + }, + "retract_at_layer_change": { + "default_value": false + } + } +} diff --git a/resources/definitions/snapmaker2_A150.def.json b/resources/definitions/snapmaker2_A150.def.json new file mode 100644 index 0000000000..8baea05016 --- /dev/null +++ b/resources/definitions/snapmaker2_A150.def.json @@ -0,0 +1,39 @@ +{ + "version": 2, + "name": "Snapmaker 2 A150", + "inherits": "snapmaker2", + "metadata": { + "visible": true, + "manufacturer": "Snapmaker", + "file_formats": "text/x-gcode", + "machine_extruder_trains": { + "0": "snapmaker_extruder_0" + }, + "quality_definition": "snapmaker2" + }, + "overrides": { + "machine_name": { + "default_value": "Snapmaker A150" + }, + "machine_width": { + "default_value": 160 + }, + "machine_depth": { + "default_value": 160 + }, + "machine_height": { + "default_value": 145 + }, + "machine_head_with_fans_polygon": { + "default_value": [ + [-67, 22], + [-67, -25], + [25.5, 22], + [25.5, -25] + ] + }, + "gantry_height": { + "value": 27 + } + } +} diff --git a/resources/definitions/snapmaker2_A250.def.json b/resources/definitions/snapmaker2_A250.def.json new file mode 100644 index 0000000000..a61d52c46f --- /dev/null +++ b/resources/definitions/snapmaker2_A250.def.json @@ -0,0 +1,39 @@ +{ + "version": 2, + "name": "Snapmaker 2 A250", + "inherits": "snapmaker2", + "metadata": { + "visible": true, + "manufacturer": "Snapmaker", + "file_formats": "text/x-gcode", + "machine_extruder_trains": { + "0": "snapmaker_extruder_0" + }, + "quality_definition": "snapmaker2" + }, + "overrides": { + "machine_name": { + "default_value": "Snapmaker A250" + }, + "machine_width": { + "default_value": 230 + }, + "machine_depth": { + "default_value": 250 + }, + "machine_height": { + "default_value": 235 + }, + "machine_head_with_fans_polygon": { + "default_value": [ + [-67, 22], + [-67, -25], + [25.5, 22], + [25.5, -25] + ] + }, + "gantry_height": { + "value": 27 + } + } +} diff --git a/resources/definitions/snapmaker2_A350.def.json b/resources/definitions/snapmaker2_A350.def.json new file mode 100644 index 0000000000..944e9ebc3b --- /dev/null +++ b/resources/definitions/snapmaker2_A350.def.json @@ -0,0 +1,39 @@ +{ + "version": 2, + "name": "Snapmaker 2 A350", + "inherits": "snapmaker2", + "metadata": { + "visible": true, + "manufacturer": "Snapmaker", + "file_formats": "text/x-gcode", + "machine_extruder_trains": { + "0": "snapmaker_extruder_0" + }, + "quality_definition": "snapmaker2" + }, + "overrides": { + "machine_name": { + "default_value": "Snapmaker A350" + }, + "machine_width": { + "default_value": 320 + }, + "machine_depth": { + "default_value": 350 + }, + "machine_height": { + "default_value": 330 + }, + "machine_head_with_fans_polygon": { + "default_value": [ + [-67, 22], + [-67, -25], + [25.5, 22], + [25.5, -25] + ] + }, + "gantry_height": { + "value": 27 + } + } +} diff --git a/resources/definitions/stereotech_start.def.json b/resources/definitions/stereotech_start.def.json index ca03937007..f6733d2ec7 100644 --- a/resources/definitions/stereotech_start.def.json +++ b/resources/definitions/stereotech_start.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Stereotech START", + "name": "Stereotech Start", "inherits": "fdmprinter", "metadata": { "visible": true, diff --git a/resources/definitions/strateo3d.def.json b/resources/definitions/strateo3d.def.json index 2858a859c5..9c865fe233 100644 --- a/resources/definitions/strateo3d.def.json +++ b/resources/definitions/strateo3d.def.json @@ -15,14 +15,14 @@ "preferred_material": "emotiontech_pla", "preferred_quality_type": "c", "variants_name": "Print Head", - "machine_extruder_trains": - { - "0": "strateo3d_right_extruder", + "machine_extruder_trains": + { + "0": "strateo3d_right_extruder", "1": "strateo3d_left_extruder" } }, - - "overrides": + + "overrides": { "machine_name": { "default_value": "Strateo3D" }, "machine_width": { "default_value": 600 }, @@ -35,28 +35,43 @@ "gantry_height": { "value": "40" }, "machine_extruder_count": { "default_value": 2 }, "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_start_gcode": { "default_value": "G28 \nG90 G1 X300 Y210 Z15 F6000 \nG92 E0" }, + "machine_start_gcode": { "default_value": ";M104 T0 S{material_standby_temperature, 0} \n;M104 T1 S{material_standby_temperature, 1} \n;M140 S{material_bed_temperature_layer_0} \n;M141 S{build_volume_temperature} \nG28 \nG90 \nT{initial_extruder_nr} \nG1 X0 Y0 Z15 F6000 \n;M190 S{material_bed_temperature_layer_0} \n;M109 S{material_print_temperature_layer_0, initial_extruder_nr} \nG1 Z0.3 \nG92 E0 \nG1 F300 X45 E18 \n;G1 F1500 E17 \nG1 F600 X25 \nG1 F600 Z3" }, "machine_end_gcode": { "default_value": "T1 \nM104 S0 \nT0 \nM104 S0 \nM140 S0 \nM141 S0 \nG91 \nG0 z1 \nG90 \nG28 \nM801.0 \nM84 \nM192" }, "extruder_prime_pos_y": {"minimum_value": "0", "maximum_value": "machine_depth"}, "extruder_prime_pos_x": {"minimum_value": "0", "maximum_value": "machine_width"}, "machine_heat_zone_length": { "default_value": 7 }, - "default_material_print_temperature": { "maximum_value_warning": "350" }, - "material_print_temperature": { "maximum_value_warning": "350" }, - "material_print_temperature_layer_0": { "maximum_value_warning": "350" }, - "material_bed_temperature": { "maximum_value": "130" }, - "material_bed_temperature_layer_0": { "maximum_value": "130" }, + "default_material_print_temperature": { "maximum_value_warning": "400", "maximum_value": "415" }, + "material_print_temperature": { "maximum_value_warning": "400", "maximum_value": "415" }, + "material_print_temperature_layer_0": { "maximum_value_warning": "400", "maximum_value": "415" }, + "material_initial_print_temperature": { "maximum_value_warning": "400", "maximum_value": "415" }, + "material_final_print_temperature": { "maximum_value_warning": "400", "maximum_value": "415" }, + "material_standby_temperature": { "maximum_value_warning": "material_print_temperature - 40", "maximum_value": "material_print_temperature" }, + "material_bed_temperature": { "maximum_value_warning": "140", "maximum_value": "140" }, + "material_bed_temperature_layer_0": { "maximum_value_warning": "140", "maximum_value": "140" }, "extruder_prime_pos_abs": { "default_value": true }, "machine_acceleration": { "default_value": 1500 }, + "machine_max_jerk_xy": { "default_value": 0.01 }, + "machine_max_jerk_z": { "default_value": 0}, "acceleration_enabled": { "value": false }, - "acceleration_print": { "value": "machine_acceleration" }, - "acceleration_wall": { "value": "math.ceil(acceleration_print * 1250 / acceleration_print)" }, - "acceleration_wall_0": { "value": "math.ceil(acceleration_print * 1000 / acceleration_print)" }, - "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1250 / acceleration_print)" }, - "acceleration_support": { "value": "acceleration_print" }, - "acceleration_support_interface": { "value": "acceleration_topbottom" }, - "acceleration_travel": { "value": "acceleration_print" }, - "acceleration_layer_0": { "value": "acceleration_topbottom" }, + "acceleration_print": { "value": "machine_acceleration", "maximum_value_warning": "1500" }, + "acceleration_infill": { "maximum_value_warning": "1500" }, + "acceleration_wall": { "value": "math.ceil(acceleration_print * 1250 / acceleration_print)", "maximum_value_warning": "1500" }, + "acceleration_wall_0": { "value": "math.ceil(acceleration_print * 1000 / acceleration_print)", "maximum_value_warning": "1500" }, + "acceleration_wall_x": { "maximum_value_warning": "1500" }, + "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1250 / acceleration_print)", "maximum_value_warning": "1500" }, + "acceleration_support": { "value": "acceleration_print", "maximum_value_warning": "1500" }, + "acceleration_support_infill": { "maximum_value_warning": "1500" }, + "acceleration_support_interface": { "value": "acceleration_topbottom", "maximum_value_warning": "1500" }, + "acceleration_support_roof": { "maximum_value_warning": "1500" }, + "acceleration_support_bottom": { "maximum_value_warning": "1500" }, + "acceleration_prime_tower": { "maximum_value_warning": "1500" }, + "acceleration_travel": { "value": "acceleration_print", "maximum_value_warning": "1500" }, + "acceleration_layer_0": { "value": "acceleration_topbottom", "maximum_value_warning": "1500" }, + "acceleration_print_layer_0": { "maximum_value_warning": "1500" }, + "acceleration_travel_layer_0": { "maximum_value_warning": "1500" }, + "acceleration_skirt_brim": { "maximum_value_warning": "1500" }, + "adaptive_layer_height_variation": { "default_value": 0.1 }, "adaptive_layer_height_variation_step": { "default_value": 0.05 }, "adhesion_type": { "default_value": "skirt" }, @@ -66,30 +81,39 @@ "infill_before_walls": { "default_value": false }, "infill_overlap": { "value": "0" }, "infill_wipe_dist": { "value": "0" }, - "jerk_enabled": { "value": "False" }, - "jerk_layer_0": { "value": "jerk_topbottom" }, - "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" }, - "jerk_print": { "value": "25" }, - "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" }, - "jerk_support_interface": { "value": "jerk_topbottom" }, - "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, - "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, - "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, + + "jerk_enabled": { "value": "False", "maximum_value_warning": "0.01" }, + "jerk_print": { "value": "0.01", "maximum_value_warning": "0.01" }, + "jerk_infill": { "value": "0.01", "maximum_value_warning": "0.01" }, + "jerk_layer_0": { "value": "jerk_topbottom", "maximum_value_warning": "0.01" }, + "jerk_print_layer_0": { "maximum_value_warning": "0.01" }, + "jerk_travel_layer_0": { "maximum_value_warning": "0.01" }, + "jerk_skirt_brim": { "maximum_value_warning": "0.01" }, + "jerk_prime_tower": { "value": "jerk_print * 15 / 25", "maximum_value_warning": "0.01" }, + "jerk_support": { "value": "jerk_print * 15 / 25", "maximum_value_warning": "0.01" }, + "jerk_support_infill": { "maximum_value_warning": "0.01" }, + "jerk_support_interface": { "value": "jerk_topbottom", "maximum_value_warning": "0.01" }, + "jerk_support_roof": { "maximum_value_warning": "0.01" }, + "jerk_support_bottom": { "maximum_value_warning": "0.01" }, + "jerk_topbottom": { "value": "jerk_print * 5 / 25", "maximum_value_warning": "0.01" }, + "jerk_wall": { "value": "jerk_print * 5 / 25", "maximum_value_warning": "0.01" }, + "jerk_wall_0": { "value": "jerk_wall * 5 / 10", "maximum_value_warning": "0.01" }, + "jerk_wall_x": { "maximum_value_warning": "0.01" }, + "jerk_travel": { "value": "machine_max_jerk_xy", "maximum_value_warning": "0.01" }, + "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_min_cool_heat_time_window": { "value": "15" }, "machine_nozzle_cool_down_speed": { "default_value": 0.50 }, "machine_nozzle_heat_up_speed": { "default_value": 2.25 }, - "material_final_print_temperature": { "value": "material_print_temperature - 10" }, "material_flow": { "default_value": 93 }, "material_flow_layer_0": { "value": "math.ceil(material_flow*1)" }, - "material_initial_print_temperature": { "value": "material_print_temperature - 5" }, "meshfix_maximum_resolution": { "value": "0.5" }, "meshfix_maximum_deviation": { "default_value": 0.04 }, "optimize_wall_printing_order": { "value": "True" }, "prime_blob_enable": { "enabled": false, "default_value": false }, "prime_tower_min_volume": { "default_value": 35 }, - "prime_tower_position_x": { "value": "machine_width/2 - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" }, + "prime_tower_position_x": { "value": "machine_width/2 + prime_tower_size/2" }, "prime_tower_position_y": { "value": "machine_depth - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" }, "retraction_amount": { "default_value": 1.5 }, "retraction_combing": { "default_value": "all" }, @@ -135,4 +159,4 @@ "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_thickness": { "value": "wall_line_width_0 + wall_line_width_x" } } -} \ No newline at end of file +} diff --git a/resources/definitions/stream20dual_mk2.def.json b/resources/definitions/stream20dual_mk2.def.json new file mode 100644 index 0000000000..2bb491a906 --- /dev/null +++ b/resources/definitions/stream20dual_mk2.def.json @@ -0,0 +1,52 @@ +{ + "version": 2, + "name": "Volumic Stream20Dual MK2", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Volumic", + "manufacturer": "Volumic", + "file_formats": "text/x-gcode", + "icon": "volumic-icon", + "platform": "STREAM20PRO_platform.STL", + "machine_extruder_trains":{"0": "stream20dual_0","1": "stream20dual_1"}, + "has_machine_quality": true, + "has_materials": true + }, + + "overrides": { + "machine_name": { "default_value": "VOLUMIC STREAM20DUAL MK2" }, + "machine_heated_bed": { "default_value": true }, + "machine_width": { "default_value": 165 }, + "machine_height": { "default_value": 240 }, + "machine_depth": { "default_value": 200 }, + "machine_center_is_zero": { "default_value": false }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.1 }, + "retraction_amount": { "default_value": 2 }, + "retraction_speed": { "default_value": 25 }, + "adhesion_type": { "default_value": "none" }, + "infill_sparse_density": { "default_value": 25 }, + "fill_outline_gaps": { "default_value": true }, + "retract_at_layer_change": { "default_value": true }, + "retraction_combing_max_distance": { "default_value": 200 }, + "machine_head_with_fans_polygon": { "default_value": [[-38,30],[38,30],[38,-40],[-38,-40]] }, + "machine_max_feedrate_z": { "default_value": 20 }, + "machine_max_feedrate_e": { "default_value": 60 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_acceleration": { "default_value": 2000 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.4 }, + "machine_max_jerk_e": { "default_value": 5 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_extruder_count": {"default_value": 2}, + "machine_start_gcode": { + "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" + }, + "machine_end_gcode": { + "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" + } + } +} diff --git a/resources/definitions/stream20pro_mk2.def.json b/resources/definitions/stream20pro_mk2.def.json new file mode 100644 index 0000000000..1da3c01d1f --- /dev/null +++ b/resources/definitions/stream20pro_mk2.def.json @@ -0,0 +1,51 @@ +{ + "version": 2, + "name": "Volumic Stream20Pro MK2", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Volumic", + "manufacturer": "Volumic", + "file_formats": "text/x-gcode", + "icon": "volumic-icon", + "platform": "STREAM20PRO_platform.STL", + "has_materials": true, + "has_machine_quality": true, + "machine_extruder_trains":{"0": "stream20_extruder"} + }, + + "overrides": { + "machine_name": { "default_value": "VOLUMIC STREAM20PRO MK2" }, + "machine_heated_bed": { "default_value": true }, + "machine_width": { "default_value": 200 }, + "machine_height": { "default_value": 240 }, + "machine_depth": { "default_value": 200 }, + "machine_center_is_zero": { "default_value": false }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.1 }, + "retraction_amount": { "default_value": 2 }, + "retraction_speed": { "default_value": 25 }, + "adhesion_type": { "default_value": "none" }, + "infill_sparse_density": { "default_value": 25 }, + "fill_outline_gaps": { "default_value": true }, + "retract_at_layer_change": { "default_value": true }, + "retraction_combing_max_distance": { "default_value": 200 }, + "machine_head_with_fans_polygon": { "default_value": [[-38,30],[38,30],[38,-40],[-38,-40]] }, + "machine_max_feedrate_z": { "default_value": 50 }, + "machine_max_feedrate_e": { "default_value": 60 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_acceleration": { "default_value": 2000 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.4 }, + "machine_max_jerk_e": { "default_value": 5 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { + "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" + }, + "machine_end_gcode": { + "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" + } + } +} diff --git a/resources/definitions/stream30dual_mk2.def.json b/resources/definitions/stream30dual_mk2.def.json new file mode 100644 index 0000000000..4d16c978a9 --- /dev/null +++ b/resources/definitions/stream30dual_mk2.def.json @@ -0,0 +1,52 @@ +{ + "version": 2, + "name": "Volumic Stream30Dual MK2", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Volumic", + "manufacturer": "Volumic", + "file_formats": "text/x-gcode", + "icon": "volumic-icon", + "platform": "STREAM30PRO_platform.STL", + "machine_extruder_trains":{"0": "stream30dual_0","1": "stream30dual_1"}, + "has_machine_quality": true, + "has_materials": true + }, + + "overrides": { + "machine_name": { "default_value": "VOLUMIC STREAM30DUAL MK2" }, + "machine_heated_bed": { "default_value": true }, + "machine_width": { "default_value": 265 }, + "machine_height": { "default_value": 300 }, + "machine_depth": { "default_value": 200 }, + "machine_center_is_zero": { "default_value": false }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.1 }, + "retraction_amount": { "default_value": 2 }, + "retraction_speed": { "default_value": 25 }, + "adhesion_type": { "default_value": "none" }, + "infill_sparse_density": { "default_value": 25 }, + "fill_outline_gaps": { "default_value": true }, + "retract_at_layer_change": { "default_value": true }, + "retraction_combing_max_distance": { "default_value": 200 }, + "machine_head_with_fans_polygon": { "default_value": [[0,0],[0,0],[0,0],[0,0]] }, + "machine_max_feedrate_z": { "default_value": 50 }, + "machine_max_feedrate_e": { "default_value": 60 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_acceleration": { "default_value": 2000 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.4 }, + "machine_max_jerk_e": { "default_value": 5 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_extruder_count": {"default_value": 2}, + "machine_start_gcode": { + "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" + }, + "machine_end_gcode": { + "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" + } + } +} diff --git a/resources/definitions/stream30pro_mk2.def.json b/resources/definitions/stream30pro_mk2.def.json new file mode 100644 index 0000000000..b313704dac --- /dev/null +++ b/resources/definitions/stream30pro_mk2.def.json @@ -0,0 +1,51 @@ +{ + "version": 2, + "name": "Volumic Stream30Pro MK2", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Volumic", + "manufacturer": "Volumic", + "file_formats": "text/x-gcode", + "icon": "volumic-icon", + "platform": "STREAM30PRO_platform.STL", + "has_materials": true, + "has_machine_quality": true, + "machine_extruder_trains":{"0": "stream30_extruder"} + }, + + "overrides": { + "machine_name": { "default_value": "VOLUMIC STREAM30PRO MK2" }, + "machine_heated_bed": { "default_value": true }, + "machine_width": { "default_value": 300 }, + "machine_height": { "default_value": 300 }, + "machine_depth": { "default_value": 200 }, + "machine_center_is_zero": { "default_value": false }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.1 }, + "retraction_amount": { "default_value": 2 }, + "retraction_speed": { "default_value": 25 }, + "adhesion_type": { "default_value": "none" }, + "infill_sparse_density": { "default_value": 25 }, + "fill_outline_gaps": { "default_value": true }, + "retract_at_layer_change": { "default_value": true }, + "retraction_combing_max_distance": { "default_value": 200 }, + "machine_head_with_fans_polygon": { "default_value": [[-38,30],[38,30],[38,-40],[-38,-40]] }, + "machine_max_feedrate_z": { "default_value": 50 }, + "machine_max_feedrate_e": { "default_value": 60 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_acceleration": { "default_value": 2000 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.4 }, + "machine_max_jerk_e": { "default_value": 5 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { + "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" + }, + "machine_end_gcode": { + "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" + } + } +} diff --git a/resources/definitions/stream30ultra.def.json b/resources/definitions/stream30ultra.def.json new file mode 100644 index 0000000000..731e213447 --- /dev/null +++ b/resources/definitions/stream30ultra.def.json @@ -0,0 +1,51 @@ +{ + "version": 2, + "name": "Volumic Stream30Ultra", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Volumic", + "manufacturer": "Volumic", + "file_formats": "text/x-gcode", + "icon": "volumic-icon", + "platform": "STREAM30ULTRA_platform.STL", + "has_materials": true, + "has_machine_quality": true, + "machine_extruder_trains":{"0": "stream30ultra_extruder"} + }, + + "overrides": { + "machine_name": { "default_value": "VOLUMIC STREAM30ULTRA" }, + "machine_heated_bed": { "default_value": true }, + "machine_width": { "default_value": 290 }, + "machine_height": { "default_value": 300 }, + "machine_depth": { "default_value": 200 }, + "machine_center_is_zero": { "default_value": false }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.1 }, + "retraction_amount": { "default_value": 2 }, + "retraction_speed": { "default_value": 25 }, + "adhesion_type": { "default_value": "none" }, + "infill_sparse_density": { "default_value": 25 }, + "fill_outline_gaps": { "default_value": true }, + "retract_at_layer_change": { "default_value": true }, + "retraction_combing_max_distance": { "default_value": 200 }, + "machine_head_with_fans_polygon": { "default_value": [[-38,30],[38,30],[38,-40],[-38,-40]] }, + "machine_max_feedrate_z": { "default_value": 30 }, + "machine_max_feedrate_e": { "default_value": 60 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_acceleration": { "default_value": 2000 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.4 }, + "machine_max_jerk_e": { "default_value": 5 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { + "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" + }, + "machine_end_gcode": { + "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" + } + } +} diff --git a/resources/definitions/stream30ultrasc.def.json b/resources/definitions/stream30ultrasc.def.json new file mode 100644 index 0000000000..2f645a057b --- /dev/null +++ b/resources/definitions/stream30ultrasc.def.json @@ -0,0 +1,51 @@ +{ + "version": 2, + "name": "Volumic Stream30Ultra SC", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Volumic", + "manufacturer": "Volumic", + "file_formats": "text/x-gcode", + "icon": "volumic-icon", + "platform": "STREAM30ULTRA_platform.STL", + "has_materials": true, + "has_machine_quality": true, + "machine_extruder_trains":{"0": "stream30ultrasc_extruder"} + }, + + "overrides": { + "machine_name": { "default_value": "VOLUMIC STREAM30ULTRA SC" }, + "machine_heated_bed": { "default_value": true }, + "machine_width": { "default_value": 300 }, + "machine_height": { "default_value": 310 }, + "machine_depth": { "default_value": 200 }, + "machine_center_is_zero": { "default_value": false }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.1 }, + "retraction_amount": { "default_value": 2.40 }, + "retraction_speed": { "default_value": 30 }, + "adhesion_type": { "default_value": "none" }, + "infill_sparse_density": { "default_value": 25 }, + "fill_outline_gaps": { "default_value": true }, + "retract_at_layer_change": { "default_value": true }, + "retraction_combing_max_distance": { "default_value": 200 }, + "machine_head_with_fans_polygon": { "default_value": [[-38,30],[38,30],[38,-40],[-38,-40]] }, + "machine_max_feedrate_z": { "default_value": 30 }, + "machine_max_feedrate_e": { "default_value": 60 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_acceleration": { "default_value": 2000 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.4 }, + "machine_max_jerk_e": { "default_value": 5 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { + "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" + }, + "machine_end_gcode": { + "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" + } + } +} diff --git a/resources/definitions/syndaveraxi.def.json b/resources/definitions/syndaveraxi.def.json index 887bfca6ee..186b89212f 100644 --- a/resources/definitions/syndaveraxi.def.json +++ b/resources/definitions/syndaveraxi.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "SyndaverAXI", + "name": "SyndaverAxi", "inherits": "fdmprinter", "metadata": { @@ -33,11 +33,11 @@ [ 0, 0 ] ] }, - "gantry_height": { "value": "286" }, + "gantry_height": { "value": "30" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { - "default_value": ";This G-Code has been generated specifically for Syndaver AXI with Hemera toolhead\nM73 P0 ; clear LCD progress bar\nM75 ; Start LCD Print Timer\nM107 ; disable fans\nM420 S0 ; disable leveling matrix\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder position to 0\nM140 S{material_bed_temperature_layer_0} ; start bed heating up\nM104 S170 ; start nozzle heating up\nG28 ; home all axes\nM117 AXI Heating Up...\nG1 X-17.5 Y100 Z10 F3000 ; move to wipe position\nG29 L1 ; load leveling matrix slot 1\nG29 A ; ensure mesh is enabled\nM109 R170 ; wait for nozzle to reach wiping temp\nG1 E-3 ; retract material before wipe\nM117 AXI Wiping Nozzle...\nG1 Z-3 ; lower nozzle\nG1 Y90 F1000 ; slow wipe\nG1 Y65 F1000 ; slow wipe\nG1 Y80 F1000 ; slow wipe\nG1 Y65 F1000 ; slow wipe\nG1 Y55 F1000 ; slow wipe\nG1 Y30 F3000 ; fast wipe\nG1 Y55 F3000 ; fast wipe\nG1 Y30 F3000 ; fast wipe\nG1 Y55 F3000 ; fast wipe\nG1 Z10 ; raise nozzle\nM117 Heating...\nM190 R{material_bed_temperature_layer_0} ; wait for bed to reach printing temp\nM104 S{material_print_temperature_layer_0} ; set extruder to reach initial printing temp, held back for ooze reasons\nM117 Probe Z at Temp\nG28 Z ; re-probe Z0 to account for any thermal expansion in the bed\nG1 X-17.5 Y80 Z10 F3000 ; move back to wiper\nM117 Heating...\nM109 R{material_print_temperature_layer_0} ; wait for extruder to reach initial printing temp\nM117 AXI Wiping Nozzle...\nG1 E0 ; prime material in nozzle\nG1 Z-3 ; final ooze wipe\nG1 Y60 F2000 ; final ooze wipe\nG1 Y20 F2000 ; final ooze wipe\nM117 AXI Starting Print\nG1 Z2 ; move nozzle back up to not run into things on print start\nM400 ; wait for moves to finish\nM117 AXI Printing" + "default_value": ";This G-Code has been generated specifically for Syndaver AXI with Hemera toolhead\nM73 P0 ; clear LCD progress bar\nM75 ; Start LCD Print Timer\nM107 ; disable fans\nM420 S0 ; disable leveling matrix\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder position to 0\nM140 S{material_bed_temperature_layer_0} ; start bed heating up\nM104 S170 ; start nozzle heating up\nG28 ; home all axes\nM117 AXI Heating Up...\nG1 X-17.5 Y100 F3000 ; move to wiper pad\nG1 Z10 F5000 ; move to wiper pad\nG29 L1 ; load leveling matrix slot 1\nG29 A ; ensure mesh is enabled\nM109 R170 ; wait for nozzle to reach wiping temp\nG1 E-3 ; retract material before wipe\nM117 AXI Wiping Nozzle...\nG1 Z-3 ; lower nozzle\nG1 Y90 F1000 ; slow wipe\nG1 Y65 F1000 ; slow wipe\nG1 Y80 F1000 ; slow wipe\nG1 Y65 F1000 ; slow wipe\nG1 Y55 F1000 ; slow wipe\nG1 Y30 F3000 ; fast wipe\nG1 Y55 F3000 ; fast wipe\nG1 Y30 F3000 ; fast wipe\nG1 Y55 F3000 ; fast wipe\nG1 Z10 ; raise nozzle\nM117 Heating...\nM190 R{material_bed_temperature_layer_0} ; wait for bed to reach printing temp\nM104 S{material_print_temperature_layer_0} ; set extruder to reach initial printing temp, held back for ooze reasons\nM117 Probe Z at Temp\nG28 Z ; re-probe Z0 to account for any thermal expansion in the bed\nG1 X-17.5 Y80 F3000 ; move to wiper pad\nG1 Z10 F5000 ; move to wiper pad\nM117 Heating...\nM109 R{material_print_temperature_layer_0} ; wait for extruder to reach initial printing temp\nM117 AXI Wiping Nozzle...\nG1 E0 ; prime material in nozzle\nG1 Z-3 ; final ooze wipe\nG1 Y60 F2000 ; final ooze wipe\nG1 Y20 F2000 ; final ooze wipe\nM117 AXI Starting Print\nG1 Z2 ; move nozzle back up to not run into things on print start\nM400 ; wait for moves to finish\nM117 AXI Printing" }, "machine_end_gcode": { "default_value": "M400 ; wait for moves to finish\nM140 S50 ; start bed cooling\nM104 S0 ; disable hotend\nM107 ; disable fans\nM117 Cooling please wait\nG91 ; relative positioning\nG1 Z5 F3000 ; move Z up 5mm so it wont drag on the print\nG90 ; absolute positioning\nG1 X5 Y5 F3000 ; move to cooling position\nM190 R50 ; wait for bed to cool down to removal temp\nG1 X145 Y260 F1000 ; present finished print\nM140 S0 ; cool down bed\nM77 ; End LCD Print Timer\nM18 X Y E ; turn off x y and e axis\nM117 Print Complete." diff --git a/resources/definitions/syndaveraxi2.def.json b/resources/definitions/syndaveraxi2.def.json new file mode 100644 index 0000000000..8ab0003e09 --- /dev/null +++ b/resources/definitions/syndaveraxi2.def.json @@ -0,0 +1,46 @@ +{ + "version": 2, + "name": "SyndaverAxi2", + "inherits": "fdmprinter", + "metadata": +{ + "type": "machine", + "visible": true, + "author": "Syndaver3D", + "manufacturer": "Syndaver3D", + "file_formats": "text/x-gcode", + "supports_usb_connection": true, + "preferred_quality_type": "draft", + "machine_extruder_trains": + { + "0": "syndaveraxi2_extruder_0" + } + }, + + "overrides": { + "machine_name": { "default_value": "AXI2" }, + "machine_shape": { "default_value": "rectangular"}, + "machine_heated_bed": { "default_value": true }, + "machine_width": { "default_value": 280 }, + "machine_depth": { "default_value": 280 }, + "machine_height": { "default_value": 280 }, + "machine_center_is_zero": { "default_value": false }, + "machine_head_with_fans_polygon": { + "default_value": [ + [ 0, 0 ], + [ 0, 0 ], + [ 0, 0 ], + [ 0, 0 ] + ] + }, + "gantry_height": { "value": "60" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + + "machine_start_gcode": { + "default_value": ";This G-Code has been generated specifically for Syndaver AXI 2 with Hemera toolhead\nM73 P0 ; clear LCD progress bar\nM75 ; Start LCD Print Timer\nM107 ; disable fans\nM420 S0 ; disable leveling matrix\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder position to 0\nM140 S{material_bed_temperature_layer_0} ; start bed heating up\nM104 S170 ; start nozzle heating up\nG28 ; home all axes\nM117 AXI Heating Up...\nG1 X-17.5 Y100 F3000 ; move to wiper pad\nG1 Z10 F5000 ; move to wiper pad\nG29 L1 ; load leveling matrix slot 1\nG29 A ; ensure mesh is enabled\nM109 R170 ; wait for nozzle to reach wiping temp\nG1 E-3 ; retract material before wipe\nM117 AXI Wiping Nozzle...\nG1 Z-3 ; lower nozzle\nG1 Y90 F1000 ; slow wipe\nG1 Y65 F1000 ; slow wipe\nG1 Y80 F1000 ; slow wipe\nG1 Y65 F1000 ; slow wipe\nG1 Y55 F1000 ; slow wipe\nG1 Y30 F3000 ; fast wipe\nG1 Y55 F3000 ; fast wipe\nG1 Y30 F3000 ; fast wipe\nG1 Y55 F3000 ; fast wipe\nG1 Z10 ; raise nozzle\nM117 Heating...\nM190 R{material_bed_temperature_layer_0} ; wait for bed to reach printing temp\nM104 S{material_print_temperature_layer_0} ; set extruder to reach initial printing temp, held back for ooze reasons\nM117 Probe Z at Temp\nG28 Z ; re-probe Z0 to account for any thermal expansion in the bed\nG1 X-17.5 Y80 F3000 ; move to wiper pad\nG1 Z10 F5000 ; move to wiper pad\nM117 Heating...\nM109 R{material_print_temperature_layer_0} ; wait for extruder to reach initial printing temp\nM117 AXI Wiping Nozzle...\nG1 E0 ; prime material in nozzle\nG1 Z-3 ; final ooze wipe\nG1 Y60 F2000 ; final ooze wipe\nG1 Y20 F2000 ; final ooze wipe\nM117 AXI Starting Print\nG1 Z2 ; move nozzle back up to not run into things on print start\nM400 ; wait for moves to finish\nM117 AXI Printing" + }, + "machine_end_gcode": { + "default_value": "M400 ; wait for moves to finish\nM140 S50 ; start bed cooling\nM104 S0 ; disable hotend\nM107 ; disable fans\nM117 Cooling please wait\nG91 ; relative positioning\nG1 Z5 F3000 ; move Z up 5mm so it wont drag on the print\nG90 ; absolute positioning\nG1 X5 Y5 F3000 ; move to cooling position\nM190 R50 ; wait for bed to cool down to removal temp\nG1 X145 Y260 F1000 ; present finished print\nM140 S0 ; cool down bed\nM77 ; End LCD Print Timer\nM18 X Y E ; turn off x y and e axis\nM117 Print Complete." + } + } +} \ No newline at end of file diff --git a/resources/definitions/tam.def.json b/resources/definitions/tam.def.json index 2378cc0ae3..080a3125db 100644 --- a/resources/definitions/tam.def.json +++ b/resources/definitions/tam.def.json @@ -4,8 +4,8 @@ "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "typeamachines", - "manufacturer": "typeamachines", + "author": "TypeAMachines", + "manufacturer": "TypeAMachines", "file_formats": "text/x-gcode", "platform": "tam_series1.3mf", "platform_offset": [-580.0, -6.23, 253.5], diff --git a/resources/definitions/tevo_tarantula.def.json b/resources/definitions/tevo_tarantula.def.json index eee773cd74..8efa9c4f87 100644 --- a/resources/definitions/tevo_tarantula.def.json +++ b/resources/definitions/tevo_tarantula.def.json @@ -47,6 +47,7 @@ "machine_max_acceleration_y": { "default_value": 2650 }, "acceleration_print": { "default_value": 2650 }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, - "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y200 F3600 ;move extruder out of the way by moving the baseplate to the front for easier access to printed object\nM84 ;steppers off" } + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y200 F3600 ;move extruder out of the way by moving the baseplate to the front for easier access to printed object\nM84 ;steppers off" }, + "speed_z_hop": {"default_value": 3} } } diff --git a/resources/definitions/tizyx_evy.def.json b/resources/definitions/tizyx_evy.def.json index 8ed9a5aeff..7776007f41 100644 --- a/resources/definitions/tizyx_evy.def.json +++ b/resources/definitions/tizyx_evy.def.json @@ -1,11 +1,11 @@ { - "name": "TiZYX EVY", + "name": "Tizyx Evy", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "TiZYX", - "manufacturer": "TiZYX", + "author": "Tizyx", + "manufacturer": "Tizyx", "file_formats": "text/x-gcode", "has_machine_quality": true, diff --git a/resources/definitions/tizyx_evy_dual.def.json b/resources/definitions/tizyx_evy_dual.def.json index 25ff2a3af8..3b6892682a 100644 --- a/resources/definitions/tizyx_evy_dual.def.json +++ b/resources/definitions/tizyx_evy_dual.def.json @@ -1,11 +1,11 @@ { - "name": "TiZYX EVY Dual", + "name": "Tizyx Evy Dual", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "TiZYX", - "manufacturer": "TiZYX", + "author": "Tizyx", + "manufacturer": "Tizyx", "file_formats": "text/x-gcode", "has_machine_quality": true, diff --git a/resources/definitions/tizyx_k25.def.json b/resources/definitions/tizyx_k25.def.json index 5723fa514e..ccaa6fff0b 100644 --- a/resources/definitions/tizyx_k25.def.json +++ b/resources/definitions/tizyx_k25.def.json @@ -1,12 +1,12 @@ { "version": 2, - "name": "TiZYX K25", + "name": "Tizyx K25", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "TiZYX", - "manufacturer": "TiZYX", + "author": "Tizyx", + "manufacturer": "Tizyx", "file_formats": "text/x-gcode", "platform": "tizyx_k25_platform.3mf", "platform_offset": [0, -4, 0], diff --git a/resources/definitions/trimaker_cosmosII.def.json b/resources/definitions/trimaker_cosmosII.def.json new file mode 100644 index 0000000000..45072df1b1 --- /dev/null +++ b/resources/definitions/trimaker_cosmosII.def.json @@ -0,0 +1,198 @@ +{ + "version": 2, + "name": "Trimaker Cosmos II", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Trimaker", + "manufacturer": "Trimaker", + "file_formats": "text/x-gcode", + "platform": "trimaker_cosmosII_platform.stl", + "platform_offset": [-110.5, -28.3, 134], + + "has_machine_quality": true, + "preferred_quality_type": "normal", + "preferred_material": "redd_pla", + + "has_materials": true, + "machine_extruder_trains": {"0": "trimaker_cosmosII_extruder"}, + "exclude_materials": [ + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_abs_175", + "generic_bam", + "generic_cffcpe", + "generic_cffpa", + "generic_cpe", + "generic_cpe_175", + "generic_cpe_plus", + "generic_gffcpe", + "generic_gffpa", + "generic_hips", + "generic_hips_175", + "generic_nylon", + "generic_nylon_175", + "generic_pc", + "generic_pc_175", + "generic_petg", + "generic_petg_175", + "generic_pla", + "generic_pla_175", + "generic_pp", + "generic_pva", + "generic_pva_175", + "generic_tough_pla", + "generic_tpu", + "generic_tpu_175", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla", + "tizyx_pla_bois", + "tizyx_pva", + "ultimaker_abs_black", + "ultimaker_abs_blue", + "ultimaker_abs_green", + "ultimaker_abs_grey", + "ultimaker_abs_orange", + "ultimaker_abs_pearl-gold", + "ultimaker_abs_red", + "ultimaker_abs_silver-metallic", + "ultimaker_abs_white", + "ultimaker_abs_yellow", + "ultimaker_bam", + "ultimaker_cpe_black", + "ultimaker_cpe_blue", + "ultimaker_cpe_dark-grey", + "ultimaker_cpe_green", + "ultimaker_cpe_light-grey", + "ultimaker_cpe_plus_black", + "ultimaker_cpe_plus_transparent", + "ultimaker_cpe_plus_white", + "ultimaker_cpe_red", + "ultimaker_cpe_transparent", + "ultimaker_cpe_white", + "ultimaker_cpe_yellow", + "ultimaker_nylon_black", + "ultimaker_nylon_transparent", + "ultimaker_pc_black", + "ultimaker_pc_transparent", + "ultimaker_pc_white", + "ultimaker_pla_black", + "ultimaker_pla_blue", + "ultimaker_pla_green", + "ultimaker_pla_magenta", + "ultimaker_pla_orange", + "ultimaker_pla_pearl-white", + "ultimaker_pla_red", + "ultimaker_pla_silver-metallic", + "ultimaker_pla_transparent", + "ultimaker_pla_white", + "ultimaker_pla_yellow", + "ultimaker_pp_transparent", + "ultimaker_pva", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "ultimaker_tpu_black", + "ultimaker_tpu_blue", + "ultimaker_tpu_red", + "ultimaker_tpu_white", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] + }, + + "overrides": { + + "machine_name": {"default_value": "Trimaker Cosmos II"}, + "machine_width": {"default_value": 200}, + "machine_depth": {"default_value": 200}, + "machine_height": {"default_value": 200}, + + "layer_height": {"default_value": 0.2}, + "material_flow": {"value": 100}, + "xy_offset": {"default_value": 0}, + "xy_offset_layer_0": {"value": -0.1}, + "wall_thickness": {"value": "line_width * 3" }, + "top_bottom_thickness": {"value": "layer_height * 6"}, + "infill_sparse_density": {"default_value": 25}, + "infill_pattern": {"value": "'grid'"}, + "infill_sparse_thickness": {"value": "resolveOrValue('layer_height')"}, + "default_material_bed_temperature": {"default_value": 60}, + "default_material_print_temperature": {"default_value": 200}, + "speed_print": {"default_value": 45}, + "speed_travel": {"value": "speed_print if magic_spiralize else 100"}, + "speed_wall_0": {"value": 35}, + "speed_wall_x": {"value": 45}, + "retraction_enable": {"default_value": true}, + "retraction_amount": {"default_value": 1}, + "retraction_speed": {"default_value": 45}, + "cool_fan_enabled": {"default_value": true}, + "cool_fan_speed": {"value": "100.0 if cool_fan_enabled else 0.0"}, + "support_enable": {"default_value": true}, + "support_type": {"default_value": "everywhere"}, + "support_angle": {"default_value": 50}, + "support_pattern": {"default_value": "zigzag"}, + "support_z_distance": {"default_value": 0.17}, + "support_xy_distance": {"default_value": 0.7}, + "adhesion_type": {"default_value": "skirt"}, + + "gantry_height": {"value": 2}, + "machine_start_gcode": {"default_value": ";Start GCode - Cosmos II - 3.x.x_SEGcTK_1.1\n M104 S120; Comienzo a calentar extrusor\n G21; Unidades en mm\n G90; absolute positioning\n M82; set extruder to absolute mode\n M107; Apagar FAN\n G28; Home\n M190 S{material_bed_temperature_layer_0}\n G29; Senso la cama\n M500\n G1 F5000 X0.5 Y0.5\n M109 S{material_print_temperature}\n M900 K0.04\n G1 F200 Z10\n G92 E0; Defino cero en la posición del actual del extrusor\n G1 F200 X0.5 Y0.5 Z0.300; Posiciono antes de hacer una línea\n G1 F900 X0.5 Y51.5 E2.56436; Hago una línea\n "}, + "machine_end_gcode": {"default_value": ";CODIGO FINAL\n M107; Fan off\n G90; Set to absolute positioning\n G1 X0 Y0 Z201; Get extruder out of way\n G92 E0; Reset extruder position\n G1 E-1; Reduce filament pressure\n G92 E0; Reset extruder position again\n M140 S0; Disable heated bed\n M104 S0; Disable extruder\n M84; Turn steppers off"}, + "machine_heated_bed": {"default_value": true}, + "material_diameter": {"default_value": 1.75}, + "machine_center_is_zero": {"default_value": false} + + } +} diff --git a/resources/definitions/trimaker_nebula.def.json b/resources/definitions/trimaker_nebula.def.json new file mode 100644 index 0000000000..46e57f96e5 --- /dev/null +++ b/resources/definitions/trimaker_nebula.def.json @@ -0,0 +1,198 @@ +{ + "version": 2, + "name": "Trimaker Nebula", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Trimaker", + "manufacturer": "Trimaker", + "file_formats": "text/x-gcode", + "platform": "trimaker_nebula_platform.stl", + + "has_machine_quality": true, + "preferred_quality_type": "normal", + "preferred_material": "redd_pla", + + "platform_offset": [-117.5, -40, 147.5], + "has_materials": true, + "machine_extruder_trains": {"0": "trimaker_nebula_extruder"}, + "exclude_materials": [ + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "generic_abs_175", + "generic_bam", + "generic_cffcpe", + "generic_cffpa", + "generic_cpe", + "generic_cpe_175", + "generic_cpe_plus", + "generic_gffcpe", + "generic_gffpa", + "generic_hips", + "generic_hips_175", + "generic_nylon", + "generic_nylon_175", + "generic_pc", + "generic_pc_175", + "generic_petg", + "generic_petg_175", + "generic_pla", + "generic_pla_175", + "generic_pp", + "generic_pva", + "generic_pva_175", + "generic_tough_pla", + "generic_tpu", + "generic_tpu_175", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla", + "tizyx_pla_bois", + "tizyx_pva", + "ultimaker_abs_black", + "ultimaker_abs_blue", + "ultimaker_abs_green", + "ultimaker_abs_grey", + "ultimaker_abs_orange", + "ultimaker_abs_pearl-gold", + "ultimaker_abs_red", + "ultimaker_abs_silver-metallic", + "ultimaker_abs_white", + "ultimaker_abs_yellow", + "ultimaker_bam", + "ultimaker_cpe_black", + "ultimaker_cpe_blue", + "ultimaker_cpe_dark-grey", + "ultimaker_cpe_green", + "ultimaker_cpe_light-grey", + "ultimaker_cpe_plus_black", + "ultimaker_cpe_plus_transparent", + "ultimaker_cpe_plus_white", + "ultimaker_cpe_red", + "ultimaker_cpe_transparent", + "ultimaker_cpe_white", + "ultimaker_cpe_yellow", + "ultimaker_nylon_black", + "ultimaker_nylon_transparent", + "ultimaker_pc_black", + "ultimaker_pc_transparent", + "ultimaker_pc_white", + "ultimaker_pla_black", + "ultimaker_pla_blue", + "ultimaker_pla_green", + "ultimaker_pla_magenta", + "ultimaker_pla_orange", + "ultimaker_pla_pearl-white", + "ultimaker_pla_red", + "ultimaker_pla_silver-metallic", + "ultimaker_pla_transparent", + "ultimaker_pla_white", + "ultimaker_pla_yellow", + "ultimaker_pp_transparent", + "ultimaker_pva", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "ultimaker_tpu_black", + "ultimaker_tpu_blue", + "ultimaker_tpu_red", + "ultimaker_tpu_white", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] + }, + + "overrides": { + + "machine_name": {"default_value": "Trimaker Nebula"}, + "machine_width": {"default_value": 230}, + "machine_depth": {"default_value": 230}, + "machine_height": {"default_value": 260}, + + "layer_height": {"default_value": 0.2}, + "material_flow": {"value": 100}, + "xy_offset": {"default_value": 0}, + "xy_offset_layer_0": {"value": -0.1}, + "wall_thickness": {"value": "line_width * 3" }, + "top_bottom_thickness": {"value": "layer_height * 6"}, + "infill_sparse_density": {"default_value": 25}, + "infill_pattern": {"value": "'grid'"}, + "infill_sparse_thickness": {"value": "resolveOrValue('layer_height')"}, + "default_material_bed_temperature": {"default_value": 60}, + "default_material_print_temperature": {"default_value": 200}, + "speed_print": {"default_value": 45}, + "speed_travel": {"value": "speed_print if magic_spiralize else 100"}, + "speed_wall_0": {"value": 35}, + "speed_wall_x": {"value": 45}, + "retraction_enable": {"default_value": true}, + "retraction_amount": {"default_value": 1}, + "retraction_speed": {"default_value": 45}, + "cool_fan_enabled": {"default_value": true}, + "cool_fan_speed": {"value": "100.0 if cool_fan_enabled else 0.0"}, + "support_enable": {"default_value": true}, + "support_type": {"default_value": "everywhere"}, + "support_angle": {"default_value": 50}, + "support_pattern": {"default_value": "zigzag"}, + "support_z_distance": {"default_value": 0.17}, + "support_xy_distance": {"default_value": 0.7}, + "adhesion_type": {"default_value": "skirt"}, + + "gantry_height": {"value": 2}, + "machine_start_gcode": {"default_value": ";Trimaker Nebula Start Code\n G21; Unidades en mm\n G90; Posicion absoluta\n M82; Extrusor en modo absoluto\n M107; Fan apagado\n G28 X Y Z; Enviamos a home a todos los ejes\n M900 K=0; Linear advance desactivado\n M104 S110; Precalentamos el extrusor hasta 110 grados\n M190 S{material_bed_temperature_layer_0}; Calentamos cama y esperamos\n M109 S{material_print_temperature}; Calentamos extrusor y esperamos\n G92 E0; E=0\n G1 F200 X0.5 Y0.5 Z0.300\n G1 F900 X0.5 Y51.5 E2.56436; Hacemos una linea para limpiar extrusor\n"}, + "machine_end_gcode": {"default_value": ";Trimaker Nebula End Code\n M107; Apagamos fan\n G90\n G92 E0\n G1 X0 Y200\n G91\n G1 Z5\n G92 E0\n M140 S0; Enfriamos\n M104 S0; Enfriamos\n M84\n G90\n M117 Impresion finalizada\n M300 S440 P700\n"}, + "machine_heated_bed": {"default_value": true}, + "material_diameter": {"default_value": 1.75}, + "machine_center_is_zero": {"default_value": false} + + } +} diff --git a/resources/definitions/two_trees_base.def.json b/resources/definitions/two_trees_base.def.json new file mode 100644 index 0000000000..faeb4950b2 --- /dev/null +++ b/resources/definitions/two_trees_base.def.json @@ -0,0 +1,126 @@ +{ + "name": "Two Trees Base Printer", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": false, + "author": "3DGadgets.my", + "manufacturer": "Two Trees", + "file_formats": "text/x-gcode", + "first_start_actions": ["MachineSettingsAction"], + + "machine_extruder_trains": { + "0": "two_trees_base_extruder_0" + }, + + "has_materials": true, + "has_variants": true, + "has_machine_quality": true, + "variants_name": "Nozzle Size", + + "preferred_variant_name": "0.4mm Nozzle", + "preferred_quality_type": "standard", + "preferred_material": "generic_pla" + + }, + "overrides": { + "machine_name": { "default_value": "Two Trees Base Printer" }, + "machine_start_gcode": { "default_value": "G28 ;Home\nM420 S1 ;Enable ABL using saved Mesh and Fade Height\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move bed down\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Bed up" }, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, + + "machine_heated_bed": { "default_value": true }, + + "material_diameter": { "default_value": 1.75 }, + + + "speed_print": { "value": 50.0 } , + "speed_infill": { "value": "speed_print" }, + "speed_wall": { "value": "speed_print / 2" }, + "speed_wall_0": { "value": "speed_wall" }, + "speed_wall_x": { "value": "speed_print / 1.5" }, + "speed_topbottom": { "value": "speed_print / 2" }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_layer_0": { "value": 20.0 }, + "speed_print_layer_0": { "value": "speed_layer_0" }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_z_hop": { "value": 5 }, + + "skirt_brim_speed": { "value": "speed_layer_0" }, + + "line_width": { "value": "machine_nozzle_size" }, + + "optimize_wall_printing_order": { "value": "True" }, + + "z_seam_type": { "value": "'sharpest_corner'" }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, + + "infill_sparse_density": { "value": "20" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "skin_overlap": { "value": 10.0 }, + "infill_wipe_dist": { "value": 0.0 }, + "wall_0_wipe_dist": { "value": 0.0 }, + + "fill_perimeter_gaps": { "value": "'everywhere'" }, + "fill_outline_gaps": { "value": false }, + "filter_out_tiny_gaps": { "value": false }, + + + "retraction_hop_enabled": { "value": "False" }, + "retraction_hop": { "value": 0.2 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, + "retraction_combing_max_distance": { "value": 30 }, + "travel_avoid_other_parts": { "value": true }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + + "retraction_enable": { "value": true }, + "retraction_speed": { "default_value" : 40 }, + "retraction_amount": { "default_value" : 7 }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_min_travel": { "value": 1.5 }, + + + "cool_fan_full_layer": { "value": "2" }, + "cool_fan_enabled": { "value": true }, + "cool_min_layer_time": { "value": 10 }, + + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "skirt_gap": { "value": 10.0 }, + "skirt_line_count": { "value": 3 }, + + "adaptive_layer_height_variation": { "value": 0.04 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + + "meshfix_maximum_resolution": { "value": "0.25" }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + + "support_angle": { "value": 50 }, + "support_pattern": { "value": "'zigzag'" }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 25" }, + "support_use_towers": { "value": false }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_wall_count": { "value": 0 }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, + + "support_interface_enable": { "value": false }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "minimum_support_area": { "value": 2 }, + "minimum_interface_area": { "value": 10 }, + "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, + "wall_thickness": {"value": "line_width * 2" } + + } +} diff --git a/resources/definitions/two_trees_bluer.def.json b/resources/definitions/two_trees_bluer.def.json new file mode 100644 index 0000000000..67e903f74d --- /dev/null +++ b/resources/definitions/two_trees_bluer.def.json @@ -0,0 +1,37 @@ +{ + "name": "Two Trees Bluer", + "version": 2, + "inherits": "two_trees_base", + "overrides": { + "machine_start_gcode": { "default_value": "G28 ;Home\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move bed down\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Bed up" }, + "machine_name": { "default_value": "Two Trees Bluer" }, + "machine_width": { "default_value": 230 }, + "machine_depth": { "default_value": 230 }, + "machine_height": { "default_value": 280 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-47, 37], + [-47, -23], + [47, -23], + [47, 37] + ] + }, + + "gantry_height": { "value": 28 }, + "speed_print": { "value": 50.0 }, + "speed_travel": { "value": 180 }, + "speed_travel_layer_0": { "value": 100 }, + "retraction_speed": { "default_value" : 50 }, + "retraction_amount": { "default_value" : 8 }, + + "material_flow": { "value": 90 }, + "infill_material_flow": { "value": 100 }, + + "infill_overlap": { "value": 30 }, + "skin_overlap": { "value": 20 } + }, + "metadata": { + "quality_definition": "two_trees_base", + "visible": true, + "platform": "twotrees235x235_generic.stl" + } +} diff --git a/resources/definitions/two_trees_bluerplus.def.json b/resources/definitions/two_trees_bluerplus.def.json new file mode 100644 index 0000000000..1e1dcd20c3 --- /dev/null +++ b/resources/definitions/two_trees_bluerplus.def.json @@ -0,0 +1,36 @@ +{ + "name": "Two Trees Bluer Plus", + "version": 2, + "inherits": "two_trees_base", + "overrides": { + "machine_name": { "default_value": "Two Trees Bluer Plus" }, + "machine_width": { "default_value": 300 }, + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 400 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-47, 37], + [-47, -23], + [47, -23], + [47, 37] + ] + }, + + "gantry_height": { "value": 28 }, + "speed_print": { "value": 50.0 }, + "speed_travel": { "value": 180 }, + "speed_travel_layer_0": { "value": 100 }, + "retraction_speed": { "default_value" : 50 }, + "retraction_amount": { "default_value" : 8 }, + + "material_flow": { "value": 90 }, + "infill_material_flow": { "value": 100 }, + + "infill_overlap": { "value": 30 }, + "skin_overlap": { "value": 20 } + }, + "metadata": { + "quality_definition": "two_trees_base", + "visible": true, + "platform": "twotrees300x300_generic.stl" + } +} diff --git a/resources/definitions/two_trees_sapphireplus.def.json b/resources/definitions/two_trees_sapphireplus.def.json new file mode 100644 index 0000000000..8dae455a28 --- /dev/null +++ b/resources/definitions/two_trees_sapphireplus.def.json @@ -0,0 +1,38 @@ +{ + "name": "Two Trees Sapphire Plus", + "version": 2, + "inherits": "two_trees_base", + "overrides": { + "machine_name": { "default_value": "Two Trees Sapphire Plus" }, + "machine_width": { "default_value": 300 }, + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 350 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-30,19], + [30,19], + [30,-49], + [-30,-49] + ] + }, + + "gantry_height": { "value": 65 }, + + "speed_print": { "value": 60.0 }, + "speed_travel": { "value": 180 }, + "speed_travel_layer_0": { "value": 100 }, + "retraction_speed": { "default_value" : 40 }, + "retraction_amount": { "default_value" : 7 }, + + "material_flow": { "value": 90 }, + "infill_material_flow": { "value": 100 }, + + "infill_overlap": { "value": 30 }, + "skin_overlap": { "value": 20 } + }, + "metadata": { + "quality_definition": "two_trees_base", + "visible": true, + "platform": "sapphireplus_platform.stl" + + } +} diff --git a/resources/definitions/two_trees_sapphirepro.def.json b/resources/definitions/two_trees_sapphirepro.def.json new file mode 100644 index 0000000000..0a66a5e232 --- /dev/null +++ b/resources/definitions/two_trees_sapphirepro.def.json @@ -0,0 +1,39 @@ +{ + "name": "Two Trees Sapphire Pro", + "version": 2, + "inherits": "two_trees_base", + "overrides": { + "machine_start_gcode": { "default_value": "G28 ;Home\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move bed down\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Bed up" }, + "machine_name": { "default_value": "Two Trees Sapphire Pro" }, + "machine_width": { "default_value": 220 }, + "machine_depth": { "default_value": 220 }, + "machine_height": { "default_value": 220 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-30,19], + [30,19], + [30,-49], + [-30,-49] + ] + }, + + "gantry_height": { "value": 65 }, + + "speed_print": { "value": 60.0 }, + "speed_travel": { "value": 180 }, + "speed_travel_layer_0": { "value": 100 }, + "retraction_speed": { "default_value" : 40 }, + "retraction_amount": { "default_value" : 7 }, + + "material_flow": { "value": 90 }, + "infill_material_flow": { "value": 100 }, + + "infill_overlap": { "value": 30 }, + "skin_overlap": { "value": 20 } + }, + "metadata": { + "quality_definition": "two_trees_base", + "visible": true, + "platform": "sapphirepro_platform.stl" + + } +} diff --git a/resources/definitions/twotrees_bluer.def.json b/resources/definitions/twotrees_bluer.def.json deleted file mode 100644 index a272527e6e..0000000000 --- a/resources/definitions/twotrees_bluer.def.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "version": 2, - "name": "TwoTrees Bluer", - "inherits": "fdmprinter", - "metadata": - { - "visible": true, - "author": "Washington C. Correa Jr.", - "manufacturer": "TwoTrees", - "file_formats": "text/x-gcode", - "platform": "twotrees_platform.stl", - "machine_extruder_trains": - { - "0": "twotrees_bluer_extruder_0", - "1": "twotrees_bluer_extruder_1" - } - }, - "overrides": - { - "machine_name": { "default_value": "Two Trees Bluer" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 235 }, - "machine_depth": { "default_value": 235 }, - "machine_height": { "default_value": 280 }, - "machine_head_with_fans_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [32, -32], - [32, 34] - ] - }, - "machine_start_gcode": { "default_value": "; Two Trees Bluer Custom Start G-code\nG28 ;Home\nG92 E0 ;Reset Extruder\nG1 Z4.0 F3000 ;Move Z Axis up\nG1 E10 F1500 ;Purge a bit\nG1 X10.1 Y20 Z0.2 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.2 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.2 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.2 F1500.0 E20 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z3.0 X20 Y20 F3000 ;Move Z Axis up\nG1 E3 F2700 ;Purge a bit" }, - "machine_end_gcode": { "default_value": "; Two Trees Bluer Custom End G-code\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" }, - "gantry_height": { "value": 25 } - } -} diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index ff9a75c40c..47a60fe51c 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -6,7 +6,7 @@ "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", "visible": false, - "exclude_materials": [ "generic_hips", "generic_petg", "structur3d_dap100silicone" ] + "exclude_materials": [ "generic_hips", "structur3d_dap100silicone" ] }, "overrides": { "machine_max_feedrate_e": { diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index 3980baba31..c028363239 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -18,7 +18,8 @@ { "0": "ultimaker2_extruder_0" }, - "firmware_file": "MarlinUltimaker2.hex" + "firmware_file": "MarlinUltimaker2.hex", + "exclude_materials": [ "generic_hips", "generic_petg", "structur3d_dap100silicone", "ultimaker_petg_red", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent"] }, "overrides": { "machine_name": { "default_value": "Ultimaker 2" }, diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index 7b9c0781f7..8250e70104 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -13,7 +13,7 @@ "has_variants": true, "has_materials": true, "has_machine_quality": true, - "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ], + "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone", "ultimaker_petg_red", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent"], "first_start_actions": [], "supported_actions": [], "machine_extruder_trains": diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index c0ddcf813f..46c615a262 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -22,7 +22,8 @@ "0": "ultimaker2_plus_connect_extruder_0" }, "supports_usb_connection": false, - "supports_network_connection": true + "supports_network_connection": true, + "supports_material_export": true }, "overrides": { diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index d831221852..2e49dda806 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -13,7 +13,7 @@ "has_machine_quality": true, "has_materials": true, "has_variants": true, - "exclude_materials": [ "generic_hips", "generic_petg", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ], + "exclude_materials": [ "generic_hips", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ], "preferred_variant_name": "AA 0.4", "preferred_quality_type": "normal", "variants_name": "Print core", diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index 34d22934d6..d209c28a07 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -11,7 +11,7 @@ "platform": "ultimaker_platform.3mf", "has_materials": true, "has_machine_quality": true, - "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ], + "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent", "ultimaker_petg_red" ], "first_start_actions": ["UMOUpgradeSelection", "BedLevel"], "supported_actions": ["UMOUpgradeSelection", "BedLevel"], "machine_extruder_trains": diff --git a/resources/definitions/ultimaker_original_dual.def.json b/resources/definitions/ultimaker_original_dual.def.json index 887a84c4fa..bda8a0ce12 100644 --- a/resources/definitions/ultimaker_original_dual.def.json +++ b/resources/definitions/ultimaker_original_dual.def.json @@ -12,7 +12,7 @@ "has_materials": true, "has_machine_quality": true, "quality_definition": "ultimaker_original", - "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ], + "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent", "ultimaker_petg_red" ], "machine_extruder_trains": { "0": "ultimaker_original_dual_1st", diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 824a0e3a92..43f32a96dc 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -27,6 +27,7 @@ "first_start_actions": [ "DiscoverUM3Action" ], "supported_actions": [ "DiscoverUM3Action" ], "supports_usb_connection": false, + "supports_material_export": true, "weight": -1, "firmware_update_info": { "id": 213482, @@ -61,7 +62,7 @@ "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, "machine_acceleration": { "default_value": 3000 }, - "gantry_height": { "value": "60" }, + "gantry_height": { "value": "55" }, "machine_extruder_count": { "default_value": 2 }, "extruder_prime_pos_abs": { "default_value": true }, "machine_start_gcode": { "default_value": "" }, diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index ded94a2747..71de826953 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -28,6 +28,7 @@ "supported_actions": [ "DiscoverUM3Action" ], "supports_usb_connection": false, "supports_network_connection": true, + "supports_material_export": true, "weight": -2, "firmware_update_info": { "id": 9051, @@ -63,7 +64,7 @@ "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, "machine_acceleration": { "default_value": 3000 }, - "gantry_height": { "value": "60" }, + "gantry_height": { "value": "55" }, "machine_extruder_count": { "default_value": 2 }, "extruder_prime_pos_abs": { "default_value": true }, "machine_start_gcode": { "default_value": "" }, diff --git a/resources/definitions/uni_200.def.json b/resources/definitions/uni_200.def.json index 9fdb008213..f425a3d89f 100644 --- a/resources/definitions/uni_200.def.json +++ b/resources/definitions/uni_200.def.json @@ -1,5 +1,5 @@ { - "name": "UNI 200", + "name": "Uni 200", "version": 2, "inherits": "uni_base", "metadata": { diff --git a/resources/definitions/uni_250.def.json b/resources/definitions/uni_250.def.json index 65ceddf8c7..c6a5642439 100644 --- a/resources/definitions/uni_250.def.json +++ b/resources/definitions/uni_250.def.json @@ -1,5 +1,5 @@ { - "name": "UNI 250", + "name": "Uni 250", "version": 2, "inherits": "uni_base", "metadata": { diff --git a/resources/definitions/uni_300.def.json b/resources/definitions/uni_300.def.json index 11d1ed0591..52cfc769cf 100644 --- a/resources/definitions/uni_300.def.json +++ b/resources/definitions/uni_300.def.json @@ -1,5 +1,5 @@ { - "name": "UNI 300", + "name": "Uni 300", "version": 2, "inherits": "uni_base", "metadata": { diff --git a/resources/definitions/uni_base.def.json b/resources/definitions/uni_base.def.json index 6cdbc198a5..06ba86de2d 100644 --- a/resources/definitions/uni_base.def.json +++ b/resources/definitions/uni_base.def.json @@ -1,11 +1,11 @@ { - "name": "UNI Base Printer", + "name": "Uni Base Printer", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": false, "author": "Nail` Gimadeev (C)", - "manufacturer": "UNI 3D", + "manufacturer": "Uni 3D", "file_formats": "text/x-gcode", "first_start_actions": ["MachineSettingsAction"], "machine_extruder_trains": { diff --git a/resources/definitions/uni_mini.def.json b/resources/definitions/uni_mini.def.json index c2b67039ea..4da67907f9 100644 --- a/resources/definitions/uni_mini.def.json +++ b/resources/definitions/uni_mini.def.json @@ -1,5 +1,5 @@ { - "name": "UNI MINI", + "name": "Uni Mini", "version": 2, "inherits": "uni_base", "metadata": { diff --git a/resources/definitions/uni_print_3d.def.json b/resources/definitions/uni_print_3d.def.json index 0ad937e594..7d71d73540 100644 --- a/resources/definitions/uni_print_3d.def.json +++ b/resources/definitions/uni_print_3d.def.json @@ -1,5 +1,5 @@ { - "name": "UNI-PRINT-3D", + "name": "Uni-Print-3D", "version": 2, "inherits": "fdmprinter", "metadata": diff --git a/resources/definitions/voron0_120.def.json b/resources/definitions/voron0_120.def.json new file mode 100644 index 0000000000..d0bf92f0e0 --- /dev/null +++ b/resources/definitions/voron0_120.def.json @@ -0,0 +1,18 @@ +{ + "name": "Voron 0", + "version": 2, + "inherits": "voron2_base", + "metadata": + { + "visible": true, + "platform": "voron0_120_bed.stl", + "quality_definition": "voron2_base" + }, + "overrides": + { + "machine_name": { "default_value": "VORON 0" }, + "machine_width": { "default_value": 120 }, + "machine_depth": { "default_value": 120 }, + "machine_height": { "default_value": 120 } + } +} diff --git a/resources/definitions/voron2_250.def.json b/resources/definitions/voron2_250.def.json index 269bbfe459..a479576458 100644 --- a/resources/definitions/voron2_250.def.json +++ b/resources/definitions/voron2_250.def.json @@ -1,5 +1,5 @@ { - "name": "VORON2 250", + "name": "Voron2 250", "version": 2, "inherits": "voron2_base", "metadata": diff --git a/resources/definitions/voron2_300.def.json b/resources/definitions/voron2_300.def.json index 20698d54ff..943b841c4d 100644 --- a/resources/definitions/voron2_300.def.json +++ b/resources/definitions/voron2_300.def.json @@ -1,5 +1,5 @@ { - "name": "VORON2 300", + "name": "Voron2 300", "version": 2, "inherits": "voron2_base", "metadata": diff --git a/resources/definitions/voron2_350.def.json b/resources/definitions/voron2_350.def.json index 6af41118c4..36e5e9339c 100644 --- a/resources/definitions/voron2_350.def.json +++ b/resources/definitions/voron2_350.def.json @@ -1,5 +1,5 @@ { - "name": "VORON2 350", + "name": "Voron2 350", "version": 2, "inherits": "voron2_base", "metadata": diff --git a/resources/definitions/voron2_base.def.json b/resources/definitions/voron2_base.def.json index 7a9a6ee8aa..b6938ad991 100644 --- a/resources/definitions/voron2_base.def.json +++ b/resources/definitions/voron2_base.def.json @@ -1,12 +1,12 @@ { - "name": "VORON2 Base", + "name": "Voron2 Base", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": false, "author": "Fulg, Maglin, pizzle_Dizzle", - "manufacturer": "VORONDesign", + "manufacturer": "VoronDesign", "file_formats": "text/x-gcode", "first_start_actions": ["MachineSettingsAction"], "preferred_quality_type": "fast", diff --git a/resources/definitions/voron2_custom.def.json b/resources/definitions/voron2_custom.def.json index 2fc5c2305d..45612e0cba 100644 --- a/resources/definitions/voron2_custom.def.json +++ b/resources/definitions/voron2_custom.def.json @@ -1,5 +1,5 @@ { - "name": "VORON2 Custom", + "name": "Voron2 Custom", "version": 2, "inherits": "voron2_base", "metadata": diff --git a/resources/definitions/zav_base.def.json b/resources/definitions/zav_base.def.json index 9167d5574f..1ef9398987 100644 --- a/resources/definitions/zav_base.def.json +++ b/resources/definitions/zav_base.def.json @@ -1,11 +1,11 @@ { - "name": "ZAV Base Printer", + "name": "Zav Base Printer", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": false, "author": "Kirill Nikolaev, Kim Evgeniy (C)", - "manufacturer": "ZAV Co., Ltd.", + "manufacturer": "Zav Co., Ltd.", "file_formats": "text/x-gcode", "first_start_actions": ["MachineSettingsAction"], "machine_extruder_trains": { diff --git a/resources/definitions/zav_big.def.json b/resources/definitions/zav_big.def.json index dc68e1ad11..56d6f77111 100644 --- a/resources/definitions/zav_big.def.json +++ b/resources/definitions/zav_big.def.json @@ -1,5 +1,5 @@ { - "name": "ZAV BIG", + "name": "Zav Big", "version": 2, "inherits": "zav_base", "metadata": { diff --git a/resources/definitions/zav_bigplus.def.json b/resources/definitions/zav_bigplus.def.json index bbdf9ee264..a8b24ae323 100644 --- a/resources/definitions/zav_bigplus.def.json +++ b/resources/definitions/zav_bigplus.def.json @@ -1,5 +1,5 @@ { - "name": "ZAV Big+", + "name": "Zav Big+", "version": 2, "inherits": "zav_base", "metadata": { diff --git a/resources/definitions/zav_l.def.json b/resources/definitions/zav_l.def.json index 7da88aef85..604cb49ddb 100644 --- a/resources/definitions/zav_l.def.json +++ b/resources/definitions/zav_l.def.json @@ -1,5 +1,5 @@ { - "name": "ZAV L family printer", + "name": "Zav L Family Printer", "version": 2, "inherits": "zav_base", "metadata": { diff --git a/resources/definitions/zav_max.def.json b/resources/definitions/zav_max.def.json index f67266b0a5..3e5e987cc7 100644 --- a/resources/definitions/zav_max.def.json +++ b/resources/definitions/zav_max.def.json @@ -1,5 +1,5 @@ { - "name": "ZAV MAX", + "name": "Zav Max", "version": 2, "inherits": "zav_base", "metadata": { diff --git a/resources/definitions/zav_maxpro.def.json b/resources/definitions/zav_maxpro.def.json index 81cd43835f..97f8806f45 100644 --- a/resources/definitions/zav_maxpro.def.json +++ b/resources/definitions/zav_maxpro.def.json @@ -1,5 +1,5 @@ { - "name": "ZAV PRO", + "name": "Zav Pro", "version": 2, "inherits": "zav_base", "metadata": { diff --git a/resources/definitions/zav_mini.def.json b/resources/definitions/zav_mini.def.json index 2ceccddfda..8491ddd01c 100644 --- a/resources/definitions/zav_mini.def.json +++ b/resources/definitions/zav_mini.def.json @@ -1,5 +1,5 @@ { - "name": "ZAV mini", + "name": "Zav Mini", "version": 2, "inherits": "zav_base", "metadata": { diff --git a/resources/definitions/zyyx_agile.def.json b/resources/definitions/zyyx_agile.def.json index 2e4e086208..7294a1b10e 100644 --- a/resources/definitions/zyyx_agile.def.json +++ b/resources/definitions/zyyx_agile.def.json @@ -1,5 +1,5 @@ { - "name": "ZYYX Agile", + "name": "Zyyx Agile", "version": 2, "inherits": "fdmprinter", "metadata": { diff --git a/resources/extruders/SV03_extruder_0.def.json b/resources/extruders/SV03_extruder_0.def.json new file mode 100644 index 0000000000..9ceb468d64 --- /dev/null +++ b/resources/extruders/SV03_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "SV03", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/anycubic_i3_mega_s_extruder_0.def.json b/resources/extruders/anycubic_i3_mega_s_extruder_0.def.json new file mode 100644 index 0000000000..d59384f3e4 --- /dev/null +++ b/resources/extruders/anycubic_i3_mega_s_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "anycubic_i3_mega_s", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/arjun_dm_extruder.def.json b/resources/extruders/arjun_dm_extruder.def.json new file mode 100644 index 0000000000..da3e4da203 --- /dev/null +++ b/resources/extruders/arjun_dm_extruder.def.json @@ -0,0 +1,20 @@ +{ + "version": 2, + "name": "Duplication Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "arjun_duplication", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 } + } +} diff --git a/resources/extruders/arjun_extruder_0.def.json b/resources/extruders/arjun_extruder_0.def.json new file mode 100644 index 0000000000..c47c93a851 --- /dev/null +++ b/resources/extruders/arjun_extruder_0.def.json @@ -0,0 +1,27 @@ +{ + "version": 2, + "name": "Left Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "arjun300", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": -51 }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_code": { "default_value": "T0" } + } +} diff --git a/resources/extruders/arjun_extruder_1.def.json b/resources/extruders/arjun_extruder_1.def.json new file mode 100644 index 0000000000..b8ee27f33e --- /dev/null +++ b/resources/extruders/arjun_extruder_1.def.json @@ -0,0 +1,27 @@ +{ + "version": 2, + "name": "Right Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "arjun300", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": 257 }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_code": { "default_value": "T1" } + } +} diff --git a/resources/extruders/arjun_mm_extruder.def.json b/resources/extruders/arjun_mm_extruder.def.json new file mode 100644 index 0000000000..a8364e95f1 --- /dev/null +++ b/resources/extruders/arjun_mm_extruder.def.json @@ -0,0 +1,20 @@ +{ + "version": 2, + "name": "Mirror Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "arjun_mirrored", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 } + } +} diff --git a/resources/extruders/atom2_extruder_0.def.json b/resources/extruders/atom2_extruder_0.def.json new file mode 100644 index 0000000000..be9d5782ff --- /dev/null +++ b/resources/extruders/atom2_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "atom2", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/atom3_extruder_0.def.json b/resources/extruders/atom3_extruder_0.def.json new file mode 100644 index 0000000000..7b8dffd963 --- /dev/null +++ b/resources/extruders/atom3_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "atom3", + "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/extruders/creasee_extruder_0.def.json b/resources/extruders/creasee_extruder_0.def.json new file mode 100644 index 0000000000..abefa6b1c8 --- /dev/null +++ b/resources/extruders/creasee_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "creasee_cs20", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/creasee_extruder_1.def.json b/resources/extruders/creasee_extruder_1.def.json new file mode 100644 index 0000000000..747e1c48f8 --- /dev/null +++ b/resources/extruders/creasee_extruder_1.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "creasee_cs30", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/cubicon_style_neo_a31_extruder_0.def.json b/resources/extruders/cubicon_style_neo_a31_extruder_0.def.json new file mode 100644 index 0000000000..4f6ced9818 --- /dev/null +++ b/resources/extruders/cubicon_style_neo_a31_extruder_0.def.json @@ -0,0 +1,26 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "cubicon_style_neo_a31", + "position": "0" + }, + "overrides": { + "extruder_nr": { + "default_value": 0 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "machine_nozzle_offset_x": { + "default_value": -7.13 + }, + "machine_nozzle_offset_y": { + "default_value": -3.77 + }, + "material_diameter": { + "default_value": 1.75 + } + } +} diff --git a/resources/extruders/deltacomb_base_extruder_0.def.json b/resources/extruders/deltacomb_base_extruder_0.def.json old mode 100755 new mode 100644 diff --git a/resources/extruders/deltacomb_base_extruder_1.def.json b/resources/extruders/deltacomb_base_extruder_1.def.json old mode 100755 new mode 100644 diff --git a/resources/extruders/deltacomb_base_extruder_2.def.json b/resources/extruders/deltacomb_base_extruder_2.def.json old mode 100755 new mode 100644 diff --git a/resources/extruders/deltacomb_base_extruder_3.def.json b/resources/extruders/deltacomb_base_extruder_3.def.json old mode 100755 new mode 100644 diff --git a/resources/extruders/deltacomb_dc20dual_extruder_0.def.json b/resources/extruders/deltacomb_dc20dual_extruder_0.def.json old mode 100755 new mode 100644 index 510f8a3562..f01a416224 --- a/resources/extruders/deltacomb_dc20dual_extruder_0.def.json +++ b/resources/extruders/deltacomb_dc20dual_extruder_0.def.json @@ -11,7 +11,7 @@ "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_x": { "default_value": -8.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_extruder_start_code": { "default_value": ";DC20 Dual Extruder 1\n;Put your custom code here"}, "machine_extruder_end_code": { "default_value": ";DC20 Dual Extruder 1\n;Put your custom code here"} diff --git a/resources/extruders/deltacomb_dc20dual_extruder_1.def.json b/resources/extruders/deltacomb_dc20dual_extruder_1.def.json old mode 100755 new mode 100644 index 1421a7d3db..2749254242 --- a/resources/extruders/deltacomb_dc20dual_extruder_1.def.json +++ b/resources/extruders/deltacomb_dc20dual_extruder_1.def.json @@ -11,8 +11,8 @@ "extruder_nr": { "default_value": 1 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 19 }, - "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_offset_x": { "default_value": -8.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_extruder_start_code": { "default_value": ";DC20 Dual Extruder 2\n;Put your custom code here"}, "machine_extruder_end_code": { "default_value": ";DC20 Dual Extruder 2\n;Put your custom code here"} } diff --git a/resources/extruders/deltacomb_dc20flux_extruder_0.def.json b/resources/extruders/deltacomb_dc20flux_extruder_0.def.json old mode 100755 new mode 100644 index 96617a9465..b36879898c --- a/resources/extruders/deltacomb_dc20flux_extruder_0.def.json +++ b/resources/extruders/deltacomb_dc20flux_extruder_0.def.json @@ -7,14 +7,13 @@ "position": "0" }, - "overrides": { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC20 Flux Extruder 1 Start\n;---------------------------------------\nG92 E0 ;zero the extruded length\nG91 ;use relative coordinates\nG1 E68 F10000 ; fast insert\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\n;---------------------------------------\n;---------------------------------------"}, - "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC20 Flux Extruder 1 End\n;---------------------------------------\nG91 ;use relative coordinates\nG0 E-15 F10000\nG1 Z2 ;lift head\nG4 P3000\nG0 E14.7 F10000\nG1 E-69.7 F10000\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"} + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 1 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 1 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"} } } diff --git a/resources/extruders/deltacomb_dc20flux_extruder_1.def.json b/resources/extruders/deltacomb_dc20flux_extruder_1.def.json old mode 100755 new mode 100644 index 309f857fe0..d1232c24a8 --- a/resources/extruders/deltacomb_dc20flux_extruder_1.def.json +++ b/resources/extruders/deltacomb_dc20flux_extruder_1.def.json @@ -7,15 +7,14 @@ "position": "1" }, - "overrides": { "extruder_nr": { "default_value": 1 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC20 Flux Extruder 2 Start\n;---------------------------------------\nG92 E0 ;zero the extruded length\nG91 ;use relative coordinates\nG1 E68 F10000 ; fast insert\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\n;---------------------------------------\n;---------------------------------------"}, - "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC20 Flux Extruder 2 End\n;---------------------------------------\nG91 ;use relative coordinates\nG0 E-15 F10000\nG1 Z2 ;lift head\nG4 P3000\nG0 E14.7 F10000\nG1 E-69.7 F10000\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 2 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 2 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, "prime_tower_flow": { "value": "200" } } } diff --git a/resources/extruders/deltacomb_dc20flux_extruder_2.def.json b/resources/extruders/deltacomb_dc20flux_extruder_2.def.json old mode 100755 new mode 100644 index 1283e3dbf5..d64a0d8b66 --- a/resources/extruders/deltacomb_dc20flux_extruder_2.def.json +++ b/resources/extruders/deltacomb_dc20flux_extruder_2.def.json @@ -7,15 +7,14 @@ "position": "2" }, - "overrides": { "extruder_nr": { "default_value": 2 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC20 Flux Extruder 3 Start\n;---------------------------------------\nG92 E0 ;zero the extruded length\nG91 ;use relative coordinates\nG1 E68 F10000 ; fast insert\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\n;---------------------------------------\n;---------------------------------------"}, - "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC20 Flux Extruder 3 End\n;---------------------------------------\nG91 ;use relative coordinates\nG0 E-15 F10000\nG1 Z2 ;lift head\nG4 P3000\nG0 E14.7 F10000\nG1 E-69.7 F10000\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 3 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 3 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, "prime_tower_flow": { "value": "200" } } } diff --git a/resources/extruders/deltacomb_dc20flux_extruder_3.def.json b/resources/extruders/deltacomb_dc20flux_extruder_3.def.json old mode 100755 new mode 100644 index 1965f615f6..061de645df --- a/resources/extruders/deltacomb_dc20flux_extruder_3.def.json +++ b/resources/extruders/deltacomb_dc20flux_extruder_3.def.json @@ -7,15 +7,18 @@ "position": "3" }, - "overrides": { "extruder_nr": { "default_value": 3 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC20 Flux Extruder 4 Start\n;---------------------------------------\nG92 E0 ;zero the extruded length\nG91 ;use relative coordinates\nG1 E68 F10000 ; fast insert\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\n;---------------------------------------\n;---------------------------------------"}, - "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC20 Flux Extruder 4 End\n;---------------------------------------\nG91 ;use relative coordinates\nG0 E-15 F10000\nG1 Z2 ;lift head\nG4 P3000\nG0 E14.7 F10000\nG1 E-69.7 F10000\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 4 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 4 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, "prime_tower_flow": { "value": "200" } } } + + + + diff --git a/resources/extruders/deltacomb_dc30dual_extruder_0.def.json b/resources/extruders/deltacomb_dc30dual_extruder_0.def.json old mode 100755 new mode 100644 index d404e488bc..45cd65ea8a --- a/resources/extruders/deltacomb_dc30dual_extruder_0.def.json +++ b/resources/extruders/deltacomb_dc30dual_extruder_0.def.json @@ -11,7 +11,7 @@ "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_x": { "default_value": -8.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_extruder_start_code": { "default_value": ";DC30 Dual Extruder 1\n;Put your custom code here"}, "machine_extruder_end_code": { "default_value": ";DC30 Dual Extruder 1\n;Put your custom code here"} diff --git a/resources/extruders/deltacomb_dc30dual_extruder_1.def.json b/resources/extruders/deltacomb_dc30dual_extruder_1.def.json old mode 100755 new mode 100644 index c1ce8dec33..74d2b3d39d --- a/resources/extruders/deltacomb_dc30dual_extruder_1.def.json +++ b/resources/extruders/deltacomb_dc30dual_extruder_1.def.json @@ -11,8 +11,8 @@ "extruder_nr": { "default_value": 1 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 19 }, - "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_offset_x": { "default_value": -8.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, "machine_extruder_start_code": { "default_value": ";DC30 Dual Extruder 2\n;Put your custom code here"}, "machine_extruder_end_code": { "default_value": ";DC30 Dual Extruder 2\n;Put your custom code here"} } diff --git a/resources/extruders/deltacomb_dc30flux_extruder_0.def.json b/resources/extruders/deltacomb_dc30flux_extruder_0.def.json old mode 100755 new mode 100644 index 1f401c3657..604affe3f2 --- a/resources/extruders/deltacomb_dc30flux_extruder_0.def.json +++ b/resources/extruders/deltacomb_dc30flux_extruder_0.def.json @@ -13,7 +13,7 @@ "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 1 Start\n;---------------------------------------\nG92 E0 ;zero the extruded length\nG91 ;use relative coordinates\nG1 E68 F10000 ; fast insert\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\n;---------------------------------------\n;---------------------------------------"}, - "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 1 End\n;---------------------------------------\nG91 ;use relative coordinates\nG0 E-15 F10000\nG1 Z2 ;lift head\nG4 P3000\nG0 E14.7 F10000\nG1 E-69.7 F10000\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"} + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 1 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 1 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"} } } diff --git a/resources/extruders/deltacomb_dc30flux_extruder_1.def.json b/resources/extruders/deltacomb_dc30flux_extruder_1.def.json old mode 100755 new mode 100644 index 909d87feeb..e0b0e1711f --- a/resources/extruders/deltacomb_dc30flux_extruder_1.def.json +++ b/resources/extruders/deltacomb_dc30flux_extruder_1.def.json @@ -13,8 +13,8 @@ "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 2 Start\n;---------------------------------------\nG92 E0 ;zero the extruded length\nG91 ;use relative coordinates\nG1 E68 F10000 ; fast insert\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\n;---------------------------------------\n;---------------------------------------"}, - "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 2 End\n;---------------------------------------\nG91 ;use relative coordinates\nG0 E-15 F10000\nG1 Z2 ;lift head\nG4 P3000\nG0 E14.7 F10000\nG1 E-69.7 F10000\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 2 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 2 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, "prime_tower_flow": { "value": "200" } } } diff --git a/resources/extruders/deltacomb_dc30flux_extruder_2.def.json b/resources/extruders/deltacomb_dc30flux_extruder_2.def.json old mode 100755 new mode 100644 index f1df8ab154..048499988d --- a/resources/extruders/deltacomb_dc30flux_extruder_2.def.json +++ b/resources/extruders/deltacomb_dc30flux_extruder_2.def.json @@ -13,8 +13,8 @@ "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 3 Start\n;---------------------------------------\nG92 E0 ;zero the extruded length\nG91 ;use relative coordinates\nG1 E68 F10000 ; fast insert\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\n;---------------------------------------\n;---------------------------------------"}, - "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 3 End\n;---------------------------------------\nG91 ;use relative coordinates\nG0 E-15 F10000\nG1 Z2 ;lift head\nG4 P3000\nG0 E14.7 F10000\nG1 E-69.7 F10000\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 3 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 3 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, "prime_tower_flow": { "value": "200" } } } diff --git a/resources/extruders/deltacomb_dc30flux_extruder_3.def.json b/resources/extruders/deltacomb_dc30flux_extruder_3.def.json old mode 100755 new mode 100644 index dbc23f96b6..a18f2f1288 --- a/resources/extruders/deltacomb_dc30flux_extruder_3.def.json +++ b/resources/extruders/deltacomb_dc30flux_extruder_3.def.json @@ -13,8 +13,8 @@ "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 4 Start\n;---------------------------------------\nG92 E0 ;zero the extruded length\nG91 ;use relative coordinates\nG1 E68 F10000 ; fast insert\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\n;---------------------------------------\n;---------------------------------------"}, - "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 4 End\n;---------------------------------------\nG91 ;use relative coordinates\nG0 E-15 F10000\nG1 Z2 ;lift head\nG4 P3000\nG0 E14.7 F10000\nG1 E-69.7 F10000\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 4 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 4 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, "prime_tower_flow": { "value": "200" } } } diff --git a/resources/extruders/eryone_er20_extruder_0.def.json b/resources/extruders/eryone_er20_extruder_0.def.json new file mode 100644 index 0000000000..9b1c1fa435 --- /dev/null +++ b/resources/extruders/eryone_er20_extruder_0.def.json @@ -0,0 +1,27 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "eryone_er20", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_nozzle_offset_x": { + "default_value": -10.0 + }, + "machine_nozzle_offset_y": { + "default_value": 8.0 + } + } +} diff --git a/resources/extruders/eryone_thinker_extruder_0.def.json b/resources/extruders/eryone_thinker_extruder_0.def.json new file mode 100644 index 0000000000..32889435a8 --- /dev/null +++ b/resources/extruders/eryone_thinker_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "eryone_thinker", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/farm2_ce_extruder_1.def.json b/resources/extruders/farm2_ce_extruder_1.def.json new file mode 100644 index 0000000000..0c2e77f501 --- /dev/null +++ b/resources/extruders/farm2_ce_extruder_1.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "PrintHead", + "inherits": "fdmextruder", + "metadata": { + "machine": "farm2_ce", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } + + } +} + diff --git a/resources/extruders/farm2_extruder_1.def.json b/resources/extruders/farm2_extruder_1.def.json new file mode 100644 index 0000000000..8c86af9f93 --- /dev/null +++ b/resources/extruders/farm2_extruder_1.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "PrintHead", + "inherits": "fdmextruder", + "metadata": { + "machine": "farm2", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } + + } +} + diff --git a/resources/extruders/flashforge_dreamernx_extruder_0.def.json b/resources/extruders/flashforge_dreamernx_extruder_0.def.json new file mode 100644 index 0000000000..b9f1df00dc --- /dev/null +++ b/resources/extruders/flashforge_dreamernx_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "flashforge_base", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/flsun_q5_extruder.def.json b/resources/extruders/flsun_q5_extruder.def.json new file mode 100644 index 0000000000..ece222d70a --- /dev/null +++ b/resources/extruders/flsun_q5_extruder.def.json @@ -0,0 +1,14 @@ +{ + "version": 2, + "name": "Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "flsun_q5", + "position": "0" + }, + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/flsun_sr_extruder_0.def.json b/resources/extruders/flsun_sr_extruder_0.def.json new file mode 100644 index 0000000000..31880b5130 --- /dev/null +++ b/resources/extruders/flsun_sr_extruder_0.def.json @@ -0,0 +1,20 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "flsun_sr", + "position": "0" + }, + "overrides": { + "extruder_nr": { + "default_value": 0 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + } + } +} diff --git a/resources/extruders/hellbot_hidra_extruder_0.def.json b/resources/extruders/hellbot_hidra_extruder_0.def.json new file mode 100644 index 0000000000..f6e66d5381 --- /dev/null +++ b/resources/extruders/hellbot_hidra_extruder_0.def.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "name": "Extrusor E1", + "inherits": "fdmextruder", + "metadata": { + "machine": "hellbot_hidra", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/hellbot_hidra_extruder_1.def.json b/resources/extruders/hellbot_hidra_extruder_1.def.json new file mode 100644 index 0000000000..87b18db36c --- /dev/null +++ b/resources/extruders/hellbot_hidra_extruder_1.def.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "name": "Extrusor E2", + "inherits": "fdmextruder", + "metadata": { + "machine": "hellbot_hidra", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/hellbot_hidra_plus_extruder_0.def.json b/resources/extruders/hellbot_hidra_plus_extruder_0.def.json new file mode 100644 index 0000000000..e8817236a1 --- /dev/null +++ b/resources/extruders/hellbot_hidra_plus_extruder_0.def.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "name": "Extrusor E1", + "inherits": "fdmextruder", + "metadata": { + "machine": "hellbot_hidra_plus", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/hellbot_hidra_plus_extruder_1.def.json b/resources/extruders/hellbot_hidra_plus_extruder_1.def.json new file mode 100644 index 0000000000..37f37fc71f --- /dev/null +++ b/resources/extruders/hellbot_hidra_plus_extruder_1.def.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "name": "Extrusor E2", + "inherits": "fdmextruder", + "metadata": { + "machine": "hellbot_hidra_plus", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/twotrees_bluer_extruder_0.def.json b/resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json similarity index 74% rename from resources/extruders/twotrees_bluer_extruder_0.def.json rename to resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json index fb85e76647..b572ea4318 100644 --- a/resources/extruders/twotrees_bluer_extruder_0.def.json +++ b/resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json @@ -3,7 +3,7 @@ "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "twotrees_bluer", + "machine": "hellbot_magna_2_230_dual", "position": "0" }, @@ -12,7 +12,7 @@ "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, + "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/twotrees_bluer_extruder_1.def.json b/resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json similarity index 74% rename from resources/extruders/twotrees_bluer_extruder_1.def.json rename to resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json index fc70c5b65d..398822b156 100644 --- a/resources/extruders/twotrees_bluer_extruder_1.def.json +++ b/resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json @@ -3,7 +3,7 @@ "name": "Extruder 2", "inherits": "fdmextruder", "metadata": { - "machine": "twotrees_bluer", + "machine": "hellbot_magna_2_230_dual", "position": "1" }, @@ -12,7 +12,7 @@ "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, + "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/hellbot_magna_2_230_extruder_0.def.json b/resources/extruders/hellbot_magna_2_230_extruder_0.def.json new file mode 100644 index 0000000000..926e8b94c4 --- /dev/null +++ b/resources/extruders/hellbot_magna_2_230_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "hellbot_magna_2_230", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json b/resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json new file mode 100644 index 0000000000..af68cc9422 --- /dev/null +++ b/resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "hellbot_magna_2_300_dual", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json b/resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json new file mode 100644 index 0000000000..3585978d6e --- /dev/null +++ b/resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "hellbot_magna_2_300_dual", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/hellbot_magna_2_300_extruder_0.def.json b/resources/extruders/hellbot_magna_2_300_extruder_0.def.json new file mode 100644 index 0000000000..db68460415 --- /dev/null +++ b/resources/extruders/hellbot_magna_2_300_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "hellbot_magna_2_300", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/inat_extruder_0.def.json b/resources/extruders/inat_extruder_0.def.json new file mode 100644 index 0000000000..100b8c0bca --- /dev/null +++ b/resources/extruders/inat_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "inat_base", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/jgaurora_a6_extruder_0.def.json b/resources/extruders/jgaurora_a6_extruder_0.def.json new file mode 100644 index 0000000000..dbe6248a7e --- /dev/null +++ b/resources/extruders/jgaurora_a6_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + + "metadata": { + "machine": "jgaurora_a6", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/kosher_dm_extruder.def.json b/resources/extruders/kosher_dm_extruder.def.json new file mode 100644 index 0000000000..50ce46b434 --- /dev/null +++ b/resources/extruders/kosher_dm_extruder.def.json @@ -0,0 +1,20 @@ +{ + "version": 2, + "name": "Duplication Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "kosher_duplication", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 } + } +} diff --git a/resources/extruders/kosher_extruder_0.def.json b/resources/extruders/kosher_extruder_0.def.json new file mode 100644 index 0000000000..9b1fa4d934 --- /dev/null +++ b/resources/extruders/kosher_extruder_0.def.json @@ -0,0 +1,27 @@ +{ + "version": 2, + "name": "Left Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "kosher", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": -51 }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_code": { "default_value": "T0" } + } +} diff --git a/resources/extruders/kosher_extruder_1.def.json b/resources/extruders/kosher_extruder_1.def.json new file mode 100644 index 0000000000..353d6bcea4 --- /dev/null +++ b/resources/extruders/kosher_extruder_1.def.json @@ -0,0 +1,27 @@ +{ + "version": 2, + "name": "Right Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "kosher", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": 257 }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_code": { "default_value": "T1" } + } +} diff --git a/resources/extruders/kosher_mm_extruder.def.json b/resources/extruders/kosher_mm_extruder.def.json new file mode 100644 index 0000000000..8eacf54875 --- /dev/null +++ b/resources/extruders/kosher_mm_extruder.def.json @@ -0,0 +1,20 @@ +{ + "version": 2, + "name": "Mirror Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "kosher_mirror", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 } + } +} diff --git a/resources/extruders/longer_base_extruder_0.def.json b/resources/extruders/longer_base_extruder_0.def.json new file mode 100644 index 0000000000..f4b144ec87 --- /dev/null +++ b/resources/extruders/longer_base_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "longer_base", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/lulzbot_mini_2_se_extruder.def.json b/resources/extruders/lulzbot_mini_2_se_extruder.def.json new file mode 100644 index 0000000000..135b247b67 --- /dev/null +++ b/resources/extruders/lulzbot_mini_2_se_extruder.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Lulzbot Mini 2 | SE | 0.5mm", + "inherits": "fdmextruder", + "metadata": { + "machine": "lulzbot_mini_2_se", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "0" + }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.5 }, + "machine_extruder_start_pos_abs": { "default_value": false }, + "machine_extruder_start_pos_x": { "default_value": 0 }, + "machine_extruder_start_pos_y": { "default_value": 0 }, + "machine_extruder_end_pos_abs": { "default_value": false }, + "machine_extruder_end_pos_x": { "default_value": 0 }, + "machine_extruder_end_pos_y": { "default_value": 0 } + } +} diff --git a/resources/extruders/lulzbot_mini_2_sl_extruder.def.json b/resources/extruders/lulzbot_mini_2_sl_extruder.def.json new file mode 100644 index 0000000000..12faf247e5 --- /dev/null +++ b/resources/extruders/lulzbot_mini_2_sl_extruder.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Lulzbot Mini 2 | SL | 0.25mm (Micro)", + "inherits": "fdmextruder", + "metadata": { + "machine": "lulzbot_mini_2_sl", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "0" + }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.25 }, + "machine_extruder_start_pos_abs": { "default_value": false }, + "machine_extruder_start_pos_x": { "default_value": 0 }, + "machine_extruder_start_pos_y": { "default_value": 0 }, + "machine_extruder_end_pos_abs": { "default_value": false }, + "machine_extruder_end_pos_x": { "default_value": 0 }, + "machine_extruder_end_pos_y": { "default_value": 0 } + } +} diff --git a/resources/extruders/lulzbot_taz_pro_dual_extruder_0.def.json b/resources/extruders/lulzbot_taz_pro_dual_extruder_0.def.json new file mode 100644 index 0000000000..1bc148c583 --- /dev/null +++ b/resources/extruders/lulzbot_taz_pro_dual_extruder_0.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "lulzbot_taz_pro_dual", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.5 }, + "machine_extruder_start_pos_abs": { "default_value": false }, + "machine_extruder_start_pos_x": { "default_value": 0 }, + "machine_extruder_start_pos_y": { "default_value": 0 }, + "machine_extruder_end_pos_abs": { "default_value": false }, + "machine_extruder_end_pos_x": { "default_value": 0 }, + "machine_extruder_end_pos_y": { "default_value": 0 } + } +} diff --git a/resources/extruders/lulzbot_taz_pro_dual_extruder_1.def.json b/resources/extruders/lulzbot_taz_pro_dual_extruder_1.def.json new file mode 100644 index 0000000000..3d193426cb --- /dev/null +++ b/resources/extruders/lulzbot_taz_pro_dual_extruder_1.def.json @@ -0,0 +1,30 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "lulzbot_taz_pro_dual", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.5 }, + "nozzle_disallowed_areas": { + "default_value": [ + [[-115, 140], [ -140, 140], [ -140, -140], [-115, -140]] + ] + }, + "machine_extruder_start_pos_abs": { "default_value": false }, + "machine_extruder_start_pos_x": { "default_value": 0 }, + "machine_extruder_start_pos_y": { "default_value": 0 }, + "machine_extruder_end_pos_abs": { "default_value": false }, + "machine_extruder_end_pos_x": { "default_value": 0 }, + "machine_extruder_end_pos_y": { "default_value": 0 } + } +} diff --git a/resources/extruders/maker_made_300x_extruder_0.def.json b/resources/extruders/maker_made_300x_extruder_0.def.json new file mode 100644 index 0000000000..a35c47b395 --- /dev/null +++ b/resources/extruders/maker_made_300x_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "name": "Extruder 1", + "version": 2, + "inherits": "fdmextruder", + "metadata": { + "machine": "maker_made_300x", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/mingda_base_extruder_0.def.json b/resources/extruders/mingda_base_extruder_0.def.json new file mode 100644 index 0000000000..034f6ce45f --- /dev/null +++ b/resources/extruders/mingda_base_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "mingda_base", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/mp_mini_delta_v2_extruder_0.def.json b/resources/extruders/mp_mini_delta_v2_extruder_0.def.json new file mode 100644 index 0000000000..022ace632f --- /dev/null +++ b/resources/extruders/mp_mini_delta_v2_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 0", + "inherits": "fdmextruder", + "metadata": { + "machine": "mp_mini_delta_v2", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/pbr3d_g1_extruder_0.def.json b/resources/extruders/pbr3d_g1_extruder_0.def.json new file mode 100644 index 0000000000..3a79fe4f20 --- /dev/null +++ b/resources/extruders/pbr3d_g1_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "pbr3d_g1", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/snapmaker_extruder_0.def.json b/resources/extruders/snapmaker_extruder_0.def.json new file mode 100644 index 0000000000..c9b69703a7 --- /dev/null +++ b/resources/extruders/snapmaker_extruder_0.def.json @@ -0,0 +1,20 @@ +{ + "name": "Extruder 1", + "version": 2, + "inherits": "fdmextruder", + "metadata": { + "machine": "snapmaker2", + "position": "0" + }, + "overrides": { + "extruder_nr": { + "default_value": 0 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + } + } +} diff --git a/resources/extruders/stream20_extruder.def.json b/resources/extruders/stream20_extruder.def.json new file mode 100644 index 0000000000..f7186c704f --- /dev/null +++ b/resources/extruders/stream20_extruder.def.json @@ -0,0 +1,21 @@ +{ + "version": 2, + "name": "STREAM20MK2 Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "stream20pro_mk2", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + } + } +} diff --git a/resources/extruders/stream20dual_0.def.json b/resources/extruders/stream20dual_0.def.json new file mode 100644 index 0000000000..9138d5df63 --- /dev/null +++ b/resources/extruders/stream20dual_0.def.json @@ -0,0 +1,31 @@ +{ + "version": 2, + "name": "Left extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "stream20dual_mk2", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/extruders/stream20dual_1.def.json b/resources/extruders/stream20dual_1.def.json new file mode 100644 index 0000000000..d52ab86111 --- /dev/null +++ b/resources/extruders/stream20dual_1.def.json @@ -0,0 +1,33 @@ +{ + "version": 2, + "name": "Right extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "stream20dual_mk2", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_nozzle_offset_x": { "default_value": 35 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + } +} + + diff --git a/resources/extruders/stream30_extruder.def.json b/resources/extruders/stream30_extruder.def.json new file mode 100644 index 0000000000..182ef9b481 --- /dev/null +++ b/resources/extruders/stream30_extruder.def.json @@ -0,0 +1,21 @@ +{ + "version": 2, + "name": "STREAM30MK2 Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "stream30pro_mk2", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + } + } +} diff --git a/resources/extruders/stream30dual_0.def.json b/resources/extruders/stream30dual_0.def.json new file mode 100644 index 0000000000..3955219154 --- /dev/null +++ b/resources/extruders/stream30dual_0.def.json @@ -0,0 +1,31 @@ +{ + "version": 2, + "name": "Left extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "stream30dual_mk2", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/extruders/stream30dual_1.def.json b/resources/extruders/stream30dual_1.def.json new file mode 100644 index 0000000000..8db42ecdc7 --- /dev/null +++ b/resources/extruders/stream30dual_1.def.json @@ -0,0 +1,33 @@ +{ + "version": 2, + "name": "Right extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "stream30dual_mk2", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_nozzle_offset_x": { "default_value": 35 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + } +} + + diff --git a/resources/extruders/stream30ultra_extruder.def.json b/resources/extruders/stream30ultra_extruder.def.json new file mode 100644 index 0000000000..a2564677ec --- /dev/null +++ b/resources/extruders/stream30ultra_extruder.def.json @@ -0,0 +1,21 @@ +{ + "version": 2, + "name": "Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "stream30ultra", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + } + } +} diff --git a/resources/extruders/stream30ultrasc_extruder.def.json b/resources/extruders/stream30ultrasc_extruder.def.json new file mode 100644 index 0000000000..1f76837e87 --- /dev/null +++ b/resources/extruders/stream30ultrasc_extruder.def.json @@ -0,0 +1,21 @@ +{ + "version": 2, + "name": "Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "stream30ultrasc", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + } + } +} diff --git a/resources/extruders/syndaveraxi2_extruder_0.def.json b/resources/extruders/syndaveraxi2_extruder_0.def.json new file mode 100644 index 0000000000..62357f3227 --- /dev/null +++ b/resources/extruders/syndaveraxi2_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Hemera 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "syndaveraxi2", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_steps_per_mm_e": { "default_value": 400 } + } +} \ No newline at end of file diff --git a/resources/extruders/trimaker_cosmosII_extruder.def.json b/resources/extruders/trimaker_cosmosII_extruder.def.json new file mode 100644 index 0000000000..87c9394d96 --- /dev/null +++ b/resources/extruders/trimaker_cosmosII_extruder.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "trimaker_cosmosII", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/trimaker_nebula_extruder.def.json b/resources/extruders/trimaker_nebula_extruder.def.json new file mode 100644 index 0000000000..6dbd251edc --- /dev/null +++ b/resources/extruders/trimaker_nebula_extruder.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "trimaker_nebula", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/two_trees_base_extruder_0.def.json b/resources/extruders/two_trees_base_extruder_0.def.json new file mode 100644 index 0000000000..d8a810dedc --- /dev/null +++ b/resources/extruders/two_trees_base_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "two_trees_base", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/i18n/cs_CZ/cura.po b/resources/i18n/cs_CZ/cura.po index b2b9420729..cd7b770253 100644 --- a/resources/i18n/cs_CZ/cura.po +++ b/resources/i18n/cs_CZ/cura.po @@ -1,27 +1,27 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2020. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0200\n" -"PO-Revision-Date: 2020-08-21 14:20+0200\n" -"Last-Translator: DenyCZ \n" +"POT-Creation-Date: 2021-06-10 17:35+0200\n" +"PO-Revision-Date: 2021-04-04 15:31+0200\n" +"Last-Translator: Miroslav Šustek \n" "Language-Team: DenyCZ \n" "Language: cs_CZ\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n>=2 && n<=4 ? 1 : 2);\n" -"X-Generator: Poedit 2.3\n" +"X-Generator: Poedit 2.4.2\n" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1581 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 msgctxt "@label" @@ -47,7 +47,7 @@ msgstr "Nepřepsáno" #, python-brace-format msgctxt "@label {0} is the name of a printer that's about to be deleted." msgid "Are you sure you wish to remove {0}? This cannot be undone!" -msgstr "" +msgstr "Doopravdy chcete odstranit {0}? Toto nelze vrátit zpět!" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 @@ -92,12 +92,12 @@ msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "Návrhový profil je navržen pro tisk počátečních prototypů a ověření koncepce s cílem podstatného zkrácení doby tisku." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:226 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:234 msgctxt "@label" msgid "Custom Material" msgstr "Vlastní materiál" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:227 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 msgctxt "@label" msgid "Custom" @@ -119,7 +119,7 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Všechny soubory (*)" -#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:178 +#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:181 msgctxt "@info:title" msgid "Login failed" msgstr "Přihlášení selhalo" @@ -149,28 +149,33 @@ msgctxt "@info:title" msgid "Can't Find Location" msgstr "Nemohu najít umístění" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:104 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:116 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Nelze vytvořit archiv ze složky s uživatelskými daty: {}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:110 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 msgctxt "@info:title" msgid "Backup" msgstr "Záloha" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:123 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:135 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "Pokusil se obnovit zálohu Cura bez nutnosti správných dat nebo metadat." -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:134 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:146 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that is higher than the current version." msgstr "Pokusil se obnovit zálohu Cura, která je vyšší než aktuální verze." +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 +msgctxt "@info:backup_failed" +msgid "The following error occurred while trying to restore a Cura backup:" +msgstr "Během obnovení zálohy Cura se vyskytly následující chyby:" + #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -320,74 +325,74 @@ msgctxt "@action:button" msgid "Send report" msgstr "Odeslat záznam" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:521 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:527 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Načítám zařízení..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:528 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:534 msgctxt "@info:progress" msgid "Setting up preferences..." msgstr "Nastavuji preference..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:657 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:672 msgctxt "@info:progress" msgid "Initializing Active Machine..." msgstr "Inicializuji aktivní zařízení..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:803 msgctxt "@info:progress" msgid "Initializing machine manager..." msgstr "Inicializuji správce zařízení..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:802 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:817 msgctxt "@info:progress" msgid "Initializing build volume..." msgstr "Inicializuji prostor podložky..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:870 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:888 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Připravuji scénu..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:906 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:924 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Načítám rozhraní..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:911 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:929 msgctxt "@info:progress" msgid "Initializing engine..." msgstr "Inicializuji engine..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1221 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1246 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1777 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1799 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Současně lze načíst pouze jeden soubor G-kódu. Přeskočen import {0}" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1778 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:188 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 msgctxt "@info:title" msgid "Warning" msgstr "Varování" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1787 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1809 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Nelze otevřít žádný jiný soubor, když se načítá G kód. Přeskočen import {0}" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 @@ -410,7 +415,7 @@ msgctxt "@info:title" msgid "Placing Object" msgstr "Umisťuji objekt" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:92 msgctxt "@message" msgid "Could not read response." msgstr "Nelze přečíst odpověď." @@ -430,12 +435,12 @@ msgctxt "@message" msgid "Something unexpected happened when trying to log in, please try again." msgstr "Při pokusu o přihlášení se stalo něco neočekávaného, zkuste to znovu." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:187 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:189 msgctxt "@info" msgid "Unable to start a new sign in process. Check if another sign in attempt is still active." msgstr "Nepodařilo se mi spustit nový proces přihlášení. Zkontrolujte, zda nějaký jiný již neběží." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Nelze se dostat na server účtu Ultimaker." @@ -453,8 +458,8 @@ msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Soubor {0} již existuje. Opravdu jej chcete přepsat?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:452 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:455 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "Špatná cesta k souboru:" @@ -523,7 +528,7 @@ msgstr "Import profilu z {0} se nezdařil:" #, python-brace-format msgctxt "@info:status" msgid "Successfully imported profile {0}." -msgstr "" +msgstr "Úspěšně importován profil {0}." #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:349 #, python-brace-format @@ -537,37 +542,37 @@ msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Profil {0} má neznámý typ souboru nebo je poškozen." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:423 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:426 msgctxt "@label" msgid "Custom profile" msgstr "Vlastní profil" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:439 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:442 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "V profilu chybí typ kvality." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:443 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:446 msgctxt "@info:status" -msgid "Global stack is missing." -msgstr "" +msgid "There is no active printer yet." +msgstr "Zatím neexistuje aktivní tiskárna." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:449 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:452 msgctxt "@info:status" msgid "Unable to add the profile." msgstr "Nepovedlo se přidat profil." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:463 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:466 #, python-brace-format msgctxt "@info:status" msgid "Quality type '{0}' is not compatible with the current active machine definition '{1}'." -msgstr "" +msgstr "Typ kvality '{0}' není kompatibilní s definicí '{1}' aktivního zařízení." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:468 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:471 #, python-brace-format msgctxt "@info:status" msgid "Warning: The profile is not visible because its quality type '{0}' is not available for the current configuration. Switch to a material/nozzle combination that can use this quality type." -msgstr "" +msgstr "Varování: Profil není viditelný, protože typ kvality '{0}' není dostupný pro aktuální konfiguraci. Přepněte na kombinaci materiálu a trysky, která může být použita s tímto typem kvality." #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" @@ -579,23 +584,23 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Výchozí" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:712 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 msgctxt "@label" msgid "Nozzle" msgstr "Tryska" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:860 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:856 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "Nastavení byla změněna, aby odpovídala aktuální dostupnosti extruderů:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:862 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:858 msgctxt "@info:title" msgid "Settings updated" msgstr "Nastavení aktualizováno" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1447 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1478 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extruder(y) zakázány" @@ -608,13 +613,13 @@ msgid "Add" msgstr "Přidat" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:263 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 msgctxt "@action:button" msgid "Finish" msgstr "Dokončit" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 #: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 #: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 @@ -622,7 +627,7 @@ msgstr "Dokončit" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 msgctxt "@action:button" msgid "Cancel" @@ -634,76 +639,83 @@ msgctxt "@label" msgid "Group #{group_nr}" msgstr "Skupina #{group_nr}" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Vnější stěna" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Vnitřní stěna" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Skin" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Výplň" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Výplň podpor" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Rozhraní podpor" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Podpora" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Límec" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 msgctxt "@tooltip" msgid "Prime Tower" msgstr "Hlavní věž" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 msgctxt "@tooltip" msgid "Travel" msgstr "Pohyb" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 msgctxt "@tooltip" msgid "Retractions" msgstr "Retrakce" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:94 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 msgctxt "@tooltip" msgid "Other" msgstr "Jiné" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 msgctxt "@action:button" msgid "Next" msgstr "Další" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 +msgctxt "@action:button" +msgid "Skip" +msgstr "Přeskočit" + +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:173 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 msgctxt "@action:button" msgid "Close" @@ -728,29 +740,36 @@ msgstr "" "

    Zjistěte, jak zajistit nejlepší možnou kvalitu a spolehlivost tisku.

    \n" "

    Zobrazit průvodce kvalitou tisku

    " -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:535 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:540 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Projektový soubor {0} obsahuje neznámý typ zařízení {1}. Nelze importovat zařízení. Místo toho budou importovány modely." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:538 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:543 msgctxt "@info:title" msgid "Open Project File" msgstr "Otevřít soubor s projektem" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:634 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:639 #, python-brace-format msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." -msgstr "Soubor projektu {0}je neočekávaně nedostupný: {1}." +msgstr "Soubor projektu {0} je neočekávaně nedostupný: {1}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:635 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "Nepovedlo se otevřít soubor projektu" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:686 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:646 +#, python-brace-format +msgctxt "@info:error Don't translate the XML tags or !" +msgid "Project file {0} is corrupt: {1}." +msgstr "Soubor projektu {0} je poškozený: {1}." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:698 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." @@ -786,9 +805,9 @@ msgstr "Nemáte oprávnění zapisovat do tohoto pracovního prostoru." #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:96 msgctxt "@error:zip" msgid "The operating system does not allow saving a project file to this location or with this file name." -msgstr "" +msgstr "Operační systém nepovoluje uložit soubor s projektem do tohoto umístění nebo pod tímto názvem." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:206 msgctxt "@error:zip" msgid "Error writing 3mf file." msgstr "Chyba při zápisu 3mf file." @@ -843,8 +862,8 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "Záloha překračuje maximální povolenou velikost soubor." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:23 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "Nastala chyba při pokusu obnovit vaši zálohu." @@ -854,45 +873,45 @@ msgctxt "@item:inmenu" msgid "Manage backups" msgstr "Spravovat zálohy" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Nelze slicovat s aktuálním materiálem, protože je nekompatibilní s vybraným strojem nebo konfigurací." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:411 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:420 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:429 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 msgctxt "@info:title" msgid "Unable to slice" msgstr "Nelze slicovat" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:412 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "S aktuálním nastavením nelze slicovat. Následující nastavení obsahuje chyby: {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:410 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:436 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Nelze slicovat kvůli některým nastavení jednotlivých modelů. Následující nastavení obsahuje chyby na jednom nebo více modelech: {error_labels}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:445 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "Nelze slicovat, protože hlavní věž nebo primární pozice jsou neplatné." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:428 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:454 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "Nelze slicovat, protože jsou zde objekty asociované k zakázanému extruder %s." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:463 msgctxt "@info:status" msgid "" "Please review settings and check if your models:\n" @@ -1161,28 +1180,28 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Vyměnitelná jednotka" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:121 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:128 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled." msgstr "Když je aktivován síťový tisk, Cura přesně nezobrazuje vrstvy." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:129 msgctxt "@info:title" msgid "Simulation View" msgstr "Pohled simulace" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:status" msgid "Nothing is shown because you need to slice first." msgstr "Nic není zobrazeno, nejdříve musíte slicovat." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:title" msgid "No layers to show" msgstr "Žádné vrstvy k zobrazení" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:124 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "Znovu nezobrazovat tuto zprávu" @@ -1192,16 +1211,21 @@ msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Pohled vrstev" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:70 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:71 msgctxt "@info:status" -msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." -msgstr "Váš model není rozmanitý. Zvýrazněné oblasti indikují buď chybějící, či vedlejší povrch." +msgid "The highlighted areas indicate either missing or extraneous surfaces. Fix your model and open it again into Cura." +msgstr "Zvýrazněné oblasti označují chybějící nebo vedlejší povrchy. Opravte váš model a otevřete jej znovu." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 msgctxt "@info:title" -msgid "Model errors" +msgid "Model Errors" msgstr "Chyby modelu" +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:79 +msgctxt "@action:button" +msgid "Learn more" +msgstr "Zjistit více" + #: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/__init__.py:12 msgctxt "@item:inmenu" msgid "Solid view" @@ -1228,7 +1252,7 @@ msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "Zjištěny změny z vašeho účtu Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:145 msgctxt "@action:button" msgid "Sync" msgstr "Synchronizovat" @@ -1264,7 +1288,7 @@ msgctxt "@info:generic" msgid "You need to quit and restart {} before changes have effect." msgstr "Než se změny projeví, musíte ukončit a restartovat {}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:79 msgctxt "@info:generic" msgid "{} plugins failed to download" msgstr "Nepovedlo se stáhnout {} zásuvných modulů" @@ -1305,7 +1329,11 @@ msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Balíček ve formátu Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "Nemohu zapsat do UFP souboru:" @@ -1320,26 +1348,26 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Vybrat vylepšení" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:152 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 msgctxt "@action:button" msgid "Print via cloud" msgstr "Tisknout přes cloud" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:155 msgctxt "@properties:tooltip" msgid "Print via cloud" msgstr "Tisknout přes cloud" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:156 msgctxt "@info:status" msgid "Connected via cloud" msgstr "Připojen přes cloud" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:264 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:270 #, python-brace-format msgctxt "@error:send" msgid "Unknown error code when uploading print job: {0}" -msgstr "" +msgstr "Při nahrávání tiskové úlohy došlo k chybě s neznámým kódem: {0}" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:227 msgctxt "info:status" @@ -1353,21 +1381,21 @@ msgstr[2] "Z vašeho Ultimaker účtu byly detekovány nové tiskárny" #, python-brace-format msgctxt "info:status Filled in with printer name and printer model." msgid "Adding printer {name} ({model}) from your account" -msgstr "" +msgstr "Přidávám tiskárnu {name} ({model}) z vašeho účtu" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:255 #, python-brace-format msgctxt "info:{0} gets replaced by a number of printers" msgid "... and {0} other" msgid_plural "... and {0} others" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "... a {0} další" +msgstr[1] "... a {0} další" +msgstr[2] "... a {0} dalších" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:260 msgctxt "info:status" msgid "Printers added from Digital Factory:" -msgstr "" +msgstr "Tiskárny přidané z Digital Factory:" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:316 msgctxt "info:status" @@ -1389,13 +1417,13 @@ msgstr[2] "Tyto tiskárny nejsou napojeny na Digital Factory:" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:419 msgctxt "info:name" msgid "Ultimaker Digital Factory" -msgstr "" +msgstr "Ultimaker Digital Factory" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:333 #, python-brace-format msgctxt "info:status" msgid "To establish a connection, please visit the {website_link}" -msgstr "" +msgstr "Chcete-li navázat spojení, navštivte {website_link}" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:337 msgctxt "@action:button" @@ -1411,19 +1439,19 @@ msgstr "Odstranit tiskárnu" #, python-brace-format msgctxt "@message {printer_name} is replaced with the name of the printer" msgid "{printer_name} will be removed until the next account sync." -msgstr "" +msgstr "Tiskárna {printer_name} bude odebrána až do další synchronizace účtu." #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:422 #, python-brace-format msgctxt "@message {printer_name} is replaced with the name of the printer" msgid "To remove {printer_name} permanently, visit {digital_factory_link}" -msgstr "" +msgstr "Chcete-li tiskárnu {printer_name} trvale odebrat, navštivte {digital_factory_link}" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:423 #, python-brace-format msgctxt "@message {printer_name} is replaced with the name of the printer" msgid "Are you sure you want to remove {printer_name} temporarily?" -msgstr "" +msgstr "Opravdu chcete tiskárnu {printer_name} dočasně odebrat?" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:460 msgctxt "@title:window" @@ -1440,8 +1468,14 @@ msgid_plural "" "You are about to remove {0} printers from Cura. This action cannot be undone.\n" "Are you sure you want to continue?" msgstr[0] "" +"Chystáte se odebrat {0} tiskárnu z Cury. Tuto akci nelze vrátit zpět.\n" +"Doopravdy chcete pokračovat?" msgstr[1] "" +"Chystáte se odebrat {0} tiskárny z Cury. Tuto akci nelze vrátit zpět.\n" +"Doopravdy chcete pokračovat?" msgstr[2] "" +"Chystáte se odebrat {0} tiskáren z Cury. Tuto akci nelze vrátit zpět.\n" +"Doopravdy chcete pokračovat?" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:468 msgctxt "@label" @@ -1449,6 +1483,8 @@ msgid "" "You are about to remove all printers from Cura. This action cannot be undone.\n" "Are you sure you want to continue?" msgstr "" +"Chystáte se odebrat všechny tiskárny z Cury. Tuto akci nelze vrátit zpět.\n" +"Doopravdy chcete pokračovat?" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py:27 msgctxt "@info:status" @@ -1535,12 +1571,12 @@ msgstr "Nahrávám tiskovou úlohu do tiskárny." #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadQueueFullMessage.py:16 msgctxt "@info:status" msgid "Print job queue is full. The printer can't accept a new job." -msgstr "" +msgstr "Fronta tiskových úloh je plná. Tiskárna nemůže přijmout další úlohu." #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadQueueFullMessage.py:17 msgctxt "@info:title" msgid "Queue Full" -msgstr "" +msgstr "Fronta je plná" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadSuccessMessage.py:15 msgctxt "@info:status" @@ -1632,82 +1668,82 @@ msgctxt "@info:tooltip" msgid "Some things could be problematic in this print. Click to see tips for adjustment." msgstr "Některé věci mohou být v tomto tisku problematické. Kliknutím zobrazíte tipy pro úpravy." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:15 msgctxt "@title:window" msgid "Open Project" msgstr "Otevřit projekt" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" msgstr "Aktualizovat existující" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:63 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "Vytvořit nový" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "Souhrn - Projekt Cura" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 msgctxt "@action:label" msgid "Printer settings" msgstr "Nastavení tiskárny" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:112 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:113 msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "Jak by měl být problém v zařízení vyřešen?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:165 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 msgctxt "@action:label" msgid "Type" msgstr "Typ" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:181 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 msgctxt "@action:label" msgid "Printer Group" msgstr "Skupina tiskárny" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:203 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 msgctxt "@action:label" msgid "Profile settings" msgstr "Nastavení profilu" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:219 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:221 msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "Jak by měl být problém v profilu vyřešen?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:349 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 msgctxt "@action:label" msgid "Name" msgstr "Název" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:255 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 msgctxt "@action:label" msgid "Intent" msgstr "Záměr" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:271 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Not in profile" msgstr "Není v profilu" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:276 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 msgctxt "@action:label" msgid "%1 override" @@ -1716,12 +1752,12 @@ msgstr[0] "%1 přepsání" msgstr[1] "%1 přepsání" msgstr[2] "%1 přepsání" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:287 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:290 msgctxt "@action:label" msgid "Derivative from" msgstr "Derivát z" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:295 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" @@ -1729,42 +1765,42 @@ msgstr[0] "%1, %2 override" msgstr[1] "%1, %2 overrides" msgstr[2] "%1, %2 overrides" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:309 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:312 msgctxt "@action:label" msgid "Material settings" msgstr "Nastavení materiálu" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:328 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Jak by měl být problém v materiálu vyřešen?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:369 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:373 msgctxt "@action:label" msgid "Setting visibility" msgstr "Nastavení zobrazení" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:378 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:382 msgctxt "@action:label" msgid "Mode" msgstr "Mód" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:label" msgid "Visible settings:" msgstr "Viditelná zařízení:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:399 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:403 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 z %2" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:425 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:429 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Nahrání projektu vymaže všechny modely na podložce." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:457 msgctxt "@action:button" msgid "Open" msgstr "Otevřít" @@ -1866,8 +1902,8 @@ msgstr "Zálohovat a synchronizovat vaše nastavení Cura." #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:68 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:125 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:199 msgctxt "@button" msgid "Sign in" msgstr "Přihlásit se" @@ -2101,12 +2137,12 @@ msgctxt "@label" msgid "Cooling Fan Number" msgstr "Číslo chladícího větráku" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:163 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "Počáteční G-kód extuderu" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:177 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "Ukončující G-kód extuderu" @@ -2191,12 +2227,17 @@ msgctxt "@label" msgid "Number of Extruders" msgstr "Počet extrůderů" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:345 +msgctxt "@label" +msgid "Apply Extruder offsets to GCode" +msgstr "Aplikovat offsety extruderu do G kódu" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:393 msgctxt "@title:label" msgid "Start G-code" msgstr "Počáteční G kód" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:385 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:404 msgctxt "@title:label" msgid "End G-code" msgstr "Ukončující G kód" @@ -2224,6 +2265,11 @@ msgctxt "@label link to technical assistance" msgid "View user manuals online" msgstr "Zobrazit online manuály" +#: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 +msgctxt "@info" +msgid "In order to monitor your print from Cura, please connect the printer." +msgstr "Abyste mohli monitorovat tisk z Cury, připojte prosím tiskárnu." + #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" msgid "Mesh Type" @@ -2270,7 +2316,7 @@ msgid "Select Settings to Customize for this model" msgstr "Vybrat nastavení k přizpůsobení pro tento model" #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtrovat..." @@ -2280,32 +2326,32 @@ msgctxt "@label:checkbox" msgid "Show all" msgstr "Zobrazit vše" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:20 msgctxt "@title:window" msgid "Post Processing Plugin" msgstr "Zásuvný balíček Post Processing" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:59 msgctxt "@label" msgid "Post Processing Scripts" msgstr "Skripty Post Processingu" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:235 msgctxt "@action" msgid "Add a script" msgstr "Přidat skript" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:282 msgctxt "@label" msgid "Settings" msgstr "Nastavení" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:499 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:502 msgctxt "@info:tooltip" msgid "Change active post-processing scripts." msgstr "Změnít aktivní post-processing skripty." -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:506 msgctxt "@info:tooltip" msgid "The following script is active:" msgid_plural "The following scripts are active:" @@ -2319,78 +2365,93 @@ msgctxt "@label" msgid "Color scheme" msgstr "Barevné schéma" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:110 msgctxt "@label:listbox" msgid "Material Color" msgstr "Barva materiálu" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:111 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:114 msgctxt "@label:listbox" msgid "Line Type" msgstr "Typ úsečky" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:115 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:118 msgctxt "@label:listbox" msgid "Speed" msgstr "Rychlost" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:122 msgctxt "@label:listbox" -msgid "Layer thickness" +msgid "Layer Thickness" msgstr "Tloušťka vrstvy" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:126 +msgctxt "@label:listbox" +msgid "Line Width" +msgstr "Šířka čáry" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 +msgctxt "@label:listbox" +msgid "Flow" +msgstr "Průtok" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" msgid "Compatibility Mode" msgstr "Mód kompatibility" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:230 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:245 msgctxt "@label" msgid "Travels" msgstr "Cesty" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:251 msgctxt "@label" msgid "Helpers" msgstr "Pomocníci" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:257 msgctxt "@label" msgid "Shell" msgstr "Shell" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:248 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 msgctxt "@label" msgid "Infill" msgstr "Výplň" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:298 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:271 +msgctxt "@label" +msgid "Starts" +msgstr "Začátky" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 msgctxt "@label" msgid "Only Show Top Layers" msgstr "Zobrazit jen vrchní vrstvy" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:308 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:332 msgctxt "@label" msgid "Show 5 Detailed Layers On Top" msgstr "Zobrazit 5 podrobných vrstev nahoře" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:346 msgctxt "@label" msgid "Top / Bottom" msgstr "Nahoře / Dole" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:350 msgctxt "@label" msgid "Inner Wall" msgstr "Vnitřní stěna" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:384 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:419 msgctxt "@label" msgid "min" msgstr "min" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:433 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:488 msgctxt "@label" msgid "max" msgstr "max" @@ -2531,7 +2592,7 @@ msgid "Plugins" msgstr "Zásuvné moduly" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 msgctxt "@title:tab" msgid "Materials" @@ -2580,6 +2641,7 @@ msgstr "Schovat" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:178 msgctxt "@button" msgid "Next" msgstr "Další" @@ -2924,7 +2986,7 @@ msgid "Delete" msgstr "Odstranit" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:289 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 msgctxt "@label" msgid "Resume" msgstr "Obnovit" @@ -2940,8 +3002,8 @@ msgid "Resuming..." msgstr "Obnovuji..." #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 msgctxt "@label" msgid "Pause" msgstr "Pozastavit" @@ -2982,7 +3044,7 @@ msgid "Are you sure you want to abort %1?" msgstr "Doopravdy chcete zrušit %1?" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 msgctxt "@window:title" msgid "Abort print" msgstr "Zrušit tisk" @@ -2993,7 +3055,7 @@ msgid "Manage printer" msgstr "Spravovat tiskárnu" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." @@ -3019,27 +3081,34 @@ msgctxt "@label:status" msgid "Idle" msgstr "Čekám" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:365 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +msgctxt "@label:status" +msgid "Preparing..." +msgstr "Připravuji..." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:369 msgctxt "@label:status" msgid "Printing" -msgstr "" +msgstr "Tisknu" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:406 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:410 msgctxt "@label" msgid "Untitled" msgstr "Bez názvu" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:431 msgctxt "@label" msgid "Anonymous" msgstr "Anonymní" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:458 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Jsou nutné změny v nastavení" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:492 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:496 msgctxt "@action:button" msgid "Details" msgstr "Podrobnosti" @@ -3066,12 +3135,6 @@ msgctxt "@label:status" msgid "Finished" msgstr "Dokončeno" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -msgctxt "@label:status" -msgid "Preparing..." -msgstr "Připravuji..." - #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." @@ -3152,27 +3215,27 @@ msgctxt "@action:button" msgid "Sign in" msgstr "Přihlásit se" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" -msgid "Your key to connected 3D printing" -msgstr "Váš klíč k propojenému 3D tisku" +msgid "Sign in to the Ultimaker platform" +msgstr "Přihlásit se do platformy Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:42 msgctxt "@text" msgid "" -"- Customize your experience with more print profiles and plugins\n" -"- Stay flexible by syncing your setup and loading it anywhere\n" -"- Increase efficiency with a remote workflow on Ultimaker printers" +"- Add material profiles and plug-ins from the Marketplace\n" +"- Back-up and sync your material profiles and plug-ins\n" +"- Share ideas and get help from 48,000+ users in the Ultimaker community" msgstr "" -"- Přizpůsobte si své zážitky pomocí více profilů tisku a modulů\n" -"- Zůstaňte flexibilní díky synchronizaci nastavení a přístupu k ní kdekoli\n" -"- Zvyšte efektivitu pomocí vzdáleného pracovního postupu na tiskárnách Ultimaker" +"- Přidejte materiálnové profily and moduly z Obchodu\n" +"- Zálohujte a synchronizujte vaše materiálové profily and moduly\n" +"- Sdílejte nápady a získejte pomoc od více než 48 000 uživatelů v Ultimaker komunitě" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:142 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:62 msgctxt "@button" -msgid "Create account" -msgstr "Vytvořit účet" +msgid "Create a free Ultimaker account" +msgstr "Vytvořit účet Ultimaker zdarma" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/SyncState.qml:28 msgctxt "@label" @@ -3279,312 +3342,308 @@ msgctxt "@button" msgid "Cancel" msgstr "Zrušit" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:83 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Zobrazit online průvodce řešením problémů" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:90 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Přepnout zobrazení na celou obrazovku" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:98 msgctxt "@action:inmenu" msgid "Exit Full Screen" msgstr "Ukončit zobrazení na celou obrazovku" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:105 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Vrátit" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:115 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Znovu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:125 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Ukončit" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:132 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:133 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "3D Pohled" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:140 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Přední pohled" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:147 msgctxt "@action:inmenu menubar:view" msgid "Top View" -msgstr "Pohled ze shora" +msgstr "Pohled seshora" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 +msgctxt "@action:inmenu menubar:view" +msgid "Bottom View" +msgstr "Pohled zezdola" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Pohled z pravé strany" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:160 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:168 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Pohled z pravé strany" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:175 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Konfigurovat Cura..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:182 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "Přidat t&iskárnu..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:180 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:188 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Spravovat &tiskárny..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:187 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Spravovat materiály..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu" msgid "Add more materials from Marketplace" msgstr "Přidat více materiálů z obchodu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "&Aktualizovat profil s aktuálními nastaveními/přepsáními" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "Smazat aktuální &změny" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:222 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:230 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "&Vytvořit profil z aktuálního nastavení/přepsání." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Spravovat profily..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Zobrazit online &dokumentaci" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Nahlásit &chybu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:260 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Co je nového" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:266 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Více..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:273 msgctxt "@action:inmenu menubar:edit" -msgid "Delete Selected Model" -msgid_plural "Delete Selected Models" -msgstr[0] "Smazat vybraný model" -msgstr[1] "Smazat vybrané modely" -msgstr[2] "Smazat vybrané modely" +msgid "Delete Selected" +msgstr "Smazat vybrané" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:283 msgctxt "@action:inmenu menubar:edit" -msgid "Center Selected Model" -msgid_plural "Center Selected Models" -msgstr[0] "Centrovat vybraný model" -msgstr[1] "Centrovat vybrané modely" -msgstr[2] "Centrovat vybrané modely" +msgid "Center Selected" +msgstr "Centrovat vybrané" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:292 msgctxt "@action:inmenu menubar:edit" -msgid "Multiply Selected Model" -msgid_plural "Multiply Selected Models" -msgstr[0] "Násobit vybraný model" -msgstr[1] "Násobit vybrané modely" -msgstr[2] "Násobit vybrané modely" +msgid "Multiply Selected" +msgstr "Násobit vybrané" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Odstranit model" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:309 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "&Centerovat model na podložce" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:307 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "Sesk&upit modely" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:327 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:335 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Rozdělit modely" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:345 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "Spo&jit modely" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:347 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:355 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "Náso&bení modelu..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:362 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Vybrat všechny modely" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:372 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Vyčistit podložku" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:382 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Znovu načíst všechny modely" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Uspořádejte všechny modely do všechpodložek" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:390 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Uspořádat všechny modely" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:406 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Uspořádat selekci" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:405 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:413 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Resetovat všechny pozice modelů" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:412 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Resetovat všechny transformace modelů" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:419 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:429 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Otevřít soubor(y)..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:439 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Nový projekt..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:434 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:446 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Zobrazit složku s konfigurací" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:441 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:538 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Konfigurovat viditelnost nastavení..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:448 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:460 msgctxt "@action:menu" msgid "&Marketplace" msgstr "Mark&et" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:257 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Tento balíček bude nainstalován po restartování." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 msgctxt "@title:tab" msgid "General" msgstr "Obecné" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:462 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:453 msgctxt "@title:tab" msgid "Settings" msgstr "Nastavení" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:464 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 msgctxt "@title:tab" msgid "Printers" msgstr "Tiskárny" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 msgctxt "@title:tab" msgid "Profiles" msgstr "Profily" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:576 msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "Zavírám %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:588 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "Doopravdy chcete zavřít %1?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:638 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Otevřít soubor(y)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:744 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:737 msgctxt "@window:title" msgid "Install Package" msgstr "Nainstalovat balíček" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:752 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:745 msgctxt "@title:window" msgid "Open File(s)" msgstr "Otevřít Soubor(y)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:755 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:748 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Ve vybraných souborech jsme našli jeden nebo více souborů G-kódu. Naraz můžete otevřít pouze jeden soubor G-kódu. Pokud chcete otevřít soubor G-Code, vyberte pouze jeden." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:858 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:857 msgctxt "@title:window" msgid "Add Printer" msgstr "Přidat tiskárnu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:866 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:865 msgctxt "@title:window" msgid "What's New" msgstr "Co je nového" @@ -3727,24 +3786,34 @@ msgstr "Chyba v Python trackovací knihovně" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:159 msgctxt "@label" msgid "Polygon packing library, developed by Prusa Research" -msgstr "" +msgstr "Knihovna pro plošnou optimalizaci vyvinutá Prusa Research" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:160 msgctxt "@label" msgid "Python bindings for libnest2d" -msgstr "" +msgstr "Propojení libnest2d s jazykem Python" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +msgctxt "@label" +msgid "Support library for system keyring access" +msgstr "Podpůrná knihovna pro přístup k systémové klíčence" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" +msgid "Python extensions for Microsoft Windows" +msgstr "Python rozšíření pro Microsoft Windows" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +msgctxt "@label" msgid "Font" msgstr "Font" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 msgctxt "@label" msgid "SVG icons" msgstr "Ikony SVG" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:165 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Linux cross-distribution application deployment" @@ -3754,22 +3823,22 @@ msgctxt "@title:window" msgid "Open project file" msgstr "Otevřít soubor s projektem" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:88 msgctxt "@text:window" msgid "This is a Cura project file. Would you like to open it as a project or import the models from it?" msgstr "Toto je soubor projektu Cura. Chcete jej otevřít jako projekt nebo importovat z něj modely?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:98 msgctxt "@text:window" msgid "Remember my choice" msgstr "Pamatuj si moji volbu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:122 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:117 msgctxt "@action:button" msgid "Open as project" msgstr "Otevřít jako projekt" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:131 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:126 msgctxt "@action:button" msgid "Import models" msgstr "Importovat modely" @@ -3786,6 +3855,9 @@ msgid "" "Would you like to Keep these changed settings after switching profiles?\n" "Alternatively, you can discard the changes to load the defaults from '%1'." msgstr "" +"Upravili jste některá nastavení profilu.\n" +"Chcete tato změněná nastavení zachovat i po přepnutí profilů?\n" +"V opačném případě můžete změny smazat a načíst výchozí hodnoty z '%1'." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:111 msgctxt "@title:column" @@ -3798,7 +3870,7 @@ msgid "Current changes" msgstr "Aktuální změny" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Vždy se zeptat" @@ -3823,12 +3895,12 @@ msgctxt "@action:button" msgid "Keep changes" msgstr "Zanechat změny" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 msgctxt "@text:window" msgid "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?" msgstr "Ve vybraných souborech jsme našli jeden nebo více projektových souborů. Naraz můžete otevřít pouze jeden soubor projektu. Doporučujeme importovat pouze modely z těchto souborů. Chtěli byste pokračovat?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:99 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:94 msgctxt "@action:button" msgid "Import all as models" msgstr "Importovat vše jako modely" @@ -3984,7 +4056,7 @@ msgctxt "@label" msgid "Material" msgstr "Materiál" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:407 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "S touto kombinací materiálu pro lepší adhezi použijte lepidlo." @@ -4010,17 +4082,17 @@ msgctxt "@label" msgid "Number of Copies" msgstr "Počet kopií" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:33 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:41 msgctxt "@title:menu menubar:file" msgid "&Save Project..." msgstr "&Uložit projekt..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:54 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:74 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&Exportovat..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:85 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Výběr exportu..." @@ -4040,6 +4112,11 @@ msgctxt "@label:category menu label" msgid "Generic" msgstr "Obecné" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/OpenFilesMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Open File(s)..." +msgstr "Otevřít soubor(y)..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -4055,6 +4132,11 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Otevřít &Poslední" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SaveProjectMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Save Project..." +msgstr "Uložit projekt..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:15 msgctxt "@title:menu menubar:settings" msgid "&Printer" @@ -4080,17 +4162,17 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Zakázat Extruder" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:16 msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Viditelná nastavení" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:45 msgctxt "@action:inmenu" msgid "Collapse All Categories" msgstr "Sbalit všechny kategorie" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Spravovat nastavení viditelnosti ..." @@ -4100,22 +4182,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "Pozice &kamery" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:45 msgctxt "@action:inmenu menubar:view" msgid "Camera view" msgstr "Pohled kamery" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:48 msgctxt "@action:inmenu menubar:view" msgid "Perspective" msgstr "Perspektiva" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:60 msgctxt "@action:inmenu menubar:view" msgid "Orthographic" msgstr "Ortografický" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:81 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "Pod&ložka" @@ -4160,12 +4242,12 @@ msgctxt "@label:MonitorStatus" msgid "Please remove the print" msgstr "Prosím odstraňte výtisk" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@label" msgid "Abort Print" msgstr "Zrušit tisk" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:338 msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Jste si jist, že chcete zrušit tisknutí?" @@ -4194,9 +4276,9 @@ msgstr "Přesahy na tomto modelu nejsou podporovány." msgctxt "@label %1 is the number of settings it overrides." msgid "Overrides %1 setting." msgid_plural "Overrides %1 settings." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Přepíše %1 nastavení." +msgstr[1] "Přepíše %1 nastavení." +msgstr[2] "Přepíše %1 nastavení." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/ObjectSelector.qml:59 msgctxt "@label" @@ -4208,301 +4290,301 @@ msgctxt "@label" msgid "Interface" msgstr "Rozhranní" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:216 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:209 msgctxt "@label" msgid "Currency:" msgstr "Měna:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:229 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:222 msgctxt "@label" msgid "Theme:" msgstr "Styl:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Aby se tyto změny projevily, budete muset aplikaci restartovat." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:284 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Slicovat automaticky při změně nastavení." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 msgctxt "@option:check" msgid "Slice automatically" msgstr "Slicovat automaticky" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:306 msgctxt "@label" msgid "Viewport behavior" msgstr "Chování výřezu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:314 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Zvýraznit červeně místa modelu bez podpor. Bez podpor tyto místa nebudou správně vytisknuta." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:323 msgctxt "@option:check" msgid "Display overhang" msgstr "Zobrazit převis" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:351 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@info:tooltip" msgid "Highlight missing or extraneous surfaces of the model using warning signs. The toolpaths will often be missing parts of the intended geometry." msgstr "Zvýraznit chybějící nebo vedlejší povrchy modelu pomocí varovných značek. Dráhám nástrojů budou často chybět části zamýšlené geometrie." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:342 msgctxt "@option:check" msgid "Display model errors" msgstr "Zobrazovat chyby modelu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Při výběru modelu pohybuje kamerou tak, aby byl model ve středu pohledu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:373 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Vycentrovat kameru pokud je vybrána položka" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Mělo by být výchozí chování přiblížení u cury invertováno?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:388 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Obrátit směr přibližování kamery." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Mělo by se přibližování pohybovat ve směru myši?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "V pravoúhlé perspektivě není podporováno přiblížení směrem k myši." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:409 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Přiblížit směrem k směru myši" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:435 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:417 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Měly by se modely na platformě pohybovat tak, aby se již neprotínaly?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:440 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:422 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Zajistěte, aby modely byly odděleny" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:431 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Měly by být modely na platformě posunuty dolů tak, aby se dotýkaly podložky?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:436 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Automaticky přetáhnout modely na podložku" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:448 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Zobrazte v čtečce g-kódu varovnou zprávu." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:457 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Upozornění ve čtečce G-kódu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Měla by být vrstva vynucena do režimu kompatibility?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Vynutit režim kompatibility zobrazení vrstev (vyžaduje restart)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:498 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" msgstr "Měla by se Cura otevřít v místě, kde byla uzavřena?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:485 msgctxt "@option:check" msgid "Restore window position on start" msgstr "Při zapnutí obnovit pozici okna" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:513 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Jaký typ kamery by se měl použít?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:502 msgctxt "@window:text" msgid "Camera rendering:" msgstr "Vykreslování kamery:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:531 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:509 msgid "Perspective" msgstr "Perspektiva" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:532 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgid "Orthographic" msgstr "Ortografický" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:563 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:548 msgctxt "@label" msgid "Opening and saving files" msgstr "Otevírám a ukládám soubory" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:555 msgctxt "@info:tooltip" msgid "Should opening files from the desktop or external applications open in the same instance of Cura?" msgstr "Měli by se soubory z plochy, nebo externích aplikací otevírat ve stejné instanci Cury?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@option:check" msgid "Use a single instance of Cura" msgstr "Používat pouze jednu instanci programu Cura" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Měly by být modely upraveny na velikost podložky, pokud jsou příliš velké?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@option:check" msgid "Scale large models" msgstr "Škálovat velké modely" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Model se může jevit velmi malý, pokud je jeho jednotka například v metrech, nikoli v milimetrech. Měly by být tyto modely škálovány?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Škálovat extrémně malé modely" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Měly by být modely vybrány po načtení?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Vybrat modely po načtení" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Je třeba k názvu tiskové úlohy přidat předponu založenou na názvu tiskárny automaticky?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:635 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Přidat předponu zařízení před název úlohy" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:645 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Mělo by se při ukládání souboru projektu zobrazit souhrn?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:649 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:634 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Zobrazit souhrnný dialog při ukládání projektu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:659 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:644 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Výchozí chování při otevírání souboru" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:652 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Výchozí chování při otevření souboru s projektem: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Vždy se zeptat" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:682 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Vždy otevírat jako projekt" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:668 msgctxt "@option:openProject" msgid "Always import models" msgstr "Vždy importovat modely" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:705 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Pokud jste provedli změny v profilu a přepnuli na jiný, zobrazí se dialogové okno s dotazem, zda si přejete zachovat své modifikace nebo ne, nebo si můžete zvolit výchozí chování a už nikdy toto dialogové okno nezobrazovat." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:728 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Profily" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Výchozí chování pro změněné hodnoty nastavení při přepnutí na jiný profil: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:748 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:734 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Vždy smazat změněné nastavení" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:749 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:735 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Vždy přesunout nastavení do nového profilu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:783 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@label" msgid "Privacy" msgstr "Soukromí" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:790 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:777 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Měla by Cura zkontrolovat aktualizace při spuštění programu?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:795 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:782 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Zkontrolovat aktualizace při zapnutí" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:805 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:792 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Měla by být anonymní data o vašem tisku zaslána společnosti Ultimaker? Upozorňujeme, že nejsou odesílány ani ukládány žádné modely, adresy IP ani jiné osobní údaje." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:810 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:797 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Posílat (anonymní) informace o tisku" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:819 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:806 msgctxt "@action:button" msgid "More information" msgstr "Více informací" @@ -4542,55 +4624,65 @@ msgctxt "@action:button" msgid "Export" msgstr "Export" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 +msgctxt "@action:button Sending materials to printers" +msgid "Sync with Printers" +msgstr "Synchronizovat s tiskárnami" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" msgid "Printer" msgstr "Tiskárna" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:298 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Potvrdit odstranění" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:301 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Doopravdy chcete odstranit %1? Toto nelze vrátit zpět!" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 msgctxt "@title:window" msgid "Import Material" msgstr "Importovat materiál" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:338 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Nelze importovat materiál %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:328 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:342 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Úspěšně importován materiál %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:346 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 msgctxt "@title:window" msgid "Export Material" msgstr "Exportovat materiál" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:358 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:372 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Neúspěch při exportu materiálu do %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:378 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Úspěšné exportování materiálu do %1" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 +msgctxt "@title:window" +msgid "Export All Materials" +msgstr "Exportovat všechny materiály" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" @@ -4702,53 +4794,53 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Prosím uveďte jméno pro tento profil." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Duplikovat profil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@title:window" msgid "Rename Profile" msgstr "Přejmenovat profil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:307 msgctxt "@title:window" msgid "Import Profile" msgstr "Importovat profil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:336 msgctxt "@title:window" msgid "Export Profile" msgstr "Exportovat profil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:399 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Tiskárna: %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:557 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Aktualizovat profil s aktuálním nastavení/přepsánímy" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 msgctxt "@action:button" msgid "Discard current changes" msgstr "Zrušit aktuální změny" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:583 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Tento profil používá výchozí nastavení zadaná tiskárnou, takže nemá žádná nastavení / přepíše v níže uvedeném seznamu." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:591 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Vaše aktuální nastavení odpovídá vybranému profilu." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:609 msgctxt "@title:tab" msgid "Global Settings" msgstr "Globální nastavení" @@ -4778,12 +4870,12 @@ msgctxt "@title:column" msgid "Unit" msgstr "Jednotka" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:16 msgctxt "@title:tab" msgid "Setting Visibility" msgstr "Nastavení zobrazení" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:48 msgctxt "@label:textbox" msgid "Check all" msgstr "Zkontrolovat vše" @@ -5122,27 +5214,27 @@ msgctxt "@label:textbox" msgid "Search settings" msgstr "Prohledat nastavení" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:456 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:468 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Kopírovat hodnotu na všechny extrudery" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:477 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Kopírovat všechny změněné hodnoty na všechny extrudery" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:502 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:514 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Schovat toto nastavení" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:515 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:527 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Neukazovat toto nastavení" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:531 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Nechat toto nastavení viditelné" @@ -5160,7 +5252,7 @@ msgstr "Přední pohled" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/ViewOrientationControls.qml:53 msgctxt "@info:tooltip" msgid "Top View" -msgstr "Pohled ze shora" +msgstr "Pohled seshora" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/ViewOrientationControls.qml:66 msgctxt "@info:tooltip" @@ -5202,11 +5294,6 @@ msgctxt "@button" msgid "Add printer manually" msgstr "Přidat tiskárnu manuálně" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddCloudPrintersView.qml:218 -msgctxt "@button" -msgid "Finish" -msgstr "Dokončit" - #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:230 msgctxt "@label" msgid "Manufacturer" @@ -5225,7 +5312,7 @@ msgstr "Název tiskárny" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:274 msgctxt "@text" msgid "Please name your printer" -msgstr "" +msgstr "Pojmenujte prosím svou tiskárnu" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml:24 msgctxt "@label" @@ -5313,32 +5400,32 @@ msgctxt "@button" msgid "Connect" msgstr "Připojit" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:43 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" -msgid "Ultimaker Account" -msgstr "Účet Ultimaker" +msgid "Release Notes" +msgstr "Poznámky k vydání" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:124 msgctxt "@text" -msgid "Your key to connected 3D printing" -msgstr "Váš klíč k propojenému 3D tisku" +msgid "Add material settings and plugins from the Marketplace" +msgstr "Přidat nastavení materiálů a moduly z Obchodu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:101 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:154 msgctxt "@text" -msgid "- Customize your experience with more print profiles and plugins" -msgstr "- Přizpůsobte si své zážitky pomocí více profilů tisku a modulů" +msgid "Backup and sync your material settings and plugins" +msgstr "Zálohovat a synchronizovat nastavení materiálů a moduly" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:184 msgctxt "@text" -msgid "- Stay flexible by syncing your setup and loading it anywhere" -msgstr "- Zůstaňte flexibilní díky synchronizaci nastavení a přístupu k ní kdekoli" +msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" +msgstr "Sdílejte nápady a získejte pomoc od více než 48 0000 uživatelů v Ultimaker komunitě" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:217 msgctxt "@text" -msgid "- Increase efficiency with a remote workflow on Ultimaker printers" -msgstr "- Zvyšte efektivitu pomocí vzdáleného pracovního postupu na tiskárnách Ultimaker" +msgid "Create a free Ultimaker Account" +msgstr "Vytvořit účet Ultimaker zdarma" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:230 msgctxt "@button" msgid "Skip" msgstr "Přeskočit" @@ -5398,29 +5485,30 @@ msgctxt "@button" msgid "Decline and close" msgstr "Odmítnout a zavřít" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:29 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" msgid "Welcome to Ultimaker Cura" msgstr "Vítejte v Ultimaker Cura" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:68 msgctxt "@text" -msgid "" -"Please follow these steps to set up\n" -"Ultimaker Cura. This will only take a few moments." -msgstr "" -"Při nastavování postupujte podle těchto pokynů\n" -"Ultimaker Cura. Bude to trvat jen několik okamžiků." +msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." +msgstr "Při nastavování postupujte podle těchto pokynů Ultimaker Cura. Bude to trvat jen několik okamžiků." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:86 msgctxt "@button" msgid "Get started" msgstr "Začínáme" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:28 msgctxt "@label" -msgid "What's new in Ultimaker Cura" -msgstr "Co je nového v Ultimaker Cura" +msgid "What's New" +msgstr "Co je nového" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Widgets/ComboBox.qml:24 +msgctxt "@label" +msgid "No items to select from" +msgstr "Není z čeho vybírat" #: ModelChecker/plugin.json msgctxt "description" @@ -5502,6 +5590,16 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Zapisovač Cura profilu" +#: DigitalLibrary/plugin.json +msgctxt "description" +msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." +msgstr "Připojuje k Digitální knihovně. Umožňuje Cuře otevírat a ukládat soubory z a do Digitální knihovny." + +#: DigitalLibrary/plugin.json +msgctxt "name" +msgid "Ultimaker Digital Library" +msgstr "Digitální knihovna Ultimaker" + #: FirmwareUpdateChecker/plugin.json msgctxt "description" msgid "Checks for firmware updates." @@ -5965,12 +6063,32 @@ msgstr "Aktualizace verze 4.6.2 na 4.7" #: VersionUpgrade/VersionUpgrade47to48/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.7 to Cura 4.8." -msgstr "" +msgstr "Aktualizuje konfigurace z Cura 4.7 na Cura 4.8." #: VersionUpgrade/VersionUpgrade47to48/plugin.json msgctxt "name" msgid "Version Upgrade 4.7 to 4.8" -msgstr "" +msgstr "Aktualizace verze 4.7 na 4.8" + +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." +msgstr "Aktualizuje konfigurace z Cura 4.8 na Cura 4.9." + +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.8 to 4.9" +msgstr "Aktualizace verze 4.8 na 4.9" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." +msgstr "Aktualizuje konfigurace z Cura 4.9 na Cura 4.10." + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.9 to 4.10" +msgstr "Aktualizace verze 4.9 na 4.10" #: X3DReader/plugin.json msgctxt "description" @@ -6002,6 +6120,97 @@ msgctxt "name" msgid "X-Ray View" msgstr "Rentgenový pohled" +#~ msgctxt "@info:status" +#~ msgid "Global stack is missing." +#~ msgstr "Chybí globální zásobník." + +#~ msgctxt "@info:status" +#~ msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." +#~ msgstr "Váš model není rozmanitý. Zvýrazněné oblasti indikují buď chybějící, či vedlejší povrch." + +#~ msgctxt "@info:title" +#~ msgid "Model errors" +#~ msgstr "Chyby modelu" + +#~ msgctxt "@label:listbox" +#~ msgid "Layer thickness" +#~ msgstr "Tloušťka vrstvy" + +#~ msgctxt "@label" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "Váš klíč k propojenému 3D tisku" + +#~ msgctxt "@text" +#~ msgid "" +#~ "- Customize your experience with more print profiles and plugins\n" +#~ "- Stay flexible by syncing your setup and loading it anywhere\n" +#~ "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "" +#~ "- Přizpůsobte si své zážitky pomocí více profilů tisku a modulů\n" +#~ "- Zůstaňte flexibilní díky synchronizaci nastavení a přístupu k ní kdekoli\n" +#~ "- Zvyšte efektivitu pomocí vzdáleného pracovního postupu na tiskárnách Ultimaker" + +#~ msgctxt "@button" +#~ msgid "Create account" +#~ msgstr "Vytvořit účet" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Delete Selected Model" +#~ msgid_plural "Delete Selected Models" +#~ msgstr[0] "Smazat vybraný model" +#~ msgstr[1] "Smazat vybrané modely" +#~ msgstr[2] "Smazat vybrané modely" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Center Selected Model" +#~ msgid_plural "Center Selected Models" +#~ msgstr[0] "Centrovat vybraný model" +#~ msgstr[1] "Centrovat vybrané modely" +#~ msgstr[2] "Centrovat vybrané modely" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Multiply Selected Model" +#~ msgid_plural "Multiply Selected Models" +#~ msgstr[0] "Násobit vybraný model" +#~ msgstr[1] "Násobit vybrané modely" +#~ msgstr[2] "Násobit vybrané modely" + +#~ msgctxt "@button" +#~ msgid "Finish" +#~ msgstr "Dokončit" + +#~ msgctxt "@label" +#~ msgid "Ultimaker Account" +#~ msgstr "Účet Ultimaker" + +#~ msgctxt "@text" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "Váš klíč k propojenému 3D tisku" + +#~ msgctxt "@text" +#~ msgid "- Customize your experience with more print profiles and plugins" +#~ msgstr "- Přizpůsobte si své zážitky pomocí více profilů tisku a modulů" + +#~ msgctxt "@text" +#~ msgid "- Stay flexible by syncing your setup and loading it anywhere" +#~ msgstr "- Zůstaňte flexibilní díky synchronizaci nastavení a přístupu k ní kdekoli" + +#~ msgctxt "@text" +#~ msgid "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "- Zvyšte efektivitu pomocí vzdáleného pracovního postupu na tiskárnách Ultimaker" + +#~ msgctxt "@text" +#~ msgid "" +#~ "Please follow these steps to set up\n" +#~ "Ultimaker Cura. This will only take a few moments." +#~ msgstr "" +#~ "Při nastavování postupujte podle těchto pokynů\n" +#~ "Ultimaker Cura. Bude to trvat jen několik okamžiků." + +#~ msgctxt "@label" +#~ msgid "What's new in Ultimaker Cura" +#~ msgstr "Co je nového v Ultimaker Cura" + #~ msgctxt "@label ({} is object name)" #~ msgid "Are you sure you wish to remove {}? This cannot be undone!" #~ msgstr "Doopravdy chcete odstranit {}? Toto nelze vrátit zpět!" diff --git a/resources/i18n/cs_CZ/fdmextruder.def.json.po b/resources/i18n/cs_CZ/fdmextruder.def.json.po index 03847d2514..e2833ba4c3 100644 --- a/resources/i18n/cs_CZ/fdmextruder.def.json.po +++ b/resources/i18n/cs_CZ/fdmextruder.def.json.po @@ -1,13 +1,13 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2020. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" "PO-Revision-Date: 2020-02-20 17:30+0100\n" "Last-Translator: DenyCZ \n" "Language-Team: DenyCZ \n" diff --git a/resources/i18n/cs_CZ/fdmprinter.def.json.po b/resources/i18n/cs_CZ/fdmprinter.def.json.po index 7dd0b5d797..fca828a2a6 100644 --- a/resources/i18n/cs_CZ/fdmprinter.def.json.po +++ b/resources/i18n/cs_CZ/fdmprinter.def.json.po @@ -1,21 +1,21 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # Ruben Dulek , 2020. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2020-08-04 12:40+0200\n" -"Last-Translator: DenyCZ \n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-04 19:37+0200\n" +"Last-Translator: Miroslav Šustek \n" "Language-Team: DenyCZ \n" "Language: cs_CZ\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.3\n" +"X-Generator: Poedit 2.4.2\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -418,6 +418,26 @@ msgctxt "machine_extruders_share_heater description" msgid "Whether the extruders share a single heater rather than each extruder having its own heater." msgstr "Zda extrudéry sdílejí jeden ohřívač spíše než každý extrudér mající svůj vlastní ohřívač." +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle label" +msgid "Extruders Share Nozzle" +msgstr "Extrudery sdílí trysku" + +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle description" +msgid "Whether the extruders share a single nozzle rather than each extruder having its own nozzle. When set to true, it is expected that the printer-start gcode script properly sets up all extruders in an initial retraction state that is known and mutually compatible (either zero or one filament not retracted); in that case the initial retraction status is described, per extruder, by the 'machine_extruders_shared_nozzle_initial_retraction' parameter." +msgstr "Určuje, zda extrudery sdílí jednu trysku namísto, aby měl každý extruder svou vlastní trysku. Pokud je zvoleno, předpokládá se, že počáteční G kód tiskárny správně nastaví všechny extrudery do známého stavu, který je vzájemně kompatibilní (všechny filamenty jsou zatažené nebo jen jeden je nezatažený). V tomto případě je počáteční stav zatažení určen pro každý extruder parametrem 'machine_extruders_shared_nozzle_initial_retraction'." + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction label" +msgid "Shared Nozzle Initial Retraction" +msgstr "Počáteční retrakce sdílené trysky" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction description" +msgid "How much the filament of each extruder is assumed to have been retracted from the shared nozzle tip at the completion of the printer-start gcode script; the value should be equal to or greater than the length of the common part of the nozzle's ducts." +msgstr "Jak daleko je zatažen filament každého extruderu sdílené trysky po dokončení počátečního G kódu tiskárny. Tato hodnota by se měla rovnat nebo být vyšší než je délka společné části vedení trysky." + #: fdmprinter.def.json msgctxt "machine_disallowed_areas label" msgid "Disallowed Areas" @@ -485,8 +505,8 @@ msgstr "Offset s extrudérem" #: fdmprinter.def.json msgctxt "machine_use_extruder_offset_to_offset_coords description" -msgid "Apply the extruder offset to the coordinate system." -msgstr "Naneste odsazení extrudéru na souřadnicový systém." +msgid "Apply the extruder offset to the coordinate system. Affects all extruders." +msgstr "Použít offset extruderu v souřadnicovém systému. Ovlivňuje všechny extrudery." #: fdmprinter.def.json msgctxt "extruder_prime_pos_z label" @@ -880,8 +900,8 @@ msgstr "Násobitel šířky čáry v první vrstvě. Jejich zvýšení by mohlo #: fdmprinter.def.json msgctxt "shell label" -msgid "Shell" -msgstr "Shell" +msgid "Walls" +msgstr "Stěny" #: fdmprinter.def.json msgctxt "shell description" @@ -948,166 +968,6 @@ msgctxt "wall_0_wipe_dist description" msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better." msgstr "Vzdálenost pohybového posunu vloženého za vnější stěnu, aby se skryla Z šev lépe." -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr label" -msgid "Top Surface Skin Extruder" -msgstr "Nejvyšší povrchový extrudér" - -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr description" -msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." -msgstr "Vytlačovací stroj používaný pro tisk nejvyššího povrchu. To se používá při vícenásobném vytlačování." - -#: fdmprinter.def.json -msgctxt "roofing_layer_count label" -msgid "Top Surface Skin Layers" -msgstr "Nejvyšší povrchová vrstva" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count description" -msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." -msgstr "Počet nejpřednějších vrstev pokožky. Obvykle stačí jedna horní vrstva nejvíce k vytvoření horních povrchů vyšší kvality." - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr label" -msgid "Top/Bottom Extruder" -msgstr "Vrchní/spodní extruder" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr description" -msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." -msgstr "Vytlačovací souprava použitá pro tisk horní a spodní pokožky. To se používá při vícenásobném vytlačování." - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness label" -msgid "Top/Bottom Thickness" -msgstr "Vrchní/spodní tloušťka" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness description" -msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." -msgstr "Tloušťka horní / dolní vrstvy v tisku. Tato hodnota dělená výškou vrstvy definuje počet vrstev horní / dolní." - -#: fdmprinter.def.json -msgctxt "top_thickness label" -msgid "Top Thickness" -msgstr "Vrchní tloušťka" - -#: fdmprinter.def.json -msgctxt "top_thickness description" -msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." -msgstr "Tloušťka horních vrstev v tisku. Tato hodnota dělená výškou vrstvy definuje počet vrchních vrstev." - -#: fdmprinter.def.json -msgctxt "top_layers label" -msgid "Top Layers" -msgstr "Vrchní vrstvy" - -#: fdmprinter.def.json -msgctxt "top_layers description" -msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." -msgstr "Počet vrchních vrstev. Při výpočtu podle nejvyšší tloušťky se tato hodnota zaokrouhlí na celé číslo." - -#: fdmprinter.def.json -msgctxt "bottom_thickness label" -msgid "Bottom Thickness" -msgstr "Spodní tloušťka" - -#: fdmprinter.def.json -msgctxt "bottom_thickness description" -msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." -msgstr "Tloušťka spodních vrstev v tisku. Tato hodnota dělená výškou vrstvy definuje počet spodních vrstev." - -#: fdmprinter.def.json -msgctxt "bottom_layers label" -msgid "Bottom Layers" -msgstr "Spodní vrstvy" - -#: fdmprinter.def.json -msgctxt "bottom_layers description" -msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "Počet spodních vrstev. Při výpočtu podle tloušťky dna je tato hodnota zaokrouhlena na celé číslo." - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers label" -msgid "Initial Bottom Layers" -msgstr "Počáteční spodní vrstvy" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers description" -msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "Počet počátečních spodních vrstev od montážní desky směrem nahoru. Při výpočtu podle tloušťky dna je tato hodnota zaokrouhlena na celé číslo." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern label" -msgid "Top/Bottom Pattern" -msgstr "Vrchní/spodní vzor" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern description" -msgid "The pattern of the top/bottom layers." -msgstr "Vzor horní / dolní vrstvy." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option lines" -msgid "Lines" -msgstr "Čáry" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option concentric" -msgid "Concentric" -msgstr "Soustředný" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option zigzag" -msgid "Zig Zag" -msgstr "Zig Zag" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 label" -msgid "Bottom Pattern Initial Layer" -msgstr "Vzor spodní počáteční vrstvy" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 description" -msgid "The pattern on the bottom of the print on the first layer." -msgstr "Vzor ve spodní části tisku na první vrstvě." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option lines" -msgid "Lines" -msgstr "Čáry" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option concentric" -msgid "Concentric" -msgstr "Soustředný" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option zigzag" -msgid "Zig Zag" -msgstr "Zig Zag" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons label" -msgid "Connect Top/Bottom Polygons" -msgstr "Připojte horní / dolní polygony" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." -msgstr "Propojte horní / dolní povrchové cesty tam, kde běží vedle sebe. Pro soustředné uspořádání umožňující toto nastavení výrazně zkracuje dobu cestování, ale protože se spojení může uskutečnit uprostřed výplně, může tato funkce snížit kvalitu povrchu." - -#: fdmprinter.def.json -msgctxt "skin_angles label" -msgid "Top/Bottom Line Directions" -msgstr "Pokyny pro horní a dolní řádek" - -#: fdmprinter.def.json -msgctxt "skin_angles description" -msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." -msgstr "Seznam směrů celočíselných čar, které se použijí, když horní / dolní vrstvy používají čáry nebo vzor zig zag. Prvky ze seznamu se používají postupně jako vrstvy a jakmile je dosaženo konce seznamu, začíná znovu na začátku. Položky seznamu jsou odděleny čárkami a celý seznam je obsažen v hranatých závorkách. Výchozí je prázdný seznam, což znamená použití tradičních výchozích úhlů (45 a 135 stupňů)." - #: fdmprinter.def.json msgctxt "wall_0_inset label" msgid "Outer Wall Inset" @@ -1413,6 +1273,176 @@ msgctxt "z_seam_relative description" msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate." msgstr "Pokud je tato možnost povolena, jsou souřadnice z švu vztaženy ke středu každé součásti. Pokud je zakázána, souřadnice definují absolutní polohu na sestavovací desce." +#: fdmprinter.def.json +msgctxt "top_bottom label" +msgid "Top/Bottom" +msgstr "Vrch/spodek" + +#: fdmprinter.def.json +msgctxt "top_bottom description" +msgid "Top/Bottom" +msgstr "Vrch/spodek" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr label" +msgid "Top Surface Skin Extruder" +msgstr "Nejvyšší povrchový extrudér" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr description" +msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." +msgstr "Vytlačovací stroj používaný pro tisk nejvyššího povrchu. To se používá při vícenásobném vytlačování." + +#: fdmprinter.def.json +msgctxt "roofing_layer_count label" +msgid "Top Surface Skin Layers" +msgstr "Nejvyšší povrchová vrstva" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count description" +msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." +msgstr "Počet nejpřednějších vrstev pokožky. Obvykle stačí jedna horní vrstva nejvíce k vytvoření horních povrchů vyšší kvality." + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr label" +msgid "Top/Bottom Extruder" +msgstr "Vrchní/spodní extruder" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr description" +msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." +msgstr "Vytlačovací souprava použitá pro tisk horní a spodní pokožky. To se používá při vícenásobném vytlačování." + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness label" +msgid "Top/Bottom Thickness" +msgstr "Vrchní/spodní tloušťka" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness description" +msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." +msgstr "Tloušťka horní / dolní vrstvy v tisku. Tato hodnota dělená výškou vrstvy definuje počet vrstev horní / dolní." + +#: fdmprinter.def.json +msgctxt "top_thickness label" +msgid "Top Thickness" +msgstr "Vrchní tloušťka" + +#: fdmprinter.def.json +msgctxt "top_thickness description" +msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." +msgstr "Tloušťka horních vrstev v tisku. Tato hodnota dělená výškou vrstvy definuje počet vrchních vrstev." + +#: fdmprinter.def.json +msgctxt "top_layers label" +msgid "Top Layers" +msgstr "Vrchní vrstvy" + +#: fdmprinter.def.json +msgctxt "top_layers description" +msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." +msgstr "Počet vrchních vrstev. Při výpočtu podle nejvyšší tloušťky se tato hodnota zaokrouhlí na celé číslo." + +#: fdmprinter.def.json +msgctxt "bottom_thickness label" +msgid "Bottom Thickness" +msgstr "Spodní tloušťka" + +#: fdmprinter.def.json +msgctxt "bottom_thickness description" +msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." +msgstr "Tloušťka spodních vrstev v tisku. Tato hodnota dělená výškou vrstvy definuje počet spodních vrstev." + +#: fdmprinter.def.json +msgctxt "bottom_layers label" +msgid "Bottom Layers" +msgstr "Spodní vrstvy" + +#: fdmprinter.def.json +msgctxt "bottom_layers description" +msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "Počet spodních vrstev. Při výpočtu podle tloušťky dna je tato hodnota zaokrouhlena na celé číslo." + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "Počáteční spodní vrstvy" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "Počet počátečních spodních vrstev od montážní desky směrem nahoru. Při výpočtu podle tloušťky dna je tato hodnota zaokrouhlena na celé číslo." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern label" +msgid "Top/Bottom Pattern" +msgstr "Vrchní/spodní vzor" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern description" +msgid "The pattern of the top/bottom layers." +msgstr "Vzor horní / dolní vrstvy." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option lines" +msgid "Lines" +msgstr "Čáry" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option concentric" +msgid "Concentric" +msgstr "Soustředný" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option zigzag" +msgid "Zig Zag" +msgstr "Zig Zag" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 label" +msgid "Bottom Pattern Initial Layer" +msgstr "Vzor spodní počáteční vrstvy" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 description" +msgid "The pattern on the bottom of the print on the first layer." +msgstr "Vzor ve spodní části tisku na první vrstvě." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option lines" +msgid "Lines" +msgstr "Čáry" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option concentric" +msgid "Concentric" +msgstr "Soustředný" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option zigzag" +msgid "Zig Zag" +msgstr "Zig Zag" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons label" +msgid "Connect Top/Bottom Polygons" +msgstr "Připojte horní / dolní polygony" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons description" +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "Propojte horní / dolní povrchové cesty tam, kde běží vedle sebe. Pro soustředné uspořádání umožňující toto nastavení výrazně zkracuje dobu cestování, ale protože se spojení může uskutečnit uprostřed výplně, může tato funkce snížit kvalitu povrchu." + +#: fdmprinter.def.json +msgctxt "skin_angles label" +msgid "Top/Bottom Line Directions" +msgstr "Pokyny pro horní a dolní řádek" + +#: fdmprinter.def.json +msgctxt "skin_angles description" +msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." +msgstr "Seznam směrů celočíselných čar, které se použijí, když horní / dolní vrstvy používají čáry nebo vzor zig zag. Prvky ze seznamu se používají postupně jako vrstvy a jakmile je dosaženo konce seznamu, začíná znovu na začátku. Položky seznamu jsou odděleny čárkami a celý seznam je obsažen v hranatých závorkách. Výchozí je prázdný seznam, což znamená použití tradičních výchozích úhlů (45 a 135 stupňů)." + #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" msgid "No Skin in Z Gaps" @@ -1553,6 +1583,86 @@ msgctxt "skin_overlap_mm description" msgid "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any value over half the width of the wall may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall." msgstr "Upravte míru překrytí mezi stěnami a (koncovými body) osami porvchu. Mírné překrytí umožňuje, aby se stěny pevně spojily s povrchem. Je třeba si uvědomit, že při stejné šířce linie povrchu a stěny může jakákoli hodnota přesahující polovinu šířky stěny již způsobit, že jakýkoli povrch projde kolem zdi, protože v tomto bodě může pozice trysky extruderu povrchu již dosáhnout. kolem středu zdi." +#: fdmprinter.def.json +msgctxt "skin_preshrink label" +msgid "Skin Removal Width" +msgstr "Šířka odstranění povrchu" + +#: fdmprinter.def.json +msgctxt "skin_preshrink description" +msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." +msgstr "Největší šířka oblastí povrchu, které mají být odstraněny. Každá oblast povrchu menší než tato hodnota zmizí. To může pomoci omezit množství času a materiálu stráveného tiskem vrchní / spodní kůže na šikmých plochách v modelu." + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink label" +msgid "Top Skin Removal Width" +msgstr "Horní šířka odstranění povrchu" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink description" +msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." +msgstr "Největší šířka horních oblastí povrchu, které mají být odstraněny. Každá oblast povrchu menší než tato hodnota zmizí. To může pomoci omezit množství času a materiálu stráveného tiskem vrchní kůže na šikmých plochách v modelu." + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink label" +msgid "Bottom Skin Removal Width" +msgstr "Dolní šířka odstranění povrchu" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink description" +msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." +msgstr "Největší šířka spodních částí povrchu, které mají být odstraněny. Každá oblast povrchu menší než tato hodnota zmizí. To může pomoci omezit množství času a materiálu stráveného tiskem spodní vrstvy na šikmých plochách v modelu." + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance label" +msgid "Skin Expand Distance" +msgstr "Vzdálenost rozšíření povrchu" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance description" +msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." +msgstr "Vzdálenost povrchu je rozšířena do výplně. Vyšší hodnoty umožňují lepší přilnavost povrchu k vzoru výplně a díky tomu lepí přilnavost stěn na sousedních vrstvách k povrchu. Nižší hodnoty šetří množství použitého materiálu." + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance label" +msgid "Top Skin Expand Distance" +msgstr "Horní vzdálenost rozšíření povrchu" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance description" +msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." +msgstr "Vzdálenost, ve které jsou vrchní vrstvy povrchu rozšířeny do výplně. Vyšší hodnoty umožňují lepší přilnavost povrchu k vzoru výplně a lepší přilnutí stěn nad vrstvou k povrchu. Nižší hodnoty šetří množství použitého materiálu." + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance label" +msgid "Bottom Skin Expand Distance" +msgstr "Dolní vzdálenost rozšíření povrchu" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance description" +msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." +msgstr "Vzdálenost spodního povrchu, který se rozšiřuje do výplně. Vyšší hodnoty umožňují lepší přilnavost povrchu k vzoru výplně a lepší přilnavost povrchu ke stěnám na spodní vrstvě. Nižší hodnoty šetří množství použitého materiálu." + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion label" +msgid "Maximum Skin Angle for Expansion" +msgstr "Maximální úhel pro rozšíření povrchu" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion description" +msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded." +msgstr "Horní a/nebo dolní povrchy objektu s větším úhlem, než je toto nastavení, nebudou mít své horní/spodní povrchy rozšířeny. Tím se zabrání rozšíření úzkých oblastí, které jsou vytvořeny, když má povrch modelu téměř svislý sklon. Úhel 0° je vodorovný a způsobí, že žádný povrch nebude rozšířen, zatímco úhel 90° je svislý a způsobí, že všechny povrchy budou rozšířeny." + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion label" +msgid "Minimum Skin Width for Expansion" +msgstr "Minimální úhel pro rozšíření povrchu" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion description" +msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." +msgstr "Oblasti povrchu užší, než je tento, nejsou rozšířeny. Tím se zabrání rozšíření úzkých oblastí vzhledu, které jsou vytvořeny, když má povrch modelu sklon v blízkosti svislé." + #: fdmprinter.def.json msgctxt "infill label" msgid "Infill" @@ -1862,86 +1972,6 @@ msgctxt "infill_support_angle description" msgid "The minimum angle of internal overhangs for which infill is added. At a value of 0° objects are totally filled with infill, 90° will not provide any infill." msgstr "Minimální úhel vnitřních přesahů, pro které je přidána výplň. Při hodnotě 0 ° jsou objekty zcela vyplněny výplní, 90 ° neposkytuje výplně." -#: fdmprinter.def.json -msgctxt "skin_preshrink label" -msgid "Skin Removal Width" -msgstr "Šířka odstranění povrchu" - -#: fdmprinter.def.json -msgctxt "skin_preshrink description" -msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." -msgstr "Největší šířka oblastí povrchu, které mají být odstraněny. Každá oblast povrchu menší než tato hodnota zmizí. To může pomoci omezit množství času a materiálu stráveného tiskem vrchní / spodní kůže na šikmých plochách v modelu." - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink label" -msgid "Top Skin Removal Width" -msgstr "Horní šířka odstranění povrchu" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink description" -msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." -msgstr "Největší šířka horních oblastí povrchu, které mají být odstraněny. Každá oblast povrchu menší než tato hodnota zmizí. To může pomoci omezit množství času a materiálu stráveného tiskem vrchní kůže na šikmých plochách v modelu." - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink label" -msgid "Bottom Skin Removal Width" -msgstr "Dolní šířka odstranění povrchu" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink description" -msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." -msgstr "Největší šířka spodních částí povrchu, které mají být odstraněny. Každá oblast povrchu menší než tato hodnota zmizí. To může pomoci omezit množství času a materiálu stráveného tiskem spodní vrstvy na šikmých plochách v modelu." - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance label" -msgid "Skin Expand Distance" -msgstr "Vzdálenost rozšíření povrchu" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance description" -msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." -msgstr "Vzdálenost povrchu je rozšířena do výplně. Vyšší hodnoty umožňují lepší přilnavost povrchu k vzoru výplně a díky tomu lepí přilnavost stěn na sousedních vrstvách k povrchu. Nižší hodnoty šetří množství použitého materiálu." - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance label" -msgid "Top Skin Expand Distance" -msgstr "Horní vzdálenost rozšíření povrchu" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance description" -msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." -msgstr "Vzdálenost, ve které jsou vrchní vrstvy povrchu rozšířeny do výplně. Vyšší hodnoty umožňují lepší přilnavost povrchu k vzoru výplně a lepší přilnutí stěn nad vrstvou k povrchu. Nižší hodnoty šetří množství použitého materiálu." - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance label" -msgid "Bottom Skin Expand Distance" -msgstr "Dolní vzdálenost rozšíření povrchu" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance description" -msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." -msgstr "Vzdálenost spodního povrchu, který se rozšiřuje do výplně. Vyšší hodnoty umožňují lepší přilnavost povrchu k vzoru výplně a lepší přilnavost povrchu ke stěnám na spodní vrstvě. Nižší hodnoty šetří množství použitého materiálu." - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion label" -msgid "Maximum Skin Angle for Expansion" -msgstr "Maximální úhel pro rozšíření povrchu" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion description" -msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." -msgstr "Horní a/nebo dolní povrch objektu s větším úhlem, než je toto nastavení, nebudou mít rozbalenou horní/dolní plochu. Tím se zabrání rozšíření úzkých oblastí vzhledu, které jsou vytvořeny, když má povrch modelu téměř svislý sklon. Úhel 0° je vodorovný, zatímco úhel 90° je svislý." - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion label" -msgid "Minimum Skin Width for Expansion" -msgstr "Minimální úhel pro rozšíření povrchu" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion description" -msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." -msgstr "Oblasti povrchu užší, než je tento, nejsou rozšířeny. Tím se zabrání rozšíření úzkých oblastí vzhledu, které jsou vytvořeny, když má povrch modelu sklon v blízkosti svislé." - #: fdmprinter.def.json msgctxt "skin_edge_support_thickness label" msgid "Skin Edge Support Thickness" @@ -2060,7 +2090,7 @@ msgstr "Teplota podložky" #: fdmprinter.def.json msgctxt "material_bed_temperature description" msgid "The temperature used for the heated build plate. If this is 0, the build plate is left unheated." -msgstr "" +msgstr "Teplota použitá pro vyhřívanou podložku. Pokud je to 0, podložka se vyhřívat nebude." #: fdmprinter.def.json msgctxt "material_bed_temperature_layer_0 label" @@ -2070,7 +2100,7 @@ msgstr "Teplota podložky při počáteční vrstvě" #: fdmprinter.def.json msgctxt "material_bed_temperature_layer_0 description" msgid "The temperature used for the heated build plate at the first layer. If this is 0, the build plate is left unheated during the first layer." -msgstr "" +msgstr "Teplota použitá pro vyhřívanou podložku při první vrstvě. Pokud je to 0, podložka se při první vrstvě vyhřívat nebude." #: fdmprinter.def.json msgctxt "material_adhesion_tendency label" @@ -2095,12 +2125,12 @@ msgstr "Povrchová energie." #: fdmprinter.def.json msgctxt "material_shrinkage_percentage label" msgid "Scaling Factor Shrinkage Compensation" -msgstr "" +msgstr "Faktor zvětšení pro kompenzaci smrštění" #: fdmprinter.def.json msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." -msgstr "" +msgstr "Model bude zvětšen tímto faktorem, aby bylo kompenzováno smrštění materiálu po vychladnutí." #: fdmprinter.def.json msgctxt "material_crystallinity label" @@ -2559,8 +2589,8 @@ msgstr "Rychlost prvotní vrstvy" #: fdmprinter.def.json msgctxt "speed_layer_0 description" -msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." -msgstr "Rychlost počáteční vrstvy. Doporučuje se nižší hodnota pro zlepšení přilnavosti k montážní desce." +msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate. Does not affect the build plate adhesion structures themselves, like brim and raft." +msgstr "Rychlost počáteční vrstvy. Doporučuje se nižší hodnota pro zlepšení přilnavosti k montážní desce. Nemá vliv na samotné struktury pro přilnavost k podložce (např. límec a raft)." #: fdmprinter.def.json msgctxt "speed_print_layer_0 label" @@ -3169,8 +3199,8 @@ msgstr "Maximální vzdálenost Combing-u bez retrakce" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" -msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." -msgstr "Pokud nenulové, pohyby combingového pohybu, které jsou delší než tato vzdálenost, použijí zatažení." +msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." +msgstr "Pokud je větší než nula, combingové pohyby delší než tato vzdálenost budou používat retrakci. Nula znamená, že se při combingových pohybech retrakce provádět nebudou." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" @@ -5069,12 +5099,12 @@ msgstr "Pomocí této mřížky můžete upravit výplň dalších sítí, s nim #: fdmprinter.def.json msgctxt "infill_mesh_order label" msgid "Mesh Processing Rank" -msgstr "Úroveň Zpracování Masky" +msgstr "Pořadí zpracování sítě" #: fdmprinter.def.json msgctxt "infill_mesh_order description" -msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." -msgstr "" +msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the highest rank. An infill mesh with a higher rank will modify the infill of infill meshes with lower rank and normal meshes." +msgstr "Určuje prioritu této sítě, když se překrývá více sítí výplně. U oblastí, kde se překrývá více sítí výplně, se nastavení přebírá ze sítě s nejvyšším pořadím. Síť výplně s vyšším pořadím bude modifikovat výplň sítě výplně s nižším pořadím a běžné sítě." #: fdmprinter.def.json msgctxt "cutting_mesh label" @@ -5204,7 +5234,7 @@ msgstr "Použijte spíše relativní extruzi než absolutní extruzi. Použití #: fdmprinter.def.json msgctxt "experimental label" msgid "Experimental" -msgstr "Experimentálí" +msgstr "Experimentální" #: fdmprinter.def.json msgctxt "experimental description" @@ -5421,6 +5451,16 @@ msgctxt "conical_overhang_angle description" msgid "The maximum angle of overhangs after the they have been made printable. At a value of 0° all overhangs are replaced by a piece of model connected to the build plate, 90° will not change the model in any way." msgstr "Maximální úhel přesahů po jejich tisku. Při hodnotě 0 ° jsou všechny převisy nahrazeny kusem modelu připojeným k podložce, 90 ° model nijak nijak nezmění." +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size label" +msgid "Maximum Overhang Hole Area" +msgstr "Maximální plocha díry pod převisem" + +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size description" +msgid "The maximum area of a hole in the base of the model before it's removed by Make Overhang Printable. Holes smaller than this will be retained. A value of 0 mm² will fill all holes in the models base." +msgstr "Maximální plocha díry v základně modelu, která nebude odstraněna funkcí „Udělat převis tisknutelný“. Menší díry budou zachovány. Hodnota 0 mm² způsobí vyplnění všech děr v základně modelu." + #: fdmprinter.def.json msgctxt "coasting_enable label" msgid "Enable Coasting" @@ -6360,6 +6400,30 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Transformační matice, která se použije na model při načítání ze souboru." +#~ msgctxt "retraction_combing_max_distance description" +#~ msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." +#~ msgstr "Pokud nenulové, pohyby combingového pohybu, které jsou delší než tato vzdálenost, použijí zatažení." + +#~ msgctxt "infill_mesh_order description" +#~ msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." +#~ msgstr "Určuje prioritu této sítě, když se překrývá více sítí výplně. U oblastí, kde se překrývá více sítí výplně, se nastavení přebírá ze sítě s nejnižším pořadím. Síť výplně s vyšším pořadím bude modifikovat výplň sítě výplně s nižším pořadím a běžné sítě." + +#~ msgctxt "machine_use_extruder_offset_to_offset_coords description" +#~ msgid "Apply the extruder offset to the coordinate system." +#~ msgstr "Naneste odsazení extrudéru na souřadnicový systém." + +#~ msgctxt "shell label" +#~ msgid "Shell" +#~ msgstr "Shell" + +#~ msgctxt "max_skin_angle_for_expansion description" +#~ msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." +#~ msgstr "Horní a/nebo dolní povrch objektu s větším úhlem, než je toto nastavení, nebudou mít rozbalenou horní/dolní plochu. Tím se zabrání rozšíření úzkých oblastí vzhledu, které jsou vytvořeny, když má povrch modelu téměř svislý sklon. Úhel 0° je vodorovný, zatímco úhel 90° je svislý." + +#~ msgctxt "speed_layer_0 description" +#~ msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." +#~ msgstr "Rychlost počáteční vrstvy. Doporučuje se nižší hodnota pro zlepšení přilnavosti k montážní desce." + #~ msgctxt "material_bed_temperature description" #~ msgid "The temperature used for the heated build plate. If this is 0, the bed temperature will not be adjusted." #~ msgstr "Teplota použitá pro vyhřívanou podložku. Pokud je to 0, teplota podložky nebude upravena." diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index f2ef969f37..07459f1da2 100644 --- a/resources/i18n/cura.pot +++ b/resources/i18n/cura.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,7 +21,7 @@ msgstr "" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1581 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 msgctxt "@label" @@ -99,12 +99,12 @@ msgid "" "validation with the intent of significant print time reduction." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:226 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:234 msgctxt "@label" msgid "Custom Material" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:227 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 msgctxt "@label" msgid "Custom" @@ -126,7 +126,7 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:178 +#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:181 msgctxt "@info:title" msgid "Login failed" msgstr "" @@ -156,28 +156,33 @@ msgctxt "@info:title" msgid "Can't Find Location" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:104 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:116 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:110 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 msgctxt "@info:title" msgid "Backup" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:123 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:135 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:134 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:146 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that is higher than the current version." msgstr "" +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 +msgctxt "@info:backup_failed" +msgid "The following error occurred while trying to restore a Cura backup:" +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" msgid "" @@ -328,47 +333,47 @@ msgctxt "@action:button" msgid "Send report" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:521 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:527 msgctxt "@info:progress" msgid "Loading machines..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:528 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:534 msgctxt "@info:progress" msgid "Setting up preferences..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:657 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:672 msgctxt "@info:progress" msgid "Initializing Active Machine..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:803 msgctxt "@info:progress" msgid "Initializing machine manager..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:802 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:817 msgctxt "@info:progress" msgid "Initializing build volume..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:870 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:888 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:906 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:924 msgctxt "@info:progress" msgid "Loading interface..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:911 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:929 msgctxt "@info:progress" msgid "Initializing engine..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1221 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1246 #, python-format msgctxt "" "@info 'width', 'depth' and 'height' are variable names that must NOT be " @@ -376,28 +381,28 @@ msgctxt "" msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1777 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1799 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1778 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:188 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 msgctxt "@info:title" msgid "Warning" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1787 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1809 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 @@ -420,7 +425,7 @@ msgctxt "@info:title" msgid "Placing Object" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:92 msgctxt "@message" msgid "Could not read response." msgstr "" @@ -440,14 +445,14 @@ msgctxt "@message" msgid "Something unexpected happened when trying to log in, please try again." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:187 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:189 msgctxt "@info" msgid "" "Unable to start a new sign in process. Check if another sign in attempt is " "still active." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "" @@ -467,8 +472,8 @@ msgid "" "overwrite it?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:452 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:455 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "" @@ -557,27 +562,27 @@ msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:423 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:426 msgctxt "@label" msgid "Custom profile" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:439 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:442 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:443 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:446 msgctxt "@info:status" -msgid "Global stack is missing." +msgid "There is no active printer yet." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:449 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:452 msgctxt "@info:status" msgid "Unable to add the profile." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:463 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:466 #, python-brace-format msgctxt "@info:status" msgid "" @@ -585,7 +590,7 @@ msgid "" "definition '{1}'." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:468 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:471 #, python-brace-format msgctxt "@info:status" msgid "" @@ -604,24 +609,24 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:712 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 msgctxt "@label" msgid "Nozzle" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:860 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:856 msgctxt "@info:message Followed by a list of settings." msgid "" "Settings have been changed to match the current availability of extruders:" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:862 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:858 msgctxt "@info:title" msgid "Settings updated" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1447 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1478 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "" @@ -634,13 +639,13 @@ msgid "Add" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:263 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 msgctxt "@action:button" msgid "Finish" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 #: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 #: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 @@ -648,7 +653,7 @@ msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 msgctxt "@action:button" msgid "Cancel" @@ -660,76 +665,83 @@ msgctxt "@label" msgid "Group #{group_nr}" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 msgctxt "@tooltip" msgid "Prime Tower" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 msgctxt "@tooltip" msgid "Travel" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 msgctxt "@tooltip" msgid "Retractions" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:94 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 msgctxt "@tooltip" msgid "Other" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 msgctxt "@action:button" msgid "Next" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 +msgctxt "@action:button" +msgid "Skip" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:173 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 msgctxt "@action:button" msgid "Close" @@ -753,7 +765,7 @@ msgid "" "guide

    " msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:535 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:540 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "" @@ -762,12 +774,12 @@ msgid "" "instead." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:538 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:543 msgctxt "@info:title" msgid "Open Project File" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:634 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:639 #, python-brace-format msgctxt "@info:error Don't translate the XML tags or !" msgid "" @@ -775,12 +787,20 @@ msgid "" "." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:635 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:686 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:646 +#, python-brace-format +msgctxt "@info:error Don't translate the XML tags or !" +msgid "" +"Project file {0} is corrupt: {1}." +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:698 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" msgid "" @@ -822,7 +842,7 @@ msgid "" "or with this file name." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:206 msgctxt "@error:zip" msgid "Error writing 3mf file." msgstr "" @@ -877,8 +897,8 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:23 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "" @@ -888,24 +908,24 @@ msgctxt "@item:inmenu" msgid "Manage backups" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 msgctxt "@info:status" msgid "" "Unable to slice with the current material as it is incompatible with the " "selected machine or configuration." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:411 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:420 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:429 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 msgctxt "@info:title" msgid "Unable to slice" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:412 #, python-brace-format msgctxt "@info:status" msgid "" @@ -913,7 +933,7 @@ msgid "" "errors: {0}" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:410 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:436 #, python-brace-format msgctxt "@info:status" msgid "" @@ -921,13 +941,13 @@ msgid "" "errors on one or more models: {error_labels}" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:445 msgctxt "@info:status" msgid "" "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:428 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:454 #, python-format msgctxt "@info:status" msgid "" @@ -935,7 +955,7 @@ msgid "" "%s." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:463 msgctxt "@info:status" msgid "" "Please review settings and check if your models:\n" @@ -1207,28 +1227,28 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:121 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:128 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:129 msgctxt "@info:title" msgid "Simulation View" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:status" msgid "Nothing is shown because you need to slice first." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:title" msgid "No layers to show" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:124 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "" @@ -1238,16 +1258,21 @@ msgctxt "@item:inlistbox" msgid "Layer view" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:70 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:71 msgctxt "@info:status" msgid "" -"Your model is not manifold. The highlighted areas indicate either missing or " -"extraneous surfaces." +"The highlighted areas indicate either missing or extraneous surfaces. Fix " +"your model and open it again into Cura." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 msgctxt "@info:title" -msgid "Model errors" +msgid "Model Errors" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:79 +msgctxt "@action:button" +msgid "Learn more" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/__init__.py:12 @@ -1276,7 +1301,7 @@ msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:145 msgctxt "@action:button" msgid "Sync" msgstr "" @@ -1312,7 +1337,7 @@ msgctxt "@info:generic" msgid "You need to quit and restart {} before changes have effect." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:79 msgctxt "@info:generic" msgid "{} plugins failed to download" msgstr "" @@ -1353,7 +1378,11 @@ msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "" @@ -1368,22 +1397,22 @@ msgctxt "@action" msgid "Select upgrades" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:152 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 msgctxt "@action:button" msgid "Print via cloud" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:155 msgctxt "@properties:tooltip" msgid "Print via cloud" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:156 msgctxt "@info:status" msgid "Connected via cloud" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:264 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:270 #, python-brace-format msgctxt "@error:send" msgid "Unknown error code when uploading print job: {0}" @@ -1689,82 +1718,82 @@ msgid "" "adjustment." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:15 msgctxt "@title:window" msgid "Open Project" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:63 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 msgctxt "@action:label" msgid "Printer settings" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:112 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:113 msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:165 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 msgctxt "@action:label" msgid "Type" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:181 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 msgctxt "@action:label" msgid "Printer Group" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:203 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 msgctxt "@action:label" msgid "Profile settings" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:219 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:221 msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:349 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 msgctxt "@action:label" msgid "Name" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:255 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 msgctxt "@action:label" msgid "Intent" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:271 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Not in profile" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:276 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 msgctxt "@action:label" msgid "%1 override" @@ -1772,54 +1801,54 @@ msgid_plural "%1 overrides" msgstr[0] "" msgstr[1] "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:287 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:290 msgctxt "@action:label" msgid "Derivative from" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:295 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "" msgstr[1] "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:309 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:312 msgctxt "@action:label" msgid "Material settings" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:328 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:369 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:373 msgctxt "@action:label" msgid "Setting visibility" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:378 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:382 msgctxt "@action:label" msgid "Mode" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:label" msgid "Visible settings:" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:399 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:403 msgctxt "@action:label" msgid "%1 out of %2" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:425 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:429 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:457 msgctxt "@action:button" msgid "Open" msgstr "" @@ -1927,8 +1956,8 @@ msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:68 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:125 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:199 msgctxt "@button" msgid "Sign in" msgstr "" @@ -2179,12 +2208,12 @@ msgctxt "@label" msgid "Cooling Fan Number" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:163 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:177 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "" @@ -2269,12 +2298,17 @@ msgctxt "@label" msgid "Number of Extruders" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:345 +msgctxt "@label" +msgid "Apply Extruder offsets to GCode" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:393 msgctxt "@title:label" msgid "Start G-code" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:385 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:404 msgctxt "@title:label" msgid "End G-code" msgstr "" @@ -2298,6 +2332,11 @@ msgctxt "@label link to technical assistance" msgid "View user manuals online" msgstr "" +#: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 +msgctxt "@info" +msgid "In order to monitor your print from Cura, please connect the printer." +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" msgid "Mesh Type" @@ -2344,7 +2383,7 @@ msgid "Select Settings to Customize for this model" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 msgctxt "@label:textbox" msgid "Filter..." msgstr "" @@ -2354,32 +2393,32 @@ msgctxt "@label:checkbox" msgid "Show all" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:20 msgctxt "@title:window" msgid "Post Processing Plugin" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:59 msgctxt "@label" msgid "Post Processing Scripts" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:235 msgctxt "@action" msgid "Add a script" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:282 msgctxt "@label" msgid "Settings" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:499 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:502 msgctxt "@info:tooltip" msgid "Change active post-processing scripts." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:506 msgctxt "@info:tooltip" msgid "The following script is active:" msgid_plural "The following scripts are active:" @@ -2392,78 +2431,93 @@ msgctxt "@label" msgid "Color scheme" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:110 msgctxt "@label:listbox" msgid "Material Color" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:111 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:114 msgctxt "@label:listbox" msgid "Line Type" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:115 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:118 msgctxt "@label:listbox" msgid "Speed" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:122 msgctxt "@label:listbox" -msgid "Layer thickness" +msgid "Layer Thickness" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:126 +msgctxt "@label:listbox" +msgid "Line Width" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 +msgctxt "@label:listbox" +msgid "Flow" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" msgid "Compatibility Mode" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:230 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:245 msgctxt "@label" msgid "Travels" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:251 msgctxt "@label" msgid "Helpers" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:257 msgctxt "@label" msgid "Shell" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:248 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 msgctxt "@label" msgid "Infill" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:298 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:271 msgctxt "@label" -msgid "Only Show Top Layers" -msgstr "" - -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:308 -msgctxt "@label" -msgid "Show 5 Detailed Layers On Top" +msgid "Starts" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 msgctxt "@label" +msgid "Only Show Top Layers" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:332 +msgctxt "@label" +msgid "Show 5 Detailed Layers On Top" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:346 +msgctxt "@label" msgid "Top / Bottom" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:350 msgctxt "@label" msgid "Inner Wall" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:384 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:419 msgctxt "@label" msgid "min" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:433 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:488 msgctxt "@label" msgid "max" msgstr "" @@ -2606,7 +2660,7 @@ msgid "Plugins" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 msgctxt "@title:tab" msgid "Materials" @@ -2655,6 +2709,7 @@ msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:178 msgctxt "@button" msgid "Next" msgstr "" @@ -3023,7 +3078,7 @@ msgid "Delete" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:289 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 msgctxt "@label" msgid "Resume" msgstr "" @@ -3039,8 +3094,8 @@ msgid "Resuming..." msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 msgctxt "@label" msgid "Pause" msgstr "" @@ -3081,7 +3136,7 @@ msgid "Are you sure you want to abort %1?" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 msgctxt "@window:title" msgid "Abort print" msgstr "" @@ -3092,7 +3147,7 @@ msgid "Manage printer" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." @@ -3118,27 +3173,34 @@ msgctxt "@label:status" msgid "Idle" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:365 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +msgctxt "@label:status" +msgid "Preparing..." +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:369 msgctxt "@label:status" msgid "Printing" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:406 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:410 msgctxt "@label" msgid "Untitled" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:431 msgctxt "@label" msgid "Anonymous" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:458 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:492 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:496 msgctxt "@action:button" msgid "Details" msgstr "" @@ -3165,12 +3227,6 @@ msgctxt "@label:status" msgid "Finished" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -msgctxt "@label:status" -msgid "Preparing..." -msgstr "" - #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." @@ -3251,23 +3307,23 @@ msgctxt "@action:button" msgid "Sign in" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" -msgid "Your key to connected 3D printing" +msgid "Sign in to the Ultimaker platform" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:42 msgctxt "@text" msgid "" -"- Customize your experience with more print profiles and plugins\n" -"- Stay flexible by syncing your setup and loading it anywhere\n" -"- Increase efficiency with a remote workflow on Ultimaker printers" +"- Add material profiles and plug-ins from the Marketplace\n" +"- Back-up and sync your material profiles and plug-ins\n" +"- Share ideas and get help from 48,000+ users in the Ultimaker community" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:142 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:62 msgctxt "@button" -msgid "Create account" +msgid "Create a free Ultimaker account" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/SyncState.qml:28 @@ -3375,299 +3431,298 @@ msgctxt "@button" msgid "Cancel" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:83 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:90 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:98 msgctxt "@action:inmenu" msgid "Exit Full Screen" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:105 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:115 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:125 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:132 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:133 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:140 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:147 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 +msgctxt "@action:inmenu menubar:view" +msgid "Bottom View" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:160 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:168 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:175 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:182 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:180 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:188 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:187 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu" msgid "Add more materials from Marketplace" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:222 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:230 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:260 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:266 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:273 msgctxt "@action:inmenu menubar:edit" -msgid "Delete Selected Model" -msgid_plural "Delete Selected Models" -msgstr[0] "" -msgstr[1] "" +msgid "Delete Selected" +msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:283 msgctxt "@action:inmenu menubar:edit" -msgid "Center Selected Model" -msgid_plural "Center Selected Models" -msgstr[0] "" -msgstr[1] "" +msgid "Center Selected" +msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:292 msgctxt "@action:inmenu menubar:edit" -msgid "Multiply Selected Model" -msgid_plural "Multiply Selected Models" -msgstr[0] "" -msgstr[1] "" - -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:293 -msgctxt "@action:inmenu" -msgid "Delete Model" +msgid "Multiply Selected" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 msgctxt "@action:inmenu" +msgid "Delete Model" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:309 +msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:307 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:327 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:335 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:345 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:347 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:355 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:362 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:372 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:382 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:390 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:406 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:405 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:413 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:412 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:419 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:429 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:439 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:434 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:446 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:441 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:538 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:448 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:460 msgctxt "@action:menu" msgid "&Marketplace" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:257 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 msgctxt "@title:tab" msgid "General" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:462 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:453 msgctxt "@title:tab" msgid "Settings" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:464 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 msgctxt "@title:tab" msgid "Printers" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 msgctxt "@title:tab" msgid "Profiles" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:576 msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:588 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:638 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:744 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:737 msgctxt "@window:title" msgid "Install Package" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:752 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:745 msgctxt "@title:window" msgid "Open File(s)" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:755 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:748 msgctxt "@text:window" msgid "" "We have found one or more G-Code files within the files you have selected. " @@ -3675,12 +3730,12 @@ msgid "" "file, please just select only one." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:858 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:857 msgctxt "@title:window" msgid "Add Printer" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:866 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:865 msgctxt "@title:window" msgid "What's New" msgstr "" @@ -3828,18 +3883,28 @@ msgctxt "@label" msgid "Python bindings for libnest2d" msgstr "" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +msgctxt "@label" +msgid "Support library for system keyring access" +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" -msgid "Font" +msgid "Python extensions for Microsoft Windows" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 msgctxt "@label" -msgid "SVG icons" +msgid "Font" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 msgctxt "@label" +msgid "SVG icons" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:165 +msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "" @@ -3848,24 +3913,24 @@ msgctxt "@title:window" msgid "Open project file" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:88 msgctxt "@text:window" msgid "" "This is a Cura project file. Would you like to open it as a project or " "import the models from it?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:98 msgctxt "@text:window" msgid "Remember my choice" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:122 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:117 msgctxt "@action:button" msgid "Open as project" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:131 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:126 msgctxt "@action:button" msgid "Import models" msgstr "" @@ -3894,7 +3959,7 @@ msgid "Current changes" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "" @@ -3919,7 +3984,7 @@ msgctxt "@action:button" msgid "Keep changes" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 msgctxt "@text:window" msgid "" "We have found one or more project file(s) within the files you have " @@ -3927,7 +3992,7 @@ msgid "" "import models from those files. Would you like to proceed?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:99 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:94 msgctxt "@action:button" msgid "Import all as models" msgstr "" @@ -4087,7 +4152,7 @@ msgctxt "@label" msgid "Material" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:407 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "" @@ -4111,17 +4176,17 @@ msgctxt "@label" msgid "Number of Copies" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:33 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:41 msgctxt "@title:menu menubar:file" msgid "&Save Project..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:54 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:74 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:85 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "" @@ -4141,6 +4206,11 @@ msgctxt "@label:category menu label" msgid "Generic" msgstr "" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/OpenFilesMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Open File(s)..." +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -4156,6 +4226,11 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SaveProjectMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Save Project..." +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:15 msgctxt "@title:menu menubar:settings" msgid "&Printer" @@ -4181,17 +4256,17 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:16 msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:45 msgctxt "@action:inmenu" msgid "Collapse All Categories" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "" @@ -4201,22 +4276,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:45 msgctxt "@action:inmenu menubar:view" msgid "Camera view" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:48 msgctxt "@action:inmenu menubar:view" msgid "Perspective" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:60 msgctxt "@action:inmenu menubar:view" msgid "Orthographic" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:81 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "" @@ -4261,12 +4336,12 @@ msgctxt "@label:MonitorStatus" msgid "Please remove the print" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@label" msgid "Abort Print" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:338 msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "" @@ -4308,265 +4383,265 @@ msgctxt "@label" msgid "Interface" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:216 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:209 msgctxt "@label" msgid "Currency:" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:229 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:222 msgctxt "@label" msgid "Theme:" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 msgctxt "@label" msgid "" "You will need to restart the application for these changes to have effect." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:284 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 msgctxt "@option:check" msgid "Slice automatically" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:306 msgctxt "@label" msgid "Viewport behavior" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:314 msgctxt "@info:tooltip" msgid "" "Highlight unsupported areas of the model in red. Without support these areas " "will not print properly." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:323 msgctxt "@option:check" msgid "Display overhang" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:351 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@info:tooltip" msgid "" "Highlight missing or extraneous surfaces of the model using warning signs. " "The toolpaths will often be missing parts of the intended geometry." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:342 msgctxt "@option:check" msgid "Display model errors" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 msgctxt "@info:tooltip" msgid "" "Moves the camera so the model is in the center of the view when a model is " "selected" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:373 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:388 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "" "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:409 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:435 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:417 msgctxt "@info:tooltip" msgid "" "Should models on the platform be moved so that they no longer intersect?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:440 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:422 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:431 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:436 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:448 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:457 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:498 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:485 msgctxt "@option:check" msgid "Restore window position on start" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:513 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:502 msgctxt "@window:text" msgid "Camera rendering:" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:531 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:509 msgid "Perspective" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:532 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgid "Orthographic" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:563 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:548 msgctxt "@label" msgid "Opening and saving files" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:555 msgctxt "@info:tooltip" msgid "" "Should opening files from the desktop or external applications open in the " "same instance of Cura?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@option:check" msgid "Use a single instance of Cura" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@option:check" msgid "Scale large models" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 msgctxt "@info:tooltip" msgid "" "An model may appear extremely small if its unit is for example in meters " "rather than millimeters. Should these models be scaled up?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@option:check" msgid "Select models when loaded" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 msgctxt "@info:tooltip" msgid "" "Should a prefix based on the printer name be added to the print job name " "automatically?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:635 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:645 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:649 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:634 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:659 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:644 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:652 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:682 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:668 msgctxt "@option:openProject" msgid "Always import models" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:705 msgctxt "@info:tooltip" msgid "" "When you have made changes to a profile and switched to a different one, a " @@ -4574,45 +4649,45 @@ msgid "" "not, or you can choose a default behaviour and never show that dialog again." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:728 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 msgctxt "@window:text" msgid "" "Default behavior for changed setting values when switching to a different " "profile: " msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:748 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:734 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:749 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:735 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:783 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@label" msgid "Privacy" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:790 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:777 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:795 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:782 msgctxt "@option:check" msgid "Check for updates on start" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:805 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:792 msgctxt "@info:tooltip" msgid "" "Should anonymous data about your print be sent to Ultimaker? Note, no " @@ -4620,12 +4695,12 @@ msgid "" "stored." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:810 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:797 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:819 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:806 msgctxt "@action:button" msgid "More information" msgstr "" @@ -4665,57 +4740,67 @@ msgctxt "@action:button" msgid "Export" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 +msgctxt "@action:button Sending materials to printers" +msgid "Sync with Printers" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" msgid "Printer" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:298 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 msgctxt "@title:window" msgid "Confirm Remove" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:301 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 msgctxt "@title:window" msgid "Import Material" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:338 msgctxt "@info:status Don't translate the XML tags or !" msgid "" "Could not import material %1: %2" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:328 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:342 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:346 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 msgctxt "@title:window" msgid "Export Material" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:358 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:372 msgctxt "@info:status Don't translate the XML tags and !" msgid "" "Failed to export material to %1: %2" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:378 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 +msgctxt "@title:window" +msgid "Export All Materials" +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" @@ -4829,55 +4914,55 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@title:window" msgid "Rename Profile" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:307 msgctxt "@title:window" msgid "Import Profile" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:336 msgctxt "@title:window" msgid "Export Profile" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:399 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:557 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 msgctxt "@action:button" msgid "Discard current changes" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:583 msgctxt "@action:label" msgid "" "This profile uses the defaults specified by the printer, so it has no " "settings/overrides in the list below." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:591 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:609 msgctxt "@title:tab" msgid "Global Settings" msgstr "" @@ -4907,12 +4992,12 @@ msgctxt "@title:column" msgid "Unit" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:16 msgctxt "@title:tab" msgid "Setting Visibility" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:48 msgctxt "@label:textbox" msgid "Check all" msgstr "" @@ -5278,27 +5363,27 @@ msgctxt "@label:textbox" msgid "Search settings" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:456 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:468 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:477 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:502 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:514 msgctxt "@action:menu" msgid "Hide this setting" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:515 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:527 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:531 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "" @@ -5358,11 +5443,6 @@ msgctxt "@button" msgid "Add printer manually" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddCloudPrintersView.qml:218 -msgctxt "@button" -msgid "Finish" -msgstr "" - #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:230 msgctxt "@label" msgid "Manufacturer" @@ -5471,32 +5551,32 @@ msgctxt "@button" msgid "Connect" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:43 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" -msgid "Ultimaker Account" +msgid "Release Notes" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:124 msgctxt "@text" -msgid "Your key to connected 3D printing" +msgid "Add material settings and plugins from the Marketplace" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:101 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:154 msgctxt "@text" -msgid "- Customize your experience with more print profiles and plugins" +msgid "Backup and sync your material settings and plugins" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:184 msgctxt "@text" -msgid "- Stay flexible by syncing your setup and loading it anywhere" +msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:217 msgctxt "@text" -msgid "- Increase efficiency with a remote workflow on Ultimaker printers" +msgid "Create a free Ultimaker Account" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:230 msgctxt "@button" msgid "Skip" msgstr "" @@ -5559,26 +5639,31 @@ msgctxt "@button" msgid "Decline and close" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:29 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" msgid "Welcome to Ultimaker Cura" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:68 msgctxt "@text" msgid "" -"Please follow these steps to set up\n" -"Ultimaker Cura. This will only take a few moments." +"Please follow these steps to set up Ultimaker Cura. This will only take a " +"few moments." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:86 msgctxt "@button" msgid "Get started" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:28 msgctxt "@label" -msgid "What's new in Ultimaker Cura" +msgid "What's New" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Widgets/ComboBox.qml:24 +msgctxt "@label" +msgid "No items to select from" msgstr "" #: ModelChecker/plugin.json @@ -5663,6 +5748,18 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "" +#: DigitalLibrary/plugin.json +msgctxt "description" +msgid "" +"Connects to the Digital Library, allowing Cura to open files from and save " +"files to the Digital Library." +msgstr "" + +#: DigitalLibrary/plugin.json +msgctxt "name" +msgid "Ultimaker Digital Library" +msgstr "" + #: FirmwareUpdateChecker/plugin.json msgctxt "description" msgid "Checks for firmware updates." @@ -6139,6 +6236,26 @@ msgctxt "name" msgid "Version Upgrade 4.7 to 4.8" msgstr "" +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." +msgstr "" + +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.8 to 4.9" +msgstr "" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." +msgstr "" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.9 to 4.10" +msgstr "" + #: X3DReader/plugin.json msgctxt "description" msgid "Provides support for reading X3D files." diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index 5743da88dc..fb20f85938 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -1,13 +1,13 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0200\n" -"PO-Revision-Date: 2020-11-09 14:27+0100\n" +"POT-Creation-Date: 2021-06-10 17:35+0200\n" +"PO-Revision-Date: 2021-04-16 15:15+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: German , German \n" "Language: de_DE\n" @@ -17,8 +17,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.4.1\n" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1581 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 msgctxt "@label" msgid "Unknown" msgstr "Unbekannt" @@ -44,47 +48,56 @@ msgctxt "@label {0} is the name of a printer that's about to be deleted." msgid "Are you sure you wish to remove {0}? This cannot be undone!" msgstr "Möchten Sie {0} wirklich entfernen? Der Vorgang kann nicht rückgängig gemacht werden!" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 msgctxt "@label" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 msgctxt "@label" msgid "Visual" msgstr "Visuell" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." msgstr "Das visuelle Profil wurde für den Druck visueller Prototypen und Modellen entwickelt, bei denen das Ziel eine hohe visuelle Qualität und eine hohe Oberflächenqualität ist." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 msgctxt "@label" msgid "Engineering" msgstr "Engineering" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." msgstr "Das Engineering-Profil ist für den Druck von Funktionsprototypen und Endnutzungsteilen gedacht, bei denen Präzision gefragt ist und engere Toleranzen gelten." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 msgctxt "@label" msgid "Draft" msgstr "Entwurf" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "Das Entwurfsprofil wurde für erste Prototypen und die Konzeptvalidierung entwickelt, um einen deutlich schnelleren Druck zu ermöglichen." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:226 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:234 msgctxt "@label" msgid "Custom Material" msgstr "Benutzerdefiniertes Material" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:227 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 msgctxt "@label" msgid "Custom" msgstr "Benutzerdefiniert" @@ -105,51 +118,63 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Alle Dateien (*)" -#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:178 +#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:181 msgctxt "@info:title" msgid "Login failed" msgstr "Login fehlgeschlagen" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:67 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:67 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:24 msgctxt "@info:status" msgid "Finding new location for objects" msgstr "Neue Position für Objekte finden" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:71 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:28 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:71 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:28 msgctxt "@info:title" msgid "Finding Location" msgstr "Position finden" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:150 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:76 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:150 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 +#: /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:76 msgctxt "@info:status" msgid "Unable to find a location within the build volume for all objects" msgstr "Innerhalb der Druckabmessung für alle Objekte konnte keine Position gefunden werden" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:151 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:42 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:151 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:42 msgctxt "@info:title" msgid "Can't Find Location" msgstr "Kann Position nicht finden" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:104 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:116 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Konnte kein Archiv von Benutzer-Datenverzeichnis {} erstellen" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:110 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 msgctxt "@info:title" msgid "Backup" msgstr "Backup" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:123 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:135 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "Versucht, ein Cura-Backup-Verzeichnis ohne entsprechende Daten oder Metadaten wiederherzustellen." -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:134 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:146 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that is higher than the current version." msgstr "Versucht, ein Cura-Backup wiederherzustellen, das eine höhere Version als die aktuelle hat." +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 +msgctxt "@info:backup_failed" +msgid "The following error occurred while trying to restore a Cura backup:" +msgstr "Beim Versuch, ein Backup von Cura wiederherzustellen, trat der folgende Fehler auf:" + #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -299,71 +324,76 @@ msgctxt "@action:button" msgid "Send report" msgstr "Bericht senden" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:521 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:527 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Geräte werden geladen..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:528 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:534 msgctxt "@info:progress" msgid "Setting up preferences..." msgstr "Erstellungen werden eingerichtet ..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:657 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:672 msgctxt "@info:progress" msgid "Initializing Active Machine..." msgstr "Aktives Gerät wird initialisiert ..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:803 msgctxt "@info:progress" msgid "Initializing machine manager..." msgstr "Gerätemanager wird initialisiert ..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:802 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:817 msgctxt "@info:progress" msgid "Initializing build volume..." msgstr "Bauraum wird initialisiert ..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:870 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:888 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Die Szene wird eingerichtet..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:906 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:924 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Die Benutzeroberfläche wird geladen..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:911 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:929 msgctxt "@info:progress" msgid "Initializing engine..." msgstr "Funktion wird initialisiert ..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1221 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1246 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1777 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1799 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Es kann nur jeweils ein G-Code gleichzeitig geladen werden. Wichtige {0} werden übersprungen." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1778 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:188 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 msgctxt "@info:title" msgid "Warning" msgstr "Warnhinweis" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1787 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1809 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Wenn G-Code geladen wird, kann keine weitere Datei geöffnet werden. Wichtige {0} werden übersprungen." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1788 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 msgctxt "@info:title" msgid "Error" @@ -384,7 +414,7 @@ msgctxt "@info:title" msgid "Placing Object" msgstr "Objekt-Platzierung" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:92 msgctxt "@message" msgid "Could not read response." msgstr "Antwort konnte nicht gelesen werden." @@ -404,28 +434,31 @@ msgctxt "@message" msgid "Something unexpected happened when trying to log in, please try again." msgstr "Bei dem Versuch, sich anzumelden, trat ein unerwarteter Fehler auf. Bitte erneut versuchen." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:187 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:189 msgctxt "@info" msgid "Unable to start a new sign in process. Check if another sign in attempt is still active." msgstr "Es kann kein neuer Anmeldevorgang gestartet werden. Bitte überprüfen Sie, ob noch ein weiterer Anmeldevorgang aktiv ist." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Der Ultimaker-Konto-Server konnte nicht erreicht werden." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:205 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:205 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 msgctxt "@title:window" msgid "File Already Exists" msgstr "Datei bereits vorhanden" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:206 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:206 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Die Datei {0} ist bereits vorhanden. Soll die Datei wirklich überschrieben werden?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:452 /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:455 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "Ungültige Datei-URL:" @@ -477,7 +510,8 @@ msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Import des Profils aus Datei {0} fehlgeschlagen:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:235 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:245 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:235 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:245 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." @@ -507,33 +541,33 @@ msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Profil {0} hat einen unbekannten Dateityp oder ist beschädigt." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:423 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:426 msgctxt "@label" msgid "Custom profile" msgstr "Benutzerdefiniertes Profil" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:439 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:442 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Für das Profil fehlt eine Qualitätsangabe." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:443 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:446 msgctxt "@info:status" -msgid "Global stack is missing." -msgstr "Globaler Stack fehlt." +msgid "There is no active printer yet." +msgstr "Es ist noch kein Drucker aktiv." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:449 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:452 msgctxt "@info:status" msgid "Unable to add the profile." msgstr "Das Profil kann nicht hinzugefügt werden." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:463 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:466 #, python-brace-format msgctxt "@info:status" msgid "Quality type '{0}' is not compatible with the current active machine definition '{1}'." msgstr "Der Qualitätstyp „{0}“ ist nicht mit der aktuell aktiven Maschinendefinition „{1}“ kompatibel." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:468 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:471 #, python-brace-format msgctxt "@info:status" msgid "Warning: The profile is not visible because its quality type '{0}' is not available for the current configuration. Switch to a material/nozzle combination that can use this quality type." @@ -549,40 +583,51 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:712 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 msgctxt "@label" msgid "Nozzle" msgstr "Düse" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:860 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:856 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "Die Einstellungen wurden an die aktuell verfügbaren Extruder angepasst:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:862 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:858 msgctxt "@info:title" msgid "Settings updated" msgstr "Einstellungen aktualisiert" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1447 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1478 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extruder deaktiviert" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:67 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:67 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "Hinzufügen" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:263 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 msgctxt "@action:button" msgid "Finish" msgstr "Beenden" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:441 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml:81 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 msgctxt "@action:button" msgid "Cancel" msgstr "Abbrechen" @@ -593,73 +638,84 @@ msgctxt "@label" msgid "Group #{group_nr}" msgstr "Gruppe #{group_nr}" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Außenwand" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Innenwände" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Außenhaut" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Füllung" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Stützstruktur-Füllung" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Stützstruktur-Schnittstelle" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Stützstruktur" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Skirt" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 msgctxt "@tooltip" msgid "Prime Tower" msgstr "Einzugsturm" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 msgctxt "@tooltip" msgid "Travel" msgstr "Bewegungen" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 msgctxt "@tooltip" msgid "Retractions" msgstr "Einzüge" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:94 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 msgctxt "@tooltip" msgid "Other" msgstr "Sonstige" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 msgctxt "@action:button" msgid "Next" msgstr "Weiter" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:173 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 +msgctxt "@action:button" +msgid "Skip" +msgstr "Überspringen" + +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 +#: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 msgctxt "@action:button" msgid "Close" msgstr "Schließen" @@ -683,29 +739,36 @@ msgstr "" "

    Erfahren Sie, wie Sie die bestmögliche Druckqualität und Zuverlässigkeit sicherstellen.

    \n" "

    Leitfaden zu Druckqualität anzeigen

    " -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:535 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:540 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Projektdatei {0} enthält einen unbekannten Maschinentyp {1}. Importieren der Maschine ist nicht möglich. Stattdessen werden die Modelle importiert." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:538 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:543 msgctxt "@info:title" msgid "Open Project File" msgstr "Projektdatei öffnen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:634 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:639 #, python-brace-format msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "Auf Projektdatei {0} kann plötzlich nicht mehr zugegriffen werden: {1}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:635 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "Projektdatei kann nicht geöffnet werden" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:686 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:646 +#, python-brace-format +msgctxt "@info:error Don't translate the XML tags or !" +msgid "Project file {0} is corrupt: {1}." +msgstr "Projektdatei {0} ist beschädigt: {1}." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:698 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." @@ -721,7 +784,8 @@ msgctxt "@title:tab" msgid "Custom" msgstr "Benutzerdefiniert" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 msgctxt "@item:inlistbox" msgid "3MF File" msgstr "3MF-Datei" @@ -731,7 +795,8 @@ msgctxt "@error:zip" msgid "3MF Writer plug-in is corrupt." msgstr "Das 3MF-Writer-Plugin ist beschädigt." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:59 /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:92 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:59 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:92 msgctxt "@error:zip" msgid "No permission to write the workspace here." msgstr "Keine Erlaubnis zum Beschreiben dieses Arbeitsbereichs." @@ -741,7 +806,7 @@ msgctxt "@error:zip" msgid "The operating system does not allow saving a project file to this location or with this file name." msgstr "Das Betriebssystem erlaubt es nicht, eine Projektdatei an diesem Speicherort oder mit diesem Dateinamen zu speichern." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:206 msgctxt "@error:zip" msgid "Error writing 3mf file." msgstr "Fehler beim Schreiben von 3MF-Datei." @@ -796,7 +861,8 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "Das Backup überschreitet die maximale Dateigröße." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:82 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:23 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "Beim Versuch, Ihr Backup wiederherzustellen, trat ein Fehler auf." @@ -806,41 +872,45 @@ msgctxt "@item:inmenu" msgid "Manage backups" msgstr "Backups verwalten" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Slicing mit dem aktuellen Material nicht möglich, da es mit der gewählten Maschine oder Konfiguration nicht kompatibel ist." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:411 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:420 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:429 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 msgctxt "@info:title" msgid "Unable to slice" msgstr "Slicing nicht möglich" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:412 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Die aktuellen Einstellungen lassen kein Schneiden (Slicing) zu. Die folgenden Einstellungen sind fehlerhaft:{0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:410 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:436 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Aufgrund der Pro-Modell-Einstellungen ist kein Schneiden (Slicing) möglich. Die folgenden Einstellungen sind für ein oder mehrere Modelle fehlerhaft: {error_labels}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:445 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "Schneiden (Slicing) ist nicht möglich, da der Einzugsturm oder die Einzugsposition(en) ungültig ist (sind)." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:428 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:454 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "Schneiden (Slicing) ist nicht möglich, da Objekte vorhanden sind, die mit dem deaktivierten Extruder %s verbunden sind." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:463 msgctxt "@info:status" msgid "" "Please review settings and check if your models:\n" @@ -853,7 +923,8 @@ msgstr "" "- Einem aktiven Extruder zugewiesen sind\n" "- Nicht alle als Modifier Meshes eingerichtet sind" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 msgctxt "@info:status" msgid "Processing Layers" msgstr "Schichten werden verarbeitet" @@ -863,7 +934,8 @@ msgctxt "@info:title" msgid "Information" msgstr "Informationen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura-Profil" @@ -895,7 +967,8 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Firmware aktualisieren" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 msgctxt "@item:inlistbox" msgid "Compressed G-code File" msgstr "Komprimierte G-Code-Datei" @@ -905,7 +978,9 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "GCodeWriter unterstützt keinen Textmodus." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 msgctxt "@item:inlistbox" msgid "G-code File" msgstr "G-Code-Datei" @@ -915,7 +990,8 @@ msgctxt "@info:status" msgid "Parsing G-code" msgstr "G-Code parsen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:349 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:349 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:503 msgctxt "@info:title" msgid "G-code Details" msgstr "G-Code-Details" @@ -935,7 +1011,8 @@ msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "GCodeWriter unterstützt keinen Nicht-Textmodus." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Vor dem Exportieren bitte G-Code vorbereiten." @@ -1021,7 +1098,8 @@ msgctxt "@item:inlistbox" msgid "Save to Removable Drive {0}" msgstr "Auf Wechseldatenträger speichern {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "Es sind keine Dateiformate zum Schreiben vorhanden!" @@ -1037,7 +1115,8 @@ msgctxt "@info:title" msgid "Saving" msgstr "Wird gespeichert" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:106 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:109 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:106 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:109 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not save to {0}: {1}" @@ -1049,7 +1128,8 @@ msgctxt "@info:status Don't translate the tag {device}!" msgid "Could not find a file name when trying to write to {device}." msgstr "Bei dem Versuch, auf {device} zu schreiben, wurde ein Dateiname nicht gefunden." -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:138 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:138 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #, python-brace-format msgctxt "@info:status" msgid "Could not save to removable drive {0}: {1}" @@ -1099,27 +1179,28 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Wechseldatenträger" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:121 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:128 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled." msgstr "Cura zeigt die Schichten nicht präzise an, wenn „Drucken mit Drahtstruktur“ aktiviert ist." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:129 msgctxt "@info:title" msgid "Simulation View" msgstr "Simulationsansicht" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:status" msgid "Nothing is shown because you need to slice first." msgstr "Es kann nichts angezeigt werden, weil Sie zuerst das Slicing vornehmen müssen." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:title" msgid "No layers to show" msgstr "Keine anzeigbaren Schichten vorhanden" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:124 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "Diese Meldung nicht mehr anzeigen" @@ -1129,16 +1210,21 @@ msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Schichtenansicht" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:70 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:71 msgctxt "@info:status" -msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." -msgstr "Ihrem Modell fehlen Schichten. Die fehlenden oder fehlerhaften Bereiche sind hervorgehoben." +msgid "The highlighted areas indicate either missing or extraneous surfaces. Fix your model and open it again into Cura." +msgstr "Die hervorgehobenen Bereiche kennzeichnen fehlende oder überschüssige Oberflächen. Beheben Sie die Fehler am Modell und öffnen Sie es erneut in Cura." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 msgctxt "@info:title" -msgid "Model errors" +msgid "Model Errors" msgstr "Modellfehler" +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:79 +msgctxt "@action:button" +msgid "Learn more" +msgstr "Mehr erfahren" + #: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/__init__.py:12 msgctxt "@item:inmenu" msgid "Solid view" @@ -1159,12 +1245,13 @@ msgctxt "@info:generic" msgid "Do you want to sync material and software packages with your account?" msgstr "Möchten Sie Material- und Softwarepakete mit Ihrem Konto synchronisieren?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:143 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/DownloadPresenter.py:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:143 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/DownloadPresenter.py:93 msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "Von Ihrem Ultimaker-Konto erkannte Änderungen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:145 msgctxt "@action:button" msgid "Sync" msgstr "Synchronisieren" @@ -1179,7 +1266,8 @@ msgctxt "@button" msgid "Decline" msgstr "Ablehnen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/LicenseModel.py:10 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:56 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/LicenseModel.py:10 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:56 msgctxt "@button" msgid "Agree" msgstr "Stimme zu" @@ -1199,7 +1287,7 @@ msgctxt "@info:generic" msgid "You need to quit and restart {} before changes have effect." msgstr "Sie müssen das Programm beenden und neu starten {}, bevor Änderungen wirksam werden." -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:79 msgctxt "@info:generic" msgid "{} plugins failed to download" msgstr "{} Plugins konnten nicht heruntergeladen werden" @@ -1234,12 +1322,17 @@ msgctxt "@item:inlistbox" msgid "Compressed COLLADA Digital Asset Exchange" msgstr "Compressed COLLADA Digital Asset Exchange" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimaker Format Package" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "Kann nicht in UFP-Datei schreiben:" @@ -1254,22 +1347,22 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Upgrades wählen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:152 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 msgctxt "@action:button" msgid "Print via cloud" msgstr "Über Cloud drucken" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:155 msgctxt "@properties:tooltip" msgid "Print via cloud" msgstr "Über Cloud drucken" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:156 msgctxt "@info:status" msgid "Connected via cloud" msgstr "Über Cloud verbunden" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:264 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:270 #, python-brace-format msgctxt "@error:send" msgid "Unknown error code when uploading print job: {0}" @@ -1280,7 +1373,7 @@ msgctxt "info:status" msgid "New printer detected from your Ultimaker account" msgid_plural "New printers detected from your Ultimaker account" msgstr[0] "Ihr Ultimaker-Konto hat einen neuen Drucker erkannt" -msgstr[1] "Ihr Ultimaker-Konto hat neue Drucker erkannt." +msgstr[1] "Ihr Ultimaker-Konto hat neue Drucker erkannt" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:238 #, python-brace-format @@ -1315,7 +1408,8 @@ msgid_plural "These printers are not linked to the Digital Factory:" msgstr[0] "Dieser Drucker ist nicht mit der Digital Factory verbunden:" msgstr[1] "Diese Drucker sind nicht mit der Digital Factory verbunden:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:329 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:329 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:419 msgctxt "info:name" msgid "Ultimaker Digital Factory" msgstr "Ultimaker Digital Factory" @@ -1373,7 +1467,7 @@ msgstr[0] "" "Möchten Sie wirklich fortfahren?" msgstr[1] "" "Es werden gleich {0} Drucker aus Cura entfernt. Der Vorgang kann nicht rückgängig gemacht werden. \n" -"Möchten Sie wirklich fortfahren." +"Möchten Sie wirklich fortfahren?" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:468 msgctxt "@label" @@ -1564,127 +1658,137 @@ msgctxt "@info:tooltip" msgid "Some things could be problematic in this print. Click to see tips for adjustment." msgstr "Einige Punkte bei diesem Druck könnten problematisch sein. Klicken Sie, um Tipps für die Anpassung zu erhalten." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:15 msgctxt "@title:window" msgid "Open Project" msgstr "Projekt öffnen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" msgstr "Vorhandenes aktualisieren" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:63 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "Neu erstellen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:74 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "Zusammenfassung – Cura-Projekt" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:96 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 msgctxt "@action:label" msgid "Printer settings" msgstr "Druckereinstellungen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:112 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:113 msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "Wie soll der Konflikt im Gerät gelöst werden?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:165 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 msgctxt "@action:label" msgid "Type" msgstr "Typ" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:181 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 msgctxt "@action:label" msgid "Printer Group" msgstr "Druckergruppe" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:203 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 msgctxt "@action:label" msgid "Profile settings" msgstr "Profileinstellungen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:219 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:221 msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "Wie soll der Konflikt im Profil gelöst werden?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:349 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 msgctxt "@action:label" msgid "Name" msgstr "Name" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:255 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 msgctxt "@action:label" msgid "Intent" msgstr "Intent" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:271 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Not in profile" msgstr "Nicht im Profil" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:276 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 überschreiben" msgstr[1] "%1 überschreibt" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:287 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:290 msgctxt "@action:label" msgid "Derivative from" msgstr "Ableitung von" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:295 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 überschreiben" msgstr[1] "%1, %2 überschreibt" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:309 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:312 msgctxt "@action:label" msgid "Material settings" msgstr "Materialeinstellungen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:328 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Wie soll der Konflikt im Material gelöst werden?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:369 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:373 msgctxt "@action:label" msgid "Setting visibility" msgstr "Sichtbarkeit einstellen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:378 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:382 msgctxt "@action:label" msgid "Mode" msgstr "Modus" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:label" msgid "Visible settings:" msgstr "Sichtbare Einstellungen:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:399 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:403 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 von %2" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:425 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:429 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Das Laden eines Projekts entfernt alle Modelle von der Druckplatte." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:457 msgctxt "@action:button" msgid "Open" msgstr "Öffnen" @@ -1784,8 +1888,10 @@ msgctxt "@description" msgid "Backup and synchronize your Cura settings." msgstr "Ihre Cura-Einstellungen sichern und synchronisieren." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:68 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:125 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:199 msgctxt "@button" msgid "Sign in" msgstr "Anmelden" @@ -1935,7 +2041,8 @@ msgctxt "@item:inlistbox" msgid "Linear" msgstr "Linear" -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:161 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:172 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:161 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:172 msgctxt "@item:inlistbox" msgid "Translucency" msgstr "Transparenz" @@ -1960,7 +2067,9 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "Glättung" -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:227 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:139 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:227 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@action:button" msgid "OK" msgstr "OK" @@ -1980,10 +2089,18 @@ msgctxt "@label" msgid "Nozzle size" msgstr "Düsengröße" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:89 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:205 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:245 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:283 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:245 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:283 msgctxt "@label" msgid "mm" msgstr "mm" @@ -2008,12 +2125,12 @@ msgctxt "@label" msgid "Cooling Fan Number" msgstr "Kühllüfter-Nr." -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:163 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "G-Code Extruder-Start" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:177 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "G-Code Extruder-Ende" @@ -2098,12 +2215,17 @@ msgctxt "@label" msgid "Number of Extruders" msgstr "Anzahl Extruder" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:345 +msgctxt "@label" +msgid "Apply Extruder offsets to GCode" +msgstr "Extruder-Versatzwerte auf GCode anwenden" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:393 msgctxt "@title:label" msgid "Start G-code" msgstr "Start G-Code" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:385 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:404 msgctxt "@title:label" msgid "End G-code" msgstr "Ende G-Code" @@ -2130,6 +2252,11 @@ msgctxt "@label link to technical assistance" msgid "View user manuals online" msgstr "Benutzerhandbücher online anzeigen" +#: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 +msgctxt "@info" +msgid "In order to monitor your print from Cura, please connect the printer." +msgstr "Um Ihren Druck von Cura aus zu überwachen, schließen Sie bitte den Drucker an." + #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" msgid "Mesh Type" @@ -2175,7 +2302,8 @@ msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Einstellungen für die benutzerdefinierte Anpassung dieses Modells wählen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtern..." @@ -2185,114 +2313,131 @@ msgctxt "@label:checkbox" msgid "Show all" msgstr "Alle anzeigen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:20 msgctxt "@title:window" msgid "Post Processing Plugin" msgstr "Plugin Nachbearbeitung" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:59 msgctxt "@label" msgid "Post Processing Scripts" msgstr "Skripts Nachbearbeitung" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:235 msgctxt "@action" msgid "Add a script" msgstr "Ein Skript hinzufügen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:282 msgctxt "@label" msgid "Settings" msgstr "Einstellungen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:499 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:502 msgctxt "@info:tooltip" msgid "Change active post-processing scripts." msgstr "Aktive Nachbearbeitungsskripts ändern." -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:506 msgctxt "@info:tooltip" msgid "The following script is active:" msgid_plural "The following scripts are active:" msgstr[0] "Die folgenden Skript ist aktiv:" msgstr[1] "Die folgenden Skripte sind aktiv:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:20 /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:49 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:49 msgctxt "@label" msgid "Color scheme" msgstr "Farbschema" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:110 msgctxt "@label:listbox" msgid "Material Color" msgstr "Materialfarbe" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:111 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:114 msgctxt "@label:listbox" msgid "Line Type" msgstr "Linientyp" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:115 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:118 msgctxt "@label:listbox" msgid "Speed" msgstr "Geschwindigkeit" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:122 msgctxt "@label:listbox" -msgid "Layer thickness" +msgid "Layer Thickness" msgstr "Schichtdicke" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:126 +msgctxt "@label:listbox" +msgid "Line Width" +msgstr "Linienbreite" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 +msgctxt "@label:listbox" +msgid "Flow" +msgstr "Fluss" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" msgid "Compatibility Mode" msgstr "Kompatibilitätsmodus" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:230 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:245 msgctxt "@label" msgid "Travels" msgstr "Bewegungen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:251 msgctxt "@label" msgid "Helpers" msgstr "Helfer" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:257 msgctxt "@label" msgid "Shell" msgstr "Gehäuse" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:248 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 msgctxt "@label" msgid "Infill" msgstr "Füllung" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:298 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:271 +msgctxt "@label" +msgid "Starts" +msgstr "Startet" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 msgctxt "@label" msgid "Only Show Top Layers" msgstr "Nur obere Schichten anzeigen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:308 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:332 msgctxt "@label" msgid "Show 5 Detailed Layers On Top" msgstr "5 detaillierte Schichten oben anzeigen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:346 msgctxt "@label" msgid "Top / Bottom" msgstr "Oben/Unten" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:350 msgctxt "@label" msgid "Inner Wall" msgstr "Innenwand" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:384 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:419 msgctxt "@label" msgid "min" msgstr "min." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:433 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:488 msgctxt "@label" msgid "max" msgstr "max." @@ -2367,7 +2512,8 @@ msgctxt "@action:label" msgid "Website" msgstr "Website" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:46 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:20 msgctxt "@action:button" msgid "Installed" msgstr "Installiert" @@ -2382,17 +2528,20 @@ msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "Materialspulen kaufen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:96 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:34 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "Aktualisierung" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:97 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:35 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "Aktualisierung wird durchgeführt" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:98 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:36 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:98 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" msgstr "Aktualisiert" @@ -2402,7 +2551,8 @@ msgctxt "@label" msgid "Premium" msgstr "Premium" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml:39 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml:39 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:86 msgctxt "@info:tooltip" msgid "Go to Web Marketplace" msgstr "Zum Web Marketplace gehen" @@ -2427,7 +2577,9 @@ msgctxt "@title:tab" msgid "Plugins" msgstr "Plugins" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:466 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 msgctxt "@title:tab" msgid "Materials" msgstr "Materialien" @@ -2472,7 +2624,10 @@ msgctxt "@button" msgid "Dismiss" msgstr "Verwerfen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:178 msgctxt "@button" msgid "Next" msgstr "Weiter" @@ -2537,7 +2692,8 @@ msgctxt "@label" msgid "Last updated" msgstr "Zuletzt aktualisiert" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:103 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "Marke" @@ -2667,7 +2823,9 @@ msgctxt "@action:button" msgid "Edit" msgstr "Bearbeiten" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:156 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" @@ -2683,17 +2841,20 @@ msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Wenn Ihr Drucker nicht aufgeführt ist, lesen Sie die Anleitung für Fehlerbehebung für Netzwerkdruck" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:205 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:263 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:263 msgctxt "@label" msgid "Type" msgstr "Typ" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:279 msgctxt "@label" msgid "Firmware version" msgstr "Firmware-Version" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:295 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:295 msgctxt "@label" msgid "Address" msgstr "Adresse" @@ -2723,7 +2884,8 @@ msgctxt "@title:window" msgid "Invalid IP address" msgstr "Ungültige IP-Adresse" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Bitte eine gültige IP-Adresse eingeben." @@ -2733,7 +2895,8 @@ msgctxt "@title:window" msgid "Printer Address" msgstr "Druckeradresse" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Geben Sie die IP-Adresse Ihres Druckers in das Netzwerk ein." @@ -2785,7 +2948,8 @@ msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "Überschreiben verwendet die definierten Einstellungen mit der vorhandenen Druckerkonfiguration. Dies kann zu einem fehlgeschlagenen Druck führen." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:191 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:191 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:184 msgctxt "@label" msgid "Glass" @@ -2806,7 +2970,8 @@ msgctxt "@label" msgid "Delete" msgstr "Löschen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:289 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 msgctxt "@label" msgid "Resume" msgstr "Zurückkehren" @@ -2821,7 +2986,9 @@ msgctxt "@label" msgid "Resuming..." msgstr "Wird fortgesetzt..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 msgctxt "@label" msgid "Pause" msgstr "Pausieren" @@ -2861,7 +3028,8 @@ msgctxt "@label %1 is the name of a print job." msgid "Are you sure you want to abort %1?" msgstr "Möchten Sie %1 wirklich abbrechen?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 msgctxt "@window:title" msgid "Abort print" msgstr "Drucken abbrechen" @@ -2871,7 +3039,9 @@ msgctxt "@label link to Connect and Cloud interfaces" msgid "Manage printer" msgstr "Drucker verwalten" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:519 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." msgstr "Damit Sie die Warteschlange aus der Ferne verwalten können, müssen Sie die Druckfirmware aktualisieren." @@ -2896,27 +3066,34 @@ msgctxt "@label:status" msgid "Idle" msgstr "Leerlauf" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:365 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +msgctxt "@label:status" +msgid "Preparing..." +msgstr "Vorbereitung..." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:369 msgctxt "@label:status" msgid "Printing" msgstr "Drucken" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:406 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:410 msgctxt "@label" msgid "Untitled" msgstr "Unbenannt" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:431 msgctxt "@label" msgid "Anonymous" msgstr "Anonym" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:458 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Erfordert Konfigurationsänderungen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:492 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:496 msgctxt "@action:button" msgid "Details" msgstr "Details" @@ -2931,21 +3108,18 @@ msgctxt "@label" msgid "First available" msgstr "Zuerst verfügbar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "Abgebrochen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "Beendet" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -msgctxt "@label:status" -msgid "Preparing..." -msgstr "Vorbereitung..." - #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." @@ -3026,26 +3200,27 @@ msgctxt "@action:button" msgid "Sign in" msgstr "Anmelden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" -msgid "Your key to connected 3D printing" -msgstr "Ihr Schlüssel zu vernetztem 3D-Druck" +msgid "Sign in to the Ultimaker platform" +msgstr "Bei der Ultimaker-Plattform anmelden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:42 msgctxt "@text" msgid "" -"- Customize your experience with more print profiles and plugins\n" -"- Stay flexible by syncing your setup and loading it anywhere\n" -"- Increase efficiency with a remote workflow on Ultimaker printers" +"- Add material profiles and plug-ins from the Marketplace\n" +"- Back-up and sync your material profiles and plug-ins\n" +"- Share ideas and get help from 48,000+ users in the Ultimaker community" msgstr "" -"- Personalisieren Sie Ihre Druckerfahrung mit weiteren Druckprofilen und Plugins\n" -"- Bleiben Sie flexibel, indem Sie Ihre Einstellungen synchronisieren und überall laden können\n" -"- Steigern Sie Ihre Effizienz mit einem Remote-Workflow für Ultimaker-Drucker" +"- Materialprofile und Plug-ins aus dem Marketplace hinzufügen\n" +"- Materialprofile und Plug-ins sichern und synchronisieren\n" +"- Ideenaustausch mit und Hilfe von mehr als 48.000 Benutzern in der Ultimaker Community" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:142 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:62 msgctxt "@button" -msgid "Create account" -msgstr "Konto erstellen" +msgid "Create a free Ultimaker account" +msgstr "Kostenloses Ultimaker-Konto erstellen" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/SyncState.qml:28 msgctxt "@label" @@ -3152,303 +3327,308 @@ msgctxt "@button" msgid "Cancel" msgstr "Abbrechen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:83 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Online-Fehlerbehebung anzeigen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:90 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Umschalten auf Vollbild-Modus" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:98 msgctxt "@action:inmenu" msgid "Exit Full Screen" msgstr "Vollbildmodus beenden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:105 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Rückgängig machen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:115 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Wiederholen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:125 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Beenden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:132 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:133 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "3D-Ansicht" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:140 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Vorderansicht" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:147 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Draufsicht" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 +msgctxt "@action:inmenu menubar:view" +msgid "Bottom View" +msgstr "Ansicht von unten" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Ansicht von links" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:160 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:168 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Ansicht von rechts" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:175 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Cura konfigurieren..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:182 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Drucker hinzufügen..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:180 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:188 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Dr&ucker verwalten..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:187 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Materialien werden verwaltet..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu" msgid "Add more materials from Marketplace" msgstr "Weiteres Material aus Marketplace hinzufügen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "&Profil mit aktuellen Einstellungen/Überschreibungen aktualisieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Aktuelle Änderungen verwerfen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:222 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:230 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "P&rofil von aktuellen Einstellungen/Überschreibungen erstellen..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Profile verwalten..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Online-&Dokumentation anzeigen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "&Fehler melden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:260 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Neuheiten" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:266 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Über..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:273 msgctxt "@action:inmenu menubar:edit" -msgid "Delete Selected Model" -msgid_plural "Delete Selected Models" -msgstr[0] "Ausgewähltes Modell löschen" -msgstr[1] "Ausgewählte Modelle löschen" +msgid "Delete Selected" +msgstr "Ausgewählte löschen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:283 msgctxt "@action:inmenu menubar:edit" -msgid "Center Selected Model" -msgid_plural "Center Selected Models" -msgstr[0] "Ausgewähltes Modell zentrieren" -msgstr[1] "Ausgewählte Modelle zentrieren" +msgid "Center Selected" +msgstr "Ausgewählte zentrieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:292 msgctxt "@action:inmenu menubar:edit" -msgid "Multiply Selected Model" -msgid_plural "Multiply Selected Models" -msgstr[0] "Ausgewähltes Modell multiplizieren" -msgstr[1] "Ausgewählte Modelle multiplizieren" +msgid "Multiply Selected" +msgstr "Ausgewählte vervielfachen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Modell löschen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:309 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Modell auf Druckplatte ze&ntrieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:307 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "Modelle &gruppieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:327 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:335 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Gruppierung für Modelle aufheben" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:345 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "Modelle &zusammenführen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:347 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:355 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "Modell &multiplizieren..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:362 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Alle Modelle wählen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:372 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Druckplatte reinigen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:382 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Alle Modelle neu laden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Alle Modelle an allen Druckplatten anordnen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:390 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Alle Modelle anordnen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:406 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Anordnung auswählen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:405 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:413 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Alle Modellpositionen zurücksetzen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:412 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Alle Modelltransformationen zurücksetzen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:419 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:429 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Datei(en) öffnen..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:439 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Neues Projekt..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:434 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:446 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Konfigurationsordner anzeigen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:441 /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:538 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Sichtbarkeit einstellen wird konfiguriert..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:448 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:460 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Marktplatz" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:257 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Dieses Paket wird nach einem Neustart installiert." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 msgctxt "@title:tab" msgid "General" msgstr "Allgemein" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:462 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:453 msgctxt "@title:tab" msgid "Settings" msgstr "Einstellungen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:464 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 msgctxt "@title:tab" msgid "Printers" msgstr "Drucker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 msgctxt "@title:tab" msgid "Profiles" msgstr "Profile" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:576 msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "%1 wird geschlossen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:588 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "Möchten Sie %1 wirklich beenden?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:638 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Datei(en) öffnen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:744 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:737 msgctxt "@window:title" msgid "Install Package" msgstr "Paket installieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:752 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:745 msgctxt "@title:window" msgid "Open File(s)" msgstr "Datei(en) öffnen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:755 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:748 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Es wurden eine oder mehrere G-Code-Datei(en) innerhalb der von Ihnen gewählten Dateien gefunden. Sie können nur eine G-Code-Datei auf einmal öffnen. Wenn Sie eine G-Code-Datei öffnen möchten wählen Sie bitte nur eine Datei." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:858 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:857 msgctxt "@title:window" msgid "Add Printer" msgstr "Drucker hinzufügen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:866 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:865 msgctxt "@title:window" msgid "What's New" msgstr "Neuheiten" @@ -3577,7 +3757,8 @@ msgctxt "@Label" msgid "Static type checker for Python" msgstr "Statischer Prüfer für Python" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@Label" msgid "Root Certificates for validating SSL trustworthiness" msgstr "Root-Zertifikate zur Validierung der SSL-Vertrauenswürdigkeit" @@ -3597,17 +3778,27 @@ msgctxt "@label" msgid "Python bindings for libnest2d" msgstr "Python-Bindungen für libnest2d" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +msgctxt "@label" +msgid "Support library for system keyring access" +msgstr "Unterstützungsbibliothek für den Zugriff auf den Systemschlüsselbund" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" +msgid "Python extensions for Microsoft Windows" +msgstr "Python-Erweiterungen für Microsoft Windows" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +msgctxt "@label" msgid "Font" msgstr "Schriftart" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 msgctxt "@label" msgid "SVG icons" msgstr "SVG-Symbole" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:165 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Distributionsunabhängiges Format für Linux-Anwendungen" @@ -3617,22 +3808,22 @@ msgctxt "@title:window" msgid "Open project file" msgstr "Projektdatei öffnen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:88 msgctxt "@text:window" msgid "This is a Cura project file. Would you like to open it as a project or import the models from it?" msgstr "Dies ist eine Cura-Projektdatei. Möchten Sie diese als Projekt öffnen oder die Modelle hieraus importieren?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:98 msgctxt "@text:window" msgid "Remember my choice" msgstr "Meine Auswahl merken" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:122 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:117 msgctxt "@action:button" msgid "Open as project" msgstr "Als Projekt öffnen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:131 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:126 msgctxt "@action:button" msgid "Import models" msgstr "Modelle importieren" @@ -3663,7 +3854,8 @@ msgctxt "@title:column" msgid "Current changes" msgstr "Aktuelle Änderungen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Stets nachfragen" @@ -3688,12 +3880,12 @@ msgctxt "@action:button" msgid "Keep changes" msgstr "Änderungen speichern" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 msgctxt "@text:window" msgid "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?" msgstr "Es wurden eine oder mehrere Projektdatei(en) innerhalb der von Ihnen gewählten Dateien gefunden. Sie können nur eine Projektdatei auf einmal öffnen. Es wird empfohlen, nur Modelle aus diesen Dateien zu importieren. Möchten Sie fortfahren?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:99 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:94 msgctxt "@action:button" msgid "Import all as models" msgstr "Alle als Modelle importieren" @@ -3740,7 +3932,8 @@ msgctxt "@text Print job name" msgid "Untitled" msgstr "Unbenannt" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:27 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:27 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "&Datei" @@ -3750,12 +3943,14 @@ msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "&Bearbeiten" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:49 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:12 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:49 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:12 msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "&Ansicht" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:51 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&Settings" msgstr "&Einstellungen" @@ -3768,7 +3963,7 @@ msgstr "Er&weiterungen" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:94 msgctxt "@title:menu menubar:toplevel" msgid "P&references" -msgstr "E&instellungen" +msgstr "&Konfiguration" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:102 msgctxt "@title:menu menubar:toplevel" @@ -3845,7 +4040,7 @@ msgctxt "@label" msgid "Material" msgstr "Material" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:407 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Für diese Materialkombination Kleber für eine bessere Haftung verwenden." @@ -3869,17 +4064,17 @@ msgctxt "@label" msgid "Number of Copies" msgstr "Anzahl Kopien" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:33 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:41 msgctxt "@title:menu menubar:file" msgid "&Save Project..." msgstr "&Projekt speichern ..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:54 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:74 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&Exportieren..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:85 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Auswahl exportieren..." @@ -3899,6 +4094,11 @@ msgctxt "@label:category menu label" msgid "Generic" msgstr "Generisch" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/OpenFilesMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Open File(s)..." +msgstr "Datei(en) öffnen..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3914,6 +4114,11 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "&Zuletzt geöffnet" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SaveProjectMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Save Project..." +msgstr "Projekt speichern..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:15 msgctxt "@title:menu menubar:settings" msgid "&Printer" @@ -3939,17 +4144,17 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Extruder deaktivieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:16 msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Sichtbare Einstellungen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:45 msgctxt "@action:inmenu" msgid "Collapse All Categories" msgstr "Alle Kategorien schließen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Sichtbarkeit einstellen verwalten..." @@ -3959,22 +4164,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Kameraposition" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:45 msgctxt "@action:inmenu menubar:view" msgid "Camera view" msgstr "Kameraansicht" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:48 msgctxt "@action:inmenu menubar:view" msgid "Perspective" msgstr "Ansicht" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:60 msgctxt "@action:inmenu menubar:view" msgid "Orthographic" msgstr "Orthogonal" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:81 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "&Druckplatte" @@ -4019,12 +4224,12 @@ msgctxt "@label:MonitorStatus" msgid "Please remove the print" msgstr "Bitte den Ausdruck entfernen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@label" msgid "Abort Print" msgstr "Drucken abbrechen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:338 msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Soll das Drucken wirklich abgebrochen werden?" @@ -4066,310 +4271,314 @@ msgctxt "@label" msgid "Interface" msgstr "Schnittstelle" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:216 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:209 msgctxt "@label" msgid "Currency:" msgstr "Währung:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:229 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:222 msgctxt "@label" msgid "Theme:" msgstr "Thema:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Die Anwendung muss neu gestartet werden, um die Änderungen zu übernehmen." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:284 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Bei Änderung der Einstellungen automatisch schneiden." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 msgctxt "@option:check" msgid "Slice automatically" msgstr "Automatisch schneiden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:306 msgctxt "@label" msgid "Viewport behavior" msgstr "Viewport-Verhalten" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:314 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Nicht gestützte Bereiche des Modells in rot hervorheben. Ohne Support werden diese Bereiche nicht korrekt gedruckt." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:323 msgctxt "@option:check" msgid "Display overhang" msgstr "Überhang anzeigen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:351 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@info:tooltip" msgid "Highlight missing or extraneous surfaces of the model using warning signs. The toolpaths will often be missing parts of the intended geometry." msgstr "Heben Sie fehlende oder fehlerhafte Flächen des Modells mithilfe von Warnhinweisen hervor. In den Werkzeugpfaden fehlen oft Teile der beabsichtigten Geometrie." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:342 msgctxt "@option:check" msgid "Display model errors" msgstr "Modellfehler anzeigen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Bewegt die Kamera, bis sich das Modell im Mittelpunkt der Ansicht befindet, wenn ein Modell ausgewählt wurde" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:373 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Zentrieren Sie die Kamera, wenn das Element ausgewählt wurde" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Soll das standardmäßige Zoom-Verhalten von Cura umgekehrt werden?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:388 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Kehren Sie die Richtung des Kamera-Zooms um." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Soll das Zoomen in Richtung der Maus erfolgen?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "Das Zoomen in Richtung der Maus wird in der orthografischen Perspektive nicht unterstützt." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:409 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "In Mausrichtung zoomen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:435 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:417 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Sollen Modelle auf der Plattform so verschoben werden, dass sie sich nicht länger überschneiden?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:440 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:422 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Stellen Sie sicher, dass die Modelle getrennt gehalten werden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:431 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Sollen Modelle auf der Plattform so nach unten verschoben werden, dass sie die Druckplatte berühren?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:436 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Setzt Modelle automatisch auf der Druckplatte ab" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:448 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Warnmeldung im G-Code-Reader anzeigen." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:457 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Warnmeldung in G-Code-Reader" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Soll die Schicht in den Kompatibilitätsmodus gezwungen werden?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Schichtenansicht Kompatibilitätsmodus erzwingen (Neustart erforderlich)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:498 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" msgstr "Sollte Cura sich an der Stelle öffnen, an der das Programm geschlossen wurde?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:485 msgctxt "@option:check" msgid "Restore window position on start" msgstr "Fensterposition beim Start wiederherstellen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:513 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Welches Kamera-Rendering sollte verwendet werden?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:502 msgctxt "@window:text" msgid "Camera rendering:" msgstr "Kamera-Rendering:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:531 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:509 msgid "Perspective" msgstr "Ansicht" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:532 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgid "Orthographic" msgstr "Orthogonal" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:563 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:548 msgctxt "@label" msgid "Opening and saving files" msgstr "Dateien öffnen und speichern" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:555 msgctxt "@info:tooltip" msgid "Should opening files from the desktop or external applications open in the same instance of Cura?" msgstr "Sollten Dateien vom Desktop oder von externen Anwendungen in derselben Instanz von Cura geöffnet werden?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@option:check" msgid "Use a single instance of Cura" msgstr "Eine einzelne Instanz von Cura verwenden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Sollen Modelle an das Erstellungsvolumen angepasst werden, wenn sie zu groß sind?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@option:check" msgid "Scale large models" msgstr "Große Modelle anpassen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Ein Modell kann extrem klein erscheinen, wenn seine Maßeinheit z. B. in Metern anstelle von Millimetern angegeben ist. Sollen diese Modelle hoch skaliert werden?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Extrem kleine Modelle skalieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Sollten Modelle gewählt werden, nachdem sie geladen wurden?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Modelle wählen, nachdem sie geladen wurden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Soll ein Präfix anhand des Druckernamens automatisch zum Namen des Druckauftrags hinzugefügt werden?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:635 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Geräte-Präfix zu Auftragsnamen hinzufügen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:645 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Soll beim Speichern einer Projektdatei eine Zusammenfassung angezeigt werden?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:649 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:634 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Dialog Zusammenfassung beim Speichern eines Projekts anzeigen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:659 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:644 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Standardverhalten beim Öffnen einer Projektdatei" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:652 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Standardverhalten beim Öffnen einer Projektdatei: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Stets nachfragen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:682 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Immer als Projekt öffnen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:668 msgctxt "@option:openProject" msgid "Always import models" msgstr "Modelle immer importieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:705 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Wenn Sie Änderungen für ein Profil vorgenommen haben und zu einem anderen Profil gewechselt sind, wird ein Dialog angezeigt, der hinterfragt, ob Sie Ihre Änderungen beibehalten möchten oder nicht; optional können Sie ein Standardverhalten wählen, sodass dieser Dialog nicht erneut angezeigt wird." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:728 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Profile" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Standardverhalten für geänderte Einstellungswerte beim Wechsel zu einem anderen Profil: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:748 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:734 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Geänderte Einstellungen immer verwerfen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:749 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:735 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Geänderte Einstellungen immer auf neues Profil übertragen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:783 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@label" msgid "Privacy" msgstr "Privatsphäre" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:790 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:777 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Soll Cura bei Programmstart nach Updates suchen?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:795 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:782 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Bei Start nach Updates suchen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:805 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:792 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Sollen anonyme Daten über Ihren Druck an Ultimaker gesendet werden? Beachten Sie, dass keine Modelle, IP-Adressen oder andere personenbezogene Daten gesendet oder gespeichert werden." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:810 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:797 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "(Anonyme) Druckinformationen senden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:819 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:806 msgctxt "@action:button" msgid "More information" msgstr "Mehr Informationen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "Aktivieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "Umbenennen" @@ -4384,61 +4593,77 @@ msgctxt "@action:button" msgid "Duplicate" msgstr "Duplizieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:171 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:171 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "Import" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:185 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:185 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 msgctxt "@action:button" msgid "Export" msgstr "Export" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 +msgctxt "@action:button Sending materials to printers" +msgid "Sync with Printers" +msgstr "Mit Druckern synchronisieren" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" msgid "Printer" msgstr "Drucker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:298 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Entfernen bestätigen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:301 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Möchten Sie %1 wirklich entfernen? Dies kann nicht rückgängig gemacht werden!" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 msgctxt "@title:window" msgid "Import Material" msgstr "Material importieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:338 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Material konnte nicht importiert werden %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:328 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:342 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Material wurde erfolgreich importiert %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:346 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 msgctxt "@title:window" msgid "Export Material" msgstr "Material exportieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:358 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:372 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Exportieren des Materials nach %1: %2 schlug fehl" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:378 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Material erfolgreich nach %1 exportiert" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 +msgctxt "@title:window" +msgid "Export All Materials" +msgstr "Alle Materialien exportieren" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" @@ -4524,7 +4749,8 @@ msgctxt "@label" msgid "Adhesion Information" msgstr "Haftungsinformationen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Druckeinstellungen" @@ -4549,52 +4775,53 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Geben Sie bitte einen Namen für dieses Profil an." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Profil duplizieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@title:window" msgid "Rename Profile" msgstr "Profil umbenennen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:307 msgctxt "@title:window" msgid "Import Profile" msgstr "Profil importieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:336 msgctxt "@title:window" msgid "Export Profile" msgstr "Profil exportieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:399 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Drucker: %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:557 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Profil mit aktuellen Einstellungen/Überschreibungen aktualisieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 msgctxt "@action:button" msgid "Discard current changes" msgstr "Aktuelle Änderungen verwerfen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:583 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Dieses Profil verwendet die vom Drucker festgelegten Standardeinstellungen, deshalb sind in der folgenden Liste keine Einstellungen/Überschreibungen enthalten." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:591 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Ihre aktuellen Einstellungen stimmen mit dem gewählten Profil überein." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:609 msgctxt "@title:tab" msgid "Global Settings" msgstr "Globale Einstellungen" @@ -4624,12 +4851,12 @@ msgctxt "@title:column" msgid "Unit" msgstr "Einheit" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:16 msgctxt "@title:tab" msgid "Setting Visibility" msgstr "Sichtbarkeit einstellen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:48 msgctxt "@label:textbox" msgid "Check all" msgstr "Alle prüfen" @@ -4654,12 +4881,14 @@ msgctxt "@tooltip of temperature input" msgid "The temperature to pre-heat the hotend to." msgstr "Die Temperatur, auf die das Hotend vorgeheizt wird." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:341 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:332 msgctxt "@button Cancel pre-heating" msgid "Cancel" msgstr "Abbrechen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:344 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:344 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:335 msgctxt "@button" msgid "Pre-heat" msgstr "Vorheizen" @@ -4965,27 +5194,27 @@ msgctxt "@label:textbox" msgid "Search settings" msgstr "Einstellungen durchsuchen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:456 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:468 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Werte für alle Extruder kopieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:477 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Alle geänderten Werte für alle Extruder kopieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:502 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:514 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Diese Einstellung ausblenden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:515 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:527 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Diese Einstellung ausblenden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:531 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Diese Einstellung weiterhin anzeigen" @@ -5045,11 +5274,6 @@ msgctxt "@button" msgid "Add printer manually" msgstr "Drucker manuell hinzufügen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddCloudPrintersView.qml:218 -msgctxt "@button" -msgid "Finish" -msgstr "Beenden" - #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:230 msgctxt "@label" msgid "Manufacturer" @@ -5130,7 +5354,8 @@ msgctxt "@label" msgid "Could not connect to device." msgstr "Verbindung mit Drucker nicht möglich." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:207 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:212 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:207 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:212 msgctxt "@label" msgid "Can't connect to your Ultimaker printer?" msgstr "Sie können keine Verbindung zu Ihrem Ultimaker-Drucker herstellen?" @@ -5155,32 +5380,32 @@ msgctxt "@button" msgid "Connect" msgstr "Verbinden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:43 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" -msgid "Ultimaker Account" -msgstr "Ultimaker‑Konto" +msgid "Release Notes" +msgstr "Versionshinweise" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:124 msgctxt "@text" -msgid "Your key to connected 3D printing" -msgstr "Ihr Schlüssel zu vernetztem 3D-Druck" +msgid "Add material settings and plugins from the Marketplace" +msgstr "Materialeinstellungen und Plug-ins aus dem Marketplace hinzufügen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:101 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:154 msgctxt "@text" -msgid "- Customize your experience with more print profiles and plugins" -msgstr "- Personalisieren Sie Ihre Druckerfahrung mit weiteren Druckprofile und Plugins" +msgid "Backup and sync your material settings and plugins" +msgstr "Materialeinstellungen und Plug-ins sichern und synchronisieren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:184 msgctxt "@text" -msgid "- Stay flexible by syncing your setup and loading it anywhere" -msgstr "- Bleiben Sie flexibel, indem Sie Ihre Einstellungen synchronisieren und überall laden können" +msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" +msgstr "Ideenaustausch mit und Hilfe von mehr als 48.000 Benutzern in der Ultimaker Community" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:217 msgctxt "@text" -msgid "- Increase efficiency with a remote workflow on Ultimaker printers" -msgstr "- Steigern Sie Ihre Effizienz mit einem Remote-Workflow für Ultimaker-Drucker" +msgid "Create a free Ultimaker Account" +msgstr "Kostenloses Ultimaker-Konto erstellen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:230 msgctxt "@button" msgid "Skip" msgstr "Überspringen" @@ -5240,29 +5465,32 @@ msgctxt "@button" msgid "Decline and close" msgstr "Ablehnen und schließen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:29 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" msgid "Welcome to Ultimaker Cura" msgstr "Willkommen bei Ultimaker Cura" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:68 msgctxt "@text" -msgid "" -"Please follow these steps to set up\n" -"Ultimaker Cura. This will only take a few moments." +msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." msgstr "" "Befolgen Sie bitte diese Schritte für das Einrichten von\n" "Ultimaker Cura. Dies dauert nur wenige Sekunden." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:86 msgctxt "@button" msgid "Get started" msgstr "Erste Schritte" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:28 msgctxt "@label" -msgid "What's new in Ultimaker Cura" -msgstr "Neuheiten bei Ultimaker Cura" +msgid "What's New" +msgstr "Neuheiten" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Widgets/ComboBox.qml:24 +msgctxt "@label" +msgid "No items to select from" +msgstr "Keine auswählbaren Einträge" #: ModelChecker/plugin.json msgctxt "description" @@ -5344,6 +5572,16 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura-Profil-Writer" +#: DigitalLibrary/plugin.json +msgctxt "description" +msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." +msgstr "Stellt eine Verbindung zur Digitalen Bibliothek her und ermöglicht es Cura, Dateien aus der Digitalen Bibliothek zu öffnen und darin zu speichern." + +#: DigitalLibrary/plugin.json +msgctxt "name" +msgid "Ultimaker Digital Library" +msgstr "Digitale Bibliothek von Ultimaker" + #: FirmwareUpdateChecker/plugin.json msgctxt "description" msgid "Checks for firmware updates." @@ -5814,6 +6052,26 @@ msgctxt "name" msgid "Version Upgrade 4.7 to 4.8" msgstr "Upgrade von Version 4.7 auf 4.8" +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." +msgstr "Upgrade der Konfigurationen von Cura 4.8 auf Cura 4.9." + +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.8 to 4.9" +msgstr "Upgrade von Version 4.8 auf 4.9" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." +msgstr "Upgrade der Konfigurationen von Cura 4.9 auf Cura 4.10." + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.9 to 4.10" +msgstr "Upgrade von Version 4.9 auf 4.10" + #: X3DReader/plugin.json msgctxt "description" msgid "Provides support for reading X3D files." @@ -5844,6 +6102,94 @@ msgctxt "name" msgid "X-Ray View" msgstr "Röntgen-Ansicht" +#~ msgctxt "@info:status" +#~ msgid "Global stack is missing." +#~ msgstr "Globaler Stack fehlt." + +#~ msgctxt "@info:status" +#~ msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." +#~ msgstr "Ihrem Modell fehlen Schichten. Die fehlenden oder fehlerhaften Bereiche sind hervorgehoben." + +#~ msgctxt "@info:title" +#~ msgid "Model errors" +#~ msgstr "Modellfehler" + +#~ msgctxt "@label:listbox" +#~ msgid "Layer thickness" +#~ msgstr "Schichtdicke" + +#~ msgctxt "@label" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "Ihr Schlüssel zu vernetztem 3D-Druck" + +#~ msgctxt "@text" +#~ msgid "" +#~ "- Customize your experience with more print profiles and plugins\n" +#~ "- Stay flexible by syncing your setup and loading it anywhere\n" +#~ "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "" +#~ "- Personalisieren Sie Ihre Druckerfahrung mit weiteren Druckprofilen und Plugins\n" +#~ "- Bleiben Sie flexibel, indem Sie Ihre Einstellungen synchronisieren und überall laden können\n" +#~ "- Steigern Sie Ihre Effizienz mit einem Remote-Workflow für Ultimaker-Drucker" + +#~ msgctxt "@button" +#~ msgid "Create account" +#~ msgstr "Konto erstellen" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Delete Selected Model" +#~ msgid_plural "Delete Selected Models" +#~ msgstr[0] "Ausgewähltes Modell löschen" +#~ msgstr[1] "Ausgewählte Modelle löschen" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Center Selected Model" +#~ msgid_plural "Center Selected Models" +#~ msgstr[0] "Ausgewähltes Modell zentrieren" +#~ msgstr[1] "Ausgewählte Modelle zentrieren" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Multiply Selected Model" +#~ msgid_plural "Multiply Selected Models" +#~ msgstr[0] "Ausgewähltes Modell multiplizieren" +#~ msgstr[1] "Ausgewählte Modelle multiplizieren" + +#~ msgctxt "@button" +#~ msgid "Finish" +#~ msgstr "Beenden" + +#~ msgctxt "@label" +#~ msgid "Ultimaker Account" +#~ msgstr "Ultimaker‑Konto" + +#~ msgctxt "@text" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "Ihr Schlüssel zu vernetztem 3D-Druck" + +#~ msgctxt "@text" +#~ msgid "- Customize your experience with more print profiles and plugins" +#~ msgstr "- Personalisieren Sie Ihre Druckerfahrung mit weiteren Druckprofile und Plugins" + +#~ msgctxt "@text" +#~ msgid "- Stay flexible by syncing your setup and loading it anywhere" +#~ msgstr "- Bleiben Sie flexibel, indem Sie Ihre Einstellungen synchronisieren und überall laden können" + +#~ msgctxt "@text" +#~ msgid "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "- Steigern Sie Ihre Effizienz mit einem Remote-Workflow für Ultimaker-Drucker" + +#~ msgctxt "@text" +#~ msgid "" +#~ "Please follow these steps to set up\n" +#~ "Ultimaker Cura. This will only take a few moments." +#~ msgstr "" +#~ "Befolgen Sie bitte diese Schritte für das Einrichten von\n" +#~ "Ultimaker Cura. Dies dauert nur wenige Sekunden." + +#~ msgctxt "@label" +#~ msgid "What's new in Ultimaker Cura" +#~ msgstr "Neuheiten bei Ultimaker Cura" + #~ msgctxt "@label ({} is object name)" #~ msgid "Are you sure you wish to remove {}? This cannot be undone!" #~ msgstr "Möchten Sie {} wirklich entfernen? Der Vorgang kann nicht rückgängig gemacht werden!" @@ -6593,8 +6939,7 @@ msgstr "Röntgen-Ansicht" #~ "\n" #~ "Select your printer from the list below:" #~ msgstr "" -#~ "Um über das Netzwerk direkt auf Ihrem Drucker zu drucken, stellen Sie bitte sicher, dass der Drucker mit dem Netzwerkkabel verbunden ist oder verbinden Sie Ihren Drucker mit Ihrem WLAN-Netzwerk. Wenn Sie Cura nicht mit Ihrem Drucker verbinden, können Sie dennoch ein USB-Laufwerk für die Übertragung " -#~ "von G-Code-Dateien auf Ihren Drucker verwenden.\n" +#~ "Um über das Netzwerk direkt auf Ihrem Drucker zu drucken, stellen Sie bitte sicher, dass der Drucker mit dem Netzwerkkabel verbunden ist oder verbinden Sie Ihren Drucker mit Ihrem WLAN-Netzwerk. Wenn Sie Cura nicht mit Ihrem Drucker verbinden, können Sie dennoch ein USB-Laufwerk für die Übertragung von G-Code-Dateien auf Ihren Drucker verwenden.\n" #~ "\n" #~ "Wählen Sie Ihren Drucker aus der folgenden Liste:" diff --git a/resources/i18n/de_DE/fdmextruder.def.json.po b/resources/i18n/de_DE/fdmextruder.def.json.po index 76cabf3310..a0cc8d19be 100644 --- a/resources/i18n/de_DE/fdmextruder.def.json.po +++ b/resources/i18n/de_DE/fdmextruder.def.json.po @@ -1,19 +1,20 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2019-03-13 14:00+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 15:15+0200\n" "Last-Translator: Bothof \n" "Language-Team: German\n" "Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.4.1\n" #: fdmextruder.def.json msgctxt "machine_settings label" diff --git a/resources/i18n/de_DE/fdmprinter.def.json.po b/resources/i18n/de_DE/fdmprinter.def.json.po index 264f66656c..3eb590b680 100644 --- a/resources/i18n/de_DE/fdmprinter.def.json.po +++ b/resources/i18n/de_DE/fdmprinter.def.json.po @@ -1,20 +1,20 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2020-08-21 13:40+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 15:16+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: German , German \n" "Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.6\n" +"X-Generator: Poedit 2.4.1\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -419,6 +419,26 @@ msgctxt "machine_extruders_share_heater description" msgid "Whether the extruders share a single heater rather than each extruder having its own heater." msgstr "Gibt an, ob die Extruder sich ein Heizelement teilen oder jeweils über ein eigenes verfügen." +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle label" +msgid "Extruders Share Nozzle" +msgstr "Extruder teilen sich eine Düse" + +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle description" +msgid "Whether the extruders share a single nozzle rather than each extruder having its own nozzle. When set to true, it is expected that the printer-start gcode script properly sets up all extruders in an initial retraction state that is known and mutually compatible (either zero or one filament not retracted); in that case the initial retraction status is described, per extruder, by the 'machine_extruders_shared_nozzle_initial_retraction' parameter." +msgstr "Gibt an, ob die Extruder gemeinsam eine Düse nutzen oder jeweils über eine eigene verfügen. In der Einstellung „true“ ist zu erwarten, dass das GCode-Skript „printer-start“ alle Extruder ordnungsgemäß in einem bekannten und untereinander kompatiblen Anfangszustand anordnet (Rückzugstellung; entweder Null oder mit einem nicht zurückgezogenen Filament); in diesem Fall wird die anfängliche Rückzugstellung für jeden Extruder durch den Parameter „machine_extruders_shared_nozzle_initial_retraction“ beschrieben." + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction label" +msgid "Shared Nozzle Initial Retraction" +msgstr "Rückzugstellung der gemeinsam genutzten Düse" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction description" +msgid "How much the filament of each extruder is assumed to have been retracted from the shared nozzle tip at the completion of the printer-start gcode script; the value should be equal to or greater than the length of the common part of the nozzle's ducts." +msgstr "Bestimmt, wie weit das Filament jedes Extruders bei Abschluss des GCode-Skripts „printer-start“ von der gemeinsam genutzten Düsenspitze zurückgezogen sein soll; der Wert sollte gleich oder größer sein als die Länge des gemeinsamen Teils der Düsenkanäle." + #: fdmprinter.def.json msgctxt "machine_disallowed_areas label" msgid "Disallowed Areas" @@ -486,8 +506,8 @@ msgstr "Versatz mit Extruder" #: fdmprinter.def.json msgctxt "machine_use_extruder_offset_to_offset_coords description" -msgid "Apply the extruder offset to the coordinate system." -msgstr "Verwenden Sie den Extruder-Versatz für das Koordinatensystem." +msgid "Apply the extruder offset to the coordinate system. Affects all extruders." +msgstr "Verwenden Sie den Extruder-Versatz für das Koordinatensystem. Betrifft alle Extruder." #: fdmprinter.def.json msgctxt "extruder_prime_pos_z label" @@ -881,8 +901,8 @@ msgstr "Multiplikator der Linienbreite der ersten Schicht. Eine Erhöhung dieses #: fdmprinter.def.json msgctxt "shell label" -msgid "Shell" -msgstr "Gehäuse" +msgid "Walls" +msgstr "Wände" #: fdmprinter.def.json msgctxt "shell description" @@ -949,166 +969,6 @@ msgctxt "wall_0_wipe_dist description" msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better." msgstr "Entfernung einer Bewegung nach der Außenwand, um die Z-Naht besser zu verbergen." -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr label" -msgid "Top Surface Skin Extruder" -msgstr "Oberfläche Außenhaut Extruder" - -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr description" -msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." -msgstr "Die für das Drucken der obersten Außenhaut verwendete Extruder-Einheit. Diese wird für die Mehrfach-Extrusion benutzt." - -#: fdmprinter.def.json -msgctxt "roofing_layer_count label" -msgid "Top Surface Skin Layers" -msgstr "Oberfläche Außenhaut Schichten" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count description" -msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." -msgstr "Die Anzahl der obersten Außenhautschichten. Üblicherweise reicht eine einzige oberste Schicht aus, um höherwertige Oberflächen zu generieren." - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr label" -msgid "Top/Bottom Extruder" -msgstr "Extruder Oben/Unten" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr description" -msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." -msgstr "Die für das Drucken der oberen und unteren Außenhaut verwendete Extruder-Einheit. Diese wird für die Mehrfach-Extrusion benutzt." - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness label" -msgid "Top/Bottom Thickness" -msgstr "Obere/untere Dicke" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness description" -msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." -msgstr "Die Dicke der oberen/unteren Schichten des Drucks. Dieser Wert geteilt durch die Schichtdicke bestimmt die Anzahl der oberen/unteren Schichten." - -#: fdmprinter.def.json -msgctxt "top_thickness label" -msgid "Top Thickness" -msgstr "Obere Dicke" - -#: fdmprinter.def.json -msgctxt "top_thickness description" -msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." -msgstr "Die Dicke der oberen Schichten des Drucks. Dieser Wert geteilt durch die Schichtdicke bestimmt die Anzahl der oberen Schichten." - -#: fdmprinter.def.json -msgctxt "top_layers label" -msgid "Top Layers" -msgstr "Obere Schichten" - -#: fdmprinter.def.json -msgctxt "top_layers description" -msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." -msgstr "Die Anzahl der oberen Schichten. Wenn diese anhand der oberen Dicke berechnet wird, wird der Wert auf eine ganze Zahl auf- oder abgerundet." - -#: fdmprinter.def.json -msgctxt "bottom_thickness label" -msgid "Bottom Thickness" -msgstr "Untere Dicke" - -#: fdmprinter.def.json -msgctxt "bottom_thickness description" -msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." -msgstr "Die Dicke der unteren Schichten des Drucks. Dieser Wert geteilt durch die Schichtdicke bestimmt die Anzahl der unteren Schichten." - -#: fdmprinter.def.json -msgctxt "bottom_layers label" -msgid "Bottom Layers" -msgstr "Untere Schichten" - -#: fdmprinter.def.json -msgctxt "bottom_layers description" -msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "Die Anzahl der unteren Schichten. Wenn diese anhand der unteren Dicke berechnet wird, wird der Wert auf eine ganze Zahl auf- oder abgerundet." - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers label" -msgid "Initial Bottom Layers" -msgstr "Erste untere Schichten" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers description" -msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "Die Anzahl der ersten Schichten, die auf die Druckplatte aufgetragen werden. Wenn diese anhand der unteren Dicke berechnet werden, wird der Wert auf eine ganze Zahl auf- oder abgerundet." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern label" -msgid "Top/Bottom Pattern" -msgstr "Unteres/oberes Muster" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern description" -msgid "The pattern of the top/bottom layers." -msgstr "Das Muster der oberen/unteren Schichten." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option lines" -msgid "Lines" -msgstr "Linien" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option concentric" -msgid "Concentric" -msgstr "Konzentrisch" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option zigzag" -msgid "Zig Zag" -msgstr "Zickzack" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 label" -msgid "Bottom Pattern Initial Layer" -msgstr "Unteres Muster für erste Schicht" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 description" -msgid "The pattern on the bottom of the print on the first layer." -msgstr "Das Muster am Boden des Drucks der ersten Schicht." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option lines" -msgid "Lines" -msgstr "Linien" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option concentric" -msgid "Concentric" -msgstr "Konzentrisch" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option zigzag" -msgid "Zig Zag" -msgstr "Zickzack" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons label" -msgid "Connect Top/Bottom Polygons" -msgstr "Polygone oben/unten verbinden" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." -msgstr "Außenhaut-Pfade oben/unten verbinden, wenn sie nebeneinander laufen. Bei konzentrischen Mustern reduziert die Aktivierung dieser Einstellung die Durchlaufzeit erheblich. Da die Verbindungen jedoch auf halbem Weg über der Füllung erfolgen können, kann diese Funktion die Oberflächenqualität reduzieren." - -#: fdmprinter.def.json -msgctxt "skin_angles label" -msgid "Top/Bottom Line Directions" -msgstr "Richtungen der oberen/unteren Linie" - -#: fdmprinter.def.json -msgctxt "skin_angles description" -msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." -msgstr "Eine Liste von Ganzzahl-Linienrichtungen für den Fall, wenn die oberen/unteren Schichten die Linien- oder Zickzack-Muster verwenden. Elemente aus der Liste werden während des Aufbaus der Schichten sequentiell verwendet und wenn das Listenende erreicht wird, beginnt die Liste von vorne. Die Listenobjekte werden durch Kommas getrennt und die gesamte Liste ist in eckige Klammern gesetzt. Standardmäßig ist eine leere Liste vorhanden, was bedeutet, dass herkömmliche Standardwinkel (45- und 135-Grad) verwendet werden." - #: fdmprinter.def.json msgctxt "wall_0_inset label" msgid "Outer Wall Inset" @@ -1317,7 +1177,7 @@ msgstr "Hinten links" #: fdmprinter.def.json msgctxt "z_seam_position option back" msgid "Back" -msgstr "Zurück" +msgstr "Hinten" #: fdmprinter.def.json msgctxt "z_seam_position option backright" @@ -1414,6 +1274,176 @@ msgctxt "z_seam_relative description" msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate." msgstr "Bei Aktivierung sind die Z-Naht-Koordinaten relativ zur Mitte der jeweiligen Teile. Bei Deaktivierung definieren die Koordinaten eine absolute Position auf dem Druckbett." +#: fdmprinter.def.json +msgctxt "top_bottom label" +msgid "Top/Bottom" +msgstr "Oben/Unten" + +#: fdmprinter.def.json +msgctxt "top_bottom description" +msgid "Top/Bottom" +msgstr "Oben/Unten" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr label" +msgid "Top Surface Skin Extruder" +msgstr "Oberfläche Außenhaut Extruder" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr description" +msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." +msgstr "Die für das Drucken der obersten Außenhaut verwendete Extruder-Einheit. Diese wird für die Mehrfach-Extrusion benutzt." + +#: fdmprinter.def.json +msgctxt "roofing_layer_count label" +msgid "Top Surface Skin Layers" +msgstr "Oberfläche Außenhaut Schichten" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count description" +msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." +msgstr "Die Anzahl der obersten Außenhautschichten. Üblicherweise reicht eine einzige oberste Schicht aus, um höherwertige Oberflächen zu generieren." + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr label" +msgid "Top/Bottom Extruder" +msgstr "Extruder Oben/Unten" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr description" +msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." +msgstr "Die für das Drucken der oberen und unteren Außenhaut verwendete Extruder-Einheit. Diese wird für die Mehrfach-Extrusion benutzt." + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness label" +msgid "Top/Bottom Thickness" +msgstr "Obere/untere Dicke" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness description" +msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." +msgstr "Die Dicke der oberen/unteren Schichten des Drucks. Dieser Wert geteilt durch die Schichtdicke bestimmt die Anzahl der oberen/unteren Schichten." + +#: fdmprinter.def.json +msgctxt "top_thickness label" +msgid "Top Thickness" +msgstr "Obere Dicke" + +#: fdmprinter.def.json +msgctxt "top_thickness description" +msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." +msgstr "Die Dicke der oberen Schichten des Drucks. Dieser Wert geteilt durch die Schichtdicke bestimmt die Anzahl der oberen Schichten." + +#: fdmprinter.def.json +msgctxt "top_layers label" +msgid "Top Layers" +msgstr "Obere Schichten" + +#: fdmprinter.def.json +msgctxt "top_layers description" +msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." +msgstr "Die Anzahl der oberen Schichten. Wenn diese anhand der oberen Dicke berechnet wird, wird der Wert auf eine ganze Zahl auf- oder abgerundet." + +#: fdmprinter.def.json +msgctxt "bottom_thickness label" +msgid "Bottom Thickness" +msgstr "Untere Dicke" + +#: fdmprinter.def.json +msgctxt "bottom_thickness description" +msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." +msgstr "Die Dicke der unteren Schichten des Drucks. Dieser Wert geteilt durch die Schichtdicke bestimmt die Anzahl der unteren Schichten." + +#: fdmprinter.def.json +msgctxt "bottom_layers label" +msgid "Bottom Layers" +msgstr "Untere Schichten" + +#: fdmprinter.def.json +msgctxt "bottom_layers description" +msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "Die Anzahl der unteren Schichten. Wenn diese anhand der unteren Dicke berechnet wird, wird der Wert auf eine ganze Zahl auf- oder abgerundet." + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "Erste untere Schichten" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "Die Anzahl der ersten Schichten, die auf die Druckplatte aufgetragen werden. Wenn diese anhand der unteren Dicke berechnet werden, wird der Wert auf eine ganze Zahl auf- oder abgerundet." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern label" +msgid "Top/Bottom Pattern" +msgstr "Unteres/oberes Muster" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern description" +msgid "The pattern of the top/bottom layers." +msgstr "Das Muster der oberen/unteren Schichten." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option lines" +msgid "Lines" +msgstr "Linien" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option concentric" +msgid "Concentric" +msgstr "Konzentrisch" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option zigzag" +msgid "Zig Zag" +msgstr "Zickzack" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 label" +msgid "Bottom Pattern Initial Layer" +msgstr "Unteres Muster für erste Schicht" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 description" +msgid "The pattern on the bottom of the print on the first layer." +msgstr "Das Muster am Boden des Drucks der ersten Schicht." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option lines" +msgid "Lines" +msgstr "Linien" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option concentric" +msgid "Concentric" +msgstr "Konzentrisch" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option zigzag" +msgid "Zig Zag" +msgstr "Zickzack" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons label" +msgid "Connect Top/Bottom Polygons" +msgstr "Polygone oben/unten verbinden" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons description" +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "Außenhaut-Pfade oben/unten verbinden, wenn sie nebeneinander laufen. Bei konzentrischen Mustern reduziert die Aktivierung dieser Einstellung die Durchlaufzeit erheblich. Da die Verbindungen jedoch auf halbem Weg über der Füllung erfolgen können, kann diese Funktion die Oberflächenqualität reduzieren." + +#: fdmprinter.def.json +msgctxt "skin_angles label" +msgid "Top/Bottom Line Directions" +msgstr "Richtungen der oberen/unteren Linie" + +#: fdmprinter.def.json +msgctxt "skin_angles description" +msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." +msgstr "Eine Liste von Ganzzahl-Linienrichtungen für den Fall, wenn die oberen/unteren Schichten die Linien- oder Zickzack-Muster verwenden. Elemente aus der Liste werden während des Aufbaus der Schichten sequentiell verwendet und wenn das Listenende erreicht wird, beginnt die Liste von vorne. Die Listenobjekte werden durch Kommas getrennt und die gesamte Liste ist in eckige Klammern gesetzt. Standardmäßig ist eine leere Liste vorhanden, was bedeutet, dass herkömmliche Standardwinkel (45- und 135-Grad) verwendet werden." + #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" msgid "No Skin in Z Gaps" @@ -1554,6 +1584,86 @@ msgctxt "skin_overlap_mm description" msgid "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any value over half the width of the wall may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall." msgstr "Justieren Sie die Überlappung zwischen den Wänden und den Außenhaut-Mittellinien bzw. den Endpunkten der Außenhaut-Mittellinien. Eine geringe Überlappung ermöglicht die feste Verbindung der Wände mit der Außenhaut. Beachten Sie, dass bei einer einheitlichen Linienbreite von Außenhaut und Wand jeder Wert über die Hälfte der Wandbreite bereits dazu führen kann, dass die Außenhaut über die Wand hinausgeht, da in diesem Moment die Position der Düse des Außenhaut-Extruders möglicherweise bereits über die Wandmitte hinausgeht." +#: fdmprinter.def.json +msgctxt "skin_preshrink label" +msgid "Skin Removal Width" +msgstr "Breite für das Entfernen der Außenhaut" + +#: fdmprinter.def.json +msgctxt "skin_preshrink description" +msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." +msgstr "Dies bezeichnet die größte Breite der zu entfernenden Außenhautbereiche. Jeder Außenhautbereich, der kleiner als dieser Wert ist, verschwindet. Dies kann bei der Beschränkung der benötigten Zeit und Materialmenge für das Drucken der Außenhaut oben/unten an abgeschrägten Flächen des Modells unterstützen." + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink label" +msgid "Top Skin Removal Width" +msgstr "Breite für das Entfernen der Außenhaut oben" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink description" +msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." +msgstr "Dies bezeichnet die größte Breite der zu entfernenden oberen Außenhautbereiche. Jeder Außenhautbereich, der kleiner als dieser Wert ist, verschwindet. Dies kann bei der Beschränkung der benötigten Zeit und Materialmenge für das Drucken der oberen Außenhaut an abgeschrägten Flächen des Modells unterstützen." + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink label" +msgid "Bottom Skin Removal Width" +msgstr "Breite für das Entfernen der Außenhaut unten" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink description" +msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." +msgstr "Dies bezeichnet die größte Breite der zu entfernenden unteren Außenhautbereiche. Jeder Außenhautbereich, der kleiner als dieser Wert ist, verschwindet. Dies kann bei der Beschränkung der benötigten Zeit und Materialmenge für das Drucken der unteren Außenhaut an abgeschrägten Flächen des Modells unterstützen." + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance label" +msgid "Skin Expand Distance" +msgstr "Expansionsdistanz Außenhaut" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance description" +msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." +msgstr "Die Distanz, um die die Außenhäute in die Füllung expandiert werden. Höhere Werte lassen die Außenhaut besser am Füllmuster und die Wände an den angrenzenden Schichten besser an der Außenhaut haften. Niedrigere Werte reduzieren den Materialverbrauch." + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance label" +msgid "Top Skin Expand Distance" +msgstr "Expansionsdistanz Außenhaut oben" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance description" +msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." +msgstr "Die Distanz, um die die oberen Außenhäute in die Füllung expandiert werden. Höhere Werte lassen die Außenhaut besser am Füllmuster und die Wände an den Schichten darüber besser an der Außenhaut haften. Niedrigere Werte reduzieren den Materialverbrauch." + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance label" +msgid "Bottom Skin Expand Distance" +msgstr "Expansionsdistanz Außenhaut unten" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance description" +msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." +msgstr "Die Distanz, um die die unteren Außenhäute in die Füllung expandiert werden. Höhere Werte lassen die Außenhaut besser am Füllmuster und an den Wänden auf der darunter liegenden Schicht haften. Niedrigere Werte reduzieren den Materialverbrauch." + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion label" +msgid "Maximum Skin Angle for Expansion" +msgstr "Maximaler Winkel Außenhaut für Expansion" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion description" +msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded." +msgstr "Die Außenhaut von Ober- und/oder Unterseiten Ihres Objekts, deren Winkel größer als dieser Wert sind, werden nicht expandiert. Dadurch wird vermieden, dass die schmalen Außenhautbereiche, die entstehen, wenn die Modelloberfläche eine nahezu vertikale Neigung aufweist, expandiert werden. Ein Winkel von 0° ist horizontal und führt dazu, dass ein solcher Außenhautbereich nicht expandiert wird; ein Winkel von 90° ist vertikal und führt dazu, dass die gesamte Außenhaut expandiert wird." + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion label" +msgid "Minimum Skin Width for Expansion" +msgstr "Mindestbreite Außenhaut für Expansion" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion description" +msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." +msgstr "Außenhautbereiche, die schmaler als die Mindestbreite sind, werden nicht expandiert. Damit wird vermieden, dass enge Außenhautbereiche expandiert werden, die entstehen, wenn die Modellfläche eine nahezu vertikale Neigung aufweist." + #: fdmprinter.def.json msgctxt "infill label" msgid "Infill" @@ -1863,86 +1973,6 @@ msgctxt "infill_support_angle description" msgid "The minimum angle of internal overhangs for which infill is added. At a value of 0° objects are totally filled with infill, 90° will not provide any infill." msgstr "Der Mindestwinkel für Überhänge, für welche eine Stützstruktur zugefügt wird. Bei einem Wert von 0° werden Objekte komplett gefüllt, bei 90° wird keine Füllung ausgeführt." -#: fdmprinter.def.json -msgctxt "skin_preshrink label" -msgid "Skin Removal Width" -msgstr "Breite für das Entfernen der Außenhaut" - -#: fdmprinter.def.json -msgctxt "skin_preshrink description" -msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." -msgstr "Dies bezeichnet die größte Breite der zu entfernenden Außenhautbereiche. Jeder Außenhautbereich, der kleiner als dieser Wert ist, verschwindet. Dies kann bei der Beschränkung der benötigten Zeit und Materialmenge für das Drucken der Außenhaut oben/unten an abgeschrägten Flächen des Modells unterstützen." - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink label" -msgid "Top Skin Removal Width" -msgstr "Breite für das Entfernen der Außenhaut oben" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink description" -msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." -msgstr "Dies bezeichnet die größte Breite der zu entfernenden oberen Außenhautbereiche. Jeder Außenhautbereich, der kleiner als dieser Wert ist, verschwindet. Dies kann bei der Beschränkung der benötigten Zeit und Materialmenge für das Drucken der oberen Außenhaut an abgeschrägten Flächen des Modells unterstützen." - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink label" -msgid "Bottom Skin Removal Width" -msgstr "Breite für das Entfernen der Außenhaut unten" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink description" -msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." -msgstr "Dies bezeichnet die größte Breite der zu entfernenden unteren Außenhautbereiche. Jeder Außenhautbereich, der kleiner als dieser Wert ist, verschwindet. Dies kann bei der Beschränkung der benötigten Zeit und Materialmenge für das Drucken der unteren Außenhaut an abgeschrägten Flächen des Modells unterstützen." - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance label" -msgid "Skin Expand Distance" -msgstr "Expansionsdistanz Außenhaut" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance description" -msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." -msgstr "Die Distanz, um die die Außenhäute in die Füllung expandiert werden. Höhere Werte lassen die Außenhaut besser am Füllmuster und die Wände an den angrenzenden Schichten besser an der Außenhaut haften. Niedrigere Werte reduzieren den Materialverbrauch." - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance label" -msgid "Top Skin Expand Distance" -msgstr "Expansionsdistanz Außenhaut oben" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance description" -msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." -msgstr "Die Distanz, um die die oberen Außenhäute in die Füllung expandiert werden. Höhere Werte lassen die Außenhaut besser am Füllmuster und die Wände an den Schichten darüber besser an der Außenhaut haften. Niedrigere Werte reduzieren den Materialverbrauch." - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance label" -msgid "Bottom Skin Expand Distance" -msgstr "Expansionsdistanz Außenhaut unten" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance description" -msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." -msgstr "Die Distanz, um die die unteren Außenhäute in die Füllung expandiert werden. Höhere Werte lassen die Außenhaut besser am Füllmuster und an den Wänden auf der darunter liegenden Schicht haften. Niedrigere Werte reduzieren den Materialverbrauch." - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion label" -msgid "Maximum Skin Angle for Expansion" -msgstr "Maximaler Winkel Außenhaut für Expansion" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion description" -msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." -msgstr "Obere und/oder untere Flächen Ihres Objekts mit einem Winkel, der diese Einstellung übersteigt, werden ohne Expansion der oberen/unteren Außenhaut ausgeführt. Damit wird vermieden, dass enge Außenhautbereiche expandiert werden, die entstehen, wenn die Modellfläche eine nahezu vertikale Neigung aufweist. Ein Winkel von 0 Grad ist horizontal, während ein Winkel von 90 Grad vertikal ist." - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion label" -msgid "Minimum Skin Width for Expansion" -msgstr "Mindestbreite Außenhaut für Expansion" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion description" -msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." -msgstr "Außenhautbereiche, die schmaler als die Mindestbreite sind, werden nicht expandiert. Damit wird vermieden, dass enge Außenhautbereiche expandiert werden, die entstehen, wenn die Modellfläche eine nahezu vertikale Neigung aufweist." - #: fdmprinter.def.json msgctxt "skin_edge_support_thickness label" msgid "Skin Edge Support Thickness" @@ -2560,8 +2590,8 @@ msgstr "Geschwindigkeit der ersten Schicht" #: fdmprinter.def.json msgctxt "speed_layer_0 description" -msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." -msgstr "Die Geschwindigkeit für die erste Schicht. Ein niedrigerer Wert wird empfohlen, um die Haftung an der Druckplatte zu verbessern." +msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate. Does not affect the build plate adhesion structures themselves, like brim and raft." +msgstr "Die Geschwindigkeit für die erste Schicht. Ein niedrigerer Wert wird empfohlen, um die Haftung auf der Bauplatte zu verbessern. Hat keinen Einfluss auf die Haftstrukturen des Druckbetts selbst, wie Krempe und Raft." #: fdmprinter.def.json msgctxt "speed_print_layer_0 label" @@ -3170,8 +3200,9 @@ msgstr "Max. Kammentfernung ohne Einziehen" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" -msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." -msgstr "Bei Nicht-Null verwenden die Combing-Fahrbewegungen, die länger als die Distanz sind, die Einziehfunktion." +msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." +msgstr "Bei Werten größer als Null verwenden die Combing-Fahrbewegungen, die weiter als über diese Distanz erfolgen, die Einzugsfunktion. Beim Wert Null gibt es" +" keine Maximalstellung, und die Combing-Fahrbewegungen verwenden die Einzugsfunktion nicht." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" @@ -5074,10 +5105,8 @@ msgstr "Rang der Netzverarbeitung" #: fdmprinter.def.json msgctxt "infill_mesh_order description" -msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." -msgstr "Legt fest, welche Priorität dieses Netz (Mesh) bei mehreren überlappenden Mesh-Füllungen hat. Bereiche, in denen mehrere Mesh-Füllungen überlappen, übernehmen" -" die Einstellungen des Netzes mit dem niedrigsten Rang. Wird eine Mesh-Füllung höher gerankt, führt dies zu einer Modifizierung der Füllungen oder Mesh-Füllungen," -" deren Priorität niedriger oder normal ist." +msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the highest rank. An infill mesh with a higher rank will modify the infill of infill meshes with lower rank and normal meshes." +msgstr "Legt fest, welchen Rang dieses Netz (Mesh) bei mehreren überlappenden Mesh-Füllungen hat. Bereiche, in denen mehrere Mesh-Füllungen überlappen, übernehmen die Einstellungen des Netzes mit dem höchsten Rang. Ist der Rang einer Mesh-Füllung höher, führt dies zu einer Modifizierung der Füllungen oder Mesh-Füllungen, deren Rang niedriger oder normal ist." #: fdmprinter.def.json msgctxt "cutting_mesh label" @@ -5424,6 +5453,16 @@ msgctxt "conical_overhang_angle description" msgid "The maximum angle of overhangs after the they have been made printable. At a value of 0° all overhangs are replaced by a piece of model connected to the build plate, 90° will not change the model in any way." msgstr "Der maximale Winkel von Überhängen, nachdem sie druckbar gemacht wurden. Bei einem Wert von 0° werden alle Überhänge durch ein Teil des Modells ersetzt, das mit der Druckplatte verbunden ist, 90° führt zu keiner Änderung des Modells." +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size label" +msgid "Maximum Overhang Hole Area" +msgstr "Maximaler Lochflächen-Überstand" + +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size description" +msgid "The maximum area of a hole in the base of the model before it's removed by Make Overhang Printable. Holes smaller than this will be retained. A value of 0 mm² will fill all holes in the models base." +msgstr "Die maximale Fläche eines Lochs im Sockel des Modells, das mittels „Überhang drucken“ entfernt werden soll. Löcher mit kleinerer Fläche werden beibehalten. Beim Wert 0 mm² werden alle Löcher in der Modellbasis gefüllt." + #: fdmprinter.def.json msgctxt "coasting_enable label" msgid "Enable Coasting" @@ -6363,6 +6402,30 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Transformationsmatrix, die beim Laden aus der Datei auf das Modell angewandt wird." +#~ msgctxt "retraction_combing_max_distance description" +#~ msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." +#~ msgstr "Bei Nicht-Null verwenden die Combing-Fahrbewegungen, die länger als die Distanz sind, die Einziehfunktion." + +#~ msgctxt "machine_use_extruder_offset_to_offset_coords description" +#~ msgid "Apply the extruder offset to the coordinate system." +#~ msgstr "Verwenden Sie den Extruder-Versatz für das Koordinatensystem." + +#~ msgctxt "shell label" +#~ msgid "Shell" +#~ msgstr "Gehäuse" + +#~ msgctxt "max_skin_angle_for_expansion description" +#~ msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." +#~ msgstr "Obere und/oder untere Flächen Ihres Objekts mit einem Winkel, der diese Einstellung übersteigt, werden ohne Expansion der oberen/unteren Außenhaut ausgeführt. Damit wird vermieden, dass enge Außenhautbereiche expandiert werden, die entstehen, wenn die Modellfläche eine nahezu vertikale Neigung aufweist. Ein Winkel von 0 Grad ist horizontal, während ein Winkel von 90 Grad vertikal ist." + +#~ msgctxt "speed_layer_0 description" +#~ msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." +#~ msgstr "Die Geschwindigkeit für die erste Schicht. Ein niedrigerer Wert wird empfohlen, um die Haftung an der Druckplatte zu verbessern." + +#~ msgctxt "infill_mesh_order description" +#~ msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." +#~ msgstr "Legt fest, welche Priorität dieses Netz (Mesh) bei mehreren überlappenden Mesh-Füllungen hat. Bereiche, in denen mehrere Mesh-Füllungen überlappen, übernehmen die Einstellungen des Netzes mit dem niedrigsten Rang. Wird eine Mesh-Füllung höher gerankt, führt dies zu einer Modifizierung der Füllungen oder Mesh-Füllungen, deren Priorität niedriger oder normal ist." + #~ msgctxt "material_bed_temperature description" #~ msgid "The temperature used for the heated build plate. If this is 0, the bed temperature will not be adjusted." #~ msgstr "Die Temperatur, die für die erhitzte Druckplatte verwendet wird. Wenn dieser Wert 0 beträgt, wird die Betttemperatur nicht angepasst." diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index 14396c0549..08bb506928 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -1,24 +1,28 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0200\n" -"PO-Revision-Date: 2020-11-09 14:01+0100\n" +"POT-Creation-Date: 2021-06-10 17:35+0200\n" +"PO-Revision-Date: 2021-04-16 15:15+0200\n" "Last-Translator: Lionbridge \n" +"Language-Team: \n" "Language: es_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.4.1\n" -"Language-Team: \n" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1581 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 msgctxt "@label" msgid "Unknown" msgstr "Desconocido" @@ -44,47 +48,56 @@ msgctxt "@label {0} is the name of a printer that's about to be deleted." msgid "Are you sure you wish to remove {0}? This cannot be undone!" msgstr "¿Seguro que desea eliminar {0}? ¡Esta acción no se puede deshacer!" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 msgctxt "@label" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 msgctxt "@label" msgid "Visual" msgstr "Visual" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." msgstr "El perfil visual está diseñado para imprimir prototipos y modelos visuales con la intención de obtener una alta calidad visual y de superficies." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 msgctxt "@label" msgid "Engineering" msgstr "Engineering" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." msgstr "El perfil de ingeniería ha sido diseñado para imprimir prototipos funcionales y piezas de uso final con la intención de obtener una mayor precisión y tolerancias más precisas." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 msgctxt "@label" msgid "Draft" msgstr "Boceto" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "El perfil del boceto ha sido diseñado para imprimir los prototipos iniciales y la validación del concepto con la intención de reducir el tiempo de impresión de manera considerable." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:226 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:234 msgctxt "@label" msgid "Custom Material" msgstr "Material personalizado" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:227 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 msgctxt "@label" msgid "Custom" msgstr "Personalizado" @@ -105,51 +118,63 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Todos los archivos (*)" -#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:178 +#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:181 msgctxt "@info:title" msgid "Login failed" msgstr "Fallo de inicio de sesión" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:67 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:67 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:24 msgctxt "@info:status" msgid "Finding new location for objects" msgstr "Buscando nueva ubicación para los objetos" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:71 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:28 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:71 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:28 msgctxt "@info:title" msgid "Finding Location" msgstr "Buscando ubicación" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:150 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:76 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:150 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 +#: /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:76 msgctxt "@info:status" msgid "Unable to find a location within the build volume for all objects" msgstr "No se puede encontrar una ubicación dentro del volumen de impresión para todos los objetos" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:151 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:42 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:151 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:42 msgctxt "@info:title" msgid "Can't Find Location" msgstr "No se puede encontrar la ubicación" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:104 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:116 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "No se ha podido crear el archivo desde el directorio de datos de usuario: {}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:110 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 msgctxt "@info:title" msgid "Backup" msgstr "Copia de seguridad" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:123 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:135 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "Se ha intentado restaurar una copia de seguridad de Cura sin tener los datos o metadatos adecuados." -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:134 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:146 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that is higher than the current version." msgstr "Se ha intentado restaurar una copia de seguridad de Cura superior a la versión actual." +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 +msgctxt "@info:backup_failed" +msgid "The following error occurred while trying to restore a Cura backup:" +msgstr "Se ha producido el siguiente error al intentar restaurar una copia de seguridad de Cura:" + #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -299,71 +324,77 @@ msgctxt "@action:button" msgid "Send report" msgstr "Enviar informe" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:521 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:527 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Cargando máquinas..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:528 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:534 msgctxt "@info:progress" msgid "Setting up preferences..." msgstr "Configurando preferencias...." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:657 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:672 msgctxt "@info:progress" msgid "Initializing Active Machine..." msgstr "Iniciando la máquina activa..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:803 msgctxt "@info:progress" msgid "Initializing machine manager..." msgstr "Iniciando el administrador de la máquina..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:802 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:817 msgctxt "@info:progress" msgid "Initializing build volume..." msgstr "Iniciando el volumen de impresión..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:870 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:888 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Configurando escena..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:906 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:924 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Cargando interfaz..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:911 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:929 msgctxt "@info:progress" msgid "Initializing engine..." msgstr "Iniciando el motor..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1221 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1246 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1777 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1799 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Solo se puede cargar un archivo GCode a la vez. Se omitió la importación de {0}" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1778 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:188 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 msgctxt "@info:title" msgid "Warning" msgstr "Advertencia" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1787 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1809 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "No se puede abrir ningún archivo si se está cargando un archivo GCode. Se omitió la importación de {0}" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1788 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 msgctxt "@info:title" msgid "Error" msgstr "Error" @@ -383,7 +414,7 @@ msgctxt "@info:title" msgid "Placing Object" msgstr "Colocando objeto" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:92 msgctxt "@message" msgid "Could not read response." msgstr "No se ha podido leer la respuesta." @@ -403,28 +434,31 @@ msgctxt "@message" msgid "Something unexpected happened when trying to log in, please try again." msgstr "Se ha producido un problema al intentar iniciar sesión, vuelva a intentarlo." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:187 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:189 msgctxt "@info" msgid "Unable to start a new sign in process. Check if another sign in attempt is still active." msgstr "No se puede iniciar un nuevo proceso de inicio de sesión. Compruebe si todavía está activo otro intento de inicio de sesión." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "No se puede acceder al servidor de cuentas de Ultimaker." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:205 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:205 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 msgctxt "@title:window" msgid "File Already Exists" msgstr "El archivo ya existe" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:206 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:206 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "El archivo {0} ya existe. ¿Está seguro de que desea sobrescribirlo?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:452 /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:455 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "URL del archivo no válida:" @@ -476,7 +510,8 @@ msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Error al importar el perfil de {0}:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:235 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:245 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:235 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:245 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." @@ -506,33 +541,33 @@ msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "El perfil {0} tiene un tipo de archivo desconocido o está corrupto." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:423 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:426 msgctxt "@label" msgid "Custom profile" msgstr "Perfil personalizado" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:439 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:442 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Al perfil le falta un tipo de calidad." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:443 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:446 msgctxt "@info:status" -msgid "Global stack is missing." -msgstr "Falta la pila global." +msgid "There is no active printer yet." +msgstr "Todavía no hay ninguna impresora activa." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:449 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:452 msgctxt "@info:status" msgid "Unable to add the profile." msgstr "No se puede añadir el perfil." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:463 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:466 #, python-brace-format msgctxt "@info:status" msgid "Quality type '{0}' is not compatible with the current active machine definition '{1}'." msgstr "El tipo de calidad '{0}' no es compatible con la definición actual de máquina activa '{1}'." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:468 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:471 #, python-brace-format msgctxt "@info:status" msgid "Warning: The profile is not visible because its quality type '{0}' is not available for the current configuration. Switch to a material/nozzle combination that can use this quality type." @@ -548,39 +583,50 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:712 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 msgctxt "@label" msgid "Nozzle" msgstr "Tobera" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:860 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:856 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "La configuración se ha cambiado para que coincida con los extrusores disponibles en este momento:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:862 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:858 msgctxt "@info:title" msgid "Settings updated" msgstr "Ajustes actualizados" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1447 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1478 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extrusores deshabilitados" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:67 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:67 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "Agregar" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:263 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 msgctxt "@action:button" msgid "Finish" msgstr "Finalizar" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:441 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml:81 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml:81 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 msgctxt "@action:button" msgid "Cancel" @@ -592,73 +638,84 @@ msgctxt "@label" msgid "Group #{group_nr}" msgstr "N.º de grupo {group_nr}" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Pared exterior" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Paredes interiores" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Forro" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Relleno" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Relleno de soporte" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Interfaz de soporte" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Soporte" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Falda" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 msgctxt "@tooltip" msgid "Prime Tower" msgstr "Torre auxiliar" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 msgctxt "@tooltip" msgid "Travel" msgstr "Desplazamiento" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 msgctxt "@tooltip" msgid "Retractions" msgstr "Retracciones" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:94 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 msgctxt "@tooltip" msgid "Other" msgstr "Otro" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 msgctxt "@action:button" msgid "Next" msgstr "Siguiente" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:173 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 +msgctxt "@action:button" +msgid "Skip" +msgstr "Omitir" + +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 +#: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 msgctxt "@action:button" msgid "Close" msgstr "Cerrar" @@ -682,29 +739,36 @@ msgstr "" "

    Obtenga más información sobre cómo garantizar la mejor calidad y fiabilidad de impresión posible.

    \n" "

    Ver guía de impresión de calidad

    " -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:535 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:540 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "El archivo del proyecto {0} contiene un tipo de máquina desconocida {1}. No se puede importar la máquina, en su lugar, se importarán los modelos." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:538 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:543 msgctxt "@info:title" msgid "Open Project File" msgstr "Abrir archivo de proyecto" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:634 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:639 #, python-brace-format msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "El archivo de proyecto {0} está repentinamente inaccesible: {1}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:635 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "No se puede abrir el archivo de proyecto" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:686 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:646 +#, python-brace-format +msgctxt "@info:error Don't translate the XML tags or !" +msgid "Project file {0} is corrupt: {1}." +msgstr "El archivo de proyecto {0} está dañado: {1}." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:698 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." @@ -720,7 +784,8 @@ msgctxt "@title:tab" msgid "Custom" msgstr "Personalizado" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 msgctxt "@item:inlistbox" msgid "3MF File" msgstr "Archivo 3MF" @@ -730,7 +795,8 @@ msgctxt "@error:zip" msgid "3MF Writer plug-in is corrupt." msgstr "El complemento del Escritor de 3MF está dañado." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:59 /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:92 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:59 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:92 msgctxt "@error:zip" msgid "No permission to write the workspace here." msgstr "No tiene permiso para escribir el espacio de trabajo aquí." @@ -740,7 +806,7 @@ msgctxt "@error:zip" msgid "The operating system does not allow saving a project file to this location or with this file name." msgstr "El sistema operativo no permite guardar un archivo de proyecto en esta ubicación ni con este nombre de archivo." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:206 msgctxt "@error:zip" msgid "Error writing 3mf file." msgstr "Error al escribir el archivo 3MF." @@ -795,7 +861,8 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "La copia de seguridad excede el tamaño máximo de archivo." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:82 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:23 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "Se ha producido un error al intentar restaurar su copia de seguridad." @@ -805,41 +872,45 @@ msgctxt "@item:inmenu" msgid "Manage backups" msgstr "Administrar copias de seguridad" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "No se puede segmentar con el material actual, ya que es incompatible con el dispositivo o la configuración seleccionados." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:411 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:420 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:429 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 msgctxt "@info:title" msgid "Unable to slice" msgstr "No se puede segmentar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:412 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Los ajustes actuales no permiten la segmentación. Los siguientes ajustes contienen errores: {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:410 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:436 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Los ajustes de algunos modelos no permiten la segmentación. Los siguientes ajustes contienen errores en uno o más modelos: {error_labels}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:445 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "No se puede segmentar porque la torre auxiliar o la posición o posiciones de preparación no son válidas." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:428 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:454 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "No se puede segmentar porque hay objetos asociados al extrusor %s que está deshabilitado." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:463 msgctxt "@info:status" msgid "" "Please review settings and check if your models:\n" @@ -852,7 +923,8 @@ msgstr "" "- Están asignados a un extrusor activado\n" " - No están todos definidos como mallas modificadoras" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 msgctxt "@info:status" msgid "Processing Layers" msgstr "Procesando capas" @@ -862,7 +934,8 @@ msgctxt "@info:title" msgid "Information" msgstr "Información" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Perfil de cura" @@ -894,7 +967,8 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Actualizar firmware" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 msgctxt "@item:inlistbox" msgid "Compressed G-code File" msgstr "Archivo GCode comprimido" @@ -904,7 +978,9 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "GCodeGzWriter no es compatible con el modo texto." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 msgctxt "@item:inlistbox" msgid "G-code File" msgstr "Archivo GCode" @@ -914,7 +990,8 @@ msgctxt "@info:status" msgid "Parsing G-code" msgstr "Analizar GCode" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:349 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:349 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:503 msgctxt "@info:title" msgid "G-code Details" msgstr "Datos de GCode" @@ -934,7 +1011,8 @@ msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "GCodeWriter no es compatible con el modo sin texto." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Prepare el Gcode antes de la exportación." @@ -1020,7 +1098,8 @@ msgctxt "@item:inlistbox" msgid "Save to Removable Drive {0}" msgstr "Guardar en unidad extraíble {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "¡No hay formatos de archivo disponibles con los que escribir!" @@ -1036,7 +1115,8 @@ msgctxt "@info:title" msgid "Saving" msgstr "Guardando" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:106 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:109 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:106 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:109 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not save to {0}: {1}" @@ -1048,7 +1128,8 @@ msgctxt "@info:status Don't translate the tag {device}!" msgid "Could not find a file name when trying to write to {device}." msgstr "No se pudo encontrar un nombre de archivo al tratar de escribir en {device}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:138 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:138 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #, python-brace-format msgctxt "@info:status" msgid "Could not save to removable drive {0}: {1}" @@ -1098,27 +1179,28 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Unidad extraíble" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:121 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:128 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled." msgstr "Cura no muestra correctamente las capas si la impresión de alambre está habilitada." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:129 msgctxt "@info:title" msgid "Simulation View" msgstr "Vista de simulación" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:status" msgid "Nothing is shown because you need to slice first." msgstr "No se muestra nada porque primero hay que cortar." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:title" msgid "No layers to show" msgstr "No hay capas para mostrar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:124 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "No volver a mostrar este mensaje" @@ -1128,16 +1210,21 @@ msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Vista de capas" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:70 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:71 msgctxt "@info:status" -msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." -msgstr "Su modelo no es funcional. Las áreas resaltadas indican que faltan superficies o son extrañas." +msgid "The highlighted areas indicate either missing or extraneous surfaces. Fix your model and open it again into Cura." +msgstr "Las áreas resaltadas indican que faltan superficies o son inusuales. Corrija los errores en el modelo y vuelva a abrirlo en Cura." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 msgctxt "@info:title" -msgid "Model errors" +msgid "Model Errors" msgstr "Errores de modelo" +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:79 +msgctxt "@action:button" +msgid "Learn more" +msgstr "Más información" + #: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/__init__.py:12 msgctxt "@item:inmenu" msgid "Solid view" @@ -1158,12 +1245,13 @@ msgctxt "@info:generic" msgid "Do you want to sync material and software packages with your account?" msgstr "¿Desea sincronizar el material y los paquetes de software con su cuenta?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:143 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/DownloadPresenter.py:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:143 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/DownloadPresenter.py:93 msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "Se han detectado cambios desde su cuenta de Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:145 msgctxt "@action:button" msgid "Sync" msgstr "Sincronizar" @@ -1178,7 +1266,8 @@ msgctxt "@button" msgid "Decline" msgstr "Rechazar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/LicenseModel.py:10 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:56 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/LicenseModel.py:10 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:56 msgctxt "@button" msgid "Agree" msgstr "Estoy de acuerdo" @@ -1198,7 +1287,7 @@ msgctxt "@info:generic" msgid "You need to quit and restart {} before changes have effect." msgstr "Tiene que salir y reiniciar {} para que los cambios surtan efecto." -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:79 msgctxt "@info:generic" msgid "{} plugins failed to download" msgstr "Error al descargar los complementos {}" @@ -1233,12 +1322,17 @@ msgctxt "@item:inlistbox" msgid "Compressed COLLADA Digital Asset Exchange" msgstr "COLLADA Digital Asset Exchange comprimido" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Paquete de formato Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "No se puede escribir en el archivo UFP:" @@ -1253,22 +1347,22 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Seleccionar actualizaciones" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:152 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 msgctxt "@action:button" msgid "Print via cloud" msgstr "Imprimir mediante cloud" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:155 msgctxt "@properties:tooltip" msgid "Print via cloud" msgstr "Imprimir mediante cloud" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:156 msgctxt "@info:status" msgid "Connected via cloud" msgstr "Conectado mediante cloud" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:264 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:270 #, python-brace-format msgctxt "@error:send" msgid "Unknown error code when uploading print job: {0}" @@ -1314,7 +1408,8 @@ msgid_plural "These printers are not linked to the Digital Factory:" msgstr[0] "Esta impresora no está vinculada a Digital Factory:" msgstr[1] "Estas impresoras no están vinculadas a Digital Factory:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:329 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:329 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:419 msgctxt "info:name" msgid "Ultimaker Digital Factory" msgstr "Ultimaker Digital Factory" @@ -1563,126 +1658,137 @@ msgctxt "@info:tooltip" msgid "Some things could be problematic in this print. Click to see tips for adjustment." msgstr "Algunos elementos pueden causar problemas durante la impresión. Haga clic para ver consejos sobre cómo ajustarlos." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:15 msgctxt "@title:window" msgid "Open Project" msgstr "Abrir proyecto" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" msgstr "Actualizar existente" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:63 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "Crear nuevo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:74 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "Resumen: proyecto de Cura" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:96 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 msgctxt "@action:label" msgid "Printer settings" msgstr "Ajustes de la impresora" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:112 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:113 msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "¿Cómo debería solucionarse el conflicto en la máquina?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:165 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 msgctxt "@action:label" msgid "Type" msgstr "Tipo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:181 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 msgctxt "@action:label" msgid "Printer Group" msgstr "Grupo de impresoras" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:203 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 msgctxt "@action:label" msgid "Profile settings" msgstr "Ajustes del perfil" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:219 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:221 msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "¿Cómo debería solucionarse el conflicto en el perfil?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:349 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 msgctxt "@action:label" msgid "Name" msgstr "Nombre" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:255 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 msgctxt "@action:label" msgid "Intent" msgstr "Intent" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:271 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Not in profile" msgstr "No está en el perfil" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:276 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 sobrescrito" msgstr[1] "%1 sobrescritos" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:287 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:290 msgctxt "@action:label" msgid "Derivative from" msgstr "Derivado de" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:295 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 sobrescrito" msgstr[1] "%1, %2 sobrescritos" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:309 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:312 msgctxt "@action:label" msgid "Material settings" msgstr "Ajustes del material" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:328 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "¿Cómo debería solucionarse el conflicto en el material?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:369 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:373 msgctxt "@action:label" msgid "Setting visibility" msgstr "Visibilidad de los ajustes" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:378 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:382 msgctxt "@action:label" msgid "Mode" msgstr "Modo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:label" msgid "Visible settings:" msgstr "Ajustes visibles:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:399 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:403 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 de un total de %2" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:425 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:429 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Si carga un proyecto, se borrarán todos los modelos de la placa de impresión." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:457 msgctxt "@action:button" msgid "Open" msgstr "Abrir" @@ -1782,7 +1888,10 @@ msgctxt "@description" msgid "Backup and synchronize your Cura settings." msgstr "Realice una copia de seguridad y sincronice sus ajustes de Cura." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:68 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:125 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:199 msgctxt "@button" msgid "Sign in" msgstr "Iniciar sesión" @@ -1932,7 +2041,8 @@ msgctxt "@item:inlistbox" msgid "Linear" msgstr "Lineal" -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:161 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:172 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:161 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:172 msgctxt "@item:inlistbox" msgid "Translucency" msgstr "Translucidez" @@ -1957,7 +2067,9 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "Suavizado" -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:227 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:139 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:227 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@action:button" msgid "OK" msgstr "Aceptar" @@ -1977,10 +2089,18 @@ msgctxt "@label" msgid "Nozzle size" msgstr "Tamaño de la tobera" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:89 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:205 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:245 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:283 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:245 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:283 msgctxt "@label" msgid "mm" msgstr "mm" @@ -2005,12 +2125,12 @@ msgctxt "@label" msgid "Cooling Fan Number" msgstr "Número de ventilador de enfriamiento" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:163 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "GCode inicial del extrusor" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:177 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "GCode final del extrusor" @@ -2095,12 +2215,17 @@ msgctxt "@label" msgid "Number of Extruders" msgstr "Número de extrusores" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:345 +msgctxt "@label" +msgid "Apply Extruder offsets to GCode" +msgstr "Aplicar compensaciones del extrusor a GCode" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:393 msgctxt "@title:label" msgid "Start G-code" msgstr "Iniciar GCode" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:385 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:404 msgctxt "@title:label" msgid "End G-code" msgstr "Finalizar GCode" @@ -2128,6 +2253,11 @@ msgctxt "@label link to technical assistance" msgid "View user manuals online" msgstr "Ver manuales de usuario en línea" +#: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 +msgctxt "@info" +msgid "In order to monitor your print from Cura, please connect the printer." +msgstr "Para supervisar la copia impresa desde Cura, conecte la impresora." + #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" msgid "Mesh Type" @@ -2173,7 +2303,8 @@ msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Seleccionar ajustes o personalizar este modelo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtrar..." @@ -2183,114 +2314,131 @@ msgctxt "@label:checkbox" msgid "Show all" msgstr "Mostrar todo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:20 msgctxt "@title:window" msgid "Post Processing Plugin" msgstr "Complemento de posprocesamiento" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:59 msgctxt "@label" msgid "Post Processing Scripts" msgstr "Secuencias de comandos de posprocesamiento" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:235 msgctxt "@action" msgid "Add a script" msgstr "Añadir secuencia de comando" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:282 msgctxt "@label" msgid "Settings" msgstr "Ajustes" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:499 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:502 msgctxt "@info:tooltip" msgid "Change active post-processing scripts." msgstr "Cambiar las secuencias de comandos de posprocesamiento." -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:506 msgctxt "@info:tooltip" msgid "The following script is active:" msgid_plural "The following scripts are active:" msgstr[0] "La siguiente secuencia de comandos está activa:" msgstr[1] "Las siguientes secuencias de comandos están activas:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:20 /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:49 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:49 msgctxt "@label" msgid "Color scheme" msgstr "Combinación de colores" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:110 msgctxt "@label:listbox" msgid "Material Color" msgstr "Color del material" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:111 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:114 msgctxt "@label:listbox" msgid "Line Type" msgstr "Tipo de línea" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:115 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:118 msgctxt "@label:listbox" msgid "Speed" msgstr "Velocidad" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:122 msgctxt "@label:listbox" -msgid "Layer thickness" +msgid "Layer Thickness" msgstr "Grosor de la capa" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:126 +msgctxt "@label:listbox" +msgid "Line Width" +msgstr "Ancho de línea" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 +msgctxt "@label:listbox" +msgid "Flow" +msgstr "Flujo" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" msgid "Compatibility Mode" msgstr "Modo de compatibilidad" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:230 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:245 msgctxt "@label" msgid "Travels" msgstr "Desplazamientos" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:251 msgctxt "@label" msgid "Helpers" msgstr "Asistentes" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:257 msgctxt "@label" msgid "Shell" msgstr "Perímetro" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:248 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 msgctxt "@label" msgid "Infill" msgstr "Relleno" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:298 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:271 +msgctxt "@label" +msgid "Starts" +msgstr "Inicios" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 msgctxt "@label" msgid "Only Show Top Layers" msgstr "Mostrar solo capas superiores" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:308 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:332 msgctxt "@label" msgid "Show 5 Detailed Layers On Top" msgstr "Mostrar cinco capas detalladas en la parte superior" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:346 msgctxt "@label" msgid "Top / Bottom" msgstr "Superior o inferior" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:350 msgctxt "@label" msgid "Inner Wall" msgstr "Pared interior" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:384 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:419 msgctxt "@label" msgid "min" msgstr "mín." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:433 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:488 msgctxt "@label" msgid "max" msgstr "máx." @@ -2365,7 +2513,8 @@ msgctxt "@action:label" msgid "Website" msgstr "Sitio web" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:46 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:20 msgctxt "@action:button" msgid "Installed" msgstr "Instalado" @@ -2380,17 +2529,20 @@ msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "Comprar bobinas de material" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:96 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:34 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "Actualizar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:97 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:35 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "Actualizando" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:98 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:36 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:98 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" msgstr "Actualizado" @@ -2400,7 +2552,8 @@ msgctxt "@label" msgid "Premium" msgstr "Prémium" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml:39 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml:39 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:86 msgctxt "@info:tooltip" msgid "Go to Web Marketplace" msgstr "Ir a Web Marketplace" @@ -2425,7 +2578,9 @@ msgctxt "@title:tab" msgid "Plugins" msgstr "Complementos" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:466 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 msgctxt "@title:tab" msgid "Materials" msgstr "Materiales" @@ -2470,7 +2625,10 @@ msgctxt "@button" msgid "Dismiss" msgstr "Descartar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:178 msgctxt "@button" msgid "Next" msgstr "Siguiente" @@ -2535,7 +2693,8 @@ msgctxt "@label" msgid "Last updated" msgstr "Última actualización" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:103 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "Marca" @@ -2665,7 +2824,10 @@ msgctxt "@action:button" msgid "Edit" msgstr "Editar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:156 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" msgstr "Eliminar" @@ -2680,17 +2842,20 @@ msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Si la impresora no aparece en la lista, lea la guía de solución de problemas de impresión y red" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:205 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:263 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:263 msgctxt "@label" msgid "Type" msgstr "Tipo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:279 msgctxt "@label" msgid "Firmware version" msgstr "Versión de firmware" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:295 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:295 msgctxt "@label" msgid "Address" msgstr "Dirección" @@ -2720,7 +2885,8 @@ msgctxt "@title:window" msgid "Invalid IP address" msgstr "Dirección IP no válida" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Introduzca una dirección IP válida." @@ -2730,7 +2896,8 @@ msgctxt "@title:window" msgid "Printer Address" msgstr "Dirección de la impresora" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Introduzca la dirección IP de la impresora en la red." @@ -2782,7 +2949,9 @@ msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "Al sobrescribir la configuración se usarán los ajustes especificados con la configuración de impresora existente. Esto podría provocar un fallo en la impresión." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:191 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:184 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:191 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:184 msgctxt "@label" msgid "Glass" msgstr "Vidrio" @@ -2802,7 +2971,8 @@ msgctxt "@label" msgid "Delete" msgstr "Borrar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:289 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 msgctxt "@label" msgid "Resume" msgstr "Reanudar" @@ -2817,7 +2987,9 @@ msgctxt "@label" msgid "Resuming..." msgstr "Reanudando..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 msgctxt "@label" msgid "Pause" msgstr "Pausar" @@ -2857,7 +3029,8 @@ msgctxt "@label %1 is the name of a print job." msgid "Are you sure you want to abort %1?" msgstr "¿Seguro que desea cancelar %1?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 msgctxt "@window:title" msgid "Abort print" msgstr "Cancela la impresión" @@ -2867,7 +3040,9 @@ msgctxt "@label link to Connect and Cloud interfaces" msgid "Manage printer" msgstr "Administrar impresora" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:519 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." msgstr "Actualice el firmware de la impresora para gestionar la cola de forma remota." @@ -2892,27 +3067,34 @@ msgctxt "@label:status" msgid "Idle" msgstr "Sin actividad" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:365 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +msgctxt "@label:status" +msgid "Preparing..." +msgstr "Preparando..." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:369 msgctxt "@label:status" msgid "Printing" msgstr "Imprimiendo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:406 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:410 msgctxt "@label" msgid "Untitled" msgstr "Sin título" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:431 msgctxt "@label" msgid "Anonymous" msgstr "Anónimo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:458 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Debe cambiar la configuración" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:492 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:496 msgctxt "@action:button" msgid "Details" msgstr "Detalles" @@ -2927,21 +3109,18 @@ msgctxt "@label" msgid "First available" msgstr "Primera disponible" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "Cancelado" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "Terminado" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -msgctxt "@label:status" -msgid "Preparing..." -msgstr "Preparando..." - #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." @@ -3022,26 +3201,27 @@ msgctxt "@action:button" msgid "Sign in" msgstr "Iniciar sesión" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" -msgid "Your key to connected 3D printing" -msgstr "Su clave para una impresión 3D conectada" +msgid "Sign in to the Ultimaker platform" +msgstr "Inicie sesión en la plataforma Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:42 msgctxt "@text" msgid "" -"- Customize your experience with more print profiles and plugins\n" -"- Stay flexible by syncing your setup and loading it anywhere\n" -"- Increase efficiency with a remote workflow on Ultimaker printers" +"- Add material profiles and plug-ins from the Marketplace\n" +"- Back-up and sync your material profiles and plug-ins\n" +"- Share ideas and get help from 48,000+ users in the Ultimaker community" msgstr "" -"- Personalice su experiencia con más perfiles de impresión y complementos\n" -"- Consiga más flexibilidad sincronizando su configuración y cargándola en cualquier lugar\n" -"- Aumente la eficiencia con un flujo de trabajo remoto en las impresoras Ultimaker" +"- Añada perfiles de materiales y complementos del Marketplace \n" +"- Realice copias de seguridad y sincronice los perfiles y complementos de sus materiales \n" +"- Comparta ideas y obtenga ayuda de más de 48 000 usuarios de la comunidad Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:142 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:62 msgctxt "@button" -msgid "Create account" -msgstr "Crear cuenta" +msgid "Create a free Ultimaker account" +msgstr "Cree una cuenta gratuita de Ultimaker" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/SyncState.qml:28 msgctxt "@label" @@ -3148,303 +3328,308 @@ msgctxt "@button" msgid "Cancel" msgstr "Cancelar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:83 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Mostrar Guía de resolución de problemas en línea" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:90 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Alternar pantalla completa" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:98 msgctxt "@action:inmenu" msgid "Exit Full Screen" msgstr "Salir de modo de pantalla completa" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:105 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "Des&hacer" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:115 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Rehacer" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:125 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Salir" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:132 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:133 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Vista en 3D" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:140 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Vista frontal" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:147 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Vista superior" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 +msgctxt "@action:inmenu menubar:view" +msgid "Bottom View" +msgstr "Vista inferior" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Vista del lado izquierdo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:160 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:168 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Vista del lado derecho" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:175 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Configurar Cura..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:182 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Agregar impresora..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:180 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:188 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Adm&inistrar impresoras ..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:187 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Administrar materiales..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu" msgid "Add more materials from Marketplace" msgstr "Añadir más materiales de Marketplace" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "&Actualizar perfil con ajustes o sobrescrituras actuales" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Descartar cambios actuales" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:222 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:230 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "&Crear perfil a partir de ajustes o sobrescrituras actuales..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Administrar perfiles..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Mostrar &documentación en línea" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Informar de un &error" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:260 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Novedades" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:266 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Acerca de..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:273 msgctxt "@action:inmenu menubar:edit" -msgid "Delete Selected Model" -msgid_plural "Delete Selected Models" -msgstr[0] "Eliminar modelo seleccionado" -msgstr[1] "Eliminar modelos seleccionados" +msgid "Delete Selected" +msgstr "Eliminar selección" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:283 msgctxt "@action:inmenu menubar:edit" -msgid "Center Selected Model" -msgid_plural "Center Selected Models" -msgstr[0] "Centrar modelo seleccionado" -msgstr[1] "Centrar modelos seleccionados" +msgid "Center Selected" +msgstr "Centrar selección" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:292 msgctxt "@action:inmenu menubar:edit" -msgid "Multiply Selected Model" -msgid_plural "Multiply Selected Models" -msgstr[0] "Multiplicar modelo seleccionado" -msgstr[1] "Multiplicar modelos seleccionados" +msgid "Multiply Selected" +msgstr "Multiplicar selección" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Eliminar modelo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:309 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Ce&ntrar modelo en plataforma" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:307 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "A&grupar modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:327 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:335 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Desagrupar modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:345 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "Co&mbinar modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:347 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:355 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Multiplicar modelo..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:362 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Seleccionar todos los modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:372 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Borrar placa de impresión" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:382 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Recargar todos los modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Organizar todos los modelos en todas las placas de impresión" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:390 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Organizar todos los modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:406 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Organizar selección" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:405 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:413 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Restablecer las posiciones de todos los modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:412 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Restablecer las transformaciones de todos los modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:419 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:429 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Abrir archivo(s)..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:439 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Nuevo proyecto..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:434 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:446 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Mostrar carpeta de configuración" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:441 /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:538 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Configurar visibilidad de los ajustes..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:448 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:460 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Marketplace" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:257 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Este paquete se instalará después de reiniciar." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 msgctxt "@title:tab" msgid "General" msgstr "General" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:462 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:453 msgctxt "@title:tab" msgid "Settings" msgstr "Ajustes" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:464 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 msgctxt "@title:tab" msgid "Printers" msgstr "Impresoras" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 msgctxt "@title:tab" msgid "Profiles" msgstr "Perfiles" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:576 msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "Cerrando %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:588 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "¿Seguro que desea salir de %1?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:638 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Abrir archivo(s)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:744 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:737 msgctxt "@window:title" msgid "Install Package" msgstr "Instalar paquete" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:752 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:745 msgctxt "@title:window" msgid "Open File(s)" msgstr "Abrir archivo(s)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:755 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:748 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Hemos encontrado uno o más archivos de GCode entre los archivos que ha seleccionado. Solo puede abrir los archivos GCode de uno en uno. Si desea abrir un archivo GCode, seleccione solo uno." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:858 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:857 msgctxt "@title:window" msgid "Add Printer" msgstr "Agregar impresora" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:866 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:865 msgctxt "@title:window" msgid "What's New" msgstr "Novedades" @@ -3573,7 +3758,8 @@ msgctxt "@Label" msgid "Static type checker for Python" msgstr "Comprobador de tipo estático para Python" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@Label" msgid "Root Certificates for validating SSL trustworthiness" msgstr "Certificados de raíz para validar la fiabilidad del SSL" @@ -3593,17 +3779,27 @@ msgctxt "@label" msgid "Python bindings for libnest2d" msgstr "Enlaces de Python para libnest2d" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +msgctxt "@label" +msgid "Support library for system keyring access" +msgstr "Biblioteca de soporte para el acceso al llavero del sistema" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" +msgid "Python extensions for Microsoft Windows" +msgstr "Extensiones Python para Microsoft Windows" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +msgctxt "@label" msgid "Font" msgstr "Fuente" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 msgctxt "@label" msgid "SVG icons" msgstr "Iconos SVG" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:165 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Implementación de la aplicación de distribución múltiple de Linux" @@ -3613,22 +3809,22 @@ msgctxt "@title:window" msgid "Open project file" msgstr "Abrir archivo de proyecto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:88 msgctxt "@text:window" msgid "This is a Cura project file. Would you like to open it as a project or import the models from it?" msgstr "Este es un archivo de proyecto Cura. ¿Le gustaría abrirlo como un proyecto o importar sus modelos?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:98 msgctxt "@text:window" msgid "Remember my choice" msgstr "Recordar mi selección" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:122 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:117 msgctxt "@action:button" msgid "Open as project" msgstr "Abrir como proyecto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:131 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:126 msgctxt "@action:button" msgid "Import models" msgstr "Importar modelos" @@ -3659,7 +3855,8 @@ msgctxt "@title:column" msgid "Current changes" msgstr "Cambios actuales" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Preguntar siempre" @@ -3684,12 +3881,12 @@ msgctxt "@action:button" msgid "Keep changes" msgstr "Mantener los cambios" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 msgctxt "@text:window" msgid "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?" msgstr "Hemos encontrado uno o más archivos del proyecto entre los archivos que ha seleccionado. Solo puede abrir los archivos de proyecto de uno en uno. Le recomendamos que solo importe modelos de esos archivos. ¿Desea continuar?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:99 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:94 msgctxt "@action:button" msgid "Import all as models" msgstr "Importar todos como modelos" @@ -3736,7 +3933,8 @@ msgctxt "@text Print job name" msgid "Untitled" msgstr "Sin título" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:27 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:27 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "&Archivo" @@ -3746,12 +3944,14 @@ msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "&Edición" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:49 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:12 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:49 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:12 msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "&Ver" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:51 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&Settings" msgstr "A&justes" @@ -3841,7 +4041,7 @@ msgctxt "@label" msgid "Material" msgstr "Material" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:407 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Utilice pegamento con esta combinación de materiales para lograr una mejor adhesión." @@ -3865,17 +4065,17 @@ msgctxt "@label" msgid "Number of Copies" msgstr "Número de copias" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:33 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:41 msgctxt "@title:menu menubar:file" msgid "&Save Project..." msgstr "&Guardar proyecto..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:54 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:74 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&Exportar..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:85 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Exportar selección..." @@ -3895,6 +4095,11 @@ msgctxt "@label:category menu label" msgid "Generic" msgstr "Genérico" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/OpenFilesMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Open File(s)..." +msgstr "Abrir archivo(s)..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3910,6 +4115,11 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Abrir &reciente" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SaveProjectMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Save Project..." +msgstr "Guardar proyecto..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:15 msgctxt "@title:menu menubar:settings" msgid "&Printer" @@ -3935,17 +4145,17 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Deshabilitar extrusor" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:16 msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Ajustes visibles" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:45 msgctxt "@action:inmenu" msgid "Collapse All Categories" msgstr "Contraer todas las categorías" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Gestionar visibilidad de los ajustes..." @@ -3955,22 +4165,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Posición de la cámara" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:45 msgctxt "@action:inmenu menubar:view" msgid "Camera view" msgstr "Vista de cámara" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:48 msgctxt "@action:inmenu menubar:view" msgid "Perspective" msgstr "Perspectiva" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:60 msgctxt "@action:inmenu menubar:view" msgid "Orthographic" msgstr "Ortográfica" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:81 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "P&laca de impresión" @@ -4015,12 +4225,12 @@ msgctxt "@label:MonitorStatus" msgid "Please remove the print" msgstr "Retire la impresión" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@label" msgid "Abort Print" msgstr "Cancelar impresión" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:338 msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "¿Está seguro de que desea cancelar la impresión?" @@ -4062,310 +4272,314 @@ msgctxt "@label" msgid "Interface" msgstr "Interfaz" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:216 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:209 msgctxt "@label" msgid "Currency:" msgstr "Moneda:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:229 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:222 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Tendrá que reiniciar la aplicación para que estos cambios tengan efecto." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:284 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Segmentar automáticamente al cambiar los ajustes." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 msgctxt "@option:check" msgid "Slice automatically" msgstr "Segmentar automáticamente" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:306 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportamiento de la ventanilla" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:314 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Resaltar en rojo las áreas del modelo sin soporte. Sin soporte, estas áreas no se imprimirán correctamente." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:323 msgctxt "@option:check" msgid "Display overhang" msgstr "Mostrar voladizos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:351 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@info:tooltip" msgid "Highlight missing or extraneous surfaces of the model using warning signs. The toolpaths will often be missing parts of the intended geometry." msgstr "Resalta las superficies que faltan o son extrañas del modelo usando señales de advertencia. A las trayectorias de herramientas les faltarán a menudo partes de la geometría prevista." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:342 msgctxt "@option:check" msgid "Display model errors" msgstr "Mostrar errores de modelo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Mueve la cámara de manera que el modelo se encuentre en el centro de la vista cuando se selecciona un modelo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:373 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Centrar cámara cuando se selecciona elemento" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "¿Se debería invertir el comportamiento predeterminado del zoom de cura?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:388 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Invertir la dirección del zoom de la cámara." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "¿Debería moverse el zoom en la dirección del ratón?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "Hacer zoom en la dirección del ratón no es compatible con la perspectiva ortográfica." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:409 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Hacer zoom en la dirección del ratón" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:435 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:417 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "¿Deben moverse los modelos en la plataforma de modo que no se crucen?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:440 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:422 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Asegúrese de que los modelos están separados" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:431 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "¿Deben moverse los modelos del área de impresión de modo que no toquen la placa de impresión?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:436 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Arrastrar modelos a la placa de impresión de forma automática" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:448 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Se muestra el mensaje de advertencia en el lector de GCode." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:457 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Mensaje de advertencia en el lector de GCode" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "¿Debe forzarse el modo de compatibilidad de la capa?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Forzar modo de compatibilidad de la vista de capas (necesario reiniciar)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:498 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" msgstr "¿Debería abrirse Cura en el lugar donde se cerró?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:485 msgctxt "@option:check" msgid "Restore window position on start" msgstr "Restaurar la posición de la ventana al inicio" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:513 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "¿Qué tipo de renderizado de cámara debería usarse?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:502 msgctxt "@window:text" msgid "Camera rendering:" msgstr "Renderizado de cámara:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:531 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:509 msgid "Perspective" msgstr "Perspectiva" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:532 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgid "Orthographic" msgstr "Ortográfica" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:563 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:548 msgctxt "@label" msgid "Opening and saving files" msgstr "Abrir y guardar archivos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:555 msgctxt "@info:tooltip" msgid "Should opening files from the desktop or external applications open in the same instance of Cura?" msgstr "¿Debería abrir los archivos del escritorio o las aplicaciones externas en la misma instancia de Cura?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@option:check" msgid "Use a single instance of Cura" msgstr "Utilizar una sola instancia de Cura" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "¿Deben ajustarse los modelos al volumen de impresión si son demasiado grandes?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@option:check" msgid "Scale large models" msgstr "Escalar modelos de gran tamaño" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Un modelo puede mostrarse demasiado pequeño si su unidad son metros en lugar de milímetros, por ejemplo. ¿Deben escalarse estos modelos?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Escalar modelos demasiado pequeños" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "¿Se deberían seleccionar los modelos después de haberse cargado?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Seleccionar modelos al abrirlos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "¿Debe añadirse automáticamente un prefijo basado en el nombre de la impresora al nombre del trabajo de impresión?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:635 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Agregar prefijo de la máquina al nombre del trabajo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:645 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "¿Mostrar un resumen al guardar un archivo de proyecto?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:649 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:634 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Mostrar un cuadro de diálogo de resumen al guardar el proyecto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:659 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:644 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Comportamiento predeterminado al abrir un archivo del proyecto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:652 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Comportamiento predeterminado al abrir un archivo del proyecto: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Preguntar siempre" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:682 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Abrir siempre como un proyecto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:668 msgctxt "@option:openProject" msgid "Always import models" msgstr "Importar modelos siempre" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:705 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Si ha realizado cambios en un perfil y, a continuación, ha cambiado a otro, aparecerá un cuadro de diálogo que le preguntará si desea guardar o descartar los cambios. También puede elegir el comportamiento predeterminado, así ese cuadro de diálogo no volverá a aparecer." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:728 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Perfiles" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Comportamiento predeterminado para los valores modificados al cambiar a otro perfil: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:748 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:734 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Descartar siempre los ajustes modificados" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:749 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:735 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Transferir siempre los ajustes modificados al nuevo perfil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:783 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@label" msgid "Privacy" msgstr "Privacidad" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:790 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:777 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "¿Debe Cura buscar actualizaciones cuando se abre el programa?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:795 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:782 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Buscar actualizaciones al iniciar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:805 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:792 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "¿Deben enviarse datos anónimos sobre la impresión a Ultimaker? Tenga en cuenta que no se envían ni almacenan modelos, direcciones IP ni otra información de identificación personal." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:810 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:797 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Enviar información (anónima) de impresión" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:819 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:806 msgctxt "@action:button" msgid "More information" msgstr "Más información" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "Activar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "Cambiar nombre" @@ -4380,61 +4594,77 @@ msgctxt "@action:button" msgid "Duplicate" msgstr "Duplicado" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:171 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:171 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "Importar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:185 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:185 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 msgctxt "@action:button" msgid "Export" msgstr "Exportar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 +msgctxt "@action:button Sending materials to printers" +msgid "Sync with Printers" +msgstr "Sincronizar con las impresoras" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" msgid "Printer" msgstr "Impresora" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:298 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Confirmar eliminación" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:301 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "¿Seguro que desea eliminar %1? ¡Esta acción no se puede deshacer!" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 msgctxt "@title:window" msgid "Import Material" msgstr "Importar material" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:338 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "No se pudo importar el material en %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:328 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:342 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "El material se ha importado correctamente en %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:346 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 msgctxt "@title:window" msgid "Export Material" msgstr "Exportar material" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:358 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:372 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Se ha producido un error al exportar el material a %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:378 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "El material se ha exportado correctamente a %1" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 +msgctxt "@title:window" +msgid "Export All Materials" +msgstr "Exportar todos los materiales" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" @@ -4520,7 +4750,8 @@ msgctxt "@label" msgid "Adhesion Information" msgstr "Información sobre adherencia" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Ajustes de impresión" @@ -4545,52 +4776,53 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Introduzca un nombre para este perfil." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Duplicar perfil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@title:window" msgid "Rename Profile" msgstr "Cambiar nombre de perfil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:307 msgctxt "@title:window" msgid "Import Profile" msgstr "Importar perfil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:336 msgctxt "@title:window" msgid "Export Profile" msgstr "Exportar perfil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:399 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Impresora: %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:557 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Actualizar perfil con ajustes o sobrescrituras actuales" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 msgctxt "@action:button" msgid "Discard current changes" msgstr "Descartar cambios actuales" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:583 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Este perfil utiliza los ajustes predeterminados especificados por la impresora, por eso no aparece ningún ajuste o sobrescritura en la lista que se ve a continuación." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:591 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Los ajustes actuales coinciden con el perfil seleccionado." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:609 msgctxt "@title:tab" msgid "Global Settings" msgstr "Ajustes globales" @@ -4620,12 +4852,12 @@ msgctxt "@title:column" msgid "Unit" msgstr "Unidad" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:16 msgctxt "@title:tab" msgid "Setting Visibility" msgstr "Visibilidad de los ajustes" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:48 msgctxt "@label:textbox" msgid "Check all" msgstr "Comprobar todo" @@ -4650,12 +4882,14 @@ msgctxt "@tooltip of temperature input" msgid "The temperature to pre-heat the hotend to." msgstr "Temperatura a la que se va a precalentar el extremo caliente." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:341 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:332 msgctxt "@button Cancel pre-heating" msgid "Cancel" msgstr "Cancelar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:344 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:344 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:335 msgctxt "@button" msgid "Pre-heat" msgstr "Precalentar" @@ -4961,27 +5195,27 @@ msgctxt "@label:textbox" msgid "Search settings" msgstr "Buscar ajustes" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:456 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:468 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Copiar valor en todos los extrusores" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:477 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Copiar todos los valores cambiados en todos los extrusores" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:502 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:514 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Ocultar este ajuste" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:515 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:527 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "No mostrar este ajuste" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:531 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Mostrar este ajuste" @@ -5041,11 +5275,6 @@ msgctxt "@button" msgid "Add printer manually" msgstr "Añadir impresora manualmente" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddCloudPrintersView.qml:218 -msgctxt "@button" -msgid "Finish" -msgstr "Finalizar" - #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:230 msgctxt "@label" msgid "Manufacturer" @@ -5126,7 +5355,8 @@ msgctxt "@label" msgid "Could not connect to device." msgstr "No se ha podido conectar al dispositivo." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:207 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:212 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:207 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:212 msgctxt "@label" msgid "Can't connect to your Ultimaker printer?" msgstr "¿No puede conectarse a la impresora Ultimaker?" @@ -5151,32 +5381,32 @@ msgctxt "@button" msgid "Connect" msgstr "Conectar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:43 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" -msgid "Ultimaker Account" -msgstr "Cuenta de Ultimaker" +msgid "Release Notes" +msgstr "Notas de la versión" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:124 msgctxt "@text" -msgid "Your key to connected 3D printing" -msgstr "Su clave para una impresión 3D conectada" +msgid "Add material settings and plugins from the Marketplace" +msgstr "Añada ajustes de material y complementos desde Marketplace" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:101 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:154 msgctxt "@text" -msgid "- Customize your experience with more print profiles and plugins" -msgstr "- Personalice su experiencia con más perfiles de impresión y complementos" +msgid "Backup and sync your material settings and plugins" +msgstr "Realice copias de seguridad y sincronice los ajustes y complementos de sus materiales" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:184 msgctxt "@text" -msgid "- Stay flexible by syncing your setup and loading it anywhere" -msgstr "- Consiga más flexibilidad sincronizando su configuración y cargándola en cualquier lugar" +msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" +msgstr "Comparta ideas y obtenga ayuda de más de 48 000 usuarios de la comunidad Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:217 msgctxt "@text" -msgid "- Increase efficiency with a remote workflow on Ultimaker printers" -msgstr "- Aumente la eficiencia con un flujo de trabajo remoto en las impresoras Ultimaker" +msgid "Create a free Ultimaker Account" +msgstr "Cree una cuenta gratuita de Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:230 msgctxt "@button" msgid "Skip" msgstr "Omitir" @@ -5236,29 +5466,32 @@ msgctxt "@button" msgid "Decline and close" msgstr "Rechazar y cerrar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:29 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" msgid "Welcome to Ultimaker Cura" msgstr "Le damos la bienvenida a Ultimaker Cura" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:68 msgctxt "@text" -msgid "" -"Please follow these steps to set up\n" -"Ultimaker Cura. This will only take a few moments." +msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." msgstr "" "Siga estos pasos para configurar\n" "Ultimaker Cura. Solo le llevará unos minutos." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:86 msgctxt "@button" msgid "Get started" msgstr "Empezar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:28 msgctxt "@label" -msgid "What's new in Ultimaker Cura" -msgstr "Novedades en Ultimaker Cura" +msgid "What's New" +msgstr "Novedades" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Widgets/ComboBox.qml:24 +msgctxt "@label" +msgid "No items to select from" +msgstr "No hay elementos para seleccionar" #: ModelChecker/plugin.json msgctxt "description" @@ -5340,6 +5573,16 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Escritor de perfiles de Cura" +#: DigitalLibrary/plugin.json +msgctxt "description" +msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." +msgstr "Se conecta a la biblioteca digital, por lo que Cura puede abrir y guardar archivos en ella." + +#: DigitalLibrary/plugin.json +msgctxt "name" +msgid "Ultimaker Digital Library" +msgstr "Ultimaker Digital Library" + #: FirmwareUpdateChecker/plugin.json msgctxt "description" msgid "Checks for firmware updates." @@ -5810,6 +6053,26 @@ msgctxt "name" msgid "Version Upgrade 4.7 to 4.8" msgstr "Actualización de la versión 4.7 a la 4.8" +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." +msgstr "Actualiza la configuración de Cura 4.8 a Cura 4.9." + +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.8 to 4.9" +msgstr "Actualización de la versión 4.8 a la 4.9" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." +msgstr "Actualiza la configuración de Cura 4.9 a Cura 4.10." + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.9 to 4.10" +msgstr "Actualización de la versión 4.9 a la 4.10" + #: X3DReader/plugin.json msgctxt "description" msgid "Provides support for reading X3D files." @@ -5840,6 +6103,94 @@ msgctxt "name" msgid "X-Ray View" msgstr "Vista de rayos X" +#~ msgctxt "@info:status" +#~ msgid "Global stack is missing." +#~ msgstr "Falta la pila global." + +#~ msgctxt "@info:status" +#~ msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." +#~ msgstr "Su modelo no es funcional. Las áreas resaltadas indican que faltan superficies o son extrañas." + +#~ msgctxt "@info:title" +#~ msgid "Model errors" +#~ msgstr "Errores de modelo" + +#~ msgctxt "@label:listbox" +#~ msgid "Layer thickness" +#~ msgstr "Grosor de la capa" + +#~ msgctxt "@label" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "Su clave para una impresión 3D conectada" + +#~ msgctxt "@text" +#~ msgid "" +#~ "- Customize your experience with more print profiles and plugins\n" +#~ "- Stay flexible by syncing your setup and loading it anywhere\n" +#~ "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "" +#~ "- Personalice su experiencia con más perfiles de impresión y complementos\n" +#~ "- Consiga más flexibilidad sincronizando su configuración y cargándola en cualquier lugar\n" +#~ "- Aumente la eficiencia con un flujo de trabajo remoto en las impresoras Ultimaker" + +#~ msgctxt "@button" +#~ msgid "Create account" +#~ msgstr "Crear cuenta" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Delete Selected Model" +#~ msgid_plural "Delete Selected Models" +#~ msgstr[0] "Eliminar modelo seleccionado" +#~ msgstr[1] "Eliminar modelos seleccionados" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Center Selected Model" +#~ msgid_plural "Center Selected Models" +#~ msgstr[0] "Centrar modelo seleccionado" +#~ msgstr[1] "Centrar modelos seleccionados" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Multiply Selected Model" +#~ msgid_plural "Multiply Selected Models" +#~ msgstr[0] "Multiplicar modelo seleccionado" +#~ msgstr[1] "Multiplicar modelos seleccionados" + +#~ msgctxt "@button" +#~ msgid "Finish" +#~ msgstr "Finalizar" + +#~ msgctxt "@label" +#~ msgid "Ultimaker Account" +#~ msgstr "Cuenta de Ultimaker" + +#~ msgctxt "@text" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "Su clave para una impresión 3D conectada" + +#~ msgctxt "@text" +#~ msgid "- Customize your experience with more print profiles and plugins" +#~ msgstr "- Personalice su experiencia con más perfiles de impresión y complementos" + +#~ msgctxt "@text" +#~ msgid "- Stay flexible by syncing your setup and loading it anywhere" +#~ msgstr "- Consiga más flexibilidad sincronizando su configuración y cargándola en cualquier lugar" + +#~ msgctxt "@text" +#~ msgid "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "- Aumente la eficiencia con un flujo de trabajo remoto en las impresoras Ultimaker" + +#~ msgctxt "@text" +#~ msgid "" +#~ "Please follow these steps to set up\n" +#~ "Ultimaker Cura. This will only take a few moments." +#~ msgstr "" +#~ "Siga estos pasos para configurar\n" +#~ "Ultimaker Cura. Solo le llevará unos minutos." + +#~ msgctxt "@label" +#~ msgid "What's new in Ultimaker Cura" +#~ msgstr "Novedades en Ultimaker Cura" + #~ msgctxt "@label ({} is object name)" #~ msgid "Are you sure you wish to remove {}? This cannot be undone!" #~ msgstr "¿Seguro que desea eliminar {}? ¡Esta acción no se puede deshacer!" diff --git a/resources/i18n/es_ES/fdmextruder.def.json.po b/resources/i18n/es_ES/fdmextruder.def.json.po index 8f3cf70884..c9d4b0a656 100644 --- a/resources/i18n/es_ES/fdmextruder.def.json.po +++ b/resources/i18n/es_ES/fdmextruder.def.json.po @@ -1,12 +1,12 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: Spanish\n" diff --git a/resources/i18n/es_ES/fdmprinter.def.json.po b/resources/i18n/es_ES/fdmprinter.def.json.po index 9dc4561d58..4983fbd68b 100644 --- a/resources/i18n/es_ES/fdmprinter.def.json.po +++ b/resources/i18n/es_ES/fdmprinter.def.json.po @@ -1,20 +1,20 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2020-08-21 13:40+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 15:15+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Spanish , Spanish \n" "Language: es_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2.3\n" +"X-Generator: Poedit 2.4.1\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -419,6 +419,26 @@ msgctxt "machine_extruders_share_heater description" msgid "Whether the extruders share a single heater rather than each extruder having its own heater." msgstr "Si los extrusores comparten un único calentador en lugar de que cada extrusor tenga el suyo propio." +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle label" +msgid "Extruders Share Nozzle" +msgstr "Los extrusores comparten la tobera" + +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle description" +msgid "Whether the extruders share a single nozzle rather than each extruder having its own nozzle. When set to true, it is expected that the printer-start gcode script properly sets up all extruders in an initial retraction state that is known and mutually compatible (either zero or one filament not retracted); in that case the initial retraction status is described, per extruder, by the 'machine_extruders_shared_nozzle_initial_retraction' parameter." +msgstr "Indica si los extrusores comparten una única tobera en lugar de que cada uno tenga la suya propia. Cuando se establece en true, se espera que la secuencia de comandos gcode de inicio de la impresora establezca todos los extrusores en un estado de retracción inicial conocido y mutuamente compatible (ninguno o un solo filamento que no se retrae); en este caso, el estado de retracción inicial se describe, por extrusor, mediante el parámetro \"machine_extruders_shared_nozzle_initial_retraction\"." + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction label" +msgid "Shared Nozzle Initial Retraction" +msgstr "Retracción inicial de tobera compartida" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction description" +msgid "How much the filament of each extruder is assumed to have been retracted from the shared nozzle tip at the completion of the printer-start gcode script; the value should be equal to or greater than the length of the common part of the nozzle's ducts." +msgstr "La cantidad de filamento de cada extrusor que se supone que se ha retirado de la punta de la tobera compartida al final de la secuencia de comandos gcode de inicio de la impresora; el valor debe ser igual o mayor que la longitud de la parte común de los conductos de la tobera." + #: fdmprinter.def.json msgctxt "machine_disallowed_areas label" msgid "Disallowed Areas" @@ -486,8 +506,8 @@ msgstr "Desplazamiento con extrusor" #: fdmprinter.def.json msgctxt "machine_use_extruder_offset_to_offset_coords description" -msgid "Apply the extruder offset to the coordinate system." -msgstr "Aplicar el desplazamiento del extrusor al sistema de coordenadas." +msgid "Apply the extruder offset to the coordinate system. Affects all extruders." +msgstr "Aplicar el desplazamiento del extrusor al sistema de coordenadas. Influye en todos los extrusores." #: fdmprinter.def.json msgctxt "extruder_prime_pos_z label" @@ -881,8 +901,8 @@ msgstr "Multiplicador del ancho de la línea de la primera capa. Si esta se aume #: fdmprinter.def.json msgctxt "shell label" -msgid "Shell" -msgstr "Perímetro" +msgid "Walls" +msgstr "Paredes" #: fdmprinter.def.json msgctxt "shell description" @@ -949,166 +969,6 @@ msgctxt "wall_0_wipe_dist description" msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better." msgstr "Distancia de un movimiento de desplazamiento insertado tras la pared exterior con el fin de ocultar mejor la costura sobre el eje Z." -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr label" -msgid "Top Surface Skin Extruder" -msgstr "Extrusor de la superficie superior del forro" - -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr description" -msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." -msgstr "El tren extrusor que se utiliza para imprimir el nivel superior del forro. Se emplea en la extrusión múltiple." - -#: fdmprinter.def.json -msgctxt "roofing_layer_count label" -msgid "Top Surface Skin Layers" -msgstr "Capas de la superficie superior del forro" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count description" -msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." -msgstr "El número de capas del nivel superior del forro. Normalmente es suficiente con una sola capa para generar superficies superiores con mayor calidad." - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr label" -msgid "Top/Bottom Extruder" -msgstr "Extrusor superior/inferior" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr description" -msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." -msgstr "El tren extrusor que se utiliza para imprimir el forro superior e inferior. Se emplea en la extrusión múltiple." - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness label" -msgid "Top/Bottom Thickness" -msgstr "Grosor superior/inferior" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness description" -msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." -msgstr "Grosor de las capas superiores/inferiores en la impresión. Este valor dividido por la altura de la capa define el número de capas superiores/inferiores." - -#: fdmprinter.def.json -msgctxt "top_thickness label" -msgid "Top Thickness" -msgstr "Grosor superior" - -#: fdmprinter.def.json -msgctxt "top_thickness description" -msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." -msgstr "Grosor de las capas superiores en la impresión. Este valor dividido por la altura de capa define el número de capas superiores." - -#: fdmprinter.def.json -msgctxt "top_layers label" -msgid "Top Layers" -msgstr "Capas superiores" - -#: fdmprinter.def.json -msgctxt "top_layers description" -msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." -msgstr "Número de capas superiores. Al calcularlo por el grosor superior, este valor se redondea a un número entero." - -#: fdmprinter.def.json -msgctxt "bottom_thickness label" -msgid "Bottom Thickness" -msgstr "Grosor inferior" - -#: fdmprinter.def.json -msgctxt "bottom_thickness description" -msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." -msgstr "Grosor de las capas inferiores en la impresión. Este valor dividido por la altura de capa define el número de capas inferiores." - -#: fdmprinter.def.json -msgctxt "bottom_layers label" -msgid "Bottom Layers" -msgstr "Capas inferiores" - -#: fdmprinter.def.json -msgctxt "bottom_layers description" -msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "Número de capas inferiores. Al calcularlo por el grosor inferior, este valor se redondea a un número entero." - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers label" -msgid "Initial Bottom Layers" -msgstr "Capas inferiores iniciales" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers description" -msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "El número de capas inferiores iniciales, desde la capa de impresión hacia arriba. Al calcularlo por el grosor inferior, este valor se redondea a un número entero." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern label" -msgid "Top/Bottom Pattern" -msgstr "Patrón superior/inferior" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern description" -msgid "The pattern of the top/bottom layers." -msgstr "Patrón de las capas superiores/inferiores." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option lines" -msgid "Lines" -msgstr "Líneas" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option concentric" -msgid "Concentric" -msgstr "Concéntrico" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option zigzag" -msgid "Zig Zag" -msgstr "Zigzag" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 label" -msgid "Bottom Pattern Initial Layer" -msgstr "Patrón inferior de la capa inicial" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 description" -msgid "The pattern on the bottom of the print on the first layer." -msgstr "El patrón que aparece en la parte inferior de la impresión de la primera capa." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option lines" -msgid "Lines" -msgstr "Líneas" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option concentric" -msgid "Concentric" -msgstr "Concéntrico" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option zigzag" -msgid "Zig Zag" -msgstr "Zigzag" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons label" -msgid "Connect Top/Bottom Polygons" -msgstr "Conectar polígonos superiores/inferiores" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." -msgstr "Conecta las trayectorias de forro superior/inferior cuando están próximas entre sí. Al habilitar este ajuste, en el patrón concéntrico se reduce considerablemente el tiempo de desplazamiento, pero las conexiones pueden producirse en mitad del relleno, con lo que bajaría la calidad de la superficie superior." - -#: fdmprinter.def.json -msgctxt "skin_angles label" -msgid "Top/Bottom Line Directions" -msgstr "Direcciones de línea superior/inferior" - -#: fdmprinter.def.json -msgctxt "skin_angles description" -msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." -msgstr "Una lista de los valores enteros de las direcciones de línea si las capas superiores e inferiores utilizan líneas o el patrón en zigzag. Los elementos de esta lista se utilizan de forma secuencial a medida que las capas se utilizan y, cuando se alcanza el final, la lista vuelve a comenzar desde el principio. Los elementos de la lista están separados por comas y toda la lista aparece entre corchetes. El valor predeterminado es una lista vacía que utiliza los ángulos predeterminados típicos (45 y 135 grados)." - #: fdmprinter.def.json msgctxt "wall_0_inset label" msgid "Outer Wall Inset" @@ -1414,6 +1274,176 @@ msgctxt "z_seam_relative description" msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate." msgstr "Cuando se habilita, las coordenadas de la costura en z son relativas al centro de cada pieza. De lo contrario, las coordenadas definen una posición absoluta en la placa de impresión." +#: fdmprinter.def.json +msgctxt "top_bottom label" +msgid "Top/Bottom" +msgstr "Superior o inferior" + +#: fdmprinter.def.json +msgctxt "top_bottom description" +msgid "Top/Bottom" +msgstr "Superior o inferior" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr label" +msgid "Top Surface Skin Extruder" +msgstr "Extrusor de la superficie superior del forro" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr description" +msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." +msgstr "El tren extrusor que se utiliza para imprimir el nivel superior del forro. Se emplea en la extrusión múltiple." + +#: fdmprinter.def.json +msgctxt "roofing_layer_count label" +msgid "Top Surface Skin Layers" +msgstr "Capas de la superficie superior del forro" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count description" +msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." +msgstr "El número de capas del nivel superior del forro. Normalmente es suficiente con una sola capa para generar superficies superiores con mayor calidad." + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr label" +msgid "Top/Bottom Extruder" +msgstr "Extrusor superior/inferior" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr description" +msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." +msgstr "El tren extrusor que se utiliza para imprimir el forro superior e inferior. Se emplea en la extrusión múltiple." + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness label" +msgid "Top/Bottom Thickness" +msgstr "Grosor superior/inferior" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness description" +msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." +msgstr "Grosor de las capas superiores/inferiores en la impresión. Este valor dividido por la altura de la capa define el número de capas superiores/inferiores." + +#: fdmprinter.def.json +msgctxt "top_thickness label" +msgid "Top Thickness" +msgstr "Grosor superior" + +#: fdmprinter.def.json +msgctxt "top_thickness description" +msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." +msgstr "Grosor de las capas superiores en la impresión. Este valor dividido por la altura de capa define el número de capas superiores." + +#: fdmprinter.def.json +msgctxt "top_layers label" +msgid "Top Layers" +msgstr "Capas superiores" + +#: fdmprinter.def.json +msgctxt "top_layers description" +msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." +msgstr "Número de capas superiores. Al calcularlo por el grosor superior, este valor se redondea a un número entero." + +#: fdmprinter.def.json +msgctxt "bottom_thickness label" +msgid "Bottom Thickness" +msgstr "Grosor inferior" + +#: fdmprinter.def.json +msgctxt "bottom_thickness description" +msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." +msgstr "Grosor de las capas inferiores en la impresión. Este valor dividido por la altura de capa define el número de capas inferiores." + +#: fdmprinter.def.json +msgctxt "bottom_layers label" +msgid "Bottom Layers" +msgstr "Capas inferiores" + +#: fdmprinter.def.json +msgctxt "bottom_layers description" +msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "Número de capas inferiores. Al calcularlo por el grosor inferior, este valor se redondea a un número entero." + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "Capas inferiores iniciales" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "El número de capas inferiores iniciales, desde la capa de impresión hacia arriba. Al calcularlo por el grosor inferior, este valor se redondea a un número entero." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern label" +msgid "Top/Bottom Pattern" +msgstr "Patrón superior/inferior" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern description" +msgid "The pattern of the top/bottom layers." +msgstr "Patrón de las capas superiores/inferiores." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option lines" +msgid "Lines" +msgstr "Líneas" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option concentric" +msgid "Concentric" +msgstr "Concéntrico" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option zigzag" +msgid "Zig Zag" +msgstr "Zigzag" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 label" +msgid "Bottom Pattern Initial Layer" +msgstr "Patrón inferior de la capa inicial" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 description" +msgid "The pattern on the bottom of the print on the first layer." +msgstr "El patrón que aparece en la parte inferior de la impresión de la primera capa." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option lines" +msgid "Lines" +msgstr "Líneas" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option concentric" +msgid "Concentric" +msgstr "Concéntrico" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option zigzag" +msgid "Zig Zag" +msgstr "Zigzag" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons label" +msgid "Connect Top/Bottom Polygons" +msgstr "Conectar polígonos superiores/inferiores" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons description" +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "Conecta las trayectorias de forro superior/inferior cuando están próximas entre sí. Al habilitar este ajuste, en el patrón concéntrico se reduce considerablemente el tiempo de desplazamiento, pero las conexiones pueden producirse en mitad del relleno, con lo que bajaría la calidad de la superficie superior." + +#: fdmprinter.def.json +msgctxt "skin_angles label" +msgid "Top/Bottom Line Directions" +msgstr "Direcciones de línea superior/inferior" + +#: fdmprinter.def.json +msgctxt "skin_angles description" +msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." +msgstr "Una lista de los valores enteros de las direcciones de línea si las capas superiores e inferiores utilizan líneas o el patrón en zigzag. Los elementos de esta lista se utilizan de forma secuencial a medida que las capas se utilizan y, cuando se alcanza el final, la lista vuelve a comenzar desde el principio. Los elementos de la lista están separados por comas y toda la lista aparece entre corchetes. El valor predeterminado es una lista vacía que utiliza los ángulos predeterminados típicos (45 y 135 grados)." + #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" msgid "No Skin in Z Gaps" @@ -1554,6 +1584,86 @@ msgctxt "skin_overlap_mm description" msgid "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any value over half the width of the wall may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall." msgstr "Ajuste la cantidad de superposición entre las paredes y (los extremos de) las líneas centrales del forro. Una ligera superposición permite que las paredes estén firmemente unidas al forro. Tenga en cuenta que, con un mismo ancho de la línea del forro y la pared, cualquier valor superior a la mitad del ancho de la pared ya puede provocar que cualquier forro sobrepase la pared, debido a que en ese punto la posición de la tobera del extrusor del forro ya puede sobrepasar la mitad de la pared." +#: fdmprinter.def.json +msgctxt "skin_preshrink label" +msgid "Skin Removal Width" +msgstr "Anchura de retirada del forro" + +#: fdmprinter.def.json +msgctxt "skin_preshrink description" +msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." +msgstr "Anchura máxima de las áreas de forro que se deben retirar. Todas las áreas de forro inferiores a este valor desaparecerán. Esto puede contribuir a limitar el tiempo y el material empleados en imprimir el forro superior/inferior en las superficies inclinadas del modelo." + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink label" +msgid "Top Skin Removal Width" +msgstr "Anchura de retirada del forro superior" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink description" +msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." +msgstr "Anchura máxima de las áreas superiores de forro que se deben retirar. Todas las áreas de forro inferiores a este valor desaparecerán. Esto puede contribuir a limitar el tiempo y el material empleados en imprimir el forro superior en las superficies inclinadas del modelo." + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink label" +msgid "Bottom Skin Removal Width" +msgstr "Anchura de retirada del forro inferior" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink description" +msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." +msgstr "Anchura máxima de las áreas inferiores de forro que se deben retirar. Todas las áreas de forro inferiores a este valor desaparecerán. Esto puede contribuir a limitar el tiempo y el material empleados en imprimir el forro inferior en las superficies inclinadas del modelo." + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance label" +msgid "Skin Expand Distance" +msgstr "Distancia de expansión del forro" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance description" +msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." +msgstr "La distancia a la que los forros se expanden en el relleno. Los valores superiores hacen que el forro se adhiera mejor al patrón de relleno y que las paredes de las capas vecinas se adhieran mejor al forro. Los valores inferiores ahorran material." + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance label" +msgid "Top Skin Expand Distance" +msgstr "Distancia de expansión del forro superior" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance description" +msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." +msgstr "La distancia a la que los forros superiores se expanden en el relleno. Los valores superiores hacen que el forro se adhiera mejor al patrón de relleno y que las paredes de la capa superior se adhieran mejor al forro. Los valores inferiores ahorran material." + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance label" +msgid "Bottom Skin Expand Distance" +msgstr "Distancia de expansión del forro inferior" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance description" +msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." +msgstr "La distancia a la que los forros inferiores se expanden en el relleno. Los valores superiores hacen que el forro se adhiera mejor al patrón de relleno y que el forro se adhiera mejor a las paredes de la capa inferior. Los valores inferiores ahorran material." + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion label" +msgid "Maximum Skin Angle for Expansion" +msgstr "Ángulo máximo de expansión del forro" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion description" +msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded." +msgstr "El revestimiento superior e inferior no se expandirá cuando las superficies superior e inferior del objeto tengan un ángulo mayor que este valor. Esto evita la expansión de las pequeñas áreas de revestimiento que se crean cuando la superficie del modelo tiene una pendiente casi vertical. Un ángulo de 0° es horizontal y no provoca la extensión de ningún revestimiento exterior, mientras que un ángulo de 90 ° es vertical y provoca la extensión de todo el revestimiento exterior." + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion label" +msgid "Minimum Skin Width for Expansion" +msgstr "Anchura de expansión mínima del forro" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion description" +msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." +msgstr "Las áreas de forro más estrechas que este valor no se expanden. Esto evita la expansión de las áreas de forro estrechas que se crean cuando la superficie del modelo tiene una inclinación casi vertical." + #: fdmprinter.def.json msgctxt "infill label" msgid "Infill" @@ -1863,86 +1973,6 @@ msgctxt "infill_support_angle description" msgid "The minimum angle of internal overhangs for which infill is added. At a value of 0° objects are totally filled with infill, 90° will not provide any infill." msgstr "El ángulo mínimo de los voladizos internos para los que se agrega relleno. A partir de un valor de 0 º todos los objetos estarán totalmente rellenos, a 90 º no se proporcionará ningún relleno." -#: fdmprinter.def.json -msgctxt "skin_preshrink label" -msgid "Skin Removal Width" -msgstr "Anchura de retirada del forro" - -#: fdmprinter.def.json -msgctxt "skin_preshrink description" -msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." -msgstr "Anchura máxima de las áreas de forro que se deben retirar. Todas las áreas de forro inferiores a este valor desaparecerán. Esto puede contribuir a limitar el tiempo y el material empleados en imprimir el forro superior/inferior en las superficies inclinadas del modelo." - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink label" -msgid "Top Skin Removal Width" -msgstr "Anchura de retirada del forro superior" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink description" -msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." -msgstr "Anchura máxima de las áreas superiores de forro que se deben retirar. Todas las áreas de forro inferiores a este valor desaparecerán. Esto puede contribuir a limitar el tiempo y el material empleados en imprimir el forro superior en las superficies inclinadas del modelo." - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink label" -msgid "Bottom Skin Removal Width" -msgstr "Anchura de retirada del forro inferior" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink description" -msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." -msgstr "Anchura máxima de las áreas inferiores de forro que se deben retirar. Todas las áreas de forro inferiores a este valor desaparecerán. Esto puede contribuir a limitar el tiempo y el material empleados en imprimir el forro inferior en las superficies inclinadas del modelo." - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance label" -msgid "Skin Expand Distance" -msgstr "Distancia de expansión del forro" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance description" -msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." -msgstr "La distancia a la que los forros se expanden en el relleno. Los valores superiores hacen que el forro se adhiera mejor al patrón de relleno y que las paredes de las capas vecinas se adhieran mejor al forro. Los valores inferiores ahorran material." - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance label" -msgid "Top Skin Expand Distance" -msgstr "Distancia de expansión del forro superior" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance description" -msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." -msgstr "La distancia a la que los forros superiores se expanden en el relleno. Los valores superiores hacen que el forro se adhiera mejor al patrón de relleno y que las paredes de la capa superior se adhieran mejor al forro. Los valores inferiores ahorran material." - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance label" -msgid "Bottom Skin Expand Distance" -msgstr "Distancia de expansión del forro inferior" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance description" -msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." -msgstr "La distancia a la que los forros inferiores se expanden en el relleno. Los valores superiores hacen que el forro se adhiera mejor al patrón de relleno y que el forro se adhiera mejor a las paredes de la capa inferior. Los valores inferiores ahorran material." - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion label" -msgid "Maximum Skin Angle for Expansion" -msgstr "Ángulo máximo de expansión del forro" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion description" -msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." -msgstr "Las superficies superiores e inferiores de un objeto con un ángulo mayor que este no expanden los forros superior e inferior. Esto evita la expansión de las áreas de forro estrechas que se crean cuando la superficie del modelo tiene una inclinación casi vertical. Un ángulo de 0º es horizontal, mientras que uno de 90º es vertical." - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion label" -msgid "Minimum Skin Width for Expansion" -msgstr "Anchura de expansión mínima del forro" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion description" -msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." -msgstr "Las áreas de forro más estrechas que este valor no se expanden. Esto evita la expansión de las áreas de forro estrechas que se crean cuando la superficie del modelo tiene una inclinación casi vertical." - #: fdmprinter.def.json msgctxt "skin_edge_support_thickness label" msgid "Skin Edge Support Thickness" @@ -2560,8 +2590,8 @@ msgstr "Velocidad de capa inicial" #: fdmprinter.def.json msgctxt "speed_layer_0 description" -msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." -msgstr "Velocidad de la capa inicial. Se recomienda un valor más bajo para mejorar la adherencia a la placa de impresión." +msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate. Does not affect the build plate adhesion structures themselves, like brim and raft." +msgstr "La velocidad de la capa inicial. Se recomienda un valor más bajo para mejorar la adherencia a la placa de impresión. No influye en las estructuras de adhesión de la placa de impresión en sí, como el borde y la balsa." #: fdmprinter.def.json msgctxt "speed_print_layer_0 label" @@ -3170,8 +3200,9 @@ msgstr "Distancia de peinada máxima sin retracción" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" -msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." -msgstr "Si no es cero, los movimientos de desplazamiento de peinada que sean superiores a esta distancia utilizarán retracción." +msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." +msgstr "Si es mayor que cero, los movimientos de desplazamiento de peinada que sean superiores a esta distancia utilizarán retracción. Si se establece como cero," +" no hay un máximo y los movimientos de peinada no utilizarán la retracción." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" @@ -5074,10 +5105,8 @@ msgstr "Rango de procesamiento de la malla" #: fdmprinter.def.json msgctxt "infill_mesh_order description" -msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." -msgstr "Determina la prioridad de esta malla al tener en cuenta varias mallas de relleno superpuestas. Las áreas en las que se superponen varias mallas de relleno" -" tomarán la configuración de la malla con el rango más bajo. Una malla de relleno con un orden superior modificará el relleno de las mallas de relleno" -" con un orden inferior y las mallas normales." +msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the highest rank. An infill mesh with a higher rank will modify the infill of infill meshes with lower rank and normal meshes." +msgstr "Determina la prioridad de esta malla al tener en cuenta varias mallas de relleno superpuestas. Las áreas en las que se superponen varias mallas de relleno tomarán la configuración de la malla con el rango más alto. Una malla de relleno con un rango superior modificará el relleno de las mallas de relleno con un rango inferior y mallas normales." #: fdmprinter.def.json msgctxt "cutting_mesh label" @@ -5424,6 +5453,16 @@ msgctxt "conical_overhang_angle description" msgid "The maximum angle of overhangs after the they have been made printable. At a value of 0° all overhangs are replaced by a piece of model connected to the build plate, 90° will not change the model in any way." msgstr "Ángulo máximo de los voladizos una vez que se han hecho imprimibles. Un valor de 0º hace que todos los voladizos sean reemplazados por una pieza del modelo conectada a la placa de impresión y un valor de 90º no cambiará el modelo." +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size label" +msgid "Maximum Overhang Hole Area" +msgstr "Área máxima del agujero en voladizo" + +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size description" +msgid "The maximum area of a hole in the base of the model before it's removed by Make Overhang Printable. Holes smaller than this will be retained. A value of 0 mm² will fill all holes in the models base." +msgstr "El área máxima de un agujero en la base del modelo antes de que se elimine mediante la herramienta Convertir voladizo en imprimible. Se conservarán los agujeros más pequeños. Con un valor de 0 mm² se rellenan todos los agujeros de la base del modelo." + #: fdmprinter.def.json msgctxt "coasting_enable label" msgid "Enable Coasting" @@ -6363,6 +6402,30 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Matriz de transformación que se aplicará al modelo cuando se cargue desde el archivo." +#~ msgctxt "retraction_combing_max_distance description" +#~ msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." +#~ msgstr "Si no es cero, los movimientos de desplazamiento de peinada que sean superiores a esta distancia utilizarán retracción." + +#~ msgctxt "machine_use_extruder_offset_to_offset_coords description" +#~ msgid "Apply the extruder offset to the coordinate system." +#~ msgstr "Aplicar el desplazamiento del extrusor al sistema de coordenadas." + +#~ msgctxt "shell label" +#~ msgid "Shell" +#~ msgstr "Perímetro" + +#~ msgctxt "max_skin_angle_for_expansion description" +#~ msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." +#~ msgstr "Las superficies superiores e inferiores de un objeto con un ángulo mayor que este no expanden los forros superior e inferior. Esto evita la expansión de las áreas de forro estrechas que se crean cuando la superficie del modelo tiene una inclinación casi vertical. Un ángulo de 0º es horizontal, mientras que uno de 90º es vertical." + +#~ msgctxt "speed_layer_0 description" +#~ msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." +#~ msgstr "Velocidad de la capa inicial. Se recomienda un valor más bajo para mejorar la adherencia a la placa de impresión." + +#~ msgctxt "infill_mesh_order description" +#~ msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." +#~ msgstr "Determina la prioridad de esta malla al tener en cuenta varias mallas de relleno superpuestas. Las áreas en las que se superponen varias mallas de relleno tomarán la configuración de la malla con el rango más bajo. Una malla de relleno con un orden superior modificará el relleno de las mallas de relleno con un orden inferior y las mallas normales." + #~ msgctxt "material_bed_temperature description" #~ msgid "The temperature used for the heated build plate. If this is 0, the bed temperature will not be adjusted." #~ msgstr "La temperatura utilizada para la placa de impresión caliente. Si el valor es 0, la temperatura de la plataforma no se ajustará." diff --git a/resources/i18n/fdmextruder.def.json.pot b/resources/i18n/fdmextruder.def.json.pot index 8205e867d3..cdbf81ab6b 100644 --- a/resources/i18n/fdmextruder.def.json.pot +++ b/resources/i18n/fdmextruder.def.json.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" diff --git a/resources/i18n/fdmprinter.def.json.pot b/resources/i18n/fdmprinter.def.json.pot index 6c65886f4d..085e7e837f 100644 --- a/resources/i18n/fdmprinter.def.json.pot +++ b/resources/i18n/fdmprinter.def.json.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Uranium json setting files\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE\n" @@ -450,6 +450,37 @@ msgid "" "its own heater." msgstr "" +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle label" +msgid "Extruders Share Nozzle" +msgstr "" + +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle description" +msgid "" +"Whether the extruders share a single nozzle rather than each extruder having " +"its own nozzle. When set to true, it is expected that the printer-start " +"gcode script properly sets up all extruders in an initial retraction state " +"that is known and mutually compatible (either zero or one filament not " +"retracted); in that case the initial retraction status is described, per " +"extruder, by the 'machine_extruders_shared_nozzle_initial_retraction' " +"parameter." +msgstr "" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction label" +msgid "Shared Nozzle Initial Retraction" +msgstr "" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction description" +msgid "" +"How much the filament of each extruder is assumed to have been retracted " +"from the shared nozzle tip at the completion of the printer-start gcode " +"script; the value should be equal to or greater than the length of the " +"common part of the nozzle's ducts." +msgstr "" + #: fdmprinter.def.json msgctxt "machine_disallowed_areas label" msgid "Disallowed Areas" @@ -521,7 +552,8 @@ msgstr "" #: fdmprinter.def.json msgctxt "machine_use_extruder_offset_to_offset_coords description" -msgid "Apply the extruder offset to the coordinate system." +msgid "" +"Apply the extruder offset to the coordinate system. Affects all extruders." msgstr "" #: fdmprinter.def.json @@ -948,7 +980,7 @@ msgstr "" #: fdmprinter.def.json msgctxt "shell label" -msgid "Shell" +msgid "Walls" msgstr "" #: fdmprinter.def.json @@ -1028,194 +1060,6 @@ msgid "" "better." msgstr "" -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr label" -msgid "Top Surface Skin Extruder" -msgstr "" - -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr description" -msgid "" -"The extruder train used for printing the top most skin. This is used in " -"multi-extrusion." -msgstr "" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count label" -msgid "Top Surface Skin Layers" -msgstr "" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count description" -msgid "" -"The number of top most skin layers. Usually only one top most layer is " -"sufficient to generate higher quality top surfaces." -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr label" -msgid "Top/Bottom Extruder" -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr description" -msgid "" -"The extruder train used for printing the top and bottom skin. This is used " -"in multi-extrusion." -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness label" -msgid "Top/Bottom Thickness" -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness description" -msgid "" -"The thickness of the top/bottom layers in the print. This value divided by " -"the layer height defines the number of top/bottom layers." -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_thickness label" -msgid "Top Thickness" -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_thickness description" -msgid "" -"The thickness of the top layers in the print. This value divided by the " -"layer height defines the number of top layers." -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_layers label" -msgid "Top Layers" -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_layers description" -msgid "" -"The number of top layers. When calculated by the top thickness, this value " -"is rounded to a whole number." -msgstr "" - -#: fdmprinter.def.json -msgctxt "bottom_thickness label" -msgid "Bottom Thickness" -msgstr "" - -#: fdmprinter.def.json -msgctxt "bottom_thickness description" -msgid "" -"The thickness of the bottom layers in the print. This value divided by the " -"layer height defines the number of bottom layers." -msgstr "" - -#: fdmprinter.def.json -msgctxt "bottom_layers label" -msgid "Bottom Layers" -msgstr "" - -#: fdmprinter.def.json -msgctxt "bottom_layers description" -msgid "" -"The number of bottom layers. When calculated by the bottom thickness, this " -"value is rounded to a whole number." -msgstr "" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers label" -msgid "Initial Bottom Layers" -msgstr "" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers description" -msgid "" -"The number of initial bottom layers, from the build-plate upwards. When " -"calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern label" -msgid "Top/Bottom Pattern" -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern description" -msgid "The pattern of the top/bottom layers." -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option lines" -msgid "Lines" -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option concentric" -msgid "Concentric" -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option zigzag" -msgid "Zig Zag" -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 label" -msgid "Bottom Pattern Initial Layer" -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 description" -msgid "The pattern on the bottom of the print on the first layer." -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option lines" -msgid "Lines" -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option concentric" -msgid "Concentric" -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option zigzag" -msgid "Zig Zag" -msgstr "" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons label" -msgid "Connect Top/Bottom Polygons" -msgstr "" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons description" -msgid "" -"Connect top/bottom skin paths where they run next to each other. For the " -"concentric pattern enabling this setting greatly reduces the travel time, " -"but because the connections can happen midway over infill this feature can " -"reduce the top surface quality." -msgstr "" - -#: fdmprinter.def.json -msgctxt "skin_angles label" -msgid "Top/Bottom Line Directions" -msgstr "" - -#: fdmprinter.def.json -msgctxt "skin_angles description" -msgid "" -"A list of integer line directions to use when the top/bottom layers use the " -"lines or zig zag pattern. Elements from the list are used sequentially as " -"the layers progress and when the end of the list is reached, it starts at " -"the beginning again. The list items are separated by commas and the whole " -"list is contained in square brackets. Default is an empty list which means " -"use the traditional default angles (45 and 135 degrees)." -msgstr "" - #: fdmprinter.def.json msgctxt "wall_0_inset label" msgid "Outer Wall Inset" @@ -1578,6 +1422,204 @@ msgid "" "plate." msgstr "" +#: fdmprinter.def.json +msgctxt "top_bottom label" +msgid "Top/Bottom" +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_bottom description" +msgid "Top/Bottom" +msgstr "" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr label" +msgid "Top Surface Skin Extruder" +msgstr "" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr description" +msgid "" +"The extruder train used for printing the top most skin. This is used in " +"multi-extrusion." +msgstr "" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count label" +msgid "Top Surface Skin Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count description" +msgid "" +"The number of top most skin layers. Usually only one top most layer is " +"sufficient to generate higher quality top surfaces." +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr label" +msgid "Top/Bottom Extruder" +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr description" +msgid "" +"The extruder train used for printing the top and bottom skin. This is used " +"in multi-extrusion." +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness label" +msgid "Top/Bottom Thickness" +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness description" +msgid "" +"The thickness of the top/bottom layers in the print. This value divided by " +"the layer height defines the number of top/bottom layers." +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_thickness label" +msgid "Top Thickness" +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_thickness description" +msgid "" +"The thickness of the top layers in the print. This value divided by the " +"layer height defines the number of top layers." +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_layers label" +msgid "Top Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_layers description" +msgid "" +"The number of top layers. When calculated by the top thickness, this value " +"is rounded to a whole number." +msgstr "" + +#: fdmprinter.def.json +msgctxt "bottom_thickness label" +msgid "Bottom Thickness" +msgstr "" + +#: fdmprinter.def.json +msgctxt "bottom_thickness description" +msgid "" +"The thickness of the bottom layers in the print. This value divided by the " +"layer height defines the number of bottom layers." +msgstr "" + +#: fdmprinter.def.json +msgctxt "bottom_layers label" +msgid "Bottom Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "bottom_layers description" +msgid "" +"The number of bottom layers. When calculated by the bottom thickness, this " +"value is rounded to a whole number." +msgstr "" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "" +"The number of initial bottom layers, from the build-plate upwards. When " +"calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern label" +msgid "Top/Bottom Pattern" +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern description" +msgid "The pattern of the top/bottom layers." +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option lines" +msgid "Lines" +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option concentric" +msgid "Concentric" +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option zigzag" +msgid "Zig Zag" +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 label" +msgid "Bottom Pattern Initial Layer" +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 description" +msgid "The pattern on the bottom of the print on the first layer." +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option lines" +msgid "Lines" +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option concentric" +msgid "Concentric" +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option zigzag" +msgid "Zig Zag" +msgstr "" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons label" +msgid "Connect Top/Bottom Polygons" +msgstr "" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons description" +msgid "" +"Connect top/bottom skin paths where they run next to each other. For the " +"concentric pattern enabling this setting greatly reduces the travel time, " +"but because the connections can happen midway over infill this feature can " +"reduce the top surface quality." +msgstr "" + +#: fdmprinter.def.json +msgctxt "skin_angles label" +msgid "Top/Bottom Line Directions" +msgstr "" + +#: fdmprinter.def.json +msgctxt "skin_angles description" +msgid "" +"A list of integer line directions to use when the top/bottom layers use the " +"lines or zig zag pattern. Elements from the list are used sequentially as " +"the layers progress and when the end of the list is reached, it starts at " +"the beginning again. The list items are separated by commas and the whole " +"list is contained in square brackets. Default is an empty list which means " +"use the traditional default angles (45 and 135 degrees)." +msgstr "" + #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" msgid "No Skin in Z Gaps" @@ -1751,6 +1793,118 @@ msgid "" "already reach past the middle of the wall." msgstr "" +#: fdmprinter.def.json +msgctxt "skin_preshrink label" +msgid "Skin Removal Width" +msgstr "" + +#: fdmprinter.def.json +msgctxt "skin_preshrink description" +msgid "" +"The largest width of skin areas which are to be removed. Every skin area " +"smaller than this value will disappear. This can help in limiting the amount " +"of time and material spent on printing top/bottom skin at slanted surfaces " +"in the model." +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink label" +msgid "Top Skin Removal Width" +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink description" +msgid "" +"The largest width of top skin areas which are to be removed. Every skin area " +"smaller than this value will disappear. This can help in limiting the amount " +"of time and material spent on printing top skin at slanted surfaces in the " +"model." +msgstr "" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink label" +msgid "Bottom Skin Removal Width" +msgstr "" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink description" +msgid "" +"The largest width of bottom skin areas which are to be removed. Every skin " +"area smaller than this value will disappear. This can help in limiting the " +"amount of time and material spent on printing bottom skin at slanted " +"surfaces in the model." +msgstr "" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance label" +msgid "Skin Expand Distance" +msgstr "" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance description" +msgid "" +"The distance the skins are expanded into the infill. Higher values makes the " +"skin attach better to the infill pattern and makes the walls on neighboring " +"layers adhere better to the skin. Lower values save amount of material used." +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance label" +msgid "Top Skin Expand Distance" +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance description" +msgid "" +"The distance the top skins are expanded into the infill. Higher values makes " +"the skin attach better to the infill pattern and makes the walls on the " +"layer above adhere better to the skin. Lower values save amount of material " +"used." +msgstr "" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance label" +msgid "Bottom Skin Expand Distance" +msgstr "" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance description" +msgid "" +"The distance the bottom skins are expanded into the infill. Higher values " +"makes the skin attach better to the infill pattern and makes the skin adhere " +"better to the walls on the layer below. Lower values save amount of material " +"used." +msgstr "" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion label" +msgid "Maximum Skin Angle for Expansion" +msgstr "" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion description" +msgid "" +"Top and/or bottom surfaces of your object with an angle larger than this " +"setting, won't have their top/bottom skin expanded. This avoids expanding " +"the narrow skin areas that are created when the model surface has a near " +"vertical slope. An angle of 0° is horizontal and will cause no skin to be " +"expanded, while an angle of 90° is vertical and will cause all skin to be " +"expanded." +msgstr "" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion label" +msgid "Minimum Skin Width for Expansion" +msgstr "" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion description" +msgid "" +"Skin areas narrower than this are not expanded. This avoids expanding the " +"narrow skin areas that are created when the model surface has a slope close " +"to the vertical." +msgstr "" + #: fdmprinter.def.json msgctxt "infill label" msgid "Infill" @@ -2119,117 +2273,6 @@ msgid "" "infill." msgstr "" -#: fdmprinter.def.json -msgctxt "skin_preshrink label" -msgid "Skin Removal Width" -msgstr "" - -#: fdmprinter.def.json -msgctxt "skin_preshrink description" -msgid "" -"The largest width of skin areas which are to be removed. Every skin area " -"smaller than this value will disappear. This can help in limiting the amount " -"of time and material spent on printing top/bottom skin at slanted surfaces " -"in the model." -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink label" -msgid "Top Skin Removal Width" -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink description" -msgid "" -"The largest width of top skin areas which are to be removed. Every skin area " -"smaller than this value will disappear. This can help in limiting the amount " -"of time and material spent on printing top skin at slanted surfaces in the " -"model." -msgstr "" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink label" -msgid "Bottom Skin Removal Width" -msgstr "" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink description" -msgid "" -"The largest width of bottom skin areas which are to be removed. Every skin " -"area smaller than this value will disappear. This can help in limiting the " -"amount of time and material spent on printing bottom skin at slanted " -"surfaces in the model." -msgstr "" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance label" -msgid "Skin Expand Distance" -msgstr "" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance description" -msgid "" -"The distance the skins are expanded into the infill. Higher values makes the " -"skin attach better to the infill pattern and makes the walls on neighboring " -"layers adhere better to the skin. Lower values save amount of material used." -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance label" -msgid "Top Skin Expand Distance" -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance description" -msgid "" -"The distance the top skins are expanded into the infill. Higher values makes " -"the skin attach better to the infill pattern and makes the walls on the " -"layer above adhere better to the skin. Lower values save amount of material " -"used." -msgstr "" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance label" -msgid "Bottom Skin Expand Distance" -msgstr "" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance description" -msgid "" -"The distance the bottom skins are expanded into the infill. Higher values " -"makes the skin attach better to the infill pattern and makes the skin adhere " -"better to the walls on the layer below. Lower values save amount of material " -"used." -msgstr "" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion label" -msgid "Maximum Skin Angle for Expansion" -msgstr "" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion description" -msgid "" -"Top and/or bottom surfaces of your object with an angle larger than this " -"setting, won't have their top/bottom skin expanded. This avoids expanding " -"the narrow skin areas that are created when the model surface has a near " -"vertical slope. An angle of 0° is horizontal, while an angle of 90° is " -"vertical." -msgstr "" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion label" -msgid "Minimum Skin Width for Expansion" -msgstr "" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion description" -msgid "" -"Skin areas narrower than this are not expanded. This avoids expanding the " -"narrow skin areas that are created when the model surface has a slope close " -"to the vertical." -msgstr "" - #: fdmprinter.def.json msgctxt "skin_edge_support_thickness label" msgid "Skin Edge Support Thickness" @@ -2919,7 +2962,8 @@ msgstr "" msgctxt "speed_layer_0 description" msgid "" "The speed for the initial layer. A lower value is advised to improve " -"adhesion to the build plate." +"adhesion to the build plate. Does not affect the build plate adhesion " +"structures themselves, like brim and raft." msgstr "" #: fdmprinter.def.json @@ -3612,8 +3656,9 @@ msgstr "" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" msgid "" -"When non-zero, combing travel moves that are longer than this distance will " -"use retraction." +"When greater than zero, combing travel moves that are longer than this " +"distance will use retraction. If set to zero, there is no maximum and " +"combing moves will not use retraction." msgstr "" #: fdmprinter.def.json @@ -5880,8 +5925,8 @@ msgctxt "infill_mesh_order description" msgid "" "Determines the priority of this mesh when considering multiple overlapping " "infill meshes. Areas where multiple infill meshes overlap will take on the " -"settings of the mesh with the lowest rank. An infill mesh with a higher " -"order will modify the infill of infill meshes with lower order and normal " +"settings of the mesh with the highest rank. An infill mesh with a higher " +"rank will modify the infill of infill meshes with lower rank and normal " "meshes." msgstr "" @@ -6306,6 +6351,19 @@ msgid "" "build plate, 90° will not change the model in any way." msgstr "" +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size label" +msgid "Maximum Overhang Hole Area" +msgstr "" + +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size description" +msgid "" +"The maximum area of a hole in the base of the model before it's removed by " +"Make Overhang Printable. Holes smaller than this will be retained. A value " +"of 0 mm² will fill all holes in the models base." +msgstr "" + #: fdmprinter.def.json msgctxt "coasting_enable label" msgid "Enable Coasting" diff --git a/resources/i18n/fi_FI/cura.po b/resources/i18n/fi_FI/cura.po index aa3178f13e..d8aaa50cbf 100644 --- a/resources/i18n/fi_FI/cura.po +++ b/resources/i18n/fi_FI/cura.po @@ -1,12 +1,12 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0200\n" "PO-Revision-Date: 2017-09-27 12:27+0200\n" "Last-Translator: Bothof \n" "Language-Team: Finnish\n" @@ -18,7 +18,7 @@ msgstr "" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1581 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 msgctxt "@label" @@ -89,12 +89,12 @@ msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:226 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:234 msgctxt "@label" msgid "Custom Material" msgstr "Mukautettu materiaali" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:227 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 msgctxt "@label" msgid "Custom" @@ -116,7 +116,7 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:178 +#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:181 msgctxt "@info:title" msgid "Login failed" msgstr "" @@ -146,28 +146,33 @@ msgctxt "@info:title" msgid "Can't Find Location" msgstr "Paikkaa ei löydy" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:104 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:116 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:110 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 msgctxt "@info:title" msgid "Backup" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:123 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:135 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:134 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:146 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that is higher than the current version." msgstr "" +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 +msgctxt "@info:backup_failed" +msgid "The following error occurred while trying to restore a Cura backup:" +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -309,74 +314,74 @@ msgctxt "@action:button" msgid "Send report" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:521 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:527 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Ladataan laitteita..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:528 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:534 msgctxt "@info:progress" msgid "Setting up preferences..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:657 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:672 msgctxt "@info:progress" msgid "Initializing Active Machine..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:803 msgctxt "@info:progress" msgid "Initializing machine manager..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:802 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:817 msgctxt "@info:progress" msgid "Initializing build volume..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:870 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:888 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Asetetaan näkymää..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:906 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:924 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Ladataan käyttöliittymää..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:911 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:929 msgctxt "@info:progress" msgid "Initializing engine..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1221 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1246 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1777 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1799 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Vain yksi G-code-tiedosto voidaan ladata kerralla. Tiedoston {0} tuonti ohitettiin." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1778 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:188 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 msgctxt "@info:title" msgid "Warning" msgstr "Varoitus" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1787 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1809 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Muita tiedostoja ei voida ladata, kun G-code latautuu. Tiedoston {0} tuonti ohitettiin." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 @@ -399,7 +404,7 @@ msgctxt "@info:title" msgid "Placing Object" msgstr "Sijoitetaan kappaletta" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:92 msgctxt "@message" msgid "Could not read response." msgstr "" @@ -419,12 +424,12 @@ msgctxt "@message" msgid "Something unexpected happened when trying to log in, please try again." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:187 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:189 msgctxt "@info" msgid "Unable to start a new sign in process. Check if another sign in attempt is still active." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "" @@ -442,8 +447,8 @@ msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Tiedosto {0} on jo olemassa. Haluatko varmasti kirjoittaa sen päälle?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:452 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:455 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "" @@ -526,33 +531,33 @@ msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Profiililla {0} on tuntematon tiedostotyyppi tai se on vioittunut." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:423 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:426 msgctxt "@label" msgid "Custom profile" msgstr "Mukautettu profiili" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:439 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:442 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Profiilista puuttuu laatutyyppi." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:443 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:446 msgctxt "@info:status" -msgid "Global stack is missing." +msgid "There is no active printer yet." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:449 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:452 msgctxt "@info:status" msgid "Unable to add the profile." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:463 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:466 #, python-brace-format msgctxt "@info:status" msgid "Quality type '{0}' is not compatible with the current active machine definition '{1}'." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:468 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:471 #, python-brace-format msgctxt "@info:status" msgid "Warning: The profile is not visible because its quality type '{0}' is not available for the current configuration. Switch to a material/nozzle combination that can use this quality type." @@ -568,23 +573,23 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:712 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 msgctxt "@label" msgid "Nozzle" msgstr "Suutin" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:860 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:856 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:862 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:858 msgctxt "@info:title" msgid "Settings updated" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1447 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1478 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "" @@ -597,13 +602,13 @@ msgid "Add" msgstr "Lisää" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:263 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 msgctxt "@action:button" msgid "Finish" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 #: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 #: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 @@ -611,7 +616,7 @@ msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 msgctxt "@action:button" msgid "Cancel" @@ -623,76 +628,83 @@ msgctxt "@label" msgid "Group #{group_nr}" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Ulkoseinämä" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Sisäseinämät" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Pintakalvo" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Täyttö" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Tuen täyttö" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Tukiliittymä" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Tuki" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Helma" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 msgctxt "@tooltip" msgid "Prime Tower" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 msgctxt "@tooltip" msgid "Travel" msgstr "Siirtoliike" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 msgctxt "@tooltip" msgid "Retractions" msgstr "Takaisinvedot" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:94 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 msgctxt "@tooltip" msgid "Other" msgstr "Muu" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 msgctxt "@action:button" msgid "Next" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 +msgctxt "@action:button" +msgid "Skip" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:173 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 msgctxt "@action:button" msgid "Close" @@ -713,29 +725,36 @@ msgid "" "

    View print quality guide

    " msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:535 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:540 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:538 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:543 msgctxt "@info:title" msgid "Open Project File" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:634 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:639 #, python-brace-format msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:635 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:686 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:646 +#, python-brace-format +msgctxt "@info:error Don't translate the XML tags or !" +msgid "Project file {0} is corrupt: {1}." +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:698 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." @@ -773,7 +792,7 @@ msgctxt "@error:zip" msgid "The operating system does not allow saving a project file to this location or with this file name." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:206 msgctxt "@error:zip" msgid "Error writing 3mf file." msgstr "" @@ -828,8 +847,8 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:23 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "" @@ -839,45 +858,45 @@ msgctxt "@item:inmenu" msgid "Manage backups" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Viipalointi ei onnistu nykyisellä materiaalilla, sillä se ei sovellu käytettäväksi valitun laitteen tai kokoonpanon kanssa." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:411 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:420 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:429 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 msgctxt "@info:title" msgid "Unable to slice" msgstr "Viipalointi ei onnistu" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:412 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Viipalointi ei onnistu nykyisten asetuksien ollessa voimassa. Seuraavissa asetuksissa on virheitä: {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:410 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:436 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:445 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "Viipalointi ei onnistu, koska esitäyttötorni tai esitäytön sijainti tai sijainnit eivät kelpaa." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:428 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:454 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:463 msgctxt "@info:status" msgid "" "Please review settings and check if your models:\n" @@ -1142,28 +1161,28 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Siirrettävä asema" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:121 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:128 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:129 msgctxt "@info:title" msgid "Simulation View" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:status" msgid "Nothing is shown because you need to slice first." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:title" msgid "No layers to show" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:124 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "" @@ -1173,14 +1192,19 @@ msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Kerrosnäkymä" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:70 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:71 msgctxt "@info:status" -msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." +msgid "The highlighted areas indicate either missing or extraneous surfaces. Fix your model and open it again into Cura." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 msgctxt "@info:title" -msgid "Model errors" +msgid "Model Errors" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:79 +msgctxt "@action:button" +msgid "Learn more" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/__init__.py:12 @@ -1209,7 +1233,7 @@ msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:145 msgctxt "@action:button" msgid "Sync" msgstr "" @@ -1245,7 +1269,7 @@ msgctxt "@info:generic" msgid "You need to quit and restart {} before changes have effect." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:79 msgctxt "@info:generic" msgid "{} plugins failed to download" msgstr "" @@ -1286,7 +1310,11 @@ msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "" @@ -1301,22 +1329,22 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Valitse päivitykset" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:152 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 msgctxt "@action:button" msgid "Print via cloud" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:155 msgctxt "@properties:tooltip" msgid "Print via cloud" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:156 msgctxt "@info:status" msgid "Connected via cloud" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:264 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:270 #, python-brace-format msgctxt "@error:send" msgid "Unknown error code when uploading print job: {0}" @@ -1608,82 +1636,82 @@ msgctxt "@info:tooltip" msgid "Some things could be problematic in this print. Click to see tips for adjustment." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:15 msgctxt "@title:window" msgid "Open Project" msgstr "Avaa projekti" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:63 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "Yhteenveto – Cura-projekti" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 msgctxt "@action:label" msgid "Printer settings" msgstr "Tulostimen asetukset" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:112 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:113 msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "Miten laitteen ristiriita pitäisi ratkaista?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:165 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 msgctxt "@action:label" msgid "Type" msgstr "Tyyppi" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:181 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 msgctxt "@action:label" msgid "Printer Group" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:203 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 msgctxt "@action:label" msgid "Profile settings" msgstr "Profiilin asetukset" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:219 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:221 msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "Miten profiilin ristiriita pitäisi ratkaista?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:349 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 msgctxt "@action:label" msgid "Name" msgstr "Nimi" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:255 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 msgctxt "@action:label" msgid "Intent" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:271 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Not in profile" msgstr "Ei profiilissa" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:276 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 msgctxt "@action:label" msgid "%1 override" @@ -1691,54 +1719,54 @@ msgid_plural "%1 overrides" msgstr[0] "%1 ohitus" msgstr[1] "%1 ohitusta" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:287 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:290 msgctxt "@action:label" msgid "Derivative from" msgstr "Johdettu seuraavista" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:295 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 ohitus" msgstr[1] "%1, %2 ohitusta" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:309 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:312 msgctxt "@action:label" msgid "Material settings" msgstr "Materiaaliasetukset" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:328 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Miten materiaalin ristiriita pitäisi ratkaista?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:369 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:373 msgctxt "@action:label" msgid "Setting visibility" msgstr "Asetusten näkyvyys" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:378 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:382 msgctxt "@action:label" msgid "Mode" msgstr "Tila" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:label" msgid "Visible settings:" msgstr "Näkyvät asetukset:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:399 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:403 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1/%2" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:425 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:429 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:457 msgctxt "@action:button" msgid "Open" msgstr "Avaa" @@ -1840,8 +1868,8 @@ msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:68 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:125 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:199 msgctxt "@button" msgid "Sign in" msgstr "" @@ -2075,12 +2103,12 @@ msgctxt "@label" msgid "Cooling Fan Number" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:163 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:177 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "" @@ -2165,12 +2193,17 @@ msgctxt "@label" msgid "Number of Extruders" msgstr "Suulakkeiden määrä" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:345 +msgctxt "@label" +msgid "Apply Extruder offsets to GCode" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:393 msgctxt "@title:label" msgid "Start G-code" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:385 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:404 msgctxt "@title:label" msgid "End G-code" msgstr "" @@ -2194,6 +2227,11 @@ msgctxt "@label link to technical assistance" msgid "View user manuals online" msgstr "" +#: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 +msgctxt "@info" +msgid "In order to monitor your print from Cura, please connect the printer." +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" msgid "Mesh Type" @@ -2240,7 +2278,7 @@ msgid "Select Settings to Customize for this model" msgstr "Valitse tätä mallia varten mukautettavat asetukset" #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 msgctxt "@label:textbox" msgid "Filter..." msgstr "Suodatin..." @@ -2250,32 +2288,32 @@ msgctxt "@label:checkbox" msgid "Show all" msgstr "Näytä kaikki" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:20 msgctxt "@title:window" msgid "Post Processing Plugin" msgstr "Jälkikäsittelylisäosa" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:59 msgctxt "@label" msgid "Post Processing Scripts" msgstr "Jälkikäsittelykomentosarjat" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:235 msgctxt "@action" msgid "Add a script" msgstr "Lisää komentosarja" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:282 msgctxt "@label" msgid "Settings" msgstr "Asetukset" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:499 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:502 msgctxt "@info:tooltip" msgid "Change active post-processing scripts." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:506 msgctxt "@info:tooltip" msgid "The following script is active:" msgid_plural "The following scripts are active:" @@ -2288,78 +2326,93 @@ msgctxt "@label" msgid "Color scheme" msgstr "Värimalli" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:110 msgctxt "@label:listbox" msgid "Material Color" msgstr "Materiaalin väri" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:111 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:114 msgctxt "@label:listbox" msgid "Line Type" msgstr "Linjojen tyyppi" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:115 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:118 msgctxt "@label:listbox" msgid "Speed" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:122 msgctxt "@label:listbox" -msgid "Layer thickness" +msgid "Layer Thickness" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:126 +msgctxt "@label:listbox" +msgid "Line Width" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 +msgctxt "@label:listbox" +msgid "Flow" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" msgid "Compatibility Mode" msgstr "Yhteensopivuustila" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:230 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:245 msgctxt "@label" msgid "Travels" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:251 msgctxt "@label" msgid "Helpers" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:257 msgctxt "@label" msgid "Shell" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:248 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 msgctxt "@label" msgid "Infill" msgstr "Täyttö" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:298 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:271 +msgctxt "@label" +msgid "Starts" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 msgctxt "@label" msgid "Only Show Top Layers" msgstr "Näytä vain yläkerrokset" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:308 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:332 msgctxt "@label" msgid "Show 5 Detailed Layers On Top" msgstr "Näytä 5 yksityiskohtaista kerrosta ylhäällä" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:346 msgctxt "@label" msgid "Top / Bottom" msgstr "Yläosa/alaosa" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:350 msgctxt "@label" msgid "Inner Wall" msgstr "Sisäseinämä" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:384 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:419 msgctxt "@label" msgid "min" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:433 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:488 msgctxt "@label" msgid "max" msgstr "" @@ -2500,7 +2553,7 @@ msgid "Plugins" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 msgctxt "@title:tab" msgid "Materials" @@ -2549,6 +2602,7 @@ msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:178 msgctxt "@button" msgid "Next" msgstr "" @@ -2892,7 +2946,7 @@ msgid "Delete" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:289 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 msgctxt "@label" msgid "Resume" msgstr "" @@ -2908,8 +2962,8 @@ msgid "Resuming..." msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 msgctxt "@label" msgid "Pause" msgstr "" @@ -2950,7 +3004,7 @@ msgid "Are you sure you want to abort %1?" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 msgctxt "@window:title" msgid "Abort print" msgstr "Keskeytä tulostus" @@ -2961,7 +3015,7 @@ msgid "Manage printer" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." @@ -2987,27 +3041,34 @@ msgctxt "@label:status" msgid "Idle" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:365 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +msgctxt "@label:status" +msgid "Preparing..." +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:369 msgctxt "@label:status" msgid "Printing" msgstr "Tulostetaan" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:406 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:410 msgctxt "@label" msgid "Untitled" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:431 msgctxt "@label" msgid "Anonymous" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:458 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:492 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:496 msgctxt "@action:button" msgid "Details" msgstr "" @@ -3034,12 +3095,6 @@ msgctxt "@label:status" msgid "Finished" msgstr "Valmis" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -msgctxt "@label:status" -msgid "Preparing..." -msgstr "" - #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." @@ -3120,23 +3175,23 @@ msgctxt "@action:button" msgid "Sign in" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" -msgid "Your key to connected 3D printing" +msgid "Sign in to the Ultimaker platform" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:42 msgctxt "@text" msgid "" -"- Customize your experience with more print profiles and plugins\n" -"- Stay flexible by syncing your setup and loading it anywhere\n" -"- Increase efficiency with a remote workflow on Ultimaker printers" +"- Add material profiles and plug-ins from the Marketplace\n" +"- Back-up and sync your material profiles and plug-ins\n" +"- Share ideas and get help from 48,000+ users in the Ultimaker community" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:142 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:62 msgctxt "@button" -msgid "Create account" +msgid "Create a free Ultimaker account" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/SyncState.qml:28 @@ -3244,309 +3299,308 @@ msgctxt "@button" msgid "Cancel" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:83 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:90 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Vaihda koko näyttöön" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:98 msgctxt "@action:inmenu" msgid "Exit Full Screen" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:105 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Kumoa" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:115 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "Tee &uudelleen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:125 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Lopeta" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:132 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:133 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:140 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:147 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 +msgctxt "@action:inmenu menubar:view" +msgid "Bottom View" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:160 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:168 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:175 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Määritä Curan asetukset..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:182 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "L&isää tulostin..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:180 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:188 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Tulostinten &hallinta..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:187 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Hallitse materiaaleja..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu" msgid "Add more materials from Marketplace" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "&Päivitä nykyiset asetukset tai ohitukset profiiliin" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Hylkää tehdyt muutokset" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:222 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:230 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "&Luo profiili nykyisten asetusten tai ohitusten perusteella..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Profiilien hallinta..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Näytä sähköinen &dokumentaatio" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Ilmoita &virheestä" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:260 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:266 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Tietoja..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:273 msgctxt "@action:inmenu menubar:edit" -msgid "Delete Selected Model" -msgid_plural "Delete Selected Models" -msgstr[0] "Poista valittu malli" -msgstr[1] "Poista valitut mallit" +msgid "Delete Selected" +msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:283 msgctxt "@action:inmenu menubar:edit" -msgid "Center Selected Model" -msgid_plural "Center Selected Models" -msgstr[0] "Keskitä valittu malli" -msgstr[1] "Keskitä valitut mallit" +msgid "Center Selected" +msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:292 msgctxt "@action:inmenu menubar:edit" -msgid "Multiply Selected Model" -msgid_plural "Multiply Selected Models" -msgstr[0] "Kerro valittu malli" -msgstr[1] "Kerro valitut mallit" +msgid "Multiply Selected" +msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Poista malli" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:309 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Ke&skitä malli alustalle" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:307 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "&Ryhmittele mallit" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:327 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:335 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Poista mallien ryhmitys" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:345 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "&Yhdistä mallit" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:347 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:355 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Kerro malli..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:362 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Valitse kaikki mallit" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:372 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Tyhjennä tulostusalusta" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:382 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Lataa kaikki mallit uudelleen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:390 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Järjestä kaikki mallit" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:406 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Järjestä valinta" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:405 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:413 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Määritä kaikkien mallien positiot uudelleen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:412 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Määritä kaikkien mallien muutokset uudelleen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:419 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:429 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Avaa tiedosto(t)..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:439 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Uusi projekti..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:434 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:446 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Näytä määrityskansio" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:441 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:538 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Määritä asetusten näkyvyys..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:448 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:460 msgctxt "@action:menu" msgid "&Marketplace" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:257 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 msgctxt "@title:tab" msgid "General" msgstr "Yleiset" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:462 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:453 msgctxt "@title:tab" msgid "Settings" msgstr "Asetukset" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:464 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 msgctxt "@title:tab" msgid "Printers" msgstr "Tulostimet" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 msgctxt "@title:tab" msgid "Profiles" msgstr "Profiilit" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:576 msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:588 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:638 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Avaa tiedosto(t)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:744 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:737 msgctxt "@window:title" msgid "Install Package" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:752 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:745 msgctxt "@title:window" msgid "Open File(s)" msgstr "Avaa tiedosto(t)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:755 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:748 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Löysimme vähintään yhden Gcode-tiedoston valitsemiesi tiedostojen joukosta. Voit avata vain yhden Gcode-tiedoston kerrallaan. Jos haluat avata Gcode-tiedoston, valitse vain yksi." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:858 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:857 msgctxt "@title:window" msgid "Add Printer" msgstr "Lisää tulostin" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:866 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:865 msgctxt "@title:window" msgid "What's New" msgstr "" @@ -3696,17 +3750,27 @@ msgctxt "@label" msgid "Python bindings for libnest2d" msgstr "" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +msgctxt "@label" +msgid "Support library for system keyring access" +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" +msgid "Python extensions for Microsoft Windows" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +msgctxt "@label" msgid "Font" msgstr "Fontti" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 msgctxt "@label" msgid "SVG icons" msgstr "SVG-kuvakkeet" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:165 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "" @@ -3716,22 +3780,22 @@ msgctxt "@title:window" msgid "Open project file" msgstr "Avaa projektitiedosto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:88 msgctxt "@text:window" msgid "This is a Cura project file. Would you like to open it as a project or import the models from it?" msgstr "Tämä on Cura-projektitiedosto. Haluatko avata sen projektina vai tuoda siinä olevat mallit?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:98 msgctxt "@text:window" msgid "Remember my choice" msgstr "Muista valintani" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:122 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:117 msgctxt "@action:button" msgid "Open as project" msgstr "Avaa projektina" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:131 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:126 msgctxt "@action:button" msgid "Import models" msgstr "Tuo mallit" @@ -3760,7 +3824,7 @@ msgid "Current changes" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Kysy aina" @@ -3785,12 +3849,12 @@ msgctxt "@action:button" msgid "Keep changes" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 msgctxt "@text:window" msgid "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?" msgstr "Löysimme vähintään yhden projektitiedoston valitsemiesi tiedostojen joukosta. Voit avata vain yhden projektitiedoston kerrallaan. Suosittelemme, että tuot vain malleja niistä tiedostoista. Haluatko jatkaa?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:99 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:94 msgctxt "@action:button" msgid "Import all as models" msgstr "Tuo kaikki malleina" @@ -3945,7 +4009,7 @@ msgctxt "@label" msgid "Material" msgstr "Materiaali" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:407 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "" @@ -3969,17 +4033,17 @@ msgctxt "@label" msgid "Number of Copies" msgstr "Kopioiden määrä" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:33 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:41 msgctxt "@title:menu menubar:file" msgid "&Save Project..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:54 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:74 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:85 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "" @@ -3999,6 +4063,11 @@ msgctxt "@label:category menu label" msgid "Generic" msgstr "" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/OpenFilesMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Open File(s)..." +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -4014,6 +4083,11 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Avaa &viimeisin" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SaveProjectMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Save Project..." +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:15 msgctxt "@title:menu menubar:settings" msgid "&Printer" @@ -4039,17 +4113,17 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:16 msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:45 msgctxt "@action:inmenu" msgid "Collapse All Categories" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "" @@ -4059,22 +4133,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:45 msgctxt "@action:inmenu menubar:view" msgid "Camera view" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:48 msgctxt "@action:inmenu menubar:view" msgid "Perspective" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:60 msgctxt "@action:inmenu menubar:view" msgid "Orthographic" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:81 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "" @@ -4119,12 +4193,12 @@ msgctxt "@label:MonitorStatus" msgid "Please remove the print" msgstr "Poista tuloste" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@label" msgid "Abort Print" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:338 msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Haluatko varmasti keskeyttää tulostuksen?" @@ -4166,301 +4240,301 @@ msgctxt "@label" msgid "Interface" msgstr "Käyttöliittymä" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:216 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:209 msgctxt "@label" msgid "Currency:" msgstr "Valuutta:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:229 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:222 msgctxt "@label" msgid "Theme:" msgstr "Teema:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Sovellus on käynnistettävä uudelleen, jotta nämä muutokset tulevat voimaan." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:284 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Viipaloi automaattisesti, kun asetuksia muutetaan." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 msgctxt "@option:check" msgid "Slice automatically" msgstr "Viipaloi automaattisesti" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:306 msgctxt "@label" msgid "Viewport behavior" msgstr "Näyttöikkunan käyttäytyminen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:314 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Korosta mallin vailla tukea olevat alueet punaisella. Ilman tukea nämä alueet eivät tulostu kunnolla." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:323 msgctxt "@option:check" msgid "Display overhang" msgstr "Näytä uloke" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:351 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@info:tooltip" msgid "Highlight missing or extraneous surfaces of the model using warning signs. The toolpaths will often be missing parts of the intended geometry." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:342 msgctxt "@option:check" msgid "Display model errors" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Siirtää kameraa siten, että valittuna oleva malli on näkymän keskellä." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:373 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Keskitä kamera kun kohde on valittu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Pitääkö Curan oletusarvoinen zoom-toimintatapa muuttaa päinvastaiseksi?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:388 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Käännä kameran zoomin suunta päinvastaiseksi." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Tuleeko zoomauksen siirtyä hiiren suuntaan?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:409 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Zoomaa hiiren suuntaan" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:435 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:417 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Pitäisikö alustalla olevia malleja siirtää niin, etteivät ne enää leikkaa toisiaan?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:440 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:422 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Varmista, että mallit ovat erillään" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:431 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Pitäisikö tulostusalueella olevia malleja siirtää alas niin, että ne koskettavat tulostusalustaa?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:436 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Pudota mallit automaattisesti alustalle" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:448 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:457 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Pakotetaanko kerros yhteensopivuustilaan?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Pakota kerrosnäkymän yhteensopivuustila (vaatii uudelleenkäynnistyksen)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:498 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:485 msgctxt "@option:check" msgid "Restore window position on start" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:513 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:502 msgctxt "@window:text" msgid "Camera rendering:" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:531 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:509 msgid "Perspective" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:532 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgid "Orthographic" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:563 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:548 msgctxt "@label" msgid "Opening and saving files" msgstr "Tiedostojen avaaminen ja tallentaminen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:555 msgctxt "@info:tooltip" msgid "Should opening files from the desktop or external applications open in the same instance of Cura?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@option:check" msgid "Use a single instance of Cura" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Pitäisikö mallit skaalata tulostustilavuuteen, jos ne ovat liian isoja?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@option:check" msgid "Scale large models" msgstr "Skaalaa suuret mallit" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Malli voi vaikuttaa erittäin pieneltä, jos sen koko on ilmoitettu esimerkiksi metreissä eikä millimetreissä. Pitäisikö nämä mallit suurentaa?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Skaalaa erittäin pienet mallit" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@option:check" msgid "Select models when loaded" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Pitäisikö tulostustyön nimeen lisätä automaattisesti tulostimen nimeen perustuva etuliite?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:635 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Lisää laitteen etuliite työn nimeen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:645 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Näytetäänkö yhteenveto, kun projektitiedosto tallennetaan?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:649 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:634 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Näytä yhteenvetoikkuna, kun projekti tallennetaan" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:659 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:644 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Projektitiedoston avaamisen oletustoimintatapa" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:652 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Projektitiedoston avaamisen oletustoimintatapa: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:682 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Avaa aina projektina" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:668 msgctxt "@option:openProject" msgid "Always import models" msgstr "Tuo mallit aina" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:705 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Kun olet tehnyt muutokset profiiliin ja vaihtanut toiseen, näytetään valintaikkuna, jossa kysytään, haluatko säilyttää vai hylätä muutokset. Tässä voit myös valita oletuskäytöksen, jolloin valintaikkunaa ei näytetä uudelleen." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:728 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:748 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:734 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:749 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:735 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:783 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@label" msgid "Privacy" msgstr "Tietosuoja" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:790 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:777 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Pitäisikö Curan tarkistaa saatavilla olevat päivitykset, kun ohjelma käynnistetään?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:795 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:782 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Tarkista päivitykset käynnistettäessä" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:805 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:792 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Pitäisikö anonyymejä tietoja tulosteesta lähettää Ultimakerille? Huomaa, että malleja, IP-osoitteita tai muita henkilökohtaisia tietoja ei lähetetä eikä tallenneta." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:810 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:797 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Lähetä (anonyymit) tulostustiedot" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:819 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:806 msgctxt "@action:button" msgid "More information" msgstr "" @@ -4500,55 +4574,65 @@ msgctxt "@action:button" msgid "Export" msgstr "Vie" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 +msgctxt "@action:button Sending materials to printers" +msgid "Sync with Printers" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" msgid "Printer" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:298 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 msgctxt "@title:window" msgid "Confirm Remove" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:301 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 msgctxt "@title:window" msgid "Import Material" msgstr "Tuo materiaali" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:338 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Materiaalin tuominen epäonnistui: %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:328 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:342 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Materiaalin tuominen onnistui: %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:346 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 msgctxt "@title:window" msgid "Export Material" msgstr "Vie materiaali" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:358 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:372 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Materiaalin vieminen epäonnistui kohteeseen %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:378 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Materiaalin vieminen onnistui kohteeseen %1" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 +msgctxt "@title:window" +msgid "Export All Materials" +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" @@ -4660,53 +4744,53 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Monista profiili" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@title:window" msgid "Rename Profile" msgstr "Nimeä profiili uudelleen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:307 msgctxt "@title:window" msgid "Import Profile" msgstr "Profiilin tuonti" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:336 msgctxt "@title:window" msgid "Export Profile" msgstr "Profiilin vienti" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:399 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Tulostin: %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:557 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Päivitä nykyiset asetukset tai ohitukset profiiliin" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 msgctxt "@action:button" msgid "Discard current changes" msgstr "Hylkää tehdyt muutokset" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:583 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Tässä profiilissa käytetään tulostimen oletusarvoja, joten siinä ei ole alla olevan listan asetuksia tai ohituksia." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:591 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Nykyiset asetukset vastaavat valittua profiilia." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:609 msgctxt "@title:tab" msgid "Global Settings" msgstr "Yleiset asetukset" @@ -4736,12 +4820,12 @@ msgctxt "@title:column" msgid "Unit" msgstr "Yksikkö" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:16 msgctxt "@title:tab" msgid "Setting Visibility" msgstr "Näkyvyyden asettaminen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:48 msgctxt "@label:textbox" msgid "Check all" msgstr "Tarkista kaikki" @@ -5079,27 +5163,27 @@ msgctxt "@label:textbox" msgid "Search settings" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:456 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:468 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Kopioi arvo kaikkiin suulakepuristimiin" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:477 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:502 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:514 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Piilota tämä asetus" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:515 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:527 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Älä näytä tätä asetusta" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:531 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Pidä tämä asetus näkyvissä" @@ -5159,11 +5243,6 @@ msgctxt "@button" msgid "Add printer manually" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddCloudPrintersView.qml:218 -msgctxt "@button" -msgid "Finish" -msgstr "" - #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:230 msgctxt "@label" msgid "Manufacturer" @@ -5270,32 +5349,32 @@ msgctxt "@button" msgid "Connect" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:43 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" -msgid "Ultimaker Account" +msgid "Release Notes" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:124 msgctxt "@text" -msgid "Your key to connected 3D printing" +msgid "Add material settings and plugins from the Marketplace" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:101 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:154 msgctxt "@text" -msgid "- Customize your experience with more print profiles and plugins" +msgid "Backup and sync your material settings and plugins" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:184 msgctxt "@text" -msgid "- Stay flexible by syncing your setup and loading it anywhere" +msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:217 msgctxt "@text" -msgid "- Increase efficiency with a remote workflow on Ultimaker printers" +msgid "Create a free Ultimaker Account" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:230 msgctxt "@button" msgid "Skip" msgstr "" @@ -5355,26 +5434,29 @@ msgctxt "@button" msgid "Decline and close" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:29 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" msgid "Welcome to Ultimaker Cura" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:68 msgctxt "@text" -msgid "" -"Please follow these steps to set up\n" -"Ultimaker Cura. This will only take a few moments." +msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:86 msgctxt "@button" msgid "Get started" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:28 msgctxt "@label" -msgid "What's new in Ultimaker Cura" +msgid "What's New" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Widgets/ComboBox.qml:24 +msgctxt "@label" +msgid "No items to select from" msgstr "" #: ModelChecker/plugin.json @@ -5457,6 +5539,16 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura-profiilin kirjoitin" +#: DigitalLibrary/plugin.json +msgctxt "description" +msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." +msgstr "" + +#: DigitalLibrary/plugin.json +msgctxt "name" +msgid "Ultimaker Digital Library" +msgstr "" + #: FirmwareUpdateChecker/plugin.json msgctxt "description" msgid "Checks for firmware updates." @@ -5927,6 +6019,26 @@ msgctxt "name" msgid "Version Upgrade 4.7 to 4.8" msgstr "" +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." +msgstr "" + +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.8 to 4.9" +msgstr "" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." +msgstr "" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.9 to 4.10" +msgstr "" + #: X3DReader/plugin.json msgctxt "description" msgid "Provides support for reading X3D files." @@ -5957,6 +6069,24 @@ msgctxt "name" msgid "X-Ray View" msgstr "Kerrosnäkymä" +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Delete Selected Model" +#~ msgid_plural "Delete Selected Models" +#~ msgstr[0] "Poista valittu malli" +#~ msgstr[1] "Poista valitut mallit" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Center Selected Model" +#~ msgid_plural "Center Selected Models" +#~ msgstr[0] "Keskitä valittu malli" +#~ msgstr[1] "Keskitä valitut mallit" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Multiply Selected Model" +#~ msgid_plural "Multiply Selected Models" +#~ msgstr[0] "Kerro valittu malli" +#~ msgstr[1] "Kerro valitut mallit" + #~ msgctxt "@info:status" #~ msgid "Successfully imported profile {0}" #~ msgstr "Onnistuneesti tuotu profiili {0}" diff --git a/resources/i18n/fi_FI/fdmextruder.def.json.po b/resources/i18n/fi_FI/fdmextruder.def.json.po index 838bdaf5a2..bf103b91a4 100644 --- a/resources/i18n/fi_FI/fdmextruder.def.json.po +++ b/resources/i18n/fi_FI/fdmextruder.def.json.po @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" "PO-Revision-Date: 2017-08-11 14:31+0200\n" "Last-Translator: Bothof \n" "Language-Team: Finnish\n" diff --git a/resources/i18n/fi_FI/fdmprinter.def.json.po b/resources/i18n/fi_FI/fdmprinter.def.json.po index 3b4dbf1737..d1ffed61eb 100644 --- a/resources/i18n/fi_FI/fdmprinter.def.json.po +++ b/resources/i18n/fi_FI/fdmprinter.def.json.po @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" "PO-Revision-Date: 2017-09-27 12:27+0200\n" "Last-Translator: Bothof \n" "Language-Team: Finnish\n" @@ -414,6 +414,26 @@ msgctxt "machine_extruders_share_heater description" msgid "Whether the extruders share a single heater rather than each extruder having its own heater." msgstr "" +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle label" +msgid "Extruders Share Nozzle" +msgstr "" + +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle description" +msgid "Whether the extruders share a single nozzle rather than each extruder having its own nozzle. When set to true, it is expected that the printer-start gcode script properly sets up all extruders in an initial retraction state that is known and mutually compatible (either zero or one filament not retracted); in that case the initial retraction status is described, per extruder, by the 'machine_extruders_shared_nozzle_initial_retraction' parameter." +msgstr "" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction label" +msgid "Shared Nozzle Initial Retraction" +msgstr "" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction description" +msgid "How much the filament of each extruder is assumed to have been retracted from the shared nozzle tip at the completion of the printer-start gcode script; the value should be equal to or greater than the length of the common part of the nozzle's ducts." +msgstr "" + #: fdmprinter.def.json msgctxt "machine_disallowed_areas label" msgid "Disallowed Areas" @@ -481,8 +501,8 @@ msgstr "" #: fdmprinter.def.json msgctxt "machine_use_extruder_offset_to_offset_coords description" -msgid "Apply the extruder offset to the coordinate system." -msgstr "Käytä suulakkeen siirtymää koordinaattijärjestelmään." +msgid "Apply the extruder offset to the coordinate system. Affects all extruders." +msgstr "" #: fdmprinter.def.json msgctxt "extruder_prime_pos_z label" @@ -876,8 +896,8 @@ msgstr "Ensimmäisen kerroksen linjaleveyden kerroin. Sen suurentaminen voi para #: fdmprinter.def.json msgctxt "shell label" -msgid "Shell" -msgstr "Kuori" +msgid "Walls" +msgstr "" #: fdmprinter.def.json msgctxt "shell description" @@ -944,166 +964,6 @@ msgctxt "wall_0_wipe_dist description" msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better." msgstr "Siirtoliikkeen etäisyys ulkoseinämän jälkeen Z-sauman piilottamiseksi paremmin." -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr label" -msgid "Top Surface Skin Extruder" -msgstr "Yläpinnan pintakalvon suulake" - -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr description" -msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." -msgstr "Ylimmän pintakalvon tulostukseen käytettävä suulakeryhmä. Tätä käytetään monipursotuksessa." - -#: fdmprinter.def.json -msgctxt "roofing_layer_count label" -msgid "Top Surface Skin Layers" -msgstr "Yläpinnan pintakalvokerrokset" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count description" -msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." -msgstr "Ylimpien pintakalvokerrosten määrä. Yleensä vain yksi ylin kerros riittää tuottamaan korkeampilaatuisia yläpintoja." - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr label" -msgid "Top/Bottom Extruder" -msgstr "Ylä- ja alapuolen suulake" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr description" -msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." -msgstr "Ylä- ja alapuolen pintakalvon tulostukseen käytettävä suulakeryhmä. Tätä käytetään monipursotuksessa." - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness label" -msgid "Top/Bottom Thickness" -msgstr "Ylä-/alaosan paksuus" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness description" -msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." -msgstr "Ylä-/alakerrosten paksuus tulosteessa. Tämä arvo jaettuna kerroksen korkeusarvolla määrittää ylä-/alakerrosten lukumäärän." - -#: fdmprinter.def.json -msgctxt "top_thickness label" -msgid "Top Thickness" -msgstr "Yläosan paksuus" - -#: fdmprinter.def.json -msgctxt "top_thickness description" -msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." -msgstr "Yläkerrosten paksuus tulosteessa. Tämä arvo jaettuna kerroksen korkeusarvolla määrittää yläkerrosten lukumäärän." - -#: fdmprinter.def.json -msgctxt "top_layers label" -msgid "Top Layers" -msgstr "Yläkerrokset" - -#: fdmprinter.def.json -msgctxt "top_layers description" -msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." -msgstr "Yläkerrosten lukumäärä. Kun se lasketaan yläosan paksuudesta, arvo pyöristetään kokonaislukuun." - -#: fdmprinter.def.json -msgctxt "bottom_thickness label" -msgid "Bottom Thickness" -msgstr "Alaosan paksuus" - -#: fdmprinter.def.json -msgctxt "bottom_thickness description" -msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." -msgstr "Alakerrosten paksuus tulosteessa. Tämä arvo jaettuna kerroksen korkeusarvolla määrittää alakerrosten lukumäärän." - -#: fdmprinter.def.json -msgctxt "bottom_layers label" -msgid "Bottom Layers" -msgstr "Alakerrokset" - -#: fdmprinter.def.json -msgctxt "bottom_layers description" -msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "Alakerrosten lukumäärä. Kun se lasketaan alaosan paksuudesta, arvo pyöristetään kokonaislukuun." - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers label" -msgid "Initial Bottom Layers" -msgstr "" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers description" -msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern label" -msgid "Top/Bottom Pattern" -msgstr "Ylä-/alaosan kuvio" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern description" -msgid "The pattern of the top/bottom layers." -msgstr "Ylä-/alakerrosten kuvio." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option lines" -msgid "Lines" -msgstr "Linjat" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option concentric" -msgid "Concentric" -msgstr "Samankeskinen" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option zigzag" -msgid "Zig Zag" -msgstr "Siksak" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 label" -msgid "Bottom Pattern Initial Layer" -msgstr "Alaosan kuvio, alkukerros" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 description" -msgid "The pattern on the bottom of the print on the first layer." -msgstr "Tulosteen alaosan kuvio ensimmäisellä kerroksella." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option lines" -msgid "Lines" -msgstr "Linjat" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option concentric" -msgid "Concentric" -msgstr "Samankeskinen" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option zigzag" -msgid "Zig Zag" -msgstr "Siksak" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons label" -msgid "Connect Top/Bottom Polygons" -msgstr "" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." -msgstr "" - -#: fdmprinter.def.json -msgctxt "skin_angles label" -msgid "Top/Bottom Line Directions" -msgstr "Yläosan/alaosan linjojen suunnat" - -#: fdmprinter.def.json -msgctxt "skin_angles description" -msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." -msgstr "Luettelo käytettävistä linjojen kokonaislukusuunnista, kun ylimmällä/alimmalla kerroksella käytetään linja- tai siksak-kuviota. Tämän luettelon elementtejä käytetään järjestyksessä kerrosten edetessä, ja kun luettelon loppu saavutetaan, aloitetaan taas alusta. Luettelon kohteet on erotettu pilkuilla, ja koko luettelo on hakasulkeiden sisällä. Oletusarvo on tyhjä luettelo, jolloin käytetään perinteisiä oletuskulmia (45 ja 135 astetta)." - #: fdmprinter.def.json msgctxt "wall_0_inset label" msgid "Outer Wall Inset" @@ -1409,6 +1269,176 @@ msgctxt "z_seam_relative description" msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate." msgstr "Kun tämä on käytössä, Z-sauman koordinaatit ovat suhteessa kunkin osan keskikohtaan. Kun asetus on pois käytöstä, koordinaatit määrittävät absoluuttisen sijainnin alustalla." +#: fdmprinter.def.json +msgctxt "top_bottom label" +msgid "Top/Bottom" +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_bottom description" +msgid "Top/Bottom" +msgstr "" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr label" +msgid "Top Surface Skin Extruder" +msgstr "Yläpinnan pintakalvon suulake" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr description" +msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." +msgstr "Ylimmän pintakalvon tulostukseen käytettävä suulakeryhmä. Tätä käytetään monipursotuksessa." + +#: fdmprinter.def.json +msgctxt "roofing_layer_count label" +msgid "Top Surface Skin Layers" +msgstr "Yläpinnan pintakalvokerrokset" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count description" +msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." +msgstr "Ylimpien pintakalvokerrosten määrä. Yleensä vain yksi ylin kerros riittää tuottamaan korkeampilaatuisia yläpintoja." + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr label" +msgid "Top/Bottom Extruder" +msgstr "Ylä- ja alapuolen suulake" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr description" +msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." +msgstr "Ylä- ja alapuolen pintakalvon tulostukseen käytettävä suulakeryhmä. Tätä käytetään monipursotuksessa." + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness label" +msgid "Top/Bottom Thickness" +msgstr "Ylä-/alaosan paksuus" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness description" +msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." +msgstr "Ylä-/alakerrosten paksuus tulosteessa. Tämä arvo jaettuna kerroksen korkeusarvolla määrittää ylä-/alakerrosten lukumäärän." + +#: fdmprinter.def.json +msgctxt "top_thickness label" +msgid "Top Thickness" +msgstr "Yläosan paksuus" + +#: fdmprinter.def.json +msgctxt "top_thickness description" +msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." +msgstr "Yläkerrosten paksuus tulosteessa. Tämä arvo jaettuna kerroksen korkeusarvolla määrittää yläkerrosten lukumäärän." + +#: fdmprinter.def.json +msgctxt "top_layers label" +msgid "Top Layers" +msgstr "Yläkerrokset" + +#: fdmprinter.def.json +msgctxt "top_layers description" +msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." +msgstr "Yläkerrosten lukumäärä. Kun se lasketaan yläosan paksuudesta, arvo pyöristetään kokonaislukuun." + +#: fdmprinter.def.json +msgctxt "bottom_thickness label" +msgid "Bottom Thickness" +msgstr "Alaosan paksuus" + +#: fdmprinter.def.json +msgctxt "bottom_thickness description" +msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." +msgstr "Alakerrosten paksuus tulosteessa. Tämä arvo jaettuna kerroksen korkeusarvolla määrittää alakerrosten lukumäärän." + +#: fdmprinter.def.json +msgctxt "bottom_layers label" +msgid "Bottom Layers" +msgstr "Alakerrokset" + +#: fdmprinter.def.json +msgctxt "bottom_layers description" +msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "Alakerrosten lukumäärä. Kun se lasketaan alaosan paksuudesta, arvo pyöristetään kokonaislukuun." + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern label" +msgid "Top/Bottom Pattern" +msgstr "Ylä-/alaosan kuvio" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern description" +msgid "The pattern of the top/bottom layers." +msgstr "Ylä-/alakerrosten kuvio." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option lines" +msgid "Lines" +msgstr "Linjat" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option concentric" +msgid "Concentric" +msgstr "Samankeskinen" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option zigzag" +msgid "Zig Zag" +msgstr "Siksak" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 label" +msgid "Bottom Pattern Initial Layer" +msgstr "Alaosan kuvio, alkukerros" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 description" +msgid "The pattern on the bottom of the print on the first layer." +msgstr "Tulosteen alaosan kuvio ensimmäisellä kerroksella." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option lines" +msgid "Lines" +msgstr "Linjat" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option concentric" +msgid "Concentric" +msgstr "Samankeskinen" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option zigzag" +msgid "Zig Zag" +msgstr "Siksak" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons label" +msgid "Connect Top/Bottom Polygons" +msgstr "" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons description" +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "" + +#: fdmprinter.def.json +msgctxt "skin_angles label" +msgid "Top/Bottom Line Directions" +msgstr "Yläosan/alaosan linjojen suunnat" + +#: fdmprinter.def.json +msgctxt "skin_angles description" +msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." +msgstr "Luettelo käytettävistä linjojen kokonaislukusuunnista, kun ylimmällä/alimmalla kerroksella käytetään linja- tai siksak-kuviota. Tämän luettelon elementtejä käytetään järjestyksessä kerrosten edetessä, ja kun luettelon loppu saavutetaan, aloitetaan taas alusta. Luettelon kohteet on erotettu pilkuilla, ja koko luettelo on hakasulkeiden sisällä. Oletusarvo on tyhjä luettelo, jolloin käytetään perinteisiä oletuskulmia (45 ja 135 astetta)." + #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" msgid "No Skin in Z Gaps" @@ -1549,6 +1579,86 @@ msgctxt "skin_overlap_mm description" msgid "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any value over half the width of the wall may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall." msgstr "" +#: fdmprinter.def.json +msgctxt "skin_preshrink label" +msgid "Skin Removal Width" +msgstr "Pintakalvon poistoleveys" + +#: fdmprinter.def.json +msgctxt "skin_preshrink description" +msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." +msgstr "Suurin poistettavien pintakalvoalueiden leveys. Kaikki tätä arvoa pienemmät pintakalvoalueet poistuvat. Tästä voi olla apua mallin kaltevien pintojen ylä-/alapintakalvon tulostukseen käytettävän ajan ja materiaalin rajoittamisessa." + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink label" +msgid "Top Skin Removal Width" +msgstr "Yläpintakalvon poistoleveys" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink description" +msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." +msgstr "Suurin poistettavien yläpintakalvoalueiden leveys. Kaikki tätä arvoa pienemmät pintakalvoalueet poistuvat. Tästä voi olla apua mallin kaltevien pintojen yläpintakalvon tulostukseen käytettävän ajan ja materiaalin rajoittamisessa." + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink label" +msgid "Bottom Skin Removal Width" +msgstr "Alapintakalvon poistoleveys" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink description" +msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." +msgstr "Suurin poistettavien alapintakalvoalueiden leveys. Kaikki tätä arvoa pienemmät pintakalvoalueet poistuvat. Tästä voi olla apua mallin kaltevien pintojen alapintakalvon tulostukseen käytettävän ajan ja materiaalin rajoittamisessa." + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance label" +msgid "Skin Expand Distance" +msgstr "Pintakalvon laajennuksen etäisyys" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance description" +msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." +msgstr "Etäisyys, jonka verran pintakalvot laajentuvat täyttöön. Suuremmat arvot saavat pintakalvon kiinnittymään paremmin täyttökuvioon ja viereisten kerrosten seinämät tarttumaan paremmin pintakalvoon. Pienemmät arvot vähentävät käytettävän materiaalin määrää." + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance label" +msgid "Top Skin Expand Distance" +msgstr "Yläpintakalvon laajennuksen etäisyys" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance description" +msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." +msgstr "Etäisyys, jonka verran yläpintakalvot laajentuvat täyttöön. Suuremmat arvot saavat pintakalvon kiinnittymään paremmin täyttökuvioon ja yllä olevan kerroksen seinämät tarttumaan paremmin pintakalvoon. Pienemmät arvot vähentävät käytettävän materiaalin määrää." + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance label" +msgid "Bottom Skin Expand Distance" +msgstr "Alapintakalvon laajennuksen etäisyys" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance description" +msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." +msgstr "Etäisyys, jonka verran alapintakalvot laajentuvat täyttöön. Suuremmat arvot saavat pintakalvon kiinnittymään paremmin täyttökuvioon ja tarttumaan paremmin alla olevan kerroksen seinämiin. Pienemmät arvot vähentävät käytettävän materiaalin määrää." + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion label" +msgid "Maximum Skin Angle for Expansion" +msgstr "Pintakalvon maksimikulma laajennuksessa" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion description" +msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded." +msgstr "" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion label" +msgid "Minimum Skin Width for Expansion" +msgstr "Pintakalvon minimileveys laajennuksessa" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion description" +msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." +msgstr "Tätä kapeampia pintakalvoja ei laajenneta. Tällä vältetään laajentamasta kapeita pintakalvoja, jotka syntyvät, kun mallin pinnalla on rinne lähellä pystysuoraa osuutta." + #: fdmprinter.def.json msgctxt "infill label" msgid "Infill" @@ -1856,86 +1966,6 @@ msgctxt "infill_support_angle description" msgid "The minimum angle of internal overhangs for which infill is added. At a value of 0° objects are totally filled with infill, 90° will not provide any infill." msgstr "" -#: fdmprinter.def.json -msgctxt "skin_preshrink label" -msgid "Skin Removal Width" -msgstr "Pintakalvon poistoleveys" - -#: fdmprinter.def.json -msgctxt "skin_preshrink description" -msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." -msgstr "Suurin poistettavien pintakalvoalueiden leveys. Kaikki tätä arvoa pienemmät pintakalvoalueet poistuvat. Tästä voi olla apua mallin kaltevien pintojen ylä-/alapintakalvon tulostukseen käytettävän ajan ja materiaalin rajoittamisessa." - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink label" -msgid "Top Skin Removal Width" -msgstr "Yläpintakalvon poistoleveys" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink description" -msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." -msgstr "Suurin poistettavien yläpintakalvoalueiden leveys. Kaikki tätä arvoa pienemmät pintakalvoalueet poistuvat. Tästä voi olla apua mallin kaltevien pintojen yläpintakalvon tulostukseen käytettävän ajan ja materiaalin rajoittamisessa." - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink label" -msgid "Bottom Skin Removal Width" -msgstr "Alapintakalvon poistoleveys" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink description" -msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." -msgstr "Suurin poistettavien alapintakalvoalueiden leveys. Kaikki tätä arvoa pienemmät pintakalvoalueet poistuvat. Tästä voi olla apua mallin kaltevien pintojen alapintakalvon tulostukseen käytettävän ajan ja materiaalin rajoittamisessa." - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance label" -msgid "Skin Expand Distance" -msgstr "Pintakalvon laajennuksen etäisyys" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance description" -msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." -msgstr "Etäisyys, jonka verran pintakalvot laajentuvat täyttöön. Suuremmat arvot saavat pintakalvon kiinnittymään paremmin täyttökuvioon ja viereisten kerrosten seinämät tarttumaan paremmin pintakalvoon. Pienemmät arvot vähentävät käytettävän materiaalin määrää." - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance label" -msgid "Top Skin Expand Distance" -msgstr "Yläpintakalvon laajennuksen etäisyys" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance description" -msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." -msgstr "Etäisyys, jonka verran yläpintakalvot laajentuvat täyttöön. Suuremmat arvot saavat pintakalvon kiinnittymään paremmin täyttökuvioon ja yllä olevan kerroksen seinämät tarttumaan paremmin pintakalvoon. Pienemmät arvot vähentävät käytettävän materiaalin määrää." - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance label" -msgid "Bottom Skin Expand Distance" -msgstr "Alapintakalvon laajennuksen etäisyys" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance description" -msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." -msgstr "Etäisyys, jonka verran alapintakalvot laajentuvat täyttöön. Suuremmat arvot saavat pintakalvon kiinnittymään paremmin täyttökuvioon ja tarttumaan paremmin alla olevan kerroksen seinämiin. Pienemmät arvot vähentävät käytettävän materiaalin määrää." - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion label" -msgid "Maximum Skin Angle for Expansion" -msgstr "Pintakalvon maksimikulma laajennuksessa" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion description" -msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." -msgstr "Kappaleesi ylä- ja/tai alapinnan ylä- ja alapintakalvoja ei laajenneta, jos niiden kulma on suurempi kuin tämä asetus. Tällä vältetään laajentamasta kapeita pintakalvoja, jotka syntyvät, kun mallin pinnalla on lähes pystysuora rinne. 0 °:n kulma on vaakasuora ja 90 °:n kulma on pystysuora." - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion label" -msgid "Minimum Skin Width for Expansion" -msgstr "Pintakalvon minimileveys laajennuksessa" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion description" -msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." -msgstr "Tätä kapeampia pintakalvoja ei laajenneta. Tällä vältetään laajentamasta kapeita pintakalvoja, jotka syntyvät, kun mallin pinnalla on rinne lähellä pystysuoraa osuutta." - #: fdmprinter.def.json msgctxt "skin_edge_support_thickness label" msgid "Skin Edge Support Thickness" @@ -2553,8 +2583,8 @@ msgstr "Alkukerroksen nopeus" #: fdmprinter.def.json msgctxt "speed_layer_0 description" -msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." -msgstr "Alkukerroksen nopeus. Alhaisempi arvo on suositeltava, jotta tarttuvuus alustaan on parempi." +msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate. Does not affect the build plate adhesion structures themselves, like brim and raft." +msgstr "" #: fdmprinter.def.json msgctxt "speed_print_layer_0 label" @@ -3163,7 +3193,7 @@ msgstr "" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" -msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." +msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." msgstr "" #: fdmprinter.def.json @@ -5065,7 +5095,7 @@ msgstr "" #: fdmprinter.def.json msgctxt "infill_mesh_order description" -msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." +msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the highest rank. An infill mesh with a higher rank will modify the infill of infill meshes with lower rank and normal meshes." msgstr "" #: fdmprinter.def.json @@ -5413,6 +5443,16 @@ msgctxt "conical_overhang_angle description" msgid "The maximum angle of overhangs after the they have been made printable. At a value of 0° all overhangs are replaced by a piece of model connected to the build plate, 90° will not change the model in any way." msgstr "Ulokkeiden maksimikulma, kun niistä on tehty tulostettavia. 0 asteessa kaikki ulokkeet korvataan mallikappaleella, joka on yhdistetty alustaan. 90 asteessa mallia ei muuteta millään tavalla." +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size label" +msgid "Maximum Overhang Hole Area" +msgstr "" + +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size description" +msgid "The maximum area of a hole in the base of the model before it's removed by Make Overhang Printable. Holes smaller than this will be retained. A value of 0 mm² will fill all holes in the models base." +msgstr "" + #: fdmprinter.def.json msgctxt "coasting_enable label" msgid "Enable Coasting" @@ -6352,6 +6392,22 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Mallissa käytettävä muunnosmatriisi, kun malli ladataan tiedostosta." +#~ msgctxt "machine_use_extruder_offset_to_offset_coords description" +#~ msgid "Apply the extruder offset to the coordinate system." +#~ msgstr "Käytä suulakkeen siirtymää koordinaattijärjestelmään." + +#~ msgctxt "shell label" +#~ msgid "Shell" +#~ msgstr "Kuori" + +#~ msgctxt "max_skin_angle_for_expansion description" +#~ msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." +#~ msgstr "Kappaleesi ylä- ja/tai alapinnan ylä- ja alapintakalvoja ei laajenneta, jos niiden kulma on suurempi kuin tämä asetus. Tällä vältetään laajentamasta kapeita pintakalvoja, jotka syntyvät, kun mallin pinnalla on lähes pystysuora rinne. 0 °:n kulma on vaakasuora ja 90 °:n kulma on pystysuora." + +#~ msgctxt "speed_layer_0 description" +#~ msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." +#~ msgstr "Alkukerroksen nopeus. Alhaisempi arvo on suositeltava, jotta tarttuvuus alustaan on parempi." + #~ msgctxt "material_bed_temperature_layer_0 description" #~ msgid "The temperature used for the heated build plate at the first layer." #~ msgstr "Lämmitettävän alustan lämpötila ensimmäistä kerrosta tulostettaessa." diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index aa443f1735..a0f3ac59cb 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -1,13 +1,13 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0200\n" -"PO-Revision-Date: 2020-11-09 14:02+0100\n" +"POT-Creation-Date: 2021-06-10 17:35+0200\n" +"PO-Revision-Date: 2021-04-16 15:16+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: French , French \n" "Language: fr_FR\n" @@ -17,8 +17,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 2.4.1\n" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1581 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 msgctxt "@label" msgid "Unknown" msgstr "Inconnu" @@ -44,47 +48,56 @@ msgctxt "@label {0} is the name of a printer that's about to be deleted." msgid "Are you sure you wish to remove {0}? This cannot be undone!" msgstr "Voulez-vous vraiment supprimer l'objet {0} ? Cette action est irréversible !" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 msgctxt "@label" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 msgctxt "@label" msgid "Visual" msgstr "Visuel" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." msgstr "Le profil visuel est conçu pour imprimer des prototypes et des modèles visuels dans le but d'obtenir une qualité visuelle et de surface élevée." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 msgctxt "@label" msgid "Engineering" msgstr "Engineering" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." msgstr "Le profil d'ingénierie est conçu pour imprimer des prototypes fonctionnels et des pièces finales dans le but d'obtenir une meilleure précision et des tolérances plus étroites." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 msgctxt "@label" msgid "Draft" msgstr "Ébauche" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "L'ébauche du profil est conçue pour imprimer les prototypes initiaux et la validation du concept dans le but de réduire considérablement le temps d'impression." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:226 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:234 msgctxt "@label" msgid "Custom Material" msgstr "Matériau personnalisé" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:227 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 msgctxt "@label" msgid "Custom" msgstr "Personnalisé" @@ -105,51 +118,63 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Tous les fichiers (*)" -#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:178 +#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:181 msgctxt "@info:title" msgid "Login failed" msgstr "La connexion a échoué" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:67 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:67 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:24 msgctxt "@info:status" msgid "Finding new location for objects" msgstr "Recherche d'un nouvel emplacement pour les objets" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:71 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:28 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:71 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:28 msgctxt "@info:title" msgid "Finding Location" msgstr "Recherche d'emplacement" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:150 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:76 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:150 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 +#: /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:76 msgctxt "@info:status" msgid "Unable to find a location within the build volume for all objects" msgstr "Impossible de trouver un emplacement dans le volume d'impression pour tous les objets" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:151 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:42 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:151 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:42 msgctxt "@info:title" msgid "Can't Find Location" msgstr "Impossible de trouver un emplacement" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:104 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:116 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Impossible de créer une archive à partir du répertoire de données de l'utilisateur : {}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:110 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 msgctxt "@info:title" msgid "Backup" msgstr "Sauvegarde" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:123 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:135 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "A essayé de restaurer une sauvegarde Cura sans disposer de données ou de métadonnées appropriées." -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:134 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:146 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that is higher than the current version." msgstr "A essayé de restaurer une sauvegarde Cura supérieure à la version actuelle." +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 +msgctxt "@info:backup_failed" +msgid "The following error occurred while trying to restore a Cura backup:" +msgstr "L'erreur suivante s'est produite lors de la restauration d'une sauvegarde Cura :" + #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -299,71 +324,77 @@ msgctxt "@action:button" msgid "Send report" msgstr "Envoyer rapport" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:521 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:527 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Chargement des machines..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:528 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:534 msgctxt "@info:progress" msgid "Setting up preferences..." msgstr "Configuration des préférences..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:657 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:672 msgctxt "@info:progress" msgid "Initializing Active Machine..." msgstr "Initialisation de la machine active..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:803 msgctxt "@info:progress" msgid "Initializing machine manager..." msgstr "Initialisation du gestionnaire de machine..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:802 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:817 msgctxt "@info:progress" msgid "Initializing build volume..." msgstr "Initialisation du volume de fabrication..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:870 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:888 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Préparation de la scène..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:906 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:924 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Chargement de l'interface..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:911 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:929 msgctxt "@info:progress" msgid "Initializing engine..." msgstr "Initialisation du moteur..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1221 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1246 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1777 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1799 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Un seul fichier G-Code peut être chargé à la fois. Importation de {0} sautée" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1778 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:188 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 msgctxt "@info:title" msgid "Warning" msgstr "Avertissement" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1787 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1809 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Impossible d'ouvrir un autre fichier si le G-Code est en cours de chargement. Importation de {0} sautée" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1788 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 msgctxt "@info:title" msgid "Error" msgstr "Erreur" @@ -383,7 +414,7 @@ msgctxt "@info:title" msgid "Placing Object" msgstr "Placement de l'objet" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:92 msgctxt "@message" msgid "Could not read response." msgstr "Impossible de lire la réponse." @@ -403,28 +434,31 @@ msgctxt "@message" msgid "Something unexpected happened when trying to log in, please try again." msgstr "Une erreur s'est produite lors de la connexion, veuillez réessayer." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:187 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:189 msgctxt "@info" msgid "Unable to start a new sign in process. Check if another sign in attempt is still active." msgstr "Impossible de lancer une nouvelle procédure de connexion. Vérifiez si une autre tentative de connexion est toujours active." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Impossible d’atteindre le serveur du compte Ultimaker." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:205 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:205 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 msgctxt "@title:window" msgid "File Already Exists" msgstr "Le fichier existe déjà" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:206 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:206 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Le fichier {0} existe déjà. Êtes-vous sûr de vouloir le remplacer ?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:452 /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:455 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "URL de fichier invalide :" @@ -476,7 +510,8 @@ msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Échec de l'importation du profil depuis le fichier {0} :" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:235 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:245 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:235 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:245 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." @@ -506,33 +541,33 @@ msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Le profil {0} est un type de fichier inconnu ou est corrompu." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:423 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:426 msgctxt "@label" msgid "Custom profile" msgstr "Personnaliser le profil" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:439 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:442 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Il manque un type de qualité au profil." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:443 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:446 msgctxt "@info:status" -msgid "Global stack is missing." -msgstr "Il manque la pile globale." +msgid "There is no active printer yet." +msgstr "Aucune imprimante n'est active pour le moment." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:449 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:452 msgctxt "@info:status" msgid "Unable to add the profile." msgstr "Impossible d'ajouter le profil." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:463 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:466 #, python-brace-format msgctxt "@info:status" msgid "Quality type '{0}' is not compatible with the current active machine definition '{1}'." msgstr "Le type de qualité « {0} » n'est pas compatible avec la définition actuelle de la machine active « {1} »." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:468 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:471 #, python-brace-format msgctxt "@info:status" msgid "Warning: The profile is not visible because its quality type '{0}' is not available for the current configuration. Switch to a material/nozzle combination that can use this quality type." @@ -548,39 +583,50 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:712 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 msgctxt "@label" msgid "Nozzle" msgstr "Buse" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:860 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:856 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "Les paramètres ont été modifiés pour correspondre aux extrudeuses actuellement disponibles :" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:862 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:858 msgctxt "@info:title" msgid "Settings updated" msgstr "Paramètres mis à jour" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1447 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1478 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extrudeuse(s) désactivée(s)" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:67 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:67 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "Ajouter" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:263 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 msgctxt "@action:button" msgid "Finish" msgstr "Fin" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:441 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml:81 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml:81 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 msgctxt "@action:button" msgid "Cancel" @@ -592,73 +638,84 @@ msgctxt "@label" msgid "Group #{group_nr}" msgstr "Groupe nº {group_nr}" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Paroi externe" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Parois internes" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Couche extérieure" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Remplissage" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Remplissage du support" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Interface du support" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Support" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Jupe" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 msgctxt "@tooltip" msgid "Prime Tower" msgstr "Tour primaire" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 msgctxt "@tooltip" msgid "Travel" msgstr "Déplacement" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 msgctxt "@tooltip" msgid "Retractions" msgstr "Rétractions" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:94 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 msgctxt "@tooltip" msgid "Other" msgstr "Autre" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 msgctxt "@action:button" msgid "Next" msgstr "Suivant" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:173 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 +msgctxt "@action:button" +msgid "Skip" +msgstr "Passer" + +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 +#: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 msgctxt "@action:button" msgid "Close" msgstr "Fermer" @@ -682,29 +739,36 @@ msgstr "" "

    Découvrez comment optimiser la qualité et la fiabilité de l'impression.

    \n" "

    Consultez le guide de qualité d'impression

    " -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:535 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:540 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Le fichier projet {0} contient un type de machine inconnu {1}. Impossible d'importer la machine. Les modèles seront importés à la place." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:538 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:543 msgctxt "@info:title" msgid "Open Project File" msgstr "Ouvrir un fichier de projet" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:634 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:639 #, python-brace-format msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "Le fichier de projet {0} est soudainement inaccessible : {1}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:635 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "Impossible d'ouvrir le fichier de projet" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:686 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:646 +#, python-brace-format +msgctxt "@info:error Don't translate the XML tags or !" +msgid "Project file {0} is corrupt: {1}." +msgstr "Le fichier de projet {0} est corrompu : {1}." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:698 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." @@ -720,7 +784,8 @@ msgctxt "@title:tab" msgid "Custom" msgstr "Personnalisé" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 msgctxt "@item:inlistbox" msgid "3MF File" msgstr "Fichier 3MF" @@ -730,7 +795,8 @@ msgctxt "@error:zip" msgid "3MF Writer plug-in is corrupt." msgstr "Le plug-in 3MF Writer est corrompu." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:59 /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:92 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:59 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:92 msgctxt "@error:zip" msgid "No permission to write the workspace here." msgstr "Aucune autorisation d'écrire l'espace de travail ici." @@ -740,7 +806,7 @@ msgctxt "@error:zip" msgid "The operating system does not allow saving a project file to this location or with this file name." msgstr "Le système d'exploitation ne permet pas d'enregistrer un fichier de projet à cet emplacement ou avec ce nom de fichier." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:206 msgctxt "@error:zip" msgid "Error writing 3mf file." msgstr "Erreur d'écriture du fichier 3MF." @@ -795,7 +861,8 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "La sauvegarde dépasse la taille de fichier maximale." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:82 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:23 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "Une erreur s’est produite lors de la tentative de restauration de votre sauvegarde." @@ -805,41 +872,45 @@ msgctxt "@item:inmenu" msgid "Manage backups" msgstr "Gérer les sauvegardes" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Impossible de découper le matériau actuel, car celui-ci est incompatible avec la machine ou la configuration sélectionnée." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:411 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:420 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:429 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 msgctxt "@info:title" msgid "Unable to slice" msgstr "Impossible de découper" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:412 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Impossible de couper avec les paramètres actuels. Les paramètres suivants contiennent des erreurs : {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:410 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:436 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Impossible de couper en raison de certains paramètres par modèle. Les paramètres suivants contiennent des erreurs sur un ou plusieurs modèles : {error_labels}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:445 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "Impossible de couper car la tour primaire ou la (les) position(s) d'amorçage ne sont pas valides." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:428 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:454 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "Impossible de couper car il existe des objets associés à l'extrudeuse désactivée %s." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:463 msgctxt "@info:status" msgid "" "Please review settings and check if your models:\n" @@ -852,7 +923,8 @@ msgstr "" "- Sont affectés à un extrudeur activé\n" "- N sont pas tous définis comme des mailles de modificateur" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 msgctxt "@info:status" msgid "Processing Layers" msgstr "Traitement des couches" @@ -862,7 +934,8 @@ msgctxt "@info:title" msgid "Information" msgstr "Informations" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Profil Cura" @@ -894,7 +967,8 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Mettre à jour le firmware" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 msgctxt "@item:inlistbox" msgid "Compressed G-code File" msgstr "Fichier G-Code compressé" @@ -904,7 +978,9 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "GCodeGzWriter ne prend pas en charge le mode texte." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 msgctxt "@item:inlistbox" msgid "G-code File" msgstr "Fichier GCode" @@ -914,7 +990,8 @@ msgctxt "@info:status" msgid "Parsing G-code" msgstr "Analyse du G-Code" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:349 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:349 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:503 msgctxt "@info:title" msgid "G-code Details" msgstr "Détails G-Code" @@ -934,7 +1011,8 @@ msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "GCodeWriter ne prend pas en charge le mode non-texte." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Veuillez préparer le G-Code avant d'exporter." @@ -1020,7 +1098,8 @@ msgctxt "@item:inlistbox" msgid "Save to Removable Drive {0}" msgstr "Enregistrer sur un lecteur amovible {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "Aucun format de fichier n'est disponible pour écriture !" @@ -1036,7 +1115,8 @@ msgctxt "@info:title" msgid "Saving" msgstr "Enregistrement" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:106 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:109 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:106 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:109 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not save to {0}: {1}" @@ -1048,7 +1128,8 @@ msgctxt "@info:status Don't translate the tag {device}!" msgid "Could not find a file name when trying to write to {device}." msgstr "Impossible de trouver un nom de fichier lors d'une tentative d'écriture sur {device}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:138 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:138 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #, python-brace-format msgctxt "@info:status" msgid "Could not save to removable drive {0}: {1}" @@ -1098,27 +1179,28 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Lecteur amovible" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:121 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:128 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled." msgstr "Cura n'affiche pas les couches avec précision lorsque l'impression filaire est activée." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:129 msgctxt "@info:title" msgid "Simulation View" msgstr "Vue simulation" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:status" msgid "Nothing is shown because you need to slice first." msgstr "Rien ne s'affiche car vous devez d'abord découper." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:title" msgid "No layers to show" msgstr "Pas de couches à afficher" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:124 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "Ne plus afficher ce message" @@ -1128,16 +1210,21 @@ msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Vue en couches" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:70 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:71 msgctxt "@info:status" -msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." -msgstr "Votre modèle n'est pas fonctionnel. Les zones surlignées indiquent que des surfaces manquent ou sont étrangères." +msgid "The highlighted areas indicate either missing or extraneous surfaces. Fix your model and open it again into Cura." +msgstr "Les zones surlignées indiquent que des surfaces manquent ou sont étrangères. Réparez votre modèle et ouvrez-le à nouveau dans Cura." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 msgctxt "@info:title" -msgid "Model errors" +msgid "Model Errors" msgstr "Erreurs du modèle" +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:79 +msgctxt "@action:button" +msgid "Learn more" +msgstr "En savoir plus" + #: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/__init__.py:12 msgctxt "@item:inmenu" msgid "Solid view" @@ -1158,12 +1245,13 @@ msgctxt "@info:generic" msgid "Do you want to sync material and software packages with your account?" msgstr "Vous souhaitez synchroniser du matériel et des logiciels avec votre compte ?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:143 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/DownloadPresenter.py:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:143 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/DownloadPresenter.py:93 msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "Changements détectés à partir de votre compte Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:145 msgctxt "@action:button" msgid "Sync" msgstr "Synchroniser" @@ -1178,7 +1266,8 @@ msgctxt "@button" msgid "Decline" msgstr "Refuser" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/LicenseModel.py:10 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:56 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/LicenseModel.py:10 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:56 msgctxt "@button" msgid "Agree" msgstr "Accepter" @@ -1198,7 +1287,7 @@ msgctxt "@info:generic" msgid "You need to quit and restart {} before changes have effect." msgstr "Vous devez quitter et redémarrer {} avant que les changements apportés ne prennent effet." -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:79 msgctxt "@info:generic" msgid "{} plugins failed to download" msgstr "Échec de téléchargement des plugins {}" @@ -1233,12 +1322,17 @@ msgctxt "@item:inlistbox" msgid "Compressed COLLADA Digital Asset Exchange" msgstr "COLLADA Digital Asset Exchange compressé" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimaker Format Package" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "Impossible d'écrire dans le fichier UFP :" @@ -1253,22 +1347,22 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Sélectionner les mises à niveau" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:152 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 msgctxt "@action:button" msgid "Print via cloud" msgstr "Imprimer via le cloud" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:155 msgctxt "@properties:tooltip" msgid "Print via cloud" msgstr "Imprimer via le cloud" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:156 msgctxt "@info:status" msgid "Connected via cloud" msgstr "Connecté via le cloud" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:264 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:270 #, python-brace-format msgctxt "@error:send" msgid "Unknown error code when uploading print job: {0}" @@ -1314,7 +1408,8 @@ msgid_plural "These printers are not linked to the Digital Factory:" msgstr[0] "Cette imprimante n'est pas associée à Digital Factory :" msgstr[1] "Ces imprimantes ne sont pas associées à Digital Factory :" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:329 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:329 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:419 msgctxt "info:name" msgid "Ultimaker Digital Factory" msgstr "Ultimaker Digital Factory" @@ -1565,126 +1660,137 @@ msgctxt "@info:tooltip" msgid "Some things could be problematic in this print. Click to see tips for adjustment." msgstr "Certains éléments pourraient causer des problèmes à cette impression. Cliquez pour voir les conseils d'ajustement." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:15 msgctxt "@title:window" msgid "Open Project" msgstr "Ouvrir un projet" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" msgstr "Mettre à jour l'existant" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:63 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "Créer" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:74 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "Résumé - Projet Cura" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:96 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 msgctxt "@action:label" msgid "Printer settings" msgstr "Paramètres de l'imprimante" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:112 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:113 msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "Comment le conflit de la machine doit-il être résolu ?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:165 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 msgctxt "@action:label" msgid "Type" msgstr "Type" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:181 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 msgctxt "@action:label" msgid "Printer Group" msgstr "Groupe d'imprimantes" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:203 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 msgctxt "@action:label" msgid "Profile settings" msgstr "Paramètres de profil" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:219 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:221 msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "Comment le conflit du profil doit-il être résolu ?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:349 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 msgctxt "@action:label" msgid "Name" msgstr "Nom" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:255 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 msgctxt "@action:label" msgid "Intent" msgstr "Intent" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:271 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Not in profile" msgstr "Absent du profil" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:276 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 écrasent" msgstr[1] "%1 écrase" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:287 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:290 msgctxt "@action:label" msgid "Derivative from" msgstr "Dérivé de" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:295 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 écrasent" msgstr[1] "%1, %2 écrase" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:309 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:312 msgctxt "@action:label" msgid "Material settings" msgstr "Paramètres du matériau" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:328 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Comment le conflit du matériau doit-il être résolu ?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:369 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:373 msgctxt "@action:label" msgid "Setting visibility" msgstr "Visibilité des paramètres" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:378 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:382 msgctxt "@action:label" msgid "Mode" msgstr "Mode" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:label" msgid "Visible settings:" msgstr "Paramètres visibles :" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:399 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:403 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 sur %2" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:425 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:429 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Le chargement d'un projet effacera tous les modèles sur le plateau." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:457 msgctxt "@action:button" msgid "Open" msgstr "Ouvrir" @@ -1784,7 +1890,10 @@ msgctxt "@description" msgid "Backup and synchronize your Cura settings." msgstr "Sauvegardez et synchronisez vos paramètres Cura." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:68 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:125 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:199 msgctxt "@button" msgid "Sign in" msgstr "Se connecter" @@ -1934,7 +2043,8 @@ msgctxt "@item:inlistbox" msgid "Linear" msgstr "Linéaire" -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:161 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:172 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:161 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:172 msgctxt "@item:inlistbox" msgid "Translucency" msgstr "Translucidité" @@ -1959,7 +2069,9 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "Lissage" -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:227 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:139 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:227 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@action:button" msgid "OK" msgstr "OK" @@ -1979,10 +2091,18 @@ msgctxt "@label" msgid "Nozzle size" msgstr "Taille de la buse" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:89 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:205 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:245 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:283 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:245 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:283 msgctxt "@label" msgid "mm" msgstr "mm" @@ -2007,12 +2127,12 @@ msgctxt "@label" msgid "Cooling Fan Number" msgstr "Numéro du ventilateur de refroidissement" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:163 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "Extrudeuse G-Code de démarrage" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:177 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "Extrudeuse G-Code de fin" @@ -2097,12 +2217,17 @@ msgctxt "@label" msgid "Number of Extruders" msgstr "Nombre d'extrudeuses" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:345 +msgctxt "@label" +msgid "Apply Extruder offsets to GCode" +msgstr "Appliquer les décalages offset de l'extrudeuse au GCode" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:393 msgctxt "@title:label" msgid "Start G-code" msgstr "G-Code de démarrage" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:385 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:404 msgctxt "@title:label" msgid "End G-code" msgstr "G-Code de fin" @@ -2129,6 +2254,11 @@ msgctxt "@label link to technical assistance" msgid "View user manuals online" msgstr "Voir les manuels d'utilisation en ligne" +#: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 +msgctxt "@info" +msgid "In order to monitor your print from Cura, please connect the printer." +msgstr "Pour surveiller votre impression depuis Cura, veuillez connecter l'imprimante." + #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" msgid "Mesh Type" @@ -2174,7 +2304,8 @@ msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Sélectionner les paramètres pour personnaliser ce modèle" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtrer..." @@ -2184,114 +2315,131 @@ msgctxt "@label:checkbox" msgid "Show all" msgstr "Afficher tout" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:20 msgctxt "@title:window" msgid "Post Processing Plugin" msgstr "Plug-in de post-traitement" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:59 msgctxt "@label" msgid "Post Processing Scripts" msgstr "Scripts de post-traitement" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:235 msgctxt "@action" msgid "Add a script" msgstr "Ajouter un script" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:282 msgctxt "@label" msgid "Settings" msgstr "Paramètres" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:499 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:502 msgctxt "@info:tooltip" msgid "Change active post-processing scripts." msgstr "Modifiez les scripts de post-traitement actifs." -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:506 msgctxt "@info:tooltip" msgid "The following script is active:" msgid_plural "The following scripts are active:" msgstr[0] "Le script suivant est actif :" msgstr[1] "Les scripts suivants sont actifs :" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:20 /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:49 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:49 msgctxt "@label" msgid "Color scheme" msgstr "Modèle de couleurs" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:110 msgctxt "@label:listbox" msgid "Material Color" msgstr "Couleur du matériau" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:111 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:114 msgctxt "@label:listbox" msgid "Line Type" msgstr "Type de ligne" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:115 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:118 msgctxt "@label:listbox" msgid "Speed" msgstr "Vitesse" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:122 msgctxt "@label:listbox" -msgid "Layer thickness" +msgid "Layer Thickness" msgstr "Épaisseur de la couche" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:126 +msgctxt "@label:listbox" +msgid "Line Width" +msgstr "Largeur de ligne" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 +msgctxt "@label:listbox" +msgid "Flow" +msgstr "Débit" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" msgid "Compatibility Mode" msgstr "Mode de compatibilité" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:230 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:245 msgctxt "@label" msgid "Travels" msgstr "Déplacements" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:251 msgctxt "@label" msgid "Helpers" msgstr "Aides" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:257 msgctxt "@label" msgid "Shell" msgstr "Coque" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:248 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 msgctxt "@label" msgid "Infill" msgstr "Remplissage" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:298 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:271 +msgctxt "@label" +msgid "Starts" +msgstr "Démarre" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 msgctxt "@label" msgid "Only Show Top Layers" msgstr "Afficher uniquement les couches supérieures" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:308 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:332 msgctxt "@label" msgid "Show 5 Detailed Layers On Top" msgstr "Afficher 5 niveaux détaillés en haut" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:346 msgctxt "@label" msgid "Top / Bottom" msgstr "Haut / bas" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:350 msgctxt "@label" msgid "Inner Wall" msgstr "Paroi interne" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:384 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:419 msgctxt "@label" msgid "min" msgstr "min." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:433 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:488 msgctxt "@label" msgid "max" msgstr "max." @@ -2366,7 +2514,8 @@ msgctxt "@action:label" msgid "Website" msgstr "Site Internet" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:46 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:20 msgctxt "@action:button" msgid "Installed" msgstr "Installé" @@ -2381,17 +2530,20 @@ msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "Acheter des bobines de matériau" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:96 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:34 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "Mise à jour" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:97 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:35 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "Mise à jour" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:98 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:36 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:98 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" msgstr "Mis à jour" @@ -2401,7 +2553,8 @@ msgctxt "@label" msgid "Premium" msgstr "Premium" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml:39 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml:39 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:86 msgctxt "@info:tooltip" msgid "Go to Web Marketplace" msgstr "Aller sur le Marché en ligne" @@ -2426,7 +2579,9 @@ msgctxt "@title:tab" msgid "Plugins" msgstr "Plug-ins" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:466 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 msgctxt "@title:tab" msgid "Materials" msgstr "Matériaux" @@ -2471,7 +2626,10 @@ msgctxt "@button" msgid "Dismiss" msgstr "Ignorer" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:178 msgctxt "@button" msgid "Next" msgstr "Suivant" @@ -2536,7 +2694,8 @@ msgctxt "@label" msgid "Last updated" msgstr "Dernière mise à jour" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:103 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "Marque" @@ -2666,7 +2825,9 @@ msgctxt "@action:button" msgid "Edit" msgstr "Modifier" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:156 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" @@ -2682,17 +2843,20 @@ msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Si votre imprimante n'apparaît pas dans la liste, lisez le guide de dépannage de l'impression en réseau" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:205 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:263 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:263 msgctxt "@label" msgid "Type" msgstr "Type" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:279 msgctxt "@label" msgid "Firmware version" msgstr "Version du firmware" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:295 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:295 msgctxt "@label" msgid "Address" msgstr "Adresse" @@ -2722,7 +2886,8 @@ msgctxt "@title:window" msgid "Invalid IP address" msgstr "Adresse IP non valide" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Veuillez saisir une adresse IP valide." @@ -2732,7 +2897,8 @@ msgctxt "@title:window" msgid "Printer Address" msgstr "Adresse de l'imprimante" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Saisissez l'adresse IP de votre imprimante sur le réseau." @@ -2784,7 +2950,9 @@ msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "Si vous sélectionnez « Remplacer », les paramètres de la configuration actuelle de l'imprimante seront utilisés. Cela peut entraîner l'échec de l'impression." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:191 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:184 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:191 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:184 msgctxt "@label" msgid "Glass" msgstr "Verre" @@ -2804,7 +2972,8 @@ msgctxt "@label" msgid "Delete" msgstr "Effacer" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:289 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 msgctxt "@label" msgid "Resume" msgstr "Reprendre" @@ -2819,7 +2988,9 @@ msgctxt "@label" msgid "Resuming..." msgstr "Reprise..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 msgctxt "@label" msgid "Pause" msgstr "Pause" @@ -2859,7 +3030,8 @@ msgctxt "@label %1 is the name of a print job." msgid "Are you sure you want to abort %1?" msgstr "Êtes-vous sûr de vouloir annuler %1 ?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 msgctxt "@window:title" msgid "Abort print" msgstr "Abandonner l'impression" @@ -2869,7 +3041,9 @@ msgctxt "@label link to Connect and Cloud interfaces" msgid "Manage printer" msgstr "Gérer l'imprimante" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:519 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." msgstr "Veuillez mettre à jour le Firmware de votre imprimante pour gérer la file d'attente à distance." @@ -2894,27 +3068,34 @@ msgctxt "@label:status" msgid "Idle" msgstr "Inactif" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:365 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +msgctxt "@label:status" +msgid "Preparing..." +msgstr "Préparation..." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:369 msgctxt "@label:status" msgid "Printing" msgstr "Impression" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:406 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:410 msgctxt "@label" msgid "Untitled" msgstr "Sans titre" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:431 msgctxt "@label" msgid "Anonymous" msgstr "Anonyme" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:458 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Nécessite des modifications de configuration" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:492 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:496 msgctxt "@action:button" msgid "Details" msgstr "Détails" @@ -2929,21 +3110,18 @@ msgctxt "@label" msgid "First available" msgstr "Premier disponible" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "Abandonné" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "Terminé" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -msgctxt "@label:status" -msgid "Preparing..." -msgstr "Préparation..." - #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." @@ -3024,26 +3202,24 @@ msgctxt "@action:button" msgid "Sign in" msgstr "Se connecter" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" -msgid "Your key to connected 3D printing" -msgstr "Votre clé pour une impression 3D connectée" +msgid "Sign in to the Ultimaker platform" +msgstr "Connectez-vous à la plateforme Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:42 msgctxt "@text" msgid "" -"- Customize your experience with more print profiles and plugins\n" -"- Stay flexible by syncing your setup and loading it anywhere\n" -"- Increase efficiency with a remote workflow on Ultimaker printers" -msgstr "" -"- Personnalisez votre expérience avec plus de profils d'impression et de plug-ins\n" -"- Restez flexible en synchronisant votre configuration et en la chargeant n'importe où\n" -"- Augmentez l'efficacité grâce à un flux de travail à distance sur les imprimantes Ultimaker" +"- Add material profiles and plug-ins from the Marketplace\n" +"- Back-up and sync your material profiles and plug-ins\n" +"- Share ideas and get help from 48,000+ users in the Ultimaker community" +msgstr "- Ajoutez des profils de matériaux et des plug-ins à partir de la Marketplace - Sauvegardez et synchronisez vos profils de matériaux et vos plug-ins - Partagez vos idées et obtenez l'aide de plus de 48 000 utilisateurs de la communauté Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:142 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:62 msgctxt "@button" -msgid "Create account" -msgstr "Créer un compte" +msgid "Create a free Ultimaker account" +msgstr "Créez gratuitement un compte Ultimaker" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/SyncState.qml:28 msgctxt "@label" @@ -3150,303 +3326,308 @@ msgctxt "@button" msgid "Cancel" msgstr "Annuler" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:83 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Afficher le guide de dépannage en ligne" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:90 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Passer en Plein écran" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:98 msgctxt "@action:inmenu" msgid "Exit Full Screen" msgstr "Quitter le mode plein écran" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:105 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Annuler" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:115 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Rétablir" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:125 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Quitter" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:132 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:133 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Vue 3D" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:140 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Vue de face" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:147 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Vue du dessus" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 +msgctxt "@action:inmenu menubar:view" +msgid "Bottom View" +msgstr "Vue de dessous" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Vue latérale gauche" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:160 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:168 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Vue latérale droite" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:175 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Configurer Cura..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:182 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Ajouter une imprimante..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:180 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:188 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Gérer les &imprimantes..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:187 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Gérer les matériaux..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu" msgid "Add more materials from Marketplace" msgstr "Ajouter d'autres matériaux du Marketplace" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "&Mettre à jour le profil à l'aide des paramètres / forçages actuels" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Ignorer les modifications actuelles" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:222 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:230 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "&Créer un profil à partir des paramètres / forçages actuels..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Gérer les profils..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Afficher la &documentation en ligne" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Notifier un &bug" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:260 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Quoi de neuf" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:266 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "À propos de..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:273 msgctxt "@action:inmenu menubar:edit" -msgid "Delete Selected Model" -msgid_plural "Delete Selected Models" -msgstr[0] "Supprimer le modèle sélectionné" -msgstr[1] "Supprimer les modèles sélectionnés" +msgid "Delete Selected" +msgstr "Supprimer la sélection" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:283 msgctxt "@action:inmenu menubar:edit" -msgid "Center Selected Model" -msgid_plural "Center Selected Models" -msgstr[0] "Centrer le modèle sélectionné" -msgstr[1] "Centrer les modèles sélectionnés" +msgid "Center Selected" +msgstr "Centrer la sélection" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:292 msgctxt "@action:inmenu menubar:edit" -msgid "Multiply Selected Model" -msgid_plural "Multiply Selected Models" -msgstr[0] "Multiplier le modèle sélectionné" -msgstr[1] "Multiplier les modèles sélectionnés" +msgid "Multiply Selected" +msgstr "Multiplier la sélection" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Supprimer le modèle" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:309 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Ce&ntrer le modèle sur le plateau" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:307 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "&Grouper les modèles" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:327 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:335 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Dégrouper les modèles" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:345 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "&Fusionner les modèles" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:347 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:355 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Multiplier le modèle..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:362 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Sélectionner tous les modèles" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:372 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Supprimer les objets du plateau" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:382 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Recharger tous les modèles" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Réorganiser tous les modèles sur tous les plateaux" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:390 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Réorganiser tous les modèles" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:406 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Réorganiser la sélection" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:405 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:413 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Réinitialiser toutes les positions des modèles" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:412 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Réinitialiser tous les modèles et transformations" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:419 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:429 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Ouvrir le(s) fichier(s)..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:439 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Nouveau projet..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:434 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:446 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Afficher le dossier de configuration" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:441 /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:538 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Configurer la visibilité des paramètres..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:448 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:460 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Marché en ligne" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:257 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Ce paquet sera installé après le redémarrage." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 msgctxt "@title:tab" msgid "General" msgstr "Général" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:462 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:453 msgctxt "@title:tab" msgid "Settings" msgstr "Paramètres" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:464 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 msgctxt "@title:tab" msgid "Printers" msgstr "Imprimantes" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 msgctxt "@title:tab" msgid "Profiles" msgstr "Profils" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:576 msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "Fermeture de %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:588 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "Voulez-vous vraiment quitter %1 ?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:638 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Ouvrir le(s) fichier(s)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:744 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:737 msgctxt "@window:title" msgid "Install Package" msgstr "Installer le paquet" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:752 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:745 msgctxt "@title:window" msgid "Open File(s)" msgstr "Ouvrir le(s) fichier(s)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:755 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:748 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Nous avons trouvé au moins un fichier G-Code parmi les fichiers que vous avez sélectionné. Vous ne pouvez ouvrir qu'un seul fichier G-Code à la fois. Si vous souhaitez ouvrir un fichier G-Code, veuillez ne sélectionner qu'un seul fichier de ce type." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:858 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:857 msgctxt "@title:window" msgid "Add Printer" msgstr "Ajouter une imprimante" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:866 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:865 msgctxt "@title:window" msgid "What's New" msgstr "Quoi de neuf" @@ -3575,7 +3756,8 @@ msgctxt "@Label" msgid "Static type checker for Python" msgstr "Vérificateur de type statique pour Python" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@Label" msgid "Root Certificates for validating SSL trustworthiness" msgstr "Certificats racines pour valider la fiabilité SSL" @@ -3595,17 +3777,27 @@ msgctxt "@label" msgid "Python bindings for libnest2d" msgstr "Liens en python pour libnest2d" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +msgctxt "@label" +msgid "Support library for system keyring access" +msgstr "Bibliothèque de support pour l'accès au trousseau de clés du système" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" +msgid "Python extensions for Microsoft Windows" +msgstr "Extensions Python pour Microsoft Windows" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +msgctxt "@label" msgid "Font" msgstr "Police" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 msgctxt "@label" msgid "SVG icons" msgstr "Icônes SVG" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:165 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Déploiement d'applications sur multiples distributions Linux" @@ -3615,22 +3807,22 @@ msgctxt "@title:window" msgid "Open project file" msgstr "Ouvrir un fichier de projet" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:88 msgctxt "@text:window" msgid "This is a Cura project file. Would you like to open it as a project or import the models from it?" msgstr "Ceci est un fichier de projet Cura. Souhaitez-vous l'ouvrir comme projet ou en importer les modèles ?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:98 msgctxt "@text:window" msgid "Remember my choice" msgstr "Se souvenir de mon choix" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:122 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:117 msgctxt "@action:button" msgid "Open as project" msgstr "Ouvrir comme projet" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:131 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:126 msgctxt "@action:button" msgid "Import models" msgstr "Importer les modèles" @@ -3661,7 +3853,8 @@ msgctxt "@title:column" msgid "Current changes" msgstr "Modifications actuelles" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Toujours me demander" @@ -3686,12 +3879,12 @@ msgctxt "@action:button" msgid "Keep changes" msgstr "Conserver les modifications" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 msgctxt "@text:window" msgid "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?" msgstr "Nous avons trouvé au moins un fichier de projet parmi les fichiers que vous avez sélectionnés. Vous ne pouvez ouvrir qu'un seul fichier de projet à la fois. Nous vous conseillons de n'importer que les modèles de ces fichiers. Souhaitez-vous continuer ?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:99 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:94 msgctxt "@action:button" msgid "Import all as models" msgstr "Importer tout comme modèles" @@ -3738,7 +3931,8 @@ msgctxt "@text Print job name" msgid "Untitled" msgstr "Sans titre" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:27 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:27 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "&Fichier" @@ -3748,12 +3942,14 @@ msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "&Modifier" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:49 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:12 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:49 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:12 msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "&Visualisation" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:51 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&Settings" msgstr "&Paramètres" @@ -3843,7 +4039,7 @@ msgctxt "@label" msgid "Material" msgstr "Matériau" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:407 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Utiliser de la colle pour une meilleure adhérence avec cette combinaison de matériaux." @@ -3867,17 +4063,17 @@ msgctxt "@label" msgid "Number of Copies" msgstr "Nombre de copies" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:33 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:41 msgctxt "@title:menu menubar:file" msgid "&Save Project..." msgstr "&Enregistrer le projet..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:54 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:74 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "E&xporter..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:85 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Exporter la sélection..." @@ -3897,6 +4093,11 @@ msgctxt "@label:category menu label" msgid "Generic" msgstr "Générique" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/OpenFilesMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Open File(s)..." +msgstr "Ouvrir le(s) fichier(s)..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3912,6 +4113,11 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Ouvrir un fichier &récent" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SaveProjectMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Save Project..." +msgstr "Sauvegarder le projet..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:15 msgctxt "@title:menu menubar:settings" msgid "&Printer" @@ -3937,17 +4143,17 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Désactiver l'extrudeuse" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:16 msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Paramètres visibles" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:45 msgctxt "@action:inmenu" msgid "Collapse All Categories" msgstr "Réduire toutes les catégories" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Gérer la visibilité des paramètres..." @@ -3957,22 +4163,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "Position de la &caméra" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:45 msgctxt "@action:inmenu menubar:view" msgid "Camera view" msgstr "Vue de la caméra" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:48 msgctxt "@action:inmenu menubar:view" msgid "Perspective" msgstr "Perspective" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:60 msgctxt "@action:inmenu menubar:view" msgid "Orthographic" msgstr "Orthographique" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:81 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "&Plateau" @@ -4017,12 +4223,12 @@ msgctxt "@label:MonitorStatus" msgid "Please remove the print" msgstr "Supprimez l'imprimante" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@label" msgid "Abort Print" msgstr "Abandonner l'impression" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:338 msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Êtes-vous sûr(e) de vouloir abandonner l'impression ?" @@ -4064,310 +4270,314 @@ msgctxt "@label" msgid "Interface" msgstr "Interface" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:216 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:209 msgctxt "@label" msgid "Currency:" msgstr "Devise :" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:229 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:222 msgctxt "@label" msgid "Theme:" msgstr "Thème :" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Vous devez redémarrer l'application pour que ces changements prennent effet." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:284 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Découper automatiquement si les paramètres sont modifiés." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 msgctxt "@option:check" msgid "Slice automatically" msgstr "Découper automatiquement" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:306 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportement Viewport" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:314 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Surligne les parties non supportées du modèle en rouge. Sans ajouter de support, ces zones ne s'imprimeront pas correctement." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:323 msgctxt "@option:check" msgid "Display overhang" msgstr "Mettre en surbrillance les porte-à-faux" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:351 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@info:tooltip" msgid "Highlight missing or extraneous surfaces of the model using warning signs. The toolpaths will often be missing parts of the intended geometry." msgstr "Surlignez les surfaces du modèle manquantes ou étrangères en utilisant les signes d'avertissement. Les Toolpaths seront souvent les parties manquantes de la géométrie prévue." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:342 msgctxt "@option:check" msgid "Display model errors" msgstr "Afficher les erreurs du modèle" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Déplace la caméra afin que le modèle sélectionné se trouve au centre de la vue" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:373 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Centrer la caméra lorsqu'un élément est sélectionné" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Le comportement de zoom par défaut de Cura doit-il être inversé ?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:388 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Inverser la direction du zoom de la caméra." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Le zoom doit-il se faire dans la direction de la souris ?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "Le zoom vers la souris n'est pas pris en charge dans la perspective orthographique." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:409 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Zoomer vers la direction de la souris" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:435 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:417 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Les modèles dans la zone d'impression doivent-ils être déplacés afin de ne plus se croiser ?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:440 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:422 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Veillez à ce que les modèles restent séparés" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:431 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Les modèles dans la zone d'impression doivent-ils être abaissés afin de toucher le plateau ?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:436 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Abaisser automatiquement les modèles sur le plateau" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:448 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Afficher le message d'avertissement dans le lecteur G-Code." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:457 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Message d'avertissement dans le lecteur G-Code" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "La couche doit-elle être forcée en mode de compatibilité ?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Forcer l'affichage de la couche en mode de compatibilité (redémarrage requis)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:498 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" msgstr "Est-ce que Cura devrait ouvrir à l'endroit où il a été fermé ?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:485 msgctxt "@option:check" msgid "Restore window position on start" msgstr "Restaurer la position de la fenêtre au démarrage" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:513 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Quel type de rendu de la caméra doit-il être utilisé?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:502 msgctxt "@window:text" msgid "Camera rendering:" msgstr "Rendu caméra :" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:531 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:509 msgid "Perspective" msgstr "Perspective" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:532 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgid "Orthographic" msgstr "Orthographique" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:563 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:548 msgctxt "@label" msgid "Opening and saving files" msgstr "Ouvrir et enregistrer des fichiers" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:555 msgctxt "@info:tooltip" msgid "Should opening files from the desktop or external applications open in the same instance of Cura?" msgstr "L'ouverture de fichiers à partir du bureau ou d'applications externes doit-elle se faire dans la même instance de Cura ?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@option:check" msgid "Use a single instance of Cura" msgstr "Utiliser une seule instance de Cura" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Les modèles doivent-ils être mis à l'échelle du volume d'impression s'ils sont trop grands ?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@option:check" msgid "Scale large models" msgstr "Réduire la taille des modèles trop grands" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Un modèle peut apparaître en tout petit si son unité est par exemple en mètres plutôt qu'en millimètres. Ces modèles doivent-ils être agrandis ?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Mettre à l'échelle les modèles extrêmement petits" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Les modèles doivent-ils être sélectionnés après leur chargement ?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Sélectionner les modèles lorsqu'ils sont chargés" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Un préfixe basé sur le nom de l'imprimante doit-il être automatiquement ajouté au nom de la tâche d'impression ?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:635 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Ajouter le préfixe de la machine au nom de la tâche" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:645 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Un résumé doit-il être affiché lors de l'enregistrement d'un fichier de projet ?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:649 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:634 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Afficher la boîte de dialogue du résumé lors de l'enregistrement du projet" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:659 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:644 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Comportement par défaut lors de l'ouverture d'un fichier de projet" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:652 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Comportement par défaut lors de l'ouverture d'un fichier de projet : " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Toujours me demander" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:682 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Toujours ouvrir comme projet" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:668 msgctxt "@option:openProject" msgid "Always import models" msgstr "Toujours importer les modèles" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:705 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Lorsque vous apportez des modifications à un profil puis passez à un autre profil, une boîte de dialogue apparaît, vous demandant si vous souhaitez conserver les modifications. Vous pouvez aussi choisir une option par défaut, et le dialogue ne s'affichera plus." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:728 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Profils" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Comportement par défaut pour les valeurs de paramètres modifiées lors du passage à un profil différent : " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:748 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:734 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Toujours rejeter les paramètres modifiés" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:749 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:735 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Toujours transférer les paramètres modifiés dans le nouveau profil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:783 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@label" msgid "Privacy" msgstr "Confidentialité" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:790 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:777 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Cura doit-il vérifier les mises à jour au démarrage du programme ?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:795 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:782 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Vérifier les mises à jour au démarrage" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:805 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:792 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Les données anonymes de votre impression doivent-elles être envoyées à Ultimaker ? Notez qu'aucun modèle, aucune adresse IP ni aucune autre information permettant de vous identifier personnellement ne seront envoyés ou stockés." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:810 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:797 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Envoyer des informations (anonymes) sur l'impression" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:819 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:806 msgctxt "@action:button" msgid "More information" msgstr "Plus d'informations" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "Activer" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "Renommer" @@ -4382,61 +4592,77 @@ msgctxt "@action:button" msgid "Duplicate" msgstr "Dupliquer" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:171 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:171 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "Importer" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:185 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:185 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 msgctxt "@action:button" msgid "Export" msgstr "Exporter" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 +msgctxt "@action:button Sending materials to printers" +msgid "Sync with Printers" +msgstr "Synchroniser les imprimantes" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" msgid "Printer" msgstr "Imprimante" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:298 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Confirmer la suppression" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:301 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Êtes-vous sûr de vouloir supprimer l'objet %1 ? Vous ne pourrez pas revenir en arrière !" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 msgctxt "@title:window" msgid "Import Material" msgstr "Importer un matériau" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:338 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Impossible d'importer le matériau %1 : %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:328 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:342 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Matériau %1 importé avec succès" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:346 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 msgctxt "@title:window" msgid "Export Material" msgstr "Exporter un matériau" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:358 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:372 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Échec de l'exportation de matériau vers %1 : %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:378 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Matériau exporté avec succès vers %1" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 +msgctxt "@title:window" +msgid "Export All Materials" +msgstr "Exporter tous les matériaux" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" @@ -4522,7 +4748,8 @@ msgctxt "@label" msgid "Adhesion Information" msgstr "Informations d'adhérence" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Paramètres d'impression" @@ -4547,52 +4774,53 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Veuillez fournir un nom pour ce profil." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Dupliquer un profil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@title:window" msgid "Rename Profile" msgstr "Renommer le profil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:307 msgctxt "@title:window" msgid "Import Profile" msgstr "Importer un profil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:336 msgctxt "@title:window" msgid "Export Profile" msgstr "Exporter un profil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:399 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Imprimante : %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:557 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Mettre à jour le profil à l'aide des paramètres / forçages actuels" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 msgctxt "@action:button" msgid "Discard current changes" msgstr "Ignorer les modifications actuelles" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:583 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Ce profil utilise les paramètres par défaut spécifiés par l'imprimante, de sorte qu'aucun paramètre / forçage n'apparaît dans la liste ci-dessous." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:591 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Vos paramètres actuels correspondent au profil sélectionné." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:609 msgctxt "@title:tab" msgid "Global Settings" msgstr "Paramètres généraux" @@ -4622,12 +4850,12 @@ msgctxt "@title:column" msgid "Unit" msgstr "Unité" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:16 msgctxt "@title:tab" msgid "Setting Visibility" msgstr "Visibilité des paramètres" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:48 msgctxt "@label:textbox" msgid "Check all" msgstr "Vérifier tout" @@ -4652,12 +4880,14 @@ msgctxt "@tooltip of temperature input" msgid "The temperature to pre-heat the hotend to." msgstr "Température jusqu'à laquelle préchauffer l'extrémité chauffante." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:341 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:332 msgctxt "@button Cancel pre-heating" msgid "Cancel" msgstr "Annuler" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:344 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:344 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:335 msgctxt "@button" msgid "Pre-heat" msgstr "Préchauffer" @@ -4963,27 +5193,27 @@ msgctxt "@label:textbox" msgid "Search settings" msgstr "Paramètres de recherche" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:456 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:468 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Copier la valeur vers tous les extrudeurs" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:477 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Copier toutes les valeurs modifiées vers toutes les extrudeuses" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:502 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:514 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Masquer ce paramètre" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:515 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:527 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Masquer ce paramètre" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:531 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Afficher ce paramètre" @@ -5043,11 +5273,6 @@ msgctxt "@button" msgid "Add printer manually" msgstr "Ajouter l'imprimante manuellement" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddCloudPrintersView.qml:218 -msgctxt "@button" -msgid "Finish" -msgstr "Fin" - #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:230 msgctxt "@label" msgid "Manufacturer" @@ -5128,7 +5353,8 @@ msgctxt "@label" msgid "Could not connect to device." msgstr "Impossible de se connecter à l'appareil." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:207 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:212 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:207 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:212 msgctxt "@label" msgid "Can't connect to your Ultimaker printer?" msgstr "Impossible de vous connecter à votre imprimante Ultimaker ?" @@ -5153,32 +5379,32 @@ msgctxt "@button" msgid "Connect" msgstr "Se connecter" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:43 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" -msgid "Ultimaker Account" -msgstr "Compte Ultimaker" +msgid "Release Notes" +msgstr "Notes de version" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:124 msgctxt "@text" -msgid "Your key to connected 3D printing" -msgstr "Votre clé pour une impression 3D connectée" +msgid "Add material settings and plugins from the Marketplace" +msgstr "Ajoutez des paramètres de matériaux et des plug-ins depuis la Marketplace" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:101 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:154 msgctxt "@text" -msgid "- Customize your experience with more print profiles and plugins" -msgstr "- Personnalisez votre expérience avec plus de profils d'impression et de plug-ins" +msgid "Backup and sync your material settings and plugins" +msgstr "Sauvegardez et synchronisez vos paramètres de matériaux et vos plug-ins" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:184 msgctxt "@text" -msgid "- Stay flexible by syncing your setup and loading it anywhere" -msgstr "- Restez flexible en synchronisant votre configuration et en la chargeant n'importe où" +msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" +msgstr "Partagez vos idées et obtenez l'aide de plus de 48 000 utilisateurs de la communauté Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:217 msgctxt "@text" -msgid "- Increase efficiency with a remote workflow on Ultimaker printers" -msgstr "- Augmentez l'efficacité avec un flux de travail à distance sur les imprimantes Ultimaker" +msgid "Create a free Ultimaker Account" +msgstr "Créez gratuitement un compte Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:230 msgctxt "@button" msgid "Skip" msgstr "Ignorer" @@ -5238,29 +5464,32 @@ msgctxt "@button" msgid "Decline and close" msgstr "Décliner et fermer" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:29 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" msgid "Welcome to Ultimaker Cura" msgstr "Bienvenue dans Ultimaker Cura" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:68 msgctxt "@text" -msgid "" -"Please follow these steps to set up\n" -"Ultimaker Cura. This will only take a few moments." +msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." msgstr "" "Veuillez suivre ces étapes pour configurer\n" "Ultimaker Cura. Cela ne prendra que quelques instants." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:86 msgctxt "@button" msgid "Get started" msgstr "Prise en main" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:28 msgctxt "@label" -msgid "What's new in Ultimaker Cura" -msgstr "Quoi de neuf dans Ultimaker Cura" +msgid "What's New" +msgstr "Nouveautés" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Widgets/ComboBox.qml:24 +msgctxt "@label" +msgid "No items to select from" +msgstr "Aucun élément à sélectionner" #: ModelChecker/plugin.json msgctxt "description" @@ -5342,6 +5571,16 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Générateur de profil Cura" +#: DigitalLibrary/plugin.json +msgctxt "description" +msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." +msgstr "Se connecte à la Digital Library, permettant à Cura d'ouvrir des fichiers à partir de cette dernière et d'y enregistrer des fichiers." + +#: DigitalLibrary/plugin.json +msgctxt "name" +msgid "Ultimaker Digital Library" +msgstr "Ultimaker Digital Library" + #: FirmwareUpdateChecker/plugin.json msgctxt "description" msgid "Checks for firmware updates." @@ -5812,6 +6051,26 @@ msgctxt "name" msgid "Version Upgrade 4.7 to 4.8" msgstr "Mise à niveau de 4.7 vers 4.8" +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." +msgstr "Mises à niveau des configurations de Cura 4.8 vers Cura 4.9." + +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.8 to 4.9" +msgstr "Mise à niveau de 4.8 vers 4.9" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." +msgstr "Mises à niveau des configurations de Cura 4.9 vers Cura 4.10." + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.9 to 4.10" +msgstr "Mise à niveau de 4.9 vers 4.10" + #: X3DReader/plugin.json msgctxt "description" msgid "Provides support for reading X3D files." @@ -5842,6 +6101,94 @@ msgctxt "name" msgid "X-Ray View" msgstr "Vue Rayon-X" +#~ msgctxt "@info:status" +#~ msgid "Global stack is missing." +#~ msgstr "Il manque la pile globale." + +#~ msgctxt "@info:status" +#~ msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." +#~ msgstr "Votre modèle n'est pas fonctionnel. Les zones surlignées indiquent que des surfaces manquent ou sont étrangères." + +#~ msgctxt "@info:title" +#~ msgid "Model errors" +#~ msgstr "Erreurs du modèle" + +#~ msgctxt "@label:listbox" +#~ msgid "Layer thickness" +#~ msgstr "Épaisseur de la couche" + +#~ msgctxt "@label" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "Votre clé pour une impression 3D connectée" + +#~ msgctxt "@text" +#~ msgid "" +#~ "- Customize your experience with more print profiles and plugins\n" +#~ "- Stay flexible by syncing your setup and loading it anywhere\n" +#~ "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "" +#~ "- Personnalisez votre expérience avec plus de profils d'impression et de plug-ins\n" +#~ "- Restez flexible en synchronisant votre configuration et en la chargeant n'importe où\n" +#~ "- Augmentez l'efficacité grâce à un flux de travail à distance sur les imprimantes Ultimaker" + +#~ msgctxt "@button" +#~ msgid "Create account" +#~ msgstr "Créer un compte" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Delete Selected Model" +#~ msgid_plural "Delete Selected Models" +#~ msgstr[0] "Supprimer le modèle sélectionné" +#~ msgstr[1] "Supprimer les modèles sélectionnés" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Center Selected Model" +#~ msgid_plural "Center Selected Models" +#~ msgstr[0] "Centrer le modèle sélectionné" +#~ msgstr[1] "Centrer les modèles sélectionnés" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Multiply Selected Model" +#~ msgid_plural "Multiply Selected Models" +#~ msgstr[0] "Multiplier le modèle sélectionné" +#~ msgstr[1] "Multiplier les modèles sélectionnés" + +#~ msgctxt "@button" +#~ msgid "Finish" +#~ msgstr "Fin" + +#~ msgctxt "@label" +#~ msgid "Ultimaker Account" +#~ msgstr "Compte Ultimaker" + +#~ msgctxt "@text" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "Votre clé pour une impression 3D connectée" + +#~ msgctxt "@text" +#~ msgid "- Customize your experience with more print profiles and plugins" +#~ msgstr "- Personnalisez votre expérience avec plus de profils d'impression et de plug-ins" + +#~ msgctxt "@text" +#~ msgid "- Stay flexible by syncing your setup and loading it anywhere" +#~ msgstr "- Restez flexible en synchronisant votre configuration et en la chargeant n'importe où" + +#~ msgctxt "@text" +#~ msgid "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "- Augmentez l'efficacité avec un flux de travail à distance sur les imprimantes Ultimaker" + +#~ msgctxt "@text" +#~ msgid "" +#~ "Please follow these steps to set up\n" +#~ "Ultimaker Cura. This will only take a few moments." +#~ msgstr "" +#~ "Veuillez suivre ces étapes pour configurer\n" +#~ "Ultimaker Cura. Cela ne prendra que quelques instants." + +#~ msgctxt "@label" +#~ msgid "What's new in Ultimaker Cura" +#~ msgstr "Quoi de neuf dans Ultimaker Cura" + #~ msgctxt "@label ({} is object name)" #~ msgid "Are you sure you wish to remove {}? This cannot be undone!" #~ msgstr "Êtes-vous sûr de vouloir supprimer l'objet {} ? Cette action est irréversible !" diff --git a/resources/i18n/fr_FR/fdmextruder.def.json.po b/resources/i18n/fr_FR/fdmextruder.def.json.po index a683a21495..88eef3e0b5 100644 --- a/resources/i18n/fr_FR/fdmextruder.def.json.po +++ b/resources/i18n/fr_FR/fdmextruder.def.json.po @@ -1,19 +1,20 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2019-03-13 14:00+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 15:16+0200\n" "Last-Translator: Bothof \n" "Language-Team: French\n" "Language: fr_FR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.4.1\n" #: fdmextruder.def.json msgctxt "machine_settings label" diff --git a/resources/i18n/fr_FR/fdmprinter.def.json.po b/resources/i18n/fr_FR/fdmprinter.def.json.po index 646c0c9af8..b9a95fdedb 100644 --- a/resources/i18n/fr_FR/fdmprinter.def.json.po +++ b/resources/i18n/fr_FR/fdmprinter.def.json.po @@ -1,20 +1,20 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2020-08-21 13:40+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 15:16+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: French , French \n" "Language: fr_FR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.6\n" +"X-Generator: Poedit 2.4.1\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -419,6 +419,26 @@ msgctxt "machine_extruders_share_heater description" msgid "Whether the extruders share a single heater rather than each extruder having its own heater." msgstr "Si les extrudeurs partagent un seul chauffage au lieu que chaque extrudeur ait son propre chauffage." +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle label" +msgid "Extruders Share Nozzle" +msgstr "Les extrudeuses partagent la buse" + +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle description" +msgid "Whether the extruders share a single nozzle rather than each extruder having its own nozzle. When set to true, it is expected that the printer-start gcode script properly sets up all extruders in an initial retraction state that is known and mutually compatible (either zero or one filament not retracted); in that case the initial retraction status is described, per extruder, by the 'machine_extruders_shared_nozzle_initial_retraction' parameter." +msgstr "Lorsque les extrudeuses partagent une seule buse au lieu que chaque extrudeuse ait sa propre buse. Lorsqu'il est défini à true, le script gcode de démarrage de l'imprimante doit configurer correctement toutes les extrudeuses dans un état de rétraction initial connu et mutuellement compatible (zéro ou un filament non rétracté) ; dans ce cas, l'état de rétraction initial est décrit, par extrudeuse, par le paramètre 'machine_extruders_shared_nozzle_initial_retraction'." + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction label" +msgid "Shared Nozzle Initial Retraction" +msgstr "Rétraction initiale de la buse partagée" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction description" +msgid "How much the filament of each extruder is assumed to have been retracted from the shared nozzle tip at the completion of the printer-start gcode script; the value should be equal to or greater than the length of the common part of the nozzle's ducts." +msgstr "La quantité de filament de chaque extrudeuse qui est supposée avoir été rétractée de l'extrémité de la buse partagée à la fin du script gcode de démarrage de l'imprimante ; la valeur doit être égale ou supérieure à la longueur de la partie commune des conduits de la buse." + #: fdmprinter.def.json msgctxt "machine_disallowed_areas label" msgid "Disallowed Areas" @@ -486,8 +506,8 @@ msgstr "Décalage avec extrudeuse" #: fdmprinter.def.json msgctxt "machine_use_extruder_offset_to_offset_coords description" -msgid "Apply the extruder offset to the coordinate system." -msgstr "Appliquer le décalage de l'extrudeuse au système de coordonnées." +msgid "Apply the extruder offset to the coordinate system. Affects all extruders." +msgstr "Appliquez le décalage de l'extrudeuse au système de coordonnées. Affecte toutes les extrudeuses." #: fdmprinter.def.json msgctxt "extruder_prime_pos_z label" @@ -881,8 +901,8 @@ msgstr "Multiplicateur de la largeur de la ligne sur la première couche. Augmen #: fdmprinter.def.json msgctxt "shell label" -msgid "Shell" -msgstr "Coque" +msgid "Walls" +msgstr "Parois" #: fdmprinter.def.json msgctxt "shell description" @@ -949,166 +969,6 @@ msgctxt "wall_0_wipe_dist description" msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better." msgstr "Distance d'un déplacement inséré après la paroi extérieure, pour mieux masquer la jointure en Z." -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr label" -msgid "Top Surface Skin Extruder" -msgstr "Extrudeuse de couche extérieure de la surface supérieure" - -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr description" -msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." -msgstr "Le train d'extrudeuse utilisé pour l'impression de la couche extérieure supérieure. Cela est utilisé en multi-extrusion." - -#: fdmprinter.def.json -msgctxt "roofing_layer_count label" -msgid "Top Surface Skin Layers" -msgstr "Couches extérieures de la surface supérieure" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count description" -msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." -msgstr "Nombre de couches extérieures supérieures. En général, une seule couche supérieure est suffisante pour générer des surfaces supérieures de qualité." - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr label" -msgid "Top/Bottom Extruder" -msgstr "Extrudeuse du dessus/dessous" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr description" -msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." -msgstr "Le train d'extrudeuse utilisé pour l'impression de la couche extérieure du haut et du bas. Cela est utilisé en multi-extrusion." - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness label" -msgid "Top/Bottom Thickness" -msgstr "Épaisseur du dessus/dessous" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness description" -msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." -msgstr "L’épaisseur des couches du dessus/dessous dans l'impression. Cette valeur divisée par la hauteur de la couche définit le nombre de couches du dessus/dessous." - -#: fdmprinter.def.json -msgctxt "top_thickness label" -msgid "Top Thickness" -msgstr "Épaisseur du dessus" - -#: fdmprinter.def.json -msgctxt "top_thickness description" -msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." -msgstr "L’épaisseur des couches du dessus dans l'impression. Cette valeur divisée par la hauteur de la couche définit le nombre de couches du dessus." - -#: fdmprinter.def.json -msgctxt "top_layers label" -msgid "Top Layers" -msgstr "Couches supérieures" - -#: fdmprinter.def.json -msgctxt "top_layers description" -msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." -msgstr "Le nombre de couches supérieures. Lorsqu'elle est calculée par l'épaisseur du dessus, cette valeur est arrondie à un nombre entier." - -#: fdmprinter.def.json -msgctxt "bottom_thickness label" -msgid "Bottom Thickness" -msgstr "Épaisseur du dessous" - -#: fdmprinter.def.json -msgctxt "bottom_thickness description" -msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." -msgstr "L’épaisseur des couches du dessous dans l'impression. Cette valeur divisée par la hauteur de la couche définit le nombre de couches du dessous." - -#: fdmprinter.def.json -msgctxt "bottom_layers label" -msgid "Bottom Layers" -msgstr "Couches inférieures" - -#: fdmprinter.def.json -msgctxt "bottom_layers description" -msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "Le nombre de couches inférieures. Lorsqu'elle est calculée par l'épaisseur du dessous, cette valeur est arrondie à un nombre entier." - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers label" -msgid "Initial Bottom Layers" -msgstr "Couches inférieures initiales" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers description" -msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "Le nombre de couches inférieures initiales à partir du haut du plateau. Lorsqu'elle est calculée par l'épaisseur du dessous, cette valeur est arrondie à un nombre entier." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern label" -msgid "Top/Bottom Pattern" -msgstr "Motif du dessus/dessous" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern description" -msgid "The pattern of the top/bottom layers." -msgstr "Le motif des couches du dessus/dessous." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option lines" -msgid "Lines" -msgstr "Lignes" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option concentric" -msgid "Concentric" -msgstr "Concentrique" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option zigzag" -msgid "Zig Zag" -msgstr "Zig Zag" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 label" -msgid "Bottom Pattern Initial Layer" -msgstr "Couche initiale du motif du dessous" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 description" -msgid "The pattern on the bottom of the print on the first layer." -msgstr "Motif au bas de l'impression sur la première couche." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option lines" -msgid "Lines" -msgstr "Lignes" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option concentric" -msgid "Concentric" -msgstr "Concentrique" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option zigzag" -msgid "Zig Zag" -msgstr "Zig Zag" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons label" -msgid "Connect Top/Bottom Polygons" -msgstr "Relier les polygones supérieurs / inférieurs" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." -msgstr "Relier les voies de couche extérieure supérieures / inférieures lorsqu'elles sont côte à côte. Pour le motif concentrique, ce paramètre réduit considérablement le temps de parcours, mais comme les liens peuvent se trouver à mi-chemin sur le remplissage, cette fonctionnalité peut réduire la qualité de la surface supérieure." - -#: fdmprinter.def.json -msgctxt "skin_angles label" -msgid "Top/Bottom Line Directions" -msgstr "Sens de la ligne du dessus / dessous" - -#: fdmprinter.def.json -msgctxt "skin_angles description" -msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." -msgstr "Une liste de sens de ligne (exprimés en nombres entiers) à utiliser lorsque les couches du haut / bas utilisent le motif en lignes ou en zig zag. Les éléments de la liste sont utilisés de manière séquentielle à mesure de l'avancement des couches. La liste reprend depuis le début lorsque la fin est atteinte. Les éléments de la liste sont séparés par des virgules et la liste entière est encadrée entre crochets. La valeur par défaut est une liste vide, ce qui signifie que les angles traditionnels par défaut seront utilisés (45 et 135 degrés)." - #: fdmprinter.def.json msgctxt "wall_0_inset label" msgid "Outer Wall Inset" @@ -1414,6 +1274,176 @@ msgctxt "z_seam_relative description" msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate." msgstr "Si cette option est activée, les coordonnées de la jointure z sont relatives au centre de chaque partie. Si elle est désactivée, les coordonnées définissent une position absolue sur le plateau." +#: fdmprinter.def.json +msgctxt "top_bottom label" +msgid "Top/Bottom" +msgstr "Haut / bas" + +#: fdmprinter.def.json +msgctxt "top_bottom description" +msgid "Top/Bottom" +msgstr "Haut / bas" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr label" +msgid "Top Surface Skin Extruder" +msgstr "Extrudeuse de couche extérieure de la surface supérieure" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr description" +msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." +msgstr "Le train d'extrudeuse utilisé pour l'impression de la couche extérieure supérieure. Cela est utilisé en multi-extrusion." + +#: fdmprinter.def.json +msgctxt "roofing_layer_count label" +msgid "Top Surface Skin Layers" +msgstr "Couches extérieures de la surface supérieure" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count description" +msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." +msgstr "Nombre de couches extérieures supérieures. En général, une seule couche supérieure est suffisante pour générer des surfaces supérieures de qualité." + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr label" +msgid "Top/Bottom Extruder" +msgstr "Extrudeuse du dessus/dessous" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr description" +msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." +msgstr "Le train d'extrudeuse utilisé pour l'impression de la couche extérieure du haut et du bas. Cela est utilisé en multi-extrusion." + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness label" +msgid "Top/Bottom Thickness" +msgstr "Épaisseur du dessus/dessous" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness description" +msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." +msgstr "L’épaisseur des couches du dessus/dessous dans l'impression. Cette valeur divisée par la hauteur de la couche définit le nombre de couches du dessus/dessous." + +#: fdmprinter.def.json +msgctxt "top_thickness label" +msgid "Top Thickness" +msgstr "Épaisseur du dessus" + +#: fdmprinter.def.json +msgctxt "top_thickness description" +msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." +msgstr "L’épaisseur des couches du dessus dans l'impression. Cette valeur divisée par la hauteur de la couche définit le nombre de couches du dessus." + +#: fdmprinter.def.json +msgctxt "top_layers label" +msgid "Top Layers" +msgstr "Couches supérieures" + +#: fdmprinter.def.json +msgctxt "top_layers description" +msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." +msgstr "Le nombre de couches supérieures. Lorsqu'elle est calculée par l'épaisseur du dessus, cette valeur est arrondie à un nombre entier." + +#: fdmprinter.def.json +msgctxt "bottom_thickness label" +msgid "Bottom Thickness" +msgstr "Épaisseur du dessous" + +#: fdmprinter.def.json +msgctxt "bottom_thickness description" +msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." +msgstr "L’épaisseur des couches du dessous dans l'impression. Cette valeur divisée par la hauteur de la couche définit le nombre de couches du dessous." + +#: fdmprinter.def.json +msgctxt "bottom_layers label" +msgid "Bottom Layers" +msgstr "Couches inférieures" + +#: fdmprinter.def.json +msgctxt "bottom_layers description" +msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "Le nombre de couches inférieures. Lorsqu'elle est calculée par l'épaisseur du dessous, cette valeur est arrondie à un nombre entier." + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "Couches inférieures initiales" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "Le nombre de couches inférieures initiales à partir du haut du plateau. Lorsqu'elle est calculée par l'épaisseur du dessous, cette valeur est arrondie à un nombre entier." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern label" +msgid "Top/Bottom Pattern" +msgstr "Motif du dessus/dessous" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern description" +msgid "The pattern of the top/bottom layers." +msgstr "Le motif des couches du dessus/dessous." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option lines" +msgid "Lines" +msgstr "Lignes" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option concentric" +msgid "Concentric" +msgstr "Concentrique" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option zigzag" +msgid "Zig Zag" +msgstr "Zig Zag" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 label" +msgid "Bottom Pattern Initial Layer" +msgstr "Couche initiale du motif du dessous" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 description" +msgid "The pattern on the bottom of the print on the first layer." +msgstr "Motif au bas de l'impression sur la première couche." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option lines" +msgid "Lines" +msgstr "Lignes" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option concentric" +msgid "Concentric" +msgstr "Concentrique" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option zigzag" +msgid "Zig Zag" +msgstr "Zig Zag" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons label" +msgid "Connect Top/Bottom Polygons" +msgstr "Relier les polygones supérieurs / inférieurs" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons description" +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "Relier les voies de couche extérieure supérieures / inférieures lorsqu'elles sont côte à côte. Pour le motif concentrique, ce paramètre réduit considérablement le temps de parcours, mais comme les liens peuvent se trouver à mi-chemin sur le remplissage, cette fonctionnalité peut réduire la qualité de la surface supérieure." + +#: fdmprinter.def.json +msgctxt "skin_angles label" +msgid "Top/Bottom Line Directions" +msgstr "Sens de la ligne du dessus / dessous" + +#: fdmprinter.def.json +msgctxt "skin_angles description" +msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." +msgstr "Une liste de sens de ligne (exprimés en nombres entiers) à utiliser lorsque les couches du haut / bas utilisent le motif en lignes ou en zig zag. Les éléments de la liste sont utilisés de manière séquentielle à mesure de l'avancement des couches. La liste reprend depuis le début lorsque la fin est atteinte. Les éléments de la liste sont séparés par des virgules et la liste entière est encadrée entre crochets. La valeur par défaut est une liste vide, ce qui signifie que les angles traditionnels par défaut seront utilisés (45 et 135 degrés)." + #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" msgid "No Skin in Z Gaps" @@ -1554,6 +1584,86 @@ msgctxt "skin_overlap_mm description" msgid "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any value over half the width of the wall may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall." msgstr "Ajuster le degré de chevauchement entre les parois et les (extrémités des) lignes centrales de la couche extérieure. Un chevauchement léger permet de relier fermement les parois à la couche extérieure. Notez que, si la largeur de la couche extérieure est égale à celle de la ligne de la paroi, une valeur supérieure à la moitié de la largeur de la paroi peut déjà faire dépasser la couche extérieure de la paroi, car dans ce cas la position de la buse de l'extrudeuse peut déjà atteindre le milieu de la paroi." +#: fdmprinter.def.json +msgctxt "skin_preshrink label" +msgid "Skin Removal Width" +msgstr "Largeur de retrait de la couche extérieure" + +#: fdmprinter.def.json +msgctxt "skin_preshrink description" +msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." +msgstr "La plus grande largeur des zones de la couche extérieure à faire disparaître. Toute zone de la couche extérieure plus étroite que cette valeur disparaîtra. Ceci peut aider à limiter le temps et la quantité de matière utilisés pour imprimer la couche extérieure supérieure/inférieure sur les surfaces obliques du modèle." + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink label" +msgid "Top Skin Removal Width" +msgstr "Largeur de retrait de la couche extérieure supérieure" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink description" +msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." +msgstr "La plus grande largeur des zones de la couche extérieure supérieure à faire disparaître. Toute zone de la couche extérieure plus étroite que cette valeur disparaîtra. Ceci peut aider à limiter le temps et la quantité de matière utilisés pour imprimer la couche extérieure supérieure sur les surfaces obliques du modèle." + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink label" +msgid "Bottom Skin Removal Width" +msgstr "Largeur de retrait de la couche extérieure inférieure" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink description" +msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." +msgstr "La plus grande largeur des zones de la couche extérieure inférieure à faire disparaître. Toute zone de la couche extérieure plus étroite que cette valeur disparaîtra. Ceci peut aider à limiter le temps et la quantité de matière utilisés pour imprimer la couche extérieure inférieure sur les surfaces obliques du modèle." + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance label" +msgid "Skin Expand Distance" +msgstr "Distance d'expansion de la couche extérieure" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance description" +msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." +msgstr "La distance à laquelle les couches extérieures s'étendent à l'intérieur du remplissage. Des valeurs élevées lient mieux la couche extérieure au motif de remplissage et font mieux adhérer à cette couche les parois des couches voisines. Des valeurs faibles économisent la quantité de matériau utilisé." + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance label" +msgid "Top Skin Expand Distance" +msgstr "Distance d'expansion de la couche extérieure supérieure" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance description" +msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." +msgstr "La distance à laquelle les couches extérieures supérieures s'étendent à l'intérieur du remplissage. Des valeurs élevées lient mieux la couche extérieure au motif de remplissage et font mieux adhérer à cette couche les parois de la couche supérieure. Des valeurs faibles économisent la quantité de matériau utilisé." + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance label" +msgid "Bottom Skin Expand Distance" +msgstr "Distance d'expansion de la couche extérieure inférieure" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance description" +msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." +msgstr "La distance à laquelle les couches extérieures inférieures s'étendent à l'intérieur du remplissage. Des valeurs élevées lient mieux la couche extérieure au motif de remplissage et font mieux adhérer à cette couche les parois de la couche inférieure. Des valeurs faibles économisent la quantité de matériau utilisé." + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion label" +msgid "Maximum Skin Angle for Expansion" +msgstr "Angle maximum de la couche extérieure pour l'expansion" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion description" +msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded." +msgstr "Les couches extérieures supérieures / inférieures des surfaces supérieures et / ou inférieures de votre objet possédant un angle supérieur à ce paramètre ne seront pas étendues. Cela permet d'éviter d'étendre les zones de couche extérieure étroites qui sont créées lorsque la surface du modèle possède une pente proche de la verticale. Un angle de 0° est horizontal et évitera l'extension des couches ; un angle de 90° est vertical et entraînera l'extension de toutes les couches." + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion label" +msgid "Minimum Skin Width for Expansion" +msgstr "Largeur minimum de la couche extérieure pour l'expansion" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion description" +msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." +msgstr "Les zones de couche extérieure plus étroites que cette valeur ne seront pas étendues. Cela permet d'éviter d'étendre les zones de couche extérieure étroites qui sont créées lorsque la surface du modèle possède une pente proche de la verticale." + #: fdmprinter.def.json msgctxt "infill label" msgid "Infill" @@ -1863,86 +1973,6 @@ msgctxt "infill_support_angle description" msgid "The minimum angle of internal overhangs for which infill is added. At a value of 0° objects are totally filled with infill, 90° will not provide any infill." msgstr "Angle minimal des porte-à-faux internes pour lesquels le remplissage est ajouté. À une valeur de 0°, les objets sont totalement remplis, 90° ne fournira aucun remplissage." -#: fdmprinter.def.json -msgctxt "skin_preshrink label" -msgid "Skin Removal Width" -msgstr "Largeur de retrait de la couche extérieure" - -#: fdmprinter.def.json -msgctxt "skin_preshrink description" -msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." -msgstr "La plus grande largeur des zones de la couche extérieure à faire disparaître. Toute zone de la couche extérieure plus étroite que cette valeur disparaîtra. Ceci peut aider à limiter le temps et la quantité de matière utilisés pour imprimer la couche extérieure supérieure/inférieure sur les surfaces obliques du modèle." - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink label" -msgid "Top Skin Removal Width" -msgstr "Largeur de retrait de la couche extérieure supérieure" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink description" -msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." -msgstr "La plus grande largeur des zones de la couche extérieure supérieure à faire disparaître. Toute zone de la couche extérieure plus étroite que cette valeur disparaîtra. Ceci peut aider à limiter le temps et la quantité de matière utilisés pour imprimer la couche extérieure supérieure sur les surfaces obliques du modèle." - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink label" -msgid "Bottom Skin Removal Width" -msgstr "Largeur de retrait de la couche extérieure inférieure" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink description" -msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." -msgstr "La plus grande largeur des zones de la couche extérieure inférieure à faire disparaître. Toute zone de la couche extérieure plus étroite que cette valeur disparaîtra. Ceci peut aider à limiter le temps et la quantité de matière utilisés pour imprimer la couche extérieure inférieure sur les surfaces obliques du modèle." - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance label" -msgid "Skin Expand Distance" -msgstr "Distance d'expansion de la couche extérieure" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance description" -msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." -msgstr "La distance à laquelle les couches extérieures s'étendent à l'intérieur du remplissage. Des valeurs élevées lient mieux la couche extérieure au motif de remplissage et font mieux adhérer à cette couche les parois des couches voisines. Des valeurs faibles économisent la quantité de matériau utilisé." - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance label" -msgid "Top Skin Expand Distance" -msgstr "Distance d'expansion de la couche extérieure supérieure" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance description" -msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." -msgstr "La distance à laquelle les couches extérieures supérieures s'étendent à l'intérieur du remplissage. Des valeurs élevées lient mieux la couche extérieure au motif de remplissage et font mieux adhérer à cette couche les parois de la couche supérieure. Des valeurs faibles économisent la quantité de matériau utilisé." - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance label" -msgid "Bottom Skin Expand Distance" -msgstr "Distance d'expansion de la couche extérieure inférieure" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance description" -msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." -msgstr "La distance à laquelle les couches extérieures inférieures s'étendent à l'intérieur du remplissage. Des valeurs élevées lient mieux la couche extérieure au motif de remplissage et font mieux adhérer à cette couche les parois de la couche inférieure. Des valeurs faibles économisent la quantité de matériau utilisé." - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion label" -msgid "Maximum Skin Angle for Expansion" -msgstr "Angle maximum de la couche extérieure pour l'expansion" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion description" -msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." -msgstr "Les couches extérieures supérieures / inférieures des surfaces supérieures et / ou inférieures de votre objet possédant un angle supérieur à ce paramètre ne seront pas étendues. Cela permet d'éviter d'étendre les zones de couche extérieure étroites qui sont créées lorsque la surface du modèle possède une pente proche de la verticale. Un angle de 0° est horizontal, et un angle de 90° est vertical." - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion label" -msgid "Minimum Skin Width for Expansion" -msgstr "Largeur minimum de la couche extérieure pour l'expansion" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion description" -msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." -msgstr "Les zones de couche extérieure plus étroites que cette valeur ne seront pas étendues. Cela permet d'éviter d'étendre les zones de couche extérieure étroites qui sont créées lorsque la surface du modèle possède une pente proche de la verticale." - #: fdmprinter.def.json msgctxt "skin_edge_support_thickness label" msgid "Skin Edge Support Thickness" @@ -2071,8 +2101,7 @@ msgstr "Température du plateau couche initiale" #: fdmprinter.def.json msgctxt "material_bed_temperature_layer_0 description" msgid "The temperature used for the heated build plate at the first layer. If this is 0, the build plate is left unheated during the first layer." -msgstr "Température utilisée pour le plateau de fabrication chauffé à la première couche. Si elle est définie sur 0, le plateau de fabrication ne sera pas chauffé" -" lors de la première couche." +msgstr "Température utilisée pour le plateau de fabrication chauffé à la première couche. Si elle est définie sur 0, le plateau de fabrication ne sera pas chauffé lors de la première couche." #: fdmprinter.def.json msgctxt "material_adhesion_tendency label" @@ -2561,8 +2590,8 @@ msgstr "Vitesse de la couche initiale" #: fdmprinter.def.json msgctxt "speed_layer_0 description" -msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." -msgstr "La vitesse de la couche initiale. Une valeur plus faible est recommandée pour améliorer l'adhérence au plateau." +msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate. Does not affect the build plate adhesion structures themselves, like brim and raft." +msgstr "La vitesse de la couche initiale. Une valeur plus faible est recommandée pour améliorer l'adhérence au plateau de fabrication. N'affecte pas les structures d'adhérence au plateau, comme la bordure et le radeau." #: fdmprinter.def.json msgctxt "speed_print_layer_0 label" @@ -3171,8 +3200,9 @@ msgstr "Distance de détour max. sans rétraction" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" -msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." -msgstr "Lorsque cette distance n'est pas nulle, les déplacements de détour qui sont plus longs que cette distance utiliseront la rétraction." +msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." +msgstr "Lorsque cette distance est supérieure à zéro, les déplacements de détour qui sont plus longs que cette distance utiliseront la rétraction. Si elle est" +" définie sur zéro, il n'y a pas de maximum et les mouvements de détour n'utiliseront pas la rétraction." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" @@ -5075,10 +5105,8 @@ msgstr "Rang de traitement du maillage" #: fdmprinter.def.json msgctxt "infill_mesh_order description" -msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." -msgstr "Détermine la priorité de cette maille lorsque plusieurs chevauchements de mailles de remplissage sont pris en considération. Les zones comportant plusieurs" -" chevauchements de mailles de remplissage prendront en compte les paramètres du maillage ayant l'ordre le plus bas. Une maille de remplissage possédant" -" un ordre plus élevé modifiera le remplissage des mailles de remplissage ayant un ordre plus bas et des mailles normales." +msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the highest rank. An infill mesh with a higher rank will modify the infill of infill meshes with lower rank and normal meshes." +msgstr "Détermine la priorité de cette maille lorsque plusieurs chevauchements de mailles de remplissage sont pris en considération. Les zones comportant plusieurs chevauchements de mailles de remplissage prendront en compte les paramètres du maillage ayant l'ordre le plus élevé. Une maille de remplissage possédant un ordre plus élevé modifiera le remplissage des mailles de remplissage ayant un ordre plus bas et des mailles normales." #: fdmprinter.def.json msgctxt "cutting_mesh label" @@ -5425,6 +5453,16 @@ msgctxt "conical_overhang_angle description" msgid "The maximum angle of overhangs after the they have been made printable. At a value of 0° all overhangs are replaced by a piece of model connected to the build plate, 90° will not change the model in any way." msgstr "L'angle maximal des porte-à-faux après qu'ils aient été rendus imprimables. À une valeur de 0°, tous les porte-à-faux sont remplacés par une pièce de modèle rattachée au plateau, tandis que 90° ne changera en rien le modèle." +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size label" +msgid "Maximum Overhang Hole Area" +msgstr "Surface maximale du trou en porte-à-faux" + +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size description" +msgid "The maximum area of a hole in the base of the model before it's removed by Make Overhang Printable. Holes smaller than this will be retained. A value of 0 mm² will fill all holes in the models base." +msgstr "Zone maximale d'un trou dans la base du modèle avant d'être retirée par l'outil Rendre le porte-à-faux imprimable. Les trous plus petits seront conservés. Une valeur de 0 mm² remplira tous les trous dans la base des modèles." + #: fdmprinter.def.json msgctxt "coasting_enable label" msgid "Enable Coasting" @@ -6364,6 +6402,30 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Matrice de transformation à appliquer au modèle lors de son chargement depuis le fichier." +#~ msgctxt "retraction_combing_max_distance description" +#~ msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." +#~ msgstr "Lorsque cette distance n'est pas nulle, les déplacements de détour qui sont plus longs que cette distance utiliseront la rétraction." + +#~ msgctxt "machine_use_extruder_offset_to_offset_coords description" +#~ msgid "Apply the extruder offset to the coordinate system." +#~ msgstr "Appliquer le décalage de l'extrudeuse au système de coordonnées." + +#~ msgctxt "shell label" +#~ msgid "Shell" +#~ msgstr "Coque" + +#~ msgctxt "max_skin_angle_for_expansion description" +#~ msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." +#~ msgstr "Les couches extérieures supérieures / inférieures des surfaces supérieures et / ou inférieures de votre objet possédant un angle supérieur à ce paramètre ne seront pas étendues. Cela permet d'éviter d'étendre les zones de couche extérieure étroites qui sont créées lorsque la surface du modèle possède une pente proche de la verticale. Un angle de 0° est horizontal, et un angle de 90° est vertical." + +#~ msgctxt "speed_layer_0 description" +#~ msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." +#~ msgstr "La vitesse de la couche initiale. Une valeur plus faible est recommandée pour améliorer l'adhérence au plateau." + +#~ msgctxt "infill_mesh_order description" +#~ msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." +#~ msgstr "Détermine la priorité de cette maille lorsque plusieurs chevauchements de mailles de remplissage sont pris en considération. Les zones comportant plusieurs chevauchements de mailles de remplissage prendront en compte les paramètres du maillage ayant l'ordre le plus bas. Une maille de remplissage possédant un ordre plus élevé modifiera le remplissage des mailles de remplissage ayant un ordre plus bas et des mailles normales." + #~ msgctxt "material_bed_temperature description" #~ msgid "The temperature used for the heated build plate. If this is 0, the bed temperature will not be adjusted." #~ msgstr "Température utilisée pour le plateau chauffant. Si elle est définie sur 0, la température du plateau ne sera pas ajustée." diff --git a/resources/i18n/hu_HU/cura.po b/resources/i18n/hu_HU/cura.po index 8d33d009f0..f21a32653d 100644 --- a/resources/i18n/hu_HU/cura.po +++ b/resources/i18n/hu_HU/cura.po @@ -1,12 +1,12 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0200\n" "PO-Revision-Date: 2020-03-24 09:36+0100\n" "Last-Translator: Nagy Attila \n" "Language-Team: ATI-SZOFT\n" @@ -20,7 +20,7 @@ msgstr "" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1581 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 msgctxt "@label" @@ -91,12 +91,12 @@ msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:226 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:234 msgctxt "@label" msgid "Custom Material" msgstr "Egyedi anyag" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:227 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 msgctxt "@label" msgid "Custom" @@ -118,7 +118,7 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Minden fájl (*)" -#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:178 +#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:181 msgctxt "@info:title" msgid "Login failed" msgstr "Sikertelen bejelentkezés" @@ -148,28 +148,33 @@ msgctxt "@info:title" msgid "Can't Find Location" msgstr "Nem találok helyet" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:104 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:116 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Nem sikerült archívumot létrehozni a felhasználói adatkönyvtárból: {}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:110 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 msgctxt "@info:title" msgid "Backup" msgstr "Biztonsági mentés" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:123 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:135 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "Megpróbált visszaállítani egy Cura biztonsági másolatot anélkül, hogy megfelelő adatok vagy meta adatok lennének." -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:134 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:146 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that is higher than the current version." msgstr "Egy olyan Cura biztonsági mentést próbált visszaállítani, amelyiknek a verziója magasabb a jelenlegitől." +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 +msgctxt "@info:backup_failed" +msgid "The following error occurred while trying to restore a Cura backup:" +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -319,74 +324,74 @@ msgctxt "@action:button" msgid "Send report" msgstr "Jelentés küldés" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:521 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:527 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Gépek betöltése ..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:528 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:534 msgctxt "@info:progress" msgid "Setting up preferences..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:657 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:672 msgctxt "@info:progress" msgid "Initializing Active Machine..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:803 msgctxt "@info:progress" msgid "Initializing machine manager..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:802 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:817 msgctxt "@info:progress" msgid "Initializing build volume..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:870 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:888 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Felület beállítása..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:906 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:924 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Interfészek betöltése..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:911 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:929 msgctxt "@info:progress" msgid "Initializing engine..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1221 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1246 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1777 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1799 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Egyszerre csak egy G-kód fájlt lehet betölteni. Az importálás kihagyva {0}" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1778 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:188 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 msgctxt "@info:title" msgid "Warning" msgstr "Figyelem" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1787 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1809 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Nem nyitható meg más fájl, ha a G-kód betöltődik. Az importálás kihagyva {0}" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 @@ -409,7 +414,7 @@ msgctxt "@info:title" msgid "Placing Object" msgstr "Tárgy elhelyezése" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:92 msgctxt "@message" msgid "Could not read response." msgstr "Nincs olvasható válasz." @@ -429,12 +434,12 @@ msgctxt "@message" msgid "Something unexpected happened when trying to log in, please try again." msgstr "Valami váratlan esemény történt a bejelentkezéskor, próbálkozzon újra." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:187 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:189 msgctxt "@info" msgid "Unable to start a new sign in process. Check if another sign in attempt is still active." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Az Ultimaker fiókkiszolgáló elérhetetlen." @@ -452,8 +457,8 @@ msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "A {0} fájl már létezik. Biztosan szeretnéd, hogy felülírjuk?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:452 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:455 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "Érvénytelen fájl URL:" @@ -536,33 +541,33 @@ msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "A(z) {0} profil ismeretlen fájltípusú vagy sérült." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:423 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:426 msgctxt "@label" msgid "Custom profile" msgstr "Egyedi profil" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:439 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:442 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Hiányzik a profil minőségi típusa." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:443 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:446 msgctxt "@info:status" -msgid "Global stack is missing." +msgid "There is no active printer yet." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:449 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:452 msgctxt "@info:status" msgid "Unable to add the profile." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:463 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:466 #, python-brace-format msgctxt "@info:status" msgid "Quality type '{0}' is not compatible with the current active machine definition '{1}'." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:468 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:471 #, python-brace-format msgctxt "@info:status" msgid "Warning: The profile is not visible because its quality type '{0}' is not available for the current configuration. Switch to a material/nozzle combination that can use this quality type." @@ -578,23 +583,23 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:712 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 msgctxt "@label" msgid "Nozzle" msgstr "Fúvóka" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:860 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:856 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "A beállításokat megváltoztattuk, hogy azok megfeleljenek az jelenleg elérhető extrudereknek:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:862 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:858 msgctxt "@info:title" msgid "Settings updated" msgstr "Beállítások frissítve" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1447 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1478 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extruder(ek) kikapcsolva" @@ -607,13 +612,13 @@ msgid "Add" msgstr "Hozzáad" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:263 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 msgctxt "@action:button" msgid "Finish" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 #: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 #: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 @@ -621,7 +626,7 @@ msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 msgctxt "@action:button" msgid "Cancel" @@ -633,76 +638,83 @@ msgctxt "@label" msgid "Group #{group_nr}" msgstr "Csoport #{group_nr}" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Külső fal" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Belső falak" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Héj" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Kitöltés" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Támasz kitöltés" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Támasz interface" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Támasz" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Szoknya" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 msgctxt "@tooltip" msgid "Prime Tower" msgstr "Elsődleges torony" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 msgctxt "@tooltip" msgid "Travel" msgstr "Átmozgás" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 msgctxt "@tooltip" msgid "Retractions" msgstr "Visszahúzás" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:94 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 msgctxt "@tooltip" msgid "Other" msgstr "Egyéb" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 msgctxt "@action:button" msgid "Next" msgstr "Következő" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 +msgctxt "@action:button" +msgid "Skip" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:173 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 msgctxt "@action:button" msgid "Close" @@ -727,29 +739,36 @@ msgstr "" "

    Itt Megtudhatja, hogyan lehet a lehető legjobb nyomtatási minőséget és megbízhatóságot biztosítani.

    \n" "

    View print quality guide

    " -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:535 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:540 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "A projekt fájl {0} egy ismeretlen {1} géptípust tartalmaz.Gépet nem lehet importálni. Importálj helyette modelleket." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:538 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:543 msgctxt "@info:title" msgid "Open Project File" msgstr "Projekt fájl megnyitása" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:634 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:639 #, python-brace-format msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:635 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:686 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:646 +#, python-brace-format +msgctxt "@info:error Don't translate the XML tags or !" +msgid "Project file {0} is corrupt: {1}." +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:698 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." @@ -787,7 +806,7 @@ msgctxt "@error:zip" msgid "The operating system does not allow saving a project file to this location or with this file name." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:206 msgctxt "@error:zip" msgid "Error writing 3mf file." msgstr "Hiba a 3mf fájl írásakor." @@ -842,8 +861,8 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:23 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "Hiba történt a biztonsági másolat visszaállításakor." @@ -853,45 +872,45 @@ msgctxt "@item:inmenu" msgid "Manage backups" msgstr "Bitonsági mentések kezelése" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Nem lehet szeletelni a jelenlegi alapanyaggal, mert nem kompatibilis a kiválasztott nyomtatóval, vagy a beállításaival." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:411 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:420 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:429 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 msgctxt "@info:title" msgid "Unable to slice" msgstr "Nem lehet szeletelni" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:412 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Nem lehet szeletelni ezekkel a beállításokkal. Ezek a beállítások okoznak hibát: {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:410 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:436 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Nem lehet szeletelni pár modell beállítás miatt. A következő beállításokokoznak hibát egy vagy több modellnél: {error_labels}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:445 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "Nem lehet szeletelni, mert az elsődleges torony, vagy az elsődleges pozíció érvénytelen." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:428 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:454 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "Nem lehet szeletelni, mert vannak olyan objektumok, amelyek a letiltott Extruderhez vannak társítva.%s." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:463 msgctxt "@info:status" msgid "" "Please review settings and check if your models:\n" @@ -1156,28 +1175,28 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Cserélhető meghajtó" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:121 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:128 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:129 msgctxt "@info:title" msgid "Simulation View" msgstr "Szimuláció nézet" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:status" msgid "Nothing is shown because you need to slice first." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:title" msgid "No layers to show" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:124 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "" @@ -1187,14 +1206,19 @@ msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Réteg nézet" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:70 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:71 msgctxt "@info:status" -msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." +msgid "The highlighted areas indicate either missing or extraneous surfaces. Fix your model and open it again into Cura." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 msgctxt "@info:title" -msgid "Model errors" +msgid "Model Errors" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:79 +msgctxt "@action:button" +msgid "Learn more" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/__init__.py:12 @@ -1223,7 +1247,7 @@ msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:145 msgctxt "@action:button" msgid "Sync" msgstr "" @@ -1259,7 +1283,7 @@ msgctxt "@info:generic" msgid "You need to quit and restart {} before changes have effect." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:79 msgctxt "@info:generic" msgid "{} plugins failed to download" msgstr "" @@ -1300,7 +1324,11 @@ msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimaker formátumcsomag" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "" @@ -1315,22 +1343,22 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Válassz frissítést" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:152 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 msgctxt "@action:button" msgid "Print via cloud" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:155 msgctxt "@properties:tooltip" msgid "Print via cloud" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:156 msgctxt "@info:status" msgid "Connected via cloud" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:264 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:270 #, python-brace-format msgctxt "@error:send" msgid "Unknown error code when uploading print job: {0}" @@ -1622,82 +1650,82 @@ msgctxt "@info:tooltip" msgid "Some things could be problematic in this print. Click to see tips for adjustment." msgstr "Néhány dolog problémát jelenthet ebben a nyomtatásban.Kattintson ide a beállítási tippek megtekintéséhez." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:15 msgctxt "@title:window" msgid "Open Project" msgstr "Projekt megnyitása" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:63 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "Összegzés - Cura Project" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 msgctxt "@action:label" msgid "Printer settings" msgstr "Nyomtató beállítások" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:112 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:113 msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "Hogyan lehet megoldani a gépet érintő konfliktust?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:165 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 msgctxt "@action:label" msgid "Type" msgstr "Típus" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:181 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 msgctxt "@action:label" msgid "Printer Group" msgstr "Nyomtató csoport" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:203 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 msgctxt "@action:label" msgid "Profile settings" msgstr "Profil beállítások" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:219 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:221 msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "Hogyan lehet megoldani a profilt érintő konfliktust?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:349 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 msgctxt "@action:label" msgid "Name" msgstr "Név" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:255 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 msgctxt "@action:label" msgid "Intent" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:271 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Not in profile" msgstr "Nincs a profilban" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:276 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 msgctxt "@action:label" msgid "%1 override" @@ -1705,54 +1733,54 @@ msgid_plural "%1 overrides" msgstr[0] "%1 felülírás" msgstr[1] "%1 felülírás" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:287 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:290 msgctxt "@action:label" msgid "Derivative from" msgstr "Származék" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:295 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 felülírás" msgstr[1] "%1, %2 felülírás" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:309 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:312 msgctxt "@action:label" msgid "Material settings" msgstr "Alapanyag beállítások" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:328 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Hogyan lehet megoldani az alapanyaggal kapcsolatos konfliktust?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:369 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:373 msgctxt "@action:label" msgid "Setting visibility" msgstr "Beállítások láthatósága" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:378 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:382 msgctxt "@action:label" msgid "Mode" msgstr "Mód" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:label" msgid "Visible settings:" msgstr "Látható beállítások:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:399 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:403 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 %2 -ből" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:425 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:429 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "A projekt betöltésekor minden modell törlődik a tárgyasztalról." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:457 msgctxt "@action:button" msgid "Open" msgstr "Megnyitás" @@ -1854,8 +1882,8 @@ msgstr "A Cura beállítások biztonsági mentése és szinkronizálása." #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:68 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:125 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:199 msgctxt "@button" msgid "Sign in" msgstr "Bejelentkezés" @@ -2089,12 +2117,12 @@ msgctxt "@label" msgid "Cooling Fan Number" msgstr "Hűtőventilátorok száma" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:163 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "Extruder G-kód kezdés" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:177 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "Extruder G-kód zárás" @@ -2179,12 +2207,17 @@ msgctxt "@label" msgid "Number of Extruders" msgstr "Extruderek száma" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:345 +msgctxt "@label" +msgid "Apply Extruder offsets to GCode" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:393 msgctxt "@title:label" msgid "Start G-code" msgstr "G-kód kezdés" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:385 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:404 msgctxt "@title:label" msgid "End G-code" msgstr "G-kód zárás" @@ -2212,6 +2245,11 @@ msgctxt "@label link to technical assistance" msgid "View user manuals online" msgstr "Nézd meg az online felhasználói kézikönyvet" +#: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 +msgctxt "@info" +msgid "In order to monitor your print from Cura, please connect the printer." +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" msgid "Mesh Type" @@ -2258,7 +2296,7 @@ msgid "Select Settings to Customize for this model" msgstr "A modellek egyéni beállításainak kiválasztása" #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 msgctxt "@label:textbox" msgid "Filter..." msgstr "Szűrés..." @@ -2268,32 +2306,32 @@ msgctxt "@label:checkbox" msgid "Show all" msgstr "Mindent mutat" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:20 msgctxt "@title:window" msgid "Post Processing Plugin" msgstr "Utó művelet beépülő" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:59 msgctxt "@label" msgid "Post Processing Scripts" msgstr "Utó művelet szkript" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:235 msgctxt "@action" msgid "Add a script" msgstr "Adjon hozzá egy szkriptet" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:282 msgctxt "@label" msgid "Settings" msgstr "Beállítások" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:499 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:502 msgctxt "@info:tooltip" msgid "Change active post-processing scripts." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:506 msgctxt "@info:tooltip" msgid "The following script is active:" msgid_plural "The following scripts are active:" @@ -2306,78 +2344,93 @@ msgctxt "@label" msgid "Color scheme" msgstr "Szín séma" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:110 msgctxt "@label:listbox" msgid "Material Color" msgstr "Alapanyag szín" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:111 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:114 msgctxt "@label:listbox" msgid "Line Type" msgstr "Vonal típus" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:115 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:118 msgctxt "@label:listbox" msgid "Speed" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:122 msgctxt "@label:listbox" -msgid "Layer thickness" -msgstr "Réteg vastagság" +msgid "Layer Thickness" +msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:126 +msgctxt "@label:listbox" +msgid "Line Width" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 +msgctxt "@label:listbox" +msgid "Flow" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" msgid "Compatibility Mode" msgstr "Kompatibilis mód" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:230 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:245 msgctxt "@label" msgid "Travels" msgstr "Átmozgás" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:251 msgctxt "@label" msgid "Helpers" msgstr "Segítők" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:257 msgctxt "@label" msgid "Shell" msgstr "Héj" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:248 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 msgctxt "@label" msgid "Infill" msgstr "Kitöltés" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:298 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:271 +msgctxt "@label" +msgid "Starts" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 msgctxt "@label" msgid "Only Show Top Layers" msgstr "Csak a felső rétegek megjelenítése" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:308 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:332 msgctxt "@label" msgid "Show 5 Detailed Layers On Top" msgstr "Mutasson 5 felső réteget részletesen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:346 msgctxt "@label" msgid "Top / Bottom" msgstr "Felső / Alsó" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:350 msgctxt "@label" msgid "Inner Wall" msgstr "Belső fal" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:384 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:419 msgctxt "@label" msgid "min" msgstr "min" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:433 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:488 msgctxt "@label" msgid "max" msgstr "max" @@ -2518,7 +2571,7 @@ msgid "Plugins" msgstr "Kiegészítők" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 msgctxt "@title:tab" msgid "Materials" @@ -2567,6 +2620,7 @@ msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:178 msgctxt "@button" msgid "Next" msgstr "Következő" @@ -2910,7 +2964,7 @@ msgid "Delete" msgstr "Törlés" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:289 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 msgctxt "@label" msgid "Resume" msgstr "Folytat" @@ -2926,8 +2980,8 @@ msgid "Resuming..." msgstr "Folytatás..." #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 msgctxt "@label" msgid "Pause" msgstr "Várakozás" @@ -2968,7 +3022,7 @@ msgid "Are you sure you want to abort %1?" msgstr "Biztosan meg akarod szakítani %1?" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 msgctxt "@window:title" msgid "Abort print" msgstr "Nyomtatás megszakítás" @@ -2979,7 +3033,7 @@ msgid "Manage printer" msgstr "Nyomtató kezelés" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." @@ -3005,27 +3059,34 @@ msgctxt "@label:status" msgid "Idle" msgstr "Készenlét" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:365 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +msgctxt "@label:status" +msgid "Preparing..." +msgstr "Előkészítés..." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:369 msgctxt "@label:status" msgid "Printing" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:406 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:410 msgctxt "@label" msgid "Untitled" msgstr "Felirat nélküli" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:431 msgctxt "@label" msgid "Anonymous" msgstr "Névtelen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:458 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "A konfiguráció változtatásokat igényel" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:492 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:496 msgctxt "@action:button" msgid "Details" msgstr "Részletek" @@ -3052,12 +3113,6 @@ msgctxt "@label:status" msgid "Finished" msgstr "Befejezve" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -msgctxt "@label:status" -msgid "Preparing..." -msgstr "Előkészítés..." - #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." @@ -3138,24 +3193,24 @@ msgctxt "@action:button" msgid "Sign in" msgstr "Bejelentkezés" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" -msgid "Your key to connected 3D printing" +msgid "Sign in to the Ultimaker platform" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:42 msgctxt "@text" msgid "" -"- Customize your experience with more print profiles and plugins\n" -"- Stay flexible by syncing your setup and loading it anywhere\n" -"- Increase efficiency with a remote workflow on Ultimaker printers" +"- Add material profiles and plug-ins from the Marketplace\n" +"- Back-up and sync your material profiles and plug-ins\n" +"- Share ideas and get help from 48,000+ users in the Ultimaker community" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:142 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:62 msgctxt "@button" -msgid "Create account" -msgstr "Fiók létrehozása" +msgid "Create a free Ultimaker account" +msgstr "" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/SyncState.qml:28 msgctxt "@label" @@ -3262,309 +3317,308 @@ msgctxt "@button" msgid "Cancel" msgstr "Elvet" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:83 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Mutassa az online hibaelhárítási útmutatót" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:90 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Teljes képernyőre váltás" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:98 msgctxt "@action:inmenu" msgid "Exit Full Screen" msgstr "Kilépés a teljes képernyőn" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:105 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Visszavon" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:115 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Újra" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:125 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "Kilép" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:132 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:133 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "3D nézet" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:140 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Előlnézet" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:147 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Felülnézet" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 +msgctxt "@action:inmenu menubar:view" +msgid "Bottom View" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Bal oldalnézet" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:160 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:168 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Jobb oldalnézet" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:175 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Cura beállítása..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:182 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Nyomtató hozzáadása..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:180 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:188 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Nyomtatók kezelése..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:187 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Anyagok kezelése..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu" msgid "Add more materials from Marketplace" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "Profil &frissítése a jelenlegi beállításokkal/felülírásokkal" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Jelenlegi változtatások eldobása" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:222 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:230 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "Profil &létrehozása a jelenlegi beállításokkal/felülírásokkal..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Profilok kezelése..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Online &Dokumentumok megjelenítése" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Hibajelentés" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:260 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Újdonságok" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:266 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Rólunk..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:273 msgctxt "@action:inmenu menubar:edit" -msgid "Delete Selected Model" -msgid_plural "Delete Selected Models" -msgstr[0] "Kiválasztott modell törlése" -msgstr[1] "Kiválasztott modellek törlése" +msgid "Delete Selected" +msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:283 msgctxt "@action:inmenu menubar:edit" -msgid "Center Selected Model" -msgid_plural "Center Selected Models" -msgstr[0] "A kijelölt modellt középre" -msgstr[1] "A kijelölt modelleket középre" +msgid "Center Selected" +msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:292 msgctxt "@action:inmenu menubar:edit" -msgid "Multiply Selected Model" -msgid_plural "Multiply Selected Models" -msgstr[0] "A kijelölt modell többszörözése" -msgstr[1] "A kijelölt modellek többszörözése" +msgid "Multiply Selected" +msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Modell törlés" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:309 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "&Középső modell a platformon" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:307 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "&Csoportosítás" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:327 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:335 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Csoport bontása" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:345 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "&Modellek keverése" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:347 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:355 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Modell többszörözés..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:362 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Mindent kijelöl" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:372 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Tárgyasztal törlése" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:382 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Mindent újratölt" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Minden modell elrendezése a tárgyasztalon" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:390 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Minden modell rendezése" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:406 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Kijelöltek rendezése" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:405 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:413 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Minden modellpozíció visszaállítása" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:412 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Minden modelltranszformáció visszaállítása" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:419 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:429 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "Fájl(ok) megnyitása..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:439 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "Új projekt..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:434 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:446 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Konfigurációs mappa megjelenítése" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:441 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:538 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Beállítások láthatóságának beállítása..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:448 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:460 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Piactér" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:257 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Ez a csomag újraindítás után fog települni." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 msgctxt "@title:tab" msgid "General" msgstr "Általános" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:462 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:453 msgctxt "@title:tab" msgid "Settings" msgstr "Beállítások" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:464 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 msgctxt "@title:tab" msgid "Printers" msgstr "Nyomtatók" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 msgctxt "@title:tab" msgid "Profiles" msgstr "Profilok" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:576 msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:588 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:638 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Fájl(ok) megnyitása" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:744 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:737 msgctxt "@window:title" msgid "Install Package" msgstr "Csomag telepítése" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:752 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:745 msgctxt "@title:window" msgid "Open File(s)" msgstr "Fájl(ok) megnyitása" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:755 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:748 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "A kiválasztott fájlok között több G-kód fájl is található.Egyszerre csak egy G-kód fájlt nyithat meg, ezért csak egy ilyen fájlt válasszon ki." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:858 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:857 msgctxt "@title:window" msgid "Add Printer" msgstr "Nyomtató hozzáadása" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:866 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:865 msgctxt "@title:window" msgid "What's New" msgstr "Újdonságok" @@ -3712,17 +3766,27 @@ msgctxt "@label" msgid "Python bindings for libnest2d" msgstr "" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +msgctxt "@label" +msgid "Support library for system keyring access" +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" +msgid "Python extensions for Microsoft Windows" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +msgctxt "@label" msgid "Font" msgstr "Betűtípus" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 msgctxt "@label" msgid "SVG icons" msgstr "SVG ikonok" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:165 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Linux kereszt-disztribúciós alkalmazás telepítése" @@ -3732,22 +3796,22 @@ msgctxt "@title:window" msgid "Open project file" msgstr "Projekt fájl megnyitása" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:88 msgctxt "@text:window" msgid "This is a Cura project file. Would you like to open it as a project or import the models from it?" msgstr "Ez egy Cura projekt fájl. Szeretné projektként megnyitni, vagy importálni a modelleket?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:98 msgctxt "@text:window" msgid "Remember my choice" msgstr "Emlékezzen a választásra" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:122 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:117 msgctxt "@action:button" msgid "Open as project" msgstr "Megnyitás projektként" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:131 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:126 msgctxt "@action:button" msgid "Import models" msgstr "Modellek importálása" @@ -3776,7 +3840,7 @@ msgid "Current changes" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Mindig kérdezz" @@ -3801,12 +3865,12 @@ msgctxt "@action:button" msgid "Keep changes" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 msgctxt "@text:window" msgid "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?" msgstr "Egy vagy több projekt fájlt találtunk a kiválasztott fájlokban.Egyszerre csak egy projekt fájlt nyithat meg. Javasoljuk, hogy csak a modelleket importálja ezekből a fájlokból. Szeretné folytatni?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:99 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:94 msgctxt "@action:button" msgid "Import all as models" msgstr "Importáljunk mindent modellekként" @@ -3961,7 +4025,7 @@ msgctxt "@label" msgid "Material" msgstr "Alapanyag" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:407 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Használj ragasztót a jobb tapadás érdekében, ennél az alapanyag kombinációnál." @@ -3985,17 +4049,17 @@ msgctxt "@label" msgid "Number of Copies" msgstr "Másolatok száma" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:33 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:41 msgctxt "@title:menu menubar:file" msgid "&Save Project..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:54 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:74 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:85 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Kiválasztás exportálása..." @@ -4015,6 +4079,11 @@ msgctxt "@label:category menu label" msgid "Generic" msgstr "Generikus" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/OpenFilesMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Open File(s)..." +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -4030,6 +4099,11 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Legutóbbi fájlok" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SaveProjectMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Save Project..." +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:15 msgctxt "@title:menu menubar:settings" msgid "&Printer" @@ -4055,17 +4129,17 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Extruder letiltása" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:16 msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Láthatósági beállítások" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:45 msgctxt "@action:inmenu" msgid "Collapse All Categories" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Beállítások láthatóságának kezelése..." @@ -4075,22 +4149,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Kamera helyzet" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:45 msgctxt "@action:inmenu menubar:view" msgid "Camera view" msgstr "Kamera nézet" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:48 msgctxt "@action:inmenu menubar:view" msgid "Perspective" msgstr "Perspektívikus" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:60 msgctxt "@action:inmenu menubar:view" msgid "Orthographic" msgstr "Merőleges" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:81 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "&Tárgyasztal" @@ -4135,12 +4209,12 @@ msgctxt "@label:MonitorStatus" msgid "Please remove the print" msgstr "Távolítsa el a tárgyat" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@label" msgid "Abort Print" msgstr "Nyomtatás megszakítás" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:338 msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Biztosan meg akarod szakítani a nyomtatást?" @@ -4182,301 +4256,301 @@ msgctxt "@label" msgid "Interface" msgstr "Interfész" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:216 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:209 msgctxt "@label" msgid "Currency:" msgstr "Pénznem:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:229 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:222 msgctxt "@label" msgid "Theme:" msgstr "Téma:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "A módosítások érvénybe lépéséhez újra kell indítania az alkalmazást." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:284 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Automatikus újraszeletelés, ha a beállítások megváltoznak." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 msgctxt "@option:check" msgid "Slice automatically" msgstr "Automatikus szeletelés" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:306 msgctxt "@label" msgid "Viewport behavior" msgstr "A nézetablak viselkedése" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:314 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Jelölje meg pirossal azokat a területeket, amiket szükséges alátámasztani.Ha ezeket a részeket nem támasztjuk alá, a nyomtatás nem lesz hibátlan." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:323 msgctxt "@option:check" msgid "Display overhang" msgstr "Túlnyúlás kijelzése" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:351 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@info:tooltip" msgid "Highlight missing or extraneous surfaces of the model using warning signs. The toolpaths will often be missing parts of the intended geometry." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:342 msgctxt "@option:check" msgid "Display model errors" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "A kamerát úgy mozgatja, hogy a modell kiválasztásakor, az a nézet középpontjában legyen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:373 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Kamera középre, mikor az elem ki van választva" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Megfordítsuk-e az alapértelmezett Zoom viselkedését?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:388 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Fordítsa meg a kamera zoom irányát." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "A nagyítás az egér mozgatásának irányában mozogjon?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "Az egér felé történő nagyítás ortográfiai szempontból nem támogatott." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:409 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Nagyítás az egér mozgás irányában" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:435 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:417 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Az alapsíkon lévő modelleket elmozgassuk úgy, hogy ne keresztezzék egymást?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:440 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:422 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "A modellek egymástól való távtartásának biztosítása" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:431 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "A modelleket mozgatni kell lefelé, hogy érintsék a tárgyasztalt?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:436 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Modellek automatikus tárgyasztalra illesztése" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:448 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Figyelmeztető üzenet megjelenítése g-kód olvasóban." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:457 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Figyelmeztető üzenet a g-code olvasóban" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Kényszerítsük a réteget kompatibilitási módba ?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "A rétegnézet kompatibilis módjának kényszerítése (újraindítás szükséges)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:498 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:485 msgctxt "@option:check" msgid "Restore window position on start" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:513 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Milyen fípusú fényképezőgépet használunk?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:502 msgctxt "@window:text" msgid "Camera rendering:" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:531 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:509 msgid "Perspective" msgstr "Perspetívikus" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:532 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgid "Orthographic" msgstr "Merőleges" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:563 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:548 msgctxt "@label" msgid "Opening and saving files" msgstr "Fájlok megnyitása és mentése" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:555 msgctxt "@info:tooltip" msgid "Should opening files from the desktop or external applications open in the same instance of Cura?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@option:check" msgid "Use a single instance of Cura" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "A modelleket átméretezzük a maximális építési méretre, ha azok túl nagyok?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@option:check" msgid "Scale large models" msgstr "Nagy modellek átméretezése" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Egy adott modell rendkívül kicsinek tűnhet, ha mértékegysége például méterben van, nem pedig milliméterben. Ezeket a modelleket átméretezzük?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Extrém kicsi modellek átméretezése" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Betöltés után a modellek legyenek kiválasztva?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Modell kiválasztása betöltés után" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "A nyomtató nevét, mint előtagot, hozzáadjuk a nyomtatási feladat nevéhez?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:635 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Gépnév előtagként a feladatnévben" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:645 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Mutassuk az összegzést a projekt mentésekor?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:649 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:634 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Összegzés megjelenítése projekt mentésekor" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:659 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:644 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Alapértelmezett viselkedés a projektfájl megnyitásakor" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:652 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Alapértelmezett viselkedés a projektfájl megnyitásakor: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Mindig kérdezz" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:682 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Projektként való megnyitás" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:668 msgctxt "@option:openProject" msgid "Always import models" msgstr "Importálja a modelleket" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:705 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Ha módosított egy profilt, és váltott egy másikra, akkor megjelenik egy párbeszédpanel, amelyben megkérdezi, hogy meg kívánja-e tartani a módosításokat, vagy nem. Vagy választhat egy alapértelmezett viselkedést, és soha többé nem jeleníti meg ezt a párbeszédablakot." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:728 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Profilok" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Alapértelmezett viselkedés a megváltozott beállítási értékeknél, ha másik profilra vált: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:748 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:734 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Megváltozott beállítások elvetése" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:749 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:735 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Megváltozott beállítások alkalmazása az új profilba" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:783 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@label" msgid "Privacy" msgstr "Magán" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:790 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:777 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "A Cura-nak ellenőriznie kell-e a frissítéseket a program indításakor?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:795 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:782 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Keressen frissítéseket az induláskor" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:805 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:792 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Elküldjük a nyomtatott adatokat név nélkül az Ultimaker-nek?Semmilyen személyes infromáció, IP cím vagy azonosító nem kerül elküldésre." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:810 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:797 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Név nélküli információ küldés" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:819 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:806 msgctxt "@action:button" msgid "More information" msgstr "Több információ" @@ -4516,55 +4590,65 @@ msgctxt "@action:button" msgid "Export" msgstr "Export" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 +msgctxt "@action:button Sending materials to printers" +msgid "Sync with Printers" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" msgid "Printer" msgstr "Nyomtató" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:298 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Eltávolítás megerősítése" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:301 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Biztosan el akarod távolítani %1 -et? Ez nem vonható vissza!" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 msgctxt "@title:window" msgid "Import Material" msgstr "Alapanyag importálás" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:338 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Nem sikerült importálni az alapanyagot %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:328 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:342 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Sikeres alapanyag import %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:346 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 msgctxt "@title:window" msgid "Export Material" msgstr "Alapanyag export" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:358 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:372 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Sikertelen alapanyag export %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:378 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Sikeres alapanyag export %1 -ba" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 +msgctxt "@title:window" +msgid "Export All Materials" +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" @@ -4676,53 +4760,53 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Adjon nevet ehhez a profilhoz." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Profil másolása" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@title:window" msgid "Rename Profile" msgstr "Profil átnevezés" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:307 msgctxt "@title:window" msgid "Import Profile" msgstr "Profil importálás" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:336 msgctxt "@title:window" msgid "Export Profile" msgstr "Profil exportálás" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:399 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Nyomtató: %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:557 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Frissítse a profilt az aktuális beállításokkal/felülbírálásokkal" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 msgctxt "@action:button" msgid "Discard current changes" msgstr "A jelenlegi változások elvetése" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:583 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Ez a profil a nyomtató által megadott alapértelmezéseket használja, tehát az alábbi listában nincs egyetlen beállítás módosítás sem." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:591 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Az Ön aktuális beállításai megegyeznek a kiválasztott profillal." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:609 msgctxt "@title:tab" msgid "Global Settings" msgstr "Általános beállítások" @@ -4752,12 +4836,12 @@ msgctxt "@title:column" msgid "Unit" msgstr "Egység" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:16 msgctxt "@title:tab" msgid "Setting Visibility" msgstr "Láthatóság beállítása" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:48 msgctxt "@label:textbox" msgid "Check all" msgstr "Mindent ellenőrizni" @@ -5095,27 +5179,27 @@ msgctxt "@label:textbox" msgid "Search settings" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:456 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:468 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Értékek másolása minden extruderre" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:477 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Minden változott érték másolása minden extruderre" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:502 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:514 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Beállítás elrejtése" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:515 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:527 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Ne jelenítsd meg ezt a beállítást" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:531 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Beállítás látható marad" @@ -5175,11 +5259,6 @@ msgctxt "@button" msgid "Add printer manually" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddCloudPrintersView.qml:218 -msgctxt "@button" -msgid "Finish" -msgstr "Befejezés" - #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:230 msgctxt "@label" msgid "Manufacturer" @@ -5286,32 +5365,32 @@ msgctxt "@button" msgid "Connect" msgstr "Csatlakozás" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:43 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" -msgid "Ultimaker Account" +msgid "Release Notes" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:124 msgctxt "@text" -msgid "Your key to connected 3D printing" +msgid "Add material settings and plugins from the Marketplace" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:101 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:154 msgctxt "@text" -msgid "- Customize your experience with more print profiles and plugins" +msgid "Backup and sync your material settings and plugins" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:184 msgctxt "@text" -msgid "- Stay flexible by syncing your setup and loading it anywhere" +msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:217 msgctxt "@text" -msgid "- Increase efficiency with a remote workflow on Ultimaker printers" +msgid "Create a free Ultimaker Account" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:230 msgctxt "@button" msgid "Skip" msgstr "" @@ -5371,29 +5450,30 @@ msgctxt "@button" msgid "Decline and close" msgstr "Elutasítás és bezárás" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:29 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" msgid "Welcome to Ultimaker Cura" msgstr "Üdvözöljük az Ultimaker Cura-ban" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:68 msgctxt "@text" -msgid "" -"Please follow these steps to set up\n" -"Ultimaker Cura. This will only take a few moments." +msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." msgstr "" -"Kéjük, kövesd a következő lépéseket\n" -"az Ultimaker Cura beállításához. Pár pillanat az egész." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:86 msgctxt "@button" msgid "Get started" msgstr "Kezdj hozzá" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:28 msgctxt "@label" -msgid "What's new in Ultimaker Cura" -msgstr "Újdonságok az Ultimaker Cura-ban" +msgid "What's New" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Widgets/ComboBox.qml:24 +msgctxt "@label" +msgid "No items to select from" +msgstr "" #: ModelChecker/plugin.json msgctxt "description" @@ -5475,6 +5555,16 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura profil író" +#: DigitalLibrary/plugin.json +msgctxt "description" +msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." +msgstr "" + +#: DigitalLibrary/plugin.json +msgctxt "name" +msgid "Ultimaker Digital Library" +msgstr "" + #: FirmwareUpdateChecker/plugin.json msgctxt "description" msgid "Checks for firmware updates." @@ -5945,6 +6035,26 @@ msgctxt "name" msgid "Version Upgrade 4.7 to 4.8" msgstr "" +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." +msgstr "" + +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.8 to 4.9" +msgstr "" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." +msgstr "" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.9 to 4.10" +msgstr "" + #: X3DReader/plugin.json msgctxt "description" msgid "Provides support for reading X3D files." @@ -5975,6 +6085,48 @@ msgctxt "name" msgid "X-Ray View" msgstr "Röntgen nézet" +#~ msgctxt "@label:listbox" +#~ msgid "Layer thickness" +#~ msgstr "Réteg vastagság" + +#~ msgctxt "@button" +#~ msgid "Create account" +#~ msgstr "Fiók létrehozása" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Delete Selected Model" +#~ msgid_plural "Delete Selected Models" +#~ msgstr[0] "Kiválasztott modell törlése" +#~ msgstr[1] "Kiválasztott modellek törlése" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Center Selected Model" +#~ msgid_plural "Center Selected Models" +#~ msgstr[0] "A kijelölt modellt középre" +#~ msgstr[1] "A kijelölt modelleket középre" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Multiply Selected Model" +#~ msgid_plural "Multiply Selected Models" +#~ msgstr[0] "A kijelölt modell többszörözése" +#~ msgstr[1] "A kijelölt modellek többszörözése" + +#~ msgctxt "@button" +#~ msgid "Finish" +#~ msgstr "Befejezés" + +#~ msgctxt "@text" +#~ msgid "" +#~ "Please follow these steps to set up\n" +#~ "Ultimaker Cura. This will only take a few moments." +#~ msgstr "" +#~ "Kéjük, kövesd a következő lépéseket\n" +#~ "az Ultimaker Cura beállításához. Pár pillanat az egész." + +#~ msgctxt "@label" +#~ msgid "What's new in Ultimaker Cura" +#~ msgstr "Újdonságok az Ultimaker Cura-ban" + #~ msgctxt "@info:status" #~ msgid "The selected model was too small to load." #~ msgstr "A kiválasztott tárgy túl kicsi volt a betöltéshez." diff --git a/resources/i18n/hu_HU/fdmextruder.def.json.po b/resources/i18n/hu_HU/fdmextruder.def.json.po index 572a2d163d..a1638741a5 100644 --- a/resources/i18n/hu_HU/fdmextruder.def.json.po +++ b/resources/i18n/hu_HU/fdmextruder.def.json.po @@ -1,12 +1,12 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" "PO-Revision-Date: 2020-03-24 09:27+0100\n" "Last-Translator: Nagy Attila \n" "Language-Team: AT-VLOG\n" diff --git a/resources/i18n/hu_HU/fdmprinter.def.json.po b/resources/i18n/hu_HU/fdmprinter.def.json.po index 7498ce78b9..6720c0c58d 100644 --- a/resources/i18n/hu_HU/fdmprinter.def.json.po +++ b/resources/i18n/hu_HU/fdmprinter.def.json.po @@ -1,12 +1,12 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" "PO-Revision-Date: 2020-03-24 09:43+0100\n" "Last-Translator: Nagy Attila \n" "Language-Team: AT-VLOG\n" @@ -420,6 +420,26 @@ msgctxt "machine_extruders_share_heater description" msgid "Whether the extruders share a single heater rather than each extruder having its own heater." msgstr "" +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle label" +msgid "Extruders Share Nozzle" +msgstr "" + +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle description" +msgid "Whether the extruders share a single nozzle rather than each extruder having its own nozzle. When set to true, it is expected that the printer-start gcode script properly sets up all extruders in an initial retraction state that is known and mutually compatible (either zero or one filament not retracted); in that case the initial retraction status is described, per extruder, by the 'machine_extruders_shared_nozzle_initial_retraction' parameter." +msgstr "" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction label" +msgid "Shared Nozzle Initial Retraction" +msgstr "" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction description" +msgid "How much the filament of each extruder is assumed to have been retracted from the shared nozzle tip at the completion of the printer-start gcode script; the value should be equal to or greater than the length of the common part of the nozzle's ducts." +msgstr "" + #: fdmprinter.def.json msgctxt "machine_disallowed_areas label" msgid "Disallowed Areas" @@ -487,8 +507,8 @@ msgstr "Extruder eltolás" #: fdmprinter.def.json msgctxt "machine_use_extruder_offset_to_offset_coords description" -msgid "Apply the extruder offset to the coordinate system." -msgstr "Alkalmazza az extruder eltolását a koordinátarendszerre vonatkoztatva." +msgid "Apply the extruder offset to the coordinate system. Affects all extruders." +msgstr "" #: fdmprinter.def.json msgctxt "extruder_prime_pos_z label" @@ -882,8 +902,8 @@ msgstr "Az első réteg vonalszélességének szorzója. Ennek a növelésével #: fdmprinter.def.json msgctxt "shell label" -msgid "Shell" -msgstr "Héj" +msgid "Walls" +msgstr "" #: fdmprinter.def.json msgctxt "shell description" @@ -950,166 +970,6 @@ msgctxt "wall_0_wipe_dist description" msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better." msgstr "A külső fal nyomtatása után, beilleszt egy fej átemelést, a meghatározott távolságra. Ez segít elrejteni a Z varratot." -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr label" -msgid "Top Surface Skin Extruder" -msgstr "Felső és külső felületi extruder" - -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr description" -msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." -msgstr "Az az extruder, amelyik a felső réteg külső lezárását végzi.Ez a funkció csak multiextruderes gépen érhető el." - -#: fdmprinter.def.json -msgctxt "roofing_layer_count label" -msgid "Top Surface Skin Layers" -msgstr "Felső kéreg rétegek" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count description" -msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." -msgstr "A felső felszíni zárórétegek száma. Általában egy felső réteg is elegendő a jó minőségű felső felületek előállításához." - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr label" -msgid "Top/Bottom Extruder" -msgstr "Alsó/felső extruder" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr description" -msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." -msgstr "Az az extruder, amit az alsó/felső felületi rétegek nyomtatásához használunk. Ezt csak multi extruder esetén használhatjuk." - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness label" -msgid "Top/Bottom Thickness" -msgstr "Alsó/felső vastagság" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness description" -msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." -msgstr "Az alsó/felső rétegek vastagsága a nyomtatáskor. Ez az érték osztva a rétegmagassággal adja meg az alsó/felső rétegek számát." - -#: fdmprinter.def.json -msgctxt "top_thickness label" -msgid "Top Thickness" -msgstr "Felső vastagság" - -#: fdmprinter.def.json -msgctxt "top_thickness description" -msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." -msgstr "A felső rétegek vastagsága a nyomtatáskor. Ez az érték osztva a rétegmagassággal adja meg az felső rétegek számát." - -#: fdmprinter.def.json -msgctxt "top_layers label" -msgid "Top Layers" -msgstr "Felső rétegek" - -#: fdmprinter.def.json -msgctxt "top_layers description" -msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." -msgstr "A felső rétegek száma. A felső vastagság alapján számítva ezt az értéket egész számra kerekíti." - -#: fdmprinter.def.json -msgctxt "bottom_thickness label" -msgid "Bottom Thickness" -msgstr "Alsó vastagság" - -#: fdmprinter.def.json -msgctxt "bottom_thickness description" -msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." -msgstr "Az alsó rétegek vastagsága a nyomtatáskor. Ez az érték osztva a rétegmagassággal adja meg az alsó rétegek számát." - -#: fdmprinter.def.json -msgctxt "bottom_layers label" -msgid "Bottom Layers" -msgstr "Alsó rétegek" - -#: fdmprinter.def.json -msgctxt "bottom_layers description" -msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "Az alsó rétegek száma. Az alsó vastagság alapján számítva ezt az értéket egész számra kerekíti." - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers label" -msgid "Initial Bottom Layers" -msgstr "" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers description" -msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern label" -msgid "Top/Bottom Pattern" -msgstr "Alsó/felső mintázat" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern description" -msgid "The pattern of the top/bottom layers." -msgstr "Az alsó/felső rétegek mintázata." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option lines" -msgid "Lines" -msgstr "Vonalas" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option concentric" -msgid "Concentric" -msgstr "Körkörös" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option zigzag" -msgid "Zig Zag" -msgstr "Cikcakk" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 label" -msgid "Bottom Pattern Initial Layer" -msgstr "Alsó kezdő réteg mintázata" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 description" -msgid "The pattern on the bottom of the print on the first layer." -msgstr "A legalsóbb, kezdő réteg mintázata." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option lines" -msgid "Lines" -msgstr "Vonalas" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option concentric" -msgid "Concentric" -msgstr "Körkörös" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option zigzag" -msgid "Zig Zag" -msgstr "Cikcakk" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons label" -msgid "Connect Top/Bottom Polygons" -msgstr "Alsó/felső poligonok kapcsolása" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." -msgstr "Az alsó/felső rétegpályákat kapcsolja össze, ahol egymás mellett futnak.Ha ezt a beállítást engedélyezzük a körkörös mintázatnál, jelentősen csökkenthetjük a fej átemelési időt, mivel a kapcsolódások félúton terténhetnek meg. Ez azonban ronthatja a felső felület minőségét." - -#: fdmprinter.def.json -msgctxt "skin_angles label" -msgid "Top/Bottom Line Directions" -msgstr "Alsó/felső vonal irányok" - -#: fdmprinter.def.json -msgctxt "skin_angles description" -msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." -msgstr "Az egész vonal-irányok listája, amelyet akkor kell használni, ha az alsó/felső rétegek a vonalas vagy cikcakk mintákat használják.A lista elemeit egymás után használják a rétegek előrehaladtával, és amikor a lista vége eléri, akkor újra előlről kezdi.A lista elemeit vesszők választják el, és a teljes listát szögletes zárójelben tartalmazza. Az Alapértelmezés egy üres lista, amely azt jelenti, hogy a hagyományos alapértelmezett szögeket (45 és 135 fok) kell használni." - #: fdmprinter.def.json msgctxt "wall_0_inset label" msgid "Outer Wall Inset" @@ -1415,6 +1275,176 @@ msgctxt "z_seam_relative description" msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate." msgstr "Ha engedélyezve van, a z varrás koordinátái az egyes alkatrészek középpontjához viszonyítva vannak. Letiltva a koordináták meghatározzák az abszolút helyzetét a tárgyasztalon." +#: fdmprinter.def.json +msgctxt "top_bottom label" +msgid "Top/Bottom" +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_bottom description" +msgid "Top/Bottom" +msgstr "" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr label" +msgid "Top Surface Skin Extruder" +msgstr "Felső és külső felületi extruder" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr description" +msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." +msgstr "Az az extruder, amelyik a felső réteg külső lezárását végzi.Ez a funkció csak multiextruderes gépen érhető el." + +#: fdmprinter.def.json +msgctxt "roofing_layer_count label" +msgid "Top Surface Skin Layers" +msgstr "Felső kéreg rétegek" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count description" +msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." +msgstr "A felső felszíni zárórétegek száma. Általában egy felső réteg is elegendő a jó minőségű felső felületek előállításához." + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr label" +msgid "Top/Bottom Extruder" +msgstr "Alsó/felső extruder" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr description" +msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." +msgstr "Az az extruder, amit az alsó/felső felületi rétegek nyomtatásához használunk. Ezt csak multi extruder esetén használhatjuk." + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness label" +msgid "Top/Bottom Thickness" +msgstr "Alsó/felső vastagság" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness description" +msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." +msgstr "Az alsó/felső rétegek vastagsága a nyomtatáskor. Ez az érték osztva a rétegmagassággal adja meg az alsó/felső rétegek számát." + +#: fdmprinter.def.json +msgctxt "top_thickness label" +msgid "Top Thickness" +msgstr "Felső vastagság" + +#: fdmprinter.def.json +msgctxt "top_thickness description" +msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." +msgstr "A felső rétegek vastagsága a nyomtatáskor. Ez az érték osztva a rétegmagassággal adja meg az felső rétegek számát." + +#: fdmprinter.def.json +msgctxt "top_layers label" +msgid "Top Layers" +msgstr "Felső rétegek" + +#: fdmprinter.def.json +msgctxt "top_layers description" +msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." +msgstr "A felső rétegek száma. A felső vastagság alapján számítva ezt az értéket egész számra kerekíti." + +#: fdmprinter.def.json +msgctxt "bottom_thickness label" +msgid "Bottom Thickness" +msgstr "Alsó vastagság" + +#: fdmprinter.def.json +msgctxt "bottom_thickness description" +msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." +msgstr "Az alsó rétegek vastagsága a nyomtatáskor. Ez az érték osztva a rétegmagassággal adja meg az alsó rétegek számát." + +#: fdmprinter.def.json +msgctxt "bottom_layers label" +msgid "Bottom Layers" +msgstr "Alsó rétegek" + +#: fdmprinter.def.json +msgctxt "bottom_layers description" +msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "Az alsó rétegek száma. Az alsó vastagság alapján számítva ezt az értéket egész számra kerekíti." + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern label" +msgid "Top/Bottom Pattern" +msgstr "Alsó/felső mintázat" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern description" +msgid "The pattern of the top/bottom layers." +msgstr "Az alsó/felső rétegek mintázata." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option lines" +msgid "Lines" +msgstr "Vonalas" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option concentric" +msgid "Concentric" +msgstr "Körkörös" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option zigzag" +msgid "Zig Zag" +msgstr "Cikcakk" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 label" +msgid "Bottom Pattern Initial Layer" +msgstr "Alsó kezdő réteg mintázata" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 description" +msgid "The pattern on the bottom of the print on the first layer." +msgstr "A legalsóbb, kezdő réteg mintázata." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option lines" +msgid "Lines" +msgstr "Vonalas" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option concentric" +msgid "Concentric" +msgstr "Körkörös" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option zigzag" +msgid "Zig Zag" +msgstr "Cikcakk" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons label" +msgid "Connect Top/Bottom Polygons" +msgstr "Alsó/felső poligonok kapcsolása" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons description" +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "Az alsó/felső rétegpályákat kapcsolja össze, ahol egymás mellett futnak.Ha ezt a beállítást engedélyezzük a körkörös mintázatnál, jelentősen csökkenthetjük a fej átemelési időt, mivel a kapcsolódások félúton terténhetnek meg. Ez azonban ronthatja a felső felület minőségét." + +#: fdmprinter.def.json +msgctxt "skin_angles label" +msgid "Top/Bottom Line Directions" +msgstr "Alsó/felső vonal irányok" + +#: fdmprinter.def.json +msgctxt "skin_angles description" +msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." +msgstr "Az egész vonal-irányok listája, amelyet akkor kell használni, ha az alsó/felső rétegek a vonalas vagy cikcakk mintákat használják.A lista elemeit egymás után használják a rétegek előrehaladtával, és amikor a lista vége eléri, akkor újra előlről kezdi.A lista elemeit vesszők választják el, és a teljes listát szögletes zárójelben tartalmazza. Az Alapértelmezés egy üres lista, amely azt jelenti, hogy a hagyományos alapértelmezett szögeket (45 és 135 fok) kell használni." + #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" msgid "No Skin in Z Gaps" @@ -1555,6 +1585,86 @@ msgctxt "skin_overlap_mm description" msgid "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any value over half the width of the wall may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall." msgstr "Az átfedés mértékét állítja be a falak és a felszíni vonalak középpontjainak végpontjai között. Az enyhe átfedés lehetővé teszi a falak szoros kapcsolódását a felszínhez. Vegye figyelembe, hogy ha a kéreg és a fal vonalszélessége egyenlő, akkor a fal szélességének felét meghaladó érték bármilyen felszín esetén áthaladhat a falon, mert ezen a ponton a kéreg-extruder fúvóka pozíciója már elérheti a fal közepén." +#: fdmprinter.def.json +msgctxt "skin_preshrink label" +msgid "Skin Removal Width" +msgstr "Kéreg eltávolítás szélessége" + +#: fdmprinter.def.json +msgctxt "skin_preshrink description" +msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." +msgstr "Az eltávolítandó kéreg felület legnagyobb szélessége. Az ettől kissebb felületek el fognak tűnni. Ez segíthet korlátozni a modell ferde felületeinek alsó és felső részének nyomtatásához felhasznált időt és anyagot." + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink label" +msgid "Top Skin Removal Width" +msgstr "Felső kéreg eltávolítási szélesség" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink description" +msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." +msgstr "Az eltávolítandó felső kéreg felület legnagyobb szélessége. Az ettől kissebb felületek el fognak tűnni. Ez segíthet korlátozni a modell ferde felületeinek felső részének nyomtatásához felhasznált időt és anyagot." + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink label" +msgid "Bottom Skin Removal Width" +msgstr "Alsó kéreg eltávolítási szélesség" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink description" +msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." +msgstr "Az eltávolítandó alsókéreg felület legnagyobb szélessége. Az ettől kissebb felületek el fognak tűnni. Ez segíthet korlátozni a modell ferde felületeinek alsó részének nyomtatásához felhasznált időt és anyagot." + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance label" +msgid "Skin Expand Distance" +msgstr "Kéreg bővítési távolság" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance description" +msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." +msgstr "A kéreg felületek a kitöltésig jönnek létre. Ha bővítjük a kérget, és növeljük ezt az értéket, akkor jobb tapadást érhetünk el a kitöltéssel kapcsolatban, illetve a szomszédos falak jobban tudnak tapadni a kéreghez. Az alacsonyabb érték anyagmegtakarítást eredményez." + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance label" +msgid "Top Skin Expand Distance" +msgstr "Felső kéreg bővítési távolság" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance description" +msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." +msgstr "A felső kéreg felületek a kitöltésig jönnek létre. Ha bővítjük a felső kérget, és növeljük ezt az értéket, akkor jobb tapadást érhetünk el a kitöltéssel kapcsolatban, illetve a szomszédos falak jobban tudnak tapadni a kéreghez. Az alacsonyabb érték anyagmegtakarítást eredményez." + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance label" +msgid "Bottom Skin Expand Distance" +msgstr "Alsó kéreg bővítési távolság" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance description" +msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." +msgstr "Az alsó kéreg felületek a kitöltésig jönnek létre. Ha bővítjük az alsó kérget, és növeljük ezt az értéket, akkor jobb tapadást érhetünk el a kitöltéssel kapcsolatban, illetve a szomszédos falak jobban tudnak tapadni a kéreghez. Az alacsonyabb érték anyagmegtakarítást eredményez." + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion label" +msgid "Maximum Skin Angle for Expansion" +msgstr "A kéreg bővítés maximális szöge" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion description" +msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded." +msgstr "" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion label" +msgid "Minimum Skin Width for Expansion" +msgstr "A minimális kéregszélesség kibővítéshez" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion description" +msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." +msgstr "Az ennél keskenyebb kéregfelületek nem bővülnek ki. Ezzel elkerülhető, hogy keskeny kéregfelületek kibővüljenek, amik akkor jönnek létre, mikor a modell külső felületének lejtése közel van a függőlegeshez." + #: fdmprinter.def.json msgctxt "infill label" msgid "Infill" @@ -1864,86 +1974,6 @@ msgctxt "infill_support_angle description" msgid "The minimum angle of internal overhangs for which infill is added. At a value of 0° objects are totally filled with infill, 90° will not provide any infill." msgstr "Az a belső túlnyúlási szög, amihez szükséges kitöltést hozzáadni. Ha ez 0°, a test teljes mértékben kitöltésre kerül. Ha az érték 90°, akkor nem lesz semmiféle kitöltés." -#: fdmprinter.def.json -msgctxt "skin_preshrink label" -msgid "Skin Removal Width" -msgstr "Kéreg eltávolítás szélessége" - -#: fdmprinter.def.json -msgctxt "skin_preshrink description" -msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." -msgstr "Az eltávolítandó kéreg felület legnagyobb szélessége. Az ettől kissebb felületek el fognak tűnni. Ez segíthet korlátozni a modell ferde felületeinek alsó és felső részének nyomtatásához felhasznált időt és anyagot." - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink label" -msgid "Top Skin Removal Width" -msgstr "Felső kéreg eltávolítási szélesség" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink description" -msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." -msgstr "Az eltávolítandó felső kéreg felület legnagyobb szélessége. Az ettől kissebb felületek el fognak tűnni. Ez segíthet korlátozni a modell ferde felületeinek felső részének nyomtatásához felhasznált időt és anyagot." - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink label" -msgid "Bottom Skin Removal Width" -msgstr "Alsó kéreg eltávolítási szélesség" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink description" -msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." -msgstr "Az eltávolítandó alsókéreg felület legnagyobb szélessége. Az ettől kissebb felületek el fognak tűnni. Ez segíthet korlátozni a modell ferde felületeinek alsó részének nyomtatásához felhasznált időt és anyagot." - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance label" -msgid "Skin Expand Distance" -msgstr "Kéreg bővítési távolság" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance description" -msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." -msgstr "A kéreg felületek a kitöltésig jönnek létre. Ha bővítjük a kérget, és növeljük ezt az értéket, akkor jobb tapadást érhetünk el a kitöltéssel kapcsolatban, illetve a szomszédos falak jobban tudnak tapadni a kéreghez. Az alacsonyabb érték anyagmegtakarítást eredményez." - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance label" -msgid "Top Skin Expand Distance" -msgstr "Felső kéreg bővítési távolság" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance description" -msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." -msgstr "A felső kéreg felületek a kitöltésig jönnek létre. Ha bővítjük a felső kérget, és növeljük ezt az értéket, akkor jobb tapadást érhetünk el a kitöltéssel kapcsolatban, illetve a szomszédos falak jobban tudnak tapadni a kéreghez. Az alacsonyabb érték anyagmegtakarítást eredményez." - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance label" -msgid "Bottom Skin Expand Distance" -msgstr "Alsó kéreg bővítési távolság" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance description" -msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." -msgstr "Az alsó kéreg felületek a kitöltésig jönnek létre. Ha bővítjük az alsó kérget, és növeljük ezt az értéket, akkor jobb tapadást érhetünk el a kitöltéssel kapcsolatban, illetve a szomszédos falak jobban tudnak tapadni a kéreghez. Az alacsonyabb érték anyagmegtakarítást eredményez." - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion label" -msgid "Maximum Skin Angle for Expansion" -msgstr "A kéreg bővítés maximális szöge" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion description" -msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." -msgstr "A tárgy alsó/felső felületén, az itt megadott szögnél nagyobb szög esetén a kéreg nem lesz kibővítve. Így elkerülhető, hogy a keskeny kéregrészek ne legyenek kibővítve, amik akkor jönnek létre, mikor a modell felülete közel függőleges szögben áll. A 0° szög a vízszintes, míg a 90° szög a függőlegest jelenti." - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion label" -msgid "Minimum Skin Width for Expansion" -msgstr "A minimális kéregszélesség kibővítéshez" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion description" -msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." -msgstr "Az ennél keskenyebb kéregfelületek nem bővülnek ki. Ezzel elkerülhető, hogy keskeny kéregfelületek kibővüljenek, amik akkor jönnek létre, mikor a modell külső felületének lejtése közel van a függőlegeshez." - #: fdmprinter.def.json msgctxt "skin_edge_support_thickness label" msgid "Skin Edge Support Thickness" @@ -2561,8 +2591,8 @@ msgstr "Kezdő réteg sebessége" #: fdmprinter.def.json msgctxt "speed_layer_0 description" -msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." -msgstr "A kezdő réteg sebessége. Az alacsonyabb érték segít növelni a tapadást a tárgyasztalhoz." +msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate. Does not affect the build plate adhesion structures themselves, like brim and raft." +msgstr "" #: fdmprinter.def.json msgctxt "speed_print_layer_0 label" @@ -3171,8 +3201,8 @@ msgstr "Maximum fésű táv visszahúzás nélkül" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" -msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." -msgstr "Ha ez az érték nem nulla, akkor a megadott értéktől hosszabb utazáskor nyomtatószál visszahúzás fog történni." +msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." +msgstr "" #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" @@ -5075,7 +5105,7 @@ msgstr "" #: fdmprinter.def.json msgctxt "infill_mesh_order description" -msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." +msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the highest rank. An infill mesh with a higher rank will modify the infill of infill meshes with lower rank and normal meshes." msgstr "" #: fdmprinter.def.json @@ -5423,6 +5453,16 @@ msgctxt "conical_overhang_angle description" msgid "The maximum angle of overhangs after the they have been made printable. At a value of 0° all overhangs are replaced by a piece of model connected to the build plate, 90° will not change the model in any way." msgstr "A túlnyúlások maximális szöge a nyomtathatóvá tétel után. 0 ° értéknél az összes túlnyúlást egy, az építőlemezhez kapcsolt modelldarab váltja fel, a 90 ° -ot a modell semmilyen módon nem változtatja meg." +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size label" +msgid "Maximum Overhang Hole Area" +msgstr "" + +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size description" +msgid "The maximum area of a hole in the base of the model before it's removed by Make Overhang Printable. Holes smaller than this will be retained. A value of 0 mm² will fill all holes in the models base." +msgstr "" + #: fdmprinter.def.json msgctxt "coasting_enable label" msgid "Enable Coasting" @@ -6360,6 +6400,26 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "A modellre alkalmazandó átalakítási mátrix, amikor azt fájlból tölti be." +#~ msgctxt "retraction_combing_max_distance description" +#~ msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." +#~ msgstr "Ha ez az érték nem nulla, akkor a megadott értéktől hosszabb utazáskor nyomtatószál visszahúzás fog történni." + +#~ msgctxt "machine_use_extruder_offset_to_offset_coords description" +#~ msgid "Apply the extruder offset to the coordinate system." +#~ msgstr "Alkalmazza az extruder eltolását a koordinátarendszerre vonatkoztatva." + +#~ msgctxt "shell label" +#~ msgid "Shell" +#~ msgstr "Héj" + +#~ msgctxt "max_skin_angle_for_expansion description" +#~ msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." +#~ msgstr "A tárgy alsó/felső felületén, az itt megadott szögnél nagyobb szög esetén a kéreg nem lesz kibővítve. Így elkerülhető, hogy a keskeny kéregrészek ne legyenek kibővítve, amik akkor jönnek létre, mikor a modell felülete közel függőleges szögben áll. A 0° szög a vízszintes, míg a 90° szög a függőlegest jelenti." + +#~ msgctxt "speed_layer_0 description" +#~ msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." +#~ msgstr "A kezdő réteg sebessége. Az alacsonyabb érték segít növelni a tapadást a tárgyasztalhoz." + #~ msgctxt "material_bed_temperature description" #~ msgid "The temperature used for the heated build plate. If this is 0, the bed temperature will not be adjusted." #~ msgstr "A tárgyasztal hőmérséklete. Ha ez az érték 0, akkor tárgyasztal hőmérséklete nem lesz beállítva, azaz nem fogja fűteni a gép." diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index eb02d844d2..0c5eb87796 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -1,13 +1,13 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0200\n" -"PO-Revision-Date: 2020-08-21 13:40+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0200\n" +"PO-Revision-Date: 2021-04-16 14:58+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Italian , Italian \n" "Language: it_IT\n" @@ -15,12 +15,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.1.1\n" +"X-Generator: Poedit 2.4.1\n" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1581 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 msgctxt "@label" @@ -91,12 +91,12 @@ msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "Il profilo bozza è destinato alla stampa dei prototipi iniziali e alla convalida dei concept, con l'intento di ridurre in modo significativo il tempo di stampa." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:226 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:234 msgctxt "@label" msgid "Custom Material" msgstr "Materiale personalizzato" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:227 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 msgctxt "@label" msgid "Custom" @@ -118,7 +118,7 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Tutti i file (*)" -#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:178 +#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:181 msgctxt "@info:title" msgid "Login failed" msgstr "Login non riuscito" @@ -148,28 +148,33 @@ msgctxt "@info:title" msgid "Can't Find Location" msgstr "Impossibile individuare posizione" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:104 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:116 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Impossibile creare un archivio dalla directory dei dati utente: {}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:110 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 msgctxt "@info:title" msgid "Backup" msgstr "Backup" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:123 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:135 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "Tentativo di ripristinare un backup di Cura senza dati o metadati appropriati." -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:134 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:146 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that is higher than the current version." msgstr "Tentativo di ripristinare un backup di Cura di versione superiore rispetto a quella corrente." +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 +msgctxt "@info:backup_failed" +msgid "The following error occurred while trying to restore a Cura backup:" +msgstr "Nel tentativo di ripristinare un backup di Cura, si è verificato il seguente errore:" + #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -319,74 +324,74 @@ msgctxt "@action:button" msgid "Send report" msgstr "Invia report" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:521 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:527 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Caricamento macchine in corso..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:528 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:534 msgctxt "@info:progress" msgid "Setting up preferences..." msgstr "Impostazione delle preferenze..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:657 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:672 msgctxt "@info:progress" msgid "Initializing Active Machine..." msgstr "Inizializzazione Active Machine in corso..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:803 msgctxt "@info:progress" msgid "Initializing machine manager..." msgstr "Inizializzazione gestore macchina in corso..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:802 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:817 msgctxt "@info:progress" msgid "Initializing build volume..." msgstr "Inizializzazione volume di stampa in corso..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:870 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:888 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Impostazione scena in corso..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:906 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:924 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Caricamento interfaccia in corso..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:911 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:929 msgctxt "@info:progress" msgid "Initializing engine..." msgstr "Inizializzazione motore in corso..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1221 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1246 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1777 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1799 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "È possibile caricare un solo file codice G per volta. Importazione saltata {0}" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1778 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:188 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 msgctxt "@info:title" msgid "Warning" msgstr "Avvertenza" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1787 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1809 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Impossibile aprire altri file durante il caricamento del codice G. Importazione saltata {0}" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 @@ -409,7 +414,7 @@ msgctxt "@info:title" msgid "Placing Object" msgstr "Sistemazione oggetto" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:92 msgctxt "@message" msgid "Could not read response." msgstr "Impossibile leggere la risposta." @@ -429,12 +434,12 @@ msgctxt "@message" msgid "Something unexpected happened when trying to log in, please try again." msgstr "Si è verificato qualcosa di inatteso durante il tentativo di accesso, riprovare." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:187 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:189 msgctxt "@info" msgid "Unable to start a new sign in process. Check if another sign in attempt is still active." msgstr "Impossibile avviare un nuovo processo di accesso. Verificare se è ancora attivo un altro tentativo di accesso." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Impossibile raggiungere il server account Ultimaker." @@ -452,8 +457,8 @@ msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Il file {0} esiste già. Sei sicuro di volerlo sovrascrivere?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:452 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:455 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "File URL non valido:" @@ -536,38 +541,37 @@ msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Il profilo {0} ha un tipo di file sconosciuto o corrotto." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:423 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:426 msgctxt "@label" msgid "Custom profile" msgstr "Profilo personalizzato" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:439 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:442 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Il profilo è privo del tipo di qualità." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:443 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:446 msgctxt "@info:status" -msgid "Global stack is missing." -msgstr "Pila globale mancante." +msgid "There is no active printer yet." +msgstr "Non ci sono ancora stampanti attive." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:449 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:452 msgctxt "@info:status" msgid "Unable to add the profile." msgstr "Impossibile aggiungere il profilo." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:463 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:466 #, python-brace-format msgctxt "@info:status" msgid "Quality type '{0}' is not compatible with the current active machine definition '{1}'." msgstr "Il tipo di qualità '{0}' non è compatibile con la definizione di macchina attiva corrente '{1}'." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:468 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:471 #, python-brace-format msgctxt "@info:status" msgid "Warning: The profile is not visible because its quality type '{0}' is not available for the current configuration. Switch to a material/nozzle combination that can use this quality type." -msgstr "Avvertenza: il profilo non è visibile in quanto il tipo di qualità '{0}' non è disponibile per la configurazione corrente. Passare alla combinazione materiale/ugello" -" che consente di utilizzare questo tipo di qualità." +msgstr "Avvertenza: il profilo non è visibile in quanto il tipo di qualità '{0}' non è disponibile per la configurazione corrente. Passare alla combinazione materiale/ugello che consente di utilizzare questo tipo di qualità." #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" @@ -579,23 +583,23 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:712 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 msgctxt "@label" msgid "Nozzle" msgstr "Ugello" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:860 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:856 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "Le impostazioni sono state modificate in base all’attuale disponibilità di estrusori:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:862 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:858 msgctxt "@info:title" msgid "Settings updated" msgstr "Impostazioni aggiornate" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1447 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1478 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Estrusore disabilitato" @@ -608,13 +612,13 @@ msgid "Add" msgstr "Aggiungi" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:263 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 msgctxt "@action:button" msgid "Finish" msgstr "Fine" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 #: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 #: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 @@ -622,7 +626,7 @@ msgstr "Fine" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 msgctxt "@action:button" msgid "Cancel" @@ -634,76 +638,83 @@ msgctxt "@label" msgid "Group #{group_nr}" msgstr "Gruppo #{group_nr}" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Parete esterna" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Pareti interne" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Rivestimento esterno" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Riempimento" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Riempimento del supporto" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Interfaccia supporto" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Supporto" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Skirt" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 msgctxt "@tooltip" msgid "Prime Tower" msgstr "Torre di innesco" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 msgctxt "@tooltip" msgid "Travel" msgstr "Spostamenti" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 msgctxt "@tooltip" msgid "Retractions" msgstr "Retrazioni" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:94 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 msgctxt "@tooltip" msgid "Other" msgstr "Altro" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 msgctxt "@action:button" msgid "Next" msgstr "Avanti" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 +msgctxt "@action:button" +msgid "Skip" +msgstr "Salta" + +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:173 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 msgctxt "@action:button" msgid "Close" @@ -728,29 +739,36 @@ msgstr "" "

    Scopri come garantire la migliore qualità ed affidabilità di stampa.

    \n" "

    Visualizza la guida alla qualità di stampa

    " -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:535 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:540 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Il file di progetto {0} contiene un tipo di macchina sconosciuto {1}. Impossibile importare la macchina. Verranno invece importati i modelli." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:538 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:543 msgctxt "@info:title" msgid "Open Project File" msgstr "Apri file progetto" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:634 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:639 #, python-brace-format msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "Il file di progetto {0} è diventato improvvisamente inaccessibile: {1}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:635 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "Impossibile aprire il file di progetto" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:686 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:646 +#, python-brace-format +msgctxt "@info:error Don't translate the XML tags or !" +msgid "Project file {0} is corrupt: {1}." +msgstr "Il file di progetto {0} è danneggiato: {1}." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:698 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." @@ -788,7 +806,7 @@ msgctxt "@error:zip" msgid "The operating system does not allow saving a project file to this location or with this file name." msgstr "Il sistema operativo non consente di salvare un file di progetto in questa posizione o con questo nome file." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:206 msgctxt "@error:zip" msgid "Error writing 3mf file." msgstr "Errore scrittura file 3MF." @@ -843,8 +861,8 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "Il backup supera la dimensione file massima." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:23 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "Si è verificato un errore cercando di ripristinare il backup." @@ -854,45 +872,45 @@ msgctxt "@item:inmenu" msgid "Manage backups" msgstr "Gestione backup" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Impossibile eseguire il sezionamento con il materiale corrente in quanto incompatibile con la macchina o la configurazione selezionata." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:411 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:420 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:429 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 msgctxt "@info:title" msgid "Unable to slice" msgstr "Sezionamento impossibile" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:412 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Impossibile eseguire il sezionamento con le impostazioni attuali. Le seguenti impostazioni presentano errori: {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:410 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:436 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Impossibile eseguire il sezionamento a causa di alcune impostazioni per modello. Le seguenti impostazioni presentano errori su uno o più modelli: {error_labels}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:445 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "Impossibile eseguire il sezionamento perché la torre di innesco o la posizione di innesco non sono valide." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:428 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:454 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "Impossibile effettuare il sezionamento in quanto vi sono oggetti associati a Extruder %s disabilitato." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:463 msgctxt "@info:status" msgid "" "Please review settings and check if your models:\n" @@ -1161,28 +1179,28 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Unità rimovibile" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:121 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:128 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled." msgstr "Cura non visualizza in modo accurato i layer se la funzione Wire Printing è abilitata." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:129 msgctxt "@info:title" msgid "Simulation View" msgstr "Vista simulazione" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:status" msgid "Nothing is shown because you need to slice first." msgstr "Non viene visualizzato nulla poiché è necessario prima effetuare lo slicing." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:title" msgid "No layers to show" msgstr "Nessun layer da visualizzare" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:124 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "Non mostrare nuovamente questo messaggio" @@ -1192,16 +1210,21 @@ msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Visualizzazione strato" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:70 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:71 msgctxt "@info:status" -msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." -msgstr "Il modello in uso non è multiforme. Le aree evidenziate indicano superfici mancanti o estranee." +msgid "The highlighted areas indicate either missing or extraneous surfaces. Fix your model and open it again into Cura." +msgstr "Le aree evidenziate indicano superfici mancanti o estranee. Correggi il modello e aprilo nuovamente in Cura." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 msgctxt "@info:title" -msgid "Model errors" +msgid "Model Errors" msgstr "Errori modello" +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:79 +msgctxt "@action:button" +msgid "Learn more" +msgstr "Ulteriori informazioni" + #: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/__init__.py:12 msgctxt "@item:inmenu" msgid "Solid view" @@ -1228,7 +1251,7 @@ msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "Modifiche rilevate dal tuo account Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:145 msgctxt "@action:button" msgid "Sync" msgstr "Sincronizza" @@ -1264,7 +1287,7 @@ msgctxt "@info:generic" msgid "You need to quit and restart {} before changes have effect." msgstr "Affinché le modifiche diventino effettive, è necessario chiudere e riavviare {}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:79 msgctxt "@info:generic" msgid "{} plugins failed to download" msgstr "Impossibile scaricare i plugin {}" @@ -1305,7 +1328,11 @@ msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Pacchetto formato Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "Impossibile scrivere nel file UFP:" @@ -1320,22 +1347,22 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Seleziona aggiornamenti" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:152 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 msgctxt "@action:button" msgid "Print via cloud" msgstr "Stampa tramite cloud" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:155 msgctxt "@properties:tooltip" msgid "Print via cloud" msgstr "Stampa tramite cloud" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:156 msgctxt "@info:status" msgid "Connected via cloud" msgstr "Collegato tramite cloud" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:264 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:270 #, python-brace-format msgctxt "@error:send" msgid "Unknown error code when uploading print job: {0}" @@ -1435,15 +1462,21 @@ msgid "" msgid_plural "" "You are about to remove {0} printers from Cura. This action cannot be undone.\n" "Are you sure you want to continue?" -msgstr[0] "Si sta per rimuovere {0} stampante da Cura. Questa azione non può essere annullata.\nContinuare?" -msgstr[1] "Si stanno per rimuovere {0} stampanti da Cura. Questa azione non può essere annullata.\nContinuare?" +msgstr[0] "" +"Si sta per rimuovere {0} stampante da Cura. Questa azione non può essere annullata.\n" +"Continuare?" +msgstr[1] "" +"Si stanno per rimuovere {0} stampanti da Cura. Questa azione non può essere annullata.\n" +"Continuare?" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:468 msgctxt "@label" msgid "" "You are about to remove all printers from Cura. This action cannot be undone.\n" "Are you sure you want to continue?" -msgstr "Si stanno per rimuovere tutte le stampanti da Cura. Questa azione non può essere annullata. \nContinuare?" +msgstr "" +"Si stanno per rimuovere tutte le stampanti da Cura. Questa azione non può essere annullata. \n" +"Continuare?" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py:27 msgctxt "@info:status" @@ -1627,82 +1660,82 @@ msgctxt "@info:tooltip" msgid "Some things could be problematic in this print. Click to see tips for adjustment." msgstr "Alcune parti potrebbero risultare problematiche in questa stampa. Fare click per visualizzare i suggerimenti per la regolazione." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:15 msgctxt "@title:window" msgid "Open Project" msgstr "Apri progetto" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" msgstr "Aggiorna esistente" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:63 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "Crea nuovo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "Riepilogo - Progetto Cura" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 msgctxt "@action:label" msgid "Printer settings" msgstr "Impostazioni della stampante" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:112 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:113 msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "Come può essere risolto il conflitto nella macchina?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:165 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 msgctxt "@action:label" msgid "Type" msgstr "Tipo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:181 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 msgctxt "@action:label" msgid "Printer Group" msgstr "Gruppo stampanti" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:203 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 msgctxt "@action:label" msgid "Profile settings" msgstr "Impostazioni profilo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:219 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:221 msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "Come può essere risolto il conflitto nel profilo?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:349 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 msgctxt "@action:label" msgid "Name" msgstr "Nome" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:255 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 msgctxt "@action:label" msgid "Intent" msgstr "Intent" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:271 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Not in profile" msgstr "Non nel profilo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:276 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 msgctxt "@action:label" msgid "%1 override" @@ -1710,54 +1743,54 @@ msgid_plural "%1 overrides" msgstr[0] "%1 override" msgstr[1] "%1 override" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:287 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:290 msgctxt "@action:label" msgid "Derivative from" msgstr "Derivato da" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:295 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 override" msgstr[1] "%1, %2 override" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:309 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:312 msgctxt "@action:label" msgid "Material settings" msgstr "Impostazioni materiale" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:328 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Come può essere risolto il conflitto nel materiale?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:369 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:373 msgctxt "@action:label" msgid "Setting visibility" msgstr "Impostazione visibilità" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:378 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:382 msgctxt "@action:label" msgid "Mode" msgstr "Modalità" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:label" msgid "Visible settings:" msgstr "Impostazioni visibili:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:399 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:403 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 su %2" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:425 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:429 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Il caricamento di un progetto annulla tutti i modelli sul piano di stampa." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:457 msgctxt "@action:button" msgid "Open" msgstr "Apri" @@ -1859,8 +1892,8 @@ msgstr "Backup e sincronizzazione delle impostazioni Cura." #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:68 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:125 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:199 msgctxt "@button" msgid "Sign in" msgstr "Accedi" @@ -2094,12 +2127,12 @@ msgctxt "@label" msgid "Cooling Fan Number" msgstr "Numero ventola di raffreddamento" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:163 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "Codice G avvio estrusore" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:177 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "Codice G fine estrusore" @@ -2184,12 +2217,17 @@ msgctxt "@label" msgid "Number of Extruders" msgstr "Numero di estrusori" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:345 +msgctxt "@label" +msgid "Apply Extruder offsets to GCode" +msgstr "Applica offset estrusore a gcode" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:393 msgctxt "@title:label" msgid "Start G-code" msgstr "Codice G avvio" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:385 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:404 msgctxt "@title:label" msgid "End G-code" msgstr "Codice G fine" @@ -2217,6 +2255,11 @@ msgctxt "@label link to technical assistance" msgid "View user manuals online" msgstr "Visualizza i manuali utente online" +#: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 +msgctxt "@info" +msgid "In order to monitor your print from Cura, please connect the printer." +msgstr "Al fine di monitorare la stampa da Cura, collegare la stampante." + #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" msgid "Mesh Type" @@ -2263,7 +2306,7 @@ msgid "Select Settings to Customize for this model" msgstr "Seleziona impostazioni di personalizzazione per questo modello" #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtro..." @@ -2273,32 +2316,32 @@ msgctxt "@label:checkbox" msgid "Show all" msgstr "Mostra tutto" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:20 msgctxt "@title:window" msgid "Post Processing Plugin" msgstr "Plug-in di post-elaborazione" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:59 msgctxt "@label" msgid "Post Processing Scripts" msgstr "Script di post-elaborazione" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:235 msgctxt "@action" msgid "Add a script" msgstr "Aggiungi uno script" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:282 msgctxt "@label" msgid "Settings" msgstr "Impostazioni" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:499 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:502 msgctxt "@info:tooltip" msgid "Change active post-processing scripts." msgstr "Modificare gli script di post-elaborazione attivi." -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:506 msgctxt "@info:tooltip" msgid "The following script is active:" msgid_plural "The following scripts are active:" @@ -2311,78 +2354,93 @@ msgctxt "@label" msgid "Color scheme" msgstr "Schema colori" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:110 msgctxt "@label:listbox" msgid "Material Color" msgstr "Colore materiale" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:111 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:114 msgctxt "@label:listbox" msgid "Line Type" msgstr "Tipo di linea" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:115 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:118 msgctxt "@label:listbox" msgid "Speed" msgstr "Velocità" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:122 msgctxt "@label:listbox" -msgid "Layer thickness" -msgstr "Spessore strato" +msgid "Layer Thickness" +msgstr "Spessore layer" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:126 +msgctxt "@label:listbox" +msgid "Line Width" +msgstr "Larghezza della linea" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 +msgctxt "@label:listbox" +msgid "Flow" +msgstr "Flusso" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" msgid "Compatibility Mode" msgstr "Modalità di compatibilità" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:230 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:245 msgctxt "@label" msgid "Travels" msgstr "Spostamenti" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:251 msgctxt "@label" msgid "Helpers" msgstr "Helper" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:257 msgctxt "@label" msgid "Shell" msgstr "Guscio" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:248 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 msgctxt "@label" msgid "Infill" msgstr "Riempimento" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:298 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:271 +msgctxt "@label" +msgid "Starts" +msgstr "Avvia" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 msgctxt "@label" msgid "Only Show Top Layers" msgstr "Mostra solo strati superiori" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:308 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:332 msgctxt "@label" msgid "Show 5 Detailed Layers On Top" msgstr "Mostra 5 strati superiori in dettaglio" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:346 msgctxt "@label" msgid "Top / Bottom" msgstr "Superiore / Inferiore" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:350 msgctxt "@label" msgid "Inner Wall" msgstr "Parete interna" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:384 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:419 msgctxt "@label" msgid "min" msgstr "min." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:433 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:488 msgctxt "@label" msgid "max" msgstr "max." @@ -2523,7 +2581,7 @@ msgid "Plugins" msgstr "Plugin" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 msgctxt "@title:tab" msgid "Materials" @@ -2572,6 +2630,7 @@ msgstr "Rimuovi" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:178 msgctxt "@button" msgid "Next" msgstr "Avanti" @@ -2915,7 +2974,7 @@ msgid "Delete" msgstr "Cancella" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:289 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 msgctxt "@label" msgid "Resume" msgstr "Riprendi" @@ -2931,8 +2990,8 @@ msgid "Resuming..." msgstr "Ripresa in corso..." #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 msgctxt "@label" msgid "Pause" msgstr "Pausa" @@ -2973,7 +3032,7 @@ msgid "Are you sure you want to abort %1?" msgstr "Sei sicuro di voler interrompere %1?" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 msgctxt "@window:title" msgid "Abort print" msgstr "Interrompi la stampa" @@ -2984,7 +3043,7 @@ msgid "Manage printer" msgstr "Gestione stampanti" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." @@ -3010,27 +3069,34 @@ msgctxt "@label:status" msgid "Idle" msgstr "Ferma" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:365 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +msgctxt "@label:status" +msgid "Preparing..." +msgstr "Preparazione in corso..." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:369 msgctxt "@label:status" msgid "Printing" msgstr "Stampa in corso" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:406 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:410 msgctxt "@label" msgid "Untitled" msgstr "Senza titolo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:431 msgctxt "@label" msgid "Anonymous" msgstr "Anonimo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:458 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Richiede modifiche di configurazione" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:492 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:496 msgctxt "@action:button" msgid "Details" msgstr "Dettagli" @@ -3057,12 +3123,6 @@ msgctxt "@label:status" msgid "Finished" msgstr "Terminato" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -msgctxt "@label:status" -msgid "Preparing..." -msgstr "Preparazione in corso..." - #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." @@ -3143,27 +3203,26 @@ msgctxt "@action:button" msgid "Sign in" msgstr "Accedi" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" -msgid "Your key to connected 3D printing" -msgstr "La chiave per la stampa 3D connessa" +msgid "Sign in to the Ultimaker platform" +msgstr "Accedi alla piattaforma Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:42 msgctxt "@text" msgid "" -"- Customize your experience with more print profiles and plugins\n" -"- Stay flexible by syncing your setup and loading it anywhere\n" -"- Increase efficiency with a remote workflow on Ultimaker printers" +"- Add material profiles and plug-ins from the Marketplace\n" +"- Back-up and sync your material profiles and plug-ins\n" +"- Share ideas and get help from 48,000+ users in the Ultimaker community" msgstr "" -"- Personalizza la tua esperienza con più profili di stampa e plugin\n" -"- Mantieni la flessibilità sincronizzando la configurazione e caricandola ovunque\n" -"- Aumenta l'efficienza grazie a un flusso di lavoro remoto sulle stampanti Ultimaker" +"- Aggiungi profili materiale e plugin dal Marketplace\n" +"- Esegui il backup e la sincronizzazione dei profili materiale e dei plugin⏎- Condividi idee e ottieni supporto da più di 48.000 utenti nella community di Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:142 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:62 msgctxt "@button" -msgid "Create account" -msgstr "Crea account" +msgid "Create a free Ultimaker account" +msgstr "Crea un account Ultimaker gratuito" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/SyncState.qml:28 msgctxt "@label" @@ -3270,309 +3329,308 @@ msgctxt "@button" msgid "Cancel" msgstr "Annulla" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:83 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Mostra la Guida ricerca e riparazione dei guasti online" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:90 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Attiva/disattiva schermo intero" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:98 msgctxt "@action:inmenu" msgid "Exit Full Screen" msgstr "Esci da schermo intero" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:105 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Annulla" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:115 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "Ri&peti" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:125 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Esci" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:132 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:133 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Visualizzazione 3D" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:140 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Visualizzazione frontale" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:147 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Visualizzazione superiore" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 +msgctxt "@action:inmenu menubar:view" +msgid "Bottom View" +msgstr "Vista inferiore" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Visualizzazione lato sinistro" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:160 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:168 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Visualizzazione lato destro" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:175 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Configura Cura..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:182 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Aggiungi stampante..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:180 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:188 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Gestione stampanti..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:187 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Gestione materiali..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu" msgid "Add more materials from Marketplace" msgstr "Aggiungere altri materiali da Marketplace" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "&Aggiorna il profilo con le impostazioni/esclusioni correnti" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Elimina le modifiche correnti" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:222 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:230 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "&Crea profilo dalle impostazioni/esclusioni correnti..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Gestione profili..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Mostra documentazione &online" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Se&gnala un errore" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:260 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Scopri le novità" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:266 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Informazioni..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:273 msgctxt "@action:inmenu menubar:edit" -msgid "Delete Selected Model" -msgid_plural "Delete Selected Models" -msgstr[0] "Cancella modello selezionato" -msgstr[1] "Cancella modelli selezionati" +msgid "Delete Selected" +msgstr "Cancella selezionati" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:283 msgctxt "@action:inmenu menubar:edit" -msgid "Center Selected Model" -msgid_plural "Center Selected Models" -msgstr[0] "Centra modello selezionato" -msgstr[1] "Centra modelli selezionati" +msgid "Center Selected" +msgstr "Centra selezionati" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:292 msgctxt "@action:inmenu menubar:edit" -msgid "Multiply Selected Model" -msgid_plural "Multiply Selected Models" -msgstr[0] "Moltiplica modello selezionato" -msgstr[1] "Moltiplica modelli selezionati" +msgid "Multiply Selected" +msgstr "Moltiplica selezionati" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Elimina modello" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:309 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "C&entra modello su piattaforma" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:307 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "&Raggruppa modelli" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:327 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:335 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Separa modelli" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:345 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "&Unisci modelli" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:347 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:355 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "Mo<iplica modello..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:362 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Seleziona tutti i modelli" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:372 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Cancellare piano di stampa" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:382 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Ricarica tutti i modelli" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Sistema tutti i modelli su tutti i piani di stampa" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:390 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Sistema tutti i modelli" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:406 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Sistema selezione" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:405 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:413 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Reimposta tutte le posizioni dei modelli" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:412 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Reimposta tutte le trasformazioni dei modelli" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:419 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:429 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Apri file..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:439 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Nuovo Progetto..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:434 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:446 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Mostra cartella di configurazione" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:441 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:538 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Configura visibilità delle impostazioni..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:448 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:460 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Mercato" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:257 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Questo pacchetto sarà installato dopo il riavvio." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 msgctxt "@title:tab" msgid "General" msgstr "Generale" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:462 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:453 msgctxt "@title:tab" msgid "Settings" msgstr "Impostazioni" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:464 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 msgctxt "@title:tab" msgid "Printers" msgstr "Stampanti" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 msgctxt "@title:tab" msgid "Profiles" msgstr "Profili" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:576 msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "Chiusura di %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:588 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "Chiudere %1?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:638 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Apri file" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:744 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:737 msgctxt "@window:title" msgid "Install Package" msgstr "Installa il pacchetto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:752 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:745 msgctxt "@title:window" msgid "Open File(s)" msgstr "Apri file" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:755 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:748 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Rilevata la presenza di uno o più file codice G tra i file selezionati. È possibile aprire solo un file codice G alla volta. Se desideri aprire un file codice G, selezionane uno solo." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:858 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:857 msgctxt "@title:window" msgid "Add Printer" msgstr "Aggiungi stampante" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:866 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:865 msgctxt "@title:window" msgid "What's New" msgstr "Scopri le novità" @@ -3722,17 +3780,27 @@ msgctxt "@label" msgid "Python bindings for libnest2d" msgstr "Vincoli Python per libnest2d" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +msgctxt "@label" +msgid "Support library for system keyring access" +msgstr "Libreria di supporto per accesso a keyring sistema" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" +msgid "Python extensions for Microsoft Windows" +msgstr "Estensioni Python per Microsoft Windows" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +msgctxt "@label" msgid "Font" msgstr "Font" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 msgctxt "@label" msgid "SVG icons" msgstr "Icone SVG" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:165 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Apertura applicazione distribuzione incrociata Linux" @@ -3742,22 +3810,22 @@ msgctxt "@title:window" msgid "Open project file" msgstr "Apri file progetto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:88 msgctxt "@text:window" msgid "This is a Cura project file. Would you like to open it as a project or import the models from it?" msgstr "Questo è un file progetto Cura. Vuoi aprirlo come progetto o importarne i modelli?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:98 msgctxt "@text:window" msgid "Remember my choice" msgstr "Ricorda la scelta" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:122 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:117 msgctxt "@action:button" msgid "Open as project" msgstr "Apri come progetto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:131 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:126 msgctxt "@action:button" msgid "Import models" msgstr "Importa i modelli" @@ -3773,8 +3841,10 @@ msgid "" "You have customized some profile settings.\n" "Would you like to Keep these changed settings after switching profiles?\n" "Alternatively, you can discard the changes to load the defaults from '%1'." -msgstr "Alcune impostazioni di profilo sono state personalizzate.\nMantenere queste impostazioni modificate dopo il cambio dei profili?\nIn alternativa, è possibile" -" eliminare le modifiche per caricare i valori predefiniti da '%1'." +msgstr "" +"Alcune impostazioni di profilo sono state personalizzate.\n" +"Mantenere queste impostazioni modificate dopo il cambio dei profili?\n" +"In alternativa, è possibile eliminare le modifiche per caricare i valori predefiniti da '%1'." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:111 msgctxt "@title:column" @@ -3787,7 +3857,7 @@ msgid "Current changes" msgstr "Modifiche correnti" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Chiedi sempre" @@ -3812,12 +3882,12 @@ msgctxt "@action:button" msgid "Keep changes" msgstr "Mantieni modifiche" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 msgctxt "@text:window" msgid "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?" msgstr "Rilevata la presenza di uno o più file progetto tra i file selezionati. È possibile aprire solo un file progetto alla volta. Si suggerisce di importare i modelli solo da tali file. Vuoi procedere?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:99 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:94 msgctxt "@action:button" msgid "Import all as models" msgstr "Importa tutto come modelli" @@ -3972,7 +4042,7 @@ msgctxt "@label" msgid "Material" msgstr "Materiale" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:407 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Utilizzare la colla per una migliore adesione con questa combinazione di materiali." @@ -3996,17 +4066,17 @@ msgctxt "@label" msgid "Number of Copies" msgstr "Numero di copie" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:33 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:41 msgctxt "@title:menu menubar:file" msgid "&Save Project..." msgstr "&Salva progetto..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:54 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:74 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&Esporta..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:85 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Esporta selezione..." @@ -4026,6 +4096,11 @@ msgctxt "@label:category menu label" msgid "Generic" msgstr "Generale" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/OpenFilesMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Open File(s)..." +msgstr "Apri file..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -4041,6 +4116,11 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Ap&ri recenti" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SaveProjectMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Save Project..." +msgstr "Salva progetto..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:15 msgctxt "@title:menu menubar:settings" msgid "&Printer" @@ -4066,17 +4146,17 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Disabilita estrusore" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:16 msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Impostazioni visibili" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:45 msgctxt "@action:inmenu" msgid "Collapse All Categories" msgstr "Comprimi tutte le categorie" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Gestisci Impostazione visibilità..." @@ -4086,22 +4166,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Posizione fotocamera" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:45 msgctxt "@action:inmenu menubar:view" msgid "Camera view" msgstr "Visualizzazione fotocamera" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:48 msgctxt "@action:inmenu menubar:view" msgid "Perspective" msgstr "Prospettiva" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:60 msgctxt "@action:inmenu menubar:view" msgid "Orthographic" msgstr "Ortogonale" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:81 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "P&iano di stampa" @@ -4146,12 +4226,12 @@ msgctxt "@label:MonitorStatus" msgid "Please remove the print" msgstr "Rimuovere la stampa" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@label" msgid "Abort Print" msgstr "Interrompi la stampa" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:338 msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Sei sicuro di voler interrompere la stampa?" @@ -4193,301 +4273,301 @@ msgctxt "@label" msgid "Interface" msgstr "Interfaccia" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:216 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:209 msgctxt "@label" msgid "Currency:" msgstr "Valuta:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:229 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:222 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Riavviare l'applicazione per rendere effettive le modifiche." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:284 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Seziona automaticamente alla modifica delle impostazioni." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 msgctxt "@option:check" msgid "Slice automatically" msgstr "Seziona automaticamente" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:306 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportamento del riquadro di visualizzazione" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:314 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Evidenzia in rosso le zone non supportate del modello. In assenza di supporto, queste aree non saranno stampate in modo corretto." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:323 msgctxt "@option:check" msgid "Display overhang" msgstr "Visualizza sbalzo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:351 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@info:tooltip" msgid "Highlight missing or extraneous surfaces of the model using warning signs. The toolpaths will often be missing parts of the intended geometry." msgstr "Evidenziare le superfici mancanti o estranee del modello utilizzando i simboli di avvertenza. I percorsi degli utensili spesso ignoreranno parti della geometria prevista." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:342 msgctxt "@option:check" msgid "Display model errors" msgstr "Visualizzare gli errori del modello" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Sposta la fotocamera in modo che il modello si trovi al centro della visualizzazione quando è selezionato" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:373 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Centratura fotocamera alla selezione dell'elemento" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Il comportamento dello zoom predefinito di Cura dovrebbe essere invertito?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:388 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Inverti la direzione dello zoom della fotocamera." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Lo zoom si muove nella direzione del mouse?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "Nella prospettiva ortogonale lo zoom verso la direzione del mouse non è supportato." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:409 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Zoom verso la direzione del mouse" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:435 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:417 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "I modelli sull’area di stampa devono essere spostati per evitare intersezioni?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:440 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:422 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Assicurarsi che i modelli siano mantenuti separati" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:431 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "I modelli sull’area di stampa devono essere portati a contatto del piano di stampa?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:436 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Rilascia automaticamente i modelli sul piano di stampa" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:448 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Visualizza il messaggio di avvertimento sul lettore codice G." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:457 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Messaggio di avvertimento sul lettore codice G" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Lo strato deve essere forzato in modalità di compatibilità?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Forzare la modalità di compatibilità visualizzazione strato (riavvio necessario)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:498 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" msgstr "Aprire Cura nel punto in cui è stato chiuso?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:485 msgctxt "@option:check" msgid "Restore window position on start" msgstr "Ripristinare la posizione della finestra all'avvio" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:513 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Quale tipo di rendering della fotocamera è necessario utilizzare?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:502 msgctxt "@window:text" msgid "Camera rendering:" msgstr "Rendering fotocamera:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:531 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:509 msgid "Perspective" msgstr "Prospettiva" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:532 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgid "Orthographic" msgstr "Ortogonale" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:563 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:548 msgctxt "@label" msgid "Opening and saving files" msgstr "Apertura e salvataggio file" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:555 msgctxt "@info:tooltip" msgid "Should opening files from the desktop or external applications open in the same instance of Cura?" msgstr "L'apertura dei file dal desktop o da applicazioni esterne deve essere eseguita nella stessa istanza di Cura?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@option:check" msgid "Use a single instance of Cura" msgstr "Utilizzare una singola istanza di Cura" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "I modelli devono essere ridimensionati al volume di stampa, se troppo grandi?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@option:check" msgid "Scale large models" msgstr "Ridimensiona i modelli troppo grandi" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Un modello può apparire eccessivamente piccolo se la sua unità di misura è espressa in metri anziché in millimetri. Questi modelli devono essere aumentati?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Ridimensiona i modelli eccessivamente piccoli" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "I modelli devono essere selezionati dopo essere stati caricati?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Selezionare i modelli dopo il caricamento" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Al nome del processo di stampa deve essere aggiunto automaticamente un prefisso basato sul nome della stampante?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:635 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Aggiungi al nome del processo un prefisso macchina" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:645 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Quando si salva un file di progetto deve essere visualizzato un riepilogo?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:649 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:634 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Visualizza una finestra di riepilogo quando si salva un progetto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:659 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:644 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Comportamento predefinito all'apertura di un file progetto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:652 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Comportamento predefinito all'apertura di un file progetto: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Chiedi sempre" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:682 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Apri sempre come progetto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:668 msgctxt "@option:openProject" msgid "Always import models" msgstr "Importa sempre i modelli" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:705 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Dopo aver modificato un profilo ed essere passati a un altro, si apre una finestra di dialogo che chiede se mantenere o eliminare le modifiche oppure se scegliere un comportamento predefinito e non visualizzare più tale finestra di dialogo." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:728 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Profili" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Comportamento predefinito per i valori di impostazione modificati al passaggio a un profilo diverso: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:748 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:734 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Elimina sempre le impostazioni modificate" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:749 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:735 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Trasferisci sempre le impostazioni modificate a un nuovo profilo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:783 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@label" msgid "Privacy" msgstr "Privacy" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:790 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:777 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Cura deve verificare la presenza di eventuali aggiornamenti all’avvio del programma?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:795 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:782 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Controlla aggiornamenti all’avvio" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:805 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:792 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "I dati anonimi sulla stampa devono essere inviati a Ultimaker? Nota, non sono trasmessi o memorizzati modelli, indirizzi IP o altre informazioni personali." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:810 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:797 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Invia informazioni di stampa (anonime)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:819 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:806 msgctxt "@action:button" msgid "More information" msgstr "Ulteriori informazioni" @@ -4527,55 +4607,65 @@ msgctxt "@action:button" msgid "Export" msgstr "Esporta" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 +msgctxt "@action:button Sending materials to printers" +msgid "Sync with Printers" +msgstr "Sincronizza con le stampanti" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" msgid "Printer" msgstr "Stampante" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:298 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Conferma rimozione" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:301 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Sei sicuro di voler rimuovere %1? Questa operazione non può essere annullata!" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 msgctxt "@title:window" msgid "Import Material" msgstr "Importa materiale" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:338 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Impossibile importare materiale {1}: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:328 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:342 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Materiale importato correttamente %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:346 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 msgctxt "@title:window" msgid "Export Material" msgstr "Esporta materiale" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:358 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:372 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Impossibile esportare il materiale su %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:378 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Materiale esportato correttamente su %1" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 +msgctxt "@title:window" +msgid "Export All Materials" +msgstr "Esporta tutti i materiali" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" @@ -4687,53 +4777,53 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Indica un nome per questo profilo." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Duplica profilo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@title:window" msgid "Rename Profile" msgstr "Rinomina profilo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:307 msgctxt "@title:window" msgid "Import Profile" msgstr "Importa profilo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:336 msgctxt "@title:window" msgid "Export Profile" msgstr "Esporta profilo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:399 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Stampante: %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:557 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Aggiorna il profilo con le impostazioni/esclusioni correnti" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 msgctxt "@action:button" msgid "Discard current changes" msgstr "Elimina le modifiche correnti" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:583 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Questo profilo utilizza le impostazioni predefinite dalla stampante, perciò non ci sono impostazioni/esclusioni nell’elenco riportato di seguito." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:591 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Le impostazioni correnti corrispondono al profilo selezionato." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:609 msgctxt "@title:tab" msgid "Global Settings" msgstr "Impostazioni globali" @@ -4763,12 +4853,12 @@ msgctxt "@title:column" msgid "Unit" msgstr "Unità" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:16 msgctxt "@title:tab" msgid "Setting Visibility" msgstr "Impostazione visibilità" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:48 msgctxt "@label:textbox" msgid "Check all" msgstr "Controlla tutto" @@ -5106,27 +5196,27 @@ msgctxt "@label:textbox" msgid "Search settings" msgstr "Impostazioni ricerca" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:456 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:468 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Copia valore su tutti gli estrusori" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:477 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Copia tutti i valori modificati su tutti gli estrusori" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:502 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:514 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Nascondi questa impostazione" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:515 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:527 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Nascondi questa impostazione" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:531 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Mantieni visibile questa impostazione" @@ -5186,11 +5276,6 @@ msgctxt "@button" msgid "Add printer manually" msgstr "Aggiungere la stampante manualmente" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddCloudPrintersView.qml:218 -msgctxt "@button" -msgid "Finish" -msgstr "Fine" - #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:230 msgctxt "@label" msgid "Manufacturer" @@ -5297,32 +5382,32 @@ msgctxt "@button" msgid "Connect" msgstr "Collega" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:43 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" -msgid "Ultimaker Account" -msgstr "Account Ultimaker" +msgid "Release Notes" +msgstr "Note sulla versione" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:124 msgctxt "@text" -msgid "Your key to connected 3D printing" -msgstr "La chiave per la stampa 3D connessa" +msgid "Add material settings and plugins from the Marketplace" +msgstr "Aggiungi impostazioni materiale e plugin dal Marketplace" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:101 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:154 msgctxt "@text" -msgid "- Customize your experience with more print profiles and plugins" -msgstr "- Personalizza la tua esperienza con più profili di stampa e plugin" +msgid "Backup and sync your material settings and plugins" +msgstr "Esegui il backup e la sincronizzazione delle impostazioni materiale e dei plugin" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:184 msgctxt "@text" -msgid "- Stay flexible by syncing your setup and loading it anywhere" -msgstr "- Mantieni la flessibilità sincronizzando la configurazione e caricandola ovunque" +msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" +msgstr "Condividi idee e ottieni supporto da più di 48.000 utenti nella community di Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:217 msgctxt "@text" -msgid "- Increase efficiency with a remote workflow on Ultimaker printers" -msgstr "- Aumenta l'efficienza grazie a un flusso di lavoro remoto sulle stampanti Ultimaker" +msgid "Create a free Ultimaker Account" +msgstr "Crea un account Ultimaker gratuito" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:230 msgctxt "@button" msgid "Skip" msgstr "Salta" @@ -5382,29 +5467,32 @@ msgctxt "@button" msgid "Decline and close" msgstr "Rifiuta e chiudi" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:29 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" msgid "Welcome to Ultimaker Cura" msgstr "Benvenuto in Ultimaker Cura" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:68 msgctxt "@text" -msgid "" -"Please follow these steps to set up\n" -"Ultimaker Cura. This will only take a few moments." +msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." msgstr "" "Segui questa procedura per configurare\n" "Ultimaker Cura. Questa operazione richiederà solo pochi istanti." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:86 msgctxt "@button" msgid "Get started" msgstr "Per iniziare" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:28 msgctxt "@label" -msgid "What's new in Ultimaker Cura" -msgstr "Scopri le novità in Ultimaker Cura" +msgid "What's New" +msgstr "Scopri le novità" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Widgets/ComboBox.qml:24 +msgctxt "@label" +msgid "No items to select from" +msgstr "Nessun elemento da selezionare da" #: ModelChecker/plugin.json msgctxt "description" @@ -5486,6 +5574,16 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Writer profilo Cura" +#: DigitalLibrary/plugin.json +msgctxt "description" +msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." +msgstr "Si collega alla Digital Library, consentendo a Cura di aprire file e salvare file in Digital Library." + +#: DigitalLibrary/plugin.json +msgctxt "name" +msgid "Ultimaker Digital Library" +msgstr "Ultimaker Digital Library" + #: FirmwareUpdateChecker/plugin.json msgctxt "description" msgid "Checks for firmware updates." @@ -5956,6 +6054,26 @@ msgctxt "name" msgid "Version Upgrade 4.7 to 4.8" msgstr "Aggiornamento della versione da 4.7 a 4.8" +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." +msgstr "Aggiorna le configurazioni da Cura 4.8 a Cura 4.9." + +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.8 to 4.9" +msgstr "Aggiornamento della versione da 4.8 a 4.9" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." +msgstr "Aggiorna le configurazioni da Cura 4.9 a Cura 4.10." + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.9 to 4.10" +msgstr "Aggiornamento della versione da 4.9 a 4.10" + #: X3DReader/plugin.json msgctxt "description" msgid "Provides support for reading X3D files." @@ -5986,6 +6104,94 @@ msgctxt "name" msgid "X-Ray View" msgstr "Vista ai raggi X" +#~ msgctxt "@info:status" +#~ msgid "Global stack is missing." +#~ msgstr "Pila globale mancante." + +#~ msgctxt "@info:status" +#~ msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." +#~ msgstr "Il modello in uso non è multiforme. Le aree evidenziate indicano superfici mancanti o estranee." + +#~ msgctxt "@info:title" +#~ msgid "Model errors" +#~ msgstr "Errori modello" + +#~ msgctxt "@label:listbox" +#~ msgid "Layer thickness" +#~ msgstr "Spessore strato" + +#~ msgctxt "@label" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "La chiave per la stampa 3D connessa" + +#~ msgctxt "@text" +#~ msgid "" +#~ "- Customize your experience with more print profiles and plugins\n" +#~ "- Stay flexible by syncing your setup and loading it anywhere\n" +#~ "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "" +#~ "- Personalizza la tua esperienza con più profili di stampa e plugin\n" +#~ "- Mantieni la flessibilità sincronizzando la configurazione e caricandola ovunque\n" +#~ "- Aumenta l'efficienza grazie a un flusso di lavoro remoto sulle stampanti Ultimaker" + +#~ msgctxt "@button" +#~ msgid "Create account" +#~ msgstr "Crea account" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Delete Selected Model" +#~ msgid_plural "Delete Selected Models" +#~ msgstr[0] "Cancella modello selezionato" +#~ msgstr[1] "Cancella modelli selezionati" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Center Selected Model" +#~ msgid_plural "Center Selected Models" +#~ msgstr[0] "Centra modello selezionato" +#~ msgstr[1] "Centra modelli selezionati" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Multiply Selected Model" +#~ msgid_plural "Multiply Selected Models" +#~ msgstr[0] "Moltiplica modello selezionato" +#~ msgstr[1] "Moltiplica modelli selezionati" + +#~ msgctxt "@button" +#~ msgid "Finish" +#~ msgstr "Fine" + +#~ msgctxt "@label" +#~ msgid "Ultimaker Account" +#~ msgstr "Account Ultimaker" + +#~ msgctxt "@text" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "La chiave per la stampa 3D connessa" + +#~ msgctxt "@text" +#~ msgid "- Customize your experience with more print profiles and plugins" +#~ msgstr "- Personalizza la tua esperienza con più profili di stampa e plugin" + +#~ msgctxt "@text" +#~ msgid "- Stay flexible by syncing your setup and loading it anywhere" +#~ msgstr "- Mantieni la flessibilità sincronizzando la configurazione e caricandola ovunque" + +#~ msgctxt "@text" +#~ msgid "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "- Aumenta l'efficienza grazie a un flusso di lavoro remoto sulle stampanti Ultimaker" + +#~ msgctxt "@text" +#~ msgid "" +#~ "Please follow these steps to set up\n" +#~ "Ultimaker Cura. This will only take a few moments." +#~ msgstr "" +#~ "Segui questa procedura per configurare\n" +#~ "Ultimaker Cura. Questa operazione richiederà solo pochi istanti." + +#~ msgctxt "@label" +#~ msgid "What's new in Ultimaker Cura" +#~ msgstr "Scopri le novità in Ultimaker Cura" + #~ msgctxt "@label ({} is object name)" #~ msgid "Are you sure you wish to remove {}? This cannot be undone!" #~ msgstr "Desideri rimuovere {}? Questa operazione non può essere annullata!" diff --git a/resources/i18n/it_IT/fdmextruder.def.json.po b/resources/i18n/it_IT/fdmextruder.def.json.po index 6f8bb576b3..2b1b6af466 100644 --- a/resources/i18n/it_IT/fdmextruder.def.json.po +++ b/resources/i18n/it_IT/fdmextruder.def.json.po @@ -1,19 +1,20 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2019-03-13 14:00+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 14:58+0200\n" "Last-Translator: Bothof \n" "Language-Team: Italian\n" "Language: it_IT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.4.1\n" #: fdmextruder.def.json msgctxt "machine_settings label" diff --git a/resources/i18n/it_IT/fdmprinter.def.json.po b/resources/i18n/it_IT/fdmprinter.def.json.po index 7539cd64d8..0754a9374c 100644 --- a/resources/i18n/it_IT/fdmprinter.def.json.po +++ b/resources/i18n/it_IT/fdmprinter.def.json.po @@ -1,20 +1,20 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2020-08-21 13:40+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 14:58+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Italian , Italian \n" "Language: it_IT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.6\n" +"X-Generator: Poedit 2.4.1\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -419,6 +419,26 @@ msgctxt "machine_extruders_share_heater description" msgid "Whether the extruders share a single heater rather than each extruder having its own heater." msgstr "Indica se gli estrusori condividono un singolo riscaldatore piuttosto che avere ognuno il proprio." +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle label" +msgid "Extruders Share Nozzle" +msgstr "Estrusori condividono ugello" + +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle description" +msgid "Whether the extruders share a single nozzle rather than each extruder having its own nozzle. When set to true, it is expected that the printer-start gcode script properly sets up all extruders in an initial retraction state that is known and mutually compatible (either zero or one filament not retracted); in that case the initial retraction status is described, per extruder, by the 'machine_extruders_shared_nozzle_initial_retraction' parameter." +msgstr "Indica se gli estrusori condividono un singolo ugello piuttosto che avere ognuno il proprio. Se impostato su true, si prevede che lo script gcode di avvio della stampante imposti tutti gli estrusori su uno stato di retrazione iniziale noto e mutuamente compatibile (nessuno o un solo filamento non retratto); in questo caso lo stato di retrazione iniziale è descritto, per estrusore, dal parametro 'machine_extruders_shared_nozzle_initial_retraction'." + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction label" +msgid "Shared Nozzle Initial Retraction" +msgstr "Retrazione iniziale ugello condivisa" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction description" +msgid "How much the filament of each extruder is assumed to have been retracted from the shared nozzle tip at the completion of the printer-start gcode script; the value should be equal to or greater than the length of the common part of the nozzle's ducts." +msgstr "La quantità di filamento di ogni estrusore che si presume sia stata retratta dalla punta dell'ugello condiviso al termine dello script gcode di avvio stampante; il valore deve essere uguale o maggiore della lunghezza della parte comune dei condotti dell'ugello." + #: fdmprinter.def.json msgctxt "machine_disallowed_areas label" msgid "Disallowed Areas" @@ -486,8 +506,8 @@ msgstr "Offset con estrusore" #: fdmprinter.def.json msgctxt "machine_use_extruder_offset_to_offset_coords description" -msgid "Apply the extruder offset to the coordinate system." -msgstr "Applicare l’offset estrusore al sistema coordinate." +msgid "Apply the extruder offset to the coordinate system. Affects all extruders." +msgstr "Applica l’offset estrusore al sistema coordinate. Influisce su tutti gli estrusori." #: fdmprinter.def.json msgctxt "extruder_prime_pos_z label" @@ -881,8 +901,8 @@ msgstr "Moltiplicatore della larghezza della linea del primo strato Il suo aumen #: fdmprinter.def.json msgctxt "shell label" -msgid "Shell" -msgstr "Guscio" +msgid "Walls" +msgstr "Pareti" #: fdmprinter.def.json msgctxt "shell description" @@ -949,166 +969,6 @@ msgctxt "wall_0_wipe_dist description" msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better." msgstr "Distanza di spostamento inserita dopo la parete esterna per nascondere meglio la giunzione Z." -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr label" -msgid "Top Surface Skin Extruder" -msgstr "Estrusore rivestimento superficie superiore" - -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr description" -msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." -msgstr "Treno estrusore utilizzato per stampare il rivestimento più in alto. Si utilizza nell'estrusione multipla." - -#: fdmprinter.def.json -msgctxt "roofing_layer_count label" -msgid "Top Surface Skin Layers" -msgstr "Strati di rivestimento superficie superiore" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count description" -msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." -msgstr "Numero degli strati di rivestimento superiori. Solitamente è sufficiente un unico strato di sommità per ottenere superfici superiori di qualità elevata." - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr label" -msgid "Top/Bottom Extruder" -msgstr "Estrusore superiore/inferiore" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr description" -msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." -msgstr "Treno estrusore utilizzato per stampare il rivestimento superiore e quello inferiore. Si utilizza nell'estrusione multipla." - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness label" -msgid "Top/Bottom Thickness" -msgstr "Spessore dello strato superiore/inferiore" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness description" -msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." -msgstr "Indica lo spessore degli strati superiore/inferiore nella stampa. Questo valore diviso per la l’altezza dello strato definisce il numero degli strati superiori/inferiori." - -#: fdmprinter.def.json -msgctxt "top_thickness label" -msgid "Top Thickness" -msgstr "Spessore dello strato superiore" - -#: fdmprinter.def.json -msgctxt "top_thickness description" -msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." -msgstr "Indica lo spessore degli strati superiori nella stampa. Questo valore diviso per la l’altezza dello strato definisce il numero degli strati superiori." - -#: fdmprinter.def.json -msgctxt "top_layers label" -msgid "Top Layers" -msgstr "Strati superiori" - -#: fdmprinter.def.json -msgctxt "top_layers description" -msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." -msgstr "Indica il numero degli strati superiori. Quando calcolato mediante lo spessore dello strato superiore, il valore viene arrotondato a numero intero." - -#: fdmprinter.def.json -msgctxt "bottom_thickness label" -msgid "Bottom Thickness" -msgstr "Spessore degli strati inferiori" - -#: fdmprinter.def.json -msgctxt "bottom_thickness description" -msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." -msgstr "Indica lo spessore degli strati inferiori nella stampa. Questo valore diviso per la l’altezza dello strato definisce il numero degli strati inferiori." - -#: fdmprinter.def.json -msgctxt "bottom_layers label" -msgid "Bottom Layers" -msgstr "Strati inferiori" - -#: fdmprinter.def.json -msgctxt "bottom_layers description" -msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "Indica il numero degli strati inferiori. Quando calcolato mediante lo spessore dello strato inferiore, il valore viene arrotondato a numero intero." - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers label" -msgid "Initial Bottom Layers" -msgstr "Layer inferiori iniziali" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers description" -msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "Il numero di layer inferiori iniziali, dal piano di stampa verso l'alto. Quando viene calcolato mediante lo spessore inferiore, questo valore viene arrotondato a un numero intero." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern label" -msgid "Top/Bottom Pattern" -msgstr "Configurazione dello strato superiore/inferiore" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern description" -msgid "The pattern of the top/bottom layers." -msgstr "Indica la configurazione degli strati superiori/inferiori." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option lines" -msgid "Lines" -msgstr "Linee" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option concentric" -msgid "Concentric" -msgstr "Concentriche" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option zigzag" -msgid "Zig Zag" -msgstr "Zig Zag" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 label" -msgid "Bottom Pattern Initial Layer" -msgstr "Strato iniziale configurazione inferiore" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 description" -msgid "The pattern on the bottom of the print on the first layer." -msgstr "La configurazione al fondo della stampa sul primo strato." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option lines" -msgid "Lines" -msgstr "Linee" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option concentric" -msgid "Concentric" -msgstr "Concentriche" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option zigzag" -msgid "Zig Zag" -msgstr "Zig Zag" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons label" -msgid "Connect Top/Bottom Polygons" -msgstr "Collega poligoni superiori/inferiori" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." -msgstr "Collega i percorsi del rivestimento esterno superiore/inferiore quando corrono uno accanto all’altro. Per le configurazioni concentriche, l’abilitazione di questa impostazione riduce notevolmente il tempo di spostamento, tuttavia poiché i collegamenti possono aver luogo a metà del riempimento, con questa funzione la qualità della superficie superiore potrebbe risultare inferiore." - -#: fdmprinter.def.json -msgctxt "skin_angles label" -msgid "Top/Bottom Line Directions" -msgstr "Direzioni delle linee superiori/inferiori" - -#: fdmprinter.def.json -msgctxt "skin_angles description" -msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." -msgstr "Un elenco di direzioni linee intere da usare quando gli strati superiori/inferiori utilizzano le linee o la configurazione zig zag. Gli elementi dall’elenco sono utilizzati in sequenza con il progredire degli strati e, al raggiungimento della fine dell’elenco, la sequenza ricomincia dall’inizio. Le voci elencate sono separate da virgole e l’intero elenco è racchiuso tra parentesi quadre. L’elenco predefinito è vuoto, vale a dire che utilizza i valori angolari predefiniti (45 e 135 gradi)." - #: fdmprinter.def.json msgctxt "wall_0_inset label" msgid "Outer Wall Inset" @@ -1414,6 +1274,176 @@ msgctxt "z_seam_relative description" msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate." msgstr "Se abilitato, le coordinate della giunzione Z sono riferite al centro di ogni parte. Se disabilitato, le coordinate definiscono una posizione assoluta sul piano di stampa." +#: fdmprinter.def.json +msgctxt "top_bottom label" +msgid "Top/Bottom" +msgstr "Superiore / Inferiore" + +#: fdmprinter.def.json +msgctxt "top_bottom description" +msgid "Top/Bottom" +msgstr "Superiore / Inferiore" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr label" +msgid "Top Surface Skin Extruder" +msgstr "Estrusore rivestimento superficie superiore" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr description" +msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." +msgstr "Treno estrusore utilizzato per stampare il rivestimento più in alto. Si utilizza nell'estrusione multipla." + +#: fdmprinter.def.json +msgctxt "roofing_layer_count label" +msgid "Top Surface Skin Layers" +msgstr "Strati di rivestimento superficie superiore" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count description" +msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." +msgstr "Numero degli strati di rivestimento superiori. Solitamente è sufficiente un unico strato di sommità per ottenere superfici superiori di qualità elevata." + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr label" +msgid "Top/Bottom Extruder" +msgstr "Estrusore superiore/inferiore" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr description" +msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." +msgstr "Treno estrusore utilizzato per stampare il rivestimento superiore e quello inferiore. Si utilizza nell'estrusione multipla." + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness label" +msgid "Top/Bottom Thickness" +msgstr "Spessore dello strato superiore/inferiore" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness description" +msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." +msgstr "Indica lo spessore degli strati superiore/inferiore nella stampa. Questo valore diviso per la l’altezza dello strato definisce il numero degli strati superiori/inferiori." + +#: fdmprinter.def.json +msgctxt "top_thickness label" +msgid "Top Thickness" +msgstr "Spessore dello strato superiore" + +#: fdmprinter.def.json +msgctxt "top_thickness description" +msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." +msgstr "Indica lo spessore degli strati superiori nella stampa. Questo valore diviso per la l’altezza dello strato definisce il numero degli strati superiori." + +#: fdmprinter.def.json +msgctxt "top_layers label" +msgid "Top Layers" +msgstr "Strati superiori" + +#: fdmprinter.def.json +msgctxt "top_layers description" +msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." +msgstr "Indica il numero degli strati superiori. Quando calcolato mediante lo spessore dello strato superiore, il valore viene arrotondato a numero intero." + +#: fdmprinter.def.json +msgctxt "bottom_thickness label" +msgid "Bottom Thickness" +msgstr "Spessore degli strati inferiori" + +#: fdmprinter.def.json +msgctxt "bottom_thickness description" +msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." +msgstr "Indica lo spessore degli strati inferiori nella stampa. Questo valore diviso per la l’altezza dello strato definisce il numero degli strati inferiori." + +#: fdmprinter.def.json +msgctxt "bottom_layers label" +msgid "Bottom Layers" +msgstr "Strati inferiori" + +#: fdmprinter.def.json +msgctxt "bottom_layers description" +msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "Indica il numero degli strati inferiori. Quando calcolato mediante lo spessore dello strato inferiore, il valore viene arrotondato a numero intero." + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "Layer inferiori iniziali" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "Il numero di layer inferiori iniziali, dal piano di stampa verso l'alto. Quando viene calcolato mediante lo spessore inferiore, questo valore viene arrotondato a un numero intero." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern label" +msgid "Top/Bottom Pattern" +msgstr "Configurazione dello strato superiore/inferiore" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern description" +msgid "The pattern of the top/bottom layers." +msgstr "Indica la configurazione degli strati superiori/inferiori." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option lines" +msgid "Lines" +msgstr "Linee" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option concentric" +msgid "Concentric" +msgstr "Concentriche" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option zigzag" +msgid "Zig Zag" +msgstr "Zig Zag" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 label" +msgid "Bottom Pattern Initial Layer" +msgstr "Strato iniziale configurazione inferiore" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 description" +msgid "The pattern on the bottom of the print on the first layer." +msgstr "La configurazione al fondo della stampa sul primo strato." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option lines" +msgid "Lines" +msgstr "Linee" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option concentric" +msgid "Concentric" +msgstr "Concentriche" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option zigzag" +msgid "Zig Zag" +msgstr "Zig Zag" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons label" +msgid "Connect Top/Bottom Polygons" +msgstr "Collega poligoni superiori/inferiori" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons description" +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "Collega i percorsi del rivestimento esterno superiore/inferiore quando corrono uno accanto all’altro. Per le configurazioni concentriche, l’abilitazione di questa impostazione riduce notevolmente il tempo di spostamento, tuttavia poiché i collegamenti possono aver luogo a metà del riempimento, con questa funzione la qualità della superficie superiore potrebbe risultare inferiore." + +#: fdmprinter.def.json +msgctxt "skin_angles label" +msgid "Top/Bottom Line Directions" +msgstr "Direzioni delle linee superiori/inferiori" + +#: fdmprinter.def.json +msgctxt "skin_angles description" +msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." +msgstr "Un elenco di direzioni linee intere da usare quando gli strati superiori/inferiori utilizzano le linee o la configurazione zig zag. Gli elementi dall’elenco sono utilizzati in sequenza con il progredire degli strati e, al raggiungimento della fine dell’elenco, la sequenza ricomincia dall’inizio. Le voci elencate sono separate da virgole e l’intero elenco è racchiuso tra parentesi quadre. L’elenco predefinito è vuoto, vale a dire che utilizza i valori angolari predefiniti (45 e 135 gradi)." + #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" msgid "No Skin in Z Gaps" @@ -1554,6 +1584,86 @@ msgctxt "skin_overlap_mm description" msgid "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any value over half the width of the wall may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall." msgstr "Regolare l’entità della sovrapposizione tra le pareti e (i punti finali delle) linee centrali del rivestimento esterno. Una leggera sovrapposizione consente alle pareti di essere saldamente collegate al rivestimento. Si noti che, data una larghezza uguale del rivestimento esterno e della linea perimetrale, qualsiasi percentuale superiore alla metà della parete può già causare il superamento della parete da parte del rivestimento esterno in quanto, in quel punto, la posizione dell’ugello dell’estrusore del rivestimento esterno può già aver superato la parte centrale della parete." +#: fdmprinter.def.json +msgctxt "skin_preshrink label" +msgid "Skin Removal Width" +msgstr "Larghezza rimozione rivestimento" + +#: fdmprinter.def.json +msgctxt "skin_preshrink description" +msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." +msgstr "Larghezza massima delle aree di rivestimento che è possibile rimuovere. Ogni area di rivestimento più piccola di questo valore verrà eliminata. Questo può aiutare a limitare il tempo e il materiale necessari per la stampa del rivestimento superiore/inferiore sulle superfici inclinate del modello." + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink label" +msgid "Top Skin Removal Width" +msgstr "Larghezza rimozione rivestimento superiore" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink description" +msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." +msgstr "Larghezza massima delle aree di rivestimento superiore che è possibile rimuovere. Ogni area di rivestimento più piccola di questo valore verrà eliminata. Questo può aiutare a limitare il tempo e il materiale necessari per la stampa del rivestimento superiore sulle superfici inclinate del modello." + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink label" +msgid "Bottom Skin Removal Width" +msgstr "Larghezza rimozione rivestimento inferiore" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink description" +msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." +msgstr "Larghezza massima delle aree di rivestimento inferiore che è possibile rimuovere. Ogni area di rivestimento più piccola di questo valore verrà eliminata. Questo può aiutare a limitare il tempo e il materiale necessari per la stampa del rivestimento inferiore sulle superfici inclinate del modello." + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance label" +msgid "Skin Expand Distance" +msgstr "Distanza prolunga rivestimento esterno" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance description" +msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." +msgstr "Distanza per cui i rivestimenti si estendono nel riempimento. Valori maggiori migliorano l'aderenza del rivestimento al riempimento e consentono una migliore aderenza al rivestimento delle pareti degli strati adiacenti. Valori minori consentono di risparmiare sul materiale utilizzato." + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance label" +msgid "Top Skin Expand Distance" +msgstr "Distanza prolunga rivestimento superiore" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance description" +msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." +msgstr "Distanza per cui i rivestimenti superiori si estendono nel riempimento. Valori maggiori migliorano l'aderenza del rivestimento al riempimento e consentono una migliore aderenza al rivestimento delle pareti dello strato superiore. Valori minori consentono di risparmiare sul materiale utilizzato." + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance label" +msgid "Bottom Skin Expand Distance" +msgstr "Distanza prolunga rivestimento inferiore" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance description" +msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." +msgstr "Distanza per cui i rivestimenti inferiori si estendono nel riempimento. Valori maggiori migliorano l'aderenza del rivestimento al riempimento e consentono una migliore aderenza al rivestimento delle pareti dello strato inferiore. Valori minori consentono di risparmiare sul materiale utilizzato." + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion label" +msgid "Maximum Skin Angle for Expansion" +msgstr "Angolo massimo rivestimento esterno per prolunga" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion description" +msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded." +msgstr "Nelle superfici superiore e/o inferiore dell'oggetto con un angolo più grande di questa impostazione, il rivestimento esterno non sarà prolungato. Questo evita il prolungamento delle aree del rivestimento esterno strette che vengono create quando la pendenza della superficie del modello è quasi verticale. Un angolo di 0° è orizzontale e non causa il prolungamento di alcun rivestimento esterno, mentre un angolo di 90° è verticale e causa il prolungamento di tutto il rivestimento esterno." + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion label" +msgid "Minimum Skin Width for Expansion" +msgstr "Larghezza minima rivestimento esterno per prolunga" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion description" +msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." +msgstr "Le aree del rivestimento esterno inferiori a questa non vengono prolungate. In tal modo si evita di prolungare le aree del rivestimento esterno strette che vengono create quando la superficie del modello presenta un’inclinazione quasi verticale." + #: fdmprinter.def.json msgctxt "infill label" msgid "Infill" @@ -1863,86 +1973,6 @@ msgctxt "infill_support_angle description" msgid "The minimum angle of internal overhangs for which infill is added. At a value of 0° objects are totally filled with infill, 90° will not provide any infill." msgstr "L'angolo minimo degli sbalzi interni per il quale viene aggiunto il riempimento. Per un valore corrispondente a 0°, gli oggetti sono completamente riempiti di materiale, per un valore corrispondente a 90° non è previsto riempimento." -#: fdmprinter.def.json -msgctxt "skin_preshrink label" -msgid "Skin Removal Width" -msgstr "Larghezza rimozione rivestimento" - -#: fdmprinter.def.json -msgctxt "skin_preshrink description" -msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." -msgstr "Larghezza massima delle aree di rivestimento che è possibile rimuovere. Ogni area di rivestimento più piccola di questo valore verrà eliminata. Questo può aiutare a limitare il tempo e il materiale necessari per la stampa del rivestimento superiore/inferiore sulle superfici inclinate del modello." - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink label" -msgid "Top Skin Removal Width" -msgstr "Larghezza rimozione rivestimento superiore" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink description" -msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." -msgstr "Larghezza massima delle aree di rivestimento superiore che è possibile rimuovere. Ogni area di rivestimento più piccola di questo valore verrà eliminata. Questo può aiutare a limitare il tempo e il materiale necessari per la stampa del rivestimento superiore sulle superfici inclinate del modello." - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink label" -msgid "Bottom Skin Removal Width" -msgstr "Larghezza rimozione rivestimento inferiore" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink description" -msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." -msgstr "Larghezza massima delle aree di rivestimento inferiore che è possibile rimuovere. Ogni area di rivestimento più piccola di questo valore verrà eliminata. Questo può aiutare a limitare il tempo e il materiale necessari per la stampa del rivestimento inferiore sulle superfici inclinate del modello." - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance label" -msgid "Skin Expand Distance" -msgstr "Distanza prolunga rivestimento esterno" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance description" -msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." -msgstr "Distanza per cui i rivestimenti si estendono nel riempimento. Valori maggiori migliorano l'aderenza del rivestimento al riempimento e consentono una migliore aderenza al rivestimento delle pareti degli strati adiacenti. Valori minori consentono di risparmiare sul materiale utilizzato." - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance label" -msgid "Top Skin Expand Distance" -msgstr "Distanza prolunga rivestimento superiore" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance description" -msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." -msgstr "Distanza per cui i rivestimenti superiori si estendono nel riempimento. Valori maggiori migliorano l'aderenza del rivestimento al riempimento e consentono una migliore aderenza al rivestimento delle pareti dello strato superiore. Valori minori consentono di risparmiare sul materiale utilizzato." - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance label" -msgid "Bottom Skin Expand Distance" -msgstr "Distanza prolunga rivestimento inferiore" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance description" -msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." -msgstr "Distanza per cui i rivestimenti inferiori si estendono nel riempimento. Valori maggiori migliorano l'aderenza del rivestimento al riempimento e consentono una migliore aderenza al rivestimento delle pareti dello strato inferiore. Valori minori consentono di risparmiare sul materiale utilizzato." - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion label" -msgid "Maximum Skin Angle for Expansion" -msgstr "Angolo massimo rivestimento esterno per prolunga" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion description" -msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." -msgstr "Per le superfici inferiori e/o superiori dell’oggetto con un angolo maggiore di questa impostazione non verrà prolungato il rivestimento esterno superiore/inferiore. In tal modo si evita di prolungare le aree del rivestimento esterno strette create quando la superficie del modello ha un’inclinazione prossima al verticale. Un angolo di 0° è orizzontale, mentre un angolo di 90° è verticale." - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion label" -msgid "Minimum Skin Width for Expansion" -msgstr "Larghezza minima rivestimento esterno per prolunga" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion description" -msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." -msgstr "Le aree del rivestimento esterno inferiori a questa non vengono prolungate. In tal modo si evita di prolungare le aree del rivestimento esterno strette che vengono create quando la superficie del modello presenta un’inclinazione quasi verticale." - #: fdmprinter.def.json msgctxt "skin_edge_support_thickness label" msgid "Skin Edge Support Thickness" @@ -2071,8 +2101,7 @@ msgstr "Temperatura piano di stampa Strato iniziale" #: fdmprinter.def.json msgctxt "material_bed_temperature_layer_0 description" msgid "The temperature used for the heated build plate at the first layer. If this is 0, the build plate is left unheated during the first layer." -msgstr "Indica la temperatura usata per il piano di stampa riscaldato per il primo strato. Se questo valore è 0, il piano di stampa viene lasciato non riscaldato" -" per il primo strato." +msgstr "Indica la temperatura usata per il piano di stampa riscaldato per il primo strato. Se questo valore è 0, il piano di stampa viene lasciato non riscaldato per il primo strato." #: fdmprinter.def.json msgctxt "material_adhesion_tendency label" @@ -2561,8 +2590,8 @@ msgstr "Velocità di stampa dello strato iniziale" #: fdmprinter.def.json msgctxt "speed_layer_0 description" -msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." -msgstr "Indica la velocità per lo strato iniziale. Un valore inferiore è consigliabile per migliorare l’adesione al piano di stampa." +msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate. Does not affect the build plate adhesion structures themselves, like brim and raft." +msgstr "La velocità dello strato iniziale. È consigliabile un valore inferiore per migliorare l'adesione al piano di stampa. Non influisce sulle strutture di adesione del piano di stampa stesse, come brim e raft." #: fdmprinter.def.json msgctxt "speed_print_layer_0 label" @@ -3171,8 +3200,9 @@ msgstr "Massima distanza di combing senza retrazione" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" -msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." -msgstr "Per un valore diverso da zero, le corse di spostamento in modalità combing superiori a tale distanza utilizzeranno la retrazione." +msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." +msgstr "Per un valore superiore a zero, le corse di spostamento in modalità combing superiori a tale distanza utilizzeranno la retrazione. Se il valore impostato" +" è zero, non è presente un valore massimo e le corse in modalità combing non utilizzeranno la retrazione." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" @@ -5075,10 +5105,8 @@ msgstr "Classificazione dell'elaborazione delle maglie" #: fdmprinter.def.json msgctxt "infill_mesh_order description" -msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." -msgstr "Determina la priorità di questa mesh quando si considera la sovrapposizione multipla delle mesh di riempimento. Per le aree con la sovrapposizione di più" -" mesh di riempimento verranno utilizzate le impostazioni della mesh con la classificazione più bassa. Una mesh di riempimento con un ordine più alto modificherà" -" il riempimento delle mesh di riempimento con un ordine inferiore e delle mesh normali." +msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the highest rank. An infill mesh with a higher rank will modify the infill of infill meshes with lower rank and normal meshes." +msgstr "Determina la priorità di questa mesh quando si considera la sovrapposizione multipla delle mesh di riempimento. Per le aree con la sovrapposizione di più mesh di riempimento verranno utilizzate le impostazioni della mesh con la classificazione più alta. Una mesh di riempimento con una classificazione più alta modificherà il riempimento delle mesh di riempimento con una classificazione inferiore e delle mesh normali." #: fdmprinter.def.json msgctxt "cutting_mesh label" @@ -5425,6 +5453,16 @@ msgctxt "conical_overhang_angle description" msgid "The maximum angle of overhangs after the they have been made printable. At a value of 0° all overhangs are replaced by a piece of model connected to the build plate, 90° will not change the model in any way." msgstr "L’angolo massimo degli sbalzi dopo essere stati resi stampabili. A un valore di 0° tutti gli sbalzi sono sostituiti da un pezzo del modello collegato al piano di stampa, 90° non cambia il modello in alcun modo." +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size label" +msgid "Maximum Overhang Hole Area" +msgstr "Area foro di sbalzo massima" + +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size description" +msgid "The maximum area of a hole in the base of the model before it's removed by Make Overhang Printable. Holes smaller than this will be retained. A value of 0 mm² will fill all holes in the models base." +msgstr "L'area massima di un foro nella base del modello prima che venga rimossa da Rendi stampabile lo sbalzo. I fori più piccoli di questo verranno mantenuti. Un valore di 0 mm² riempirà i fori nella base del modello." + #: fdmprinter.def.json msgctxt "coasting_enable label" msgid "Enable Coasting" @@ -6364,6 +6402,30 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Matrice di rotazione da applicare al modello quando caricato dal file." +#~ msgctxt "retraction_combing_max_distance description" +#~ msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." +#~ msgstr "Per un valore diverso da zero, le corse di spostamento in modalità combing superiori a tale distanza utilizzeranno la retrazione." + +#~ msgctxt "machine_use_extruder_offset_to_offset_coords description" +#~ msgid "Apply the extruder offset to the coordinate system." +#~ msgstr "Applicare l’offset estrusore al sistema coordinate." + +#~ msgctxt "shell label" +#~ msgid "Shell" +#~ msgstr "Guscio" + +#~ msgctxt "max_skin_angle_for_expansion description" +#~ msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." +#~ msgstr "Per le superfici inferiori e/o superiori dell’oggetto con un angolo maggiore di questa impostazione non verrà prolungato il rivestimento esterno superiore/inferiore. In tal modo si evita di prolungare le aree del rivestimento esterno strette create quando la superficie del modello ha un’inclinazione prossima al verticale. Un angolo di 0° è orizzontale, mentre un angolo di 90° è verticale." + +#~ msgctxt "speed_layer_0 description" +#~ msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." +#~ msgstr "Indica la velocità per lo strato iniziale. Un valore inferiore è consigliabile per migliorare l’adesione al piano di stampa." + +#~ msgctxt "infill_mesh_order description" +#~ msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." +#~ msgstr "Determina la priorità di questa mesh quando si considera la sovrapposizione multipla delle mesh di riempimento. Per le aree con la sovrapposizione di più mesh di riempimento verranno utilizzate le impostazioni della mesh con la classificazione più bassa. Una mesh di riempimento con un ordine più alto modificherà il riempimento delle mesh di riempimento con un ordine inferiore e delle mesh normali." + #~ msgctxt "material_bed_temperature description" #~ msgid "The temperature used for the heated build plate. If this is 0, the bed temperature will not be adjusted." #~ msgstr "Indica la temperatura usata per il piano di stampa riscaldato. Se è 0, la temperatura del piano non si regola." diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index 4344a6da8d..c170d3ba8e 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -1,13 +1,13 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0200\n" -"PO-Revision-Date: 2020-08-21 13:40+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0200\n" +"PO-Revision-Date: 2021-04-16 15:00+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Japanese , Japanese \n" "Language: ja_JP\n" @@ -15,12 +15,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.2.4\n" +"X-Generator: Poedit 2.4.1\n" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1581 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 msgctxt "@label" @@ -91,12 +91,12 @@ msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "ドラフトプロファイルは、プリント時間の大幅短縮を目的とした初期プロトタイプとコンセプト検証をプリントするために設計されています。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:226 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:234 msgctxt "@label" msgid "Custom Material" msgstr "カスタムフィラメント" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:227 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 msgctxt "@label" msgid "Custom" @@ -118,7 +118,7 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "全てのファイル" -#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:178 +#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:181 msgctxt "@info:title" msgid "Login failed" msgstr "ログインに失敗しました" @@ -148,28 +148,33 @@ msgctxt "@info:title" msgid "Can't Find Location" msgstr "位置を確保できません" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:104 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:116 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "ユーザーデータディレクトリからアーカイブを作成できません: {}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:110 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 msgctxt "@info:title" msgid "Backup" msgstr "バックアップ" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:123 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:135 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "適切なデータまたはメタデータがないのにCuraバックアップをリストアしようとしました。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:134 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:146 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that is higher than the current version." msgstr "現行バージョンより上の Cura バックアップをリストアしようとしました。" +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 +msgctxt "@info:backup_failed" +msgid "The following error occurred while trying to restore a Cura backup:" +msgstr "Curaのバックアップのリストア中に次のエラーが発生しました。" + #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -319,74 +324,74 @@ msgctxt "@action:button" msgid "Send report" msgstr "レポート送信" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:521 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:527 msgctxt "@info:progress" msgid "Loading machines..." msgstr "プリンターを読み込み中..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:528 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:534 msgctxt "@info:progress" msgid "Setting up preferences..." msgstr "プレファレンスをセットアップ中..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:657 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:672 msgctxt "@info:progress" msgid "Initializing Active Machine..." msgstr "アクティブなプリンターを初期化中..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:803 msgctxt "@info:progress" msgid "Initializing machine manager..." msgstr "プリンターマネージャーを初期化中..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:802 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:817 msgctxt "@info:progress" msgid "Initializing build volume..." msgstr "ビルドボリュームを初期化中..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:870 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:888 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "シーンをセットアップ中..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:906 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:924 msgctxt "@info:progress" msgid "Loading interface..." msgstr "インターフェイスを読み込み中..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:911 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:929 msgctxt "@info:progress" msgid "Initializing engine..." msgstr "エンジンを初期化中..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1221 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1246 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1777 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1799 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "一度に一つのG-codeしか読み取れません。{0}の取り込みをスキップしました。" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1778 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:188 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 msgctxt "@info:title" msgid "Warning" msgstr "警告" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1787 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1809 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "G-codeを読み込み中は他のファイルを開くことができません。{0}の取り込みをスキップしました。" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 @@ -409,7 +414,7 @@ msgctxt "@info:title" msgid "Placing Object" msgstr "造形データを配置" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:92 msgctxt "@message" msgid "Could not read response." msgstr "応答を読み取れません。" @@ -429,12 +434,12 @@ msgctxt "@message" msgid "Something unexpected happened when trying to log in, please try again." msgstr "ログイン時に予期しないエラーが発生しました。やり直してください。" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:187 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:189 msgctxt "@info" msgid "Unable to start a new sign in process. Check if another sign in attempt is still active." msgstr "新しいサインインプロセスを開始できません。別のサインインの試行がアクティブなままになっていないか確認します。" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Ultimaker アカウントサーバーに到達できません。" @@ -452,8 +457,8 @@ msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "{0} は既に存在します。ファイルを上書きしますか？" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:452 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:455 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "無効なファイルのURL:" @@ -536,33 +541,33 @@ msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "プロファイル{0}は不特定なファイルまたは破損があります。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:423 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:426 msgctxt "@label" msgid "Custom profile" msgstr "カスタムプロファイル" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:439 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:442 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "プロファイルはクオリティータイプが不足しています。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:443 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:446 msgctxt "@info:status" -msgid "Global stack is missing." -msgstr "グローバルスタックがありません。" +msgid "There is no active printer yet." +msgstr "アクティブなプリンターはありません。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:449 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:452 msgctxt "@info:status" msgid "Unable to add the profile." msgstr "プロファイルを追加できません。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:463 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:466 #, python-brace-format msgctxt "@info:status" msgid "Quality type '{0}' is not compatible with the current active machine definition '{1}'." msgstr "クオリティータイプ「{0}」は、現在アクティブなプリンター定義「{1}」と互換性がありません。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:468 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:471 #, python-brace-format msgctxt "@info:status" msgid "Warning: The profile is not visible because its quality type '{0}' is not available for the current configuration. Switch to a material/nozzle combination that can use this quality type." @@ -578,23 +583,23 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:712 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 msgctxt "@label" msgid "Nozzle" msgstr "ノズル" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:860 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:856 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "現在利用可能な次のエクストルーダーに合わせて設定が変更されました:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:862 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:858 msgctxt "@info:title" msgid "Settings updated" msgstr "設定が更新されました" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1447 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1478 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "エクストルーダーを無効にしました" @@ -607,13 +612,13 @@ msgid "Add" msgstr "追加" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:263 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 msgctxt "@action:button" msgid "Finish" msgstr "終わる" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 #: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 #: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 @@ -621,7 +626,7 @@ msgstr "終わる" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 msgctxt "@action:button" msgid "Cancel" @@ -633,76 +638,83 @@ msgctxt "@label" msgid "Group #{group_nr}" msgstr "グループ #{group_nr}" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "アウターウォール" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "インナーウォール" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "スキン" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "インフィル" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "サポートイルフィル" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "サポートインターフェイス" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "サポート" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "スカート" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 msgctxt "@tooltip" msgid "Prime Tower" msgstr "プライムタワー" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 msgctxt "@tooltip" msgid "Travel" msgstr "移動" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 msgctxt "@tooltip" msgid "Retractions" msgstr "退却" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:94 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 msgctxt "@tooltip" msgid "Other" msgstr "他" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 msgctxt "@action:button" msgid "Next" msgstr "次" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 +msgctxt "@action:button" +msgid "Skip" +msgstr "スキップ" + +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:173 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 msgctxt "@action:button" msgid "Close" @@ -727,29 +739,36 @@ msgstr "" "

    可能な限り最高の品質および信頼性を得る方法をご覧ください。

    \n" "

    印字品質ガイドを見る

    " -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:535 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:540 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "プロジェクトファイル {0} に不明なマシンタイプ {1} があります。マシンをインポートできません。代わりにモデルをインポートします。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:538 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:543 msgctxt "@info:title" msgid "Open Project File" msgstr "プロジェクトファイルを開く" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:634 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:639 #, python-brace-format msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "プロジェクトファイル{0}が突然アクセスできなくなりました：{1}。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:635 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "プロジェクトファイルを開けません" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:686 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:646 +#, python-brace-format +msgctxt "@info:error Don't translate the XML tags or !" +msgid "Project file {0} is corrupt: {1}." +msgstr "プロジェクトファイル{0}は破損しています：{1}。" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:698 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." @@ -787,7 +806,7 @@ msgctxt "@error:zip" msgid "The operating system does not allow saving a project file to this location or with this file name." msgstr "使用しているオペレーティングシステムでは、この場所またはこのファイル名でプロジェクトファイルを保存することはできません。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:206 msgctxt "@error:zip" msgid "Error writing 3mf file." msgstr "3Mf ファイルの書き込みエラー。" @@ -842,8 +861,8 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "バックアップが最大ファイルサイズを超えています。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:23 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "バックアップのリストア中にエラーが発生しました。" @@ -853,45 +872,45 @@ msgctxt "@item:inmenu" msgid "Manage backups" msgstr "バックアップを管理する" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "選ばれたプリンターまたは選ばれたプリント構成が異なるため進行中の材料にてスライスを完了できません。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:411 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:420 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:429 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 msgctxt "@info:title" msgid "Unable to slice" msgstr "スライスできません" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:412 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "現在の設定でスライスが完了できません。以下の設定にエラーがあります: {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:410 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:436 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "モデル別の設定があるためスライスできません。1つまたは複数のモデルで以下の設定にエラーが発生しました：{error_labels}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:445 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "プライムタワーまたはプライム位置が無効なためスライスできません。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:428 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:454 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "無効な Extruder %s に関連付けられている造形物があるため、スライスできません。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:463 msgctxt "@info:status" msgid "" "Please review settings and check if your models:\n" @@ -1160,28 +1179,28 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "リムーバブルドライブ" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:121 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:128 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled." msgstr "Curaはワイヤープリンティングが有効な場合は正確にレイヤーを表示しません。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:129 msgctxt "@info:title" msgid "Simulation View" msgstr "シミュレーションビュー" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:status" msgid "Nothing is shown because you need to slice first." msgstr "最初にスライスする必要があるため、何も表示されません。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:title" msgid "No layers to show" msgstr "表示するレイヤーがありません" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:124 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "今後このメッセージを表示しない" @@ -1191,16 +1210,21 @@ msgctxt "@item:inlistbox" msgid "Layer view" msgstr "レイヤービュー" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:70 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:71 msgctxt "@info:status" -msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." -msgstr "モデルはマニホールドではありません。ハイライトされたエリアは、欠けている表面または無関係な表面を示します。" +msgid "The highlighted areas indicate either missing or extraneous surfaces. Fix your model and open it again into Cura." +msgstr "ハイライトされたエリアは、欠けている表面または無関係な表面を示します。モデルを修正してもう一度Curaを開いてください。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 msgctxt "@info:title" -msgid "Model errors" +msgid "Model Errors" msgstr "モデルエラー" +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:79 +msgctxt "@action:button" +msgid "Learn more" +msgstr "詳しく見る" + #: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/__init__.py:12 msgctxt "@item:inmenu" msgid "Solid view" @@ -1227,7 +1251,7 @@ msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "Ultimakerアカウントから変更が検出されました" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:145 msgctxt "@action:button" msgid "Sync" msgstr "同期" @@ -1263,7 +1287,7 @@ msgctxt "@info:generic" msgid "You need to quit and restart {} before changes have effect." msgstr "変更を有効にするために{}を終了して再始動する必要があります。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:79 msgctxt "@info:generic" msgid "{} plugins failed to download" msgstr "{}プラグインのダウンロードに失敗しました" @@ -1304,7 +1328,11 @@ msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimakerフォーマットパッケージ" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "UFPファイルに書き込めません：" @@ -1319,22 +1347,22 @@ msgctxt "@action" msgid "Select upgrades" msgstr "アップグレードを選択する" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:152 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 msgctxt "@action:button" msgid "Print via cloud" msgstr "クラウドからプリントする" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:155 msgctxt "@properties:tooltip" msgid "Print via cloud" msgstr "クラウドからプリントする" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:156 msgctxt "@info:status" msgid "Connected via cloud" msgstr "クラウド経由で接続" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:264 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:270 #, python-brace-format msgctxt "@error:send" msgid "Unknown error code when uploading print job: {0}" @@ -1430,14 +1458,18 @@ msgid "" msgid_plural "" "You are about to remove {0} printers from Cura. This action cannot be undone.\n" "Are you sure you want to continue?" -msgstr[0] "Curaから{0}台のプリンターを削除しようとしています。この操作は元に戻せません。\n続行してもよろしいですか？" +msgstr[0] "" +"Curaから{0}台のプリンターを削除しようとしています。この操作は元に戻せません。\n" +"続行してもよろしいですか？" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:468 msgctxt "@label" msgid "" "You are about to remove all printers from Cura. This action cannot be undone.\n" "Are you sure you want to continue?" -msgstr "Curaからすべてのプリンターを削除しようとしています。この操作は元に戻せません。\n続行してもよろしいですか？" +msgstr "" +"Curaからすべてのプリンターを削除しようとしています。この操作は元に戻せません。\n" +"続行してもよろしいですか？" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py:27 msgctxt "@info:status" @@ -1621,90 +1653,90 @@ msgctxt "@info:tooltip" msgid "Some things could be problematic in this print. Click to see tips for adjustment." msgstr "このプリントの何かが問題です。クリックして調整のヒントをご覧ください。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:15 msgctxt "@title:window" msgid "Open Project" msgstr "プロジェクトを開く" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" msgstr "既存を更新する" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:63 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "新しいものを作成する" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "サマリーCuraプロジェクト" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 msgctxt "@action:label" msgid "Printer settings" msgstr "プリンターの設定" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:112 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:113 msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "このプリンターの問題をどのように解決すればいいか？" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:165 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 msgctxt "@action:label" msgid "Type" msgstr "タイプ" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:181 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 msgctxt "@action:label" msgid "Printer Group" msgstr "プリンターグループ" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:203 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 msgctxt "@action:label" msgid "Profile settings" msgstr "プロファイル設定" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:219 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:221 msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "このプロファイルの問題をどのように解決すればいいか？" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:349 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 msgctxt "@action:label" msgid "Name" msgstr "ネーム" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:255 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 msgctxt "@action:label" msgid "Intent" msgstr "Intent" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:271 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Not in profile" msgstr "プロファイル内にない" # Can’t edit the Japanese text -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:276 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1個の設定を上書き" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:287 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:290 msgctxt "@action:label" msgid "Derivative from" msgstr "次から引き出す" @@ -1712,48 +1744,48 @@ msgstr "次から引き出す" # can’t inset the japanese text # %1: print quality profile name # %2: number of overridden ssettings -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:295 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%2の%1個の設定を上書き" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:309 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:312 msgctxt "@action:label" msgid "Material settings" msgstr "フィラメント設定" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:328 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "このフィラメントの問題をどのように解決すればいいか？" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:369 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:373 msgctxt "@action:label" msgid "Setting visibility" msgstr "視野設定" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:378 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:382 msgctxt "@action:label" msgid "Mode" msgstr "モード" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:label" msgid "Visible settings:" msgstr "ビジブル設定:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:399 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:403 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%2のうち%1" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:425 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:429 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "プロジェクトを読み込むとビルドプレート上のすべてのモデルがクリアされます。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:457 msgctxt "@action:button" msgid "Open" msgstr "開く" @@ -1855,8 +1887,8 @@ msgstr "Cura のバックアップおよび同期を設定します。" #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:68 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:125 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:199 msgctxt "@button" msgid "Sign in" msgstr "サインイン" @@ -2090,12 +2122,12 @@ msgctxt "@label" msgid "Cooling Fan Number" msgstr "冷却ファンの番号" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:163 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "エクストルーダーがG-Codeを開始する" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:177 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "エクストルーダーがG-Codeを終了する" @@ -2180,12 +2212,17 @@ msgctxt "@label" msgid "Number of Extruders" msgstr "エクストルーダーの数" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:345 +msgctxt "@label" +msgid "Apply Extruder offsets to GCode" +msgstr "エクストルーダーのオフセットをGCodeに適用します" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:393 msgctxt "@title:label" msgid "Start G-code" msgstr "G-Codeの開始" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:385 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:404 msgctxt "@title:label" msgid "End G-code" msgstr "G-codeの終了" @@ -2212,6 +2249,11 @@ msgctxt "@label link to technical assistance" msgid "View user manuals online" msgstr "ユーザーマニュアルをオンラインで見る" +#: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 +msgctxt "@info" +msgid "In order to monitor your print from Cura, please connect the printer." +msgstr "Cura から印刷を監視するには、プリンタを接続してください。" + #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" msgid "Mesh Type" @@ -2258,7 +2300,7 @@ msgid "Select Settings to Customize for this model" msgstr "このモデルをカスタマイズする設定を選択する" #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 msgctxt "@label:textbox" msgid "Filter..." msgstr "フィルター..." @@ -2268,32 +2310,32 @@ msgctxt "@label:checkbox" msgid "Show all" msgstr "すべて表示する" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:20 msgctxt "@title:window" msgid "Post Processing Plugin" msgstr "プラグイン処理後" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:59 msgctxt "@label" msgid "Post Processing Scripts" msgstr "スクリプトの処理後" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:235 msgctxt "@action" msgid "Add a script" msgstr "スクリプトを加える" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:282 msgctxt "@label" msgid "Settings" msgstr "設定" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:499 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:502 msgctxt "@info:tooltip" msgid "Change active post-processing scripts." msgstr "処理したアクティブなスクリプトを変更します。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:506 msgctxt "@info:tooltip" msgid "The following script is active:" msgid_plural "The following scripts are active:" @@ -2305,78 +2347,93 @@ msgctxt "@label" msgid "Color scheme" msgstr "カラースキーム" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:110 msgctxt "@label:listbox" msgid "Material Color" msgstr "フィラメントの色" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:111 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:114 msgctxt "@label:listbox" msgid "Line Type" msgstr "ラインタイプ" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:115 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:118 msgctxt "@label:listbox" msgid "Speed" msgstr "スピード" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:122 msgctxt "@label:listbox" -msgid "Layer thickness" +msgid "Layer Thickness" msgstr "レイヤーの厚さ" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:126 +msgctxt "@label:listbox" +msgid "Line Width" +msgstr "ライン幅" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 +msgctxt "@label:listbox" +msgid "Flow" +msgstr "フロー" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" msgid "Compatibility Mode" msgstr "コンパティビリティモード" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:230 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:245 msgctxt "@label" msgid "Travels" msgstr "移動" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:251 msgctxt "@label" msgid "Helpers" msgstr "ヘルプ" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:257 msgctxt "@label" msgid "Shell" msgstr "外郭" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:248 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 msgctxt "@label" msgid "Infill" msgstr "インフィル" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:298 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:271 +msgctxt "@label" +msgid "Starts" +msgstr "開始" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 msgctxt "@label" msgid "Only Show Top Layers" msgstr "トップのレイヤーを表示する" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:308 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:332 msgctxt "@label" msgid "Show 5 Detailed Layers On Top" msgstr "トップの5レイヤーの詳細を表示する" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:346 msgctxt "@label" msgid "Top / Bottom" msgstr "トップ/ボトム" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:350 msgctxt "@label" msgid "Inner Wall" msgstr "インナーウォール" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:384 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:419 msgctxt "@label" msgid "min" msgstr "最小" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:433 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:488 msgctxt "@label" msgid "max" msgstr "最大" @@ -2517,7 +2574,7 @@ msgid "Plugins" msgstr "プラグイン" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 msgctxt "@title:tab" msgid "Materials" @@ -2566,6 +2623,7 @@ msgstr "無視" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:178 msgctxt "@button" msgid "Next" msgstr "次" @@ -2908,7 +2966,7 @@ msgid "Delete" msgstr "削除" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:289 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 msgctxt "@label" msgid "Resume" msgstr "再開" @@ -2924,8 +2982,8 @@ msgid "Resuming..." msgstr "再開しています..." #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 msgctxt "@label" msgid "Pause" msgstr "一時停止" @@ -2966,7 +3024,7 @@ msgid "Are you sure you want to abort %1?" msgstr "%1 を中止してよろしいですか？" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 msgctxt "@window:title" msgid "Abort print" msgstr "プリント中止" @@ -2977,7 +3035,7 @@ msgid "Manage printer" msgstr "プリンター管理" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." @@ -3003,27 +3061,34 @@ msgctxt "@label:status" msgid "Idle" msgstr "アイドル" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:365 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +msgctxt "@label:status" +msgid "Preparing..." +msgstr "準備中..." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:369 msgctxt "@label:status" msgid "Printing" msgstr "プリント中" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:406 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:410 msgctxt "@label" msgid "Untitled" msgstr "無題" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:431 msgctxt "@label" msgid "Anonymous" msgstr "匿名" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:458 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "構成の変更が必要です" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:492 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:496 msgctxt "@action:button" msgid "Details" msgstr "詳細" @@ -3050,12 +3115,6 @@ msgctxt "@label:status" msgid "Finished" msgstr "終了" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -msgctxt "@label:status" -msgid "Preparing..." -msgstr "準備中..." - #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." @@ -3136,27 +3195,27 @@ msgctxt "@action:button" msgid "Sign in" msgstr "サインイン" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" -msgid "Your key to connected 3D printing" -msgstr "3Dプリンティング活用の鍵" +msgid "Sign in to the Ultimaker platform" +msgstr "Ultimakerのプラットフォームにサインイン" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:42 msgctxt "@text" msgid "" -"- Customize your experience with more print profiles and plugins\n" -"- Stay flexible by syncing your setup and loading it anywhere\n" -"- Increase efficiency with a remote workflow on Ultimaker printers" +"- Add material profiles and plug-ins from the Marketplace\n" +"- Back-up and sync your material profiles and plug-ins\n" +"- Share ideas and get help from 48,000+ users in the Ultimaker community" msgstr "" -"- より多くのプリントプロファイルとプラグインを使用して作業をカスタマイズする\n" -"- 設定を同期させ、どこにでも読み込めるようにすることで柔軟性を保つ\n" -"- Ultimakerプリンターのリモートワークフローを活用して効率を高める" +"- マーケットプレースから材料プロファイルとプラグインを追加\n" +"- 材料プロファイルとプラグインのバックアップと同期\n" +"- Ultimakerコミュニティで48,000人以上のユーザーとアイデアを共有してアドバイスをもらう" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:142 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:62 msgctxt "@button" -msgid "Create account" -msgstr "アカウントを作成する" +msgid "Create a free Ultimaker account" +msgstr "無料のUltimakerアカウントを作成" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/SyncState.qml:28 msgctxt "@label" @@ -3263,309 +3322,308 @@ msgctxt "@button" msgid "Cancel" msgstr "キャンセル" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:83 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "オンラインでトラブルシューティングガイドを表示する" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:90 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "留め金 フルスクリーン" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:98 msgctxt "@action:inmenu" msgid "Exit Full Screen" msgstr "全画面表示を終了する" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:105 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&取り消す" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:115 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&やりなおす" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:125 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&やめる" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:132 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:133 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "3Dビュー" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:140 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "フロントビュー" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:147 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "トップビュー" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 +msgctxt "@action:inmenu menubar:view" +msgid "Bottom View" +msgstr "底面図" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "左サイドビュー" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:160 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:168 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "右サイドビュー" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:175 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Curaを構成する..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:182 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "＆プリンターを追加する..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:180 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:188 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "プリンターを管理する..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:187 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "フィラメントを管理する..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu" msgid "Add more materials from Marketplace" msgstr "マーケットプレイスから材料を追加" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "&現在の設定/無効にプロファイルをアップデートする" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&変更を破棄する" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:222 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:230 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "&今の設定/無効からプロファイルを作成する..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "プロファイルを管理する..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "オンラインドキュメントを表示する" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "報告＆バグ" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:260 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "新情報" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:266 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "アバウト..." -# can’t enter japanese text -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:273 msgctxt "@action:inmenu menubar:edit" -msgid "Delete Selected Model" -msgid_plural "Delete Selected Models" -msgstr[0] "&選択したモデルを削除" +msgid "Delete Selected" +msgstr "選択内容を削除" -# can’t enter japanese text -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:283 msgctxt "@action:inmenu menubar:edit" -msgid "Center Selected Model" -msgid_plural "Center Selected Models" -msgstr[0] "選択したモデルを中央に移動" +msgid "Center Selected" +msgstr "選択内容を中央に移動" -# can’t edit japanese text -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:292 msgctxt "@action:inmenu menubar:edit" -msgid "Multiply Selected Model" -msgid_plural "Multiply Selected Models" -msgstr[0] "選択した複数のモデル" +msgid "Multiply Selected" +msgstr "選択内容を増倍" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "モデルを消去する" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:309 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "プラットホームの中心にモデルを配置" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:307 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "&モデルグループ" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:327 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:335 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "モデルを非グループ化" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:345 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "モ&デルの合体" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:347 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:355 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&モデルを増倍する..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:362 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "すべてのモデル選択" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:372 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "ビルドプレート上のクリア" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:382 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "すべてのモデルを読み込む" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "すべてのモデルをすべてのビルドプレートに配置" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:390 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "すべてのモデルをアレンジする" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:406 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "選択をアレンジする" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:405 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:413 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "すべてのモデルのポジションをリセットする" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:412 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "すべてのモデル＆変更点をリセットする" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:419 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:429 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&ファイルを開く(s)..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:439 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&新しいプロジェクト..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:434 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:446 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "コンフィグレーションのフォルダーを表示する" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:441 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:538 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "視野のセッティングを構成する..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:448 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:460 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&マーケットプレース" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:257 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "このパッケージは再起動後にインストールされます。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 msgctxt "@title:tab" msgid "General" msgstr "一般" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:462 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:453 msgctxt "@title:tab" msgid "Settings" msgstr "設定" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:464 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 msgctxt "@title:tab" msgid "Printers" msgstr "プリンター" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 msgctxt "@title:tab" msgid "Profiles" msgstr "プロファイル" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:576 msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "%1を閉じています" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:588 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "%1を終了しますか？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:638 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "ファイルを開く" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:744 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:737 msgctxt "@window:title" msgid "Install Package" msgstr "パッケージをインストール" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:752 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:745 msgctxt "@title:window" msgid "Open File(s)" msgstr "ファイルを開く(s)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:755 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:748 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "選択したファイルの中に複数のG-codeが存在します。1つのG-codeのみ一度に開けます。G-codeファイルを開く場合は、1点のみ選んでください。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:858 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:857 msgctxt "@title:window" msgid "Add Printer" msgstr "プリンターを追加する" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:866 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:865 msgctxt "@title:window" msgid "What's New" msgstr "新情報" @@ -3713,17 +3771,27 @@ msgctxt "@label" msgid "Python bindings for libnest2d" msgstr "libnest2dのPythonバインディング" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +msgctxt "@label" +msgid "Support library for system keyring access" +msgstr "システムキーリングアクセスを操作するためのライブラリーサポート" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" +msgid "Python extensions for Microsoft Windows" +msgstr "Microsoft Windows用のPython拡張機能" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +msgctxt "@label" msgid "Font" msgstr "フォント" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 msgctxt "@label" msgid "SVG icons" msgstr "SVGアイコン" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:165 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Linux 分散アプリケーションの開発" @@ -3733,22 +3801,22 @@ msgctxt "@title:window" msgid "Open project file" msgstr "プロジェクトを開く" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:88 msgctxt "@text:window" msgid "This is a Cura project file. Would you like to open it as a project or import the models from it?" msgstr "これはCuraのプロジェクトファイルです。プロジェクトとしてあけますか、それともモデルのみ取り込みますか？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:98 msgctxt "@text:window" msgid "Remember my choice" msgstr "選択を記憶させる" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:122 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:117 msgctxt "@action:button" msgid "Open as project" msgstr "プロジェクトを開く" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:131 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:126 msgctxt "@action:button" msgid "Import models" msgstr "モデルを取り込む" @@ -3764,7 +3832,10 @@ msgid "" "You have customized some profile settings.\n" "Would you like to Keep these changed settings after switching profiles?\n" "Alternatively, you can discard the changes to load the defaults from '%1'." -msgstr "一部のプロファイル設定がカスタマイズされています。\nこれらの変更された設定をプロファイルの切り替え後も維持しますか？\n変更を破棄して'%1'からデフォルトの設定を読み込むこともできます。" +msgstr "" +"一部のプロファイル設定がカスタマイズされています。\n" +"これらの変更された設定をプロファイルの切り替え後も維持しますか？\n" +"変更を破棄して'%1'からデフォルトの設定を読み込むこともできます。" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:111 msgctxt "@title:column" @@ -3777,7 +3848,7 @@ msgid "Current changes" msgstr "現在の変更" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "毎回確認する" @@ -3802,12 +3873,12 @@ msgctxt "@action:button" msgid "Keep changes" msgstr "変更を維持" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 msgctxt "@text:window" msgid "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?" msgstr "選択したファイルの中に複数のプロジェクトが存在します。1ファイルのみ一度に開けます。ファイルからモデルを先に取り込むことをお勧めします。続けますか？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:99 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:94 msgctxt "@action:button" msgid "Import all as models" msgstr "すべてをモデルとして取り入れる" @@ -3962,7 +4033,7 @@ msgctxt "@label" msgid "Material" msgstr "フィラメント" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:407 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "この材料の組み合わせの接着に接着材を使用する。" @@ -3986,17 +4057,17 @@ msgctxt "@label" msgid "Number of Copies" msgstr "コピーの数" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:33 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:41 msgctxt "@title:menu menubar:file" msgid "&Save Project..." msgstr "プロジェクトを保存... (&S)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:54 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:74 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "エクスポート... (&E)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:85 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "選択エクスポート..." @@ -4016,6 +4087,11 @@ msgctxt "@label:category menu label" msgid "Generic" msgstr "汎用" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/OpenFilesMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Open File(s)..." +msgstr "ファイルを開く..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -4031,6 +4107,11 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "最近開いたファイルを開く" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SaveProjectMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Save Project..." +msgstr "プロジェクトを保存..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:15 msgctxt "@title:menu menubar:settings" msgid "&Printer" @@ -4056,17 +4137,17 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "エクストルーダーを無効にする" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:16 msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "ビジブル設定" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:45 msgctxt "@action:inmenu" msgid "Collapse All Categories" msgstr "すべてのカテゴリを折りたたむ" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "視野のセッティングを管理する..." @@ -4076,22 +4157,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "カメラ位置 (&C)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:45 msgctxt "@action:inmenu menubar:view" msgid "Camera view" msgstr "カメラビュー" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:48 msgctxt "@action:inmenu menubar:view" msgid "Perspective" msgstr "パースペクティブ表示" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:60 msgctxt "@action:inmenu menubar:view" msgid "Orthographic" msgstr "平行投影表示" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:81 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "ビルドプレート (&B)" @@ -4136,12 +4217,12 @@ msgctxt "@label:MonitorStatus" msgid "Please remove the print" msgstr "造形物を取り出してください" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@label" msgid "Abort Print" msgstr "プリント中止" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:338 msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "本当にプリントを中止してもいいですか？" @@ -4182,301 +4263,301 @@ msgctxt "@label" msgid "Interface" msgstr "インターフェイス" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:216 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:209 msgctxt "@label" msgid "Currency:" msgstr "通貨:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:229 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:222 msgctxt "@label" msgid "Theme:" msgstr "テーマ:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "それらの変更を有効にするためにはアプリケーションを再起動しなけらばなりません。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:284 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "セッティングを変更すると自動にスライスします。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 msgctxt "@option:check" msgid "Slice automatically" msgstr "自動的にスライスする" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:306 msgctxt "@label" msgid "Viewport behavior" msgstr "ビューポイント機能" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:314 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "赤でサポートができないエリアをハイライトしてください。サポートがない場合、正確にプリントができない場合があります。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:323 msgctxt "@option:check" msgid "Display overhang" msgstr "ディスプレイオーバーハング" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:351 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@info:tooltip" msgid "Highlight missing or extraneous surfaces of the model using warning signs. The toolpaths will often be missing parts of the intended geometry." msgstr "モデルの欠けている部分または不要な表面部分を、警告マークを使用してハイライトします。ツールパスは意図したジオメトリの欠けている部分になることが多くあります。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:342 msgctxt "@option:check" msgid "Display model errors" msgstr "モデルエラーを表示" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "モデルの選択時にモデルがカメラの中心に見えるようにカメラを移動する" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:373 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "アイテムを選択するとカメラが中心にきます" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Curaのデフォルトのズーム機能は変更できるべきか？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:388 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "カメラのズーム方向を反転する。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "ズームはマウスの方向に動くべきか？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "マウスに対するズームは、正射投影ではサポートされていません。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:409 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "マウスの方向にズームする" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:435 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:417 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "交差を避けるためにプラットホーム上のモデルを移動するべきですか？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:440 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:422 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "モデルの距離が離れているように確認する" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:431 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "プラットホーム上のモデルはブルドプレートに触れるように下げるべきか？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:436 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "自動的にモデルをビルドプレートに落とす" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:448 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "G-codeリーダーに注意メッセージを表示します。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:457 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "G-codeリーダーに注意メッセージ" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "レイヤーはコンパティビリティモードに強制されるべきか？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "レイヤービューコンパティビリティモードを強制する。（再起動が必要）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:498 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" msgstr "Curaを終了した場所で開くようにしますか？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:485 msgctxt "@option:check" msgid "Restore window position on start" msgstr "開始時にウィンドウの位置を復元" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:513 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "どのような種類のカメラレンダリングを使用する必要がありますか?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:502 msgctxt "@window:text" msgid "Camera rendering:" msgstr "カメラレンダリング:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:531 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:509 msgid "Perspective" msgstr "パースペクティブ表示" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:532 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgid "Orthographic" msgstr "平行投影表示" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:563 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:548 msgctxt "@label" msgid "Opening and saving files" msgstr "ファイルを開くまた保存" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:555 msgctxt "@info:tooltip" msgid "Should opening files from the desktop or external applications open in the same instance of Cura?" msgstr "デスクトップまたは外部アプリケーションから開いたファイルをCuraの同じインスタンスで開く必要がありますか？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@option:check" msgid "Use a single instance of Cura" msgstr "Curaの単一インスタンスを使用" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "モデルがビルドボリュームに対して大きすぎる場合はスケールされるべきか？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@option:check" msgid "Scale large models" msgstr "大きなモデルをスケールする" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "ユニット値がミリメートルではなくメートルの場合、モデルが極端に小さく現れる場合があります。モデルはスケールアップされるべきですか？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "極端に小さなモデルをスケールアップする" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "モデルはロード後に選択しますか？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@option:check" msgid "Select models when loaded" msgstr "ロード後にモデルを選択" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "プリンター名の敬称はプリントジョブの名前に自動的に加えられるべきか？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:635 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "プリンターの敬称をジョブネームに加える" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:645 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "プロジェクトファイルを保存時にサマリーを表示するべきか？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:649 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:634 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "プロジェクトを保存時にダイアログサマリーを表示する" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:659 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:644 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "プロジェクトファイルを開く際のデフォルト機能" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:652 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "プロジェクトファイル開く際のデフォルト機能: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "毎回確認する" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:682 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "常にプロジェクトとして開く" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:668 msgctxt "@option:openProject" msgid "Always import models" msgstr "常にモデルを取り込む" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:705 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "プロファイル内を変更し異なるプロファイルにしました、どこの変更点を保持、破棄したいのダイアログが表示されます、また何度もダイアログが表示されないようにデフォルト機能を選ぶことができます。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:728 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "プロファイル" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "プロファイル交換時に設定値を変更するためのデフォルト処理： " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:748 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:734 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "常に変更した設定を廃棄する" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:749 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:735 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "常に変更した設定を新しいプロファイルに送信する" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:783 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@label" msgid "Privacy" msgstr "プライバシー" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:790 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:777 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Curaのプログラム開始時にアップデートがあるかチェックしますか？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:795 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:782 msgctxt "@option:check" msgid "Check for updates on start" msgstr "スタート時にアップデートあるかどうかのチェック" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:805 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:792 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "プリンターの不明なデータをUltimakerにおくりますか？メモ、モデル、IPアドレス、個人的な情報は送信されたり保存されたりはしません。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:810 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:797 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "(不特定な) プリントインフォメーションを送信" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:819 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:806 msgctxt "@action:button" msgid "More information" msgstr "詳細" @@ -4516,55 +4597,65 @@ msgctxt "@action:button" msgid "Export" msgstr "書き出す" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 +msgctxt "@action:button Sending materials to printers" +msgid "Sync with Printers" +msgstr "プリンターと同期する" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" msgid "Printer" msgstr "プリンター" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:298 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 msgctxt "@title:window" msgid "Confirm Remove" msgstr "モデルを取り除きました" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:301 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "%1を取り外しますか？この作業はやり直しが効きません！" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 msgctxt "@title:window" msgid "Import Material" msgstr "フィラメントを取り込む" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:338 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "%1フィラメントを取り込むことができない: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:328 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:342 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "フィラメント%1の取り込みに成功しました" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:346 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 msgctxt "@title:window" msgid "Export Material" msgstr "フィラメントを書き出す" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:358 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:372 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "フィラメントの書き出しに失敗しました %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:378 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "フィラメントの%1への書き出しが完了ました" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 +msgctxt "@title:window" +msgid "Export All Materials" +msgstr "すべての材料を書き出す" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" @@ -4676,53 +4767,53 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "このプロファイルの名前を指定してください。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "プロファイルを複製する" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@title:window" msgid "Rename Profile" msgstr "プロファイル名を変える" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:307 msgctxt "@title:window" msgid "Import Profile" msgstr "プロファイルを取り込む" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:336 msgctxt "@title:window" msgid "Export Profile" msgstr "プロファイルを書き出す" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:399 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "プリンター:%1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:557 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "プロファイルを現在のセッティング" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 msgctxt "@action:button" msgid "Discard current changes" msgstr "今の変更を破棄する" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:583 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "このプロファイルはプリンターによりデフォルトを使用、従いこのプロファイルはセッティング/書き換えが以下のリストにありません。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:591 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "設定は選択したプロファイルにマッチしています。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:609 msgctxt "@title:tab" msgid "Global Settings" msgstr "グローバル設定" @@ -4752,12 +4843,12 @@ msgctxt "@title:column" msgid "Unit" msgstr "ユニット" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:16 msgctxt "@title:tab" msgid "Setting Visibility" msgstr "視野設定" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:48 msgctxt "@label:textbox" msgid "Check all" msgstr "全てを調べる" @@ -5090,27 +5181,27 @@ msgctxt "@label:textbox" msgid "Search settings" msgstr "検索設定" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:456 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:468 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "すべてのエクストルーダーの値をコピーする" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:477 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "すべてのエクストルーダーに対して変更された値をコピーする" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:502 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:514 msgctxt "@action:menu" msgid "Hide this setting" msgstr "この設定を非表示にする" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:515 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:527 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "この設定を表示しない" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:531 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "常に見えるように設定する" @@ -5170,11 +5261,6 @@ msgctxt "@button" msgid "Add printer manually" msgstr "プリンタを手動で追加する" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddCloudPrintersView.qml:218 -msgctxt "@button" -msgid "Finish" -msgstr "終わる" - #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:230 msgctxt "@label" msgid "Manufacturer" @@ -5281,32 +5367,32 @@ msgctxt "@button" msgid "Connect" msgstr "接続" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:43 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" -msgid "Ultimaker Account" -msgstr "Ultimakerアカウント" +msgid "Release Notes" +msgstr "リリースノート" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:124 msgctxt "@text" -msgid "Your key to connected 3D printing" -msgstr "3Dプリンティング活用の鍵" +msgid "Add material settings and plugins from the Marketplace" +msgstr "マーケットプレイスから材料設定とプラグインを追加" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:101 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:154 msgctxt "@text" -msgid "- Customize your experience with more print profiles and plugins" -msgstr "- より多くの成果物プロファイルとプラグインを使用して作業をカスタマイズする" +msgid "Backup and sync your material settings and plugins" +msgstr "材料設定とプラグインのバックアップと同期" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:184 msgctxt "@text" -msgid "- Stay flexible by syncing your setup and loading it anywhere" -msgstr "- 設定を同期させ、どこにでも読み込めるようにすることで柔軟性を保つ" +msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" +msgstr "Ultimakerコミュニティで48,000人以上のユーザーとアイデアを共有してアドバイスをもらう" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:217 msgctxt "@text" -msgid "- Increase efficiency with a remote workflow on Ultimaker printers" -msgstr "- Ultimakerプリンターのリモートワークフローを活用して効率を高める" +msgid "Create a free Ultimaker Account" +msgstr "無料のUltimakerアカウントを作成" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:230 msgctxt "@button" msgid "Skip" msgstr "スキップ" @@ -5366,29 +5452,32 @@ msgctxt "@button" msgid "Decline and close" msgstr "拒否して閉じる" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:29 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" msgid "Welcome to Ultimaker Cura" msgstr "Ultimaker Cura にようこそ" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:68 msgctxt "@text" -msgid "" -"Please follow these steps to set up\n" -"Ultimaker Cura. This will only take a few moments." +msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." msgstr "" "以下の手順で\n" "Ultimaker Cura を設定してください。数秒で完了します。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:86 msgctxt "@button" msgid "Get started" msgstr "はじめに" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:28 msgctxt "@label" -msgid "What's new in Ultimaker Cura" -msgstr "Ultimaker Cura の新機能" +msgid "What's New" +msgstr "新情報" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Widgets/ComboBox.qml:24 +msgctxt "@label" +msgid "No items to select from" +msgstr "選択するアイテムがありません" #: ModelChecker/plugin.json msgctxt "description" @@ -5470,6 +5559,16 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Curaプロファイルライター" +#: DigitalLibrary/plugin.json +msgctxt "description" +msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." +msgstr "Digital Libraryに接続し、CuraでDigital Libraryからファイルを開いたりDigital Libraryにファイルを保存したりできるようにします。" + +#: DigitalLibrary/plugin.json +msgctxt "name" +msgid "Ultimaker Digital Library" +msgstr "Ultimaker Digital Library" + #: FirmwareUpdateChecker/plugin.json msgctxt "description" msgid "Checks for firmware updates." @@ -5940,6 +6039,26 @@ msgctxt "name" msgid "Version Upgrade 4.7 to 4.8" msgstr "バージョン4.7から4.8へのアップグレード" +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." +msgstr "Cura 4.8からCura 4.9に設定をアップグレードします。" + +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.8 to 4.9" +msgstr "バージョン4.8から4.9へのアップグレード" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." +msgstr "Cura 4.9からCura 4.10に設定をアップグレードします。" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.9 to 4.10" +msgstr "バージョン4.9から4.10へのアップグレード" + #: X3DReader/plugin.json msgctxt "description" msgid "Provides support for reading X3D files." @@ -5970,6 +6089,94 @@ msgctxt "name" msgid "X-Ray View" msgstr "透視ビュー" +#~ msgctxt "@info:status" +#~ msgid "Global stack is missing." +#~ msgstr "グローバルスタックがありません。" + +#~ msgctxt "@info:status" +#~ msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." +#~ msgstr "モデルはマニホールドではありません。ハイライトされたエリアは、欠けている表面または無関係な表面を示します。" + +#~ msgctxt "@info:title" +#~ msgid "Model errors" +#~ msgstr "モデルエラー" + +#~ msgctxt "@label:listbox" +#~ msgid "Layer thickness" +#~ msgstr "レイヤーの厚さ" + +#~ msgctxt "@label" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "3Dプリンティング活用の鍵" + +#~ msgctxt "@text" +#~ msgid "" +#~ "- Customize your experience with more print profiles and plugins\n" +#~ "- Stay flexible by syncing your setup and loading it anywhere\n" +#~ "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "" +#~ "- より多くのプリントプロファイルとプラグインを使用して作業をカスタマイズする\n" +#~ "- 設定を同期させ、どこにでも読み込めるようにすることで柔軟性を保つ\n" +#~ "- Ultimakerプリンターのリモートワークフローを活用して効率を高める" + +#~ msgctxt "@button" +#~ msgid "Create account" +#~ msgstr "アカウントを作成する" + +# can’t enter japanese text +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Delete Selected Model" +#~ msgid_plural "Delete Selected Models" +#~ msgstr[0] "&選択したモデルを削除" + +# can’t enter japanese text +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Center Selected Model" +#~ msgid_plural "Center Selected Models" +#~ msgstr[0] "選択したモデルを中央に移動" + +# can’t edit japanese text +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Multiply Selected Model" +#~ msgid_plural "Multiply Selected Models" +#~ msgstr[0] "選択した複数のモデル" + +#~ msgctxt "@button" +#~ msgid "Finish" +#~ msgstr "終わる" + +#~ msgctxt "@label" +#~ msgid "Ultimaker Account" +#~ msgstr "Ultimakerアカウント" + +#~ msgctxt "@text" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "3Dプリンティング活用の鍵" + +#~ msgctxt "@text" +#~ msgid "- Customize your experience with more print profiles and plugins" +#~ msgstr "- より多くの成果物プロファイルとプラグインを使用して作業をカスタマイズする" + +#~ msgctxt "@text" +#~ msgid "- Stay flexible by syncing your setup and loading it anywhere" +#~ msgstr "- 設定を同期させ、どこにでも読み込めるようにすることで柔軟性を保つ" + +#~ msgctxt "@text" +#~ msgid "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "- Ultimakerプリンターのリモートワークフローを活用して効率を高める" + +#~ msgctxt "@text" +#~ msgid "" +#~ "Please follow these steps to set up\n" +#~ "Ultimaker Cura. This will only take a few moments." +#~ msgstr "" +#~ "以下の手順で\n" +#~ "Ultimaker Cura を設定してください。数秒で完了します。" + +#~ msgctxt "@label" +#~ msgid "What's new in Ultimaker Cura" +#~ msgstr "Ultimaker Cura の新機能" + #~ msgctxt "@label ({} is object name)" #~ msgid "Are you sure you wish to remove {}? This cannot be undone!" #~ msgstr "{}を取り除いてもよろしいですか？この操作は元に戻せません。" diff --git a/resources/i18n/ja_JP/fdmextruder.def.json.po b/resources/i18n/ja_JP/fdmextruder.def.json.po index 43e72922b6..dc0d42f7d6 100644 --- a/resources/i18n/ja_JP/fdmextruder.def.json.po +++ b/resources/i18n/ja_JP/fdmextruder.def.json.po @@ -1,20 +1,20 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2019-03-13 14:00+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 14:59+0200\n" "Last-Translator: Bothof \n" "Language-Team: Japanese\n" "Language: ja_JP\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.6\n" +"X-Generator: Poedit 2.4.1\n" #: fdmextruder.def.json msgctxt "machine_settings label" diff --git a/resources/i18n/ja_JP/fdmprinter.def.json.po b/resources/i18n/ja_JP/fdmprinter.def.json.po index e3f350e8ae..d5cc2fdc2f 100644 --- a/resources/i18n/ja_JP/fdmprinter.def.json.po +++ b/resources/i18n/ja_JP/fdmprinter.def.json.po @@ -1,13 +1,13 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2020-08-21 13:40+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 15:00+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Japanese , Japanese \n" "Language: ja_JP\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.2.1\n" +"X-Generator: Poedit 2.4.1\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -447,6 +447,26 @@ msgctxt "machine_extruders_share_heater description" msgid "Whether the extruders share a single heater rather than each extruder having its own heater." msgstr "各エクストルーダーが独自のヒーターを持つのではなく、単一のヒーターを共有するかどうか。" +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle label" +msgid "Extruders Share Nozzle" +msgstr "エクストルーダーの共有ノズル" + +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle description" +msgid "Whether the extruders share a single nozzle rather than each extruder having its own nozzle. When set to true, it is expected that the printer-start gcode script properly sets up all extruders in an initial retraction state that is known and mutually compatible (either zero or one filament not retracted); in that case the initial retraction status is described, per extruder, by the 'machine_extruders_shared_nozzle_initial_retraction' parameter." +msgstr "各エクストルーダーが独自のノズルを持つのではなく、単一のノズルを共有するかどうか。初期設定した場合、プリンター起動gcodeスクリプトにより、すべてのエクストルーダーが初期の引き戻し状態が互換性のあるように設定されます（引き戻されていない状態のフィラメントが0個または1個のいずれか）。この場合、初期引き戻しステータスは「machine_extruders_shared_nozzle_initial_retraction」パラメーターによってエクストルーダーごとに規定されます。" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction label" +msgid "Shared Nozzle Initial Retraction" +msgstr "共有ノズルの初期引き戻し" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction description" +msgid "How much the filament of each extruder is assumed to have been retracted from the shared nozzle tip at the completion of the printer-start gcode script; the value should be equal to or greater than the length of the common part of the nozzle's ducts." +msgstr "プリンタ起動gcodeスクリプト完了時に、各エクストルーダーのフィラメントが共有ノズルの先端部分から引き戻されていると想定される量。この値は、ノズルのダクトの共通部分の長さ以上にする必要があります。" + #: fdmprinter.def.json msgctxt "machine_disallowed_areas label" msgid "Disallowed Areas" @@ -515,8 +535,8 @@ msgstr "エクストルーダーのオフセット" #: fdmprinter.def.json msgctxt "machine_use_extruder_offset_to_offset_coords description" -msgid "Apply the extruder offset to the coordinate system." -msgstr "エクストルーダーのオフセットを座標システムに適用します。" +msgid "Apply the extruder offset to the coordinate system. Affects all extruders." +msgstr "エクストルーダーのオフセットを座標システムに適用します。すべてのエクストルーダーが影響を受けます。" #: fdmprinter.def.json msgctxt "extruder_prime_pos_z label" @@ -915,8 +935,8 @@ msgstr "最初のレイヤーに線幅の乗数です。この値を増やすと #: fdmprinter.def.json msgctxt "shell label" -msgid "Shell" -msgstr "外郭" +msgid "Walls" +msgstr "ウォール" # msgstr "外郭" #: fdmprinter.def.json @@ -988,170 +1008,6 @@ msgctxt "wall_0_wipe_dist description" msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better." msgstr "外壁の後に挿入された移動の距離はZシームをよりよく隠します。" -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr label" -msgid "Top Surface Skin Extruder" -msgstr "上部表面用エクストルーダー" - -# msgstr "上層表面スキンエクストルーダー" -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr description" -msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." -msgstr "上部の表面印刷用のエクストルーダー。デュアルノズル印刷時に使用。" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count label" -msgid "Top Surface Skin Layers" -msgstr "上部表面レイヤー" - -# msgstr "上の表皮層" -#: fdmprinter.def.json -msgctxt "roofing_layer_count description" -msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." -msgstr "上部表面のレイヤー数。通常一層で綺麗に出来上がります。" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr label" -msgid "Top/Bottom Extruder" -msgstr "上部/底面エクストルーダー" - -# msgstr "トップ/ボトムエクストルーダー" -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr description" -msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." -msgstr "上部と下部の表面を印刷する時に使われるエクストルーダー。デュアルノズル印刷時に使用。" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness label" -msgid "Top/Bottom Thickness" -msgstr "上部/底面の厚さ" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness description" -msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." -msgstr "プリント時の最上面、最底面の厚み。これを積層ピッチで割った値で最上面、最低面のレイヤーの数を定義します。" - -#: fdmprinter.def.json -msgctxt "top_thickness label" -msgid "Top Thickness" -msgstr "上部厚さ" - -#: fdmprinter.def.json -msgctxt "top_thickness description" -msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." -msgstr "プリント時の最上面の厚み。これを積層ピッチで割った値で最上面のレイヤーの数を定義します。" - -#: fdmprinter.def.json -msgctxt "top_layers label" -msgid "Top Layers" -msgstr "上部レイヤー" - -#: fdmprinter.def.json -msgctxt "top_layers description" -msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." -msgstr "最上面のレイヤー数。トップの厚さを計算する場合、この値は整数になります。" - -#: fdmprinter.def.json -msgctxt "bottom_thickness label" -msgid "Bottom Thickness" -msgstr "底面厚さ" - -#: fdmprinter.def.json -msgctxt "bottom_thickness description" -msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." -msgstr "プリント時の最底面の厚み。これを積層ピッチで割った値で最低面のレイヤーの数を定義します。" - -#: fdmprinter.def.json -msgctxt "bottom_layers label" -msgid "Bottom Layers" -msgstr "底面レイヤー" - -#: fdmprinter.def.json -msgctxt "bottom_layers description" -msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "最底面のレイヤー数。下の厚さで計算すると、この値は整数に変換されます。" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers label" -msgid "Initial Bottom Layers" -msgstr "初期底面レイヤー" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers description" -msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "ビルドプレートから上にある初期底面レイヤーの数。下の厚さで計算すると、この値は整数に変換されます。" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern label" -msgid "Top/Bottom Pattern" -msgstr "上層/底層パターン" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern description" -msgid "The pattern of the top/bottom layers." -msgstr "上層/底層のパターン。" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option lines" -msgid "Lines" -msgstr "直線" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option concentric" -msgid "Concentric" -msgstr "同心円" - -# msgstr "同心" -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option zigzag" -msgid "Zig Zag" -msgstr "ジグザグ" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 label" -msgid "Bottom Pattern Initial Layer" -msgstr "底層初期レイヤー" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 description" -msgid "The pattern on the bottom of the print on the first layer." -msgstr "第1層のプリントの底部のパターン。" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option lines" -msgid "Lines" -msgstr "直線" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option concentric" -msgid "Concentric" -msgstr "同心円" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option zigzag" -msgid "Zig Zag" -msgstr "ジグザグ" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons label" -msgid "Connect Top/Bottom Polygons" -msgstr "上層/底層ポリゴンに接合" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." -msgstr "互いに次に実行する上層/底層スキンパスに接合します。同心円のパターンの場合、この設定を有効にすることにより、移動時間が短縮されますが、インフィルまでの途中で接合があるため、この機能で上層面の品質が損なわれることがあります。" - -#: fdmprinter.def.json -msgctxt "skin_angles label" -msgid "Top/Bottom Line Directions" -msgstr "上層/底層ラインの向き" - -#: fdmprinter.def.json -msgctxt "skin_angles description" -msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." -msgstr "上/下のレイヤーが線またはジグザグパターンを使う際の整数線の方向のリスト。リストの要素は、層が進行するにつれて順番に使用され、リストの終わりに達すると、最初から再び開始されます。リスト項目はコンマで区切られ、リスト全体は大括弧で囲まれています。デフォルトは、従来のデフォルト角度（45度と135度）を使用する空のリストです。" - #: fdmprinter.def.json msgctxt "wall_0_inset label" msgid "Outer Wall Inset" @@ -1467,6 +1323,180 @@ msgctxt "z_seam_relative description" msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate." msgstr "有効時は、Zシームは各パーツの真ん中に設定されます。無効時はプラットフォームのサイズによって設定されます。" +#: fdmprinter.def.json +msgctxt "top_bottom label" +msgid "Top/Bottom" +msgstr "トップ/ボトム" + +#: fdmprinter.def.json +msgctxt "top_bottom description" +msgid "Top/Bottom" +msgstr "トップ/ボトム" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr label" +msgid "Top Surface Skin Extruder" +msgstr "上部表面用エクストルーダー" + +# msgstr "上層表面スキンエクストルーダー" +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr description" +msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." +msgstr "上部の表面印刷用のエクストルーダー。デュアルノズル印刷時に使用。" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count label" +msgid "Top Surface Skin Layers" +msgstr "上部表面レイヤー" + +# msgstr "上の表皮層" +#: fdmprinter.def.json +msgctxt "roofing_layer_count description" +msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." +msgstr "上部表面のレイヤー数。通常一層で綺麗に出来上がります。" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr label" +msgid "Top/Bottom Extruder" +msgstr "上部/底面エクストルーダー" + +# msgstr "トップ/ボトムエクストルーダー" +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr description" +msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." +msgstr "上部と下部の表面を印刷する時に使われるエクストルーダー。デュアルノズル印刷時に使用。" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness label" +msgid "Top/Bottom Thickness" +msgstr "上部/底面の厚さ" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness description" +msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." +msgstr "プリント時の最上面、最底面の厚み。これを積層ピッチで割った値で最上面、最低面のレイヤーの数を定義します。" + +#: fdmprinter.def.json +msgctxt "top_thickness label" +msgid "Top Thickness" +msgstr "上部厚さ" + +#: fdmprinter.def.json +msgctxt "top_thickness description" +msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." +msgstr "プリント時の最上面の厚み。これを積層ピッチで割った値で最上面のレイヤーの数を定義します。" + +#: fdmprinter.def.json +msgctxt "top_layers label" +msgid "Top Layers" +msgstr "上部レイヤー" + +#: fdmprinter.def.json +msgctxt "top_layers description" +msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." +msgstr "最上面のレイヤー数。トップの厚さを計算する場合、この値は整数になります。" + +#: fdmprinter.def.json +msgctxt "bottom_thickness label" +msgid "Bottom Thickness" +msgstr "底面厚さ" + +#: fdmprinter.def.json +msgctxt "bottom_thickness description" +msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." +msgstr "プリント時の最底面の厚み。これを積層ピッチで割った値で最低面のレイヤーの数を定義します。" + +#: fdmprinter.def.json +msgctxt "bottom_layers label" +msgid "Bottom Layers" +msgstr "底面レイヤー" + +#: fdmprinter.def.json +msgctxt "bottom_layers description" +msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "最底面のレイヤー数。下の厚さで計算すると、この値は整数に変換されます。" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "初期底面レイヤー" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "ビルドプレートから上にある初期底面レイヤーの数。下の厚さで計算すると、この値は整数に変換されます。" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern label" +msgid "Top/Bottom Pattern" +msgstr "上層/底層パターン" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern description" +msgid "The pattern of the top/bottom layers." +msgstr "上層/底層のパターン。" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option lines" +msgid "Lines" +msgstr "直線" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option concentric" +msgid "Concentric" +msgstr "同心円" + +# msgstr "同心" +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option zigzag" +msgid "Zig Zag" +msgstr "ジグザグ" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 label" +msgid "Bottom Pattern Initial Layer" +msgstr "底層初期レイヤー" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 description" +msgid "The pattern on the bottom of the print on the first layer." +msgstr "第1層のプリントの底部のパターン。" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option lines" +msgid "Lines" +msgstr "直線" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option concentric" +msgid "Concentric" +msgstr "同心円" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option zigzag" +msgid "Zig Zag" +msgstr "ジグザグ" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons label" +msgid "Connect Top/Bottom Polygons" +msgstr "上層/底層ポリゴンに接合" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons description" +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "互いに次に実行する上層/底層スキンパスに接合します。同心円のパターンの場合、この設定を有効にすることにより、移動時間が短縮されますが、インフィルまでの途中で接合があるため、この機能で上層面の品質が損なわれることがあります。" + +#: fdmprinter.def.json +msgctxt "skin_angles label" +msgid "Top/Bottom Line Directions" +msgstr "上層/底層ラインの向き" + +#: fdmprinter.def.json +msgctxt "skin_angles description" +msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." +msgstr "上/下のレイヤーが線またはジグザグパターンを使う際の整数線の方向のリスト。リストの要素は、層が進行するにつれて順番に使用され、リストの終わりに達すると、最初から再び開始されます。リスト項目はコンマで区切られ、リスト全体は大括弧で囲まれています。デフォルトは、従来のデフォルト角度（45度と135度）を使用する空のリストです。" + #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" msgid "No Skin in Z Gaps" @@ -1618,6 +1648,91 @@ msgctxt "skin_overlap_mm description" msgid "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any value over half the width of the wall may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall." msgstr "壁とスキンの中央ライン（のエンドポイント）が交差する量を調整します。わずかな交差によって、壁がスキンにしっかりつながります。スキンと壁のライン幅が同じで、壁の幅が半分以上の値になると、スキンが壁を通過している可能性があります。これは、その時点で、スキン押出機のノズルの位置が、すでに壁の真ん中を過ぎている可能性があるためです。" +#: fdmprinter.def.json +msgctxt "skin_preshrink label" +msgid "Skin Removal Width" +msgstr "表面除去幅" + +# msgstr "スキン除去幅" +#: fdmprinter.def.json +msgctxt "skin_preshrink description" +msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." +msgstr "取り除くスキンエリアの最大幅。この値より小さいすべてのスキンエリアは消えます。これは、モデルの傾斜表面の上部/下部スキンに費やした時間のや材料の量を制限することができます。" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink label" +msgid "Top Skin Removal Width" +msgstr "上面除去幅" + +# msgstr "トップスキン除去幅" +#: fdmprinter.def.json +msgctxt "top_skin_preshrink description" +msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." +msgstr "取り除くスキンエリアの最大幅。この値より小さいすべてのスキンエリアは消えます。これは、モデルの傾斜表面の上部/下部スキンに費やした時間のや材料の量を制限することができます。" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink label" +msgid "Bottom Skin Removal Width" +msgstr "底面除去幅" + +# msgstr "ボトムのスキン除去幅" +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink description" +msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." +msgstr "取り除くスキンエリアの最大幅。この値より小さいすべてのスキンエリアは消えます。これは、モデルの傾斜表面の上部/下部スキンに費やした時間のや材料の量を制限することができます。" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance label" +msgid "Skin Expand Distance" +msgstr "表面展開距離" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance description" +msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." +msgstr "スキンがインフィルまで到達する距離です。高い数値の場合、スキンはインフィルのパターンに隣接しやすく、近接する壁のレイヤーもスキンに密着しやすくなります。低値の場合、材料の使用量を節約します。" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance label" +msgid "Top Skin Expand Distance" +msgstr "上面展開距離" + +# msgstr "トップのスキンの展開距離" +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance description" +msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." +msgstr "スキンがインフィルまで到達する距離です。高い数値の場合、スキンはインフィルのパターンに隣接しやすく、近接する壁のレイヤーもスキンに密着しやすくなります。低値の場合、材料の使用量を節約します。" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance label" +msgid "Bottom Skin Expand Distance" +msgstr "底面展開距離" + +# msgstr "ボトムのスキンの展開距離" +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance description" +msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." +msgstr "スキンがインフィルまで到達する距離です。高い数値の場合、スキンはインフィルのパターンに隣接しやすく、近接する壁のレイヤーもスキンに密着しやすくなります。低値の場合、材料の使用量を節約します。" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion label" +msgid "Maximum Skin Angle for Expansion" +msgstr "表面展開最大角" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion description" +msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded." +msgstr "この設定より大きい角を持つオブジェクトの上部または底部の表面は、その表面のスキンを拡大しません。これにより、モデルの表面に垂直に近い斜面がある場合に作成される狭いスキン領域の拡大を回避します。0°の角度は水平方向で、スキンは拡大しません。90°の角度は垂直方向で、すべてのスキンが拡大します。" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion label" +msgid "Minimum Skin Width for Expansion" +msgstr "表面展開最小角" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion description" +msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." +msgstr "これより狭いスキン領域は展開されません。モデル表面に、垂直に近い斜面がある場合に作成される狭いスキン領域の拡大を回避するためです。" + #: fdmprinter.def.json msgctxt "infill label" msgid "Infill" @@ -1938,91 +2053,6 @@ msgctxt "infill_support_angle description" msgid "The minimum angle of internal overhangs for which infill is added. At a value of 0° objects are totally filled with infill, 90° will not provide any infill." msgstr "インフィルが追加される内部オーバーハングの最小角度。0° のとき、対象物は完全にインフィルが充填され、90° ではインフィルが提供されません。" -#: fdmprinter.def.json -msgctxt "skin_preshrink label" -msgid "Skin Removal Width" -msgstr "表面除去幅" - -# msgstr "スキン除去幅" -#: fdmprinter.def.json -msgctxt "skin_preshrink description" -msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." -msgstr "取り除くスキンエリアの最大幅。この値より小さいすべてのスキンエリアは消えます。これは、モデルの傾斜表面の上部/下部スキンに費やした時間のや材料の量を制限することができます。" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink label" -msgid "Top Skin Removal Width" -msgstr "上面除去幅" - -# msgstr "トップスキン除去幅" -#: fdmprinter.def.json -msgctxt "top_skin_preshrink description" -msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." -msgstr "取り除くスキンエリアの最大幅。この値より小さいすべてのスキンエリアは消えます。これは、モデルの傾斜表面の上部/下部スキンに費やした時間のや材料の量を制限することができます。" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink label" -msgid "Bottom Skin Removal Width" -msgstr "底面除去幅" - -# msgstr "ボトムのスキン除去幅" -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink description" -msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." -msgstr "取り除くスキンエリアの最大幅。この値より小さいすべてのスキンエリアは消えます。これは、モデルの傾斜表面の上部/下部スキンに費やした時間のや材料の量を制限することができます。" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance label" -msgid "Skin Expand Distance" -msgstr "表面展開距離" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance description" -msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." -msgstr "スキンがインフィルまで到達する距離です。高い数値の場合、スキンはインフィルのパターンに隣接しやすく、近接する壁のレイヤーもスキンに密着しやすくなります。低値の場合、材料の使用量を節約します。" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance label" -msgid "Top Skin Expand Distance" -msgstr "上面展開距離" - -# msgstr "トップのスキンの展開距離" -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance description" -msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." -msgstr "スキンがインフィルまで到達する距離です。高い数値の場合、スキンはインフィルのパターンに隣接しやすく、近接する壁のレイヤーもスキンに密着しやすくなります。低値の場合、材料の使用量を節約します。" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance label" -msgid "Bottom Skin Expand Distance" -msgstr "底面展開距離" - -# msgstr "ボトムのスキンの展開距離" -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance description" -msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." -msgstr "スキンがインフィルまで到達する距離です。高い数値の場合、スキンはインフィルのパターンに隣接しやすく、近接する壁のレイヤーもスキンに密着しやすくなります。低値の場合、材料の使用量を節約します。" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion label" -msgid "Maximum Skin Angle for Expansion" -msgstr "表面展開最大角" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion description" -msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." -msgstr "この設定より大きい角を持つオブジェクトの上部または底部の表面、その表面のスキンはを拡大しません。これは、モデルのサーフェスに近い垂直斜面がある場合に作成される狭いスキン領域の拡大を回避します。0 ° の角度は水平方向、90 ° の角度が垂直方向です。" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion label" -msgid "Minimum Skin Width for Expansion" -msgstr "表面展開最小角" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion description" -msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." -msgstr "これより狭いスキン領域は展開されません。モデル表面に、垂直に近い斜面がある場合に作成される狭いスキン領域の拡大を回避するためです。" - #: fdmprinter.def.json msgctxt "skin_edge_support_thickness label" msgid "Skin Edge Support Thickness" @@ -2643,8 +2673,8 @@ msgstr "初期レイヤー速度" #: fdmprinter.def.json msgctxt "speed_layer_0 description" -msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." -msgstr "一層目での速度。ビルトプレートへの接着を向上するため低速を推奨します。" +msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate. Does not affect the build plate adhesion structures themselves, like brim and raft." +msgstr "初期レイヤーでの速度。ビルドプレートへの接着を改善するため低速を推奨します。ブリムやラフトなどのビルドプレート接着構造自体には影響しません。" #: fdmprinter.def.json msgctxt "speed_print_layer_0 label" @@ -3259,8 +3289,8 @@ msgstr "引き戻しのない最大コム距離" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" -msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." -msgstr "ゼロ以外の場合、この距離より移動量が多い場合は、引き戻しを使用します。" +msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." +msgstr "ゼロを超える場合、この距離より長い移動量をコーミングすると、引き戻しが使用されます。ゼロに設定した場合、最大値はなく、コーミング移動では引き戻しを使用しません。" #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" @@ -5195,8 +5225,8 @@ msgstr "メッシュ処理ランク" #: fdmprinter.def.json msgctxt "infill_mesh_order description" -msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." -msgstr "インフィルメッシュの重なりが複数生じた場合のこのメッシュの優先度を決定します。複数のインフィルメッシュの重なりがあるエリアでは、最もランクが低いメッシュの設定になります。順序が高いインフィルメッシュは、順序が低いインフィルメッシュのインフィルと通常のメッシュを変更します。" +msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the highest rank. An infill mesh with a higher rank will modify the infill of infill meshes with lower rank and normal meshes." +msgstr "インフィルメッシュの重なりが複数生じた場合のこのメッシュの優先度を決定します。複数のインフィルメッシュの重なりがあるエリアでは、最もランクが高いメッシュの設定になります。ランクが高いインフィルメッシュは、ランクが低いインフィルメッシュのインフィルと通常のメッシュを変更します。" #: fdmprinter.def.json msgctxt "cutting_mesh label" @@ -5557,6 +5587,16 @@ msgctxt "conical_overhang_angle description" msgid "The maximum angle of overhangs after the they have been made printable. At a value of 0° all overhangs are replaced by a piece of model connected to the build plate, 90° will not change the model in any way." msgstr "印刷可能になったオーバーハングの最大角度。 0°の値では、すべてのオーバーハングがビルドプレートに接続されたモデルの一部に置き換えられます。90°では、モデルは決して変更されません。" +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size label" +msgid "Maximum Overhang Hole Area" +msgstr "オーバーハングした穴の最大領域" + +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size description" +msgid "The maximum area of a hole in the base of the model before it's removed by Make Overhang Printable. Holes smaller than this will be retained. A value of 0 mm² will fill all holes in the models base." +msgstr "モデル底部にある穴の最大領域（「オーバーハング印刷可能」で削除する前の値）。これより小さい穴は保持されます。値が0 mm²の場合、モデル底部にあるすべての穴は充填されます。" + #: fdmprinter.def.json msgctxt "coasting_enable label" msgid "Enable Coasting" @@ -6495,6 +6535,30 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "ファイルから読み込むときに、モデルに適用するトランスフォーメーションマトリックス。" +#~ msgctxt "retraction_combing_max_distance description" +#~ msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." +#~ msgstr "ゼロ以外の場合、この距離より移動量が多い場合は、引き戻しを使用します。" + +#~ msgctxt "machine_use_extruder_offset_to_offset_coords description" +#~ msgid "Apply the extruder offset to the coordinate system." +#~ msgstr "エクストルーダーのオフセットを座標システムに適用します。" + +#~ msgctxt "shell label" +#~ msgid "Shell" +#~ msgstr "外郭" + +#~ msgctxt "max_skin_angle_for_expansion description" +#~ msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." +#~ msgstr "この設定より大きい角を持つオブジェクトの上部または底部の表面、その表面のスキンはを拡大しません。これは、モデルのサーフェスに近い垂直斜面がある場合に作成される狭いスキン領域の拡大を回避します。0 ° の角度は水平方向、90 ° の角度が垂直方向です。" + +#~ msgctxt "speed_layer_0 description" +#~ msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." +#~ msgstr "一層目での速度。ビルトプレートへの接着を向上するため低速を推奨します。" + +#~ msgctxt "infill_mesh_order description" +#~ msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." +#~ msgstr "インフィルメッシュの重なりが複数生じた場合のこのメッシュの優先度を決定します。複数のインフィルメッシュの重なりがあるエリアでは、最もランクが低いメッシュの設定になります。順序が高いインフィルメッシュは、順序が低いインフィルメッシュのインフィルと通常のメッシュを変更します。" + #~ msgctxt "material_bed_temperature description" #~ msgid "The temperature used for the heated build plate. If this is 0, the bed temperature will not be adjusted." #~ msgstr "加熱式ビルドプレート温度。これが 0 の場合、ベッド温度は調整されません。" diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index 31c687c231..0ae53eb3d4 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -1,13 +1,13 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0200\n" -"PO-Revision-Date: 2020-11-09 14:08+0100\n" +"POT-Creation-Date: 2021-06-10 17:35+0200\n" +"PO-Revision-Date: 2021-04-16 15:01+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Korean , Jinbum Kim , Korean \n" "Language: ko_KR\n" @@ -17,8 +17,12 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 2.4.1\n" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1581 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 msgctxt "@label" msgid "Unknown" msgstr "알 수 없는" @@ -44,47 +48,56 @@ msgctxt "@label {0} is the name of a printer that's about to be deleted." msgid "Are you sure you wish to remove {0}? This cannot be undone!" msgstr "정말로 {0}을(를) 제거하시겠습니까? 이 작업을 실행 취소할 수 없습니다." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 msgctxt "@label" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 msgctxt "@label" msgid "Visual" msgstr "뛰어난 외관" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." msgstr "시각적 프로파일은 높은 시각적 및 표면 품질의 의도를 지니고 시각적 프로토타입과 모델을 인쇄하기 위해 설계되었습니다." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 msgctxt "@label" msgid "Engineering" msgstr "Engineering" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." msgstr "엔지니어링 프로파일은 정확도를 개선하고 허용 오차를 좁히려는 의도로 기능 프로토타입 및 최종 사용 부품을 인쇄하도록 설계되었습니다." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 msgctxt "@label" msgid "Draft" msgstr "초안" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "초안 프로파일은 인쇄 시간을 상당히 줄이려는 의도로 초기 프로토타입과 컨셉트 확인을 인쇄하도록 설계되었습니다." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:226 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:234 msgctxt "@label" msgid "Custom Material" msgstr "사용자 정의 소재" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:227 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 msgctxt "@label" msgid "Custom" msgstr "사용자 정의" @@ -105,51 +118,63 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "모든 파일 (*)" -#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:178 +#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:181 msgctxt "@info:title" msgid "Login failed" msgstr "로그인 실패" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:67 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:67 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:24 msgctxt "@info:status" msgid "Finding new location for objects" msgstr "객체의 새 위치 찾기" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:71 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:28 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:71 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:28 msgctxt "@info:title" msgid "Finding Location" msgstr "위치 찾기" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:150 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:76 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:150 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 +#: /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:76 msgctxt "@info:status" msgid "Unable to find a location within the build volume for all objects" msgstr "모든 개체가 출력할 수 있는 최대 사이즈 내에 위치할 수 없습니다" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:151 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:42 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:151 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:42 msgctxt "@info:title" msgid "Can't Find Location" msgstr "위치를 찾을 수 없음" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:104 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:116 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "사용자 데이터 디렉터리에서 압축 파일을 만들 수 없습니다: {}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:110 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 msgctxt "@info:title" msgid "Backup" msgstr "백업" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:123 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:135 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "적절한 데이터 또는 메타 데이터 없이 Cura 백업을 복원하려고 시도했습니다." -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:134 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:146 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that is higher than the current version." msgstr "현재 버전보다 높은 Cura 백업을 복원하려고 시도했습니다." +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 +msgctxt "@info:backup_failed" +msgid "The following error occurred while trying to restore a Cura backup:" +msgstr "다음의 오류는 Cura 백업을 복원하려고 시도하는 동안 발생했습니다." + #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -299,71 +324,76 @@ msgctxt "@action:button" msgid "Send report" msgstr "보고서 전송" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:521 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:527 msgctxt "@info:progress" msgid "Loading machines..." msgstr "기기로드 중 ..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:528 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:534 msgctxt "@info:progress" msgid "Setting up preferences..." msgstr "환경 설정을 설정하는 중..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:657 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:672 msgctxt "@info:progress" msgid "Initializing Active Machine..." msgstr "활성 기기 초기화 중..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:803 msgctxt "@info:progress" msgid "Initializing machine manager..." msgstr "패키지 관리자 초기화 중..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:802 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:817 msgctxt "@info:progress" msgid "Initializing build volume..." msgstr "출력 사이즈 초기화 중..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:870 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:888 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "장면 설정 중..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:906 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:924 msgctxt "@info:progress" msgid "Loading interface..." msgstr "인터페이스 로드 중 ..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:911 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:929 msgctxt "@info:progress" msgid "Initializing engine..." msgstr "엔진 초기화 중..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1221 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1246 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1777 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1799 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "한 번에 하나의 G-코드 파일만 로드 할 수 있습니다. {0} 가져 오기를 건너 뛰었습니다." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1778 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:188 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 msgctxt "@info:title" msgid "Warning" msgstr "경고" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1787 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1809 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "G-코드가 로드되어 있으면 다른 파일을 열 수 없습니다. {0} 가져 오기를 건너 뛰었습니다." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1788 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 msgctxt "@info:title" msgid "Error" @@ -384,7 +414,7 @@ msgctxt "@info:title" msgid "Placing Object" msgstr "개체 배치 중" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:92 msgctxt "@message" msgid "Could not read response." msgstr "응답을 읽을 수 없습니다." @@ -404,28 +434,31 @@ msgctxt "@message" msgid "Something unexpected happened when trying to log in, please try again." msgstr "로그인을 시도할 때 예기치 못한 문제가 발생했습니다. 다시 시도하십시오." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:187 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:189 msgctxt "@info" msgid "Unable to start a new sign in process. Check if another sign in attempt is still active." msgstr "새 로그인 작업을 시작할 수 없습니다. 다른 로그인 작업이 진행 중인지 확인하십시오." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Ultimaker 계정 서버에 도달할 수 없음." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:205 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:205 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 msgctxt "@title:window" msgid "File Already Exists" msgstr "파일이 이미 있습니다" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:206 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:206 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "파일 {0}이 이미 있습니다. 덮어 쓰시겠습니까?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:452 /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:455 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "유효하지 않은 파일 URL:" @@ -477,7 +510,8 @@ msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "{0}에서 프로파일을 가져오지 못했습니다:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:235 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:245 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:235 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:245 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." @@ -507,33 +541,33 @@ msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "프로파일 {0}에 알 수 없는 파일 유형이 있거나 손상되었습니다." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:423 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:426 msgctxt "@label" msgid "Custom profile" msgstr "사용자 정의 프로파일" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:439 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:442 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "프로파일에 품질 타입이 누락되었습니다." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:443 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:446 msgctxt "@info:status" -msgid "Global stack is missing." -msgstr "전체 스택이 누락되었습니다." +msgid "There is no active printer yet." +msgstr "아직 활성화된 프린터가 없습니다." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:449 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:452 msgctxt "@info:status" msgid "Unable to add the profile." msgstr "프로파일을 추가할 수 없습니다." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:463 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:466 #, python-brace-format msgctxt "@info:status" msgid "Quality type '{0}' is not compatible with the current active machine definition '{1}'." msgstr "'{0}' 품질 타입은 현재 활성 기기 정의 '{1}'와(과) 호환되지 않습니다." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:468 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:471 #, python-brace-format msgctxt "@info:status" msgid "Warning: The profile is not visible because its quality type '{0}' is not available for the current configuration. Switch to a material/nozzle combination that can use this quality type." @@ -549,40 +583,51 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:712 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 msgctxt "@label" msgid "Nozzle" msgstr "노즐" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:860 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:856 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "익스트루더의 현재 가용성과 일치하도록 설정이 변경되었습니다:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:862 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:858 msgctxt "@info:title" msgid "Settings updated" msgstr "설정이 업데이트되었습니다" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1447 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1478 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "익스트루더 비활성화됨" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:67 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:67 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "추가" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:263 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 msgctxt "@action:button" msgid "Finish" msgstr "종료" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:441 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml:81 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 msgctxt "@action:button" msgid "Cancel" msgstr "취소" @@ -593,73 +638,84 @@ msgctxt "@label" msgid "Group #{group_nr}" msgstr "그룹 #{group_nr}" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "외벽" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "내벽" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "스킨" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "내부채움" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "내부채움 서포트" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "지원하는 인터페이스" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "서포트" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "스커트" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 msgctxt "@tooltip" msgid "Prime Tower" msgstr "프라임 타워" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 msgctxt "@tooltip" msgid "Travel" msgstr "움직임 경로" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 msgctxt "@tooltip" msgid "Retractions" msgstr "리트랙션" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:94 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 msgctxt "@tooltip" msgid "Other" msgstr "다른" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 msgctxt "@action:button" msgid "Next" msgstr "다음" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:173 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 +msgctxt "@action:button" +msgid "Skip" +msgstr "건너뛰기" + +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 +#: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 msgctxt "@action:button" msgid "Close" msgstr "닫기" @@ -683,29 +739,36 @@ msgstr "" "

    인쇄 품질 및 안정성을 최고로 높이는 방법을 알아보십시오.

    \n" "

    인쇄 품질 가이드 보기

    " -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:535 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:540 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "프로젝트 파일 {0}에 알 수 없는 기기 유형 {1}이(가) 포함되어 있습니다. 기기를 가져올 수 없습니다. 대신 모델을 가져옵니다." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:538 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:543 msgctxt "@info:title" msgid "Open Project File" msgstr "프로젝트 파일 열기" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:634 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:639 #, python-brace-format msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "프로젝트 파일 {0}에 갑자기 접근할 수 없습니다: {1}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:635 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "프로젝트 파일 열 수 없음" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:686 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:646 +#, python-brace-format +msgctxt "@info:error Don't translate the XML tags or !" +msgid "Project file {0} is corrupt: {1}." +msgstr "프로젝트 파일 {0}이 손상됨: {1}." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:698 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." @@ -721,7 +784,8 @@ msgctxt "@title:tab" msgid "Custom" msgstr "사용자 정의" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 msgctxt "@item:inlistbox" msgid "3MF File" msgstr "3MF 파일" @@ -731,7 +795,8 @@ msgctxt "@error:zip" msgid "3MF Writer plug-in is corrupt." msgstr "3MF 기록기 플러그인이 손상되었습니다." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:59 /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:92 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:59 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:92 msgctxt "@error:zip" msgid "No permission to write the workspace here." msgstr "여기서 작업 환경을 작성할 권한이 없습니다." @@ -741,7 +806,7 @@ msgctxt "@error:zip" msgid "The operating system does not allow saving a project file to this location or with this file name." msgstr "운영 체제가 프로젝트 파일을 이 위치로 또는 이 파일명으로 저장하지 못합니다." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:206 msgctxt "@error:zip" msgid "Error writing 3mf file." msgstr "3MF 파일 작성 중 오류." @@ -796,7 +861,8 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "백업이 최대 파일 크기를 초과했습니다." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:82 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:23 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "백업 복원 시도 중 오류가 있었습니다." @@ -806,41 +872,45 @@ msgctxt "@item:inmenu" msgid "Manage backups" msgstr "백업 관리" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "선택한 소재 또는 구성과 호환되지 않기 때문에 현재 소재로 슬라이스 할 수 없습니다." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:411 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:420 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:429 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 msgctxt "@info:title" msgid "Unable to slice" msgstr "슬라이스 할 수 없습니다" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:412 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "현재 설정으로 슬라이스 할 수 없습니다. 다음 설정에는 오류가 있습니다 : {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:410 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:436 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "일부 모델별 설정으로 인해 슬라이스할 수 없습니다. 하나 이상의 모델에서 다음 설정에 오류가 있습니다. {error_labels}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:445 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "프라임 타워 또는 위치가 유효하지 않아 슬라이스 할 수 없습니다." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:428 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:454 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "비활성화된 익스트루더 %s(와)과 연결된 개체가 있기 때문에 슬라이스할 수 없습니다." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:463 msgctxt "@info:status" msgid "" "Please review settings and check if your models:\n" @@ -853,7 +923,8 @@ msgstr "" "- 활성화된 익스트루더로 할당됨\n" "- 수정자 메쉬로 전체 설정되지 않음" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 msgctxt "@info:status" msgid "Processing Layers" msgstr "레이어 처리 중" @@ -863,7 +934,8 @@ msgctxt "@info:title" msgid "Information" msgstr "정보" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura 프로파일" @@ -895,7 +967,8 @@ msgctxt "@action" msgid "Update Firmware" msgstr "펌웨어 업데이트" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 msgctxt "@item:inlistbox" msgid "Compressed G-code File" msgstr "압축된 G-code 파일" @@ -905,7 +978,9 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "GCodeGzWriter는 텍스트 모드는 지원하지 않습니다." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 msgctxt "@item:inlistbox" msgid "G-code File" msgstr "G-code 파일" @@ -915,7 +990,8 @@ msgctxt "@info:status" msgid "Parsing G-code" msgstr "G 코드 파싱" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:349 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:349 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:503 msgctxt "@info:title" msgid "G-code Details" msgstr "G-코드 세부 정보" @@ -935,7 +1011,8 @@ msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "GCodeWriter는 텍스트가 아닌 모드는 지원하지 않습니다." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "내보내기 전에 G-code를 준비하십시오." @@ -1021,7 +1098,8 @@ msgctxt "@item:inlistbox" msgid "Save to Removable Drive {0}" msgstr "이동식 드라이브 {0}에 저장" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "쓸 수있는 파일 형식이 없습니다!" @@ -1037,7 +1115,8 @@ msgctxt "@info:title" msgid "Saving" msgstr "저장" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:106 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:109 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:106 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:109 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not save to {0}: {1}" @@ -1049,7 +1128,8 @@ msgctxt "@info:status Don't translate the tag {device}!" msgid "Could not find a file name when trying to write to {device}." msgstr "{device} 장치에 쓸 때 파일 이름을 찾을 수 없습니다." -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:138 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:138 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #, python-brace-format msgctxt "@info:status" msgid "Could not save to removable drive {0}: {1}" @@ -1099,27 +1179,28 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "이동식 드라이브" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:121 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:128 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled." msgstr "와이어 프린팅이 활성화되어 있을 때 Cura는 레이어를 정확하게 표시하지 않습니다." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:129 msgctxt "@info:title" msgid "Simulation View" msgstr "시뮬레이션 뷰" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:status" msgid "Nothing is shown because you need to slice first." msgstr "먼저 슬라이스해야 하기 때문에 아무것도 표시되지 않습니다." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:title" msgid "No layers to show" msgstr "표시할 레이어 없음" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:124 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "다시 메시지 표시 안 함" @@ -1129,15 +1210,20 @@ msgctxt "@item:inlistbox" msgid "Layer view" msgstr "레이어 뷰" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:70 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:71 msgctxt "@info:status" -msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." -msgstr "매니폴드 모델이 아닙니다. 강조 표시된 영역은 누락되거나 관련 없는 표면을 표시합니다." +msgid "The highlighted areas indicate either missing or extraneous surfaces. Fix your model and open it again into Cura." +msgstr "강조 표시된 영역은 누락되거나 관련 없는 표면을 표시합니다. 모델을 수정하고 Cura에서 다시 엽니다." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 msgctxt "@info:title" -msgid "Model errors" -msgstr "모델 오류" +msgid "Model Errors" +msgstr "모델 에러" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:79 +msgctxt "@action:button" +msgid "Learn more" +msgstr "자세히 알아보기" #: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/__init__.py:12 msgctxt "@item:inmenu" @@ -1159,12 +1245,13 @@ msgctxt "@info:generic" msgid "Do you want to sync material and software packages with your account?" msgstr "귀하의 계정으로 재료와 소프트웨어 패키지를 동기화하시겠습니까?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:143 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/DownloadPresenter.py:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:143 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/DownloadPresenter.py:93 msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "Ultimaker 계정에서 변경 사항이 감지되었습니다" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:145 msgctxt "@action:button" msgid "Sync" msgstr "동기화" @@ -1179,7 +1266,8 @@ msgctxt "@button" msgid "Decline" msgstr "거절" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/LicenseModel.py:10 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:56 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/LicenseModel.py:10 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:56 msgctxt "@button" msgid "Agree" msgstr "동의" @@ -1199,7 +1287,7 @@ msgctxt "@info:generic" msgid "You need to quit and restart {} before changes have effect." msgstr "변경 사항이 적용되기 전에 {}을(를) 멈추고 다시 시작해야 합니다." -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:79 msgctxt "@info:generic" msgid "{} plugins failed to download" msgstr "{}개의 플러그인을 다운로드하지 못했습니다" @@ -1234,12 +1322,17 @@ msgctxt "@item:inlistbox" msgid "Compressed COLLADA Digital Asset Exchange" msgstr "Compressed COLLADA Digital Asset Exchange" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimaker 포맷 패키지" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "UFP 파일에 쓸 수 없음:" @@ -1254,22 +1347,22 @@ msgctxt "@action" msgid "Select upgrades" msgstr "업그레이드 선택" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:152 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 msgctxt "@action:button" msgid "Print via cloud" msgstr "Cloud를 통해 프린팅" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:155 msgctxt "@properties:tooltip" msgid "Print via cloud" msgstr "Cloud를 통해 프린팅" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:156 msgctxt "@info:status" msgid "Connected via cloud" msgstr "Cloud를 통해 연결됨" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:264 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:270 #, python-brace-format msgctxt "@error:send" msgid "Unknown error code when uploading print job: {0}" @@ -1311,7 +1404,8 @@ msgid "This printer is not linked to the Digital Factory:" msgid_plural "These printers are not linked to the Digital Factory:" msgstr[0] "다음 프린터는 Digital Factory에 연결되어 있지 않습니다:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:329 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:329 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:419 msgctxt "info:name" msgid "Ultimaker Digital Factory" msgstr "Ultimaker Digital Factory" @@ -1559,125 +1653,135 @@ msgctxt "@info:tooltip" msgid "Some things could be problematic in this print. Click to see tips for adjustment." msgstr "이 출력물에는 문제가있을 수 있습니다. 조정을 위한 도움말을 보려면 클릭하십시오." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:15 msgctxt "@title:window" msgid "Open Project" msgstr "프로젝트 열기" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" msgstr "기존 업데이트" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:63 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "새로 만들기" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:74 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "요약 - Cura 프로젝트" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:96 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 msgctxt "@action:label" msgid "Printer settings" msgstr "프린터 설정" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:112 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:113 msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "기기의 충돌을 어떻게 해결해야합니까?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:165 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 msgctxt "@action:label" msgid "Type" msgstr "유형" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:181 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 msgctxt "@action:label" msgid "Printer Group" msgstr "프린터 그룹" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:203 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 msgctxt "@action:label" msgid "Profile settings" msgstr "프로파일 설정" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:219 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:221 msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "프로파일의 충돌을 어떻게 해결해야합니까?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:349 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 msgctxt "@action:label" msgid "Name" msgstr "이름" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:255 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 msgctxt "@action:label" msgid "Intent" msgstr "Intent" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:271 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Not in profile" msgstr "프로파일에 없음" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:276 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 무시" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:287 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:290 msgctxt "@action:label" msgid "Derivative from" msgstr "Derivative from" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:295 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 무시" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:309 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:312 msgctxt "@action:label" msgid "Material settings" msgstr "재료 설정" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:328 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "재료의 충돌은 어떻게 해결되어야합니까?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:369 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:373 msgctxt "@action:label" msgid "Setting visibility" msgstr "표시 설정" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:378 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:382 msgctxt "@action:label" msgid "Mode" msgstr "종류" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:label" msgid "Visible settings:" msgstr "표시 설정 :" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:399 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:403 msgctxt "@action:label" msgid "%1 out of %2" msgstr "1 out of %2" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:425 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:429 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "프로젝트를 로드하면 빌드 플레이트의 모든 모델이 지워집니다." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:457 msgctxt "@action:button" msgid "Open" msgstr "열기" @@ -1777,8 +1881,10 @@ msgctxt "@description" msgid "Backup and synchronize your Cura settings." msgstr "Cura 설정을 백업, 동기화하십시오." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:68 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:125 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:199 msgctxt "@button" msgid "Sign in" msgstr "로그인" @@ -1928,7 +2034,8 @@ msgctxt "@item:inlistbox" msgid "Linear" msgstr "직선 모양" -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:161 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:172 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:161 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:172 msgctxt "@item:inlistbox" msgid "Translucency" msgstr "반투명성" @@ -1953,7 +2060,9 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "스무딩(smoothing)" -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:227 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:139 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:227 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@action:button" msgid "OK" msgstr "확인" @@ -1973,10 +2082,18 @@ msgctxt "@label" msgid "Nozzle size" msgstr "노즐 크기" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:89 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:205 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:245 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:283 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:245 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:283 msgctxt "@label" msgid "mm" msgstr "mm" @@ -2001,12 +2118,12 @@ msgctxt "@label" msgid "Cooling Fan Number" msgstr "냉각 팬 번호" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:163 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "익스트루더 시작 Gcode" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:177 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "익스트루더 종료 Gcode" @@ -2091,12 +2208,17 @@ msgctxt "@label" msgid "Number of Extruders" msgstr "익스트루더의 수" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:345 +msgctxt "@label" +msgid "Apply Extruder offsets to GCode" +msgstr "익스트루더 오프셋을 GCode에 적용" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:393 msgctxt "@title:label" msgid "Start G-code" msgstr "시작 GCode" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:385 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:404 msgctxt "@title:label" msgid "End G-code" msgstr "End GCode" @@ -2122,6 +2244,11 @@ msgctxt "@label link to technical assistance" msgid "View user manuals online" msgstr "사용자 매뉴얼 온라인 보기" +#: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 +msgctxt "@info" +msgid "In order to monitor your print from Cura, please connect the printer." +msgstr "Cura에서 프린트를 모니터링하려면 프린터를 연결하십시오." + #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" msgid "Mesh Type" @@ -2167,7 +2294,8 @@ msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "이 모델에 맞게 사용자 정의 설정을 선택하십시오" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 msgctxt "@label:textbox" msgid "Filter..." msgstr "필터..." @@ -2177,113 +2305,130 @@ msgctxt "@label:checkbox" msgid "Show all" msgstr "모두 보이기" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:20 msgctxt "@title:window" msgid "Post Processing Plugin" msgstr "후처리 플러그인" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:59 msgctxt "@label" msgid "Post Processing Scripts" msgstr "후처리 스크립트" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:235 msgctxt "@action" msgid "Add a script" msgstr "스크립트 추가" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:282 msgctxt "@label" msgid "Settings" msgstr "설정" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:499 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:502 msgctxt "@info:tooltip" msgid "Change active post-processing scripts." msgstr "활성 사후 처리 스크립트를 변경하십시오." -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:506 msgctxt "@info:tooltip" msgid "The following script is active:" msgid_plural "The following scripts are active:" msgstr[0] "다음 스크립트들이 활성화됩니다:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:20 /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:49 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:49 msgctxt "@label" msgid "Color scheme" msgstr "색 구성표" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:110 msgctxt "@label:listbox" msgid "Material Color" msgstr "재료 색상" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:111 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:114 msgctxt "@label:listbox" msgid "Line Type" msgstr "라인 유형" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:115 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:118 msgctxt "@label:listbox" msgid "Speed" msgstr "속도" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:122 msgctxt "@label:listbox" -msgid "Layer thickness" +msgid "Layer Thickness" msgstr "레이어 두께" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:126 +msgctxt "@label:listbox" +msgid "Line Width" +msgstr "선 두께" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 +msgctxt "@label:listbox" +msgid "Flow" +msgstr "유량" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" msgid "Compatibility Mode" msgstr "호환 모드" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:230 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:245 msgctxt "@label" msgid "Travels" msgstr "이동" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:251 msgctxt "@label" msgid "Helpers" msgstr "도움말" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:257 msgctxt "@label" msgid "Shell" msgstr "외곽" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:248 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 msgctxt "@label" msgid "Infill" msgstr "내부채움" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:298 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:271 +msgctxt "@label" +msgid "Starts" +msgstr "시작" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 msgctxt "@label" msgid "Only Show Top Layers" msgstr "상단 레이어 만 표시" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:308 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:332 msgctxt "@label" msgid "Show 5 Detailed Layers On Top" msgstr "상단에 5 개의 세부 레이어 표시" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:346 msgctxt "@label" msgid "Top / Bottom" msgstr "위 / 아래" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:350 msgctxt "@label" msgid "Inner Wall" msgstr "내벽" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:384 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:419 msgctxt "@label" msgid "min" msgstr "최소" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:433 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:488 msgctxt "@label" msgid "max" msgstr "최대" @@ -2358,7 +2503,8 @@ msgctxt "@action:label" msgid "Website" msgstr "웹 사이트" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:46 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:20 msgctxt "@action:button" msgid "Installed" msgstr "설치됨" @@ -2373,17 +2519,20 @@ msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "재료 스플 구입" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:96 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:34 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "업데이트" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:97 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:35 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "업데이트 중" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:98 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:36 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:98 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" msgstr "업데이트됨" @@ -2393,7 +2542,8 @@ msgctxt "@label" msgid "Premium" msgstr "프리미엄" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml:39 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml:39 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:86 msgctxt "@info:tooltip" msgid "Go to Web Marketplace" msgstr "웹 마켓플레이스로 이동" @@ -2418,7 +2568,9 @@ msgctxt "@title:tab" msgid "Plugins" msgstr "플러그인" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:466 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 msgctxt "@title:tab" msgid "Materials" msgstr "재료" @@ -2463,7 +2615,10 @@ msgctxt "@button" msgid "Dismiss" msgstr "취소" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:178 msgctxt "@button" msgid "Next" msgstr "다음 것" @@ -2528,7 +2683,8 @@ msgctxt "@label" msgid "Last updated" msgstr "마지막으로 업데이트한 날짜" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:103 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "상표" @@ -2658,7 +2814,9 @@ msgctxt "@action:button" msgid "Edit" msgstr "편집" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:156 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" @@ -2674,17 +2832,20 @@ msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "프린터가 목록에 없으면 네트워크 프린팅 문제 해결 가이드를 읽어보십시오" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:205 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:263 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:263 msgctxt "@label" msgid "Type" msgstr "유형" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:279 msgctxt "@label" msgid "Firmware version" msgstr "펌웨어 버전" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:295 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:295 msgctxt "@label" msgid "Address" msgstr "주소" @@ -2714,7 +2875,8 @@ msgctxt "@title:window" msgid "Invalid IP address" msgstr "잘못된 IP 주소" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "유효한 IP 주소를 입력하십시오." @@ -2724,7 +2886,8 @@ msgctxt "@title:window" msgid "Printer Address" msgstr "프린터 주소" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "네트워크에 있는 프린터의 IP 주소를 입력하십시오." @@ -2775,7 +2938,8 @@ msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "무시하기는 기존 프린터 구성과 함께 지정된 설정을 사용하게 됩니다. 이는 인쇄 실패로 이어질 수 있습니다." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:191 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:191 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:184 msgctxt "@label" msgid "Glass" @@ -2796,7 +2960,8 @@ msgctxt "@label" msgid "Delete" msgstr "삭제" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:289 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 msgctxt "@label" msgid "Resume" msgstr "재개" @@ -2811,7 +2976,9 @@ msgctxt "@label" msgid "Resuming..." msgstr "다시 시작..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 msgctxt "@label" msgid "Pause" msgstr "중지" @@ -2851,7 +3018,8 @@ msgctxt "@label %1 is the name of a print job." msgid "Are you sure you want to abort %1?" msgstr "%1(을)를 정말로 중지하시겠습니까?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 msgctxt "@window:title" msgid "Abort print" msgstr "프린팅 중단" @@ -2861,7 +3029,9 @@ msgctxt "@label link to Connect and Cloud interfaces" msgid "Manage printer" msgstr "프린터 관리" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:519 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." msgstr "대기열을 원격으로 관리하려면 프린터 펌웨어를 업데이트하십시오." @@ -2886,27 +3056,34 @@ msgctxt "@label:status" msgid "Idle" msgstr "대기 상태" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:365 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +msgctxt "@label:status" +msgid "Preparing..." +msgstr "준비 중..." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:369 msgctxt "@label:status" msgid "Printing" msgstr "프린팅" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:406 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:410 msgctxt "@label" msgid "Untitled" msgstr "제목 없음" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:431 msgctxt "@label" msgid "Anonymous" msgstr "익명" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:458 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "구성 변경 필요" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:492 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:496 msgctxt "@action:button" msgid "Details" msgstr "세부 사항" @@ -2921,21 +3098,18 @@ msgctxt "@label" msgid "First available" msgstr "첫 번째로 사용 가능" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "중단됨" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "끝마친" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -msgctxt "@label:status" -msgid "Preparing..." -msgstr "준비 중..." - #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." @@ -3016,26 +3190,27 @@ msgctxt "@action:button" msgid "Sign in" msgstr "로그인" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" -msgid "Your key to connected 3D printing" -msgstr "연결된 3D 프린팅의 핵심" +msgid "Sign in to the Ultimaker platform" +msgstr "Ultimaker 플랫폼에 로그인" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:42 msgctxt "@text" msgid "" -"- Customize your experience with more print profiles and plugins\n" -"- Stay flexible by syncing your setup and loading it anywhere\n" -"- Increase efficiency with a remote workflow on Ultimaker printers" +"- Add material profiles and plug-ins from the Marketplace\n" +"- Back-up and sync your material profiles and plug-ins\n" +"- Share ideas and get help from 48,000+ users in the Ultimaker community" msgstr "" -"- 보다 많은 프린트 프로파일과 플러그인으로 자신에게 맞게 환경 조정\n" -"- 어디서든지 유연하게 설정을 동기화하고 로딩\n" -"- Ultimaker 프린터에서 원격 워크플로로 효율성 증대" +"- 재료 설정 및 Marketplace 플러그인 추가\n" +"- 재료 설정과 플러그인 백업 및 동기화\n" +"- Ultimaker 커뮤니티에서 48,000명 이상의 사용자와 아이디어를 공유하고 도움 받기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:142 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:62 msgctxt "@button" -msgid "Create account" -msgstr "계정 생성" +msgid "Create a free Ultimaker account" +msgstr "Ultimaker 계정 무료 생성" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/SyncState.qml:28 msgctxt "@label" @@ -3142,300 +3317,308 @@ msgctxt "@button" msgid "Cancel" msgstr "취소" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:83 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "온라인 문제 해결 가이드 표시" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:90 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "전채 화면 전환" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:98 msgctxt "@action:inmenu" msgid "Exit Full Screen" msgstr "전체 화면 종료" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:105 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "되돌리기(&U)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:115 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "다시하기(&R)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:125 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "종료(&Q)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:132 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:133 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "3D 보기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:140 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "앞에서 보기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:147 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "위에서 보기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 +msgctxt "@action:inmenu menubar:view" +msgid "Bottom View" +msgstr "하단 뷰" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "왼쪽에서 보기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:160 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:168 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "오른쪽에서 보기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:175 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Cura 구성 ..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:182 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "프린터 추가..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:180 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:188 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "프린터 관리 ..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:187 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "재료 관리..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu" msgid "Add more materials from Marketplace" msgstr "마켓플레이스에서 더 많은 재료 추가" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "현재 설정으로로 프로파일 업데이트" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "현재 변경 사항 무시" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:222 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:230 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "현재 설정으로 프로파일 생성..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "프로파일 관리..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "온라인 문서 표시" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "버그 리포트" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:260 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "새로운 기능" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:266 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "소개..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:273 msgctxt "@action:inmenu menubar:edit" -msgid "Delete Selected Model" -msgid_plural "Delete Selected Models" -msgstr[0] "선택한 모델 삭제" +msgid "Delete Selected" +msgstr "선택 항목 삭제" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:283 msgctxt "@action:inmenu menubar:edit" -msgid "Center Selected Model" -msgid_plural "Center Selected Models" -msgstr[0] "선택한 모델 중심에 놓기" +msgid "Center Selected" +msgstr "선택 항목 가운데 정렬" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:292 msgctxt "@action:inmenu menubar:edit" -msgid "Multiply Selected Model" -msgid_plural "Multiply Selected Models" -msgstr[0] "선택한 모델 복제" +msgid "Multiply Selected" +msgstr "선택 항목 복제" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "모델 삭제" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:309 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "플랫폼중심에 모델 위치하기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:307 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "모델 그룹화" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:327 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:335 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "모델 그룹 해제" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:345 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "모델 합치기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:347 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:355 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "모델 복제..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:362 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "모든 모델 선택" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:372 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "빌드 플레이트 지우기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:382 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "모든 모델 다시 로드" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "모든 모델을 모든 빌드 플레이트에 정렬" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:390 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "모든 모델 정렬" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:406 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "선택한 모델 정렬" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:405 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:413 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "모든 모델의 위치 재설정" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:412 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "모든 모델의 변환 재설정" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:419 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:429 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "파일 열기..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:439 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "새로운 프로젝트..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:434 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:446 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "설정 폴더 표시" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:441 /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:538 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "설정 보기..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:448 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:460 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&시장" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:257 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "다시 시작한 후에 이 패키지가 설치됩니다." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 msgctxt "@title:tab" msgid "General" msgstr "일반" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:462 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:453 msgctxt "@title:tab" msgid "Settings" msgstr "설정" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:464 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 msgctxt "@title:tab" msgid "Printers" msgstr "프린터" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 msgctxt "@title:tab" msgid "Profiles" msgstr "프로파일" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:576 msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "%1 닫기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:588 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "%1을(를) 정말로 종료하시겠습니까?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:638 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "파일 열기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:744 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:737 msgctxt "@window:title" msgid "Install Package" msgstr "패키지 설치" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:752 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:745 msgctxt "@title:window" msgid "Open File(s)" msgstr "파일 열기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:755 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:748 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "선택한 파일 내에 하나 이상의 G-코드 파일이 있습니다. 한 번에 하나의 G-코드 파일 만 열 수 있습니다. G-코드 파일을 열려면 하나만 선택하십시오." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:858 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:857 msgctxt "@title:window" msgid "Add Printer" msgstr "프린터 추가" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:866 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:865 msgctxt "@title:window" msgid "What's New" msgstr "새로운 기능" @@ -3564,7 +3747,8 @@ msgctxt "@Label" msgid "Static type checker for Python" msgstr "Python용 정적 유형 검사기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@Label" msgid "Root Certificates for validating SSL trustworthiness" msgstr "SSL 신뢰성 검증용 루트 인증서" @@ -3584,17 +3768,27 @@ msgctxt "@label" msgid "Python bindings for libnest2d" msgstr "libnest2d용 Python 바인딩" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +msgctxt "@label" +msgid "Support library for system keyring access" +msgstr "시스템 키링 액세스를 위한 서포트 라이브러리" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" +msgid "Python extensions for Microsoft Windows" +msgstr "Microsoft Windows용 Python 확장" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +msgctxt "@label" msgid "Font" msgstr "폰트" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 msgctxt "@label" msgid "SVG icons" msgstr "SVG 아이콘" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:165 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Linux 교차 배포 응용 프로그램 배포" @@ -3604,22 +3798,22 @@ msgctxt "@title:window" msgid "Open project file" msgstr "프로젝트 파일 열기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:88 msgctxt "@text:window" msgid "This is a Cura project file. Would you like to open it as a project or import the models from it?" msgstr "이 파일은 Cura 프로젝트 파일입니다. 프로젝트로 열거나 모델을 가져 오시겠습니까?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:98 msgctxt "@text:window" msgid "Remember my choice" msgstr "선택 기억하기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:122 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:117 msgctxt "@action:button" msgid "Open as project" msgstr "프로젝트로 열기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:131 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:126 msgctxt "@action:button" msgid "Import models" msgstr "모델 가져 오기" @@ -3650,7 +3844,8 @@ msgctxt "@title:column" msgid "Current changes" msgstr "현재 변경 사항" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "항상 묻기" @@ -3675,12 +3870,12 @@ msgctxt "@action:button" msgid "Keep changes" msgstr "변경 사항 유지" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 msgctxt "@text:window" msgid "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?" msgstr "선택한 파일 내에 하나 이상의 프로젝트 파일이 있습니다. 한 번에 하나의 프로젝트 파일 만 열 수 있습니다. 해당 파일에서 모델 만 가져 오기를 권장합니다. 계속 하시겠습니까?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:99 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:94 msgctxt "@action:button" msgid "Import all as models" msgstr "모두 모델로 가져 오기" @@ -3726,7 +3921,8 @@ msgctxt "@text Print job name" msgid "Untitled" msgstr "제목 없음" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:27 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:27 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "파일" @@ -3736,12 +3932,14 @@ msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "편집(&E)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:49 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:12 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:49 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:12 msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "보기(&V)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:51 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&Settings" msgstr "설정" @@ -3831,7 +4029,7 @@ msgctxt "@label" msgid "Material" msgstr "재료" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:407 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "더 나은 접착력을 위해 이 재료 조합과 함께 접착제를 사용하십시오.." @@ -3853,17 +4051,17 @@ msgctxt "@label" msgid "Number of Copies" msgstr "복제할 수" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:33 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:41 msgctxt "@title:menu menubar:file" msgid "&Save Project..." msgstr "프로젝트 저장(&S)..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:54 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:74 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "내보내기(&E)..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:85 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "내보내기 선택..." @@ -3883,6 +4081,11 @@ msgctxt "@label:category menu label" msgid "Generic" msgstr "일반" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/OpenFilesMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Open File(s)..." +msgstr "파일 여는 중..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3898,6 +4101,11 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "최근 열어본 파일 열기" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SaveProjectMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Save Project..." +msgstr "프로젝트 저장 중..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:15 msgctxt "@title:menu menubar:settings" msgid "&Printer" @@ -3923,17 +4131,17 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "익스트루더 사용하지 않음" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:16 msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "표시 설정" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:45 msgctxt "@action:inmenu" msgid "Collapse All Categories" msgstr "모든 카테고리 붕괴" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "보기 설정 관리..." @@ -3943,22 +4151,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "카메라 위치(&C)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:45 msgctxt "@action:inmenu menubar:view" msgid "Camera view" msgstr "카메라 뷰" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:48 msgctxt "@action:inmenu menubar:view" msgid "Perspective" msgstr "원근" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:60 msgctxt "@action:inmenu menubar:view" msgid "Orthographic" msgstr "직교" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:81 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "빌드 플레이트(&B)" @@ -4003,12 +4211,12 @@ msgctxt "@label:MonitorStatus" msgid "Please remove the print" msgstr "프린트물을 제거하십시오" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@label" msgid "Abort Print" msgstr "프린팅 중단" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:338 msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "프린팅를 중단 하시겠습니까?" @@ -4049,310 +4257,314 @@ msgctxt "@label" msgid "Interface" msgstr "인터페이스" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:216 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:209 msgctxt "@label" msgid "Currency:" msgstr "통화:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:229 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:222 msgctxt "@label" msgid "Theme:" msgstr "테마:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "이러한 변경 사항을 적용하려면 응용 프로그램을 다시 시작해야합니다." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:284 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "설정이 변경되면 자동으로 슬라이싱 합니다." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 msgctxt "@option:check" msgid "Slice automatically" msgstr "자동으로 슬라이싱" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:306 msgctxt "@label" msgid "Viewport behavior" msgstr "뷰포트 동작" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:314 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "지원되지 않는 모델 영역을 빨간색으로 강조 표시하십시오. 서포트가 없으면 이 영역이 제대로 프린팅되지 않습니다." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:323 msgctxt "@option:check" msgid "Display overhang" msgstr "오버행 표시" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:351 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@info:tooltip" msgid "Highlight missing or extraneous surfaces of the model using warning signs. The toolpaths will often be missing parts of the intended geometry." msgstr "경고 기호를 사용해 모델에서 누락되거나 관계 없는 표면을 강조 표시합니다. 도구 경로에서는 종종 의도한 형상의 일부가 누락됩니다." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:342 msgctxt "@option:check" msgid "Display model errors" msgstr "모델 오류 표시" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "모델을 선택하면 모델이 뷰의 가운데에 오도록 카메라를 이동합니다" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:373 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "항목을 선택하면 카메라를 중앙에 위치" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "큐라의 기본 확대 동작을 반전시켜야 합니까?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:388 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "카메라 줌의 방향을 반전시키기." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "확대가 마우스 방향으로 이동해야 합니까?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "정투영법 시점에서는 마우스 방향으로 확대가 지원되지 않습니다." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:409 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "마우스 방향으로 확대" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:435 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:417 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "모델을 더 이상 교차시키지 않도록 이동해야합니까?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:440 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:422 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "모델이 분리되어 있는지 확인" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:431 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "모델을 빌드 플레이트에 닿도록 아래로 움직여야합니까?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:436 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "모델을 빌드 플레이트에 자동으로 놓기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:448 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "g-code 리더에 주의 메시지를 표시하기." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:457 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "g-code 리더의 주의 메시지" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "레이어가 호환 모드로 강제 설정되어야합니까?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "레이어 뷰 호환성 모드로 전환 (다시 시작해야 함)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:498 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" msgstr "닫힌 위치에서 Cura를 열어야 합니까?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:485 msgctxt "@option:check" msgid "Restore window position on start" msgstr "시작 시 창 위치 복원" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:513 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "어떤 유형의 카메라 렌더링을 사용해야 합니까?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:502 msgctxt "@window:text" msgid "Camera rendering:" msgstr "카메라 렌더링:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:531 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:509 msgid "Perspective" msgstr "원근" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:532 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgid "Orthographic" msgstr "정투영" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:563 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:548 msgctxt "@label" msgid "Opening and saving files" msgstr "파일 열기 및 저장" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:555 msgctxt "@info:tooltip" msgid "Should opening files from the desktop or external applications open in the same instance of Cura?" msgstr "데스크톱 또는 외부 애플리케이션의 파일을 동일한 Cura 인스턴스에서 엽니까?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@option:check" msgid "Use a single instance of Cura" msgstr "Cura의 단일 인스턴스 사용" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "크기가 너무 큰 경우 모델을 빌드 볼륨에 맞게 조정해야합니까?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@option:check" msgid "Scale large models" msgstr "큰 모델의 사이즈 수정" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "단위가 밀리미터가 아닌 미터 단위 인 경우 모델이 매우 작게 나타날 수 있습니다. 이 모델을 확대할까요?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "매우 작은 모델의 크기 조정" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "모델을 로드한 후에 선택해야 합니까?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@option:check" msgid "Select models when loaded" msgstr "로드된 경우 모델 선택" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "프린터 이름에 기반한 접두어가 프린팅 작업 이름에 자동으로 추가되어야합니까?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:635 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "작업 이름에 기기 접두어 추가" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:645 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "프로젝트 파일을 저장할 때 요약이 표시되어야합니까?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:649 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:634 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "프로젝트 저장시 요약 대화 상자 표시" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:659 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:644 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "프로젝트 파일을 열 때 기본 동작" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:652 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "프로젝트 파일을 열 때 기본 동작 " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "항상 묻기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:682 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "항상 프로젝트로 열기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:668 msgctxt "@option:openProject" msgid "Always import models" msgstr "항상 모델 가져 오기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:705 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "프로파일을 변경하고 다른 프로파일로 전환하면 수정 사항을 유지할지 여부를 묻는 대화 상자가 표시됩니다. 기본 행동을 선택하면 해당 대화 상자를 다시 표시 하지 않을 수 있습니다." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:728 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "프로파일" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "다른 프로파일로 변경하는 경우 변경된 설정값에 대한 기본 동작 " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:748 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:734 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "항상 변경된 설정 삭제" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:749 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:735 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "항상 변경된 설정을 새 프로파일로 전송" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:783 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@label" msgid "Privacy" msgstr "보안" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:790 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:777 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Cura가 프로그램이 시작될 때 업데이트를 확인할까요?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:795 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:782 msgctxt "@option:check" msgid "Check for updates on start" msgstr "시작시 업데이트 확인" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:805 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:792 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "프린터에 대한 익명의 데이터를 Ultimaker로 보낼까요? 모델, IP 주소 또는 기타 개인 식별 정보는 전송되거나 저장되지 않습니다." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:810 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:797 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "(익명) 프린터 정보 보내기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:819 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:806 msgctxt "@action:button" msgid "More information" msgstr "추가 정보" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "활성화" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "이름 바꾸기" @@ -4367,61 +4579,77 @@ msgctxt "@action:button" msgid "Duplicate" msgstr "복제" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:171 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:171 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "가져오기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:185 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:185 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 msgctxt "@action:button" msgid "Export" msgstr "내보내기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 +msgctxt "@action:button Sending materials to printers" +msgid "Sync with Printers" +msgstr "프린터와 동기화" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" msgid "Printer" msgstr "프린터" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:298 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 msgctxt "@title:window" msgid "Confirm Remove" msgstr "제거 확인" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:301 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "%1을 제거 하시겠습니까? 이것은 취소 할 수 없습니다!" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 msgctxt "@title:window" msgid "Import Material" msgstr "재료 가져 오기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:338 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "재료를 가져올 수 없습니다" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:328 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:342 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "재료를 성공적으로 가져왔습니다" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:346 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 msgctxt "@title:window" msgid "Export Material" msgstr "재료 내보내기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:358 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:372 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "재료를 내보내는데 실패했습니다" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:378 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "재료를 성공적으로 내보냈습니다" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 +msgctxt "@title:window" +msgid "Export All Materials" +msgstr "모든 재료 내보내기" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" @@ -4507,7 +4735,8 @@ msgctxt "@label" msgid "Adhesion Information" msgstr "접착 정보" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "프린팅 설정" @@ -4532,52 +4761,53 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "이 프로파일에 대한 이름을 제공하십시오." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "프로파일 복제하기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@title:window" msgid "Rename Profile" msgstr "프로파일 이름 바꾸기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:307 msgctxt "@title:window" msgid "Import Profile" msgstr "프로파일 가져 오기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:336 msgctxt "@title:window" msgid "Export Profile" msgstr "프로파일 내보내기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:399 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "프린터: %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:557 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "현재 설정 / 재정의 프로파일 업데이트" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 msgctxt "@action:button" msgid "Discard current changes" msgstr "현재 변경 사항 삭제" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:583 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "이 프로파일은 프린터에서 지정한 기본값을 사용하므로 아래 목록에 아무런 설정/재정의가 없습니다." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:591 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "현재 설정이 선택한 프로파일과 일치합니다." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:609 msgctxt "@title:tab" msgid "Global Settings" msgstr "전역 설정" @@ -4607,12 +4837,12 @@ msgctxt "@title:column" msgid "Unit" msgstr "단위" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:16 msgctxt "@title:tab" msgid "Setting Visibility" msgstr "보기 설정" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:48 msgctxt "@label:textbox" msgid "Check all" msgstr "모두 확인" @@ -4637,12 +4867,14 @@ msgctxt "@tooltip of temperature input" msgid "The temperature to pre-heat the hotend to." msgstr "노즐을 예열하기 위한 온도." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:341 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:332 msgctxt "@button Cancel pre-heating" msgid "Cancel" msgstr "취소" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:344 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:344 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:335 msgctxt "@button" msgid "Pre-heat" msgstr "예열" @@ -4947,27 +5179,27 @@ msgctxt "@label:textbox" msgid "Search settings" msgstr "검색 설정" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:456 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:468 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "모든 익스트루더에 값 복사" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:477 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "변경된 사항을 모든 익스트루더에 복사" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:502 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:514 msgctxt "@action:menu" msgid "Hide this setting" msgstr "이 설정 숨기기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:515 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:527 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "이 설정을 표시하지 않음" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:531 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "이 설정을 계속 표시하십시오" @@ -5027,11 +5259,6 @@ msgctxt "@button" msgid "Add printer manually" msgstr "수동으로 프린터 추가" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddCloudPrintersView.qml:218 -msgctxt "@button" -msgid "Finish" -msgstr "종료" - #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:230 msgctxt "@label" msgid "Manufacturer" @@ -5112,7 +5339,8 @@ msgctxt "@label" msgid "Could not connect to device." msgstr "장치에 연결할 수 없습니다." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:207 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:212 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:207 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:212 msgctxt "@label" msgid "Can't connect to your Ultimaker printer?" msgstr "Ultimaker 프린터로 연결할 수 없습니까?" @@ -5137,32 +5365,32 @@ msgctxt "@button" msgid "Connect" msgstr "연결" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:43 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" -msgid "Ultimaker Account" -msgstr "Ultimaker 계정" +msgid "Release Notes" +msgstr "릴리즈 노트" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:124 msgctxt "@text" -msgid "Your key to connected 3D printing" -msgstr "연결된 3D 프린팅의 핵심" +msgid "Add material settings and plugins from the Marketplace" +msgstr "재료 설정 및 Marketplace 플러그인 추가" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:101 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:154 msgctxt "@text" -msgid "- Customize your experience with more print profiles and plugins" -msgstr "- 보다 많은 프린트 프로파일과 플러그인으로 자신에게 맞게 환경 조정" +msgid "Backup and sync your material settings and plugins" +msgstr "재료 설정과 플러그인 백업 및 동기화" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:184 msgctxt "@text" -msgid "- Stay flexible by syncing your setup and loading it anywhere" -msgstr "- 어디서든지 유연하게 설정을 동기화하고 로딩" +msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" +msgstr "Ultimaker 커뮤니티에서 48,000명 이상의 사용자와 아이디어를 공유하고 도움 받기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:217 msgctxt "@text" -msgid "- Increase efficiency with a remote workflow on Ultimaker printers" -msgstr "- Ultimaker 프린터에서 원격 워크플로로 효율성 증대" +msgid "Create a free Ultimaker Account" +msgstr "Ultimaker 계정 무료 생성" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:230 msgctxt "@button" msgid "Skip" msgstr "건너뛰기" @@ -5222,27 +5450,30 @@ msgctxt "@button" msgid "Decline and close" msgstr "거절 및 닫기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:29 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" msgid "Welcome to Ultimaker Cura" msgstr "Ultimaker Cura에 오신 것을 환영합니다" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:68 msgctxt "@text" -msgid "" -"Please follow these steps to set up\n" -"Ultimaker Cura. This will only take a few moments." -msgstr "Ultimaker Cura를 설정하려면 다음 단계를 따르십시오. 오래 걸리지 않습니다." +msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." +msgstr "Ultimaker Cura를 설정하려면 다음 단계로 이동하세요. 오래 걸리지 않습니다." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:86 msgctxt "@button" msgid "Get started" msgstr "시작하기" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:28 msgctxt "@label" -msgid "What's new in Ultimaker Cura" -msgstr "Ultimaker Cura의 새로운 기능" +msgid "What's New" +msgstr "새로운 기능" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Widgets/ComboBox.qml:24 +msgctxt "@label" +msgid "No items to select from" +msgstr "선택할 항목 없음" #: ModelChecker/plugin.json msgctxt "description" @@ -5324,6 +5555,16 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura 프로파일 작성자" +#: DigitalLibrary/plugin.json +msgctxt "description" +msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." +msgstr "디지털 라이브러리와 연결하여 Cura에서 디지털 라이브러리를 통해 파일을 열고 저장할 수 있도록 합니다." + +#: DigitalLibrary/plugin.json +msgctxt "name" +msgid "Ultimaker Digital Library" +msgstr "Ultimaker 디지털 라이브러리" + #: FirmwareUpdateChecker/plugin.json msgctxt "description" msgid "Checks for firmware updates." @@ -5794,6 +6035,26 @@ msgctxt "name" msgid "Version Upgrade 4.7 to 4.8" msgstr "4.7에서 4.8로 버전 업그레이드" +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." +msgstr "Cura 4.8에서 Cura 4.9로 구성을 업그레이드합니다." + +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.8 to 4.9" +msgstr "4.8에서 4.9로 버전 업그레이드" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." +msgstr "Cura 4.9에서 Cura 4.10으로 구성을 업그레이드합니다." + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.9 to 4.10" +msgstr "4.9에서 4.10으로 버전 업그레이드" + #: X3DReader/plugin.json msgctxt "description" msgid "Provides support for reading X3D files." @@ -5824,6 +6085,89 @@ msgctxt "name" msgid "X-Ray View" msgstr "엑스레이 뷰" +#~ msgctxt "@info:status" +#~ msgid "Global stack is missing." +#~ msgstr "전체 스택이 누락되었습니다." + +#~ msgctxt "@info:status" +#~ msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." +#~ msgstr "매니폴드 모델이 아닙니다. 강조 표시된 영역은 누락되거나 관련 없는 표면을 표시합니다." + +#~ msgctxt "@info:title" +#~ msgid "Model errors" +#~ msgstr "모델 오류" + +#~ msgctxt "@label:listbox" +#~ msgid "Layer thickness" +#~ msgstr "레이어 두께" + +#~ msgctxt "@label" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "연결된 3D 프린팅의 핵심" + +#~ msgctxt "@text" +#~ msgid "" +#~ "- Customize your experience with more print profiles and plugins\n" +#~ "- Stay flexible by syncing your setup and loading it anywhere\n" +#~ "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "" +#~ "- 보다 많은 프린트 프로파일과 플러그인으로 자신에게 맞게 환경 조정\n" +#~ "- 어디서든지 유연하게 설정을 동기화하고 로딩\n" +#~ "- Ultimaker 프린터에서 원격 워크플로로 효율성 증대" + +#~ msgctxt "@button" +#~ msgid "Create account" +#~ msgstr "계정 생성" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Delete Selected Model" +#~ msgid_plural "Delete Selected Models" +#~ msgstr[0] "선택한 모델 삭제" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Center Selected Model" +#~ msgid_plural "Center Selected Models" +#~ msgstr[0] "선택한 모델 중심에 놓기" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Multiply Selected Model" +#~ msgid_plural "Multiply Selected Models" +#~ msgstr[0] "선택한 모델 복제" + +#~ msgctxt "@button" +#~ msgid "Finish" +#~ msgstr "종료" + +#~ msgctxt "@label" +#~ msgid "Ultimaker Account" +#~ msgstr "Ultimaker 계정" + +#~ msgctxt "@text" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "연결된 3D 프린팅의 핵심" + +#~ msgctxt "@text" +#~ msgid "- Customize your experience with more print profiles and plugins" +#~ msgstr "- 보다 많은 프린트 프로파일과 플러그인으로 자신에게 맞게 환경 조정" + +#~ msgctxt "@text" +#~ msgid "- Stay flexible by syncing your setup and loading it anywhere" +#~ msgstr "- 어디서든지 유연하게 설정을 동기화하고 로딩" + +#~ msgctxt "@text" +#~ msgid "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "- Ultimaker 프린터에서 원격 워크플로로 효율성 증대" + +#~ msgctxt "@text" +#~ msgid "" +#~ "Please follow these steps to set up\n" +#~ "Ultimaker Cura. This will only take a few moments." +#~ msgstr "Ultimaker Cura를 설정하려면 다음 단계를 따르십시오. 오래 걸리지 않습니다." + +#~ msgctxt "@label" +#~ msgid "What's new in Ultimaker Cura" +#~ msgstr "Ultimaker Cura의 새로운 기능" + #~ msgctxt "@label ({} is object name)" #~ msgid "Are you sure you wish to remove {}? This cannot be undone!" #~ msgstr "정말로 {}을(를) 제거하시겠습니까? 이 작업을 실행 취소할 수 없습니다." diff --git a/resources/i18n/ko_KR/fdmextruder.def.json.po b/resources/i18n/ko_KR/fdmextruder.def.json.po index 998fdb283d..2aecfbb7e3 100644 --- a/resources/i18n/ko_KR/fdmextruder.def.json.po +++ b/resources/i18n/ko_KR/fdmextruder.def.json.po @@ -1,13 +1,13 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2019-03-13 14:00+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 15:01+0200\n" "Last-Translator: Korean \n" "Language-Team: Jinbum Kim , Korean \n" "Language: ko_KR\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.0.6\n" +"X-Generator: Poedit 2.4.1\n" #: fdmextruder.def.json msgctxt "machine_settings label" diff --git a/resources/i18n/ko_KR/fdmprinter.def.json.po b/resources/i18n/ko_KR/fdmprinter.def.json.po index 98f6f04593..949880ce6c 100644 --- a/resources/i18n/ko_KR/fdmprinter.def.json.po +++ b/resources/i18n/ko_KR/fdmprinter.def.json.po @@ -1,13 +1,13 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2020-08-21 13:40+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 15:02+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Korean , Jinbum Kim , Korean \n" "Language: ko_KR\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.3\n" +"X-Generator: Poedit 2.4.1\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -420,6 +420,26 @@ msgctxt "machine_extruders_share_heater description" msgid "Whether the extruders share a single heater rather than each extruder having its own heater." msgstr "압출기가 자체 히터를 가지고 있지 않고 단일 히터를 공유하는지에 대한 여부." +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle label" +msgid "Extruders Share Nozzle" +msgstr "익스트루더의 노즐 공유" + +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle description" +msgid "Whether the extruders share a single nozzle rather than each extruder having its own nozzle. When set to true, it is expected that the printer-start gcode script properly sets up all extruders in an initial retraction state that is known and mutually compatible (either zero or one filament not retracted); in that case the initial retraction status is described, per extruder, by the 'machine_extruders_shared_nozzle_initial_retraction' parameter." +msgstr "익스트루더가 자체 노즐을 가지고 있지 않고 단일 노즐을 공유하는지에 대한 여부. True로 설정하면 프린터 시동 gcode 스크립트가 알려진 상호 호환 가능한 초기 수축 상태(0 또는 1개의 필라멘트가 수축되지 않음)에서 모든 익스트루더를 적절하게 설정해야 합니다. 이 경우 초기 수축 상태는 'machine_extruders_shared_nozzle_initial_retraction' 매개 변수에 의해 익스트루더마다 표시됩니다." + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction label" +msgid "Shared Nozzle Initial Retraction" +msgstr "공유된 노즐 초기 수축" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction description" +msgid "How much the filament of each extruder is assumed to have been retracted from the shared nozzle tip at the completion of the printer-start gcode script; the value should be equal to or greater than the length of the common part of the nozzle's ducts." +msgstr "프린터 시작 gcode 스크립트가 완료될 때 공유된 노즐 끝에서 각 익스트루더의 필라멘트가 수축된 것으로 가정하는 정도입니다. 이 값은 노즐 덕트의 공통 부분의 길이와 같거나 커야 합니다." + #: fdmprinter.def.json msgctxt "machine_disallowed_areas label" msgid "Disallowed Areas" @@ -487,8 +507,8 @@ msgstr "익스트루더로 오프셋" #: fdmprinter.def.json msgctxt "machine_use_extruder_offset_to_offset_coords description" -msgid "Apply the extruder offset to the coordinate system." -msgstr "익스트루더 오프셋을 좌표계에 적용하십시오." +msgid "Apply the extruder offset to the coordinate system. Affects all extruders." +msgstr "익스트루더 오프셋을 좌표계에 적용하십시오. 모든 익스트루더에 적용됩니다." #: fdmprinter.def.json msgctxt "extruder_prime_pos_z label" @@ -882,8 +902,8 @@ msgstr "첫 번째 레이어의 라인 폭 승수입니다. 이것을 늘리면 #: fdmprinter.def.json msgctxt "shell label" -msgid "Shell" -msgstr "외곽" +msgid "Walls" +msgstr "벽" #: fdmprinter.def.json msgctxt "shell description" @@ -950,166 +970,6 @@ msgctxt "wall_0_wipe_dist description" msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better." msgstr "Z 층의 경계면을 더 잘 가리기 위해 바깥쪽 벽 뒤에 삽입되어 이동한 거리." -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr label" -msgid "Top Surface Skin Extruder" -msgstr "상단 표면 익스트루더" - -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr description" -msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." -msgstr "익스트루더는 최상층을 프린팅하는 데 사용됩니다. 이것은 다중 압출에 사용됩니다." - -#: fdmprinter.def.json -msgctxt "roofing_layer_count label" -msgid "Top Surface Skin Layers" -msgstr "상단 표면 스킨 레이어" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count description" -msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." -msgstr "최상층의 스킨 층의 수. 일반적으로 고품질의 표면을 생성하기 위해 맨위의 레이어 하나만 있으면 충분합니다." - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr label" -msgid "Top/Bottom Extruder" -msgstr "상단/하단 익스트루더" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr description" -msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." -msgstr "상단 및 하단 스킨 프린팅에 사용되는 익스트루더. 이것은 다중 압출에 사용됩니다." - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness label" -msgid "Top/Bottom Thickness" -msgstr "상단/하단 두께" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness description" -msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." -msgstr "출력물의 상단/하단 레이어의 두께. 이 값을 레이어 높이로 나눈 값은 위쪽/아래쪽 레이어의 수 입니다." - -#: fdmprinter.def.json -msgctxt "top_thickness label" -msgid "Top Thickness" -msgstr "상단 두께" - -#: fdmprinter.def.json -msgctxt "top_thickness description" -msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." -msgstr "출력물의 상단 레이어의 두께. 이 값을 레이어 높이로 나눈 값이 최상위 레이어 수 입니다." - -#: fdmprinter.def.json -msgctxt "top_layers label" -msgid "Top Layers" -msgstr "상단 레이어" - -#: fdmprinter.def.json -msgctxt "top_layers description" -msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." -msgstr "출력물의 상단 레이어의 수. 상단 두깨로 계산을 할때 이 값은 벽 두께로 계산할 때 이 값은 반올림됩니다." - -#: fdmprinter.def.json -msgctxt "bottom_thickness label" -msgid "Bottom Thickness" -msgstr "바닥 두께" - -#: fdmprinter.def.json -msgctxt "bottom_thickness description" -msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." -msgstr "출력물의 아래쪽 레이어의 두께. 이 값을 레이어 높이로 나눈 값은 맨 아래 레이어의 수 입니다." - -#: fdmprinter.def.json -msgctxt "bottom_layers label" -msgid "Bottom Layers" -msgstr "하단 레이어" - -#: fdmprinter.def.json -msgctxt "bottom_layers description" -msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "아래층의 수. 바닥 두께로 계산을 할때 이 값은 벽 두께로 계산할 때 이 값은 반올림됩니다." - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers label" -msgid "Initial Bottom Layers" -msgstr "초기 하단 레이어" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers description" -msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "빌드 플레이트에서 위를 향하는 초기 하단 레이어 수. 하단 두께로 계산할 경우, 이 값이 전체 값으로 반올림됩니다." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern label" -msgid "Top/Bottom Pattern" -msgstr "상단/하단 패턴" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern description" -msgid "The pattern of the top/bottom layers." -msgstr "상단/하단 레이어의 패턴." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option lines" -msgid "Lines" -msgstr "라인" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option concentric" -msgid "Concentric" -msgstr "동심원 형태" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option zigzag" -msgid "Zig Zag" -msgstr "지그재그" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 label" -msgid "Bottom Pattern Initial Layer" -msgstr "하단 패턴 초기 레이어" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 description" -msgid "The pattern on the bottom of the print on the first layer." -msgstr "첫 번째 레이어의 프린팅 아래쪽에 있는 패턴입니다." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option lines" -msgid "Lines" -msgstr "윤곽" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option concentric" -msgid "Concentric" -msgstr "동심원의" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option zigzag" -msgid "Zig Zag" -msgstr "지그재그" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons label" -msgid "Connect Top/Bottom Polygons" -msgstr "상단/하단 다각형 연결" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." -msgstr "스킨 경로가 나란히 이어지는 상단/하단 스킨 경로를 연결합니다. 동심원 패턴의 경우 이 설정을 사용하면 이동 시간이 크게 감소하지만, 내부채움의 중간에 연결될 수 있기 때문에 이 기능은 상단 표면 품질을 저하시킬 수 있습니다." - -#: fdmprinter.def.json -msgctxt "skin_angles label" -msgid "Top/Bottom Line Directions" -msgstr "상단/하단 라인 길 방향" - -#: fdmprinter.def.json -msgctxt "skin_angles description" -msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." -msgstr "상단/하단 레이어가 선 또는 지그재그 패턴을 사용할 때 사용할 방향 리스트입니다. 리스트의 요소는 레이어가 진행됨에 따라 순차적으로 사용되며 리스트의 끝에 도달하면 처음부터 다시 시작됩니다. 리스트 항목은 쉼표로 구분되며 전체 리스트는 대괄호 안에 들어 있습니다. 기본값은 빈 목록이고, 기본 각도(45도 및 135도)를 사용합니다." - #: fdmprinter.def.json msgctxt "wall_0_inset label" msgid "Outer Wall Inset" @@ -1415,6 +1275,176 @@ msgctxt "z_seam_relative description" msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate." msgstr "활성화 된 경우 z 솔기 좌표는 각 부품의 중심을 기준으로합니다. 비활성화 된 경우 좌표는 빌드 플레이트의 절대 위치를 정의합니다." +#: fdmprinter.def.json +msgctxt "top_bottom label" +msgid "Top/Bottom" +msgstr "위 / 아래" + +#: fdmprinter.def.json +msgctxt "top_bottom description" +msgid "Top/Bottom" +msgstr "위 / 아래" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr label" +msgid "Top Surface Skin Extruder" +msgstr "상단 표면 익스트루더" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr description" +msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." +msgstr "익스트루더는 최상층을 프린팅하는 데 사용됩니다. 이것은 다중 압출에 사용됩니다." + +#: fdmprinter.def.json +msgctxt "roofing_layer_count label" +msgid "Top Surface Skin Layers" +msgstr "상단 표면 스킨 레이어" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count description" +msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." +msgstr "최상층의 스킨 층의 수. 일반적으로 고품질의 표면을 생성하기 위해 맨위의 레이어 하나만 있으면 충분합니다." + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr label" +msgid "Top/Bottom Extruder" +msgstr "상단/하단 익스트루더" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr description" +msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." +msgstr "상단 및 하단 스킨 프린팅에 사용되는 익스트루더. 이것은 다중 압출에 사용됩니다." + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness label" +msgid "Top/Bottom Thickness" +msgstr "상단/하단 두께" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness description" +msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." +msgstr "출력물의 상단/하단 레이어의 두께. 이 값을 레이어 높이로 나눈 값은 위쪽/아래쪽 레이어의 수 입니다." + +#: fdmprinter.def.json +msgctxt "top_thickness label" +msgid "Top Thickness" +msgstr "상단 두께" + +#: fdmprinter.def.json +msgctxt "top_thickness description" +msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." +msgstr "출력물의 상단 레이어의 두께. 이 값을 레이어 높이로 나눈 값이 최상위 레이어 수 입니다." + +#: fdmprinter.def.json +msgctxt "top_layers label" +msgid "Top Layers" +msgstr "상단 레이어" + +#: fdmprinter.def.json +msgctxt "top_layers description" +msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." +msgstr "출력물의 상단 레이어의 수. 상단 두깨로 계산을 할때 이 값은 벽 두께로 계산할 때 이 값은 반올림됩니다." + +#: fdmprinter.def.json +msgctxt "bottom_thickness label" +msgid "Bottom Thickness" +msgstr "바닥 두께" + +#: fdmprinter.def.json +msgctxt "bottom_thickness description" +msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." +msgstr "출력물의 아래쪽 레이어의 두께. 이 값을 레이어 높이로 나눈 값은 맨 아래 레이어의 수 입니다." + +#: fdmprinter.def.json +msgctxt "bottom_layers label" +msgid "Bottom Layers" +msgstr "하단 레이어" + +#: fdmprinter.def.json +msgctxt "bottom_layers description" +msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "아래층의 수. 바닥 두께로 계산을 할때 이 값은 벽 두께로 계산할 때 이 값은 반올림됩니다." + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "초기 하단 레이어" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "빌드 플레이트에서 위를 향하는 초기 하단 레이어 수. 하단 두께로 계산할 경우, 이 값이 전체 값으로 반올림됩니다." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern label" +msgid "Top/Bottom Pattern" +msgstr "상단/하단 패턴" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern description" +msgid "The pattern of the top/bottom layers." +msgstr "상단/하단 레이어의 패턴." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option lines" +msgid "Lines" +msgstr "라인" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option concentric" +msgid "Concentric" +msgstr "동심원 형태" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option zigzag" +msgid "Zig Zag" +msgstr "지그재그" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 label" +msgid "Bottom Pattern Initial Layer" +msgstr "하단 패턴 초기 레이어" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 description" +msgid "The pattern on the bottom of the print on the first layer." +msgstr "첫 번째 레이어의 프린팅 아래쪽에 있는 패턴입니다." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option lines" +msgid "Lines" +msgstr "윤곽" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option concentric" +msgid "Concentric" +msgstr "동심원의" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option zigzag" +msgid "Zig Zag" +msgstr "지그재그" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons label" +msgid "Connect Top/Bottom Polygons" +msgstr "상단/하단 다각형 연결" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons description" +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "스킨 경로가 나란히 이어지는 상단/하단 스킨 경로를 연결합니다. 동심원 패턴의 경우 이 설정을 사용하면 이동 시간이 크게 감소하지만, 내부채움의 중간에 연결될 수 있기 때문에 이 기능은 상단 표면 품질을 저하시킬 수 있습니다." + +#: fdmprinter.def.json +msgctxt "skin_angles label" +msgid "Top/Bottom Line Directions" +msgstr "상단/하단 라인 길 방향" + +#: fdmprinter.def.json +msgctxt "skin_angles description" +msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." +msgstr "상단/하단 레이어가 선 또는 지그재그 패턴을 사용할 때 사용할 방향 리스트입니다. 리스트의 요소는 레이어가 진행됨에 따라 순차적으로 사용되며 리스트의 끝에 도달하면 처음부터 다시 시작됩니다. 리스트 항목은 쉼표로 구분되며 전체 리스트는 대괄호 안에 들어 있습니다. 기본값은 빈 목록이고, 기본 각도(45도 및 135도)를 사용합니다." + #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" msgid "No Skin in Z Gaps" @@ -1555,6 +1585,86 @@ msgctxt "skin_overlap_mm description" msgid "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any value over half the width of the wall may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall." msgstr "벽과 스킨-센터라인(종점) 사이의 겹침 양을 조정하십시오. 약간의 겹침으로 벽이 스킨에 확실하게 연결될 수 있습니다. 동일한 스킨 및 벽 라인-폭을 고려할 때 값이 벽 폭의 절반을 넘는다면, 그 지점에서 스킨-익스트루더의 노즐 위치가 이미 벽 중앙을 지나 도달할 수 있기 때문에 이미 스킨이 벽을 지나치고 있을 수 있습니다." +#: fdmprinter.def.json +msgctxt "skin_preshrink label" +msgid "Skin Removal Width" +msgstr "스킨 제거 폭" + +#: fdmprinter.def.json +msgctxt "skin_preshrink description" +msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." +msgstr "제거 할 외부스킨 영역의 가장 큰 너비. 이 값보다 작은 모든 스킨 영역은 사라집니다. 이렇게하면 모델의 경사면에서 위쪽 / 아래쪽 스킨을 프린팅하는 데 소요되는 시간과 재료의 양을 제한하는 데 도움이 됩니다." + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink label" +msgid "Top Skin Removal Width" +msgstr "상단 스킨 제거 폭" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink description" +msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." +msgstr "제거 할 상단 스킨 영역의 가장 큰 너비. 이 값보다 작은 모든 스킨 영역은 사라집니다. 이렇게 하면 모델의 경사면에서 상단 스킨을 프린팅하는 데 소요되는 시간과 재료의 양을 제한하는 데 도움이됩니다." + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink label" +msgid "Bottom Skin Removal Width" +msgstr "밑면 스킨 제거 폭" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink description" +msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." +msgstr "제거 할 바닥 스킨 영역의 최대 너비. 이 값보다 작은 모든 스킨 영역은 사라집니다. 이렇게하면 모델의 경사면에서 밑면 스킨을 프린팅하는 데 소요되는 시간과 재료의 양을 제한하는 데 도움이됩니다." + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance label" +msgid "Skin Expand Distance" +msgstr "스킨 확장 거리" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance description" +msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." +msgstr "스킨이 내부채움으로 확장되는 거리입니다. 값이 높을수록 스킨이 내부채움 패턴에 더 잘 부착되고 인접 레이어의 벽이 스킨에 잘 밀착됩니다. 값이 낮을수록 사용 될 재료의 양이 절약됩니다." + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance label" +msgid "Top Skin Expand Distance" +msgstr "윗면 스킨 확장 거리" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance description" +msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." +msgstr "상단 스킨의 거리가 내부채움으로 확장됩니다. 값이 높을수록 스킨이 내부채움 패턴에 더 잘 부착되며 위 레이어의 벽이 스킨에 잘 밀착됩니다. 값이 낮을수록 사용 된 재료의 양이 절약됩니다." + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance label" +msgid "Bottom Skin Expand Distance" +msgstr "밑면 스킨 확장 거리" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance description" +msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." +msgstr "바닥 스킨의 거리가 내부채움으로 확장됩니다. 값이 높을수록 스킨가 내부채움 패턴에 더 잘 붙어 스킨가 아래 층의 벽에 잘 밀착됩니다. 값이 낮을수록 사용 된 재료의 양이 절약됩니다." + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion label" +msgid "Maximum Skin Angle for Expansion" +msgstr "확장을 위한 최대 스킨 각" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion description" +msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded." +msgstr "이 설정보다 큰 각도로 객체의 상단 및 또는 하단 표면은 위쪽/아래쪽 스킨이 확장되지 않습니다. 이렇게하면 모델 표면이 수직 경사가 거의 없을 때 생성되는 좁은 스킨 영역을 확장하지 않아도됩니다. 0도의 각도는 수평이며 스킨의 확장을 유발하지 않고, 90도의 각도는 수직이며 모든 스킨의 확장을 유발합니다." + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion label" +msgid "Minimum Skin Width for Expansion" +msgstr "확장을 위한 최소 스킨 폭" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion description" +msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." +msgstr "이보다 좁은 스킨 영역은 확장되지 않습니다. 이렇게하면 모델 표면이 수직에 가까운 기울기를 가질 때 생성되는 좁은 스킨 영역을 확장하지 않아도됩니다." + #: fdmprinter.def.json msgctxt "infill label" msgid "Infill" @@ -1864,86 +1974,6 @@ msgctxt "infill_support_angle description" msgid "The minimum angle of internal overhangs for which infill is added. At a value of 0° objects are totally filled with infill, 90° will not provide any infill." msgstr "충진물이 추가되는 내부 오버행의 최소 각도. 0°에서는 개체가 충진물로 완전히 채워지지만, 90°에서는 충진물이 공급되지 않습니다." -#: fdmprinter.def.json -msgctxt "skin_preshrink label" -msgid "Skin Removal Width" -msgstr "스킨 제거 폭" - -#: fdmprinter.def.json -msgctxt "skin_preshrink description" -msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." -msgstr "제거 할 외부스킨 영역의 가장 큰 너비. 이 값보다 작은 모든 스킨 영역은 사라집니다. 이렇게하면 모델의 경사면에서 위쪽 / 아래쪽 스킨을 프린팅하는 데 소요되는 시간과 재료의 양을 제한하는 데 도움이 됩니다." - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink label" -msgid "Top Skin Removal Width" -msgstr "상단 스킨 제거 폭" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink description" -msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." -msgstr "제거 할 상단 스킨 영역의 가장 큰 너비. 이 값보다 작은 모든 스킨 영역은 사라집니다. 이렇게 하면 모델의 경사면에서 상단 스킨을 프린팅하는 데 소요되는 시간과 재료의 양을 제한하는 데 도움이됩니다." - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink label" -msgid "Bottom Skin Removal Width" -msgstr "밑면 스킨 제거 폭" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink description" -msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." -msgstr "제거 할 바닥 스킨 영역의 최대 너비. 이 값보다 작은 모든 스킨 영역은 사라집니다. 이렇게하면 모델의 경사면에서 밑면 스킨을 프린팅하는 데 소요되는 시간과 재료의 양을 제한하는 데 도움이됩니다." - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance label" -msgid "Skin Expand Distance" -msgstr "스킨 확장 거리" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance description" -msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." -msgstr "스킨이 내부채움으로 확장되는 거리입니다. 값이 높을수록 스킨이 내부채움 패턴에 더 잘 부착되고 인접 레이어의 벽이 스킨에 잘 밀착됩니다. 값이 낮을수록 사용 될 재료의 양이 절약됩니다." - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance label" -msgid "Top Skin Expand Distance" -msgstr "윗면 스킨 확장 거리" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance description" -msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." -msgstr "상단 스킨의 거리가 내부채움으로 확장됩니다. 값이 높을수록 스킨이 내부채움 패턴에 더 잘 부착되며 위 레이어의 벽이 스킨에 잘 밀착됩니다. 값이 낮을수록 사용 된 재료의 양이 절약됩니다." - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance label" -msgid "Bottom Skin Expand Distance" -msgstr "밑면 스킨 확장 거리" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance description" -msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." -msgstr "바닥 스킨의 거리가 내부채움으로 확장됩니다. 값이 높을수록 스킨가 내부채움 패턴에 더 잘 붙어 스킨가 아래 층의 벽에 잘 밀착됩니다. 값이 낮을수록 사용 된 재료의 양이 절약됩니다." - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion label" -msgid "Maximum Skin Angle for Expansion" -msgstr "확장을 위한 최대 스킨 각" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion description" -msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." -msgstr "이 설정보다 큰 각도로 객체의 상단 및 또는 하단 표면은 위쪽/아래쪽 스킨이 확장되지 않습니다. 이렇게하면 모델 표면이 수직 경사가 거의 없을 때 생성되는 좁은 스킨 영역을 확장하지 않아도됩니다. 0도의 각도는 수평이며, 90도의 각도는 수직입니다." - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion label" -msgid "Minimum Skin Width for Expansion" -msgstr "확장을 위한 최소 스킨 폭" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion description" -msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." -msgstr "이보다 좁은 스킨 영역은 확장되지 않습니다. 이렇게하면 모델 표면이 수직에 가까운 기울기를 가질 때 생성되는 좁은 스킨 영역을 확장하지 않아도됩니다." - #: fdmprinter.def.json msgctxt "skin_edge_support_thickness label" msgid "Skin Edge Support Thickness" @@ -2561,8 +2591,8 @@ msgstr "초기 레이어 속도" #: fdmprinter.def.json msgctxt "speed_layer_0 description" -msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." -msgstr "초기 레이어의 속도입니다. 빌드 플레이트에 대한 접착력을 향상 시키려면 낮은 값을 권합니다." +msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate. Does not affect the build plate adhesion structures themselves, like brim and raft." +msgstr "초기 레이어의 속도입니다. 빌드 플레이트에 대한 접착력을 향상시키려면 낮은 값을 권장합니다. 브림과 래프트 같은 빌드 플레이트 접착 구조 자체에 영향을 미치지 않습니다." #: fdmprinter.def.json msgctxt "speed_print_layer_0 label" @@ -3171,8 +3201,8 @@ msgstr "수축이 없을 때 최대 빗질 거리" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" -msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." -msgstr "0이 아닌 경우 이 거리보다 긴 빗질 이동은 후퇴를 사용합니다." +msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." +msgstr "0보다 큰 경우 이 거리보다 긴 combing travel은 retraction을 사용합니다. 0으로 설정한 경우 최댓값이 없으며 combing travel은 retraction을 사용하지 않습니다." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" @@ -5075,8 +5105,8 @@ msgstr "메쉬 처리 랭크" #: fdmprinter.def.json msgctxt "infill_mesh_order description" -msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." -msgstr "여러 오버랩 메쉬 내부채움을 고려할 때 메쉬의 우선 순위를 결정합니다. 여러 메쉬 내부채움이 오버랩하는 영역은 최저 랭크의 메쉬 설정에 착수하게 됩니다. 우선 순위가 높은 내부채움 메쉬는 우선 순위가 낮은 내부채움 메쉬와 표준 메쉬의 내부채움을 수정합니다." +msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the highest rank. An infill mesh with a higher rank will modify the infill of infill meshes with lower rank and normal meshes." +msgstr "여러 내부채움 매쉬 오버랩을 고려할 때 메쉬의 우선 순위를 결정합니다. 여러 내부채움 메쉬가 오버랩하는 영역은 최고 랭크의 메쉬 설정에 착수하게 됩니다. 높은 내부채움 메쉬는 낮은 내부채움 메쉬와 표준 메쉬의 내부채움을 수정합니다." #: fdmprinter.def.json msgctxt "cutting_mesh label" @@ -5423,6 +5453,16 @@ msgctxt "conical_overhang_angle description" msgid "The maximum angle of overhangs after the they have been made printable. At a value of 0° all overhangs are replaced by a piece of model connected to the build plate, 90° will not change the model in any way." msgstr "프린팅 가능하게 된 후 오버행의 최대 각도. 0도의 값에서 모든 오버행은 빌드 플레이트에 연결된 모델로 대체됩니다. 90도는 모델을 변경하지 않습니다." +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size label" +msgid "Maximum Overhang Hole Area" +msgstr "최대 오버행 홀 영역" + +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size description" +msgid "The maximum area of a hole in the base of the model before it's removed by Make Overhang Printable. Holes smaller than this will be retained. A value of 0 mm² will fill all holes in the models base." +msgstr "오버행 프린팅 설정에 의해 제거되기 전 모델의 베이스에 있는 구멍의 최대 영역입니다. 이보다 작은 홀은 유지됩니다. 0mm² 값은 모델 베이스의 모든 홀을 채웁니다." + #: fdmprinter.def.json msgctxt "coasting_enable label" msgid "Enable Coasting" @@ -6360,6 +6400,30 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "파일로부터 로드 하는 경유, 모델에 적용될 변환 행렬입니다." +#~ msgctxt "retraction_combing_max_distance description" +#~ msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." +#~ msgstr "0이 아닌 경우 이 거리보다 긴 빗질 이동은 후퇴를 사용합니다." + +#~ msgctxt "machine_use_extruder_offset_to_offset_coords description" +#~ msgid "Apply the extruder offset to the coordinate system." +#~ msgstr "익스트루더 오프셋을 좌표계에 적용하십시오." + +#~ msgctxt "shell label" +#~ msgid "Shell" +#~ msgstr "외곽" + +#~ msgctxt "max_skin_angle_for_expansion description" +#~ msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." +#~ msgstr "이 설정보다 큰 각도로 객체의 상단 및 또는 하단 표면은 위쪽/아래쪽 스킨이 확장되지 않습니다. 이렇게하면 모델 표면이 수직 경사가 거의 없을 때 생성되는 좁은 스킨 영역을 확장하지 않아도됩니다. 0도의 각도는 수평이며, 90도의 각도는 수직입니다." + +#~ msgctxt "speed_layer_0 description" +#~ msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." +#~ msgstr "초기 레이어의 속도입니다. 빌드 플레이트에 대한 접착력을 향상 시키려면 낮은 값을 권합니다." + +#~ msgctxt "infill_mesh_order description" +#~ msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." +#~ msgstr "여러 오버랩 메쉬 내부채움을 고려할 때 메쉬의 우선 순위를 결정합니다. 여러 메쉬 내부채움이 오버랩하는 영역은 최저 랭크의 메쉬 설정에 착수하게 됩니다. 우선 순위가 높은 내부채움 메쉬는 우선 순위가 낮은 내부채움 메쉬와 표준 메쉬의 내부채움을 수정합니다." + #~ msgctxt "material_bed_temperature description" #~ msgid "The temperature used for the heated build plate. If this is 0, the bed temperature will not be adjusted." #~ msgstr "플레이트를 가열하기 위해 사용되는 온도. 이것이 0이면, 베드 온도가 조정되지 않습니다." diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index d74aef776a..5bb80d1116 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -1,13 +1,13 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0200\n" -"PO-Revision-Date: 2020-11-09 14:10+0100\n" +"POT-Creation-Date: 2021-06-10 17:35+0200\n" +"PO-Revision-Date: 2021-04-16 14:51+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Dutch , Dutch \n" "Language: nl_NL\n" @@ -17,8 +17,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.4.1\n" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1581 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 msgctxt "@label" msgid "Unknown" msgstr "Onbekend" @@ -44,47 +48,56 @@ msgctxt "@label {0} is the name of a printer that's about to be deleted." msgid "Are you sure you wish to remove {0}? This cannot be undone!" msgstr "Weet u zeker dat u {0} wilt verwijderen? Deze bewerking kan niet ongedaan worden gemaakt!" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 msgctxt "@label" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 msgctxt "@label" msgid "Visual" msgstr "Visueel" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." msgstr "Het visuele profiel is ontworpen om visuele prototypen en modellen te printen met als doel een hoge visuele en oppervlaktekwaliteit te creëren." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 msgctxt "@label" msgid "Engineering" msgstr "Engineering" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." msgstr "Het engineeringprofiel is ontworpen om functionele prototypen en onderdelen voor eindgebruik te printen met als doel een grotere precisie en nauwere toleranties." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 msgctxt "@label" msgid "Draft" msgstr "Ontwerp" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "Het ontwerpprofiel is ontworpen om initiële prototypen en conceptvalidatie te printen met als doel de printtijd aanzienlijk te verkorten." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:226 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:234 msgctxt "@label" msgid "Custom Material" msgstr "Aangepast materiaal" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:227 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 msgctxt "@label" msgid "Custom" msgstr "Aangepast" @@ -105,51 +118,63 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Alle Bestanden (*)" -#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:178 +#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:181 msgctxt "@info:title" msgid "Login failed" msgstr "Inloggen mislukt" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:67 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:67 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:24 msgctxt "@info:status" msgid "Finding new location for objects" msgstr "Nieuwe locatie vinden voor objecten" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:71 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:28 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:71 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:28 msgctxt "@info:title" msgid "Finding Location" msgstr "Locatie vinden" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:150 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:76 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:150 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 +#: /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:76 msgctxt "@info:status" msgid "Unable to find a location within the build volume for all objects" msgstr "Kan binnen het werkvolume niet voor alle objecten een locatie vinden" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:151 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:42 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:151 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:42 msgctxt "@info:title" msgid "Can't Find Location" msgstr "Kan locatie niet vinden" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:104 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:116 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Kan geen archief maken van gegevensmap van gebruiker: {}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:110 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 msgctxt "@info:title" msgid "Backup" msgstr "Back-up" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:123 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:135 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "Geprobeerd een Cura-back-up te herstellen zonder correcte gegevens of metadata." -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:134 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:146 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that is higher than the current version." msgstr "Geprobeerd een Cura-back-up te herstellen van een versie die hoger is dan de huidige versie." +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 +msgctxt "@info:backup_failed" +msgid "The following error occurred while trying to restore a Cura backup:" +msgstr "De volgende fout is opgetreden bij het herstellen van een Cura-backup:" + #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -299,71 +324,77 @@ msgctxt "@action:button" msgid "Send report" msgstr "Rapport verzenden" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:521 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:527 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Machines laden..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:528 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:534 msgctxt "@info:progress" msgid "Setting up preferences..." msgstr "Voorkeuren instellen..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:657 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:672 msgctxt "@info:progress" msgid "Initializing Active Machine..." msgstr "Actieve machine initialiseren ..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:803 msgctxt "@info:progress" msgid "Initializing machine manager..." msgstr "Machinebeheer initialiseren ..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:802 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:817 msgctxt "@info:progress" msgid "Initializing build volume..." msgstr "Werkvolume initialiseren ..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:870 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:888 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Scene instellen..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:906 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:924 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Interface laden..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:911 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:929 msgctxt "@info:progress" msgid "Initializing engine..." msgstr "Engine initialiseren ..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1221 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1246 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1777 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1799 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Er kan slechts één G-code-bestand tegelijkertijd worden geladen. Het importeren van {0} is overgeslagen" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1778 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:188 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 msgctxt "@info:title" msgid "Warning" msgstr "Waarschuwing" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1787 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1809 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Kan geen ander bestand openen als G-code wordt geladen. Het importeren van {0} is overgeslagen" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1788 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 msgctxt "@info:title" msgid "Error" msgstr "Fout" @@ -383,7 +414,7 @@ msgctxt "@info:title" msgid "Placing Object" msgstr "Object plaatsen" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:92 msgctxt "@message" msgid "Could not read response." msgstr "Kan het antwoord niet lezen." @@ -403,28 +434,31 @@ msgctxt "@message" msgid "Something unexpected happened when trying to log in, please try again." msgstr "Er heeft een onverwachte gebeurtenis plaatsgevonden bij het aanmelden. Probeer het opnieuw." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:187 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:189 msgctxt "@info" msgid "Unable to start a new sign in process. Check if another sign in attempt is still active." msgstr "Er kan geen nieuw aanmeldingsproces worden gestart. Controleer of een andere aanmeldingspoging nog actief is." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Kan de Ultimaker-accountserver niet bereiken." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:205 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:205 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 msgctxt "@title:window" msgid "File Already Exists" msgstr "Het Bestand Bestaat Al" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:206 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:206 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Het bestand {0} bestaat al. Weet u zeker dat u dit bestand wilt overschrijven?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:452 /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:455 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "Ongeldige bestands-URL:" @@ -476,7 +510,8 @@ msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Kan het profiel niet importeren uit {0}:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:235 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:245 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:235 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:245 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." @@ -506,33 +541,33 @@ msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Het profiel {0} heeft een onbekend bestandstype of is beschadigd." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:423 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:426 msgctxt "@label" msgid "Custom profile" msgstr "Aangepast profiel" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:439 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:442 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Er ontbreekt een kwaliteitstype in het profiel." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:443 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:446 msgctxt "@info:status" -msgid "Global stack is missing." -msgstr "Algemene stapel ontbreekt." +msgid "There is no active printer yet." +msgstr "Er is nog geen actieve printer." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:449 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:452 msgctxt "@info:status" msgid "Unable to add the profile." msgstr "Kan het profiel niet toevoegen." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:463 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:466 #, python-brace-format msgctxt "@info:status" msgid "Quality type '{0}' is not compatible with the current active machine definition '{1}'." msgstr "Kwaliteitstype '{0}' is niet compatibel met de huidige actieve machinedefinitie '{1}'." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:468 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:471 #, python-brace-format msgctxt "@info:status" msgid "Warning: The profile is not visible because its quality type '{0}' is not available for the current configuration. Switch to a material/nozzle combination that can use this quality type." @@ -548,39 +583,50 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:712 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 msgctxt "@label" msgid "Nozzle" msgstr "Nozzle" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:860 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:856 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "De instellingen zijn gewijzigd zodat deze overeenkomen met de huidige beschikbaarheid van extruders:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:862 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:858 msgctxt "@info:title" msgid "Settings updated" msgstr "De instellingen zijn bijgewerkt" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1447 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1478 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extruder(s) uitgeschakeld" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:67 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:67 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "Toevoegen" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:263 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 msgctxt "@action:button" msgid "Finish" msgstr "Voltooien" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:441 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml:81 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml:81 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 msgctxt "@action:button" msgid "Cancel" @@ -590,75 +636,86 @@ msgstr "Annuleren" #, python-brace-format msgctxt "@label" msgid "Group #{group_nr}" -msgstr "Groepsnummer {group_nr}" +msgstr "Groepsnummer #{group_nr}" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Buitenwand" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Binnenwanden" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Skin" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Vulling" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Supportvulling" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Verbindingsstructuur" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Supportstructuur" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Skirt" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 msgctxt "@tooltip" msgid "Prime Tower" msgstr "Primepijler" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 msgctxt "@tooltip" msgid "Travel" msgstr "Beweging" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 msgctxt "@tooltip" msgid "Retractions" msgstr "Intrekkingen" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:94 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 msgctxt "@tooltip" msgid "Other" msgstr "Overig(e)" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 msgctxt "@action:button" msgid "Next" msgstr "Volgende" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:173 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 +msgctxt "@action:button" +msgid "Skip" +msgstr "Overslaan" + +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 +#: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 msgctxt "@action:button" msgid "Close" msgstr "Sluiten" @@ -682,29 +739,36 @@ msgstr "" "

    Ontdek hoe u de best mogelijke printkwaliteit en betrouwbaarheid verkrijgt.

    \n" "

    Handleiding printkwaliteit bekijken

    " -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:535 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:540 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Projectbestand {0} bevat een onbekend type machine {1}. Kan de machine niet importeren. In plaats daarvan worden er modellen geïmporteerd." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:538 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:543 msgctxt "@info:title" msgid "Open Project File" msgstr "Projectbestand Openen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:634 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:639 #, python-brace-format msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "Projectbestand {0} is plotseling ontoegankelijk: {1}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:635 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "Kan projectbestand niet openen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:686 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:646 +#, python-brace-format +msgctxt "@info:error Don't translate the XML tags or !" +msgid "Project file {0} is corrupt: {1}." +msgstr "Projectbestand {0} is corrupt: {1}." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:698 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." @@ -720,7 +784,8 @@ msgctxt "@title:tab" msgid "Custom" msgstr "Aangepast" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 msgctxt "@item:inlistbox" msgid "3MF File" msgstr "3MF-bestand" @@ -730,7 +795,8 @@ msgctxt "@error:zip" msgid "3MF Writer plug-in is corrupt." msgstr "3MF-schrijverplug-in is beschadigd." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:59 /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:92 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:59 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:92 msgctxt "@error:zip" msgid "No permission to write the workspace here." msgstr "Geen bevoegdheid om de werkruimte hier te schrijven." @@ -740,7 +806,7 @@ msgctxt "@error:zip" msgid "The operating system does not allow saving a project file to this location or with this file name." msgstr "Het besturingssysteem staat niet toe dat u een projectbestand opslaat op deze locatie of met deze bestandsnaam." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:206 msgctxt "@error:zip" msgid "Error writing 3mf file." msgstr "Fout bij het schrijven van het 3mf-bestand." @@ -795,7 +861,8 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "De back-up is groter dan de maximale bestandsgrootte." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:82 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:23 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "Er is een fout opgetreden tijdens het herstellen van uw back-up." @@ -805,41 +872,45 @@ msgctxt "@item:inmenu" msgid "Manage backups" msgstr "Back-ups beheren" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Met het huidige materiaal is slicen niet mogelijk, omdat het materiaal niet compatibel is met de geselecteerde machine of configuratie." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:411 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:420 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:429 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 msgctxt "@info:title" msgid "Unable to slice" msgstr "Kan niet slicen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:412 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Met de huidige instellingen is slicing niet mogelijk. De volgende instellingen bevatten fouten: {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:410 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:436 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Slicing is niet mogelijk vanwege enkele instellingen per model. De volgende instellingen bevatten fouten voor een of meer modellen: {error_labels}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:445 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "Slicen is niet mogelijk omdat de terugduwpijler of terugduwpositie(s) ongeldig zijn." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:428 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:454 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "Slicen is niet mogelijk omdat er objecten gekoppeld zijn aan uitgeschakelde Extruder %s." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:463 msgctxt "@info:status" msgid "" "Please review settings and check if your models:\n" @@ -852,7 +923,8 @@ msgstr "" "- zijn toegewezen aan een ingeschakelde extruder\n" "- niet allemaal zijn ingesteld als modificatierasters" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 msgctxt "@info:status" msgid "Processing Layers" msgstr "Lagen verwerken" @@ -862,7 +934,8 @@ msgctxt "@info:title" msgid "Information" msgstr "Informatie" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura-profiel" @@ -894,7 +967,8 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Firmware bijwerken" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 msgctxt "@item:inlistbox" msgid "Compressed G-code File" msgstr "Gecomprimeerd G-code-bestand" @@ -904,7 +978,9 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "GCodeGzWriter ondersteunt geen tekstmodus." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 msgctxt "@item:inlistbox" msgid "G-code File" msgstr "G-code-bestand" @@ -914,7 +990,8 @@ msgctxt "@info:status" msgid "Parsing G-code" msgstr "G-code parseren" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:349 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:349 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:503 msgctxt "@info:title" msgid "G-code Details" msgstr "Details van de G-code" @@ -934,7 +1011,8 @@ msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "GCodeWriter ondersteunt geen non-tekstmodus." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Bereid voorafgaand aan het exporteren G-code voor." @@ -1020,7 +1098,8 @@ msgctxt "@item:inlistbox" msgid "Save to Removable Drive {0}" msgstr "Opslaan op Verwisselbaar Station {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "Er zijn geen bestandsindelingen beschikbaar om te schrijven!" @@ -1036,7 +1115,8 @@ msgctxt "@info:title" msgid "Saving" msgstr "Opslaan" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:106 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:109 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:106 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:109 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not save to {0}: {1}" @@ -1048,7 +1128,8 @@ msgctxt "@info:status Don't translate the tag {device}!" msgid "Could not find a file name when trying to write to {device}." msgstr "Kan geen bestandsnaam vinden tijdens het schrijven naar {device}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:138 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:138 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #, python-brace-format msgctxt "@info:status" msgid "Could not save to removable drive {0}: {1}" @@ -1098,27 +1179,28 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Verwisselbaar Station" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:121 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:128 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled." msgstr "Als Draadprinten is ingeschakeld, geeft Cura lagen niet goed weer." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:129 msgctxt "@info:title" msgid "Simulation View" msgstr "Simulatieweergave" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:status" msgid "Nothing is shown because you need to slice first." msgstr "Er wordt niets weergegeven omdat u eerst moet slicen." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:title" msgid "No layers to show" msgstr "Geen lagen om weer te geven" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:124 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "Dit bericht niet meer weergeven" @@ -1128,16 +1210,21 @@ msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Laagweergave" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:70 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:71 msgctxt "@info:status" -msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." -msgstr "Uw model is niet veelvoudig. De gemarkeerde gebieden geven ofwel ontbrekende of ongebruikelijke oppervlakken aan." +msgid "The highlighted areas indicate either missing or extraneous surfaces. Fix your model and open it again into Cura." +msgstr "De gemarkeerde gebieden geven ofwel ontbrekende of ongebruikelijke oppervlakken aan. Corrigeer het model en open het opnieuw in Cura." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 msgctxt "@info:title" -msgid "Model errors" +msgid "Model Errors" msgstr "Modelfouten" +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:79 +msgctxt "@action:button" +msgid "Learn more" +msgstr "Meer informatie" + #: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/__init__.py:12 msgctxt "@item:inmenu" msgid "Solid view" @@ -1158,12 +1245,13 @@ msgctxt "@info:generic" msgid "Do you want to sync material and software packages with your account?" msgstr "Wilt u materiaal- en softwarepackages synchroniseren met uw account?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:143 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/DownloadPresenter.py:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:143 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/DownloadPresenter.py:93 msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "Wijzigingen gedetecteerd van uw Ultimaker-account" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:145 msgctxt "@action:button" msgid "Sync" msgstr "Synchroniseren" @@ -1178,7 +1266,8 @@ msgctxt "@button" msgid "Decline" msgstr "Nee, ik ga niet akkoord" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/LicenseModel.py:10 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:56 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/LicenseModel.py:10 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:56 msgctxt "@button" msgid "Agree" msgstr "Akkoord" @@ -1198,7 +1287,7 @@ msgctxt "@info:generic" msgid "You need to quit and restart {} before changes have effect." msgstr "U moet {} afsluiten en herstarten voordat de wijzigingen van kracht worden." -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:79 msgctxt "@info:generic" msgid "{} plugins failed to download" msgstr "{} plug-ins zijn niet gedownload" @@ -1233,12 +1322,17 @@ msgctxt "@item:inlistbox" msgid "Compressed COLLADA Digital Asset Exchange" msgstr "Gecomprimeerde COLLADA Digital Asset Exchange" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimaker Format Package" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "Kan niet naar UFP-bestand schrijven:" @@ -1253,22 +1347,22 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Upgrades selecteren" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:152 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 msgctxt "@action:button" msgid "Print via cloud" msgstr "Printen via Cloud" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:155 msgctxt "@properties:tooltip" msgid "Print via cloud" msgstr "Printen via Cloud" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:156 msgctxt "@info:status" msgid "Connected via cloud" msgstr "Verbonden via Cloud" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:264 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:270 #, python-brace-format msgctxt "@error:send" msgid "Unknown error code when uploading print job: {0}" @@ -1314,7 +1408,8 @@ msgid_plural "These printers are not linked to the Digital Factory:" msgstr[0] "Deze printer is niet gekoppeld aan de Digital Factory:" msgstr[1] "Deze printers zijn niet gekoppeld aan de Digital Factory:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:329 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:329 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:419 msgctxt "info:name" msgid "Ultimaker Digital Factory" msgstr "Ultimaker Digital Factory" @@ -1565,126 +1660,137 @@ msgctxt "@info:tooltip" msgid "Some things could be problematic in this print. Click to see tips for adjustment." msgstr "In deze print kunnen problemen ontstaan. Klik om tips voor aanpassingen te bekijken." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:15 msgctxt "@title:window" msgid "Open Project" msgstr "Project openen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" msgstr "Bestaand(e) bijwerken" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:63 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "Nieuw maken" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:74 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "Samenvatting - Cura-project" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:96 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 msgctxt "@action:label" msgid "Printer settings" msgstr "Printerinstellingen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:112 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:113 msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "Hoe dient het conflict in de machine te worden opgelost?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:165 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 msgctxt "@action:label" msgid "Type" msgstr "Type" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:181 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 msgctxt "@action:label" msgid "Printer Group" msgstr "Printergroep" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:203 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 msgctxt "@action:label" msgid "Profile settings" msgstr "Profielinstellingen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:219 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:221 msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "Hoe dient het conflict in het profiel te worden opgelost?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:349 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 msgctxt "@action:label" msgid "Name" msgstr "Naam" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:255 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 msgctxt "@action:label" msgid "Intent" msgstr "Intent" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:271 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Not in profile" msgstr "Niet in profiel" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:276 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 overschrijving" msgstr[1] "%1 overschrijvingen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:287 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:290 msgctxt "@action:label" msgid "Derivative from" msgstr "Afgeleide van" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:295 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 overschrijving" msgstr[1] "%1, %2 overschrijvingen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:309 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:312 msgctxt "@action:label" msgid "Material settings" msgstr "Materiaalinstellingen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:328 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Hoe dient het materiaalconflict te worden opgelost?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:369 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:373 msgctxt "@action:label" msgid "Setting visibility" msgstr "Zichtbaarheid instellen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:378 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:382 msgctxt "@action:label" msgid "Mode" msgstr "Modus" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:label" msgid "Visible settings:" msgstr "Zichtbare instellingen:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:399 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:403 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 van %2" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:425 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:429 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Als u een project laadt, worden alle modellen van het platform gewist." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:457 msgctxt "@action:button" msgid "Open" msgstr "Openen" @@ -1784,7 +1890,10 @@ msgctxt "@description" msgid "Backup and synchronize your Cura settings." msgstr "Maak een back-up van uw Cura-instellingen en synchroniseer deze." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:68 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:125 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:199 msgctxt "@button" msgid "Sign in" msgstr "Aanmelden" @@ -1934,7 +2043,8 @@ msgctxt "@item:inlistbox" msgid "Linear" msgstr "Lineair" -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:161 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:172 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:161 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:172 msgctxt "@item:inlistbox" msgid "Translucency" msgstr "Doorschijnendheid" @@ -1959,7 +2069,9 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "Effenen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:227 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:139 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:227 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@action:button" msgid "OK" msgstr "OK" @@ -1979,10 +2091,18 @@ msgctxt "@label" msgid "Nozzle size" msgstr "Maat nozzle" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:89 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:205 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:245 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:283 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:245 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:283 msgctxt "@label" msgid "mm" msgstr "mm" @@ -2007,12 +2127,12 @@ msgctxt "@label" msgid "Cooling Fan Number" msgstr "Nummer van koelventilator" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:163 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "Start-G-code van extruder" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:177 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "Eind-G-code van extruder" @@ -2097,12 +2217,17 @@ msgctxt "@label" msgid "Number of Extruders" msgstr "Aantal extruders" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:345 +msgctxt "@label" +msgid "Apply Extruder offsets to GCode" +msgstr "Pas extruderoffsets toe op GCode" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:393 msgctxt "@title:label" msgid "Start G-code" msgstr "Start G-code" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:385 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:404 msgctxt "@title:label" msgid "End G-code" msgstr "Eind G-code" @@ -2130,6 +2255,11 @@ msgctxt "@label link to technical assistance" msgid "View user manuals online" msgstr "Gebruikershandleidingen online weergegeven" +#: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 +msgctxt "@info" +msgid "In order to monitor your print from Cura, please connect the printer." +msgstr "Sluit de printer aan om uw printopdracht vanuit Cura te volgen." + #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" msgid "Mesh Type" @@ -2175,7 +2305,8 @@ msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Instellingen Selecteren om Dit Model Aan te Passen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filteren..." @@ -2185,114 +2316,131 @@ msgctxt "@label:checkbox" msgid "Show all" msgstr "Alles weergeven" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:20 msgctxt "@title:window" msgid "Post Processing Plugin" msgstr "Invoegtoepassing voor Nabewerking" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:59 msgctxt "@label" msgid "Post Processing Scripts" msgstr "Scripts voor Nabewerking" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:235 msgctxt "@action" msgid "Add a script" msgstr "Een script toevoegen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:282 msgctxt "@label" msgid "Settings" msgstr "Instellingen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:499 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:502 msgctxt "@info:tooltip" msgid "Change active post-processing scripts." msgstr "Actieve scripts voor nabewerking wijzigen." -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:506 msgctxt "@info:tooltip" msgid "The following script is active:" msgid_plural "The following scripts are active:" msgstr[0] "Het volgende script is actief:" msgstr[1] "De volgende scripts zijn actief:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:20 /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:49 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:49 msgctxt "@label" msgid "Color scheme" msgstr "Kleurenschema" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:110 msgctxt "@label:listbox" msgid "Material Color" msgstr "Materiaalkleur" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:111 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:114 msgctxt "@label:listbox" msgid "Line Type" msgstr "Lijntype" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:115 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:118 msgctxt "@label:listbox" msgid "Speed" msgstr "Snelheid" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:122 msgctxt "@label:listbox" -msgid "Layer thickness" +msgid "Layer Thickness" msgstr "Laagdikte" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:126 +msgctxt "@label:listbox" +msgid "Line Width" +msgstr "Lijnbreedte" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 +msgctxt "@label:listbox" +msgid "Flow" +msgstr "Doorvoer" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" msgid "Compatibility Mode" msgstr "Compatibiliteitsmodus" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:230 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:245 msgctxt "@label" msgid "Travels" msgstr "Bewegingen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:251 msgctxt "@label" msgid "Helpers" msgstr "Helpers" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:257 msgctxt "@label" msgid "Shell" msgstr "Shell" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:248 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 msgctxt "@label" msgid "Infill" msgstr "Vulling" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:298 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:271 +msgctxt "@label" +msgid "Starts" +msgstr "Wordt gestart" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 msgctxt "@label" msgid "Only Show Top Layers" msgstr "Alleen bovenlagen weergegeven" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:308 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:332 msgctxt "@label" msgid "Show 5 Detailed Layers On Top" msgstr "5 gedetailleerde lagen bovenaan weergeven" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:346 msgctxt "@label" msgid "Top / Bottom" msgstr "Boven-/onderkant" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:350 msgctxt "@label" msgid "Inner Wall" msgstr "Binnenwand" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:384 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:419 msgctxt "@label" msgid "min" msgstr "min." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:433 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:488 msgctxt "@label" msgid "max" msgstr "max." @@ -2367,7 +2515,8 @@ msgctxt "@action:label" msgid "Website" msgstr "Website" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:46 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:20 msgctxt "@action:button" msgid "Installed" msgstr "Geïnstalleerd" @@ -2382,17 +2531,20 @@ msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "Materiaalspoelen kopen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:96 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:34 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "Bijwerken" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:97 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:35 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "Bijwerken" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:98 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:36 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:98 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" msgstr "Bijgewerkt" @@ -2402,7 +2554,8 @@ msgctxt "@label" msgid "Premium" msgstr "Premium" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml:39 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml:39 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:86 msgctxt "@info:tooltip" msgid "Go to Web Marketplace" msgstr "Ga naar Marketplace op internet" @@ -2427,7 +2580,9 @@ msgctxt "@title:tab" msgid "Plugins" msgstr "Invoegtoepassingen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:466 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 msgctxt "@title:tab" msgid "Materials" msgstr "Materialen" @@ -2472,7 +2627,10 @@ msgctxt "@button" msgid "Dismiss" msgstr "Verwijderen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:178 msgctxt "@button" msgid "Next" msgstr "Volgende" @@ -2537,7 +2695,8 @@ msgctxt "@label" msgid "Last updated" msgstr "Laatst bijgewerkt" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:103 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "Merk" @@ -2667,7 +2826,10 @@ msgctxt "@action:button" msgid "Edit" msgstr "Bewerken" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:156 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" msgstr "Verwijderen" @@ -2682,17 +2844,20 @@ msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Raadpleeg de handleiding voor probleemoplossing bij printen via het netwerk als uw printer niet in de lijst wordt vermeld" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:205 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:263 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:263 msgctxt "@label" msgid "Type" msgstr "Type" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:279 msgctxt "@label" msgid "Firmware version" msgstr "Firmwareversie" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:295 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:295 msgctxt "@label" msgid "Address" msgstr "Adres" @@ -2722,7 +2887,8 @@ msgctxt "@title:window" msgid "Invalid IP address" msgstr "Ongeldig IP-adres" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Voer een geldig IP-adres in." @@ -2732,7 +2898,8 @@ msgctxt "@title:window" msgid "Printer Address" msgstr "Printeradres" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Voer het IP-adres van uw printer in het netwerk in." @@ -2784,7 +2951,9 @@ msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "Met het overschrijven worden de opgegeven instellingen gebruikt met de bestaande printerconfiguratie. De print kan hierdoor mislukken." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:191 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:184 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:191 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:184 msgctxt "@label" msgid "Glass" msgstr "Glas" @@ -2804,7 +2973,8 @@ msgctxt "@label" msgid "Delete" msgstr "Verwijderen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:289 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 msgctxt "@label" msgid "Resume" msgstr "Hervatten" @@ -2819,7 +2989,9 @@ msgctxt "@label" msgid "Resuming..." msgstr "Hervatten..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 msgctxt "@label" msgid "Pause" msgstr "Pauzeren" @@ -2859,7 +3031,8 @@ msgctxt "@label %1 is the name of a print job." msgid "Are you sure you want to abort %1?" msgstr "Weet u zeker dat u %1 wilt afbreken?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 msgctxt "@window:title" msgid "Abort print" msgstr "Printen afbreken" @@ -2869,7 +3042,9 @@ msgctxt "@label link to Connect and Cloud interfaces" msgid "Manage printer" msgstr "Printer beheren" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:519 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." msgstr "Werk de firmware van uw printer bij om de wachtrij op afstand te beheren." @@ -2894,27 +3069,34 @@ msgctxt "@label:status" msgid "Idle" msgstr "Inactief" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:365 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +msgctxt "@label:status" +msgid "Preparing..." +msgstr "Voorbereiden..." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:369 msgctxt "@label:status" msgid "Printing" msgstr "Printen" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:406 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:410 msgctxt "@label" msgid "Untitled" msgstr "Zonder titel" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:431 msgctxt "@label" msgid "Anonymous" msgstr "Anoniem" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:458 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Hiervoor zijn configuratiewijzigingen vereist" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:492 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:496 msgctxt "@action:button" msgid "Details" msgstr "Details" @@ -2929,21 +3111,18 @@ msgctxt "@label" msgid "First available" msgstr "Eerst beschikbaar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "Afgebroken" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "Gereed" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -msgctxt "@label:status" -msgid "Preparing..." -msgstr "Voorbereiden..." - #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." @@ -3024,26 +3203,27 @@ msgctxt "@action:button" msgid "Sign in" msgstr "Aanmelden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" -msgid "Your key to connected 3D printing" -msgstr "Uw sleutel tot verbonden 3D-printen" +msgid "Sign in to the Ultimaker platform" +msgstr "Meld u aan op het Ultimaker-platform" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:42 msgctxt "@text" msgid "" -"- Customize your experience with more print profiles and plugins\n" -"- Stay flexible by syncing your setup and loading it anywhere\n" -"- Increase efficiency with a remote workflow on Ultimaker printers" +"- Add material profiles and plug-ins from the Marketplace\n" +"- Back-up and sync your material profiles and plug-ins\n" +"- Share ideas and get help from 48,000+ users in the Ultimaker community" msgstr "" -"- Pas uw ervaring aan met meer printprofielen en plug-ins\n" -"- Blijf flexibel door uw instellingen te synchroniseren en overal te laden\n" -"- Verhoog de efficiëntie met een externe workflow op Ultimaker-printers" +"- Voeg materiaalprofielen en plug-ins toe uit de Marktplaats\n" +"- Maak back-ups van uw materiaalprofielen en plug-ins en synchroniseer deze\n" +"- Deel ideeën met 48.000+ gebruikers in de Ultimaker-community of vraag hen om ondersteuning" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:142 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:62 msgctxt "@button" -msgid "Create account" -msgstr "Account maken" +msgid "Create a free Ultimaker account" +msgstr "Maak een gratis Ultimaker-account aan" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/SyncState.qml:28 msgctxt "@label" @@ -3150,303 +3330,308 @@ msgctxt "@button" msgid "Cancel" msgstr "Annuleren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:83 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Online gids voor probleemoplossing weergegeven" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:90 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Volledig Scherm In-/Uitschakelen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:98 msgctxt "@action:inmenu" msgid "Exit Full Screen" msgstr "Volledig scherm sluiten" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:105 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "Ongedaan &Maken" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:115 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Opnieuw" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:125 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Afsluiten" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:132 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:133 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "3D-weergave" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:140 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Weergave voorzijde" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:147 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Weergave bovenzijde" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 +msgctxt "@action:inmenu menubar:view" +msgid "Bottom View" +msgstr "Aanzicht onderzijde" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Weergave linkerzijde" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:160 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:168 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Weergave rechterzijde" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:175 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Cura Configureren..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:182 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Printer Toevoegen..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:180 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:188 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Pr&inters Beheren..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:187 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Materialen Beheren..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu" msgid "Add more materials from Marketplace" msgstr "Meer materialen toevoegen van Marketplace" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "Profiel bijwerken met h&uidige instellingen/overschrijvingen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "Hui&dige wijzigingen verwijderen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:222 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:230 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "Profiel maken op basis van huidige instellingen/overs&chrijvingen..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Profielen Beheren..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Online &Documentatie Weergeven" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Een &Bug Rapporteren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:260 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Nieuwe functies" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:266 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Over..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:273 msgctxt "@action:inmenu menubar:edit" -msgid "Delete Selected Model" -msgid_plural "Delete Selected Models" -msgstr[0] "Geselecteerd model verwijderen" -msgstr[1] "Geselecteerde modellen verwijderen" +msgid "Delete Selected" +msgstr "Verwijder geselecteerde items" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:283 msgctxt "@action:inmenu menubar:edit" -msgid "Center Selected Model" -msgid_plural "Center Selected Models" -msgstr[0] "Geselecteerd model centreren" -msgstr[1] "Geselecteerde modellen centreren" +msgid "Center Selected" +msgstr "Centreer geselecteerde items" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:292 msgctxt "@action:inmenu menubar:edit" -msgid "Multiply Selected Model" -msgid_plural "Multiply Selected Models" -msgstr[0] "Geselecteerd model verveelvoudigen" -msgstr[1] "Geselecteerde modellen verveelvoudigen" +msgid "Multiply Selected" +msgstr "Verveelvoudig geselecteerde items" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Model Verwijderen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:309 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Model op Platform Ce&ntreren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:307 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "Modellen &Groeperen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:327 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:335 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Groeperen van Modellen Opheffen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:345 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "Modellen Samen&voegen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:347 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:355 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Model verveelvoudigen..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:362 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Alle Modellen Selecteren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:372 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Platform Leegmaken" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:382 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Alle Modellen Opnieuw Laden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Alle modellen schikken op alle platformen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:390 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Alle modellen schikken" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:406 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Selectie schikken" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:405 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:413 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Alle Modelposities Herstellen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:412 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Alle Modeltransformaties Herstellen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:419 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:429 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "Bestand(en) &openen..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:439 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Nieuw project..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:434 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:446 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Open Configuratiemap" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:441 /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:538 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Zichtbaarheid Instelling Configureren..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:448 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:460 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Marktplaats" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:257 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Dit package wordt na opnieuw starten geïnstalleerd." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 msgctxt "@title:tab" msgid "General" msgstr "Algemeen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:462 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:453 msgctxt "@title:tab" msgid "Settings" msgstr "Instellingen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:464 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 msgctxt "@title:tab" msgid "Printers" msgstr "Printers" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 msgctxt "@title:tab" msgid "Profiles" msgstr "Profielen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:576 msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "%1 wordt gesloten" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:588 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "Weet u zeker dat u %1 wilt afsluiten?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:638 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Bestand(en) openen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:744 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:737 msgctxt "@window:title" msgid "Install Package" msgstr "Package installeren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:752 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:745 msgctxt "@title:window" msgid "Open File(s)" msgstr "Bestand(en) openen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:755 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:748 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Binnen de door u geselecteerde bestanden zijn een of meer G-code-bestanden aangetroffen. U kunt maximaal één G-code-bestand tegelijk openen. Selecteer maximaal één bestand als u dit wilt openen als G-code-bestand." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:858 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:857 msgctxt "@title:window" msgid "Add Printer" msgstr "Printer Toevoegen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:866 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:865 msgctxt "@title:window" msgid "What's New" msgstr "Nieuwe functies" @@ -3575,7 +3760,8 @@ msgctxt "@Label" msgid "Static type checker for Python" msgstr "Statische typecontrole voor Python" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@Label" msgid "Root Certificates for validating SSL trustworthiness" msgstr "Rootcertificaten voor het valideren van SSL-betrouwbaarheid" @@ -3595,17 +3781,27 @@ msgctxt "@label" msgid "Python bindings for libnest2d" msgstr "Pythonbindingen voor libnest2d" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +msgctxt "@label" +msgid "Support library for system keyring access" +msgstr "Ondersteuningsbibliotheek voor toegang tot systeemkeyring" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" +msgid "Python extensions for Microsoft Windows" +msgstr "Pythonextensies voor Microsoft Windows" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +msgctxt "@label" msgid "Font" msgstr "Lettertype" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 msgctxt "@label" msgid "SVG icons" msgstr "SVG-pictogrammen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:165 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Implementatie van Linux-toepassing voor kruisdistributie" @@ -3615,22 +3811,22 @@ msgctxt "@title:window" msgid "Open project file" msgstr "Projectbestand openen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:88 msgctxt "@text:window" msgid "This is a Cura project file. Would you like to open it as a project or import the models from it?" msgstr "Dit is een Cura-projectbestand. Wilt u dit openen als project of de modellen eruit importeren?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:98 msgctxt "@text:window" msgid "Remember my choice" msgstr "Mijn keuze onthouden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:122 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:117 msgctxt "@action:button" msgid "Open as project" msgstr "Openen als project" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:131 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:126 msgctxt "@action:button" msgid "Import models" msgstr "Modellen importeren" @@ -3661,7 +3857,8 @@ msgctxt "@title:column" msgid "Current changes" msgstr "Huidige wijzigingen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Altijd vragen" @@ -3686,12 +3883,12 @@ msgctxt "@action:button" msgid "Keep changes" msgstr "Wijzigingen behouden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 msgctxt "@text:window" msgid "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?" msgstr "Binnen de door u geselecteerde bestanden zijn een of meer projectbestanden aangetroffen. U kunt slechts één projectbestand tegelijk openen. Het wordt aangeraden alleen modellen uit deze bestanden te importeren. Wilt u verdergaan?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:99 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:94 msgctxt "@action:button" msgid "Import all as models" msgstr "Allemaal als model importeren" @@ -3738,7 +3935,8 @@ msgctxt "@text Print job name" msgid "Untitled" msgstr "Zonder titel" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:27 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:27 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "&Bestand" @@ -3748,12 +3946,14 @@ msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "B&ewerken" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:49 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:12 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:49 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:12 msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "Beel&d" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:51 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&Settings" msgstr "In&stellingen" @@ -3843,7 +4043,7 @@ msgctxt "@label" msgid "Material" msgstr "Materiaal" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:407 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Gebruik lijm bij deze combinatie van materialen voor een betere hechting." @@ -3867,17 +4067,17 @@ msgctxt "@label" msgid "Number of Copies" msgstr "Aantal exemplaren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:33 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:41 msgctxt "@title:menu menubar:file" msgid "&Save Project..." msgstr "&Project opslaan..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:54 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:74 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&Exporteren..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:85 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Selectie Exporteren..." @@ -3897,6 +4097,11 @@ msgctxt "@label:category menu label" msgid "Generic" msgstr "Standaard" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/OpenFilesMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Open File(s)..." +msgstr "Bestand(en) openen..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3912,6 +4117,11 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "&Recente bestanden openen" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SaveProjectMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Save Project..." +msgstr "Project opslaan..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:15 msgctxt "@title:menu menubar:settings" msgid "&Printer" @@ -3937,17 +4147,17 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Extruder uitschakelen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:16 msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Zichtbare instellingen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:45 msgctxt "@action:inmenu" msgid "Collapse All Categories" msgstr "Alle categorieën samenvouwen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Instelling voor zichtbaarheid beheren..." @@ -3957,22 +4167,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Camerapositie" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:45 msgctxt "@action:inmenu menubar:view" msgid "Camera view" msgstr "Camerabeeld" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:48 msgctxt "@action:inmenu menubar:view" msgid "Perspective" msgstr "Perspectief" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:60 msgctxt "@action:inmenu menubar:view" msgid "Orthographic" msgstr "Orthografisch" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:81 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "&Platform" @@ -4017,12 +4227,12 @@ msgctxt "@label:MonitorStatus" msgid "Please remove the print" msgstr "Verwijder de print" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@label" msgid "Abort Print" msgstr "Printen Afbreken" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:338 msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Weet u zeker dat u het printen wilt afbreken?" @@ -4064,310 +4274,314 @@ msgctxt "@label" msgid "Interface" msgstr "Interface" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:216 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:209 msgctxt "@label" msgid "Currency:" msgstr "Valuta:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:229 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:222 msgctxt "@label" msgid "Theme:" msgstr "Thema:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "U moet de toepassing opnieuw starten voordat deze wijzigingen van kracht worden." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:284 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Automatisch slicen bij wijzigen van instellingen." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 msgctxt "@option:check" msgid "Slice automatically" msgstr "Automatisch slicen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:306 msgctxt "@label" msgid "Viewport behavior" msgstr "Gedrag kijkvenster" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:314 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Geef niet-ondersteunde gedeelten van het model een rode markering. Zonder ondersteuning zullen deze gedeelten niet goed worden geprint." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:323 msgctxt "@option:check" msgid "Display overhang" msgstr "Overhang weergeven" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:351 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@info:tooltip" msgid "Highlight missing or extraneous surfaces of the model using warning signs. The toolpaths will often be missing parts of the intended geometry." msgstr "Markeer ontbrekende of ongebruikelijke oppervlakken van het model met behulp van waarschuwingstekens. De toolpaths zullen vaak delen van de beoogde geometrie missen." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:342 msgctxt "@option:check" msgid "Display model errors" msgstr "Modelfouten weergeven" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Verplaatst de camera zodanig dat wanneer een model wordt geselecteerd, het model in het midden van het beeld wordt weergegeven" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:373 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Camera centreren wanneer een item wordt geselecteerd" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Moet het standaard zoomgedrag van Cura worden omgekeerd?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:388 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Keer de richting van de camerazoom om." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Moet het zoomen in de richting van de muis gebeuren?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "Zoomen in de richting van de muis wordt niet ondersteund in het orthografische perspectief." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:409 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Zoomen in de richting van de muis" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:435 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:417 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Moeten modellen op het platform zodanig worden verplaatst dat ze elkaar niet meer doorsnijden?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:440 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:422 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Modellen gescheiden houden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:431 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Moeten modellen in het printgebied omlaag worden gebracht zodat ze het platform raken?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:436 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Modellen automatisch op het platform laten vallen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:448 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Toon het waarschuwingsbericht in de G-code-lezer." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:457 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Waarschuwingsbericht in de G-code-lezer" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Moet de laag in de compatibiliteitsmodus worden geforceerd?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Compatibiliteitsmodus voor laagweergave forceren (opnieuw opstarten vereist)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:498 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" msgstr "Moet Cura openen op de locatie waar het gesloten werd?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:485 msgctxt "@option:check" msgid "Restore window position on start" msgstr "Herstel de vensterpositie bij het opstarten" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:513 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Welk type cameraweergave moet worden gebruikt?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:502 msgctxt "@window:text" msgid "Camera rendering:" msgstr "Cameraweergave:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:531 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:509 msgid "Perspective" msgstr "Perspectief" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:532 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgid "Orthographic" msgstr "Orthografisch" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:563 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:548 msgctxt "@label" msgid "Opening and saving files" msgstr "Bestanden openen en opslaan" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:555 msgctxt "@info:tooltip" msgid "Should opening files from the desktop or external applications open in the same instance of Cura?" msgstr "Wilt u dat bestanden vanaf de desktop of externe toepassingen in dezelfde instantie van Cura worden geopend?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@option:check" msgid "Use a single instance of Cura" msgstr "Gebruik één instantie van Cura" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Moeten modellen worden geschaald naar het werkvolume als ze te groot zijn?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@option:check" msgid "Scale large models" msgstr "Grote modellen schalen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Een model wordt mogelijk extreem klein weergegeven als de eenheden bijvoorbeeld in meters zijn in plaats van in millimeters. Moeten dergelijke modellen worden opgeschaald?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Extreem kleine modellen schalen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Moeten modellen worden geselecteerd nadat ze zijn geladen?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Modellen selecteren wanneer ze geladen zijn" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Moet er automatisch een op de printernaam gebaseerde voorvoegsel aan de naam van de printtaak worden toegevoegd?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:635 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Machinevoorvoegsel toevoegen aan taaknaam" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:645 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Dient er een samenvatting te worden weergegeven wanneer een projectbestand wordt opgeslagen?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:649 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:634 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Dialoogvenster voor samenvatting weergeven tijdens het opslaan van een project" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:659 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:644 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Standaardgedrag tijdens het openen van een projectbestand" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:652 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Standaardgedrag tijdens het openen van een projectbestand: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Altijd vragen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:682 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Altijd als project openen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:668 msgctxt "@option:openProject" msgid "Always import models" msgstr "Altijd modellen importeren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:705 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Wanneer u wijzigingen hebt aangebracht aan een profiel en naar een ander profiel wisselt, wordt een dialoogvenster weergegeven waarin u wordt gevraagd of u de aanpassingen wilt behouden. U kunt ook een standaardgedrag kiezen en het dialoogvenster nooit meer laten weergeven." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:728 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Profielen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Standaardgedrag voor gewijzigde instellingen wanneer er naar een ander profiel wordt overgeschakeld: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:748 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:734 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Gewijzigde instellingen altijd verwijderen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:749 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:735 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Gewijzigde instellingen altijd naar nieuw profiel overbrengen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:783 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@label" msgid "Privacy" msgstr "Privacy" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:790 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:777 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Moet Cura op updates controleren wanneer het programma wordt gestart?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:795 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:782 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Bij starten op updates controleren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:805 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:792 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Mogen anonieme gegevens over uw print naar Ultimaker worden verzonden? Opmerking: er worden geen modellen, IP-adressen of andere persoonlijk identificeerbare gegevens verzonden of opgeslagen." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:810 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:797 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "(Anonieme) printgegevens verzenden" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:819 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:806 msgctxt "@action:button" msgid "More information" msgstr "Meer informatie" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "Activeren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "Hernoemen" @@ -4382,61 +4596,77 @@ msgctxt "@action:button" msgid "Duplicate" msgstr "Dupliceren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:171 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:171 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "Importeren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:185 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:185 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 msgctxt "@action:button" msgid "Export" msgstr "Exporteren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 +msgctxt "@action:button Sending materials to printers" +msgid "Sync with Printers" +msgstr "Synchroniseren met printers" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" msgid "Printer" msgstr "Printer" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:298 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Verwijderen Bevestigen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:301 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Weet u zeker dat u %1 wilt verwijderen? Deze bewerking kan niet ongedaan worden gemaakt!" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 msgctxt "@title:window" msgid "Import Material" msgstr "Materiaal Importeren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:338 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Kon materiaal %1 niet importeren: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:328 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:342 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Materiaal %1 is geïmporteerd" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:346 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 msgctxt "@title:window" msgid "Export Material" msgstr "Materiaal Exporteren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:358 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:372 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Exporteren van materiaal naar %1 is mislukt: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:378 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Materiaal is geëxporteerd naar %1" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 +msgctxt "@title:window" +msgid "Export All Materials" +msgstr "Alle materialen exporteren" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" @@ -4522,7 +4752,8 @@ msgctxt "@label" msgid "Adhesion Information" msgstr "Gegevens Hechting" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Instellingen voor printen" @@ -4547,52 +4778,53 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Geef een naam op voor dit profiel." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Profiel Dupliceren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@title:window" msgid "Rename Profile" msgstr "Profiel Hernoemen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:307 msgctxt "@title:window" msgid "Import Profile" msgstr "Profiel Importeren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:336 msgctxt "@title:window" msgid "Export Profile" msgstr "Profiel Exporteren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:399 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Printer: %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:557 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Profiel bijwerken met huidige instellingen/overschrijvingen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 msgctxt "@action:button" msgid "Discard current changes" msgstr "Huidige wijzigingen verwijderen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:583 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Dit profiel gebruikt de standaardinstellingen die door de printer zijn opgegeven, dus er zijn hiervoor geen instellingen/overschrijvingen in de onderstaande lijst." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:591 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Uw huidige instellingen komen overeen met het geselecteerde profiel." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:609 msgctxt "@title:tab" msgid "Global Settings" msgstr "Algemene Instellingen" @@ -4622,12 +4854,12 @@ msgctxt "@title:column" msgid "Unit" msgstr "Eenheid" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:16 msgctxt "@title:tab" msgid "Setting Visibility" msgstr "Zichtbaarheid Instellen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:48 msgctxt "@label:textbox" msgid "Check all" msgstr "Alles aanvinken" @@ -4652,12 +4884,14 @@ msgctxt "@tooltip of temperature input" msgid "The temperature to pre-heat the hotend to." msgstr "De temperatuur waarnaar het hotend moet worden voorverwarmd." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:341 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:332 msgctxt "@button Cancel pre-heating" msgid "Cancel" msgstr "Annuleren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:344 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:344 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:335 msgctxt "@button" msgid "Pre-heat" msgstr "Voorverwarmen" @@ -4963,27 +5197,27 @@ msgctxt "@label:textbox" msgid "Search settings" msgstr "Instellingen zoeken" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:456 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:468 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Waarde naar alle extruders kopiëren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:477 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Alle gewijzigde waarden naar alle extruders kopiëren" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:502 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:514 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Deze instelling verbergen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:515 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:527 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Deze instelling verbergen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:531 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Deze instelling zichtbaar houden" @@ -5043,11 +5277,6 @@ msgctxt "@button" msgid "Add printer manually" msgstr "Printer handmatig toevoegen" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddCloudPrintersView.qml:218 -msgctxt "@button" -msgid "Finish" -msgstr "Voltooien" - #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:230 msgctxt "@label" msgid "Manufacturer" @@ -5128,7 +5357,8 @@ msgctxt "@label" msgid "Could not connect to device." msgstr "Kan geen verbinding maken met het apparaat." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:207 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:212 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:207 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:212 msgctxt "@label" msgid "Can't connect to your Ultimaker printer?" msgstr "Kunt u geen verbinding maken met uw Ultimaker-printer?" @@ -5153,32 +5383,32 @@ msgctxt "@button" msgid "Connect" msgstr "Verbinding maken" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:43 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" -msgid "Ultimaker Account" -msgstr "Ultimaker-account" +msgid "Release Notes" +msgstr "Release notes" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:124 msgctxt "@text" -msgid "Your key to connected 3D printing" -msgstr "Uw sleutel tot verbonden 3D-printen" +msgid "Add material settings and plugins from the Marketplace" +msgstr "Voeg materiaalinstellingen en plugins uit de Marktplaats toe" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:101 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:154 msgctxt "@text" -msgid "- Customize your experience with more print profiles and plugins" -msgstr "- Pas uw ervaring aan met meer printprofielen en plug-ins" +msgid "Backup and sync your material settings and plugins" +msgstr "Maak een back-up van uw materiaalinstellingen en plug-ins en synchroniseer deze" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:184 msgctxt "@text" -msgid "- Stay flexible by syncing your setup and loading it anywhere" -msgstr "- Blijf flexibel door uw instellingen te synchroniseren en overal te laden" +msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" +msgstr "Deel ideeën met 48,000+ gebruikers in de Ultimaker Community of vraag hen om ondersteuning" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:217 msgctxt "@text" -msgid "- Increase efficiency with a remote workflow on Ultimaker printers" -msgstr "- Verhoog de efficiëntie met een externe workflow op Ultimaker-printers" +msgid "Create a free Ultimaker Account" +msgstr "Maak een gratis Ultimaker-account aan" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:230 msgctxt "@button" msgid "Skip" msgstr "Overslaan" @@ -5238,29 +5468,32 @@ msgctxt "@button" msgid "Decline and close" msgstr "Afwijzen en sluiten" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:29 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" msgid "Welcome to Ultimaker Cura" msgstr "Welkom bij Ultimaker Cura" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:68 msgctxt "@text" -msgid "" -"Please follow these steps to set up\n" -"Ultimaker Cura. This will only take a few moments." +msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." msgstr "" "Volg deze stappen voor het instellen van\n" "Ultimaker Cura. Dit duurt slechts even." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:86 msgctxt "@button" msgid "Get started" msgstr "Aan de slag" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:28 msgctxt "@label" -msgid "What's new in Ultimaker Cura" -msgstr "Nieuwe functies in Ultimaker Cura" +msgid "What's New" +msgstr "Nieuwe functies" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Widgets/ComboBox.qml:24 +msgctxt "@label" +msgid "No items to select from" +msgstr "Geen items om uit te kiezen" #: ModelChecker/plugin.json msgctxt "description" @@ -5342,6 +5575,16 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura-profielschrijver" +#: DigitalLibrary/plugin.json +msgctxt "description" +msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." +msgstr "Maakt verbinding met de digitale bibliotheek, zodat Cura bestanden kan openen vanuit, en bestanden kan opslaan in, de digitale bibliotheek." + +#: DigitalLibrary/plugin.json +msgctxt "name" +msgid "Ultimaker Digital Library" +msgstr "Ultimaker Digital Library" + #: FirmwareUpdateChecker/plugin.json msgctxt "description" msgid "Checks for firmware updates." @@ -5812,6 +6055,26 @@ msgctxt "name" msgid "Version Upgrade 4.7 to 4.8" msgstr "Versie-upgrade van 4.7 naar 4.8" +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." +msgstr "Hiermee worden configuraties bijgewerkt van Cura 4.7 naar Cura 4.9." + +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.8 to 4.9" +msgstr "Versie-upgrade van 4.8 naar 4.9" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." +msgstr "Hiermee worden configuraties bijgewerkt van Cura 4.9 naar Cura 4.10." + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.9 to 4.10" +msgstr "Versie-upgrade 4.9 naar 4.10" + #: X3DReader/plugin.json msgctxt "description" msgid "Provides support for reading X3D files." @@ -5842,6 +6105,94 @@ msgctxt "name" msgid "X-Ray View" msgstr "Röntgenweergave" +#~ msgctxt "@info:status" +#~ msgid "Global stack is missing." +#~ msgstr "Algemene stapel ontbreekt." + +#~ msgctxt "@info:status" +#~ msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." +#~ msgstr "Uw model is niet veelvoudig. De gemarkeerde gebieden geven ofwel ontbrekende of ongebruikelijke oppervlakken aan." + +#~ msgctxt "@info:title" +#~ msgid "Model errors" +#~ msgstr "Modelfouten" + +#~ msgctxt "@label:listbox" +#~ msgid "Layer thickness" +#~ msgstr "Laagdikte" + +#~ msgctxt "@label" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "Uw sleutel tot verbonden 3D-printen" + +#~ msgctxt "@text" +#~ msgid "" +#~ "- Customize your experience with more print profiles and plugins\n" +#~ "- Stay flexible by syncing your setup and loading it anywhere\n" +#~ "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "" +#~ "- Pas uw ervaring aan met meer printprofielen en plug-ins\n" +#~ "- Blijf flexibel door uw instellingen te synchroniseren en overal te laden\n" +#~ "- Verhoog de efficiëntie met een externe workflow op Ultimaker-printers" + +#~ msgctxt "@button" +#~ msgid "Create account" +#~ msgstr "Account maken" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Delete Selected Model" +#~ msgid_plural "Delete Selected Models" +#~ msgstr[0] "Geselecteerd model verwijderen" +#~ msgstr[1] "Geselecteerde modellen verwijderen" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Center Selected Model" +#~ msgid_plural "Center Selected Models" +#~ msgstr[0] "Geselecteerd model centreren" +#~ msgstr[1] "Geselecteerde modellen centreren" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Multiply Selected Model" +#~ msgid_plural "Multiply Selected Models" +#~ msgstr[0] "Geselecteerd model verveelvoudigen" +#~ msgstr[1] "Geselecteerde modellen verveelvoudigen" + +#~ msgctxt "@button" +#~ msgid "Finish" +#~ msgstr "Voltooien" + +#~ msgctxt "@label" +#~ msgid "Ultimaker Account" +#~ msgstr "Ultimaker-account" + +#~ msgctxt "@text" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "Uw sleutel tot verbonden 3D-printen" + +#~ msgctxt "@text" +#~ msgid "- Customize your experience with more print profiles and plugins" +#~ msgstr "- Pas uw ervaring aan met meer printprofielen en plug-ins" + +#~ msgctxt "@text" +#~ msgid "- Stay flexible by syncing your setup and loading it anywhere" +#~ msgstr "- Blijf flexibel door uw instellingen te synchroniseren en overal te laden" + +#~ msgctxt "@text" +#~ msgid "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "- Verhoog de efficiëntie met een externe workflow op Ultimaker-printers" + +#~ msgctxt "@text" +#~ msgid "" +#~ "Please follow these steps to set up\n" +#~ "Ultimaker Cura. This will only take a few moments." +#~ msgstr "" +#~ "Volg deze stappen voor het instellen van\n" +#~ "Ultimaker Cura. Dit duurt slechts even." + +#~ msgctxt "@label" +#~ msgid "What's new in Ultimaker Cura" +#~ msgstr "Nieuwe functies in Ultimaker Cura" + #~ msgctxt "@label ({} is object name)" #~ msgid "Are you sure you wish to remove {}? This cannot be undone!" #~ msgstr "Weet u zeker dat u {} wilt verwijderen? Deze bewerking kan niet ongedaan worden gemaakt." diff --git a/resources/i18n/nl_NL/fdmextruder.def.json.po b/resources/i18n/nl_NL/fdmextruder.def.json.po index 61b993cdb3..72fde7bd7a 100644 --- a/resources/i18n/nl_NL/fdmextruder.def.json.po +++ b/resources/i18n/nl_NL/fdmextruder.def.json.po @@ -1,19 +1,20 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2019-03-13 14:00+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 15:03+0200\n" "Last-Translator: Bothof \n" "Language-Team: Dutch\n" "Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.4.1\n" #: fdmextruder.def.json msgctxt "machine_settings label" diff --git a/resources/i18n/nl_NL/fdmprinter.def.json.po b/resources/i18n/nl_NL/fdmprinter.def.json.po index 90db586658..ee37cee494 100644 --- a/resources/i18n/nl_NL/fdmprinter.def.json.po +++ b/resources/i18n/nl_NL/fdmprinter.def.json.po @@ -1,20 +1,20 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2020-08-21 13:40+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 15:03+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Dutch , Dutch \n" "Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.6\n" +"X-Generator: Poedit 2.4.1\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -419,6 +419,26 @@ msgctxt "machine_extruders_share_heater description" msgid "Whether the extruders share a single heater rather than each extruder having its own heater." msgstr "Hiermee bepaalt u of de extruders één verwarming delen in plaats van dat elke extruder zijn eigen verwarming heeft." +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle label" +msgid "Extruders Share Nozzle" +msgstr "Extruders delen nozzle" + +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle description" +msgid "Whether the extruders share a single nozzle rather than each extruder having its own nozzle. When set to true, it is expected that the printer-start gcode script properly sets up all extruders in an initial retraction state that is known and mutually compatible (either zero or one filament not retracted); in that case the initial retraction status is described, per extruder, by the 'machine_extruders_shared_nozzle_initial_retraction' parameter." +msgstr "Hiermee bepaalt u of de extruders één nozzle delen in plaats van dat elke extruder zijn eigen nozzle heeft. Wanneer dit wordt ingesteld op 'true', wordt verwacht dat het G-code-script voor het opstarten van de printer alle extruders correct instelt in een initiële intrekstatus die bekend is en onderling compatibel is (nul of één filament niet ingetrokken). In dat geval wordt de initiële intrekstatus per extruder beschreven door de parameter 'machine_extruders_shared_nozzle_initial_retraction'." + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction label" +msgid "Shared Nozzle Initial Retraction" +msgstr "Initiële terugtrekking gedeelde nozzle" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction description" +msgid "How much the filament of each extruder is assumed to have been retracted from the shared nozzle tip at the completion of the printer-start gcode script; the value should be equal to or greater than the length of the common part of the nozzle's ducts." +msgstr "Hoever het filament van elke extruder geacht wordt te zijn ingetrokken vanuit de gedeelde nozzle als het G-code-script voor het opstarten van de printer is uitgevoerd. De waarde mag niet gelijk zijn aan of groter zijn dan de lengte van het gemeenschappelijke deel van de kanalen in de nozzle." + #: fdmprinter.def.json msgctxt "machine_disallowed_areas label" msgid "Disallowed Areas" @@ -486,8 +506,8 @@ msgstr "Offset met extruder" #: fdmprinter.def.json msgctxt "machine_use_extruder_offset_to_offset_coords description" -msgid "Apply the extruder offset to the coordinate system." -msgstr "Pas de extruderoffset toe op het coördinatensysteem." +msgid "Apply the extruder offset to the coordinate system. Affects all extruders." +msgstr "Pas de extruderoffset toe op het coördinatensysteem. Van toepassing op alle extruders." #: fdmprinter.def.json msgctxt "extruder_prime_pos_z label" @@ -881,8 +901,8 @@ msgstr "Vermenigvuldiging van de lijnbreedte van de eerste laag. Door deze te ve #: fdmprinter.def.json msgctxt "shell label" -msgid "Shell" -msgstr "Shell" +msgid "Walls" +msgstr "Wanden" #: fdmprinter.def.json msgctxt "shell description" @@ -949,166 +969,6 @@ msgctxt "wall_0_wipe_dist description" msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better." msgstr "Afstand van een beweging die ingevoegd is na de buitenwand, om de Z-naad beter te maskeren." -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr label" -msgid "Top Surface Skin Extruder" -msgstr "Extruder bovenskin" - -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr description" -msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." -msgstr "De extruder train die voor het printen van de bovenste skinlaag wordt gebruikt. Deze wordt gebruikt in meervoudige doorvoer." - -#: fdmprinter.def.json -msgctxt "roofing_layer_count label" -msgid "Top Surface Skin Layers" -msgstr "Bovenste skinlagen" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count description" -msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." -msgstr "Het aantal bovenste skinlagen. Doorgaans is één bovenste skinlaag voldoende om oppervlakken van hogere kwaliteit te verkrijgen." - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr label" -msgid "Top/Bottom Extruder" -msgstr "Extruder Boven-/Onderkant" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr description" -msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." -msgstr "De extruder train die voor het printen van de boven- en onderskin wordt gebruikt. Deze wordt gebruikt in meervoudige doorvoer." - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness label" -msgid "Top/Bottom Thickness" -msgstr "Dikte Boven-/Onderkant" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness description" -msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." -msgstr "De dikte van de boven-/onderlagen in de print. Het aantal boven-/onderlagen wordt bepaald door het delen van deze waarde door de laaghoogte." - -#: fdmprinter.def.json -msgctxt "top_thickness label" -msgid "Top Thickness" -msgstr "Dikte Bovenkant" - -#: fdmprinter.def.json -msgctxt "top_thickness description" -msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." -msgstr "De dikte van de bovenlagen in de print. Het aantal bovenlagen wordt bepaald door het delen van deze waarde door de laaghoogte." - -#: fdmprinter.def.json -msgctxt "top_layers label" -msgid "Top Layers" -msgstr "Bovenlagen" - -#: fdmprinter.def.json -msgctxt "top_layers description" -msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." -msgstr "Het aantal bovenlagen. Wanneer deze waarde wordt berekend aan de hand van de dikte van de bovenkant, wordt deze afgerond naar een geheel getal." - -#: fdmprinter.def.json -msgctxt "bottom_thickness label" -msgid "Bottom Thickness" -msgstr "Bodemdikte" - -#: fdmprinter.def.json -msgctxt "bottom_thickness description" -msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." -msgstr "De dikte van de onderlagen in de print. Het aantal onderlagen wordt bepaald door het delen van deze waarde door de laaghoogte." - -#: fdmprinter.def.json -msgctxt "bottom_layers label" -msgid "Bottom Layers" -msgstr "Bodemlagen" - -#: fdmprinter.def.json -msgctxt "bottom_layers description" -msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "Het aantal bodemlagen. Wanneer deze waarde wordt berekend aan de hand van de dikte van de bodem, wordt deze afgerond naar een geheel getal." - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers label" -msgid "Initial Bottom Layers" -msgstr "Eerste onderste lagen" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers description" -msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "Het aantal initiële onderste lagen, vanaf de bouwplaat naar boven. Wanneer deze waarde wordt berekend aan de hand van de dikte van de bodem, wordt deze afgerond naar een geheel getal." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern label" -msgid "Top/Bottom Pattern" -msgstr "Patroon Boven-/Onderkant" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern description" -msgid "The pattern of the top/bottom layers." -msgstr "Het patroon van de boven-/onderlagen." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option lines" -msgid "Lines" -msgstr "Lijnen" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option concentric" -msgid "Concentric" -msgstr "Concentrisch" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option zigzag" -msgid "Zig Zag" -msgstr "Zigzag" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 label" -msgid "Bottom Pattern Initial Layer" -msgstr "Eerste laag patroon onderkant" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 description" -msgid "The pattern on the bottom of the print on the first layer." -msgstr "Het patroon van de eerste laag aan de onderkant van de print." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option lines" -msgid "Lines" -msgstr "Lijnen" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option concentric" -msgid "Concentric" -msgstr "Concentrisch" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option zigzag" -msgid "Zig Zag" -msgstr "Zigzag" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons label" -msgid "Connect Top/Bottom Polygons" -msgstr "Boven-/onderkant Polygonen Verbinden" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." -msgstr "Verbind skinpaden aan de boven-/onderkant waar ze naast elkaar lopen. Met deze instelling wordt bij concentrische patronen de bewegingstijd aanzienlijk verkort. Dit kan echter ten koste gaan van de kwaliteit van de bovenste laag aangezien de verbindingen in het midden van de vulling kunnen komen te liggen." - -#: fdmprinter.def.json -msgctxt "skin_angles label" -msgid "Top/Bottom Line Directions" -msgstr "Lijnrichtingen boven-/onderkant" - -#: fdmprinter.def.json -msgctxt "skin_angles description" -msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." -msgstr "Een lijst met gehele getallen voor lijnrichtingen die moet worden gebruikt wanneer voor de boven-/onderlagen een lijn- of zigzagpatroon wordt gebruikt. Elementen uit de lijst worden tijdens het printen van de lagen opeenvolgend gebruikt. Wanneer het einde van de lijst bereikt is, wordt deze weer van voren af aan gestart. De lijstitems zijn gescheiden door komma's en de hele lijst is binnen vierkante haken geplaatst. Standaard wordt een lege lijst gebruikt, wat inhoudt dat de traditionele standaardhoeken (45 en 135 graden) worden gebruikt." - #: fdmprinter.def.json msgctxt "wall_0_inset label" msgid "Outer Wall Inset" @@ -1414,6 +1274,176 @@ msgctxt "z_seam_relative description" msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate." msgstr "Als deze optie ingeschakeld is, zijn de Z-naadcoördinaten relatief ten opzichte van het midden van elk deel. Als de optie uitgeschakeld is, staan de coördinaten voor een absolute positie op het platform." +#: fdmprinter.def.json +msgctxt "top_bottom label" +msgid "Top/Bottom" +msgstr "Boven-/onderkant" + +#: fdmprinter.def.json +msgctxt "top_bottom description" +msgid "Top/Bottom" +msgstr "Boven-/onderkant" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr label" +msgid "Top Surface Skin Extruder" +msgstr "Extruder bovenskin" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr description" +msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." +msgstr "De extruder train die voor het printen van de bovenste skinlaag wordt gebruikt. Deze wordt gebruikt in meervoudige doorvoer." + +#: fdmprinter.def.json +msgctxt "roofing_layer_count label" +msgid "Top Surface Skin Layers" +msgstr "Bovenste skinlagen" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count description" +msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." +msgstr "Het aantal bovenste skinlagen. Doorgaans is één bovenste skinlaag voldoende om oppervlakken van hogere kwaliteit te verkrijgen." + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr label" +msgid "Top/Bottom Extruder" +msgstr "Extruder Boven-/Onderkant" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr description" +msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." +msgstr "De extruder train die voor het printen van de boven- en onderskin wordt gebruikt. Deze wordt gebruikt in meervoudige doorvoer." + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness label" +msgid "Top/Bottom Thickness" +msgstr "Dikte Boven-/Onderkant" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness description" +msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." +msgstr "De dikte van de boven-/onderlagen in de print. Het aantal boven-/onderlagen wordt bepaald door het delen van deze waarde door de laaghoogte." + +#: fdmprinter.def.json +msgctxt "top_thickness label" +msgid "Top Thickness" +msgstr "Dikte Bovenkant" + +#: fdmprinter.def.json +msgctxt "top_thickness description" +msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." +msgstr "De dikte van de bovenlagen in de print. Het aantal bovenlagen wordt bepaald door het delen van deze waarde door de laaghoogte." + +#: fdmprinter.def.json +msgctxt "top_layers label" +msgid "Top Layers" +msgstr "Bovenlagen" + +#: fdmprinter.def.json +msgctxt "top_layers description" +msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." +msgstr "Het aantal bovenlagen. Wanneer deze waarde wordt berekend aan de hand van de dikte van de bovenkant, wordt deze afgerond naar een geheel getal." + +#: fdmprinter.def.json +msgctxt "bottom_thickness label" +msgid "Bottom Thickness" +msgstr "Bodemdikte" + +#: fdmprinter.def.json +msgctxt "bottom_thickness description" +msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." +msgstr "De dikte van de onderlagen in de print. Het aantal onderlagen wordt bepaald door het delen van deze waarde door de laaghoogte." + +#: fdmprinter.def.json +msgctxt "bottom_layers label" +msgid "Bottom Layers" +msgstr "Bodemlagen" + +#: fdmprinter.def.json +msgctxt "bottom_layers description" +msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "Het aantal bodemlagen. Wanneer deze waarde wordt berekend aan de hand van de dikte van de bodem, wordt deze afgerond naar een geheel getal." + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "Eerste onderste lagen" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "Het aantal initiële onderste lagen, vanaf de bouwplaat naar boven. Wanneer deze waarde wordt berekend aan de hand van de dikte van de bodem, wordt deze afgerond naar een geheel getal." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern label" +msgid "Top/Bottom Pattern" +msgstr "Patroon Boven-/Onderkant" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern description" +msgid "The pattern of the top/bottom layers." +msgstr "Het patroon van de boven-/onderlagen." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option lines" +msgid "Lines" +msgstr "Lijnen" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option concentric" +msgid "Concentric" +msgstr "Concentrisch" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option zigzag" +msgid "Zig Zag" +msgstr "Zigzag" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 label" +msgid "Bottom Pattern Initial Layer" +msgstr "Eerste laag patroon onderkant" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 description" +msgid "The pattern on the bottom of the print on the first layer." +msgstr "Het patroon van de eerste laag aan de onderkant van de print." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option lines" +msgid "Lines" +msgstr "Lijnen" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option concentric" +msgid "Concentric" +msgstr "Concentrisch" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option zigzag" +msgid "Zig Zag" +msgstr "Zigzag" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons label" +msgid "Connect Top/Bottom Polygons" +msgstr "Boven-/onderkant Polygonen Verbinden" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons description" +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "Verbind skinpaden aan de boven-/onderkant waar ze naast elkaar lopen. Met deze instelling wordt bij concentrische patronen de bewegingstijd aanzienlijk verkort. Dit kan echter ten koste gaan van de kwaliteit van de bovenste laag aangezien de verbindingen in het midden van de vulling kunnen komen te liggen." + +#: fdmprinter.def.json +msgctxt "skin_angles label" +msgid "Top/Bottom Line Directions" +msgstr "Lijnrichtingen boven-/onderkant" + +#: fdmprinter.def.json +msgctxt "skin_angles description" +msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." +msgstr "Een lijst met gehele getallen voor lijnrichtingen die moet worden gebruikt wanneer voor de boven-/onderlagen een lijn- of zigzagpatroon wordt gebruikt. Elementen uit de lijst worden tijdens het printen van de lagen opeenvolgend gebruikt. Wanneer het einde van de lijst bereikt is, wordt deze weer van voren af aan gestart. De lijstitems zijn gescheiden door komma's en de hele lijst is binnen vierkante haken geplaatst. Standaard wordt een lege lijst gebruikt, wat inhoudt dat de traditionele standaardhoeken (45 en 135 graden) worden gebruikt." + #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" msgid "No Skin in Z Gaps" @@ -1554,6 +1584,86 @@ msgctxt "skin_overlap_mm description" msgid "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any value over half the width of the wall may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall." msgstr "Pas de mate van overlap tussen de wanden en (de eindpunten van) de skin-middellijnen aan. Met een lichte overlap kunnen de wanden goed hechten aan de skin. Houd er rekening mee dat met een gelijke lijnbreedte voor skin en wand, skin buiten de wand kan treden bij een waarde groter dan de halve wandbreedte, omdat de nozzle van de skin-extruder op deze positie het midden van de wand al kan hebben bereikt." +#: fdmprinter.def.json +msgctxt "skin_preshrink label" +msgid "Skin Removal Width" +msgstr "Verwijderingsbreedte skin" + +#: fdmprinter.def.json +msgctxt "skin_preshrink description" +msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." +msgstr "De grootste breedte van skingebieden die verwijderd moeten worden. Elk skingebied dat smaller is dan deze waarde zal verdwijnen. Hiermee kan op tijd en materiaal worden bespaard bij het printen van de bovenste/onderste skinlaag op schuine vlakken in het model." + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink label" +msgid "Top Skin Removal Width" +msgstr "Verwijderingsbreedte bovenste skinlaag" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink description" +msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." +msgstr "De grootste breedte van delen van bovenste skingebieden die verwijderd moeten worden. Elk skingebied dat smaller is dan deze waarde, zal verdwijnen. Hiermee kan op tijd en materiaal worden bespaard bij het printen van de bovenste/onderste skinlaag op schuine vlakken in het model." + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink label" +msgid "Bottom Skin Removal Width" +msgstr "Verwijderingsbreedte onderste skinlaag" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink description" +msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." +msgstr "De grootste breedte van delen van de onderste skingebieden die verwijderd moeten worden. Elk skingebied dat smaller is dan deze waarde, zal verdwijnen. Hiermee kan op tijd en materiaal worden bespaard bij het printen van de onderste skinlaag op schuine vlakken in het model." + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance label" +msgid "Skin Expand Distance" +msgstr "Uitbreidingsafstand van skin" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance description" +msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." +msgstr "De afstand waarmee de skin wordt uitgebreid in de vulling. Bij hogere waarden hecht de skin beter aan het vulpatroon en hechten de wanden van aangrenzende lagen beter aan de skin. Bij lagere waarden wordt er minder materiaal gebruikt." + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance label" +msgid "Top Skin Expand Distance" +msgstr "Uitbreidingsafstand van bovenste skinlaag" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance description" +msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." +msgstr "De afstand waarmee de bovenste skinlagen worden uitgebreid in de vulling. Bij hogere waarden hecht de skin beter aan het vulpatroon en hechten de wanden op de bovenliggende laag beter aan de skin. Bij lagere waarden wordt er minder materiaal gebruikt." + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance label" +msgid "Bottom Skin Expand Distance" +msgstr "Uitbreidingsafstand van onderste skinlaag" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance description" +msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." +msgstr "De afstand waarmee de onderste skinlagen worden uitgebreid in de vulling. Bij hogere waarden hecht de skin beter aan het vulpatroon en de wanden van de onderliggende laag. Bij lagere waarden wordt er minder materiaal gebruikt." + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion label" +msgid "Maximum Skin Angle for Expansion" +msgstr "Maximale skinhoek voor uitbreiding" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion description" +msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded." +msgstr "Van boven- en/of onderoppervlakken van het object met een hoek die groter is dan deze instelling, wordt de boven-/onderskin niet uitgebreid. Hiermee wordt uitbreiding voorkomen van smalle skingebieden die worden gemaakt wanneer het modeloppervlak een nagenoeg verticale helling heeft. Bij een hoek van 0° (horizontaal) wordt er geen skin uitgebreid; bij een hoek van 90° (verticaal) wordt alle skin uitgebreid." + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion label" +msgid "Minimum Skin Width for Expansion" +msgstr "Minimale skinbreedte voor uitbreiding" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion description" +msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." +msgstr "Skingebieden die smaller zijn dan deze waarde, worden niet uitgebreid. Dit voorkomt het uitbreiden van smalle skingebieden die worden gemaakt wanneer het modeloppervlak een nagenoeg verticale helling heeft." + #: fdmprinter.def.json msgctxt "infill label" msgid "Infill" @@ -1863,86 +1973,6 @@ msgctxt "infill_support_angle description" msgid "The minimum angle of internal overhangs for which infill is added. At a value of 0° objects are totally filled with infill, 90° will not provide any infill." msgstr "De minimale interne overhanghoek waarbij vulling wordt toegevoegd. Bij een waarde van 0° worden objecten volledig gevuld. Bij 90° wordt er geen vulling geprint." -#: fdmprinter.def.json -msgctxt "skin_preshrink label" -msgid "Skin Removal Width" -msgstr "Verwijderingsbreedte skin" - -#: fdmprinter.def.json -msgctxt "skin_preshrink description" -msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." -msgstr "De grootste breedte van skingebieden die verwijderd moeten worden. Elk skingebied dat smaller is dan deze waarde zal verdwijnen. Hiermee kan op tijd en materiaal worden bespaard bij het printen van de bovenste/onderste skinlaag op schuine vlakken in het model." - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink label" -msgid "Top Skin Removal Width" -msgstr "Verwijderingsbreedte bovenste skinlaag" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink description" -msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." -msgstr "De grootste breedte van delen van bovenste skingebieden die verwijderd moeten worden. Elk skingebied dat smaller is dan deze waarde, zal verdwijnen. Hiermee kan op tijd en materiaal worden bespaard bij het printen van de bovenste/onderste skinlaag op schuine vlakken in het model." - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink label" -msgid "Bottom Skin Removal Width" -msgstr "Verwijderingsbreedte onderste skinlaag" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink description" -msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." -msgstr "De grootste breedte van delen van de onderste skingebieden die verwijderd moeten worden. Elk skingebied dat smaller is dan deze waarde, zal verdwijnen. Hiermee kan op tijd en materiaal worden bespaard bij het printen van de onderste skinlaag op schuine vlakken in het model." - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance label" -msgid "Skin Expand Distance" -msgstr "Uitbreidingsafstand van skin" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance description" -msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." -msgstr "De afstand waarmee de skin wordt uitgebreid in de vulling. Bij hogere waarden hecht de skin beter aan het vulpatroon en hechten de wanden van aangrenzende lagen beter aan de skin. Bij lagere waarden wordt er minder materiaal gebruikt." - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance label" -msgid "Top Skin Expand Distance" -msgstr "Uitbreidingsafstand van bovenste skinlaag" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance description" -msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." -msgstr "De afstand waarmee de bovenste skinlagen worden uitgebreid in de vulling. Bij hogere waarden hecht de skin beter aan het vulpatroon en hechten de wanden op de bovenliggende laag beter aan de skin. Bij lagere waarden wordt er minder materiaal gebruikt." - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance label" -msgid "Bottom Skin Expand Distance" -msgstr "Uitbreidingsafstand van onderste skinlaag" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance description" -msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." -msgstr "De afstand waarmee de onderste skinlagen worden uitgebreid in de vulling. Bij hogere waarden hecht de skin beter aan het vulpatroon en de wanden van de onderliggende laag. Bij lagere waarden wordt er minder materiaal gebruikt." - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion label" -msgid "Maximum Skin Angle for Expansion" -msgstr "Maximale skinhoek voor uitbreiding" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion description" -msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." -msgstr "Van boven- en/of onderoppervlakken van het object met een hoek die groter is dan deze instelling, wordt de boven-/onderksin niet uitgebreid. Hiermee wordt de uitbreiding voorkomen van smalle skingebieden die worden gemaakt wanneer het modeloppervlak een nagenoeg verticale helling heeft. Een hoek van 0° is horizontaal en een hoek van 90° is verticaal." - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion label" -msgid "Minimum Skin Width for Expansion" -msgstr "Minimale skinbreedte voor uitbreiding" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion description" -msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." -msgstr "Skingebieden die smaller zijn dan deze waarde, worden niet uitgebreid. Dit voorkomt het uitbreiden van smalle skingebieden die worden gemaakt wanneer het modeloppervlak een nagenoeg verticale helling heeft." - #: fdmprinter.def.json msgctxt "skin_edge_support_thickness label" msgid "Skin Edge Support Thickness" @@ -2560,8 +2590,8 @@ msgstr "Snelheid Eerste Laag" #: fdmprinter.def.json msgctxt "speed_layer_0 description" -msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." -msgstr "De snelheid waarmee de eerste laag wordt geprint. Hiervoor wordt een lagere waarde aanbevolen om hechting aan het platform te verbeteren." +msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate. Does not affect the build plate adhesion structures themselves, like brim and raft." +msgstr "De snelheid waarmee de eerste laag wordt geprint. Hiervoor wordt een lagere waarde aanbevolen om hechting aan het platform te verbeteren. Heeft geen invloed op de hechtstructuren van het platform zelf, zoals brim en raft." #: fdmprinter.def.json msgctxt "speed_print_layer_0 label" @@ -3170,8 +3200,9 @@ msgstr "Max. combing-afstand zonder intrekken" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" -msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." -msgstr "Wanneer dit niet nul is, vindt bij een combing-beweging die langer is dan deze afstand, intrekking plaats." +msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." +msgstr "Wanneer dit groter dan nul is, vindt bij een combing-beweging die langer is dan deze afstand, intrekking plaats. Wanneer dit nul is, is er geen maximum" +" en vindt bij combing-bewegingen geen intrekking plaats." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" @@ -5074,9 +5105,8 @@ msgstr "Rasterverwerkingsrang" #: fdmprinter.def.json msgctxt "infill_mesh_order description" -msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." -msgstr "Bepaalt de prioriteit van dit raster bij meerdere overlappende vulrasters. Gebieden met meerdere overlappende vulrasters krijgen de instellingen van het" -" vulraster met de laagste rang. Met een vulraster dat voorrang heeft, wordt de vulling van andere vulrasters en normale rasters aangepast." +msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the highest rank. An infill mesh with a higher rank will modify the infill of infill meshes with lower rank and normal meshes." +msgstr "Bepaalt de prioriteit van dit raster bij meerdere overlappende vulrasters. Gebieden met meerdere overlappende vulrasters krijgen de instellingen van het vulraster met de hoogste rang. Bij een vulraster met een hogere rang wordt de vulling van vulrasters met een lagere rang en normale rasters aangepast." #: fdmprinter.def.json msgctxt "cutting_mesh label" @@ -5423,6 +5453,16 @@ msgctxt "conical_overhang_angle description" msgid "The maximum angle of overhangs after the they have been made printable. At a value of 0° all overhangs are replaced by a piece of model connected to the build plate, 90° will not change the model in any way." msgstr "De maximale hoek van een overhang nadat deze printbaar is gemaakt. Bij een hoek van 0° worden alle overhangende gedeelten vervangen door een deel van het model dat is verbonden met het platform; bij een hoek van 90° wordt het model niet gewijzigd." +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size label" +msgid "Maximum Overhang Hole Area" +msgstr "Maximale overhang oppervlak gat" + +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size description" +msgid "The maximum area of a hole in the base of the model before it's removed by Make Overhang Printable. Holes smaller than this will be retained. A value of 0 mm² will fill all holes in the models base." +msgstr "Het maximale oppervlak van een gat in de basis van het model voordat het wordt verwijderd om de overhang printbaar te maken. Gaten die kleiner zijn dan dit oppervlak worden behouden. Bij een waarde van 0 mm² worden alle gaten in de basis van het model gevuld." + #: fdmprinter.def.json msgctxt "coasting_enable label" msgid "Enable Coasting" @@ -6362,6 +6402,30 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Omzettingsmatrix die moet worden toegepast op het model wanneer dit wordt geladen vanuit een bestand." +#~ msgctxt "retraction_combing_max_distance description" +#~ msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." +#~ msgstr "Wanneer dit niet nul is, vindt bij een combing-beweging die langer is dan deze afstand, intrekking plaats." + +#~ msgctxt "machine_use_extruder_offset_to_offset_coords description" +#~ msgid "Apply the extruder offset to the coordinate system." +#~ msgstr "Pas de extruderoffset toe op het coördinatensysteem." + +#~ msgctxt "shell label" +#~ msgid "Shell" +#~ msgstr "Shell" + +#~ msgctxt "max_skin_angle_for_expansion description" +#~ msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." +#~ msgstr "Van boven- en/of onderoppervlakken van het object met een hoek die groter is dan deze instelling, wordt de boven-/onderksin niet uitgebreid. Hiermee wordt de uitbreiding voorkomen van smalle skingebieden die worden gemaakt wanneer het modeloppervlak een nagenoeg verticale helling heeft. Een hoek van 0° is horizontaal en een hoek van 90° is verticaal." + +#~ msgctxt "speed_layer_0 description" +#~ msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." +#~ msgstr "De snelheid waarmee de eerste laag wordt geprint. Hiervoor wordt een lagere waarde aanbevolen om hechting aan het platform te verbeteren." + +#~ msgctxt "infill_mesh_order description" +#~ msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." +#~ msgstr "Bepaalt de prioriteit van dit raster bij meerdere overlappende vulrasters. Gebieden met meerdere overlappende vulrasters krijgen de instellingen van het vulraster met de laagste rang. Met een vulraster dat voorrang heeft, wordt de vulling van andere vulrasters en normale rasters aangepast." + #~ msgctxt "material_bed_temperature description" #~ msgid "The temperature used for the heated build plate. If this is 0, the bed temperature will not be adjusted." #~ msgstr "De temperatuur van het verwarmde platform. Als deze waarde is ingesteld op 0, wordt de printbedtemperatuur niet aangepast." diff --git a/resources/i18n/pl_PL/cura.po b/resources/i18n/pl_PL/cura.po index 850fd98e1d..1dce7efaa4 100644 --- a/resources/i18n/pl_PL/cura.po +++ b/resources/i18n/pl_PL/cura.po @@ -1,12 +1,12 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0200\n" "PO-Revision-Date: 2019-11-15 15:23+0100\n" "Last-Translator: Mariusz Matłosz \n" "Language-Team: Mariusz Matłosz , reprapy.pl\n" @@ -21,7 +21,7 @@ msgstr "" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1581 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 msgctxt "@label" @@ -92,12 +92,12 @@ msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "Profil szkicu służy do drukowania początkowych prototypów i weryfikacji koncepcji z naciskiem na krótki czasu drukowania." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:226 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:234 msgctxt "@label" msgid "Custom Material" msgstr "Niestandardowy materiał" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:227 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 msgctxt "@label" msgid "Custom" @@ -119,7 +119,7 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Wszystkie Pliki (*)" -#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:178 +#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:181 msgctxt "@info:title" msgid "Login failed" msgstr "Logowanie nie powiodło się" @@ -149,28 +149,33 @@ msgctxt "@info:title" msgid "Can't Find Location" msgstr "Nie można Znaleźć Lokalizacji" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:104 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:116 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Nie można utworzyć archiwum z folderu danych użytkownika: {}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:110 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 msgctxt "@info:title" msgid "Backup" msgstr "Kopia zapasowa" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:123 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:135 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "Podjęto próbę przywrócenia kopii zapasowej Cura na podstawie niepoprawnych danych lub metadanych." -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:134 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:146 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that is higher than the current version." msgstr "Próbowano przywrócić kopię zapasową Cura, nowszą od aktualnej wersji." +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 +msgctxt "@info:backup_failed" +msgid "The following error occurred while trying to restore a Cura backup:" +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -320,74 +325,74 @@ msgctxt "@action:button" msgid "Send report" msgstr "Wyślij raport" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:521 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:527 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Ładowanie drukarek..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:528 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:534 msgctxt "@info:progress" msgid "Setting up preferences..." msgstr "Ustawianie preferencji..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:657 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:672 msgctxt "@info:progress" msgid "Initializing Active Machine..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:803 msgctxt "@info:progress" msgid "Initializing machine manager..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:802 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:817 msgctxt "@info:progress" msgid "Initializing build volume..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:870 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:888 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Ustawianie sceny ..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:906 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:924 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Ładowanie interfejsu ..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:911 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:929 msgctxt "@info:progress" msgid "Initializing engine..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1221 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1246 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1777 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1799 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Jednocześnie można załadować tylko jeden plik G-code. Pominięto importowanie {0}" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1778 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:188 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 msgctxt "@info:title" msgid "Warning" msgstr "Ostrzeżenie" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1787 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1809 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Nie można otworzyć żadnego innego pliku, jeśli ładuje się G-code. Pominięto importowanie {0}" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 @@ -410,7 +415,7 @@ msgctxt "@info:title" msgid "Placing Object" msgstr "Rozmieszczenie Obiektów" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:92 msgctxt "@message" msgid "Could not read response." msgstr "Nie można odczytać odpowiedzi." @@ -430,12 +435,12 @@ msgctxt "@message" msgid "Something unexpected happened when trying to log in, please try again." msgstr "Coś nieoczekiwanego się stało, podczas próby logowania, spróbuj ponownie." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:187 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:189 msgctxt "@info" msgid "Unable to start a new sign in process. Check if another sign in attempt is still active." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Nie można uzyskać dostępu do serwera kont Ultimaker." @@ -453,8 +458,8 @@ msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Plik {0} już istnieje. Czy na pewno chcesz go nadpisać?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:452 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:455 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "Nieprawidłowy adres URL pliku:" @@ -537,33 +542,33 @@ msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Profil {0} ma nieznany typ pliku lub jest uszkodzony." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:423 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:426 msgctxt "@label" msgid "Custom profile" msgstr "Niestandardowy profil" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:439 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:442 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Profilowi brakuje typu jakości." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:443 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:446 msgctxt "@info:status" -msgid "Global stack is missing." +msgid "There is no active printer yet." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:449 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:452 msgctxt "@info:status" msgid "Unable to add the profile." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:463 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:466 #, python-brace-format msgctxt "@info:status" msgid "Quality type '{0}' is not compatible with the current active machine definition '{1}'." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:468 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:471 #, python-brace-format msgctxt "@info:status" msgid "Warning: The profile is not visible because its quality type '{0}' is not available for the current configuration. Switch to a material/nozzle combination that can use this quality type." @@ -579,23 +584,23 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Domyślne" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:712 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 msgctxt "@label" msgid "Nozzle" msgstr "Dysza" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:860 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:856 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "Ustawienia zostały zmienione w celu dopasowania do bieżącej dostępności ekstruderów:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:862 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:858 msgctxt "@info:title" msgid "Settings updated" msgstr "Ustawienia zostały zaaktualizowane" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1447 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1478 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Ekstruder(y) wyłączony(/e)" @@ -608,13 +613,13 @@ msgid "Add" msgstr "Dodaj" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:263 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 msgctxt "@action:button" msgid "Finish" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 #: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 #: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 @@ -622,7 +627,7 @@ msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 msgctxt "@action:button" msgid "Cancel" @@ -634,76 +639,83 @@ msgctxt "@label" msgid "Group #{group_nr}" msgstr "Grupa #{group_nr}" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Zewnętrzna ściana" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Ściany wewnętrzne" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Skin" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Wypełnienie" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Wypełnienie podpór" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Łączenie podpory" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Podpory" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Obwódka" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 msgctxt "@tooltip" msgid "Prime Tower" msgstr "Wieża czyszcząca" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 msgctxt "@tooltip" msgid "Travel" msgstr "Ruch jałowy" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 msgctxt "@tooltip" msgid "Retractions" msgstr "Retrakcja" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:94 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 msgctxt "@tooltip" msgid "Other" msgstr "Inny" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 msgctxt "@action:button" msgid "Next" msgstr "Następny" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 +msgctxt "@action:button" +msgid "Skip" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:173 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 msgctxt "@action:button" msgid "Close" @@ -728,29 +740,36 @@ msgstr "" "

    Dowiedz się, jak zapewnić najlepszą możliwą jakość oraz niezawodnośc wydruku.

    \n" "

    Zobacz przewodnik po jakości wydruku (strona w języku angielskim)

    " -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:535 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:540 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Plik projektu {0} zawiera nieznany typ maszyny {1}. Nie można zaimportować maszyny. Zostaną zaimportowane modele." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:538 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:543 msgctxt "@info:title" msgid "Open Project File" msgstr "Otwórz Plik Projektu" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:634 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:639 #, python-brace-format msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:635 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:686 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:646 +#, python-brace-format +msgctxt "@info:error Don't translate the XML tags or !" +msgid "Project file {0} is corrupt: {1}." +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:698 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." @@ -788,7 +807,7 @@ msgctxt "@error:zip" msgid "The operating system does not allow saving a project file to this location or with this file name." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:206 msgctxt "@error:zip" msgid "Error writing 3mf file." msgstr "Błąd zapisu pliku 3mf." @@ -843,8 +862,8 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:23 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "Wystąpił błąd podczas próby przywrócenia kopii zapasowej." @@ -854,45 +873,45 @@ msgctxt "@item:inmenu" msgid "Manage backups" msgstr "Zarządzaj kopiami zapasowymi" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Nie można pociąć z obecnym materiałem, ponieważ nie jest on kompatybilny z wybraną maszyną lub konfiguracją." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:411 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:420 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:429 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 msgctxt "@info:title" msgid "Unable to slice" msgstr "Nie można pociąć" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:412 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Nie można pociąć z bieżącymi ustawieniami. Następujące ustawienia mają błędy: {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:410 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:436 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Nie można pokroić przez ustawienia osobne dla modelu. Następujące ustawienia mają błędy w jednym lub więcej modeli: {error_labels}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:445 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "Nie można pociąć, ponieważ wieża czyszcząca lub jej pozycja(e) są niewłaściwe." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:428 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:454 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "Nie można pociąć, ponieważ obecne są obiekty powiązane z wyłączonym ekstruderem %s." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:463 msgctxt "@info:status" msgid "" "Please review settings and check if your models:\n" @@ -1157,28 +1176,28 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Dysk wymienny" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:121 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:128 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:129 msgctxt "@info:title" msgid "Simulation View" msgstr "Widok symulacji" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:status" msgid "Nothing is shown because you need to slice first." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:title" msgid "No layers to show" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:124 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "Nie pokazuj tego komunikatu ponownie" @@ -1188,14 +1207,19 @@ msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Widok warstwy" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:70 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:71 msgctxt "@info:status" -msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." +msgid "The highlighted areas indicate either missing or extraneous surfaces. Fix your model and open it again into Cura." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 msgctxt "@info:title" -msgid "Model errors" +msgid "Model Errors" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:79 +msgctxt "@action:button" +msgid "Learn more" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/__init__.py:12 @@ -1224,7 +1248,7 @@ msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:145 msgctxt "@action:button" msgid "Sync" msgstr "" @@ -1260,7 +1284,7 @@ msgctxt "@info:generic" msgid "You need to quit and restart {} before changes have effect." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:79 msgctxt "@info:generic" msgid "{} plugins failed to download" msgstr "" @@ -1301,7 +1325,11 @@ msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Pakiet Formatu Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "" @@ -1316,22 +1344,22 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Wybierz aktualizacje" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:152 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 msgctxt "@action:button" msgid "Print via cloud" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:155 msgctxt "@properties:tooltip" msgid "Print via cloud" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:156 msgctxt "@info:status" msgid "Connected via cloud" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:264 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:270 #, python-brace-format msgctxt "@error:send" msgid "Unknown error code when uploading print job: {0}" @@ -1623,82 +1651,82 @@ msgctxt "@info:tooltip" msgid "Some things could be problematic in this print. Click to see tips for adjustment." msgstr "Niektóre rzeczy mogą być problematyczne podczas tego wydruku. Kliknij, aby zobaczyć porady dotyczące regulacji." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:15 msgctxt "@title:window" msgid "Open Project" msgstr "Otwórz projekt" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" msgstr "Zaktualizuj istniejące" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:63 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "Utwórz nowy" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "Podsumowanie - Projekt Cura" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 msgctxt "@action:label" msgid "Printer settings" msgstr "Ustawienia drukarki" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:112 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:113 msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "Jak powinny być rozwiązywane błędy w maszynie?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:165 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 msgctxt "@action:label" msgid "Type" msgstr "Typ" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:181 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 msgctxt "@action:label" msgid "Printer Group" msgstr "Grupa drukarek" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:203 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 msgctxt "@action:label" msgid "Profile settings" msgstr "Ustawienia profilu" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:219 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:221 msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "Jak powinien zostać rozwiązany problem z profilem?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:349 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 msgctxt "@action:label" msgid "Name" msgstr "Nazwa" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:255 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 msgctxt "@action:label" msgid "Intent" msgstr "Cel" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:271 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Not in profile" msgstr "Nie w profilu" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:276 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 msgctxt "@action:label" msgid "%1 override" @@ -1706,54 +1734,54 @@ msgid_plural "%1 overrides" msgstr[0] "%1 nadpisanie" msgstr[1] "%1 Zastępuje" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:287 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:290 msgctxt "@action:label" msgid "Derivative from" msgstr "Pochodna z" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:295 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 nadpisanie" msgstr[1] "%1, %2 zastępuje" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:309 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:312 msgctxt "@action:label" msgid "Material settings" msgstr "Ustawienia materiału" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:328 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Jak powinien zostać rozwiązany problem z materiałem?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:369 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:373 msgctxt "@action:label" msgid "Setting visibility" msgstr "Ustawienie widoczności" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:378 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:382 msgctxt "@action:label" msgid "Mode" msgstr "Tryb" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:label" msgid "Visible settings:" msgstr "Widoczne ustawienie:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:399 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:403 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 poza %2" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:425 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:429 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Ładowanie projektu usunie wszystkie modele z platformy roboczej." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:457 msgctxt "@action:button" msgid "Open" msgstr "Otwórz" @@ -1855,8 +1883,8 @@ msgstr "Wykonaj kopię zapasową i zsynchronizuj ustawienia Cura." #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:68 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:125 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:199 msgctxt "@button" msgid "Sign in" msgstr "Zaloguj" @@ -2090,12 +2118,12 @@ msgctxt "@label" msgid "Cooling Fan Number" msgstr "Numer Wentylatora" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:163 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "Początkowy G-code ekstrudera" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:177 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "Końcowy G-code ekstrudera" @@ -2180,12 +2208,17 @@ msgctxt "@label" msgid "Number of Extruders" msgstr "Liczba ekstruderów" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:345 +msgctxt "@label" +msgid "Apply Extruder offsets to GCode" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:393 msgctxt "@title:label" msgid "Start G-code" msgstr "Początkowy G-code" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:385 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:404 msgctxt "@title:label" msgid "End G-code" msgstr "Końcowy G-code" @@ -2213,6 +2246,11 @@ msgctxt "@label link to technical assistance" msgid "View user manuals online" msgstr "Pokaż instrukcję użytkownika online" +#: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 +msgctxt "@info" +msgid "In order to monitor your print from Cura, please connect the printer." +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" msgid "Mesh Type" @@ -2259,7 +2297,7 @@ msgid "Select Settings to Customize for this model" msgstr "Wybierz Ustawienia, aby dostosować ten model" #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtr..." @@ -2269,32 +2307,32 @@ msgctxt "@label:checkbox" msgid "Show all" msgstr "Pokaż wszystko" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:20 msgctxt "@title:window" msgid "Post Processing Plugin" msgstr "Plugin post-processingu" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:59 msgctxt "@label" msgid "Post Processing Scripts" msgstr "Skrypty post-processingu" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:235 msgctxt "@action" msgid "Add a script" msgstr "Dodaj skrypt" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:282 msgctxt "@label" msgid "Settings" msgstr "Ustawienia" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:499 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:502 msgctxt "@info:tooltip" msgid "Change active post-processing scripts." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:506 msgctxt "@info:tooltip" msgid "The following script is active:" msgid_plural "The following scripts are active:" @@ -2307,78 +2345,93 @@ msgctxt "@label" msgid "Color scheme" msgstr "Schemat kolorów" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:110 msgctxt "@label:listbox" msgid "Material Color" msgstr "Kolor materiału" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:111 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:114 msgctxt "@label:listbox" msgid "Line Type" msgstr "Rodzaj linii" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:115 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:118 msgctxt "@label:listbox" msgid "Speed" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:122 msgctxt "@label:listbox" -msgid "Layer thickness" -msgstr "Grubość warstwy" +msgid "Layer Thickness" +msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:126 +msgctxt "@label:listbox" +msgid "Line Width" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 +msgctxt "@label:listbox" +msgid "Flow" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" msgid "Compatibility Mode" msgstr "Tryb zgodności" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:230 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:245 msgctxt "@label" msgid "Travels" msgstr "Ruchy" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:251 msgctxt "@label" msgid "Helpers" msgstr "Pomoce" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:257 msgctxt "@label" msgid "Shell" msgstr "Obrys" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:248 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 msgctxt "@label" msgid "Infill" msgstr "Wypełnienie" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:298 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:271 +msgctxt "@label" +msgid "Starts" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 msgctxt "@label" msgid "Only Show Top Layers" msgstr "Pokaż tylko najwyższe warstwy" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:308 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:332 msgctxt "@label" msgid "Show 5 Detailed Layers On Top" msgstr "Pokaż 5 Szczegółowych Warstw" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:346 msgctxt "@label" msgid "Top / Bottom" msgstr "Góra/ Dół" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:350 msgctxt "@label" msgid "Inner Wall" msgstr "Wewnętrzna ściana" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:384 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:419 msgctxt "@label" msgid "min" msgstr "min" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:433 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:488 msgctxt "@label" msgid "max" msgstr "max" @@ -2519,7 +2572,7 @@ msgid "Plugins" msgstr "Wtyczki" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 msgctxt "@title:tab" msgid "Materials" @@ -2568,6 +2621,7 @@ msgstr "" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:178 msgctxt "@button" msgid "Next" msgstr "Dalej" @@ -2911,7 +2965,7 @@ msgid "Delete" msgstr "Usuń" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:289 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 msgctxt "@label" msgid "Resume" msgstr "Ponów" @@ -2927,8 +2981,8 @@ msgid "Resuming..." msgstr "Przywracanie..." #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 msgctxt "@label" msgid "Pause" msgstr "Wstrzymaj" @@ -2969,7 +3023,7 @@ msgid "Are you sure you want to abort %1?" msgstr "Czy jesteś pewien, że chcesz anulować %1?" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 msgctxt "@window:title" msgid "Abort print" msgstr "Anuluj wydruk" @@ -2980,7 +3034,7 @@ msgid "Manage printer" msgstr "Zarządzaj drukarkami" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." @@ -3006,27 +3060,34 @@ msgctxt "@label:status" msgid "Idle" msgstr "Zajęta" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:365 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +msgctxt "@label:status" +msgid "Preparing..." +msgstr "Przygotowyję..." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:369 msgctxt "@label:status" msgid "Printing" msgstr "Drukowanie" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:406 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:410 msgctxt "@label" msgid "Untitled" msgstr "Bez tytułu" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:431 msgctxt "@label" msgid "Anonymous" msgstr "Anonimowa" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:458 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Wymaga zmian konfiguracji" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:492 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:496 msgctxt "@action:button" msgid "Details" msgstr "Szczegóły" @@ -3053,12 +3114,6 @@ msgctxt "@label:status" msgid "Finished" msgstr "Zakończono" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -msgctxt "@label:status" -msgid "Preparing..." -msgstr "Przygotowyję..." - #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." @@ -3139,24 +3194,24 @@ msgctxt "@action:button" msgid "Sign in" msgstr "Zaloguj" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" -msgid "Your key to connected 3D printing" +msgid "Sign in to the Ultimaker platform" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:42 msgctxt "@text" msgid "" -"- Customize your experience with more print profiles and plugins\n" -"- Stay flexible by syncing your setup and loading it anywhere\n" -"- Increase efficiency with a remote workflow on Ultimaker printers" +"- Add material profiles and plug-ins from the Marketplace\n" +"- Back-up and sync your material profiles and plug-ins\n" +"- Share ideas and get help from 48,000+ users in the Ultimaker community" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:142 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:62 msgctxt "@button" -msgid "Create account" -msgstr "Utwórz konto" +msgid "Create a free Ultimaker account" +msgstr "" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/SyncState.qml:28 msgctxt "@label" @@ -3263,309 +3318,308 @@ msgctxt "@button" msgid "Cancel" msgstr "Anuluj" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:83 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Pokaż przewodnik rozwiązywania problemów online" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:90 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Przełącz tryb pełnoekranowy" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:98 msgctxt "@action:inmenu" msgid "Exit Full Screen" msgstr "Wyłącz tryb pełnoekranowy" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:105 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Cofnij" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:115 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Ponów" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:125 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Zamknij" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:132 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:133 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Widok 3D" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:140 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Widok z przodu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:147 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Widok z góry" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 +msgctxt "@action:inmenu menubar:view" +msgid "Bottom View" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Widok z lewej strony" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:160 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:168 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Widok z prawej strony" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:175 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Konfiguruj Cura..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:182 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Dodaj drukarkę..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:180 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:188 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Zarządzaj drukarkami..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:187 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Zarządzaj materiałami..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu" msgid "Add more materials from Marketplace" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "&Aktualizuj profil z bieżącymi ustawieniami" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Odrzuć bieżące zmiany" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:222 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:230 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "&Utwórz profil z bieżących ustawień..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Zarządzaj profilami..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Pokaż dokumentację internetową" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Zgłoś błąd" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:260 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Co nowego" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:266 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "O..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:273 msgctxt "@action:inmenu menubar:edit" -msgid "Delete Selected Model" -msgid_plural "Delete Selected Models" -msgstr[0] "Usuń wybrany model" -msgstr[1] "Usuń wybrane modele" +msgid "Delete Selected" +msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:283 msgctxt "@action:inmenu menubar:edit" -msgid "Center Selected Model" -msgid_plural "Center Selected Models" -msgstr[0] "Wyśrodkuj wybrany model" -msgstr[1] "Wyśrodkuj wybrane modele" +msgid "Center Selected" +msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:292 msgctxt "@action:inmenu menubar:edit" -msgid "Multiply Selected Model" -msgid_plural "Multiply Selected Models" -msgstr[0] "Rozmnóż wybrany model" -msgstr[1] "Rozmnóż wybrane modele" +msgid "Multiply Selected" +msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Usuń model" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:309 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Wyśrodkuj model na platformie" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:307 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "&Grupuj modele" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:327 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:335 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Rozgrupuj modele" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:345 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "Połącz modele" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:347 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:355 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Powiel model..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:362 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Wybierz wszystkie modele" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:372 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Wyczyść stół" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:382 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Przeładuj wszystkie modele" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Rozłóż Wszystkie Modele na Wszystkie Platformy Robocze" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:390 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Ułóż wszystkie modele" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:406 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Wybór ułożenia" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:405 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:413 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Zresetuj wszystkie pozycje modelu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:412 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Zresetuj wszystkie przekształcenia modelu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:419 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:429 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Otwórz plik(i)..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:439 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Nowy projekt..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:434 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:446 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Pokaż folder konfiguracji" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:441 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:538 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Skonfiguruj widoczność ustawień ..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:448 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:460 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Marketplace" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:257 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Ten pakiet zostanie zainstalowany po ponownym uruchomieniu." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 msgctxt "@title:tab" msgid "General" msgstr "Ogólny" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:462 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:453 msgctxt "@title:tab" msgid "Settings" msgstr "Ustawienia" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:464 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 msgctxt "@title:tab" msgid "Printers" msgstr "Drukarki" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 msgctxt "@title:tab" msgid "Profiles" msgstr "Profile" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:576 msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:588 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:638 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Otwórz plik(i)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:744 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:737 msgctxt "@window:title" msgid "Install Package" msgstr "Instaluj pakiety" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:752 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:745 msgctxt "@title:window" msgid "Open File(s)" msgstr "Otwórz plik(i)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:755 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:748 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Znaleziono jeden lub więcej plików G-code w wybranych plikach. Możesz otwierać tylko jeden plik G-code jednocześnie. Jeśli chcesz otworzyć plik G-code, proszę wybierz tylko jeden." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:858 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:857 msgctxt "@title:window" msgid "Add Printer" msgstr "Dodaj drukarkę" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:866 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:865 msgctxt "@title:window" msgid "What's New" msgstr "Co nowego" @@ -3715,17 +3769,27 @@ msgctxt "@label" msgid "Python bindings for libnest2d" msgstr "" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +msgctxt "@label" +msgid "Support library for system keyring access" +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" +msgid "Python extensions for Microsoft Windows" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +msgctxt "@label" msgid "Font" msgstr "Czcionka" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 msgctxt "@label" msgid "SVG icons" msgstr "Ikony SVG" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:165 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Wdrożenie aplikacji pomiędzy dystrybucjami Linux" @@ -3735,22 +3799,22 @@ msgctxt "@title:window" msgid "Open project file" msgstr "Otwórz plik projektu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:88 msgctxt "@text:window" msgid "This is a Cura project file. Would you like to open it as a project or import the models from it?" msgstr "Jest to plik projektu Cura. Czy chcesz otworzyć go jako projekt, czy zaimportować z niego modele?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:98 msgctxt "@text:window" msgid "Remember my choice" msgstr "Zapamiętaj mój wybór" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:122 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:117 msgctxt "@action:button" msgid "Open as project" msgstr "Otwórz jako projekt" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:131 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:126 msgctxt "@action:button" msgid "Import models" msgstr "Importuj modele" @@ -3779,7 +3843,7 @@ msgid "Current changes" msgstr "" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Zawsze pytaj o to" @@ -3804,12 +3868,12 @@ msgctxt "@action:button" msgid "Keep changes" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 msgctxt "@text:window" msgid "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?" msgstr "Znaleziono jeden lub więcej plików projektu w wybranych plikach. Możesz otwierać tylko jeden plik projektu na raz. Proponujemy importowanie tylko modeli z tych plików. Czy chcesz kontynuować?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:99 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:94 msgctxt "@action:button" msgid "Import all as models" msgstr "Importuj wszystkie jako modele" @@ -3964,7 +4028,7 @@ msgctxt "@label" msgid "Material" msgstr "Materiał" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:407 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Użyj kleju dla lepszej przyczepności dla tej kombinacji materiałów." @@ -3988,17 +4052,17 @@ msgctxt "@label" msgid "Number of Copies" msgstr "Liczba kopii" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:33 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:41 msgctxt "@title:menu menubar:file" msgid "&Save Project..." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:54 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:74 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&Eksportuj..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:85 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Eksportuj Zaznaczenie..." @@ -4018,6 +4082,11 @@ msgctxt "@label:category menu label" msgid "Generic" msgstr "Podstawowe" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/OpenFilesMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Open File(s)..." +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -4033,6 +4102,11 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Otwórz &ostatnio używane" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SaveProjectMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Save Project..." +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:15 msgctxt "@title:menu menubar:settings" msgid "&Printer" @@ -4058,17 +4132,17 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Wyłącz Ekstruder" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:16 msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Widoczne Ustawienia" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:45 msgctxt "@action:inmenu" msgid "Collapse All Categories" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Ustaw Widoczność Ustawień..." @@ -4078,22 +4152,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Pozycja kamery" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:45 msgctxt "@action:inmenu menubar:view" msgid "Camera view" msgstr "Widok z kamery" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:48 msgctxt "@action:inmenu menubar:view" msgid "Perspective" msgstr "Perspektywiczny" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:60 msgctxt "@action:inmenu menubar:view" msgid "Orthographic" msgstr "Rzut ortograficzny" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:81 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "P&ole robocze" @@ -4138,12 +4212,12 @@ msgctxt "@label:MonitorStatus" msgid "Please remove the print" msgstr "Usuń wydruk" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@label" msgid "Abort Print" msgstr "Anuluj Wydruk" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:338 msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Czy na pewno chcesz przerwać drukowanie?" @@ -4185,301 +4259,301 @@ msgctxt "@label" msgid "Interface" msgstr "Interfejs" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:216 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:209 msgctxt "@label" msgid "Currency:" msgstr "Waluta:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:229 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:222 msgctxt "@label" msgid "Theme:" msgstr "Motyw:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Musisz zrestartować aplikację, aby te zmiany zaczęły obowiązywać." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:284 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Tnij automatycznie podczas zmiany ustawień." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 msgctxt "@option:check" msgid "Slice automatically" msgstr "Automatyczne Cięcie" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:306 msgctxt "@label" msgid "Viewport behavior" msgstr "Zachowanie okna edycji" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:314 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Zaznacz nieobsługiwane obszary modelu na czerwono. Bez wsparcia te obszary nie będą drukowane prawidłowo." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:323 msgctxt "@option:check" msgid "Display overhang" msgstr "Wyświetl zwis" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:351 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@info:tooltip" msgid "Highlight missing or extraneous surfaces of the model using warning signs. The toolpaths will often be missing parts of the intended geometry." msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:342 msgctxt "@option:check" msgid "Display model errors" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Przenosi kamerę, aby model był w centrum widoku, gdy wybrano model" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:373 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Wyśrodkuj kamerę kiedy przedmiot jest zaznaczony" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Czy domyślne zachowanie zoomu powinno zostać odwrócone?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:388 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Odwróć kierunek zoomu kamery." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Czy przybliżanie powinno poruszać się w kierunku myszy?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "Powiększanie w kierunku myszy nie jest obsługiwane w danej perspektywie." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:409 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Przybliżaj w kierunku myszy" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:435 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:417 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Czy modele na platformie powinny być przenoszone w taki sposób, aby nie przecinały się?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:440 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:422 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Upewnij się, że modele są oddzielone" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:431 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Czy modele na platformie powinny być przesunięte w dół, aby dotknęły stołu roboczego?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:436 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Automatycznie upuść modele na stół roboczy" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:448 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Pokaż wiadomości ostrzegawcze w czytniku g-code." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:457 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Wiadomość ostrzegawcza w czytniku g-code" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Czy warstwa powinna być wymuszona w trybie zgodności?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Wymuszenie widoku warstw w trybie zgodności (wymaga ponownego uruchomienia)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:498 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" msgstr "Czy Cura powinna się otwierać w miejscu, w którym została zamknięta?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:485 msgctxt "@option:check" msgid "Restore window position on start" msgstr "Przywróć pozycję okna przy starcie" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:513 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Jakiego rodzaju kamery należy użyć do renderowania?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:502 msgctxt "@window:text" msgid "Camera rendering:" msgstr "Renderowanie z kamery: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:531 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:509 msgid "Perspective" msgstr "Perspektywiczny" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:532 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgid "Orthographic" msgstr "Rzut ortograficzny" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:563 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:548 msgctxt "@label" msgid "Opening and saving files" msgstr "Otwieranie i zapisywanie plików" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:555 msgctxt "@info:tooltip" msgid "Should opening files from the desktop or external applications open in the same instance of Cura?" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@option:check" msgid "Use a single instance of Cura" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Czy modele powinny być skalowane do wielkości obszaru roboczego, jeśli są zbyt duże?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@option:check" msgid "Scale large models" msgstr "Skaluj duże modele" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Model może wydawać się bardzo mały, jeśli jego jednostka jest na przykład w metrach, a nie w milimetrach. Czy takie modele powinny być skalowane?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Skaluj bardzo małe modele" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Czy modele powinny zostać zaznaczone po załadowaniu?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Zaznaczaj modele po załadowaniu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Czy przedrostek oparty na nazwie drukarki powinien być automatycznie dodawany do nazwy zadania?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:635 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Dodaj przedrostek maszyny do nazwy zadania" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:645 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Czy podsumowanie powinno być wyświetlane podczas zapisu projektu?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:649 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:634 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Pokaż okno podsumowania podczas zapisywaniu projektu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:659 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:644 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Domyślne zachowanie podczas otwierania pliku projektu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:652 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Domyślne zachowanie podczas otwierania pliku projektu: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Zawsze pytaj" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:682 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Zawsze otwieraj jako projekt" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:668 msgctxt "@option:openProject" msgid "Always import models" msgstr "Zawsze importuj modele" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:705 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Kiedy dokonasz zmian w profilu i przełączysz się na inny, zostanie wyświetlone okno z pytaniem, czy chcesz zachować twoje zmiany, czy nie. Możesz też wybrać domyślne zachowanie, żeby to okno już nigdy nie było pokazywane." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:728 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Profile" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Domyślne zachowanie dla zmienionych ustawień podczas zmiany profilu na inny: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:748 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:734 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Zawsze odrzucaj wprowadzone zmiany" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:749 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:735 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Zawsze przenoś wprowadzone zmiany do nowego profilu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:783 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@label" msgid "Privacy" msgstr "Prywatność" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:790 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:777 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Czy Cura ma sprawdzać dostępność aktualizacji podczas uruchamiania programu?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:795 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:782 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Sprawdź, dostępność aktualizacji podczas uruchamiania" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:805 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:792 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Czy anonimowe dane na temat wydruku mają być wysyłane do Ultimaker? Uwaga. Żadne modele, adresy IP, ani żadne inne dane osobiste nie będą wysyłane i/lub przechowywane." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:810 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:797 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Wyślij (anonimowe) informacje o drukowaniu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:819 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:806 msgctxt "@action:button" msgid "More information" msgstr "Więcej informacji" @@ -4519,55 +4593,65 @@ msgctxt "@action:button" msgid "Export" msgstr "Eksportuj" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 +msgctxt "@action:button Sending materials to printers" +msgid "Sync with Printers" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" msgid "Printer" msgstr "Drukarka" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:298 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Potwierdź Usunięcie" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:301 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Czy na pewno chcesz usunąć %1? Nie można tego cofnąć!" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 msgctxt "@title:window" msgid "Import Material" msgstr "Importuj Materiał" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:338 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Nie można zaimportować materiału %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:328 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:342 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Udało się zaimportować materiał %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:346 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 msgctxt "@title:window" msgid "Export Material" msgstr "Eksportuj Materiał" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:358 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:372 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Nie udało się wyeksportować materiału do %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:378 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Udało się wyeksportować materiał do %1" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 +msgctxt "@title:window" +msgid "Export All Materials" +msgstr "" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" @@ -4679,53 +4763,53 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Podaj nazwę tego profilu." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Duplikuj profil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@title:window" msgid "Rename Profile" msgstr "Zmień nazwę profilu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:307 msgctxt "@title:window" msgid "Import Profile" msgstr "Importuj Profil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:336 msgctxt "@title:window" msgid "Export Profile" msgstr "Eksportuj Profil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:399 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Drukarka: %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:557 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Aktualizuj profil z bieżącymi ustawieniami" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 msgctxt "@action:button" msgid "Discard current changes" msgstr "Odrzuć bieżące zmiany" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:583 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Ten profil używa ustawień domyślnych określonych przez drukarkę, dlatego nie ma żadnych ustawień z poniższej liście." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:591 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Aktualne ustawienia odpowiadają wybranemu profilowi." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:609 msgctxt "@title:tab" msgid "Global Settings" msgstr "Ustawienia ogólne" @@ -4755,12 +4839,12 @@ msgctxt "@title:column" msgid "Unit" msgstr "Jednostka" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:16 msgctxt "@title:tab" msgid "Setting Visibility" msgstr "Widoczność ustawienia" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:48 msgctxt "@label:textbox" msgid "Check all" msgstr "Zaznacz wszystko" @@ -5098,27 +5182,27 @@ msgctxt "@label:textbox" msgid "Search settings" msgstr "Ustawienia wyszukiwania" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:456 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:468 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Skopiuj wartość do wszystkich ekstruderów" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:477 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Skopiuj wszystkie zmienione wartości do wszystkich ekstruderów" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:502 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:514 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Ukryj tę opcję" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:515 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:527 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Nie pokazuj tej opcji" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:531 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Pozostaw tę opcję widoczną" @@ -5178,11 +5262,6 @@ msgctxt "@button" msgid "Add printer manually" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddCloudPrintersView.qml:218 -msgctxt "@button" -msgid "Finish" -msgstr "Koniec" - #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:230 msgctxt "@label" msgid "Manufacturer" @@ -5289,32 +5368,32 @@ msgctxt "@button" msgid "Connect" msgstr "Połącz" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:43 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" -msgid "Ultimaker Account" +msgid "Release Notes" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:124 msgctxt "@text" -msgid "Your key to connected 3D printing" +msgid "Add material settings and plugins from the Marketplace" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:101 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:154 msgctxt "@text" -msgid "- Customize your experience with more print profiles and plugins" +msgid "Backup and sync your material settings and plugins" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:184 msgctxt "@text" -msgid "- Stay flexible by syncing your setup and loading it anywhere" +msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:217 msgctxt "@text" -msgid "- Increase efficiency with a remote workflow on Ultimaker printers" +msgid "Create a free Ultimaker Account" msgstr "" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:230 msgctxt "@button" msgid "Skip" msgstr "" @@ -5374,29 +5453,30 @@ msgctxt "@button" msgid "Decline and close" msgstr "Odrzuć i zamknij" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:29 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" msgid "Welcome to Ultimaker Cura" msgstr "Witaj w Ultimaker Cura" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:68 msgctxt "@text" -msgid "" -"Please follow these steps to set up\n" -"Ultimaker Cura. This will only take a few moments." +msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." msgstr "" -"Wykonaj poniższe kroki, aby skonfigurować\n" -"Ultimaker Cura. To zajmie tylko kilka chwil." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:86 msgctxt "@button" msgid "Get started" msgstr "Rozpocznij" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:28 msgctxt "@label" -msgid "What's new in Ultimaker Cura" -msgstr "Co nowego w Ultimaker Cura" +msgid "What's New" +msgstr "" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Widgets/ComboBox.qml:24 +msgctxt "@label" +msgid "No items to select from" +msgstr "" #: ModelChecker/plugin.json msgctxt "description" @@ -5478,6 +5558,16 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura Profile Writer" +#: DigitalLibrary/plugin.json +msgctxt "description" +msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." +msgstr "" + +#: DigitalLibrary/plugin.json +msgctxt "name" +msgid "Ultimaker Digital Library" +msgstr "" + #: FirmwareUpdateChecker/plugin.json msgctxt "description" msgid "Checks for firmware updates." @@ -5948,6 +6038,26 @@ msgctxt "name" msgid "Version Upgrade 4.7 to 4.8" msgstr "" +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." +msgstr "" + +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.8 to 4.9" +msgstr "" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." +msgstr "" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.9 to 4.10" +msgstr "" + #: X3DReader/plugin.json msgctxt "description" msgid "Provides support for reading X3D files." @@ -5978,6 +6088,48 @@ msgctxt "name" msgid "X-Ray View" msgstr "Widok Rentgena" +#~ msgctxt "@label:listbox" +#~ msgid "Layer thickness" +#~ msgstr "Grubość warstwy" + +#~ msgctxt "@button" +#~ msgid "Create account" +#~ msgstr "Utwórz konto" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Delete Selected Model" +#~ msgid_plural "Delete Selected Models" +#~ msgstr[0] "Usuń wybrany model" +#~ msgstr[1] "Usuń wybrane modele" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Center Selected Model" +#~ msgid_plural "Center Selected Models" +#~ msgstr[0] "Wyśrodkuj wybrany model" +#~ msgstr[1] "Wyśrodkuj wybrane modele" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Multiply Selected Model" +#~ msgid_plural "Multiply Selected Models" +#~ msgstr[0] "Rozmnóż wybrany model" +#~ msgstr[1] "Rozmnóż wybrane modele" + +#~ msgctxt "@button" +#~ msgid "Finish" +#~ msgstr "Koniec" + +#~ msgctxt "@text" +#~ msgid "" +#~ "Please follow these steps to set up\n" +#~ "Ultimaker Cura. This will only take a few moments." +#~ msgstr "" +#~ "Wykonaj poniższe kroki, aby skonfigurować\n" +#~ "Ultimaker Cura. To zajmie tylko kilka chwil." + +#~ msgctxt "@label" +#~ msgid "What's new in Ultimaker Cura" +#~ msgstr "Co nowego w Ultimaker Cura" + #~ msgctxt "@info:status" #~ msgid "The selected model was too small to load." #~ msgstr "Wybrany model był zbyta mały do załadowania." diff --git a/resources/i18n/pl_PL/fdmextruder.def.json.po b/resources/i18n/pl_PL/fdmextruder.def.json.po index 38dcf8f1b6..ddfad4bb62 100644 --- a/resources/i18n/pl_PL/fdmextruder.def.json.po +++ b/resources/i18n/pl_PL/fdmextruder.def.json.po @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Mariusz 'Virgin71' Matłosz \n" "Language-Team: reprapy.pl\n" diff --git a/resources/i18n/pl_PL/fdmprinter.def.json.po b/resources/i18n/pl_PL/fdmprinter.def.json.po index d8ba0e5461..ab90d10d72 100644 --- a/resources/i18n/pl_PL/fdmprinter.def.json.po +++ b/resources/i18n/pl_PL/fdmprinter.def.json.po @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" "PO-Revision-Date: 2019-11-15 15:34+0100\n" "Last-Translator: Mariusz Matłosz \n" "Language-Team: Mariusz Matłosz , reprapy.pl\n" @@ -419,6 +419,26 @@ msgctxt "machine_extruders_share_heater description" msgid "Whether the extruders share a single heater rather than each extruder having its own heater." msgstr "" +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle label" +msgid "Extruders Share Nozzle" +msgstr "" + +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle description" +msgid "Whether the extruders share a single nozzle rather than each extruder having its own nozzle. When set to true, it is expected that the printer-start gcode script properly sets up all extruders in an initial retraction state that is known and mutually compatible (either zero or one filament not retracted); in that case the initial retraction status is described, per extruder, by the 'machine_extruders_shared_nozzle_initial_retraction' parameter." +msgstr "" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction label" +msgid "Shared Nozzle Initial Retraction" +msgstr "" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction description" +msgid "How much the filament of each extruder is assumed to have been retracted from the shared nozzle tip at the completion of the printer-start gcode script; the value should be equal to or greater than the length of the common part of the nozzle's ducts." +msgstr "" + #: fdmprinter.def.json msgctxt "machine_disallowed_areas label" msgid "Disallowed Areas" @@ -486,8 +506,8 @@ msgstr "Przesunięcie ekstrudera" #: fdmprinter.def.json msgctxt "machine_use_extruder_offset_to_offset_coords description" -msgid "Apply the extruder offset to the coordinate system." -msgstr "Zastosuj przesunięcie głowicy względem." +msgid "Apply the extruder offset to the coordinate system. Affects all extruders." +msgstr "" #: fdmprinter.def.json msgctxt "extruder_prime_pos_z label" @@ -881,8 +901,8 @@ msgstr "Mnożnik szerokości linii na pierwszej warstwie. Zwiększenie może pol #: fdmprinter.def.json msgctxt "shell label" -msgid "Shell" -msgstr "Powłoka" +msgid "Walls" +msgstr "" #: fdmprinter.def.json msgctxt "shell description" @@ -949,166 +969,6 @@ msgctxt "wall_0_wipe_dist description" msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better." msgstr "Długość ruchu jałowego umieszczonego po wydrukowaniu zewnętrznej ściany, aby lepiej ukryć szew Z." -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr label" -msgid "Top Surface Skin Extruder" -msgstr "Ekstruder Górnej Pow. Skóry" - -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr description" -msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." -msgstr "Esktruder używany do drukowania górnej skóry. Używane w multi-ekstruzji." - -#: fdmprinter.def.json -msgctxt "roofing_layer_count label" -msgid "Top Surface Skin Layers" -msgstr "Warstwy Górnej Pow. Skóry" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count description" -msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." -msgstr "Liczba warstw górnej skóry. Zazwyczaj tylko jedna górna warstwa poprawia jakość górnych powierzchni." - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr label" -msgid "Top/Bottom Extruder" -msgstr "Ekstruder Góra/Dół" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr description" -msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." -msgstr "Ekstruder używany do drukowania górnej i dolnej skóry. Używane w multi-ekstruzji." - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness label" -msgid "Top/Bottom Thickness" -msgstr "Grubość Góra/Dół" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness description" -msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." -msgstr "Grubość górnej/dolnej warstwy wydruku. Ta wartość podzielona przez wysokość warstwy definiuje liczbę warstw górnych/dolnych." - -#: fdmprinter.def.json -msgctxt "top_thickness label" -msgid "Top Thickness" -msgstr "Grubość Góra" - -#: fdmprinter.def.json -msgctxt "top_thickness description" -msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." -msgstr "Grubość górnych warstw na wydruku. Ta wartość podzielona przez wysokość warstwy definiuje liczbę warstw górnych." - -#: fdmprinter.def.json -msgctxt "top_layers label" -msgid "Top Layers" -msgstr "Górne warstwy" - -#: fdmprinter.def.json -msgctxt "top_layers description" -msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." -msgstr "Liczba górnych warstw. Przy obliczaniu górnej grubości wartość ta jest zaokrąglana do liczby całkowitej." - -#: fdmprinter.def.json -msgctxt "bottom_thickness label" -msgid "Bottom Thickness" -msgstr "Grubość Dołu" - -#: fdmprinter.def.json -msgctxt "bottom_thickness description" -msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." -msgstr "Grubość dolnych warstw w wydruku. Ta wartość podzielona przez wysokość warstwy definiuje liczbę warstw dolnych." - -#: fdmprinter.def.json -msgctxt "bottom_layers label" -msgid "Bottom Layers" -msgstr "Dolne Warstwy" - -#: fdmprinter.def.json -msgctxt "bottom_layers description" -msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "Liczba dolnych warstw. Przy obliczaniu grubości dołu ta wartość jest zaokrąglana do liczby całkowitej." - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers label" -msgid "Initial Bottom Layers" -msgstr "Początkowej warstwy dolne" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers description" -msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "Liczba początkowych dolnych warstw, od stołu w górę. Obliczona na podstawie grubości spodu, wartość ta jest zaokrąglana do liczby całkowitej." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern label" -msgid "Top/Bottom Pattern" -msgstr "Wzór Góra/Dół" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern description" -msgid "The pattern of the top/bottom layers." -msgstr "Wzór górnej/dolnej warstwy." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option lines" -msgid "Lines" -msgstr "Linie" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option concentric" -msgid "Concentric" -msgstr "Koncentryczny" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option zigzag" -msgid "Zig Zag" -msgstr "Zygzak" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 label" -msgid "Bottom Pattern Initial Layer" -msgstr "Wzór Dolnej Początkowej Warstwy" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 description" -msgid "The pattern on the bottom of the print on the first layer." -msgstr "Wzór na pierwszej warstwie na dole wydruku." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option lines" -msgid "Lines" -msgstr "Linie" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option concentric" -msgid "Concentric" -msgstr "Koncentryczny" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option zigzag" -msgid "Zig Zag" -msgstr "Zygzak" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons label" -msgid "Connect Top/Bottom Polygons" -msgstr "Połącz Górne/Dolne Wieloboki" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." -msgstr "Połącz górne/dolne ścieżki, które przebiegają koło siebie. Włączenie tej opcji powoduje ograniczenie czasu ruchów jałowych dla wzorca koncentrycznego, ale ze względu na możliwość pojawienia się połączeń w połowie ścieżki wypełnienia, opcja ta może obniżyć jakość górnego wykończenia." - -#: fdmprinter.def.json -msgctxt "skin_angles label" -msgid "Top/Bottom Line Directions" -msgstr "Kierunki Linii Góra/Dół" - -#: fdmprinter.def.json -msgctxt "skin_angles description" -msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." -msgstr "Lista całkowitych kierunków linii używana kiedy górne/dolne warstwy używają wzoru linii i zygzaka. Elementy z listy są używane kolejno w miarę postępu warstw, a kiedy kończy się lista, zaczyna się od początku. Elementy listy są oddzielone przecinkami, a cała lista znajduje się w nawiasach kwadratowych. Domyślnie lista jest pusta, co oznacza tradycyjne, domyślne kąty (45 i 135 stopni)." - #: fdmprinter.def.json msgctxt "wall_0_inset label" msgid "Outer Wall Inset" @@ -1414,6 +1274,176 @@ msgctxt "z_seam_relative description" msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate." msgstr "Kiedy włączone, współrzędne szwu są względne do każdego środka części. Kiedy wyłączone, współrzędne opisują bezwzględną pozycję na stole." +#: fdmprinter.def.json +msgctxt "top_bottom label" +msgid "Top/Bottom" +msgstr "" + +#: fdmprinter.def.json +msgctxt "top_bottom description" +msgid "Top/Bottom" +msgstr "" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr label" +msgid "Top Surface Skin Extruder" +msgstr "Ekstruder Górnej Pow. Skóry" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr description" +msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." +msgstr "Esktruder używany do drukowania górnej skóry. Używane w multi-ekstruzji." + +#: fdmprinter.def.json +msgctxt "roofing_layer_count label" +msgid "Top Surface Skin Layers" +msgstr "Warstwy Górnej Pow. Skóry" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count description" +msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." +msgstr "Liczba warstw górnej skóry. Zazwyczaj tylko jedna górna warstwa poprawia jakość górnych powierzchni." + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr label" +msgid "Top/Bottom Extruder" +msgstr "Ekstruder Góra/Dół" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr description" +msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." +msgstr "Ekstruder używany do drukowania górnej i dolnej skóry. Używane w multi-ekstruzji." + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness label" +msgid "Top/Bottom Thickness" +msgstr "Grubość Góra/Dół" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness description" +msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." +msgstr "Grubość górnej/dolnej warstwy wydruku. Ta wartość podzielona przez wysokość warstwy definiuje liczbę warstw górnych/dolnych." + +#: fdmprinter.def.json +msgctxt "top_thickness label" +msgid "Top Thickness" +msgstr "Grubość Góra" + +#: fdmprinter.def.json +msgctxt "top_thickness description" +msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." +msgstr "Grubość górnych warstw na wydruku. Ta wartość podzielona przez wysokość warstwy definiuje liczbę warstw górnych." + +#: fdmprinter.def.json +msgctxt "top_layers label" +msgid "Top Layers" +msgstr "Górne warstwy" + +#: fdmprinter.def.json +msgctxt "top_layers description" +msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." +msgstr "Liczba górnych warstw. Przy obliczaniu górnej grubości wartość ta jest zaokrąglana do liczby całkowitej." + +#: fdmprinter.def.json +msgctxt "bottom_thickness label" +msgid "Bottom Thickness" +msgstr "Grubość Dołu" + +#: fdmprinter.def.json +msgctxt "bottom_thickness description" +msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." +msgstr "Grubość dolnych warstw w wydruku. Ta wartość podzielona przez wysokość warstwy definiuje liczbę warstw dolnych." + +#: fdmprinter.def.json +msgctxt "bottom_layers label" +msgid "Bottom Layers" +msgstr "Dolne Warstwy" + +#: fdmprinter.def.json +msgctxt "bottom_layers description" +msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "Liczba dolnych warstw. Przy obliczaniu grubości dołu ta wartość jest zaokrąglana do liczby całkowitej." + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "Początkowej warstwy dolne" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "Liczba początkowych dolnych warstw, od stołu w górę. Obliczona na podstawie grubości spodu, wartość ta jest zaokrąglana do liczby całkowitej." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern label" +msgid "Top/Bottom Pattern" +msgstr "Wzór Góra/Dół" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern description" +msgid "The pattern of the top/bottom layers." +msgstr "Wzór górnej/dolnej warstwy." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option lines" +msgid "Lines" +msgstr "Linie" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option concentric" +msgid "Concentric" +msgstr "Koncentryczny" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option zigzag" +msgid "Zig Zag" +msgstr "Zygzak" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 label" +msgid "Bottom Pattern Initial Layer" +msgstr "Wzór Dolnej Początkowej Warstwy" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 description" +msgid "The pattern on the bottom of the print on the first layer." +msgstr "Wzór na pierwszej warstwie na dole wydruku." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option lines" +msgid "Lines" +msgstr "Linie" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option concentric" +msgid "Concentric" +msgstr "Koncentryczny" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option zigzag" +msgid "Zig Zag" +msgstr "Zygzak" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons label" +msgid "Connect Top/Bottom Polygons" +msgstr "Połącz Górne/Dolne Wieloboki" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons description" +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "Połącz górne/dolne ścieżki, które przebiegają koło siebie. Włączenie tej opcji powoduje ograniczenie czasu ruchów jałowych dla wzorca koncentrycznego, ale ze względu na możliwość pojawienia się połączeń w połowie ścieżki wypełnienia, opcja ta może obniżyć jakość górnego wykończenia." + +#: fdmprinter.def.json +msgctxt "skin_angles label" +msgid "Top/Bottom Line Directions" +msgstr "Kierunki Linii Góra/Dół" + +#: fdmprinter.def.json +msgctxt "skin_angles description" +msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." +msgstr "Lista całkowitych kierunków linii używana kiedy górne/dolne warstwy używają wzoru linii i zygzaka. Elementy z listy są używane kolejno w miarę postępu warstw, a kiedy kończy się lista, zaczyna się od początku. Elementy listy są oddzielone przecinkami, a cała lista znajduje się w nawiasach kwadratowych. Domyślnie lista jest pusta, co oznacza tradycyjne, domyślne kąty (45 i 135 stopni)." + #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" msgid "No Skin in Z Gaps" @@ -1554,6 +1584,86 @@ msgctxt "skin_overlap_mm description" msgid "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any value over half the width of the wall may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall." msgstr "Dostosuj zachodzenie pomiędzy ścianami, a (punktami końcowymi) linią obrysu. Niewielkie zachodzenie na siebie pozwala ścianom połączyć się mocno z obrysem. Zauważ, że przy równej szerokości obrysu i szerokości ściany, każdy procent powyżej 50% może spowodować przekroczenie ściany przez obrys, ponieważ pozycja dyszy ekstrudera obrysu może sięgać poza środek ściany." +#: fdmprinter.def.json +msgctxt "skin_preshrink label" +msgid "Skin Removal Width" +msgstr "Szerokość Usuwania Skóry" + +#: fdmprinter.def.json +msgctxt "skin_preshrink description" +msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." +msgstr "Największa szerokość pow. skóry, które mają zostać usunięte. Każda pow. skóry mniejsza niż ta wartość zniknie. Może to pomóc w ograniczeniu ilości czasu i materiału zużywanego na drukowanie górnych/dolnych skór na pochyłych powierzchniach modelu." + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink label" +msgid "Top Skin Removal Width" +msgstr "Szer. Usuwania Górnej Skóry" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink description" +msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." +msgstr "Największa szerokość górnej pow. skóry, które mają zostać usunięte. Każda pow. skóry mniejsza niż ta wartość zniknie. Może to pomóc w ograniczeniu ilości czasu i materiału zużywanego na drukowanie górnych skór na pochyłych powierzchniach modelu." + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink label" +msgid "Bottom Skin Removal Width" +msgstr "Szer. Usuwania Dolnej Skóry" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink description" +msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." +msgstr "Największa szerokość dolnych pow. skóry, które mają zostać usunięte. Każda pow. skóry mniejsza niż ta wartość zniknie. Może to pomóc w ograniczeniu ilości czasu i materiału zużywanego na drukowanie dolnych skór na pochyłych powierzchniach modelu." + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance label" +msgid "Skin Expand Distance" +msgstr "Odległość Rozsz. Skóry" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance description" +msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." +msgstr "Odległość na jaką skóry są rozszerzane w kierunku wypełnienia. Wyższe wartości powodują lepsze łączenie się skóry i wypełnienia i powodują, że ściany sąsiednich warstw lepiej łączą się ze skórą. Niższe wartości oszczędzają materiał." + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance label" +msgid "Top Skin Expand Distance" +msgstr "Odległość Rozsz. Górnej Skóry" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance description" +msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." +msgstr "Odległość na jaką górne skóry są rozszerzane w kierunku wypełnienia. Wyższe wartości powodują lepsze łączenie się skóry i wypełnienia i powodują, że ściany sąsiednich warstw lepiej łączą się ze skórą. Niższe wartości oszczędzają materiał." + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance label" +msgid "Bottom Skin Expand Distance" +msgstr "Odległość Rozsz. Dolnej Skóry" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance description" +msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." +msgstr "Odległość na jaką dolne skóry są rozszerzane w kierunku wypełnienia. Wyższe wartości powodują lepsze łączenie się skóry i wypełnienia i powodują, że ściany sąsiednich warstw lepiej łączą się ze skórą. Niższe wartości oszczędzają materiał." + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion label" +msgid "Maximum Skin Angle for Expansion" +msgstr "Maks. Kąt Rozciągania Ścian" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion description" +msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded." +msgstr "" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion label" +msgid "Minimum Skin Width for Expansion" +msgstr "Min. Szerok. Skóry do Poszerzenia" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion description" +msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." +msgstr "Obszary skóry, które są węższe niż to, nie zostaną poszerzone. W ten sposób unikamy rozszerzania wąskich skór, które są tworzone, kiedy powierzchnia jest blisko pionowi." + #: fdmprinter.def.json msgctxt "infill label" msgid "Infill" @@ -1863,86 +1973,6 @@ msgctxt "infill_support_angle description" msgid "The minimum angle of internal overhangs for which infill is added. At a value of 0° objects are totally filled with infill, 90° will not provide any infill." msgstr "Minimalny kąt zwisu wewnętrznego, dla którego zostanie dodane wypełnienie. Przy wartości 0° obiekty zostaną wypełnione całkowicie, natomiast przy 90° wypełnienie nie zostanie wygenerowane." -#: fdmprinter.def.json -msgctxt "skin_preshrink label" -msgid "Skin Removal Width" -msgstr "Szerokość Usuwania Skóry" - -#: fdmprinter.def.json -msgctxt "skin_preshrink description" -msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." -msgstr "Największa szerokość pow. skóry, które mają zostać usunięte. Każda pow. skóry mniejsza niż ta wartość zniknie. Może to pomóc w ograniczeniu ilości czasu i materiału zużywanego na drukowanie górnych/dolnych skór na pochyłych powierzchniach modelu." - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink label" -msgid "Top Skin Removal Width" -msgstr "Szer. Usuwania Górnej Skóry" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink description" -msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." -msgstr "Największa szerokość górnej pow. skóry, które mają zostać usunięte. Każda pow. skóry mniejsza niż ta wartość zniknie. Może to pomóc w ograniczeniu ilości czasu i materiału zużywanego na drukowanie górnych skór na pochyłych powierzchniach modelu." - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink label" -msgid "Bottom Skin Removal Width" -msgstr "Szer. Usuwania Dolnej Skóry" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink description" -msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." -msgstr "Największa szerokość dolnych pow. skóry, które mają zostać usunięte. Każda pow. skóry mniejsza niż ta wartość zniknie. Może to pomóc w ograniczeniu ilości czasu i materiału zużywanego na drukowanie dolnych skór na pochyłych powierzchniach modelu." - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance label" -msgid "Skin Expand Distance" -msgstr "Odległość Rozsz. Skóry" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance description" -msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." -msgstr "Odległość na jaką skóry są rozszerzane w kierunku wypełnienia. Wyższe wartości powodują lepsze łączenie się skóry i wypełnienia i powodują, że ściany sąsiednich warstw lepiej łączą się ze skórą. Niższe wartości oszczędzają materiał." - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance label" -msgid "Top Skin Expand Distance" -msgstr "Odległość Rozsz. Górnej Skóry" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance description" -msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." -msgstr "Odległość na jaką górne skóry są rozszerzane w kierunku wypełnienia. Wyższe wartości powodują lepsze łączenie się skóry i wypełnienia i powodują, że ściany sąsiednich warstw lepiej łączą się ze skórą. Niższe wartości oszczędzają materiał." - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance label" -msgid "Bottom Skin Expand Distance" -msgstr "Odległość Rozsz. Dolnej Skóry" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance description" -msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." -msgstr "Odległość na jaką dolne skóry są rozszerzane w kierunku wypełnienia. Wyższe wartości powodują lepsze łączenie się skóry i wypełnienia i powodują, że ściany sąsiednich warstw lepiej łączą się ze skórą. Niższe wartości oszczędzają materiał." - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion label" -msgid "Maximum Skin Angle for Expansion" -msgstr "Maks. Kąt Rozciągania Ścian" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion description" -msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." -msgstr "Górne i/lub dolne powierzchnie przedmiotu o kącie większym niż to ustawienie nie będą miały rozszerzonego górnej/dolnej skóry. Pozwala to uniknąć powiększania wąskich ścian, które powstają, gdy powierzchnia modelu ma blisko pionowe nachylenie. Kąt 0 ° jest poziomy, a kąt 90 ° jest pionowy." - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion label" -msgid "Minimum Skin Width for Expansion" -msgstr "Min. Szerok. Skóry do Poszerzenia" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion description" -msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." -msgstr "Obszary skóry, które są węższe niż to, nie zostaną poszerzone. W ten sposób unikamy rozszerzania wąskich skór, które są tworzone, kiedy powierzchnia jest blisko pionowi." - #: fdmprinter.def.json msgctxt "skin_edge_support_thickness label" msgid "Skin Edge Support Thickness" @@ -2560,8 +2590,8 @@ msgstr "Prędk. Początk. Warstwy" #: fdmprinter.def.json msgctxt "speed_layer_0 description" -msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." -msgstr "Prędkość dla pierwszej warstwy. Niższa wartość jest zalecane w celu poprawy przyczepności do stołu." +msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate. Does not affect the build plate adhesion structures themselves, like brim and raft." +msgstr "" #: fdmprinter.def.json msgctxt "speed_print_layer_0 label" @@ -3170,8 +3200,8 @@ msgstr "Max. Dystans Kombinowania Bez Retrakcji" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" -msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." -msgstr "Przy wartości niezerowej, kombinowane ruchy jałowe o dystansie większym niż zadany bedą używały retrakcji." +msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." +msgstr "" #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" @@ -5074,7 +5104,7 @@ msgstr "" #: fdmprinter.def.json msgctxt "infill_mesh_order description" -msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." +msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the highest rank. An infill mesh with a higher rank will modify the infill of infill meshes with lower rank and normal meshes." msgstr "" #: fdmprinter.def.json @@ -5422,6 +5452,16 @@ msgctxt "conical_overhang_angle description" msgid "The maximum angle of overhangs after the they have been made printable. At a value of 0° all overhangs are replaced by a piece of model connected to the build plate, 90° will not change the model in any way." msgstr "Maksymalny kąt zwisów po którym będą one drukowalne. Przy wartości 0 ° wszystkie zwisy są zastępowane przez fragment modelu połączony ze stołem, a 90 ° w żaden sposób nie zmienia modelu." +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size label" +msgid "Maximum Overhang Hole Area" +msgstr "" + +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size description" +msgid "The maximum area of a hole in the base of the model before it's removed by Make Overhang Printable. Holes smaller than this will be retained. A value of 0 mm² will fill all holes in the models base." +msgstr "" + #: fdmprinter.def.json msgctxt "coasting_enable label" msgid "Enable Coasting" @@ -6361,6 +6401,26 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Forma przesunięcia, która ma być zastosowana do modelu podczas ładowania z pliku." +#~ msgctxt "retraction_combing_max_distance description" +#~ msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." +#~ msgstr "Przy wartości niezerowej, kombinowane ruchy jałowe o dystansie większym niż zadany bedą używały retrakcji." + +#~ msgctxt "machine_use_extruder_offset_to_offset_coords description" +#~ msgid "Apply the extruder offset to the coordinate system." +#~ msgstr "Zastosuj przesunięcie głowicy względem." + +#~ msgctxt "shell label" +#~ msgid "Shell" +#~ msgstr "Powłoka" + +#~ msgctxt "max_skin_angle_for_expansion description" +#~ msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." +#~ msgstr "Górne i/lub dolne powierzchnie przedmiotu o kącie większym niż to ustawienie nie będą miały rozszerzonego górnej/dolnej skóry. Pozwala to uniknąć powiększania wąskich ścian, które powstają, gdy powierzchnia modelu ma blisko pionowe nachylenie. Kąt 0 ° jest poziomy, a kąt 90 ° jest pionowy." + +#~ msgctxt "speed_layer_0 description" +#~ msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." +#~ msgstr "Prędkość dla pierwszej warstwy. Niższa wartość jest zalecane w celu poprawy przyczepności do stołu." + #~ msgctxt "material_bed_temperature description" #~ msgid "The temperature used for the heated build plate. If this is 0, the bed temperature will not be adjusted." #~ msgstr "Temperatura stosowana dla podgrzewanej platformy roboczej. Jeżeli jest ustawione 0, temperatura stołu nie będzie ustawiona." diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index 7f69fdf283..1e2858a8ea 100644 --- a/resources/i18n/pt_BR/cura.po +++ b/resources/i18n/pt_BR/cura.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0200\n" -"PO-Revision-Date: 2020-10-25 13:00+0100\n" +"POT-Creation-Date: 2021-06-10 17:35+0200\n" +"PO-Revision-Date: 2021-06-19 06:21+0200\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" @@ -15,14 +15,10 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 2.2.3\n" +"X-Generator: Poedit 3.0\n" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1581 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 msgctxt "@label" msgid "Unknown" msgstr "Desconhecido" @@ -48,56 +44,47 @@ msgctxt "@label {0} is the name of a printer that's about to be deleted." msgid "Are you sure you wish to remove {0}? This cannot be undone!" msgstr "Tem certeza que deseja remover {0}? Isto não pode ser defeito!" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 msgctxt "@label" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 msgctxt "@label" msgid "Visual" msgstr "Visual" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." msgstr "O perfil visual é projetado para imprimir protótipos e modelos virtuais com o objetivo de alta qualidade visual e de superfície." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 msgctxt "@label" msgid "Engineering" msgstr "Engenharia" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." msgstr "O perfil de engenharia é projetado para imprimir protótipos funcionais e partes de uso final com o objetivo de melhor precisão e tolerâncias mais estritas." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 msgctxt "@label" msgid "Draft" msgstr "Rascunho" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "O perfil de rascunho é projetado para imprimir protótipos iniciais e validações de conceito com o objetivo de redução significativa de tempo de impressão." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:226 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:234 msgctxt "@label" msgid "Custom Material" msgstr "Material Personalizado" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:227 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 msgctxt "@label" msgid "Custom" msgstr "Personalizado" @@ -118,58 +105,56 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Todos Os Arquivos (*)" -#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:178 +#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:181 msgctxt "@info:title" msgid "Login failed" msgstr "Login falhou" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:67 -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:67 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:24 msgctxt "@info:status" msgid "Finding new location for objects" msgstr "Achando novos lugares para objetos" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:71 -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:28 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:71 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:28 msgctxt "@info:title" msgid "Finding Location" msgstr "Buscando Localização" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:150 -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 -#: /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:76 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:150 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:76 msgctxt "@info:status" msgid "Unable to find a location within the build volume for all objects" msgstr "Não foi possível achar um lugar dentro do volume de construção para todos os objetos" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:151 -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:42 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:151 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:42 msgctxt "@info:title" msgid "Can't Find Location" msgstr "Não Foi Encontrada Localização" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:104 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:116 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Não pude criar arquivo do diretório de dados de usuário: {}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:110 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 msgctxt "@info:title" msgid "Backup" msgstr "Backup" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:123 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:135 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "Tentativa de restauração de backup do Cura sem dados ou metadados apropriados." -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:134 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:146 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that is higher than the current version." msgstr "Tentativa de restauração de backup do Cura de versão maior que a atual." +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 +msgctxt "@info:backup_failed" +msgid "The following error occurred while trying to restore a Cura backup:" +msgstr "O seguinte erro ocorreu ao tentar restaurar um backup do Cura:" + #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -319,76 +304,71 @@ msgctxt "@action:button" msgid "Send report" msgstr "Enviar relatório" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:521 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:527 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Carregando máquinas..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:528 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:534 msgctxt "@info:progress" msgid "Setting up preferences..." msgstr "Ajustando preferências..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:657 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:672 msgctxt "@info:progress" msgid "Initializing Active Machine..." msgstr "Inicializando Máquina Ativa..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:803 msgctxt "@info:progress" msgid "Initializing machine manager..." msgstr "Inicializando gestor de máquinas..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:802 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:817 msgctxt "@info:progress" msgid "Initializing build volume..." msgstr "Inicializando volume de impressão..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:870 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:888 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Configurando cena..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:906 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:924 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Carregando interface..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:911 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:929 msgctxt "@info:progress" msgid "Initializing engine..." msgstr "Inicializando motor..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1221 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1246 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1777 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1799 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Somente um arquivo G-Code pode ser carregado por vez. Pulando importação de {0}" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1778 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:188 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 msgctxt "@info:title" msgid "Warning" msgstr "Aviso" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1787 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1809 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Não é possível abrir nenhum outro arquivo se G-Code estiver sendo carregado. Pulando importação de {0}" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1788 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 msgctxt "@info:title" msgid "Error" @@ -409,7 +389,7 @@ msgctxt "@info:title" msgid "Placing Object" msgstr "Colocando Objeto" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:92 msgctxt "@message" msgid "Could not read response." msgstr "Não foi possível ler a resposta." @@ -429,31 +409,28 @@ msgctxt "@message" msgid "Something unexpected happened when trying to log in, please try again." msgstr "Algo inesperado aconteceu ao tentar login, por favor tente novamente." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:187 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:189 msgctxt "@info" msgid "Unable to start a new sign in process. Check if another sign in attempt is still active." msgstr "Não foi possível iniciar processo de sign-in. Verifique se outra tentativa de sign-in ainda está ativa." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Não foi possível contactar o servidor de contas da Ultimaker." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:205 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:205 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 msgctxt "@title:window" msgid "File Already Exists" msgstr "O Arquivo Já Existe" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:206 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:206 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "O arquivo {0} já existe. Tem certeza que quer sobrescrevê-lo?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:452 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:455 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "URL de arquivo inválida:" @@ -505,8 +482,7 @@ msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Erro ao importar perfil de {0}:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:235 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:245 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:235 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:245 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." @@ -536,33 +512,33 @@ msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "O Perfil {0} tem tipo de arquivo desconhecido ou está corrompido." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:423 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:426 msgctxt "@label" msgid "Custom profile" msgstr "Perfil personalizado" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:439 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:442 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Falta um tipo de qualidade ao Perfil." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:443 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:446 msgctxt "@info:status" -msgid "Global stack is missing." -msgstr "A pilha global não foi encontrada." +msgid "There is no active printer yet." +msgstr "Não há impressora ativa ainda." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:449 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:452 msgctxt "@info:status" msgid "Unable to add the profile." msgstr "Não foi possível adicionar o perfil." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:463 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:466 #, python-brace-format msgctxt "@info:status" msgid "Quality type '{0}' is not compatible with the current active machine definition '{1}'." msgstr "Tipo de qualidade '{0}' não é compatível com a definição de máquina ativa atual '{1}'." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:468 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:471 #, python-brace-format msgctxt "@info:status" msgid "Warning: The profile is not visible because its quality type '{0}' is not available for the current configuration. Switch to a material/nozzle combination that can use this quality type." @@ -578,51 +554,40 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:712 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 msgctxt "@label" msgid "Nozzle" msgstr "Bico" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:860 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:856 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "Os ajustes foram alterados para seguir a disponibilidade de extrusores atuais:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:862 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:858 msgctxt "@info:title" msgid "Settings updated" msgstr "Ajustes atualizados" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1447 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1478 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extrusor(es) Desabilitado(s)" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:67 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:67 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "Adicionar" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:263 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 msgctxt "@action:button" msgid "Finish" msgstr "Finalizar" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:441 -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml:81 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 msgctxt "@action:button" msgid "Cancel" msgstr "Cancelar" @@ -633,77 +598,78 @@ msgctxt "@label" msgid "Group #{group_nr}" msgstr "Grupo #{group_nr}" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Parede Externa" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Paredes Internas" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Contorno" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Preenchimento" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Preenchimento de Suporte" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Interface de Suporte" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Suporte" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Skirt (Saia)" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 msgctxt "@tooltip" msgid "Prime Tower" msgstr "Torre de Prime" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 msgctxt "@tooltip" msgid "Travel" msgstr "Percurso" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 msgctxt "@tooltip" msgid "Retractions" msgstr "Retrações" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:94 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 msgctxt "@tooltip" msgid "Other" msgstr "Outros" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 msgctxt "@action:button" msgid "Next" msgstr "Próximo" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:173 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 +msgctxt "@action:button" +msgid "Skip" +msgstr "Pular" + +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 msgctxt "@action:button" msgid "Close" msgstr "Fechar" @@ -727,29 +693,35 @@ msgstr "" "

    Descubra como assegurar a melhor qualidade de impressão e confiabilidade possível.

    \n" "

    Ver guia de qualidade de impressão

    " -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:535 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:540 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "O arquivo de projeto {0} contém um tipo de máquina desconhecido {1}. Não foi possível importar a máquina. Os modelos serão importados ao invés dela." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:538 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:543 msgctxt "@info:title" msgid "Open Project File" msgstr "Abrir Arquivo de Projeto" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:634 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:639 #, python-brace-format msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "O arquivo de projeto {0} tornou-se subitamente inacessível: {1}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:635 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "Não Foi Possível Abrir o Arquivo de Projeto" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:686 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:646 +#, python-brace-format +msgctxt "@info:error Don't translate the XML tags or !" +msgid "Project file {0} is corrupt: {1}." +msgstr "Arquivo de projeto {0} está corrompido: {1}." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:698 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." @@ -765,8 +737,7 @@ msgctxt "@title:tab" msgid "Custom" msgstr "Personalizado" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 msgctxt "@item:inlistbox" msgid "3MF File" msgstr "Arquivo 3MF" @@ -776,8 +747,7 @@ msgctxt "@error:zip" msgid "3MF Writer plug-in is corrupt." msgstr "O complemento de Escrita 3MF está corrompido." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:59 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:92 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:59 /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:92 msgctxt "@error:zip" msgid "No permission to write the workspace here." msgstr "Sem permissão para gravar o espaço de trabalho aqui." @@ -787,7 +757,7 @@ msgctxt "@error:zip" msgid "The operating system does not allow saving a project file to this location or with this file name." msgstr "O sistema operacional não permite salvar um arquivo de projeto nesta localização ou com este nome de arquivo." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:206 msgctxt "@error:zip" msgid "Error writing 3mf file." msgstr "Erro ao escrever arquivo 3mf." @@ -842,8 +812,7 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "O backup excede o tamanho máximo de arquivo." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:23 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "Houve um erro ao tentar restaurar seu backup." @@ -853,45 +822,41 @@ msgctxt "@item:inmenu" msgid "Manage backups" msgstr "Gerenciar backups" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Não foi possível fatiar com o material atual visto que é incompatível com a máquina ou configuração selecionada." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:411 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:420 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:429 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 msgctxt "@info:title" msgid "Unable to slice" msgstr "Não foi possível fatiar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:412 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Não foi possível fatiar com os ajustes atuais. Os seguintes ajustes têm erros: {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:410 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:436 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Não foi possível fatiar devido a alguns ajustes por modelo. Os seguintes ajustes têm erros em um dos modelos ou mais: {error_labels}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:445 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "Não foi possível fatiar porque a torre de purga ou posição de purga são inválidas." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:428 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:454 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "Não foi possível fatiar porque há objetos associados com o Extrusor desabilitado %s." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:463 msgctxt "@info:status" msgid "" "Please review settings and check if your models:\n" @@ -904,8 +869,7 @@ msgstr "" "- Estão associados a um extrusor habilitado\n" "- Não estão todos configurados como malhas de modificação" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 msgctxt "@info:status" msgid "Processing Layers" msgstr "Processando Camadas" @@ -915,8 +879,7 @@ msgctxt "@info:title" msgid "Information" msgstr "Informação" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Perfil do Cura" @@ -948,8 +911,7 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Atualizar Firmware" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 msgctxt "@item:inlistbox" msgid "Compressed G-code File" msgstr "Arquivo de G-Code Comprimido" @@ -959,9 +921,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "O GCodeGzWriter não suporta modo binário." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 msgctxt "@item:inlistbox" msgid "G-code File" msgstr "Arquivo G-Code" @@ -971,8 +931,7 @@ msgctxt "@info:status" msgid "Parsing G-code" msgstr "Interpretando G-Code" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:349 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:349 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:503 msgctxt "@info:title" msgid "G-code Details" msgstr "Detalhes do G-Code" @@ -992,8 +951,7 @@ msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "O GCodeWriter não suporta modo binário." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Por favor prepare o G-Code antes de exportar." @@ -1079,8 +1037,7 @@ msgctxt "@item:inlistbox" msgid "Save to Removable Drive {0}" msgstr "Salvar em Unidade Removível {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "Não há formatos de arquivo disponíveis com os quais escrever!" @@ -1096,8 +1053,7 @@ msgctxt "@info:title" msgid "Saving" msgstr "Salvando" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:106 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:109 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:106 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:109 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not save to {0}: {1}" @@ -1109,8 +1065,7 @@ msgctxt "@info:status Don't translate the tag {device}!" msgid "Could not find a file name when trying to write to {device}." msgstr "Não foi possível encontrar nome de arquivo ao tentar escrever em {device}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:138 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:138 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #, python-brace-format msgctxt "@info:status" msgid "Could not save to removable drive {0}: {1}" @@ -1160,28 +1115,27 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Unidade Removível" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:121 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:128 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled." msgstr "O Cura não exibe camadas de forma precisa quando Impressão em Arame está habilitada." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:129 msgctxt "@info:title" msgid "Simulation View" msgstr "Visão Simulada" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:status" msgid "Nothing is shown because you need to slice first." msgstr "Nada está exibido porque você precisa fatiar primeiro." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:title" msgid "No layers to show" msgstr "Não há camadas a exibir" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:124 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "Não mostrar essa mensagem novamente" @@ -1191,15 +1145,20 @@ msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Visão de Camadas" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:70 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:71 msgctxt "@info:status" -msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." -msgstr "Seu modelo não é manifold. As áreas ressaltadas indicam superfícies faltantes ou incorretas." +msgid "The highlighted areas indicate either missing or extraneous surfaces. Fix your model and open it again into Cura." +msgstr "As áreas ressaltadas indicam superfícies faltantes ou incorretas. Conserte seu modelo e o abra novamente no Cura." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 msgctxt "@info:title" -msgid "Model errors" -msgstr "Erros de modelo" +msgid "Model Errors" +msgstr "Erros de Modelo" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:79 +msgctxt "@action:button" +msgid "Learn more" +msgstr "Saiba mais" #: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/__init__.py:12 msgctxt "@item:inmenu" @@ -1221,13 +1180,12 @@ msgctxt "@info:generic" msgid "Do you want to sync material and software packages with your account?" msgstr "Você quer sincronizar os pacotes de material e software com sua conta?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:143 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/DownloadPresenter.py:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:143 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/DownloadPresenter.py:93 msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "Alterações detectadas de sua conta Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:145 msgctxt "@action:button" msgid "Sync" msgstr "Sincronizar" @@ -1242,8 +1200,7 @@ msgctxt "@button" msgid "Decline" msgstr "Recusar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/LicenseModel.py:10 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:56 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/LicenseModel.py:10 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:56 msgctxt "@button" msgid "Agree" msgstr "Concordar" @@ -1263,7 +1220,7 @@ msgctxt "@info:generic" msgid "You need to quit and restart {} before changes have effect." msgstr "Você precisa sair e reiniciar {} para que as alterações tenham efeito." -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:79 msgctxt "@info:generic" msgid "{} plugins failed to download" msgstr "{} complementos falharam em baixar" @@ -1298,13 +1255,13 @@ msgctxt "@item:inlistbox" msgid "Compressed COLLADA Digital Asset Exchange" msgstr "Câmbio de Ativos Digitais COLLADA Comprimido" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Pacote de Formato da Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "Não foi possível escrever no arquivo UFP:" @@ -1319,22 +1276,22 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Selecionar Atualizações" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:152 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 msgctxt "@action:button" msgid "Print via cloud" msgstr "Imprimir pela nuvem" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:155 msgctxt "@properties:tooltip" msgid "Print via cloud" msgstr "Imprimir pela nuvem" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:156 msgctxt "@info:status" msgid "Connected via cloud" msgstr "Conectado pela nuvem" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:264 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:270 #, python-brace-format msgctxt "@error:send" msgid "Unknown error code when uploading print job: {0}" @@ -1370,8 +1327,8 @@ msgstr "Impressoras adicionadas da Digital Factory:" msgctxt "info:status" msgid "A cloud connection is not available for a printer" msgid_plural "A cloud connection is not available for some printers" -msgstr[0] "Conexão de nuvem não está disponível para uma impressora." -msgstr[1] "Conexão de nuvem não está disponível para algumas impressoras." +msgstr[0] "Conexão de nuvem não está disponível para uma impressora" +msgstr[1] "Conexão de nuvem não está disponível para algumas impressoras" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:324 msgctxt "info:status" @@ -1380,8 +1337,7 @@ msgid_plural "These printers are not linked to the Digital Factory:" msgstr[0] "Esta impressora não está ligada à Digital Factory:" msgstr[1] "Estas impressoras não estão ligadas à Digital Factory:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:329 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:329 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:419 msgctxt "info:name" msgid "Ultimaker Digital Factory" msgstr "Ultimaker Digital Factory" @@ -1632,137 +1588,127 @@ msgctxt "@info:tooltip" msgid "Some things could be problematic in this print. Click to see tips for adjustment." msgstr "Algumas coisas podem ser problemáticas nesta impressão. Clique para ver dicas de correção." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:15 msgctxt "@title:window" msgid "Open Project" msgstr "Abrir Projeto" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" msgstr "Atualizar existentes" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:63 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "Criar novos" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:74 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "Resumo - Projeto do Cura" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:96 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 msgctxt "@action:label" msgid "Printer settings" msgstr "Ajustes da impressora" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:112 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:113 msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "Como o conflito na máquina deve ser resolvido?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:165 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 msgctxt "@action:label" msgid "Type" msgstr "Tipo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:181 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 msgctxt "@action:label" msgid "Printer Group" msgstr "Grupo de Impressora" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:203 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 msgctxt "@action:label" msgid "Profile settings" msgstr "Ajustes de perfil" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:219 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:221 msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "Como o conflito no perfil deve ser resolvido?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:349 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 msgctxt "@action:label" msgid "Name" msgstr "Nome" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:255 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 msgctxt "@action:label" msgid "Intent" msgstr "Objetivo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:271 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Not in profile" msgstr "Ausente no perfil" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:276 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 sobreposto" msgstr[1] "%1 sobrepostos" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:287 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:290 msgctxt "@action:label" msgid "Derivative from" msgstr "Derivado de" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:295 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 sobreposição" msgstr[1] "%1, %2 sobreposições" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:309 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:312 msgctxt "@action:label" msgid "Material settings" msgstr "Ajustes de material" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:328 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Como o conflito no material deve ser resolvido?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:369 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:373 msgctxt "@action:label" msgid "Setting visibility" msgstr "Visibilidade dos ajustes" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:378 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:382 msgctxt "@action:label" msgid "Mode" msgstr "Modo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:label" msgid "Visible settings:" msgstr "Ajustes visíveis:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:399 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:403 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 de %2" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:425 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:429 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Carregar um projeto limpará todos os modelos da mesa de impressão." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:457 msgctxt "@action:button" msgid "Open" msgstr "Abrir" @@ -1862,10 +1808,8 @@ msgctxt "@description" msgid "Backup and synchronize your Cura settings." msgstr "Fazer backup e sincronizar os ajustes do Cura." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:68 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:125 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:199 msgctxt "@button" msgid "Sign in" msgstr "Entrar" @@ -2015,8 +1959,7 @@ msgctxt "@item:inlistbox" msgid "Linear" msgstr "Linear" -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:161 -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:172 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:161 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:172 msgctxt "@item:inlistbox" msgid "Translucency" msgstr "Translucidez" @@ -2041,9 +1984,7 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "Suavização" -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:227 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:139 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:227 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:139 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@action:button" msgid "OK" msgstr "Ok" @@ -2063,18 +2004,10 @@ msgctxt "@label" msgid "Nozzle size" msgstr "Tamanho do bico" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:89 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:205 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:245 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:283 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:205 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:245 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:283 msgctxt "@label" msgid "mm" msgstr "mm" @@ -2099,12 +2032,12 @@ msgctxt "@label" msgid "Cooling Fan Number" msgstr "Número da Ventoinha de Resfriamento" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:163 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "G-Code Inicial do Extrusor" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:177 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "G-Code Final do Extrusor" @@ -2189,12 +2122,17 @@ msgctxt "@label" msgid "Number of Extruders" msgstr "Número de Extrusores" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:345 +msgctxt "@label" +msgid "Apply Extruder offsets to GCode" +msgstr "Aplicar deslocamentos de Extrusão ao G-Code" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:393 msgctxt "@title:label" msgid "Start G-code" msgstr "G-Code Inicial" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:385 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:404 msgctxt "@title:label" msgid "End G-code" msgstr "G-Code Final" @@ -2222,6 +2160,11 @@ msgctxt "@label link to technical assistance" msgid "View user manuals online" msgstr "Ver manuais de usuário online" +#: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 +msgctxt "@info" +msgid "In order to monitor your print from Cura, please connect the printer." +msgstr "Para monitorar sua impressão pelo Cura, por favor conecte a impressora." + #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" msgid "Mesh Type" @@ -2267,8 +2210,7 @@ msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Selecionar Ajustes a Personalizar para este modelo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtrar..." @@ -2278,116 +2220,129 @@ msgctxt "@label:checkbox" msgid "Show all" msgstr "Exibir tudo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:20 msgctxt "@title:window" msgid "Post Processing Plugin" msgstr "Complemento de Pós-Processamento" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:59 msgctxt "@label" msgid "Post Processing Scripts" msgstr "Scripts de Pós-Processamento" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:235 msgctxt "@action" msgid "Add a script" msgstr "Adicionar um script" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:282 msgctxt "@label" msgid "Settings" msgstr "Ajustes" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:499 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:502 msgctxt "@info:tooltip" msgid "Change active post-processing scripts." msgstr "Alterar scripts de pós-processamento ativos." -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:506 msgctxt "@info:tooltip" msgid "The following script is active:" msgid_plural "The following scripts are active:" msgstr[0] "O seguinte script está ativo:" msgstr[1] "Os seguintes scripts estão ativos:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:20 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:49 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:20 /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:49 msgctxt "@label" msgid "Color scheme" msgstr "Esquema de Cores" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:110 msgctxt "@label:listbox" msgid "Material Color" msgstr "Cor do Material" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:111 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:114 msgctxt "@label:listbox" msgid "Line Type" msgstr "Tipo de Linha" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:115 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:118 msgctxt "@label:listbox" msgid "Speed" msgstr "Velocidade" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:122 msgctxt "@label:listbox" -msgid "Layer thickness" -msgstr "Largura de camada" +msgid "Layer Thickness" +msgstr "Espessura de Camada" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:126 +msgctxt "@label:listbox" +msgid "Line Width" +msgstr "Largura de Extrusão" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 +msgctxt "@label:listbox" +msgid "Flow" +msgstr "Fluxo" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" msgid "Compatibility Mode" msgstr "Modo de Compatibilidade" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:230 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:245 msgctxt "@label" msgid "Travels" msgstr "Percursos" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:251 msgctxt "@label" msgid "Helpers" msgstr "Assistentes" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:257 msgctxt "@label" msgid "Shell" msgstr "Perímetro" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:248 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 msgctxt "@label" msgid "Infill" msgstr "Preenchimento" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:298 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:271 +msgctxt "@label" +msgid "Starts" +msgstr "Inícios" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 msgctxt "@label" msgid "Only Show Top Layers" msgstr "Somente Exibir Camadas Superiores" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:308 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:332 msgctxt "@label" msgid "Show 5 Detailed Layers On Top" msgstr "Exibir 5 Camadas Superiores Detalhadas" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:346 msgctxt "@label" msgid "Top / Bottom" msgstr "Topo / Base" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:350 msgctxt "@label" msgid "Inner Wall" msgstr "Parede Interna" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:384 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:419 msgctxt "@label" msgid "min" msgstr "mín" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:433 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:488 msgctxt "@label" msgid "max" msgstr "máx" @@ -2462,8 +2417,7 @@ msgctxt "@action:label" msgid "Website" msgstr "Sítio Web" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:46 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:46 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:20 msgctxt "@action:button" msgid "Installed" msgstr "Instalado" @@ -2478,20 +2432,17 @@ msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "Comprar rolos de material" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:96 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:34 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:96 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "Atualizar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:97 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:35 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:97 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "Atualizando" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:98 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:36 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:98 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" msgstr "Atualizado" @@ -2501,8 +2452,7 @@ msgctxt "@label" msgid "Premium" msgstr "Premium" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml:39 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml:39 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:86 msgctxt "@info:tooltip" msgid "Go to Web Marketplace" msgstr "Ir ao Mercado Web" @@ -2527,9 +2477,7 @@ msgctxt "@title:tab" msgid "Plugins" msgstr "Complementos" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:466 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 msgctxt "@title:tab" msgid "Materials" msgstr "Materiais" @@ -2574,9 +2522,8 @@ msgctxt "@button" msgid "Dismiss" msgstr "Dispensar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:178 msgctxt "@button" msgid "Next" msgstr "Próximo" @@ -2641,8 +2588,7 @@ msgctxt "@label" msgid "Last updated" msgstr "Última atualização" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:103 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:103 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "Marca" @@ -2772,9 +2718,7 @@ msgctxt "@action:button" msgid "Edit" msgstr "Editar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:156 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" @@ -2790,20 +2734,17 @@ msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Se sua impressora não está listada, leia o guia de resolução de problemas de impressão em rede" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:205 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:263 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:205 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:263 msgctxt "@label" msgid "Type" msgstr "Tipo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:279 msgctxt "@label" msgid "Firmware version" msgstr "Versão do firmware" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:295 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:295 msgctxt "@label" msgid "Address" msgstr "Endereço" @@ -2833,8 +2774,7 @@ msgctxt "@title:window" msgid "Invalid IP address" msgstr "Endereço IP inválido" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Por favor entre um endereço IP válido." @@ -2844,8 +2784,7 @@ msgctxt "@title:window" msgid "Printer Address" msgstr "Endereço da Impressora" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Entre o endereço IP da sua impressora na rede." @@ -2897,8 +2836,7 @@ msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "Sobrepor irá usar os ajustes especificados com a configuração existente da impressora. Isto pode causar falha da impressão." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:191 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:191 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:184 msgctxt "@label" msgid "Glass" @@ -2919,8 +2857,7 @@ msgctxt "@label" msgid "Delete" msgstr "Remover" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:289 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 msgctxt "@label" msgid "Resume" msgstr "Continuar" @@ -2935,9 +2872,7 @@ msgctxt "@label" msgid "Resuming..." msgstr "Continuando..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 msgctxt "@label" msgid "Pause" msgstr "Pausar" @@ -2977,8 +2912,7 @@ msgctxt "@label %1 is the name of a print job." msgid "Are you sure you want to abort %1?" msgstr "Você tem certeza que quer abortar %1?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 msgctxt "@window:title" msgid "Abort print" msgstr "Abortar impressão" @@ -2988,9 +2922,7 @@ msgctxt "@label link to Connect and Cloud interfaces" msgid "Manage printer" msgstr "Gerir Impressora" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:519 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." msgstr "Por favor atualize o firmware de sua impressora parar gerir a fila remotamente." @@ -3015,27 +2947,33 @@ msgctxt "@label:status" msgid "Idle" msgstr "Ocioso" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:365 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +msgctxt "@label:status" +msgid "Preparing..." +msgstr "Preparando..." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:369 msgctxt "@label:status" msgid "Printing" msgstr "Imprimindo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:406 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:410 msgctxt "@label" msgid "Untitled" msgstr "Sem Título" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:431 msgctxt "@label" msgid "Anonymous" msgstr "Anônimo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:458 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Requer mudanças na configuração" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:492 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:496 msgctxt "@action:button" msgid "Details" msgstr "Detalhes" @@ -3050,24 +2988,16 @@ msgctxt "@label" msgid "First available" msgstr "Primeira disponível" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "Abortado" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "Finalizado" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -msgctxt "@label:status" -msgid "Preparing..." -msgstr "Preparando..." - #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." @@ -3148,27 +3078,26 @@ msgctxt "@action:button" msgid "Sign in" msgstr "Entrar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" -msgid "Your key to connected 3D printing" -msgstr "Sua chave para impressão 3D conectada" +msgid "Sign in to the Ultimaker platform" +msgstr "Entre na plataforma Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:42 msgctxt "@text" msgid "" -"- Customize your experience with more print profiles and plugins\n" -"- Stay flexible by syncing your setup and loading it anywhere\n" -"- Increase efficiency with a remote workflow on Ultimaker printers" +"- Add material profiles and plug-ins from the Marketplace\n" +"- Back-up and sync your material profiles and plug-ins\n" +"- Share ideas and get help from 48,000+ users in the Ultimaker community" msgstr "" -"- Personalize sua experiência com mais perfis de impressão e complementos\n" -"- Mantenha-se flexível ao sincronizar sua configuração e a acessar em qualquer lugar\n" -"- Melhore a eficiência com um fluxo de trabalho remoto com as impressoras Ultimaker" +"- Adicione perfis de material e plug-ins do Marketplace\n" +"- Faça backup e sincronize seus perfis de materiais e plugins\n" +"- Compartilhe ideias e consiga ajuda de mais de 48.000 usuários da comunidade Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:142 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:62 msgctxt "@button" -msgid "Create account" -msgstr "Criar conta" +msgid "Create a free Ultimaker account" +msgstr "Criar uma conta Ultimaker gratuita" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/SyncState.qml:28 msgctxt "@label" @@ -3275,309 +3204,302 @@ msgctxt "@button" msgid "Cancel" msgstr "Cancelar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:83 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Mostra Guia de Resolução de Problemas Online" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:90 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Alternar Tela Cheia" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:98 msgctxt "@action:inmenu" msgid "Exit Full Screen" msgstr "Sair da Tela Cheia" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:105 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "Desfazer (&U)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:115 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Refazer" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:125 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "Sair (&Q)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:132 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:133 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Visão &3D" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:140 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Visão Frontal" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:147 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Visão Superior" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 +msgctxt "@action:inmenu menubar:view" +msgid "Bottom View" +msgstr "Visão de Baixo" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Visão do Lado Esquerdo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:160 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:168 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Visão do Lado Direito" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:175 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Configurar Cura..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:182 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Adicionar Impressora..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:180 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:188 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Adm&inistrar Impressoras..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:187 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Administrar Materiais..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu" msgid "Add more materials from Marketplace" msgstr "Adicionar mais materiais do Mercado" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "At&ualizar perfil com valores e sobreposições atuais" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Descartar ajustes atuais" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:222 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:230 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "&Criar perfil a partir de ajustes/sobreposições atuais..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Administrar perfis..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Exibir &Documentação Online" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Relatar um &Bug" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:260 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Novidades" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:266 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Sobre..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:273 msgctxt "@action:inmenu menubar:edit" -msgid "Delete Selected Model" -msgid_plural "Delete Selected Models" -msgstr[0] "Remover Modelo Selecionado" -msgstr[1] "Remover Modelos Selecionados" +msgid "Delete Selected" +msgstr "Remover Selecionados" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:283 msgctxt "@action:inmenu menubar:edit" -msgid "Center Selected Model" -msgid_plural "Center Selected Models" -msgstr[0] "Centralizar Modelo Selecionado" -msgstr[1] "Centralizar Modelos Selecionados" +msgid "Center Selected" +msgstr "Centralizar Selecionados" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:292 msgctxt "@action:inmenu menubar:edit" -msgid "Multiply Selected Model" -msgid_plural "Multiply Selected Models" -msgstr[0] "Multiplicar Modelo Selecionado" -msgstr[1] "Multiplicar Modelos Selecionados" +msgid "Multiply Selected" +msgstr "Multiplicar Selecionados" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Remover Modelo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:309 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Ce&ntralizar Modelo na Mesa" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:307 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "A&grupar Modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:327 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:335 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Desagrupar Modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:345 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "Co&mbinar Modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:347 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:355 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Multiplicar Modelo..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:362 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Selecionar Todos Os Modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:372 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Esvaziar a Mesa de Impressão" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:382 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Recarregar Todos Os Modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Posicionar Todos os Modelos em Todas as Plataformas de Impressão" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:390 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Posicionar Todos os Modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:406 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Posicionar Seleção" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:405 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:413 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Reestabelecer as Posições de Todos Os Modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:412 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Remover as Transformações de Todos Os Modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:419 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:429 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "Abrir Arquiv&o(s)..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:439 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Novo Projeto..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:434 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:446 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Exibir Pasta de Configuração" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:441 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:538 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Configurar a visibilidade dos ajustes..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:448 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:460 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Mercado" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:257 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Este pacote será instalado após o reinício." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 msgctxt "@title:tab" msgid "General" msgstr "Geral" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:462 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:453 msgctxt "@title:tab" msgid "Settings" msgstr "Ajustes" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:464 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 msgctxt "@title:tab" msgid "Printers" msgstr "Impressoras" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 msgctxt "@title:tab" msgid "Profiles" msgstr "Perfis" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:576 msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "Fechando %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:588 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "Tem certeza que quer sair de %1?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:638 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Abrir arquivo(s)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:744 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:737 msgctxt "@window:title" msgid "Install Package" msgstr "Instalar Pacote" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:752 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:745 msgctxt "@title:window" msgid "Open File(s)" msgstr "Abrir Arquivo(s)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:755 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:748 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Encontramos um ou mais arquivos de G-Code entre os arquivos que você selecionou. Você só pode abrir um arquivo de G-Code por vez. Se você quiser abrir um arquivo de G-Code, por favor selecione somente um." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:858 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:857 msgctxt "@title:window" msgid "Add Printer" msgstr "Adicionar Impressora" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:866 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:865 msgctxt "@title:window" msgid "What's New" msgstr "Novidades" @@ -3654,7 +3576,7 @@ msgstr "Formato de Intercâmbio de Dados" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:145 msgctxt "@label" msgid "Support library for scientific computing" -msgstr "Bibliteca de suporte para computação científica" +msgstr "Biblioteca de suporte para computação científica" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:146 msgctxt "@label" @@ -3706,8 +3628,7 @@ msgctxt "@Label" msgid "Static type checker for Python" msgstr "Verificador de tipos estáticos para Python" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@Label" msgid "Root Certificates for validating SSL trustworthiness" msgstr "Certificados raiz para validar confiança de SSL" @@ -3727,17 +3648,27 @@ msgctxt "@label" msgid "Python bindings for libnest2d" msgstr "Ligações de Python para a libnest2d" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +msgctxt "@label" +msgid "Support library for system keyring access" +msgstr "Biblioteca de suporte para acesso ao chaveiro do sistema" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" +msgid "Python extensions for Microsoft Windows" +msgstr "Extensões de python para o Microsoft Windows" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +msgctxt "@label" msgid "Font" msgstr "Fonte" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 msgctxt "@label" msgid "SVG icons" msgstr "Ícones SVG" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:165 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Implementação de aplicação multidistribuição em Linux" @@ -3747,22 +3678,22 @@ msgctxt "@title:window" msgid "Open project file" msgstr "Abrir arquivo de projeto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:88 msgctxt "@text:window" msgid "This is a Cura project file. Would you like to open it as a project or import the models from it?" msgstr "Este é um arquivo de projeto do Cura. Gostaria de abri-lo como um projeto ou importar os modelos dele?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:98 msgctxt "@text:window" msgid "Remember my choice" msgstr "Lembrar minha escolha" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:122 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:117 msgctxt "@action:button" msgid "Open as project" msgstr "Abrir como projeto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:131 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:126 msgctxt "@action:button" msgid "Import models" msgstr "Importar modelos" @@ -3793,8 +3724,7 @@ msgctxt "@title:column" msgid "Current changes" msgstr "Alterações atuais" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Sempre perguntar" @@ -3819,12 +3749,12 @@ msgctxt "@action:button" msgid "Keep changes" msgstr "Manter alterações" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 msgctxt "@text:window" msgid "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?" msgstr "Encontramos um ou mais arquivo(s) de projeto entre os arquivos que você selecionou. Você só pode abrir um arquivo de projeto por vez. Sugerimos que somente importe modelos destes arquivos. Gostaria de prosseguir?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:99 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:94 msgctxt "@action:button" msgid "Import all as models" msgstr "Importar todos como modelos" @@ -3871,8 +3801,7 @@ msgctxt "@text Print job name" msgid "Untitled" msgstr "Sem Título" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:27 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:27 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "Arquivo (&F)" @@ -3882,14 +3811,12 @@ msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "&Editar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:49 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:12 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:49 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:12 msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "&Ver" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:51 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:51 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&Settings" msgstr "Aju&stes" @@ -3979,7 +3906,7 @@ msgctxt "@label" msgid "Material" msgstr "Material" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:407 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Use cola para melhor aderência com essa combinação de materiais." @@ -4003,17 +3930,17 @@ msgctxt "@label" msgid "Number of Copies" msgstr "Número de Cópias" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:33 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:41 msgctxt "@title:menu menubar:file" msgid "&Save Project..." msgstr "&Salvar Projeto..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:54 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:74 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&Exportar..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:85 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Exportar Seleção..." @@ -4033,6 +3960,11 @@ msgctxt "@label:category menu label" msgid "Generic" msgstr "Genérico" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/OpenFilesMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Open File(s)..." +msgstr "Abrir Arquivo(s)..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -4048,6 +3980,11 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Abrir &Recente" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SaveProjectMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Save Project..." +msgstr "Salvar Projeto..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:15 msgctxt "@title:menu menubar:settings" msgid "&Printer" @@ -4073,17 +4010,17 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Desabilitar Extrusor" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:16 msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Ajustes Visíveis" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:45 msgctxt "@action:inmenu" msgid "Collapse All Categories" msgstr "Encolher Todas As Categorias" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Gerenciar Visibilidade dos Ajustes..." @@ -4093,22 +4030,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "Posição da &câmera" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:45 msgctxt "@action:inmenu menubar:view" msgid "Camera view" msgstr "Visão de câmera" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:48 msgctxt "@action:inmenu menubar:view" msgid "Perspective" msgstr "Perspectiva" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:60 msgctxt "@action:inmenu menubar:view" msgid "Orthographic" msgstr "Ortográfico" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:81 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "Plataforma de Impressão (&B)" @@ -4153,12 +4090,12 @@ msgctxt "@label:MonitorStatus" msgid "Please remove the print" msgstr "Por favor remova a impressão" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@label" msgid "Abort Print" msgstr "Abortar Impressão" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:338 msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Tem certeza que deseja abortar a impressão?" @@ -4200,314 +4137,310 @@ msgctxt "@label" msgid "Interface" msgstr "Interface" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:216 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:209 msgctxt "@label" msgid "Currency:" msgstr "Moeda:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:229 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:222 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Você precisará reiniciar a aplicação para que essas mudanças tenham efeito." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:284 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Fatiar automaticamente quando mudar ajustes." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 msgctxt "@option:check" msgid "Slice automatically" msgstr "Fatiar automaticamente" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:306 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportamento da área de visualização" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:314 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Ressaltar áreas sem suporte do modelo em vermelho. Sem suporte, estas áreas não serão impressas corretamente." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:323 msgctxt "@option:check" msgid "Display overhang" msgstr "Exibir seções pendentes" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:351 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@info:tooltip" msgid "Highlight missing or extraneous surfaces of the model using warning signs. The toolpaths will often be missing parts of the intended geometry." msgstr "Ressalta superfícies faltantes ou incorretas do modelo usando sinais de alerta. Os caminhos de extrusão frequentemente terão partes da geometria pretendida ausentes." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:342 msgctxt "@option:check" msgid "Display model errors" msgstr "Exibir erros de modelo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Move a câmera de modo que o modelo fique no centro da visão quando for selecionado" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:373 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Centralizar câmera quanto o item é selecionado" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "O comportamento default de ampliação deve ser invertido?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:388 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Inverter a direção da ampliação de câmera." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "A ampliação (zoom) deve se mover na direção do mouse?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "Ampliar com o mouse não é suportado na perspectiva ortográfica." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:409 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Ampliar na direção do mouse" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:435 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:417 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Os modelos devem ser movidos na plataforma de modo que não se sobreponham?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:440 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:422 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Assegurar que os modelos sejam mantidos separados" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:431 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Os modelos devem ser movidos pra baixo pra se assentar na plataforma de impressão?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:436 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Automaticamente fazer os modelos caírem na mesa de impressão" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:448 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Exibir mensagem de alerta no leitor de G-Code." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:457 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Mensagem de alera no leitor de G-Code" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "A Visão de Camada deve ser forçada a ficar em modo de compatibilidade?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Forçar modo de compatibilidade da visão de camadas (requer reinício)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:498 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" msgstr "O Cura deve abrir no lugar onde foi fechado?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:485 msgctxt "@option:check" msgid "Restore window position on start" msgstr "Restaurar posição da janela no início" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:513 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Que tipo de renderização de câmera deve ser usada?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:502 msgctxt "@window:text" msgid "Camera rendering:" msgstr "Renderização de câmera:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:531 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:509 msgid "Perspective" msgstr "Perspectiva" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:532 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgid "Orthographic" msgstr "Ortográfica" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:563 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:548 msgctxt "@label" msgid "Opening and saving files" msgstr "Abrindo e salvando arquivos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:555 msgctxt "@info:tooltip" msgid "Should opening files from the desktop or external applications open in the same instance of Cura?" msgstr "Arquivos da área de trabalho ou de aplicações externas devem ser abertos na mesma instância do Cura?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@option:check" msgid "Use a single instance of Cura" msgstr "Usar uma única instância do Cura" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Os modelos devem ser redimensionados dentro do volume de impressão se forem muito grandes?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@option:check" msgid "Scale large models" msgstr "Redimensionar modelos grandes" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Um modelo pode ser carregado diminuto se sua unidade for por exemplo em metros ao invés de milímetros. Devem esses modelos ser redimensionados?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Redimensionar modelos minúsculos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Os modelos devem ser selecionados após serem carregados?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Selecionar modelos ao carregar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Um prefixo baseado no nome da impressora deve ser adicionado ao nome do trabalho de impressão automaticamente?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:635 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Adicionar prefixo de máquina ao nome do trabalho" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:645 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Um resumo deve ser exibido ao salvar um arquivo de projeto?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:649 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:634 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Exibir diálogo de resumo ao salvar projeto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:659 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:644 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Comportamento default ao abrir um arquivo de projeto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:652 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Comportamento default ao abrir um arquivo de projeto: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Sempre me perguntar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:682 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Sempre abrir como projeto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:668 msgctxt "@option:openProject" msgid "Always import models" msgstr "Sempre importar modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:705 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Quando você faz alterações em um perfil e troca para um diferent, um diálogo aparecerá perguntando se você quer manter ou aplicar suas modificações, ou você pode forçar um comportamento default e não ter o diálogo." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:728 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Perfis" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Comportamento default para valores de configuração alterados ao mudar para um perfil diferente: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:748 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:734 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Sempre descartar alterações da configuração" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:749 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:735 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Sempre transferir as alterações para o novo perfil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:783 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@label" msgid "Privacy" msgstr "Privacidade" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:790 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:777 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "O Cura deve verificar novas atualizações quando o programa for iniciado?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:795 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:782 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Verificar atualizações na inicialização" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:805 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:792 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Dados anônimos sobre sua impressão podem ser enviados para a Ultimaker? Nota: nenhuma informação pessoalmente identificável, modelos ou endereços IP são enviados ou armazenados." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:810 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:797 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Enviar informação (anônima) de impressão" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:819 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:806 msgctxt "@action:button" msgid "More information" msgstr "Mais informações" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "Ativar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "Renomear" @@ -4522,67 +4455,71 @@ msgctxt "@action:button" msgid "Duplicate" msgstr "Duplicar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:171 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:171 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "Importar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:185 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:185 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 msgctxt "@action:button" msgid "Export" msgstr "Exportar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 +msgctxt "@action:button Sending materials to printers" +msgid "Sync with Printers" +msgstr "Sincronizar com Impressoras" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" msgid "Printer" msgstr "Impressora" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:298 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Confirmar Remoção" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:301 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Tem certeza que deseja remover %1? Isto não poderá ser desfeito!" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 msgctxt "@title:window" msgid "Import Material" msgstr "Importar Material" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:338 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Não foi possível importar material %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:328 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:342 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Material %1 importado com sucesso" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:346 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 msgctxt "@title:window" msgid "Export Material" msgstr "Exportar Material" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:358 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:372 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Falha em exportar material para %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:378 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Material exportado para %1 com sucesso" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 +msgctxt "@title:window" +msgid "Export All Materials" +msgstr "Exportar Todos Os Materiais" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" @@ -4668,8 +4605,7 @@ msgctxt "@label" msgid "Adhesion Information" msgstr "Informação sobre Aderência" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Ajustes de impressão" @@ -4694,53 +4630,52 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Por favor dê um nome a este perfil." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Duplicar Perfil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@title:window" msgid "Rename Profile" msgstr "Renomear Perfil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:307 msgctxt "@title:window" msgid "Import Profile" msgstr "Importar Perfil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:336 msgctxt "@title:window" msgid "Export Profile" msgstr "Exportar Perfil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:399 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Impressora: %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:557 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Atualizar perfil com ajustes/sobreposições atuais" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 msgctxt "@action:button" msgid "Discard current changes" msgstr "Descartar ajustes atuais" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:583 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Este perfil usa os defaults especificados pela impressora, portanto não tem ajustes/sobreposições na lista abaixo." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:591 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Seus ajustes atuais coincidem com o perfil selecionado." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:609 msgctxt "@title:tab" msgid "Global Settings" msgstr "Ajustes globais" @@ -4770,12 +4705,12 @@ msgctxt "@title:column" msgid "Unit" msgstr "Unidade" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:16 msgctxt "@title:tab" msgid "Setting Visibility" msgstr "Visibilidade dos Ajustes" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:48 msgctxt "@label:textbox" msgid "Check all" msgstr "Verificar tudo" @@ -4800,14 +4735,12 @@ msgctxt "@tooltip of temperature input" msgid "The temperature to pre-heat the hotend to." msgstr "A temperatura com a qual pré-aquecer o hotend." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:341 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:341 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:332 msgctxt "@button Cancel pre-heating" msgid "Cancel" msgstr "Cancelar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:344 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:344 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:335 msgctxt "@button" msgid "Pre-heat" msgstr "Pré-aquecer" @@ -5113,27 +5046,27 @@ msgctxt "@label:textbox" msgid "Search settings" msgstr "Ajustes de busca" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:456 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:468 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Copiar valor para todos os extrusores" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:477 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Copiar todos os valores alterados para todos os extrusores" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:502 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:514 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Ocultar este ajuste" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:515 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:527 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Não exibir este ajuste" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:531 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Manter este ajuste visível" @@ -5193,11 +5126,6 @@ msgctxt "@button" msgid "Add printer manually" msgstr "Adicionar impressora manualmente" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddCloudPrintersView.qml:218 -msgctxt "@button" -msgid "Finish" -msgstr "Finalizar" - #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:230 msgctxt "@label" msgid "Manufacturer" @@ -5278,8 +5206,7 @@ msgctxt "@label" msgid "Could not connect to device." msgstr "Não foi possível conectar ao dispositivo." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:207 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:212 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:207 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:212 msgctxt "@label" msgid "Can't connect to your Ultimaker printer?" msgstr "Não consegue conectar à sua impressora Ultimaker?" @@ -5304,32 +5231,32 @@ msgctxt "@button" msgid "Connect" msgstr "Conectar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:43 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" -msgid "Ultimaker Account" -msgstr "Conta da Ultimaker" +msgid "Release Notes" +msgstr "Notas de lançamento" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:124 msgctxt "@text" -msgid "Your key to connected 3D printing" -msgstr "Sua chave para a impressão 3D conectada" +msgid "Add material settings and plugins from the Marketplace" +msgstr "Adicionar ajustes de materiais e plugins do Marketplace" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:101 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:154 msgctxt "@text" -msgid "- Customize your experience with more print profiles and plugins" -msgstr "- Personalize sua experiência com mais perfis de impressão e complementos" +msgid "Backup and sync your material settings and plugins" +msgstr "Fazer backup e sincronizar seus ajustes de materiais e plugins" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:184 msgctxt "@text" -msgid "- Stay flexible by syncing your setup and loading it anywhere" -msgstr "- Flexibilize-se ao sincronizar sua configuração e a acessar de qualquer lugar" +msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" +msgstr "Compartilhe ideias e consiga ajuda de mais de 48.000 usuários da Comunidade Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:217 msgctxt "@text" -msgid "- Increase efficiency with a remote workflow on Ultimaker printers" -msgstr "- Melhore a eficiência com um fluxo de trabalho remoto com as impressoras Ultimaker" +msgid "Create a free Ultimaker Account" +msgstr "Criar uma conta Ultimaker gratuita" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:230 msgctxt "@button" msgid "Skip" msgstr "Pular" @@ -5389,29 +5316,30 @@ msgctxt "@button" msgid "Decline and close" msgstr "Rejeitar e fechar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:29 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" msgid "Welcome to Ultimaker Cura" msgstr "Bem-vindo ao Ultimaker Cura" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:68 msgctxt "@text" -msgid "" -"Please follow these steps to set up\n" -"Ultimaker Cura. This will only take a few moments." -msgstr "" -"Por favor siga estes passos para configurar\n" -"o Ultimaker Cura. Isto tomará apenas alguns momentos." +msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." +msgstr "Por favor siga estes passos para configurar o Ultimaker Cura. Isto tomará apenas alguns momentos." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:86 msgctxt "@button" msgid "Get started" msgstr "Começar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:28 msgctxt "@label" -msgid "What's new in Ultimaker Cura" -msgstr "O que há de novo no Ultimaker Cura" +msgid "What's New" +msgstr "O Que Há de Novo" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Widgets/ComboBox.qml:24 +msgctxt "@label" +msgid "No items to select from" +msgstr "Sem itens para selecionar" #: ModelChecker/plugin.json msgctxt "description" @@ -5493,6 +5421,16 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Gravador de Perfis do Cura" +#: DigitalLibrary/plugin.json +msgctxt "description" +msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." +msgstr "Conecta-se à Digital Library, permitindo ao Cura abrir arquivos dela e gravar arquivos nela." + +#: DigitalLibrary/plugin.json +msgctxt "name" +msgid "Ultimaker Digital Library" +msgstr "Digital Library da Ultimaker" + #: FirmwareUpdateChecker/plugin.json msgctxt "description" msgid "Checks for firmware updates." @@ -5963,6 +5901,26 @@ msgctxt "name" msgid "Version Upgrade 4.7 to 4.8" msgstr "Atualização de Versão de 4.7 para 4.8" +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." +msgstr "Atualiza configurações do Cura 4.8 para o Cura 4.9." + +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.8 to 4.9" +msgstr "Atualização de Versão de 4.8 para 4.9" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." +msgstr "Atualiza configurações do Cura 4.9 para o Cura 4.10." + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.9 to 4.10" +msgstr "Atualização de Versão de 4.9 para 4.10" + #: X3DReader/plugin.json msgctxt "description" msgid "Provides support for reading X3D files." @@ -5993,6 +5951,94 @@ msgctxt "name" msgid "X-Ray View" msgstr "Visão de Raios-X" +#~ msgctxt "@info:status" +#~ msgid "Global stack is missing." +#~ msgstr "A pilha global não foi encontrada." + +#~ msgctxt "@info:status" +#~ msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." +#~ msgstr "Seu modelo não é manifold. As áreas ressaltadas indicam superfícies faltantes ou incorretas." + +#~ msgctxt "@info:title" +#~ msgid "Model errors" +#~ msgstr "Erros de modelo" + +#~ msgctxt "@label:listbox" +#~ msgid "Layer thickness" +#~ msgstr "Largura de camada" + +#~ msgctxt "@label" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "Sua chave para impressão 3D conectada" + +#~ msgctxt "@text" +#~ msgid "" +#~ "- Customize your experience with more print profiles and plugins\n" +#~ "- Stay flexible by syncing your setup and loading it anywhere\n" +#~ "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "" +#~ "- Personalize sua experiência com mais perfis de impressão e complementos\n" +#~ "- Mantenha-se flexível ao sincronizar sua configuração e a acessar em qualquer lugar\n" +#~ "- Melhore a eficiência com um fluxo de trabalho remoto com as impressoras Ultimaker" + +#~ msgctxt "@button" +#~ msgid "Create account" +#~ msgstr "Criar conta" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Delete Selected Model" +#~ msgid_plural "Delete Selected Models" +#~ msgstr[0] "Remover Modelo Selecionado" +#~ msgstr[1] "Remover Modelos Selecionados" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Center Selected Model" +#~ msgid_plural "Center Selected Models" +#~ msgstr[0] "Centralizar Modelo Selecionado" +#~ msgstr[1] "Centralizar Modelos Selecionados" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Multiply Selected Model" +#~ msgid_plural "Multiply Selected Models" +#~ msgstr[0] "Multiplicar Modelo Selecionado" +#~ msgstr[1] "Multiplicar Modelos Selecionados" + +#~ msgctxt "@button" +#~ msgid "Finish" +#~ msgstr "Finalizar" + +#~ msgctxt "@label" +#~ msgid "Ultimaker Account" +#~ msgstr "Conta da Ultimaker" + +#~ msgctxt "@text" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "Sua chave para a impressão 3D conectada" + +#~ msgctxt "@text" +#~ msgid "- Customize your experience with more print profiles and plugins" +#~ msgstr "- Personalize sua experiência com mais perfis de impressão e complementos" + +#~ msgctxt "@text" +#~ msgid "- Stay flexible by syncing your setup and loading it anywhere" +#~ msgstr "- Flexibilize-se ao sincronizar sua configuração e a acessar de qualquer lugar" + +#~ msgctxt "@text" +#~ msgid "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "- Melhore a eficiência com um fluxo de trabalho remoto com as impressoras Ultimaker" + +#~ msgctxt "@text" +#~ msgid "" +#~ "Please follow these steps to set up\n" +#~ "Ultimaker Cura. This will only take a few moments." +#~ msgstr "" +#~ "Por favor siga estes passos para configurar\n" +#~ "o Ultimaker Cura. Isto tomará apenas alguns momentos." + +#~ msgctxt "@label" +#~ msgid "What's new in Ultimaker Cura" +#~ msgstr "O que há de novo no Ultimaker Cura" + #~ msgctxt "@label ({} is object name)" #~ msgid "Are you sure you wish to remove {}? This cannot be undone!" #~ msgstr "Tem certeza que deseja remover {}? Isto não pode ser desfeito!" @@ -6742,7 +6788,8 @@ msgstr "Visão de Raios-X" #~ "\n" #~ "Select your printer from the list below:" #~ msgstr "" -#~ "Para imprimir diretamente para sua impressora pela rede, por favor se certifique que a impressora esteja conectada na rede usando um cabo de rede ou conectando sua impressora na rede WIFI. Se você não conectar o Cura à sua impressora, você ainda pode usar uma unidade USB para transferir arquivos G-Code para sua impressora.\n" +#~ "Para imprimir diretamente para sua impressora pela rede, por favor se certifique que a impressora esteja conectada na rede usando um cabo de rede ou conectando sua impressora na rede WIFI. Se você não conectar o Cura à sua impressora, você ainda pode usar uma unidade USB para transferir arquivos G-" +#~ "Code para sua impressora.\n" #~ "\n" #~ "Selecione sua impressora da lista abaixo:" diff --git a/resources/i18n/pt_BR/fdmextruder.def.json.po b/resources/i18n/pt_BR/fdmextruder.def.json.po index e668592eef..0ade4ddd02 100644 --- a/resources/i18n/pt_BR/fdmextruder.def.json.po +++ b/resources/i18n/pt_BR/fdmextruder.def.json.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2020-10-25 12:57+0100\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-11 17:09+0200\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 2.1.1\n" +"X-Generator: Poedit 2.4.1\n" #: fdmextruder.def.json msgctxt "machine_settings label" @@ -90,7 +90,7 @@ msgstr "G-Code inicial a executar quando mudar para este extrusor." #: fdmextruder.def.json msgctxt "machine_extruder_start_pos_abs label" msgid "Extruder Start Position Absolute" -msgstr "Posição de Início do Extrusor Absoluta" +msgstr "Posição Absoluta de Início do Extrusor" #: fdmextruder.def.json msgctxt "machine_extruder_start_pos_abs description" @@ -130,7 +130,7 @@ msgstr "G-Code final a executar quando mudar deste extrusor para outro." #: fdmextruder.def.json msgctxt "machine_extruder_end_pos_abs label" msgid "Extruder End Position Absolute" -msgstr "Posição Final do Extrusor Absoluta" +msgstr "Posição Absoluta Final do Extrusor" #: fdmextruder.def.json msgctxt "machine_extruder_end_pos_abs description" diff --git a/resources/i18n/pt_BR/fdmprinter.def.json.po b/resources/i18n/pt_BR/fdmprinter.def.json.po index b1c41d1ed9..fea811aac4 100644 --- a/resources/i18n/pt_BR/fdmprinter.def.json.po +++ b/resources/i18n/pt_BR/fdmprinter.def.json.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2020-10-25 10:20+0100\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-06-19 06:31+0200\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 2.2.3\n" +"X-Generator: Poedit 3.0\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -45,7 +45,7 @@ msgstr "Exibir Variantes de Máquina" #: fdmprinter.def.json msgctxt "machine_show_variants description" msgid "Whether to show the different variants of this machine, which are described in separate json files." -msgstr "Opção que diz se se deseja exibir as variantes desta máquina, que são descrita em arquivos .json separados." +msgstr "Decide se deseja exibir as variantes desta máquina, que são descrita em arquivos .json separados." #: fdmprinter.def.json msgctxt "machine_start_gcode label" @@ -103,7 +103,7 @@ msgstr "Aguardar o Aquecimento da Mesa" #: fdmprinter.def.json msgctxt "material_bed_temp_wait description" msgid "Whether to insert a command to wait until the build plate temperature is reached at the start." -msgstr "Opção que diz se se deve inserir comando para aguardar que a temperatura-alvo da mesa de impressão estabilize no início." +msgstr "Decide se haverá inserção do comando para aguardar que a temperatura-alvo da mesa de impressão estabilize no início." #: fdmprinter.def.json msgctxt "material_print_temp_wait label" @@ -113,7 +113,7 @@ msgstr "Aguardar Aquecimento do Bico" #: fdmprinter.def.json msgctxt "material_print_temp_wait description" msgid "Whether to wait until the nozzle temperature is reached at the start." -msgstr "Opção que diz se se deve inserir comando para aguardar que a temperatura-alvo do bico estabilize no início." +msgstr "Decide se haverá a inserção do comando para aguardar que a temperatura-alvo do bico estabilize no início." #: fdmprinter.def.json msgctxt "material_print_temp_prepend label" @@ -123,7 +123,7 @@ msgstr "Incluir Temperaturas de Material" #: fdmprinter.def.json msgctxt "material_print_temp_prepend description" msgid "Whether to include nozzle temperature commands at the start of the gcode. When the start_gcode already contains nozzle temperature commands Cura frontend will automatically disable this setting." -msgstr "Opção que diz se se deve incluir comandos de temperatura do bico no início do G-Code. Quando o G-Code Inicial já contiver comandos de temperatura do bico, a interface do Cura automaticamente desabilitará este ajuste." +msgstr "Decide se haverá a inclusão de comandos de temperatura do bico no início do G-Code. Quando o G-Code Inicial já contiver comandos de temperatura do bico, a interface do Cura automaticamente desabilitará este ajuste." #: fdmprinter.def.json msgctxt "material_bed_temp_prepend label" @@ -133,7 +133,7 @@ msgstr "Incluir Temperatura da Mesa" #: fdmprinter.def.json msgctxt "material_bed_temp_prepend description" msgid "Whether to include build plate temperature commands at the start of the gcode. When the start_gcode already contains build plate temperature commands Cura frontend will automatically disable this setting." -msgstr "Opção que diz se se deve incluir comandos de temperatura da mesa de impressão no início do G-Code. Quando o G-Code Inicial já contiver comandos de temperatura da mesa, a interface do Cura automaticamente desabilitará este ajuste." +msgstr "Decide se haverá a inclusão de comandos de temperatura da mesa de impressão no início do G-Code. Quando o G-Code Inicial já contiver comandos de temperatura da mesa, a interface do Cura automaticamente desabilitará este ajuste." #: fdmprinter.def.json msgctxt "machine_width label" @@ -213,7 +213,7 @@ msgstr "Tem Mesa Aquecida" #: fdmprinter.def.json msgctxt "machine_heated_bed description" msgid "Whether the machine has a heated build plate present." -msgstr "Indica se a plataforma de impressão pode ser aquecida." +msgstr "Decide se a plataforma de impressão pode ser aquecida." #: fdmprinter.def.json msgctxt "machine_heated_build_volume label" @@ -223,7 +223,7 @@ msgstr "Tem Estabilização de Temperatura do Volume de Impressão" #: fdmprinter.def.json msgctxt "machine_heated_build_volume description" msgid "Whether the machine is able to stabilize the build volume temperature." -msgstr "Indica se a máquina consegue estabilizar a temperatura do volume de construção." +msgstr "Decide se a máquina consegue estabilizar a temperatura do volume de construção." #: fdmprinter.def.json msgctxt "machine_always_write_active_tool label" @@ -243,7 +243,7 @@ msgstr "Origem é no Centro" #: fdmprinter.def.json msgctxt "machine_center_is_zero description" msgid "Whether the X/Y coordinates of the zero position of the printer is at the center of the printable area." -msgstr "Indica se as coordenadas X/Y da posição zero da impressão estão no centro da área imprimível (senão, estarão no canto inferior esquerdo)." +msgstr "Decide se as coordenadas X/Y da posição zero da impressão estão no centro da área imprimível (senão, estarão no canto inferior esquerdo)." #: fdmprinter.def.json msgctxt "machine_extruder_count label" @@ -313,7 +313,7 @@ msgstr "Habilitar Controle de Temperatura do Bico" #: fdmprinter.def.json msgctxt "machine_nozzle_temp_enabled description" msgid "Whether to control temperature from Cura. Turn this off to control nozzle temperature from outside of Cura." -msgstr "Opção que diz se a temperatura deve ser controlada pelo Cura. Desligue para controlar a temperatura do bico fora do Cura." +msgstr "Decide se a temperatura deve ser controlada pelo Cura. Desligue para controlar a temperatura do bico fora do Cura." #: fdmprinter.def.json msgctxt "machine_nozzle_heat_up_speed label" @@ -408,7 +408,7 @@ msgstr "Retração de Firmware" #: fdmprinter.def.json msgctxt "machine_firmware_retract description" msgid "Whether to use firmware retract commands (G10/G11) instead of using the E property in G1 commands to retract the material." -msgstr "Opção que diz se se deve usar comandos de retração de firmware (G10/G11) ao invés da propriedade E dos comandos G1 para retrair o material." +msgstr "Decide se serão usados comandos de retração de firmware (G10/G11) ao invés da propriedade E dos comandos G1 para retrair o material." #: fdmprinter.def.json msgctxt "machine_extruders_share_heater label" @@ -418,7 +418,27 @@ msgstr "Extrusores Compartilham Aquecedor" #: fdmprinter.def.json msgctxt "machine_extruders_share_heater description" msgid "Whether the extruders share a single heater rather than each extruder having its own heater." -msgstr "Opção que diz se os extrusores usam um único aquecedor combinado ou cada um tem o seu respectivo aquecedor." +msgstr "Decide se os extrusores usam um único aquecedor combinado ou cada um tem o seu respectivo aquecedor." + +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle label" +msgid "Extruders Share Nozzle" +msgstr "Extrusores Compartilham o Bico" + +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle description" +msgid "Whether the extruders share a single nozzle rather than each extruder having its own nozzle. When set to true, it is expected that the printer-start gcode script properly sets up all extruders in an initial retraction state that is known and mutually compatible (either zero or one filament not retracted); in that case the initial retraction status is described, per extruder, by the 'machine_extruders_shared_nozzle_initial_retraction' parameter." +msgstr "Decide se os extrusores compartilham um único bico ao invés de cada extrusor ter seu próprio. Quando colocado em verdadeiro, é esperado que o script g-code de início da impressora configure todos os extrusores em um estado inicial de retração que seja conhecido e mutuamente compatível (ou zero ou filamento não retraído); neste caso, o status de retração inicial é descrito, por extrusor, pelo parâmetro 'machine_extruders_shared_nozzle_initial_retraction'." + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction label" +msgid "Shared Nozzle Initial Retraction" +msgstr "Retração Inicial do Bico Compartilhado" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction description" +msgid "How much the filament of each extruder is assumed to have been retracted from the shared nozzle tip at the completion of the printer-start gcode script; the value should be equal to or greater than the length of the common part of the nozzle's ducts." +msgstr "Quanto é assumido que o filamento de cada extrusor tenha retraído da ponta do bico ao completar o script g-code de início da impressora; o valor deve ser igual ou superior ao comprimento da parte comum dos dutos do bico." #: fdmprinter.def.json msgctxt "machine_disallowed_areas label" @@ -468,7 +488,7 @@ msgstr "ID do Bico" #: fdmprinter.def.json msgctxt "machine_nozzle_id description" msgid "The nozzle ID for an extruder train, such as \"AA 0.4\" and \"BB 0.8\"." -msgstr "O identificador do bico para o carro extrusor, tais como \"AA 0.4\" ou \"BB 0.8.\"" +msgstr "O identificador do bico para o carro extrusor, tais como \"AA 0.4\" ou \"BB 0.8\"." #: fdmprinter.def.json msgctxt "machine_nozzle_size label" @@ -487,8 +507,8 @@ msgstr "Deslocamento com o Extrusor" #: fdmprinter.def.json msgctxt "machine_use_extruder_offset_to_offset_coords description" -msgid "Apply the extruder offset to the coordinate system." -msgstr "Aplicar o deslocamento do extrusor ao sistema de coordenadas." +msgid "Apply the extruder offset to the coordinate system. Affects all extruders." +msgstr "Aplicar o deslocamento de extrusor ao sistema de coordenadas. Afeta todos os extrusores." #: fdmprinter.def.json msgctxt "extruder_prime_pos_z label" @@ -678,7 +698,7 @@ msgstr "Endstop X na Direção Positiva" #: fdmprinter.def.json msgctxt "machine_endstop_positive_direction_x description" msgid "Whether the endstop of the X axis is in the positive direction (high X coordinate) or negative (low X coordinate)." -msgstr "Opção que diz se o endstop do eixo X está na direção positiva (coordenada X alta) ou negativa (coordenada X baixa)." +msgstr "Decide se o endstop do eixo X está na direção positiva (coordenada X alta) ou negativa (coordenada X baixa)." #: fdmprinter.def.json msgctxt "machine_endstop_positive_direction_y label" @@ -688,7 +708,7 @@ msgstr "Endstop Y na Direção Positiva" #: fdmprinter.def.json msgctxt "machine_endstop_positive_direction_y description" msgid "Whether the endstop of the Y axis is in the positive direction (high Y coordinate) or negative (low Y coordinate)." -msgstr "Opção que diz se o endstop do eixo Y está na direção positiva (coordenada Y alta) ou negativa (coordenada Y baixa)." +msgstr "Decide se o endstop do eixo Y está na direção positiva (coordenada Y alta) ou negativa (coordenada Y baixa)." #: fdmprinter.def.json msgctxt "machine_endstop_positive_direction_z label" @@ -698,7 +718,7 @@ msgstr "Endstop Z na Direção Positiva" #: fdmprinter.def.json msgctxt "machine_endstop_positive_direction_z description" msgid "Whether the endstop of the Z axis is in the positive direction (high Z coordinate) or negative (low Z coordinate)." -msgstr "Opção que diz se o endstop do eixo Z está na direção positiva (coordenada Z alta) ou negativa (coordenada Z baixa)." +msgstr "Decide se o endstop do eixo Z está na direção positiva (coordenada Z alta) ou negativa (coordenada Z baixa)." #: fdmprinter.def.json msgctxt "machine_minimum_feedrate label" @@ -882,8 +902,8 @@ msgstr "Multiplicador da largura de extrusão da primeira camada. Aumentar este #: fdmprinter.def.json msgctxt "shell label" -msgid "Shell" -msgstr "Perímetro" +msgid "Walls" +msgstr "Paredes" #: fdmprinter.def.json msgctxt "shell description" @@ -950,166 +970,6 @@ msgctxt "wall_0_wipe_dist description" msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better." msgstr "Distância do percurso inserido após a parede externa para esconder melhor a costura em Z." -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr label" -msgid "Top Surface Skin Extruder" -msgstr "Extrusor da Superfície Superior" - -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr description" -msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." -msgstr "O carro extrusor usado para imprimir a parte superior da peça. Este ajuste é usado em multi-extrusão." - -#: fdmprinter.def.json -msgctxt "roofing_layer_count label" -msgid "Top Surface Skin Layers" -msgstr "Camadas da Superfície Superior" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count description" -msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." -msgstr "O número de camadas da superfície superior. Geralmente somente uma camada é suficiente para gerar superfícies de alta qualidade." - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr label" -msgid "Top/Bottom Extruder" -msgstr "Extrusor Superior/Inferior" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr description" -msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." -msgstr "O carro extrusor usado para imprimir as paredes superiores e inferiores. Este ajuste é usado na multi-extrusão." - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness label" -msgid "Top/Bottom Thickness" -msgstr "Espessura Superior/Inferior" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness description" -msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." -msgstr "A espessura das camadas superiores e inferiores da impressão. Este valor dividido pela altura de camada define o número de camadas superiores e inferiores." - -#: fdmprinter.def.json -msgctxt "top_thickness label" -msgid "Top Thickness" -msgstr "Espessura Superior" - -#: fdmprinter.def.json -msgctxt "top_thickness description" -msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." -msgstr "A espessura das camadas superiores da impressão. Este valor dividido pela altura de camada define o número de camadas superiores." - -#: fdmprinter.def.json -msgctxt "top_layers label" -msgid "Top Layers" -msgstr "Camadas Superiores" - -#: fdmprinter.def.json -msgctxt "top_layers description" -msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." -msgstr "O número de camadas superiores. Quando calculado da espessura superior, este valor é arredondado para um inteiro." - -#: fdmprinter.def.json -msgctxt "bottom_thickness label" -msgid "Bottom Thickness" -msgstr "Espessura Inferior" - -#: fdmprinter.def.json -msgctxt "bottom_thickness description" -msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." -msgstr "A espessura das camadas inferiores da impressão. Este valor dividido pela altura de camada define o número de camadas inferiores." - -#: fdmprinter.def.json -msgctxt "bottom_layers label" -msgid "Bottom Layers" -msgstr "Camadas Inferiores" - -#: fdmprinter.def.json -msgctxt "bottom_layers description" -msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "O número de camadas inferiores. Quando calculado da espessura inferior, este valor é arredondado para um inteiro." - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers label" -msgid "Initial Bottom Layers" -msgstr "Camadas Inferiores Iniciais" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers description" -msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "O número de camadas inferiores iniciais da plataforma de impressão pra cima. Quanto calculado a partir da espessura inferior, esse valor é arrendado para um número inteiro." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern label" -msgid "Top/Bottom Pattern" -msgstr "Padrão Superior/Inferior" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern description" -msgid "The pattern of the top/bottom layers." -msgstr "Padrão ou Estampa das camadas superiores e inferiores." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option lines" -msgid "Lines" -msgstr "Linhas" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option concentric" -msgid "Concentric" -msgstr "Concêntrico" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option zigzag" -msgid "Zig Zag" -msgstr "Ziguezague" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 label" -msgid "Bottom Pattern Initial Layer" -msgstr "Camada Inicial do Padrão da Base" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 description" -msgid "The pattern on the bottom of the print on the first layer." -msgstr "O padrão na base da impressão na primeira camada." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option lines" -msgid "Lines" -msgstr "Linhas" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option concentric" -msgid "Concentric" -msgstr "Concêntrico" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option zigzag" -msgid "Zig Zag" -msgstr "Ziguezague" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons label" -msgid "Connect Top/Bottom Polygons" -msgstr "Conectar Polígonos do Topo e Base" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." -msgstr "Conectar caminhos de contorno da base e topo quando estiverem próximos entre si. Para o padrão concêntrico, habilitar este ajuste reduzirá bastante o tempo de percurso, mas por as conexões poderem acontecer no meio do preenchimento, este recurso pode reduzir a qualidade da superfície superior." - -#: fdmprinter.def.json -msgctxt "skin_angles label" -msgid "Top/Bottom Line Directions" -msgstr "Direções de Linha Superior/Inferior" - -#: fdmprinter.def.json -msgctxt "skin_angles description" -msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." -msgstr "Uma lista de direções de linha inteiras para usar quando as camadas superiores e inferiores usarem os padrões de linha ou ziguezague. Elementos desta lista são usados sequencialmente à medida que as camadas progridem e quando o fim da lista é alcançado, ela inicia novamente. Os itens da lista são separados por vírgulas e a lita inteira é contida em colchetes. O default é uma lista vazia, o que significa usar os ângulos default (45 e 135 graus)." - #: fdmprinter.def.json msgctxt "wall_0_inset label" msgid "Outer Wall Inset" @@ -1415,6 +1275,176 @@ msgctxt "z_seam_relative description" msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate." msgstr "Quando habilitado, as coordenadas da costura Z são relativas ao centro de cada parte. Quando desabilitado, as coordenadas definem uma posição absoluta na plataforma de impressão." +#: fdmprinter.def.json +msgctxt "top_bottom label" +msgid "Top/Bottom" +msgstr "Superior/Inferior" + +#: fdmprinter.def.json +msgctxt "top_bottom description" +msgid "Top/Bottom" +msgstr "Superior/Inferior" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr label" +msgid "Top Surface Skin Extruder" +msgstr "Extrusor da Superfície Superior" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr description" +msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." +msgstr "O carro extrusor usado para imprimir a parte superior da peça. Este ajuste é usado em multi-extrusão." + +#: fdmprinter.def.json +msgctxt "roofing_layer_count label" +msgid "Top Surface Skin Layers" +msgstr "Camadas da Superfície Superior" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count description" +msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." +msgstr "O número de camadas da superfície superior. Geralmente somente uma camada é suficiente para gerar superfícies de alta qualidade." + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr label" +msgid "Top/Bottom Extruder" +msgstr "Extrusor Superior/Inferior" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr description" +msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." +msgstr "O carro extrusor usado para imprimir as paredes superiores e inferiores. Este ajuste é usado na multi-extrusão." + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness label" +msgid "Top/Bottom Thickness" +msgstr "Espessura Superior/Inferior" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness description" +msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." +msgstr "A espessura das camadas superiores e inferiores da impressão. Este valor dividido pela altura de camada define o número de camadas superiores e inferiores." + +#: fdmprinter.def.json +msgctxt "top_thickness label" +msgid "Top Thickness" +msgstr "Espessura Superior" + +#: fdmprinter.def.json +msgctxt "top_thickness description" +msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." +msgstr "A espessura das camadas superiores da impressão. Este valor dividido pela altura de camada define o número de camadas superiores." + +#: fdmprinter.def.json +msgctxt "top_layers label" +msgid "Top Layers" +msgstr "Camadas Superiores" + +#: fdmprinter.def.json +msgctxt "top_layers description" +msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." +msgstr "O número de camadas superiores. Quando calculado da espessura superior, este valor é arredondado para um inteiro." + +#: fdmprinter.def.json +msgctxt "bottom_thickness label" +msgid "Bottom Thickness" +msgstr "Espessura Inferior" + +#: fdmprinter.def.json +msgctxt "bottom_thickness description" +msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." +msgstr "A espessura das camadas inferiores da impressão. Este valor dividido pela altura de camada define o número de camadas inferiores." + +#: fdmprinter.def.json +msgctxt "bottom_layers label" +msgid "Bottom Layers" +msgstr "Camadas Inferiores" + +#: fdmprinter.def.json +msgctxt "bottom_layers description" +msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "O número de camadas inferiores. Quando calculado da espessura inferior, este valor é arredondado para um inteiro." + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "Camadas Inferiores Iniciais" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "O número de camadas inferiores iniciais da plataforma de impressão pra cima. Quanto calculado a partir da espessura inferior, esse valor é arrendado para um número inteiro." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern label" +msgid "Top/Bottom Pattern" +msgstr "Padrão Superior/Inferior" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern description" +msgid "The pattern of the top/bottom layers." +msgstr "Padrão ou Estampa das camadas superiores e inferiores." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option lines" +msgid "Lines" +msgstr "Linhas" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option concentric" +msgid "Concentric" +msgstr "Concêntrico" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option zigzag" +msgid "Zig Zag" +msgstr "Ziguezague" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 label" +msgid "Bottom Pattern Initial Layer" +msgstr "Camada Inicial do Padrão da Base" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 description" +msgid "The pattern on the bottom of the print on the first layer." +msgstr "O padrão na base da impressão na primeira camada." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option lines" +msgid "Lines" +msgstr "Linhas" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option concentric" +msgid "Concentric" +msgstr "Concêntrico" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option zigzag" +msgid "Zig Zag" +msgstr "Ziguezague" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons label" +msgid "Connect Top/Bottom Polygons" +msgstr "Conectar Polígonos do Topo e Base" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons description" +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "Conectar caminhos de contorno da base e topo quando estiverem próximos entre si. Para o padrão concêntrico, habilitar este ajuste reduzirá bastante o tempo de percurso, mas por as conexões poderem acontecer no meio do preenchimento, este recurso pode reduzir a qualidade da superfície superior." + +#: fdmprinter.def.json +msgctxt "skin_angles label" +msgid "Top/Bottom Line Directions" +msgstr "Direções de Linha Superior/Inferior" + +#: fdmprinter.def.json +msgctxt "skin_angles description" +msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." +msgstr "Uma lista de direções de linha inteiras para usar quando as camadas superiores e inferiores usarem os padrões de linha ou ziguezague. Elementos desta lista são usados sequencialmente à medida que as camadas progridem e quando o fim da lista é alcançado, ela inicia novamente. Os itens da lista são separados por vírgulas e a lita inteira é contida em colchetes. O default é uma lista vazia, o que significa usar os ângulos default (45 e 135 graus)." + #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" msgid "No Skin in Z Gaps" @@ -1555,6 +1585,86 @@ msgctxt "skin_overlap_mm description" msgid "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any value over half the width of the wall may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall." msgstr "Ajusta a quantidade de sobreposição entre as paredes e (os extermos de) linhas centrais do contorno. Uma sobreposição pequena permite que as paredes se conectem firmemente ao contorno. Note que, dados uma largura de contorno e filete de parede iguais, qualquer valor maior que metade da largura da parede pode fazer com que o contorno ultrapasse a parede, pois a este ponto a posição do bico do extrusor de contorno pode já ter passado do meio da parede." +#: fdmprinter.def.json +msgctxt "skin_preshrink label" +msgid "Skin Removal Width" +msgstr "Largura de Remoção de Contorno" + +#: fdmprinter.def.json +msgctxt "skin_preshrink description" +msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." +msgstr "A maior largura das áreas de contorno que serão removidas. Cada área de contorno menor que este valor desaparecerá. Isto pode ajudar em limitar a quantidade de tempo e material gastos em impressão de contornos inferiores e superiores em superfícies inclinadas do modelo." + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink label" +msgid "Top Skin Removal Width" +msgstr "Largura de Remoção do Contorno Superior" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink description" +msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." +msgstr "A maior largura das áreas de contorno superiores que serão removidas. Cada área de contorno menor que este valor desaparecerá. Isto pode ajudar em limitar a quantidade de tempo e material gastos em impressão de contornos superiores em superfícies inclinadas do modelo." + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink label" +msgid "Bottom Skin Removal Width" +msgstr "Largura de Remoção do Contorno Inferior" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink description" +msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." +msgstr "A maior largura das áreas de contorno inferiores que serão removidas. Cada área de contorno menor que este valor desaparecerá. Isto pode ajudar em limitar a quantidade de tempo e material gastos em impressão de contornos inferiores em superfícies inclinadas do modelo." + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance label" +msgid "Skin Expand Distance" +msgstr "Distância de Expansão do Contorno" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance description" +msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." +msgstr "A distância em que os contornos são expandidos pra dentro do preenchimento. Valores mais altos fazem o contorno aderir melhor ao padrão de preenchimento e faz as paredes de camadas vizinhas aderirem melhor ao contorno. Valores menores diminuem a quantidade de material usado." + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance label" +msgid "Top Skin Expand Distance" +msgstr "Distância de Expansão do Contorno Superior" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance description" +msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." +msgstr "A distância com que os contornos superiores são expandidos para dentro do preenchimento. Valores mais altos fazem o contorno se anexar melhor ao padrão de preenchimento e fazem as paredes da camada acima aderirem melhor ao contorno. Valores mais baixos economizam a quantidade de material usado." + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance label" +msgid "Bottom Skin Expand Distance" +msgstr "Distância de Expansão do Contorno Inferior" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance description" +msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." +msgstr "A distância com que os contornos inferiores são expandidos para dentro do preenchimento. Valores mais altos fazem o contorno se anexar melhor ao padrão de preenchimento e fazem as paredes da camada abaixo aderirem melhor ao contorno. Valores mais baixos economizam a quantidade de material usado." + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion label" +msgid "Maximum Skin Angle for Expansion" +msgstr "Ângulo Máximo do Contorno para Expansão" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion description" +msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded." +msgstr "Superfícies superiores e/ou inferiores de seu objeto com um ângulo maior que este ajuste não terão seu contorno expandido. Isto permite evitar a expansão de áreas estreitas de contorno que são criadas quando a superfície do modelo tem uma inclinação quase vertical. Um ângulo de 0° é horizontal e não causará expansão no contorno, enquanto que um ângulo de 90° é vertical e causará expansão em todo o contorno." + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion label" +msgid "Minimum Skin Width for Expansion" +msgstr "Largura Mínima de Contorno para Expansão" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion description" +msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." +msgstr "Áreas de contorno mais estreitas que esta não são expandidas. Isto evita expandir as áreas estreitas que são criadas quando a superfície do modelo tem inclinações quase verticais." + #: fdmprinter.def.json msgctxt "infill label" msgid "Infill" @@ -1864,86 +1974,6 @@ msgctxt "infill_support_angle description" msgid "The minimum angle of internal overhangs for which infill is added. At a value of 0° objects are totally filled with infill, 90° will not provide any infill." msgstr "O ângulo mínimo de seções pendentes internas para as quais o preenchimento é adicionado. Em um valor de 0°, objetos são completamente preenchidos no padrão escolhido, e 90° torna o volume oco, sem preenchimento." -#: fdmprinter.def.json -msgctxt "skin_preshrink label" -msgid "Skin Removal Width" -msgstr "Largura de Remoção de Contorno" - -#: fdmprinter.def.json -msgctxt "skin_preshrink description" -msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." -msgstr "A maior largura das áreas de contorno que serão removidas. Cada área de contorno menor que este valor desaparecerá. Isto pode ajudar em limitar a quantidade de tempo e material gastos em impressão de contornos inferiores e superiores em superfícies inclinadas do modelo." - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink label" -msgid "Top Skin Removal Width" -msgstr "Largura de Remoção do Contorno Superior" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink description" -msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." -msgstr "A maior largura das áreas de contorno superiores que serão removidas. Cada área de contorno menor que este valor desaparecerá. Isto pode ajudar em limitar a quantidade de tempo e material gastos em impressão de contornos superiores em superfícies inclinadas do modelo." - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink label" -msgid "Bottom Skin Removal Width" -msgstr "Largura de Remoção do Contorno Inferior" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink description" -msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." -msgstr "A maior largura das áreas de contorno inferiores que serão removidas. Cada área de contorno menor que este valor desaparecerá. Isto pode ajudar em limitar a quantidade de tempo e material gastos em impressão de contornos inferiores em superfícies inclinadas do modelo." - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance label" -msgid "Skin Expand Distance" -msgstr "Distância de Expansão do Contorno" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance description" -msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." -msgstr "A distância em que os contornos são expandidos pra dentro do preenchimento. Valores mais altos fazem o contorno aderir melhor ao padrão de preenchimento e faz as paredes de camadas vizinhas aderirem melhor ao contorno. Valores menores diminuem a quantidade de material usado." - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance label" -msgid "Top Skin Expand Distance" -msgstr "Distância de Expansão do Contorno Superior" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance description" -msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." -msgstr "A distância com que os contornos superiores são expandidos para dentro do preenchimento. Valores mais altos fazem o contorno se anexar melhor ao padrão de preenchimento e fazem as paredes da camada acima aderirem melhor ao contorno. Valores mais baixos economizam a quantidade de material usado." - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance label" -msgid "Bottom Skin Expand Distance" -msgstr "Distância de Expansão do Contorno Inferior" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance description" -msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." -msgstr "A distância com que os contornos inferiores são expandidos para dentro do preenchimento. Valores mais altos fazem o contorno se anexar melhor ao padrão de preenchimento e fazem as paredes da camada abaixo aderirem melhor ao contorno. Valores mais baixos economizam a quantidade de material usado." - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion label" -msgid "Maximum Skin Angle for Expansion" -msgstr "Ângulo Máximo do Contorno para Expansão" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion description" -msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." -msgstr "Superfícies Superiores e/ou Inferiores de seu objeto com um ângulo maior que este ajuste não terão seus contornos superior/inferior expandidos. Isto evita que expandam as áreas estreitas de contorno que são criadas quando a superfície do modelo tem uma inclinação praticamente vertical. Um ângulo de 0° é horizontal, um ângulo de 90° é vertical." - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion label" -msgid "Minimum Skin Width for Expansion" -msgstr "Largura Mínima de Contorno para Expansão" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion description" -msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." -msgstr "Áreas de contorno mais estreitas que esta não são expandidas. Isto evita expandir as áreas estreitas que são criadas quando a superfície do modelo tem inclinações quase verticais." - #: fdmprinter.def.json msgctxt "skin_edge_support_thickness label" msgid "Skin Edge Support Thickness" @@ -2561,8 +2591,8 @@ msgstr "Velocidade da Camada Inicial" #: fdmprinter.def.json msgctxt "speed_layer_0 description" -msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." -msgstr "A velocidade para a camada inicial. Um valor menor é aconselhado para aprimorar a aderência à mesa de impressão." +msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate. Does not affect the build plate adhesion structures themselves, like brim and raft." +msgstr "A velocidade para a camada inicial. Um valor menor é sugerido para melhorar aderência à mesa de impressão. Não afeta as estruturas de aderência à mesa de impressão como o brim e o raft." #: fdmprinter.def.json msgctxt "speed_print_layer_0 label" @@ -3171,8 +3201,8 @@ msgstr "Máxima Distância de Combing Sem Retração" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" -msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." -msgstr "Quando não-zero, os movimentos de percurso de combing que são maiores que esta distância usarão retração." +msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." +msgstr "Quando maior que zero, os movimentos de percurso de combing que forem maiores que essa distância usarão retração. Se deixado em zero, não haverá máximo e os movimentos de combing não usarão retração." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" @@ -3777,7 +3807,7 @@ msgstr "Prioridade das Distâncias de Suporte" #: fdmprinter.def.json msgctxt "support_xy_overrides_z description" msgid "Whether the Support X/Y Distance overrides the Support Z Distance or vice versa. When X/Y overrides Z the X/Y distance can push away the support from the model, influencing the actual Z distance to the overhang. We can disable this by not applying the X/Y distance around overhangs." -msgstr "Opção que diz se a distância XY substitui a distância Z de suporte ou vice-versa. Quando XY substitui Z a distância XY pode afastar o suporte do modelo, influenciando a distância Z real até a seção pendente. Podemos desabilitar isso não aplicando a distância XY em volta das seções pendentes." +msgstr "Decide se a distância XY substitui a distância Z de suporte ou vice-versa. Quando XY substitui Z a distância XY pode afastar o suporte do modelo, influenciando a distância Z real até a seção pendente. Podemos desabilitar isso não aplicando a distância XY em volta das seções pendentes." #: fdmprinter.def.json msgctxt "support_xy_overrides_z option xy_overrides_z" @@ -4302,7 +4332,7 @@ msgstr "Habilitar Massa de Purga" #: fdmprinter.def.json msgctxt "prime_blob_enable description" msgid "Whether to prime the filament with a blob before printing. Turning this setting on will ensure that the extruder will have material ready at the nozzle before printing. Printing Brim or Skirt can act like priming too, in which case turning this setting off saves some time." -msgstr "Indica se é preciso descarregar o filamento com uma massa de purga antes de imprimir. Ligar este ajuste assegurará que o extrusor tenha material pronto no bico antes de imprimir. Imprimir um Brim ou Skirt pode funcionar como purga também, em cujo caso desligar esse ajuste faz ganhar algum tempo." +msgstr "Decide se é preciso descarregar o filamento com uma massa de purga antes de imprimir. Ligar este ajuste assegurará que o extrusor tenha material pronto no bico antes de imprimir. Imprimir um Brim ou Skirt pode funcionar como purga também, em cujo caso desligar esse ajuste faz ganhar algum tempo." #: fdmprinter.def.json msgctxt "extruder_prime_pos_x label" @@ -5046,7 +5076,7 @@ msgstr "Sequência de Impressão" #: fdmprinter.def.json msgctxt "print_sequence description" msgid "Whether to print all models one layer at a time or to wait for one model to finish, before moving on to the next. One at a time mode is possible if a) only one extruder is enabled and b) all models are separated in such a way that the whole print head can move in between and all models are lower than the distance between the nozzle and the X/Y axes." -msgstr "Ajuste para decidir se os modelos devem ser impressos todos de uma vez só, uma camada por vez, ou se se deve esperar a cada modelo terminar antes de prosseguir para o próximo. O modo um de cada vez só é possível se a) somente um extrusor estiver habilitado e b) todos os modelos estiverem separados de modo que a cabeça de impressão pode se mover entre todos e todos os modelos estiverem em altura mais baixa que a distância entre o bico e os eixos X e Y." +msgstr "Decide se os modelos devem ser impressos todos de uma vez só, uma camada por vez, ou se se deve esperar a cada modelo terminar antes de prosseguir para o próximo. O modo um de cada vez só é possível se a) somente um extrusor estiver habilitado e b) todos os modelos estiverem separados de modo que a cabeça de impressão pode se mover entre todos e todos os modelos estiverem em altura mais baixa que a distância entre o bico e os eixos X e Y." #: fdmprinter.def.json msgctxt "print_sequence option all_at_once" @@ -5075,8 +5105,8 @@ msgstr "Hierarquia do Processamento de Malha" #: fdmprinter.def.json msgctxt "infill_mesh_order description" -msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." -msgstr "Determina a prioridade desta malha ao considerar múltiplas malhas de preenchimento sobrepostas. Áreas onde elas se sobrepõem terão as configurações da malha com o menor número. Uma malha de prenchimento de ordem maior modificará o preenchimento das malhas de preenchimento com as malhas de ordem mais baixa e normais." +msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the highest rank. An infill mesh with a higher rank will modify the infill of infill meshes with lower rank and normal meshes." +msgstr "Determina a prioridade desta malha ao considerar múltiplas malhas de preenchimento sobrepostas. Áreas onde múltiplas malhas de preenchimento se sobrepõem terão os ajustes da malha com a maior prioridade. Uma malha de preenchimento com prioridade maior modificará o preenchimento tanto das malhas de preenchimento com prioridade menor quanto das malhas normais." #: fdmprinter.def.json msgctxt "cutting_mesh label" @@ -5423,6 +5453,16 @@ msgctxt "conical_overhang_angle description" msgid "The maximum angle of overhangs after the they have been made printable. At a value of 0° all overhangs are replaced by a piece of model connected to the build plate, 90° will not change the model in any way." msgstr "O ângulo máximo de seçọes pendentes depois de se tornarem imprimíveis. Com o valor de 0° todas as seções pendentes serão trocadas por uma parte do modelo conectada à mesa e 90° não mudará o modelo." +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size label" +msgid "Maximum Overhang Hole Area" +msgstr "Área Máxima de Furo de Seções Pendentes" + +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size description" +msgid "The maximum area of a hole in the base of the model before it's removed by Make Overhang Printable. Holes smaller than this will be retained. A value of 0 mm² will fill all holes in the models base." +msgstr "A área máxima de um furo na base do modelo antes que seja removido por \"Torna Seções Pendentes Imprimíveis\". Furos com área menor que esta serão retidos. O valor de 0 mm² preenche todos os furos na base do modelo." + #: fdmprinter.def.json msgctxt "coasting_enable label" msgid "Enable Coasting" @@ -6120,7 +6160,7 @@ msgstr "Limpar o Bico Entre Camadas" #: fdmprinter.def.json msgctxt "clean_between_layers description" msgid "Whether to include nozzle wipe G-Code between layers (maximum 1 per layer). Enabling this setting could influence behavior of retract at layer change. Please use Wipe Retraction settings to control retraction at layers where the wipe script will be working." -msgstr "Opção que diz se se deve incluir G-Code de limpeza de bico entre camadas (no máximo 1 por camada). Habilitar este ajuste pode influenciar o comportamento de retração na mudança de camada. Por favor use ajustes de Retração de Limpeza para controlar retração nas camadas onde o script de limpeza estará atuando." +msgstr "Decide se haverá inclusão de G-Code de limpeza de bico entre camadas (no máximo 1 por camada). Habilitar este ajuste pode influenciar o comportamento de retração na mudança de camada. Por favor use ajustes de Retração de Limpeza para controlar retração nas camadas onde o script de limpeza estará atuando." #: fdmprinter.def.json msgctxt "max_extrusion_before_wipe label" @@ -6320,7 +6360,7 @@ msgstr "Centralizar Objeto" #: fdmprinter.def.json msgctxt "center_object description" msgid "Whether to center the object on the middle of the build platform (0,0), instead of using the coordinate system in which the object was saved." -msgstr "Opção que diz se o objeto deve ser centralizado no meio da plataforma de impressão, ao invés de usar o sistema de coordenadas em que o objeto foi salvo." +msgstr "Decide se o objeto deve ser centralizado no meio da plataforma de impressão, ao invés de usar o sistema de coordenadas em que o objeto foi salvo." #: fdmprinter.def.json msgctxt "mesh_position_x label" @@ -6362,6 +6402,30 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Matriz de transformação a ser aplicada ao modelo após o carregamento do arquivo." +#~ msgctxt "retraction_combing_max_distance description" +#~ msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." +#~ msgstr "Quando não-zero, os movimentos de percurso de combing que são maiores que esta distância usarão retração." + +#~ msgctxt "machine_use_extruder_offset_to_offset_coords description" +#~ msgid "Apply the extruder offset to the coordinate system." +#~ msgstr "Aplicar o deslocamento do extrusor ao sistema de coordenadas." + +#~ msgctxt "shell label" +#~ msgid "Shell" +#~ msgstr "Perímetro" + +#~ msgctxt "max_skin_angle_for_expansion description" +#~ msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." +#~ msgstr "Superfícies Superiores e/ou Inferiores de seu objeto com um ângulo maior que este ajuste não terão seus contornos superior/inferior expandidos. Isto evita que expandam as áreas estreitas de contorno que são criadas quando a superfície do modelo tem uma inclinação praticamente vertical. Um ângulo de 0° é horizontal, um ângulo de 90° é vertical." + +#~ msgctxt "speed_layer_0 description" +#~ msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." +#~ msgstr "A velocidade para a camada inicial. Um valor menor é aconselhado para aprimorar a aderência à mesa de impressão." + +#~ msgctxt "infill_mesh_order description" +#~ msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." +#~ msgstr "Determina a prioridade desta malha ao considerar múltiplas malhas de preenchimento sobrepostas. Áreas onde elas se sobrepõem terão as configurações da malha com o menor número. Uma malha de prenchimento de ordem maior modificará o preenchimento das malhas de preenchimento com as malhas de ordem mais baixa e normais." + #~ msgctxt "material_bed_temperature description" #~ msgid "The temperature used for the heated build plate. If this is 0, the bed temperature will not be adjusted." #~ msgstr "A temperatura usada para a plataforma de impressão aquecida. Se for 0, a temperatura da mesa não será ajustada." diff --git a/resources/i18n/pt_PT/cura.po b/resources/i18n/pt_PT/cura.po index b156b94b0d..e5a738b4f8 100644 --- a/resources/i18n/pt_PT/cura.po +++ b/resources/i18n/pt_PT/cura.po @@ -1,13 +1,13 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0200\n" -"PO-Revision-Date: 2020-08-21 13:40+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0200\n" +"PO-Revision-Date: 2021-04-16 14:56+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Portuguese , Paulo Miranda , Portuguese \n" "Language: pt_PT\n" @@ -15,12 +15,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.0.7\n" +"X-Generator: Poedit 2.4.1\n" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1581 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 msgctxt "@label" @@ -91,12 +91,12 @@ msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "O perfil de rascunho foi concebido para imprimir protótipos de teste e de validação de conceitos com o objetivo de se obter uma redução significativa do tempo de impressão." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:226 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:234 msgctxt "@label" msgid "Custom Material" msgstr "Material Personalizado" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:227 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 msgctxt "@label" msgid "Custom" @@ -120,7 +120,7 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Todos os Ficheiros (*)" -#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:178 +#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:181 msgctxt "@info:title" msgid "Login failed" msgstr "Falha no início de sessão" @@ -151,28 +151,33 @@ msgctxt "@info:title" msgid "Can't Find Location" msgstr "Não é Possível Posicionar" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:104 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:116 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Não é possível criar um arquivo a partir do directório de dados do utilizador: {}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:110 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 msgctxt "@info:title" msgid "Backup" msgstr "Backup" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:123 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:135 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "Tentou restaurar um Cura backup sem existirem dados ou metadados correctos." -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:134 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:146 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that is higher than the current version." msgstr "Tentativa de reposição de uma cópia de segurança do Cura que é superior à versão atual." +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 +msgctxt "@info:backup_failed" +msgid "The following error occurred while trying to restore a Cura backup:" +msgstr "O seguinte erro ocorreu ao tentar restaurar uma cópia de segurança do Cura:" + #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -326,53 +331,53 @@ msgctxt "@action:button" msgid "Send report" msgstr "Enviar relatório" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:521 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:527 msgctxt "@info:progress" msgid "Loading machines..." msgstr "A carregar máquinas..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:528 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:534 msgctxt "@info:progress" msgid "Setting up preferences..." msgstr "A configurar as preferências..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:657 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:672 msgctxt "@info:progress" msgid "Initializing Active Machine..." msgstr "A Inicializar a Máquina Ativa..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:803 msgctxt "@info:progress" msgid "Initializing machine manager..." msgstr "A inicializar o gestor das máquinas..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:802 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:817 msgctxt "@info:progress" msgid "Initializing build volume..." msgstr "A inicializar o volume de construção..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:870 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:888 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "A configurar cenário..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:906 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:924 msgctxt "@info:progress" msgid "Loading interface..." msgstr "A carregar interface..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:911 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:929 msgctxt "@info:progress" msgid "Initializing engine..." msgstr "A inicializar o motor..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1221 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1246 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1777 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1799 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" @@ -381,22 +386,22 @@ msgstr "Apenas pode ser carregado um ficheiro G-code de cada vez. Importação { # rever! # contexto! # Atenção? -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1778 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:188 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 msgctxt "@info:title" msgid "Warning" msgstr "Aviso" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1787 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1809 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Não é possível abrir outro ficheiro enquanto o G-code estiver a carregar. Importação {0} ignorada" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 @@ -419,7 +424,7 @@ msgctxt "@info:title" msgid "Placing Object" msgstr "A Posicionar Objeto" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:92 msgctxt "@message" msgid "Could not read response." msgstr "Não foi possível ler a resposta." @@ -439,12 +444,12 @@ msgctxt "@message" msgid "Something unexpected happened when trying to log in, please try again." msgstr "Ocorreu algo inesperado ao tentar iniciar sessão, tente novamente." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:187 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:189 msgctxt "@info" msgid "Unable to start a new sign in process. Check if another sign in attempt is still active." msgstr "Não é possível iniciar um novo processo de início de sessão. Verifique se ainda está ativa outra tentativa de início de sessão." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Não é possível aceder ao servidor da conta Ultimaker." @@ -462,8 +467,8 @@ msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "O ficheiro {0} já existe. Tem a certeza de que deseja substituí-lo?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:452 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:455 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "URL de ficheiro inválido:" @@ -546,38 +551,37 @@ msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "O perfil {0} é de um formato de ficheiro desconhecido ou está corrompido." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:423 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:426 msgctxt "@label" msgid "Custom profile" msgstr "Perfil personalizado" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:439 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:442 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "O perfil não inclui qualquer tipo de qualidade." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:443 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:446 msgctxt "@info:status" -msgid "Global stack is missing." -msgstr "A pilha global está em falta." +msgid "There is no active printer yet." +msgstr "Ainda não existe qualquer impressora ativa." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:449 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:452 msgctxt "@info:status" msgid "Unable to add the profile." msgstr "Não é possível adicionar o perfil." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:463 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:466 #, python-brace-format msgctxt "@info:status" msgid "Quality type '{0}' is not compatible with the current active machine definition '{1}'." msgstr "O tipo de qualidade '{0}' não é compatível com a definição de máquina atualmente ativa '{1}'." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:468 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:471 #, python-brace-format msgctxt "@info:status" msgid "Warning: The profile is not visible because its quality type '{0}' is not available for the current configuration. Switch to a material/nozzle combination that can use this quality type." -msgstr "Aviso: o perfil não é visível porque o respetivo tipo de qualidade '{0}' não está disponível para a configuração atual. Mude para uma combinação de material/bocal" -" que possa utilizar este tipo de qualidade." +msgstr "Aviso: o perfil não é visível porque o respetivo tipo de qualidade '{0}' não está disponível para a configuração atual. Mude para uma combinação de material/bocal que possa utilizar este tipo de qualidade." #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" @@ -589,23 +593,23 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:712 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 msgctxt "@label" msgid "Nozzle" msgstr "Nozzle" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:860 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:856 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "As definições foram alteradas de forma a corresponder aos extrusores disponíveis de momento:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:862 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:858 msgctxt "@info:title" msgid "Settings updated" msgstr "Definições atualizadas" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1447 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1478 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extrusor(es) desativado(s)" @@ -618,13 +622,13 @@ msgid "Add" msgstr "Adicionar" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:263 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 msgctxt "@action:button" msgid "Finish" msgstr "Concluir" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 #: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 #: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 @@ -632,7 +636,7 @@ msgstr "Concluir" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 msgctxt "@action:button" msgid "Cancel" @@ -644,76 +648,83 @@ msgctxt "@label" msgid "Group #{group_nr}" msgstr "Grupo #{group_nr}" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Parede Exterior" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Paredes Interiores" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Revestimento" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Enchimento" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Enchimento dos Suportes" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Interface dos Suportes" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Suportes" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Contorno" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 msgctxt "@tooltip" msgid "Prime Tower" msgstr "Torre de preparação" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 msgctxt "@tooltip" msgid "Travel" msgstr "Deslocação" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 msgctxt "@tooltip" msgid "Retractions" msgstr "Retrações" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:94 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 msgctxt "@tooltip" msgid "Other" msgstr "Outro" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 msgctxt "@action:button" msgid "Next" msgstr "Seguinte" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 +msgctxt "@action:button" +msgid "Skip" +msgstr "Ignorar" + +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:173 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 msgctxt "@action:button" msgid "Close" @@ -739,29 +750,36 @@ msgstr "" "

    Descubra como assegurar a melhor qualidade e fiabilidade possível da impressão.

    \n" "

    Ver o guia de qualidade da impressão

    " -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:535 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:540 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "O ficheiro de projeto {0} contém um tipo de máquina desconhecido {1}. Não é possível importar a máquina. Em vez disso, serão importados os modelos." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:538 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:543 msgctxt "@info:title" msgid "Open Project File" msgstr "Abrir ficheiro de projeto" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:634 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:639 #, python-brace-format msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "O projeto de ficheiro {0} ficou subitamente inacessível: {1}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:635 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "Não é possível abrir o ficheiro de projeto" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:686 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:646 +#, python-brace-format +msgctxt "@info:error Don't translate the XML tags or !" +msgid "Project file {0} is corrupt: {1}." +msgstr "O ficheiro de projeto {0} está corrompido: {1}." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:698 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." @@ -799,7 +817,7 @@ msgctxt "@error:zip" msgid "The operating system does not allow saving a project file to this location or with this file name." msgstr "O sistema operativo não permite guardar um ficheiro de projeto nesta localização ou com este nome de ficheiro." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:206 msgctxt "@error:zip" msgid "Error writing 3mf file." msgstr "Erro ao gravar ficheiro 3mf." @@ -854,8 +872,8 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "A cópia de segurança excede o tamanho de ficheiro máximo." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:23 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "Ocorreu um erro ao tentar restaurar a sua cópia de segurança." @@ -865,45 +883,45 @@ msgctxt "@item:inmenu" msgid "Manage backups" msgstr "Gerir cópias de segurança" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Não é possível seccionar com o material atual, uma vez que é incompatível com a impressora ou configuração selecionada." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:411 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:420 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:429 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 msgctxt "@info:title" msgid "Unable to slice" msgstr "Não é possível Seccionar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:412 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Não é possível seccionar com as definições atuais. As seguintes definições apresentam erros: {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:410 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:436 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Não é possível seccionar devido a algumas definições por modelo. As seguintes definições apresentam erros num ou mais modelos: {error_labels}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:445 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "Não é possível seccionar porque a torre de preparação ou a(s) posição(ões) de preparação é(são) inválidas." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:428 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:454 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "Não é possível seccionar porque existem objetos associados ao extrusor %s desativado." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:463 msgctxt "@info:status" msgid "" "Please review settings and check if your models:\n" @@ -1174,28 +1192,28 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Disco Externo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:121 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:128 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled." msgstr "Quando a opção Wire Printing está ativa, o Cura não permite visualizar as camadas de uma forma precisa." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:129 msgctxt "@info:title" msgid "Simulation View" msgstr "Visualização por Camadas" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:status" msgid "Nothing is shown because you need to slice first." msgstr "Não consegue visualizar, porque precisa de fazer o seccionamento primeiro." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:title" msgid "No layers to show" msgstr "Sem camadas para visualizar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:124 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "Não mostrar esta mensagem novamente" @@ -1205,15 +1223,20 @@ msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Vista Camadas" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:70 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:71 msgctxt "@info:status" -msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." -msgstr "O seu modelo não é uma variedade. As áreas destacadas indicam superfícies extra ou em falta." +msgid "The highlighted areas indicate either missing or extraneous surfaces. Fix your model and open it again into Cura." +msgstr "As áreas destacadas indicam superfícies em falta ou separadas. Corrija o modelo e volte a abri-lo no Cura." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 msgctxt "@info:title" -msgid "Model errors" -msgstr "Erros de modelo" +msgid "Model Errors" +msgstr "Erros no modelo" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:79 +msgctxt "@action:button" +msgid "Learn more" +msgstr "Saber mais" #: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/__init__.py:12 msgctxt "@item:inmenu" @@ -1241,7 +1264,7 @@ msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "Foram detetadas alterações da sua conta Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:145 msgctxt "@action:button" msgid "Sync" msgstr "Sincronizar" @@ -1277,7 +1300,7 @@ msgctxt "@info:generic" msgid "You need to quit and restart {} before changes have effect." msgstr "É necessário reiniciar o {} para que as alterações tenham efeito." -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:79 msgctxt "@info:generic" msgid "{} plugins failed to download" msgstr "Falhou a transferência de {} plug-ins" @@ -1318,7 +1341,11 @@ msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Arquivo Ultimaker Format" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "Não é possível escrever no ficheiro UFP:" @@ -1333,22 +1360,22 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Selecionar atualizações" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:152 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 msgctxt "@action:button" msgid "Print via cloud" msgstr "Imprimir através da cloud" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:155 msgctxt "@properties:tooltip" msgid "Print via cloud" msgstr "Imprimir através da cloud" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:156 msgctxt "@info:status" msgid "Connected via cloud" msgstr "Ligada através da cloud" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:264 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:270 #, python-brace-format msgctxt "@error:send" msgid "Unknown error code when uploading print job: {0}" @@ -1448,8 +1475,12 @@ msgid "" msgid_plural "" "You are about to remove {0} printers from Cura. This action cannot be undone.\n" "Are you sure you want to continue?" -msgstr[0] "Está prestes a remover {0} impressora do Cura. Esta ação não pode ser anulada.\nTem a certeza de que pretende continuar?" -msgstr[1] "Está prestes a remover {0} impressoras do Cura. Esta ação não pode ser anulada.\nTem a certeza de que pretende continuar?" +msgstr[0] "" +"Está prestes a remover {0} impressora do Cura. Esta ação não pode ser anulada.\n" +"Tem a certeza de que pretende continuar?" +msgstr[1] "" +"Está prestes a remover {0} impressoras do Cura. Esta ação não pode ser anulada.\n" +"Tem a certeza de que pretende continuar?" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:468 msgctxt "@label" @@ -1640,76 +1671,76 @@ msgctxt "@info:tooltip" msgid "Some things could be problematic in this print. Click to see tips for adjustment." msgstr "Alguns factores podem vir a ser problemáticos nesta impressão. Clique para ver algumas sugestões para melhorar a qualidade da impressão." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:15 msgctxt "@title:window" msgid "Open Project" msgstr "Abrir Projeto" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" msgstr "Atualizar existente" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:63 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "Criar nova" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "Resumo – Projeto Cura" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 msgctxt "@action:label" msgid "Printer settings" msgstr "Definições da impressora" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:112 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:113 msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "Como deve ser resolvido o conflito da máquina?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:165 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 msgctxt "@action:label" msgid "Type" msgstr "Tipo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:181 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 msgctxt "@action:label" msgid "Printer Group" msgstr "Grupo da Impressora" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:203 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 msgctxt "@action:label" msgid "Profile settings" msgstr "Definições do perfil" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:219 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:221 msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "Como deve ser resolvido o conflito no perfil?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:349 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 msgctxt "@action:label" msgid "Name" msgstr "Nome" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:255 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 msgctxt "@action:label" msgid "Intent" msgstr "Intent" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:271 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Not in profile" @@ -1717,7 +1748,7 @@ msgstr "Inexistente no perfil" # rever! # contexto?! -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:276 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 msgctxt "@action:label" msgid "%1 override" @@ -1725,54 +1756,54 @@ msgid_plural "%1 overrides" msgstr[0] "%1 substituição" msgstr[1] "%1 substituições" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:287 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:290 msgctxt "@action:label" msgid "Derivative from" msgstr "Derivado de" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:295 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 substituição" msgstr[1] "%1, %2 substituições" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:309 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:312 msgctxt "@action:label" msgid "Material settings" msgstr "Definições de material" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:328 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Como deve ser resolvido o conflito no material?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:369 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:373 msgctxt "@action:label" msgid "Setting visibility" msgstr "Visibilidade das definições" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:378 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:382 msgctxt "@action:label" msgid "Mode" msgstr "Modo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:label" msgid "Visible settings:" msgstr "Definições visíveis:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:399 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:403 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 de %2" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:425 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:429 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Abrir um projeto irá apagar todos os modelos na base de construção." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:457 msgctxt "@action:button" msgid "Open" msgstr "Abrir" @@ -1874,8 +1905,8 @@ msgstr "Efetue a cópia de segurança e sincronize as suas definições do Cura. #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:68 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:125 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:199 msgctxt "@button" msgid "Sign in" msgstr "Iniciar sessão" @@ -2111,12 +2142,12 @@ msgctxt "@label" msgid "Cooling Fan Number" msgstr "Número de ventoinha de arrefecimento" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:163 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "G-code inicial do extrusor" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:177 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "G-code final do extrusor" @@ -2201,12 +2232,17 @@ msgctxt "@label" msgid "Number of Extruders" msgstr "Número de Extrusores" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:345 +msgctxt "@label" +msgid "Apply Extruder offsets to GCode" +msgstr "Aplicar desvios da extrusora ao GCode" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:393 msgctxt "@title:label" msgid "Start G-code" msgstr "G-code inicial" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:385 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:404 msgctxt "@title:label" msgid "End G-code" msgstr "G-code final" @@ -2234,6 +2270,11 @@ msgctxt "@label link to technical assistance" msgid "View user manuals online" msgstr "Ver manuais do utilizador online" +#: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 +msgctxt "@info" +msgid "In order to monitor your print from Cura, please connect the printer." +msgstr "Para monitorizar a sua impressão a partir do Cura, ligue a impressora." + #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" msgid "Mesh Type" @@ -2280,7 +2321,7 @@ msgid "Select Settings to Customize for this model" msgstr "Selecionar definições a personalizar para este modelo" #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtrar..." @@ -2290,32 +2331,32 @@ msgctxt "@label:checkbox" msgid "Show all" msgstr "Mostrar tudo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:20 msgctxt "@title:window" msgid "Post Processing Plugin" msgstr "Plug-in de pós-processamento" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:59 msgctxt "@label" msgid "Post Processing Scripts" msgstr "Scripts de pós-processamento" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:235 msgctxt "@action" msgid "Add a script" msgstr "Adicionar um script" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:282 msgctxt "@label" msgid "Settings" msgstr "Definições" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:499 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:502 msgctxt "@info:tooltip" msgid "Change active post-processing scripts." msgstr "Altere os scripts de pós-processamento." -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:506 msgctxt "@info:tooltip" msgid "The following script is active:" msgid_plural "The following scripts are active:" @@ -2328,58 +2369,73 @@ msgctxt "@label" msgid "Color scheme" msgstr "Esquema de cores" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:110 msgctxt "@label:listbox" msgid "Material Color" msgstr "Cor do Material" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:111 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:114 msgctxt "@label:listbox" msgid "Line Type" msgstr "Tipo de Linha" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:115 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:118 msgctxt "@label:listbox" msgid "Speed" msgstr "Velocidade" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:122 msgctxt "@label:listbox" -msgid "Layer thickness" +msgid "Layer Thickness" msgstr "Espessura da Camada" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:126 +msgctxt "@label:listbox" +msgid "Line Width" +msgstr "Diâmetro da Linha" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 +msgctxt "@label:listbox" +msgid "Flow" +msgstr "Fluxo" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" msgid "Compatibility Mode" msgstr "Modo Compatibilidade" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:230 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:245 msgctxt "@label" msgid "Travels" msgstr "Deslocações" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:251 msgctxt "@label" msgid "Helpers" msgstr "Auxiliares" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:257 msgctxt "@label" msgid "Shell" msgstr "Invólucro" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:248 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 msgctxt "@label" msgid "Infill" msgstr "Enchimento" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:298 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:271 +msgctxt "@label" +msgid "Starts" +msgstr "A Iniciar" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 msgctxt "@label" msgid "Only Show Top Layers" msgstr "Só Camadas Superiores" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:308 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:332 msgctxt "@label" msgid "Show 5 Detailed Layers On Top" msgstr "5 Camadas Superiores Detalhadas" @@ -2387,22 +2443,22 @@ msgstr "5 Camadas Superiores Detalhadas" # rever! # todas as strings com a frase # Topo / Base ?? -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:346 msgctxt "@label" msgid "Top / Bottom" msgstr "Superior / Inferior" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:350 msgctxt "@label" msgid "Inner Wall" msgstr "Parede Interior" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:384 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:419 msgctxt "@label" msgid "min" msgstr "mín" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:433 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:488 msgctxt "@label" msgid "max" msgstr "máx" @@ -2543,7 +2599,7 @@ msgid "Plugins" msgstr "Plug-ins" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 msgctxt "@title:tab" msgid "Materials" @@ -2592,6 +2648,7 @@ msgstr "Descartar" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:178 msgctxt "@button" msgid "Next" msgstr "Seguinte" @@ -2935,7 +2992,7 @@ msgid "Delete" msgstr "Eliminar" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:289 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 msgctxt "@label" msgid "Resume" msgstr "Retomar" @@ -2951,8 +3008,8 @@ msgid "Resuming..." msgstr "A recomeçar..." #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 msgctxt "@label" msgid "Pause" msgstr "Colocar em pausa" @@ -2993,7 +3050,7 @@ msgid "Are you sure you want to abort %1?" msgstr "Tem a certeza de que deseja cancelar %1?" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 msgctxt "@window:title" msgid "Abort print" msgstr "Cancelar impressão" @@ -3004,7 +3061,7 @@ msgid "Manage printer" msgstr "Gerir impressora" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." @@ -3030,27 +3087,34 @@ msgctxt "@label:status" msgid "Idle" msgstr "Inativa" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:365 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +msgctxt "@label:status" +msgid "Preparing..." +msgstr "A preparar..." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:369 msgctxt "@label:status" msgid "Printing" msgstr "A Imprimir" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:406 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:410 msgctxt "@label" msgid "Untitled" msgstr "Sem título" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:431 msgctxt "@label" msgid "Anonymous" msgstr "Anónimo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:458 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Requer alterações na configuração" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:492 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:496 msgctxt "@action:button" msgid "Details" msgstr "Detalhes" @@ -3077,12 +3141,6 @@ msgctxt "@label:status" msgid "Finished" msgstr "Impressão terminada" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -msgctxt "@label:status" -msgid "Preparing..." -msgstr "A preparar..." - #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." @@ -3165,27 +3223,27 @@ msgctxt "@action:button" msgid "Sign in" msgstr "Iniciar sessão" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" -msgid "Your key to connected 3D printing" -msgstr "A chave para a impressão 3D em rede" +msgid "Sign in to the Ultimaker platform" +msgstr "Inicie a sessão na plataforma Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:42 msgctxt "@text" msgid "" -"- Customize your experience with more print profiles and plugins\n" -"- Stay flexible by syncing your setup and loading it anywhere\n" -"- Increase efficiency with a remote workflow on Ultimaker printers" +"- Add material profiles and plug-ins from the Marketplace\n" +"- Back-up and sync your material profiles and plug-ins\n" +"- Share ideas and get help from 48,000+ users in the Ultimaker community" msgstr "" -"- Personalize a sua experiência com mais perfis e plug-ins de impressão\n" -"- Mantenha a sua flexibilidade. Sincronize a sua configuração e carregue-a em qualquer local\n" -"- Aumente a eficiência com um fluxo de trabalho remoto nas impressoras Ultimaker" +"- Adicione definições de materiais e plug-ins do Marketplace\n" +"- Efetue uma cópia de segurança e sincronize as definições de materiais e plug-ins\n" +"- Partilhe ideias e obtenha ajuda dos mais de 48.000 utilizadores da Comunidade Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:142 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:62 msgctxt "@button" -msgid "Create account" -msgstr "Criar conta" +msgid "Create a free Ultimaker account" +msgstr "Crie uma conta Ultimaker gratuita" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/SyncState.qml:28 msgctxt "@label" @@ -3292,311 +3350,310 @@ msgctxt "@button" msgid "Cancel" msgstr "Cancelar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:83 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Mostrar Guia de resolução de problemas online" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:90 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Alternar para ecrã inteiro" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:98 msgctxt "@action:inmenu" msgid "Exit Full Screen" msgstr "Sair do Ecrã Inteiro" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:105 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Desfazer" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:115 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Refazer" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:125 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Sair" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:132 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:133 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Vista 3D" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:140 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Vista Frente" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:147 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Vista Cima" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 +msgctxt "@action:inmenu menubar:view" +msgid "Bottom View" +msgstr "Vista Inferior" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Vista Lado Esquerdo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:160 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:168 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Vista Lado Direito" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:175 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Configurar Cura..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:182 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Adicionar Impressora..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:180 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:188 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Gerir Im&pressoras..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:187 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Gerir Materiais..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu" msgid "Add more materials from Marketplace" msgstr "Use o Mercado para adicionar outros materiais" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "&Atualizar perfil com as definições/substituições atuais" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Descartar alterações atuais" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:222 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:230 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "&Criar perfil a partir das definições/substituições atuais..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Gerir Perfis..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Mostrar &documentação online" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Reportar um &erro" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:260 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Novidades" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:266 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Sobre..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:273 msgctxt "@action:inmenu menubar:edit" -msgid "Delete Selected Model" -msgid_plural "Delete Selected Models" -msgstr[0] "Apagar Modelo Selecionado" -msgstr[1] "Apagar Modelos Selecionados" +msgid "Delete Selected" +msgstr "Apagar seleção" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:283 msgctxt "@action:inmenu menubar:edit" -msgid "Center Selected Model" -msgid_plural "Center Selected Models" -msgstr[0] "Centrar modelo selecionado" -msgstr[1] "Centrar modelos selecionados" +msgid "Center Selected" +msgstr "Centrar seleção" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:292 msgctxt "@action:inmenu menubar:edit" -msgid "Multiply Selected Model" -msgid_plural "Multiply Selected Models" -msgstr[0] "Multiplicar modelo selecionado" -msgstr[1] "Multiplicar modelos selecionados" +msgid "Multiply Selected" +msgstr "Multiplicar seleção" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Apagar Modelo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:309 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Ce&ntrar Modelo na Base" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:307 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "&Agrupar Modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:327 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:335 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Desagrupar Modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:345 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "&Combinar Modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:347 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:355 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Multiplicar Modelo..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:362 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Selecionar todos os modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:372 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Limpar base de construção" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:382 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Recarregar todos os modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Dispor todos os modelos em todas as bases de construção" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:390 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Dispor todos os modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:406 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Dispor seleção" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:405 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:413 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Repor todas as posições de modelos" # rever! # Cancelar todas? -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:412 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Repor Todas as Transformações do Modelo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:419 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:429 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Abrir Ficheiro(s)..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:439 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Novo Projeto..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:434 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:446 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Mostrar pasta de configuração" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:441 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:538 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Configurar visibilidade das definições..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:448 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:460 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Mercado" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:257 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Este pacote será instalado após reiniciar." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 msgctxt "@title:tab" msgid "General" msgstr "Geral" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:462 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:453 msgctxt "@title:tab" msgid "Settings" msgstr "Definições" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:464 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 msgctxt "@title:tab" msgid "Printers" msgstr "Impressoras" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 msgctxt "@title:tab" msgid "Profiles" msgstr "Perfis" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:576 msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "A fechar %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:588 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "Tem a certeza de que pretende sair de %1?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:638 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Abrir ficheiro(s)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:744 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:737 msgctxt "@window:title" msgid "Install Package" msgstr "Instalar Pacote" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:752 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:745 msgctxt "@title:window" msgid "Open File(s)" msgstr "Abrir ficheiro(s)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:755 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:748 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Encontrámos um ou mais ficheiros G-code nos ficheiros selecionados. Só é possível abrir um ficheiro G-code de cada vez. Se pretender abrir um ficheiro G-code, selecione apenas um." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:858 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:857 msgctxt "@title:window" msgid "Add Printer" msgstr "Adicionar Impressora" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:866 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:865 msgctxt "@title:window" msgid "What's New" msgstr "Novidades" @@ -3748,18 +3805,28 @@ msgctxt "@label" msgid "Python bindings for libnest2d" msgstr "Ligações Python para libnest2d" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +msgctxt "@label" +msgid "Support library for system keyring access" +msgstr "Biblioteca de apoio para acesso às chaves de sistema" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" +msgid "Python extensions for Microsoft Windows" +msgstr "Extensões Python para Microsoft Windows" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +msgctxt "@label" msgid "Font" msgstr "Tipo de letra" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 msgctxt "@label" msgid "SVG icons" msgstr "Ícones SVG" # rever! -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:165 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Implementação da aplicação de distribuição cruzada Linux" @@ -3769,22 +3836,22 @@ msgctxt "@title:window" msgid "Open project file" msgstr "Abrir ficheiro de projeto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:88 msgctxt "@text:window" msgid "This is a Cura project file. Would you like to open it as a project or import the models from it?" msgstr "Este ficheiro é um Projeto do Cura. Pretende abrir como Projeto ou só importar os modelos 3D incluídos no Projeto?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:98 msgctxt "@text:window" msgid "Remember my choice" msgstr "Memorizar a minha escolha" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:122 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:117 msgctxt "@action:button" msgid "Open as project" msgstr "Abrir como projeto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:131 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:126 msgctxt "@action:button" msgid "Import models" msgstr "Importar modelos" @@ -3800,8 +3867,10 @@ msgid "" "You have customized some profile settings.\n" "Would you like to Keep these changed settings after switching profiles?\n" "Alternatively, you can discard the changes to load the defaults from '%1'." -msgstr "Personalizou algumas definições de perfil.\nPretende manter estas definições alteradas depois de trocar de perfis?\nComo alternativa, pode descartar as" -" alterações para carregar as predefinições a partir de '%1'." +msgstr "" +"Personalizou algumas definições de perfil.\n" +"Pretende manter estas definições alteradas depois de trocar de perfis?\n" +"Como alternativa, pode descartar as alterações para carregar as predefinições a partir de '%1'." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:111 msgctxt "@title:column" @@ -3814,7 +3883,7 @@ msgid "Current changes" msgstr "Alterações atuais" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Perguntar sempre isto" @@ -3839,12 +3908,12 @@ msgctxt "@action:button" msgid "Keep changes" msgstr "Manter alterações" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 msgctxt "@text:window" msgid "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?" msgstr "Encontrámos um ou mais projetos do Cura nos ficheiros selecionados. Só é possível abrir um Projeto do Cura, de cada vez. Sugerimos importar apenas os modelos 3D desses Projetos do Cura. Deseja continuar?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:99 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:94 msgctxt "@action:button" msgid "Import all as models" msgstr "Importar tudo como modelos 3D" @@ -3999,7 +4068,7 @@ msgctxt "@label" msgid "Material" msgstr "Material" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:407 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Utilizar cola para melhor aderência com esta combinação de materiais." @@ -4023,17 +4092,17 @@ msgctxt "@label" msgid "Number of Copies" msgstr "Número de Cópias" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:33 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:41 msgctxt "@title:menu menubar:file" msgid "&Save Project..." msgstr "&Guardar projeto..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:54 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:74 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&Exportar..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:85 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Exportar seleção..." @@ -4053,6 +4122,11 @@ msgctxt "@label:category menu label" msgid "Generic" msgstr "Genérico" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/OpenFilesMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Open File(s)..." +msgstr "Abrir ficheiro(s)..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -4068,6 +4142,11 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Abrir &Recente" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SaveProjectMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Save Project..." +msgstr "Guardar projeto..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:15 msgctxt "@title:menu menubar:settings" msgid "&Printer" @@ -4093,17 +4172,17 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Desativar Extrusor" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:16 msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Definições Visíveis" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:45 msgctxt "@action:inmenu" msgid "Collapse All Categories" msgstr "Fechar todas as categorias" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Gerir Visibilidade das Definições..." @@ -4113,22 +4192,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Posição da câmara" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:45 msgctxt "@action:inmenu menubar:view" msgid "Camera view" msgstr "Vista da câmara" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:48 msgctxt "@action:inmenu menubar:view" msgid "Perspective" msgstr "Perspetiva" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:60 msgctxt "@action:inmenu menubar:view" msgid "Orthographic" msgstr "Ortográfica" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:81 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "&Base de construção" @@ -4173,12 +4252,12 @@ msgctxt "@label:MonitorStatus" msgid "Please remove the print" msgstr "Remova a impressão" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@label" msgid "Abort Print" msgstr "Cancelar impressão" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:338 msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Tem a certeza de que deseja cancelar a impressão?" @@ -4220,305 +4299,305 @@ msgctxt "@label" msgid "Interface" msgstr "Interface" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:216 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:209 msgctxt "@label" msgid "Currency:" msgstr "Moeda:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:229 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:222 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "É necessário reiniciar a aplicação para que estas alterações sejam aplicadas." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:284 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Seccionar automaticamente ao alterar as definições." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 msgctxt "@option:check" msgid "Slice automatically" msgstr "Seccionar automaticamente" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:306 msgctxt "@label" msgid "Viewport behavior" msgstr "Comportamento da janela" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:314 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Realçar, a vermelho, as áreas do modelo sem apoio. Sem suporte, estas áreas podem não ser impressas correctamente." # rever! # consolas? -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:323 msgctxt "@option:check" msgid "Display overhang" msgstr "Mostrar Saliências (Overhangs)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:351 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@info:tooltip" msgid "Highlight missing or extraneous surfaces of the model using warning signs. The toolpaths will often be missing parts of the intended geometry." msgstr "Destaque as superfícies extra ou em falta do modelo utilizando sinais de aviso. As trajetórias de ferramentas irão falhar muitas vezes partes da geometria pretendida." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:342 msgctxt "@option:check" msgid "Display model errors" msgstr "Apresentar erros de modelo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Move a câmara de forma que o modelo fique no centro da visualização quando é selecionado um modelo" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:373 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Centrar câmara ao selecionar item" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "O comportamento de zoom predefinido do Cura deve ser invertido?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:388 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Inverta a direção do zoom da câmera." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "O zoom deve deslocar-se na direção do rato?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "Fazer zoom em direção ao rato não é suportado na perspetiva ortográfica." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:409 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Fazer Zoom na direção do rato" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:435 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:417 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Os modelos, na plataforma, devem ser movidos para que não se intersectem?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:440 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:422 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Garantir que os modelos não se interceptam" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:431 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Pousar os modelos na base de construção?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:436 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Pousar automaticamente os modelos na base de construção" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:448 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Mostrar mensagem de aviso no leitor de g-code." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:457 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Mensagem de aviso no leitor de g-code" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "A vista por camada deve ser forçada a utilizar o modo de compatibilidade?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Forçar o modo de compatibilidade na visualização por camada (é necessário reiniciar)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:498 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" msgstr "O Cura deve abrir na localização onde foi fechado?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:485 msgctxt "@option:check" msgid "Restore window position on start" msgstr "Restaurar posição da janela ao iniciar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:513 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Que tipo de composição de câmara deve ser utilizado?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:502 msgctxt "@window:text" msgid "Camera rendering:" msgstr "Composição de câmara:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:531 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:509 msgid "Perspective" msgstr "Perspetiva" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:532 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgid "Orthographic" msgstr "Ortográfica" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:563 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:548 msgctxt "@label" msgid "Opening and saving files" msgstr "Abrir e guardar ficheiros" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:555 msgctxt "@info:tooltip" msgid "Should opening files from the desktop or external applications open in the same instance of Cura?" msgstr "Pretende que os ficheiros abertos a partir do ambiente de trabalho ou de aplicações externas sejam executados na mesma instância do Cura?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@option:check" msgid "Use a single instance of Cura" msgstr "Utilizar uma única instância do Cura" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Os modelos devem ser redimensionados até ao volume de construção se forem demasiado grandes?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@option:check" msgid "Scale large models" msgstr "Redimensionar modelos demasiado grandes" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Um modelo pode parecer extremamente pequeno se, por exemplo, este tiver sido criado em metros e não em milímetros. Estes modelos devem ser redimensionados?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Redimensionar modelos extremamente pequenos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Selecionar os modelos depois de abertos?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Selecionar os modelos depois de abertos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Deve um prefixo com base no nome da impressora ser adicionado ao nome do trabalho de impressão automaticamente?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:635 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Adicionar prefixo da máquina ao nome do trabalho" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:645 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Deve ser apresentado um resumo ao guardar um ficheiro de projeto?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:649 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:634 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Mostrar caixa de diálogo de resumo ao guardar projeto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:659 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:644 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Comportamento predefinido ao abrir um ficheiro de projeto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:652 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Comportamento predefinido ao abrir um ficheiro de projeto: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Perguntar sempre isto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:682 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Abrir sempre como projeto" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:668 msgctxt "@option:openProject" msgid "Always import models" msgstr "Importar sempre modelos" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:705 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Quando tiver realizado alterações a um perfil e mudado para outro, será apresentada uma caixa de diálogo a perguntar se pretende manter as alterações. Caso contrário, pode escolher um comportamento predefinido, sendo que a caixa de diálogo nunca mais é apresentada." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:728 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Perfis" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Comportamento predefinido para valores de definição alterados ao mudar para um perfil diferente: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:748 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:734 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Descartar sempre definições alteradas" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:749 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:735 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Transferir sempre definições alteradas para o novo perfil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:783 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@label" msgid "Privacy" msgstr "Privacidade" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:790 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:777 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "O Cura deve procurar atualizações quando o programa é iniciado?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:795 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:782 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Procurar atualizações ao iniciar" # rever! # legal wording -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:805 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:792 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Podem alguns dados anónimos sobre a impressão ser enviados para a Ultimaker? Não são enviadas, nem armazenadas, quaisquer informações pessoais, incluindo modelos, endereços IP ou outro tipo de identificação pessoal." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:810 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:797 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Enviar dados (anónimos) sobre a impressão" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:819 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:806 msgctxt "@action:button" msgid "More information" msgstr "Mais informações" @@ -4558,55 +4637,65 @@ msgctxt "@action:button" msgid "Export" msgstr "Exportar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 +msgctxt "@action:button Sending materials to printers" +msgid "Sync with Printers" +msgstr "Sincronizar com Impressoras" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" msgid "Printer" msgstr "Impressora" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:298 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Confirmar Remoção" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:301 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Tem a certeza de que deseja remover o perfil %1? Não é possível desfazer esta ação!" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 msgctxt "@title:window" msgid "Import Material" msgstr "Importar material" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:338 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Não foi possível importar o material %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:328 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:342 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Material %1 importado com êxito" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:346 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 msgctxt "@title:window" msgid "Export Material" msgstr "Exportar Material" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:358 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:372 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Falha ao exportar material para %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:378 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Material exportado com êxito para %1" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 +msgctxt "@title:window" +msgid "Export All Materials" +msgstr "Exportar Todos os Materiais" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" @@ -4718,53 +4807,53 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Forneça um nome para este perfil." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Duplicar Perfil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@title:window" msgid "Rename Profile" msgstr "Mudar Nome do Perfil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:307 msgctxt "@title:window" msgid "Import Profile" msgstr "Importar Perfil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:336 msgctxt "@title:window" msgid "Export Profile" msgstr "Exportar Perfil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:399 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Impressora: %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:557 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Atualizar perfil com as definições/substituições atuais" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 msgctxt "@action:button" msgid "Discard current changes" msgstr "Descartar alterações atuais" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:583 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Este perfil utiliza as predefinições especificadas pela impressora, pelo que não tem quaisquer definições/substituições na lista seguinte." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:591 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "As suas definições atuais correspondem ao perfil selecionado." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:609 msgctxt "@title:tab" msgid "Global Settings" msgstr "Definições Globais" @@ -4794,12 +4883,12 @@ msgctxt "@title:column" msgid "Unit" msgstr "Unidade" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:16 msgctxt "@title:tab" msgid "Setting Visibility" msgstr "Visibilidade das Definições" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:48 msgctxt "@label:textbox" msgid "Check all" msgstr "Selecionar tudo" @@ -5155,27 +5244,27 @@ msgctxt "@label:textbox" msgid "Search settings" msgstr "Procurar definições" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:456 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:468 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Copiar valor para todos os extrusores" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:477 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Copiar todos os valores alterados para todos os extrusores" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:502 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:514 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Esconder esta definição" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:515 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:527 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Não mostrar esta definição" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:531 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Manter esta definição visível" @@ -5235,11 +5324,6 @@ msgctxt "@button" msgid "Add printer manually" msgstr "Adicionar impressora manualmente" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddCloudPrintersView.qml:218 -msgctxt "@button" -msgid "Finish" -msgstr "Concluir" - #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:230 msgctxt "@label" msgid "Manufacturer" @@ -5346,32 +5430,32 @@ msgctxt "@button" msgid "Connect" msgstr "Ligar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:43 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" -msgid "Ultimaker Account" -msgstr "Conta Ultimaker" +msgid "Release Notes" +msgstr "Notas da versão" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:124 msgctxt "@text" -msgid "Your key to connected 3D printing" -msgstr "A chave para a impressão 3D em rede" +msgid "Add material settings and plugins from the Marketplace" +msgstr "Adicione definições de materiais e plug-ins do Marketplace" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:101 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:154 msgctxt "@text" -msgid "- Customize your experience with more print profiles and plugins" -msgstr "Personalize a sua experiência com mais perfis e plug-ins de impressão" +msgid "Backup and sync your material settings and plugins" +msgstr "Efetue uma cópia de segurança e sincronize as definições de materiais e plug-ins" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:184 msgctxt "@text" -msgid "- Stay flexible by syncing your setup and loading it anywhere" -msgstr "Mantenha a sua flexibilidade. Sincronize a sua configuração e carregue-a em qualquer local" +msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" +msgstr "Partilhe ideias e obtenha ajuda dos mais de 48.000 utilizadores da Comunidade Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:217 msgctxt "@text" -msgid "- Increase efficiency with a remote workflow on Ultimaker printers" -msgstr "Aumente a eficiência com um fluxo de trabalho remoto nas impressoras Ultimaker" +msgid "Create a free Ultimaker Account" +msgstr "Crie uma Conta Ultimaker gratuita" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:230 msgctxt "@button" msgid "Skip" msgstr "Ignorar" @@ -5431,29 +5515,30 @@ msgctxt "@button" msgid "Decline and close" msgstr "Rejeitar e fechar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:29 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" msgid "Welcome to Ultimaker Cura" msgstr "Bem-vindo ao Ultimaker Cura" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:68 msgctxt "@text" -msgid "" -"Please follow these steps to set up\n" -"Ultimaker Cura. This will only take a few moments." -msgstr "" -"Siga estes passos para configurar o\n" -"Ultimaker Cura. Este processo deverá demorar apenas alguns momentos." +msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." +msgstr "Siga estes passos para configurar o Ultimaker Cura. Este processo irá demorar apenas alguns momentos." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:86 msgctxt "@button" msgid "Get started" msgstr "Iniciar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:28 msgctxt "@label" -msgid "What's new in Ultimaker Cura" -msgstr "Novidades no Ultimaker Cura" +msgid "What's New" +msgstr "Novidades" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Widgets/ComboBox.qml:24 +msgctxt "@label" +msgid "No items to select from" +msgstr "Nenhum item para selecionar" #: ModelChecker/plugin.json msgctxt "description" @@ -5537,6 +5622,16 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Gravador de perfis Cura" +#: DigitalLibrary/plugin.json +msgctxt "description" +msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." +msgstr "Liga à Biblioteca Digital, permitindo ao Cura abrir ficheiros da Biblioteca Digital e guardar ficheiros na mesma." + +#: DigitalLibrary/plugin.json +msgctxt "name" +msgid "Ultimaker Digital Library" +msgstr "Biblioteca Digital Ultimaker" + #: FirmwareUpdateChecker/plugin.json msgctxt "description" msgid "Checks for firmware updates." @@ -6008,6 +6103,26 @@ msgctxt "name" msgid "Version Upgrade 4.7 to 4.8" msgstr "Atualização da versão 4.7 para 4.8" +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." +msgstr "Atualiza as configurações do Cura 4.8 para o Cura 4.9." + +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.8 to 4.9" +msgstr "Atualização da versão 4.8 para 4.9" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." +msgstr "Atualiza as configurações do Cura 4.9 para o Cura 4.10." + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.9 to 4.10" +msgstr "Atualização da versão 4.9 para 4.10" + #: X3DReader/plugin.json msgctxt "description" msgid "Provides support for reading X3D files." @@ -6038,6 +6153,94 @@ msgctxt "name" msgid "X-Ray View" msgstr "Vista Raio-X" +#~ msgctxt "@info:status" +#~ msgid "Global stack is missing." +#~ msgstr "A pilha global está em falta." + +#~ msgctxt "@info:status" +#~ msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." +#~ msgstr "O seu modelo não é uma variedade. As áreas destacadas indicam superfícies extra ou em falta." + +#~ msgctxt "@info:title" +#~ msgid "Model errors" +#~ msgstr "Erros de modelo" + +#~ msgctxt "@label:listbox" +#~ msgid "Layer thickness" +#~ msgstr "Espessura da Camada" + +#~ msgctxt "@label" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "A chave para a impressão 3D em rede" + +#~ msgctxt "@text" +#~ msgid "" +#~ "- Customize your experience with more print profiles and plugins\n" +#~ "- Stay flexible by syncing your setup and loading it anywhere\n" +#~ "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "" +#~ "- Personalize a sua experiência com mais perfis e plug-ins de impressão\n" +#~ "- Mantenha a sua flexibilidade. Sincronize a sua configuração e carregue-a em qualquer local\n" +#~ "- Aumente a eficiência com um fluxo de trabalho remoto nas impressoras Ultimaker" + +#~ msgctxt "@button" +#~ msgid "Create account" +#~ msgstr "Criar conta" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Delete Selected Model" +#~ msgid_plural "Delete Selected Models" +#~ msgstr[0] "Apagar Modelo Selecionado" +#~ msgstr[1] "Apagar Modelos Selecionados" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Center Selected Model" +#~ msgid_plural "Center Selected Models" +#~ msgstr[0] "Centrar modelo selecionado" +#~ msgstr[1] "Centrar modelos selecionados" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Multiply Selected Model" +#~ msgid_plural "Multiply Selected Models" +#~ msgstr[0] "Multiplicar modelo selecionado" +#~ msgstr[1] "Multiplicar modelos selecionados" + +#~ msgctxt "@button" +#~ msgid "Finish" +#~ msgstr "Concluir" + +#~ msgctxt "@label" +#~ msgid "Ultimaker Account" +#~ msgstr "Conta Ultimaker" + +#~ msgctxt "@text" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "A chave para a impressão 3D em rede" + +#~ msgctxt "@text" +#~ msgid "- Customize your experience with more print profiles and plugins" +#~ msgstr "Personalize a sua experiência com mais perfis e plug-ins de impressão" + +#~ msgctxt "@text" +#~ msgid "- Stay flexible by syncing your setup and loading it anywhere" +#~ msgstr "Mantenha a sua flexibilidade. Sincronize a sua configuração e carregue-a em qualquer local" + +#~ msgctxt "@text" +#~ msgid "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "Aumente a eficiência com um fluxo de trabalho remoto nas impressoras Ultimaker" + +#~ msgctxt "@text" +#~ msgid "" +#~ "Please follow these steps to set up\n" +#~ "Ultimaker Cura. This will only take a few moments." +#~ msgstr "" +#~ "Siga estes passos para configurar o\n" +#~ "Ultimaker Cura. Este processo deverá demorar apenas alguns momentos." + +#~ msgctxt "@label" +#~ msgid "What's new in Ultimaker Cura" +#~ msgstr "Novidades no Ultimaker Cura" + #~ msgctxt "@label ({} is object name)" #~ msgid "Are you sure you wish to remove {}? This cannot be undone!" #~ msgstr "Tem a certeza de que pretende remover {}? Esta ação não pode ser anulada!" diff --git a/resources/i18n/pt_PT/fdmextruder.def.json.po b/resources/i18n/pt_PT/fdmextruder.def.json.po index 1a2952698a..338c20d5d3 100644 --- a/resources/i18n/pt_PT/fdmextruder.def.json.po +++ b/resources/i18n/pt_PT/fdmextruder.def.json.po @@ -1,13 +1,13 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2019-03-14 14:15+0100\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 14:56+0200\n" "Last-Translator: Portuguese \n" "Language-Team: Paulo Miranda , Portuguese \n" "Language: pt_PT\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.0.7\n" +"X-Generator: Poedit 2.4.1\n" #: fdmextruder.def.json msgctxt "machine_settings label" diff --git a/resources/i18n/pt_PT/fdmprinter.def.json.po b/resources/i18n/pt_PT/fdmprinter.def.json.po index d5b4f4c196..cd8849efd5 100644 --- a/resources/i18n/pt_PT/fdmprinter.def.json.po +++ b/resources/i18n/pt_PT/fdmprinter.def.json.po @@ -1,13 +1,13 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2020-08-21 13:40+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 14:56+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Portuguese , Paulo Miranda , Portuguese \n" "Language: pt_PT\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.0.7\n" +"X-Generator: Poedit 2.4.1\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -424,6 +424,26 @@ msgctxt "machine_extruders_share_heater description" msgid "Whether the extruders share a single heater rather than each extruder having its own heater." msgstr "Se, as extrusoras partilham um único aquecedor em vez de cada extrusora ter o seu próprio aquecedor." +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle label" +msgid "Extruders Share Nozzle" +msgstr "Extrusoras partilham bocal" + +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle description" +msgid "Whether the extruders share a single nozzle rather than each extruder having its own nozzle. When set to true, it is expected that the printer-start gcode script properly sets up all extruders in an initial retraction state that is known and mutually compatible (either zero or one filament not retracted); in that case the initial retraction status is described, per extruder, by the 'machine_extruders_shared_nozzle_initial_retraction' parameter." +msgstr "Se as extrusoras partilham um único bocal, em vez de cada extrusora ter um bocal próprio. Quando definido como verdadeiro, espera-se que o script gcode de arranque da impressora configure corretamente todas as extrusoras num estado de retração inicial conhecido e mutuamente compatível (seja zero ou um filamento não retraído); nesse caso, o estado de retração inicial é descrito, por extrusora, pelo parâmetro 'machine_extruders_shared_nozzle_initial_retraction'." + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction label" +msgid "Shared Nozzle Initial Retraction" +msgstr "Retração inicial do bocal partilhado" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction description" +msgid "How much the filament of each extruder is assumed to have been retracted from the shared nozzle tip at the completion of the printer-start gcode script; the value should be equal to or greater than the length of the common part of the nozzle's ducts." +msgstr "Até que ponto se assume que o filamento de cada extrusora foi retraído a partir da ponta do bocal partilhado após a conclusão do script gcode de arranque da impressora; o valor deverá ser igual ou superior ao comprimento da parte comum das condutas do bocal." + #: fdmprinter.def.json msgctxt "machine_disallowed_areas label" msgid "Disallowed Areas" @@ -491,8 +511,8 @@ msgstr "Desviar com extrusor" #: fdmprinter.def.json msgctxt "machine_use_extruder_offset_to_offset_coords description" -msgid "Apply the extruder offset to the coordinate system." -msgstr "Aplicar o desvio do extrusor ao sistema de coordenadas." +msgid "Apply the extruder offset to the coordinate system. Affects all extruders." +msgstr "Aplique o desvio do alinhamento da extrusora ao sistema de coordenadas. Afeta todas as extrusoras." #: fdmprinter.def.json msgctxt "extruder_prime_pos_z label" @@ -897,8 +917,8 @@ msgstr "Multiplicador do diâmetro da linha da camada inicial. Aumentar o diâme #: fdmprinter.def.json msgctxt "shell label" -msgid "Shell" -msgstr "Invólucro" +msgid "Walls" +msgstr "Paredes" #: fdmprinter.def.json msgctxt "shell description" @@ -968,168 +988,6 @@ msgctxt "wall_0_wipe_dist description" msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better." msgstr "A distância de um movimento de deslocação inserido depois da parede exterior, para ocultar melhor a junta Z." -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr label" -msgid "Top Surface Skin Extruder" -msgstr "Extrusor Revestimento Superior" - -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr description" -msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." -msgstr "O núcleo de extrusão utilizado para imprimir a(s) camada(s) de revestimento das superfícies mais superiores. Definição usada com múltiplos extrusores." - -#: fdmprinter.def.json -msgctxt "roofing_layer_count label" -msgid "Top Surface Skin Layers" -msgstr "Camadas Revestimento Superior" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count description" -msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." -msgstr "O número de camadas de revestimento da superfície superior. Por norma, uma só camada superior é suficiente para gerar superfícies superiores de maior qualidade." - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr label" -msgid "Top/Bottom Extruder" -msgstr "Extrusor Superior / Inferior" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr description" -msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." -msgstr "O núcleo de extrusão utilizado para imprimir as camadas superiores e inferiores da impressão. Definição usada com múltiplos extrusores." - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness label" -msgid "Top/Bottom Thickness" -msgstr "Espessura Superior / Inferior" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness description" -msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." -msgstr "A espessura total das camadas superiores e inferiores na impressão. Este valor, dividido pela Espessura das Camadas, define o número de camadas superiores / inferiores." - -#: fdmprinter.def.json -msgctxt "top_thickness label" -msgid "Top Thickness" -msgstr "Espessura Superior" - -#: fdmprinter.def.json -msgctxt "top_thickness description" -msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." -msgstr "A espessura total das camadas superiores na impressão. Este valor, dividido pela Espessura das Camadas, define o número de camadas superiores." - -#: fdmprinter.def.json -msgctxt "top_layers label" -msgid "Top Layers" -msgstr "Camadas Superiores" - -#: fdmprinter.def.json -msgctxt "top_layers description" -msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." -msgstr "O número de camadas superiores. Quando calculado através da Espessura Superior, este valor é arredondado para um número inteiro." - -#: fdmprinter.def.json -msgctxt "bottom_thickness label" -msgid "Bottom Thickness" -msgstr "Espessura Inferior" - -#: fdmprinter.def.json -msgctxt "bottom_thickness description" -msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." -msgstr "A espessura total das camadas inferiores na impressão. Este valor, dividido pela Espessura das Camadas, define o número de camadas inferiores." - -#: fdmprinter.def.json -msgctxt "bottom_layers label" -msgid "Bottom Layers" -msgstr "Camadas Inferiores" - -#: fdmprinter.def.json -msgctxt "bottom_layers description" -msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "O número de camadas inferiores. Quando calculado através da Espessura Inferior, este valor é arredondado para um número inteiro." - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers label" -msgid "Initial Bottom Layers" -msgstr "Camadas inferiores iniciais" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers description" -msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "O número de camadas inferiores iniciais, a partir da base de construção no sentido ascendente. Quando calculado pela espessura inferior, este valor é arredondado para um número inteiro." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern label" -msgid "Top/Bottom Pattern" -msgstr "Padrão Superior / Inferior" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern description" -msgid "The pattern of the top/bottom layers." -msgstr "O padrão geométrico das camadas superiores / inferiores." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option lines" -msgid "Lines" -msgstr "Linhas" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option concentric" -msgid "Concentric" -msgstr "Concêntrico" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option zigzag" -msgid "Zig Zag" -msgstr "Ziguezague" - -# Is the English string correct? meaning? -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 label" -msgid "Bottom Pattern Initial Layer" -msgstr "Padrão da Base na Camada Inicial" - -# Is the English string correct? meaning? -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 description" -msgid "The pattern on the bottom of the print on the first layer." -msgstr "O padrão geométrico da base da peça na camada inicial." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option lines" -msgid "Lines" -msgstr "Linhas" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option concentric" -msgid "Concentric" -msgstr "Concêntrico" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option zigzag" -msgid "Zig Zag" -msgstr "Ziguezague" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons label" -msgid "Connect Top/Bottom Polygons" -msgstr "Ligar polígonos superiores/inferiores" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." -msgstr "Ligar caminhos de revestimento superiores/inferiores quando as trajetórias são paralelas. Para o padrão concêntrico, ativar esta definição reduz consideravelmente o tempo de deslocação mas, uma vez que as ligações podem suceder num ponto intermediário sobre o enchimento, esta funcionalidade pode reduzir a qualidade da superfície superior." - -#: fdmprinter.def.json -msgctxt "skin_angles label" -msgid "Top/Bottom Line Directions" -msgstr "Direções Linha Superior / Inferior" - -#: fdmprinter.def.json -msgctxt "skin_angles description" -msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." -msgstr "Uma lista de ângulos (números inteiros) relativos às direções de linha a utilizar quando as camadas da superfície superiores/inferiores utilizarem os padrões de Linhas ou Ziguezague. Os valores da lista são utilizados em sequência, à medida que as camadas progridem, voltando ao início assim que a lista chega ao fim. Os itens da lista são separados por vírgulas e a lista completa é escrita entre parênteses retos. Por defeito a lista está vazia, o que significa a utilização dos ângulos predefinidos tradicionais (45 e 135 graus)." - # Inserção? # desvio? # Movimento? @@ -1459,6 +1317,178 @@ msgctxt "z_seam_relative description" msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate." msgstr "Quando ativado, as coordenadas da junta-Z são relativas ao centro de cada peça. Quando desativado, as coordenadas definem uma posição absoluta na base de construção." +#: fdmprinter.def.json +msgctxt "top_bottom label" +msgid "Top/Bottom" +msgstr "Superior / Inferior" + +#: fdmprinter.def.json +msgctxt "top_bottom description" +msgid "Top/Bottom" +msgstr "Superior / Inferior" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr label" +msgid "Top Surface Skin Extruder" +msgstr "Extrusor Revestimento Superior" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr description" +msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." +msgstr "O núcleo de extrusão utilizado para imprimir a(s) camada(s) de revestimento das superfícies mais superiores. Definição usada com múltiplos extrusores." + +#: fdmprinter.def.json +msgctxt "roofing_layer_count label" +msgid "Top Surface Skin Layers" +msgstr "Camadas Revestimento Superior" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count description" +msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." +msgstr "O número de camadas de revestimento da superfície superior. Por norma, uma só camada superior é suficiente para gerar superfícies superiores de maior qualidade." + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr label" +msgid "Top/Bottom Extruder" +msgstr "Extrusor Superior / Inferior" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr description" +msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." +msgstr "O núcleo de extrusão utilizado para imprimir as camadas superiores e inferiores da impressão. Definição usada com múltiplos extrusores." + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness label" +msgid "Top/Bottom Thickness" +msgstr "Espessura Superior / Inferior" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness description" +msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." +msgstr "A espessura total das camadas superiores e inferiores na impressão. Este valor, dividido pela Espessura das Camadas, define o número de camadas superiores / inferiores." + +#: fdmprinter.def.json +msgctxt "top_thickness label" +msgid "Top Thickness" +msgstr "Espessura Superior" + +#: fdmprinter.def.json +msgctxt "top_thickness description" +msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." +msgstr "A espessura total das camadas superiores na impressão. Este valor, dividido pela Espessura das Camadas, define o número de camadas superiores." + +#: fdmprinter.def.json +msgctxt "top_layers label" +msgid "Top Layers" +msgstr "Camadas Superiores" + +#: fdmprinter.def.json +msgctxt "top_layers description" +msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." +msgstr "O número de camadas superiores. Quando calculado através da Espessura Superior, este valor é arredondado para um número inteiro." + +#: fdmprinter.def.json +msgctxt "bottom_thickness label" +msgid "Bottom Thickness" +msgstr "Espessura Inferior" + +#: fdmprinter.def.json +msgctxt "bottom_thickness description" +msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." +msgstr "A espessura total das camadas inferiores na impressão. Este valor, dividido pela Espessura das Camadas, define o número de camadas inferiores." + +#: fdmprinter.def.json +msgctxt "bottom_layers label" +msgid "Bottom Layers" +msgstr "Camadas Inferiores" + +#: fdmprinter.def.json +msgctxt "bottom_layers description" +msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "O número de camadas inferiores. Quando calculado através da Espessura Inferior, este valor é arredondado para um número inteiro." + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "Camadas inferiores iniciais" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "O número de camadas inferiores iniciais, a partir da base de construção no sentido ascendente. Quando calculado pela espessura inferior, este valor é arredondado para um número inteiro." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern label" +msgid "Top/Bottom Pattern" +msgstr "Padrão Superior / Inferior" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern description" +msgid "The pattern of the top/bottom layers." +msgstr "O padrão geométrico das camadas superiores / inferiores." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option lines" +msgid "Lines" +msgstr "Linhas" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option concentric" +msgid "Concentric" +msgstr "Concêntrico" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option zigzag" +msgid "Zig Zag" +msgstr "Ziguezague" + +# Is the English string correct? meaning? +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 label" +msgid "Bottom Pattern Initial Layer" +msgstr "Padrão da Base na Camada Inicial" + +# Is the English string correct? meaning? +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 description" +msgid "The pattern on the bottom of the print on the first layer." +msgstr "O padrão geométrico da base da peça na camada inicial." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option lines" +msgid "Lines" +msgstr "Linhas" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option concentric" +msgid "Concentric" +msgstr "Concêntrico" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option zigzag" +msgid "Zig Zag" +msgstr "Ziguezague" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons label" +msgid "Connect Top/Bottom Polygons" +msgstr "Ligar polígonos superiores/inferiores" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons description" +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "Ligar caminhos de revestimento superiores/inferiores quando as trajetórias são paralelas. Para o padrão concêntrico, ativar esta definição reduz consideravelmente o tempo de deslocação mas, uma vez que as ligações podem suceder num ponto intermediário sobre o enchimento, esta funcionalidade pode reduzir a qualidade da superfície superior." + +#: fdmprinter.def.json +msgctxt "skin_angles label" +msgid "Top/Bottom Line Directions" +msgstr "Direções Linha Superior / Inferior" + +#: fdmprinter.def.json +msgctxt "skin_angles description" +msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." +msgstr "Uma lista de ângulos (números inteiros) relativos às direções de linha a utilizar quando as camadas da superfície superiores/inferiores utilizarem os padrões de Linhas ou Ziguezague. Os valores da lista são utilizados em sequência, à medida que as camadas progridem, voltando ao início assim que a lista chega ao fim. Os itens da lista são separados por vírgulas e a lista completa é escrita entre parênteses retos. Por defeito a lista está vazia, o que significa a utilização dos ângulos predefinidos tradicionais (45 e 135 graus)." + #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" msgid "No Skin in Z Gaps" @@ -1607,6 +1637,86 @@ msgctxt "skin_overlap_mm description" msgid "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any value over half the width of the wall may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall." msgstr "Ajuste a quantidade de sobreposição entre as paredes e (as extremidades) das linhas centrais de revestimento. Uma ligeira sobreposição permite que as paredes se liguem firmemente ao revestimento. Observe que no caso de um revestimento e uma largura de revestimento da parede iguais, qualquer valor acima da metade da largura da parede pode fazer com que o revestimento ultrapasse a parede, visto que a posição do nozzle do extrusor de revestimento pode já ultrapassar o centro da parede." +#: fdmprinter.def.json +msgctxt "skin_preshrink label" +msgid "Skin Removal Width" +msgstr "Largura Remoção Revestimento" + +#: fdmprinter.def.json +msgctxt "skin_preshrink description" +msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." +msgstr "A largura máxima das áreas do revestimento a serem removidas. Todas as áreas de revestimento mais pequenas do que este valor irão desaparecer. Isto pode ajudar a limitar a quantidade de tempo e material gastos na impressão do revestimento superior/inferior nas superfícies inclinadas do modelo." + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink label" +msgid "Top Skin Removal Width" +msgstr "Largura Remoção Revestimento Superior" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink description" +msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." +msgstr "A largura máxima das áreas do revestimento superior a serem removidas. Todas as áreas de revestimento mais pequenas do que este valor irão desaparecer. Isto pode ajudar a limitar a quantidade de tempo e material gastos na impressão do revestimento superior nas superfícies inclinadas do modelo." + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink label" +msgid "Bottom Skin Removal Width" +msgstr "Largura Remoção Revestimento Inferior" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink description" +msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." +msgstr "A largura máxima das áreas do revestimento inferior a serem removidas. Todas as áreas de revestimento mais pequenas do que este valor irão desaparecer. Isto pode ajudar a limitar a quantidade de tempo e material gastos na impressão do revestimento inferior nas superfícies inclinadas do modelo." + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance label" +msgid "Skin Expand Distance" +msgstr "Distância Expansão Revestimento" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance description" +msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." +msgstr "A distância da expansão dos revestimentos para dentro do enchimento. Valores mais elevados melhoram tanto a fixação do revestimento ao padrão geométrico de enchimento, assim como a aderência ao revestimento das paredes de camadas adjacentes. Valores mais baixos reduzem a quantidade de material utilizado." + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance label" +msgid "Top Skin Expand Distance" +msgstr "Distância Expansão Revestimento Superior" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance description" +msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." +msgstr "A distância da expansão dos revestimentos superiores para dentro do enchimento. Valores mais elevados melhoram, tanto, a fixação do revestimento ao padrão geométrico do enchimento, assim como a aderência ao revestimento das paredes da camada seguinte. Valores mais baixos reduzem a quantidade de material utilizado." + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance label" +msgid "Bottom Skin Expand Distance" +msgstr "Expansão Revestimento Inferior" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance description" +msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." +msgstr "A distância da expansão dos revestimentos inferiores para dentro do enchimento. Valores mais elevados melhoram, tanto, a fixação do revestimento ao padrão geométrico de enchimento, assim como a aderência do revestimento às paredes da camada anterior. Valores mais baixos reduzem a quantidade de material utilizado." + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion label" +msgid "Maximum Skin Angle for Expansion" +msgstr "Ângulo Revestimento para Expansão" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion description" +msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded." +msgstr "O revestimento superior/inferior não será expandido, quando as superfícies superiores e/ou inferiores do objeto tiverem um ângulo maior que este valor. Isto evita a expansão das pequenas áreas de revestimento que são criadas quando a superfície do modelo tem uma inclinação quase vertical. Um ângulo de 0° é horizontal e fará com que nenhum revestimento seja expandido, enquanto um ângulo de 90° é vertical e fará com que todo o revestimento seja expandido." + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion label" +msgid "Minimum Skin Width for Expansion" +msgstr "Largura Mínima Revestimento para Expansão" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion description" +msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." +msgstr "As áreas de revestimento mais pequenas do que este valor não são expandidas. Isto evita a expansão das pequenas áreas de revestimento que são criadas quando a superfície do modelo apresenta uma inclinação quase vertical." + #: fdmprinter.def.json msgctxt "infill label" msgid "Infill" @@ -1921,86 +2031,6 @@ msgctxt "infill_support_angle description" msgid "The minimum angle of internal overhangs for which infill is added. At a value of 0° objects are totally filled with infill, 90° will not provide any infill." msgstr "O ângulo mínimo das saliências internas ao qual é adicionado enchimento. Com um valor de 0° os objetos são totalmente preenchidos com enchimento, e com um valor de 90° não é produzido qualquer enchimento." -#: fdmprinter.def.json -msgctxt "skin_preshrink label" -msgid "Skin Removal Width" -msgstr "Largura Remoção Revestimento" - -#: fdmprinter.def.json -msgctxt "skin_preshrink description" -msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." -msgstr "A largura máxima das áreas do revestimento a serem removidas. Todas as áreas de revestimento mais pequenas do que este valor irão desaparecer. Isto pode ajudar a limitar a quantidade de tempo e material gastos na impressão do revestimento superior/inferior nas superfícies inclinadas do modelo." - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink label" -msgid "Top Skin Removal Width" -msgstr "Largura Remoção Revestimento Superior" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink description" -msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." -msgstr "A largura máxima das áreas do revestimento superior a serem removidas. Todas as áreas de revestimento mais pequenas do que este valor irão desaparecer. Isto pode ajudar a limitar a quantidade de tempo e material gastos na impressão do revestimento superior nas superfícies inclinadas do modelo." - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink label" -msgid "Bottom Skin Removal Width" -msgstr "Largura Remoção Revestimento Inferior" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink description" -msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." -msgstr "A largura máxima das áreas do revestimento inferior a serem removidas. Todas as áreas de revestimento mais pequenas do que este valor irão desaparecer. Isto pode ajudar a limitar a quantidade de tempo e material gastos na impressão do revestimento inferior nas superfícies inclinadas do modelo." - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance label" -msgid "Skin Expand Distance" -msgstr "Distância Expansão Revestimento" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance description" -msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." -msgstr "A distância da expansão dos revestimentos para dentro do enchimento. Valores mais elevados melhoram tanto a fixação do revestimento ao padrão geométrico de enchimento, assim como a aderência ao revestimento das paredes de camadas adjacentes. Valores mais baixos reduzem a quantidade de material utilizado." - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance label" -msgid "Top Skin Expand Distance" -msgstr "Distância Expansão Revestimento Superior" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance description" -msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." -msgstr "A distância da expansão dos revestimentos superiores para dentro do enchimento. Valores mais elevados melhoram, tanto, a fixação do revestimento ao padrão geométrico do enchimento, assim como a aderência ao revestimento das paredes da camada seguinte. Valores mais baixos reduzem a quantidade de material utilizado." - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance label" -msgid "Bottom Skin Expand Distance" -msgstr "Expansão Revestimento Inferior" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance description" -msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." -msgstr "A distância da expansão dos revestimentos inferiores para dentro do enchimento. Valores mais elevados melhoram, tanto, a fixação do revestimento ao padrão geométrico de enchimento, assim como a aderência do revestimento às paredes da camada anterior. Valores mais baixos reduzem a quantidade de material utilizado." - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion label" -msgid "Maximum Skin Angle for Expansion" -msgstr "Ângulo Revestimento para Expansão" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion description" -msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." -msgstr "O revestimento superior/inferior não será expandido, quando as superfícies superiores e/ou inferiores do objeto tiverem um ângulo maior que este valor. Isto evita a expansão das pequenas áreas de revestimento que são criadas quando a superfície do modelo tem uma inclinação quase vertical. Um ângulo de 0° é horizontal e um ângulo de 90° é vertical." - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion label" -msgid "Minimum Skin Width for Expansion" -msgstr "Largura Mínima Revestimento para Expansão" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion description" -msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." -msgstr "As áreas de revestimento mais pequenas do que este valor não são expandidas. Isto evita a expansão das pequenas áreas de revestimento que são criadas quando a superfície do modelo apresenta uma inclinação quase vertical." - #: fdmprinter.def.json msgctxt "skin_edge_support_thickness label" msgid "Skin Edge Support Thickness" @@ -2134,8 +2164,7 @@ msgstr "Temperatura da base de construção da camada inicial" #: fdmprinter.def.json msgctxt "material_bed_temperature_layer_0 description" msgid "The temperature used for the heated build plate at the first layer. If this is 0, the build plate is left unheated during the first layer." -msgstr "A temperatura utilizada para a base de construção aquecida na primeira camada. Se este valor for 0, a temperatura da base de construção não é aquecida" -" durante a primeira camada." +msgstr "A temperatura utilizada para a base de construção aquecida na primeira camada. Se este valor for 0, a temperatura da base de construção não é aquecida durante a primeira camada." #: fdmprinter.def.json msgctxt "material_adhesion_tendency label" @@ -2638,8 +2667,8 @@ msgstr "Velocidade Camada Inicial" #: fdmprinter.def.json msgctxt "speed_layer_0 description" -msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." -msgstr "A velocidade da camada inicial. É recomendado um valor inferior para melhorar a aderência à base de construção." +msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate. Does not affect the build plate adhesion structures themselves, like brim and raft." +msgstr "A velocidade da camada inicial. Recomenda-se um valor baixo para melhorar a aderência à base de construção. Não afeta as estruturas de aderência da base de construção propriamente ditas, como aba e raft." #: fdmprinter.def.json msgctxt "speed_print_layer_0 label" @@ -3275,8 +3304,9 @@ msgstr "Distância Max. de Combing sem Retração" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" -msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." -msgstr "Os movimentos de deslocação de Combing com uma distância maior que este valor, quando este é superior a zero, utilizam retrações." +msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." +msgstr "Os movimentos de deslocação de Combing com uma distância maior que este valor, quando este é superior a zero, utilizam retrações. Se o valor for definido" +" como zero, não existirá qualquer valor máximo e os movimentos Combing não utilizarão retrações." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" @@ -5225,10 +5255,8 @@ msgstr "Classificação de processamento de malha" #: fdmprinter.def.json msgctxt "infill_mesh_order description" -msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." -msgstr "Determina a prioridade desta malha quando se consideram várias malhas de enchimento em sobreposição. As áreas com sobreposição de várias malhas de enchimento" -" vão assumir as definições da malha com a classificação mais baixa. Uma malha de enchimento com uma ordem superior irá modificar o enchimento das malhas" -" de enchimento com uma ordem inferior e as malhas normais." +msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the highest rank. An infill mesh with a higher rank will modify the infill of infill meshes with lower rank and normal meshes." +msgstr "Determina a prioridade desta malha para resolver a sobreposição de várias malhas de enchimento. As áreas com sobreposição de várias malhas de enchimento vão assumir as definições da malha com a prioridade mais alta. Uma malha de enchimento com uma prioridade superior irá modificar o enchimento das malhas de enchimento com uma prioridade inferior e também as malhas normais." #: fdmprinter.def.json msgctxt "cutting_mesh label" @@ -5589,6 +5617,16 @@ msgctxt "conical_overhang_angle description" msgid "The maximum angle of overhangs after the they have been made printable. At a value of 0° all overhangs are replaced by a piece of model connected to the build plate, 90° will not change the model in any way." msgstr "O ângulo máximo das saliências após se terem tornado imprimíveis. Com um valor de 0°, todas as saliências são substituídas por um modelo ligado à base de construção e, com um valor de 90°, o modelo não será alterado de forma alguma." +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size label" +msgid "Maximum Overhang Hole Area" +msgstr "Área máxima do buraco da saliência" + +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size description" +msgid "The maximum area of a hole in the base of the model before it's removed by Make Overhang Printable. Holes smaller than this will be retained. A value of 0 mm² will fill all holes in the models base." +msgstr "A área máxima de um buraco na base do modelo antes que seja removido por Tornar Saliência Imprimível. Buracos mais pequenos do que este valor serão mantidos. Um valor de 0 mm² preencherá todos os buracos na base do modelo." + #: fdmprinter.def.json msgctxt "coasting_enable label" msgid "Enable Coasting" @@ -6530,6 +6568,30 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Matriz de transformação a ser aplicada ao modelo quando abrir o ficheiro." +#~ msgctxt "retraction_combing_max_distance description" +#~ msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." +#~ msgstr "Os movimentos de deslocação de Combing com uma distância maior que este valor, quando este é superior a zero, utilizam retrações." + +#~ msgctxt "machine_use_extruder_offset_to_offset_coords description" +#~ msgid "Apply the extruder offset to the coordinate system." +#~ msgstr "Aplicar o desvio do extrusor ao sistema de coordenadas." + +#~ msgctxt "shell label" +#~ msgid "Shell" +#~ msgstr "Invólucro" + +#~ msgctxt "max_skin_angle_for_expansion description" +#~ msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." +#~ msgstr "O revestimento superior/inferior não será expandido, quando as superfícies superiores e/ou inferiores do objeto tiverem um ângulo maior que este valor. Isto evita a expansão das pequenas áreas de revestimento que são criadas quando a superfície do modelo tem uma inclinação quase vertical. Um ângulo de 0° é horizontal e um ângulo de 90° é vertical." + +#~ msgctxt "speed_layer_0 description" +#~ msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." +#~ msgstr "A velocidade da camada inicial. É recomendado um valor inferior para melhorar a aderência à base de construção." + +#~ msgctxt "infill_mesh_order description" +#~ msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." +#~ msgstr "Determina a prioridade desta malha quando se consideram várias malhas de enchimento em sobreposição. As áreas com sobreposição de várias malhas de enchimento vão assumir as definições da malha com a classificação mais baixa. Uma malha de enchimento com uma ordem superior irá modificar o enchimento das malhas de enchimento com uma ordem inferior e as malhas normais." + #~ msgctxt "material_bed_temperature description" #~ msgid "The temperature used for the heated build plate. If this is 0, the bed temperature will not be adjusted." #~ msgstr "A temperatura utilizada na base de construção aquecida. Se este valor for 0, a temperatura da base não será alterada." diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index 8ae27be847..cf2eb14327 100644 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -1,26 +1,26 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0200\n" -"PO-Revision-Date: 2020-08-21 13:40+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0200\n" +"PO-Revision-Date: 2021-04-16 14:57+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Russian , Ruslan Popov , Russian \n" "Language: ru_RU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2.4\n" +"X-Generator: Poedit 2.4.1\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1581 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 msgctxt "@label" @@ -91,12 +91,12 @@ msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "Черновой профиль предназначен для печати начальных прототипов и проверки концепции, где приоритетом является скорость печати." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:226 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:234 msgctxt "@label" msgid "Custom Material" msgstr "Собственный материал" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:227 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 msgctxt "@label" msgid "Custom" @@ -118,7 +118,7 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Все файлы (*)" -#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:178 +#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:181 msgctxt "@info:title" msgid "Login failed" msgstr "Вход не выполнен" @@ -148,28 +148,33 @@ msgctxt "@info:title" msgid "Can't Find Location" msgstr "Не могу найти место" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:104 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:116 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Не удалось создать архив из каталога с данными пользователя: {}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:110 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 msgctxt "@info:title" msgid "Backup" msgstr "Резервное копирование" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:123 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:135 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "Попытка восстановить резервную копию Cura при отсутствии необходимых данных или метаданных." -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:134 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:146 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that is higher than the current version." msgstr "Выполнена попытка восстановить резервную копию Cura с более поздней версией, чем текущая." +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 +msgctxt "@info:backup_failed" +msgid "The following error occurred while trying to restore a Cura backup:" +msgstr "При попытке восстановить резервную копию Cura произошла следующая ошибка:" + #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -319,74 +324,74 @@ msgctxt "@action:button" msgid "Send report" msgstr "Отправить отчёт" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:521 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:527 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Загрузка принтеров..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:528 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:534 msgctxt "@info:progress" msgid "Setting up preferences..." msgstr "Настройка параметров..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:657 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:672 msgctxt "@info:progress" msgid "Initializing Active Machine..." msgstr "Инициализация активной машины..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:803 msgctxt "@info:progress" msgid "Initializing machine manager..." msgstr "Инициализация диспетчера машин..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:802 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:817 msgctxt "@info:progress" msgid "Initializing build volume..." msgstr "Инициализация объема печати..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:870 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:888 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Настройка сцены..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:906 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:924 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Загрузка интерфейса..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:911 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:929 msgctxt "@info:progress" msgid "Initializing engine..." msgstr "Инициализация ядра..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1221 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1246 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f мм" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1777 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1799 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Только один G-code файла может быть загружен в момент времени. Пропускаю импортирование {0}" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1778 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:188 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 msgctxt "@info:title" msgid "Warning" msgstr "Внимание" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1787 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1809 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Невозможно открыть любой другой файл, если G-code файл уже загружен. Пропускаю импортирование {0}" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 @@ -409,7 +414,7 @@ msgctxt "@info:title" msgid "Placing Object" msgstr "Размещение объекта" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:92 msgctxt "@message" msgid "Could not read response." msgstr "Не удалось прочитать ответ." @@ -429,12 +434,12 @@ msgctxt "@message" msgid "Something unexpected happened when trying to log in, please try again." msgstr "Возникла непредвиденная ошибка при попытке входа в систему. Повторите попытку." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:187 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:189 msgctxt "@info" msgid "Unable to start a new sign in process. Check if another sign in attempt is still active." msgstr "Невозможно начать новый вход в систему. Проверьте, возможно другой сеанс еще не завершен." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Нет связи с сервером учетных записей Ultimaker." @@ -452,8 +457,8 @@ msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Файл {0} уже существует. Вы уверены, что желаете перезаписать его?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:452 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:455 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "Неправильный URL-адрес файла:" @@ -536,33 +541,33 @@ msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Профиль {0} имеет неизвестный тип файла или повреждён." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:423 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:426 msgctxt "@label" msgid "Custom profile" msgstr "Собственный профиль" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:439 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:442 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "У профайла отсутствует тип качества." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:443 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:446 msgctxt "@info:status" -msgid "Global stack is missing." -msgstr "Общий стек отсутствует." +msgid "There is no active printer yet." +msgstr "Еще нет активных принтеров." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:449 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:452 msgctxt "@info:status" msgid "Unable to add the profile." msgstr "Невозможно добавить профиль." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:463 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:466 #, python-brace-format msgctxt "@info:status" msgid "Quality type '{0}' is not compatible with the current active machine definition '{1}'." msgstr "Тип качества \"{0}\" несовместим с текущим определением активной машины \"{1}\"." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:468 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:471 #, python-brace-format msgctxt "@info:status" msgid "Warning: The profile is not visible because its quality type '{0}' is not available for the current configuration. Switch to a material/nozzle combination that can use this quality type." @@ -578,23 +583,23 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:712 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 msgctxt "@label" msgid "Nozzle" msgstr "Сопло" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:860 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:856 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "Настройки изменены в соответствии с текущей доступностью экструдеров:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:862 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:858 msgctxt "@info:title" msgid "Settings updated" msgstr "Настройки обновлены" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1447 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1478 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Экструдер (-ы) отключен (-ы)" @@ -607,13 +612,13 @@ msgid "Add" msgstr "Добавить" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:263 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 msgctxt "@action:button" msgid "Finish" msgstr "Завершить" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 #: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 #: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 @@ -621,7 +626,7 @@ msgstr "Завершить" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 msgctxt "@action:button" msgid "Cancel" @@ -633,76 +638,83 @@ msgctxt "@label" msgid "Group #{group_nr}" msgstr "Группа #{group_nr}" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Внешняя стенка" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "Внутренние стенки" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Покрытие" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Заполнение" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Заполнение поддержек" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Связующий слой поддержек" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Поддержки" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Юбка" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 msgctxt "@tooltip" msgid "Prime Tower" msgstr "Черновая башня" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 msgctxt "@tooltip" msgid "Travel" msgstr "Перемещение" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 msgctxt "@tooltip" msgid "Retractions" msgstr "Откаты" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:94 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 msgctxt "@tooltip" msgid "Other" msgstr "Другое" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 msgctxt "@action:button" msgid "Next" msgstr "Следующий" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 +msgctxt "@action:button" +msgid "Skip" +msgstr "Пропустить" + +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:173 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 msgctxt "@action:button" msgid "Close" @@ -727,29 +739,36 @@ msgstr "" "

    Узнайте, как обеспечить максимально возможное качество и высокую надежность печати.

    \n" "

    Ознакомиться с руководством по качеству печати

    " -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:535 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:540 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Файл проекта {0} содержит неизвестный тип принтера {1}. Не удалось импортировать принтер. Вместо этого будут импортированы модели." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:538 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:543 msgctxt "@info:title" msgid "Open Project File" msgstr "Открыть файл проекта" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:634 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:639 #, python-brace-format msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "Файл проекта {0} внезапно стал недоступен: {1}.." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:635 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "Невозможно открыть файл проекта" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:686 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:646 +#, python-brace-format +msgctxt "@info:error Don't translate the XML tags or !" +msgid "Project file {0} is corrupt: {1}." +msgstr "Файл проекта {0} поврежден: {1}." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:698 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." @@ -787,7 +806,7 @@ msgctxt "@error:zip" msgid "The operating system does not allow saving a project file to this location or with this file name." msgstr "Операционная система не позволяет сохранять файл проекта в этом каталоге или с этим именем файла." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:206 msgctxt "@error:zip" msgid "Error writing 3mf file." msgstr "Ошибка в ходе записи файла 3MF." @@ -842,8 +861,8 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "Размер файла резервной копии превышает максимально допустимый." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:23 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "При попытке восстановления данных из резервной копии возникла ошибка." @@ -853,45 +872,45 @@ msgctxt "@item:inmenu" msgid "Manage backups" msgstr "Управление резервными копиями" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Невозможно нарезать модель, используя текущий материал, так как он несовместим с выбранной машиной или конфигурацией." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:411 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:420 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:429 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 msgctxt "@info:title" msgid "Unable to slice" msgstr "Невозможно нарезать" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:412 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Не могу выполнить слайсинг на текущих настройках. Проверьте следующие настройки: {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:410 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:436 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Не удалось выполнить слайсинг из-за настроек модели. Следующие настройки ошибочны для одной или нескольких моделей: {error_labels}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:445 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "Слайсинг невозможен, так как черновая башня или её позиция неверные." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:428 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:454 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "Невозможно разделить на слои из-за наличия объектов, связанных с отключенным экструдером %s." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:463 msgctxt "@info:status" msgid "" "Please review settings and check if your models:\n" @@ -1160,28 +1179,28 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Внешний носитель" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:121 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:128 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled." msgstr "При печати через кабель Cura отображает слои неточно." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:129 msgctxt "@info:title" msgid "Simulation View" msgstr "Вид моделирования" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:status" msgid "Nothing is shown because you need to slice first." msgstr "Ничего не отображается, поскольку сначала нужно выполнить нарезку на слои." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:title" msgid "No layers to show" msgstr "Нет слоев для отображения" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:124 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "Больше не показывать это сообщение" @@ -1191,16 +1210,21 @@ msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Просмотр слоёв" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:70 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:71 msgctxt "@info:status" -msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." -msgstr "Модель не размножена. Выделены области с отсутствующими или лишними поверхностями." +msgid "The highlighted areas indicate either missing or extraneous surfaces. Fix your model and open it again into Cura." +msgstr "Выделены области с отсутствующими или лишними поверхностями. Исправьте модель и снова откройте ее в Cura." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 msgctxt "@info:title" -msgid "Model errors" +msgid "Model Errors" msgstr "Ошибки модели" +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:79 +msgctxt "@action:button" +msgid "Learn more" +msgstr "Узнать больше" + #: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/__init__.py:12 msgctxt "@item:inmenu" msgid "Solid view" @@ -1227,7 +1251,7 @@ msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "В вашей учетной записи Ultimaker обнаружены изменения" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:145 msgctxt "@action:button" msgid "Sync" msgstr "Синхронизация" @@ -1263,7 +1287,7 @@ msgctxt "@info:generic" msgid "You need to quit and restart {} before changes have effect." msgstr "Для активации изменений вам потребуется завершить работу программного обеспечения {} и перезапустить его." -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:79 msgctxt "@info:generic" msgid "{} plugins failed to download" msgstr "Встраиваемые модули ({} шт.) не загружены" @@ -1304,7 +1328,11 @@ msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Пакет формата Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "Невозможно записать в файл UFP:" @@ -1319,22 +1347,22 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Выбор обновлений" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:152 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 msgctxt "@action:button" msgid "Print via cloud" msgstr "Печать через облако" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:155 msgctxt "@properties:tooltip" msgid "Print via cloud" msgstr "Печать через облако" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:156 msgctxt "@info:status" msgid "Connected via cloud" msgstr "Подключено через облако" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:264 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:270 #, python-brace-format msgctxt "@error:send" msgid "Unknown error code when uploading print job: {0}" @@ -1637,82 +1665,82 @@ msgctxt "@info:tooltip" msgid "Some things could be problematic in this print. Click to see tips for adjustment." msgstr "С этой печатью могут быть связаны некоторые проблемы. Щелкните для просмотра советов по регулировке." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:15 msgctxt "@title:window" msgid "Open Project" msgstr "Открытие проекта" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" msgstr "Обновить существующий" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:63 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "Создать новый" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "Сводка - Проект Cura" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 msgctxt "@action:label" msgid "Printer settings" msgstr "Параметры принтера" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:112 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:113 msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "Как следует решать конфликт в принтере?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:165 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 msgctxt "@action:label" msgid "Type" msgstr "Тип" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:181 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 msgctxt "@action:label" msgid "Printer Group" msgstr "Группа принтеров" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:203 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 msgctxt "@action:label" msgid "Profile settings" msgstr "Параметры профиля" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:219 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:221 msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "Как следует решать конфликт в профиле?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:349 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 msgctxt "@action:label" msgid "Name" msgstr "Название" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:255 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 msgctxt "@action:label" msgid "Intent" msgstr "Intent" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:271 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Not in profile" msgstr "Вне профиля" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:276 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 msgctxt "@action:label" msgid "%1 override" @@ -1721,12 +1749,12 @@ msgstr[0] "%1 перекрыт" msgstr[1] "%1 перекрыто" msgstr[2] "%1 перекрыто" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:287 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:290 msgctxt "@action:label" msgid "Derivative from" msgstr "Производное от" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:295 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" @@ -1734,42 +1762,42 @@ msgstr[0] "%1, %2 перекрыто" msgstr[1] "%1, %2 перекрыто" msgstr[2] "%1, %2 перекрыто" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:309 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:312 msgctxt "@action:label" msgid "Material settings" msgstr "Параметры материала" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:328 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Как следует решать конфликт в материале?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:369 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:373 msgctxt "@action:label" msgid "Setting visibility" msgstr "Видимость параметров" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:378 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:382 msgctxt "@action:label" msgid "Mode" msgstr "Режим" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:label" msgid "Visible settings:" msgstr "Видимые параметры:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:399 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:403 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 из %2" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:425 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:429 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Загрузка проекта приведет к удалению всех моделей на рабочем столе." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:457 msgctxt "@action:button" msgid "Open" msgstr "Открыть" @@ -1871,8 +1899,8 @@ msgstr "Резервное копирование и синхронизация #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:68 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:125 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:199 msgctxt "@button" msgid "Sign in" msgstr "Войти" @@ -2106,12 +2134,12 @@ msgctxt "@label" msgid "Cooling Fan Number" msgstr "Номер охлаждающего вентилятора" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:163 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "Стартовый G-код экструдера" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:177 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "Завершающий G-код экструдера" @@ -2196,12 +2224,17 @@ msgctxt "@label" msgid "Number of Extruders" msgstr "Количество экструдеров" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:345 +msgctxt "@label" +msgid "Apply Extruder offsets to GCode" +msgstr "Применить смещения экструдера к GCode" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:393 msgctxt "@title:label" msgid "Start G-code" msgstr "Стартовый G-код" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:385 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:404 msgctxt "@title:label" msgid "End G-code" msgstr "Завершающий G-код" @@ -2229,6 +2262,11 @@ msgctxt "@label link to technical assistance" msgid "View user manuals online" msgstr "Просмотр руководств пользователей онлайн" +#: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 +msgctxt "@info" +msgid "In order to monitor your print from Cura, please connect the printer." +msgstr "Чтобы отслеживать задания печати при помощи Cura, подключите принтер." + #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" msgid "Mesh Type" @@ -2275,7 +2313,7 @@ msgid "Select Settings to Customize for this model" msgstr "Выберите параметр для изменения этой модели" #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 msgctxt "@label:textbox" msgid "Filter..." msgstr "Фильтр..." @@ -2285,32 +2323,32 @@ msgctxt "@label:checkbox" msgid "Show all" msgstr "Показать всё" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:20 msgctxt "@title:window" msgid "Post Processing Plugin" msgstr "Плагин пост-обработки" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:59 msgctxt "@label" msgid "Post Processing Scripts" msgstr "Скрипты пост-обработки" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:235 msgctxt "@action" msgid "Add a script" msgstr "Добавить скрипт" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:282 msgctxt "@label" msgid "Settings" msgstr "Параметры" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:499 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:502 msgctxt "@info:tooltip" msgid "Change active post-processing scripts." msgstr "Измените активные скрипты пост-обработки." -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:506 msgctxt "@info:tooltip" msgid "The following script is active:" msgid_plural "The following scripts are active:" @@ -2324,78 +2362,93 @@ msgctxt "@label" msgid "Color scheme" msgstr "Цветовая схема" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:110 msgctxt "@label:listbox" msgid "Material Color" msgstr "Цвет материала" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:111 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:114 msgctxt "@label:listbox" msgid "Line Type" msgstr "Тип линии" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:115 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:118 msgctxt "@label:listbox" msgid "Speed" msgstr "Скорость" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:122 msgctxt "@label:listbox" -msgid "Layer thickness" +msgid "Layer Thickness" msgstr "Толщина слоя" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:126 +msgctxt "@label:listbox" +msgid "Line Width" +msgstr "Ширина линии" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 +msgctxt "@label:listbox" +msgid "Flow" +msgstr "Поток" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" msgid "Compatibility Mode" msgstr "Режим совместимости" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:230 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:245 msgctxt "@label" msgid "Travels" msgstr "Перемещения" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:251 msgctxt "@label" msgid "Helpers" msgstr "Помощники" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:257 msgctxt "@label" msgid "Shell" msgstr "Ограждение" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:248 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 msgctxt "@label" msgid "Infill" msgstr "Заполнение" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:298 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:271 +msgctxt "@label" +msgid "Starts" +msgstr "Запуск" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 msgctxt "@label" msgid "Only Show Top Layers" msgstr "Показать только верхние слои" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:308 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:332 msgctxt "@label" msgid "Show 5 Detailed Layers On Top" msgstr "Показать 5 детализированных слоёв сверху" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:346 msgctxt "@label" msgid "Top / Bottom" msgstr "Дно / крышка" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:350 msgctxt "@label" msgid "Inner Wall" msgstr "Внутренняя стенка" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:384 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:419 msgctxt "@label" msgid "min" msgstr "мин." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:433 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:488 msgctxt "@label" msgid "max" msgstr "макс." @@ -2536,7 +2589,7 @@ msgid "Plugins" msgstr "Плагины" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 msgctxt "@title:tab" msgid "Materials" @@ -2585,6 +2638,7 @@ msgstr "Отклонить" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:178 msgctxt "@button" msgid "Next" msgstr "Следующий" @@ -2929,7 +2983,7 @@ msgid "Delete" msgstr "Удалить" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:289 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 msgctxt "@label" msgid "Resume" msgstr "Продолжить" @@ -2945,8 +2999,8 @@ msgid "Resuming..." msgstr "Возобновляется..." #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 msgctxt "@label" msgid "Pause" msgstr "Пауза" @@ -2987,7 +3041,7 @@ msgid "Are you sure you want to abort %1?" msgstr "Вы уверены, что хотите прервать %1?" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 msgctxt "@window:title" msgid "Abort print" msgstr "Прервать печать" @@ -2998,7 +3052,7 @@ msgid "Manage printer" msgstr "Управление принтером" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." @@ -3024,27 +3078,34 @@ msgctxt "@label:status" msgid "Idle" msgstr "Простой" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:365 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +msgctxt "@label:status" +msgid "Preparing..." +msgstr "Подготовка..." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:369 msgctxt "@label:status" msgid "Printing" msgstr "Печать" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:406 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:410 msgctxt "@label" msgid "Untitled" msgstr "Без имени" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:431 msgctxt "@label" msgid "Anonymous" msgstr "Анонимн" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:458 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Необходимо внести изменения конфигурации" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:492 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:496 msgctxt "@action:button" msgid "Details" msgstr "Подробности" @@ -3071,12 +3132,6 @@ msgctxt "@label:status" msgid "Finished" msgstr "Завершено" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -msgctxt "@label:status" -msgid "Preparing..." -msgstr "Подготовка..." - #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." @@ -3157,27 +3212,27 @@ msgctxt "@action:button" msgid "Sign in" msgstr "Войти" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" -msgid "Your key to connected 3D printing" -msgstr "Ваш ключ к дистанционной 3D-печати" +msgid "Sign in to the Ultimaker platform" +msgstr "Войдите на платформу Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:42 msgctxt "@text" msgid "" -"- Customize your experience with more print profiles and plugins\n" -"- Stay flexible by syncing your setup and loading it anywhere\n" -"- Increase efficiency with a remote workflow on Ultimaker printers" +"- Add material profiles and plug-ins from the Marketplace\n" +"- Back-up and sync your material profiles and plug-ins\n" +"- Share ideas and get help from 48,000+ users in the Ultimaker community" msgstr "" -"- Новые профили печати и подключаемые модули позволяют вам печатать именно то, что вы хотите\n" -"- Функция синхронизации настроек и их загрузки из любого места расширяет ваши возможности\n" -"- Удаленная работа на принтерах Ultimaker обеспечивает повышение эффективности ваших процессов" +"- Добавляйте настройки материалов и плагины из Marketplace \n" +" - Выполняйте резервное копирование и синхронизацию своих настроек материалов и плагинов \n" +" - Делитесь идеями и получайте помощь от 48 000 пользователей в сообществе Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:142 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:62 msgctxt "@button" -msgid "Create account" -msgstr "Создать учетную запись" +msgid "Create a free Ultimaker account" +msgstr "Создайте бесплатную учетную запись Ultimaker" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/SyncState.qml:28 msgctxt "@label" @@ -3284,312 +3339,308 @@ msgctxt "@button" msgid "Cancel" msgstr "Отмена" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:83 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Показать онлайн-руководство по решению проблем" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:90 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Полный экран" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:98 msgctxt "@action:inmenu" msgid "Exit Full Screen" msgstr "Выйти из полноэкранного режима" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:105 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "Отмена" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:115 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "Возврат" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:125 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "Выход" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:132 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:133 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "Трехмерный вид" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:140 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Вид спереди" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:147 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Вид сверху" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 +msgctxt "@action:inmenu menubar:view" +msgid "Bottom View" +msgstr "Вид снизу" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Вид слева" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:160 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:168 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Вид справа" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:175 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Настроить Cura..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:182 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "Добавить принтер..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:180 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:188 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Управление принтерами..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:187 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Управление материалами..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu" msgid "Add more materials from Marketplace" msgstr "Добавить больше материалов из Магазина" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "Обновить профиль текущими параметрами" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "Сбросить текущие параметры" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:222 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:230 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "Создать профиль из текущих параметров..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Управление профилями..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Показать онлайн документацию" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Отправить отчёт об ошибке" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:260 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Что нового" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:266 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "О Cura..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:273 msgctxt "@action:inmenu menubar:edit" -msgid "Delete Selected Model" -msgid_plural "Delete Selected Models" -msgstr[0] "Удалить выбранную модель" -msgstr[1] "Удалить выбранные модели" -msgstr[2] "Удалить выбранные модели" +msgid "Delete Selected" +msgstr "Удалить выбранное" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:283 msgctxt "@action:inmenu menubar:edit" -msgid "Center Selected Model" -msgid_plural "Center Selected Models" -msgstr[0] "Центрировать выбранную модель" -msgstr[1] "Центрировать выбранные модели" -msgstr[2] "Центрировать выбранные модели" +msgid "Center Selected" +msgstr "Центрировать выбранное" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:292 msgctxt "@action:inmenu menubar:edit" -msgid "Multiply Selected Model" -msgid_plural "Multiply Selected Models" -msgstr[0] "Размножить выбранную модель" -msgstr[1] "Размножить выбранные модели" -msgstr[2] "Размножить выбранные модели" +msgid "Multiply Selected" +msgstr "Размножить выбранное" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Удалить модель" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:309 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Поместить модель по центру" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:307 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "Сгруппировать модели" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:327 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:335 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Разгруппировать модели" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:345 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "Объединить модели" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:347 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:355 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "Дублировать модель..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:362 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Выбрать все модели" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:372 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Очистить стол" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:382 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Перезагрузить все модели" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Выровнять все модели по всем рабочим столам" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:390 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Выровнять все модели" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:406 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Выровнять выбранные" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:405 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:413 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Сбросить позиции всех моделей" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:412 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Сбросить преобразования всех моделей" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:419 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:429 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "Открыть файл(ы)..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:439 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "Новый проект..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:434 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:446 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Показать конфигурационный каталог" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:441 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:538 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Видимость параметров..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:448 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:460 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Магазин" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:257 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Этот пакет будет установлен после перезапуска." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 msgctxt "@title:tab" msgid "General" msgstr "Общее" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:462 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:453 msgctxt "@title:tab" msgid "Settings" msgstr "Параметры" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:464 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 msgctxt "@title:tab" msgid "Printers" msgstr "Принтеры" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 msgctxt "@title:tab" msgid "Profiles" msgstr "Профили" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:576 msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "Закрытие %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:588 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "Вы уверены, что хотите выйти из %1?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:638 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Открыть файл(ы)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:744 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:737 msgctxt "@window:title" msgid "Install Package" msgstr "Установить пакет" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:752 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:745 msgctxt "@title:window" msgid "Open File(s)" msgstr "Открыть файл(ы)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:755 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:748 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Среди выбранных файлов мы нашли несколько файлов с G-кодом. Вы можете открыть только один файл за раз. Измените свой выбор, пожалуйста." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:858 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:857 msgctxt "@title:window" msgid "Add Printer" msgstr "Добавление принтера" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:866 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:865 msgctxt "@title:window" msgid "What's New" msgstr "Что нового" @@ -3739,17 +3790,27 @@ msgctxt "@label" msgid "Python bindings for libnest2d" msgstr "Интерфейс Python для libnest2d" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +msgctxt "@label" +msgid "Support library for system keyring access" +msgstr "Вспомогательная библиотека для доступа к набору ключей системы" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" +msgid "Python extensions for Microsoft Windows" +msgstr "Расширения Python для Microsoft Windows" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +msgctxt "@label" msgid "Font" msgstr "Шрифт" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 msgctxt "@label" msgid "SVG icons" msgstr "Иконки SVG" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:165 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Развертывание приложений для различных дистрибутивов Linux" @@ -3759,22 +3820,22 @@ msgctxt "@title:window" msgid "Open project file" msgstr "Открыть файл проекта" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:88 msgctxt "@text:window" msgid "This is a Cura project file. Would you like to open it as a project or import the models from it?" msgstr "Это проект Cura. Следует открыть его как проект или просто импортировать из него модели?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:98 msgctxt "@text:window" msgid "Remember my choice" msgstr "Запомнить мой выбор" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:122 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:117 msgctxt "@action:button" msgid "Open as project" msgstr "Открыть как проект" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:131 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:126 msgctxt "@action:button" msgid "Import models" msgstr "Импортировать модели" @@ -3806,7 +3867,7 @@ msgid "Current changes" msgstr "Текущие изменения" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Всегда спрашивать меня" @@ -3831,12 +3892,12 @@ msgctxt "@action:button" msgid "Keep changes" msgstr "Сохранить изменения" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 msgctxt "@text:window" msgid "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?" msgstr "Мы нашли один или более проектных файлов среди выбранных вами. Вы можете открыть только один файл проекта. Мы предлагаем импортировать только модели их этих файлов. Желаете продолжить?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:99 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:94 msgctxt "@action:button" msgid "Import all as models" msgstr "Импортировать всё как модели" @@ -3992,7 +4053,7 @@ msgctxt "@label" msgid "Material" msgstr "Материал" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:407 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Использовать клей для лучшего прилипания с этой комбинацией материалов." @@ -4018,17 +4079,17 @@ msgctxt "@label" msgid "Number of Copies" msgstr "Количество копий" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:33 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:41 msgctxt "@title:menu menubar:file" msgid "&Save Project..." msgstr "&Сохранить проект..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:54 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:74 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&Экспорт..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:85 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Экспорт выбранного..." @@ -4048,6 +4109,11 @@ msgctxt "@label:category menu label" msgid "Generic" msgstr "Универсальные" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/OpenFilesMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Open File(s)..." +msgstr "Открыть файл(ы)..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -4063,6 +4129,11 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "Открыть недавние" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SaveProjectMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Save Project..." +msgstr "Сохранить проект..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:15 msgctxt "@title:menu menubar:settings" msgid "&Printer" @@ -4088,17 +4159,17 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Отключить экструдер" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:16 msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Видимые параметры" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:45 msgctxt "@action:inmenu" msgid "Collapse All Categories" msgstr "Свернуть все категории" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Управление видимостью настроек..." @@ -4108,22 +4179,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "Положение камеры" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:45 msgctxt "@action:inmenu menubar:view" msgid "Camera view" msgstr "Вид камеры" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:48 msgctxt "@action:inmenu menubar:view" msgid "Perspective" msgstr "Перспективная" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:60 msgctxt "@action:inmenu menubar:view" msgid "Orthographic" msgstr "Ортографическая" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:81 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "Рабочий стол" @@ -4168,12 +4239,12 @@ msgctxt "@label:MonitorStatus" msgid "Please remove the print" msgstr "Пожалуйста, удалите напечатанное" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@label" msgid "Abort Print" msgstr "Прервать печать" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:338 msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Вы уверены, что желаете прервать печать?" @@ -4216,301 +4287,301 @@ msgctxt "@label" msgid "Interface" msgstr "Интерфейс" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:216 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:209 msgctxt "@label" msgid "Currency:" msgstr "Валюта:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:229 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:222 msgctxt "@label" msgid "Theme:" msgstr "Тема:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Для применения данных изменений вам потребуется перезапустить приложение." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:284 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Нарезать автоматически при изменении настроек." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 msgctxt "@option:check" msgid "Slice automatically" msgstr "Нарезать автоматически" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:306 msgctxt "@label" msgid "Viewport behavior" msgstr "Поведение окна" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:314 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Подсвечивать красным области модели, требующие поддержек. Без поддержек эти области не будут напечатаны правильно." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:323 msgctxt "@option:check" msgid "Display overhang" msgstr "Отобразить нависания" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:351 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@info:tooltip" msgid "Highlight missing or extraneous surfaces of the model using warning signs. The toolpaths will often be missing parts of the intended geometry." msgstr "Отметьте отсутствующие или лишние поверхности модели с помощью предупреждающих знаков. В путях инструментов часто будут отсутствовать детали предполагаемой геометрии." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:342 msgctxt "@option:check" msgid "Display model errors" msgstr "Показывать ошибки модели" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Перемещать камеру так, чтобы выбранная модель помещалась в центр экрана" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:373 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Центрировать камеру на выбранном объекте" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Следует ли инвертировать стандартный способ увеличения в Cura?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:388 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Инвертировать направление увеличения камеры." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Увеличивать по мере движения мышкой?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "В ортогональной проекции изменение масштаба мышью не поддерживается." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:409 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Увеличивать по движению мышки" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:435 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:417 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Следует ли размещать модели на столе так, чтобы они больше не пересекались?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:440 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:422 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Удостовериться, что модели размещены рядом" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:431 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Следует ли опустить модели на стол?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:436 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Автоматически опускать модели на стол" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:448 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "Показывать предупреждающее сообщение в средстве считывания G-кода." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:457 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "Предупреждающее сообщение в средстве считывания G-кода" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Должен ли слой быть переведён в режим совместимости?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Просматривать слои в режиме совместимости (требуется перезапуск)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:498 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" msgstr "Открыть Cura на том месте, где вы остановились в прошлый раз?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:485 msgctxt "@option:check" msgid "Restore window position on start" msgstr "Восстановить положение окна при запуске" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:513 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Рендеринг камеры какого типа следует использовать?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:502 msgctxt "@window:text" msgid "Camera rendering:" msgstr "Рендеринг камеры:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:531 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:509 msgid "Perspective" msgstr "Перспективная" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:532 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgid "Orthographic" msgstr "Ортографическая" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:563 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:548 msgctxt "@label" msgid "Opening and saving files" msgstr "Открытие и сохранение файлов" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:555 msgctxt "@info:tooltip" msgid "Should opening files from the desktop or external applications open in the same instance of Cura?" msgstr "Открывать файлы с компьютера и из внешних приложений в одном экземпляре Cura?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@option:check" msgid "Use a single instance of Cura" msgstr "Использовать один экземпляр Cura" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Масштабировать ли модели для размещения внутри печатаемого объёма, если они не влезают в него?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@option:check" msgid "Scale large models" msgstr "Масштабировать большие модели" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Модель может показаться очень маленькой, если её размерность задана в метрах, а не миллиметрах. Следует ли масштабировать такие модели?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Масштабировать очень маленькие модели" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Выбрать модели после их загрузки?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Выбрать модели при загрузке" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Надо ли автоматически добавлять префикс, основанный на имени принтера, к названию задачи на печать?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:635 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Добавить префикс принтера к имени задачи" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:645 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Показывать сводку при сохранении файла проекта?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:649 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:634 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Показывать сводку при сохранении проекта" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:659 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:644 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Стандартное поведение при открытии файла проекта" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:652 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Стандартное поведение при открытии файла проекта: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Всегда спрашивать меня" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:682 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Всегда открывать как проект" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:668 msgctxt "@option:openProject" msgid "Always import models" msgstr "Всегда импортировать модели" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:705 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "При внесении изменений в профиль и переключении на другой, будет показан диалог, запрашивающий ваше решение о сохранении ваших изменений, или вы можете указать стандартное поведение и не показывать такой диалог." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:728 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Профили" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Поведение по умолчанию для измененных значений настройки при переключении на другой профиль: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:748 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:734 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Всегда сбрасывать измененные настройки" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:749 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:735 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Всегда передавать измененные настройки новому профилю" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:783 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@label" msgid "Privacy" msgstr "Приватность" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:790 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:777 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Должна ли Cura проверять обновления программы при старте?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:795 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:782 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Проверять обновления при старте" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:805 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:792 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Можно ли отправлять анонимную информацию о вашей печати в Ultimaker? Следует отметить, что ни модели, ни IP-адреса и никакая другая персональная информация не будет отправлена или сохранена." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:810 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:797 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "Отправлять (анонимно) информацию о печати" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:819 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:806 msgctxt "@action:button" msgid "More information" msgstr "Дополнительная информация" @@ -4550,55 +4621,65 @@ msgctxt "@action:button" msgid "Export" msgstr "Экспорт" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 +msgctxt "@action:button Sending materials to printers" +msgid "Sync with Printers" +msgstr "Синхронизация с принтерами" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" msgid "Printer" msgstr "Принтер" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:298 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Подтвердите удаление" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:301 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Вы уверены, что желаете удалить %1? Это нельзя будет отменить!" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 msgctxt "@title:window" msgid "Import Material" msgstr "Импортировать материал" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:338 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Не могу импортировать материал %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:328 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:342 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Успешно импортированный материал %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:346 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 msgctxt "@title:window" msgid "Export Material" msgstr "Экспортировать материал" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:358 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:372 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Не могу экспортировать материал %1: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:378 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Материал успешно экспортирован в %1" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 +msgctxt "@title:window" +msgid "Export All Materials" +msgstr "Экспорт всех материалов" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" @@ -4710,53 +4791,53 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Укажите имя для данного профиля." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Скопировать профиль" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@title:window" msgid "Rename Profile" msgstr "Переименовать профиль" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:307 msgctxt "@title:window" msgid "Import Profile" msgstr "Импорт профиля" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:336 msgctxt "@title:window" msgid "Export Profile" msgstr "Экспорт профиля" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:399 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Принтер: %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:557 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Обновить профиль текущими параметрами" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 msgctxt "@action:button" msgid "Discard current changes" msgstr "Сбросить текущие параметры" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:583 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Данный профиль использует настройки принтера по умолчанию, поэтому список ниже пуст." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:591 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Ваши текущие параметры совпадают с выбранным профилем." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:609 msgctxt "@title:tab" msgid "Global Settings" msgstr "Общие параметры" @@ -4786,12 +4867,12 @@ msgctxt "@title:column" msgid "Unit" msgstr "Единица" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:16 msgctxt "@title:tab" msgid "Setting Visibility" msgstr "Видимость параметров" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:48 msgctxt "@label:textbox" msgid "Check all" msgstr "Выбрать все" @@ -5130,27 +5211,27 @@ msgctxt "@label:textbox" msgid "Search settings" msgstr "Параметры поиска" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:456 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:468 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Скопировать значение для всех экструдеров" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:477 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Копировать все измененные значения для всех экструдеров" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:502 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:514 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Спрятать этот параметр" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:515 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:527 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Не показывать этот параметр" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:531 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Оставить этот параметр видимым" @@ -5210,11 +5291,6 @@ msgctxt "@button" msgid "Add printer manually" msgstr "Добавить принтер вручную" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddCloudPrintersView.qml:218 -msgctxt "@button" -msgid "Finish" -msgstr "Завершить" - #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:230 msgctxt "@label" msgid "Manufacturer" @@ -5321,32 +5397,32 @@ msgctxt "@button" msgid "Connect" msgstr "Подключить" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:43 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" -msgid "Ultimaker Account" -msgstr "Учетная запись Ultimaker" +msgid "Release Notes" +msgstr "Примечания к выпуску" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:124 msgctxt "@text" -msgid "Your key to connected 3D printing" -msgstr "Ваш ключ к дистанционной 3D-печати" +msgid "Add material settings and plugins from the Marketplace" +msgstr "Добавляйте настройки материалов и плагины из Marketplace" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:101 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:154 msgctxt "@text" -msgid "- Customize your experience with more print profiles and plugins" -msgstr "- Новые профили печати и подключаемые модули позволяют вам печатать именно то, что вы хотите" +msgid "Backup and sync your material settings and plugins" +msgstr "Выполняйте резервное копирование и синхронизацию своих настроек материалов и плагинов" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:184 msgctxt "@text" -msgid "- Stay flexible by syncing your setup and loading it anywhere" -msgstr "- Функция синхронизации настроек и их загрузки из любого места расширяет ваши возможности" +msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" +msgstr "Делитесь идеями и получайте помощь от 48 000 пользователей в сообществе Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:217 msgctxt "@text" -msgid "- Increase efficiency with a remote workflow on Ultimaker printers" -msgstr "- Удаленная работа на принтерах Ultimaker обеспечивает повышение эффективности ваших процессов" +msgid "Create a free Ultimaker Account" +msgstr "Создайте бесплатную учетную запись Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:230 msgctxt "@button" msgid "Skip" msgstr "Пропустить" @@ -5406,29 +5482,32 @@ msgctxt "@button" msgid "Decline and close" msgstr "Отклонить и закрыть" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:29 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" msgid "Welcome to Ultimaker Cura" msgstr "Приветствуем в Ultimaker Cura" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:68 msgctxt "@text" -msgid "" -"Please follow these steps to set up\n" -"Ultimaker Cura. This will only take a few moments." +msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." msgstr "" "Выполните указанные ниже действия для настройки\n" "Ultimaker Cura. Это займет немного времени." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:86 msgctxt "@button" msgid "Get started" msgstr "Приступить" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:28 msgctxt "@label" -msgid "What's new in Ultimaker Cura" -msgstr "Что нового в Ultimaker Cura" +msgid "What's New" +msgstr "Что нового" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Widgets/ComboBox.qml:24 +msgctxt "@label" +msgid "No items to select from" +msgstr "Нет элементов для выбора" #: ModelChecker/plugin.json msgctxt "description" @@ -5510,6 +5589,16 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Запись профиля Cura" +#: DigitalLibrary/plugin.json +msgctxt "description" +msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." +msgstr "Подключается к цифровой библиотеке, позволяя Cura открывать файлы из цифровой библиотеки и сохранять файлы в нее." + +#: DigitalLibrary/plugin.json +msgctxt "name" +msgid "Ultimaker Digital Library" +msgstr "Цифровая библиотека Ultimaker" + #: FirmwareUpdateChecker/plugin.json msgctxt "description" msgid "Checks for firmware updates." @@ -5980,6 +6069,26 @@ msgctxt "name" msgid "Version Upgrade 4.7 to 4.8" msgstr "Обновление версии 4.7 до 4.8" +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." +msgstr "Обновляет конфигурации Cura 4.8 до Cura 4.9." + +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.8 to 4.9" +msgstr "Обновление версии 4.8 до 4.9" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." +msgstr "Обновляет конфигурации Cura 4.9 до Cura 4.10." + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.9 to 4.10" +msgstr "Обновление версии 4.9 до 4.10" + #: X3DReader/plugin.json msgctxt "description" msgid "Provides support for reading X3D files." @@ -6010,6 +6119,97 @@ msgctxt "name" msgid "X-Ray View" msgstr "Просмотр в рентгене" +#~ msgctxt "@info:status" +#~ msgid "Global stack is missing." +#~ msgstr "Общий стек отсутствует." + +#~ msgctxt "@info:status" +#~ msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." +#~ msgstr "Модель не размножена. Выделены области с отсутствующими или лишними поверхностями." + +#~ msgctxt "@info:title" +#~ msgid "Model errors" +#~ msgstr "Ошибки модели" + +#~ msgctxt "@label:listbox" +#~ msgid "Layer thickness" +#~ msgstr "Толщина слоя" + +#~ msgctxt "@label" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "Ваш ключ к дистанционной 3D-печати" + +#~ msgctxt "@text" +#~ msgid "" +#~ "- Customize your experience with more print profiles and plugins\n" +#~ "- Stay flexible by syncing your setup and loading it anywhere\n" +#~ "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "" +#~ "- Новые профили печати и подключаемые модули позволяют вам печатать именно то, что вы хотите\n" +#~ "- Функция синхронизации настроек и их загрузки из любого места расширяет ваши возможности\n" +#~ "- Удаленная работа на принтерах Ultimaker обеспечивает повышение эффективности ваших процессов" + +#~ msgctxt "@button" +#~ msgid "Create account" +#~ msgstr "Создать учетную запись" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Delete Selected Model" +#~ msgid_plural "Delete Selected Models" +#~ msgstr[0] "Удалить выбранную модель" +#~ msgstr[1] "Удалить выбранные модели" +#~ msgstr[2] "Удалить выбранные модели" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Center Selected Model" +#~ msgid_plural "Center Selected Models" +#~ msgstr[0] "Центрировать выбранную модель" +#~ msgstr[1] "Центрировать выбранные модели" +#~ msgstr[2] "Центрировать выбранные модели" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Multiply Selected Model" +#~ msgid_plural "Multiply Selected Models" +#~ msgstr[0] "Размножить выбранную модель" +#~ msgstr[1] "Размножить выбранные модели" +#~ msgstr[2] "Размножить выбранные модели" + +#~ msgctxt "@button" +#~ msgid "Finish" +#~ msgstr "Завершить" + +#~ msgctxt "@label" +#~ msgid "Ultimaker Account" +#~ msgstr "Учетная запись Ultimaker" + +#~ msgctxt "@text" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "Ваш ключ к дистанционной 3D-печати" + +#~ msgctxt "@text" +#~ msgid "- Customize your experience with more print profiles and plugins" +#~ msgstr "- Новые профили печати и подключаемые модули позволяют вам печатать именно то, что вы хотите" + +#~ msgctxt "@text" +#~ msgid "- Stay flexible by syncing your setup and loading it anywhere" +#~ msgstr "- Функция синхронизации настроек и их загрузки из любого места расширяет ваши возможности" + +#~ msgctxt "@text" +#~ msgid "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "- Удаленная работа на принтерах Ultimaker обеспечивает повышение эффективности ваших процессов" + +#~ msgctxt "@text" +#~ msgid "" +#~ "Please follow these steps to set up\n" +#~ "Ultimaker Cura. This will only take a few moments." +#~ msgstr "" +#~ "Выполните указанные ниже действия для настройки\n" +#~ "Ultimaker Cura. Это займет немного времени." + +#~ msgctxt "@label" +#~ msgid "What's new in Ultimaker Cura" +#~ msgstr "Что нового в Ultimaker Cura" + #~ msgctxt "@label ({} is object name)" #~ msgid "Are you sure you wish to remove {}? This cannot be undone!" #~ msgstr "Действительно удалить {}? Это действие невозможно будет отменить!" diff --git a/resources/i18n/ru_RU/fdmextruder.def.json.po b/resources/i18n/ru_RU/fdmextruder.def.json.po index 1ff7f2c3fe..110b6180b6 100644 --- a/resources/i18n/ru_RU/fdmextruder.def.json.po +++ b/resources/i18n/ru_RU/fdmextruder.def.json.po @@ -1,20 +1,20 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2019-03-13 14:00+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 14:58+0200\n" "Last-Translator: Bothof \n" "Language-Team: Ruslan Popov , Russian \n" "Language: ru_RU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0\n" +"X-Generator: Poedit 2.4.1\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: fdmextruder.def.json diff --git a/resources/i18n/ru_RU/fdmprinter.def.json.po b/resources/i18n/ru_RU/fdmprinter.def.json.po index 2643199b85..f0bd5a6feb 100644 --- a/resources/i18n/ru_RU/fdmprinter.def.json.po +++ b/resources/i18n/ru_RU/fdmprinter.def.json.po @@ -1,20 +1,20 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2020-08-21 13:40+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 14:58+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Russian , Ruslan Popov , Russian \n" "Language: ru_RU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.3\n" +"X-Generator: Poedit 2.4.1\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: fdmprinter.def.json @@ -420,6 +420,26 @@ msgctxt "machine_extruders_share_heater description" msgid "Whether the extruders share a single heater rather than each extruder having its own heater." msgstr "Указывает, используют ли для все экструдеры общий нагреватель или у каждого имеется отдельный." +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle label" +msgid "Extruders Share Nozzle" +msgstr "Общее сопло экструдеров" + +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle description" +msgid "Whether the extruders share a single nozzle rather than each extruder having its own nozzle. When set to true, it is expected that the printer-start gcode script properly sets up all extruders in an initial retraction state that is known and mutually compatible (either zero or one filament not retracted); in that case the initial retraction status is described, per extruder, by the 'machine_extruders_shared_nozzle_initial_retraction' parameter." +msgstr "Указывает, используют ли все экструдеры общее сопло или у каждого имеется отдельное. Если установлено значение true, ожидается, что сценарий gcode запуска принтера правильно переводит все экструдеры в известное и взаимно совместимое начальное состояние отката (либо ноль, либо один материал не втянут); в этом случае начальное состояние отката описывается для каждого экструдера параметром machine_extruders_shared_nozzle_initial_retraction." + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction label" +msgid "Shared Nozzle Initial Retraction" +msgstr "Начальный откат общего сопла" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction description" +msgid "How much the filament of each extruder is assumed to have been retracted from the shared nozzle tip at the completion of the printer-start gcode script; the value should be equal to or greater than the length of the common part of the nozzle's ducts." +msgstr "Показывает, насколько материал каждого экструдера предположительно вытянут от наконечника общего сопла по завершении запуска сценария gcode принтера; значение должно быть равно длине общей части каналов сопла или превышать ее." + #: fdmprinter.def.json msgctxt "machine_disallowed_areas label" msgid "Disallowed Areas" @@ -487,8 +507,8 @@ msgstr "Смещение с экструдером" #: fdmprinter.def.json msgctxt "machine_use_extruder_offset_to_offset_coords description" -msgid "Apply the extruder offset to the coordinate system." -msgstr "Применить смещение экструдера к системе координат." +msgid "Apply the extruder offset to the coordinate system. Affects all extruders." +msgstr "Применить смещение экструдера к системе координат. Влияет на все экструдеры." #: fdmprinter.def.json msgctxt "extruder_prime_pos_z label" @@ -882,8 +902,8 @@ msgstr "Множитель для ширины линии первого сло #: fdmprinter.def.json msgctxt "shell label" -msgid "Shell" -msgstr "Ограждение" +msgid "Walls" +msgstr "Стенки" #: fdmprinter.def.json msgctxt "shell description" @@ -950,166 +970,6 @@ msgctxt "wall_0_wipe_dist description" msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better." msgstr "Расстояние перемещения, добавленное после печати внешней стенки, чтобы лучше спрятать Z шов." -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr label" -msgid "Top Surface Skin Extruder" -msgstr "Экструдер для печати крышки" - -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr description" -msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." -msgstr "Экструдер, используемый для печати верхних оболочек. Используется при наличии нескольких экструдеров." - -#: fdmprinter.def.json -msgctxt "roofing_layer_count label" -msgid "Top Surface Skin Layers" -msgstr "Слои верхней оболочки" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count description" -msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." -msgstr "Количество верхних слоёв оболочки. Обычно достаточно одного слоя для получения верхних поверхностей в хорошем качестве." - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr label" -msgid "Top/Bottom Extruder" -msgstr "Экструдер дна/крышки" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr description" -msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." -msgstr "Экструдер, используемый для печати верхней и нижней оболочек. Используется при наличии нескольких экструдеров." - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness label" -msgid "Top/Bottom Thickness" -msgstr "Толщина дна/крышки" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness description" -msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." -msgstr "Толщина слоя дна/крышки при печати. Это значение, разделённое на высоту слоя, определяет количество слоёв в дне/крышке." - -#: fdmprinter.def.json -msgctxt "top_thickness label" -msgid "Top Thickness" -msgstr "Толщина крышки" - -#: fdmprinter.def.json -msgctxt "top_thickness description" -msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." -msgstr "Толщина крышки при печати. Это значение, разделённое на высоту слоя, определяет количество слоёв в крышке." - -#: fdmprinter.def.json -msgctxt "top_layers label" -msgid "Top Layers" -msgstr "Слои крышки" - -#: fdmprinter.def.json -msgctxt "top_layers description" -msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." -msgstr "Количество слоёв в крышке. При вычислении толщины крышки это значение округляется до целого." - -#: fdmprinter.def.json -msgctxt "bottom_thickness label" -msgid "Bottom Thickness" -msgstr "Толщина дна" - -#: fdmprinter.def.json -msgctxt "bottom_thickness description" -msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." -msgstr "Толщина дна при печати. Это значение, разделённое на высоту слоя, определяет количество слоёв в дне." - -#: fdmprinter.def.json -msgctxt "bottom_layers label" -msgid "Bottom Layers" -msgstr "Слои дна" - -#: fdmprinter.def.json -msgctxt "bottom_layers description" -msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "Количество слоёв в дне. При вычислении толщины дна это значение округляется до целого." - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers label" -msgid "Initial Bottom Layers" -msgstr "Начальные слои дна" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers description" -msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "Количество начальных слоев дна, вверх от рабочего стола. При вычислении толщины дна это значение округляется до целого." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern label" -msgid "Top/Bottom Pattern" -msgstr "Шаблон для крышки/дна" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern description" -msgid "The pattern of the top/bottom layers." -msgstr "Шаблон слоёв для крышки/дна." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option lines" -msgid "Lines" -msgstr "Линии" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option concentric" -msgid "Concentric" -msgstr "Концентрический" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option zigzag" -msgid "Zig Zag" -msgstr "Зигзаг" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 label" -msgid "Bottom Pattern Initial Layer" -msgstr "Нижний шаблон начального слоя" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 description" -msgid "The pattern on the bottom of the print on the first layer." -msgstr "Шаблон низа печати на первом слое." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option lines" -msgid "Lines" -msgstr "Линии" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option concentric" -msgid "Concentric" -msgstr "Концентрический" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option zigzag" -msgid "Zig Zag" -msgstr "Зигзаг" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons label" -msgid "Connect Top/Bottom Polygons" -msgstr "Соединение верхних/нижних полигонов" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." -msgstr "Соединение верхних/нижних путей оболочки на участках, где они проходят рядом. При использовании концентрического шаблона активация данной настройки значительно сокращает время перемещения, но, учитывая возможность наличия соединений на полпути над заполнением, эта функция может ухудшить качество верхней поверхности." - -#: fdmprinter.def.json -msgctxt "skin_angles label" -msgid "Top/Bottom Line Directions" -msgstr "Направление линии дна/крышки" - -#: fdmprinter.def.json -msgctxt "skin_angles description" -msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." -msgstr "Список направлений линии при печати слоёв дна/крышки линиями или зигзагом. Элементы списка используются последовательно по мере печати слоёв, и, когда конец списка будет достигнут, он начнётся сначала. Элементы списка отделяются запятыми и сам список заключён в квадратные скобки. По умолчанию, он пустой, что означает использование стандартных углов (45 и 135 градусов)." - #: fdmprinter.def.json msgctxt "wall_0_inset label" msgid "Outer Wall Inset" @@ -1415,6 +1275,176 @@ msgctxt "z_seam_relative description" msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate." msgstr "Когда включено, координаты Z шва привязаны к центру каждой части. Когда отключено, координаты определяются от абсолютной позиции на столе." +#: fdmprinter.def.json +msgctxt "top_bottom label" +msgid "Top/Bottom" +msgstr "Дно / крышка" + +#: fdmprinter.def.json +msgctxt "top_bottom description" +msgid "Top/Bottom" +msgstr "Дно / крышка" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr label" +msgid "Top Surface Skin Extruder" +msgstr "Экструдер для печати крышки" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr description" +msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." +msgstr "Экструдер, используемый для печати верхних оболочек. Используется при наличии нескольких экструдеров." + +#: fdmprinter.def.json +msgctxt "roofing_layer_count label" +msgid "Top Surface Skin Layers" +msgstr "Слои верхней оболочки" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count description" +msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." +msgstr "Количество верхних слоёв оболочки. Обычно достаточно одного слоя для получения верхних поверхностей в хорошем качестве." + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr label" +msgid "Top/Bottom Extruder" +msgstr "Экструдер дна/крышки" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr description" +msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." +msgstr "Экструдер, используемый для печати верхней и нижней оболочек. Используется при наличии нескольких экструдеров." + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness label" +msgid "Top/Bottom Thickness" +msgstr "Толщина дна/крышки" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness description" +msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." +msgstr "Толщина слоя дна/крышки при печати. Это значение, разделённое на высоту слоя, определяет количество слоёв в дне/крышке." + +#: fdmprinter.def.json +msgctxt "top_thickness label" +msgid "Top Thickness" +msgstr "Толщина крышки" + +#: fdmprinter.def.json +msgctxt "top_thickness description" +msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." +msgstr "Толщина крышки при печати. Это значение, разделённое на высоту слоя, определяет количество слоёв в крышке." + +#: fdmprinter.def.json +msgctxt "top_layers label" +msgid "Top Layers" +msgstr "Слои крышки" + +#: fdmprinter.def.json +msgctxt "top_layers description" +msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." +msgstr "Количество слоёв в крышке. При вычислении толщины крышки это значение округляется до целого." + +#: fdmprinter.def.json +msgctxt "bottom_thickness label" +msgid "Bottom Thickness" +msgstr "Толщина дна" + +#: fdmprinter.def.json +msgctxt "bottom_thickness description" +msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." +msgstr "Толщина дна при печати. Это значение, разделённое на высоту слоя, определяет количество слоёв в дне." + +#: fdmprinter.def.json +msgctxt "bottom_layers label" +msgid "Bottom Layers" +msgstr "Слои дна" + +#: fdmprinter.def.json +msgctxt "bottom_layers description" +msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "Количество слоёв в дне. При вычислении толщины дна это значение округляется до целого." + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "Начальные слои дна" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "Количество начальных слоев дна, вверх от рабочего стола. При вычислении толщины дна это значение округляется до целого." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern label" +msgid "Top/Bottom Pattern" +msgstr "Шаблон для крышки/дна" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern description" +msgid "The pattern of the top/bottom layers." +msgstr "Шаблон слоёв для крышки/дна." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option lines" +msgid "Lines" +msgstr "Линии" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option concentric" +msgid "Concentric" +msgstr "Концентрический" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option zigzag" +msgid "Zig Zag" +msgstr "Зигзаг" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 label" +msgid "Bottom Pattern Initial Layer" +msgstr "Нижний шаблон начального слоя" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 description" +msgid "The pattern on the bottom of the print on the first layer." +msgstr "Шаблон низа печати на первом слое." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option lines" +msgid "Lines" +msgstr "Линии" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option concentric" +msgid "Concentric" +msgstr "Концентрический" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option zigzag" +msgid "Zig Zag" +msgstr "Зигзаг" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons label" +msgid "Connect Top/Bottom Polygons" +msgstr "Соединение верхних/нижних полигонов" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons description" +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "Соединение верхних/нижних путей оболочки на участках, где они проходят рядом. При использовании концентрического шаблона активация данной настройки значительно сокращает время перемещения, но, учитывая возможность наличия соединений на полпути над заполнением, эта функция может ухудшить качество верхней поверхности." + +#: fdmprinter.def.json +msgctxt "skin_angles label" +msgid "Top/Bottom Line Directions" +msgstr "Направление линии дна/крышки" + +#: fdmprinter.def.json +msgctxt "skin_angles description" +msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." +msgstr "Список направлений линии при печати слоёв дна/крышки линиями или зигзагом. Элементы списка используются последовательно по мере печати слоёв, и, когда конец списка будет достигнут, он начнётся сначала. Элементы списка отделяются запятыми и сам список заключён в квадратные скобки. По умолчанию, он пустой, что означает использование стандартных углов (45 и 135 градусов)." + #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" msgid "No Skin in Z Gaps" @@ -1555,6 +1585,86 @@ msgctxt "skin_overlap_mm description" msgid "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any value over half the width of the wall may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall." msgstr "Настройте величину перекрытия между стенками и центральными линиями оболочки (конечными точками). Небольшое перекрытие позволяет стенкам надежно соединяться с оболочкой. Обратите внимание, что при одинаковой толщине оболочки и ширине линии стенки любое значение, превышающее половину ширины стенки, может привести к размещению любой оболочки за пределами стенки. Это обусловлено тем, что в этот момент расположение сопла экструдера оболочки может сместиться за середину стенки." +#: fdmprinter.def.json +msgctxt "skin_preshrink label" +msgid "Skin Removal Width" +msgstr "Ширина удаляемой оболочки" + +#: fdmprinter.def.json +msgctxt "skin_preshrink description" +msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." +msgstr "Наибольшая ширина областей оболочки, которые будут удалены. Каждая область оболочки, которая меньше указанного значения, будет удалена. Это может помочь с сокращением затрат времени и материала при печати верхних/нижних оболочек наклонных поверхностей модели." + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink label" +msgid "Top Skin Removal Width" +msgstr "Ширина удаляемой оболочки сверху" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink description" +msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." +msgstr "Наибольшая ширина областей оболочки, которые будут удалены. Каждая область оболочки, которая меньше указанного значения, будет удалена. Это может помочь с сокращением затрат времени и материала при печати верхних оболочек наклонных поверхностей модели." + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink label" +msgid "Bottom Skin Removal Width" +msgstr "Ширина удаляемой оболочки снизу" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink description" +msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." +msgstr "Наибольшая ширина областей оболочки, которые будут удалены. Каждая область оболочки, которая меньше указанного значения, будет удалена. Это может помочь с сокращением затрат времени и материала при печати нижних оболочек наклонных поверхностей модели." + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance label" +msgid "Skin Expand Distance" +msgstr "Дистанция расширения оболочки" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance description" +msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." +msgstr "Расстояние на которое оболочки внедряются в заполнение. Большие значения лучше связывают оболочку с шаблоном заполнения и стенками. Меньшие значения сохраняют используемый материал." + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance label" +msgid "Top Skin Expand Distance" +msgstr "Дистанция расширения оболочки сверху" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance description" +msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." +msgstr "Расстояние на которое верхние оболочки входят в заполнение. Большие значения лучше связывают оболочку с шаблоном заполнения и стенками. Меньшие значения сохраняют используемый материал." + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance label" +msgid "Bottom Skin Expand Distance" +msgstr "Расстояние расширения оболочки снизу" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance description" +msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." +msgstr "Расстояние на которое нижние оболочки входят в заполнение. Большие значения лучше связывают оболочку с шаблоном заполнения и стенками. Меньшие значения сохраняют используемый материал." + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion label" +msgid "Maximum Skin Angle for Expansion" +msgstr "Максимальный угол оболочки при расширении" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion description" +msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded." +msgstr "Для верхней и (или) нижней поверхностей вашего объекта с углом больше указанного в данном параметре верхняя и нижняя оболочки не будут расширены. Это предотвращает расширение узких областей оболочек, которые создаются, если поверхность модели имеет почти вертикальный наклон. Угол 0° является горизонтальным и не вызывает расширения оболочки, угол 90° является вертикальным и вызывает расширение всей оболочки." + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion label" +msgid "Minimum Skin Width for Expansion" +msgstr "Минимальная ширина оболочки при расширении" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion description" +msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." +msgstr "Области оболочек уже указанного значения не расширяются. Это предотвращает расширение узких областей оболочек, которые создаются, если наклон поверхности модели близок к вертикальному." + #: fdmprinter.def.json msgctxt "infill label" msgid "Infill" @@ -1864,86 +1974,6 @@ msgctxt "infill_support_angle description" msgid "The minimum angle of internal overhangs for which infill is added. At a value of 0° objects are totally filled with infill, 90° will not provide any infill." msgstr "Минимальный угол внутренних нависаний, для которых добавляется заполнение. При 0° объекты полностью заполняются, при 90° заполнение отсутствует." -#: fdmprinter.def.json -msgctxt "skin_preshrink label" -msgid "Skin Removal Width" -msgstr "Ширина удаляемой оболочки" - -#: fdmprinter.def.json -msgctxt "skin_preshrink description" -msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." -msgstr "Наибольшая ширина областей оболочки, которые будут удалены. Каждая область оболочки, которая меньше указанного значения, будет удалена. Это может помочь с сокращением затрат времени и материала при печати верхних/нижних оболочек наклонных поверхностей модели." - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink label" -msgid "Top Skin Removal Width" -msgstr "Ширина удаляемой оболочки сверху" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink description" -msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." -msgstr "Наибольшая ширина областей оболочки, которые будут удалены. Каждая область оболочки, которая меньше указанного значения, будет удалена. Это может помочь с сокращением затрат времени и материала при печати верхних оболочек наклонных поверхностей модели." - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink label" -msgid "Bottom Skin Removal Width" -msgstr "Ширина удаляемой оболочки снизу" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink description" -msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." -msgstr "Наибольшая ширина областей оболочки, которые будут удалены. Каждая область оболочки, которая меньше указанного значения, будет удалена. Это может помочь с сокращением затрат времени и материала при печати нижних оболочек наклонных поверхностей модели." - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance label" -msgid "Skin Expand Distance" -msgstr "Дистанция расширения оболочки" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance description" -msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." -msgstr "Расстояние на которое оболочки внедряются в заполнение. Большие значения лучше связывают оболочку с шаблоном заполнения и стенками. Меньшие значения сохраняют используемый материал." - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance label" -msgid "Top Skin Expand Distance" -msgstr "Дистанция расширения оболочки сверху" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance description" -msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." -msgstr "Расстояние на которое верхние оболочки входят в заполнение. Большие значения лучше связывают оболочку с шаблоном заполнения и стенками. Меньшие значения сохраняют используемый материал." - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance label" -msgid "Bottom Skin Expand Distance" -msgstr "Расстояние расширения оболочки снизу" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance description" -msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." -msgstr "Расстояние на которое нижние оболочки входят в заполнение. Большие значения лучше связывают оболочку с шаблоном заполнения и стенками. Меньшие значения сохраняют используемый материал." - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion label" -msgid "Maximum Skin Angle for Expansion" -msgstr "Максимальный угол оболочки при расширении" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion description" -msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." -msgstr "Верхняя и/или нижняя поверхности вашего объекта с углом больше указанного в данном параметре, не будут иметь расширенные оболочки дна/крышки. Это предотвращает расширение узких областей оболочек, которые создаются, если поверхность модели имеет почти вертикальный наклон. Угол в 0° является горизонтальным, а в 90° - вертикальным." - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion label" -msgid "Minimum Skin Width for Expansion" -msgstr "Минимальная ширина оболочки при расширении" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion description" -msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." -msgstr "Области оболочек уже указанного значения не расширяются. Это предотвращает расширение узких областей оболочек, которые создаются, если наклон поверхности модели близок к вертикальному." - #: fdmprinter.def.json msgctxt "skin_edge_support_thickness label" msgid "Skin Edge Support Thickness" @@ -2561,8 +2591,8 @@ msgstr "Скорость первого слоя" #: fdmprinter.def.json msgctxt "speed_layer_0 description" -msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." -msgstr "Скорость печати первого слоя. Пониженное значение помогает улучшить прилипание материала к столу." +msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate. Does not affect the build plate adhesion structures themselves, like brim and raft." +msgstr "Скорость печати первого слоя. Пониженное значение улучшает прилипание материала к печатной пластине. Не влияет на сами адгезионные структуры печатной пластины, такие как край и основание." #: fdmprinter.def.json msgctxt "speed_print_layer_0 label" @@ -3171,8 +3201,9 @@ msgstr "Макс. расстояние комб. без отката" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" -msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." -msgstr "При ненулевом значении перемещения комбинга, превышающие указанное расстояние, будут выполняться с откатом." +msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." +msgstr "При значении параметра выше нуля перемещения комбинга, превышающие заданное расстояние, будут выполняться с откатом. Когда значение параметра равно нулю," +" то максимума нет и перемещения комбинга выполняются без отката." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" @@ -5075,8 +5106,8 @@ msgstr "Порядок обработки объекта" #: fdmprinter.def.json msgctxt "infill_mesh_order description" -msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." -msgstr "Определяет приоритет данного объекта при вычислении нескольких перекрывающихся заполняющих объектов. К областям с несколькими перекрывающимися заполняющими объектами будут применяться настройки объекта более низкого порядка. Заполняющий объект более высокого порядка будет модифицировать заполнение объектов более низких порядков и обычных объектов." +msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the highest rank. An infill mesh with a higher rank will modify the infill of infill meshes with lower rank and normal meshes." +msgstr "Определяет приоритет данного объекта при вычислении нескольких перекрывающихся заполняющих объектов. К областям с несколькими перекрывающимися заполняющими объектами будут применяться настройки объекта более высокого порядка. Заполняющий объект более высокого порядка будет модифицировать заполнение объектов более низких порядков и обычных объектов." #: fdmprinter.def.json msgctxt "cutting_mesh label" @@ -5423,6 +5454,16 @@ msgctxt "conical_overhang_angle description" msgid "The maximum angle of overhangs after the they have been made printable. At a value of 0° all overhangs are replaced by a piece of model connected to the build plate, 90° will not change the model in any way." msgstr "Максимальный угол нависания, после которого они становятся печатаемыми. При значении в 0° все нависания заменяются частью модели, соединённой со столом, при 90° в модель не вносится никаких изменений." +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size label" +msgid "Maximum Overhang Hole Area" +msgstr "Максимальная площадь отверстия выступа" + +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size description" +msgid "The maximum area of a hole in the base of the model before it's removed by Make Overhang Printable. Holes smaller than this will be retained. A value of 0 mm² will fill all holes in the models base." +msgstr "Максимальная площадь отверстия в основании модели, при достижении которой оно удаляется функцией «Сделать нависания печатаемыми». Более мелкие отверстия сохраняются. Значение 0 мм² приведет к заполнению всех отверстий в основании модели." + #: fdmprinter.def.json msgctxt "coasting_enable label" msgid "Enable Coasting" @@ -6362,6 +6403,30 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Матрица преобразования, применяемая к модели при её загрузке из файла." +#~ msgctxt "retraction_combing_max_distance description" +#~ msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." +#~ msgstr "При ненулевом значении перемещения комбинга, превышающие указанное расстояние, будут выполняться с откатом." + +#~ msgctxt "machine_use_extruder_offset_to_offset_coords description" +#~ msgid "Apply the extruder offset to the coordinate system." +#~ msgstr "Применить смещение экструдера к системе координат." + +#~ msgctxt "shell label" +#~ msgid "Shell" +#~ msgstr "Ограждение" + +#~ msgctxt "max_skin_angle_for_expansion description" +#~ msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." +#~ msgstr "Верхняя и/или нижняя поверхности вашего объекта с углом больше указанного в данном параметре, не будут иметь расширенные оболочки дна/крышки. Это предотвращает расширение узких областей оболочек, которые создаются, если поверхность модели имеет почти вертикальный наклон. Угол в 0° является горизонтальным, а в 90° - вертикальным." + +#~ msgctxt "speed_layer_0 description" +#~ msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." +#~ msgstr "Скорость печати первого слоя. Пониженное значение помогает улучшить прилипание материала к столу." + +#~ msgctxt "infill_mesh_order description" +#~ msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." +#~ msgstr "Определяет приоритет данного объекта при вычислении нескольких перекрывающихся заполняющих объектов. К областям с несколькими перекрывающимися заполняющими объектами будут применяться настройки объекта более низкого порядка. Заполняющий объект более высокого порядка будет модифицировать заполнение объектов более низких порядков и обычных объектов." + #~ msgctxt "material_bed_temperature description" #~ msgid "The temperature used for the heated build plate. If this is 0, the bed temperature will not be adjusted." #~ msgstr "Температура, задаваемая для разогретого рабочего стола. Если значение равно 0, температура основания не будет регулироваться." diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index 65778e4af8..7f356a3702 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -1,13 +1,13 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0200\n" -"PO-Revision-Date: 2020-08-21 13:40+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0200\n" +"PO-Revision-Date: 2021-04-16 14:58+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Turkish , Turkish \n" "Language: tr_TR\n" @@ -15,12 +15,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.2.4\n" +"X-Generator: Poedit 2.4.1\n" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1581 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 msgctxt "@label" @@ -91,12 +91,12 @@ msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "Taslak profili, baskı süresinin önemli ölçüde kısaltılması amacıyla, birincil prototipler basılması ve konsept doğrulaması yapılması için tasarlanmıştır." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:226 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:234 msgctxt "@label" msgid "Custom Material" msgstr "Özel Malzeme" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:227 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 msgctxt "@label" msgid "Custom" @@ -118,7 +118,7 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "Tüm Dosyalar (*)" -#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:178 +#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:181 msgctxt "@info:title" msgid "Login failed" msgstr "Giriş başarısız" @@ -148,28 +148,33 @@ msgctxt "@info:title" msgid "Can't Find Location" msgstr "Konum Bulunamıyor" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:104 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:116 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Kullanıcı veri dizininden arşiv oluşturulamadı: {}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:110 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 msgctxt "@info:title" msgid "Backup" msgstr "Yedekle" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:123 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:135 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "Uygun veri veya meta veri olmadan Cura yedeği geri yüklenmeye çalışıldı." -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:134 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:146 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that is higher than the current version." msgstr "Geçerli sürümünüzden yüksek bir sürüme sahip bir Cura yedeği geri yüklenmeye çalışıldı." +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 +msgctxt "@info:backup_failed" +msgid "The following error occurred while trying to restore a Cura backup:" +msgstr "Cura yedeklemesi geri yüklenmeye çalışılırken aşağıdaki hata oluştu:" + #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -319,74 +324,74 @@ msgctxt "@action:button" msgid "Send report" msgstr "Rapor gönder" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:521 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:527 msgctxt "@info:progress" msgid "Loading machines..." msgstr "Makineler yükleniyor..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:528 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:534 msgctxt "@info:progress" msgid "Setting up preferences..." msgstr "Tercihler ayarlanıyor..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:657 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:672 msgctxt "@info:progress" msgid "Initializing Active Machine..." msgstr "Etkin Makine Başlatılıyor..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:803 msgctxt "@info:progress" msgid "Initializing machine manager..." msgstr "Makine yöneticisi başlatılıyor..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:802 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:817 msgctxt "@info:progress" msgid "Initializing build volume..." msgstr "Yapı hacmi başlatılıyor..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:870 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:888 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "Görünüm ayarlanıyor..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:906 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:924 msgctxt "@info:progress" msgid "Loading interface..." msgstr "Arayüz yükleniyor..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:911 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:929 msgctxt "@info:progress" msgid "Initializing engine..." msgstr "Motor başlatılıyor..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1221 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1246 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1777 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1799 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Aynı anda yalnızca bir G-code dosyası yüklenebilir. {0} içe aktarma atlandı" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1778 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:188 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 msgctxt "@info:title" msgid "Warning" msgstr "Uyarı" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1787 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1809 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "G-code yüklenirken başka bir dosya açılamaz. {0} içe aktarma atlandı" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 @@ -409,7 +414,7 @@ msgctxt "@info:title" msgid "Placing Object" msgstr "Nesne Yerleştiriliyor" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:92 msgctxt "@message" msgid "Could not read response." msgstr "Yanıt okunamadı." @@ -429,12 +434,12 @@ msgctxt "@message" msgid "Something unexpected happened when trying to log in, please try again." msgstr "Oturum açmaya çalışırken beklenmeyen bir sorun oluştu, lütfen tekrar deneyin." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:187 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:189 msgctxt "@info" msgid "Unable to start a new sign in process. Check if another sign in attempt is still active." msgstr "Yeni bir oturum açma işlemi başlatılamıyor. Başka bir aktif oturum açma girişimi olup olmadığını kontrol edin." -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Ultimaker hesabı sunucusuna ulaşılamadı." @@ -452,8 +457,8 @@ msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "Dosya {0} zaten mevcut. Üstüne yazmak istediğinizden emin misiniz?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:452 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:455 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "Geçersiz dosya URL’si:" @@ -536,38 +541,37 @@ msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "Profil {0} öğesinde bilinmeyen bir dosya türü var veya profil bozuk." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:423 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:426 msgctxt "@label" msgid "Custom profile" msgstr "Özel profil" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:439 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:442 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "Profilde eksik bir kalite tipi var." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:443 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:446 msgctxt "@info:status" -msgid "Global stack is missing." -msgstr "Genel yığın eksik." +msgid "There is no active printer yet." +msgstr "Henüz etkin bir yazıcı yok." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:449 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:452 msgctxt "@info:status" msgid "Unable to add the profile." msgstr "Profil eklenemiyor." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:463 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:466 #, python-brace-format msgctxt "@info:status" msgid "Quality type '{0}' is not compatible with the current active machine definition '{1}'." msgstr "'{0}' kalite tipi, mevcut aktif makine tanımı '{1}' ile uyumlu değil." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:468 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:471 #, python-brace-format msgctxt "@info:status" msgid "Warning: The profile is not visible because its quality type '{0}' is not available for the current configuration. Switch to a material/nozzle combination that can use this quality type." -msgstr "Uyarı: Profilin '{0}' kalite tipi, mevcut yapılandırma için kullanılabilir olmadığından profil görünür değil. Bu kalite tipini kullanabilen malzeme/nozül" -" kombinasyonuna geçiş yapın." +msgstr "Uyarı: Profilin '{0}' kalite tipi, mevcut yapılandırma için kullanılabilir olmadığından profil görünür değil. Bu kalite tipini kullanabilen malzeme/nozül kombinasyonuna geçiş yapın." #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" @@ -579,23 +583,23 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:712 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 msgctxt "@label" msgid "Nozzle" msgstr "Nozül" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:860 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:856 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "Ayarlar, ekstrüderlerin mevcut kullanılabilirliğine uyacak şekilde değiştirildi:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:862 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:858 msgctxt "@info:title" msgid "Settings updated" msgstr "Ayarlar güncellendi" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1447 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1478 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Ekstrüder(ler) Devre Dışı Bırakıldı" @@ -608,13 +612,13 @@ msgid "Add" msgstr "Ekle" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:263 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 msgctxt "@action:button" msgid "Finish" msgstr "Bitir" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 #: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 #: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 @@ -622,7 +626,7 @@ msgstr "Bitir" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 msgctxt "@action:button" msgid "Cancel" @@ -634,76 +638,83 @@ msgctxt "@label" msgid "Group #{group_nr}" msgstr "Grup #{group_nr}" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "Dış Duvar" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "İç Duvarlar" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "Yüzey Alanı" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "Dolgu" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "Destek Dolgusu" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "Destek Arayüzü" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "Destek" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Etek" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 msgctxt "@tooltip" msgid "Prime Tower" msgstr "Astarlama Direği" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 msgctxt "@tooltip" msgid "Travel" msgstr "Hareket" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 msgctxt "@tooltip" msgid "Retractions" msgstr "Geri Çekmeler" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:94 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 msgctxt "@tooltip" msgid "Other" msgstr "Diğer" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 msgctxt "@action:button" msgid "Next" msgstr "Sonraki" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 +msgctxt "@action:button" +msgid "Skip" +msgstr "Atla" + +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:173 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 msgctxt "@action:button" msgid "Close" @@ -728,29 +739,36 @@ msgstr "" "

    En iyi kalite ve güvenilirliği nasıl elde edeceğinizi öğrenin.

    \n" "

    Yazdırma kalitesi kılavuzunu görüntüleyin

    " -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:535 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:540 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "Proje dosyası {0} bilinmeyen bir makine tipi içeriyor: {1}. Makine alınamıyor. Bunun yerine modeller alınacak." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:538 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:543 msgctxt "@info:title" msgid "Open Project File" msgstr "Proje Dosyası Aç" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:634 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:639 #, python-brace-format msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "{0} proje dosyası aniden erişilemez oldu: {1}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:635 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "Proje Dosyası Açılamıyor" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:686 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:646 +#, python-brace-format +msgctxt "@info:error Don't translate the XML tags or !" +msgid "Project file {0} is corrupt: {1}." +msgstr "Proje dosyası {0} bozuk: {1}." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:698 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." @@ -788,7 +806,7 @@ msgctxt "@error:zip" msgid "The operating system does not allow saving a project file to this location or with this file name." msgstr "İşletim sistemi, proje dosyalarının bu konuma veya bu dosya adıyla kaydedilmesine izin vermiyor." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:206 msgctxt "@error:zip" msgid "Error writing 3mf file." msgstr "3mf dosyasını yazarken hata oluştu." @@ -843,8 +861,8 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "Yedekleme maksimum dosya boyutunu aşıyor." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:23 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "Yedeklemeniz geri yüklenirken bir hata oluştu." @@ -854,45 +872,45 @@ msgctxt "@item:inmenu" msgid "Manage backups" msgstr "Yedeklemeleri yönet" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Mevcut malzeme, seçilen makine veya yapılandırma ile uyumlu olmadığından mevcut malzeme ile dilimlenemedi." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:411 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:420 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:429 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 msgctxt "@info:title" msgid "Unable to slice" msgstr "Dilimlenemedi" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:412 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "Geçerli ayarlarla dilimlenemiyor. Şu ayarlarda hata var: {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:410 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:436 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "Modele özgü ayarlar nedeniyle dilimlenemedi. Şu ayarlar bir veya daha fazla modelde hataya yol açıyor: {error_labels}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:445 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "İlk direk veya ilk konum(lar) geçersiz olduğu için dilimlenemiyor." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:428 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:454 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "Etkisizleştirilmiş Extruder %s ile ilgili nesneler olduğundan dilimleme yapılamıyor." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:463 msgctxt "@info:status" msgid "" "Please review settings and check if your models:\n" @@ -1161,28 +1179,28 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "Çıkarılabilir Sürücü" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:121 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:128 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled." msgstr "Kablo Yazdırma etkinleştirildiğinde Cura, katmanları doğru olarak görüntülemez." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:129 msgctxt "@info:title" msgid "Simulation View" msgstr "Simülasyon Görünümü" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:status" msgid "Nothing is shown because you need to slice first." msgstr "Önce dilimleme yapmanız gerektiğinden hiçbir şey gösterilmez." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:title" msgid "No layers to show" msgstr "Görüntülenecek katman yok" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:124 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "Bu mesajı bir daha gösterme" @@ -1192,16 +1210,21 @@ msgctxt "@item:inlistbox" msgid "Layer view" msgstr "Katman görünümü" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:70 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:71 msgctxt "@info:status" -msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." -msgstr "Modeliniz çok katmanlı değil. Vurgulanan alanlar eksik ya da ikincil yüzeyleri gösterir." +msgid "The highlighted areas indicate either missing or extraneous surfaces. Fix your model and open it again into Cura." +msgstr "Vurgulanan alanlar, eksik ya da ikincil yüzeyleri gösterir. Modelinizi düzeltin ve Cura'da tekrar açın." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 msgctxt "@info:title" -msgid "Model errors" +msgid "Model Errors" msgstr "Model hataları" +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:79 +msgctxt "@action:button" +msgid "Learn more" +msgstr "Daha fazla bilgi edinin" + #: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/__init__.py:12 msgctxt "@item:inmenu" msgid "Solid view" @@ -1228,7 +1251,7 @@ msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "Ultimaker hesabınızda değişiklik tespit edildi" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:145 msgctxt "@action:button" msgid "Sync" msgstr "Senkronize et" @@ -1264,7 +1287,7 @@ msgctxt "@info:generic" msgid "You need to quit and restart {} before changes have effect." msgstr "Değişikliklerin etkili olması için {} uygulamasını kapatarak yeniden başlatmalısınız." -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:79 msgctxt "@info:generic" msgid "{} plugins failed to download" msgstr "{} eklenti indirilemedi" @@ -1305,7 +1328,11 @@ msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimaker Biçim Paketi" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "UFP dosyasına yazamıyor:" @@ -1320,22 +1347,22 @@ msgctxt "@action" msgid "Select upgrades" msgstr "Yükseltmeleri seçin" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:152 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 msgctxt "@action:button" msgid "Print via cloud" msgstr "Bulut üzerinden yazdır" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:155 msgctxt "@properties:tooltip" msgid "Print via cloud" msgstr "Bulut üzerinden yazdır" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:156 msgctxt "@info:status" msgid "Connected via cloud" msgstr "Bulut üzerinden bağlı" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:264 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:270 #, python-brace-format msgctxt "@error:send" msgid "Unknown error code when uploading print job: {0}" @@ -1435,15 +1462,21 @@ msgid "" msgid_plural "" "You are about to remove {0} printers from Cura. This action cannot be undone.\n" "Are you sure you want to continue?" -msgstr[0] "{0} yazıcıyı Cura'dan kaldırmak üzeresiniz. Bu işlem geri alınamaz.\nDevam etmek istediğinizden emin misiniz?" -msgstr[1] "{0} yazıcıyı Cura'dan kaldırmak üzeresiniz. Bu işlem geri alınamaz.\nDevam etmek istediğinizden emin misiniz?" +msgstr[0] "" +"{0} yazıcıyı Cura'dan kaldırmak üzeresiniz. Bu işlem geri alınamaz.\n" +"Devam etmek istediğinizden emin misiniz?" +msgstr[1] "" +"{0} yazıcıyı Cura'dan kaldırmak üzeresiniz. Bu işlem geri alınamaz.\n" +"Devam etmek istediğinizden emin misiniz?" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:468 msgctxt "@label" msgid "" "You are about to remove all printers from Cura. This action cannot be undone.\n" "Are you sure you want to continue?" -msgstr "Tüm yazıcıları Cura'dan kaldırmak üzeresiniz. Bu işlem geri alınamaz.\nDevam etmek istediğinizden emin misiniz?" +msgstr "" +"Tüm yazıcıları Cura'dan kaldırmak üzeresiniz. Bu işlem geri alınamaz.\n" +"Devam etmek istediğinizden emin misiniz?" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py:27 msgctxt "@info:status" @@ -1627,82 +1660,82 @@ msgctxt "@info:tooltip" msgid "Some things could be problematic in this print. Click to see tips for adjustment." msgstr "Bu yazdırmada bazı şeyler sorunlu olabilir. Ayarlama için ipuçlarını görmek için tıklayın." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:15 msgctxt "@title:window" msgid "Open Project" msgstr "Proje Aç" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" msgstr "Var olanları güncelleştir" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:63 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "Yeni oluştur" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "Özet - Cura Projesi" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 msgctxt "@action:label" msgid "Printer settings" msgstr "Yazıcı ayarları" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:112 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:113 msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "Makinedeki çakışma nasıl çözülmelidir?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:165 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 msgctxt "@action:label" msgid "Type" msgstr "Tür" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:181 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 msgctxt "@action:label" msgid "Printer Group" msgstr "Yazıcı Grubu" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:203 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 msgctxt "@action:label" msgid "Profile settings" msgstr "Profil ayarları" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:219 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:221 msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "Profildeki çakışma nasıl çözülmelidir?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:349 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 msgctxt "@action:label" msgid "Name" msgstr "İsim" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:255 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 msgctxt "@action:label" msgid "Intent" msgstr "Intent" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:271 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Not in profile" msgstr "Profilde değil" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:276 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 msgctxt "@action:label" msgid "%1 override" @@ -1710,54 +1743,54 @@ msgid_plural "%1 overrides" msgstr[0] "%1 geçersiz kılma" msgstr[1] "%1 geçersiz kılmalar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:287 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:290 msgctxt "@action:label" msgid "Derivative from" msgstr "Kaynağı" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:295 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 geçersiz kılma" msgstr[1] "%1, %2 geçersiz kılmalar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:309 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:312 msgctxt "@action:label" msgid "Material settings" msgstr "Malzeme ayarları" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:328 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "Malzemedeki çakışma nasıl çözülmelidir?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:369 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:373 msgctxt "@action:label" msgid "Setting visibility" msgstr "Görünürlük ayarı" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:378 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:382 msgctxt "@action:label" msgid "Mode" msgstr "Mod" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:label" msgid "Visible settings:" msgstr "Görünür ayarlar:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:399 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:403 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 / %2" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:425 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:429 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "Bir projenin yüklenmesi derleme levhasındaki tüm modelleri siler." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:457 msgctxt "@action:button" msgid "Open" msgstr "Aç" @@ -1859,8 +1892,8 @@ msgstr "Cura ayarlarınızı yedekleyin ve senkronize edin." #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:68 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:125 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:199 msgctxt "@button" msgid "Sign in" msgstr "Giriş yap" @@ -2094,12 +2127,12 @@ msgctxt "@label" msgid "Cooling Fan Number" msgstr "Soğutma Fanı Numarası" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:163 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "Ekstruder G-Code'u Başlatma" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:177 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "Ekstruder G-Code'u Sonlandırma" @@ -2184,12 +2217,17 @@ msgctxt "@label" msgid "Number of Extruders" msgstr "Ekstrüder Sayısı" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:345 +msgctxt "@label" +msgid "Apply Extruder offsets to GCode" +msgstr "Ekstrüder ofsetlerini GCode'a uygula" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:393 msgctxt "@title:label" msgid "Start G-code" msgstr "G-code’u Başlat" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:385 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:404 msgctxt "@title:label" msgid "End G-code" msgstr "G-code’u Sonlandır" @@ -2217,6 +2255,11 @@ msgctxt "@label link to technical assistance" msgid "View user manuals online" msgstr "Kullanım kılavuzlarını çevrimiçi olarak görüntüle" +#: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 +msgctxt "@info" +msgid "In order to monitor your print from Cura, please connect the printer." +msgstr "Baskınızı Cura üzerinden izlemek için lütfen yazıcıyı bağlayın." + #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" msgid "Mesh Type" @@ -2263,7 +2306,7 @@ msgid "Select Settings to Customize for this model" msgstr "Bu modeli Özelleştirmek için Ayarları seçin" #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtrele..." @@ -2273,32 +2316,32 @@ msgctxt "@label:checkbox" msgid "Show all" msgstr "Tümünü göster" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:20 msgctxt "@title:window" msgid "Post Processing Plugin" msgstr "Son İşleme Uzantısı" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:59 msgctxt "@label" msgid "Post Processing Scripts" msgstr "Son İşleme Dosyaları" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:235 msgctxt "@action" msgid "Add a script" msgstr "Dosya ekle" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:282 msgctxt "@label" msgid "Settings" msgstr "Ayarlar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:499 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:502 msgctxt "@info:tooltip" msgid "Change active post-processing scripts." msgstr "Etkin ileri işleme komut dosyalarını değiştirin." -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:506 msgctxt "@info:tooltip" msgid "The following script is active:" msgid_plural "The following scripts are active:" @@ -2311,78 +2354,93 @@ msgctxt "@label" msgid "Color scheme" msgstr "Renk şeması" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:110 msgctxt "@label:listbox" msgid "Material Color" msgstr "Malzeme Rengi" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:111 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:114 msgctxt "@label:listbox" msgid "Line Type" msgstr "Çizgi Tipi" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:115 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:118 msgctxt "@label:listbox" msgid "Speed" msgstr "Hız" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:122 msgctxt "@label:listbox" -msgid "Layer thickness" +msgid "Layer Thickness" msgstr "Katman kalınlığı" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:126 +msgctxt "@label:listbox" +msgid "Line Width" +msgstr "Hat Genişliği" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 +msgctxt "@label:listbox" +msgid "Flow" +msgstr "Akış" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" msgid "Compatibility Mode" msgstr "Uyumluluk Modu" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:230 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:245 msgctxt "@label" msgid "Travels" msgstr "Geçişler" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:251 msgctxt "@label" msgid "Helpers" msgstr "Yardımcılar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:257 msgctxt "@label" msgid "Shell" msgstr "Kabuk" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:248 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 msgctxt "@label" msgid "Infill" msgstr "Dolgu" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:298 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:271 +msgctxt "@label" +msgid "Starts" +msgstr "Başlangıçlar" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 msgctxt "@label" msgid "Only Show Top Layers" msgstr "Yalnızca Üst Katmanları Göster" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:308 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:332 msgctxt "@label" msgid "Show 5 Detailed Layers On Top" msgstr "En Üstteki 5 Ayrıntılı Katmanı Göster" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:346 msgctxt "@label" msgid "Top / Bottom" msgstr "Üst / Alt" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:350 msgctxt "@label" msgid "Inner Wall" msgstr "İç Duvar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:384 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:419 msgctxt "@label" msgid "min" msgstr "min" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:433 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:488 msgctxt "@label" msgid "max" msgstr "maks" @@ -2523,7 +2581,7 @@ msgid "Plugins" msgstr "Eklentiler" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 msgctxt "@title:tab" msgid "Materials" @@ -2572,6 +2630,7 @@ msgstr "Kapat" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:178 msgctxt "@button" msgid "Next" msgstr "Sonraki" @@ -2915,7 +2974,7 @@ msgid "Delete" msgstr "Sil" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:289 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 msgctxt "@label" msgid "Resume" msgstr "Devam et" @@ -2931,8 +2990,8 @@ msgid "Resuming..." msgstr "Devam ediliyor..." #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 msgctxt "@label" msgid "Pause" msgstr "Duraklat" @@ -2973,7 +3032,7 @@ msgid "Are you sure you want to abort %1?" msgstr "%1 öğesini durdurmak istediğinizden emin misiniz?" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 msgctxt "@window:title" msgid "Abort print" msgstr "Yazdırmayı durdur" @@ -2984,7 +3043,7 @@ msgid "Manage printer" msgstr "Yazıcıyı yönet" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." @@ -3010,27 +3069,34 @@ msgctxt "@label:status" msgid "Idle" msgstr "Boşta" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:365 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +msgctxt "@label:status" +msgid "Preparing..." +msgstr "Hazırlanıyor..." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:369 msgctxt "@label:status" msgid "Printing" msgstr "Yazdırma" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:406 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:410 msgctxt "@label" msgid "Untitled" msgstr "Başlıksız" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:431 msgctxt "@label" msgid "Anonymous" msgstr "Anonim" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:458 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "Yapılandırma değişiklikleri gerekiyor" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:492 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:496 msgctxt "@action:button" msgid "Details" msgstr "Detaylar" @@ -3057,12 +3123,6 @@ msgctxt "@label:status" msgid "Finished" msgstr "Tamamlandı" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -msgctxt "@label:status" -msgid "Preparing..." -msgstr "Hazırlanıyor..." - #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." @@ -3143,27 +3203,27 @@ msgctxt "@action:button" msgid "Sign in" msgstr "Giriş yap" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" -msgid "Your key to connected 3D printing" -msgstr "3D baskıya bağlı anahtarınız" +msgid "Sign in to the Ultimaker platform" +msgstr "Ultimaker platformuna giriş yapın" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:42 msgctxt "@text" msgid "" -"- Customize your experience with more print profiles and plugins\n" -"- Stay flexible by syncing your setup and loading it anywhere\n" -"- Increase efficiency with a remote workflow on Ultimaker printers" +"- Add material profiles and plug-ins from the Marketplace\n" +"- Back-up and sync your material profiles and plug-ins\n" +"- Share ideas and get help from 48,000+ users in the Ultimaker community" msgstr "" -"- Daha fazla baskı profili ve eklenti ile deneyiminizi kişiselleştirin\n" -"- Ayarlarınızı senkronize ederek ve dilediğiniz yerde yükleyerek esnek çalışın\n" -"- Ultimaker yazıcılardaki uzaktan iş akışı sayesinde verimliliği artırın" +"- Marketplace'den malzeme profilleri ve eklentiler ekleyin\n" +"- Malzeme profillerinizi ve eklentilerinizi yedekleyin ve senkronize edin\n" +"- Ultimaker topluluğunda fikirlerinizi paylaşın ve 48.000'den fazla kullanıcıdan yardım alın" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:142 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:62 msgctxt "@button" -msgid "Create account" -msgstr "Hesap oluştur" +msgid "Create a free Ultimaker account" +msgstr "Ücretsiz Ultimaker hesabı oluşturun" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/SyncState.qml:28 msgctxt "@label" @@ -3270,309 +3330,308 @@ msgctxt "@button" msgid "Cancel" msgstr "İptal" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:83 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "Çevrimiçi Sorun Giderme Kılavuzunu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:90 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "Tam Ekrana Geç" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:98 msgctxt "@action:inmenu" msgid "Exit Full Screen" msgstr "Tam Ekrandan Çık" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:105 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "&Geri Al" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:115 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "&Yinele" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:125 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "&Çıkış" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:132 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:133 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "3 Boyutlu Görünüm" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:140 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "Önden Görünüm" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:147 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "Yukarıdan Görünüm" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 +msgctxt "@action:inmenu menubar:view" +msgid "Bottom View" +msgstr "Alttan Görünüm" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "Sol Taraftan Görünüm" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:160 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:168 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "Sağ Taraftan Görünüm" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:175 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "Cura’yı yapılandır..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:182 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "&Yazıcı Ekle..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:180 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:188 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "Yazıcıları Yönet..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:187 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "Malzemeleri Yönet..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu" msgid "Add more materials from Marketplace" msgstr "Mağazadan daha fazla malzeme ekle" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "&Profili geçerli ayarlar/geçersiz kılmalar ile güncelle" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "&Geçerli değişiklikleri iptal et" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:222 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:230 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "G&eçerli ayarlardan/geçersiz kılmalardan profil oluştur..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "Profilleri Yönet..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "Çevrimiçi Belgeleri Göster" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "Hata Bildir" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:260 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "Yenilikler" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:266 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "Hakkında..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:273 msgctxt "@action:inmenu menubar:edit" -msgid "Delete Selected Model" -msgid_plural "Delete Selected Models" -msgstr[0] "Seçili Modeli Sil" -msgstr[1] "Seçili Modelleri Sil" +msgid "Delete Selected" +msgstr "Seçileni Sil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:283 msgctxt "@action:inmenu menubar:edit" -msgid "Center Selected Model" -msgid_plural "Center Selected Models" -msgstr[0] "Seçili Modeli Ortala" -msgstr[1] "Seçili Modelleri Ortala" +msgid "Center Selected" +msgstr "Seçileni Ortala" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:292 msgctxt "@action:inmenu menubar:edit" -msgid "Multiply Selected Model" -msgid_plural "Multiply Selected Models" -msgstr[0] "Seçili Modeli Çoğalt" -msgstr[1] "Seçili Modelleri Çoğalt" +msgid "Multiply Selected" +msgstr "Seçileni Çoğalt" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "Modeli Sil" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:309 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "Modeli Platformda Ortala" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:307 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "Modelleri Gruplandır" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:327 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:335 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "Model Grubunu Çöz" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:345 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "&Modelleri Birleştir" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:347 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:355 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "&Modeli Çoğalt..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:362 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "Tüm modelleri Seç" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:372 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "Yapı Levhasını Temizle" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:382 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "Tüm Modelleri Yeniden Yükle" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "Tüm Modelleri Tüm Yapı Levhalarına Yerleştir" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:390 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "Tüm Modelleri Düzenle" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:406 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "Seçimi Düzenle" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:405 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:413 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "Tüm Model Konumlarını Sıfırla" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:412 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "Tüm Model ve Dönüşümleri Sıfırla" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:419 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:429 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "&Dosya Aç..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:439 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "&Yeni Proje..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:434 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:446 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Yapılandırma Klasörünü Göster" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:441 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:538 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Görünürlük ayarını yapılandır..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:448 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:460 msgctxt "@action:menu" msgid "&Marketplace" msgstr "&Mağazayı Göster" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:257 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Bu paket yeniden başlatmanın ardından kurulacak." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 msgctxt "@title:tab" msgid "General" msgstr "Genel" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:462 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:453 msgctxt "@title:tab" msgid "Settings" msgstr "Ayarlar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:464 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 msgctxt "@title:tab" msgid "Printers" msgstr "Yazıcılar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 msgctxt "@title:tab" msgid "Profiles" msgstr "Profiller" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:576 msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "%1 kapatılıyor" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:588 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "%1 uygulamasından çıkmak istediğinizden emin misiniz?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:638 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Dosya aç" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:744 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:737 msgctxt "@window:title" msgid "Install Package" msgstr "Paketi Kur" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:752 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:745 msgctxt "@title:window" msgid "Open File(s)" msgstr "Dosya Aç" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:755 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:748 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "Seçtiğiniz dosyalar arasında bir veya daha fazla G-code dosyası bulduk. Tek seferde sadece bir G-code dosyası açabilirsiniz. Bir G-code dosyası açmak istiyorsanız, sadece birini seçiniz." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:858 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:857 msgctxt "@title:window" msgid "Add Printer" msgstr "Yazıcı Ekle" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:866 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:865 msgctxt "@title:window" msgid "What's New" msgstr "Yenilikler" @@ -3722,17 +3781,27 @@ msgctxt "@label" msgid "Python bindings for libnest2d" msgstr "libnest2d için Python bağlamaları" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +msgctxt "@label" +msgid "Support library for system keyring access" +msgstr "Sistem anahtarlık erişimi için destek kitaplığı" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" +msgid "Python extensions for Microsoft Windows" +msgstr "Microsoft Windows için Python uzantıları" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +msgctxt "@label" msgid "Font" msgstr "Yazı tipi" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 msgctxt "@label" msgid "SVG icons" msgstr "SVG simgeleri" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:165 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Linux çapraz-dağıtım uygulama dağıtımı" @@ -3742,22 +3811,22 @@ msgctxt "@title:window" msgid "Open project file" msgstr "Proje dosyası aç" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:88 msgctxt "@text:window" msgid "This is a Cura project file. Would you like to open it as a project or import the models from it?" msgstr "Bu bir Cura proje dosyasıdır. Bir proje olarak açmak mı yoksa içindeki modelleri içe aktarmak mı istiyorsunuz?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:98 msgctxt "@text:window" msgid "Remember my choice" msgstr "Seçimimi hatırla" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:122 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:117 msgctxt "@action:button" msgid "Open as project" msgstr "Proje olarak aç" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:131 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:126 msgctxt "@action:button" msgid "Import models" msgstr "Modelleri içe aktar" @@ -3773,8 +3842,10 @@ msgid "" "You have customized some profile settings.\n" "Would you like to Keep these changed settings after switching profiles?\n" "Alternatively, you can discard the changes to load the defaults from '%1'." -msgstr "Bazı profil ayarlarını özelleştirdiniz.\nProfiller arasında geçiş yapıldıktan sonra bu değişiklikleri tutmak ister misiniz?\nAlternatif olarak, '%1' üzerinden" -" varsayılanları yüklemek için değişiklikleri silebilirsiniz." +msgstr "" +"Bazı profil ayarlarını özelleştirdiniz.\n" +"Profiller arasında geçiş yapıldıktan sonra bu değişiklikleri tutmak ister misiniz?\n" +"Alternatif olarak, '%1' üzerinden varsayılanları yüklemek için değişiklikleri silebilirsiniz." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:111 msgctxt "@title:column" @@ -3787,7 +3858,7 @@ msgid "Current changes" msgstr "Mevcut değişiklikler" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Her zaman sor" @@ -3812,12 +3883,12 @@ msgctxt "@action:button" msgid "Keep changes" msgstr "Değişiklikleri tut" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 msgctxt "@text:window" msgid "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?" msgstr "Seçtiğiniz dosyalar arasında bir veya daha fazla proje dosyası bulduk. Tek seferde sadece bir proje dosyası açabilirsiniz. Sadece bu dosyalarda bulunan modelleri içe aktarmanızı öneririz. Devam etmek istiyor musunuz?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:99 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:94 msgctxt "@action:button" msgid "Import all as models" msgstr "Tümünü model olarak içe aktar" @@ -3972,7 +4043,7 @@ msgctxt "@label" msgid "Material" msgstr "Malzeme" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:407 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "Bu malzeme kombinasyonuyla daha iyi yapıştırma için yapıştırıcı kullanın." @@ -3996,17 +4067,17 @@ msgctxt "@label" msgid "Number of Copies" msgstr "Kopya Sayısı" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:33 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:41 msgctxt "@title:menu menubar:file" msgid "&Save Project..." msgstr "&Projeyi Kaydet..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:54 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:74 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "&Dışa Aktar..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:85 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "Seçimi Dışa Aktar..." @@ -4026,6 +4097,11 @@ msgctxt "@label:category menu label" msgid "Generic" msgstr "Genel" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/OpenFilesMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Open File(s)..." +msgstr "Dosya Aç..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -4041,6 +4117,11 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "En Son Öğeyi Aç" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SaveProjectMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Save Project..." +msgstr "Projeyi Kaydet..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:15 msgctxt "@title:menu menubar:settings" msgid "&Printer" @@ -4066,17 +4147,17 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "Ekstruderi Devre Dışı Bırak" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:16 msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "Görünür ayarlar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:45 msgctxt "@action:inmenu" msgid "Collapse All Categories" msgstr "Tüm Kategorileri Daralt" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "Ayar Görünürlüğünü Yönet..." @@ -4086,22 +4167,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "&Kamera konumu" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:45 msgctxt "@action:inmenu menubar:view" msgid "Camera view" msgstr "Kamera görüşü" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:48 msgctxt "@action:inmenu menubar:view" msgid "Perspective" msgstr "Perspektif" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:60 msgctxt "@action:inmenu menubar:view" msgid "Orthographic" msgstr "Ortografik" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:81 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "&Yapı levhası" @@ -4146,12 +4227,12 @@ msgctxt "@label:MonitorStatus" msgid "Please remove the print" msgstr "Lütfen yazıcıyı çıkarın" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@label" msgid "Abort Print" msgstr "Yazdırmayı Durdur" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:338 msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "Yazdırmayı iptal etmek istediğinizden emin misiniz?" @@ -4193,301 +4274,301 @@ msgctxt "@label" msgid "Interface" msgstr "Arayüz" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:216 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:209 msgctxt "@label" msgid "Currency:" msgstr "Para Birimi:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:229 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:222 msgctxt "@label" msgid "Theme:" msgstr "Tema:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "Bu değişikliklerinin geçerli olması için uygulamayı yeniden başlatmanız gerekecektir." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:284 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "Ayarlar değiştirilirken otomatik olarak dilimle." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 msgctxt "@option:check" msgid "Slice automatically" msgstr "Otomatik olarak dilimle" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:306 msgctxt "@label" msgid "Viewport behavior" msgstr "Görünüm şekli" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:314 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "Modelin desteklenmeyen alanlarını kırmızı ile gösterin. Destek alınmadan bu alanlar düzgün bir şekilde yazdırılmayacaktır." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:323 msgctxt "@option:check" msgid "Display overhang" msgstr "Dışarıda kalan alanı göster" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:351 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@info:tooltip" msgid "Highlight missing or extraneous surfaces of the model using warning signs. The toolpaths will often be missing parts of the intended geometry." msgstr "Modelin eksik veya ikincil yüzeylerini uyarı işaretleri kullanarak vurgulayın. Amaçlanan geometrinin eksik parçaları genellikle takım yolları olacaktır." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:342 msgctxt "@option:check" msgid "Display model errors" msgstr "Model hatalarını görüntüle" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "Bir model seçildiğinde bu model görüntünün ortasında kalacak şekilde kamera hareket eder" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:373 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "Öğeyi seçince kamerayı ortalayın" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "Cura’nın varsayılan yakınlaştırma davranışı tersine çevrilsin mi?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:388 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "Kamera yakınlaştırma yönünü ters çevir." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "Yakınlaştırma farenin hareket yönüne uygun olsun mu?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "Fareye doğru yakınlaştırma yapılması ortografik perspektifte desteklenmez." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:409 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "Farenin hareket yönüne göre yakınlaştır" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:435 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:417 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "Platformun üzerindeki öğeler kesişmemeleri için hareket ettirilmeli mi?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:440 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:422 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "Modellerin birbirinden ayrı olduğundan emin olduğundan emin olun" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:431 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "Platformun üzerindeki modeller yapı levhasına değmeleri için indirilmeli mi?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:436 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "Modelleri otomatik olarak yapı tahtasına indirin" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:448 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "G-code okuyucuda uyarı mesajı göster." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:457 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "G-code okuyucuda uyarı mesajı" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "Katman, uyumluluk moduna zorlansın mı?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "Katman görünümünü uyumluluk moduna zorla (yeniden başlatma gerekir)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:498 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" msgstr "Cura kapatıldığı yerden mi başlatılsın?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:485 msgctxt "@option:check" msgid "Restore window position on start" msgstr "Başlangıçtaki pencere konumuna dönülsün" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:513 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "Ne tür bir kamera oluşturma işlemi kullanılmalıdır?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:502 msgctxt "@window:text" msgid "Camera rendering:" msgstr "Kamera oluşturma:" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:531 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:509 msgid "Perspective" msgstr "Perspektif" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:532 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgid "Orthographic" msgstr "Ortografik" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:563 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:548 msgctxt "@label" msgid "Opening and saving files" msgstr "Dosyaların açılması ve kaydedilmesi" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:555 msgctxt "@info:tooltip" msgid "Should opening files from the desktop or external applications open in the same instance of Cura?" msgstr "Masaüstünden veya harici uygulamalardan açılan dosyalar aynı Cura örneğinde mi açılacak?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@option:check" msgid "Use a single instance of Cura" msgstr "Tek bir Cura örneği kullan" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "Modeller çok büyükse yapı hacmine göre ölçeklendirilmeli mi?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@option:check" msgid "Scale large models" msgstr "Büyük modelleri ölçeklendirin" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "Bir modelin birimi milimetre değil de metre ise oldukça küçük görünebilir. Bu modeller ölçeklendirilmeli mi?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "Çok küçük modelleri ölçeklendirin" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "Yüklendikten sonra modeller seçilsin mi?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@option:check" msgid "Select models when loaded" msgstr "Yüklendiğinde modelleri seç" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "Yazıcı adına bağlı bir ön ek otomatik olarak yazdırma işinin adına eklenmeli mi?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:635 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "Makine ön ekini iş adına ekleyin" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:645 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "Bir proje dosyasını kaydederken özet gösterilmeli mi?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:649 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:634 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "Projeyi kaydederken özet iletişim kutusunu göster" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:659 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:644 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "Bir proje dosyası açıldığında varsayılan davranış" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:652 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "Bir proje dosyası açıldığında varsayılan davranış: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "Her zaman sor" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:682 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "Her zaman proje olarak aç" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:668 msgctxt "@option:openProject" msgid "Always import models" msgstr "Her zaman modelleri içe aktar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:705 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Bir profil üzerinde değişiklik yapıp farklı bir profile geçtiğinizde, değişikliklerin kaydedilmesini isteyip istemediğinizi soran bir iletişim kutusu açılır. Alternatif olarak bu işleve yönelik varsayılan bir davranış seçebilir ve bu iletişim kutusunun bir daha görüntülenmemesini tercih edebilirsiniz." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:728 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Profiller" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "Farklı bir profile geçerken değişen ayar değerleriyle ilgili varsayılan davranış: " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:748 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:734 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "Değiştirilen ayarları her zaman at" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:749 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:735 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "Değiştirilen ayarları her zaman yeni profile taşı" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:783 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@label" msgid "Privacy" msgstr "Gizlilik" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:790 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:777 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "Cura, program başladığında güncellemeleri kontrol etmeli mi?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:795 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:782 msgctxt "@option:check" msgid "Check for updates on start" msgstr "Başlangıçta güncellemeleri kontrol edin" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:805 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:792 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "Yazdırmanızdaki anonim veriler Ultimaker’a gönderilmeli mi? Unutmayın; hiçbir model, IP adresi veya diğer kişiye özgü bilgiler gönderilmez veya saklanmaz." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:810 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:797 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "(Anonim) yazdırma bilgisi gönder" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:819 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:806 msgctxt "@action:button" msgid "More information" msgstr "Daha fazla bilgi" @@ -4527,55 +4608,65 @@ msgctxt "@action:button" msgid "Export" msgstr "Dışa Aktar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 +msgctxt "@action:button Sending materials to printers" +msgid "Sync with Printers" +msgstr "Yazıcılarla Senkronize Et" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" msgid "Printer" msgstr "Yazıcı" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:298 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Kaldırmayı Onayla" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:301 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "%1’i kaldırmak istediğinizden emin misiniz? Bu eylem geri alınamaz!" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 msgctxt "@title:window" msgid "Import Material" msgstr "Malzemeyi İçe Aktar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:338 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "Malzeme %1 dosyasına içe aktarılamadı: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:328 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:342 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Malzeme %1 dosyasına başarıyla içe aktarıldı" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:346 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 msgctxt "@title:window" msgid "Export Material" msgstr "Malzemeyi Dışa Aktar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:358 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:372 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "Malzemenin %1 dosyasına dışa aktarımı başarısız oldu: %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:378 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "Malzeme %1 dosyasına başarıyla dışa aktarıldı" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 +msgctxt "@title:window" +msgid "Export All Materials" +msgstr "Tüm Malzemeleri Dışa Aktar" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" @@ -4687,53 +4778,53 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "Bu profil için lütfen bir ad girin." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "Profili Çoğalt" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@title:window" msgid "Rename Profile" msgstr "Profili Yeniden Adlandır" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:307 msgctxt "@title:window" msgid "Import Profile" msgstr "Profili İçe Aktar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:336 msgctxt "@title:window" msgid "Export Profile" msgstr "Profili Dışa Aktar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:399 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "Yazıcı: %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:557 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Profili geçerli ayarlar/geçersiz kılmalar ile güncelle" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 msgctxt "@action:button" msgid "Discard current changes" msgstr "Geçerli değişiklikleri iptal et" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:583 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "Bu profil yazıcının belirlediği varsayılan ayarları kullanır; dolayısıyla aşağıdaki listede bulunan ayarları/geçersiz kılmaları içermez." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:591 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "Geçerli ayarlarınız seçilen profille uyumlu." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:609 msgctxt "@title:tab" msgid "Global Settings" msgstr "Küresel Ayarlar" @@ -4763,12 +4854,12 @@ msgctxt "@title:column" msgid "Unit" msgstr "Birim" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:16 msgctxt "@title:tab" msgid "Setting Visibility" msgstr "Görünürlüğü Ayarlama" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:48 msgctxt "@label:textbox" msgid "Check all" msgstr "Tümünü denetle" @@ -5106,27 +5197,27 @@ msgctxt "@label:textbox" msgid "Search settings" msgstr "Arama ayarları" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:456 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:468 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "Değeri tüm ekstruderlere kopyala" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:477 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "Tüm değiştirilmiş değerleri tüm ekstruderlere kopyala" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:502 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:514 msgctxt "@action:menu" msgid "Hide this setting" msgstr "Bu ayarı gizle" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:515 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:527 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "Bu ayarı gösterme" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:531 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "Bu ayarı görünür yap" @@ -5186,11 +5277,6 @@ msgctxt "@button" msgid "Add printer manually" msgstr "Yazıcıyı manuel olarak ekle" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddCloudPrintersView.qml:218 -msgctxt "@button" -msgid "Finish" -msgstr "Bitir" - #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:230 msgctxt "@label" msgid "Manufacturer" @@ -5297,32 +5383,32 @@ msgctxt "@button" msgid "Connect" msgstr "Bağlan" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:43 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" -msgid "Ultimaker Account" -msgstr "Ultimaker hesabı" +msgid "Release Notes" +msgstr "Sürüm notları" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:124 msgctxt "@text" -msgid "Your key to connected 3D printing" -msgstr "3D baskıya bağlı anahtarınız" +msgid "Add material settings and plugins from the Marketplace" +msgstr "Marketplace'den malzeme ayarlarını ve eklentileri ekleyin" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:101 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:154 msgctxt "@text" -msgid "- Customize your experience with more print profiles and plugins" -msgstr "- Daha fazla baskı profili ve eklenti ile deneyiminizi kişiselleştirin" +msgid "Backup and sync your material settings and plugins" +msgstr "Malzeme ayarlarınızı ve eklentilerinizi yedekleyin ve senkronize edin" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:184 msgctxt "@text" -msgid "- Stay flexible by syncing your setup and loading it anywhere" -msgstr "- Ayarlarınızı senkronize ederek ve dilediğiniz yerde yükleyerek esnek çalışın" +msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" +msgstr "Ultimaker Topluluğunda fikirlerinizi paylaşın ve 48.000'den fazla kullanıcıdan yardım alın" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:217 msgctxt "@text" -msgid "- Increase efficiency with a remote workflow on Ultimaker printers" -msgstr "- Ultimaker yazıcılardaki uzaktan iş akışı sayesinde verimliliği artırın" +msgid "Create a free Ultimaker Account" +msgstr "Ücretsiz Ultimaker Hesabı oluşturun" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:230 msgctxt "@button" msgid "Skip" msgstr "Atla" @@ -5382,29 +5468,32 @@ msgctxt "@button" msgid "Decline and close" msgstr "Reddet ve kapat" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:29 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" msgid "Welcome to Ultimaker Cura" msgstr "Ultimaker Cura'ya hoş geldiniz" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:68 msgctxt "@text" -msgid "" -"Please follow these steps to set up\n" -"Ultimaker Cura. This will only take a few moments." +msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." msgstr "" "Ultimaker Cura'yı kurmak\n" " için lütfen aşağıdaki adımları izleyin. Bu sadece birkaç saniye sürecektir." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:86 msgctxt "@button" msgid "Get started" msgstr "Başlayın" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:28 msgctxt "@label" -msgid "What's new in Ultimaker Cura" -msgstr "Ultimaker Cura'daki yenilikler" +msgid "What's New" +msgstr "Yenilikler" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Widgets/ComboBox.qml:24 +msgctxt "@label" +msgid "No items to select from" +msgstr "Seçilecek öğe yok" #: ModelChecker/plugin.json msgctxt "description" @@ -5486,6 +5575,16 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura Profili Yazıcı" +#: DigitalLibrary/plugin.json +msgctxt "description" +msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." +msgstr "Digital Library'ye bağlanarak Cura'nın Digital Library'deki dosyaları açmasına ve kaydetmesine olanak tanır." + +#: DigitalLibrary/plugin.json +msgctxt "name" +msgid "Ultimaker Digital Library" +msgstr "Ultimaker Digital Library" + #: FirmwareUpdateChecker/plugin.json msgctxt "description" msgid "Checks for firmware updates." @@ -5956,6 +6055,26 @@ msgctxt "name" msgid "Version Upgrade 4.7 to 4.8" msgstr "4.7'den 4.8'e Sürüm Yükseltme" +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." +msgstr "Yapılandırmaları Cura 4.8'den Cura 4.9'a yükseltir." + +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.8 to 4.9" +msgstr "4.8'den 4.9'a Sürüm Yükseltme" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." +msgstr "Yapılandırmaları Cura 4.9'dan Cura 4.10'a yükseltir." + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.9 to 4.10" +msgstr "4.9'dan 4.10'a Sürüm Yükseltme" + #: X3DReader/plugin.json msgctxt "description" msgid "Provides support for reading X3D files." @@ -5986,6 +6105,94 @@ msgctxt "name" msgid "X-Ray View" msgstr "Röntgen Görüntüsü" +#~ msgctxt "@info:status" +#~ msgid "Global stack is missing." +#~ msgstr "Genel yığın eksik." + +#~ msgctxt "@info:status" +#~ msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." +#~ msgstr "Modeliniz çok katmanlı değil. Vurgulanan alanlar eksik ya da ikincil yüzeyleri gösterir." + +#~ msgctxt "@info:title" +#~ msgid "Model errors" +#~ msgstr "Model hataları" + +#~ msgctxt "@label:listbox" +#~ msgid "Layer thickness" +#~ msgstr "Katman kalınlığı" + +#~ msgctxt "@label" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "3D baskıya bağlı anahtarınız" + +#~ msgctxt "@text" +#~ msgid "" +#~ "- Customize your experience with more print profiles and plugins\n" +#~ "- Stay flexible by syncing your setup and loading it anywhere\n" +#~ "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "" +#~ "- Daha fazla baskı profili ve eklenti ile deneyiminizi kişiselleştirin\n" +#~ "- Ayarlarınızı senkronize ederek ve dilediğiniz yerde yükleyerek esnek çalışın\n" +#~ "- Ultimaker yazıcılardaki uzaktan iş akışı sayesinde verimliliği artırın" + +#~ msgctxt "@button" +#~ msgid "Create account" +#~ msgstr "Hesap oluştur" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Delete Selected Model" +#~ msgid_plural "Delete Selected Models" +#~ msgstr[0] "Seçili Modeli Sil" +#~ msgstr[1] "Seçili Modelleri Sil" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Center Selected Model" +#~ msgid_plural "Center Selected Models" +#~ msgstr[0] "Seçili Modeli Ortala" +#~ msgstr[1] "Seçili Modelleri Ortala" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Multiply Selected Model" +#~ msgid_plural "Multiply Selected Models" +#~ msgstr[0] "Seçili Modeli Çoğalt" +#~ msgstr[1] "Seçili Modelleri Çoğalt" + +#~ msgctxt "@button" +#~ msgid "Finish" +#~ msgstr "Bitir" + +#~ msgctxt "@label" +#~ msgid "Ultimaker Account" +#~ msgstr "Ultimaker hesabı" + +#~ msgctxt "@text" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "3D baskıya bağlı anahtarınız" + +#~ msgctxt "@text" +#~ msgid "- Customize your experience with more print profiles and plugins" +#~ msgstr "- Daha fazla baskı profili ve eklenti ile deneyiminizi kişiselleştirin" + +#~ msgctxt "@text" +#~ msgid "- Stay flexible by syncing your setup and loading it anywhere" +#~ msgstr "- Ayarlarınızı senkronize ederek ve dilediğiniz yerde yükleyerek esnek çalışın" + +#~ msgctxt "@text" +#~ msgid "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "- Ultimaker yazıcılardaki uzaktan iş akışı sayesinde verimliliği artırın" + +#~ msgctxt "@text" +#~ msgid "" +#~ "Please follow these steps to set up\n" +#~ "Ultimaker Cura. This will only take a few moments." +#~ msgstr "" +#~ "Ultimaker Cura'yı kurmak\n" +#~ " için lütfen aşağıdaki adımları izleyin. Bu sadece birkaç saniye sürecektir." + +#~ msgctxt "@label" +#~ msgid "What's new in Ultimaker Cura" +#~ msgstr "Ultimaker Cura'daki yenilikler" + #~ msgctxt "@label ({} is object name)" #~ msgid "Are you sure you wish to remove {}? This cannot be undone!" #~ msgstr "{} yazıcısını kaldırmak istediğinizden emin misiniz? Bu işlem geri alınamaz!" diff --git a/resources/i18n/tr_TR/fdmextruder.def.json.po b/resources/i18n/tr_TR/fdmextruder.def.json.po index bebcfb8ba0..74b7cd1a7c 100644 --- a/resources/i18n/tr_TR/fdmextruder.def.json.po +++ b/resources/i18n/tr_TR/fdmextruder.def.json.po @@ -1,19 +1,20 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2019-03-13 14:00+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 15:03+0200\n" "Last-Translator: Bothof \n" "Language-Team: Turkish\n" "Language: tr_TR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.4.1\n" #: fdmextruder.def.json msgctxt "machine_settings label" diff --git a/resources/i18n/tr_TR/fdmprinter.def.json.po b/resources/i18n/tr_TR/fdmprinter.def.json.po index 81a5ad1f72..ed189efda7 100644 --- a/resources/i18n/tr_TR/fdmprinter.def.json.po +++ b/resources/i18n/tr_TR/fdmprinter.def.json.po @@ -1,20 +1,20 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2020-08-21 13:40+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 15:03+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Turkish , Turkish \n" "Language: tr_TR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2.4\n" +"X-Generator: Poedit 2.4.1\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -419,6 +419,26 @@ msgctxt "machine_extruders_share_heater description" msgid "Whether the extruders share a single heater rather than each extruder having its own heater." msgstr "Ekstrüderlerin tek bir ısıtıcıyı mı paylaşacağı yoksa her bir ekstrüderin kendi ısıtıcısı mı olacağı." +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle label" +msgid "Extruders Share Nozzle" +msgstr "Ekstrüder Nozül Paylaşımı" + +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle description" +msgid "Whether the extruders share a single nozzle rather than each extruder having its own nozzle. When set to true, it is expected that the printer-start gcode script properly sets up all extruders in an initial retraction state that is known and mutually compatible (either zero or one filament not retracted); in that case the initial retraction status is described, per extruder, by the 'machine_extruders_shared_nozzle_initial_retraction' parameter." +msgstr "Ekstrüderlerin tek bir nozülü mü paylaşacağı yoksa her bir ekstrüderin kendi nozülü mü olacağıdır. True olarak ayarlandığında printer-start gcode betiğinin tüm ekstrüderleri bilinen ve karşılıklı olarak uyumlu olan bir ilk geri çekme durumunda (sıfır veya geri çekilmemiş bir filament) düzgün bir şekilde ayarlaması beklenir. Bu durumda ilk geri çekme, ekstrüder başına \"machine_extruders_shared_nozzle_initial_retraction\" parametresi ile açıklanır." + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction label" +msgid "Shared Nozzle Initial Retraction" +msgstr "Paylaşılan Nozül İlk Geri Çekme" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction description" +msgid "How much the filament of each extruder is assumed to have been retracted from the shared nozzle tip at the completion of the printer-start gcode script; the value should be equal to or greater than the length of the common part of the nozzle's ducts." +msgstr "Printer-start gcode betiğinin tamamlanmasında her bir ekstrüder filamentinin paylaşılan nozül ucundan ne kadar geri çekildiğinin varsayıldığıdır. Değer, nozül kanallarının ortak parçasının uzunluğuna eşit veya daha büyük olmalıdır." + #: fdmprinter.def.json msgctxt "machine_disallowed_areas label" msgid "Disallowed Areas" @@ -486,8 +506,8 @@ msgstr "Ekstruder Ofseti" #: fdmprinter.def.json msgctxt "machine_use_extruder_offset_to_offset_coords description" -msgid "Apply the extruder offset to the coordinate system." -msgstr "Ekstruder ofsetini koordinat sistemine uygulayın." +msgid "Apply the extruder offset to the coordinate system. Affects all extruders." +msgstr "Ekstrüder ofsetini koordinat sistemine uygulayın. Tüm ekstrüderleri etkiler." #: fdmprinter.def.json msgctxt "extruder_prime_pos_z label" @@ -881,8 +901,8 @@ msgstr "İlk katman üzerinde bulunan hat genişliği çoğaltıcı. Çoğaltmay #: fdmprinter.def.json msgctxt "shell label" -msgid "Shell" -msgstr "Kovan" +msgid "Walls" +msgstr "Duvarlar" #: fdmprinter.def.json msgctxt "shell description" @@ -949,166 +969,6 @@ msgctxt "wall_0_wipe_dist description" msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better." msgstr "Z dikişini daha iyi gizlemek için dış duvardan sonra eklenen hareket mesafesi." -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr label" -msgid "Top Surface Skin Extruder" -msgstr "Üst Yüzey Ekstruderi" - -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr description" -msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." -msgstr "En üstteki yüzeyi yazdırmak için kullanılan ekstruder dişli çarkı. Çoklu ekstrüzyon işlemi için kullanılır." - -#: fdmprinter.def.json -msgctxt "roofing_layer_count label" -msgid "Top Surface Skin Layers" -msgstr "Üst Yüzey Katmanları" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count description" -msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." -msgstr "En üstteki yüzey katmanlarının sayısı. Yüksek kalitede üst yüzeyler oluşturmak için genellikle tek bir üst yüzey katmanı yeterlidir." - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr label" -msgid "Top/Bottom Extruder" -msgstr "Üst/Alt Ekstruderi" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr description" -msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." -msgstr "Üst ve alt yüzeyi yazdırmak için kullanılan ekstruder dişli çarkı. Çoklu ekstrüzyon işlemi için kullanılır." - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness label" -msgid "Top/Bottom Thickness" -msgstr "Üst/Alt Kalınlık" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness description" -msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." -msgstr "Yazdırmadaki üst/alt katmanların kalınlığı. Katman yüksekliğiyle ayrılan bu değer üst/alt katmanların sayısını belirtir." - -#: fdmprinter.def.json -msgctxt "top_thickness label" -msgid "Top Thickness" -msgstr "Üst Kalınlık" - -#: fdmprinter.def.json -msgctxt "top_thickness description" -msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." -msgstr "Yazdırmadaki üst katmanların kalınlığı. Katman yüksekliğiyle ayrılan bu değer üst katmanların sayısını belirtir." - -#: fdmprinter.def.json -msgctxt "top_layers label" -msgid "Top Layers" -msgstr "Üst Katmanlar" - -#: fdmprinter.def.json -msgctxt "top_layers description" -msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." -msgstr "Üst katman sayısı. Bu değer, üst kalınlığıyla hesaplandığında tam sayıya yuvarlanır." - -#: fdmprinter.def.json -msgctxt "bottom_thickness label" -msgid "Bottom Thickness" -msgstr "Alt Kalınlık" - -#: fdmprinter.def.json -msgctxt "bottom_thickness description" -msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." -msgstr "Yazdırmadaki alt katmanların kalınlığı. Katman yüksekliğiyle ayrılan bu değer alt katmanların sayısını belirtir." - -#: fdmprinter.def.json -msgctxt "bottom_layers label" -msgid "Bottom Layers" -msgstr "Alt katmanlar" - -#: fdmprinter.def.json -msgctxt "bottom_layers description" -msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "Alt katman sayısı. Bu değer, alt kalınlığıyla hesaplandığında tam sayıya yuvarlanır." - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers label" -msgid "Initial Bottom Layers" -msgstr "İlk Alt Katmanlar" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers description" -msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "Yapı plakasından itibaren ilk alt katman sayısı Bu değer, alt kalınlığıyla hesaplandığında tam sayıya yuvarlanır." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern label" -msgid "Top/Bottom Pattern" -msgstr "Üst/Alt Şekil" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern description" -msgid "The pattern of the top/bottom layers." -msgstr "Üst/alt katmanların şekli." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option lines" -msgid "Lines" -msgstr "Çizgiler" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option concentric" -msgid "Concentric" -msgstr "Eş merkezli" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option zigzag" -msgid "Zig Zag" -msgstr "Zik Zak" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 label" -msgid "Bottom Pattern Initial Layer" -msgstr "Alt Şekil İlk Katmanı" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 description" -msgid "The pattern on the bottom of the print on the first layer." -msgstr "Yazdırmanın altında ilk katmanda yer alacak şekil." - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option lines" -msgid "Lines" -msgstr "Çizgiler" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option concentric" -msgid "Concentric" -msgstr "Eş merkezli" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option zigzag" -msgid "Zig Zag" -msgstr "Zikzak" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons label" -msgid "Connect Top/Bottom Polygons" -msgstr "Üst/Alt Poligonları Bağla" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." -msgstr "Üst/alt yüzey yollarını yan yana ise bağla. Eş merkezli şekil için bu ayarı etkinleştirmek, hareket süresini önemli ölçüde kısaltır ancak bağlantılar dolgunun üzerinde meydana gelebileceğinden bu özellik üst yüzeyin kalitesini düşürebilir." - -#: fdmprinter.def.json -msgctxt "skin_angles label" -msgid "Top/Bottom Line Directions" -msgstr "Üst/Alt Çizgi Yönleri" - -#: fdmprinter.def.json -msgctxt "skin_angles description" -msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." -msgstr "Üst/alt katmanlar çizgi veya zikzak şekillerini kullandığında kullanılacak tam sayı çizgi yönü listesi. Listedeki öğeler, katmanlar ilerledikçe sıralı olarak kullanılır. Listenin sonuna ulaşıldığında baştan başlanır. Liste öğeleri virgülle ayrılır ve tüm liste köşeli parantez içine alınır. Varsayılan ayar boş listedir ve geleneksel varsayılan açılar (45 ve 135 derece) kullanılır." - #: fdmprinter.def.json msgctxt "wall_0_inset label" msgid "Outer Wall Inset" @@ -1414,6 +1274,176 @@ msgctxt "z_seam_relative description" msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate." msgstr "Etkin olduğunda, z dikişi koordinatları her parçanın merkezine göre hizalıdır. Devre dışı olduğunda, koordinatlar yapı levhası üzerinde mutlak bir pozisyonu belirtir." +#: fdmprinter.def.json +msgctxt "top_bottom label" +msgid "Top/Bottom" +msgstr "Üst / Alt" + +#: fdmprinter.def.json +msgctxt "top_bottom description" +msgid "Top/Bottom" +msgstr "Üst / Alt" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr label" +msgid "Top Surface Skin Extruder" +msgstr "Üst Yüzey Ekstruderi" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr description" +msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." +msgstr "En üstteki yüzeyi yazdırmak için kullanılan ekstruder dişli çarkı. Çoklu ekstrüzyon işlemi için kullanılır." + +#: fdmprinter.def.json +msgctxt "roofing_layer_count label" +msgid "Top Surface Skin Layers" +msgstr "Üst Yüzey Katmanları" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count description" +msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." +msgstr "En üstteki yüzey katmanlarının sayısı. Yüksek kalitede üst yüzeyler oluşturmak için genellikle tek bir üst yüzey katmanı yeterlidir." + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr label" +msgid "Top/Bottom Extruder" +msgstr "Üst/Alt Ekstruderi" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr description" +msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." +msgstr "Üst ve alt yüzeyi yazdırmak için kullanılan ekstruder dişli çarkı. Çoklu ekstrüzyon işlemi için kullanılır." + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness label" +msgid "Top/Bottom Thickness" +msgstr "Üst/Alt Kalınlık" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness description" +msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." +msgstr "Yazdırmadaki üst/alt katmanların kalınlığı. Katman yüksekliğiyle ayrılan bu değer üst/alt katmanların sayısını belirtir." + +#: fdmprinter.def.json +msgctxt "top_thickness label" +msgid "Top Thickness" +msgstr "Üst Kalınlık" + +#: fdmprinter.def.json +msgctxt "top_thickness description" +msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." +msgstr "Yazdırmadaki üst katmanların kalınlığı. Katman yüksekliğiyle ayrılan bu değer üst katmanların sayısını belirtir." + +#: fdmprinter.def.json +msgctxt "top_layers label" +msgid "Top Layers" +msgstr "Üst Katmanlar" + +#: fdmprinter.def.json +msgctxt "top_layers description" +msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." +msgstr "Üst katman sayısı. Bu değer, üst kalınlığıyla hesaplandığında tam sayıya yuvarlanır." + +#: fdmprinter.def.json +msgctxt "bottom_thickness label" +msgid "Bottom Thickness" +msgstr "Alt Kalınlık" + +#: fdmprinter.def.json +msgctxt "bottom_thickness description" +msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." +msgstr "Yazdırmadaki alt katmanların kalınlığı. Katman yüksekliğiyle ayrılan bu değer alt katmanların sayısını belirtir." + +#: fdmprinter.def.json +msgctxt "bottom_layers label" +msgid "Bottom Layers" +msgstr "Alt katmanlar" + +#: fdmprinter.def.json +msgctxt "bottom_layers description" +msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "Alt katman sayısı. Bu değer, alt kalınlığıyla hesaplandığında tam sayıya yuvarlanır." + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "İlk Alt Katmanlar" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "Yapı plakasından itibaren ilk alt katman sayısı Bu değer, alt kalınlığıyla hesaplandığında tam sayıya yuvarlanır." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern label" +msgid "Top/Bottom Pattern" +msgstr "Üst/Alt Şekil" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern description" +msgid "The pattern of the top/bottom layers." +msgstr "Üst/alt katmanların şekli." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option lines" +msgid "Lines" +msgstr "Çizgiler" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option concentric" +msgid "Concentric" +msgstr "Eş merkezli" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option zigzag" +msgid "Zig Zag" +msgstr "Zik Zak" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 label" +msgid "Bottom Pattern Initial Layer" +msgstr "Alt Şekil İlk Katmanı" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 description" +msgid "The pattern on the bottom of the print on the first layer." +msgstr "Yazdırmanın altında ilk katmanda yer alacak şekil." + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option lines" +msgid "Lines" +msgstr "Çizgiler" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option concentric" +msgid "Concentric" +msgstr "Eş merkezli" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option zigzag" +msgid "Zig Zag" +msgstr "Zikzak" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons label" +msgid "Connect Top/Bottom Polygons" +msgstr "Üst/Alt Poligonları Bağla" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons description" +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "Üst/alt yüzey yollarını yan yana ise bağla. Eş merkezli şekil için bu ayarı etkinleştirmek, hareket süresini önemli ölçüde kısaltır ancak bağlantılar dolgunun üzerinde meydana gelebileceğinden bu özellik üst yüzeyin kalitesini düşürebilir." + +#: fdmprinter.def.json +msgctxt "skin_angles label" +msgid "Top/Bottom Line Directions" +msgstr "Üst/Alt Çizgi Yönleri" + +#: fdmprinter.def.json +msgctxt "skin_angles description" +msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." +msgstr "Üst/alt katmanlar çizgi veya zikzak şekillerini kullandığında kullanılacak tam sayı çizgi yönü listesi. Listedeki öğeler, katmanlar ilerledikçe sıralı olarak kullanılır. Listenin sonuna ulaşıldığında baştan başlanır. Liste öğeleri virgülle ayrılır ve tüm liste köşeli parantez içine alınır. Varsayılan ayar boş listedir ve geleneksel varsayılan açılar (45 ve 135 derece) kullanılır." + #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" msgid "No Skin in Z Gaps" @@ -1554,6 +1584,86 @@ msgctxt "skin_overlap_mm description" msgid "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any value over half the width of the wall may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall." msgstr "Duvarlar ile yüzey ekseni (uçları) arasındaki çakışma miktarını ayarlayın. Az miktar çakışma duvarların yüzeye sıkıca bağlanmasını sağlar. Eşit yüzey ve duvar hattı genişliği söz konusu olduğunda, duvar kalınlığının yarısından fazla değerlerde bu noktada yüzey ekstrüderinin nozül konumu halihazırda duvarın ortasına ulaşmış olacağından yüzeyin duvarı geçmiş olabileceğini unutmayın." +#: fdmprinter.def.json +msgctxt "skin_preshrink label" +msgid "Skin Removal Width" +msgstr "Yüzey Kaldırma Genişliği" + +#: fdmprinter.def.json +msgctxt "skin_preshrink description" +msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." +msgstr "Kaldırılacak olan yüzey alanlarının en büyük genişliğidir. Bu değerden daha küçük olan her yüzey alanı kaybolacaktır. Bu, modeldeki eğimli yüzeylerde alt/üst yüzeyin yazdırılması için harcanan süreyi ve malzemeyi sınırlamaya yardımcı olabilir." + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink label" +msgid "Top Skin Removal Width" +msgstr "Üst Yüzey Kaldırma Genişliği" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink description" +msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." +msgstr "Kaldırılacak olan üst yüzey alanlarının en büyük genişliğidir. Bu değerden daha küçük olan her yüzey alanı kaybolacaktır. Bu, modeldeki eğimli yüzeylerde üst yüzeyin yazdırılması için harcanan süreyi ve malzemeyi sınırlamaya yardımcı olabilir." + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink label" +msgid "Bottom Skin Removal Width" +msgstr "Alt Yüzey Kaldırma Genişliği" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink description" +msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." +msgstr "Kaldırılacak olan alt yüzey alanlarının en büyük genişliğidir. Bu değerden daha küçük olan her yüzey alanı kaybolacaktır. Bu, modeldeki eğimli yüzeylerde alt yüzeyin yazdırılması için harcanan süreyi ve malzemeyi sınırlamaya yardımcı olabilir." + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance label" +msgid "Skin Expand Distance" +msgstr "Yüzey Genişleme Mesafesi" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance description" +msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." +msgstr "Yüzeylerin dolgunun içine doğru genişleyeceği mesafedir. Daha yüksek değerler, yüzeyin dolgu şekline daha iyi tutunmasını sağladığı gibi komşu katmanlardaki duvarların yüzeye daha iyi yapışmasını sağlar. Daha düşük değerler, kullanılan malzemenin miktarından tasarruf yapılmasını sağlar." + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance label" +msgid "Top Skin Expand Distance" +msgstr "Üst Yüzey Genişleme Mesafesi" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance description" +msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." +msgstr "Üst yüzeylerin dolgunun içine doğru genişleyeceği mesafedir. Daha yüksek değerler, yüzeyin dolgu şekline daha iyi tutunmasını sağladığı gibi yukarıdaki katmandaki duvarların yüzeye daha iyi yapışmasını sağlar. Daha düşük değerler, kullanılan malzemenin miktarından tasarruf yapılmasını sağlar." + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance label" +msgid "Bottom Skin Expand Distance" +msgstr "Alt Yüzey Genişleme Mesafesi" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance description" +msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." +msgstr "Alt yüzeylerin dolgunun içine doğru genişleyeceği mesafedir. Daha yüksek değerler, yüzeyin dolgu şekline daha iyi tutunmasını sağladığı gibi yüzeyin aşağıdaki katmandaki duvara daha iyi yapışmasını sağlar. Daha düşük değerler, kullanılan malzemenin miktarından tasarruf yapılmasını sağlar." + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion label" +msgid "Maximum Skin Angle for Expansion" +msgstr "Genişleme için Maksimum Yüzey Açısı" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion description" +msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded." +msgstr "Nesnenizin bu ayardan daha geniş açıya sahip üst ve/veya alt zeminlerinin yüzeyleri genişletilmez. Böylece model yüzeyinin neredeyse dik açıya sahip olduğu durumlarda ortaya çıkan dar yüzey alanlarının genişletilmesi önlenmiş olur. 0°’lik bir açı yataydır ve yüzey alanının genişlemesine neden olmaz; 90°’lik bir açı dikeydir ve tüm yüzey alanlarının genişlemesine neden olur." + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion label" +msgid "Minimum Skin Width for Expansion" +msgstr "Genişleme için Minimum Yüzey Genişliği" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion description" +msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." +msgstr "Bu değerden daha dar olan yüzey alanları genişletilmez. Böylece model yüzeyinin dikeye yakın bir eğime sahip olduğu durumlarda ortaya çıkan dar yüzey alanlarının genişletilmesi önlenmiş olur." + #: fdmprinter.def.json msgctxt "infill label" msgid "Infill" @@ -1863,86 +1973,6 @@ msgctxt "infill_support_angle description" msgid "The minimum angle of internal overhangs for which infill is added. At a value of 0° objects are totally filled with infill, 90° will not provide any infill." msgstr "Dolum eklenen dahili çıkıntıların minimum açısı. 0° değerde nesneler tamamen doldurulur, 90°’de dolgu yapılmaz." -#: fdmprinter.def.json -msgctxt "skin_preshrink label" -msgid "Skin Removal Width" -msgstr "Yüzey Kaldırma Genişliği" - -#: fdmprinter.def.json -msgctxt "skin_preshrink description" -msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." -msgstr "Kaldırılacak olan yüzey alanlarının en büyük genişliğidir. Bu değerden daha küçük olan her yüzey alanı kaybolacaktır. Bu, modeldeki eğimli yüzeylerde alt/üst yüzeyin yazdırılması için harcanan süreyi ve malzemeyi sınırlamaya yardımcı olabilir." - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink label" -msgid "Top Skin Removal Width" -msgstr "Üst Yüzey Kaldırma Genişliği" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink description" -msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." -msgstr "Kaldırılacak olan üst yüzey alanlarının en büyük genişliğidir. Bu değerden daha küçük olan her yüzey alanı kaybolacaktır. Bu, modeldeki eğimli yüzeylerde üst yüzeyin yazdırılması için harcanan süreyi ve malzemeyi sınırlamaya yardımcı olabilir." - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink label" -msgid "Bottom Skin Removal Width" -msgstr "Alt Yüzey Kaldırma Genişliği" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink description" -msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." -msgstr "Kaldırılacak olan alt yüzey alanlarının en büyük genişliğidir. Bu değerden daha küçük olan her yüzey alanı kaybolacaktır. Bu, modeldeki eğimli yüzeylerde alt yüzeyin yazdırılması için harcanan süreyi ve malzemeyi sınırlamaya yardımcı olabilir." - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance label" -msgid "Skin Expand Distance" -msgstr "Yüzey Genişleme Mesafesi" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance description" -msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." -msgstr "Yüzeylerin dolgunun içine doğru genişleyeceği mesafedir. Daha yüksek değerler, yüzeyin dolgu şekline daha iyi tutunmasını sağladığı gibi komşu katmanlardaki duvarların yüzeye daha iyi yapışmasını sağlar. Daha düşük değerler, kullanılan malzemenin miktarından tasarruf yapılmasını sağlar." - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance label" -msgid "Top Skin Expand Distance" -msgstr "Üst Yüzey Genişleme Mesafesi" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance description" -msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." -msgstr "Üst yüzeylerin dolgunun içine doğru genişleyeceği mesafedir. Daha yüksek değerler, yüzeyin dolgu şekline daha iyi tutunmasını sağladığı gibi yukarıdaki katmandaki duvarların yüzeye daha iyi yapışmasını sağlar. Daha düşük değerler, kullanılan malzemenin miktarından tasarruf yapılmasını sağlar." - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance label" -msgid "Bottom Skin Expand Distance" -msgstr "Alt Yüzey Genişleme Mesafesi" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance description" -msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." -msgstr "Alt yüzeylerin dolgunun içine doğru genişleyeceği mesafedir. Daha yüksek değerler, yüzeyin dolgu şekline daha iyi tutunmasını sağladığı gibi yüzeyin aşağıdaki katmandaki duvara daha iyi yapışmasını sağlar. Daha düşük değerler, kullanılan malzemenin miktarından tasarruf yapılmasını sağlar." - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion label" -msgid "Maximum Skin Angle for Expansion" -msgstr "Genişleme için Maksimum Yüzey Açısı" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion description" -msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." -msgstr "Nesnenizin bu ayardan daha geniş açıya sahip üst ve/veya alt zeminlerinin yüzeyleri genişletilmez. Böylece model yüzeyinin neredeyse dik açıya sahip olduğu durumlarda ortaya çıkan dar yüzey alanlarının genişletilmesi önlenmiş olur. 0°’lik bir açı yataydır; 90°’lik bir açı dikeydir." - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion label" -msgid "Minimum Skin Width for Expansion" -msgstr "Genişleme için Minimum Yüzey Genişliği" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion description" -msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." -msgstr "Bu değerden daha dar olan yüzey alanları genişletilmez. Böylece model yüzeyinin dikeye yakın bir eğime sahip olduğu durumlarda ortaya çıkan dar yüzey alanlarının genişletilmesi önlenmiş olur." - #: fdmprinter.def.json msgctxt "skin_edge_support_thickness label" msgid "Skin Edge Support Thickness" @@ -2560,8 +2590,8 @@ msgstr "İlk Katman Hızı" #: fdmprinter.def.json msgctxt "speed_layer_0 description" -msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." -msgstr "İlk katman için belirlenen hız. Yapı tahtasına yapışmayı artırmak için daha düşük bir değer önerilmektedir." +msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate. Does not affect the build plate adhesion structures themselves, like brim and raft." +msgstr "İlk katman için hız. Yapı plakasında yapışmayı iyileştirmek için düşük bir değer tavsiye edilir. Yapı plakasının kenar ve radye gibi yapışma yapılarını etkilemez." #: fdmprinter.def.json msgctxt "speed_print_layer_0 label" @@ -3170,8 +3200,9 @@ msgstr "Geri Çekmesiz Maks. Tarama Mesafesi" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" -msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." -msgstr "Sıfır olmadığında, bu mesafeden daha uzun tarama mesafelerinde geri çekme yapılır." +msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." +msgstr "Sıfırdan büyük olduğunda, bu mesafeden daha uzun tarama mesafelerinde geri çekme yapılır. Sıfıra ayarlandığında, bir maksimum belirlenmez ve tarama hareketlerinde" +" geri çekme kullanılmaz." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" @@ -5074,8 +5105,8 @@ msgstr "Örgü İşleme Sıralaması" #: fdmprinter.def.json msgctxt "infill_mesh_order description" -msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." -msgstr "Çakışan birden çok dolgu örgüsünü göz önüne alarak bu örgünün önceliğini belirler. Birden çok dolgu örgüsünün çakıştığı alanlar en düşük sıralamaya sahip örgünün ayarlarını alacaktır. Daha yüksek sıralamaya sahip dolgu örgüsü, dolgu örgülerinin dolgusunu daha düşük sıralı ve normal örgüler ile değiştirecektir." +msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the highest rank. An infill mesh with a higher rank will modify the infill of infill meshes with lower rank and normal meshes." +msgstr "Çakışan birden çok dolgu örgüsünü göz önüne alarak bu örgünün önceliğini belirler. Birden çok dolgu örgüsünün çakıştığı alanlar en yüksek sıralamaya sahip örgünün ayarlarını alacaktır. Daha yüksek sıralamaya sahip dolgu örgüsü, dolgu örgülerinin dolgusunu daha düşük sıralı ve normal örgüler ile değiştirecektir." #: fdmprinter.def.json msgctxt "cutting_mesh label" @@ -5422,6 +5453,16 @@ msgctxt "conical_overhang_angle description" msgid "The maximum angle of overhangs after the they have been made printable. At a value of 0° all overhangs are replaced by a piece of model connected to the build plate, 90° will not change the model in any way." msgstr "Yazdırılabilir yapıldıktan sonra çıkıntıların en büyük açısı. 0° değerindeyken tüm modeller yapı levhasına bağlı bir model parçasıyla değiştirilirken 90° modeli hiçbir şekilde değiştirmez." +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size label" +msgid "Maximum Overhang Hole Area" +msgstr "Maksimum Çıkıntı Deliği Alanı" + +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size description" +msgid "The maximum area of a hole in the base of the model before it's removed by Make Overhang Printable. Holes smaller than this will be retained. A value of 0 mm² will fill all holes in the models base." +msgstr "Çıkıntıyı Yazdırılabilir Yap işlemiyle çıkarılmadan önce modelin tabanındaki deliğin maksimum alanı. Bu değerden küçük delikler korunacaktır. 0 mm²'lik değer modellerin tabanındaki tüm delikleri dolduracaktır." + #: fdmprinter.def.json msgctxt "coasting_enable label" msgid "Enable Coasting" @@ -6361,6 +6402,30 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "Modeli dosyadan indirirken modele uygulanacak olan dönüşüm matrisi." +#~ msgctxt "retraction_combing_max_distance description" +#~ msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." +#~ msgstr "Sıfır olmadığında, bu mesafeden daha uzun tarama mesafelerinde geri çekme yapılır." + +#~ msgctxt "machine_use_extruder_offset_to_offset_coords description" +#~ msgid "Apply the extruder offset to the coordinate system." +#~ msgstr "Ekstruder ofsetini koordinat sistemine uygulayın." + +#~ msgctxt "shell label" +#~ msgid "Shell" +#~ msgstr "Kovan" + +#~ msgctxt "max_skin_angle_for_expansion description" +#~ msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." +#~ msgstr "Nesnenizin bu ayardan daha geniş açıya sahip üst ve/veya alt zeminlerinin yüzeyleri genişletilmez. Böylece model yüzeyinin neredeyse dik açıya sahip olduğu durumlarda ortaya çıkan dar yüzey alanlarının genişletilmesi önlenmiş olur. 0°’lik bir açı yataydır; 90°’lik bir açı dikeydir." + +#~ msgctxt "speed_layer_0 description" +#~ msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." +#~ msgstr "İlk katman için belirlenen hız. Yapı tahtasına yapışmayı artırmak için daha düşük bir değer önerilmektedir." + +#~ msgctxt "infill_mesh_order description" +#~ msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." +#~ msgstr "Çakışan birden çok dolgu örgüsünü göz önüne alarak bu örgünün önceliğini belirler. Birden çok dolgu örgüsünün çakıştığı alanlar en düşük sıralamaya sahip örgünün ayarlarını alacaktır. Daha yüksek sıralamaya sahip dolgu örgüsü, dolgu örgülerinin dolgusunu daha düşük sıralı ve normal örgüler ile değiştirecektir." + #~ msgctxt "material_bed_temperature description" #~ msgid "The temperature used for the heated build plate. If this is 0, the bed temperature will not be adjusted." #~ msgstr "Isınan yapı levhası için kullanılan sıcaklık. Bu değer 0 ise yatak sıcaklığı değiştirilmez." diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index e61f5663d9..6ef1643c6f 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -1,13 +1,13 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0200\n" -"PO-Revision-Date: 2020-08-21 13:40+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0200\n" +"PO-Revision-Date: 2021-04-16 15:04+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Chinese , PCDotFan , Chinese \n" "Language: zh_CN\n" @@ -15,12 +15,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.3\n" +"X-Generator: Poedit 2.4.1\n" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1581 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 msgctxt "@label" @@ -91,12 +91,12 @@ msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "草稿配置文件用于打印初始原型和概念验证，可大大缩短打印时间。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:226 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:234 msgctxt "@label" msgid "Custom Material" msgstr "自定义材料" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:227 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 msgctxt "@label" msgid "Custom" @@ -118,7 +118,7 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "所有文件 (*)" -#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:178 +#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:181 msgctxt "@info:title" msgid "Login failed" msgstr "登录失败" @@ -148,28 +148,33 @@ msgctxt "@info:title" msgid "Can't Find Location" msgstr "找不到位置" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:104 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:116 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "不能从用户数据目录创建存档: {}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:110 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 msgctxt "@info:title" msgid "Backup" msgstr "备份" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:123 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:135 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." msgstr "试图在没有适当数据或元数据的情况下恢复Cura备份。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:134 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:146 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that is higher than the current version." msgstr "尝试恢复的 Cura 备份版本高于当前版本。" +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 +msgctxt "@info:backup_failed" +msgid "The following error occurred while trying to restore a Cura backup:" +msgstr "尝试恢复 Cura 备份时出现以下错误：" + #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" msgid "The build volume height has been reduced due to the value of the \"Print Sequence\" setting to prevent the gantry from colliding with printed models." @@ -319,74 +324,74 @@ msgctxt "@action:button" msgid "Send report" msgstr "发送报告" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:521 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:527 msgctxt "@info:progress" msgid "Loading machines..." msgstr "正在载入打印机..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:528 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:534 msgctxt "@info:progress" msgid "Setting up preferences..." msgstr "正在设置偏好设置..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:657 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:672 msgctxt "@info:progress" msgid "Initializing Active Machine..." msgstr "正在初始化当前机器..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:803 msgctxt "@info:progress" msgid "Initializing machine manager..." msgstr "正在初始化机器管理器..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:802 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:817 msgctxt "@info:progress" msgid "Initializing build volume..." msgstr "正在初始化成形空间体积..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:870 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:888 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "正在设置场景..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:906 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:924 msgctxt "@info:progress" msgid "Loading interface..." msgstr "正在载入界面..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:911 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:929 msgctxt "@info:progress" msgid "Initializing engine..." msgstr "正在初始化引擎..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1221 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1246 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1777 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1799 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "一次只能加载一个 G-code 文件。{0} 已跳过导入" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1778 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:188 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 msgctxt "@info:title" msgid "Warning" msgstr "警告" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1787 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1809 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "如果加载 G-code，则无法打开其他任何文件。{0} 已跳过导入" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 @@ -409,7 +414,7 @@ msgctxt "@info:title" msgid "Placing Object" msgstr "放置模型" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:92 msgctxt "@message" msgid "Could not read response." msgstr "无法读取响应。" @@ -429,12 +434,12 @@ msgctxt "@message" msgid "Something unexpected happened when trying to log in, please try again." msgstr "尝试登录时出现意外情况，请重试。" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:187 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:189 msgctxt "@info" msgid "Unable to start a new sign in process. Check if another sign in attempt is still active." msgstr "无法开始新的登录过程。请检查是否仍在尝试进行另一登录。" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "无法连接 Ultimaker 帐户服务器。" @@ -452,8 +457,8 @@ msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "文件 {0} 已存在。您确定要覆盖它吗？" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:452 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:455 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "文件 URL 无效：" @@ -536,33 +541,33 @@ msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "配置 {0} 文件类型未知或已损坏。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:423 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:426 msgctxt "@label" msgid "Custom profile" msgstr "自定义配置文件" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:439 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:442 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "配置文件缺少打印质量类型定义。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:443 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:446 msgctxt "@info:status" -msgid "Global stack is missing." -msgstr "缺少全局堆栈。" +msgid "There is no active printer yet." +msgstr "尚无处于活动状态的打印机。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:449 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:452 msgctxt "@info:status" msgid "Unable to add the profile." msgstr "无法添加配置文件。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:463 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:466 #, python-brace-format msgctxt "@info:status" msgid "Quality type '{0}' is not compatible with the current active machine definition '{1}'." msgstr "质量类型“{0}”与当前有效的机器定义“{1}”不兼容。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:468 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:471 #, python-brace-format msgctxt "@info:status" msgid "Warning: The profile is not visible because its quality type '{0}' is not available for the current configuration. Switch to a material/nozzle combination that can use this quality type." @@ -578,23 +583,23 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:712 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 #: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 msgctxt "@label" msgid "Nozzle" msgstr "喷嘴" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:860 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:856 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "已根据挤出机的当前可用性更改设置：" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:862 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:858 msgctxt "@info:title" msgid "Settings updated" msgstr "设置已更新" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1447 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1478 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "挤出机已禁用" @@ -607,13 +612,13 @@ msgid "Add" msgstr "添加" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:263 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 msgctxt "@action:button" msgid "Finish" msgstr "完成" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 #: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 #: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 @@ -621,7 +626,7 @@ msgstr "完成" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 msgctxt "@action:button" msgid "Cancel" @@ -633,76 +638,83 @@ msgctxt "@label" msgid "Group #{group_nr}" msgstr "组 ＃{group_nr}" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "外壁" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "内壁" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "表层" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "填充" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "支撑填充" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "支撑接触面" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "支撑" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "Skirt" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 msgctxt "@tooltip" msgid "Prime Tower" msgstr "装填塔" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 msgctxt "@tooltip" msgid "Travel" msgstr "移动" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 msgctxt "@tooltip" msgid "Retractions" msgstr "回抽" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:94 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 msgctxt "@tooltip" msgid "Other" msgstr "其它" #: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 msgctxt "@action:button" msgid "Next" msgstr "下一步" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 +msgctxt "@action:button" +msgid "Skip" +msgstr "跳过" + +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 #: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:173 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 msgctxt "@action:button" msgid "Close" @@ -727,29 +739,36 @@ msgstr "" "

    找出如何确保最好的打印质量和可靠性.

    \n" "

    查看打印质量指南

    " -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:535 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:540 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "项目文件 {0} 包含未知机器类型 {1}。无法导入机器。将改为导入模型。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:538 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:543 msgctxt "@info:title" msgid "Open Project File" msgstr "打开项目文件" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:634 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:639 #, python-brace-format msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "突然无法访问项目文件 {0}：{1}。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:635 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "无法打开项目文件" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:686 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:646 +#, python-brace-format +msgctxt "@info:error Don't translate the XML tags or !" +msgid "Project file {0} is corrupt: {1}." +msgstr "项目文件 {0} 损坏: {1}。" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:698 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." @@ -787,7 +806,7 @@ msgctxt "@error:zip" msgid "The operating system does not allow saving a project file to this location or with this file name." msgstr "操作系统不允许向此位置或用此文件名保存项目文件。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:206 msgctxt "@error:zip" msgid "Error writing 3mf file." msgstr "写入 3mf 文件时出错。" @@ -842,8 +861,8 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "备份超过了最大文件大小。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:82 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:23 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "尝试恢复您的备份时出错。" @@ -853,45 +872,45 @@ msgctxt "@item:inmenu" msgid "Manage backups" msgstr "管理备份" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "无法使用当前材料进行切片，因为该材料与所选机器或配置不兼容。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:411 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:420 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:429 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 msgctxt "@info:title" msgid "Unable to slice" msgstr "无法切片" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:412 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "无法使用当前设置进行切片。以下设置存在错误：{0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:410 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:436 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "因部分特定模型设置而无法切片。 以下设置在一个或多个模型上存在错误： {error_labels}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:445 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "无法切片（原因：主塔或主位置无效）。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:428 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:454 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "无法切片，因为存在与已禁用挤出机 %s 相关联的对象。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:463 msgctxt "@info:status" msgid "" "Please review settings and check if your models:\n" @@ -1160,28 +1179,28 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "可移动磁盘" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:121 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:128 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled." msgstr "启用“单线打印”后，Cura 将无法准确地显示打印层。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:129 msgctxt "@info:title" msgid "Simulation View" msgstr "仿真视图" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:status" msgid "Nothing is shown because you need to slice first." msgstr "由于需要先切片，因此未显示任何内容。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:title" msgid "No layers to show" msgstr "无层可显示" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:124 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "不再显示此消息" @@ -1191,16 +1210,21 @@ msgctxt "@item:inlistbox" msgid "Layer view" msgstr "分层视图" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:70 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:71 msgctxt "@info:status" -msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." -msgstr "您的模型不是流形。突出显示的区域指示缺少或多余的表面。" +msgid "The highlighted areas indicate either missing or extraneous surfaces. Fix your model and open it again into Cura." +msgstr "突出显示的区域指示缺少或多余的表面。修复模型，并再次在 Cura 中打开。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 msgctxt "@info:title" -msgid "Model errors" +msgid "Model Errors" msgstr "模型错误" +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:79 +msgctxt "@action:button" +msgid "Learn more" +msgstr "详细了解" + #: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/__init__.py:12 msgctxt "@item:inmenu" msgid "Solid view" @@ -1227,7 +1251,7 @@ msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "检测到您的 Ultimaker 帐户有更改" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:145 msgctxt "@action:button" msgid "Sync" msgstr "同步" @@ -1263,7 +1287,7 @@ msgctxt "@info:generic" msgid "You need to quit and restart {} before changes have effect." msgstr "需要退出并重新启动 {}，然后更改才能生效。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:79 msgctxt "@info:generic" msgid "{} plugins failed to download" msgstr "{} 个插件下载失败" @@ -1304,7 +1328,11 @@ msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimaker 格式包" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "无法写入到 UFP 文件：" @@ -1319,22 +1347,22 @@ msgctxt "@action" msgid "Select upgrades" msgstr "选择升级" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:152 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 msgctxt "@action:button" msgid "Print via cloud" msgstr "通过云打印" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:155 msgctxt "@properties:tooltip" msgid "Print via cloud" msgstr "通过云打印" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:156 msgctxt "@info:status" msgid "Connected via cloud" msgstr "通过云连接" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:264 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:270 #, python-brace-format msgctxt "@error:send" msgid "Unknown error code when uploading print job: {0}" @@ -1430,14 +1458,18 @@ msgid "" msgid_plural "" "You are about to remove {0} printers from Cura. This action cannot be undone.\n" "Are you sure you want to continue?" -msgstr[0] "您即将从 Cura 中删除 {0} 台打印机。此操作无法撤消。\n是否确实要继续？" +msgstr[0] "" +"您即将从 Cura 中删除 {0} 台打印机。此操作无法撤消。\n" +"是否确实要继续？" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:468 msgctxt "@label" msgid "" "You are about to remove all printers from Cura. This action cannot be undone.\n" "Are you sure you want to continue?" -msgstr "您即将从 Cura 中删除所有打印机。此操作无法撤消。\n是否确定继续？" +msgstr "" +"您即将从 Cura 中删除所有打印机。此操作无法撤消。\n" +"是否确定继续？" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py:27 msgctxt "@info:status" @@ -1621,135 +1653,135 @@ msgctxt "@info:tooltip" msgid "Some things could be problematic in this print. Click to see tips for adjustment." msgstr "此次打印可能出现了某些问题。点击查看调整提示。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:15 msgctxt "@title:window" msgid "Open Project" msgstr "打开项目" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" msgstr "更新已有配置" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:63 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "新建" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "摘要 - Cura 项目" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 msgctxt "@action:label" msgid "Printer settings" msgstr "打印机设置" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:112 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:113 msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "机器的设置冲突应如何解决？" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:165 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 msgctxt "@action:label" msgid "Type" msgstr "类型" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:181 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 msgctxt "@action:label" msgid "Printer Group" msgstr "打印机组" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:203 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 msgctxt "@action:label" msgid "Profile settings" msgstr "配置文件设置" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:219 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:221 msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "配置文件中的冲突如何解决？" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:349 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 msgctxt "@action:label" msgid "Name" msgstr "名字" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:255 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 msgctxt "@action:label" msgid "Intent" msgstr "Intent" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:271 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Not in profile" msgstr "不在配置文件中" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:276 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 重写" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:287 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:290 msgctxt "@action:label" msgid "Derivative from" msgstr "衍生自" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:295 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 重写" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:309 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:312 msgctxt "@action:label" msgid "Material settings" msgstr "材料设置" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:328 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" msgstr "材料的设置冲突应如何解决？" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:369 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:373 msgctxt "@action:label" msgid "Setting visibility" msgstr "设置可见性" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:378 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:382 msgctxt "@action:label" msgid "Mode" msgstr "模式" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:label" msgid "Visible settings:" msgstr "可见设置：" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:399 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:403 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 / %2" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:425 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:429 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "加载项目将清除打印平台上的所有模型。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:457 msgctxt "@action:button" msgid "Open" msgstr "打开" @@ -1851,8 +1883,8 @@ msgstr "备份并同步您的 Cura 设置。" #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:68 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:125 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:199 msgctxt "@button" msgid "Sign in" msgstr "登录" @@ -2086,12 +2118,12 @@ msgctxt "@label" msgid "Cooling Fan Number" msgstr "冷却风扇数量" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:163 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "挤出机的开始 G-code" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:177 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "挤出机的结束 G-code" @@ -2176,12 +2208,17 @@ msgctxt "@label" msgid "Number of Extruders" msgstr "挤出机数目" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:345 +msgctxt "@label" +msgid "Apply Extruder offsets to GCode" +msgstr "将挤出器偏移量应用于 GCode" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:393 msgctxt "@title:label" msgid "Start G-code" msgstr "开始 G-code" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:385 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:404 msgctxt "@title:label" msgid "End G-code" msgstr "结束 G-code" @@ -2209,6 +2246,11 @@ msgctxt "@label link to technical assistance" msgid "View user manuals online" msgstr "查看联机用户手册" +#: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 +msgctxt "@info" +msgid "In order to monitor your print from Cura, please connect the printer." +msgstr "为了从 Cura 监控您的打印，请连接打印机。" + #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" msgid "Mesh Type" @@ -2255,7 +2297,7 @@ msgid "Select Settings to Customize for this model" msgstr "选择对此模型的自定义设置" #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 msgctxt "@label:textbox" msgid "Filter..." msgstr "筛选..." @@ -2265,32 +2307,32 @@ msgctxt "@label:checkbox" msgid "Show all" msgstr "显示全部" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:20 msgctxt "@title:window" msgid "Post Processing Plugin" msgstr "后期处理插件" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:59 msgctxt "@label" msgid "Post Processing Scripts" msgstr "后期处理脚本" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:235 msgctxt "@action" msgid "Add a script" msgstr "添加一个脚本" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:282 msgctxt "@label" msgid "Settings" msgstr "设置" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:499 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:502 msgctxt "@info:tooltip" msgid "Change active post-processing scripts." msgstr "更改处于活动状态的后期处理脚本。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:506 msgctxt "@info:tooltip" msgid "The following script is active:" msgid_plural "The following scripts are active:" @@ -2302,78 +2344,93 @@ msgctxt "@label" msgid "Color scheme" msgstr "颜色方案" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:110 msgctxt "@label:listbox" msgid "Material Color" msgstr "材料颜色" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:111 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:114 msgctxt "@label:listbox" msgid "Line Type" msgstr "走线类型" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:115 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:118 msgctxt "@label:listbox" msgid "Speed" msgstr "速度" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:122 msgctxt "@label:listbox" -msgid "Layer thickness" +msgid "Layer Thickness" msgstr "层厚度" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:126 +msgctxt "@label:listbox" +msgid "Line Width" +msgstr "走线宽度" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 +msgctxt "@label:listbox" +msgid "Flow" +msgstr "流量" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" msgid "Compatibility Mode" msgstr "兼容模式" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:230 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:245 msgctxt "@label" msgid "Travels" msgstr "空驶" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:251 msgctxt "@label" msgid "Helpers" msgstr "打印辅助结构" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:257 msgctxt "@label" msgid "Shell" msgstr "外壳" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:248 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 msgctxt "@label" msgid "Infill" msgstr "填充" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:298 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:271 +msgctxt "@label" +msgid "Starts" +msgstr "开始" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 msgctxt "@label" msgid "Only Show Top Layers" msgstr "只显示顶层" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:308 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:332 msgctxt "@label" msgid "Show 5 Detailed Layers On Top" msgstr "在顶部显示 5 层打印细节" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:346 msgctxt "@label" msgid "Top / Bottom" msgstr "顶 / 底层" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:350 msgctxt "@label" msgid "Inner Wall" msgstr "内壁" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:384 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:419 msgctxt "@label" msgid "min" msgstr "最小" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:433 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:488 msgctxt "@label" msgid "max" msgstr "最大" @@ -2514,7 +2571,7 @@ msgid "Plugins" msgstr "插件" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 msgctxt "@title:tab" msgid "Materials" @@ -2563,6 +2620,7 @@ msgstr "解除" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:178 msgctxt "@button" msgid "Next" msgstr "下一步" @@ -2905,7 +2963,7 @@ msgid "Delete" msgstr "删除" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:289 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 msgctxt "@label" msgid "Resume" msgstr "恢复" @@ -2921,8 +2979,8 @@ msgid "Resuming..." msgstr "正在恢复..." #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 msgctxt "@label" msgid "Pause" msgstr "暂停" @@ -2963,7 +3021,7 @@ msgid "Are you sure you want to abort %1?" msgstr "您确定要中止 %1 吗？" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 msgctxt "@window:title" msgid "Abort print" msgstr "中止打印" @@ -2974,7 +3032,7 @@ msgid "Manage printer" msgstr "管理打印机" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." @@ -3000,27 +3058,34 @@ msgctxt "@label:status" msgid "Idle" msgstr "空闲" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:365 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +msgctxt "@label:status" +msgid "Preparing..." +msgstr "正在准备..." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:369 msgctxt "@label:status" msgid "Printing" msgstr "打印" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:406 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:410 msgctxt "@label" msgid "Untitled" msgstr "未命名" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:431 msgctxt "@label" msgid "Anonymous" msgstr "匿名" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:458 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "需要更改配置" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:492 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:496 msgctxt "@action:button" msgid "Details" msgstr "详细信息" @@ -3047,12 +3112,6 @@ msgctxt "@label:status" msgid "Finished" msgstr "已完成" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -msgctxt "@label:status" -msgid "Preparing..." -msgstr "正在准备..." - #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." @@ -3133,27 +3192,27 @@ msgctxt "@action:button" msgid "Sign in" msgstr "登录" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" -msgid "Your key to connected 3D printing" -msgstr "互连 3D 打印的特点" +msgid "Sign in to the Ultimaker platform" +msgstr "登录 Ultimaker 平台" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:42 msgctxt "@text" msgid "" -"- Customize your experience with more print profiles and plugins\n" -"- Stay flexible by syncing your setup and loading it anywhere\n" -"- Increase efficiency with a remote workflow on Ultimaker printers" +"- Add material profiles and plug-ins from the Marketplace\n" +"- Back-up and sync your material profiles and plug-ins\n" +"- Share ideas and get help from 48,000+ users in the Ultimaker community" msgstr "" -"- 借助更多的打印配置文件和插件定制您的体验\n" -"- 通过同步设置并将其加载到任何位置保持灵活性\n" -"- 使用 Ultimaker 打印机上的远程工作流提高效率" +"- 从 Marketplace 添加材料配置文件和插件\n" +"- 备份和同步材料配置文件和插件\n" +"- 在 Ultimaker 社区分享观点并获取 48,000 多名用户的帮助" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:142 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:62 msgctxt "@button" -msgid "Create account" -msgstr "创建账户" +msgid "Create a free Ultimaker account" +msgstr "创建免费的 Ultimaker 帐户" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/SyncState.qml:28 msgctxt "@label" @@ -3260,306 +3319,308 @@ msgctxt "@button" msgid "Cancel" msgstr "取消" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:83 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "显示联机故障排除指南" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:90 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "切换完整界面" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:98 msgctxt "@action:inmenu" msgid "Exit Full Screen" msgstr "退出完整界面" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:105 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "撤销(&U)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:115 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "重做(&R)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:125 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "退出(&Q)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:132 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:133 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "3D 视图" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:140 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "正视图" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:147 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "顶视图" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 +msgctxt "@action:inmenu menubar:view" +msgid "Bottom View" +msgstr "仰视图" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "左视图" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:160 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:168 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "右视图" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:175 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "配置 Cura..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:182 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "新增打印机(&A)..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:180 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:188 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "管理打印机(&I)..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:187 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu" msgid "Manage Materials..." msgstr "管理材料..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:203 msgctxt "@action:inmenu" msgid "Add more materials from Marketplace" msgstr "从市场添加更多材料" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "使用当前设置 / 重写值更新配置文件（&U）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "舍弃当前更改（&D）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:222 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:230 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "从当前设置 / 重写值创建配置文件（&C）..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "管理配置文件.." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "显示在线文档(&D)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "BUG 反馈(&B)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:260 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "新增功能" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:266 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "关于..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:273 msgctxt "@action:inmenu menubar:edit" -msgid "Delete Selected Model" -msgid_plural "Delete Selected Models" -msgstr[0] "删除所选模型" +msgid "Delete Selected" +msgstr "删除所选项" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:283 msgctxt "@action:inmenu menubar:edit" -msgid "Center Selected Model" -msgid_plural "Center Selected Models" -msgstr[0] "居中所选模型" +msgid "Center Selected" +msgstr "居中所选项" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:292 msgctxt "@action:inmenu menubar:edit" -msgid "Multiply Selected Model" -msgid_plural "Multiply Selected Models" -msgstr[0] "复制所选模型" +msgid "Multiply Selected" +msgstr "复制所选项" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "删除模型" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:309 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "使模型居于平台中央（&N）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:307 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "绑定模型（&G）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:327 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:335 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "拆分模型" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:345 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "合并模型（&M）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:347 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:355 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "复制模型…（&M）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:362 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "选择所有模型" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:372 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "清空打印平台" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:382 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "重新载入所有模型" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "将所有模型编位到所有打印平台" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:390 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "编位所有的模型" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:406 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "为所选模型编位" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:405 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:413 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "复位所有模型的位置" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:412 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "复位所有模型的变动" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:419 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:429 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "打开文件（&O）..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:439 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "新建项目（&N）..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:434 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:446 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "显示配置文件夹" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:441 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:538 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "配置设定可见性..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:448 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:460 msgctxt "@action:menu" msgid "&Marketplace" msgstr "市场(&M)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:257 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "这个包将在重新启动后安装。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 msgctxt "@title:tab" msgid "General" msgstr "基本" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:462 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:453 msgctxt "@title:tab" msgid "Settings" msgstr "设置" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:464 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 msgctxt "@title:tab" msgid "Printers" msgstr "打印机" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 msgctxt "@title:tab" msgid "Profiles" msgstr "配置文件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:576 msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "正在关闭 %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:588 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "您确定要退出 %1 吗？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:638 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "打开文件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:744 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:737 msgctxt "@window:title" msgid "Install Package" msgstr "安装包" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:752 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:745 msgctxt "@title:window" msgid "Open File(s)" msgstr "打开文件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:755 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:748 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "我们已经在您选择的文件中找到一个或多个 G-Code 文件。您一次只能打开一个 G-Code 文件。若需打开 G-Code 文件，请仅选择一个。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:858 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:857 msgctxt "@title:window" msgid "Add Printer" msgstr "新增打印机" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:866 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:865 msgctxt "@title:window" msgid "What's New" msgstr "新增功能" @@ -3709,17 +3770,27 @@ msgctxt "@label" msgid "Python bindings for libnest2d" msgstr "libnest2d 的 Python 绑定" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +msgctxt "@label" +msgid "Support library for system keyring access" +msgstr "支持系统密钥环访问库" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" +msgid "Python extensions for Microsoft Windows" +msgstr "适用于 Microsoft Windows 的 Python 扩展" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +msgctxt "@label" msgid "Font" msgstr "字体" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 msgctxt "@label" msgid "SVG icons" msgstr "SVG 图标" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:165 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Linux 交叉分布应用程序部署" @@ -3729,22 +3800,22 @@ msgctxt "@title:window" msgid "Open project file" msgstr "打开项目文件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:88 msgctxt "@text:window" msgid "This is a Cura project file. Would you like to open it as a project or import the models from it?" msgstr "这是一个 Cura 项目文件。您想将其作为一个项目打开还是从中导入模型？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:98 msgctxt "@text:window" msgid "Remember my choice" msgstr "记住我的选择" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:122 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:117 msgctxt "@action:button" msgid "Open as project" msgstr "作为项目打开" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:131 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:126 msgctxt "@action:button" msgid "Import models" msgstr "导入模型" @@ -3760,7 +3831,10 @@ msgid "" "You have customized some profile settings.\n" "Would you like to Keep these changed settings after switching profiles?\n" "Alternatively, you can discard the changes to load the defaults from '%1'." -msgstr "您已经自定义了若干配置文件设置。\n是否要在切换配置文件后保留这些更改的设置？\n或者，也可舍弃更改以从“%1”加载默认值。" +msgstr "" +"您已经自定义了若干配置文件设置。\n" +"是否要在切换配置文件后保留这些更改的设置？\n" +"或者，也可舍弃更改以从“%1”加载默认值。" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:111 msgctxt "@title:column" @@ -3773,7 +3847,7 @@ msgid "Current changes" msgstr "当前更改" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "总是询问" @@ -3798,12 +3872,12 @@ msgctxt "@action:button" msgid "Keep changes" msgstr "保留更改" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 msgctxt "@text:window" msgid "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?" msgstr "我们已经在您所选择的文件中找到一个或多个项目文件，但一次只能打开一个项目文件。我们建议只从那些文件中导入模型而不打开项目。您要继续操作吗?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:99 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:94 msgctxt "@action:button" msgid "Import all as models" msgstr "导入所有模型" @@ -3957,7 +4031,7 @@ msgctxt "@label" msgid "Material" msgstr "材料" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:407 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." msgstr "用胶粘和此材料组合以产生更好的附着。" @@ -3979,17 +4053,17 @@ msgctxt "@label" msgid "Number of Copies" msgstr "复制个数" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:33 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:41 msgctxt "@title:menu menubar:file" msgid "&Save Project..." msgstr "保存项目(＆S)..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:54 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:74 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "导出(&E)..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:85 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "导出选择..." @@ -4009,6 +4083,11 @@ msgctxt "@label:category menu label" msgid "Generic" msgstr "通用" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/OpenFilesMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Open File(s)..." +msgstr "打开文件..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -4024,6 +4103,11 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "打开最近使用过的文件(&R)" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SaveProjectMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Save Project..." +msgstr "保存项目..." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:15 msgctxt "@title:menu menubar:settings" msgid "&Printer" @@ -4049,17 +4133,17 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "禁用挤出机" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:16 msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "可见设置" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:45 msgctxt "@action:inmenu" msgid "Collapse All Categories" msgstr "折叠所有类别" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "管理设置可见性..." @@ -4069,22 +4153,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "摄像头位置(&C)" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:45 msgctxt "@action:inmenu menubar:view" msgid "Camera view" msgstr "摄像头视图" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:48 msgctxt "@action:inmenu menubar:view" msgid "Perspective" msgstr "透视" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:60 msgctxt "@action:inmenu menubar:view" msgid "Orthographic" msgstr "正交" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:81 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "打印平台(&B)" @@ -4129,12 +4213,12 @@ msgctxt "@label:MonitorStatus" msgid "Please remove the print" msgstr "请取出打印件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@label" msgid "Abort Print" msgstr "中止打印" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:338 msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "您确定要中止打印吗？" @@ -4175,301 +4259,301 @@ msgctxt "@label" msgid "Interface" msgstr "接口" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:216 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:209 msgctxt "@label" msgid "Currency:" msgstr "币种：" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:229 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:222 msgctxt "@label" msgid "Theme:" msgstr "主题：" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "需重新启动 Cura，新的设置才能生效。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:284 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "当设置被更改时自动进行切片。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 msgctxt "@option:check" msgid "Slice automatically" msgstr "自动切片" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:306 msgctxt "@label" msgid "Viewport behavior" msgstr "视区行为" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:314 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "以红色突出显示模型需要增加支撑结构的区域。没有支撑，这些区域将无法正确打印。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:323 msgctxt "@option:check" msgid "Display overhang" msgstr "显示悬垂（Overhang）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:351 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@info:tooltip" msgid "Highlight missing or extraneous surfaces of the model using warning signs. The toolpaths will often be missing parts of the intended geometry." msgstr "使用警告标志突出显示模型缺少或多余的表面。刀具路径常常是要打印的几何结构缺少的部分。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:342 msgctxt "@option:check" msgid "Display model errors" msgstr "显示模型错误" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "当模型被选中时，视角将自动调整到最合适的观察位置（模型处于正中央）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:373 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "当项目被选中时，自动对中视角" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "需要令 Cura 的默认缩放操作反转吗？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:388 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "反转视角变焦方向。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "是否跟随鼠标方向进行缩放？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "正交透视不支持通过鼠标进行缩放。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:409 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "跟随鼠标方向缩放" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:435 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:417 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "需要移动平台上的模型，使它们不再相交吗？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:440 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:422 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "确保每个模型都保持分离" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:431 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "需要转动模型，使它们接触打印平台吗？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:436 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "自动下降模型到打印平台" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:448 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "在 G-code 读取器中显示警告信息。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:457 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "G-code 读取器中的警告信息" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "层视图要强制进入兼容模式吗？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "强制层视图兼容模式（需要重新启动）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:498 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" msgstr "Cura 是否应该在关闭的位置打开？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:485 msgctxt "@option:check" msgid "Restore window position on start" msgstr "恢复初始窗口位置" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:513 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "应使用哪种类型的摄像头进行渲染？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:502 msgctxt "@window:text" msgid "Camera rendering:" msgstr "摄像头渲染：" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:531 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:509 msgid "Perspective" msgstr "透视" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:532 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgid "Orthographic" msgstr "正交" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:563 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:548 msgctxt "@label" msgid "Opening and saving files" msgstr "打开并保存文件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:555 msgctxt "@info:tooltip" msgid "Should opening files from the desktop or external applications open in the same instance of Cura?" msgstr "应从桌面打开文件还是在同一 Cura 实例中打开外部应用程序？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@option:check" msgid "Use a single instance of Cura" msgstr "使用单个 Cura 实例" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "当模型的尺寸过大时，是否将模型自动缩小至成形空间体积？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@option:check" msgid "Scale large models" msgstr "缩小过大模型" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "当模型以米而不是毫米为单位时，模型可能会在打印平台中显得非常小。在此情况下是否进行放大？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "放大过小模型" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "模型是否应该在加载后被选中？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@option:check" msgid "Select models when loaded" msgstr "选择模型时加载" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "打印机名是否自动作为打印作业名称的前缀？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:635 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "将机器前缀添加到作业名称中" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:645 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "保存项目文件时是否显示摘要？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:649 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:634 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "保存项目时显示摘要对话框" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:659 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:644 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "打开项目文件时的默认行为" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:652 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "打开项目文件时的默认行为： " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "总是询问" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:682 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "始终作为一个项目打开" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:668 msgctxt "@option:openProject" msgid "Always import models" msgstr "始终导入模型" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:705 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "当您对配置文件进行更改并切换到其他配置文件时将显示一个对话框，询问您是否要保留修改。您也可以选择一个默认行为并令其不再显示该对话框。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:728 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "配置文件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "切换到不同配置文件时对设置值更改的默认操作： " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:748 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:734 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "总是舍失更改的设置" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:749 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:735 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "总是将更改的设置传输至新配置文件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:783 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@label" msgid "Privacy" msgstr "隐私" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:790 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:777 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "当 Cura 启动时，是否自动检查更新？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:795 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:782 msgctxt "@option:check" msgid "Check for updates on start" msgstr "启动时检查更新" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:805 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:792 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "您愿意将关于您的打印数据以匿名形式发送到 Ultimaker 吗？注意：我们不会记录/发送任何模型、IP 地址或其他私人数据。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:810 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:797 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "（匿名）发送打印信息" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:819 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:806 msgctxt "@action:button" msgid "More information" msgstr "详细信息" @@ -4509,55 +4593,65 @@ msgctxt "@action:button" msgid "Export" msgstr "导出" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 +msgctxt "@action:button Sending materials to printers" +msgid "Sync with Printers" +msgstr "与打印机同步" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" msgid "Printer" msgstr "打印机" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:298 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 msgctxt "@title:window" msgid "Confirm Remove" msgstr "确认删除" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:301 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "您确认要删除 %1？该操作无法恢复！" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 msgctxt "@title:window" msgid "Import Material" msgstr "导入配置" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:338 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" msgstr "无法导入材料 %1： %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:328 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:342 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "成功导入材料 %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:346 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 msgctxt "@title:window" msgid "Export Material" msgstr "导出材料" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:358 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:372 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" msgstr "无法导出材料至 %1： %2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:378 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" msgstr "成功导出材料至： %1" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 +msgctxt "@title:window" +msgid "Export All Materials" +msgstr "导出所有材料" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" msgid "Information" @@ -4669,53 +4763,53 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "请为此配置文件提供名称。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "复制配置文件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@title:window" msgid "Rename Profile" msgstr "重命名配置文件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:307 msgctxt "@title:window" msgid "Import Profile" msgstr "导入配置文件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:336 msgctxt "@title:window" msgid "Export Profile" msgstr "导出配置文件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:399 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "打印机：%1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:557 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "使用当前设置 / 重写值更新配置文件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 msgctxt "@action:button" msgid "Discard current changes" msgstr "舍弃当前更改" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:583 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "此配置文件使用打印机指定的默认值，因此在下面的列表中没有此设置项。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:591 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "您当前的设置与选定的配置文件相匹配。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:609 msgctxt "@title:tab" msgid "Global Settings" msgstr "全局设置" @@ -4745,12 +4839,12 @@ msgctxt "@title:column" msgid "Unit" msgstr "单位" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:16 msgctxt "@title:tab" msgid "Setting Visibility" msgstr "设置可见性" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:48 msgctxt "@label:textbox" msgid "Check all" msgstr "全部勾选" @@ -5087,27 +5181,27 @@ msgctxt "@label:textbox" msgid "Search settings" msgstr "搜索设置" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:456 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:468 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "将值复制到所有挤出机" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:477 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "将所有修改值复制到所有挤出机" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:502 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:514 msgctxt "@action:menu" msgid "Hide this setting" msgstr "隐藏此设置" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:515 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:527 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "不再显示此设置" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:531 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "保持此设置可见" @@ -5167,11 +5261,6 @@ msgctxt "@button" msgid "Add printer manually" msgstr "手动添加打印机" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddCloudPrintersView.qml:218 -msgctxt "@button" -msgid "Finish" -msgstr "完成" - #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:230 msgctxt "@label" msgid "Manufacturer" @@ -5278,32 +5367,32 @@ msgctxt "@button" msgid "Connect" msgstr "连接" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:43 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" -msgid "Ultimaker Account" -msgstr "Ultimaker 帐户" +msgid "Release Notes" +msgstr "版本说明" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:124 msgctxt "@text" -msgid "Your key to connected 3D printing" -msgstr "互连 3D 打印的特点" +msgid "Add material settings and plugins from the Marketplace" +msgstr "从 Marketplace 添加材料设置和插件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:101 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:154 msgctxt "@text" -msgid "- Customize your experience with more print profiles and plugins" -msgstr "- 借助更多的打印配置文件和插件定制您的体验" +msgid "Backup and sync your material settings and plugins" +msgstr "备份和同步材料设置和插件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:184 msgctxt "@text" -msgid "- Stay flexible by syncing your setup and loading it anywhere" -msgstr "- 通过同步设置并将其加载到任何位置保持灵活性" +msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" +msgstr "在 Ultimaker 社区分享观点并获取 48,000 多名用户的帮助" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:217 msgctxt "@text" -msgid "- Increase efficiency with a remote workflow on Ultimaker printers" -msgstr "- 使用 Ultimaker 打印机上的远程工作流提高效率" +msgid "Create a free Ultimaker Account" +msgstr "创建免费的 Ultimaker 帐户" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:230 msgctxt "@button" msgid "Skip" msgstr "跳过" @@ -5363,29 +5452,32 @@ msgctxt "@button" msgid "Decline and close" msgstr "拒绝并关闭" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:29 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" msgid "Welcome to Ultimaker Cura" msgstr "欢迎使用 Ultimaker Cura" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:68 msgctxt "@text" -msgid "" -"Please follow these steps to set up\n" -"Ultimaker Cura. This will only take a few moments." +msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." msgstr "" "请按照以下步骤设置\n" "Ultimaker Cura。此操作只需要几分钟时间。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:86 msgctxt "@button" msgid "Get started" msgstr "开始" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:28 msgctxt "@label" -msgid "What's new in Ultimaker Cura" -msgstr "Ultimaker Cura 新增功能" +msgid "What's New" +msgstr "新增功能" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Widgets/ComboBox.qml:24 +msgctxt "@label" +msgid "No items to select from" +msgstr "没有可供选择的项目" #: ModelChecker/plugin.json msgctxt "description" @@ -5467,6 +5559,16 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura 配置文件写入器" +#: DigitalLibrary/plugin.json +msgctxt "description" +msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." +msgstr "连接到 Digital Library，以允许 Cura 从 Digital Library 打开文件并将文件保存到其中。" + +#: DigitalLibrary/plugin.json +msgctxt "name" +msgid "Ultimaker Digital Library" +msgstr "Ultimaker Digital Library" + #: FirmwareUpdateChecker/plugin.json msgctxt "description" msgid "Checks for firmware updates." @@ -5937,6 +6039,26 @@ msgctxt "name" msgid "Version Upgrade 4.7 to 4.8" msgstr "将版本从 4.7 升级到 4.8" +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." +msgstr "将配置从 Cura 4.8 升级到 Cura 4.9。" + +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.8 to 4.9" +msgstr "版本从 4.8 升级到 4.9" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." +msgstr "将配置从 Cura 4.9 升级到 Cura 4.10。" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.9 to 4.10" +msgstr "版本从 4.9 升级到 4.10" + #: X3DReader/plugin.json msgctxt "description" msgid "Provides support for reading X3D files." @@ -5967,6 +6089,91 @@ msgctxt "name" msgid "X-Ray View" msgstr "透视视图" +#~ msgctxt "@info:status" +#~ msgid "Global stack is missing." +#~ msgstr "缺少全局堆栈。" + +#~ msgctxt "@info:status" +#~ msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." +#~ msgstr "您的模型不是流形。突出显示的区域指示缺少或多余的表面。" + +#~ msgctxt "@info:title" +#~ msgid "Model errors" +#~ msgstr "模型错误" + +#~ msgctxt "@label:listbox" +#~ msgid "Layer thickness" +#~ msgstr "层厚度" + +#~ msgctxt "@label" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "互连 3D 打印的特点" + +#~ msgctxt "@text" +#~ msgid "" +#~ "- Customize your experience with more print profiles and plugins\n" +#~ "- Stay flexible by syncing your setup and loading it anywhere\n" +#~ "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "" +#~ "- 借助更多的打印配置文件和插件定制您的体验\n" +#~ "- 通过同步设置并将其加载到任何位置保持灵活性\n" +#~ "- 使用 Ultimaker 打印机上的远程工作流提高效率" + +#~ msgctxt "@button" +#~ msgid "Create account" +#~ msgstr "创建账户" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Delete Selected Model" +#~ msgid_plural "Delete Selected Models" +#~ msgstr[0] "删除所选模型" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Center Selected Model" +#~ msgid_plural "Center Selected Models" +#~ msgstr[0] "居中所选模型" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Multiply Selected Model" +#~ msgid_plural "Multiply Selected Models" +#~ msgstr[0] "复制所选模型" + +#~ msgctxt "@button" +#~ msgid "Finish" +#~ msgstr "完成" + +#~ msgctxt "@label" +#~ msgid "Ultimaker Account" +#~ msgstr "Ultimaker 帐户" + +#~ msgctxt "@text" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "互连 3D 打印的特点" + +#~ msgctxt "@text" +#~ msgid "- Customize your experience with more print profiles and plugins" +#~ msgstr "- 借助更多的打印配置文件和插件定制您的体验" + +#~ msgctxt "@text" +#~ msgid "- Stay flexible by syncing your setup and loading it anywhere" +#~ msgstr "- 通过同步设置并将其加载到任何位置保持灵活性" + +#~ msgctxt "@text" +#~ msgid "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "- 使用 Ultimaker 打印机上的远程工作流提高效率" + +#~ msgctxt "@text" +#~ msgid "" +#~ "Please follow these steps to set up\n" +#~ "Ultimaker Cura. This will only take a few moments." +#~ msgstr "" +#~ "请按照以下步骤设置\n" +#~ "Ultimaker Cura。此操作只需要几分钟时间。" + +#~ msgctxt "@label" +#~ msgid "What's new in Ultimaker Cura" +#~ msgstr "Ultimaker Cura 新增功能" + #~ msgctxt "@label ({} is object name)" #~ msgid "Are you sure you wish to remove {}? This cannot be undone!" #~ msgstr "是否确实要删除 {}？此操作无法撤消！" diff --git a/resources/i18n/zh_CN/fdmextruder.def.json.po b/resources/i18n/zh_CN/fdmextruder.def.json.po index f75b2d93f1..01edc05a49 100644 --- a/resources/i18n/zh_CN/fdmextruder.def.json.po +++ b/resources/i18n/zh_CN/fdmextruder.def.json.po @@ -1,12 +1,12 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" "PO-Revision-Date: 2019-03-13 14:00+0200\n" "Last-Translator: Bothof \n" "Language-Team: PCDotFan , Bothof \n" diff --git a/resources/i18n/zh_CN/fdmprinter.def.json.po b/resources/i18n/zh_CN/fdmprinter.def.json.po index 0e1d82a9b4..5ab5e2533b 100644 --- a/resources/i18n/zh_CN/fdmprinter.def.json.po +++ b/resources/i18n/zh_CN/fdmprinter.def.json.po @@ -1,20 +1,20 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2020-08-21 13:40+0200\n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 15:04+0200\n" "Last-Translator: Lionbridge \n" "Language-Team: Chinese , PCDotFan , Chinese \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2.1\n" +"X-Generator: Poedit 2.4.1\n" "Plural-Forms: nplurals=1; plural=0;\n" #: fdmprinter.def.json @@ -420,6 +420,26 @@ msgctxt "machine_extruders_share_heater description" msgid "Whether the extruders share a single heater rather than each extruder having its own heater." msgstr "挤出器是否共用一个加热器，而不是每个挤出器都有自己的加热器。" +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle label" +msgid "Extruders Share Nozzle" +msgstr "挤出器共用喷嘴" + +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle description" +msgid "Whether the extruders share a single nozzle rather than each extruder having its own nozzle. When set to true, it is expected that the printer-start gcode script properly sets up all extruders in an initial retraction state that is known and mutually compatible (either zero or one filament not retracted); in that case the initial retraction status is described, per extruder, by the 'machine_extruders_shared_nozzle_initial_retraction' parameter." +msgstr "挤出器是否共用一个喷嘴，而不是每个挤出器都有自己的喷嘴。当设置为 true 时，预计打印机启动 gcode 脚本会将所有挤出器正确设置为已知且相互兼容的初始缩回状态 (零根或一根细丝未缩回)；在这种情况下，会通过“machine_extruders_shared_nozzle_initial_retraction”参数描述每个挤出器的初始缩回状态。" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction label" +msgid "Shared Nozzle Initial Retraction" +msgstr "共用喷嘴初始缩回" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction description" +msgid "How much the filament of each extruder is assumed to have been retracted from the shared nozzle tip at the completion of the printer-start gcode script; the value should be equal to or greater than the length of the common part of the nozzle's ducts." +msgstr "假定在打印机启动 gcode 脚本完成后，每个挤出器的细丝从共用喷嘴头缩回多少；该值应等于或大于喷嘴导管公共部分的长度。" + #: fdmprinter.def.json msgctxt "machine_disallowed_areas label" msgid "Disallowed Areas" @@ -487,8 +507,8 @@ msgstr "挤出机偏移量" #: fdmprinter.def.json msgctxt "machine_use_extruder_offset_to_offset_coords description" -msgid "Apply the extruder offset to the coordinate system." -msgstr "将挤出机偏移量应用到坐标轴系统。" +msgid "Apply the extruder offset to the coordinate system. Affects all extruders." +msgstr "将挤出器偏移量应用到坐标轴系统。影响所有挤出器。" #: fdmprinter.def.json msgctxt "extruder_prime_pos_z label" @@ -882,8 +902,8 @@ msgstr "第一层走线宽度乘数。 增大此乘数可改善热床粘着。" #: fdmprinter.def.json msgctxt "shell label" -msgid "Shell" -msgstr "外壳" +msgid "Walls" +msgstr "墙" #: fdmprinter.def.json msgctxt "shell description" @@ -950,166 +970,6 @@ msgctxt "wall_0_wipe_dist description" msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better." msgstr "插入外壁后的空驶距离，旨在更好地隐藏 Z 缝。" -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr label" -msgid "Top Surface Skin Extruder" -msgstr "顶部皮肤挤出机" - -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr description" -msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." -msgstr "用于打印最顶部皮肤的挤出机组。 用于多重挤出。" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count label" -msgid "Top Surface Skin Layers" -msgstr "顶部表面皮肤层" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count description" -msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." -msgstr "最顶部皮肤层数。 通常只需一层最顶层就足以生成较高质量的顶部表面。" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr label" -msgid "Top/Bottom Extruder" -msgstr "顶部/底部挤出机" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr description" -msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." -msgstr "用于打印顶部和底部皮肤的挤出机组。 用于多重挤出。" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness label" -msgid "Top/Bottom Thickness" -msgstr "顶层 / 底层厚度" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness description" -msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." -msgstr "打印品中顶层/底层的厚度。 该值除以层高定义顶层/底层的数量。" - -#: fdmprinter.def.json -msgctxt "top_thickness label" -msgid "Top Thickness" -msgstr "顶层厚度" - -#: fdmprinter.def.json -msgctxt "top_thickness description" -msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." -msgstr "打印品中顶层的厚度。 该值除以层高定义顶层的数量。" - -#: fdmprinter.def.json -msgctxt "top_layers label" -msgid "Top Layers" -msgstr "顶部层数" - -#: fdmprinter.def.json -msgctxt "top_layers description" -msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." -msgstr "顶层的数量。 在按顶层厚度计算时，该值舍入为整数。" - -#: fdmprinter.def.json -msgctxt "bottom_thickness label" -msgid "Bottom Thickness" -msgstr "底层厚度" - -#: fdmprinter.def.json -msgctxt "bottom_thickness description" -msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." -msgstr "打印品中底层的厚度。 此值除以层高定义底层数量。" - -#: fdmprinter.def.json -msgctxt "bottom_layers label" -msgid "Bottom Layers" -msgstr "底部层数" - -#: fdmprinter.def.json -msgctxt "bottom_layers description" -msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "底层的数量。 在按底层厚度计算时，该值舍入为整数。" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers label" -msgid "Initial Bottom Layers" -msgstr "初始底层数" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers description" -msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "从构建板向上算起的初始底层数。在按底层厚度计算时，该值四舍五入为整数。" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern label" -msgid "Top/Bottom Pattern" -msgstr "顶部 / 底部走线图案" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern description" -msgid "The pattern of the top/bottom layers." -msgstr "顶层/底层图案。" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option lines" -msgid "Lines" -msgstr "直线" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option concentric" -msgid "Concentric" -msgstr "同心圆" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option zigzag" -msgid "Zig Zag" -msgstr "锯齿状" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 label" -msgid "Bottom Pattern Initial Layer" -msgstr "底层图案起始层" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 description" -msgid "The pattern on the bottom of the print on the first layer." -msgstr "打印品底部第一层上的图案。" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option lines" -msgid "Lines" -msgstr "直线" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option concentric" -msgid "Concentric" -msgstr "同心圆" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option zigzag" -msgid "Zig Zag" -msgstr "锯齿状" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons label" -msgid "Connect Top/Bottom Polygons" -msgstr "连接顶部/底部多边形" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." -msgstr "在顶部/底部皮肤路径互相紧靠运行的地方连接它们。对于同心图案，启用此设置可大大减少空驶时间，但由于连接可在填充中途发生，此功能可能会降低顶部表面质量。" - -#: fdmprinter.def.json -msgctxt "skin_angles label" -msgid "Top/Bottom Line Directions" -msgstr "顶层/底层走线方向" - -#: fdmprinter.def.json -msgctxt "skin_angles description" -msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." -msgstr "当顶层/底层采用线条或锯齿状图案时使用的整数走线方向的列表。 列表中的元素随层的进度依次使用，当达到列表末尾时，它将从头开始。 列表项以逗号分隔，整个列表包含在方括号中。 默认是一个空列表，即意味着使用传统的默认角度（45 和 135 度）。" - #: fdmprinter.def.json msgctxt "wall_0_inset label" msgid "Outer Wall Inset" @@ -1415,6 +1275,176 @@ msgctxt "z_seam_relative description" msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate." msgstr "启用时，Z 缝坐标为相对于各个部分中心的值。 禁用时，坐标定义打印平台上的一个绝对位置。" +#: fdmprinter.def.json +msgctxt "top_bottom label" +msgid "Top/Bottom" +msgstr "顶 / 底层" + +#: fdmprinter.def.json +msgctxt "top_bottom description" +msgid "Top/Bottom" +msgstr "顶 / 底层" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr label" +msgid "Top Surface Skin Extruder" +msgstr "顶部皮肤挤出机" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr description" +msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." +msgstr "用于打印最顶部皮肤的挤出机组。 用于多重挤出。" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count label" +msgid "Top Surface Skin Layers" +msgstr "顶部表面皮肤层" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count description" +msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." +msgstr "最顶部皮肤层数。 通常只需一层最顶层就足以生成较高质量的顶部表面。" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr label" +msgid "Top/Bottom Extruder" +msgstr "顶部/底部挤出机" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr description" +msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." +msgstr "用于打印顶部和底部皮肤的挤出机组。 用于多重挤出。" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness label" +msgid "Top/Bottom Thickness" +msgstr "顶层 / 底层厚度" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness description" +msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." +msgstr "打印品中顶层/底层的厚度。 该值除以层高定义顶层/底层的数量。" + +#: fdmprinter.def.json +msgctxt "top_thickness label" +msgid "Top Thickness" +msgstr "顶层厚度" + +#: fdmprinter.def.json +msgctxt "top_thickness description" +msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." +msgstr "打印品中顶层的厚度。 该值除以层高定义顶层的数量。" + +#: fdmprinter.def.json +msgctxt "top_layers label" +msgid "Top Layers" +msgstr "顶部层数" + +#: fdmprinter.def.json +msgctxt "top_layers description" +msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." +msgstr "顶层的数量。 在按顶层厚度计算时，该值舍入为整数。" + +#: fdmprinter.def.json +msgctxt "bottom_thickness label" +msgid "Bottom Thickness" +msgstr "底层厚度" + +#: fdmprinter.def.json +msgctxt "bottom_thickness description" +msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." +msgstr "打印品中底层的厚度。 此值除以层高定义底层数量。" + +#: fdmprinter.def.json +msgctxt "bottom_layers label" +msgid "Bottom Layers" +msgstr "底部层数" + +#: fdmprinter.def.json +msgctxt "bottom_layers description" +msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "底层的数量。 在按底层厚度计算时，该值舍入为整数。" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "初始底层数" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "从构建板向上算起的初始底层数。在按底层厚度计算时，该值四舍五入为整数。" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern label" +msgid "Top/Bottom Pattern" +msgstr "顶部 / 底部走线图案" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern description" +msgid "The pattern of the top/bottom layers." +msgstr "顶层/底层图案。" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option lines" +msgid "Lines" +msgstr "直线" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option concentric" +msgid "Concentric" +msgstr "同心圆" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option zigzag" +msgid "Zig Zag" +msgstr "锯齿状" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 label" +msgid "Bottom Pattern Initial Layer" +msgstr "底层图案起始层" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 description" +msgid "The pattern on the bottom of the print on the first layer." +msgstr "打印品底部第一层上的图案。" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option lines" +msgid "Lines" +msgstr "直线" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option concentric" +msgid "Concentric" +msgstr "同心圆" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option zigzag" +msgid "Zig Zag" +msgstr "锯齿状" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons label" +msgid "Connect Top/Bottom Polygons" +msgstr "连接顶部/底部多边形" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons description" +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "在顶部/底部皮肤路径互相紧靠运行的地方连接它们。对于同心图案，启用此设置可大大减少空驶时间，但由于连接可在填充中途发生，此功能可能会降低顶部表面质量。" + +#: fdmprinter.def.json +msgctxt "skin_angles label" +msgid "Top/Bottom Line Directions" +msgstr "顶层/底层走线方向" + +#: fdmprinter.def.json +msgctxt "skin_angles description" +msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." +msgstr "当顶层/底层采用线条或锯齿状图案时使用的整数走线方向的列表。 列表中的元素随层的进度依次使用，当达到列表末尾时，它将从头开始。 列表项以逗号分隔，整个列表包含在方括号中。 默认是一个空列表，即意味着使用传统的默认角度（45 和 135 度）。" + #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" msgid "No Skin in Z Gaps" @@ -1555,6 +1585,86 @@ msgctxt "skin_overlap_mm description" msgid "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any value over half the width of the wall may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall." msgstr "调整壁和皮肤中心线的（端点）之间的重叠量。稍微重叠可让各个壁与皮肤牢固连接。请注意，对于相等的皮肤和壁线宽度，任何超过壁宽度一半的值可能已经导致任何皮肤越过壁，因为在该点，皮肤挤出机的喷嘴位置可能已经达到越过壁中间的位置。" +#: fdmprinter.def.json +msgctxt "skin_preshrink label" +msgid "Skin Removal Width" +msgstr "肤移除宽度" + +#: fdmprinter.def.json +msgctxt "skin_preshrink description" +msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." +msgstr "将被移除的皮肤区域的最大宽度。 小于此值的所有皮肤区域都将消失。 这有助于限制在模型的倾斜表面打印顶部/底部皮肤时所耗用的时间和材料。" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink label" +msgid "Top Skin Removal Width" +msgstr "顶部皮肤移除宽度" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink description" +msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." +msgstr "将被移除的顶部皮肤区域的最大宽度。 小于此值的所有皮肤区域都将消失。 这有助于限制在模型的倾斜表面打印顶部皮肤时所耗用的时间和材料。" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink label" +msgid "Bottom Skin Removal Width" +msgstr "底部皮肤移除宽度" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink description" +msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." +msgstr "将被移除的底部皮肤区域的最大宽度。 小于此值的所有皮肤区域都将消失。 这有助于限制在模型的倾斜表面打印底部皮肤时所耗用的时间和材料。" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance label" +msgid "Skin Expand Distance" +msgstr "皮肤扩展距离" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance description" +msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." +msgstr "皮肤扩展到填充物中的距离。 值越大会让皮肤与填充图案更好地附着，并让相邻层的层壁与皮肤更好地粘着。 较低的值将节省所用的材料量。" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance label" +msgid "Top Skin Expand Distance" +msgstr "顶部皮肤扩展距离" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance description" +msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." +msgstr "顶部皮肤扩展到填充物中的距离。 值越大会让皮肤与填充图案更好地附着，并让上方层的层壁与皮肤更好地粘着。 较低的值将节省所用的材料量。" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance label" +msgid "Bottom Skin Expand Distance" +msgstr "底部皮肤扩展距离" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance description" +msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." +msgstr "底部皮肤扩展到填充物中的距离。 值越大会让皮肤与填充图案更好地附着，并让皮肤与下面层的壁更好地粘着。 较低的值将节省所用的材料量。" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion label" +msgid "Maximum Skin Angle for Expansion" +msgstr "最大扩展皮肤角度" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion description" +msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded." +msgstr "如果对象的顶部和/或底部表面的角度大于此设置，则不要扩展其顶部/底部皮肤。这会避免扩展在模型表面有接近垂直的坡度时所形成的狭窄皮肤区域。0° 的角为水平，将导致不扩展任何皮肤，而 90° 的角为垂直，将导致扩展所有皮肤。" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion label" +msgid "Minimum Skin Width for Expansion" +msgstr "最小扩展皮肤宽度" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion description" +msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." +msgstr "如果皮肤区域宽度小于此值，则不会扩展。 这会避免扩展在模型表面的坡度接近垂直时所形成的狭窄皮肤区域。" + #: fdmprinter.def.json msgctxt "infill label" msgid "Infill" @@ -1864,86 +1974,6 @@ msgctxt "infill_support_angle description" msgid "The minimum angle of internal overhangs for which infill is added. At a value of 0° objects are totally filled with infill, 90° will not provide any infill." msgstr "添加内填充的内部覆盖的最小角度。在一个0的值中，完全填满了填充，90将不提供任何填充。" -#: fdmprinter.def.json -msgctxt "skin_preshrink label" -msgid "Skin Removal Width" -msgstr "肤移除宽度" - -#: fdmprinter.def.json -msgctxt "skin_preshrink description" -msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." -msgstr "将被移除的皮肤区域的最大宽度。 小于此值的所有皮肤区域都将消失。 这有助于限制在模型的倾斜表面打印顶部/底部皮肤时所耗用的时间和材料。" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink label" -msgid "Top Skin Removal Width" -msgstr "顶部皮肤移除宽度" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink description" -msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." -msgstr "将被移除的顶部皮肤区域的最大宽度。 小于此值的所有皮肤区域都将消失。 这有助于限制在模型的倾斜表面打印顶部皮肤时所耗用的时间和材料。" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink label" -msgid "Bottom Skin Removal Width" -msgstr "底部皮肤移除宽度" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink description" -msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." -msgstr "将被移除的底部皮肤区域的最大宽度。 小于此值的所有皮肤区域都将消失。 这有助于限制在模型的倾斜表面打印底部皮肤时所耗用的时间和材料。" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance label" -msgid "Skin Expand Distance" -msgstr "皮肤扩展距离" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance description" -msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." -msgstr "皮肤扩展到填充物中的距离。 值越大会让皮肤与填充图案更好地附着，并让相邻层的层壁与皮肤更好地粘着。 较低的值将节省所用的材料量。" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance label" -msgid "Top Skin Expand Distance" -msgstr "顶部皮肤扩展距离" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance description" -msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." -msgstr "顶部皮肤扩展到填充物中的距离。 值越大会让皮肤与填充图案更好地附着，并让上方层的层壁与皮肤更好地粘着。 较低的值将节省所用的材料量。" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance label" -msgid "Bottom Skin Expand Distance" -msgstr "底部皮肤扩展距离" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance description" -msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." -msgstr "底部皮肤扩展到填充物中的距离。 值越大会让皮肤与填充图案更好地附着，并让皮肤与下面层的壁更好地粘着。 较低的值将节省所用的材料量。" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion label" -msgid "Maximum Skin Angle for Expansion" -msgstr "最大扩展皮肤角度" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion description" -msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." -msgstr "如果模型的顶部和/或底部表面的角度大于此设置，则不要扩展其顶部/底部皮肤。 这会避免扩展在模型表面有接近垂直的坡度时所形成的狭窄皮肤区域。 0° 的角为水平，90° 的角为垂直。" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion label" -msgid "Minimum Skin Width for Expansion" -msgstr "最小扩展皮肤宽度" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion description" -msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." -msgstr "如果皮肤区域宽度小于此值，则不会扩展。 这会避免扩展在模型表面的坡度接近垂直时所形成的狭窄皮肤区域。" - #: fdmprinter.def.json msgctxt "skin_edge_support_thickness label" msgid "Skin Edge Support Thickness" @@ -2561,8 +2591,8 @@ msgstr "起始层速度" #: fdmprinter.def.json msgctxt "speed_layer_0 description" -msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." -msgstr "起始层的速度。 建议采用较低的值以便改善与打印平台的粘着。" +msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate. Does not affect the build plate adhesion structures themselves, like brim and raft." +msgstr "起始层的速度。建议采用较低的值以便改善与构建板的粘着。不会影响构建板自身的粘着结构，如边沿和筏。" #: fdmprinter.def.json msgctxt "speed_print_layer_0 label" @@ -3171,8 +3201,8 @@ msgstr "最大梳距，无收缩" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" -msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." -msgstr "当非零的时候，梳理比这段距离更长的旅行移动将会使用撤回。" +msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." +msgstr "当大于零时，比这段距离更长的梳理空驶将会使用回抽。如果设置为零，则没有最大值，梳理空驶将不会使用回抽。" #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" @@ -5075,8 +5105,8 @@ msgstr "网格处理等级" #: fdmprinter.def.json msgctxt "infill_mesh_order description" -msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." -msgstr "在考虑多个重叠的填充网格时确定此网格的优先级。其中有多个填充网格重叠的区域将采用等级最低的网格的设置。具有较高顺序的填充网格将修改具有较低顺序的填充网格和普通网格的填充。" +msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the highest rank. An infill mesh with a higher rank will modify the infill of infill meshes with lower rank and normal meshes." +msgstr "在考虑多个重叠的填充网格时确定此网格的优先级。其中有多个填充网格重叠的区域将采用等级最高的网格的设置。具有较高等级的填充网格将修改具有较低等级的填充网格和普通网格的填充。" #: fdmprinter.def.json msgctxt "cutting_mesh label" @@ -5423,6 +5453,16 @@ msgctxt "conical_overhang_angle description" msgid "The maximum angle of overhangs after the they have been made printable. At a value of 0° all overhangs are replaced by a piece of model connected to the build plate, 90° will not change the model in any way." msgstr "在悬垂变得可打印后悬垂的最大角度。 当该值为 0° 时，所有悬垂将被与打印平台连接的模型的一个部分替代，如果为 90° 时，不会以任何方式更改模型。" +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size label" +msgid "Maximum Overhang Hole Area" +msgstr "最大悬垂孔面积" + +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size description" +msgid "The maximum area of a hole in the base of the model before it's removed by Make Overhang Printable. Holes smaller than this will be retained. A value of 0 mm² will fill all holes in the models base." +msgstr "在“使悬垂对象可打印”将其删除之前，模型底部的孔的最大面积。小于此面积的孔将会保留。值 0 mm² 将填充模型底部的所有孔。" + #: fdmprinter.def.json msgctxt "coasting_enable label" msgid "Enable Coasting" @@ -6362,6 +6402,30 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "在将模型从文件中载入时应用在模型上的转换矩阵。" +#~ msgctxt "retraction_combing_max_distance description" +#~ msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." +#~ msgstr "当非零的时候，梳理比这段距离更长的旅行移动将会使用撤回。" + +#~ msgctxt "machine_use_extruder_offset_to_offset_coords description" +#~ msgid "Apply the extruder offset to the coordinate system." +#~ msgstr "将挤出机偏移量应用到坐标轴系统。" + +#~ msgctxt "shell label" +#~ msgid "Shell" +#~ msgstr "外壳" + +#~ msgctxt "max_skin_angle_for_expansion description" +#~ msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." +#~ msgstr "如果模型的顶部和/或底部表面的角度大于此设置，则不要扩展其顶部/底部皮肤。 这会避免扩展在模型表面有接近垂直的坡度时所形成的狭窄皮肤区域。 0° 的角为水平，90° 的角为垂直。" + +#~ msgctxt "speed_layer_0 description" +#~ msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." +#~ msgstr "起始层的速度。 建议采用较低的值以便改善与打印平台的粘着。" + +#~ msgctxt "infill_mesh_order description" +#~ msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." +#~ msgstr "在考虑多个重叠的填充网格时确定此网格的优先级。其中有多个填充网格重叠的区域将采用等级最低的网格的设置。具有较高顺序的填充网格将修改具有较低顺序的填充网格和普通网格的填充。" + #~ msgctxt "material_bed_temperature description" #~ msgid "The temperature used for the heated build plate. If this is 0, the bed temperature will not be adjusted." #~ msgstr "用于加热打印平台的温度。如果该值为 0，将不会调整热床。" diff --git a/resources/i18n/zh_TW/cura.po b/resources/i18n/zh_TW/cura.po index 701348a5cd..37610a8a1d 100644 --- a/resources/i18n/zh_TW/cura.po +++ b/resources/i18n/zh_TW/cura.po @@ -1,25 +1,25 @@ # Cura -# Copyright (C) 2020 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. -# Ruben Dulek , 2020. +# Ruben Dulek , 2021. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0200\n" -"PO-Revision-Date: 2020-11-01 16:58+0800\n" -"Last-Translator: Zhang Heh Ji \n" -"Language-Team: Zhang Heh Ji \n" +"POT-Creation-Date: 2021-06-10 17:35+0200\n" +"PO-Revision-Date: 2021-06-12 11:31+0800\n" +"Last-Translator: Valen Chang \n" +"Language-Team: Valen Chang / Leo Hsu\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.3\n" +"X-Generator: Poedit 2.4.2\n" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1581 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 msgctxt "@label" msgid "Unknown" msgstr "未知" @@ -43,7 +43,7 @@ msgstr "不覆寫" #, python-brace-format msgctxt "@label {0} is the name of a printer that's about to be deleted." msgid "Are you sure you wish to remove {0}? This cannot be undone!" -msgstr "你確定要移除 {0} 嗎？這動作無法復原！" +msgstr "你確定要移除 {0} 嗎？這動作無法復原!" #: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 msgctxt "@label" @@ -80,12 +80,12 @@ msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "草稿參數是設計來縮短時間，快速列印初始原型和概念驗證。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:226 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:234 msgctxt "@label" msgid "Custom Material" -msgstr "自訂耗材" +msgstr "自訂線材" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:227 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 msgctxt "@label" msgid "Custom" msgstr "自訂" @@ -106,7 +106,7 @@ msgctxt "@item:inlistbox" msgid "All Files (*)" msgstr "所有檔案 (*)" -#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:178 +#: /home/trin/Gedeeld/Projects/Cura/cura/API/Account.py:181 msgctxt "@info:title" msgid "Login failed" msgstr "登入失敗" @@ -131,25 +131,30 @@ msgctxt "@info:title" msgid "Can't Find Location" msgstr "無法找到位置" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:104 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:116 msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "無法從使用者資料目錄建立備份檔：{}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:110 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 msgctxt "@info:title" msgid "Backup" msgstr "備份" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:123 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:135 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." -msgstr "嘗試復原沒有正確資料或 meta data 的 Cura 備份。" +msgstr "嘗試復原Cura 備份(若無proper data或meta data)。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:134 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:146 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that is higher than the current version." -msgstr "嘗試復原的 Cura 備份的版本比目前的軟體版本新。" +msgstr "嘗試復原新版本的Cura備份。" + +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 +msgctxt "@info:backup_failed" +msgid "The following error occurred while trying to restore a Cura backup:" +msgstr "恢復Cura備份時，出現下列錯誤:" #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" @@ -300,71 +305,71 @@ msgctxt "@action:button" msgid "Send report" msgstr "送出報告" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:521 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:527 msgctxt "@info:progress" msgid "Loading machines..." msgstr "正在載入印表機..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:528 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:534 msgctxt "@info:progress" msgid "Setting up preferences..." msgstr "正在設定偏好設定..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:657 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:672 msgctxt "@info:progress" msgid "Initializing Active Machine..." msgstr "正在初始化啟用的機器..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:788 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:803 msgctxt "@info:progress" msgid "Initializing machine manager..." msgstr "正在初始化機器管理員..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:802 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:817 msgctxt "@info:progress" msgid "Initializing build volume..." msgstr "正在初始化列印範圍..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:870 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:888 msgctxt "@info:progress" msgid "Setting up scene..." msgstr "正在設定場景..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:906 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:924 msgctxt "@info:progress" msgid "Loading interface..." msgstr "正在載入介面..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:911 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:929 msgctxt "@info:progress" msgid "Initializing engine..." msgstr "正在初始化引擎..." -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1221 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1246 #, python-format msgctxt "@info 'width', 'depth' and 'height' are variable names that must NOT be translated; just translate the format of ##x##x## mm." msgid "%(width).1f x %(depth).1f x %(height).1f mm" msgstr "%(width).1f x %(depth).1f x %(height).1f mm" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1777 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1799 #, python-brace-format msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "一次只能載入一個 G-code 檔案。{0} 已跳過匯入" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1778 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:188 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 msgctxt "@info:title" msgid "Warning" msgstr "警告" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1787 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1809 #, python-brace-format msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "如果載入 G-code，則無法開啟其他任何檔案。{0} 已跳過匯入" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1788 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 msgctxt "@info:title" msgid "Error" @@ -385,7 +390,7 @@ msgctxt "@info:title" msgid "Placing Object" msgstr "擺放物件中" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationHelpers.py:92 msgctxt "@message" msgid "Could not read response." msgstr "雲端沒有讀取回應。" @@ -405,12 +410,12 @@ msgctxt "@message" msgid "Something unexpected happened when trying to log in, please try again." msgstr "嘗試登入時出現意外狀況，請再試一次。" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:187 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:189 msgctxt "@info" msgid "Unable to start a new sign in process. Check if another sign in attempt is still active." msgstr "無法開始新的登入程序。檢查是否有其他登入仍在進行中。" -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:242 +#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "無法連上 Ultimaker 帳號伺服器。" @@ -426,7 +431,7 @@ msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "檔案 {0} 已存在。你確定要覆蓋掉它嗎？" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:452 /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:455 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "無效的檔案網址：" @@ -508,37 +513,37 @@ msgctxt "@info:status" msgid "Profile {0} has an unknown file type or is corrupted." msgstr "列印參數 {0} 檔案類型未知或已損壞。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:423 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:426 msgctxt "@label" msgid "Custom profile" msgstr "自訂列印參數" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:439 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:442 msgctxt "@info:status" msgid "Profile is missing a quality type." msgstr "列印參數缺少列印品質類型定義。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:443 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:446 msgctxt "@info:status" -msgid "Global stack is missing." -msgstr "全域堆疊遺失。" +msgid "There is no active printer yet." +msgstr "尚未啟動列印機." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:449 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:452 msgctxt "@info:status" msgid "Unable to add the profile." msgstr "無法新增列印參數。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:463 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:466 #, python-brace-format msgctxt "@info:status" msgid "Quality type '{0}' is not compatible with the current active machine definition '{1}'." msgstr "品質類型 '{0}' 與目前的啟用的機器設定 '{1} '不相容。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:468 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:471 #, python-brace-format msgctxt "@info:status" msgid "Warning: The profile is not visible because its quality type '{0}' is not available for the current configuration. Switch to a material/nozzle combination that can use this quality type." -msgstr "警告：列印參數無法顯示，因為它的品質類型 '{0}' 無法在目前設定使用。切換到可使用此品質類型的耗材/噴頭組合。" +msgstr "警告：列印參數無法顯示，因為它的品質類型 '{0}' 無法在目前設定使用。切換到可使用此品質類型的線材/噴頭組合。" #: /home/trin/Gedeeld/Projects/Cura/cura/Settings/cura_empty_instance_containers.py:36 msgctxt "@info:not supported profile" @@ -550,22 +555,22 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "預設值" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:712 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 msgctxt "@label" msgid "Nozzle" msgstr "噴頭" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:860 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:856 msgctxt "@info:message Followed by a list of settings." msgid "Settings have been changed to match the current availability of extruders:" msgstr "設定已被更改為符合目前擠出機：" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:862 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:858 msgctxt "@info:title" msgid "Settings updated" msgstr "設定更新" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1447 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1478 msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "擠出機已停用" @@ -575,15 +580,15 @@ msgctxt "@action:button" msgid "Add" msgstr "增加" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:263 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 msgctxt "@action:button" msgid "Finish" msgstr "完成" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:441 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml:81 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:87 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 msgctxt "@action:button" msgid "Cancel" msgstr "取消" @@ -594,73 +599,78 @@ msgctxt "@label" msgid "Group #{group_nr}" msgstr "群組 #{group_nr}" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:82 msgctxt "@tooltip" msgid "Outer Wall" msgstr "外壁" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:83 msgctxt "@tooltip" msgid "Inner Walls" msgstr "內壁" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:84 msgctxt "@tooltip" msgid "Skin" msgstr "表層" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:85 msgctxt "@tooltip" msgid "Infill" msgstr "填充" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:86 msgctxt "@tooltip" msgid "Support Infill" msgstr "支撐填充" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:87 msgctxt "@tooltip" msgid "Support Interface" msgstr "支撐介面" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:88 msgctxt "@tooltip" msgid "Support" msgstr "支撐" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:89 msgctxt "@tooltip" msgid "Skirt" msgstr "外圍" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:90 msgctxt "@tooltip" msgid "Prime Tower" msgstr "裝填塔" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:91 msgctxt "@tooltip" msgid "Travel" msgstr "移動" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:92 msgctxt "@tooltip" msgid "Retractions" msgstr "回抽" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:94 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/PrintInformation.py:93 msgctxt "@tooltip" msgid "Other" msgstr "其它" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 msgctxt "@action:button" msgid "Next" msgstr "下一步" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:482 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:173 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 +msgctxt "@action:button" +msgid "Skip" +msgstr "略過" + +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 msgctxt "@action:button" msgid "Close" msgstr "關閉" @@ -679,34 +689,40 @@ msgid "" "

    Find out how to ensure the best possible print quality and reliability.

    \n" "

    View print quality guide

    " msgstr "" -"

    由於模型尺寸和耗材設定的原因，一個或多個模型無法在最佳情狀下列印

    \n" +"

    由於模型尺寸和線材設定的原因，一個或多個模型無法在最佳情狀下列印

    \n" "

    {model_names}

    \n" "

    了解如何確保最佳的列印品質和可靠性。

    \n" "

    閱讀列印品質指南

    " -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:535 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:540 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Project file {0} contains an unknown machine type {1}. Cannot import the machine. Models will be imported instead." msgstr "專案檔案 {0} 包含未知的機器類型 {1}。機器無法被匯入，但模型將被匯入。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:538 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:543 msgctxt "@info:title" msgid "Open Project File" msgstr "開啟專案檔案" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:634 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:639 #, python-brace-format msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "專案檔案 {0} 無法存取：{1}。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:635 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "無法開啟專案檔案" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:686 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:646 +#, python-brace-format +msgctxt "@info:error Don't translate the XML tags or !" +msgid "Project file {0} is corrupt: {1}." +msgstr "專案檔案{0} 已毀損 : {1}." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:698 #, python-brace-format msgctxt "@info:error Don't translate the XML tag !" msgid "Project file {0} is made using profiles that are unknown to this version of Ultimaker Cura." @@ -742,7 +758,7 @@ msgctxt "@error:zip" msgid "The operating system does not allow saving a project file to this location or with this file name." msgstr "操作系統不允許將專案檔案儲存到此位置或儲存為此檔名。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:185 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWriter.py:206 msgctxt "@error:zip" msgid "Error writing 3mf file." msgstr "寫入 3mf 檔案發生錯誤。" @@ -797,7 +813,7 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "備份超過了最大檔案大小。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:82 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:23 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "嘗試恢復備份時發生錯誤。" @@ -807,41 +823,41 @@ msgctxt "@item:inmenu" msgid "Manage backups" msgstr "管理備份" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." -msgstr "無法使用目前耗材切片，因為它與所選機器或設定不相容。" +msgstr "無法使用目前線材切片，因為它與所選機器或設定不相容。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:356 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:387 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:411 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:420 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:429 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:441 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 msgctxt "@info:title" msgid "Unable to slice" msgstr "無法切片" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:386 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:412 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice with the current settings. The following settings have errors: {0}" msgstr "無法使用目前設定進行切片。以下設定存在錯誤：{0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:410 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:436 #, python-brace-format msgctxt "@info:status" msgid "Unable to slice due to some per-model settings. The following settings have errors on one or more models: {error_labels}" msgstr "因部份模型設定問題無法進行切片。部份模型的下列設定有錯誤：{error_labels}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:445 msgctxt "@info:status" msgid "Unable to slice because the prime tower or prime position(s) are invalid." msgstr "無法切片（原因：換料塔或主位置無效）。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:428 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:454 #, python-format msgctxt "@info:status" msgid "Unable to slice because there are objects associated with disabled Extruder %s." msgstr "有物件使用了被停用的擠出機 %s ，因此無法進行切片。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:463 msgctxt "@info:status" msgid "" "Please review settings and check if your models:\n" @@ -1100,27 +1116,27 @@ msgctxt "@item:intext" msgid "Removable Drive" msgstr "行動裝置" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:121 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:128 msgctxt "@info:status" msgid "Cura does not accurately display layers when Wire Printing is enabled." msgstr "當鐵絲網列印（Wire Printing）功能開啟時，Cura 將無法準確地顯示列印層。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:122 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:129 msgctxt "@info:title" msgid "Simulation View" msgstr "模擬檢視" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:status" msgid "Nothing is shown because you need to slice first." msgstr "因為你還沒切片，沒有東西可顯示。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:123 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:130 msgctxt "@info:title" msgid "No layers to show" msgstr "沒有列印層可顯示" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:124 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "不要再顯示這個訊息" @@ -1131,16 +1147,21 @@ msgctxt "@item:inlistbox" msgid "Layer view" msgstr "分層檢視" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:70 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:71 msgctxt "@info:status" -msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." -msgstr "模型沒有封閉，標示的區域有缺少或多餘的表面。" +msgid "The highlighted areas indicate either missing or extraneous surfaces. Fix your model and open it again into Cura." +msgstr "模型區域顯示已遺失或突出表面, 請修復您的模型並重新匯入Cura." -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:72 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:73 msgctxt "@info:title" -msgid "Model errors" +msgid "Model Errors" msgstr "模型錯誤" +#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:79 +msgctxt "@action:button" +msgid "Learn more" +msgstr "學習更多" + #: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/__init__.py:12 msgctxt "@item:inmenu" msgid "Solid view" @@ -1159,14 +1180,14 @@ msgstr "建立一塊不列印支撐的空間。" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:142 msgctxt "@info:generic" msgid "Do you want to sync material and software packages with your account?" -msgstr "你要使用你的帳號同步耗材資料和軟體套件嗎？" +msgstr "你要使用你的帳號同步線材資料和軟體套件嗎？" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:143 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/DownloadPresenter.py:93 msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "從你的 Ultimaker 帳號偵測到資料更動" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:145 msgctxt "@action:button" msgid "Sync" msgstr "同步" @@ -1201,7 +1222,7 @@ msgctxt "@info:generic" msgid "You need to quit and restart {} before changes have effect." msgstr "你需要結束並重新啟動 {} ，更動才能生效。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:76 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/SyncOrchestrator.py:79 msgctxt "@info:generic" msgid "{} plugins failed to download" msgstr "下載外掛 {} 失敗" @@ -1241,7 +1262,8 @@ msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimaker 格式的封包" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" msgstr "無法寫入 UFP 檔案：" @@ -1256,22 +1278,22 @@ msgctxt "@action" msgid "Select upgrades" msgstr "選擇升級" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:152 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 msgctxt "@action:button" msgid "Print via cloud" msgstr "透過雲端服務列印" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:155 msgctxt "@properties:tooltip" msgid "Print via cloud" msgstr "透過雲端服務列印" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:154 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:156 msgctxt "@info:status" msgid "Connected via cloud" msgstr "透過雲端服務連接" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:264 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:270 #, python-brace-format msgctxt "@error:send" msgid "Unknown error code when uploading print job: {0}" @@ -1408,12 +1430,12 @@ msgstr "更新你印表機" #, python-brace-format msgctxt "@info:status" msgid "Cura has detected material profiles that were not yet installed on the host printer of group {0}." -msgstr "Cura 偵測到群組 {0} 的管理主機上未安裝的耗材參數。" +msgstr "Cura 偵測到群組 {0} 的管理主機上未安裝的線材參數。" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/MaterialSyncMessage.py:26 msgctxt "@info:title" msgid "Sending materials to printer" -msgstr "向印表機傳送耗材參數中" +msgstr "向印表機傳送線材參數中" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Messages/NotClusterHostMessage.py:27 #, python-brace-format @@ -1561,125 +1583,125 @@ msgctxt "@info:tooltip" msgid "Some things could be problematic in this print. Click to see tips for adjustment." msgstr "此列印可能會有些問題。點擊查看調整提示。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:15 msgctxt "@title:window" msgid "Open Project" msgstr "開啟專案" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:61 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 msgctxt "@action:ComboBox Update/override existing profile" msgid "Update existing" msgstr "更新已有設定" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:62 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:63 msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "新建設定" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:74 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "摘要 - Cura 專案" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:96 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 msgctxt "@action:label" msgid "Printer settings" msgstr "印表機設定" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:112 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:113 msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "如何解決機器的設定衝突？" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:165 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 msgctxt "@action:label" msgid "Type" msgstr "類型" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:181 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 msgctxt "@action:label" msgid "Printer Group" msgstr "印表機群組" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:203 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 msgctxt "@action:label" msgid "Profile settings" msgstr "列印參數設定" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:219 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:221 msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "如何解决列印參數中的設定衝突？" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:239 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:349 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 msgctxt "@action:label" msgid "Name" msgstr "名稱" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:255 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 msgctxt "@action:label" msgid "Intent" msgstr "意圖" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:271 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Not in profile" msgstr "不在列印參數中" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:276 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" msgstr[0] "%1 覆寫" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:287 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:290 msgctxt "@action:label" msgid "Derivative from" msgstr "衍生自" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:295 msgctxt "@action:label" msgid "%1, %2 override" msgid_plural "%1, %2 overrides" msgstr[0] "%1, %2 覆寫" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:309 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:312 msgctxt "@action:label" msgid "Material settings" -msgstr "耗材設定" +msgstr "線材設定" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:328 msgctxt "@info:tooltip" msgid "How should the conflict in the material be resolved?" -msgstr "如何解决耗材的設定衝突？" +msgstr "如何解决線材的設定衝突？" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:369 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:373 msgctxt "@action:label" msgid "Setting visibility" msgstr "參數顯示設定" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:378 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:382 msgctxt "@action:label" msgid "Mode" msgstr "模式" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:398 msgctxt "@action:label" msgid "Visible settings:" msgstr "顯示設定：" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:399 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:403 msgctxt "@action:label" msgid "%1 out of %2" msgstr "%1 / %2" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:425 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:429 msgctxt "@action:warning" msgid "Loading a project will clear all models on the build plate." msgstr "載入專案時將清除列印平台上的所有模型。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:453 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:457 msgctxt "@action:button" msgid "Open" msgstr "開啟" @@ -1742,7 +1764,7 @@ msgstr "印表機" #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml:37 msgctxt "@backuplist:label" msgid "Materials" -msgstr "耗材" +msgstr "線材" #: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml:45 msgctxt "@backuplist:label" @@ -1779,8 +1801,8 @@ msgctxt "@description" msgid "Backup and synchronize your Cura settings." msgstr "備份並同步你的 Cura 設定。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:68 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:125 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:199 msgctxt "@button" msgid "Sign in" msgstr "登入" @@ -1986,7 +2008,7 @@ msgstr "mm" #: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:89 msgctxt "@label" msgid "Compatible material diameter" -msgstr "相容的耗材直徑" +msgstr "相容的線材直徑" #: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:105 msgctxt "@label" @@ -2003,12 +2025,12 @@ msgctxt "@label" msgid "Cooling Fan Number" msgstr "冷卻風扇數量" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:162 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:163 msgctxt "@title:label" msgid "Extruder Start G-code" msgstr "擠出機起始 G-code" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:176 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:177 msgctxt "@title:label" msgid "Extruder End G-code" msgstr "擠出機結束 G-code" @@ -2093,12 +2115,17 @@ msgctxt "@label" msgid "Number of Extruders" msgstr "擠出機數目" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:345 +msgctxt "@label" +msgid "Apply Extruder offsets to GCode" +msgstr "將擠出機偏移設定至Gcode" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:393 msgctxt "@title:label" msgid "Start G-code" msgstr "起始 G-code" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:385 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:404 msgctxt "@title:label" msgid "End G-code" msgstr "結束 G-code" @@ -2126,6 +2153,11 @@ msgctxt "@label link to technical assistance" msgid "View user manuals online" msgstr "查看線上使用者手冊" +#: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 +msgctxt "@info" +msgid "In order to monitor your print from Cura, please connect the printer." +msgstr "為了監控您的印表機，請連結印表機." + #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" msgid "Mesh Type" @@ -2171,7 +2203,7 @@ msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "選擇對此模型的自訂設定" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:94 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 msgctxt "@label:textbox" msgid "Filter..." msgstr "篩選..." @@ -2181,32 +2213,32 @@ msgctxt "@label:checkbox" msgid "Show all" msgstr "顯示全部" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:18 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:20 msgctxt "@title:window" msgid "Post Processing Plugin" msgstr "後處理外掛" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:57 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:59 msgctxt "@label" msgid "Post Processing Scripts" msgstr "後處理腳本" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:233 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:235 msgctxt "@action" msgid "Add a script" msgstr "添加一個腳本" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:282 msgctxt "@label" msgid "Settings" msgstr "設定" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:499 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:502 msgctxt "@info:tooltip" msgid "Change active post-processing scripts." msgstr "更改目前啟用的後處理腳本。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:506 msgctxt "@info:tooltip" msgid "The following script is active:" msgid_plural "The following scripts are active:" @@ -2217,77 +2249,92 @@ msgctxt "@label" msgid "Color scheme" msgstr "顏色方案" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:110 msgctxt "@label:listbox" msgid "Material Color" -msgstr "耗材顏色" +msgstr "線材顏色" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:111 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:114 msgctxt "@label:listbox" msgid "Line Type" msgstr "線條類型" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:115 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:118 msgctxt "@label:listbox" msgid "Speed" msgstr "速度" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:119 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:122 msgctxt "@label:listbox" -msgid "Layer thickness" +msgid "Layer Thickness" msgstr "層厚" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:126 +msgctxt "@label:listbox" +msgid "Line Width" +msgstr "線寬" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 +msgctxt "@label:listbox" +msgid "Flow" +msgstr "流動" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" msgid "Compatibility Mode" msgstr "相容模式" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:230 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:245 msgctxt "@label" msgid "Travels" msgstr "移動軌跡" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:251 msgctxt "@label" msgid "Helpers" msgstr "輔助結構" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:242 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:257 msgctxt "@label" msgid "Shell" msgstr "外殼" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:248 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 msgctxt "@label" msgid "Infill" msgstr "填充" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:298 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:271 +msgctxt "@label" +msgid "Starts" +msgstr "啟動" + +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 msgctxt "@label" msgid "Only Show Top Layers" msgstr "只顯示頂層" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:308 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:332 msgctxt "@label" msgid "Show 5 Detailed Layers On Top" msgstr "顯示頂端 5 層列印細節" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:322 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:346 msgctxt "@label" msgid "Top / Bottom" msgstr "頂 / 底層" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:326 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:350 msgctxt "@label" msgid "Inner Wall" msgstr "內壁" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:384 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:419 msgctxt "@label" msgid "min" msgstr "最小值" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:433 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:488 msgctxt "@label" msgid "max" msgstr "最大值" @@ -2375,7 +2422,7 @@ msgstr "需要登入才能進行安裝或升級" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:80 msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" -msgstr "購買耗材線軸" +msgstr "購買線材線軸" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:96 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" @@ -2405,7 +2452,7 @@ msgstr "前往網路市集" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml:42 msgctxt "@label" msgid "Search materials" -msgstr "搜尋耗材" +msgstr "搜尋線材" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxFooter.qml:19 msgctxt "@info" @@ -2422,10 +2469,10 @@ msgctxt "@title:tab" msgid "Plugins" msgstr "外掛" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:466 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 msgctxt "@title:tab" msgid "Materials" -msgstr "耗材" +msgstr "線材" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:58 msgctxt "@title:tab" @@ -2468,6 +2515,7 @@ msgid "Dismiss" msgstr "捨棄" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:178 msgctxt "@button" msgid "Next" msgstr "下一步" @@ -2490,12 +2538,12 @@ msgstr "移除確認" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml:50 msgctxt "@text:window" msgid "You are uninstalling materials and/or profiles that are still in use. Confirming will reset the following materials/profiles to their defaults." -msgstr "你正在移除仍被使用的耗材/列印設定。確認後會將下列耗材/列印設定重設為預設值。" +msgstr "你正在移除仍被使用的線材/列印設定。確認後會將下列耗材/列印設定重設為預設值。" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml:51 msgctxt "@text:window" msgid "Materials" -msgstr "耗材" +msgstr "線材" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml:52 msgctxt "@text:window" @@ -2555,7 +2603,7 @@ msgstr "社群外掛" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDownloadsPage.qml:42 msgctxt "@label" msgid "Generic Materials" -msgstr "通用耗材" +msgstr "通用線材" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxErrorPage.qml:16 msgctxt "@info" @@ -2575,12 +2623,12 @@ msgstr "尚未安裝任何外掛。" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxInstalledPage.qml:86 msgctxt "@title:tab" msgid "Installed materials" -msgstr "已安裝耗材" +msgstr "已安裝線材" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxInstalledPage.qml:125 msgctxt "@info" msgid "No material has been installed." -msgstr "尚未安裝任何耗材。" +msgstr "尚未安裝任何線材。" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxInstalledPage.qml:139 msgctxt "@title:tab" @@ -2590,7 +2638,7 @@ msgstr "捆綁式外掛" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxInstalledPage.qml:184 msgctxt "@title:tab" msgid "Bundled materials" -msgstr "捆綁式耗材" +msgstr "捆綁式線材" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxLoadingPage.qml:17 msgctxt "@info" @@ -2600,7 +2648,7 @@ msgstr "取得套件..." #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:22 msgctxt "@description" msgid "Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise" -msgstr "請登入以取得 Ultimaker Cura Enterprise 驗証的外掛及耗材" +msgstr "請登入以取得 Ultimaker Cura Enterprise 驗証的外掛及線材" #: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/Toolbox.qml:19 msgctxt "@title" @@ -2752,17 +2800,17 @@ msgstr[0] "分配的印表機 %1 需要下列的設定更動：" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:89 msgctxt "@label" msgid "The printer %1 is assigned, but the job contains an unknown material configuration." -msgstr "已分配到印表機 %1，但列印工作含有未知的耗材設定。" +msgstr "已分配到印表機 %1，但列印工作含有未知的線材設定。" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:99 msgctxt "@label" msgid "Change material %1 from %2 to %3." -msgstr "將耗材 %1 從 %2 改成 %3。" +msgstr "將線材 %1 從 %2 改成 %3。" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:102 msgctxt "@label" msgid "Load %3 as material %1 (This cannot be overridden)." -msgstr "將 %3 做為耗材 %1 載入（無法覆寫）。" +msgstr "將 %3 做為線材 %1 載入（無法覆寫）。" #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:105 msgctxt "@label" @@ -2800,7 +2848,7 @@ msgctxt "@label" msgid "Delete" msgstr "刪除" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:289 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 msgctxt "@label" msgid "Resume" msgstr "繼續" @@ -2815,7 +2863,7 @@ msgctxt "@label" msgid "Resuming..." msgstr "正在繼續..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:284 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 msgctxt "@label" msgid "Pause" msgstr "暫停" @@ -2855,7 +2903,7 @@ msgctxt "@label %1 is the name of a print job." msgid "Are you sure you want to abort %1?" msgstr "你確定要中斷 %1 嗎？" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 msgctxt "@window:title" msgid "Abort print" msgstr "中斷列印" @@ -2865,7 +2913,7 @@ msgctxt "@label link to Connect and Cloud interfaces" msgid "Manage printer" msgstr "管理印表機" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:519 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." msgstr "請更新你印表機的韌體以便遠端管理工作隊列。" @@ -2890,27 +2938,33 @@ msgctxt "@label:status" msgid "Idle" msgstr "閒置中" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:365 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 +msgctxt "@label:status" +msgid "Preparing..." +msgstr "正在準備..." + +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:369 msgctxt "@label:status" msgid "Printing" msgstr "正在列印" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:406 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:410 msgctxt "@label" msgid "Untitled" msgstr "無標題" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:431 msgctxt "@label" msgid "Anonymous" msgstr "匿名" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:458 msgctxt "@label:status" msgid "Requires configuration changes" msgstr "需要修改設定" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:492 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:496 msgctxt "@action:button" msgid "Details" msgstr "細項" @@ -2935,11 +2989,6 @@ msgctxt "@label:status" msgid "Finished" msgstr "已完成" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 -msgctxt "@label:status" -msgid "Preparing..." -msgstr "正在準備..." - #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:88 msgctxt "@label:status" msgid "Aborting..." @@ -3020,26 +3069,26 @@ msgctxt "@action:button" msgid "Sign in" msgstr "登入" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:40 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" -msgid "Your key to connected 3D printing" -msgstr "連線 3D 列印的金鑰" +msgid "Sign in to the Ultimaker platform" +msgstr "登入Ultimaker 論壇" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:42 msgctxt "@text" msgid "" -"- Customize your experience with more print profiles and plugins\n" -"- Stay flexible by syncing your setup and loading it anywhere\n" -"- Increase efficiency with a remote workflow on Ultimaker printers" +"- Add material profiles and plug-ins from the Marketplace\n" +"- Back-up and sync your material profiles and plug-ins\n" +"- Share ideas and get help from 48,000+ users in the Ultimaker community" msgstr "" -"- 使用更多的列印參數設定和外掛訂做你的使用體驗\n" -"- 通過同步設定可在任何地方將其載入以保持靈活性\n" -"- 透過 Ultimaker 印表機上的遠端工作流程提高效率" +"- 從市集中加入線材參數及插件\n" +"-備份及同步您的線材設定與插件 \n" +"- 分享創意並可從Ultimaker社群中超過48000的使用者得到幫助" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:78 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:142 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:62 msgctxt "@button" -msgid "Create account" -msgstr "建立帳號" +msgid "Create a free Ultimaker account" +msgstr "創建免費的Ultimaker帳戶" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/SyncState.qml:28 msgctxt "@label" @@ -3104,7 +3153,7 @@ msgstr "時間估計" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/ActionPanel/PrintJobInformation.qml:114 msgctxt "@label" msgid "Material estimation" -msgstr "耗材估計" +msgstr "線材估計" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/ActionPanel/PrintJobInformation.qml:164 msgctxt "@label m for meter" @@ -3146,300 +3195,302 @@ msgctxt "@button" msgid "Cancel" msgstr "取消" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:83 msgctxt "@action:inmenu" msgid "Show Online Troubleshooting Guide" msgstr "顯示線上故障排除指南" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:90 msgctxt "@action:inmenu" msgid "Toggle Full Screen" msgstr "切換全螢幕" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:97 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:98 msgctxt "@action:inmenu" msgid "Exit Full Screen" msgstr "離開全螢幕" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:105 msgctxt "@action:inmenu menubar:edit" msgid "&Undo" msgstr "復原（&U）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:114 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:115 msgctxt "@action:inmenu menubar:edit" msgid "&Redo" msgstr "取消復原（&R）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:124 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:125 msgctxt "@action:inmenu menubar:file" msgid "&Quit" msgstr "退出（&Q）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:132 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:133 msgctxt "@action:inmenu menubar:view" msgid "3D View" msgstr "立體圖" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:139 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:140 msgctxt "@action:inmenu menubar:view" msgid "Front View" msgstr "前視圖" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:147 msgctxt "@action:inmenu menubar:view" msgid "Top View" msgstr "上視圖" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:153 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 +msgctxt "@action:inmenu menubar:view" +msgid "Bottom View" +msgstr "下視圖" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" msgid "Left Side View" msgstr "左視圖" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:160 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:168 msgctxt "@action:inmenu menubar:view" msgid "Right Side View" msgstr "右視圖" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:175 msgctxt "@action:inmenu" msgid "Configure Cura..." msgstr "設定 Cura..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:174 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:182 msgctxt "@action:inmenu menubar:printer" msgid "&Add Printer..." msgstr "新增印表機（&A）..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:180 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:188 msgctxt "@action:inmenu menubar:printer" msgid "Manage Pr&inters..." msgstr "管理印表機（&I）..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:187 -msgctxt "@action:inmenu" -msgid "Manage Materials..." -msgstr "管理耗材..." - #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:195 msgctxt "@action:inmenu" -msgid "Add more materials from Marketplace" -msgstr "從市集增加更多耗材" +msgid "Manage Materials..." +msgstr "管理線材..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:202 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:203 +msgctxt "@action:inmenu" +msgid "Add more materials from Marketplace" +msgstr "從市集增加更多線材" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 msgctxt "@action:inmenu menubar:profile" msgid "&Update profile with current settings/overrides" msgstr "使用目前設定 / 覆寫更新列印參數（&U）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:210 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:218 msgctxt "@action:inmenu menubar:profile" msgid "&Discard current changes" msgstr "捨棄目前更改（&D）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:222 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:230 msgctxt "@action:inmenu menubar:profile" msgid "&Create profile from current settings/overrides..." msgstr "從目前設定 / 覆寫值建立列印參數（&C）..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:228 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 msgctxt "@action:inmenu menubar:profile" msgid "Manage Profiles..." msgstr "管理列印參數.." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:236 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 msgctxt "@action:inmenu menubar:help" msgid "Show Online &Documentation" msgstr "顯示線上說明文件（&D）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 msgctxt "@action:inmenu menubar:help" msgid "Report a &Bug" msgstr "BUG 回報（&B）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:252 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:260 msgctxt "@action:inmenu menubar:help" msgid "What's New" msgstr "新功能" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:258 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:266 msgctxt "@action:inmenu menubar:help" msgid "About..." msgstr "關於..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:265 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:273 msgctxt "@action:inmenu menubar:edit" -msgid "Delete Selected Model" -msgid_plural "Delete Selected Models" -msgstr[0] "刪除所選模型" +msgid "Delete Selected" +msgstr "刪除選取" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:283 msgctxt "@action:inmenu menubar:edit" -msgid "Center Selected Model" -msgid_plural "Center Selected Models" -msgstr[0] "置中所選模型" +msgid "Center Selected" +msgstr "置中選取" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:284 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:292 msgctxt "@action:inmenu menubar:edit" -msgid "Multiply Selected Model" -msgid_plural "Multiply Selected Models" -msgstr[0] "複製所選模型" +msgid "Multiply Selected" +msgstr "複製選取" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:293 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 msgctxt "@action:inmenu" msgid "Delete Model" msgstr "刪除模型" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:301 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:309 msgctxt "@action:inmenu" msgid "Ce&nter Model on Platform" msgstr "將模型置中（&N）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:307 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:315 msgctxt "@action:inmenu menubar:edit" msgid "&Group Models" msgstr "群組模型（&G）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:327 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:335 msgctxt "@action:inmenu menubar:edit" msgid "Ungroup Models" msgstr "取消模型群組" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:345 msgctxt "@action:inmenu menubar:edit" msgid "&Merge Models" msgstr "結合模型（&M）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:347 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:355 msgctxt "@action:inmenu" msgid "&Multiply Model..." msgstr "複製模型...（&M）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:362 msgctxt "@action:inmenu menubar:edit" msgid "Select All Models" msgstr "選擇所有模型" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:372 msgctxt "@action:inmenu menubar:edit" msgid "Clear Build Plate" msgstr "清空列印平台" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:374 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:382 msgctxt "@action:inmenu menubar:file" msgid "Reload All Models" msgstr "重新載入所有模型" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:391 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models To All Build Plates" msgstr "將所有模型排列到所有列印平台上" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:390 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 msgctxt "@action:inmenu menubar:edit" msgid "Arrange All Models" msgstr "排列所有模型" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:398 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:406 msgctxt "@action:inmenu menubar:edit" msgid "Arrange Selection" msgstr "排列所選模型" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:405 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:413 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Positions" msgstr "重置所有模型位置" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:412 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:420 msgctxt "@action:inmenu menubar:edit" msgid "Reset All Model Transformations" msgstr "重置所有模型旋轉" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:419 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:429 msgctxt "@action:inmenu menubar:file" msgid "&Open File(s)..." msgstr "開啟檔案（&O）..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:427 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:439 msgctxt "@action:inmenu menubar:file" msgid "&New Project..." msgstr "新建專案（&N）..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:434 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:446 msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "顯示設定資料夾" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:441 /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:538 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "參數顯示設定..." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:448 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:460 msgctxt "@action:menu" msgid "&Marketplace" msgstr "市集（&M）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:266 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:257 msgctxt "@label" msgid "This package will be installed after restarting." msgstr "此套件將在重新啟動後安裝。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:15 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 msgctxt "@title:tab" msgid "General" msgstr "基本" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:462 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:453 msgctxt "@title:tab" msgid "Settings" msgstr "設定" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:464 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 msgctxt "@title:tab" msgid "Printers" msgstr "印表機" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:468 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 msgctxt "@title:tab" msgid "Profiles" msgstr "列印參數" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:587 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:576 msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "關閉 %1 中" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:588 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "是否確定要離開 %1 ？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:638 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "開啟檔案" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:744 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:737 msgctxt "@window:title" msgid "Install Package" msgstr "安裝套件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:752 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:745 msgctxt "@title:window" msgid "Open File(s)" msgstr "開啟檔案" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:755 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:748 msgctxt "@text:window" msgid "We have found one or more G-Code files within the files you have selected. You can only open one G-Code file at a time. If you want to open a G-Code file, please just select only one." msgstr "我們已經在你選擇的檔案中找到一個或多個 G-Code 檔案。你一次只能開啟一個 G-Code 檔案。若需開啟 G-Code 檔案，請僅選擇一個。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:858 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:857 msgctxt "@title:window" msgid "Add Printer" msgstr "新增印表機" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:866 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:865 msgctxt "@title:window" msgid "What's New" msgstr "新功能" @@ -3588,17 +3639,27 @@ msgctxt "@label" msgid "Python bindings for libnest2d" msgstr "Python bindings for libnest2d" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:161 +msgctxt "@label" +msgid "Support library for system keyring access" +msgstr "存取系統金鑰函式庫" + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:162 msgctxt "@label" +msgid "Python extensions for Microsoft Windows" +msgstr "Python擴充(windows)" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +msgctxt "@label" msgid "Font" msgstr "字體" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:163 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 msgctxt "@label" msgid "SVG icons" msgstr "SVG 圖標" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:164 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:165 msgctxt "@label" msgid "Linux cross-distribution application deployment" msgstr "Linux cross-distribution 應用程式部署" @@ -3608,22 +3669,22 @@ msgctxt "@title:window" msgid "Open project file" msgstr "開啟專案檔案" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:88 msgctxt "@text:window" msgid "This is a Cura project file. Would you like to open it as a project or import the models from it?" msgstr "這是一個 Cura 專案檔案。你想將其作為一個專案開啟還是從中匯入模型？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:103 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:98 msgctxt "@text:window" msgid "Remember my choice" msgstr "記住我的選擇" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:122 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:117 msgctxt "@action:button" msgid "Open as project" msgstr "作為專案開啟" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:131 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml:126 msgctxt "@action:button" msgid "Import models" msgstr "匯入模型" @@ -3654,7 +3715,7 @@ msgctxt "@title:column" msgid "Current changes" msgstr "目前更動" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:747 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "總是詢問" @@ -3679,12 +3740,12 @@ msgctxt "@action:button" msgid "Keep changes" msgstr "保留更動" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:59 msgctxt "@text:window" msgid "We have found one or more project file(s) within the files you have selected. You can open only one project file at a time. We suggest to only import models from those files. Would you like to proceed?" msgstr "我們已經在你所選擇的檔案中找到一個或多個專案檔案，但一次只能開啟一個專案檔案。我們建議只從那些檔案中匯入模型而不開啟專案。你要繼續操作嗎？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:99 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:94 msgctxt "@action:button" msgid "Import all as models" msgstr "匯入所有模型" @@ -3702,12 +3763,12 @@ msgstr "擠出機 %1" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:189 msgctxt "@action:label" msgid "%1 & material" -msgstr "%1 & 耗材" +msgstr "%1 & 線材" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:191 msgctxt "@action:label" msgid "Material" -msgstr "耗材" +msgstr "線材" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:281 msgctxt "@action:label" @@ -3788,7 +3849,7 @@ msgstr "設定" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml:137 msgctxt "@label" msgid "This configuration is not available because %1 is not recognized. Please visit %2 to download the correct material profile." -msgstr "由於無法識別 %1，因此無法使用此設定。 請連上 %2 下載正確的耗材參數設定。" +msgstr "由於無法識別 %1，因此無法使用此設定。 請連上 %2 下載正確的線材參數設定。" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml:138 msgctxt "@label" @@ -3833,12 +3894,12 @@ msgstr "已啟用" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:267 msgctxt "@label" msgid "Material" -msgstr "耗材" +msgstr "線材" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:394 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml:407 msgctxt "@label" msgid "Use glue for better adhesion with this material combination." -msgstr "在此耗材組合下，使用膠水以獲得較佳的附著。" +msgstr "在此線材組合下，使用膠水以獲得較佳的附著。" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ContextMenu.qml:27 msgctxt "@label" @@ -3857,17 +3918,17 @@ msgctxt "@label" msgid "Number of Copies" msgstr "複製個數" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:33 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:41 msgctxt "@title:menu menubar:file" msgid "&Save Project..." msgstr "儲存專案...（&S）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:54 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:74 msgctxt "@title:menu menubar:file" msgid "&Export..." msgstr "匯出...（&E）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:85 msgctxt "@action:inmenu menubar:file" msgid "Export Selection..." msgstr "匯出選擇..." @@ -3875,7 +3936,7 @@ msgstr "匯出選擇..." #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:13 msgctxt "@label:category menu label" msgid "Material" -msgstr "耗材" +msgstr "線材" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:54 msgctxt "@label:category menu label" @@ -3887,6 +3948,11 @@ msgctxt "@label:category menu label" msgid "Generic" msgstr "通用" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/OpenFilesMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Open File(s)..." +msgstr "開啟檔案." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/PrinterMenu.qml:25 msgctxt "@label:category menu label" msgid "Network enabled printers" @@ -3902,6 +3968,11 @@ msgctxt "@title:menu menubar:file" msgid "Open &Recent" msgstr "最近開啟的檔案（&R）" +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SaveProjectMenu.qml:15 +msgctxt "@title:menu menubar:file" +msgid "Save Project..." +msgstr "儲存專案." + #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:15 msgctxt "@title:menu menubar:settings" msgid "&Printer" @@ -3910,7 +3981,7 @@ msgstr "印表機（&P）" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:29 msgctxt "@title:menu" msgid "&Material" -msgstr "耗材（&M）" +msgstr "線材（&M）" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:44 msgctxt "@action:inmenu" @@ -3927,17 +3998,17 @@ msgctxt "@action:inmenu" msgid "Disable Extruder" msgstr "關閉擠出機" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:16 msgctxt "@action:inmenu" msgid "Visible Settings" msgstr "顯示設定" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:45 msgctxt "@action:inmenu" msgid "Collapse All Categories" msgstr "折疊所有分類" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:51 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingVisibilityPresetsMenu.qml:54 msgctxt "@action:inmenu" msgid "Manage Setting Visibility..." msgstr "管理參數顯示..." @@ -3947,22 +4018,22 @@ msgctxt "@action:inmenu menubar:view" msgid "&Camera position" msgstr "視角位置（&C）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:44 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:45 msgctxt "@action:inmenu menubar:view" msgid "Camera view" msgstr "攝影機檢視" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:48 msgctxt "@action:inmenu menubar:view" msgid "Perspective" msgstr "透視" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:59 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:60 msgctxt "@action:inmenu menubar:view" msgid "Orthographic" msgstr "正交" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:80 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:81 msgctxt "@action:inmenu menubar:view" msgid "&Build plate" msgstr "列印平台（&B）" @@ -4007,12 +4078,12 @@ msgctxt "@label:MonitorStatus" msgid "Please remove the print" msgstr "請取出列印件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:325 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:326 msgctxt "@label" msgid "Abort Print" msgstr "中斷列印" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:338 msgctxt "@label" msgid "Are you sure you want to abort the print?" msgstr "你確定要中斷列印嗎？" @@ -4053,300 +4124,300 @@ msgctxt "@label" msgid "Interface" msgstr "介面" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:216 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:209 msgctxt "@label" msgid "Currency:" msgstr "貨幣：" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:229 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:222 msgctxt "@label" msgid "Theme:" msgstr "主題：" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:285 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:267 msgctxt "@label" msgid "You will need to restart the application for these changes to have effect." msgstr "需重新啟動 Cura，新的設定才能生效。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:302 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:284 msgctxt "@info:tooltip" msgid "Slice automatically when changing settings." msgstr "當設定變更時自動進行切片。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:310 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:292 msgctxt "@option:check" msgid "Slice automatically" msgstr "自動切片" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:306 msgctxt "@label" msgid "Viewport behavior" msgstr "顯示區設定" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:314 msgctxt "@info:tooltip" msgid "Highlight unsupported areas of the model in red. Without support these areas will not print properly." msgstr "模型缺少支撐的區域已以紅色標示。如果沒有支撐這些區域將無法正常列印。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:341 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:323 msgctxt "@option:check" msgid "Display overhang" msgstr "顯示突出部分" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:351 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:333 msgctxt "@info:tooltip" msgid "Highlight missing or extraneous surfaces of the model using warning signs. The toolpaths will often be missing parts of the intended geometry." msgstr "模型缺少或多餘的表面已用警告符號標示。工具路徑是將缺少部份補上的型狀。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:360 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:342 msgctxt "@option:check" msgid "Display model errors" msgstr "顯示模型錯誤" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:350 msgctxt "@info:tooltip" msgid "Moves the camera so the model is in the center of the view when a model is selected" msgstr "當模型被選中時，視角將自動調整到最合適的觀察位置（模型處於正中央）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:373 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:355 msgctxt "@action:button" msgid "Center camera when item is selected" msgstr "當專案被選中時，自動置中視角" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:383 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:365 msgctxt "@info:tooltip" msgid "Should the default zoom behavior of cura be inverted?" msgstr "需要讓 Cura 的預設縮放操作反轉嗎？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:388 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:370 msgctxt "@action:button" msgid "Invert the direction of camera zoom." msgstr "反轉視角縮放方向。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Should zooming move in the direction of the mouse?" msgstr "是否跟隨滑鼠方向進行縮放？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:404 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:386 msgctxt "@info:tooltip" msgid "Zooming towards the mouse is not supported in the orthographic perspective." msgstr "正交透視不支援游標縮放功能。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:409 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:391 msgctxt "@action:button" msgid "Zoom toward mouse direction" msgstr "跟隨滑鼠方向縮放" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:435 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:417 msgctxt "@info:tooltip" msgid "Should models on the platform be moved so that they no longer intersect?" msgstr "需要移動平台上的模型，使它們不再交錯嗎？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:440 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:422 msgctxt "@option:check" msgid "Ensure models are kept apart" msgstr "確保每個模型都保持分離" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:449 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:431 msgctxt "@info:tooltip" msgid "Should models on the platform be moved down to touch the build plate?" msgstr "要將模型下降到碰觸列印平台嗎？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:454 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:436 msgctxt "@option:check" msgid "Automatically drop models to the build plate" msgstr "自動下降模型到列印平台" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:466 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:448 msgctxt "@info:tooltip" msgid "Show caution message in g-code reader." msgstr "在 g-code 讀取器中顯示警告訊息。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:475 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:457 msgctxt "@option:check" msgid "Caution message in g-code reader" msgstr "G-code 讀取器中的警告訊息" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:483 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:465 msgctxt "@info:tooltip" msgid "Should layer be forced into compatibility mode?" msgstr "分層檢視要強制進入相容模式嗎？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:488 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:470 msgctxt "@option:check" msgid "Force layer view compatibility mode (restart required)" msgstr "強制分層檢視相容模式（需要重新啟動）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:498 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:480 msgctxt "@info:tooltip" msgid "Should Cura open at the location it was closed?" msgstr "Cura 應該開啟在前次關閉時的位置嗎？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:503 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:485 msgctxt "@option:check" msgid "Restore window position on start" msgstr "開啟時復原視窗位置" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:513 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:495 msgctxt "@info:tooltip" msgid "What type of camera rendering should be used?" msgstr "使用哪種類型的攝影機渲染？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:520 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:502 msgctxt "@window:text" msgid "Camera rendering:" msgstr "攝影機渲染：" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:531 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:509 msgid "Perspective" msgstr "透視" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:532 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:510 msgid "Orthographic" msgstr "正交" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:563 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:548 msgctxt "@label" msgid "Opening and saving files" msgstr "開啟並儲存檔案" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:555 msgctxt "@info:tooltip" msgid "Should opening files from the desktop or external applications open in the same instance of Cura?" msgstr "從桌面或外部程式開啟檔案時，使用同一 Cura 視窗嗎？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:560 msgctxt "@option:check" msgid "Use a single instance of Cura" msgstr "使用同一 Cura 視窗" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:570 msgctxt "@info:tooltip" msgid "Should models be scaled to the build volume if they are too large?" msgstr "當模型的尺寸過大時，是否將模型自動縮小至列印範圍嗎？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:575 msgctxt "@option:check" msgid "Scale large models" msgstr "縮小過大模型" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:585 msgctxt "@info:tooltip" msgid "An model may appear extremely small if its unit is for example in meters rather than millimeters. Should these models be scaled up?" msgstr "部份模型採用較大的單位(例如：公尺)，導致模型變得非常小，要將這些模型放大嗎？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:590 msgctxt "@option:check" msgid "Scale extremely small models" msgstr "放大過小模型" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:600 msgctxt "@info:tooltip" msgid "Should models be selected after they are loaded?" msgstr "模型載入後要設為被選擇的狀態嗎？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:605 msgctxt "@option:check" msgid "Select models when loaded" msgstr "模型載入後選擇模型" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:615 msgctxt "@info:tooltip" msgid "Should a prefix based on the printer name be added to the print job name automatically?" msgstr "是否自動將印表機名稱作為列印作業名稱的前綴？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:635 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:620 msgctxt "@option:check" msgid "Add machine prefix to job name" msgstr "將印表機名稱前綴添加到列印作業名稱中" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:645 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:630 msgctxt "@info:tooltip" msgid "Should a summary be shown when saving a project file?" msgstr "儲存專案檔案時是否顯示摘要？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:649 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:634 msgctxt "@option:check" msgid "Show summary dialog when saving project" msgstr "儲存專案時顯示摘要對話框" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:659 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:644 msgctxt "@info:tooltip" msgid "Default behavior when opening a project file" msgstr "開啟專案檔案時的預設行為" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:652 msgctxt "@window:text" msgid "Default behavior when opening a project file: " msgstr "開啟專案檔案時的預設行為： " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:681 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:666 msgctxt "@option:openProject" msgid "Always ask me this" msgstr "每次都向我確認" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:682 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:667 msgctxt "@option:openProject" msgid "Always open as a project" msgstr "總是作為一個專案開啟" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:683 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:668 msgctxt "@option:openProject" msgid "Always import models" msgstr "總是匯入模型" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:705 msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "當你對列印參數進行更改然後切換到其他列印參數時，將顯示一個對話框詢問你是否要保留修改。你也可以選擇預設不顯示該對話框。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:728 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "列印參數" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:719 msgctxt "@window:text" msgid "Default behavior for changed setting values when switching to a different profile: " msgstr "當切換到另一組列印參數時，對於被修改過的設定的預設行為： " -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:748 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:734 msgctxt "@option:discardOrKeep" msgid "Always discard changed settings" msgstr "總是放棄修改過的設定" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:749 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:735 msgctxt "@option:discardOrKeep" msgid "Always transfer changed settings to new profile" msgstr "總是將修改過的設定轉移至新的列印參數" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:783 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:770 msgctxt "@label" msgid "Privacy" msgstr "隱私權" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:790 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:777 msgctxt "@info:tooltip" msgid "Should Cura check for updates when the program is started?" msgstr "當 Cura 啟動時，是否自動檢查更新？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:795 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:782 msgctxt "@option:check" msgid "Check for updates on start" msgstr "啟動時檢查更新" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:805 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:792 msgctxt "@info:tooltip" msgid "Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored." msgstr "你願意將關於你的列印資料以匿名形式發送到 Ultimaker 嗎？注意：我們不會記錄或發送任何模型、IP 位址或其他私人資料。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:810 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:797 msgctxt "@option:check" msgid "Send (anonymous) print information" msgstr "（匿名）發送列印資訊" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:819 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:806 msgctxt "@action:button" msgid "More information" msgstr "更多資訊" @@ -4381,50 +4452,60 @@ msgctxt "@action:button" msgid "Export" msgstr "匯出" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:234 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 +msgctxt "@action:button Sending materials to printers" +msgid "Sync with Printers" +msgstr "同步列印機" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" msgid "Printer" msgstr "印表機" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:298 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:274 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 msgctxt "@title:window" msgid "Confirm Remove" msgstr "移除確認" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:301 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:275 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "你確定要移除 %1 嗎？這動作無法復原！" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:323 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 msgctxt "@title:window" msgid "Import Material" -msgstr "匯入耗材設定" +msgstr "匯入線材設定" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:324 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:338 msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not import material %1: %2" -msgstr "無法匯入耗材 %1：%2" +msgstr "無法匯入線材 %1：%2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:328 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:342 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" -msgstr "成功匯入耗材 %1" +msgstr "成功匯入線材 %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:346 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:354 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 msgctxt "@title:window" msgid "Export Material" -msgstr "匯出耗材設定" +msgstr "匯出線材設定" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:358 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:372 msgctxt "@info:status Don't translate the XML tags and !" msgid "Failed to export material to %1: %2" -msgstr "無法匯出耗材至 %1：%2" +msgstr "無法匯出線材至 %1：%2" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:364 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:378 msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully exported material to %1" -msgstr "成功匯出耗材至：%1" +msgstr "成功匯出線材至：%1" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 +msgctxt "@title:window" +msgid "Export All Materials" +msgstr "匯出所有線材設定" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" @@ -4439,7 +4520,7 @@ msgstr "直徑更改確認" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:102 msgctxt "@label (%1 is a number)" msgid "The new filament diameter is set to %1 mm, which is not compatible with the current extruder. Do you wish to continue?" -msgstr "新的耗材直徑設定為 %1 mm，這與目前的擠出機不相容。你要繼續嗎？" +msgstr "新的線材直徑設定為 %1 mm，這與目前的擠出機不相容。你要繼續嗎？" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:128 msgctxt "@label" @@ -4449,7 +4530,7 @@ msgstr "顯示名稱" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:148 msgctxt "@label" msgid "Material Type" -msgstr "耗材類型" +msgstr "線材類型" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:158 msgctxt "@label" @@ -4474,17 +4555,17 @@ msgstr "直徑" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:259 msgctxt "@label" msgid "Filament Cost" -msgstr "耗材成本" +msgstr "線材成本" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:276 msgctxt "@label" msgid "Filament weight" -msgstr "耗材重量" +msgstr "線材重量" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:294 msgctxt "@label" msgid "Filament length" -msgstr "耗材長度" +msgstr "線材長度" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:303 msgctxt "@label" @@ -4494,12 +4575,12 @@ msgstr "每公尺成本" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:317 msgctxt "@label" msgid "This material is linked to %1 and shares some of its properties." -msgstr "此耗材與 %1 相關聯，並共享其部份屬性。" +msgstr "此線材與 %1 相關聯，並共享其部份屬性。" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:324 msgctxt "@label" msgid "Unlink Material" -msgstr "解除聯結耗材" +msgstr "解除聯結線材" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:335 msgctxt "@label" @@ -4536,52 +4617,52 @@ msgctxt "@info" msgid "Please provide a name for this profile." msgstr "請為此參數提供一個名字。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:260 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:263 msgctxt "@title:window" msgid "Duplicate Profile" msgstr "複製列印參數" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:291 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:294 msgctxt "@title:window" msgid "Rename Profile" msgstr "重命名列印參數" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:304 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:307 msgctxt "@title:window" msgid "Import Profile" msgstr "匯入列印參數" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:333 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:336 msgctxt "@title:window" msgid "Export Profile" msgstr "匯出列印參數" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:396 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:399 msgctxt "@label %1 is printer name" msgid "Printer: %1" msgstr "印表機：%1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:554 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:557 msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "使用目前設定 / 覆寫值更新列印參數" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:561 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 msgctxt "@action:button" msgid "Discard current changes" msgstr "捨棄目前更改" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:580 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:583 msgctxt "@action:label" msgid "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below." msgstr "此列印參數使用印表機指定的預設值，因此在下面的清單中沒有此設定項。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:588 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:591 msgctxt "@action:label" msgid "Your current settings match the selected profile." msgstr "你目前的設定與選定的列印參數相匹配。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:606 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:609 msgctxt "@title:tab" msgid "Global Settings" msgstr "全局設定" @@ -4611,12 +4692,12 @@ msgctxt "@title:column" msgid "Unit" msgstr "單位" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:14 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:16 msgctxt "@title:tab" msgid "Setting Visibility" msgstr "參數顯示設定" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:46 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:48 msgctxt "@label:textbox" msgid "Check all" msgstr "全選" @@ -4659,12 +4740,12 @@ msgstr "列印前預先加熱。你可以在加熱時繼續調整你的列印， #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:406 msgctxt "@tooltip" msgid "The colour of the material in this extruder." -msgstr "該擠出機中耗材的顏色。" +msgstr "該擠出機中線材的顏色。" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:438 msgctxt "@tooltip" msgid "The material in this extruder." -msgstr "該擠出機中的耗材。" +msgstr "該擠出機中的線材。" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:470 msgctxt "@tooltip" @@ -4951,27 +5032,27 @@ msgctxt "@label:textbox" msgid "Search settings" msgstr "搜尋設定" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:456 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:468 msgctxt "@action:menu" msgid "Copy value to all extruders" msgstr "將設定值複製到所有擠出機" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:465 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:477 msgctxt "@action:menu" msgid "Copy all changed values to all extruders" msgstr "複製所有改變的設定值到所有擠出機" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:502 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:514 msgctxt "@action:menu" msgid "Hide this setting" msgstr "隱藏此設定" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:515 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:527 msgctxt "@action:menu" msgid "Don't show this setting" msgstr "不再顯示此設定" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:519 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:531 msgctxt "@action:menu" msgid "Keep this setting visible" msgstr "保持此設定顯示" @@ -5031,11 +5112,6 @@ msgctxt "@button" msgid "Add printer manually" msgstr "手動新增印表機" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddCloudPrintersView.qml:218 -msgctxt "@button" -msgid "Finish" -msgstr "完成" - #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml:230 msgctxt "@label" msgid "Manufacturer" @@ -5141,32 +5217,32 @@ msgctxt "@button" msgid "Connect" msgstr "連接" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:43 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/ChangelogContent.qml:24 msgctxt "@label" -msgid "Ultimaker Account" -msgstr "Ultimaker 帳號" +msgid "Release Notes" +msgstr "發佈通知" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:124 msgctxt "@text" -msgid "Your key to connected 3D printing" -msgstr "連線 3D 列印的金鑰" +msgid "Add material settings and plugins from the Marketplace" +msgstr "從市集中加入線材設定或插件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:101 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:154 msgctxt "@text" -msgid "- Customize your experience with more print profiles and plugins" -msgstr "- 使用更多的列印參數設定和外掛訂做你的使用體驗" +msgid "Backup and sync your material settings and plugins" +msgstr "備份及同步您的線材設定與插件" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:104 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:184 msgctxt "@text" -msgid "- Stay flexible by syncing your setup and loading it anywhere" -msgstr "- 通過同步設定可在任何地方將其載入以保持靈活性" +msgid "Share ideas and get help from 48,000+ users in the Ultimaker Community" +msgstr "分享創意並可從Ultimaker社群中超過48000的使用者得到幫助" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:107 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:217 msgctxt "@text" -msgid "- Increase efficiency with a remote workflow on Ultimaker printers" -msgstr "- 透過 Ultimaker 印表機上的遠端工作流程提高效率" +msgid "Create a free Ultimaker Account" +msgstr "創建免費的Ultimaker帳戶" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:230 msgctxt "@button" msgid "Skip" msgstr "略過" @@ -5189,7 +5265,7 @@ msgstr "機器類型" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:77 msgctxt "@text" msgid "Material usage" -msgstr "耗材用法" +msgstr "線材用法" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:83 msgctxt "@text" @@ -5226,29 +5302,30 @@ msgctxt "@button" msgid "Decline and close" msgstr "拒絕並關閉" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:29 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:56 msgctxt "@label" msgid "Welcome to Ultimaker Cura" msgstr "歡迎來到 Ultimaker Cura" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:47 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:68 msgctxt "@text" -msgid "" -"Please follow these steps to set up\n" -"Ultimaker Cura. This will only take a few moments." -msgstr "" -"請按照以下步驟進行設定\n" -"Ultimaker Cura。這只需要一點時間。" +msgid "Please follow these steps to set up Ultimaker Cura. This will only take a few moments." +msgstr "請依照步驟安裝Ultimaker Cura. 這會需要幾分鐘的時間." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:58 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WelcomeContent.qml:86 msgctxt "@button" msgid "Get started" msgstr "開始" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:24 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:28 msgctxt "@label" -msgid "What's new in Ultimaker Cura" -msgstr "Ultimaker Cura 新功能" +msgid "What's New" +msgstr "新功能" + +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Widgets/ComboBox.qml:24 +msgctxt "@label" +msgid "No items to select from" +msgstr "沒有可選取的專案" #: ModelChecker/plugin.json msgctxt "description" @@ -5330,6 +5407,16 @@ msgctxt "name" msgid "Cura Profile Writer" msgstr "Cura 列印參數寫入器" +#: DigitalLibrary/plugin.json +msgctxt "description" +msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." +msgstr "連結至\"數位博物館\"，允許Cura從\"數位博物館\"打開或保存文件." + +#: DigitalLibrary/plugin.json +msgctxt "name" +msgid "Ultimaker Digital Library" +msgstr "Ultimaker 數位博物館" + #: FirmwareUpdateChecker/plugin.json msgctxt "description" msgid "Checks for firmware updates." @@ -5800,6 +5887,26 @@ msgctxt "name" msgid "Version Upgrade 4.7 to 4.8" msgstr "升級版本 4.7 到 4.8" +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." +msgstr "將設定從 Cura 4.8 版本升級至 4.9 版本。" + +#: VersionUpgrade/VersionUpgrade48to49/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.8 to 4.9" +msgstr "升級版本 4.8 到 4.9" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "description" +msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." +msgstr "將設定從 Cura 4.9 版本升級至 4.10 版本。" + +#: VersionUpgrade/VersionUpgrade49to410/plugin.json +msgctxt "name" +msgid "Version Upgrade 4.9 to 4.10" +msgstr "升級版本 4.9 到 4.10" + #: X3DReader/plugin.json msgctxt "description" msgid "Provides support for reading X3D files." @@ -5813,12 +5920,12 @@ msgstr "X3D 讀取器" #: XmlMaterialProfile/plugin.json msgctxt "description" msgid "Provides capabilities to read and write XML-based material profiles." -msgstr "提供讀寫 XML 格式耗材參數的功能。" +msgstr "提供讀寫 XML 格式線材參數的功能。" #: XmlMaterialProfile/plugin.json msgctxt "name" msgid "Material Profiles" -msgstr "耗材參數" +msgstr "線材參數" #: XRayView/plugin.json msgctxt "description" @@ -5830,6 +5937,91 @@ msgctxt "name" msgid "X-Ray View" msgstr "透視檢視" +#~ msgctxt "@info:status" +#~ msgid "Global stack is missing." +#~ msgstr "全域堆疊遺失。" + +#~ msgctxt "@info:status" +#~ msgid "Your model is not manifold. The highlighted areas indicate either missing or extraneous surfaces." +#~ msgstr "模型沒有封閉，標示的區域有缺少或多餘的表面。" + +#~ msgctxt "@info:title" +#~ msgid "Model errors" +#~ msgstr "模型錯誤" + +#~ msgctxt "@label:listbox" +#~ msgid "Layer thickness" +#~ msgstr "層厚" + +#~ msgctxt "@label" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "連線 3D 列印的金鑰" + +#~ msgctxt "@text" +#~ msgid "" +#~ "- Customize your experience with more print profiles and plugins\n" +#~ "- Stay flexible by syncing your setup and loading it anywhere\n" +#~ "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "" +#~ "- 使用更多的列印參數設定和外掛訂做你的使用體驗\n" +#~ "- 通過同步設定可在任何地方將其載入以保持靈活性\n" +#~ "- 透過 Ultimaker 印表機上的遠端工作流程提高效率" + +#~ msgctxt "@button" +#~ msgid "Create account" +#~ msgstr "建立帳號" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Delete Selected Model" +#~ msgid_plural "Delete Selected Models" +#~ msgstr[0] "刪除所選模型" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Center Selected Model" +#~ msgid_plural "Center Selected Models" +#~ msgstr[0] "置中所選模型" + +#~ msgctxt "@action:inmenu menubar:edit" +#~ msgid "Multiply Selected Model" +#~ msgid_plural "Multiply Selected Models" +#~ msgstr[0] "複製所選模型" + +#~ msgctxt "@button" +#~ msgid "Finish" +#~ msgstr "完成" + +#~ msgctxt "@label" +#~ msgid "Ultimaker Account" +#~ msgstr "Ultimaker 帳號" + +#~ msgctxt "@text" +#~ msgid "Your key to connected 3D printing" +#~ msgstr "連線 3D 列印的金鑰" + +#~ msgctxt "@text" +#~ msgid "- Customize your experience with more print profiles and plugins" +#~ msgstr "- 使用更多的列印參數設定和外掛訂做你的使用體驗" + +#~ msgctxt "@text" +#~ msgid "- Stay flexible by syncing your setup and loading it anywhere" +#~ msgstr "- 通過同步設定可在任何地方將其載入以保持靈活性" + +#~ msgctxt "@text" +#~ msgid "- Increase efficiency with a remote workflow on Ultimaker printers" +#~ msgstr "- 透過 Ultimaker 印表機上的遠端工作流程提高效率" + +#~ msgctxt "@text" +#~ msgid "" +#~ "Please follow these steps to set up\n" +#~ "Ultimaker Cura. This will only take a few moments." +#~ msgstr "" +#~ "請按照以下步驟進行設定\n" +#~ "Ultimaker Cura。這只需要一點時間。" + +#~ msgctxt "@label" +#~ msgid "What's new in Ultimaker Cura" +#~ msgstr "Ultimaker Cura 新功能" + #~ msgctxt "@label ({} is object name)" #~ msgid "Are you sure you wish to remove {}? This cannot be undone!" #~ msgstr "你確認要移除 {}？此動作無法復原！" diff --git a/resources/i18n/zh_TW/fdmextruder.def.json.po b/resources/i18n/zh_TW/fdmextruder.def.json.po index 91f018db7c..15eaf9e315 100644 --- a/resources/i18n/zh_TW/fdmextruder.def.json.po +++ b/resources/i18n/zh_TW/fdmextruder.def.json.po @@ -1,21 +1,21 @@ # Cura JSON setting files -# Copyright (C) 2017 Ultimaker +# Copyright (C) 2021 Ultimaker # This file is distributed under the same license as the Cura package. -# Ruben Dulek , 2020. +# Ruben Dulek , 2021. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2019-03-03 14:09+0800\n" -"Last-Translator: Zhang Heh Ji \n" -"Language-Team: Zhang Heh Ji \n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-04-16 20:13+0200\n" +"Last-Translator: Valen Chang \n" +"Language-Team: Valen Chang /Zhang Heh Ji \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2\n" +"X-Generator: Poedit 2.4.1\n" #: fdmextruder.def.json msgctxt "machine_settings label" @@ -210,12 +210,12 @@ msgstr "列印開始時，噴頭在 Y 軸座標上初始位置。" #: fdmextruder.def.json msgctxt "material label" msgid "Material" -msgstr "耗材" +msgstr "線材" #: fdmextruder.def.json msgctxt "material description" msgid "Material" -msgstr "耗材" +msgstr "線材" #: fdmextruder.def.json msgctxt "material_diameter label" diff --git a/resources/i18n/zh_TW/fdmprinter.def.json.po b/resources/i18n/zh_TW/fdmprinter.def.json.po index a66cfc85f0..8cd0dd8978 100644 --- a/resources/i18n/zh_TW/fdmprinter.def.json.po +++ b/resources/i18n/zh_TW/fdmprinter.def.json.po @@ -1,21 +1,21 @@ # Cura JSON setting files -# Copyright (C) 2019 Ultimaker B.V. +# Copyright (C) 2021 Ultimaker B.V. # This file is distributed under the same license as the Cura package. -# Ruben Dulek , 2020. +# Ruben Dulek , 2021. # msgid "" msgstr "" -"Project-Id-Version: Cura 4.8\n" +"Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" -"POT-Creation-Date: 2020-10-19 13:15+0000\n" -"PO-Revision-Date: 2020-10-31 15:16+0800\n" -"Last-Translator: Zhang Heh Ji \n" -"Language-Team: Zhang Heh Ji \n" +"POT-Creation-Date: 2021-06-10 17:35+0000\n" +"PO-Revision-Date: 2021-06-14 16:21+0800\n" +"Last-Translator: Valen Chang \n" +"Language-Team: Valen Chang /Zhang Heh Ji \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.3\n" +"X-Generator: Poedit 2.4.2\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -78,12 +78,12 @@ msgstr "" #: fdmprinter.def.json msgctxt "material_guid label" msgid "Material GUID" -msgstr "耗材 GUID" +msgstr "線材 GUID" #: fdmprinter.def.json msgctxt "material_guid description" msgid "GUID of the material. This is set automatically." -msgstr "耗材的 GUID，此項為自動設定。" +msgstr "線材的 GUID，此項為自動設定。" #: fdmprinter.def.json msgctxt "material_diameter label" @@ -93,7 +93,7 @@ msgstr "直徑" #: fdmprinter.def.json msgctxt "material_diameter description" msgid "Adjusts the diameter of the filament used. Match this value with the diameter of the used filament." -msgstr "調整所使用耗材的直徑。這個數值要等同於所使用耗材的直徑。" +msgstr "調整所使用線材的直徑。這個數值要等同於所使用線材的直徑。" #: fdmprinter.def.json msgctxt "material_bed_temp_wait label" @@ -118,7 +118,7 @@ msgstr "是否在開始時等待噴頭達到設定溫度。" #: fdmprinter.def.json msgctxt "material_print_temp_prepend label" msgid "Include Material Temperatures" -msgstr "插入耗材溫度" +msgstr "插入線材溫度" #: fdmprinter.def.json msgctxt "material_print_temp_prepend description" @@ -303,7 +303,7 @@ msgstr "加熱區長度" #: fdmprinter.def.json msgctxt "machine_heat_zone_length description" msgid "The distance from the tip of the nozzle in which heat from the nozzle is transferred to the filament." -msgstr "與噴頭尖端的距離，噴頭產生的熱量在這段距離內傳遞到耗材中。" +msgstr "與噴頭尖端的距離，噴頭產生的熱量在這段距離內傳遞到線材中。" #: fdmprinter.def.json msgctxt "machine_nozzle_temp_enabled label" @@ -420,6 +420,26 @@ msgctxt "machine_extruders_share_heater description" msgid "Whether the extruders share a single heater rather than each extruder having its own heater." msgstr "擠出機共用一個加熱器，而不是每個擠出機都有獨立的加熱器。" +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle label" +msgid "Extruders Share Nozzle" +msgstr "擠出機共用噴頭" + +#: fdmprinter.def.json +msgctxt "machine_extruders_share_nozzle description" +msgid "Whether the extruders share a single nozzle rather than each extruder having its own nozzle. When set to true, it is expected that the printer-start gcode script properly sets up all extruders in an initial retraction state that is known and mutually compatible (either zero or one filament not retracted); in that case the initial retraction status is described, per extruder, by the 'machine_extruders_shared_nozzle_initial_retraction' parameter." +msgstr "擠出機共用一個噴頭，而不是每個擠出機都有獨立的噴頭。當設置為\"同意\"時,預期\"Printer-start G-code\"已妥善設定擠出機之初始回抽值互相相容(設置為0或其一線材不回抽); 在此種情況下,每個擠出機之初始回抽值已透過機器.擠出機.共用噴頭.初始回抽值等參數描述設定." + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction label" +msgid "Shared Nozzle Initial Retraction" +msgstr "共用噴頭初始回抽" + +#: fdmprinter.def.json +msgctxt "machine_extruders_shared_nozzle_initial_retraction description" +msgid "How much the filament of each extruder is assumed to have been retracted from the shared nozzle tip at the completion of the printer-start gcode script; the value should be equal to or greater than the length of the common part of the nozzle's ducts." +msgstr "在完成\"Printer-start G-code\"後，各擠出機將從共用噴頭回抽多少的線材。此數值應等於或大於噴頭的共用管道長度。" + #: fdmprinter.def.json msgctxt "machine_disallowed_areas label" msgid "Disallowed Areas" @@ -487,8 +507,8 @@ msgstr "擠出機偏移量" #: fdmprinter.def.json msgctxt "machine_use_extruder_offset_to_offset_coords description" -msgid "Apply the extruder offset to the coordinate system." -msgstr "將擠出機偏移量套用到座標軸系統。" +msgid "Apply the extruder offset to the coordinate system. Affects all extruders." +msgstr "開啟擠出機補償並應用於所有擠出機." #: fdmprinter.def.json msgctxt "extruder_prime_pos_z label" @@ -548,7 +568,7 @@ msgstr "最大進料速率" #: fdmprinter.def.json msgctxt "machine_max_feedrate_e description" msgid "The maximum speed of the filament." -msgstr "耗材的最大速度。" +msgstr "線材的最大速度。" #: fdmprinter.def.json msgctxt "machine_max_acceleration_x label" @@ -718,7 +738,7 @@ msgstr "進料輪直徑" #: fdmprinter.def.json msgctxt "machine_feeder_wheel_diameter description" msgid "The diameter of the wheel that drives the material in the feeder." -msgstr "帶動進料器中耗材的輪子的直徑。" +msgstr "帶動進料器中線材的輪子的直徑。" #: fdmprinter.def.json msgctxt "resolution label" @@ -882,8 +902,8 @@ msgstr "第一層線寬倍數。增大此倍數可改善熱床附著。" #: fdmprinter.def.json msgctxt "shell label" -msgid "Shell" -msgstr "外殼" +msgid "Walls" +msgstr "牆" #: fdmprinter.def.json msgctxt "shell description" @@ -950,166 +970,6 @@ msgctxt "wall_0_wipe_dist description" msgid "Distance of a travel move inserted after the outer wall, to hide the Z seam better." msgstr "在列印外壁後插入的空跑距離，以便消除隱藏 Z 縫的銜接痕跡。" -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr label" -msgid "Top Surface Skin Extruder" -msgstr "頂部表層擠出機" - -#: fdmprinter.def.json -msgctxt "roofing_extruder_nr description" -msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." -msgstr "用於列印最頂部表層的擠出機組。在多擠出機情況下適用。" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count label" -msgid "Top Surface Skin Layers" -msgstr "頂部表層" - -#: fdmprinter.def.json -msgctxt "roofing_layer_count description" -msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." -msgstr "最頂部表層層數。通常只需一層最頂部就足以產生較高品質的頂部表面。" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr label" -msgid "Top/Bottom Extruder" -msgstr "頂部/底部擠出機" - -#: fdmprinter.def.json -msgctxt "top_bottom_extruder_nr description" -msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." -msgstr "用於列印頂部和底部表層的擠出機組。在多擠出機情況下適用。" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness label" -msgid "Top/Bottom Thickness" -msgstr "頂部 / 底部厚度" - -#: fdmprinter.def.json -msgctxt "top_bottom_thickness description" -msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." -msgstr "列印模型中頂部/底部的厚度。該值除以層高決定頂部/底部的層數。" - -#: fdmprinter.def.json -msgctxt "top_thickness label" -msgid "Top Thickness" -msgstr "頂部厚度" - -#: fdmprinter.def.json -msgctxt "top_thickness description" -msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." -msgstr "列印模型中頂部的厚度。該值除以層高決定頂部的層數。" - -#: fdmprinter.def.json -msgctxt "top_layers label" -msgid "Top Layers" -msgstr "頂部層數" - -#: fdmprinter.def.json -msgctxt "top_layers description" -msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." -msgstr "頂部列印層數，當由頂部厚度來計算時層數時，會四捨五入為一個整數值。" - -#: fdmprinter.def.json -msgctxt "bottom_thickness label" -msgid "Bottom Thickness" -msgstr "底部厚度" - -#: fdmprinter.def.json -msgctxt "bottom_thickness description" -msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." -msgstr "列印模型中底部的厚度。此值除以層高決定底部的層數。" - -#: fdmprinter.def.json -msgctxt "bottom_layers label" -msgid "Bottom Layers" -msgstr "底部層數" - -#: fdmprinter.def.json -msgctxt "bottom_layers description" -msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "底部列印層數，當由底部厚度來計算時層數時，會四捨五入為一個整數值。" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers label" -msgid "Initial Bottom Layers" -msgstr "起始底部層數" - -#: fdmprinter.def.json -msgctxt "initial_bottom_layers description" -msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." -msgstr "從列印平台列印的起始底部列印層數，當由底部厚度來計算時層數時，會四捨五入為一個整數值。" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern label" -msgid "Top/Bottom Pattern" -msgstr "頂部/底部填充樣式" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern description" -msgid "The pattern of the top/bottom layers." -msgstr "頂部/底部的列印樣式。" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option lines" -msgid "Lines" -msgstr "直線" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option concentric" -msgid "Concentric" -msgstr "同心" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern option zigzag" -msgid "Zig Zag" -msgstr "鋸齒狀" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 label" -msgid "Bottom Pattern Initial Layer" -msgstr "起始層列印樣式" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 description" -msgid "The pattern on the bottom of the print on the first layer." -msgstr "列印件底部第一層的列印樣式。" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option lines" -msgid "Lines" -msgstr "直線" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option concentric" -msgid "Concentric" -msgstr "同心" - -#: fdmprinter.def.json -msgctxt "top_bottom_pattern_0 option zigzag" -msgid "Zig Zag" -msgstr "鋸齒狀" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons label" -msgid "Connect Top/Bottom Polygons" -msgstr "連接頂部/底部多邊形" - -#: fdmprinter.def.json -msgctxt "connect_skin_polygons description" -msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." -msgstr "將頂部/底部表層路徑相鄰的位置連接。同心模式時啟用此設定，可以大大地減少移動時間。但因連接可能碰巧在途中跨越填充，所以此功能可能會降低頂部表層的品質。" - -#: fdmprinter.def.json -msgctxt "skin_angles label" -msgid "Top/Bottom Line Directions" -msgstr "頂部/底部線條方向" - -#: fdmprinter.def.json -msgctxt "skin_angles description" -msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." -msgstr "當頂部/底部採用線條或鋸齒狀的列印樣式時使用的整數線條方向的清單。清單中的元素隨層的進度依次使用，當達到清單末尾時，它將從頭開始。清單元素以逗號分隔，整個清單包含在方括號中。空的清單代表使用傳統的預設角度（45 和 135 度）。" - #: fdmprinter.def.json msgctxt "wall_0_inset label" msgid "Outer Wall Inset" @@ -1188,7 +1048,7 @@ msgstr "最小牆壁流量" #: fdmprinter.def.json msgctxt "wall_min_flow description" msgid "Minimum allowed percentage flow for a wall line. The wall overlap compensation reduces a wall's flow when it lies close to an existing wall. Walls whose flow is less than this value will be replaced with a travel move. When using this setting, you must enable the wall overlap compensation and print the outer wall before inner walls." -msgstr "牆壁允許的最小流量百分比。當在已列印的牆壁旁列印牆壁時，「補償牆壁重疊」會減少耗材流量。小於此設定流量的牆壁會被空跑取代。當啟用此設定時，必需啟用「補償牆壁重疊」並設定先列印外壁再列印內壁。" +msgstr "牆壁允許的最小流量百分比。當在已列印的牆壁旁列印牆壁時，「補償牆壁重疊」會減少線材流量。小於此設定流量的牆壁會被空跑取代。當啟用此設定時，必需啟用「補償牆壁重疊」並設定先列印外壁再列印內壁。" #: fdmprinter.def.json msgctxt "wall_min_flow_retract label" @@ -1415,6 +1275,176 @@ msgctxt "z_seam_relative description" msgid "When enabled, the z seam coordinates are relative to each part's centre. When disabled, the coordinates define an absolute position on the build plate." msgstr "啟用時，Z 接縫座標為相對於各個部分中心的值。關閉時，座標固定在列印平台上的一個絕對位置。" +#: fdmprinter.def.json +msgctxt "top_bottom label" +msgid "Top/Bottom" +msgstr "頂層" + +#: fdmprinter.def.json +msgctxt "top_bottom description" +msgid "Top/Bottom" +msgstr "頂層" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr label" +msgid "Top Surface Skin Extruder" +msgstr "頂部表層擠出機" + +#: fdmprinter.def.json +msgctxt "roofing_extruder_nr description" +msgid "The extruder train used for printing the top most skin. This is used in multi-extrusion." +msgstr "用於列印最頂部表層的擠出機組。在多擠出機情況下適用。" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count label" +msgid "Top Surface Skin Layers" +msgstr "頂部表層" + +#: fdmprinter.def.json +msgctxt "roofing_layer_count description" +msgid "The number of top most skin layers. Usually only one top most layer is sufficient to generate higher quality top surfaces." +msgstr "最頂部表層層數。通常只需一層最頂部就足以產生較高品質的頂部表面。" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr label" +msgid "Top/Bottom Extruder" +msgstr "頂部/底部擠出機" + +#: fdmprinter.def.json +msgctxt "top_bottom_extruder_nr description" +msgid "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion." +msgstr "用於列印頂部和底部表層的擠出機組。在多擠出機情況下適用。" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness label" +msgid "Top/Bottom Thickness" +msgstr "頂部 / 底部厚度" + +#: fdmprinter.def.json +msgctxt "top_bottom_thickness description" +msgid "The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers." +msgstr "列印模型中頂部/底部的厚度。該值除以層高決定頂部/底部的層數。" + +#: fdmprinter.def.json +msgctxt "top_thickness label" +msgid "Top Thickness" +msgstr "頂部厚度" + +#: fdmprinter.def.json +msgctxt "top_thickness description" +msgid "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers." +msgstr "列印模型中頂部的厚度。該值除以層高決定頂部的層數。" + +#: fdmprinter.def.json +msgctxt "top_layers label" +msgid "Top Layers" +msgstr "頂部層數" + +#: fdmprinter.def.json +msgctxt "top_layers description" +msgid "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number." +msgstr "頂部列印層數，當由頂部厚度來計算時層數時，會四捨五入為一個整數值。" + +#: fdmprinter.def.json +msgctxt "bottom_thickness label" +msgid "Bottom Thickness" +msgstr "底部厚度" + +#: fdmprinter.def.json +msgctxt "bottom_thickness description" +msgid "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers." +msgstr "列印模型中底部的厚度。此值除以層高決定底部的層數。" + +#: fdmprinter.def.json +msgctxt "bottom_layers label" +msgid "Bottom Layers" +msgstr "底部層數" + +#: fdmprinter.def.json +msgctxt "bottom_layers description" +msgid "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "底部列印層數，當由底部厚度來計算時層數時，會四捨五入為一個整數值。" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers label" +msgid "Initial Bottom Layers" +msgstr "起始底部層數" + +#: fdmprinter.def.json +msgctxt "initial_bottom_layers description" +msgid "The number of initial bottom layers, from the build-plate upwards. When calculated by the bottom thickness, this value is rounded to a whole number." +msgstr "從列印平台列印的起始底部列印層數，當由底部厚度來計算時層數時，會四捨五入為一個整數值。" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern label" +msgid "Top/Bottom Pattern" +msgstr "頂部/底部填充樣式" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern description" +msgid "The pattern of the top/bottom layers." +msgstr "頂部/底部的列印樣式。" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option lines" +msgid "Lines" +msgstr "直線" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option concentric" +msgid "Concentric" +msgstr "同心" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern option zigzag" +msgid "Zig Zag" +msgstr "鋸齒狀" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 label" +msgid "Bottom Pattern Initial Layer" +msgstr "起始層列印樣式" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 description" +msgid "The pattern on the bottom of the print on the first layer." +msgstr "列印件底部第一層的列印樣式。" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option lines" +msgid "Lines" +msgstr "直線" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option concentric" +msgid "Concentric" +msgstr "同心" + +#: fdmprinter.def.json +msgctxt "top_bottom_pattern_0 option zigzag" +msgid "Zig Zag" +msgstr "鋸齒狀" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons label" +msgid "Connect Top/Bottom Polygons" +msgstr "連接頂部/底部多邊形" + +#: fdmprinter.def.json +msgctxt "connect_skin_polygons description" +msgid "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happen midway over infill this feature can reduce the top surface quality." +msgstr "將頂部/底部表層路徑相鄰的位置連接。同心模式時啟用此設定，可以大大地減少移動時間。但因連接可能碰巧在途中跨越填充，所以此功能可能會降低頂部表層的品質。" + +#: fdmprinter.def.json +msgctxt "skin_angles label" +msgid "Top/Bottom Line Directions" +msgstr "頂部/底部線條方向" + +#: fdmprinter.def.json +msgctxt "skin_angles description" +msgid "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees)." +msgstr "當頂部/底部採用線條或鋸齒狀的列印樣式時使用的整數線條方向的清單。清單中的元素隨層的進度依次使用，當達到清單末尾時，它將從頭開始。清單元素以逗號分隔，整個清單包含在方括號中。空的清單代表使用傳統的預設角度（45 和 135 度）。" + #: fdmprinter.def.json msgctxt "skin_no_small_gaps_heuristic label" msgid "No Skin in Z Gaps" @@ -1493,7 +1523,7 @@ msgstr "燙平流量" #: fdmprinter.def.json msgctxt "ironing_flow description" msgid "The amount of material, relative to a normal skin line, to extrude during ironing. Keeping the nozzle filled helps filling some of the crevices of the top surface, but too much results in overextrusion and blips on the side of the surface." -msgstr "燙平期間相對於正常表層線條的擠出耗材量。保持噴頭填充狀态有助於填充頂部表面的一些縫隙，但如填充過多則會導致表面上過度擠出和光點。" +msgstr "燙平期間相對於正常表層線條的擠出線材量。保持噴頭填充狀态有助於填充頂部表面的一些縫隙，但如填充過多則會導致表面上過度擠出和光點。" #: fdmprinter.def.json msgctxt "ironing_inset label" @@ -1555,6 +1585,86 @@ msgctxt "skin_overlap_mm description" msgid "Adjust the amount of overlap between the walls and (the endpoints of) the skin-centerlines. A slight overlap allows the walls to connect firmly to the skin. Note that, given an equal skin and wall line-width, any value over half the width of the wall may already cause any skin to go past the wall, because at that point the position of the nozzle of the skin-extruder may already reach past the middle of the wall." msgstr "調整內壁和表層中心線（的端點）之間的重疊量。輕微的重疊可以讓牆壁牢固地連接到表層。但要注意在表層和內壁線寬度相等的情形下, 超過線寬一半的值可能導致表層越過內壁, 因為此時擠出機噴嘴的位置可能已經超過了內壁線條的中間。" +#: fdmprinter.def.json +msgctxt "skin_preshrink label" +msgid "Skin Removal Width" +msgstr "表層移除寬度" + +#: fdmprinter.def.json +msgctxt "skin_preshrink description" +msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." +msgstr "要移除表層區域的最大寬度。寬度小於此值的表層區域將會消失。這有助於減少在列印模型傾斜的頂部表層和底部表層所花費的時間和線材。" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink label" +msgid "Top Skin Removal Width" +msgstr "頂部表層移除寬度" + +#: fdmprinter.def.json +msgctxt "top_skin_preshrink description" +msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." +msgstr "要移除頂部表層區域的最大寬度。寬度小於此值的頂部表層區域將會消失。這有助於減少在列印模型傾斜的頂部表層所花費的時間和線材。" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink label" +msgid "Bottom Skin Removal Width" +msgstr "底部表層移除寬度" + +#: fdmprinter.def.json +msgctxt "bottom_skin_preshrink description" +msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." +msgstr "要移除底部表層區域的最大寬度。寬度小於此值的底部表層區域將會消失。這有助於減少在列印模型傾斜的底部表層所花費的時間和線材。" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance label" +msgid "Skin Expand Distance" +msgstr "表層延伸距離" + +#: fdmprinter.def.json +msgctxt "expand_skins_expand_distance description" +msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." +msgstr "表層延伸進入填充的距離。值愈高表層與填充之間的附著愈好，並使相鄰層的牆壁與表層黏得更緊。而較低的值可以節省線材的使用。" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance label" +msgid "Top Skin Expand Distance" +msgstr "頂部表層延伸距離" + +#: fdmprinter.def.json +msgctxt "top_skin_expand_distance description" +msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." +msgstr "頂部表層延伸進入填充的距離。值愈高表層與填充之間的附著愈好，並使上方的牆壁與表層黏得更緊。而較低的值可以節省線材的使用。" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance label" +msgid "Bottom Skin Expand Distance" +msgstr "底部表層延伸距離" + +#: fdmprinter.def.json +msgctxt "bottom_skin_expand_distance description" +msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." +msgstr "底部表層延伸進入填充的距離。值愈高表層與填充之間的附著愈好，並使下方的牆壁與表層黏得更緊。而較低的值可以節省線材的使用。" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion label" +msgid "Maximum Skin Angle for Expansion" +msgstr "最大延伸表層角度" + +#: fdmprinter.def.json +msgctxt "max_skin_angle_for_expansion description" +msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal and will cause no skin to be expanded, while an angle of 90° is vertical and will cause all skin to be expanded." +msgstr "當物件頂部與底部表面角度大於此設定值時，將不會產生表層延伸。當模型表面斜率接近垂直時，可避免產生狹小的表層延伸區域。角度0°為水平，將不會產生表層延伸。而角度90°為垂直，所有表層將被延伸。" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion label" +msgid "Minimum Skin Width for Expansion" +msgstr "最小延伸表層寬度" + +#: fdmprinter.def.json +msgctxt "min_skin_width_for_expansion description" +msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." +msgstr "如果表層區域寬度小於此值，則不會延伸。這會避免延伸在模型表面的斜度接近垂直時所形成的狹窄表層區域。" + #: fdmprinter.def.json msgctxt "infill label" msgid "Infill" @@ -1603,7 +1713,7 @@ msgstr "填充列印樣式" #: fdmprinter.def.json msgctxt "infill_pattern description" msgid "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction." -msgstr "選擇填充耗材的樣式。直線和鋸齒狀填充輪流在每一層交換方向，以降低耗材成本。網格、三角形、三-六邊形、立方體、八面體、四分立方體、十字形和同心的列印樣式在每層完整列印。螺旋形、立方體、四分立方體和八面體填充隨每層變化，以在各個方向提供更均衡的强度分布。" +msgstr "選擇填充線材的樣式。直線和鋸齒狀填充輪流在每一層交換方向，以降低線材成本。網格、三角形、三-六邊形、立方體、八面體、四分立方體、十字形和同心的列印樣式在每層完整列印。螺旋形、立方體、四分立方體和八面體填充隨每層變化，以在各個方向提供更均衡的强度分布。" #: fdmprinter.def.json msgctxt "infill_pattern option grid" @@ -1738,7 +1848,7 @@ msgstr "填充線倍增器" #: fdmprinter.def.json msgctxt "infill_multiplier description" msgid "Convert each infill line to this many lines. The extra lines do not cross over each other, but avoid each other. This makes the infill stiffer, but increases print time and material usage." -msgstr "將每條填充線轉換為此數量。 額外的線條不會相互交叉，而是相互避開。 這會使填充更硬，但增加了列印時間和耗材使用。" +msgstr "將每條填充線轉換為此數量。 額外的線條不會相互交叉，而是相互避開。 這會使填充更硬，但增加了列印時間和線材使用。" #: fdmprinter.def.json msgctxt "infill_wall_line_count label" @@ -1852,7 +1962,7 @@ msgstr "填充支撐" #: fdmprinter.def.json msgctxt "infill_support_enabled description" msgid "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength." -msgstr "只在模型頂部需要支撐的地方才列印填充。啟用此功能可減少列印時間和耗材用量，但會導致物件強度不均勻。" +msgstr "只在模型頂部需要支撐的地方才列印填充。啟用此功能可減少列印時間和線材用量，但會導致物件強度不均勻。" #: fdmprinter.def.json msgctxt "infill_support_angle label" @@ -1864,86 +1974,6 @@ msgctxt "infill_support_angle description" msgid "The minimum angle of internal overhangs for which infill is added. At a value of 0° objects are totally filled with infill, 90° will not provide any infill." msgstr "添加填充的最小向內突出角度。設為 0° 時，物件將完全填充，設為 90° 時，不提供任何填充。" -#: fdmprinter.def.json -msgctxt "skin_preshrink label" -msgid "Skin Removal Width" -msgstr "表層移除寬度" - -#: fdmprinter.def.json -msgctxt "skin_preshrink description" -msgid "The largest width of skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top/bottom skin at slanted surfaces in the model." -msgstr "要移除表層區域的最大寬度。寬度小於此值的表層區域將會消失。這有助於減少在列印模型傾斜的頂部表層和底部表層所花費的時間和耗材。" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink label" -msgid "Top Skin Removal Width" -msgstr "頂部表層移除寬度" - -#: fdmprinter.def.json -msgctxt "top_skin_preshrink description" -msgid "The largest width of top skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing top skin at slanted surfaces in the model." -msgstr "要移除頂部表層區域的最大寬度。寬度小於此值的頂部表層區域將會消失。這有助於減少在列印模型傾斜的頂部表層所花費的時間和耗材。" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink label" -msgid "Bottom Skin Removal Width" -msgstr "底部表層移除寬度" - -#: fdmprinter.def.json -msgctxt "bottom_skin_preshrink description" -msgid "The largest width of bottom skin areas which are to be removed. Every skin area smaller than this value will disappear. This can help in limiting the amount of time and material spent on printing bottom skin at slanted surfaces in the model." -msgstr "要移除底部表層區域的最大寬度。寬度小於此值的底部表層區域將會消失。這有助於減少在列印模型傾斜的底部表層所花費的時間和耗材。" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance label" -msgid "Skin Expand Distance" -msgstr "表層延伸距離" - -#: fdmprinter.def.json -msgctxt "expand_skins_expand_distance description" -msgid "The distance the skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on neighboring layers adhere better to the skin. Lower values save amount of material used." -msgstr "表層延伸進入填充的距離。值愈高表層與填充之間的附著愈好，並使相鄰層的牆壁與表層黏得更緊。而較低的值可以節省耗材的使用。" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance label" -msgid "Top Skin Expand Distance" -msgstr "頂部表層延伸距離" - -#: fdmprinter.def.json -msgctxt "top_skin_expand_distance description" -msgid "The distance the top skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the walls on the layer above adhere better to the skin. Lower values save amount of material used." -msgstr "頂部表層延伸進入填充的距離。值愈高表層與填充之間的附著愈好，並使上方的牆壁與表層黏得更緊。而較低的值可以節省耗材的使用。" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance label" -msgid "Bottom Skin Expand Distance" -msgstr "底部表層延伸距離" - -#: fdmprinter.def.json -msgctxt "bottom_skin_expand_distance description" -msgid "The distance the bottom skins are expanded into the infill. Higher values makes the skin attach better to the infill pattern and makes the skin adhere better to the walls on the layer below. Lower values save amount of material used." -msgstr "底部表層延伸進入填充的距離。值愈高表層與填充之間的附著愈好，並使下方的牆壁與表層黏得更緊。而較低的值可以節省耗材的使用。" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion label" -msgid "Maximum Skin Angle for Expansion" -msgstr "最大延伸表層角度" - -#: fdmprinter.def.json -msgctxt "max_skin_angle_for_expansion description" -msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." -msgstr "如果模型的頂部和/或底部表面的角度大於此設定，則不要延伸其頂部/底部表層。這會避免延伸作用在模型表面有接近垂直的斜面時所形成的狹窄表層區域。0° 的角為水平，90° 的角為垂直。" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion label" -msgid "Minimum Skin Width for Expansion" -msgstr "最小延伸表層寬度" - -#: fdmprinter.def.json -msgctxt "min_skin_width_for_expansion description" -msgid "Skin areas narrower than this are not expanded. This avoids expanding the narrow skin areas that are created when the model surface has a slope close to the vertical." -msgstr "如果表層區域寬度小於此值，則不會延伸。這會避免延伸在模型表面的斜度接近垂直時所形成的狹窄表層區域。" - #: fdmprinter.def.json msgctxt "skin_edge_support_thickness label" msgid "Skin Edge Support Thickness" @@ -1967,12 +1997,12 @@ msgstr "支撐表層邊緣的額外填充的層數。" #: fdmprinter.def.json msgctxt "material label" msgid "Material" -msgstr "耗材" +msgstr "線材" #: fdmprinter.def.json msgctxt "material description" msgid "Material" -msgstr "耗材" +msgstr "線材" #: fdmprinter.def.json msgctxt "default_material_print_temperature label" @@ -1982,7 +2012,7 @@ msgstr "預設列印溫度" #: fdmprinter.def.json msgctxt "default_material_print_temperature description" msgid "The default temperature used for printing. This should be the \"base\" temperature of a material. All other print temperatures should use offsets based on this value" -msgstr "用於列印的預設溫度。應為耗材的溫度\"基礎值\"。其他列印溫度將以此值為基準計算偏移" +msgstr "用於列印的預設溫度。應為線材的溫度\"基礎值\"。其他列印溫度將以此值為基準計算偏移" #: fdmprinter.def.json msgctxt "build_volume_temperature label" @@ -2102,17 +2132,17 @@ msgstr "收縮補償放大倍率" #: fdmprinter.def.json msgctxt "material_shrinkage_percentage description" msgid "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor." -msgstr "為了補償耗材在冷卻時的收縮，模型會依此比例放大列印。" +msgstr "為了補償線材在冷卻時的收縮，模型會依此比例放大列印。" #: fdmprinter.def.json msgctxt "material_crystallinity label" msgid "Crystalline Material" -msgstr "晶狀耗材" +msgstr "晶狀線材" #: fdmprinter.def.json msgctxt "material_crystallinity description" msgid "Is this material the type that breaks off cleanly when heated (crystalline), or is it the type that produces long intertwined polymer chains (non-crystalline)?" -msgstr "這種耗材高溫時是脆斷的類型（晶狀），還是拉絲的類型（非晶狀）？" +msgstr "這種線材高溫時是脆斷的類型（晶狀），還是拉絲的類型（非晶狀）？" #: fdmprinter.def.json msgctxt "material_anti_ooze_retracted_position label" @@ -2122,7 +2152,7 @@ msgstr "防滲漏回抽位置" #: fdmprinter.def.json msgctxt "material_anti_ooze_retracted_position description" msgid "How far the material needs to be retracted before it stops oozing." -msgstr "停止滲漏要回抽耗材多長的距離。" +msgstr "停止滲漏要回抽線材多長的距離。" #: fdmprinter.def.json msgctxt "material_anti_ooze_retraction_speed label" @@ -2132,7 +2162,7 @@ msgstr "防滲漏回抽速度" #: fdmprinter.def.json msgctxt "material_anti_ooze_retraction_speed description" msgid "How fast the material needs to be retracted during a filament switch to prevent oozing." -msgstr "在耗材切換回抽時，需要多快的速度來防止滲漏。" +msgstr "在線材切換回抽時，需要多快的速度來防止滲漏。" #: fdmprinter.def.json msgctxt "material_break_preparation_retracted_position label" @@ -2142,7 +2172,7 @@ msgstr "回抽切斷前位置" #: fdmprinter.def.json msgctxt "material_break_preparation_retracted_position description" msgid "How far the filament can be stretched before it breaks, while heated." -msgstr "在加熱時，耗材在脆斷前可以拉伸多長的距離。" +msgstr "在加熱時，線材在脆斷前可以拉伸多長的距離。" #: fdmprinter.def.json msgctxt "material_break_preparation_speed label" @@ -2152,7 +2182,7 @@ msgstr "回抽切斷前速度" #: fdmprinter.def.json msgctxt "material_break_preparation_speed description" msgid "How fast the filament needs to be retracted just before breaking it off in a retraction." -msgstr "回抽切斷前，耗材回抽的速度。" +msgstr "回抽切斷前，線材回抽的速度。" #: fdmprinter.def.json msgctxt "material_break_preparation_temperature label" @@ -2162,7 +2192,7 @@ msgstr "回抽切斷溫度" #: fdmprinter.def.json msgctxt "material_break_preparation_temperature description" msgid "The temperature used to purge material, should be roughly equal to the highest possible printing temperature." -msgstr "清洗耗材的溫度，應該約等於可能的最高列印溫度。" +msgstr "清洗線材的溫度，應該約等於可能的最高列印溫度。" #: fdmprinter.def.json msgctxt "material_break_retracted_position label" @@ -2172,7 +2202,7 @@ msgstr "回抽切斷位置" #: fdmprinter.def.json msgctxt "material_break_retracted_position description" msgid "How far to retract the filament in order to break it cleanly." -msgstr "要讓耗材脆斷需要回抽長的距離。" +msgstr "要讓線材脆斷需要回抽長的距離。" #: fdmprinter.def.json msgctxt "material_break_speed label" @@ -2182,7 +2212,7 @@ msgstr "回抽切斷速度" #: fdmprinter.def.json msgctxt "material_break_speed description" msgid "The speed at which to retract the filament in order to break it cleanly." -msgstr "要讓耗材脆斷要回抽多快。" +msgstr "要讓線材脆斷要回抽多快。" #: fdmprinter.def.json msgctxt "material_break_temperature label" @@ -2192,7 +2222,7 @@ msgstr "切斷溫度" #: fdmprinter.def.json msgctxt "material_break_temperature description" msgid "The temperature at which the filament is broken for a clean break." -msgstr "要讓耗材脆斷所需的溫度。" +msgstr "要讓線材脆斷所需的溫度。" #: fdmprinter.def.json msgctxt "material_flush_purge_speed label" @@ -2202,7 +2232,7 @@ msgstr "沖洗速度" #: fdmprinter.def.json msgctxt "material_flush_purge_speed description" msgid "How fast to prime the material after switching to a different material." -msgstr "切換到另一耗材後，用多快的速度擠出耗材做沖洗。" +msgstr "切換到另一線材後，用多快的速度擠出線材做沖洗。" #: fdmprinter.def.json msgctxt "material_flush_purge_length label" @@ -2212,27 +2242,27 @@ msgstr "沖洗長度" #: fdmprinter.def.json msgctxt "material_flush_purge_length description" msgid "How much material to use to purge the previous material out of the nozzle (in length of filament) when switching to a different material." -msgstr "切換到另一耗材時，要使用多少耗材（以耗材長度計算）將噴頭內先前的耗材沖洗出來。" +msgstr "切換到另一線材時，要使用多少線材（以線材長度計算）將噴頭內先前的線材沖洗出來。" #: fdmprinter.def.json msgctxt "material_end_of_filament_purge_speed label" msgid "End of Filament Purge Speed" -msgstr "耗材更換沖洗速度" +msgstr "線材更換沖洗速度" #: fdmprinter.def.json msgctxt "material_end_of_filament_purge_speed description" msgid "How fast to prime the material after replacing an empty spool with a fresh spool of the same material." -msgstr "更換新的一捲相同耗材後，用多快的速度擠出耗材做沖洗。" +msgstr "更換新的一捲相同線材後，用多快的速度擠出線材做沖洗。" #: fdmprinter.def.json msgctxt "material_end_of_filament_purge_length label" msgid "End of Filament Purge Length" -msgstr "耗材更換沖洗長度" +msgstr "線材更換沖洗長度" #: fdmprinter.def.json msgctxt "material_end_of_filament_purge_length description" msgid "How much material to use to purge the previous material out of the nozzle (in length of filament) when replacing an empty spool with a fresh spool of the same material." -msgstr "更換新的一捲相同耗材時，要使用多少耗材（以耗材長度計算）將噴頭內先前的耗材沖洗出來。" +msgstr "更換新的一捲相同線材時，要使用多少線材（以線材長度計算）將噴頭內先前的線材沖洗出來。" #: fdmprinter.def.json msgctxt "material_maximum_park_duration label" @@ -2242,7 +2272,7 @@ msgstr "最長停放時間" #: fdmprinter.def.json msgctxt "material_maximum_park_duration description" msgid "How long the material can be kept out of dry storage safely." -msgstr "耗材可在乾燥箱外安全的存放多久。" +msgstr "線材可在乾燥箱外安全的存放多久。" #: fdmprinter.def.json msgctxt "material_no_load_move_factor label" @@ -2252,7 +2282,7 @@ msgstr "空載移動係數" #: fdmprinter.def.json msgctxt "material_no_load_move_factor description" msgid "A factor indicating how much the filament gets compressed between the feeder and the nozzle chamber, used to determine how far to move the material for a filament switch." -msgstr "一個用來表示耗材在進料器和噴頭腔室之間能被壓縮多少的係數，用來決定耗材切換時需要移動多長。" +msgstr "一個用來表示線材在進料器和噴頭腔室之間能被壓縮多少的係數，用來決定線材切換時需要移動多長。" #: fdmprinter.def.json msgctxt "material_flow label" @@ -2262,7 +2292,7 @@ msgstr "流量" #: fdmprinter.def.json msgctxt "material_flow description" msgid "Flow compensation: the amount of material extruded is multiplied by this value." -msgstr "流量補償：擠出的耗材量乘以此值。" +msgstr "流量補償：擠出的線材量乘以此值。" #: fdmprinter.def.json msgctxt "wall_material_flow label" @@ -2392,7 +2422,7 @@ msgstr "起始層流量" #: fdmprinter.def.json msgctxt "material_flow_layer_0 description" msgid "Flow compensation for the first layer: the amount of material extruded on the initial layer is multiplied by this value." -msgstr "第一層的流量補償：在起始層上擠出的耗材量會乘以此值。" +msgstr "第一層的流量補償：在起始層上擠出的線材量會乘以此值。" #: fdmprinter.def.json msgctxt "material_standby_temperature label" @@ -2542,7 +2572,7 @@ msgstr "換料塔速度" #: fdmprinter.def.json msgctxt "speed_prime_tower description" msgid "The speed at which the prime tower is printed. Printing the prime tower slower can make it more stable when the adhesion between the different filaments is suboptimal." -msgstr "列印換料塔的速度。當不同耗材之間的黏合力不佳時，較慢地列印速度可以讓它更穩定。" +msgstr "列印換料塔的速度。當不同線材之間的黏合力不佳時，較慢地列印速度可以讓它更穩定。" #: fdmprinter.def.json msgctxt "speed_travel label" @@ -2561,8 +2591,8 @@ msgstr "起始層速度" #: fdmprinter.def.json msgctxt "speed_layer_0 description" -msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." -msgstr "起始層的速度。建議採用較低的值以便改善與列印平台的附著。" +msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate. Does not affect the build plate adhesion structures themselves, like brim and raft." +msgstr "初始層速度, 建議以一個較低的值去改善列印平台的附著. 並不影響模型的附著方式,例如開啟邊緣或木筏." #: fdmprinter.def.json msgctxt "speed_print_layer_0 label" @@ -2617,12 +2647,12 @@ msgstr "前幾層的列印速度比模型的其他層慢，以便實現與列印 #: fdmprinter.def.json msgctxt "speed_equalize_flow_enabled label" msgid "Equalize Filament Flow" -msgstr "均衡耗材流量" +msgstr "均衡線材流量" #: fdmprinter.def.json msgctxt "speed_equalize_flow_enabled description" msgid "Print thinner than normal lines faster so that the amount of material extruded per second remains the same. Thin pieces in your model might require lines printed with smaller line width than provided in the settings. This setting controls the speed changes for such lines." -msgstr "以較快的速度列印比正常線條更細的線條，使每秒擠出的耗材量保持相同。模型中較薄的部分可能需要以低於設定中所提供寬度的線寬來列印線條。該設定控制這些線條的速度變化。" +msgstr "以較快的速度列印比正常線條更細的線條，使每秒擠出的線材量保持相同。模型中較薄的部分可能需要以低於設定中所提供寬度的線寬來列印線條。該設定控制這些線條的速度變化。" #: fdmprinter.def.json msgctxt "speed_equalize_flow_max label" @@ -3032,7 +3062,7 @@ msgstr "啟用回抽" #: fdmprinter.def.json msgctxt "retraction_enable description" msgid "Retract the filament when the nozzle is moving over a non-printed area." -msgstr "當噴頭移動經過非列印區域時回抽耗材。" +msgstr "當噴頭移動經過非列印區域時回抽線材。" #: fdmprinter.def.json msgctxt "retract_at_layer_change label" @@ -3042,7 +3072,7 @@ msgstr "列印下一層時回抽" #: fdmprinter.def.json msgctxt "retract_at_layer_change description" msgid "Retract the filament when the nozzle is moving to the next layer." -msgstr "當噴頭移動到下一層時回抽耗材。" +msgstr "當噴頭移動到下一層時回抽線材。" #: fdmprinter.def.json msgctxt "retraction_amount label" @@ -3052,7 +3082,7 @@ msgstr "回抽距離" #: fdmprinter.def.json msgctxt "retraction_amount description" msgid "The length of material retracted during a retraction move." -msgstr "回抽移動期間回抽的耗材長度。" +msgstr "回抽移動期間回抽的線材長度。" #: fdmprinter.def.json msgctxt "retraction_speed label" @@ -3062,7 +3092,7 @@ msgstr "回抽速度" #: fdmprinter.def.json msgctxt "retraction_speed description" msgid "The speed at which the filament is retracted and primed during a retraction move." -msgstr "回抽移動期間耗材回抽和裝填的速度。" +msgstr "回抽移動期間線材回抽和裝填的速度。" #: fdmprinter.def.json msgctxt "retraction_retract_speed label" @@ -3072,7 +3102,7 @@ msgstr "回抽速度" #: fdmprinter.def.json msgctxt "retraction_retract_speed description" msgid "The speed at which the filament is retracted during a retraction move." -msgstr "回抽移動期間耗材回抽的速度。" +msgstr "回抽移動期間線材回抽的速度。" #: fdmprinter.def.json msgctxt "retraction_prime_speed label" @@ -3082,7 +3112,7 @@ msgstr "回抽裝填速度" #: fdmprinter.def.json msgctxt "retraction_prime_speed description" msgid "The speed at which the filament is primed during a retraction move." -msgstr "回抽移動期間耗材裝填的速度。" +msgstr "回抽移動期間線材裝填的速度。" #: fdmprinter.def.json msgctxt "retraction_extra_prime_amount label" @@ -3092,7 +3122,7 @@ msgstr "回抽額外裝填量" #: fdmprinter.def.json msgctxt "retraction_extra_prime_amount description" msgid "Some material can ooze away during a travel move, which can be compensated for here." -msgstr "有些耗材可能會在空跑過程中滲出，可以在這裡對其進行補償。" +msgstr "有些線材可能會在空跑過程中滲出，可以在這裡對其進行補償。" #: fdmprinter.def.json msgctxt "retraction_min_travel label" @@ -3112,7 +3142,7 @@ msgstr "最大回抽次數" #: fdmprinter.def.json msgctxt "retraction_count_max description" msgid "This setting limits the number of retractions occurring within the minimum extrusion distance window. Further retractions within this window will be ignored. This avoids retracting repeatedly on the same piece of filament, as that can flatten the filament and cause grinding issues." -msgstr "此設定限制在最小擠出距離範圍內發生的回抽數。此範圍內的額外回抽將會忽略。這避免了在同一件耗材上重複回抽，從而導致耗材變扁並引起磨損問題。" +msgstr "此設定限制在最小擠出距離範圍內發生的回抽數。此範圍內的額外回抽將會忽略。這避免了在同一件線材上重複回抽，從而導致線材變扁並引起磨損問題。" #: fdmprinter.def.json msgctxt "retraction_extrusion_window label" @@ -3122,7 +3152,7 @@ msgstr "最小擠出距離範圍" #: fdmprinter.def.json msgctxt "retraction_extrusion_window description" msgid "The window in which the maximum retraction count is enforced. This value should be approximately the same as the retraction distance, so that effectively the number of times a retraction passes the same patch of material is limited." -msgstr "最大回抽次數範圍。此值應大致與回抽距離相等，從而有效地限制在同一段耗材上的回抽次數。" +msgstr "最大回抽次數範圍。此值應大致與回抽距離相等，從而有效地限制在同一段線材上的回抽次數。" #: fdmprinter.def.json msgctxt "limit_support_retractions label" @@ -3142,7 +3172,7 @@ msgstr "梳理模式" #: fdmprinter.def.json msgctxt "retraction_combing description" msgid "Combing keeps the nozzle within already printed areas when traveling. This results in slightly longer travel moves but reduces the need for retractions. If combing is off, the material will retract and the nozzle moves in a straight line to the next point. It is also possible to avoid combing over top/bottom skin areas or to only comb within the infill." -msgstr "梳理模式讓噴頭空跑時保持在已列印的區域內。這將導致稍長的空跑移動但減少了回抽的需求。如果關閉梳理模式，噴頭將會回抽耗材，直線移動到下一點。可以設定在頂部/底部表層不使用梳理模式，或只使用在內部填充。" +msgstr "梳理模式讓噴頭空跑時保持在已列印的區域內。這將導致稍長的空跑移動但減少了回抽的需求。如果關閉梳理模式，噴頭將會回抽線材，直線移動到下一點。可以設定在頂部/底部表層不使用梳理模式，或只使用在內部填充。" #: fdmprinter.def.json msgctxt "retraction_combing option off" @@ -3171,8 +3201,8 @@ msgstr "不回抽的最大梳理距離" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" -msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." -msgstr "當此值不為 0 時，在梳理模式空跑超過此距離時，會啟用回抽。" +msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." +msgstr "觸發回抽時之最小距離，如大於此數值，便開啟回抽；如設置為0，則關閉回抽." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" @@ -3637,7 +3667,7 @@ msgstr "支撐牆壁線條數量" #: fdmprinter.def.json msgctxt "support_wall_count description" msgid "The number of walls with which to surround support infill. Adding a wall can make support print more reliably and can support overhangs better, but increases print time and material used." -msgstr "支撐填充的牆壁數。增加牆壁能讓支撐填充更加可靠並能更佳的支撐突出部分，但會增長列印時間和使用的耗材。" +msgstr "支撐填充的牆壁數。增加牆壁能讓支撐填充更加可靠並能更佳的支撐突出部分，但會增長列印時間和使用的線材。" #: fdmprinter.def.json msgctxt "zig_zaggify_support label" @@ -3647,7 +3677,7 @@ msgstr "連接支撐線條" #: fdmprinter.def.json msgctxt "zig_zaggify_support description" msgid "Connect the ends of the support lines together. Enabling this setting can make your support more sturdy and reduce underextrusion, but it will cost more material." -msgstr "將支撐線條的末端連接在一起。啟用此設定能讓支撐更堅固並減少擠出不足的問題，但會花費更多的耗材。" +msgstr "將支撐線條的末端連接在一起。啟用此設定能讓支撐更堅固並減少擠出不足的問題，但會花費更多的線材。" #: fdmprinter.def.json msgctxt "support_connect_zigzags label" @@ -3717,7 +3747,7 @@ msgstr "支撐邊緣寬度" #: fdmprinter.def.json msgctxt "support_brim_width description" msgid "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material." -msgstr "列印在支撐下面邊緣的寬度。較大的邊緣會加強對列印平台的附著力，但會需要一些額外的耗材。" +msgstr "列印在支撐下面邊緣的寬度。較大的邊緣會加強對列印平台的附著力，但會需要一些額外的線材。" #: fdmprinter.def.json msgctxt "support_brim_line_count label" @@ -3727,7 +3757,7 @@ msgstr "支撐邊緣線條數量" #: fdmprinter.def.json msgctxt "support_brim_line_count description" msgid "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material." -msgstr "支撐邊緣所使用的線條數量。邊緣使用較多的線條會加強對列印平台的附著力，但會需要一些額外的耗材。" +msgstr "支撐邊緣所使用的線條數量。邊緣使用較多的線條會加強對列印平台的附著力，但會需要一些額外的線材。" #: fdmprinter.def.json msgctxt "support_z_distance label" @@ -3857,7 +3887,7 @@ msgstr "支撐填充層厚度" #: fdmprinter.def.json msgctxt "support_infill_sparse_thickness description" msgid "The thickness per layer of support infill material. This value should always be a multiple of the layer height and is otherwise rounded." -msgstr "支撐填充耗材每層的厚度。該值應為層高的倍數，否則數值會被四捨五入到層高的倍數。" +msgstr "支撐填充線材每層的厚度。該值應為層高的倍數，否則數值會被四捨五入到層高的倍數。" #: fdmprinter.def.json msgctxt "gradual_support_infill_steps label" @@ -4302,7 +4332,7 @@ msgstr "啟用少量裝填" #: fdmprinter.def.json msgctxt "prime_blob_enable description" msgid "Whether to prime the filament with a blob before printing. Turning this setting on will ensure that the extruder will have material ready at the nozzle before printing. Printing Brim or Skirt can act like priming too, in which case turning this setting off saves some time." -msgstr "列印前是否裝填少量的耗材。開啟此設定將確保列印前擠出機的噴頭處已準備好耗材。列印邊緣或外圍也可作為裝填用途，這種情况下關閉此設定可以節省時間。" +msgstr "列印前是否裝填少量的線材。開啟此設定將確保列印前擠出機的噴頭處已準備好線材。列印邊緣或外圍也可作為裝填用途，這種情况下關閉此設定可以節省時間。" #: fdmprinter.def.json msgctxt "extruder_prime_pos_x label" @@ -4456,7 +4486,7 @@ msgstr "木筏額外邊緣" #: fdmprinter.def.json msgctxt "raft_margin description" msgid "If the raft is enabled, this is the extra raft area around the model which is also given a raft. Increasing this margin will create a stronger raft while using more material and leaving less area for your print." -msgstr "如果啟用了木筏，在模型周圍也會增加額外邊緣。增大這個邊緣將產生更強的木筏，不過也會使用更多的耗材，並減少印表機的可列印面積。" +msgstr "如果啟用了木筏，在模型周圍也會增加額外邊緣。增大這個邊緣將產生更強的木筏，不過也會使用更多的線材，並減少印表機的可列印面積。" #: fdmprinter.def.json msgctxt "raft_smoothing label" @@ -4486,7 +4516,7 @@ msgstr "起始層 Z 重疊" #: fdmprinter.def.json msgctxt "layer_0_z_overlap description" msgid "Make the first and second layer of the model overlap in the Z direction to compensate for the filament lost in the airgap. All models above the first model layer will be shifted down by this amount." -msgstr "使模型的第一層和第二層在 Z 方向上重疊以補償在空隙中損失的耗材。第一個模型層上方的所有模型將向下移動此重疊量。" +msgstr "使模型的第一層和第二層在 Z 方向上重疊以補償在空隙中損失的線材。第一個模型層上方的所有模型將向下移動此重疊量。" #: fdmprinter.def.json msgctxt "raft_surface_layers label" @@ -4616,7 +4646,7 @@ msgstr "木筏中層列印速度" #: fdmprinter.def.json msgctxt "raft_interface_speed description" msgid "The speed at which the middle raft layer is printed. This should be printed quite slowly, as the volume of material coming out of the nozzle is quite high." -msgstr "列印木筏中層的速度。這些層應以很慢的速度列印，因為噴頭所出的耗材量非常高。" +msgstr "列印木筏中層的速度。這些層應以很慢的速度列印，因為噴頭所出的線材量非常高。" #: fdmprinter.def.json msgctxt "raft_base_speed label" @@ -4626,7 +4656,7 @@ msgstr "木筏底部列印速度" #: fdmprinter.def.json msgctxt "raft_base_speed description" msgid "The speed at which the base raft layer is printed. This should be printed quite slowly, as the volume of material coming out of the nozzle is quite high." -msgstr "列印木筏底部的速度。這些層應以很慢的速度列印，因為噴頭所出的耗材量非常高。" +msgstr "列印木筏底部的速度。這些層應以很慢的速度列印，因為噴頭所出的線材量非常高。" #: fdmprinter.def.json msgctxt "raft_acceleration label" @@ -4766,7 +4796,7 @@ msgstr "啟用換料塔" #: fdmprinter.def.json msgctxt "prime_tower_enable description" msgid "Print a tower next to the print which serves to prime the material after each nozzle switch." -msgstr "在列印件旁邊印一個塔，用在每次切換噴頭後填充耗材。" +msgstr "在列印件旁邊印一個塔，用在每次切換噴頭後填充線材。" #: fdmprinter.def.json msgctxt "prime_tower_size label" @@ -4786,7 +4816,7 @@ msgstr "換料塔最小體積" #: fdmprinter.def.json msgctxt "prime_tower_min_volume description" msgid "The minimum volume for each layer of the prime tower in order to purge enough material." -msgstr "為了清除足夠的耗材，換料塔每層的最小體積。" +msgstr "為了清除足夠的線材，換料塔每層的最小體積。" #: fdmprinter.def.json msgctxt "prime_tower_position_x label" @@ -4816,7 +4846,7 @@ msgstr "在換料塔上擦拭非作用中的噴頭" #: fdmprinter.def.json msgctxt "prime_tower_wipe_enabled description" msgid "After printing the prime tower with one nozzle, wipe the oozed material from the other nozzle off on the prime tower." -msgstr "在一個噴頭列印換料塔後，在換料塔上擦拭另一個噴頭滲出的耗材。" +msgstr "在一個噴頭列印換料塔後，在換料塔上擦拭另一個噴頭滲出的線材。" #: fdmprinter.def.json msgctxt "prime_tower_brim_enable label" @@ -4846,7 +4876,7 @@ msgstr "擦拭牆角度" #: fdmprinter.def.json msgctxt "ooze_shield_angle description" msgid "The maximum angle a part in the ooze shield will have. With 0 degrees being vertical, and 90 degrees being horizontal. A smaller angle leads to less failed ooze shields, but more material." -msgstr "擦拭牆中的一部分的最大角度。0度為垂直，90度為水平。較小的角度擦拭效果較好，但是要用更多的耗材。" +msgstr "擦拭牆中的一部分的最大角度。0度為垂直，90度為水平。較小的角度擦拭效果較好，但是要用更多的線材。" #: fdmprinter.def.json msgctxt "ooze_shield_dist label" @@ -4876,7 +4906,7 @@ msgstr "噴頭切換回抽速度" #: fdmprinter.def.json msgctxt "switch_extruder_retraction_speeds description" msgid "The speed at which the filament is retracted. A higher retraction speed works better, but a very high retraction speed can lead to filament grinding." -msgstr "回抽耗材的速度。較高的回抽速度效果較好，但回抽速度過高可能導致耗材磨損。" +msgstr "回抽線材的速度。較高的回抽速度效果較好，但回抽速度過高可能導致線材磨損。" #: fdmprinter.def.json msgctxt "switch_extruder_retraction_speed label" @@ -4886,7 +4916,7 @@ msgstr "噴頭切換回抽速度" #: fdmprinter.def.json msgctxt "switch_extruder_retraction_speed description" msgid "The speed at which the filament is retracted during a nozzle switch retract." -msgstr "噴頭切換回抽期間耗材回抽的速度。" +msgstr "噴頭切換回抽期間線材回抽的速度。" #: fdmprinter.def.json msgctxt "switch_extruder_prime_speed label" @@ -4896,7 +4926,7 @@ msgstr "噴頭切換裝填速度" #: fdmprinter.def.json msgctxt "switch_extruder_prime_speed description" msgid "The speed at which the filament is pushed back after a nozzle switch retraction." -msgstr "噴頭切換回抽後耗材被推回的速度。" +msgstr "噴頭切換回抽後線材被推回的速度。" #: fdmprinter.def.json msgctxt "switch_extruder_extra_prime_amount label" @@ -4906,7 +4936,7 @@ msgstr "噴頭切換額外裝填量" #: fdmprinter.def.json msgctxt "switch_extruder_extra_prime_amount description" msgid "Extra material to prime after nozzle switching." -msgstr "噴頭切換後額外裝填的耗材量。" +msgstr "噴頭切換後額外裝填的線材量。" #: fdmprinter.def.json msgctxt "meshfix label" @@ -4976,7 +5006,7 @@ msgstr "刪除網格交集部分" #: fdmprinter.def.json msgctxt "carve_multiple_volumes description" msgid "Remove areas where multiple meshes are overlapping with each other. This may be used if merged dual material objects overlap with each other." -msgstr "刪除多個網格彼此重疊的區域。如果合併的雙重耗材對象彼此重疊，則可以使用此選項。" +msgstr "刪除多個網格彼此重疊的區域。如果合併的雙重線材對象彼此重疊，則可以使用此選項。" #: fdmprinter.def.json msgctxt "alternate_carve_order label" @@ -5075,8 +5105,8 @@ msgstr "網格處理等級" #: fdmprinter.def.json msgctxt "infill_mesh_order description" -msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." -msgstr "決定當多個網格重疊時此網格的優先等級。在多個網格重疊的區域中，將採用處理等級值最小的網格設定。高順位的填充網格將覆蓋掉低順位和普通順位網格的填充設定。" +msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the highest rank. An infill mesh with a higher rank will modify the infill of infill meshes with lower rank and normal meshes." +msgstr "決定多個網格重疊填充的優先權. 多個重疊填充區域會採取網格設定之最高值. 較高的填充網格設定會改動較低網格及普通網格之填充." #: fdmprinter.def.json msgctxt "cutting_mesh label" @@ -5201,7 +5231,7 @@ msgstr "相對模式擠出" #: fdmprinter.def.json msgctxt "relative_extrusion description" msgid "Use relative extrusion rather than absolute extrusion. Using relative E-steps makes for easier post-processing of the g-code. However, it's not supported by all printers and it may produce very slight deviations in the amount of deposited material compared to absolute E-steps. Irrespective of this setting, the extrusion mode will always be set to absolute before any g-code script is output." -msgstr "使用相對模式擠出而非絕對模式擠出。使用相對 E 步數在進行 g-code 後處理時可以更加輕鬆。不過並不是所有的印表機都支援此功能，而且與絕對 E 步數相比，它可能在耗材的使用量上產生輕微的誤差。不管設定為何，在產生 g-code 之前都是使用絕對模式。" +msgstr "使用相對模式擠出而非絕對模式擠出。使用相對 E 步數在進行 g-code 後處理時可以更加輕鬆。不過並不是所有的印表機都支援此功能，而且與絕對 E 步數相比，它可能在線材的使用量上產生輕微的誤差。不管設定為何，在產生 g-code 之前都是使用絕對模式。" #: fdmprinter.def.json msgctxt "experimental label" @@ -5311,7 +5341,7 @@ msgstr "流量溫度圖" #: fdmprinter.def.json msgctxt "material_flow_temp_graph description" msgid "Data linking material flow (in mm3 per second) to temperature (degrees Celsius)." -msgstr "數據連接耗材流量（mm3/s）到溫度（攝氏）。" +msgstr "數據連接線材流量（mm3/s）到溫度（攝氏）。" #: fdmprinter.def.json msgctxt "minimum_polygon_circumference label" @@ -5361,7 +5391,7 @@ msgstr "啟用防風罩" #: fdmprinter.def.json msgctxt "draft_shield_enabled description" msgid "This will create a wall around the model, which traps (hot) air and shields against exterior airflow. Especially useful for materials which warp easily." -msgstr "這將在模型周圍建立一個牆壁留住（熱）空氣並遮住外部氣流。對於容易翹曲的耗材非常有用。" +msgstr "這將在模型周圍建立一個牆壁留住（熱）空氣並遮住外部氣流。對於容易翹曲的線材非常有用。" #: fdmprinter.def.json msgctxt "draft_shield_dist label" @@ -5423,6 +5453,16 @@ msgctxt "conical_overhang_angle description" msgid "The maximum angle of overhangs after the they have been made printable. At a value of 0° all overhangs are replaced by a piece of model connected to the build plate, 90° will not change the model in any way." msgstr "在突出部分變得可列印後突出的最大角度。當該值為 0° 時，所有突出部分將被與列印平台連接的模型的一個部分替代，如果為 90° 時，不會以任何方式更改模型。" +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size label" +msgid "Maximum Overhang Hole Area" +msgstr "最大突出孔洞面積" + +#: fdmprinter.def.json +msgctxt "conical_overhang_hole_size description" +msgid "The maximum area of a hole in the base of the model before it's removed by Make Overhang Printable. Holes smaller than this will be retained. A value of 0 mm² will fill all holes in the models base." +msgstr "啟用\"使突出可列印\"前之模型底層孔洞最大面積. 如孔洞面積低於此值會被保留, 如設為0會填補所有模型底層孔洞." + #: fdmprinter.def.json msgctxt "coasting_enable label" msgid "Enable Coasting" @@ -5431,7 +5471,7 @@ msgstr "啟用滑行" #: fdmprinter.def.json msgctxt "coasting_enable description" msgid "Coasting replaces the last part of an extrusion path with a travel path. The oozed material is used to print the last piece of the extrusion path in order to reduce stringing." -msgstr "滑行會用一個空跑路徑替代擠出路徑的最後部分。滲出耗材用於列印擠出路徑的最後部分，以便減少牽絲。" +msgstr "滑行會用一個空跑路徑替代擠出路徑的最後部分。滲出線材用於列印擠出路徑的最後部分，以便減少牽絲。" #: fdmprinter.def.json msgctxt "coasting_volume label" @@ -5511,7 +5551,7 @@ msgstr "錐形支撐角度" #: fdmprinter.def.json msgctxt "support_conical_angle description" msgid "The angle of the tilt of conical support. With 0 degrees being vertical, and 90 degrees being horizontal. Smaller angles cause the support to be more sturdy, but consist of more material. Negative angles cause the base of the support to be wider than the top." -msgstr "錐形支撐的傾斜角度。角度 0 度時為垂直，角度 90 度時為水平。較小的角度會讓支撐更為牢固，但需要更多耗材。負值會讓支撐底座比頂部寬。" +msgstr "錐形支撐的傾斜角度。角度 0 度時為垂直，角度 90 度時為水平。較小的角度會讓支撐更為牢固，但需要更多線材。負值會讓支撐底座比頂部寬。" #: fdmprinter.def.json msgctxt "support_conical_min_width label" @@ -5581,7 +5621,7 @@ msgstr "流速補償的最大擠出偏移量" #: fdmprinter.def.json msgctxt "flow_rate_max_extrusion_offset description" msgid "The maximum distance in mm to move the filament to compensate for changes in flow rate." -msgstr "流速補償時耗材可移動的最大距離（以毫米為單位）。" +msgstr "流速補償時線材可移動的最大距離（以毫米為單位）。" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor label" @@ -5591,7 +5631,7 @@ msgstr "流速補償係數" #: fdmprinter.def.json msgctxt "flow_rate_extrusion_offset_factor description" msgid "How far to move the filament in order to compensate for changes in flow rate, as a percentage of how far the filament would move in one second of extrusion." -msgstr "為了補償流速變化，耗材所移動的距離，以耗材一秒內擠出距離的百分比表示。" +msgstr "為了補償流速變化，線材所移動的距離，以線材一秒內擠出距離的百分比表示。" #: fdmprinter.def.json msgctxt "wireframe_enabled label" @@ -5631,7 +5671,7 @@ msgstr "WP 速度" #: fdmprinter.def.json msgctxt "wireframe_printspeed description" msgid "Speed at which the nozzle moves when extruding material. Only applies to Wire Printing." -msgstr "擠出耗材時噴頭移動的速度。僅套用於鐵絲網列印。" +msgstr "擠出線材時噴頭移動的速度。僅套用於鐵絲網列印。" #: fdmprinter.def.json msgctxt "wireframe_printspeed_bottom label" @@ -5681,7 +5721,7 @@ msgstr "WP 列印流量" #: fdmprinter.def.json msgctxt "wireframe_flow description" msgid "Flow compensation: the amount of material extruded is multiplied by this value. Only applies to Wire Printing." -msgstr "流量補償：擠出的耗材量乘以此值。僅套用於鐵絲網列印。" +msgstr "流量補償：擠出的線材量乘以此值。僅套用於鐵絲網列印。" #: fdmprinter.def.json msgctxt "wireframe_flow_connection label" @@ -5745,7 +5785,7 @@ msgid "" "This can cause better adhesion to previous layers, while not heating the material in those layers too much. Only applies to Wire Printing." msgstr "" "以半速擠出的上行移動的距離。\n" -"這會與之前的層產生更好的附著，而不會將這些層中的耗材過度加熱。僅套用於鐵絲網列印。" +"這會與之前的層產生更好的附著，而不會將這些層中的線材過度加熱。僅套用於鐵絲網列印。" #: fdmprinter.def.json msgctxt "wireframe_top_jump label" @@ -5765,7 +5805,7 @@ msgstr "WP 倒塌" #: fdmprinter.def.json msgctxt "wireframe_fall_down description" msgid "Distance with which the material falls down after an upward extrusion. This distance is compensated for. Only applies to Wire Printing." -msgstr "耗材在向上擠出後倒塌的距離。將對此距離進行補償。僅套用於鐵絲網列印。" +msgstr "線材在向上擠出後倒塌的距離。將對此距離進行補償。僅套用於鐵絲網列印。" #: fdmprinter.def.json msgctxt "wireframe_drag_along label" @@ -5775,7 +5815,7 @@ msgstr "WP 拖行" #: fdmprinter.def.json msgctxt "wireframe_drag_along description" msgid "Distance with which the material of an upward extrusion is dragged along with the diagonally downward extrusion. This distance is compensated for. Only applies to Wire Printing." -msgstr "向上擠出耗材與斜向下擠出一起拖動的距離。將對此距離進行補償。僅套用於鐵絲網列印。" +msgstr "向上擠出線材與斜向下擠出一起拖動的距離。將對此距離進行補償。僅套用於鐵絲網列印。" #: fdmprinter.def.json msgctxt "wireframe_strategy label" @@ -5785,7 +5825,7 @@ msgstr "WP 使用策略" #: fdmprinter.def.json msgctxt "wireframe_strategy description" msgid "Strategy for making sure two consecutive layers connect at each connection point. Retraction lets the upward lines harden in the right position, but may cause filament grinding. A knot can be made at the end of an upward line to heighten the chance of connecting to it and to let the line cool; however, it may require slow printing speeds. Another strategy is to compensate for the sagging of the top of an upward line; however, the lines won't always fall down as predicted." -msgstr "用於確定兩個連續層在每個連接點連接的策略。回抽可讓上行線條在正確的位置硬化，但可能導致耗材磨損。紐結可以在上行線條的尾端進行打結以便提高與其連接的幾率，並讓線條冷卻；但這會需要較慢的列印速度。另一種策略是補償上行線條頂部的下垂；然而，線條不會總是如預期的那樣下降。" +msgstr "用於確定兩個連續層在每個連接點連接的策略。回抽可讓上行線條在正確的位置硬化，但可能導致線材磨損。紐結可以在上行線條的尾端進行打結以便提高與其連接的幾率，並讓線條冷卻；但這會需要較慢的列印速度。另一種策略是補償上行線條頂部的下垂；然而，線條不會總是如預期的那樣下降。" #: fdmprinter.def.json msgctxt "wireframe_strategy option compensate" @@ -5980,7 +6020,7 @@ msgstr "橋樑牆壁流量" #: fdmprinter.def.json msgctxt "bridge_wall_material_flow description" msgid "When printing bridge walls, the amount of material extruded is multiplied by this value." -msgstr "列印橋樑牆壁時，擠出的耗材量乘以此值。" +msgstr "列印橋樑牆壁時，擠出的線材量乘以此值。" #: fdmprinter.def.json msgctxt "bridge_skin_speed label" @@ -6000,7 +6040,7 @@ msgstr "橋樑表層流量" #: fdmprinter.def.json msgctxt "bridge_skin_material_flow description" msgid "When printing bridge skin regions, the amount of material extruded is multiplied by this value." -msgstr "列印橋樑表層區域時，擠出的耗材量乘以此值。" +msgstr "列印橋樑表層區域時，擠出的線材量乘以此值。" #: fdmprinter.def.json msgctxt "bridge_skin_density label" @@ -6050,7 +6090,7 @@ msgstr "橋樑第二表層流量" #: fdmprinter.def.json msgctxt "bridge_skin_material_flow_2 description" msgid "When printing the second bridge skin layer, the amount of material extruded is multiplied by this value." -msgstr "列印橋樑表層區域第二層時，擠出的耗材量乘以此值。" +msgstr "列印橋樑表層區域第二層時，擠出的線材量乘以此值。" #: fdmprinter.def.json msgctxt "bridge_skin_density_2 label" @@ -6090,7 +6130,7 @@ msgstr "橋樑第三表層流量" #: fdmprinter.def.json msgctxt "bridge_skin_material_flow_3 description" msgid "When printing the third bridge skin layer, the amount of material extruded is multiplied by this value." -msgstr "列印橋樑表層區域第三層時，擠出的耗材量乘以此值。" +msgstr "列印橋樑表層區域第三層時，擠出的線材量乘以此值。" #: fdmprinter.def.json msgctxt "bridge_skin_density_3 label" @@ -6125,12 +6165,12 @@ msgstr "是否在層與層之間加入擦拭噴頭的 G-code（每層最多一 #: fdmprinter.def.json msgctxt "max_extrusion_before_wipe label" msgid "Material Volume Between Wipes" -msgstr "擦拭耗材體積" +msgstr "擦拭線材體積" #: fdmprinter.def.json msgctxt "max_extrusion_before_wipe description" msgid "Maximum material that can be extruded before another nozzle wipe is initiated. If this value is less than the volume of material required in a layer, the setting has no effect in this layer, i.e. it is limited to one wipe per layer." -msgstr "在另一次擦拭噴頭前可擠出的最大耗材量。假如此值小於列印此層所需的耗材量，則此設定對此層無效，也就是說，每層只會擦拭一次。" +msgstr "在另一次擦拭噴頭前可擠出的最大線材量。假如此值小於列印此層所需的線材量，則此設定對此層無效，也就是說，每層只會擦拭一次。" #: fdmprinter.def.json msgctxt "wipe_retraction_enable label" @@ -6140,7 +6180,7 @@ msgstr "擦拭回抽啟用" #: fdmprinter.def.json msgctxt "wipe_retraction_enable description" msgid "Retract the filament when the nozzle is moving over a non-printed area." -msgstr "當噴頭移動經過非列印區域時回抽耗材。" +msgstr "當噴頭移動經過非列印區域時回抽線材。" #: fdmprinter.def.json msgctxt "wipe_retraction_amount label" @@ -6150,7 +6190,7 @@ msgstr "擦拭回抽距離" #: fdmprinter.def.json msgctxt "wipe_retraction_amount description" msgid "Amount to retract the filament so it does not ooze during the wipe sequence." -msgstr "回抽耗材的量，使其在擦拭過程中不會滲出。" +msgstr "回抽線材的量，使其在擦拭過程中不會滲出。" #: fdmprinter.def.json msgctxt "wipe_retraction_extra_prime_amount label" @@ -6160,7 +6200,7 @@ msgstr "擦拭回抽額外裝填量" #: fdmprinter.def.json msgctxt "wipe_retraction_extra_prime_amount description" msgid "Some material can ooze away during a wipe travel moves, which can be compensated for here." -msgstr "有些耗材可能會在擦拭過程中滲出，可以在這裡對其進行補償。" +msgstr "有些線材可能會在擦拭過程中滲出，可以在這裡對其進行補償。" #: fdmprinter.def.json msgctxt "wipe_retraction_speed label" @@ -6170,7 +6210,7 @@ msgstr "擦拭回抽速度" #: fdmprinter.def.json msgctxt "wipe_retraction_speed description" msgid "The speed at which the filament is retracted and primed during a wipe retraction move." -msgstr "擦拭過程中耗材回抽和裝填的速度。" +msgstr "擦拭過程中線材回抽和裝填的速度。" #: fdmprinter.def.json msgctxt "wipe_retraction_retract_speed label" @@ -6180,7 +6220,7 @@ msgstr "擦拭回抽回抽速度" #: fdmprinter.def.json msgctxt "wipe_retraction_retract_speed description" msgid "The speed at which the filament is retracted during a wipe retraction move." -msgstr "擦拭過程中耗材回抽的速度。" +msgstr "擦拭過程中線材回抽的速度。" #: fdmprinter.def.json msgctxt "wipe_retraction_prime_speed label" @@ -6190,7 +6230,7 @@ msgstr "擦拭回抽裝填速度" #: fdmprinter.def.json msgctxt "wipe_retraction_prime_speed description" msgid "The speed at which the filament is primed during a wipe retraction move." -msgstr "擦拭過程中耗材裝填的速度。" +msgstr "擦拭過程中線材裝填的速度。" #: fdmprinter.def.json msgctxt "wipe_pause label" @@ -6362,6 +6402,30 @@ msgctxt "mesh_rotation_matrix description" msgid "Transformation matrix to be applied to the model when loading it from file." msgstr "在將模型從檔案中載入時套用在模型上的轉換矩陣。" +#~ msgctxt "retraction_combing_max_distance description" +#~ msgid "When non-zero, combing travel moves that are longer than this distance will use retraction." +#~ msgstr "當此值不為 0 時，在梳理模式空跑超過此距離時，會啟用回抽。" + +#~ msgctxt "machine_use_extruder_offset_to_offset_coords description" +#~ msgid "Apply the extruder offset to the coordinate system." +#~ msgstr "將擠出機偏移量套用到座標軸系統。" + +#~ msgctxt "shell label" +#~ msgid "Shell" +#~ msgstr "外殼" + +#~ msgctxt "max_skin_angle_for_expansion description" +#~ msgid "Top and/or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical." +#~ msgstr "如果模型的頂部和/或底部表面的角度大於此設定，則不要延伸其頂部/底部表層。這會避免延伸作用在模型表面有接近垂直的斜面時所形成的狹窄表層區域。0° 的角為水平，90° 的角為垂直。" + +#~ msgctxt "speed_layer_0 description" +#~ msgid "The speed for the initial layer. A lower value is advised to improve adhesion to the build plate." +#~ msgstr "起始層的速度。建議採用較低的值以便改善與列印平台的附著。" + +#~ msgctxt "infill_mesh_order description" +#~ msgid "Determines the priority of this mesh when considering multiple overlapping infill meshes. Areas where multiple infill meshes overlap will take on the settings of the mesh with the lowest rank. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes." +#~ msgstr "決定當多個網格重疊時此網格的優先等級。在多個網格重疊的區域中，將採用處理等級值最小的網格設定。高順位的填充網格將覆蓋掉低順位和普通順位網格的填充設定。" + #~ msgctxt "material_bed_temperature description" #~ msgid "The temperature used for the heated build plate. If this is 0, the bed temperature will not be adjusted." #~ msgstr "設定列印平台的溫度。如果設定為 0，就不會加熱列印平台。" diff --git a/resources/images/Magna2_230.png b/resources/images/Magna2_230.png new file mode 100644 index 0000000000..0c68b91334 Binary files /dev/null and b/resources/images/Magna2_230.png differ diff --git a/resources/images/Magna2_300.png b/resources/images/Magna2_300.png new file mode 100644 index 0000000000..94a8a723ca Binary files /dev/null and b/resources/images/Magna2_300.png differ diff --git a/resources/images/eryone_thinker_plate.png b/resources/images/eryone_thinker_plate.png new file mode 100644 index 0000000000..33f7414d4e Binary files /dev/null and b/resources/images/eryone_thinker_plate.png differ diff --git a/resources/images/farm2ceplate.png b/resources/images/farm2ceplate.png new file mode 100644 index 0000000000..50016e0312 Binary files /dev/null and b/resources/images/farm2ceplate.png differ diff --git a/resources/images/farm2plate.png b/resources/images/farm2plate.png new file mode 100644 index 0000000000..7ac792520a Binary files /dev/null and b/resources/images/farm2plate.png differ diff --git a/resources/images/hellbot_hidra.png b/resources/images/hellbot_hidra.png new file mode 100644 index 0000000000..9831d651e3 Binary files /dev/null and b/resources/images/hellbot_hidra.png differ diff --git a/resources/images/hellbot_hidra_plus.png b/resources/images/hellbot_hidra_plus.png new file mode 100644 index 0000000000..d61ccaa798 Binary files /dev/null and b/resources/images/hellbot_hidra_plus.png differ diff --git a/resources/images/koshertext.png b/resources/images/koshertext.png new file mode 100644 index 0000000000..6d10f00481 Binary files /dev/null and b/resources/images/koshertext.png differ diff --git a/resources/images/whats_new/0.png b/resources/images/whats_new/0.png new file mode 100644 index 0000000000..68b06eab10 Binary files /dev/null and b/resources/images/whats_new/0.png differ diff --git a/resources/images/whats_new/1.png b/resources/images/whats_new/1.png new file mode 100644 index 0000000000..f46847155b Binary files /dev/null and b/resources/images/whats_new/1.png differ diff --git a/resources/images/whats_new/2.png b/resources/images/whats_new/2.png new file mode 100644 index 0000000000..9be5228efb Binary files /dev/null and b/resources/images/whats_new/2.png differ diff --git a/resources/images/whats_new/3.PNG b/resources/images/whats_new/3.PNG new file mode 100644 index 0000000000..b37e50d72b Binary files /dev/null and b/resources/images/whats_new/3.PNG differ diff --git a/resources/images/whats_new/4.PNG b/resources/images/whats_new/4.PNG new file mode 100644 index 0000000000..a78b128aff Binary files /dev/null and b/resources/images/whats_new/4.PNG differ diff --git a/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_B.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_B.inst.cfg new file mode 100644 index 0000000000..74f9f10d26 --- /dev/null +++ b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_B.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Accurate +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D010 +intent_category = engineering +material = generic_abs +variant = DBE 0.40mm + +[values] +jerk_wall = 5 +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +wall_thickness = =line_width * 3 +top_bottom_thickness = =wall_thickness +xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file diff --git a/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_C.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_C.inst.cfg new file mode 100644 index 0000000000..71c004bc6a --- /dev/null +++ b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_C.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Accurate +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D015 +intent_category = engineering +material = generic_abs +variant = DBE 0.40mm + +[values] +jerk_wall = 5 +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +wall_thickness = =line_width * 3 +top_bottom_thickness = =wall_thickness +xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file diff --git a/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_D.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_D.inst.cfg new file mode 100644 index 0000000000..9f982b1f63 --- /dev/null +++ b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_D.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Accurate +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D020 +intent_category = engineering +material = generic_abs +variant = DBE 0.40mm + +[values] +jerk_wall = 5 +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +wall_thickness = =line_width * 3 +top_bottom_thickness = =wall_thickness +xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file diff --git a/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_D.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_D.inst.cfg new file mode 100644 index 0000000000..1bbbd51e7d --- /dev/null +++ b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_D.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Quick +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D020 +intent_category = quick +material = generic_abs +variant = DBE 0.40mm + +[values] +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 = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +line_width = =machine_nozzle_size +wall_line_width_x = =line_width \ No newline at end of file diff --git a/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_E.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_E.inst.cfg new file mode 100644 index 0000000000..a8a84d437c --- /dev/null +++ b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_E.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Quick +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D030 +intent_category = quick +material = generic_abs +variant = DBE 0.40mm + +[values] +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 = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +line_width = =machine_nozzle_size +wall_line_width_x = =line_width \ No newline at end of file diff --git a/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_B.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_B.inst.cfg new file mode 100644 index 0000000000..1d6228030a --- /dev/null +++ b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_B.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Accurate +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D010 +intent_category = engineering +material = generic_abs +variant = FBE 0.40mm + +[values] +jerk_wall = 5 +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +wall_thickness = =line_width * 3 +top_bottom_thickness = =wall_thickness +xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file diff --git a/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_C.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_C.inst.cfg new file mode 100644 index 0000000000..6adc06ee83 --- /dev/null +++ b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_C.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Accurate +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D015 +intent_category = engineering +material = generic_abs +variant = FBE 0.40mm + +[values] +jerk_wall = 5 +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +wall_thickness = =line_width * 3 +top_bottom_thickness = =wall_thickness +xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file diff --git a/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_D.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_D.inst.cfg new file mode 100644 index 0000000000..1036154204 --- /dev/null +++ b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_D.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Accurate +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D020 +intent_category = engineering +material = generic_abs +variant = FBE 0.40mm + +[values] +jerk_wall = 5 +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +wall_thickness = =line_width * 3 +top_bottom_thickness = =wall_thickness +xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file diff --git a/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_D.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_D.inst.cfg new file mode 100644 index 0000000000..1ecb8d5bfb --- /dev/null +++ b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_D.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Quick +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D020 +intent_category = quick +material = generic_abs +variant = FBE 0.40mm + +[values] +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 = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +line_width = =machine_nozzle_size +wall_line_width_x = =line_width \ No newline at end of file diff --git a/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_E.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_E.inst.cfg new file mode 100644 index 0000000000..42e4efe351 --- /dev/null +++ b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_E.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Quick +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D030 +intent_category = quick +material = generic_abs +variant = FBE 0.40mm + +[values] +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 = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +line_width = =machine_nozzle_size +wall_line_width_x = =line_width \ No newline at end of file diff --git a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_B.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_B.inst.cfg new file mode 100644 index 0000000000..1bee0ae204 --- /dev/null +++ b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_B.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Accurate +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D010 +intent_category = engineering +material = generic_petg +variant = DBE 0.40mm + +[values] +jerk_wall = 5 +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +wall_thickness = =line_width * 3 +top_bottom_thickness = =wall_thickness +xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file diff --git a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_C.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_C.inst.cfg new file mode 100644 index 0000000000..3eb2f4b665 --- /dev/null +++ b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_C.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Accurate +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D015 +intent_category = engineering +material = generic_petg +variant = DBE 0.40mm + +[values] +jerk_wall = 5 +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +wall_thickness = =line_width * 3 +top_bottom_thickness = =wall_thickness +xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file diff --git a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_D.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_D.inst.cfg new file mode 100644 index 0000000000..150a0f9d42 --- /dev/null +++ b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_D.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Accurate +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D020 +intent_category = engineering +material = generic_petg +variant = DBE 0.40mm + +[values] +jerk_wall = 5 +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +wall_thickness = =line_width * 3 +top_bottom_thickness = =wall_thickness +xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file diff --git a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_C.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_C.inst.cfg new file mode 100644 index 0000000000..758b696145 --- /dev/null +++ b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_C.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Quick +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D020 +intent_category = quick +material = generic_petg +variant = DBE 0.40mm + +[values] +speed_print = 75 +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +line_width = =machine_nozzle_size +wall_line_width_x = =line_width \ No newline at end of file diff --git a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_D.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_D.inst.cfg new file mode 100644 index 0000000000..758b696145 --- /dev/null +++ b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_D.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Quick +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D020 +intent_category = quick +material = generic_petg +variant = DBE 0.40mm + +[values] +speed_print = 75 +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +line_width = =machine_nozzle_size +wall_line_width_x = =line_width \ No newline at end of file diff --git a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_E.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_E.inst.cfg new file mode 100644 index 0000000000..dcc7d6b096 --- /dev/null +++ b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_E.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Quick +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D030 +intent_category = quick +material = generic_petg +variant = DBE 0.40mm + +[values] +speed_print = 75 +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +line_width = =machine_nozzle_size +wall_line_width_x = =line_width \ No newline at end of file diff --git a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_B.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_B.inst.cfg new file mode 100644 index 0000000000..ac7f1aaec8 --- /dev/null +++ b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_B.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Accurate +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D010 +intent_category = engineering +material = generic_petg +variant = FBE 0.40mm + +[values] +jerk_wall = 5 +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +wall_thickness = =line_width * 3 +top_bottom_thickness = =wall_thickness +xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file diff --git a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_C.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_C.inst.cfg new file mode 100644 index 0000000000..c53272c20b --- /dev/null +++ b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_C.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Accurate +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D015 +intent_category = engineering +material = generic_petg +variant = FBE 0.40mm + +[values] +jerk_wall = 5 +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +wall_thickness = =line_width * 3 +top_bottom_thickness = =wall_thickness +xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file diff --git a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_D.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_D.inst.cfg new file mode 100644 index 0000000000..d6724f859c --- /dev/null +++ b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_D.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Accurate +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D020 +intent_category = engineering +material = generic_petg +variant = FBE 0.40mm + +[values] +jerk_wall = 5 +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +wall_thickness = =line_width * 3 +top_bottom_thickness = =wall_thickness +xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file diff --git a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_C.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_C.inst.cfg new file mode 100644 index 0000000000..a2ac0d2621 --- /dev/null +++ b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_C.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Quick +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D015 +intent_category = quick +material = generic_petg +variant = FBE 0.40mm + +[values] +speed_print = 75 +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +line_width = =machine_nozzle_size +wall_line_width_x = =line_width \ No newline at end of file diff --git a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_D.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_D.inst.cfg new file mode 100644 index 0000000000..ee2a863771 --- /dev/null +++ b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_D.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Quick +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D020 +intent_category = quick +material = generic_petg +variant = FBE 0.40mm + +[values] +speed_print = 75 +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +line_width = =machine_nozzle_size +wall_line_width_x = =line_width \ No newline at end of file diff --git a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_E.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_E.inst.cfg new file mode 100644 index 0000000000..5ac617a6e9 --- /dev/null +++ b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_E.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Quick +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D030 +intent_category = quick +material = generic_petg +variant = FBE 0.40mm + +[values] +speed_print = 75 +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +line_width = =machine_nozzle_size +wall_line_width_x = =line_width \ No newline at end of file diff --git a/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_B.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_B.inst.cfg new file mode 100644 index 0000000000..9e36ee7056 --- /dev/null +++ b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_B.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Accurate +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D010 +intent_category = engineering +material = generic_pla +variant = DBE 0.40mm + +[values] +jerk_wall = 5 +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +wall_thickness = =line_width * 3 +top_bottom_thickness = =wall_thickness +xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file diff --git a/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_C.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_C.inst.cfg new file mode 100644 index 0000000000..b7005254b9 --- /dev/null +++ b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_C.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Accurate +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D015 +intent_category = engineering +material = generic_pla +variant = DBE 0.40mm + +[values] +jerk_wall = 5 +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +wall_thickness = =line_width * 3 +top_bottom_thickness = =wall_thickness +xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file diff --git a/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_D.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_D.inst.cfg new file mode 100644 index 0000000000..d2810ec7cf --- /dev/null +++ b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_D.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Accurate +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D020 +intent_category = engineering +material = generic_pla +variant = DBE 0.40mm + +[values] +jerk_wall = 5 +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +wall_thickness = =line_width * 3 +top_bottom_thickness = =wall_thickness +xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file diff --git a/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_D.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_D.inst.cfg new file mode 100644 index 0000000000..85b1e530e8 --- /dev/null +++ b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_D.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Quick +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D020 +intent_category = quick +material = generic_pla +variant = DBE 0.40mm + +[values] +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 = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +line_width = =machine_nozzle_size +wall_line_width_x = =line_width \ No newline at end of file diff --git a/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_E.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_E.inst.cfg new file mode 100644 index 0000000000..ed19c7b54c --- /dev/null +++ b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_E.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Quick +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D030 +intent_category = quick +material = generic_pla +variant = DBE 0.40mm + +[values] +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 = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +line_width = =machine_nozzle_size +wall_line_width_x = =line_width \ No newline at end of file diff --git a/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_B.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_B.inst.cfg new file mode 100644 index 0000000000..2268807503 --- /dev/null +++ b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_B.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Accurate +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D010 +intent_category = engineering +material = generic_pla +variant = FBE 0.40mm + +[values] +jerk_wall = 5 +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +wall_thickness = =line_width * 3 +top_bottom_thickness = =wall_thickness +xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file diff --git a/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_C.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_C.inst.cfg new file mode 100644 index 0000000000..122a0a860a --- /dev/null +++ b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_C.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Accurate +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D015 +intent_category = engineering +material = generic_pla +variant = FBE 0.40mm + +[values] +jerk_wall = 5 +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +wall_thickness = =line_width * 3 +top_bottom_thickness = =wall_thickness +xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file diff --git a/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_D.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_D.inst.cfg new file mode 100644 index 0000000000..4c6ce96f1e --- /dev/null +++ b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_D.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Accurate +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D020 +intent_category = engineering +material = generic_pla +variant = FBE 0.40mm + +[values] +jerk_wall = 5 +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +wall_thickness = =line_width * 3 +top_bottom_thickness = =wall_thickness +xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file diff --git a/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_D.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_D.inst.cfg new file mode 100644 index 0000000000..ff0df08e4d --- /dev/null +++ b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_D.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Quick +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D020 +intent_category = quick +material = generic_pla +variant = FBE 0.40mm + +[values] +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 = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +line_width = =machine_nozzle_size +wall_line_width_x = =line_width \ No newline at end of file diff --git a/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_E.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_E.inst.cfg new file mode 100644 index 0000000000..6f2eda9434 --- /dev/null +++ b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_E.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Quick +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = intent +quality_type = D030 +intent_category = quick +material = generic_pla +variant = FBE 0.40mm + +[values] +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 = =wall_thickness +wall_thickness = =line_width * 2 +fill_perimeter_gaps = nowhere +infill_sparse_density = 15 +infill_line_width = =line_width +jerk_print = 30 +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +line_width = =machine_nozzle_size +wall_line_width_x = =line_width \ No newline at end of file diff --git a/resources/intent/liquid/liquid_vo0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/liquid/liquid_vo0.4_ABS_Draft_Print_Quick.inst.cfg index bc3513ab20..013a104202 100644 --- a/resources/intent/liquid/liquid_vo0.4_ABS_Draft_Print_Quick.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_ABS_Draft_Print_Quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = draft diff --git a/resources/intent/liquid/liquid_vo0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_ABS_Fast_Print_Accurate.inst.cfg index f67913ccaf..4ad76fdadc 100644 --- a/resources/intent/liquid/liquid_vo0.4_ABS_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/liquid/liquid_vo0.4_ABS_Fast_Visual.inst.cfg b/resources/intent/liquid/liquid_vo0.4_ABS_Fast_Visual.inst.cfg index c5f4fd6be7..e72efa1308 100644 --- a/resources/intent/liquid/liquid_vo0.4_ABS_Fast_Visual.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_ABS_Fast_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = fast intent_category = visual diff --git a/resources/intent/liquid/liquid_vo0.4_ABS_High_Visual.inst.cfg b/resources/intent/liquid/liquid_vo0.4_ABS_High_Visual.inst.cfg index 8cd1891559..d241bbef9f 100644 --- a/resources/intent/liquid/liquid_vo0.4_ABS_High_Visual.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_ABS_High_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = high intent_category = visual diff --git a/resources/intent/liquid/liquid_vo0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_ABS_Normal_Quality_Accurate.inst.cfg index 0dcd3e2d2a..6ecdae5b1f 100644 --- a/resources/intent/liquid/liquid_vo0.4_ABS_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/liquid/liquid_vo0.4_ABS_Normal_Visual.inst.cfg b/resources/intent/liquid/liquid_vo0.4_ABS_Normal_Visual.inst.cfg index 9f9b5748f0..853b6e068b 100644 --- a/resources/intent/liquid/liquid_vo0.4_ABS_Normal_Visual.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_ABS_Normal_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = normal intent_category = visual diff --git a/resources/intent/liquid/liquid_vo0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_CPE_Fast_Print_Accurate.inst.cfg index f60ba1efe9..6ec6290733 100644 --- a/resources/intent/liquid/liquid_vo0.4_CPE_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_CPE_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/liquid/liquid_vo0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_CPE_Normal_Quality_Accurate.inst.cfg index 615e9ab2ef..f024b94f39 100644 --- a/resources/intent/liquid/liquid_vo0.4_CPE_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_CPE_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/liquid/liquid_vo0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_Nylon_Fast_Print_Accurate.inst.cfg index d3f930eca2..21dafb9a0a 100644 --- a/resources/intent/liquid/liquid_vo0.4_Nylon_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_Nylon_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/liquid/liquid_vo0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_Nylon_Normal_Quality_Accurate.inst.cfg index 2c10917844..507efc5f32 100644 --- a/resources/intent/liquid/liquid_vo0.4_Nylon_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_Nylon_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/liquid/liquid_vo0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PC_Fast_Print_Accurate.inst.cfg index 962abe94c5..0a4122802a 100644 --- a/resources/intent/liquid/liquid_vo0.4_PC_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PC_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/liquid/liquid_vo0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PC_Normal_Quality_Accurate.inst.cfg index 0b0c98a269..3081460d4f 100644 --- a/resources/intent/liquid/liquid_vo0.4_PC_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PC_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/liquid/liquid_vo0.4_PETG_Draft_Print_Quick.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PETG_Draft_Print_Quick.inst.cfg index 90b1e8f94a..ee7465d9fd 100644 --- a/resources/intent/liquid/liquid_vo0.4_PETG_Draft_Print_Quick.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PETG_Draft_Print_Quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = draft diff --git a/resources/intent/liquid/liquid_vo0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PETG_Fast_Print_Accurate.inst.cfg index c072535458..1868a8c428 100644 --- a/resources/intent/liquid/liquid_vo0.4_PETG_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PETG_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/liquid/liquid_vo0.4_PETG_Fast_Visual.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PETG_Fast_Visual.inst.cfg index 16dc61538e..97cd4da0db 100644 --- a/resources/intent/liquid/liquid_vo0.4_PETG_Fast_Visual.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PETG_Fast_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = fast intent_category = visual diff --git a/resources/intent/liquid/liquid_vo0.4_PETG_High_Visual.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PETG_High_Visual.inst.cfg index c69abeda66..181f00ebf3 100644 --- a/resources/intent/liquid/liquid_vo0.4_PETG_High_Visual.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PETG_High_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = high intent_category = visual diff --git a/resources/intent/liquid/liquid_vo0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PETG_Normal_Quality_Accurate.inst.cfg index 926bd69257..79d3543107 100644 --- a/resources/intent/liquid/liquid_vo0.4_PETG_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PETG_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/liquid/liquid_vo0.4_PETG_Normal_Visual.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PETG_Normal_Visual.inst.cfg index 3d1519b255..68676d804c 100644 --- a/resources/intent/liquid/liquid_vo0.4_PETG_Normal_Visual.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PETG_Normal_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = normal intent_category = visual diff --git a/resources/intent/liquid/liquid_vo0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PLA_Draft_Print_Quick.inst.cfg index 9849630dd9..b760b5e860 100644 --- a/resources/intent/liquid/liquid_vo0.4_PLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PLA_Draft_Print_Quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = draft diff --git a/resources/intent/liquid/liquid_vo0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PLA_Fast_Print_Accurate.inst.cfg index e287be2fc9..54f80967e6 100644 --- a/resources/intent/liquid/liquid_vo0.4_PLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/liquid/liquid_vo0.4_PLA_Fast_Visual.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PLA_Fast_Visual.inst.cfg index 74cc12c1c3..5b7dd96df5 100644 --- a/resources/intent/liquid/liquid_vo0.4_PLA_Fast_Visual.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PLA_Fast_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = fast intent_category = visual diff --git a/resources/intent/liquid/liquid_vo0.4_PLA_High_Visual.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PLA_High_Visual.inst.cfg index adc472cd54..418caf6d98 100644 --- a/resources/intent/liquid/liquid_vo0.4_PLA_High_Visual.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PLA_High_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = high intent_category = visual diff --git a/resources/intent/liquid/liquid_vo0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PLA_Normal_Quality_Accurate.inst.cfg index bdc18ea8f5..dff192d7da 100644 --- a/resources/intent/liquid/liquid_vo0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/liquid/liquid_vo0.4_PLA_Normal_Visual.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PLA_Normal_Visual.inst.cfg index f11cbfa3e2..76f6c2c04a 100644 --- a/resources/intent/liquid/liquid_vo0.4_PLA_Normal_Visual.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PLA_Normal_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = normal intent_category = visual diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg index f7cd407ac3..c549a14367 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = draft diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg index 336ce73997..d5b8978c77 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg index 039b622e4e..4880fd0962 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = fast intent_category = visual diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg index 5e93926c2b..9122587c5b 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = high intent_category = visual diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg index 0d51ae71ef..ab56c8d836 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg index 5f096b3bee..35b15a9445 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = normal intent_category = visual diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg index 3f3240e88c..5c65e1d42e 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg index 50dd7e9aad..54b6df9384 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg index 15adfde00b..c67d55aa5f 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg index 6b522439d3..86215150f8 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg index d911003d48..36bde0e555 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg index e293c03f2e..74bd8a2252 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg index 26e428d57f..cdb21d818c 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg index 0ace9d48fd..9e9a235a41 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg new file mode 100644 index 0000000000..1c06b7869e --- /dev/null +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = intent +intent_category = engineering +quality_type = fast +material = generic_petg +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +speed_print = 30 +speed_infill = =speed_print +speed_layer_0 = 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_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =-layer_height * 0.2 + diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg new file mode 100644 index 0000000000..a4eb071f00 --- /dev/null +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = intent +intent_category = engineering +quality_type = normal +material = generic_petg +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +speed_print = 30 +speed_infill = =speed_print +speed_layer_0 = 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_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =-layer_height * 0.2 + diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg index d32cab3423..f42ea3ab7d 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = draft diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg index d8c396a9c3..c5ff496c27 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg index 72d017f146..7d6bc15f88 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = fast intent_category = visual diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg index f6537b0ba4..824efaf1d9 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = high intent_category = visual diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg index 81734ce691..61d6d979b6 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg index 41c21b22ff..259a88b5cc 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = normal intent_category = visual diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg index 37f71e5161..98536cc552 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = draft diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg index 7d0630eaa1..21a44e5eda 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg index 33d270cedb..e57d0191ac 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = fast intent_category = visual diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg index 8d4b91d858..433c10c9f9 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = high intent_category = visual diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg index 59a0f558f5..76bee3c415 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg index dde0a95267..61c799708a 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = normal intent_category = visual diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg index d5c553c184..dce6a872df 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = draft diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg index ef588985b5..b06217bb98 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg index 5e428f3b9d..b45744e730 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = fast intent_category = visual diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg index a094986a7b..9dd1faa72e 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = high intent_category = visual diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg index 668b7e9b9c..d1532558c3 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg index 758a9d13fe..d5630038b4 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = normal intent_category = visual diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg index dc53e52734..3afb11c7cd 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg index c4aa28ba63..c26d5aae4d 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg index eabf53644a..bd8f0a4a92 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg index 8c343e73d5..805437b49e 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg index b59c2d08ee..caf7c384b4 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg index 46ef43c781..14e5bb1e83 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg index 01d0454c50..cee4376aec 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg index 46152c459c..9e9901816c 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg new file mode 100644 index 0000000000..d61b0226f6 --- /dev/null +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg @@ -0,0 +1,36 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = intent +intent_category = engineering +quality_type = fast +material = generic_petg +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +speed_print = 30 +speed_infill = =speed_print +speed_layer_0 = 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_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset + diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg new file mode 100644 index 0000000000..7f7b93a24c --- /dev/null +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg @@ -0,0 +1,36 @@ +[general] +version = 4 +name = Accurate +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = intent +intent_category = engineering +quality_type = normal +material = generic_petg +variant = AA 0.4 + +[values] +infill_line_width = =line_width +jerk_print = 30 +jerk_infill = =jerk_print +jerk_topbottom = =jerk_print +jerk_wall = =jerk_print +jerk_wall_0 = =jerk_wall +jerk_wall_x = =jerk_wall +jerk_layer_0 = 5 +line_width = =machine_nozzle_size +speed_print = 30 +speed_infill = =speed_print +speed_layer_0 = 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_line_width_x = =line_width +wall_thickness = =line_width * 3 +xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset + diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg index 97bbd71ad9..43daff2c8e 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = draft diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg index 1f19fbafd7..026f917f73 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg index a85510f257..d176240085 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = fast intent_category = visual diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg index 00b48d8ec5..957825b204 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = high intent_category = visual diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg index 2252406877..12457541b7 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg index 75fbd0a03a..a7d4c127f9 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = normal intent_category = visual diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg index a43ee86c46..5e42c4de75 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = draft diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg index ac5afe4d5e..c799d72a38 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = fast diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg index 779a8319ad..44bf269bcf 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = fast intent_category = visual diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg index 8bcd79be00..d52d9bcfdf 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = high intent_category = visual diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg index 2a282e2de3..99d9689181 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = normal diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg index a663665468..d133656d5e 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = normal intent_category = visual diff --git a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.10_visual.inst.inst.cfg b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.10_visual.inst.inst.cfg index 0ffa93dbe1..ec5cc5c4ab 100644 --- a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.10_visual.inst.inst.cfg +++ b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.10_visual.inst.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = q010 intent_category = visual diff --git a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.15_eng.inst.inst.cfg b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.15_eng.inst.inst.cfg index df7ee7b98c..ae1e02bac8 100644 --- a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.15_eng.inst.inst.cfg +++ b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.15_eng.inst.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = q015 diff --git a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.15_visual.inst.inst.cfg b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.15_visual.inst.inst.cfg index 876e3fefd0..f346daca24 100644 --- a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.15_visual.inst.inst.cfg +++ b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.15_visual.inst.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = q015 intent_category = visual diff --git a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_eng.inst.inst.cfg b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_eng.inst.inst.cfg index 8e98358f22..0f722c5956 100644 --- a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_eng.inst.inst.cfg +++ b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_eng.inst.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = q020 diff --git a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_quick.inst.cfg b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_quick.inst.cfg index 858bb27944..ade59c4c39 100644 --- a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_quick.inst.cfg +++ b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = q020 diff --git a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_visual.inst.inst.cfg b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_visual.inst.inst.cfg index 78c15b5af0..f9453ee1e2 100644 --- a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_visual.inst.inst.cfg +++ b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_visual.inst.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = q020 intent_category = visual diff --git a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.25_quick.inst.cfg b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.25_quick.inst.cfg index f7dea23ffe..932826fc74 100644 --- a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.25_quick.inst.cfg +++ b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.25_quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = q025 diff --git a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.30_quick.inst.cfg b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.30_quick.inst.cfg index bd031ddbfc..abba5709d2 100644 --- a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.30_quick.inst.cfg +++ b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.30_quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = q030 diff --git a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.10_visual.inst.inst.cfg b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.10_visual.inst.inst.cfg index cd9c8a8f49..21cf681494 100644 --- a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.10_visual.inst.inst.cfg +++ b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.10_visual.inst.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = q010 intent_category = visual diff --git a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.15_eng.inst.inst.cfg b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.15_eng.inst.inst.cfg index 9828a3f1c6..260a67a5c6 100644 --- a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.15_eng.inst.inst.cfg +++ b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.15_eng.inst.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = q015 diff --git a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.15_visual.inst.inst.cfg b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.15_visual.inst.inst.cfg index 6b354739d5..018a7b3d4c 100644 --- a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.15_visual.inst.inst.cfg +++ b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.15_visual.inst.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = q015 intent_category = visual diff --git a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_eng.inst.inst.cfg b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_eng.inst.inst.cfg index 6321747991..d35c627e75 100644 --- a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_eng.inst.inst.cfg +++ b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_eng.inst.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = q020 diff --git a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_quick.inst.cfg b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_quick.inst.cfg index 93ebcfe0cf..b9dbd73909 100644 --- a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_quick.inst.cfg +++ b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = q020 diff --git a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_visual.inst.inst.cfg b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_visual.inst.inst.cfg index a3295d3512..3cf66f21db 100644 --- a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_visual.inst.inst.cfg +++ b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_visual.inst.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = q020 intent_category = visual diff --git a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.25_quick.inst.cfg b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.25_quick.inst.cfg index 6fadfc4449..1ecaced844 100644 --- a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.25_quick.inst.cfg +++ b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.25_quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = q025 diff --git a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.30_quick.inst.cfg b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.30_quick.inst.cfg index 77564a52b1..ec05701754 100644 --- a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.30_quick.inst.cfg +++ b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.30_quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = q030 diff --git a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.10_visual.inst.inst.cfg b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.10_visual.inst.inst.cfg index 362eacd958..f934fdeef2 100644 --- a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.10_visual.inst.inst.cfg +++ b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.10_visual.inst.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = q010 intent_category = visual diff --git a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.15_eng.inst.inst.cfg b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.15_eng.inst.inst.cfg index 54c626710f..a71356b93e 100644 --- a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.15_eng.inst.inst.cfg +++ b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.15_eng.inst.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = q015 diff --git a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.15_visual.inst.inst.cfg b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.15_visual.inst.inst.cfg index 168506efc5..0086501820 100644 --- a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.15_visual.inst.inst.cfg +++ b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.15_visual.inst.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = q015 intent_category = visual diff --git a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_eng.inst.inst.cfg b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_eng.inst.inst.cfg index 5776a0c76a..db5d125416 100644 --- a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_eng.inst.inst.cfg +++ b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_eng.inst.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = q020 diff --git a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_quick.inst.cfg b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_quick.inst.cfg index 8eb27c5ea0..ca0c21329c 100644 --- a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_quick.inst.cfg +++ b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = q020 diff --git a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_visual.inst.inst.cfg b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_visual.inst.inst.cfg index 828800b702..d6fb6a8641 100644 --- a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_visual.inst.inst.cfg +++ b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_visual.inst.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = q020 intent_category = visual diff --git a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.25_quick.inst.cfg b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.25_quick.inst.cfg index 74725d3a26..f74ab929b5 100644 --- a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.25_quick.inst.cfg +++ b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.25_quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = q025 diff --git a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.30_quick.inst.cfg b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.30_quick.inst.cfg index cb351e9cc6..947a6d31d3 100644 --- a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.30_quick.inst.cfg +++ b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.30_quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = q030 diff --git a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.10_visual.inst.inst.cfg b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.10_visual.inst.inst.cfg index 6bcc745117..16e2aec5de 100644 --- a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.10_visual.inst.inst.cfg +++ b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.10_visual.inst.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = ZAV_layer_010 intent_category = visual diff --git a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.15_eng.inst.inst.cfg b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.15_eng.inst.inst.cfg index 528bb6794a..d4d42cc158 100644 --- a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.15_eng.inst.inst.cfg +++ b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.15_eng.inst.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = ZAV_layer_015 diff --git a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.15_visual.inst.inst.cfg b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.15_visual.inst.inst.cfg index a88539d618..b00e540a2b 100644 --- a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.15_visual.inst.inst.cfg +++ b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.15_visual.inst.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = ZAV_layer_015 intent_category = visual diff --git a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_eng.inst.inst.cfg b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_eng.inst.inst.cfg index 554196da54..b7d44dcc2f 100644 --- a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_eng.inst.inst.cfg +++ b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_eng.inst.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = ZAV_layer_020 diff --git a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_quick.inst.cfg b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_quick.inst.cfg index 5103f5329a..8c09428987 100644 --- a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_quick.inst.cfg +++ b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = ZAV_layer_020 diff --git a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_visual.inst.inst.cfg b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_visual.inst.inst.cfg index c4f92aaeec..73d3503575 100644 --- a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_visual.inst.inst.cfg +++ b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_visual.inst.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = ZAV_layer_020 intent_category = visual diff --git a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.25_quick.inst.cfg b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.25_quick.inst.cfg index 9ddd19174e..df4d3b40b0 100644 --- a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.25_quick.inst.cfg +++ b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.25_quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = ZAV_layer_025 diff --git a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.30_quick.inst.cfg b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.30_quick.inst.cfg index 2e503367a7..098f40cb57 100644 --- a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.30_quick.inst.cfg +++ b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.30_quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = ZAV_layer_030 diff --git a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.10_visual.inst.inst.cfg b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.10_visual.inst.inst.cfg index 9f29ca25ef..da9b60f6cd 100644 --- a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.10_visual.inst.inst.cfg +++ b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.10_visual.inst.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = ZAV_layer_010 intent_category = visual diff --git a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.15_eng.inst.inst.cfg b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.15_eng.inst.inst.cfg index bc7d7f0ea3..8be4196a98 100644 --- a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.15_eng.inst.inst.cfg +++ b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.15_eng.inst.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = ZAV_layer_015 diff --git a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.15_visual.inst.inst.cfg b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.15_visual.inst.inst.cfg index c2d9a8011c..5fd39e0e88 100644 --- a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.15_visual.inst.inst.cfg +++ b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.15_visual.inst.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = ZAV_layer_015 intent_category = visual diff --git a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_eng.inst.inst.cfg b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_eng.inst.inst.cfg index 8356130a24..e3cbbb8d1b 100644 --- a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_eng.inst.inst.cfg +++ b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_eng.inst.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = ZAV_layer_020 diff --git a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_quick.inst.cfg b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_quick.inst.cfg index 6d08c36513..350bc999d7 100644 --- a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_quick.inst.cfg +++ b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = ZAV_layer_020 diff --git a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_visual.inst.inst.cfg b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_visual.inst.inst.cfg index 7059a4348a..0727df494c 100644 --- a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_visual.inst.inst.cfg +++ b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_visual.inst.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = ZAV_layer_020 intent_category = visual diff --git a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.25_quick.inst.cfg b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.25_quick.inst.cfg index 41de978397..fd510e3b41 100644 --- a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.25_quick.inst.cfg +++ b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.25_quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = ZAV_layer_025 diff --git a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.30_quick.inst.cfg b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.30_quick.inst.cfg index fa5015d49b..d44ee0dde7 100644 --- a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.30_quick.inst.cfg +++ b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.30_quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = ZAV_layer_030 diff --git a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.10_visual.inst.inst.cfg b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.10_visual.inst.inst.cfg index e16aee4314..bf9437cf2e 100644 --- a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.10_visual.inst.inst.cfg +++ b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.10_visual.inst.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = ZAV_layer_010 intent_category = visual diff --git a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.15_eng.inst.inst.cfg b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.15_eng.inst.inst.cfg index 1494fcaa39..7d022b1d32 100644 --- a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.15_eng.inst.inst.cfg +++ b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.15_eng.inst.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = ZAV_layer_015 diff --git a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.15_visual.inst.inst.cfg b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.15_visual.inst.inst.cfg index fa99b3d08d..3ff155f4ed 100644 --- a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.15_visual.inst.inst.cfg +++ b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.15_visual.inst.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = ZAV_layer_015 intent_category = visual diff --git a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_eng.inst.inst.cfg b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_eng.inst.inst.cfg index 20592f83c7..45f5f44b85 100644 --- a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_eng.inst.inst.cfg +++ b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_eng.inst.inst.cfg @@ -4,7 +4,7 @@ name = Accurate definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = engineering quality_type = ZAV_layer_020 diff --git a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_quick.inst.cfg b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_quick.inst.cfg index 096c13d6a9..fa4aca0aba 100644 --- a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_quick.inst.cfg +++ b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = ZAV_layer_020 diff --git a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_visual.inst.inst.cfg b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_visual.inst.inst.cfg index 4eed411285..b47d9d36bd 100644 --- a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_visual.inst.inst.cfg +++ b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_visual.inst.inst.cfg @@ -4,7 +4,7 @@ name = Visual definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent quality_type = ZAV_layer_020 intent_category = visual diff --git a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.25_quick.inst.cfg b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.25_quick.inst.cfg index 97a2c3e365..98842cbd19 100644 --- a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.25_quick.inst.cfg +++ b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.25_quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = ZAV_layer_025 diff --git a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.30_quick.inst.cfg b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.30_quick.inst.cfg index 2514cbed6b..0d4c89e2ad 100644 --- a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.30_quick.inst.cfg +++ b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.30_quick.inst.cfg @@ -4,7 +4,7 @@ name = Quick definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = intent intent_category = quick quality_type = ZAV_layer_030 diff --git a/resources/meshes/Atom 3 bed.3mf b/resources/meshes/Atom 3 bed.3mf new file mode 100644 index 0000000000..0f9921e926 Binary files /dev/null and b/resources/meshes/Atom 3 bed.3mf differ diff --git a/resources/meshes/Atom 3 lite bed.3mf b/resources/meshes/Atom 3 lite bed.3mf new file mode 100644 index 0000000000..d7a3b69c3c Binary files /dev/null and b/resources/meshes/Atom 3 lite bed.3mf differ diff --git a/resources/meshes/BIQU_BX_PLATE.stl b/resources/meshes/BIQU_BX_PLATE.stl new file mode 100644 index 0000000000..9c1726f276 Binary files /dev/null and b/resources/meshes/BIQU_BX_PLATE.stl differ diff --git a/resources/meshes/FlashForge_DreamerNX.obj b/resources/meshes/FlashForge_DreamerNX.obj new file mode 100644 index 0000000000..88cf90198c --- /dev/null +++ b/resources/meshes/FlashForge_DreamerNX.obj @@ -0,0 +1,10479 @@ +# Object Export From Tinkercad Server 2015 + +mtllib obj.mtl + +o obj_0 +v -115.299 76.277 -0.0502 +v -115.299 76.277 -7.5502 +v 4.897 143.541 -23.5502 +v 4.782 143.882 -25.5502 +v 4.264 144.826 -23.5502 +v -115.299 -77.723 -7.5502 +v -115.299 -77.723 -0.0502 +v 4.264 144.826 -25.5502 +v 67.699 -79.723 -29.7502 +v -49.326 146.671 -32.5502 +v 67.699 -79.723 -37.5502 +v -60.145 51.331 -0.0502 +v -60.633 51.196 -0.0502 +v -60.633 51.196 0.2388 +v -60.145 51.331 0.2388 +v -52.506 146.252 -32.5502 +v 65.501 -79.723 -29.7502 +v -51.594 146.607 -32.5502 +v -61.068 51.014 -0.0502 +v -61.068 51.014 0.2388 +v -61.44 50.7972 -0.0502 +v -66.174 38.535 -0.0502 +v -66.298 38.236 -0.0502 +v -63.5869 49.5463 -0.0502 +v -63.925 51.176 -0.0502 +v -66.298 38.236 0.2388 +v -63.925 51.176 0.2388 +v -66.174 38.535 0.2388 +v -50.626 146.756 -32.5502 +v -61.449 50.792 -0.0502 +v -66.099 38.892 -0.0502 +v -61.449 50.792 0.2388 +v -66.099 38.892 0.2388 +v -63.5051 49.152 -0.0502 +v -61.775 50.529 -0.0502 +v -61.775 50.529 0.2388 +v -62.071 50.232 -0.0502 +v -62.071 50.232 0.2388 +v -62.332 49.909 -0.0502 +v -66.266 36.113 0.2388 +v -62.332 49.909 0.2388 +v -62.559 49.558 -0.0502 +v -62.559 49.558 0.2388 +v -66.074 39.308 -0.0502 +v -53.343 145.744 -32.5502 +v -66.074 39.308 0.2388 +v 18.701 -79.723 -25.5502 +v 0.736 145.641 -23.5502 +v -62.768 49.183 -0.0502 +v -62.768 49.183 0.2388 +v -54.266 144.821 -32.5502 +v 1.231 145.473 -23.5502 +v -62.7843 49.152 -0.0502 +v 19.701 -79.723 -29.5502 +v -49.152 65.536 -0.0502 +v 18.701 -79.723 -27.5502 +v -73.3 39.759 -0.0502 +v -73.3 39.759 0.2388 +v -73.728 39.2375 -0.0502 +v -55.572 49.377 -0.0502 +v -55.5881 49.152 -0.0502 +v -72.666 40.817 -0.0502 +v -72.666 40.817 0.2388 +v -50.245 50.549 -0.0502 +v 19.701 -79.723 -35.5502 +v 21.701 -79.723 -37.5502 +v -54.774 143.984 -32.5502 +v -51.608 49.437 -0.0502 +v -51.79 49.152 -0.0502 +v -55.664 49.985 -0.0502 +v 0.059 147.254 -23.5502 +v -55.94 50.491 -0.0502 +v 62.823 56.17 -0.0502 +v 62.823 56.17 0.2388 +v -56.4 50.893 -0.0502 +v -19.299 -79.723 -25.5502 +v 65.536 56.17 0.2388 +v -55.129 140.483 -32.5502 +v 54.649 56.17 0.2388 +v 54.649 56.17 -0.0502 +v -20.299 -79.723 -29.5502 +v -54.774 139.57 -32.5502 +v 1.124 147.09 -23.5502 +v -57.05 51.196 -0.0502 +v -19.299 -79.723 -27.5502 +v -57.344 51.2595 -0.0502 +v -55.299 141.777 -32.5502 +v -55.129 143.071 -32.5502 +v 3.319 145.903 -23.5502 +v -59.142 49.406 -0.0502 +v 65.438 54.303 0.2388 +v -59.568 49.581 -0.0502 +v -60.118 49.639 -0.0502 +v -60.481 49.606 -0.0502 +v -60.824 49.505 -0.0502 +v -61.148 49.336 -0.0502 +v 2.451 146.54 -23.5502 +v -61.385 49.152 -0.0502 +v -22.299 -79.723 -37.5502 +v -20.299 -79.723 -35.5502 +v -57.4263 51.2772 -0.0502 +v 65.251 54.499 0.2388 +v 65.04 54.654 0.2388 +v -57.893 51.378 -0.0502 +v 64.791 54.773 0.2388 +v -46.664 150.554 20.4498 +v -58.931 51.439 -0.0502 +v -47.841 150.953 20.4498 +v 1.443 -71.837 -25.5502 +v 64.522 54.86 0.2388 +v -45.549 150.004 20.4498 +v -59.578 51.412 -0.0502 +v 64.234 54.916 0.2388 +v 1.267 -72.495 -25.5502 +v -43.582 148.495 20.4498 +v -42.763 147.56 20.4498 +v 63.915 54.95 0.2388 +v -49.059 151.196 20.4498 +v -66.099 -79.723 -29.5502 +v -66.099 -79.723 -29.7502 +v 63.587 54.97 0.2388 +v -68.298 -79.723 -29.7502 +v 63.248 54.977 0.2388 +v -68.298 -79.723 -37.5502 +v -44.516 149.314 20.4498 +v 62.823 54.977 0.2388 +v 49.798 64.758 -50.5502 +v 50.363 64.619 -50.5502 +v 3.019 143.995 -23.5502 +v 2.529 144.606 -23.5502 +v 53.798 52.288 0.2388 +v 51.153 63.616 -50.5502 +v -53.589 138.026 -32.5502 +v -54.266 138.733 -32.5502 +v 51.149 62.889 -50.5502 +v -57.836 147.56 20.4498 +v 1.918 145.096 -23.5502 +v 51.917 53.077 0.2388 +v -51.594 136.947 -32.5502 +v -52.506 137.302 -32.5502 +v -55.049 150.004 20.4498 +v -56.083 149.314 20.4498 +v 51.892 53.456 0.2388 +v -53.935 150.554 20.4498 +v 49.219 64.694 -50.5502 +v 50.614 64.467 -50.5502 +v 50.913 64.146 -50.5502 +v -50.299 151.277 20.4498 +v 50.826 62.29 -50.5502 +v 51.818 53.786 0.2388 +v 50.226 61.881 -50.5502 +v 49.652 61.787 -50.5502 +v -51.539 151.196 20.4498 +v 49.219 61.86 -50.5502 +v -49.326 136.884 -32.5502 +v -50.626 136.798 -32.5502 +v -57.017 148.495 20.4498 +v 48.342 63.893 -50.5502 +v 48.575 64.264 -50.5502 +v 51.693 54.067 0.2388 +v -72.6053 40.96 -0.0502 +v 51.544 54.303 0.2388 +v -75.798 41.431 -0.0502 +v -76.0392 40.96 -0.0502 +v -75.798 41.431 0.2388 +v -52.758 150.953 20.4498 +v 48.283 62.796 -50.5502 +v 48.207 63.179 -50.5502 +v 51.365 54.499 0.2388 +v 48.869 64.522 -50.5502 +v 48.869 62.033 -50.5502 +v -75.435 42.442 -0.0502 +v 48.548 62.331 -50.5502 +v -75.435 42.442 0.2388 +v 51.156 54.654 0.2388 +v -75.174 43.572 -0.0502 +v 50.904 54.773 0.2388 +v -75.174 43.572 0.2388 +v -49.147 64.223 -50.5502 +v -48.882 63.758 -50.5502 +v -48.806 63.179 -50.5502 +v -48.904 62.752 -50.5502 +v -75.017 44.805 -0.0502 +v -40.881 143.017 20.4498 +v 50.628 54.86 0.2388 +v -40.799 141.777 20.4498 +v -75.017 44.805 0.2388 +v 50.327 54.916 0.2388 +v -74.965 46.142 -0.0502 +v -74.965 46.142 0.2388 +v -51.425 64.264 -50.5502 +v 0.262 -73.377 -25.5502 +v 0.671 -73.175 -25.5502 +v -40.881 140.537 20.4498 +v -50.781 64.694 -50.5502 +v 50.021 54.95 0.2388 +v -50.397 64.771 -50.5502 +v -50.007 64.745 -50.5502 +v -75.171 48.714 -0.0502 +v -49.637 64.619 -50.5502 +v -75.171 48.714 0.2388 +v 49.7 54.97 0.2388 +v -75.2981 49.152 -0.0502 +v 49.364 54.977 0.2388 +v -45.68 139.864 20.4498 +v -81.66 36.113 -0.0502 +v -81.66 36.113 0.2388 +v -49.174 62.29 -50.5502 +v -49.637 61.935 -50.5502 +v -50.007 61.809 -50.5502 +v -50.397 61.783 -50.5502 +v -50.956 61.946 -50.5502 +v -51.425 62.29 -50.5502 +v -51.787 63.081 -50.5502 +v -51.793 63.375 -50.5502 +v -81.6382 36.114 -0.0502 +v -45.299 141.777 20.4498 +v -45.969 144.277 20.4498 +v 0.967 -70.935 -50.5502 +v 1.169 -71.431 -50.5502 +v 62.823 54.977 -0.0502 +v -80.4266 36.171 -0.0502 +v 1.156 -72.012 -50.5502 +v 65.438 54.303 -0.0502 +v -45.406 140.804 20.4498 +v 65.536 54.1602 -0.0502 +v -80.043 36.189 -0.0502 +v -80.043 36.189 0.2388 +v 65.251 54.499 -0.0502 +v -79.2392 36.3141 -0.0502 +v 0.363 -70.381 -50.5502 +v 0.687 -70.598 -50.5502 +v 0.945 -72.555 -50.5502 +v 0.687 -72.848 -50.5502 +v 0.089 -73.172 -50.5502 +v 65.04 54.654 -0.0502 +v -78.565 36.419 -0.0502 +v -78.565 36.419 0.2388 +v 1.013 -72.874 -25.5502 +v -46.548 145.067 20.4498 +v 64.791 54.773 -0.0502 +v -78.3309 36.4856 -0.0502 +v -66.099 165.909 -26.5492 +v -47.528 145.926 20.4498 +v 64.522 54.86 -0.0502 +v -48.386 146.396 20.4498 +v -77.226 36.8 -0.0502 +v -0.565 -73.177 -50.5502 +v -1.131 -72.967 -50.5502 +v -77.226 36.8 0.2388 +v -66.099 165.277 -26.0862 +v -1.544 -72.555 -50.5502 +v -66.099 164.56 -25.7702 +v -1.717 -72.204 -50.5502 +v -1.79 -71.674 -50.5502 +v -1.544 -70.891 -50.5502 +v 64.234 54.916 -0.0502 +v -1.131 -70.478 -50.5502 +v -0.781 -70.306 -50.5502 +v -0.397 -70.229 -50.5502 +v -76.03 37.34 -0.0502 +v -0.007 -70.255 -50.5502 +v -76.03 37.34 0.2388 +v -49.005 146.607 20.4498 +v 114.701 76.277 -7.5502 +v 114.701 76.277 -0.0502 +v 63.915 54.95 -0.0502 +v -74.977 38.014 -0.0502 +v -74.977 38.014 0.2388 +v 63.587 54.97 -0.0502 +v -74.069 38.822 -0.0502 +v -74.069 38.822 0.2388 +v 63.248 54.977 -0.0502 +v 114.701 -77.723 -0.0502 +v 114.701 -77.723 -7.5502 +v -81.212 37.571 -0.0502 +v -81.92 37.5334 -0.0502 +v -81.212 37.571 0.2388 +v 67.699 167.277 -29.7502 +v 0.418 147.23 -25.5502 +v 1.465 146.974 -25.5502 +v 53.798 52.288 -0.0502 +v 56.06 49.152 -0.0502 +v 67.699 167.277 -37.5502 +v -80.13 37.76 -0.0502 +v -80.13 37.76 0.2388 +v 65.501 167.277 -29.7502 +v -66.099 167.243 -29.0282 +v 51.917 53.077 -0.0502 +v -79.152 38.074 -0.0502 +v -79.152 38.074 0.2388 +v 51.892 53.456 -0.0502 +v -78.276 38.51 -0.0502 +v -66.099 166.741 -27.5502 +v -78.276 38.51 0.2388 +v 51.818 53.786 -0.0502 +v -77.5 39.063 -0.0502 +v -41.123 139.318 20.4498 +v -77.5 39.063 0.2388 +v 51.693 54.067 -0.0502 +v 2.75 146.34 -25.5502 +v 3.59 145.666 -25.5502 +v -76.823 39.732 -0.0502 +v 51.544 54.303 -0.0502 +v -66.099 166.973 -28.0192 +v 51.365 54.499 -0.0502 +v 51.156 54.654 -0.0502 +v 50.904 54.773 -0.0502 +v -49.386 64.467 -7.5502 +v 50.628 54.86 -0.0502 +v -41.523 145.413 20.4498 +v -41.123 144.236 20.4498 +v 50.327 54.916 -0.0502 +v -42.072 146.527 20.4498 +v -66.099 165.167 -28.9082 +v 50.021 54.95 -0.0502 +v -66.099 163.854 -27.6472 +v -68.298 167.277 -29.7502 +v -66.099 167.277 -29.7502 +v 49.7 54.97 -0.0502 +v -68.298 167.277 -37.5502 +v -47.01 138.026 20.4498 +v -49.637 64.619 -7.5502 +v 49.364 54.977 -0.0502 +v -50.007 64.745 -7.5502 +v -48.386 137.158 20.4498 +v -47.799 137.447 20.4498 +v 57.237 147.56 20.4498 +v 56.418 148.495 20.4498 +v 55.484 149.314 20.4498 +v 54.451 150.004 20.4498 +v 53.336 150.554 20.4498 +v 52.159 150.953 20.4498 +v 50.941 151.196 20.4498 +v 49.701 151.277 20.4498 +v -46.333 138.733 20.4498 +v -66.099 164.386 -27.8902 +v -50.397 64.771 -7.5502 +v -50.781 64.694 -7.5502 +v 48.461 151.196 20.4498 +v 47.242 150.953 20.4498 +v 46.065 150.554 20.4498 +v 44.951 150.004 20.4498 +v 43.917 149.314 20.4498 +v 42.983 148.495 20.4498 +v 42.164 147.56 20.4498 +v -66.099 164.814 -28.2882 +v -51.213 64.467 -7.5502 +v -51.425 64.264 -7.5502 +v 58.877 139.318 20.4498 +v 59.119 140.537 20.4498 +v 59.201 141.777 20.4498 +v 59.119 143.017 20.4498 +v 58.877 144.236 20.4498 +v 58.477 145.413 20.4498 +v 57.928 146.527 20.4498 +v 54.701 141.777 20.4498 +v 54.594 140.804 20.4498 +v 54.32 139.864 20.4498 +v 54.031 144.277 20.4498 +v -42.072 137.027 20.4498 +v -42.763 135.994 20.4498 +v -44.516 134.24 20.4498 +v -45.549 133.55 20.4498 +v 51.614 146.396 20.4498 +v 52.472 145.926 20.4498 +v -51.685 63.851 -7.5502 +v -46.664 133 20.4498 +v 49.374 146.756 20.4498 +v -49.059 132.358 20.4498 +v -41.523 138.142 20.4498 +v -51.748 63.665 -7.5502 +v 4.897 140.013 -23.5502 +v -43.582 135.06 20.4498 +v 4.897 140.013 -25.5502 +v 53.452 145.067 20.4498 +v -68.299 165.276 -29.7502 +v -47.841 132.601 20.4498 +v 5.095 142.668 -25.5502 +v 51 64.027 -7.5502 +v -76.823 39.732 0.2388 +v 5.153 142.495 -23.5502 +v -76.261 40.527 -0.0502 +v 50.995 146.607 20.4498 +v -76.261 40.527 0.2388 +v -68.298 165.277 -29.7502 +v 50.353 146.734 20.4498 +v 5.153 141.059 -25.5502 +v 5.177 141.418 -23.5502 +v 0.262 -70.069 -27.5502 +v -66.099 165.277 -29.7502 +v -88.244 53.077 -0.0502 +v 0.576 -70.207 -27.5502 +v -88.244 53.077 0.2388 +v 50.614 64.467 -7.5502 +v -88.269 53.456 -0.0502 +v -88.269 53.456 0.2388 +v 57.928 137.027 20.4498 +v 58.477 138.142 20.4498 +v -88.344 53.786 -0.0502 +v 50.674 136.884 20.4498 +v 49.374 136.798 20.4498 +v -88.344 53.786 0.2388 +v 52.201 137.447 20.4498 +v 51.614 137.158 20.4498 +v -88.468 54.067 -0.0502 +v -88.468 54.067 0.2388 +v 52.99 138.026 20.4498 +v -70.299 165.276 -29.7502 +v -88.617 54.303 -0.0502 +v 53.667 138.733 20.4498 +v 0.97 -70.534 -27.5502 +v -88.617 54.303 0.2388 +v 50.363 64.619 -7.5502 +v 49.798 64.771 -7.5502 +v -88.796 54.499 -0.0502 +v -66.099 163.799 -25.5842 +v -88.796 54.499 0.2388 +v -89.005 54.654 0.2388 +v 3.165 139.777 -23.5502 +v -89.005 54.654 -0.0502 +v 49.701 132.277 20.4498 +v 50.941 132.358 20.4498 +v 52.159 132.601 20.4498 +v 53.336 133 20.4498 +v 54.451 133.55 20.4498 +v 55.484 134.24 20.4498 +v 56.418 135.06 20.4498 +v 57.237 135.994 20.4498 +v 49.409 64.745 -7.5502 +v -89.257 54.773 0.2388 +v -89.257 54.773 -0.0502 +v 3.615 142.556 -23.5502 +v 3.396 143.308 -23.5502 +v 46.929 145.926 20.4498 +v 48.097 146.502 20.4498 +v -89.533 54.86 0.2388 +v -89.533 54.86 -0.0502 +v 45.949 145.067 20.4498 +v 3.48 140.494 -23.5502 +v 3.666 141.255 -23.5502 +v 45.37 144.277 20.4498 +v -66.099 163.277 -25.5502 +v -89.834 54.916 0.2388 +v 44.722 141.451 20.4498 +v -89.834 54.916 -0.0502 +v 44.976 143.381 20.4498 +v 3.701 141.777 -23.5502 +v 44.976 140.173 20.4498 +v -90.112 54.9469 -0.0502 +v -82.377 54.755 0.2388 +v -82.377 54.755 -0.0502 +v -66.099 163.077 -25.5502 +v -66.299 163.077 -25.5502 +v -85.109 54.755 0.2388 +v -85.109 54.755 -0.0502 +v 49.219 61.86 -7.5502 +v 49.749 61.787 -7.5502 +v -90.14 54.95 0.2388 +v -90.14 54.95 -0.0502 +v -90.461 54.97 0.2388 +v -90.461 54.97 -0.0502 +v -90.797 54.977 0.2388 +v 1.436 -71.495 -27.5502 +v -90.797 54.977 -0.0502 +v -91.2 54.977 0.2388 +v -91.2 54.977 -0.0502 +v 1.329 -71.11 -27.5502 +v 41.473 146.527 20.4498 +v 50.089 61.828 -7.5502 +v -89.812 37.346 -0.0502 +v -90.112 37.3149 -0.0502 +v -89.812 37.346 0.2388 +v 40.924 145.413 20.4498 +v 40.524 144.236 20.4498 +v 40.282 143.017 20.4498 +v 40.201 141.777 20.4498 +v 40.282 140.537 20.4498 +v 40.524 139.318 20.4498 +v -89.513 37.414 -0.0502 +v -89.513 37.414 0.2388 +v 46.165 138.242 20.4498 +v 45.552 139.005 20.4498 +v 48.097 137.053 20.4498 +v -89.244 37.508 -0.0502 +v -89.244 37.508 0.2388 +v -89.005 37.629 -0.0502 +v -89.005 37.629 0.2388 +v 50.451 61.978 -7.5502 +v 50.826 62.29 -7.5502 +v -88.784 37.796 -0.0502 +v -88.784 37.796 0.2388 +v -88.597 37.998 -0.0502 +v -88.597 37.998 0.2388 +v -88.446 38.236 -0.0502 +v 51.086 62.703 -7.5502 +v -88.446 38.236 0.2388 +v 40.924 138.142 20.4498 +v 41.473 137.027 20.4498 +v 42.164 135.994 20.4498 +v 42.983 135.06 20.4498 +v 43.917 134.24 20.4498 +v 44.951 133.55 20.4498 +v 46.065 133 20.4498 +v 47.242 132.601 20.4498 +v 48.461 132.358 20.4498 +v -88.334 38.535 -0.0502 +v -67.078 163.077 -25.6352 +v -88.334 38.535 0.2388 +v 51.194 63.179 -7.5502 +v -88.266 38.892 -0.0502 +v -88.266 38.892 0.2388 +v 51.188 63.473 -7.5502 +v -88.244 39.308 -0.0502 +v -88.244 39.308 0.2388 +v -68.065 163.077 -25.9702 +v -68.931 163.077 -26.5492 +v -66.299 159.744 -25.5502 +v 1.267 -72.495 -27.5502 +v -54.774 139.57 20.4498 +v -55.299 141.777 20.4498 +v 1.391 -72.176 -27.5502 +v -55.193 142.75 20.4498 +v -51.903 146.502 20.4498 +v -52.799 146.107 20.4498 +v -50.781 61.86 -7.5502 +v -50.397 61.783 -7.5502 +v -53.589 145.528 20.4498 +v -54.919 143.69 20.4498 +v -54.266 144.821 20.4498 +v -50.299 146.777 20.4498 +v -49.961 61.825 -7.5502 +v 0.671 -73.175 -27.5502 +v 0.262 -73.377 -27.5502 +v -49.468 62.033 -7.5502 +v -49.174 62.29 -7.5502 +v -58.527 146.527 20.4498 +v -59.076 145.413 20.4498 +v -59.476 144.236 20.4498 +v -59.718 143.017 20.4498 +v -59.799 141.777 20.4498 +v -59.718 140.537 20.4498 +v -59.476 139.318 20.4498 +v -53.589 138.026 20.4498 +v -54.266 138.733 20.4498 +v -66.561 163.077 -27.5672 +v -66.941 163.077 -27.6602 +v -51.594 136.947 20.4498 +v -52.506 137.302 20.4498 +v -49.326 136.884 20.4498 +v -50.626 136.798 20.4498 +v -66.299 163.077 -27.5502 +v -82.399 37.508 -0.0502 +v -85.109 37.508 -0.0502 +v -85.109 37.508 0.2388 +v -82.399 37.508 0.2388 +v -67.457 163.077 -27.9332 +v -90.797 37.286 -0.0502 +v -91.2 37.286 -0.0502 +v -57.017 135.06 20.4498 +v -91.2 37.286 0.2388 +v -90.797 37.286 0.2388 +v -90.458 37.292 -0.0502 +v -90.458 37.292 0.2388 +v -90.13 37.313 -0.0502 +v -56.083 134.24 20.4498 +v -90.13 37.313 0.2388 +v -55.049 133.55 20.4498 +v -53.935 133 20.4498 +v -52.758 132.601 20.4498 +v -51.539 132.358 20.4498 +v -50.299 132.277 20.4498 +v -59.076 138.142 20.4498 +v -58.527 137.027 20.4498 +v -91.2 36.113 0.2388 +v -57.836 135.994 20.4498 +v -91.2 36.113 -0.0502 +v 1.013 -72.874 -27.5502 +v 67.699 165.277 -29.7502 +v -91.2 56.17 -0.0502 +v 69.701 165.276 -29.7502 +v 67.701 165.276 -29.7502 +v -66.099 163.077 -27.5502 +v 65.701 163.077 -25.5502 +v -81.66 56.17 -0.0502 +v 66.736 163.077 -25.6862 +v 67.701 163.077 -26.0862 +v 68.332 163.077 -26.5492 +v 68.874 163.077 -27.1152 +v -68.717 51.176 -0.0502 +v -68.717 49.983 -0.0502 +v -72.21 50.408 -0.0502 +v -71.8377 49.152 -0.0502 +v -68.089 163.077 -28.6672 +v -66.3609 49.152 -0.0502 +v -68.257 163.077 -29.1602 +v -66.448 49.289 -0.0502 +v -66.627 49.484 -0.0502 +v -66.836 49.639 -0.0502 +v -67.087 49.761 -0.0502 +v -67.363 49.855 -0.0502 +v -67.664 49.922 -0.0502 +v -67.97 49.956 -0.0502 +v -68.291 49.976 -0.0502 +v -68.627 49.983 -0.0502 +v -72.74 51.585 -0.0502 +v -67.886 163.077 -28.3322 +v -73.405 52.636 -0.0502 +v -73.728 53.0108 -0.0502 +v -74.203 53.562 -0.0502 +v -75.134 54.344 -0.0502 +v -69.618 163.077 -27.3322 +v -76.194 54.991 -0.0502 +v 69.701 163.077 -29.7502 +v -77.383 55.503 -0.0502 +v -78.694 55.873 -0.0502 +v -80.12 56.096 -0.0502 +v -75.791 50.85 -0.0502 +v -76.823 52.551 -0.0502 +v -78.266 53.775 -0.0502 +v -80.118 54.51 -0.0502 +v 69.615 163.077 -28.7712 +v 67.658 163.077 -29.1602 +v -66.074 48.062 -0.0502 +v -66.099 48.451 -0.0502 +v -66.174 48.781 -0.0502 +v -66.298 49.053 -0.0502 +v -71.825 49.109 -0.0502 +v -71.593 47.694 -0.0502 +v 69.28 163.077 -27.7842 +v -72.165 41.997 -0.0502 +v -71.805 43.286 -0.0502 +v -71.588 44.675 -0.0502 +v -51.213 62.087 -7.5502 +v -71.516 46.162 -0.0502 +v -51.425 62.29 -7.5502 +v -68.717 37.286 -0.0502 +v -68.627 37.286 -0.0502 +v -68.289 37.292 -0.0502 +v -67.96 37.313 -0.0502 +v -51.787 63.081 -7.5502 +v -67.642 37.346 -0.0502 +v -67.343 37.414 -0.0502 +v -67.075 37.508 -0.0502 +v -66.836 37.629 -0.0502 +v -66.627 37.796 -0.0502 +v -66.448 37.998 -0.0502 +v 67.49 163.077 -28.6672 +v 67.201 163.077 -28.2342 +v 66.342 163.077 -27.6602 +v 65.701 163.077 -27.5502 +v 66.809 163.077 -27.8902 +v -68.717 36.113 -0.0502 +v -68.299 163.077 -29.7502 +v -51.717 62.796 -7.5502 +v 48.961 56.17 -0.0502 +v 48.961 56.17 0.2388 +v 48.961 54.977 0.2388 +v 39.15 49.985 0.2388 +v 38.874 50.491 0.2388 +v 38.414 50.893 0.2388 +v 37.764 51.196 0.2388 +v 36.921 51.378 0.2388 +v 39.242 49.377 0.2388 +v 35.672 49.406 0.2388 +v 19.701 -77.723 -35.5502 +v 21.701 -77.723 -37.5502 +v 35.246 49.581 0.2388 +v -70.299 163.077 -29.7502 +v 34.696 49.639 0.2388 +v 34.333 49.606 0.2388 +v 33.99 49.505 0.2388 +v -70.265 163.077 -29.0282 +v -70.079 163.077 -28.2672 +v 33.666 49.336 0.2388 +v 35.883 51.439 0.2388 +v 35.236 51.412 0.2388 +v 34.669 51.331 0.2388 +v 34.181 51.196 0.2388 +v 33.746 51.014 0.2388 +v 33.365 50.792 0.2388 +v 33.039 50.529 0.2388 +v 48.961 54.977 -0.0502 +v 39.2259 49.152 -0.0502 +v 39.242 49.377 -0.0502 +v 39.15 49.985 -0.0502 +v 38.874 50.491 -0.0502 +v 38.414 50.893 -0.0502 +v 37.764 51.196 -0.0502 +v 36.921 51.378 -0.0502 +v 36.864 51.3814 -0.0502 +v 35.672 49.406 -0.0502 +v 35.9338 49.152 -0.0502 +v 67.701 163.077 -29.7502 +v 35.246 49.581 -0.0502 +v 9.132 138.453 -27.5502 +v 34.696 49.639 -0.0502 +v 34.333 49.606 -0.0502 +v 33.99 49.505 -0.0502 +v 33.666 49.336 -0.0502 +v 36.3406 51.4121 -0.0502 +v 33.429 49.152 -0.0502 +v 35.883 51.439 -0.0502 +v 35.236 51.412 -0.0502 +v 34.669 51.331 -0.0502 +v 34.181 51.196 -0.0502 +v 33.746 51.014 -0.0502 +v 4.464 139.027 -25.5502 +v 33.365 50.792 -0.0502 +v 4.264 138.728 -23.5502 +v 33.039 50.529 -0.0502 +v 32.768 50.2571 -0.0502 +v 0.736 137.913 -23.5502 +v 1.466 138.197 -23.5502 +v 2.136 138.604 -23.5502 +v 2.701 139.145 -23.5502 +v 48.575 64.264 -7.5502 +v 48.913 64.543 -7.5502 +v 48.358 63.939 -7.5502 +v 48.233 63.569 -7.5502 +v 48.283 62.796 -7.5502 +v 48.575 62.29 -7.5502 +v 48.869 62.033 -7.5502 +v 48.207 63.179 -7.5502 +v 3.319 137.651 -23.5502 +v 0.771 136.394 -23.5502 +v 1.805 136.696 -23.5502 +v 65.465 36.113 0.2388 +v 53.798 39.308 0.2388 +v 53.821 38.892 0.2388 +v 53.888 38.535 0.2388 +v 54 38.236 0.2388 +v 54.161 37.998 0.2388 +v 54.348 37.796 0.2388 +v 54.56 37.629 0.2388 +v 54.798 37.508 0.2388 +v 55.067 37.414 0.2388 +v 4.064 138.429 -25.5502 +v 3.049 137.414 -25.5502 +v 55.366 37.346 0.2388 +v 67.699 165.277 -37.5502 +v 55.684 37.313 0.2388 +v 56.013 37.292 0.2388 +v 69.701 165.276 -37.5502 +v 67.701 165.276 -37.5502 +v 56.351 37.286 0.2388 +v 56.776 36.113 0.2388 +v 56.776 37.286 0.2388 +v 1.805 136.696 -25.5502 +v 0.418 136.324 -25.5502 +v 49.364 37.286 0.2388 +v 49.703 37.292 0.2388 +v 50.031 37.313 0.2388 +v 50.35 37.346 0.2388 +v 50.648 37.414 0.2388 +v 50.917 37.508 0.2388 +v 51.156 37.629 0.2388 +v 51.377 37.796 0.2388 +v 51.564 37.998 0.2388 +v 51.716 38.236 0.2388 +v 51.827 38.535 0.2388 +v 51.895 38.892 0.2388 +v 51.917 36.113 0.2388 +v 51.917 39.308 0.2388 +v 48.961 36.113 0.2388 +v 48.961 37.286 0.2388 +v -70.299 165.276 -37.5502 +v -68.299 165.276 -37.5502 +v -68.298 165.277 -37.5502 +v 37.287 47.458 0.2388 +v 37.675 47.537 0.2388 +v 38.013 47.644 0.2388 +v 38.312 47.779 0.2388 +v 38.571 47.941 0.2388 +v 38.775 48.127 0.2388 +v 38.939 48.336 0.2388 +v 39.063 48.568 0.2388 +v 39.163 48.828 0.2388 +v 39.222 49.098 0.2388 +v 36.291 48.116 0.2388 +v 36.331 47.395 0.2388 +v 36.172 48.689 0.2388 +v 35.973 49.114 0.2388 +v 36.839 47.411 0.2388 +v 0 134.277 -25.5502 +v 33.38 49.114 0.2388 +v 33.119 48.851 0.2388 +v 32.883 48.548 0.2388 +v 32.94 37.4 0.2388 +v 33.241 37.346 0.2388 +v 33.547 37.313 0.2388 +v 33.868 37.292 0.2388 +v -36.799 130.277 -19.5502 +v -34.799 130.277 -17.5502 +v 34.204 37.286 0.2388 +v 35.077 36.113 0.2388 +v 35.077 37.286 0.2388 +v 65.536 40.9915 -0.0502 +v 57.344 47.3719 -0.0502 +v 65.465 36.113 -0.0502 +v -37.799 126.165 -27.5502 +v 56.776 36.113 -0.0502 +v 56.776 37.286 -0.0502 +v 53.798 39.308 -0.0502 +v -36.799 130.277 -23.5502 +v 53.821 38.892 -0.0502 +v 53.888 38.535 -0.0502 +v 54 38.236 -0.0502 +v -36.799 130.497 -24.8332 +v 54.161 37.998 -0.0502 +v 54.348 37.796 -0.0502 +v 54.56 37.629 -0.0502 +v -36.799 130.311 -24.0722 +v 7.991 136.185 -27.5502 +v -41.599 123.769 -27.5502 +v 4.334 132.916 -27.5502 +v -37.799 120.277 -25.5502 +v 6.315 134.277 -27.5502 +v -38.626 119.277 -27.1152 +v -39.799 119.277 -26.0862 +v -39.364 119.277 -26.3762 +v -40.764 119.277 -25.6862 +v 54.798 37.508 -0.0502 +v 55.067 37.414 -0.0502 +v -37.834 119.277 -29.0282 +v -38.02 119.277 -28.2672 +v 55.366 37.346 -0.0502 +v 55.684 37.313 -0.0502 +v 56.013 37.292 -0.0502 +v 56.351 37.286 -0.0502 +v -40.299 119.277 -28.2342 +v -40.691 119.277 -27.8902 +v 49.364 37.286 -0.0502 +v 49.703 37.292 -0.0502 +v -39.868 119.277 -29.0322 +v 50.031 37.313 -0.0502 +v 50.35 37.346 -0.0502 +v 50.648 37.414 -0.0502 +v 50.917 37.508 -0.0502 +v 51.156 37.629 -0.0502 +v 51.377 37.796 -0.0502 +v 51.564 37.998 -0.0502 +v 51.716 38.236 -0.0502 +v -37.799 120.277 -27.5502 +v 51.827 38.535 -0.0502 +v 51.895 38.892 -0.0502 +v 51.917 39.308 -0.0502 +v -37.799 -48.923 -25.5502 +v 48.961 37.286 -0.0502 +v 48.961 36.113 -0.0502 +v -38.626 -47.923 -27.1152 +v -38.971 -47.923 -26.7212 +v -39.799 -47.923 -26.0862 +v -40.516 -47.923 -25.7702 +v -37.799 119.277 -29.5502 +v 37.287 47.458 -0.0502 +v 36.864 47.4136 -0.0502 +v -39.799 119.277 -29.5502 +v 37.675 47.537 -0.0502 +v 38.013 47.644 -0.0502 +v 38.312 47.779 -0.0502 +v 38.571 47.941 -0.0502 +v 38.775 48.127 -0.0502 +v 38.939 48.336 -0.0502 +v 39.063 48.568 -0.0502 +v 39.163 48.828 -0.0502 +v 39.222 49.098 -0.0502 +v 36.291 48.116 -0.0502 +v 36.331 47.395 -0.0502 +v 36.44 47.3984 -0.0502 +v 36.172 48.689 -0.0502 +v 36.7714 47.4089 -0.0502 +v 35.973 49.114 -0.0502 +v -32.79 48.554 0.2388 +v -32.887 48.204 0.2388 +v 36.839 47.411 -0.0502 +v -32.937 47.817 0.2388 +v 2.086 132.066 -27.5502 +v -32.967 47.413 0.2388 +v 33.38 49.114 -0.0502 +v -32.977 46.991 0.2388 +v -35.619 48.75 0.2388 +v -35.545 48.166 0.2388 +v -35.321 47.707 0.2388 +v -34.947 47.375 0.2388 +v -34.43 47.161 0.2388 +v -33.773 47.033 0.2388 +v 33.119 48.851 -0.0502 +v -41.999 120.277 -25.5502 +v -40.081 45.728 0.2388 +v -40.23 46.705 0.2388 +v 32.883 48.548 -0.0502 +v -40.479 47.597 0.2388 +v -40.822 48.399 0.2388 +v -41.999 119.277 -25.5502 +v -32.887 42.664 0.2388 +v -33.213 42.347 0.2388 +v -33.474 41.99 0.2388 +v -41.277 119.277 -25.5842 +v -33.671 41.592 0.2388 +v -33.808 41.154 0.2388 +v -36.142 42.77 0.2388 +v -36.724 41.664 0.2388 +v -33.793 44.23 0.2388 +v -35.171 43.614 0.2388 +v -40.031 43.351 0.2388 +v -40.031 44.666 0.2388 +v -41.222 119.277 -27.6472 +v -41.799 119.277 -27.5502 +v -33.917 40.157 0.2388 +v -33.89 40.676 0.2388 +v -33.848 39.355 0.2388 +v -33.639 38.701 0.2388 +v -40.917 -47.923 -27.7602 +v -40.484 -47.923 -28.0492 +v -33.29 38.196 0.2388 +v -40.14 -47.923 -28.4412 +v 32.768 48.3653 -0.0502 +v -32.81 37.836 0.2388 +v -39.91 -47.923 -28.9082 +v -41.999 120.277 -27.5502 +v -37.936 -47.923 -28.5142 +v -38.22 -47.923 -27.7842 +v -36.759 38.905 0.2388 +v -36.56 38.317 0.2388 +v -36.289 37.782 0.2388 +v -41.999 119.277 -27.5502 +v -35.953 37.31 0.2388 +v -35.552 36.902 0.2388 +v -45.836 122.281 -27.5502 +v -35.094 36.571 0.2388 +v -34.587 36.309 0.2388 +v -34.029 36.113 0.2388 +v -33.417 35.956 0.2388 +v -32.775 35.861 0.2388 +v 0 163.277 -25.5502 +v -36.918 40.298 0.2388 +v -36.878 39.566 0.2388 +v -40.874 37.987 0.2388 +v -40.762 38.29 0.2388 +v -40.725 38.58 0.2388 +v -40.747 38.811 0.2388 +v -40.815 39.02 0.2388 +v -40.926 39.207 0.2388 +v -8.077 148.062 -27.5502 +v -43.054 44.969 0.2388 +v -43.076 45.665 0.2388 +v 32.94 37.4 -0.0502 +v 32.768 37.4505 -0.0502 +v -4.027 151.057 -27.5502 +v -6.244 149.819 -27.5502 +v -43.143 46.326 0.2388 +v 4.701 150.437 -32.5502 +v 33.241 37.346 -0.0502 +v -43.255 46.95 0.2388 +v 3.527 151.016 -32.5502 +v 33.547 37.313 -0.0502 +v -43.4 47.516 0.2388 +v 2.289 151.436 -32.5502 +v 33.868 37.292 -0.0502 +v -43.594 48.029 0.2388 +v -62.799 126.165 -27.5502 +v -59 123.769 -27.5502 +v 34.204 37.286 -0.0502 +v -43.838 48.487 0.2388 +v 35.077 37.286 -0.0502 +v 7.634 147.865 -32.5502 +v -44.134 48.885 0.2388 +v 35.077 36.113 -0.0502 +v 6.772 148.848 -32.5502 +v -41.255 49.107 0.2388 +v -41.758 39.056 0.2388 +v -41.526 39.299 0.2388 +v 1.006 151.692 -32.5502 +v 5.788 149.711 -32.5502 +v -37.799 -48.923 -27.5502 +v -41.33 39.55 0.2388 +v -41.051 39.353 0.2388 +v -41.185 39.467 0.2388 +v -44.738 37.681 0.2388 +v -44.263 37.771 0.2388 +v -54.762 122.281 -27.5502 +v -43.815 37.892 0.2388 +v 9.615 143.082 -32.5502 +v 9.36 144.365 -32.5502 +v -39.799 -47.923 -29.5502 +v -43.397 38.041 0.2388 +v -43.009 38.216 0.2388 +v -50.299 121.777 -27.5502 +v -42.651 38.4 0.2388 +v 8.361 146.777 -32.5502 +v -37.799 -47.923 -29.5502 +v -42.322 38.602 0.2388 +v -42.024 38.822 0.2388 +v 9.701 141.777 -32.5502 +v -41.41 -47.923 -27.5922 +v -41.668 37.059 0.2388 +v -41.325 37.355 0.2388 +v -41.061 37.67 0.2388 +v -41.999 -47.923 -27.5502 +v -1.569 151.696 -27.5502 +v -44.517 35.956 0.2388 +v -43.793 36.113 0.2388 +v -43.146 36.304 0.2388 +v -42.579 36.526 0.2388 +v -42.091 36.78 0.2388 +v -41.999 -48.923 -27.5502 +v -49.145 38.984 0.2388 +v -48.727 38.555 0.2388 +v -48.249 38.211 0.2388 +v -47.712 37.953 0.2388 +v -47.117 37.762 0.2388 +v -46.468 37.647 0.2388 +v -45.763 37.609 0.2388 +v -45.238 37.627 0.2388 +v -46.189 35.83 0.2388 +v -45.316 35.861 0.2388 +v -48.279 36.055 0.2388 +v -47.271 35.886 0.2388 +v -49.19 48.588 0.2388 +v -49.732 47.638 0.2388 +v -50.105 46.431 0.2388 +v -52.591 47.898 0.2388 +v -53.181 45.924 0.2388 +v -57.139 47.537 0.2388 +v -56.801 47.644 0.2388 +v -56.502 47.779 0.2388 +v -56.244 47.941 0.2388 +v -56.04 48.127 0.2388 +v -55.875 48.336 0.2388 +v -55.751 48.568 0.2388 +v -55.651 48.828 0.2388 +v -55.592 49.098 0.2388 +v -50.309 44.969 0.2388 +v -50.377 43.351 0.2388 +v -50.317 42.399 0.2388 +v -50.197 41.536 0.2388 +v -53.377 43.513 0.2388 +v -53.325 42.343 0.2388 +v -53.168 41.258 0.2388 +v -50.018 40.763 0.2388 +v -49.782 40.08 0.2388 +v -41.999 -48.923 -25.5502 +v -41.999 -47.923 -25.5502 +v -49.491 39.487 0.2388 +v -50.814 37.225 0.2388 +v -50.061 36.726 0.2388 +v -49.212 36.335 0.2388 +v -41.277 -47.923 -25.5842 +v -52.907 40.258 0.2388 +v -52.529 39.35 0.2388 +v -52.051 38.542 0.2388 +v -51.474 37.832 0.2388 +v -58.523 48.116 0.2388 +v -58.483 47.395 0.2388 +v -58.642 48.689 0.2388 +v -0.299 145.777 -23.5502 +v -58.841 49.114 0.2388 +v -57.975 47.411 0.2388 +v -57.528 47.458 0.2388 +v 9.615 140.472 -32.5502 +v 8.939 145.604 -32.5502 +v -61.434 49.114 0.2388 +v -1.582 145.557 -23.5502 +v -61.695 48.851 0.2388 +v -61.932 48.548 0.2388 +v -36.799 -55.895 -26.7212 +v -62.146 48.208 0.2388 +v -3.648 146.141 -23.5502 +v -36.799 -56.723 -26.0862 +v -36.799 -57.192 -25.8542 +v -62.34 47.838 0.2388 +v -2.064 146.974 -23.5502 +v -62.514 47.436 0.2388 +v -1.017 147.23 -23.5502 +v -62.656 47.002 0.2388 +v -3.049 146.54 -23.5502 +v -62.783 46.564 0.2388 +v -62.895 46.121 0.2388 +v -62.977 45.679 0.2388 +v -63.044 45.241 0.2388 +v -63.342 48.366 0.2388 +v -63.186 48.366 0.2388 +v -62.977 48.786 0.2388 +v -2.517 145.096 -23.5502 +v -63.096 44.807 0.2388 +v -3.3 144.409 -23.5502 +v -3.764 143.777 -23.5502 +v -63.133 44.376 0.2388 +v -63.156 43.971 0.2388 +v -63.163 43.594 0.2388 +v -63.163 39.166 0.2388 +v 2.701 144.409 -32.5502 +v -63.138 38.777 0.2388 +v 1.466 145.357 -32.5502 +v -36.799 -54.723 -29.5502 +v -63.064 38.447 0.2388 +v 0.479 145.692 -32.5502 +v -36.799 -56.723 -29.5502 +v -62.939 38.175 0.2388 +v -62.79 37.939 0.2388 +v -36.799 -57.222 -28.2342 +v -62.611 37.744 0.2388 +v -62.402 37.589 0.2388 +v -36.799 -56.791 -29.0322 +v -62.151 37.481 0.2388 +v 3.165 143.777 -32.5502 +v -61.874 37.4 0.2388 +v -61.573 37.346 0.2388 +v -61.267 37.313 0.2388 +v -60.946 37.292 0.2388 +v -60.61 37.286 0.2388 +v -59.737 36.113 0.2388 +v -59.737 37.286 0.2388 +v 2.136 144.95 -32.5502 +v -35.5779 49.152 -0.0502 +v -35.619 48.75 -0.0502 +v -36.799 -54.757 -29.0282 +v -35.545 48.166 -0.0502 +v -35.321 47.707 -0.0502 +v -34.947 47.375 -0.0502 +v -36.799 -55.404 -27.3322 +v -34.43 47.161 -0.0502 +v -33.773 47.033 -0.0502 +v -32.977 46.991 -0.0502 +v -36.799 -55.027 -28.0192 +v -1.017 147.23 -25.5502 +v -32.79 48.554 -0.0502 +v -32.768 48.6042 -0.0502 +v -32.887 48.204 -0.0502 +v -32.937 47.817 -0.0502 +v -32.967 47.413 -0.0502 +v -40.081 45.728 -0.0502 +v -40.0494 45.056 -0.0502 +v -40.23 46.705 -0.0502 +v -40.479 47.597 -0.0502 +v -36.799 -58.923 -25.5502 +v -37.799 -58.923 -25.5502 +v -40.822 48.399 -0.0502 +v -2.064 146.974 -25.5502 +v -36.799 -58.723 -25.5502 +v -40.96 48.6246 -0.0502 +v -35.4736 43.351 -0.0502 +v -36.142 42.77 -0.0502 +v -36.799 -57.944 -25.6352 +v -36.724 41.664 -0.0502 +v -36.824 40.96 -0.0502 +v -32.887 42.664 -0.0502 +v -32.768 42.7426 -0.0502 +v -33.213 42.347 -0.0502 +v -5.496 143.541 -25.5502 +v -33.474 41.99 -0.0502 +v -5.063 144.527 -25.5502 +v -33.671 41.592 -0.0502 +v -5.496 143.541 -23.5502 +v -5.063 144.527 -23.5502 +v -33.808 41.154 -0.0502 +v -4.426 145.396 -25.5502 +v -33.8413 40.96 -0.0502 +v 3.019 139.56 -32.5502 +v -4.189 145.666 -23.5502 +v -40.031 43.351 -0.0502 +v 3.48 143.06 -32.5502 +v -32.768 44.4555 -0.0502 +v -33.793 44.23 -0.0502 +v 3.666 142.299 -32.5502 +v -36.799 -58.146 -27.6472 +v -35.171 43.614 -0.0502 +v 3.615 140.998 -32.5502 +v -36.799 -58.723 -27.5502 +v -40.031 44.666 -0.0502 +v -36.864 40.6782 -0.0502 +v -36.799 -57.614 -27.8902 +v -36.864 39.4882 -0.0502 +v -36.759 38.905 -0.0502 +v -36.56 38.317 -0.0502 +v 3.396 140.246 -32.5502 +v -36.289 37.782 -0.0502 +v -3.995 140.246 -23.5502 +v -35.953 37.31 -0.0502 +v -35.552 36.902 -0.0502 +v -3.618 139.56 -23.5502 +v -35.4994 36.864 -0.0502 +v -33.917 40.157 -0.0502 +v -33.89 40.676 -0.0502 +v -4.079 143.06 -23.5502 +v -33.848 39.355 -0.0502 +v -33.639 38.701 -0.0502 +v -33.29 38.196 -0.0502 +v -32.81 37.836 -0.0502 +v -32.768 37.8217 -0.0502 +v -35.094 36.571 -0.0502 +v -34.587 36.309 -0.0502 +v 8.361 136.777 -32.5502 +v -34.029 36.113 -0.0502 +v 8.939 137.95 -32.5502 +v -33.417 35.956 -0.0502 +v -32.775 35.861 -0.0502 +v 9.36 139.189 -32.5502 +v -32.768 35.8607 -0.0502 +v -4.214 140.998 -23.5502 +v -36.918 40.298 -0.0502 +v -36.878 39.566 -0.0502 +v -4.265 142.299 -23.5502 +v -40.874 37.987 -0.0502 +v -40.96 37.8412 -0.0502 +v -40.762 38.29 -0.0502 +v 0.479 137.862 -32.5502 +v -40.725 38.58 -0.0502 +v -4.299 141.777 -23.5502 +v -40.747 38.811 -0.0502 +v 1.918 138.458 -32.5502 +v -40.815 39.02 -0.0502 +v -40.926 39.207 -0.0502 +v -37.799 117.277 -37.5502 +v -37.799 119.277 -35.5502 +v -40.96 39.2467 -0.0502 +v -37.799 126.165 -32.5502 +v 1.231 138.082 -32.5502 +v -39.799 117.277 -37.5502 +v -39.799 119.277 -35.5502 +v -41.599 123.769 -32.5502 +v 2.529 138.949 -32.5502 +v -45.836 122.281 -32.5502 +v -41.255 49.107 -0.0502 +v -41.2933 49.152 -0.0502 +v -62.799 126.165 -32.5502 +v -59 123.769 -32.5502 +v -49.152 48.6243 -0.0502 +v -5.496 140.013 -23.5502 +v -54.762 122.281 -32.5502 +v -43.054 44.969 -0.0502 +v -43.076 45.665 -0.0502 +v 7.634 135.689 -32.5502 +v -50.299 121.777 -32.5502 +v -43.143 46.326 -0.0502 +v -5.752 141.059 -23.5502 +v -5.776 142.136 -23.5502 +v -43.255 46.95 -0.0502 +v -43.4 47.516 -0.0502 +v -43.594 48.029 -0.0502 +v 1.006 131.863 -32.5502 +v -43.838 48.487 -0.0502 +v 3.527 132.538 -32.5502 +v 4.701 133.117 -32.5502 +v -44.134 48.885 -0.0502 +v 0 76.277 -7.5502 +v -44.418 49.152 -0.0502 +v 0 76.277 -0.0502 +v 6.772 134.706 -32.5502 +v 5.788 133.844 -32.5502 +v 2.289 132.118 -32.5502 +v -41.051 39.353 -0.0502 +v -41.185 39.467 -0.0502 +v -41.33 39.55 -0.0502 +v -41.758 39.056 -0.0502 +v -41.9217 38.912 -0.0502 +v -41.526 39.299 -0.0502 +v -41.668 37.059 -0.0502 +v -41.9636 36.864 -0.0502 +v -41.325 37.355 -0.0502 +v -41.061 37.67 -0.0502 +v -44.738 37.681 -0.0502 +v -45.056 37.6467 -0.0502 +v -44.263 37.771 -0.0502 +v -43.815 37.892 -0.0502 +v -5.381 139.672 -25.5502 +v -43.397 38.041 -0.0502 +v -43.009 38.216 -0.0502 +v -5.776 142.136 -25.5502 +v -42.651 38.4 -0.0502 +v -5.682 140.706 -25.5502 +v -42.322 38.602 -0.0502 +v -42.024 38.822 -0.0502 +v -36.799 -58.923 -27.5502 +v -44.517 35.956 -0.0502 +v -43.793 36.113 -0.0502 +v -43.146 36.304 -0.0502 +v -42.579 36.526 -0.0502 +v -37.799 -58.923 -27.5502 +v -42.091 36.78 -0.0502 +v -45.316 35.861 -0.0502 +v -49.145 38.984 -0.0502 +v -49.152 38.9942 -0.0502 +v -48.727 38.555 -0.0502 +v -48.249 38.211 -0.0502 +v -47.712 37.953 -0.0502 +v -47.117 37.762 -0.0502 +v -46.468 37.647 -0.0502 +v -45.763 37.609 -0.0502 +v -39.799 -45.923 -37.5502 +v -39.799 -47.923 -35.5502 +v -45.238 37.627 -0.0502 +v -34.799 -56.723 -37.5502 +v -34.799 -54.723 -37.5502 +v -37.799 -45.923 -37.5502 +v -36.799 -56.723 -35.5502 +v -49.152 36.317 -0.0502 +v -36.799 -54.723 -35.5502 +v -48.279 36.055 -0.0502 +v -47.271 35.886 -0.0502 +v -46.189 35.83 -0.0502 +v -52.591 47.898 -0.0502 +v -37.799 -47.923 -35.5502 +v -53.181 45.924 -0.0502 +v -53.248 45.0998 -0.0502 +v -49.19 48.588 -0.0502 +v -49.732 47.638 -0.0502 +v -50.105 46.431 -0.0502 +v -50.2969 45.056 -0.0502 +v -0.397 -70.229 -7.5502 +v -53.2516 45.056 -0.0502 +v -57.139 47.537 -0.0502 +v -57.344 47.4954 -0.0502 +v -1.002 -70.408 -7.5502 +v -1.425 -70.736 -7.5502 +v -56.801 47.644 -0.0502 +v -56.502 47.779 -0.0502 +v -1.642 -71.061 -7.5502 +v -56.244 47.941 -0.0502 +v -56.04 48.127 -0.0502 +v -1.768 -71.431 -7.5502 +v -55.875 48.336 -0.0502 +v -55.751 48.568 -0.0502 +v -55.651 48.828 -0.0502 +v -55.592 49.098 -0.0502 +v -50.377 43.351 -0.0502 +v -50.309 44.969 -0.0502 +v -50.317 42.399 -0.0502 +v -50.197 41.536 -0.0502 +v -10.299 141.777 -27.5502 +v -10.264 140.936 -27.5502 +v -50.0636 40.96 -0.0502 +v -53.377 43.513 -0.0502 +v -53.325 42.343 -0.0502 +v -1.717 -72.204 -7.5502 +v -1.544 -72.555 -7.5502 +v -53.168 41.258 -0.0502 +v -53.0902 40.96 -0.0502 +v -50.018 40.763 -0.0502 +v -49.782 40.08 -0.0502 +v -1.36 -72.784 -7.5502 +v -1.049 -73.022 -7.5502 +v -49.491 39.487 -0.0502 +v -9.41 145.9 -27.5502 +v -52.907 40.258 -0.0502 +v -52.529 39.35 -0.0502 +v -52.051 38.542 -0.0502 +v -0.495 -73.21 -7.5502 +v -51.474 37.832 -0.0502 +v -50.814 37.225 -0.0502 +v -10.155 143.473 -27.5502 +v -0.104 -73.21 -7.5502 +v -50.061 36.726 -0.0502 +v -49.212 36.335 -0.0502 +v -1.793 -71.821 -7.5502 +v -58.523 48.116 -0.0502 +v -58.483 47.395 -0.0502 +v -58.374 47.3984 -0.0502 +v -58.642 48.689 -0.0502 +v -58.0426 47.4089 -0.0502 +v -58.841 49.114 -0.0502 +v -3.128 138.949 -23.5502 +v -57.975 47.411 -0.0502 +v -57.528 47.458 -0.0502 +v -2.517 138.458 -23.5502 +v -1.582 137.997 -23.5502 +v -0.561 137.794 -23.5502 +v -61.434 49.114 -0.0502 +v -61.44 49.108 -0.0502 +v -61.695 48.851 -0.0502 +v -61.932 48.548 -0.0502 +v -62.146 48.208 -0.0502 +v -62.34 47.838 -0.0502 +v -37.799 78.777 -25.5502 +v -62.514 47.436 -0.0502 +v -1.017 136.324 -23.5502 +v -2.064 136.58 -23.5502 +v -62.656 47.002 -0.0502 +v -3.049 137.014 -23.5502 +v -62.783 46.564 -0.0502 +v -38.626 79.777 -27.1152 +v -39.168 79.777 -26.5492 +v -40.269 79.777 -25.8542 +v -62.895 46.121 -0.0502 +v -62.977 45.679 -0.0502 +v -63.044 45.241 -0.0502 +v -63.0662 45.056 -0.0502 +v -63.342 48.366 -0.0502 +v -62.977 48.786 -0.0502 +v -63.186 48.366 -0.0502 +v -63.096 44.807 -0.0502 +v -63.133 44.376 -0.0502 +v -63.156 43.971 -0.0502 +v -63.163 43.594 -0.0502 +v -63.163 39.166 -0.0502 +v -63.138 38.777 -0.0502 +v -63.064 38.447 -0.0502 +v -1.017 136.324 -25.5502 +v -2.064 136.58 -25.5502 +v -62.939 38.175 -0.0502 +v -62.79 37.939 -0.0502 +v -3.648 137.414 -25.5502 +v -62.611 37.744 -0.0502 +v -62.402 37.589 -0.0502 +v -3.049 137.014 -25.5502 +v -62.151 37.481 -0.0502 +v -61.874 37.4 -0.0502 +v -61.573 37.346 -0.0502 +v -61.267 37.313 -0.0502 +v -60.946 37.292 -0.0502 +v -60.61 37.286 -0.0502 +v -4.426 138.158 -25.5502 +v -59.737 37.286 -0.0502 +v -59.737 36.113 -0.0502 +v -4.426 138.158 -23.5502 +v -5.063 139.027 -25.5502 +v -37.799 78.777 -27.5502 +v 65.501 166.106 -26.7212 +v -37.936 79.777 -28.5142 +v -38.22 79.777 -27.7842 +v 65.501 164.808 -25.8542 +v 65.501 165.495 -26.2312 +v 65.501 164.056 -25.6352 +v -40.691 79.777 -27.8902 +v -40.299 79.777 -28.2342 +v 65.501 165.067 -28.6672 +v 65.501 165.234 -29.1602 +v 65.501 163.919 -27.6602 +v 65.501 164.435 -27.9332 +v 65.501 164.864 -28.3322 +v -40.067 79.777 -28.5502 +v -39.91 79.777 -28.9082 +v 65.501 167.057 -28.2672 +v 65.501 166.596 -27.3322 +v 65.501 167.243 -29.0282 +v -39.799 79.777 -29.5502 +v -37.799 79.777 -29.5502 +v 65.501 165.277 -29.7502 +v -41.999 78.777 -25.5502 +v -41.999 79.777 -25.5502 +v -41.277 79.777 -25.5842 +v -41.999 79.777 -27.5502 +v -41.999 78.777 -27.5502 +v -41.538 79.777 -27.5672 +v -41.158 79.777 -27.6602 +v -37.799 79.777 -35.5502 +v -37.799 81.777 -37.5502 +v 51.413 63.618 -25.5502 +v -39.799 79.777 -35.5502 +v -39.799 81.777 -37.5502 +v 51.267 64.049 -25.5502 +v 50.671 64.729 -25.5502 +v 49.815 65.02 -25.5502 +v 50.262 64.931 -25.5502 +v 49.36 64.99 -25.5502 +v 51.013 64.428 -25.5502 +v -48.587 63.618 -25.5502 +v -48.733 64.049 -25.5502 +v -49.148 64.59 -25.5502 +v 51.413 62.936 -25.5502 +v 51.267 62.505 -25.5502 +v -49.148 61.964 -25.5502 +v -48.911 62.212 -25.5502 +v -48.733 62.505 -25.5502 +v -48.587 62.936 -25.5502 +v 62.201 126.165 -27.5502 +v 58.401 123.769 -27.5502 +v 49.36 61.564 -25.5502 +v 49.929 61.542 -25.5502 +v 49.701 121.777 -27.5502 +v 54.164 122.281 -27.5502 +v -0.805 -70.058 -25.5502 +v -0.185 -69.98 -25.5502 +v 34.201 130.277 -17.5502 +v 36.201 130.277 -19.5502 +v -1.451 -70.41 -25.5502 +v -1.174 -70.207 -25.5502 +v -48.733 64.049 -27.5502 +v -48.587 63.618 -27.5502 +v 41 123.769 -27.5502 +v -48.911 64.342 -27.5502 +v -49.148 64.59 -27.5502 +v 37.201 126.165 -27.5502 +v -6.914 134.277 -27.5502 +v 36.201 130.277 -23.5502 +v 36.201 130.413 -24.5852 +v 36.201 130.697 -25.3152 +v 50.262 61.623 -25.5502 +v -49.148 61.964 -27.5502 +v -48.733 62.505 -27.5502 +v -48.587 62.936 -27.5502 +v 41.401 120.277 -25.5502 +v 41.401 119.277 -25.5502 +v -2.012 -71.382 -25.5502 +v 41.401 119.277 -27.5502 +v 45.238 122.281 -27.5502 +v 41.401 120.277 -27.5502 +v 51.013 62.126 -25.5502 +v 37.201 120.277 -25.5502 +v 38.027 119.277 -27.1152 +v 38.372 119.277 -26.7212 +v 39.435 119.277 -25.9702 +v 40.422 119.277 -25.6352 +v 40.092 119.277 -27.8902 +v 39.7 119.277 -28.2342 +v 40.939 119.277 -27.5672 +v 40.559 119.277 -27.6602 +v 39.468 119.277 -28.5502 +v 39.311 119.277 -28.9082 +v 37.505 119.277 -28.0192 +v 37.201 120.277 -27.5502 +v 39.201 119.277 -29.5502 +v 51.413 63.618 -27.5502 +v 51.267 64.049 -27.5502 +v 37.201 119.277 -29.5502 +v 50.671 64.729 -27.5502 +v 49.36 64.99 -27.5502 +v 49.929 65.012 -27.5502 +v 50.262 64.931 -27.5502 +v -66.299 81.92 -25.5502 +v -4.933 132.916 -27.5502 +v -0.299 131.777 -27.5502 +v -2.685 132.066 -27.5502 +v -1.866 -70.951 -25.5502 +v -66.299 81.92 -27.5502 +v -16.384 134.277 -25.5502 +v -9.731 138.453 -27.5502 +v -8.59 136.185 -27.5502 +v -1.751 -72.693 -25.5502 +v 51.013 64.428 -27.5502 +v -2.042 -71.837 -25.5502 +v -1.953 -72.284 -25.5502 +v -1.403 -73.068 -25.5502 +v -0.969 -73.34 -25.5502 +v -0.299 -73.473 -25.5502 +v 51.451 63.277 -27.5502 +v 51.413 62.936 -27.5502 +v 51.267 62.505 -27.5502 +v 49.36 61.564 -27.5502 +v 49.815 61.535 -27.5502 +v 50.576 61.762 -27.5502 +v -0.014 51.439 0.2388 +v -0.486 51.425 0.2388 +v -0.949 51.385 0.2388 +v -1.402 51.318 0.2388 +v -1.855 51.23 0.2388 +v -0.058 49.523 0.2388 +v -0.566 49.61 0.2388 +v -1.133 49.639 0.2388 +v -1.74 49.601 0.2388 +v 50.97 62.088 -27.5502 +v -2.278 49.487 0.2388 +v -49.527 64.843 -25.5502 +v -49.959 64.99 -25.5502 +v -2.746 49.296 0.2388 +v -2.288 51.102 0.2388 +v -2.701 50.933 0.2388 +v -3.109 50.731 0.2388 +v -3.497 50.475 0.2388 +v -3.865 50.165 0.2388 +v -5.353 49.318 0.2388 +v -5.599 49.716 0.2388 +v -5.881 50.064 0.2388 +v -6.207 50.367 0.2388 +v -6.557 50.63 0.2388 +v -6.933 50.852 0.2388 +v -7.334 51.037 0.2388 +v -7.759 51.185 0.2388 +v -50.414 65.02 -25.5502 +v -4.216 49.797 0.2388 +v -4.552 49.365 0.2388 +v -8.21 51.297 0.2388 +v -8.667 51.376 0.2388 +v -9.145 51.423 0.2388 +v -9.643 51.439 0.2388 +v -10.125 51.425 0.2388 +v -10.588 51.385 0.2388 +v -11.031 51.318 0.2388 +v -11.444 51.23 0.2388 +v -8.849 49.186 0.2388 +v -50.861 64.931 -25.5502 +v -51.174 64.793 -25.5502 +v -9.24 49.377 0.2388 +v -9.688 49.523 0.2388 +v -10.195 49.61 0.2388 +v -10.762 49.639 0.2388 +v -11.399 49.597 0.2388 +v -11.967 49.469 0.2388 +v -11.847 51.102 0.2388 +v -12.24 50.933 0.2388 +v -12.464 49.255 0.2388 +v -14.905 51.176 0.2388 +v -12.634 50.731 0.2388 +v -13.007 50.475 0.2388 +v -13.36 50.165 0.2388 +v -13.698 49.797 0.2388 +v -14.027 49.365 0.2388 +v -3.164 49.042 0.2388 +v -3.522 48.739 0.2388 +v -3.82 48.386 0.2388 +v -4.064 47.977 0.2388 +v -7.493 45.798 0.2388 +v -7.513 46.384 0.2388 +v -7.573 46.93 0.2388 +v -7.672 47.436 0.2388 +v -7.814 47.883 0.2388 +v -8.001 48.28 0.2388 +v -4.258 47.532 0.2388 +v -4.403 47.051 0.2388 +v -4.502 46.541 0.2388 +v -4.562 46.009 0.2388 +v -4.582 45.454 0.2388 +v -5.142 48.871 0.2388 +v -4.873 48.871 0.2388 +v -4.082 37.796 0.2388 +v -3.888 37.629 0.2388 +v -3.664 37.508 0.2388 +v -0.64 -70.01 -27.5502 +v -0.299 -69.973 -27.5502 +v -3.41 37.414 0.2388 +v -3.126 37.346 0.2388 +v -2.82 37.313 0.2388 +v -2.499 37.292 0.2388 +v -1.072 -70.157 -27.5502 +v -2.163 37.286 0.2388 +v -2.074 36.113 0.2388 +v -2.074 37.286 0.2388 +v -1.451 -70.41 -27.5502 +v -4.582 39.287 0.2388 +v -4.559 38.883 0.2388 +v -4.492 38.533 0.2388 +v -4.38 38.236 0.2388 +v -4.246 37.998 0.2388 +v -7.493 36.113 0.2388 +v -8.232 48.628 0.2388 +v -8.513 48.936 0.2388 +v -51.569 64.466 -25.5502 +v -12.895 48.983 0.2388 +v -13.261 48.653 0.2388 +v -51.866 64.049 -25.5502 +v -13.562 48.264 0.2388 +v -13.818 47.824 0.2388 +v -14.019 47.339 0.2388 +v -14.166 46.809 0.2388 +v -14.278 46.249 0.2388 +v -14.345 45.677 0.2388 +v -14.345 48.871 0.2388 +v -14.368 45.09 0.2388 +v -14.48 48.871 0.2388 +v -52.012 63.618 -25.5502 +v -11.725 37.286 0.2388 +v -11.815 37.286 0.2388 +v -14.368 39.166 0.2388 +v -14.343 38.777 0.2388 +v -14.268 38.447 0.2388 +v -14.144 38.175 0.2388 +v -13.995 37.939 0.2388 +v -50.583 61.561 -25.5502 +v -51.072 61.711 -25.5502 +v -1.777 -70.804 -27.5502 +v -1.99 -71.27 -27.5502 +v -13.815 37.744 0.2388 +v -13.606 37.589 0.2388 +v -13.355 37.481 0.2388 +v -13.079 37.4 0.2388 +v -12.778 37.346 0.2388 +v -12.472 37.313 0.2388 +v -12.151 37.292 0.2388 +v -16.384 36.113 0.2388 +v -11.725 36.113 0.2388 +v -17.615 49.289 0.2388 +v -17.779 49.484 0.2388 +v -49.959 61.564 -25.5502 +v -17.973 49.639 0.2388 +v -18.197 49.761 0.2388 +v -18.451 49.855 0.2388 +v -18.734 49.922 0.2388 +v -19.041 49.956 0.2388 +v -19.362 49.976 0.2388 +v -19.697 49.983 0.2388 +v -19.787 51.176 0.2388 +v -19.787 49.983 0.2388 +v -27.973 49.341 0.2388 +v -28.264 49.583 0.2388 +v -28.61 49.781 0.2388 +v -24.947 49.421 0.2388 +v -25.306 49.92 0.2388 +v -25.744 50.347 0.2388 +v -26.261 50.691 0.2388 +v -26.858 50.967 0.2388 +v -27.535 51.176 0.2388 +v -28.279 51.322 0.2388 +v -49.527 61.711 -25.5502 +v -30.133 50.024 0.2388 +v -29.546 49.997 0.2388 +v 68.332 -75.523 -26.5492 +v 68.874 -75.523 -27.1152 +v -30.703 49.999 0.2388 +v -31.188 49.925 0.2388 +v 67.701 -75.523 -26.0862 +v -31.588 49.801 0.2388 +v -31.934 49.633 0.2388 +v -32.225 49.424 0.2388 +v -32.462 49.174 0.2388 +v 65.701 -75.523 -25.5502 +v -29.038 49.916 0.2388 +v 67.231 -75.523 -25.8542 +v 66.479 -75.523 -25.6352 +v -29.108 51.41 0.2388 +v -30.021 51.439 0.2388 +v -30.78 51.421 0.2388 +v -31.504 51.367 0.2388 +v -32.193 51.277 0.2388 +v -17.279 48.062 0.2388 +v -17.301 48.451 0.2388 +v -17.368 48.781 0.2388 +v -17.48 49.053 0.2388 +v 69.701 -75.523 -29.7502 +v -24.31 46.586 0.2388 +v -24.35 47.431 0.2388 +v -24.47 48.186 0.2388 +v 69.701 -77.722 -29.7502 +v 69.666 -75.523 -29.0282 +v -20.101 37.286 0.2388 +v -19.697 37.286 0.2388 +v -19.349 37.292 0.2388 +v -51.866 62.505 -25.5502 +v -19.021 37.313 0.2388 +v -18.712 37.346 0.2388 +v -51.451 61.964 -25.5502 +v -18.438 37.414 0.2388 +v -18.185 37.508 0.2388 +v 69.564 -75.523 -28.5142 +v -20.101 36.113 0.2388 +v -17.951 37.629 0.2388 +v 69.396 -75.523 -28.0192 +v -1.751 -72.693 -27.5502 +v -17.757 37.796 0.2388 +v -17.592 37.998 0.2388 +v -17.458 38.236 0.2388 +v -2.042 -71.837 -27.5502 +v -17.359 38.535 0.2388 +v -17.299 38.892 0.2388 +v 67.658 -75.523 -29.1602 +v -17.279 39.308 0.2388 +v -1.953 -72.284 -27.5502 +v -24.31 39.287 0.2388 +v -24.301 38.919 0.2388 +v 67.201 -75.523 -28.2342 +v -24.271 38.595 0.2388 +v 65.701 -75.523 -27.5502 +v -52.012 62.936 -25.5502 +v 66.342 -75.523 -27.6602 +v 66.809 -75.523 -27.8902 +v -24.221 38.317 0.2388 +v -24.134 38.079 0.2388 +v -24.022 37.877 0.2388 +v -23.885 37.71 0.2388 +v -23.718 37.567 0.2388 +v -23.517 37.459 0.2388 +v -23.28 37.387 0.2388 +v -23.012 37.331 0.2388 +v -22.713 37.297 0.2388 +v -22.385 37.286 0.2388 +v 67.49 -75.523 -28.6672 +v -22.295 36.113 0.2388 +v -22.295 37.286 0.2388 +v -32.648 48.878 0.2388 +v -1.27 -73.175 -27.5502 +v 67.701 -75.523 -29.7502 +v -49.959 64.99 -27.5502 +v -49.527 64.843 -27.5502 +v 67.701 -77.722 -29.7502 +v -0.805 -73.388 -27.5502 +v 67.699 -77.723 -29.7502 +v -50.414 65.02 -27.5502 +v 69.701 -77.722 -37.5502 +v 67.701 -77.722 -37.5502 +v 67.699 -77.723 -37.5502 +v -0.185 -73.465 -27.5502 +v -51.072 64.843 -27.5502 +v -32.768 134.277 -27.5502 +v 65.501 163.077 -25.5502 +v 65.501 163.277 -25.5502 +v -5.299 150.437 -32.5502 +v -6.387 149.711 -32.5502 +v 65.501 163.077 -27.5502 +v -2.888 151.436 -32.5502 +v -4.126 151.016 -32.5502 +v -7.371 148.848 -32.5502 +v -8.233 147.865 -32.5502 +v 62.201 157.39 -27.5502 +v 58.401 159.785 -27.5502 +v -0.299 151.777 -32.5502 +v -1.605 151.692 -32.5502 +v 48.249 64.247 -25.5502 +v 48.928 64.843 -25.5502 +v 48.549 64.59 -25.5502 +v -2.517 145.096 -32.5502 +v -1.582 145.557 -32.5502 +v -51.451 64.59 -27.5502 +v 54.164 161.273 -27.5502 +v 49.701 161.777 -27.5502 +v -3.618 143.995 -32.5502 +v -51.866 64.049 -27.5502 +v -0.561 145.76 -32.5502 +v -52.012 63.618 -27.5502 +v -3.128 144.606 -32.5502 +v -27.244 46.566 0.2388 +v -27.254 47.054 0.2388 +v 50.941 151.196 -25.5502 +v 52.159 150.953 -25.5502 +v -27.284 47.519 0.2388 +v 48.036 63.782 -25.5502 +v -27.334 47.961 0.2388 +v -27.428 48.37 0.2388 +v 49.701 151.277 -25.5502 +v -27.563 48.734 0.2388 +v -27.737 49.053 0.2388 +v 55.484 149.314 -25.5502 +v 56.418 148.495 -25.5502 +v -24.669 48.851 0.2388 +v -27.244 41.431 0.2388 +v 54.451 150.004 -25.5502 +v -29.237 43.614 0.2388 +v -27.244 43.695 0.2388 +v -4.079 140.494 -32.5502 +v -30.071 43.556 0.2388 +v -4.265 141.255 -32.5502 +v 57.237 147.56 -25.5502 +v -30.81 43.461 0.2388 +v -4.214 142.556 -32.5502 +v -31.454 43.331 0.2388 +v -32.011 43.149 0.2388 +v -27.244 44.888 0.2388 +v -32.489 42.927 0.2388 +v 53.336 150.554 -25.5502 +v -29.842 44.787 0.2388 +v -32.016 44.621 0.2388 +v -26.505 36.113 0.2388 +v -3.764 139.777 -32.5502 +v -26.998 38.499 0.2388 +v 48.166 62.457 -25.5502 +v 48.463 62.04 -25.5502 +v -27.244 38.499 0.2388 +v -3.995 143.308 -32.5502 +v -28.364 38.6 0.2388 +v -28.033 38.962 0.2388 +v 47.951 63.277 -25.5502 +v 47.988 62.936 -25.5502 +v 45.238 161.273 -27.5502 +v 41 159.785 -27.5502 +v -10.299 141.777 -32.5502 +v -10.214 140.472 -32.5502 +v -50.64 61.564 -27.5502 +v -51.072 61.711 -27.5502 +v -8.96 146.777 -32.5502 +v -9.538 145.604 -32.5502 +v -9.959 144.365 -32.5502 +v 48.928 61.711 -25.5502 +v 37.201 157.39 -27.5502 +v -10.214 143.082 -32.5502 +v -50.185 61.535 -27.5502 +v -19.299 -75.523 -25.5502 +v -20.299 -75.523 -25.5502 +v -3.3 139.145 -32.5502 +v 42.983 148.495 -25.5502 +v -1.582 137.997 -32.5502 +v 43.917 149.314 -25.5502 +v -2.517 138.458 -32.5502 +v -0.561 137.794 -32.5502 +v 42.164 147.56 -25.5502 +v 47.242 150.953 -25.5502 +v 48.461 151.196 -25.5502 +v -49.527 61.711 -27.5502 +v 46.065 150.554 -25.5502 +v -20.299 -76.245 -25.5842 +v -20.299 -76.758 -25.6862 +v -20.299 -77.254 -25.8542 +v 44.951 150.004 -25.5502 +v -7.371 134.706 -32.5502 +v -6.387 133.844 -32.5502 +v -20.299 -78.724 -26.9182 +v -20.299 -77.94 -26.2312 +v -5.299 133.117 -32.5502 +v -4.126 132.538 -32.5502 +v -1.605 131.863 -32.5502 +v -0.299 131.777 -32.5502 +v -51.866 62.505 -27.5502 +v -2.888 132.118 -32.5502 +v -51.569 62.088 -27.5502 +v -8.96 136.777 -32.5502 +v -8.233 135.689 -32.5502 +v -9.959 139.189 -32.5502 +v -9.538 137.95 -32.5502 +v -52.012 62.936 -27.5502 +v -20.299 -75.523 -27.5502 +v 48.249 64.247 -27.5502 +v -19.299 -75.523 -27.5502 +v 48.549 64.59 -27.5502 +v 48.928 64.843 -27.5502 +v -20.299 -77.223 -28.2342 +v -20.299 -76.832 -27.8902 +v -20.299 -77.68 -29.1602 +v -20.299 -77.513 -28.6672 +v -20.299 -76.364 -27.6602 +v 47.988 63.618 -27.5502 +v -20.299 -77.723 -29.5502 +v -20.299 -79.187 -27.5502 +v -20.299 -79.587 -28.5142 +v 47.969 63.107 -27.5502 +v 48.084 62.607 -27.5502 +v -27.757 39.373 0.2388 +v -28.506 37.108 0.2388 +v -27.535 39.833 0.2388 +v -27.373 40.325 0.2388 +v -28.185 37.427 0.2388 +v -27.881 37.762 0.2388 +v -27.276 40.858 0.2388 +v -27.568 38.119 0.2388 +v -32.176 37.62 0.2388 +v -31.387 37.549 0.2388 +v -30.78 37.578 0.2388 +v -30.212 37.665 0.2388 +v 48.249 62.307 -27.5502 +v -29.685 37.811 0.2388 +v -29.19 38.025 0.2388 +v -28.749 38.288 0.2388 +v 48.928 61.711 -27.5502 +v 48.549 61.964 -27.5502 +v -32.103 35.83 0.2388 +v -31.481 35.852 0.2388 +v -30.929 35.92 0.2388 +v -30.446 36.032 0.2388 +v -29.998 36.174 0.2388 +v -29.58 36.356 0.2388 +v -29.192 36.578 0.2388 +v -28.841 36.825 0.2388 +v 0 51.4383 -0.0502 +v -0.014 51.439 -0.0502 +v -0.486 51.425 -0.0502 +v 49.701 121.777 -32.5502 +v 54.164 122.281 -32.5502 +v 62.201 126.165 -32.5502 +v 58.401 123.769 -32.5502 +v 58.877 139.318 -25.5502 +v 41 123.769 -32.5502 +v 45.238 122.281 -32.5502 +v -37.799 47.777 -25.5502 +v 39.201 117.277 -37.5502 +v 39.201 119.277 -35.5502 +v 41.201 -47.923 -27.5502 +v 37.201 117.277 -37.5502 +v -40.516 46.777 -25.7702 +v 37.201 119.277 -35.5502 +v -39.799 46.777 -26.0862 +v -39.168 46.777 -26.5492 +v -38.626 46.777 -27.1152 +v 41.401 -48.923 -27.5502 +v 37.201 126.165 -32.5502 +v 41.401 -47.923 -27.5502 +v 41.401 -48.923 -25.5502 +v 41.401 -47.923 -25.5502 +v -37.799 47.777 -27.5502 +v -40.484 46.777 -28.0492 +v -40.917 46.777 -27.7602 +v -40.14 46.777 -28.4412 +v 37.201 -48.923 -25.5502 +v -39.91 46.777 -28.9082 +v 57.928 146.527 -25.5502 +v 58.477 145.413 -25.5502 +v -38.02 46.777 -28.2672 +v 59.119 143.017 -25.5502 +v 59.201 141.777 -25.5502 +v 58.877 144.236 -25.5502 +v 38.372 -47.923 -26.7212 +v 59.119 140.537 -25.5502 +v -0.949 51.385 -0.0502 +v 39.201 -47.923 -26.0862 +v -1.402 51.318 -0.0502 +v -1.855 51.23 -0.0502 +v -1.9565 51.2 -0.0502 +v 40.678 -47.923 -25.5842 +v -0.058 49.523 -0.0502 +v -0.566 49.61 -0.0502 +v 40.165 -47.923 -25.6862 +v -1.133 49.639 -0.0502 +v -1.74 49.601 -0.0502 +v -39.799 46.777 -29.5502 +v -37.799 46.777 -29.5502 +v 41.401 46.777 -27.5502 +v 41.401 47.777 -27.5502 +v 41.401 47.777 -25.5502 +v 41.401 46.777 -25.5502 +v -41.999 47.777 -25.5502 +v -41.999 46.777 -25.5502 +v 37.201 47.777 -25.5502 +v -41.277 46.777 -25.5842 +v 38.027 46.777 -27.1152 +v 38.372 46.777 -26.7212 +v -41.999 47.777 -27.5502 +v 39.67 46.777 -25.8542 +v 40.678 46.777 -25.5842 +v -41.999 46.777 -27.5502 +v 58.477 138.142 -25.5502 +v 57.928 137.027 -25.5502 +v -41.41 46.777 -27.5922 +v 37.201 47.777 -27.5502 +v 40.092 46.777 -27.8902 +v 39.7 46.777 -28.2342 +v 40.939 46.777 -27.5672 +v 40.559 46.777 -27.6602 +v 39.7 -47.923 -28.2342 +v 39.468 46.777 -28.5502 +v 39.311 46.777 -28.9082 +v 40.623 -47.923 -27.6472 +v 57.237 135.994 -25.5502 +v 37.505 46.777 -28.0192 +v 40.092 -47.923 -27.8902 +v 56.418 135.06 -25.5502 +v 55.484 134.24 -25.5502 +v 39.269 -47.923 -29.0322 +v 52.159 132.601 -25.5502 +v 50.941 132.358 -25.5502 +v 53.336 133 -25.5502 +v 49.701 132.277 -25.5502 +v 54.451 133.55 -25.5502 +v 39.201 46.777 -29.5502 +v 37.201 46.777 -29.5502 +v 37.235 -47.923 -29.0282 +v 37.505 -47.923 -28.0192 +v 37.201 -48.923 -27.5502 +v 37.882 -47.923 -27.3322 +v 37.201 -47.923 -29.5502 +v 39.201 -47.923 -29.5502 +v 36.201 -55.55 -27.1152 +v 36.201 -55.895 -26.7212 +v 36.201 -56.958 -25.9702 +v 36.201 -56.723 -29.5502 +v 36.201 -57.222 -28.2342 +v 36.201 -56.991 -28.5502 +v 36.201 -56.833 -28.9082 +v 36.201 -54.723 -29.5502 +v 36.201 -55.027 -28.0192 +v 37.201 -58.923 -25.5502 +v 36.201 -58.923 -25.5502 +v 36.201 -57.944 -25.6352 +v 36.201 -58.723 -25.5502 +v 37.201 -58.923 -27.5502 +v 36.201 -57.614 -27.8902 +v 36.201 -58.462 -27.5672 +v 36.201 -58.081 -27.6602 +v 36.201 -58.723 -27.5502 +v 41.401 79.777 -25.5502 +v 41.401 78.777 -25.5502 +v 41.201 79.777 -25.5502 +v 36.201 -58.923 -27.5502 +v 41.401 79.777 -27.5502 +v 34.201 -54.723 -37.5502 +v 36.201 -54.723 -35.5502 +v 36.201 -56.723 -35.5502 +v 34.201 -56.723 -37.5502 +v 41.401 78.777 -27.5502 +v 37.201 -45.923 -37.5502 +v 37.201 -47.923 -35.5502 +v 39.201 -45.923 -37.5502 +v 39.201 -47.923 -35.5502 +v 37.201 78.777 -25.5502 +v 40.422 79.777 -25.6352 +v 39.67 79.777 -25.8542 +v 39.201 79.777 -26.0862 +v 38.372 79.777 -26.7212 +v 39.201 46.777 -35.5502 +v 39.201 44.777 -37.5502 +v 37.201 44.777 -37.5502 +v 37.201 46.777 -35.5502 +v 30.89 51.176 0.2388 +v 32.743 50.232 0.2388 +v 32.482 49.909 0.2388 +v 32.256 49.558 0.2388 +v 32.047 49.183 0.2388 +v 28.367 49.289 0.2388 +v 28.187 49.484 0.2388 +v 27.978 49.639 0.2388 +v 27.727 49.761 0.2388 +v -22.299 -77.723 -37.5502 +v -20.299 -77.723 -35.5502 +v 27.451 49.855 0.2388 +v 27.15 49.922 0.2388 +v 26.844 49.956 0.2388 +v 26.523 49.976 0.2388 +v 26.187 49.983 0.2388 +v 26.097 51.176 0.2388 +v 26.097 49.983 0.2388 +v 17.028 49.821 0.2388 +v 17.635 49.783 0.2388 +v 19.046 49.215 0.2388 +v 18.64 49.478 0.2388 +v 18.173 49.669 0.2388 +v 21.753 49.72 0.2388 +v 21.161 50.239 0.2388 +v 20.489 50.664 0.2388 +v 19.738 50.994 0.2388 +v 18.899 51.241 0.2388 +v 17.996 51.389 0.2388 +v 17.028 51.439 0.2388 +v 32.669 48.208 0.2388 +v 32.475 47.838 0.2388 +v 32.3 47.436 0.2388 +v 32.159 47.002 0.2388 +v 39.7 79.777 -28.2342 +v 32.032 46.564 0.2388 +v 31.92 46.121 0.2388 +v 31.838 45.679 0.2388 +v 40.623 79.777 -27.6472 +v 31.77 45.241 0.2388 +v 28.715 48.451 0.2388 +v 31.472 48.366 0.2388 +v 28.74 48.062 0.2388 +v 40.092 79.777 -27.8902 +v 31.629 48.366 0.2388 +v 31.838 48.786 0.2388 +v -2.278 49.487 -0.0502 +v 28.64 48.781 0.2388 +v -2.746 49.296 -0.0502 +v 28.516 49.053 0.2388 +v 39.269 79.777 -29.0322 +v 31.718 44.807 0.2388 +v -2.288 51.102 -0.0502 +v 31.681 44.376 0.2388 +v -2.701 50.933 -0.0502 +v 31.658 43.971 0.2388 +v 31.651 43.594 0.2388 +v 36.201 132.277 -19.5502 +v -3.109 50.731 -0.0502 +v 34.201 132.277 -17.5502 +v -3.497 50.475 -0.0502 +v -3.865 50.165 -0.0502 +v 31.651 39.166 0.2388 +v 31.676 38.777 0.2388 +v 31.75 38.447 0.2388 +v 31.875 38.175 0.2388 +v 32.024 37.939 0.2388 +v 32.203 37.744 0.2388 +v -4.096 49.9228 -0.0502 +v 28.74 39.308 0.2388 +v -5.353 49.318 -0.0502 +v 32.412 37.589 0.2388 +v -5.2746 49.152 -0.0502 +v -5.599 49.716 -0.0502 +v 28.715 38.892 0.2388 +v -5.881 50.064 -0.0502 +v 32.664 37.481 0.2388 +v -6.207 50.367 -0.0502 +v 28.672 36.113 0.2388 +v -6.557 50.63 -0.0502 +v -6.933 50.852 -0.0502 +v 26.097 37.286 0.2388 +v 26.187 37.286 0.2388 +v -7.334 51.037 -0.0502 +v 26.525 37.292 0.2388 +v -7.759 51.185 -0.0502 +v 26.854 37.313 0.2388 +v -8.192 51.2925 -0.0502 +v 27.172 37.346 0.2388 +v 27.471 37.414 0.2388 +v 27.74 37.508 0.2388 +v -4.216 49.797 -0.0502 +v 27.978 37.629 0.2388 +v -4.552 49.365 -0.0502 +v 26.097 36.113 0.2388 +v 28.187 37.796 0.2388 +v 37.505 79.777 -28.0192 +v 37.235 79.777 -29.0282 +v 28.367 37.998 0.2388 +v -8.21 51.297 -0.0502 +v 28.516 38.236 0.2388 +v -8.667 51.376 -0.0502 +v 28.64 38.535 0.2388 +v -9.145 51.423 -0.0502 +v 20.454 45.665 0.2388 +v -9.643 51.439 -0.0502 +v 20.387 46.326 0.2388 +v -10.125 51.425 -0.0502 +v 37.201 78.777 -27.5502 +v 20.275 46.95 0.2388 +v -10.588 51.385 -0.0502 +v 37.882 79.777 -27.3322 +v 20.131 47.516 0.2388 +v 19.937 48.029 0.2388 +v 19.693 48.487 0.2388 +v 19.397 48.885 0.2388 +v 23.45 45.728 0.2388 +v 23.301 46.705 0.2388 +v 23.052 47.597 0.2388 +v 22.708 48.399 0.2388 +v 22.276 49.107 0.2388 +v 20.477 44.969 0.2388 +v 23.5 43.351 0.2388 +v 23.5 44.666 0.2388 +v 41.473 146.527 -25.5502 +v 21.773 39.056 0.2388 +v 22.004 39.299 0.2388 +v 22.201 39.55 0.2388 +v 40.924 145.413 -25.5502 +v 22.716 39.02 0.2388 +v 22.604 39.207 0.2388 +v 22.48 39.353 0.2388 +v 22.345 39.467 0.2388 +v 20.521 38.216 0.2388 +v 40.524 144.236 -25.5502 +v 20.88 38.4 0.2388 +v 21.208 38.602 0.2388 +v 40.282 140.537 -25.5502 +v 40.201 141.777 -25.5502 +v 21.507 38.822 0.2388 +v 40.524 139.318 -25.5502 +v 21.862 37.059 0.2388 +v 22.206 37.355 0.2388 +v 22.47 37.67 0.2388 +v 22.656 37.987 0.2388 +v 40.282 143.017 -25.5502 +v 22.768 38.29 0.2388 +v 22.805 38.58 0.2388 +v 22.783 38.811 0.2388 +v 20.952 36.526 0.2388 +v 21.439 36.78 0.2388 +v 16.413 37.762 0.2388 +v 17.063 37.647 0.2388 +v 17.767 37.609 0.2388 +v -11.031 51.318 -0.0502 +v 18.292 37.627 0.2388 +v 18.792 37.681 0.2388 +v -11.444 51.23 -0.0502 +v 19.267 37.771 0.2388 +v -11.5385 51.2 -0.0502 +v 19.715 37.892 0.2388 +v -8.849 49.186 -0.0502 +v -8.8033 49.152 -0.0502 +v 20.133 38.041 0.2388 +v -9.24 49.377 -0.0502 +v -9.688 49.523 -0.0502 +v 17.341 35.83 0.2388 +v 18.215 35.861 0.2388 +v 19.014 35.956 0.2388 +v 19.738 36.113 0.2388 +v 20.385 36.304 0.2388 +v -10.195 49.61 -0.0502 +v -10.762 49.639 -0.0502 +v -11.399 49.597 -0.0502 +v 15.953 49.684 0.2388 +v -11.967 49.469 -0.0502 +v 15.057 49.273 0.2388 +v 14.988 51.216 0.2388 +v 13.286 50.549 0.2388 +v -11.847 51.102 -0.0502 +v 11.922 49.437 0.2388 +v -12.24 50.933 -0.0502 +v 0.78 49.186 0.2388 +v -12.288 50.9084 -0.0502 +v 0.39 49.377 0.2388 +v -12.464 49.255 -0.0502 +v -12.6272 49.152 -0.0502 +v 4.104 49.637 0.2388 +v -14.6339 49.7057 -0.0502 +v 3.704 50.125 0.2388 +v -14.905 51.176 -0.0502 +v 3.239 50.531 0.2388 +v 2.709 50.861 0.2388 +v 2.114 51.115 0.2388 +v 1.459 51.295 0.2388 +v 0.75 51.403 0.2388 +v 14.341 48.588 0.2388 +v 13.798 47.638 0.2388 +v 13.425 46.431 0.2388 +v 13.221 44.969 0.2388 +v 13.154 43.351 0.2388 +v 13.214 42.399 0.2388 +v 13.333 41.536 0.2388 +v 10.939 47.898 0.2388 +v 10.35 45.924 0.2388 +v 10.153 43.513 0.2388 +v 10.205 42.343 0.2388 +v 10.362 41.258 0.2388 +v 13.512 40.763 0.2388 +v 13.749 40.08 0.2388 +v 14.04 39.487 0.2388 +v 14.386 38.984 0.2388 +v -12.634 50.731 -0.0502 +v 14.804 38.555 0.2388 +v -13.007 50.475 -0.0502 +v 15.281 38.211 0.2388 +v 15.819 37.953 0.2388 +v -14.5318 49.152 -0.0502 +v -13.36 50.165 -0.0502 +v -13.698 49.797 -0.0502 +v 65.501 -75.523 -25.5502 +v -14.027 49.365 -0.0502 +v 12.716 37.225 0.2388 +v 13.47 36.726 0.2388 +v 14.318 36.335 0.2388 +v 15.251 36.055 0.2388 +v 16.259 35.886 0.2388 +v -14.1641 49.152 -0.0502 +v 65.501 -76.245 -25.5842 +v 65.501 -76.758 -25.6862 +v 65.501 -77.254 -25.8542 +v 10.623 40.258 0.2388 +v 11.002 39.35 0.2388 +v 11.479 38.542 0.2388 +v 12.057 37.832 0.2388 +v 2.136 45.798 0.2388 +v 39.201 79.777 -29.5502 +v 2.116 46.384 0.2388 +v 2.057 46.93 0.2388 +v 1.957 47.436 0.2388 +v 37.201 79.777 -29.5502 +v 1.815 47.883 0.2388 +v 1.629 48.28 0.2388 +v 1.397 48.628 0.2388 +v 1.116 48.936 0.2388 +v 5.07 45.939 0.2388 +v -3.164 49.042 -0.0502 +v 5.03 46.851 0.2388 +v 4.911 47.674 0.2388 +v -3.522 48.739 -0.0502 +v 4.712 48.406 0.2388 +v 4.44 49.064 0.2388 +v -3.82 48.386 -0.0502 +v 5.07 39.287 0.2388 +v -4.064 47.977 -0.0502 +v 5.09 38.883 0.2388 +v 5.149 38.533 0.2388 +v -7.493 45.798 -0.0502 +v 39.201 79.777 -35.5502 +v 37.201 79.777 -35.5502 +v -7.513 46.384 -0.0502 +v 37.201 81.777 -37.5502 +v 39.201 81.777 -37.5502 +v 5.249 38.236 0.2388 +v -7.573 46.93 -0.0502 +v 5.383 37.998 0.2388 +v -7.672 47.436 -0.0502 +v 5.548 37.796 0.2388 +v -7.814 47.883 -0.0502 +v 5.742 37.629 0.2388 +v -8.001 48.28 -0.0502 +v 5.966 37.508 0.2388 +v -8.192 48.5677 -0.0502 +v 6.219 37.414 0.2388 +v 6.503 37.346 0.2388 +v -4.258 47.532 -0.0502 +v 6.809 37.313 0.2388 +v -4.403 47.051 -0.0502 +v 7.13 37.292 0.2388 +v -4.502 46.541 -0.0502 +v 7.466 37.286 0.2388 +v -4.562 46.009 -0.0502 +v 7.555 36.113 0.2388 +v 7.555 37.286 0.2388 +v -4.582 45.454 -0.0502 +v 91.8 36.113 0.2388 +v 91.8 36.113 -0.0502 +v 91.8 37.286 -0.0502 +v 91.8 37.286 0.2388 +v 91.061 56.17 0.2388 +v 91.061 56.17 -0.0502 +v 2.136 36.113 0.2388 +v -5.142 48.871 -0.0502 +v -4.873 48.871 -0.0502 +v 84.253 56.17 -0.0502 +v 84.253 56.17 0.2388 +v 30.89 51.176 -0.0502 +v 80.603 56.17 0.2388 +v 80.603 56.17 -0.0502 +v 32.743 50.232 -0.0502 +v 32.482 49.909 -0.0502 +v -2.074 36.113 -0.0502 +v 72.183 56.17 -0.0502 +v 72.183 56.17 0.2388 +v 32.256 49.558 -0.0502 +v 70.638 56.17 0.2388 +v 70.638 56.17 -0.0502 +v 32.047 49.183 -0.0502 +v 32.0307 49.152 -0.0502 +v 26.097 51.176 -0.0502 +v 26.097 49.983 -0.0502 +v 28.367 49.289 -0.0502 +v 65.501 -78.724 -26.9182 +v 28.4535 49.152 -0.0502 +v 91.061 54.977 0.2388 +v 90.77 54.977 0.2388 +v 28.187 49.484 -0.0502 +v 65.501 -77.94 -26.2312 +v 90.479 54.966 0.2388 +v 90.203 54.932 0.2388 +v 27.978 49.639 -0.0502 +v 27.727 49.761 -0.0502 +v 27.451 49.855 -0.0502 +v 89.941 54.876 0.2388 +v 27.15 49.922 -0.0502 +v 89.702 54.804 0.2388 +v 89.464 54.696 0.2388 +v 26.844 49.956 -0.0502 +v 89.225 54.553 0.2388 +v 26.523 49.976 -0.0502 +v 88.996 54.375 0.2388 +v 26.187 49.983 -0.0502 +v 88.757 54.166 0.2388 +v 88.508 53.926 0.2388 +v 88.249 53.647 0.2388 +v 21.753 49.72 -0.0502 +v 22.2376 49.152 -0.0502 +v 21.161 50.239 -0.0502 +v 87.981 53.324 0.2388 +v 20.489 50.664 -0.0502 +v 19.738 50.994 -0.0502 +v 18.899 51.241 -0.0502 +v 87.702 52.955 0.2388 +v 17.996 51.389 -0.0502 +v 17.028 51.439 -0.0502 +v 85.988 54.321 0.2388 +v 16.384 51.3686 -0.0502 +v 85.95 54.456 0.2388 +v 17.028 49.821 -0.0502 +v 17.635 49.783 -0.0502 +v 85.888 54.573 0.2388 +v 85.789 54.672 0.2388 +v 85.669 54.752 0.2388 +v 19.046 49.215 -0.0502 +v 19.113 49.152 -0.0502 +v 85.53 54.815 0.2388 +v 18.64 49.478 -0.0502 +v 85.373 54.874 0.2388 +v 18.173 49.669 -0.0502 +v 85.201 54.914 0.2388 +v 85.015 54.937 0.2388 +v 84.801 54.959 0.2388 +v 32.669 48.208 -0.0502 +v 84.577 54.973 0.2388 +v 32.475 47.838 -0.0502 +v 84.343 54.977 0.2388 +v 32.3 47.436 -0.0502 +v 84.253 54.977 0.2388 +v 86 54.168 0.2388 +v 85.978 53.908 0.2388 +v 32.159 47.002 -0.0502 +v 85.798 53.36 0.2388 +v 32.032 46.564 -0.0502 +v 85.91 53.638 0.2388 +v 31.92 46.121 -0.0502 +v 31.838 45.679 -0.0502 +v 85.239 52.45 0.2388 +v 85.45 52.767 0.2388 +v 31.77 45.241 -0.0502 +v 85.637 53.07 0.2388 +v 31.7478 45.056 -0.0502 +v 82.283 48.426 0.2388 +v 31.472 48.366 -0.0502 +v 83.201 47.092 0.2388 +v 28.715 48.451 -0.0502 +v 28.672 48.6402 -0.0502 +v 90.188 37.609 0.2388 +v 90.591 37.43 0.2388 +v -2.074 37.286 -0.0502 +v 28.74 48.062 -0.0502 +v 90.994 37.322 0.2388 +v 91.397 37.286 0.2388 +v -4.082 37.796 -0.0502 +v -4.096 37.8132 -0.0502 +v -3.888 37.629 -0.0502 +v 31.838 48.786 -0.0502 +v 88.911 38.782 0.2388 +v -3.664 37.508 -0.0502 +v 31.629 48.366 -0.0502 +v 89.352 38.283 0.2388 +v -3.41 37.414 -0.0502 +v 89.777 37.892 0.2388 +v 28.64 48.781 -0.0502 +v -3.126 37.346 -0.0502 +v 28.516 49.053 -0.0502 +v -2.82 37.313 -0.0502 +v 85.154 39.029 0.2388 +v -2.499 37.292 -0.0502 +v 31.718 44.807 -0.0502 +v 31.681 44.376 -0.0502 +v 84.388 40.157 0.2388 +v 84.587 39.865 0.2388 +v 85.05 39.198 0.2388 +v 31.658 43.971 -0.0502 +v 31.651 43.594 -0.0502 +v -37.799 157.39 -27.5502 +v 84.925 39.388 0.2388 +v 31.651 39.166 -0.0502 +v 84.766 39.609 0.2388 +v 31.676 38.777 -0.0502 +v 83.38 37.286 0.2388 +v 83.559 37.286 0.2388 +v 31.75 38.447 -0.0502 +v 84.592 37.389 0.2388 +v 31.875 38.175 -0.0502 +v 85.211 37.699 0.2388 +v 32.024 37.939 -0.0502 +v 85.418 38.216 0.2388 +v 85.413 38.312 0.2388 +v 32.203 37.744 -0.0502 +v -41.599 159.785 -27.5502 +v 85.398 38.413 0.2388 +v 85.373 38.519 0.2388 +v 32.412 37.589 -0.0502 +v 85.338 38.622 0.2388 +v 28.74 39.308 -0.0502 +v 28.7315 39.1664 -0.0502 +v -45.836 161.273 -27.5502 +v 85.293 38.744 0.2388 +v 85.239 38.883 0.2388 +v 32.664 37.481 -0.0502 +v 28.715 38.892 -0.0502 +v 28.672 38.6873 -0.0502 +v 83.38 36.113 0.2388 +v 80.603 54.977 0.2388 +v 80.514 54.977 0.2388 +v 80.178 54.97 0.2388 +v 79.887 54.95 0.2388 +v 26.187 37.286 -0.0502 +v 26.097 37.286 -0.0502 +v 77.824 55.296 0.2388 +v 26.525 37.292 -0.0502 +v 79.64 54.916 0.2388 +v 79.419 54.872 0.2388 +v 79.232 54.818 0.2388 +v -47.841 150.953 -25.5502 +v -46.664 150.554 -25.5502 +v 26.854 37.313 -0.0502 +v 79.08 54.755 0.2388 +v 78.961 54.672 0.2388 +v -45.549 150.004 -25.5502 +v 78.871 54.584 0.2388 +v 27.172 37.346 -0.0502 +v 78.812 54.492 0.2388 +v 78.774 54.384 0.2388 +v -43.582 148.495 -25.5502 +v -42.763 147.56 -25.5502 +v 78.752 54.276 0.2388 +v 27.471 37.414 -0.0502 +v -49.059 151.196 -25.5502 +v 27.74 37.508 -0.0502 +v 78.745 54.168 0.2388 +v 78.747 54.074 0.2388 +v 78.754 53.98 0.2388 +v 27.978 37.629 -0.0502 +v 78.767 53.885 0.2388 +v -44.516 149.314 -25.5502 +v 78.787 53.786 0.2388 +v 78.817 53.679 0.2388 +v 28.187 37.796 -0.0502 +v 78.856 53.562 0.2388 +v 26.097 36.113 -0.0502 +v 78.911 53.434 0.2388 +v 78.986 53.292 0.2388 +v 28.367 37.998 -0.0502 +v 79.185 52.951 0.2388 +v 79.08 53.137 0.2388 +v 28.516 38.236 -0.0502 +v 79.319 52.742 0.2388 +v 79.484 52.51 0.2388 +v 28.64 38.535 -0.0502 +v -2.163 37.286 -0.0502 +v 75.251 53.501 0.2388 +v 74.863 53.989 0.2388 +v 74.445 54.373 0.2388 +v -7.493 36.113 -0.0502 +v 73.997 54.654 0.2388 +v 23.45 45.728 -0.0502 +v 23.4816 45.056 -0.0502 +v 23.301 46.705 -0.0502 +v 23.052 47.597 -0.0502 +v 73.522 54.833 0.2388 +v 73.052 54.941 0.2388 +v 22.708 48.399 -0.0502 +v 72.586 54.977 0.2388 +v 22.276 49.107 -0.0502 +v 72.183 54.977 0.2388 +v -50.299 161.777 -27.5502 +v 70.638 54.977 0.2388 +v 70.235 54.977 0.2388 +v -54.762 161.273 -27.5502 +v 20.454 45.665 -0.0502 +v 20.4741 45.056 -0.0502 +v 69.897 54.97 0.2388 +v 20.387 46.326 -0.0502 +v 20.275 46.95 -0.0502 +v 20.131 47.516 -0.0502 +v 69.568 54.95 0.2388 +v -57.344 163.277 -25.5502 +v 69.25 54.916 0.2388 +v 19.937 48.029 -0.0502 +v 68.951 54.849 0.2388 +v 19.693 48.487 -0.0502 +v 68.682 54.755 0.2388 +v 68.443 54.633 0.2388 +v 19.397 48.885 -0.0502 +v 68.222 54.467 0.2388 +v 68.035 54.265 0.2388 +v 67.884 54.027 0.2388 +v 67.784 53.728 0.2388 +v 23.5 43.351 -0.0502 +v 67.724 53.371 0.2388 +v 23.5 44.666 -0.0502 +v 65.779 53.456 0.2388 +v 65.711 53.786 0.2388 +v 65.6 54.067 0.2388 +v 20.477 44.969 -0.0502 +v 22.716 39.02 -0.0502 +v 22.7506 38.912 -0.0502 +v 67.705 52.955 0.2388 +v 22.604 39.207 -0.0502 +v 65.801 53.077 0.2388 +v 22.48 39.353 -0.0502 +v 22.345 39.467 -0.0502 +v -59 159.785 -27.5502 +v 81.32 44.625 0.2388 +v 41.473 137.027 -25.5502 +v 22.201 39.55 -0.0502 +v -62.799 157.39 -27.5502 +v 80.402 45.98 0.2388 +v 21.773 39.056 -0.0502 +v 21.6093 38.912 -0.0502 +v 42.164 135.994 -25.5502 +v 22.004 39.299 -0.0502 +v 77.871 40.015 0.2388 +v 21.862 37.059 -0.0502 +v 21.5664 36.864 -0.0502 +v 48.461 132.358 -25.5502 +v 47.242 132.601 -25.5502 +v 22.206 37.355 -0.0502 +v 77.946 37.376 0.2388 +v 78.453 37.308 0.2388 +v 22.47 37.67 -0.0502 +v 79.08 37.286 0.2388 +v -56.083 149.314 -25.5502 +v -55.049 150.004 -25.5502 +v 22.656 37.987 -0.0502 +v 79.17 36.113 0.2388 +v 79.17 37.286 0.2388 +v 22.768 38.29 -0.0502 +v 75.206 39.247 0.2388 +v -53.935 150.554 -25.5502 +v 43.917 134.24 -25.5502 +v 22.805 38.58 -0.0502 +v 42.983 135.06 -25.5502 +v 77.782 39.889 0.2388 +v 22.783 38.811 -0.0502 +v 77.692 39.755 0.2388 +v -51.539 151.196 -25.5502 +v -50.299 151.277 -25.5502 +v 44.951 133.55 -25.5502 +v 77.602 39.611 0.2388 +v 77.513 39.458 0.2388 +v 20.521 38.216 -0.0502 +v -57.017 148.495 -25.5502 +v 20.48 38.1975 -0.0502 +v 46.065 133 -25.5502 +v 77.423 39.296 0.2388 +v 20.88 38.4 -0.0502 +v 77.334 39.126 0.2388 +v 77.264 38.964 0.2388 +v 21.208 38.602 -0.0502 +v -52.758 150.953 -25.5502 +v 21.507 38.822 -0.0502 +v 73.965 37.895 0.2388 +v 73.728 37.731 0.2388 +v 20.952 36.526 -0.0502 +v 20.48 36.3412 -0.0502 +v 74.196 38.09 0.2388 +v 21.439 36.78 -0.0502 +v 74.423 38.317 0.2388 +v 74.669 38.591 0.2388 +v -37.799 46.777 -35.5502 +v -37.799 44.777 -37.5502 +v -39.799 44.777 -37.5502 +v -39.799 46.777 -35.5502 +v 19.014 35.956 -0.0502 +v 74.93 38.901 0.2388 +v 18.215 35.861 -0.0502 +v 77.204 38.802 0.2388 +v 19.738 36.113 -0.0502 +v 77.155 38.64 0.2388 +v 20.385 36.304 -0.0502 +v 77.105 38.47 0.2388 +v -57.836 147.56 -25.5502 +v 77.075 38.308 0.2388 +v 16.413 37.762 -0.0502 +v 16.384 37.7713 -0.0502 +v 77.065 38.155 0.2388 +v 77.12 37.874 0.2388 +v 17.063 37.647 -0.0502 +v 77.284 37.652 0.2388 +v -4.582 39.287 -0.0502 +v 17.767 37.609 -0.0502 +v 40.924 138.142 -25.5502 +v 77.558 37.488 0.2388 +v -4.559 38.883 -0.0502 +v 18.292 37.627 -0.0502 +v -4.492 38.533 -0.0502 +v 18.792 37.681 -0.0502 +v -4.38 38.236 -0.0502 +v 19.267 37.771 -0.0502 +v -4.246 37.998 -0.0502 +v 37.201 134.477 -25.5502 +v 71.78 37.286 0.2388 +v 19.715 37.892 -0.0502 +v 71.959 37.286 0.2388 +v 20.133 38.041 -0.0502 +v 72.318 37.297 0.2388 +v -8.232 48.628 -0.0502 +v 72.646 37.331 0.2388 +v 72.945 37.387 0.2388 +v -8.513 48.936 -0.0502 +v 16.384 35.8795 -0.0502 +v 73.221 37.47 0.2388 +v 17.341 35.83 -0.0502 +v 73.482 37.585 0.2388 +v 71.78 36.113 0.2388 +v -12.895 48.983 -0.0502 +v 14.988 51.216 -0.0502 +v 13.286 50.549 -0.0502 +v 65.801 40.622 0.2388 +v 11.922 49.437 -0.0502 +v 67.705 36.113 0.2388 +v 11.74 49.152 -0.0502 +v -13.261 48.653 -0.0502 +v 90.77 54.977 -0.0502 +v 91.061 54.977 -0.0502 +v 15.953 49.684 -0.0502 +v -13.562 48.264 -0.0502 +v 15.057 49.273 -0.0502 +v 90.479 54.966 -0.0502 +v -13.818 47.824 -0.0502 +v 14.9305 49.152 -0.0502 +v -14.019 47.339 -0.0502 +v 0.78 49.186 -0.0502 +v 0.8257 49.152 -0.0502 +v 90.203 54.932 -0.0502 +v -14.166 46.809 -0.0502 +v 0.39 49.377 -0.0502 +v -14.278 46.249 -0.0502 +v 90.112 54.9125 -0.0502 +v 36.201 133.168 -25.2092 +v 36.201 132.777 -24.8662 +v -14.345 45.677 -0.0502 +v 4.3884 49.152 -0.0502 +v 4.104 49.637 -0.0502 +v -14.2117 49.078 -0.0502 +v 3.704 50.125 -0.0502 +v -14.368 45.09 -0.0502 +v 3.239 50.531 -0.0502 +v -14.345 48.871 -0.0502 +v 36.201 132.545 -24.5502 +v 36.201 132.387 -24.1912 +v 2.709 50.861 -0.0502 +v 2.114 51.115 -0.0502 +v 36.201 132.277 -23.5502 +v 1.459 51.295 -0.0502 +v -14.48 48.871 -0.0502 +v 0.75 51.403 -0.0502 +v -11.725 37.286 -0.0502 +v 13.154 43.351 -0.0502 +v -11.815 37.286 -0.0502 +v 14.341 48.588 -0.0502 +v -14.368 39.166 -0.0502 +v 13.798 47.638 -0.0502 +v -14.343 38.777 -0.0502 +v 13.425 46.431 -0.0502 +v -14.268 38.447 -0.0502 +v 13.221 44.969 -0.0502 +v -14.144 38.175 -0.0502 +v -13.995 37.939 -0.0502 +v 13.214 42.399 -0.0502 +v 13.333 41.536 -0.0502 +v -13.815 37.744 -0.0502 +v 11.6148 48.956 -0.0502 +v -13.606 37.589 -0.0502 +v -13.355 37.481 -0.0502 +v 10.939 47.898 -0.0502 +v -13.079 37.4 -0.0502 +v 36.201 134.477 -25.5502 +v 10.35 45.924 -0.0502 +v -12.778 37.346 -0.0502 +v 10.153 43.513 -0.0502 +v 36.201 134.277 -25.5502 +v -12.472 37.313 -0.0502 +v 36.201 133.636 -25.4392 +v 10.205 42.343 -0.0502 +v -12.151 37.292 -0.0502 +v 10.362 41.258 -0.0502 +v -11.725 36.113 -0.0502 +v 13.512 40.763 -0.0502 +v -36.799 132.277 -19.5502 +v -34.799 132.277 -17.5502 +v 13.749 40.08 -0.0502 +v -19.787 51.176 -0.0502 +v 14.04 39.487 -0.0502 +v -19.787 49.983 -0.0502 +v 14.386 38.984 -0.0502 +v -17.615 49.289 -0.0502 +v -17.5366 49.152 -0.0502 +v 32.768 134.277 -25.5502 +v 14.804 38.555 -0.0502 +v -17.779 49.484 -0.0502 +v 15.281 38.211 -0.0502 +v -17.973 49.639 -0.0502 +v 15.819 37.953 -0.0502 +v -18.197 49.761 -0.0502 +v 36.201 132.512 -27.1292 +v -18.451 49.855 -0.0502 +v 12.288 37.6192 -0.0502 +v 12.716 37.225 -0.0502 +v -18.734 49.922 -0.0502 +v 13.47 36.726 -0.0502 +v -19.041 49.956 -0.0502 +v 36.201 131.104 -25.9852 +v 36.201 131.645 -26.5512 +v 14.318 36.335 -0.0502 +v -19.362 49.976 -0.0502 +v 15.251 36.055 -0.0502 +v -19.697 49.983 -0.0502 +v 16.259 35.886 -0.0502 +v 65.501 -75.523 -27.5502 +v -27.973 49.341 -0.0502 +v -27.8181 49.152 -0.0502 +v 10.623 40.258 -0.0502 +v -28.264 49.583 -0.0502 +v 11.002 39.35 -0.0502 +v -28.61 49.781 -0.0502 +v 11.479 38.542 -0.0502 +v -28.672 49.8006 -0.0502 +v 12.057 37.832 -0.0502 +v -24.947 49.421 -0.0502 +v -25.306 49.92 -0.0502 +v 2.136 45.798 -0.0502 +v 2.116 46.384 -0.0502 +v 37.201 134.477 -27.5502 +v 2.057 46.93 -0.0502 +v 65.501 -76.364 -27.6602 +v 36.201 134.477 -27.5502 +v 1.957 47.436 -0.0502 +v 65.501 -77.223 -28.2342 +v 65.501 -76.832 -27.8902 +v 36.201 134.277 -27.5502 +v 1.815 47.883 -0.0502 +v 1.629 48.28 -0.0502 +v 1.397 48.628 -0.0502 +v 36.201 133.242 -27.4132 +v 1.116 48.936 -0.0502 +v 5.07 45.939 -0.0502 +v 5.03 46.851 -0.0502 +v 62.201 157.39 -32.5502 +v 4.911 47.674 -0.0502 +v 58.401 159.785 -32.5502 +v 4.712 48.406 -0.0502 +v 54.164 161.273 -32.5502 +v 4.44 49.064 -0.0502 +v 49.701 161.777 -32.5502 +v 7.555 36.113 -0.0502 +v 7.555 37.286 -0.0502 +v 65.501 -77.68 -29.1602 +v 5.07 39.287 -0.0502 +v 5.09 38.883 -0.0502 +v 5.149 38.533 -0.0502 +v 5.249 38.236 -0.0502 +v 5.383 37.998 -0.0502 +v -25.744 50.347 -0.0502 +v 45.238 161.273 -32.5502 +v -26.261 50.691 -0.0502 +v 5.548 37.796 -0.0502 +v 41 159.785 -32.5502 +v -26.858 50.967 -0.0502 +v 5.742 37.629 -0.0502 +v 37.201 157.39 -32.5502 +v -27.535 51.176 -0.0502 +v 5.966 37.508 -0.0502 +v -28.279 51.322 -0.0502 +v 6.219 37.414 -0.0502 +v -28.672 51.3637 -0.0502 +v 6.503 37.346 -0.0502 +v -30.133 50.024 -0.0502 +v -29.546 49.997 -0.0502 +v 65.501 -77.723 -29.5502 +v -30.703 49.999 -0.0502 +v 6.809 37.313 -0.0502 +v -31.188 49.925 -0.0502 +v 7.13 37.292 -0.0502 +v 49.701 146.777 -32.5502 +v -31.588 49.801 -0.0502 +v 65.501 -77.723 -29.7502 +v 7.466 37.286 -0.0502 +v -31.934 49.633 -0.0502 +v -32.225 49.424 -0.0502 +v 54.175 143.984 -32.5502 +v -32.462 49.174 -0.0502 +v 2.136 36.113 -0.0502 +v -32.4758 49.152 -0.0502 +v 52.744 145.744 -32.5502 +v -29.038 49.916 -0.0502 +v 65.501 -79.187 -27.5502 +v 65.501 -79.689 -29.0282 +v -29.108 51.41 -0.0502 +v -30.021 51.439 -0.0502 +v -30.78 51.421 -0.0502 +v -31.504 51.367 -0.0502 +v -32.193 51.277 -0.0502 +v -32.768 51.1772 -0.0502 +v -17.279 48.062 -0.0502 +v -17.301 48.451 -0.0502 +v -17.368 48.781 -0.0502 +v -17.48 49.053 -0.0502 +v -24.31 46.586 -0.0502 +v -24.35 47.431 -0.0502 +v -24.47 48.186 -0.0502 +v -24.576 48.5402 -0.0502 +v -19.697 37.286 -0.0502 +v -20.101 37.286 -0.0502 +v -19.349 37.292 -0.0502 +v -19.021 37.313 -0.0502 +v -18.712 37.346 -0.0502 +v -18.438 37.414 -0.0502 +v -18.185 37.508 -0.0502 +v 51.907 146.252 -32.5502 +v 50.674 146.671 -32.5502 +v 89.941 54.876 -0.0502 +v 53.667 144.821 -32.5502 +v 89.702 54.804 -0.0502 +v 89.464 54.696 -0.0502 +v 89.225 54.553 -0.0502 +v 88.996 54.375 -0.0502 +v 88.757 54.166 -0.0502 +v 88.508 53.926 -0.0502 +v 88.249 53.647 -0.0502 +v 88.0383 53.393 -0.0502 +v -17.951 37.629 -0.0502 +v 87.702 52.955 -0.0502 +v 86.016 50.7588 -0.0502 +v 87.981 53.324 -0.0502 +v -20.101 36.113 -0.0502 +v -17.757 37.796 -0.0502 +v 84.253 54.977 -0.0502 +v 85.988 54.321 -0.0502 +v 85.9918 54.272 -0.0502 +v -17.592 37.998 -0.0502 +v 85.95 54.456 -0.0502 +v 85.888 54.573 -0.0502 +v -17.458 38.236 -0.0502 +v 85.789 54.672 -0.0502 +v -17.359 38.535 -0.0502 +v 85.669 54.752 -0.0502 +v 85.53 54.815 -0.0502 +v -17.299 38.892 -0.0502 +v 85.373 54.874 -0.0502 +v 85.201 54.914 -0.0502 +v -17.279 39.308 -0.0502 +v 85.015 54.937 -0.0502 +v 84.801 54.959 -0.0502 +v 84.577 54.973 -0.0502 +v -22.295 36.113 -0.0502 +v -22.295 37.286 -0.0502 +v 84.343 54.977 -0.0502 +v -24.31 39.287 -0.0502 +v 86 54.168 -0.0502 +v 85.978 53.908 -0.0502 +v -24.301 38.919 -0.0502 +v -24.271 38.595 -0.0502 +v 85.798 53.36 -0.0502 +v 85.7358 53.248 -0.0502 +v -24.221 38.317 -0.0502 +v 85.91 53.638 -0.0502 +v -24.134 38.079 -0.0502 +v -24.022 37.877 -0.0502 +v 85.239 52.45 -0.0502 +v -40.881 143.017 -25.5502 +v 82.8163 49.152 -0.0502 +v -40.799 141.777 -25.5502 +v -23.885 37.71 -0.0502 +v 85.45 52.767 -0.0502 +v -23.718 37.567 -0.0502 +v 85.637 53.07 -0.0502 +v -23.517 37.459 -0.0502 +v -40.881 140.537 -25.5502 +v -23.28 37.387 -0.0502 +v 84.7825 49.152 -0.0502 +v 82.283 48.426 -0.0502 +v 81.92 48.9557 -0.0502 +v -23.012 37.331 -0.0502 +v 82.2837 48.427 -0.0502 +v -22.713 37.297 -0.0502 +v -22.385 37.286 -0.0502 +v 81.92 43.7512 -0.0502 +v 83.8366 40.96 -0.0502 +v 83.201 47.092 -0.0502 +v 87.4144 40.96 -0.0502 +v -32.648 48.878 -0.0502 +v 90.188 37.609 -0.0502 +v 90.112 37.6613 -0.0502 +v -27.244 46.566 -0.0502 +v 90.591 37.43 -0.0502 +v -27.254 47.054 -0.0502 +v 90.994 37.322 -0.0502 +v -27.284 47.519 -0.0502 +v 91.397 37.286 -0.0502 +v -27.334 47.961 -0.0502 +v -27.428 48.37 -0.0502 +v 88.911 38.782 -0.0502 +v -27.563 48.734 -0.0502 +v 89.352 38.283 -0.0502 +v -27.737 49.053 -0.0502 +v 89.777 37.892 -0.0502 +v -41.523 145.413 -25.5502 +v -41.123 144.236 -25.5502 +v -24.669 48.851 -0.0502 +v 85.154 39.029 -0.0502 +v 85.2221 38.912 -0.0502 +v -42.072 146.527 -25.5502 +v 85.1285 39.0704 -0.0502 +v -27.244 44.888 -0.0502 +v -28.3601 44.8446 -0.0502 +v 84.388 40.157 -0.0502 +v 84.587 39.865 -0.0502 +v -29.6638 44.7939 -0.0502 +v 85.0802 39.149 -0.0502 +v -29.842 44.787 -0.0502 +v -32.016 44.621 -0.0502 +v 85.05 39.198 -0.0502 +v -27.244 41.431 -0.0502 +v -27.2703 40.96 -0.0502 +v 84.9962 39.2798 -0.0502 +v -29.237 43.614 -0.0502 +v 54.701 141.777 -32.5502 +v -27.244 43.695 -0.0502 +v 84.766 39.609 -0.0502 +v -30.071 43.556 -0.0502 +v 84.925 39.388 -0.0502 +v -30.81 43.461 -0.0502 +v 83.559 37.286 -0.0502 +v 83.38 37.286 -0.0502 +v 54.175 139.57 -32.5502 +v 54.53 143.071 -32.5502 +v 84.592 37.389 -0.0502 +v -41.123 139.318 -25.5502 +v 85.211 37.699 -0.0502 +v 54.53 140.483 -32.5502 +v 85.418 38.216 -0.0502 +v -31.454 43.331 -0.0502 +v 85.413 38.312 -0.0502 +v -32.011 43.149 -0.0502 +v 85.398 38.413 -0.0502 +v -32.489 42.927 -0.0502 +v 85.373 38.519 -0.0502 +v 85.338 38.622 -0.0502 +v 85.293 38.744 -0.0502 +v 50.674 136.884 -32.5502 +v 49.374 136.798 -32.5502 +v -26.9774 38.3993 -0.0502 +v 85.239 38.883 -0.0502 +v -26.505 36.113 -0.0502 +v 52.744 137.81 -32.5502 +v 51.907 137.302 -32.5502 +v -28.506 37.108 -0.0502 +v -28.672 36.9678 -0.0502 +v 83.38 36.113 -0.0502 +v -26.998 38.499 -0.0502 +v 80.603 54.977 -0.0502 +v 80.514 54.977 -0.0502 +v -28.3964 37.2169 -0.0502 +v -28.185 37.427 -0.0502 +v 80.178 54.97 -0.0502 +v 79.887 54.95 -0.0502 +v 79.872 54.9479 -0.0502 +v 79.64 54.916 -0.0502 +v -27.881 37.762 -0.0502 +v 79.419 54.872 -0.0502 +v 53.667 138.733 -32.5502 +v 79.232 54.818 -0.0502 +v -27.8286 37.8218 -0.0502 +v 79.08 54.755 -0.0502 +v -27.568 38.119 -0.0502 +v 78.961 54.672 -0.0502 +v -27.244 38.499 -0.0502 +v 78.871 54.584 -0.0502 +v -27.4192 38.2935 -0.0502 +v 78.812 54.492 -0.0502 +v -28.364 38.6 -0.0502 +v 78.774 54.384 -0.0502 +v -28.672 38.3504 -0.0502 +v 78.752 54.276 -0.0502 +v -28.033 38.962 -0.0502 +v 78.7517 54.272 -0.0502 +v -27.757 39.373 -0.0502 +v 78.745 54.168 -0.0502 +v -27.535 39.833 -0.0502 +v -27.373 40.325 -0.0502 +v 78.747 54.074 -0.0502 +v 78.754 53.98 -0.0502 +v -27.276 40.858 -0.0502 +v 78.767 53.885 -0.0502 +v 78.787 53.786 -0.0502 +v -28.7948 36.864 -0.0502 +v 78.817 53.679 -0.0502 +v -32.176 37.62 -0.0502 +v 78.856 53.562 -0.0502 +v -31.387 37.549 -0.0502 +v 78.911 53.434 -0.0502 +v -30.78 37.578 -0.0502 +v -30.212 37.665 -0.0502 +v 78.986 53.292 -0.0502 +v -29.685 37.811 -0.0502 +v 79.0127 53.248 -0.0502 +v 79.08 53.137 -0.0502 +v -29.19 38.025 -0.0502 +v -36.799 132.777 -24.8662 +v 79.185 52.951 -0.0502 +v -36.799 133.168 -25.2092 +v 48.406 146.607 -32.5502 +v -28.749 38.288 -0.0502 +v 79.232 52.8777 -0.0502 +v 79.484 52.51 -0.0502 +v 81.7854 49.152 -0.0502 +v 47.787 146.396 -32.5502 +v -32.103 35.83 -0.0502 +v 79.319 52.742 -0.0502 +v 46.657 145.744 -32.5502 +v -31.481 35.852 -0.0502 +v -36.799 132.345 -24.0672 +v -30.929 35.92 -0.0502 +v 77.824 49.7442 -0.0502 +v 78.2296 49.152 -0.0502 +v -30.446 36.032 -0.0502 +v 45.552 144.549 -32.5502 +v 75.251 53.501 -0.0502 +v 44.976 143.381 -32.5502 +v -29.998 36.174 -0.0502 +v 74.863 53.989 -0.0502 +v -36.799 132.277 -23.5502 +v 74.445 54.373 -0.0502 +v 73.997 54.654 -0.0502 +v 73.728 54.7554 -0.0502 +v 73.522 54.833 -0.0502 +v 73.052 54.941 -0.0502 +v 72.586 54.977 -0.0502 +v 46.165 145.313 -32.5502 +v -36.799 133.7 -25.4522 +v 72.183 54.977 -0.0502 +v 70.638 54.977 -0.0502 +v -36.799 134.477 -25.5502 +v 70.235 54.977 -0.0502 +v -36.799 134.277 -25.5502 +v 69.897 54.97 -0.0502 +v 69.632 54.9539 -0.0502 +v 69.568 54.95 -0.0502 +v -29.58 36.356 -0.0502 +v 69.25 54.916 -0.0502 +v -29.192 36.578 -0.0502 +v 68.951 54.849 -0.0502 +v 44.743 142.43 -32.5502 +v -36.799 132.277 -27.0142 +v -36.799 132.746 -27.2452 +v -28.841 36.825 -0.0502 +v 68.682 54.755 -0.0502 +v 68.443 54.633 -0.0502 +v -36.799 131.842 -26.7232 +v 44.743 141.124 -32.5502 +v 68.222 54.467 -0.0502 +v -36.799 131.104 -25.9852 +v 68.035 54.265 -0.0502 +v 44.976 140.173 -32.5502 +v 67.884 54.027 -0.0502 +v 67.784 53.728 -0.0502 +v 67.724 53.371 -0.0502 +v 45.37 139.277 -32.5502 +v 67.7184 53.248 -0.0502 +v 65.779 53.456 -0.0502 +v 65.7911 53.248 -0.0502 +v 65.711 53.786 -0.0502 +v 65.6 54.067 -0.0502 +v -37.799 134.477 -25.5502 +v 67.705 52.955 -0.0502 +v 65.801 53.077 -0.0502 +v 45.949 138.487 -32.5502 +v 47.201 137.447 -32.5502 +v -37.799 134.477 -27.5502 +v 48.097 137.053 -32.5502 +v -36.799 134.477 -27.5502 +v 80.402 45.98 -0.0502 +v 76.528 40.96 -0.0502 +v -36.799 134.277 -27.5502 +v 81.32 44.625 -0.0502 +v 78.578 40.96 -0.0502 +v -36.799 133.755 -27.5152 +v 46.657 137.81 -32.5502 +v 79.17 36.113 -0.0502 +v 79.17 37.286 -0.0502 +v 77.871 40.015 -0.0502 +v 77.824 39.9485 -0.0502 +v 77.946 37.376 -0.0502 +v 77.824 37.4112 -0.0502 +v 78.453 37.308 -0.0502 +v 79.08 37.286 -0.0502 +v 75.206 39.247 -0.0502 +v 74.9388 38.912 -0.0502 +v 77.782 39.889 -0.0502 +v 77.692 39.755 -0.0502 +v 77.602 39.611 -0.0502 +v 77.513 39.458 -0.0502 +v -66.299 -75.523 -25.5502 +v -66.099 -75.523 -25.5502 +v 77.423 39.296 -0.0502 +v 77.334 39.126 -0.0502 +v -67.078 -75.523 -25.6352 +v 77.264 38.964 -0.0502 +v 77.2447 38.912 -0.0502 +v 73.965 37.895 -0.0502 +v 73.728 37.731 -0.0502 +v -42.072 137.027 -25.5502 +v -42.763 135.994 -25.5502 +v 74.196 38.09 -0.0502 +v 74.423 38.317 -0.0502 +v -41.523 138.142 -25.5502 +v 74.669 38.591 -0.0502 +v -68.299 -75.523 -26.0862 +v 74.93 38.901 -0.0502 +v -67.83 -75.523 -25.8542 +v -69.473 -75.523 -27.1152 +v 77.204 38.802 -0.0502 +v -68.735 -75.523 -26.3762 +v 77.155 38.64 -0.0502 +v 77.105 38.47 -0.0502 +v 77.075 38.308 -0.0502 +v -44.516 134.24 -25.5502 +v -45.549 133.55 -25.5502 +v 77.065 38.155 -0.0502 +v 77.12 37.874 -0.0502 +v -46.664 133 -25.5502 +v 77.284 37.652 -0.0502 +v 77.558 37.488 -0.0502 +v -49.059 132.358 -25.5502 +v -66.099 -75.984 -25.5672 +v -66.099 -77.488 -25.9702 +v -66.099 -76.758 -25.6862 +v -43.582 135.06 -25.5502 +v 71.959 37.286 -0.0502 +v 71.78 37.286 -0.0502 +v 72.318 37.297 -0.0502 +v -47.841 132.601 -25.5502 +v 16.384 163.077 -27.5502 +v 72.646 37.331 -0.0502 +v 72.945 37.387 -0.0502 +v 73.221 37.47 -0.0502 +v -66.099 -78.551 -26.7212 +v -66.099 -78.158 -26.3762 +v 73.482 37.585 -0.0502 +v -66.099 -78.896 -27.1152 +v 71.78 36.113 -0.0502 +v 0.97 151.696 -27.5502 +v -66.099 -75.523 -27.5502 +v 5.645 149.819 -27.5502 +v 3.428 151.057 -27.5502 +v 67.705 36.113 -0.0502 +v 65.801 40.622 -0.0502 +v -66.877 -75.523 -27.6472 +v -66.299 -75.523 -27.5502 +v -67.408 -75.523 -27.8902 +v 7.479 148.062 -27.5502 +v -67.836 -75.523 -28.2882 +v -68.189 -75.523 -28.9082 +v 1.169 -71.431 -7.5502 +v 1.043 -71.061 -7.5502 +v 0.687 -70.598 -7.5502 +v 0.039 -70.271 -7.5502 +v -66.099 -76.832 -27.8902 +v -66.099 -77.223 -28.2342 +v -66.099 -77.513 -28.6672 +v -66.099 -77.68 -29.1602 +v -66.099 -75.984 -27.5672 +v -66.099 -76.364 -27.6602 +v 0.451 -70.424 -7.5502 +v 0.089 -73.172 -7.5502 +v -66.099 -77.723 -29.7502 +v -68.299 -77.722 -29.7502 +v -68.299 -75.523 -29.7502 +v -68.298 -77.723 -29.7502 +v -66.099 -79.587 -28.5142 +v -66.099 -79.303 -27.7842 +v -91.2 56.17 0.2388 +v -81.66 56.17 0.2388 +v 0.451 -73.022 -7.5502 +v 0.687 -72.848 -7.5502 +v -70.299 -77.722 -29.7502 +v -70.299 -75.523 -29.7502 +v -66.448 49.289 0.2388 +v -66.627 49.484 0.2388 +v 1.086 -72.297 -7.5502 +v -69.764 -75.523 -27.5502 +v -69.995 -75.523 -28.0192 +v -70.265 -75.523 -29.0282 +v 0.945 -72.555 -7.5502 +v 1.194 -71.821 -7.5502 +v -66.836 49.639 0.2388 +v -67.087 49.761 0.2388 +v -67.363 49.855 0.2388 +v -67.664 49.922 0.2388 +v -68.299 -77.722 -37.5502 +v -67.97 49.956 0.2388 +v -70.299 -77.722 -37.5502 +v -68.291 49.976 0.2388 +v -68.627 49.983 0.2388 +v -68.717 51.176 0.2388 +v -68.717 49.983 0.2388 +v -68.298 -77.723 -37.5502 +v -72.21 50.408 0.2388 +v -72.74 51.585 0.2388 +v -73.405 52.636 0.2388 +v -75.791 50.85 0.2388 +v -76.823 52.551 0.2388 +v -78.266 53.775 0.2388 +v -80.118 54.51 0.2388 +v -74.203 53.562 0.2388 +v -75.134 54.344 0.2388 +v -76.194 54.991 0.2388 +v -77.383 55.503 0.2388 +v -78.694 55.873 0.2388 +v -80.12 56.096 0.2388 +v -66.074 48.062 0.2388 +v -66.099 48.451 0.2388 +v -66.174 48.781 0.2388 +v -66.298 49.053 0.2388 +v -72.165 41.997 0.2388 +v -71.805 43.286 0.2388 +v -71.588 44.675 0.2388 +v -71.516 46.162 0.2388 +v -71.593 47.694 0.2388 +v -71.825 49.109 0.2388 +v 65.701 57.344 -25.5502 +v -68.717 37.286 0.2388 +v -68.627 37.286 0.2388 +v -68.289 37.292 0.2388 +v -67.96 37.313 0.2388 +v -67.642 37.346 0.2388 +v -67.343 37.414 0.2388 +v -67.075 37.508 0.2388 +v -66.836 37.629 0.2388 +v -68.717 36.113 0.2388 +v -66.627 37.796 0.2388 +v 9.556 143.473 -27.5502 +v -66.448 37.998 0.2388 +v 8.811 145.9 -27.5502 +v 9.665 140.936 -27.5502 +v 65.701 57.344 -27.5502 +v 18.701 -75.523 -25.5502 +v 19.701 -75.523 -25.5502 +v 19.701 -77.488 -25.9702 +v 19.701 -76.245 -25.5842 +v 19.701 -76.758 -25.6862 +v -59.799 141.777 -25.5502 +v -59.718 143.017 -25.5502 +v -59.476 144.236 -25.5502 +v -58.527 146.527 -25.5502 +v -59.076 145.413 -25.5502 +v -59.718 140.537 -25.5502 +v -59.476 139.318 -25.5502 +v 19.701 -78.896 -27.1152 +v 19.701 -78.158 -26.3762 +v -50.299 132.277 -25.5502 +v -52.758 132.601 -25.5502 +v -53.935 133 -25.5502 +v -55.049 133.55 -25.5502 +v -57.017 135.06 -25.5502 +v -51.539 132.358 -25.5502 +v -56.083 134.24 -25.5502 +v -58.527 137.027 -25.5502 +v -59.076 138.142 -25.5502 +v -57.836 135.994 -25.5502 +v 19.701 -75.523 -27.5502 +v 18.701 -75.523 -27.5502 +v -45.836 161.273 -32.5502 +v -41.599 159.785 -32.5502 +v -37.799 157.39 -32.5502 +v 19.701 -76.112 -27.5922 +v 19.701 -76.822 -27.9042 +v 19.701 -77.382 -28.4412 +v -62.799 157.39 -32.5502 +v -59 159.785 -32.5502 +v -54.762 161.273 -32.5502 +v -50.299 161.777 -32.5502 +v -45.825 139.57 -32.5502 +v 19.701 -77.613 -28.9082 +v -45.47 143.071 -32.5502 +v -45.299 141.777 -32.5502 +v -45.825 143.984 -32.5502 +v -47.256 145.744 -32.5502 +v 19.701 -77.723 -29.5502 +v -48.093 146.252 -32.5502 +v 19.701 -79.587 -28.5142 +v 19.701 -79.303 -27.7842 +v -45.47 140.483 -32.5502 +v -32.85 51.163 0.2388 +v -33.447 51.007 0.2388 +v -33.984 50.812 0.2388 +v -34.457 50.576 0.2388 +v -34.86 50.3 0.2388 +v -35.194 49.983 0.2388 +v -35.43 49.621 0.2388 +v -35.572 49.21 0.2388 +v -44.485 49.215 0.2388 +v -44.89 49.478 0.2388 +v -41.777 49.72 0.2388 +v -42.37 50.239 0.2388 +v -43.041 50.664 0.2388 +v -43.793 50.994 0.2388 +v -44.631 51.241 0.2388 +v -46.502 49.821 0.2388 +v -45.895 49.783 0.2388 +v -46.333 144.821 -32.5502 +v -47.577 49.684 0.2388 +v -48.473 49.273 0.2388 +v -45.358 49.669 0.2388 +v -45.535 51.389 0.2388 +v -46.502 51.439 0.2388 +v -48.543 51.216 0.2388 +v -32.85 51.163 -0.0502 +v -33.447 51.007 -0.0502 +v -47.256 137.81 -32.5502 +v -48.093 137.302 -32.5502 +v -33.984 50.812 -0.0502 +v -34.457 50.576 -0.0502 +v -34.86 50.3 -0.0502 +v -35.194 49.983 -0.0502 +v -35.43 49.621 -0.0502 +v -35.572 49.21 -0.0502 +v -41.777 49.72 -0.0502 +v -42.37 50.239 -0.0502 +v -46.333 138.733 -32.5502 +v -43.041 50.664 -0.0502 +v -43.793 50.994 -0.0502 +v -44.631 51.241 -0.0502 +v -45.056 51.3106 -0.0502 +v -44.485 49.215 -0.0502 +v -44.89 49.478 -0.0502 +v -45.056 49.5457 -0.0502 +v -45.535 51.389 -0.0502 +v -46.502 51.439 -0.0502 +v -48.543 51.216 -0.0502 +v -46.502 49.821 -0.0502 +v -45.895 49.783 -0.0502 +v -47.577 49.684 -0.0502 +v -48.473 49.273 -0.0502 +v -45.358 49.669 -0.0502 +v -48.882 62.796 -7.5502 +v -48.809 63.228 -7.5502 +v -49.087 64.146 -7.5502 +v -48.882 63.758 -7.5502 +v 0.576 -70.207 -25.5502 +v 0.262 -70.069 -25.5502 +v -50.245 50.549 0.2388 +v -51.608 49.437 0.2388 +v -55.664 49.985 0.2388 +v -55.94 50.491 0.2388 +v -56.4 50.893 0.2388 +v -57.05 51.196 0.2388 +v -55.572 49.377 0.2388 +v -59.142 49.406 0.2388 +v -59.568 49.581 0.2388 +v -60.118 49.639 0.2388 +v -60.481 49.606 0.2388 +v -60.824 49.505 0.2388 +v 1.413 -71.382 -25.5502 +v 1.267 -70.951 -25.5502 +v -57.893 51.378 0.2388 +v -61.148 49.336 0.2388 +v -58.931 51.439 0.2388 +v -59.578 51.412 0.2388 +v 1.089 -70.658 -25.5502 +# 3481 vertices + +g group_0_11909273 + +usemtl color_11909273 +s 0 + +f 7 1 6 +f 2 6 1 +f 5 3 4 +f 4 8 5 +f 12 13 14 +f 12 14 15 +f 13 19 20 +f 13 20 14 +f 19 21 20 +f 22 23 26 +f 22 26 28 +f 24 25 27 +f 21 30 32 +f 21 32 20 +f 31 22 28 +f 31 28 33 +f 34 24 1082 +f 27 1082 24 +f 30 35 36 +f 30 36 32 +f 35 37 38 +f 35 38 36 +f 9 17 11 +f 66 11 17 +f 66 17 65 +f 37 39 41 +f 37 41 38 +f 18 3392 29 +f 39 42 43 +f 39 43 41 +f 44 31 33 +f 44 33 46 +f 42 49 50 +f 42 50 43 +f 49 53 50 +f 70 68 72 +f 85 56 47 +f 57 58 59 +f 76 85 47 +f 62 63 58 +f 62 58 57 +f 18 16 3391 +f 51 3390 45 +f 61 1326 69 +f 1303 69 1326 +f 69 68 70 +f 17 54 65 +f 55 72 64 +f 60 69 70 +f 72 55 75 +f 73 74 77 +f 75 55 84 +f 84 55 86 +f 93 1360 92 +f 94 1357 93 +f 95 1357 94 +f 96 1357 95 +f 98 1357 96 +f 86 55 101 +f 104 101 55 +f 103 102 77 +f 91 77 102 +f 71 1075 1057 +f 71 1057 48 +f 52 83 48 +f 83 52 97 +f 71 48 83 +f 78 82 1227 +f 82 134 1227 +f 119 120 81 +f 107 104 55 +f 105 103 77 +f 81 120 100 +f 99 100 120 +f 124 99 120 +f 112 55 12 +f 110 77 113 +f 13 55 19 +f 122 124 120 +f 117 74 121 +f 3391 45 3390 +f 88 3390 67 +f 87 3390 88 +f 74 126 123 +f 123 121 74 +f 74 117 77 +f 24 42 25 +f 35 30 25 +f 21 19 25 +f 55 25 19 +f 13 12 55 +f 112 107 55 +f 135 145 132 +f 188 185 657 +f 185 177 79 +f 175 169 79 +f 131 79 143 +f 150 143 79 +f 30 21 25 +f 35 25 37 +f 47 3358 114 +f 37 25 39 +f 127 128 145 +f 145 128 146 +f 145 146 147 +f 147 132 145 +f 145 135 149 +f 145 149 151 +f 145 151 152 +f 145 152 154 +f 145 154 171 +f 63 62 161 +f 143 138 131 +f 434 433 3 +f 385 165 164 +f 163 164 165 +f 79 160 150 +f 134 133 1227 +f 133 140 1227 +f 158 159 173 +f 159 170 173 +f 170 145 173 +f 171 173 145 +f 173 167 158 +f 168 158 167 +f 172 163 165 +f 172 165 174 +f 176 172 174 +f 176 174 178 +f 169 162 79 +f 162 160 79 +f 181 215 180 +f 182 214 181 +f 183 176 178 +f 183 178 187 +f 140 139 1228 +f 1231 1228 139 +f 137 97 52 +f 175 79 177 +f 189 183 187 +f 189 187 190 +f 130 137 1115 +f 199 189 190 +f 199 190 201 +f 197 215 195 +f 198 215 197 +f 200 215 198 +f 179 215 200 +f 180 215 179 +f 79 657 185 +f 89 97 137 +f 129 5 130 +f 203 199 201 +f 196 188 657 +f 156 1231 139 +f 202 196 657 +f 2729 798 79 +f 182 208 209 +f 182 209 210 +f 182 210 211 +f 182 211 212 +f 182 212 213 +f 182 213 214 +f 215 181 214 +f 191 195 215 +f 216 222 207 +f 216 207 206 +f 73 221 126 +f 73 126 74 +f 228 207 222 +f 233 234 219 +f 1536 47 192 +f 224 226 91 +f 227 228 222 +f 130 89 137 +f 89 130 5 +f 3 5 434 +f 129 434 5 +f 229 224 91 +f 229 91 102 +f 230 238 228 +f 230 228 227 +f 1228 1227 140 +f 155 1235 156 +f 220 223 219 +f 223 233 219 +f 234 235 219 +f 235 248 219 +f 232 219 248 +f 231 232 248 +f 229 102 103 +f 229 103 236 +f 237 238 230 +f 519 239 114 +f 236 103 105 +f 236 105 241 +f 242 250 238 +f 242 238 237 +f 47 114 239 +f 241 105 110 +f 241 110 245 +f 247 250 242 +f 245 110 113 +f 245 113 257 +f 249 252 248 +f 248 252 254 +f 248 254 255 +f 248 255 256 +f 248 256 258 +f 248 258 259 +f 248 259 260 +f 248 260 262 +f 248 262 231 +f 261 263 250 +f 261 250 247 +f 48 1095 52 +f 257 113 117 +f 257 117 267 +f 193 47 239 +f 268 269 263 +f 268 263 261 +f 267 117 121 +f 267 121 270 +f 275 265 266 +f 275 266 274 +f 271 272 269 +f 271 269 268 +f 270 121 123 +f 270 123 273 +f 271 59 272 +f 58 272 59 +f 273 123 126 +f 273 126 221 +f 556 278 277 +f 276 277 278 +f 282 283 131 +f 285 276 278 +f 285 278 286 +f 284 287 279 +f 281 280 71 +f 533 534 193 +f 289 764 138 +f 290 285 286 +f 290 286 291 +f 292 289 138 +f 292 138 143 +f 293 290 291 +f 293 291 295 +f 192 193 534 +f 296 292 143 +f 296 143 150 +f 83 281 71 +f 297 293 295 +f 297 295 299 +f 300 296 150 +f 300 150 160 +f 301 936 281 +f 39 25 42 +f 304 300 160 +f 304 160 162 +f 302 301 89 +f 321 319 284 +f 306 304 162 +f 306 162 169 +f 239 533 193 +f 301 97 89 +f 306 169 175 +f 306 175 307 +f 42 24 49 +f 49 24 53 +f 307 175 177 +f 307 177 308 +f 97 281 83 +f 309 323 1247 +f 308 177 185 +f 308 185 310 +f 301 281 97 +f 305 315 294 +f 288 315 305 +f 310 185 188 +f 310 188 313 +f 89 5 302 +f 313 188 196 +f 313 196 316 +f 287 284 319 +f 109 519 114 +f 316 196 202 +f 316 202 320 +f 321 318 319 +f 320 202 204 +f 320 204 324 +f 323 325 1247 +f 2 1247 338 +f 331 332 365 +f 384 365 332 +f 332 333 384 +f 333 334 384 +f 387 384 334 +f 52 1095 137 +f 443 417 583 +f 436 369 341 +f 342 436 341 +f 343 436 342 +f 344 435 343 +f 345 439 344 +f 73 80 221 +f 221 80 798 +f 348 349 2 +f 349 367 2 +f 353 357 352 +f 354 357 353 +f 355 360 354 +f 356 360 355 +f 351 352 357 +f 1095 1115 137 +f 236 241 229 +f 224 229 241 +f 226 224 241 +f 226 241 245 +f 226 245 257 +f 3187 3182 267 +f 270 798 267 +f 273 798 270 +f 221 798 273 +f 226 257 3184 +f 372 2 367 +f 4 2206 8 +f 8 2206 302 +f 251 243 337 +f 337 317 251 +f 8 302 5 +f 296 300 292 +f 289 292 300 +f 289 300 304 +f 289 304 306 +f 289 306 307 +f 289 307 308 +f 289 308 310 +f 289 310 313 +f 289 313 316 +f 320 847 316 +f 350 358 359 +f 391 315 288 +f 315 347 294 +f 243 294 347 +f 347 337 243 +f 357 358 351 +f 350 351 358 +f 357 354 360 +f 356 328 360 +f 373 708 375 +f 380 395 265 +f 303 297 299 +f 303 299 381 +f 376 360 328 +f 328 329 376 +f 383 303 381 +f 383 381 385 +f 3 382 379 +f 265 513 380 +f 164 383 385 +f 387 335 369 +f 382 389 379 +f 3461 390 393 +f 329 330 376 +f 366 376 330 +f 330 331 366 +f 365 366 331 +f 335 387 334 +f 395 414 265 +f 415 265 414 +f 319 391 288 +f 396 392 394 +f 396 394 397 +f 389 388 379 +f 350 359 399 +f 386 391 319 +f 386 319 318 +f 400 396 397 +f 400 397 403 +f 389 373 388 +f 406 400 403 +f 406 403 407 +f 373 375 388 +f 410 406 407 +f 410 407 413 +f 422 423 401 +f 422 401 402 +f 393 412 3461 +f 416 410 413 +f 416 413 418 +f 379 4 3 +f 393 390 2054 +f 416 418 419 +f 416 419 421 +f 393 2054 412 +f 417 253 317 +f 251 317 253 +f 421 419 431 +f 421 431 432 +f 425 426 404 +f 426 427 404 +f 427 428 408 +f 411 408 428 +f 428 429 411 +f 359 411 398 +f 399 359 398 +f 404 405 425 +f 429 398 411 +f 408 404 427 +f 424 425 405 +f 405 401 424 +f 423 424 401 +f 1163 433 434 +f 436 343 435 +f 432 431 437 +f 432 437 438 +f 438 437 444 +f 438 444 446 +f 446 444 450 +f 445 478 449 +f 452 451 455 +f 452 455 456 +f 389 448 441 +f 335 340 369 +f 340 341 369 +f 460 450 459 +f 444 459 450 +f 460 459 461 +f 460 461 462 +f 435 344 439 +f 462 461 463 +f 462 463 465 +f 346 439 345 +f 466 467 465 +f 466 465 463 +f 447 476 445 +f 440 373 441 +f 515 394 514 +f 392 514 394 +f 447 442 474 +f 469 474 442 +f 439 346 442 +f 469 442 346 +f 470 275 458 +f 456 455 554 +f 555 554 455 +f 471 472 473 +f 317 583 417 +f 476 447 475 +f 477 445 476 +f 478 445 477 +f 479 449 478 +f 480 471 473 +f 480 473 481 +f 453 552 454 +f 485 480 481 +f 485 481 486 +f 468 412 2058 +f 487 485 486 +f 487 486 488 +f 265 275 496 +f 490 275 489 +f 498 483 449 +f 491 487 488 +f 491 488 492 +f 499 500 483 +f 493 491 492 +f 493 492 494 +f 498 499 483 +f 498 449 479 +f 474 475 447 +f 389 441 373 +f 433 448 382 +f 389 382 448 +f 2054 2058 412 +f 510 265 496 +f 495 493 494 +f 495 494 497 +f 482 483 500 +f 501 482 500 +f 502 482 501 +f 503 482 502 +f 402 484 505 +f 505 506 402 +f 422 402 506 +f 504 484 503 +f 504 505 484 +f 482 503 484 +f 507 495 497 +f 507 497 509 +f 382 3 433 +f 246 244 111 +f 111 106 246 +f 264 246 106 +f 108 264 106 +f 118 264 108 +f 511 507 509 +f 511 509 512 +f 518 2596 453 +f 453 454 518 +f 514 511 512 +f 514 512 515 +f 148 531 118 +f 153 531 148 +f 166 524 153 +f 144 524 166 +f 136 537 530 +f 529 530 537 +f 142 525 141 +f 265 510 513 +f 508 454 546 +f 546 454 552 +f 240 218 116 +f 116 115 240 +f 546 547 508 +f 244 240 125 +f 225 194 217 +f 205 336 361 +f 362 361 336 +f 186 217 194 +f 186 184 217 +f 184 312 217 +f 314 116 218 +f 1169 440 441 +f 312 311 218 +f 218 217 312 +f 311 314 218 +f 115 125 240 +f 125 111 244 +f 186 2983 184 +f 326 550 378 +f 572 370 550 +f 374 362 336 +f 454 508 518 +f 186 194 2983 +f 464 522 109 +f 464 468 3383 +f 420 440 1177 +f 364 363 327 +f 322 327 363 +f 374 322 363 +f 361 371 205 +f 371 298 205 +f 225 205 298 +f 194 225 298 +f 368 364 327 +f 336 322 374 +f 327 326 368 +f 378 368 326 +f 538 539 529 +f 109 522 519 +f 522 464 3383 +f 531 153 524 +f 264 118 531 +f 141 525 144 +f 142 157 528 +f 142 528 525 +f 524 144 525 +f 542 543 521 +f 537 538 529 +f 157 136 530 +f 530 528 157 +f 540 523 539 +f 541 521 540 +f 523 529 539 +f 542 521 541 +f 520 521 543 +f 523 540 521 +f 553 554 555 +f 553 555 556 +f 277 553 556 +f 533 578 56 +f 544 545 560 +f 576 560 545 +f 520 574 545 +f 543 573 520 +f 558 559 561 +f 558 561 562 +f 568 569 549 +f 549 544 568 +f 566 568 544 +f 560 566 544 +f 563 558 562 +f 563 562 564 +f 420 1177 1160 +f 578 519 56 +f 565 563 564 +f 565 564 567 +f 548 549 569 +f 569 570 548 +f 570 571 548 +f 370 378 550 +f 551 548 571 +f 550 551 572 +f 571 572 551 +f 472 565 567 +f 472 567 473 +f 206 207 577 +f 575 577 207 +f 576 545 574 +f 573 574 520 +f 239 519 578 +f 579 741 279 +f 467 1 559 +f 580 1 467 +f 577 559 1 +f 239 578 533 +f 1439 741 579 +f 3383 56 519 +f 519 522 3383 +f 129 1107 434 +f 582 614 581 +f 470 489 275 +f 434 1107 1163 +f 453 443 583 +f 585 617 1 +f 55 1 617 +f 55 616 615 +f 615 613 55 +f 55 608 590 +f 25 55 590 +f 587 650 586 +f 588 652 587 +f 589 649 588 +f 591 590 592 +f 591 592 593 +f 516 508 547 +f 557 516 547 +f 583 552 453 +f 598 599 597 +f 599 600 597 +f 595 597 600 +f 595 600 601 +f 602 603 624 +f 44 624 603 +f 604 44 603 +f 605 44 604 +f 591 44 605 +f 592 590 606 +f 606 590 608 +f 609 608 55 +f 674 612 594 +f 607 517 557 +f 609 55 610 +f 611 610 55 +f 611 55 613 +f 596 674 594 +f 517 607 612 +f 516 557 517 +f 708 2809 375 +f 616 55 617 +f 694 623 614 +f 452 554 621 +f 619 620 554 +f 627 601 626 +f 625 626 601 +f 624 625 601 +f 595 601 627 +f 601 602 624 +f 593 628 591 +f 628 629 591 +f 629 635 591 +f 44 591 635 +f 614 623 622 +f 630 622 623 +f 623 648 630 +f 635 633 44 +f 632 44 633 +f 634 6 636 +f 526 6 634 +f 372 641 2 +f 655 2 641 +f 646 631 645 +f 647 631 646 +f 643 631 642 +f 644 631 643 +f 645 631 644 +f 640 642 631 +f 639 640 631 +f 638 639 631 +f 23 22 631 +f 22 31 631 +f 31 44 631 +f 632 631 44 +f 647 23 631 +f 649 589 648 +f 630 648 589 +f 3296 234 233 +f 650 587 652 +f 652 588 649 +f 657 79 656 +f 80 656 79 +f 204 202 657 +f 658 204 657 +f 654 673 596 +f 651 586 650 +f 636 6 655 +f 653 637 271 +f 773 774 662 +f 772 773 662 +f 663 783 662 +f 774 775 662 +f 1536 1535 76 +f 193 192 47 +f 65 666 667 +f 65 667 66 +f 665 783 663 +f 669 654 409 +f 377 409 654 +f 663 676 665 +f 2897 667 2890 +f 668 665 676 +f 666 65 54 +f 676 677 668 +f 59 271 637 +f 631 161 637 +f 637 638 631 +f 161 62 637 +f 271 268 653 +f 674 596 673 +f 607 594 612 +f 669 673 654 +f 59 637 57 +f 62 57 637 +f 678 679 670 +f 670 668 678 +f 677 678 668 +f 409 767 669 +f 176 183 277 +f 553 277 183 +f 554 553 183 +f 671 670 679 +f 680 671 679 +f 681 672 680 +f 672 671 680 +f 682 672 681 +f 675 672 682 +f 656 683 658 +f 656 658 657 +f 222 7 227 +f 683 324 658 +f 204 658 324 +f 216 7 222 +f 206 7 216 +f 3275 220 219 +f 230 227 7 +f 237 230 7 +f 684 685 664 +f 237 7 242 +f 268 261 653 +f 685 686 659 +f 685 659 664 +f 3275 219 3276 +f 247 7 261 +f 687 660 659 +f 687 659 686 +f 7 653 261 +f 687 688 661 +f 687 661 660 +f 688 689 662 +f 688 662 661 +f 689 690 663 +f 689 663 662 +f 690 691 663 +f 665 692 693 +f 582 694 614 +f 303 383 297 +f 293 297 383 +f 290 293 383 +f 383 164 290 +f 285 290 164 +f 276 285 164 +f 277 276 164 +f 692 665 668 +f 692 668 695 +f 552 1526 546 +f 2847 2851 696 +f 582 745 694 +f 695 668 670 +f 695 670 697 +f 697 670 671 +f 697 671 698 +f 698 671 672 +f 698 672 699 +f 699 672 675 +f 699 675 700 +f 676 663 701 +f 691 701 663 +f 700 675 702 +f 701 703 676 +f 3356 3353 2847 +f 703 704 677 +f 703 677 676 +f 704 705 678 +f 704 678 677 +f 705 706 679 +f 705 679 678 +f 706 707 680 +f 706 680 679 +f 2809 738 739 +f 707 709 681 +f 707 681 680 +f 373 710 708 +f 709 711 682 +f 709 682 681 +f 711 712 682 +f 2809 708 738 +f 688 656 689 +f 1249 656 80 +f 738 708 710 +f 684 847 685 +f 685 683 686 +f 688 687 656 +f 686 683 687 +f 683 656 687 +f 1249 690 656 +f 689 656 690 +f 691 690 1249 +f 693 692 695 +f 693 695 697 +f 693 697 698 +f 693 698 699 +f 693 699 700 +f 693 700 702 +f 701 691 1249 +f 704 703 1249 +f 705 704 1249 +f 703 701 1249 +f 705 1249 706 +f 706 1249 707 +f 3342 586 584 +f 718 1247 430 +f 717 1247 718 +f 3019 311 312 +f 717 719 1247 +f 719 720 1247 +f 724 721 1247 +f 722 723 1247 +f 275 1247 723 +f 457 275 723 +f 720 724 1247 +f 721 722 1247 +f 184 2981 312 +f 527 6 526 +f 3224 361 362 +f 458 275 457 +f 1467 1793 651 +f 3224 362 374 +f 368 378 3253 +f 725 710 716 +f 715 725 716 +f 710 725 738 +f 440 420 373 +f 710 373 420 +f 714 727 715 +f 726 727 713 +f 714 713 727 +f 727 725 715 +f 420 716 710 +f 728 2729 131 +f 79 131 2729 +f 651 650 3357 +f 131 138 764 +f 131 764 729 +f 716 420 1160 +f 730 729 762 +f 764 762 729 +f 761 760 731 +f 733 732 763 +f 763 734 733 +f 735 763 736 +f 738 725 739 +f 741 284 279 +f 737 763 740 +f 745 582 744 +f 581 744 582 +f 742 747 743 +f 748 746 747 +f 746 743 747 +f 750 785 749 +f 581 614 744 +f 726 750 749 +f 749 727 726 +f 752 751 765 +f 753 752 765 +f 725 727 739 +f 756 755 763 +f 757 756 763 +f 727 749 739 +f 758 757 763 +f 1818 340 335 +f 763 732 759 +f 759 758 763 +f 760 759 732 +f 732 731 760 +f 344 1868 345 +f 346 345 1873 +f 1868 1873 345 +f 742 740 747 +f 763 747 740 +f 737 736 763 +f 763 735 734 +f 731 730 762 +f 762 761 731 +f 755 754 763 +f 754 753 763 +f 765 763 753 +f 751 766 765 +f 767 409 768 +f 377 768 409 +f 377 654 768 +f 772 662 771 +f 775 776 662 +f 776 777 662 +f 777 778 662 +f 778 779 662 +f 661 662 664 +f 664 659 661 +f 779 664 662 +f 660 661 659 +f 781 784 780 +f 784 770 780 +f 769 386 321 +f 318 321 386 +f 769 391 386 +f 770 771 780 +f 782 780 771 +f 771 662 782 +f 782 662 783 +f 739 749 2809 +f 682 2079 675 +f 786 675 2079 +f 785 3151 2809 +f 2079 2080 786 +f 789 2156 790 +f 791 790 796 +f 531 18 29 +f 792 791 796 +f 797 795 796 +f 795 792 796 +f 805 1476 793 +f 80 79 798 +f 799 800 728 +f 728 131 799 +f 283 799 131 +f 131 729 804 +f 131 804 282 +f 1218 801 1222 +f 815 1222 801 +f 803 748 747 +f 803 747 802 +f 817 801 3185 +f 804 729 730 +f 804 730 806 +f 806 730 731 +f 806 731 807 +f 1218 3190 801 +f 807 731 732 +f 807 732 808 +f 808 732 733 +f 808 733 810 +f 810 733 734 +f 810 734 811 +f 3143 3133 813 +f 793 2800 805 +f 696 3356 2847 +f 1194 696 814 +f 1222 815 930 +f 3380 574 573 +f 812 811 734 +f 812 734 735 +f 889 921 817 +f 823 812 735 +f 823 735 736 +f 819 831 821 +f 824 823 736 +f 824 736 737 +f 827 824 737 +f 827 737 740 +f 828 827 740 +f 828 740 742 +f 829 828 742 +f 829 742 743 +f 830 829 743 +f 830 743 746 +f 1957 854 853 +f 803 830 746 +f 803 746 748 +f 833 849 751 +f 834 833 751 +f 834 751 752 +f 832 821 831 +f 836 834 752 +f 836 752 753 +f 1296 992 1304 +f 837 836 753 +f 837 753 754 +f 838 837 754 +f 838 754 755 +f 541 540 3363 +f 839 838 755 +f 839 755 756 +f 840 839 756 +f 840 756 757 +f 2692 537 136 +f 841 840 757 +f 841 757 758 +f 3363 3368 541 +f 842 841 758 +f 842 758 759 +f 3368 543 542 +f 843 842 759 +f 843 759 760 +f 855 858 825 +f 826 825 835 +f 831 819 835 +f 845 843 760 +f 845 760 761 +f 921 815 844 +f 763 765 850 +f 846 845 761 +f 846 761 762 +f 930 815 921 +f 801 844 815 +f 847 846 762 +f 847 762 764 +f 763 850 802 +f 844 817 921 +f 289 847 764 +f 844 801 817 +f 747 763 802 +f 849 766 751 +f 849 850 765 +f 849 765 766 +f 820 821 832 +f 826 835 819 +f 854 914 853 +f 856 770 857 +f 859 771 770 +f 859 770 856 +f 835 825 858 +f 860 772 771 +f 860 771 859 +f 861 773 772 +f 861 772 860 +f 862 774 773 +f 862 773 861 +f 863 775 774 +f 863 774 862 +f 1216 858 855 +f 406 559 400 +f 396 400 559 +f 410 559 406 +f 416 559 410 +f 421 559 416 +f 432 559 421 +f 438 559 432 +f 446 559 438 +f 450 559 446 +f 392 396 559 +f 864 776 775 +f 864 775 863 +f 543 3369 573 +f 865 777 776 +f 865 776 864 +f 866 778 777 +f 866 777 865 +f 618 619 554 +f 203 618 554 +f 867 779 778 +f 867 778 866 +f 867 684 779 +f 664 779 684 +f 868 869 781 +f 868 781 780 +f 781 869 870 +f 871 868 780 +f 871 780 782 +f 784 781 870 +f 784 870 872 +f 873 871 782 +f 873 782 783 +f 1250 814 818 +f 876 784 872 +f 876 857 784 +f 770 784 857 +f 665 693 783 +f 873 783 693 +f 880 702 786 +f 675 786 702 +f 883 884 875 +f 885 886 875 +f 886 887 877 +f 885 875 884 +f 877 875 886 +f 879 877 887 +f 881 879 887 +f 880 786 787 +f 880 787 888 +f 889 817 3185 +f 888 787 788 +f 888 788 892 +f 1974 1976 353 +f 894 958 893 +f 958 955 893 +f 3185 3249 889 +f 287 319 288 +f 355 354 1976 +f 897 905 898 +f 900 898 902 +f 902 903 900 +f 901 900 903 +f 818 1522 816 +f 889 895 927 +f 902 898 905 +f 896 905 897 +f 905 896 904 +f 321 284 769 +f 820 908 822 +f 899 909 895 +f 891 893 955 +f 955 952 891 +f 199 203 554 +f 903 937 911 +f 909 899 908 +f 456 554 452 +f 621 554 620 +f 892 788 918 +f 937 938 910 +f 559 450 460 +f 559 460 462 +f 559 462 465 +f 559 465 467 +f 915 853 914 +f 932 933 916 +f 559 558 392 +f 172 176 277 +f 554 183 189 +f 189 199 554 +f 922 923 920 +f 917 920 923 +f 923 851 917 +f 851 852 917 +f 901 903 911 +f 910 911 937 +f 912 910 938 +f 938 924 912 +f 925 926 912 +f 913 912 926 +f 926 928 913 +f 928 929 913 +f 929 931 913 +f 927 930 921 +f 909 1443 927 +f 472 471 480 +f 472 480 485 +f 472 485 487 +f 472 487 491 +f 511 514 472 +f 514 392 472 +f 565 472 392 +f 563 565 392 +f 558 563 392 +f 491 493 472 +f 916 913 931 +f 932 916 931 +f 1923 1922 1933 +f 1932 1933 1922 +f 924 925 912 +f 921 889 927 +f 832 908 820 +f 822 908 899 +f 927 895 909 +f 577 7 206 +f 941 942 972 +f 942 943 972 +f 943 944 972 +f 973 972 944 +f 927 1443 930 +f 906 907 946 +f 948 949 789 +f 3254 1001 2493 +f 954 948 789 +f 954 789 790 +f 907 890 946 +f 3374 1521 3373 +f 957 954 790 +f 957 790 791 +f 947 946 890 +f 960 957 791 +f 960 791 792 +f 890 891 947 +f 952 947 891 +f 964 960 792 +f 964 792 795 +f 894 971 958 +f 961 958 971 +f 797 966 964 +f 797 964 795 +f 962 1227 963 +f 1228 963 1227 +f 971 3415 961 +f 797 796 969 +f 797 969 966 +f 965 961 3415 +f 953 975 1115 +f 970 1115 975 +f 939 940 994 +f 978 979 973 +f 977 973 979 +f 915 917 852 +f 852 853 915 +f 989 930 1443 +f 1443 1526 989 +f 3245 3372 889 +f 981 980 1002 +f 982 963 1231 +f 1228 1231 963 +f 983 981 1003 +f 1002 1003 981 +f 982 1231 989 +f 987 983 1004 +f 1003 1004 983 +f 945 2493 951 +f 922 986 992 +f 920 986 922 +f 1292 992 986 +f 1005 1006 988 +f 163 172 277 +f 164 163 277 +f 982 989 1526 +f 507 511 472 +f 495 507 472 +f 493 495 472 +f 998 999 993 +f 994 993 999 +f 999 939 994 +f 940 941 972 +f 978 973 944 +f 972 994 940 +f 914 854 996 +f 1127 936 1140 +f 988 987 1005 +f 1004 1005 987 +f 993 990 997 +f 997 998 993 +f 1006 997 990 +f 990 988 1006 +f 3187 267 798 +f 1046 1047 1009 +f 799 803 800 +f 1795 1796 1001 +f 1010 1009 1047 +f 320 324 847 +f 799 283 804 +f 282 804 283 +f 1013 1016 1014 +f 1796 1789 1001 +f 802 800 803 +f 951 2493 950 +f 804 823 799 +f 1002 1015 1017 +f 980 1015 1002 +f 1015 1014 1017 +f 1016 1017 1014 +f 1013 1012 1019 +f 1016 1013 1019 +f 1789 950 1001 +f 1020 3464 1021 +f 808 810 807 +f 806 807 810 +f 810 811 806 +f 811 812 806 +f 812 823 806 +f 804 806 823 +f 824 799 823 +f 827 799 824 +f 828 799 827 +f 829 799 828 +f 830 799 829 +f 803 799 830 +f 1024 1022 1023 +f 1022 1021 1023 +f 945 1345 2493 +f 839 865 838 +f 840 865 839 +f 838 865 837 +f 841 865 840 +f 842 865 841 +f 843 865 842 +f 845 865 843 +f 846 865 845 +f 834 836 865 +f 833 834 865 +f 684 867 847 +f 289 316 847 +f 969 2559 274 +f 1029 1056 1028 +f 1030 1056 1029 +f 1031 1056 1030 +f 1032 1056 1031 +f 1028 1056 1027 +f 1027 1056 1026 +f 1033 1056 1032 +f 1024 1038 1034 +f 1024 1034 1022 +f 850 969 274 +f 1451 1437 1220 +f 906 946 1035 +f 1034 1035 946 +f 1038 1039 1035 +f 1035 1034 1038 +f 1037 1036 1040 +f 1039 1040 1036 +f 1036 1035 1039 +f 1040 1050 1037 +f 1050 1051 1041 +f 1041 1037 1050 +f 1007 1000 1044 +f 1007 1044 1043 +f 1007 1043 976 +f 1043 848 976 +f 1044 1000 1049 +f 1000 996 1049 +f 854 1049 996 +f 1012 1011 1018 +f 1018 1019 1012 +f 1048 1018 1011 +f 1011 1010 1048 +f 1047 1048 1010 +f 1009 1008 1046 +f 1045 1053 1008 +f 1042 1041 1051 +f 1051 1052 1042 +f 1045 1042 1052 +f 1053 1045 1052 +f 1046 1008 1053 +f 1055 1059 1054 +f 1059 1060 1054 +f 1060 1025 1054 +f 1054 1025 1056 +f 1026 1056 1025 +f 1033 3469 1056 +f 1062 1107 991 +f 985 1163 1062 +f 984 1166 985 +f 32 36 3474 +f 982 1526 963 +f 1801 1057 1064 +f 1448 1215 1438 +f 1084 1083 1068 +f 1068 1066 1084 +f 1072 1068 1083 +f 1083 1082 1074 +f 1074 1072 1083 +f 1127 71 280 +f 1071 1070 1173 +f 1076 1074 1082 +f 864 849 865 +f 849 833 865 +f 836 837 865 +f 683 847 324 +f 683 685 847 +f 1057 1075 1064 +f 1077 1064 1073 +f 849 969 850 +f 1080 1079 3332 +f 1081 1080 3332 +f 857 849 856 +f 859 849 860 +f 1079 1078 3332 +f 1078 1076 3332 +f 1082 3332 1076 +f 1075 1073 1064 +f 1081 3332 1086 +f 1089 3332 1090 +f 1086 3332 1089 +f 1115 1095 953 +f 1090 3332 1091 +f 129 130 1093 +f 1077 1069 1085 +f 1069 1161 1085 +f 1087 1085 1161 +f 1085 1064 1077 +f 48 1098 1095 +f 1088 1155 1186 +f 1094 28 1097 +f 1100 1097 40 +f 1088 1087 1156 +f 1161 1156 1087 +f 1102 1105 2041 +f 1101 1100 40 +f 1107 129 1093 +f 1093 967 1107 +f 1103 1101 40 +f 1800 1064 1085 +f 1104 1103 40 +f 1106 1104 40 +f 1173 1070 1067 +f 1109 1108 40 +f 1108 1106 40 +f 1105 1099 2040 +f 1110 1109 1113 +f 40 1113 1109 +f 1105 1118 1099 +f 1057 1098 48 +f 1114 1112 1113 +f 1112 1111 1113 +f 1111 1110 1113 +f 1116 1117 882 +f 1117 1119 883 +f 1117 883 882 +f 1119 1120 884 +f 1119 884 883 +f 832 831 1425 +f 1121 885 884 +f 1121 884 1120 +f 1115 1093 130 +f 1123 886 885 +f 1123 885 1121 +f 832 1425 908 +f 1107 967 991 +f 1093 970 967 +f 1115 970 1093 +f 959 956 1095 +f 1085 1087 1809 +f 1124 887 886 +f 1124 886 1123 +f 1125 881 887 +f 1125 887 1124 +f 1800 1085 1809 +f 874 1128 1129 +f 1073 1075 1127 +f 1128 874 875 +f 1128 875 1130 +f 1130 875 877 +f 1130 877 1131 +f 1102 1067 1122 +f 1105 1102 1122 +f 1122 1126 1105 +f 1118 1105 1126 +f 1096 1099 1118 +f 1131 877 879 +f 1131 879 1132 +f 1007 976 1280 +f 1132 879 881 +f 1132 881 1125 +f 1127 1075 71 +f 976 848 1280 +f 1133 890 1134 +f 1135 891 890 +f 1135 890 1133 +f 858 1221 1437 +f 3214 3215 1043 +f 1136 893 891 +f 1136 891 1135 +f 1139 894 893 +f 1139 893 1136 +f 1138 1866 1137 +f 894 1139 1142 +f 848 1043 1138 +f 1143 1144 902 +f 1069 1140 1161 +f 1144 1146 903 +f 1144 903 902 +f 1146 1147 903 +f 1140 1073 1127 +f 1077 1140 1069 +f 1148 1149 896 +f 1837 896 1149 +f 1077 1073 1140 +f 1148 896 897 +f 1148 897 1150 +f 1137 1275 1138 +f 1137 1141 1275 +f 1150 897 898 +f 1150 898 1152 +f 936 3019 1158 +f 1152 898 900 +f 1152 900 1154 +f 1154 900 901 +f 1154 901 1157 +f 1095 1098 959 +f 956 953 1095 +f 974 959 1098 +f 1807 1795 1098 +f 1155 1156 1153 +f 1155 1153 1151 +f 1140 936 1158 +f 1157 901 1159 +f 2041 1173 1102 +f 1140 1158 1161 +f 1164 1165 904 +f 1164 904 1840 +f 1166 441 448 +f 1165 1168 905 +f 1165 905 904 +f 1158 1153 1161 +f 1161 1153 1156 +f 405 3061 401 +f 902 905 1143 +f 1168 1143 905 +f 1141 1145 1170 +f 1169 441 1166 +f 1171 907 906 +f 1171 906 1162 +f 1171 1134 907 +f 890 907 1134 +f 1238 1155 1151 +f 1172 937 1147 +f 1174 1175 924 +f 1174 924 938 +f 1155 1088 1156 +f 1067 1102 1173 +f 1175 1176 925 +f 1175 925 924 +f 440 1169 1177 +f 1176 1178 926 +f 1176 926 925 +f 1178 1180 928 +f 1178 928 926 +f 1061 1199 1169 +f 856 849 859 +f 864 863 849 +f 1180 1181 929 +f 1180 929 928 +f 929 1181 1183 +f 860 849 861 +f 911 910 1184 +f 911 1184 1185 +f 861 849 862 +f 1184 910 912 +f 1184 912 1187 +f 862 849 863 +f 1194 1234 1160 +f 1160 1234 1223 +f 1194 1160 1177 +f 1187 912 913 +f 1187 913 1188 +f 1383 821 820 +f 1188 913 916 +f 1188 916 1189 +f 433 1163 1166 +f 846 847 865 +f 1190 1189 916 +f 1190 916 919 +f 866 865 847 +f 867 866 847 +f 433 1166 448 +f 1191 1190 919 +f 1169 1199 1177 +f 984 995 1166 +f 1163 985 1166 +f 1185 1159 911 +f 901 911 1159 +f 1183 1192 931 +f 1183 931 929 +f 888 869 880 +f 892 869 888 +f 918 869 892 +f 918 2440 869 +f 702 880 869 +f 702 869 868 +f 702 868 871 +f 702 871 873 +f 702 873 693 +f 1192 1193 932 +f 1192 932 931 +f 995 1061 1169 +f 1169 1166 995 +f 1107 1062 1163 +f 1193 1195 933 +f 1193 933 932 +f 869 2456 849 +f 870 869 849 +f 1425 1446 908 +f 1195 1197 934 +f 1195 934 933 +f 1194 1196 696 +f 872 870 849 +f 1196 1199 696 +f 1198 935 934 +f 1198 934 1197 +f 872 849 876 +f 857 876 849 +f 935 1198 1200 +f 1172 1202 937 +f 903 1147 937 +f 1194 1177 1196 +f 1202 1203 938 +f 1202 938 937 +f 1201 1230 1179 +f 1441 899 895 +f 1203 1174 938 +f 954 2495 948 +f 957 2495 954 +f 960 2492 957 +f 964 2492 960 +f 964 966 2492 +f 849 2492 966 +f 849 966 969 +f 1061 3356 1199 +f 1205 939 1206 +f 1186 1155 1204 +f 1207 940 939 +f 1207 939 1205 +f 1209 941 940 +f 1209 940 1207 +f 1211 942 941 +f 1211 941 1209 +f 1213 943 942 +f 1213 942 1211 +f 1214 944 943 +f 1214 943 1213 +f 1212 714 715 +f 1204 1238 1210 +f 1214 1217 944 +f 978 944 1217 +f 855 1438 1216 +f 714 1208 713 +f 1212 1219 714 +f 1215 1451 1220 +f 1220 1221 1216 +f 1220 1216 1215 +f 1212 1223 1251 +f 1230 1267 1417 +f 1220 1437 1221 +f 1208 714 1219 +f 906 1035 1327 +f 858 1216 1221 +f 1219 1212 1245 +f 1251 1245 1212 +f 1162 906 1327 +f 716 1160 1223 +f 1222 930 1224 +f 894 1142 971 +f 1225 971 1142 +f 1222 1224 3432 +f 155 3432 1224 +f 1235 155 1224 +f 1201 1210 1237 +f 715 716 1223 +f 971 1225 1226 +f 989 1235 930 +f 1212 715 1223 +f 1233 1232 946 +f 1233 946 947 +f 87 78 1227 +f 1231 156 1235 +f 3390 87 1227 +f 1417 1413 1230 +f 1196 1177 1199 +f 1250 1223 1234 +f 1250 1251 1223 +f 1235 989 1231 +f 1236 1233 947 +f 1236 947 952 +f 1224 930 1235 +f 814 1250 1234 +f 1239 1236 952 +f 1239 952 955 +f 814 1234 1194 +f 1240 1239 955 +f 1240 955 958 +f 1272 1230 1237 +f 1216 1438 1215 +f 1241 1240 958 +f 1241 958 961 +f 1448 1451 1215 +f 1243 1241 961 +f 1243 961 965 +f 816 1244 1245 +f 1246 1243 965 +f 1246 965 968 +f 1246 968 1248 +f 1238 1204 1155 +f 1230 1201 1237 +f 1237 1210 1238 +f 1889 1208 1242 +f 1244 1219 1245 +f 1252 1219 1244 +f 1242 1208 1252 +f 1253 978 1217 +f 816 1251 818 +f 1253 1254 979 +f 1253 979 978 +f 818 1251 1250 +f 325 338 1247 +f 339 348 2 +f 338 339 2 +f 1254 1255 977 +f 1254 977 979 +f 1873 2202 346 +f 1249 1 55 +f 1256 1257 972 +f 1249 1247 2 +f 1249 2 1 +f 1258 1256 972 +f 1258 972 973 +f 1255 1258 973 +f 1255 973 977 +f 1242 1252 878 +f 1259 997 1260 +f 1252 1244 878 +f 1261 998 997 +f 1261 997 1259 +f 1244 816 878 +f 1262 999 998 +f 1262 998 1261 +f 816 1245 1251 +f 1262 1206 999 +f 939 999 1206 +f 1263 1264 980 +f 1265 1263 980 +f 1265 980 981 +f 1266 1265 981 +f 1266 981 983 +f 1268 1266 983 +f 1268 983 987 +f 128 414 395 +f 1269 1268 987 +f 1269 987 988 +f 1238 1270 1237 +f 1271 1269 988 +f 1271 988 990 +f 1270 1527 1272 +f 1273 1271 990 +f 1273 990 993 +f 1270 1272 1237 +f 1173 1167 1071 +f 1071 1167 1145 +f 1274 1273 993 +f 1274 993 994 +f 1257 1274 994 +f 1257 994 972 +f 1151 3019 1270 +f 1170 1661 1275 +f 1277 1003 1002 +f 1277 1002 1276 +f 1270 1238 1151 +f 835 858 1437 +f 1278 1004 1003 +f 1278 1003 1277 +f 1167 1170 1145 +f 1275 1141 1170 +f 1279 1005 1004 +f 1279 1004 1278 +f 1230 1272 1267 +f 1281 1006 1005 +f 1281 1005 1279 +f 1281 1260 1006 +f 997 1006 1260 +f 1138 1275 1280 +f 1282 1276 1017 +f 1002 1017 1276 +f 848 1138 1280 +f 1283 1284 1008 +f 1045 1008 1284 +f 1898 3264 1280 +f 1064 1800 1801 +f 1283 1008 1009 +f 1283 1009 1285 +f 1805 1087 1088 +f 1286 1285 1009 +f 1286 1009 1010 +f 825 1438 855 +f 1287 1286 1010 +f 1287 1010 1011 +f 1288 1287 1011 +f 1288 1011 1012 +f 1204 1210 1830 +f 1289 1288 1012 +f 1289 1012 1013 +f 1290 1289 1013 +f 1290 1013 1014 +f 1204 1833 1186 +f 1293 1290 1014 +f 1293 1014 1015 +f 986 1990 1292 +f 445 3140 447 +f 1833 1204 1830 +f 1264 1293 1015 +f 1264 1015 980 +f 1297 1299 1295 +f 1297 1295 1294 +f 1298 1300 1018 +f 1421 1420 826 +f 1300 1301 1019 +f 1300 1019 1018 +f 1830 1210 1201 +f 1301 1302 1016 +f 1301 1016 1019 +f 1294 1099 1297 +f 1017 1016 1302 +f 1017 1302 1282 +f 1299 1297 1099 +f 1299 1099 1096 +f 908 1446 1445 +f 69 1303 1023 +f 1296 1304 1292 +f 1296 1292 1291 +f 1304 992 1292 +f 909 908 1445 +f 1303 1305 1024 +f 1303 1024 1023 +f 1305 1306 1024 +f 1307 1229 1020 +f 1307 1020 1021 +f 1307 1021 1308 +f 1098 1057 1807 +f 1308 1021 1022 +f 1308 1022 1309 +f 1309 1022 1310 +f 1316 527 1315 +f 1038 1024 1312 +f 1306 1312 1024 +f 1313 1025 1314 +f 1442 1384 822 +f 1317 1026 1025 +f 1317 1025 1313 +f 1087 1805 1809 +f 1318 1027 1026 +f 1318 1026 1317 +f 1322 6 1319 +f 6 527 1319 +f 1320 1028 1027 +f 1320 1027 1318 +f 1321 1029 1028 +f 1321 1028 1320 +f 1323 1030 1029 +f 1323 1029 1321 +f 1324 1031 1030 +f 1324 1030 1323 +f 1356 6 1322 +f 1325 1032 1031 +f 1325 1031 1324 +f 1326 1033 1032 +f 1326 1032 1325 +f 1033 1326 61 +f 1088 1186 1847 +f 1805 1088 1847 +f 1328 1310 1034 +f 1022 1034 1310 +f 1034 946 1328 +f 1232 1328 946 +f 1153 3019 1151 +f 1327 1035 1036 +f 1327 1036 1329 +f 1329 1036 1037 +f 1329 1037 1330 +f 1331 1332 1783 +f 1432 1426 835 +f 1330 1037 1333 +f 1312 1334 1038 +f 1334 1335 1039 +f 1334 1039 1038 +f 6 1336 1337 +f 1335 1338 1040 +f 1335 1040 1039 +f 1528 1783 1332 +f 1338 1339 1040 +f 1340 1333 1041 +f 1037 1041 1333 +f 1340 1041 1042 +f 1340 1042 1341 +f 1337 1342 6 +f 1343 6 1342 +f 1341 1042 1045 +f 1341 1045 1344 +f 1345 1352 2493 +f 1352 1331 2493 +f 1344 1045 1284 +f 1345 945 1858 +f 1339 1346 1050 +f 1339 1050 1040 +f 1346 1347 1051 +f 1346 1051 1050 +f 819 1383 1382 +f 1347 1348 1052 +f 1347 1052 1051 +f 1353 275 1349 +f 1783 2493 1331 +f 1348 1350 1053 +f 1348 1053 1052 +f 1350 1351 1046 +f 1350 1046 1053 +f 6 1349 275 +f 1354 1047 1046 +f 1354 1046 1351 +f 1355 1048 1047 +f 1355 1047 1354 +f 3357 1467 651 +f 1356 1336 6 +f 945 1792 1858 +f 1355 1298 1048 +f 1018 1048 1298 +f 2636 505 504 +f 1357 1358 1055 +f 1357 1055 1054 +f 1055 1358 1359 +f 819 821 1383 +f 1360 1357 1054 +f 1360 1054 1056 +f 1863 1331 1352 +f 1059 1055 1359 +f 1059 1359 1361 +f 1362 1360 1056 +f 1362 1056 1058 +f 1364 1059 1361 +f 1230 1416 1182 +f 1365 1060 1059 +f 1365 1059 1364 +f 1365 1314 1060 +f 1025 1060 1314 +f 1362 1058 90 +f 1063 1369 98 +f 1065 1370 1063 +f 1369 1063 1370 +f 1065 1371 1370 +f 1366 1363 1380 +f 1371 1065 1066 +f 1371 1066 1372 +f 1372 1066 1068 +f 1372 1068 1373 +f 1363 1182 1416 +f 1373 1068 1072 +f 1373 1072 1374 +f 1374 1072 1074 +f 1374 1074 1376 +f 1376 1074 1076 +f 1376 1076 1379 +f 1379 1076 1078 +f 1379 1078 1381 +f 1381 1078 1079 +f 1381 1079 1385 +f 726 1377 750 +f 1385 1079 1080 +f 1385 1080 1386 +f 1386 1080 1081 +f 1386 1081 1387 +f 1387 1081 1388 +f 820 1384 1383 +f 1082 1389 34 +f 1391 1389 1082 +f 53 1390 1084 +f 53 1084 50 +f 1368 726 713 +f 1378 1377 1367 +f 1378 1367 1380 +f 1416 1380 1363 +f 1366 1380 1367 +f 1368 1367 1377 +f 726 1368 1377 +f 1082 1083 1391 +f 1390 1391 1083 +f 1390 1083 1084 +f 1366 1367 1869 +f 1392 1388 1086 +f 1081 1086 1388 +f 1392 1086 1089 +f 1392 1089 1393 +f 1393 1089 1090 +f 1393 1090 1394 +f 1394 1090 1091 +f 1394 1091 1395 +f 1363 1366 1871 +f 1396 1395 1092 +f 1091 1092 1395 +f 1869 1367 1368 +f 1396 1092 1094 +f 1396 1094 1397 +f 1397 1094 1097 +f 1397 1097 1398 +f 1399 1400 785 +f 1406 1527 1400 +f 1398 1097 1100 +f 1398 1100 1401 +f 1378 1400 1399 +f 1378 1399 1377 +f 1401 1100 1101 +f 1401 1101 1402 +f 1403 1527 1406 +f 1402 1101 1103 +f 1402 1103 1404 +f 1405 1404 1103 +f 1405 1103 1104 +f 1406 1380 1403 +f 820 822 1384 +f 1407 1405 1104 +f 1407 1104 1106 +f 1408 1407 1106 +f 1408 1106 1108 +f 1399 785 750 +f 1409 1408 1108 +f 1409 1108 1109 +f 825 826 1420 +f 1377 1399 750 +f 1410 1409 1109 +f 1410 1109 1110 +f 1438 825 1420 +f 1378 1380 1400 +f 1406 1400 1380 +f 1411 1410 1110 +f 1411 1110 1111 +f 1412 1411 1111 +f 1412 1111 1112 +f 785 1400 1527 +f 1413 1527 1403 +f 1413 1417 1527 +f 1114 1414 1412 +f 1114 1412 1112 +f 1413 1403 1380 +f 1421 826 819 +f 40 1415 1113 +f 1114 1113 1415 +f 1114 1415 1414 +f 1416 1413 1380 +f 1267 1272 1527 +f 2636 506 505 +f 1417 1267 1527 +f 831 1426 1425 +f 1230 1413 1416 +f 502 501 2652 +f 1116 1139 1117 +f 1117 1136 1119 +f 1433 1432 835 +f 1182 1179 1230 +f 1120 1134 1121 +f 1121 1134 1168 +f 1123 1165 1124 +f 1132 1125 2888 +f 500 2652 501 +f 2889 2888 1125 +f 2906 2889 1125 +f 2838 2906 1125 +f 1134 1120 1133 +f 3435 55 3436 +f 1133 1119 1135 +f 1135 1119 1136 +f 1421 1433 1420 +f 1382 1383 1426 +f 1136 1117 1139 +f 1143 1171 1144 +f 1382 1421 819 +f 1144 1162 1146 +f 1147 1146 1162 +f 785 2809 749 +f 1527 3151 785 +f 1150 3035 1148 +f 1152 3035 1150 +f 1154 3035 1152 +f 1157 3035 1154 +f 1185 3035 1159 +f 1159 3035 1157 +f 1785 1788 1424 +f 1119 1133 1120 +f 1171 1143 1134 +f 1121 1168 1123 +f 1162 1144 1171 +f 1125 1124 1165 +f 1125 1165 1164 +f 1165 1123 1168 +f 1168 1134 1143 +f 1423 1422 1430 +f 1436 1434 1428 +f 1253 1217 1172 +f 7 577 1 +f 1211 1209 1175 +f 1432 1382 1426 +f 1209 1207 1175 +f 1431 1419 1430 +f 1435 1419 1431 +f 1176 1175 1207 +f 1207 1205 1176 +f 73 266 80 +f 1421 1382 1432 +f 1433 1421 1432 +f 1178 1176 1205 +f 1428 1439 1436 +f 1427 1428 1434 +f 1434 1435 1427 +f 1431 1427 1435 +f 1423 1430 1419 +f 1190 3035 1189 +f 1191 3035 1190 +f 1188 1189 3035 +f 1187 1188 3035 +f 1184 1187 3035 +f 1206 1262 1178 +f 1193 1192 7 +f 1262 1261 1180 +f 835 1426 831 +f 1195 1193 7 +f 1197 1195 7 +f 1198 1197 7 +f 1366 1869 1871 +f 1255 1254 1162 +f 1254 1253 1162 +f 1261 1259 1181 +f 1183 1181 7 +f 1192 1183 7 +f 1277 7 1278 +f 1450 1438 1437 +f 1438 1420 1437 +f 1433 1437 1420 +f 1172 1147 1253 +f 1147 1162 1253 +f 1181 1180 1261 +f 1180 1178 1262 +f 1174 1203 1211 +f 1205 1206 1178 +f 1433 835 1437 +f 1439 579 287 +f 279 287 579 +f 1175 1174 1211 +f 1213 1211 1203 +f 287 1436 1439 +f 1327 1329 1162 +f 1256 1258 1330 +f 1217 1214 1172 +f 1418 1440 1375 +f 489 151 149 +f 1441 1445 1442 +f 1445 1446 1442 +f 1308 1309 1236 +f 1307 1308 1236 +f 1229 1307 1236 +f 1229 1236 1239 +f 1229 1239 1240 +f 1229 1240 1241 +f 1229 1241 1243 +f 1229 1243 1246 +f 1229 1246 1248 +f 1203 1202 1213 +f 1202 1172 1214 +f 899 1441 1442 +f 1214 1213 1202 +f 1258 1255 1330 +f 1442 822 899 +f 1162 1330 1255 +f 1329 1330 1162 +f 1965 1480 1418 +f 1444 1443 1440 +f 1441 1440 1443 +f 1259 1260 1181 +f 1418 1444 1440 +f 1446 1425 1384 +f 1383 1384 1425 +f 1443 1445 1441 +f 1425 1426 1383 +f 1442 1446 1384 +f 1265 1330 1263 +f 1266 1330 1265 +f 1268 1330 1266 +f 1269 1271 1330 +f 1271 1273 1330 +f 1273 1274 1330 +f 1257 1330 1274 +f 1276 7 1277 +f 909 1445 1443 +f 1279 7 1281 +f 1278 7 1279 +f 1443 1444 1526 +f 1260 1281 1181 +f 7 1181 1281 +f 1479 1482 1418 +f 1282 7 1276 +f 1418 1375 1965 +f 1950 1965 1375 +f 1286 1287 1285 +f 1283 1285 1287 +f 1284 1283 1287 +f 1288 1341 1287 +f 1289 1341 1288 +f 1290 1340 1289 +f 1293 1333 1290 +f 1263 1330 1264 +f 1264 1330 1293 +f 1269 1330 1268 +f 1298 7 1300 +f 1300 7 1301 +f 1302 1301 7 +f 151 489 470 +f 1440 1521 1570 +f 7 1282 1302 +f 1319 527 1316 +f 1233 1236 1309 +f 1309 1310 1233 +f 1448 1438 1447 +f 1313 1334 1317 +f 1314 1365 1334 +f 1306 1317 1312 +f 1323 1321 1305 +f 1303 1324 1305 +f 1450 1447 1438 +f 1450 1451 1448 +f 1450 1448 1447 +f 1317 1306 1318 +f 68 64 72 +f 1306 1305 1318 +f 60 61 69 +f 1451 1450 1437 +f 1320 1318 1305 +f 1321 1320 1305 +f 1449 1452 1514 +f 1323 1305 1324 +f 1324 1303 1325 +f 1325 1303 1326 +f 1461 3342 1449 +f 1333 1293 1330 +f 1340 1290 1333 +f 1232 1233 1310 +f 1328 1232 1310 +f 1312 1317 1334 +f 1334 1395 1335 +f 1434 288 305 +f 1341 1289 1340 +f 1257 1256 1330 +f 1344 1287 1341 +f 1284 1287 1344 +f 1338 1414 1339 +f 1339 1414 1346 +f 1415 1348 1414 +f 1346 1414 1347 +f 1347 1414 1348 +f 1348 1415 1350 +f 1415 7 1351 +f 1453 2055 1455 +f 1453 1457 2055 +f 1350 1415 1351 +f 1354 1351 7 +f 1298 1355 7 +f 1354 7 1355 +f 1370 1358 1369 +f 1370 1371 1358 +f 98 1369 1358 +f 98 1358 1357 +f 1360 93 1357 +f 1362 92 1360 +f 90 92 1362 +f 1393 1334 1392 +f 1358 1387 1334 +f 1359 1358 1334 +f 1365 1364 1334 +f 1361 1359 1334 +f 1364 1361 1334 +f 1343 1349 6 +f 1372 1358 1371 +f 1373 1358 1372 +f 1374 1358 1373 +f 1376 1358 1374 +f 1379 1358 1376 +f 1381 1358 1379 +f 1385 1358 1381 +f 1386 1358 1385 +f 1387 1358 1386 +f 1388 1334 1387 +f 34 1389 1391 +f 53 34 1390 +f 34 53 24 +f 1390 34 1391 +f 1452 1449 3342 +f 1457 1452 3342 +f 1392 1334 1388 +f 1314 1334 1313 +f 1394 1334 1393 +f 1395 1334 1394 +f 1395 1396 1335 +f 1338 1335 1396 +f 1338 1396 1397 +f 1338 1397 1398 +f 1338 1398 1401 +f 1338 1401 1402 +f 1338 1402 1404 +f 1338 1404 1405 +f 1338 1405 1407 +f 1338 1407 1408 +f 1338 1408 1409 +f 1338 1409 1410 +f 1412 1338 1411 +f 1410 1411 1338 +f 1338 1412 1414 +f 1415 653 7 +f 2626 962 552 +f 1517 1457 1453 +f 1517 1453 1455 +f 1521 518 508 +f 380 147 395 +f 1518 1519 1454 +f 1456 1518 1454 +f 1455 1454 1519 +f 1519 1520 1455 +f 1798 1518 1456 +f 430 127 145 +f 127 430 415 +f 1458 1375 1459 +f 1440 1459 1375 +f 1537 1461 1449 +f 1460 1554 1483 +f 1460 1459 1440 +f 1449 1514 1537 +f 1462 1461 1539 +f 962 963 1526 +f 1461 1462 3342 +f 1468 1946 1467 +f 1467 3357 1468 +f 1468 1472 1946 +f 1465 1950 1466 +f 1464 1950 1465 +f 1463 1996 1464 +f 3357 1515 1472 +f 713 1872 1368 +f 1375 1458 1466 +f 1471 1944 1472 +f 1944 1946 1472 +f 1468 3357 1472 +f 1458 1459 1480 +f 1479 1480 1459 +f 1482 1459 1460 +f 1473 1141 1478 +f 1460 1483 1482 +f 1948 1497 1481 +f 1480 1492 1466 +f 1466 1458 1480 +f 3342 2027 1494 +f 1459 1482 1479 +f 1444 1418 1482 +f 1141 1474 2049 +f 1477 1478 1141 +f 1473 1474 1141 +f 1481 1498 1512 +f 1479 1418 1480 +f 1483 1444 1482 +f 1483 1773 1444 +f 2711 2844 1484 +f 180 3459 3460 +f 1464 1465 1491 +f 1480 1965 1492 +f 1491 1490 1464 +f 1496 1494 1493 +f 1464 1490 1463 +f 1965 2002 1491 +f 1466 1492 1491 +f 1466 1491 1465 +f 1965 1491 1492 +f 356 1971 328 +f 3457 182 181 +f 1498 1497 1496 +f 1471 1472 2059 +f 1831 329 328 +f 1493 1498 1496 +f 1500 1493 2711 +f 340 1874 341 +f 1512 1500 1484 +f 2711 1484 1500 +f 1499 1552 1489 +f 1874 342 341 +f 1499 3342 1462 +f 1489 1706 1499 +f 149 490 489 +f 1504 1508 1503 +f 1974 353 352 +f 354 353 1976 +f 1469 1470 1541 +f 1469 1541 1540 +f 1497 1498 1481 +f 457 154 458 +f 767 3311 3313 +f 1504 1494 1507 +f 1508 1504 1507 +f 1552 1542 1489 +f 1509 1510 1511 +f 1506 1502 1505 +f 1516 1511 1510 +f 1505 1503 1508 +f 1509 1501 1506 +f 2930 2905 366 +f 1484 1481 1512 +f 1500 1512 1493 +f 1498 1493 1512 +f 580 585 1 +f 1496 1507 1494 +f 1503 1505 1502 +f 2006 399 398 +f 350 399 2006 +f 1501 1509 1511 +f 1502 1506 1501 +f 1470 1994 1489 +f 1452 1515 1514 +f 1510 1513 1516 +f 1515 3357 1514 +f 1531 1472 1515 +f 1520 1517 1455 +f 2064 2059 1520 +f 1519 2064 1520 +f 1518 2064 1519 +f 3303 3302 674 +f 1440 1441 1521 +f 1883 1522 1485 +f 1497 1471 2059 +f 1242 878 1523 +f 1485 818 3198 +f 1141 1137 1477 +f 1485 1522 818 +f 1524 816 1522 +f 1523 878 1524 +f 816 1524 878 +f 1888 1524 1891 +f 1888 1523 1524 +f 1495 1525 1865 +f 1525 1477 1137 +f 607 3273 594 +f 1629 1477 1525 +f 3143 2801 2137 +f 1495 1661 1525 +f 1529 1783 1528 +f 1485 1783 1529 +f 1485 3198 1783 +f 1316 1315 258 +f 1528 1893 1529 +f 1893 1894 1529 +f 1894 1882 1529 +f 212 211 527 +f 1452 1457 1515 +f 1531 1515 1457 +f 1495 1532 1742 +f 1531 1457 1517 +f 1495 1865 1532 +f 1517 1520 1472 +f 132 147 380 +f 1530 1533 76 +f 1322 255 1356 +f 254 1356 255 +f 612 3232 517 +f 508 3218 1521 +f 1865 76 1533 +f 1534 1530 76 +f 355 1972 356 +f 352 1975 1974 +f 1535 1534 76 +f 1526 3270 546 +f 1461 1537 1538 +f 1975 352 351 +f 192 534 1536 +f 1947 1978 350 +f 355 1976 1972 +f 1514 3357 1537 +f 1461 1538 1539 +f 1539 1538 3357 +f 1538 1537 3357 +f 674 3304 3303 +f 1534 1535 1770 +f 1541 1993 1540 +f 366 365 2930 +f 1542 1541 1470 +f 1552 3357 1542 +f 1747 1742 1532 +f 1747 1532 1533 +f 1738 1747 1530 +f 535 209 208 +f 768 654 3311 +f 3289 3311 654 +f 3311 767 768 +f 2905 2933 376 +f 1470 1489 1542 +f 1547 1557 1551 +f 1551 1550 1547 +f 1557 1558 1551 +f 376 366 2905 +f 2112 2128 1506 +f 1543 1544 1549 +f 1548 1543 1549 +f 1462 1539 1552 +f 1544 1545 1549 +f 1552 1499 1462 +f 1550 1549 1545 +f 2070 1494 1504 +f 1460 1440 1554 +f 1553 1551 1558 +f 1558 1559 1553 +f 1556 1553 1559 +f 1560 1556 1559 +f 1561 1556 1560 +f 1546 1547 1550 +f 1545 1546 1550 +f 1882 1485 1529 +f 1440 1570 1555 +f 1555 1554 1440 +f 1565 1636 1564 +f 1636 1608 1564 +f 1566 1636 1565 +f 1567 1636 1566 +f 1568 1637 1567 +f 1569 1637 1568 +f 1584 1581 1573 +f 1572 1600 1571 +f 1577 1578 1586 +f 1587 1586 1578 +f 1578 1579 1587 +f 1579 1580 1587 +f 1588 1587 1580 +f 1580 1590 1588 +f 1590 1591 1588 +f 1573 1574 1584 +f 1585 1584 1575 +f 1574 1575 1584 +f 1575 1576 1585 +f 1589 1588 1591 +f 1576 1577 1586 +f 1586 1585 1576 +f 1591 1594 1589 +f 1595 1589 1594 +f 1596 1592 1595 +f 1597 1639 1596 +f 1598 1639 1597 +f 1640 1639 1598 +f 1592 1596 1639 +f 1592 1589 1595 +f 1556 1561 1599 +f 1561 1571 1599 +f 1600 1599 1571 +f 1601 1600 1572 +f 1572 1615 1601 +f 1772 1554 1555 +f 1603 1612 1604 +f 1612 1611 1604 +f 1607 1606 1614 +f 1602 1601 1615 +f 1502 2189 2073 +f 1609 1602 1615 +f 1615 1614 1609 +f 1555 1570 1777 +f 1614 1606 1609 +f 1609 1606 1610 +f 1562 1563 1608 +f 1573 1581 1569 +f 1563 1564 1608 +f 1608 1607 1562 +f 1614 1562 1607 +f 3173 2824 2823 +f 1611 1610 1605 +f 1605 1604 1611 +f 1583 1782 1582 +f 2021 429 428 +f 1533 1532 1865 +f 1612 1603 1613 +f 1605 1610 1606 +f 1635 1630 1603 +f 428 427 2021 +f 1638 1782 1583 +f 1618 1617 1635 +f 1619 1620 1473 +f 1723 1778 1719 +f 1621 1635 1627 +f 1777 1570 1582 +f 1623 1627 1624 +f 2026 425 424 +f 197 339 338 +f 1627 1628 1626 +f 1626 1624 1627 +f 510 496 135 +f 1629 1625 1477 +f 1613 1603 1630 +f 1473 1478 1625 +f 427 426 2028 +f 427 2028 2022 +f 1625 1478 1477 +f 2026 2028 425 +f 426 425 2028 +f 1631 1630 1635 +f 135 513 510 +f 1633 1632 1635 +f 1632 1631 1635 +f 1474 1473 1620 +f 1623 1622 1627 +f 1622 1621 1627 +f 1618 1635 1621 +f 1617 1616 1635 +f 1635 1616 1634 +f 1634 1633 1635 +f 2895 369 3123 +f 2054 390 1620 +f 1619 1170 1620 +f 1636 1567 1637 +f 1637 1569 1581 +f 1625 1619 1473 +f 2054 1620 1170 +f 1170 1619 1625 +f 1629 1170 1625 +f 1638 1583 1521 +f 458 154 152 +f 1598 1648 1640 +f 1642 1640 1648 +f 1582 1570 1521 +f 1583 1582 1521 +f 1638 1521 1641 +f 1643 1642 1648 +f 1648 1650 1643 +f 152 470 458 +f 1716 1715 1650 +f 1717 1716 1650 +f 1644 1643 1715 +f 1643 1650 1715 +f 1645 1644 1715 +f 744 1778 745 +f 1661 1629 1525 +f 1715 1746 1649 +f 1170 1629 1661 +f 1654 1649 1746 +f 436 3123 369 +f 1746 1744 1654 +f 3018 3019 936 +f 469 346 2202 +f 478 477 2215 +f 1857 1660 1659 +f 1495 1662 1661 +f 2215 479 478 +f 1662 1275 1661 +f 2223 2216 476 +f 1658 1657 1670 +f 496 490 149 +f 1664 1663 1670 +f 1663 1658 1670 +f 1665 1664 1670 +f 1666 1665 1670 +f 1667 1666 1671 +f 1670 1671 1666 +f 1659 1996 1674 +f 1652 1653 1671 +f 1653 1669 1671 +f 1669 1668 1671 +f 1668 1667 1671 +f 1527 3154 3156 +f 1659 1674 1864 +f 3156 3151 1527 +f 1675 1673 1593 +f 1673 1672 1593 +f 1676 1675 1593 +f 1677 1676 1593 +f 1678 1677 1682 +f 1593 1682 1677 +f 1679 1678 1682 +f 1683 1681 1682 +f 1681 1680 1682 +f 1680 1679 1682 +f 1820 1819 1689 +f 3278 260 1311 +f 1685 1684 1691 +f 1690 1691 1684 +f 1691 1692 1685 +f 1686 1685 1692 +f 1693 1686 1692 +f 1684 1820 1690 +f 1689 1690 1820 +f 1375 1466 1950 +f 2055 3342 1494 +f 1674 1996 1694 +f 1694 1996 1463 +f 1702 1714 1703 +f 1714 3405 1703 +f 436 435 3128 +f 1755 1750 1697 +f 1701 1755 1697 +f 1704 1703 3405 +f 2116 1508 1507 +f 1693 1707 1686 +f 1712 1713 1699 +f 1700 1699 1713 +f 1714 1702 1713 +f 1702 1700 1713 +f 1699 1695 1712 +f 1695 1696 1711 +f 1711 1712 1695 +f 1710 1711 1696 +f 1696 1707 1710 +f 1693 1710 1707 +f 1649 1647 1715 +f 132 380 513 +f 1647 1646 1715 +f 1706 1752 1709 +f 1672 1718 1593 +f 1718 1717 1593 +f 1650 1593 1717 +f 1646 1645 1715 +f 1823 1687 1817 +f 1722 1823 1816 +f 1816 1814 1722 +f 1727 1726 1735 +f 1725 1735 1726 +f 3128 3123 436 +f 1719 1724 1771 +f 1729 1727 1735 +f 1774 1723 1719 +f 1730 1729 1735 +f 127 415 414 +f 1778 1723 1779 +f 1735 1670 1730 +f 1275 1662 1900 +f 1733 1732 1670 +f 1732 1730 1670 +f 1530 1534 1738 +f 1739 1736 1670 +f 1736 1733 1670 +f 1660 1892 1731 +f 1740 1739 1670 +f 1741 1740 1670 +f 1742 1662 1495 +f 1731 1728 3214 +f 1728 1753 3214 +f 1744 1743 1655 +f 1670 1656 1741 +f 1743 1741 1656 +f 1656 1655 1743 +f 1657 1656 1670 +f 1655 1654 1744 +f 85 1900 1747 +f 1734 1745 1724 +f 1737 1745 1734 +f 1698 1697 1750 +f 1750 1766 1698 +f 1737 1698 1766 +f 1771 1724 1745 +f 474 469 2202 +f 1533 1530 1747 +f 2206 2212 474 +f 1754 1709 1752 +f 135 496 149 +f 395 146 128 +f 1749 1843 1751 +f 1701 1708 1755 +f 1651 1521 1753 +f 475 2223 476 +f 1756 1841 1757 +f 1758 1757 1841 +f 3357 1993 1542 +f 1552 1539 3357 +f 1841 1760 1759 +f 1759 1758 1841 +f 483 482 3188 +f 1761 1841 1762 +f 2298 2830 1706 +f 1754 1755 1708 +f 1708 1709 1754 +f 254 1336 1356 +f 1763 1767 1764 +f 1768 1765 1767 +f 1765 1764 1767 +f 3405 3406 1704 +f 1770 1738 1534 +f 1745 1737 1766 +f 1770 85 1738 +f 3214 1997 1660 +f 1659 1660 1996 +f 1660 1731 3214 +f 1554 1772 1773 +f 1719 1771 1774 +f 1483 1554 1773 +f 1775 1770 1535 +f 1772 1777 1444 +f 1774 1771 1779 +f 1781 1775 1536 +f 2650 502 2652 +f 1773 1772 1444 +f 1536 1775 1535 +f 502 2650 503 +f 1770 1775 85 +f 1781 85 1775 +f 2702 2624 498 +f 1772 1555 1777 +f 499 2630 500 +f 1774 1779 1723 +f 2630 2652 500 +f 1780 1776 11 +f 9 11 1776 +f 1781 1536 534 +f 2218 2702 479 +f 2364 3070 274 +f 534 533 56 +f 334 1812 335 +f 1349 1343 248 +f 1638 1802 1782 +f 331 330 1825 +f 1582 1782 1777 +f 1782 1526 1777 +f 1802 1526 1782 +f 1825 332 331 +f 1784 1788 1785 +f 1422 1424 1429 +f 950 1786 951 +f 584 586 651 +f 1786 1787 951 +f 950 1789 1790 +f 1429 1430 1422 +f 1790 1786 950 +f 945 1791 1792 +f 167 721 724 +f 1787 1791 951 +f 1791 945 951 +f 1793 2861 1794 +f 145 718 430 +f 651 1793 1788 +f 1794 1788 1793 +f 1343 249 248 +f 1747 1738 85 +f 1786 1790 1800 +f 1801 1800 1790 +f 974 1098 1795 +f 1790 1789 1801 +f 1807 1801 1796 +f 1795 1807 1796 +f 1429 1424 1788 +f 1337 1336 254 +f 1788 1784 651 +f 1784 584 651 +f 1901 1798 1799 +f 2861 2863 1794 +f 1787 1786 1800 +f 1638 1641 1806 +f 1798 1456 2056 +f 1638 1806 1802 +f 1901 1799 1797 +f 1788 1794 1803 +f 1852 3254 1804 +f 1803 1804 1788 +f 1526 1444 1777 +f 1806 1526 1802 +f 1641 1651 1808 +f 1806 1641 1808 +f 1799 2056 1797 +f 1799 1798 2056 +f 1057 1801 1807 +f 1353 1349 248 +f 1526 1806 1808 +f 1651 1753 1808 +f 1785 1812 1784 +f 1784 1831 584 +f 3406 3407 1705 +f 1813 1784 1812 +f 1838 1784 1813 +f 1825 1784 1838 +f 1812 334 333 +f 1812 333 1813 +f 1810 1836 1720 +f 1811 1810 1720 +f 1812 1785 1818 +f 1789 1796 1801 +f 1800 1809 1787 +f 1791 1787 1809 +f 1792 1791 1809 +f 1805 1792 1809 +f 1720 1721 1811 +f 1814 1811 1721 +f 1818 335 1812 +f 1721 1722 1814 +f 1817 1816 1823 +f 1825 1821 1784 +f 1821 1822 1784 +f 1822 1831 1784 +f 1687 1688 1817 +f 1819 1817 1688 +f 1688 1689 1819 +f 1821 330 329 +f 1821 329 1822 +f 1847 1858 1805 +f 1797 2069 1815 +f 1821 1825 330 +f 1201 1179 1828 +f 1839 1826 1836 +f 1827 1836 1826 +f 1829 1826 1839 +f 1832 1829 1839 +f 1839 1840 1832 +f 1834 1832 1840 +f 1835 1834 1840 +f 1828 1830 1201 +f 1840 904 1835 +f 1837 904 896 +f 1837 1835 904 +f 332 1838 1813 +f 332 1813 333 +f 1893 1896 1842 +f 1825 1838 332 +f 1748 1720 1827 +f 1824 1920 1748 +f 1827 1824 1748 +f 1836 1827 1720 +f 329 1831 1822 +f 344 1870 1868 +f 1763 1762 1767 +f 1841 1767 1762 +f 1841 1761 1760 +f 1756 1751 1843 +f 1748 1843 1749 +f 1920 1917 1748 +f 1841 1756 1843 +f 1179 1182 1842 +f 340 1875 1874 +f 1842 1828 1179 +f 1894 1893 1842 +f 1870 344 343 +f 1847 1186 1833 +f 1830 1854 1833 +f 1828 1895 1830 +f 340 1818 1875 +f 260 3278 262 +f 259 1315 1311 +f 1833 1860 1847 +f 259 258 1315 +f 1852 2878 1853 +f 1331 1854 1332 +f 2878 1862 1853 +f 1854 1855 1332 +f 1851 1998 1844 +f 1788 1804 3254 +f 1855 1895 1332 +f 3254 1852 1853 +f 1862 3254 1853 +f 1856 1857 1659 +f 1742 1747 1900 +f 1851 1850 1998 +f 2069 1998 1850 +f 1858 1859 1345 +f 1844 1998 1845 +f 47 1536 76 +f 1859 1860 1345 +f 2002 2005 1856 +f 1860 1352 1345 +f 1659 1864 1856 +f 1845 1861 1931 +f 1864 1876 2002 +f 1352 1860 1863 +f 1540 1861 1469 +f 1280 1275 1898 +f 1863 1854 1331 +f 1865 1525 1137 +f 1845 1994 1861 +f 1792 1805 1858 +f 1854 1830 1855 +f 1854 1863 1833 +f 1863 1860 1833 +f 1859 1847 1860 +f 1858 1847 1859 +f 1182 1363 1867 +f 1877 1874 936 +f 1870 936 1868 +f 1870 1881 936 +f 1874 1875 936 +f 1815 1850 1912 +f 1208 1872 713 +f 936 1873 1868 +f 1815 2069 1850 +f 1208 1889 1872 +f 1818 1785 1875 +f 936 1875 1785 +f 1867 1842 1182 +f 1463 1876 1694 +f 1877 936 1881 +f 1674 1694 1876 +f 1874 1877 342 +f 1363 1871 1867 +f 1879 1907 1878 +f 1864 1674 1876 +f 1867 1894 1842 +f 1871 1882 1867 +f 1869 1887 1871 +f 1876 1490 2002 +f 343 1881 1870 +f 1368 1872 1869 +f 1877 1881 343 +f 1877 343 342 +f 1876 1463 1490 +f 1894 1867 1882 +f 1888 1891 1869 +f 1869 1872 1888 +f 1889 1888 1872 +f 1882 1883 1485 +f 1522 1883 1886 +f 1912 1850 1851 +f 1886 1887 1522 +f 1889 1523 1888 +f 535 532 209 +f 1889 1242 1523 +f 1753 1728 1890 +f 1731 1890 1728 +f 1219 1252 1208 +f 1891 1887 1869 +f 1887 1886 1871 +f 1886 1883 1871 +f 1882 1871 1883 +f 1731 1892 1890 +f 1887 1524 1522 +f 3270 1526 1897 +f 1891 1524 1887 +f 3038 358 357 +f 1892 1660 1857 +f 1892 3270 1890 +f 3270 1892 1857 +f 1895 1528 1332 +f 1528 1895 1896 +f 1753 1890 1897 +f 1896 1893 1528 +f 1828 1842 1896 +f 1895 1828 1896 +f 1855 1830 1895 +f 1897 1808 1753 +f 3051 3046 358 +f 1861 1994 1469 +f 1470 1469 1994 +f 1798 1901 1902 +f 1898 1275 1900 +f 198 325 323 +f 1902 1518 1798 +f 1900 85 1865 +f 1518 1902 2064 +f 1901 2064 1902 +f 1866 1898 1865 +f 1900 1865 1898 +f 369 2895 2931 +f 1899 1901 1797 +f 1866 1878 1898 +f 1880 1907 1879 +f 1901 1899 2064 +f 315 1427 347 +f 1907 1880 1904 +f 1884 1910 1903 +f 1906 1903 1910 +f 717 718 170 +f 1815 1912 1908 +f 367 191 372 +f 1797 1908 1899 +f 1797 1815 1908 +f 325 198 338 +f 1908 2186 1899 +f 2009 2186 1912 +f 1885 1884 1904 +f 1898 1878 1907 +f 1880 1885 1904 +f 168 720 158 +f 294 1434 305 +f 2088 1909 81 +f 1909 1905 81 +f 1911 81 1905 +f 1910 1911 1906 +f 2534 108 106 +f 2065 2075 2067 +f 3082 3066 411 +f 158 720 719 +f 2067 2075 2029 +f 2036 2068 2029 +f 2022 2021 427 +f 1662 1742 1900 +f 2547 148 118 +f 85 76 1865 +f 1905 1906 1911 +f 1903 1904 1884 +f 1953 1992 1962 +f 1912 1844 1913 +f 2642 142 2643 +f 141 2643 142 +f 144 2643 141 +f 1912 1851 1844 +f 148 2656 153 +f 157 142 2662 +f 2642 2662 142 +f 1912 1913 2009 +f 157 2662 136 +f 1918 1919 1929 +f 2656 166 153 +f 1919 1921 1848 +f 1848 1929 1919 +f 1849 1848 1921 +f 1921 1846 1849 +f 1914 1849 1846 +f 2981 184 2983 +f 1846 1843 1914 +f 1916 1914 1843 +f 1843 1748 1916 +f 1917 1916 1748 +f 919 916 933 +f 934 935 919 +f 933 934 919 +f 1926 1913 1844 +f 1922 919 935 +f 1926 2009 1913 +f 1925 1938 1927 +f 1928 1927 1939 +f 1861 1930 1931 +f 1939 1915 1928 +f 1915 1918 1928 +f 1929 1928 1918 +f 1866 1865 1137 +f 1926 1844 1845 +f 1935 1936 1924 +f 1934 1935 1924 +f 1925 1924 1936 +f 1937 1925 1936 +f 1938 1925 1937 +f 1939 1927 1938 +f 1924 1923 1934 +f 935 1932 1922 +f 1933 1934 1923 +f 1940 1941 1543 +f 1926 1845 1931 +f 1931 1993 1926 +f 1540 1930 1861 +f 1943 1944 1471 +f 1540 1993 1930 +f 1808 1897 1526 +f 1897 1890 3270 +f 1467 1946 1945 +f 1856 1864 2002 +f 1490 1491 2002 +f 1974 584 1976 +f 1975 1978 584 +f 584 1978 3342 +f 1497 1948 1949 +f 3214 1753 1521 +f 1651 1641 1521 +f 173 171 723 +f 1949 1943 1497 +f 1471 1497 1943 +f 722 721 173 +f 1961 1948 1481 +f 723 171 457 +f 3199 3189 1961 +f 3188 3199 1961 +f 1513 2314 1952 +f 2314 1951 1952 +f 723 722 173 +f 1954 1516 1956 +f 1958 1966 1957 +f 1959 1966 1958 +f 1956 1952 1951 +f 1956 1951 1954 +f 720 168 724 +f 1952 1956 1513 +f 1516 1513 1956 +f 1481 1484 1961 +f 1752 2830 1960 +f 1962 1752 1960 +f 724 168 167 +f 1706 1964 1963 +f 1908 1912 2186 +f 1962 1960 1963 +f 1962 1963 1964 +f 2017 1953 1984 +f 1962 1964 1953 +f 1984 1987 2017 +f 350 2006 1947 +f 1972 584 1971 +f 1976 584 1972 +f 1975 584 1974 +f 1954 2339 1516 +f 717 170 159 +f 1972 1971 356 +f 2008 1955 1967 +f 1968 1973 1970 +f 1966 1959 1968 +f 1967 1957 1966 +f 1991 1990 1973 +f 1831 328 1971 +f 794 793 1476 +f 1486 1476 805 +f 794 1476 1475 +f 1973 1968 1959 +f 1487 809 1488 +f 717 159 158 +f 809 3173 1488 +f 1487 813 809 +f 717 158 719 +f 1941 1942 1544 +f 1941 1544 1543 +f 1486 813 1487 +f 1942 1979 1545 +f 1942 1545 1544 +f 1486 805 813 +f 1975 351 1978 +f 1979 1981 1546 +f 1979 1546 1545 +f 1947 3342 1978 +f 1981 1982 1547 +f 1981 1547 1546 +f 351 350 1978 +f 1982 1983 1547 +f 3173 2823 1488 +f 265 415 1247 +f 430 1247 415 +f 1985 1548 1549 +f 1985 1549 1986 +f 1986 1549 1550 +f 1986 1550 1988 +f 1247 1249 265 +f 266 265 1249 +f 1988 1550 1551 +f 1988 1551 1989 +f 1930 1993 1931 +f 2034 2014 1977 +f 1977 2020 1980 +f 1970 1973 1990 +f 1994 1845 1998 +f 2069 2009 1998 +f 2930 365 384 +f 2009 1926 1993 +f 1541 1542 1993 +f 359 358 3046 +f 358 3038 3051 +f 1706 1489 1995 +f 2901 360 376 +f 1995 1489 1994 +f 1993 1992 1995 +f 1993 1995 1994 +f 1998 2009 1994 +f 2059 2116 1507 +f 1992 2012 1995 +f 2112 1506 1505 +f 1965 1950 1996 +f 1997 2005 1996 +f 387 369 2931 +f 2005 1997 1999 +f 1957 1967 1955 +f 1955 2008 1999 +f 387 2931 384 +f 1971 584 1831 +f 2859 1467 1945 +f 1857 1856 3270 +f 2012 2013 2004 +f 1995 2012 2004 +f 1996 2002 1965 +f 2002 1996 2005 +f 2007 3342 2006 +f 2010 2017 2020 +f 2006 398 2007 +f 2005 1999 2008 +f 2006 3342 1947 +f 2072 2071 1503 +f 3062 402 3061 +f 401 3061 402 +f 1993 1994 2009 +f 2318 2175 1516 +f 3082 411 359 +f 854 1957 1955 +f 2003 2004 2013 +f 2001 2003 2010 +f 2010 2011 2001 +f 2013 2010 2003 +f 3066 408 411 +f 2000 2001 2011 +f 2015 2000 2011 +f 2016 2019 2015 +f 2007 2018 3342 +f 2000 2015 2019 +f 2021 2018 429 +f 1964 1984 1953 +f 398 429 2007 +f 2018 2007 429 +f 2059 1507 1496 +f 2021 2022 3342 +f 2022 2028 3342 +f 3342 2018 2021 +f 2025 2027 3342 +f 2635 1493 2027 +f 2024 424 2025 +f 423 2025 424 +f 2024 2025 3342 +f 2020 1977 2014 +f 2032 2023 2034 +f 2026 424 2024 +f 1503 1502 2072 +f 2028 2026 3342 +f 3270 1856 2005 +f 1996 1660 1997 +f 1950 1464 1996 +f 2014 2034 2023 +f 2024 3342 2026 +f 1504 1503 2070 +f 2830 2050 1960 +f 2027 2025 422 +f 423 422 2025 +f 2019 2016 2030 +f 2029 2030 2016 +f 1987 1980 2017 +f 2020 2017 1980 +f 405 3067 3061 +f 2032 2031 2023 +f 2036 2023 2031 +f 2070 1503 2071 +f 1963 1960 1969 +f 435 3131 3128 +f 2033 1969 1960 +f 2036 2035 2068 +f 2035 2036 2031 +f 527 211 210 +f 2046 2298 1963 +f 208 182 536 +f 1969 2046 1963 +f 2033 2050 1969 +f 641 215 214 +f 2039 2051 2038 +f 477 2216 2215 +f 244 246 3401 +f 2045 2037 2042 +f 2044 2045 2043 +f 2043 2040 2044 +f 2042 2043 2045 +f 2041 2042 2037 +f 2040 1099 2062 +f 349 191 367 +f 3399 240 244 +f 2635 506 2636 +f 422 506 2027 +f 2635 2027 506 +f 2658 503 2650 +f 3396 217 218 +f 2033 1960 2050 +f 470 152 151 +f 3396 3397 217 +f 2037 2038 2041 +f 2046 2050 2047 +f 2046 1969 2050 +f 1511 1516 2175 +f 2047 2054 2049 +f 2054 2052 2049 +f 2189 1502 1501 +f 395 147 146 +f 336 3431 322 +f 2189 1501 1511 +f 1511 2175 2174 +f 414 128 127 +f 3441 3431 336 +f 212 526 634 +f 3342 2055 1457 +f 1905 3282 1906 +f 2056 1455 2055 +f 513 135 132 +f 2041 2038 2051 +f 2053 2051 2039 +f 2039 2048 2053 +f 2059 1472 1520 +f 371 3227 298 +f 1454 1455 2056 +f 1456 1454 2056 +f 154 457 171 +f 3281 1903 1906 +f 2057 2055 1494 +f 378 370 3253 +f 2071 2116 2070 +f 2830 3382 2050 +f 2087 3287 2088 +f 1494 2070 2057 +f 194 2989 2983 +f 2047 2050 2058 +f 721 167 173 +f 2048 2049 2052 +f 2058 2054 2047 +f 2052 2053 2048 +f 2055 2057 2059 +f 2060 2061 2062 +f 2060 2062 2063 +f 2061 2044 2062 +f 2040 2062 2044 +f 1531 1517 1472 +f 1496 1497 2059 +f 254 252 1337 +f 1343 1342 252 +f 1342 1337 252 +f 2066 2035 2065 +f 2056 2055 2064 +f 2059 2064 2055 +f 1343 252 249 +f 2067 2068 2066 +f 2067 2066 2065 +f 2067 2029 2068 +f 2068 2035 2066 +f 3278 1311 536 +f 3277 3285 536 +f 2072 2121 2071 +f 2116 2059 2070 +f 1096 2044 2061 +f 225 3397 3404 +f 1294 2063 1099 +f 145 170 718 +f 1311 260 259 +f 2074 2075 2076 +f 2074 2076 2077 +f 1316 256 1319 +f 1502 2073 2072 +f 2077 2029 2074 +f 2030 2029 2077 +f 240 3398 218 +f 2065 2035 2076 +f 255 1322 256 +f 2065 2076 2075 +f 372 215 641 +f 2075 2074 2029 +f 2044 1118 2045 +f 2123 2122 2108 +f 2108 788 2123 +f 2109 2108 2122 +f 2110 2109 2122 +f 2116 1505 1508 +f 256 1316 258 +f 2127 2125 2078 +f 1322 1319 256 +f 2084 2083 2078 +f 2083 2127 2078 +f 99 2087 2088 +f 99 2088 100 +f 2085 2084 2078 +f 81 100 2088 +f 2085 2078 2086 +f 2089 2086 2078 +f 2090 2089 2094 +f 2078 2094 2089 +f 2091 2090 2094 +f 2128 1509 1506 +f 2095 2093 2094 +f 2093 2092 2094 +f 2092 2091 2094 +f 2097 2107 2096 +f 2102 2103 2193 +f 2104 2105 2099 +f 2100 2099 2105 +f 2105 2106 2100 +f 2097 2100 2106 +f 2107 2097 2106 +f 2099 2098 2104 +f 2103 2104 2098 +f 2098 2193 2103 +f 2080 2081 786 +f 3239 3238 364 +f 368 3242 364 +f 787 786 2081 +f 2081 2082 787 +f 2174 2189 1511 +f 2082 2123 788 +f 788 787 2082 +f 1173 2041 2051 +f 1173 2051 1167 +f 3049 298 3227 +f 2122 2119 2110 +f 363 3238 374 +f 2111 2110 2119 +f 2119 2120 2111 +f 2119 2125 2118 +f 2118 2120 2119 +f 2112 1505 2121 +f 2117 2115 2120 +f 1505 2116 2121 +f 2113 2111 2120 +f 2114 2113 2120 +f 2115 2114 2120 +f 1989 1551 1553 +f 1989 1553 2124 +f 2112 2121 2073 +f 2116 2071 2121 +f 2124 1553 1556 +f 2124 1556 2126 +f 523 521 87 +f 2128 1510 1509 +f 2119 2078 2125 +f 2129 2117 2120 +f 504 503 2658 +f 1983 2130 1557 +f 1983 1557 1547 +f 2073 2189 2112 +f 2130 2132 1558 +f 2130 1558 1557 +f 2131 2129 2120 +f 2132 2136 1559 +f 2132 1559 1558 +f 2133 2131 2120 +f 2135 2137 1475 +f 2135 1475 1476 +f 2136 2138 1560 +f 2136 1560 1559 +f 1476 1486 2135 +f 2134 2133 2120 +f 2120 2147 2134 +f 1510 2128 1513 +f 2061 2060 1096 +f 2174 2175 2128 +f 2128 2112 2189 +f 2140 2134 2147 +f 2147 2152 2140 +f 2141 2140 2152 +f 2138 2139 1561 +f 2138 1561 1560 +f 2152 2180 2141 +f 2142 2141 2180 +f 2139 2146 1561 +f 2148 1562 2150 +f 2143 2142 2156 +f 2151 1563 1562 +f 2151 1562 2148 +f 2153 1564 1563 +f 2153 1563 2151 +f 2144 2143 2156 +f 2145 2144 2156 +f 2149 2145 2156 +f 2153 2155 1565 +f 2153 1565 1564 +f 641 214 213 +f 439 442 3138 +f 2155 2157 1566 +f 2155 1566 1565 +f 2154 2149 2156 +f 796 790 2156 +f 2154 2156 789 +f 2157 2158 1567 +f 2157 1567 1566 +f 2158 2161 1568 +f 2158 1568 1567 +f 2162 2160 2172 +f 2159 2172 2160 +f 2161 2163 1569 +f 2161 1569 1568 +f 2164 2162 2172 +f 2166 2164 2172 +f 1105 2043 2042 +f 1866 3246 1878 +f 2073 2121 2072 +f 2057 2070 2059 +f 1573 1569 2165 +f 2163 2165 1569 +f 2167 2166 2156 +f 2172 2156 2166 +f 309 3459 179 +f 2146 2169 1571 +f 2146 1571 1561 +f 2064 2186 2056 +f 2056 2186 2069 +f 2169 2171 1572 +f 2169 1572 1571 +f 2170 2168 2156 +f 2168 2167 2156 +f 2171 2371 1572 +f 197 195 339 +f 2318 2314 2175 +f 2174 2128 2189 +f 2176 2173 2156 +f 2173 2170 2156 +f 2165 2177 1573 +f 2177 2179 1574 +f 2177 1574 1573 +f 2178 2176 2142 +f 2156 2142 2176 +f 348 339 195 +f 2179 2181 1575 +f 2179 1575 1574 +f 2180 2178 2142 +f 2181 2183 1576 +f 2181 1576 1575 +f 2183 2185 1577 +f 2183 1577 1576 +f 2185 2188 1578 +f 2185 1578 1577 +f 2182 2199 2194 +f 2194 2195 2182 +f 1105 2042 2041 +f 2184 2182 2195 +f 435 439 3150 +f 2187 2184 2195 +f 2195 2196 2187 +f 2190 2187 2196 +f 435 3150 3131 +f 1105 2040 2043 +f 442 447 3140 +f 2196 2197 2190 +f 2197 2198 2190 +f 2191 2190 2198 +f 2192 2191 2101 +f 2101 2102 2192 +f 2198 2101 2191 +f 2193 2192 2102 +f 2044 1096 1118 +f 2277 2278 2199 +f 1122 2038 2037 +f 3281 1906 3282 +f 2037 2045 1122 +f 2202 1873 936 +f 2201 2194 2199 +f 2200 2201 2199 +f 2206 474 2202 +f 2038 1122 1067 +f 1071 2039 1070 +f 2202 936 2206 +f 2207 2208 2203 +f 2204 2203 2208 +f 2208 2209 2204 +f 2209 2210 2204 +f 2205 2204 2210 +f 2039 2038 1070 +f 2223 2212 4 +f 936 302 2206 +f 1067 1070 2038 +f 475 474 2212 +f 1126 2045 1118 +f 2218 2215 2788 +f 2216 4 2215 +f 2788 2215 2809 +f 536 535 208 +f 2214 2213 2219 +f 2211 2228 2213 +f 1126 1122 2045 +f 10 531 29 +f 1145 2048 2039 +f 479 2215 2218 +f 1145 2039 1071 +f 530 529 51 +f 119 81 3291 +f 2225 2203 2224 +f 2222 2224 2217 +f 2221 2222 2217 +f 2217 2214 2221 +f 2226 2203 2225 +f 2207 2203 2226 +f 2217 2224 2203 +f 2220 2221 2214 +f 2219 2220 2214 +f 477 476 2216 +f 2212 2206 4 +f 1167 2053 2052 +f 2212 2223 475 +f 2188 2232 1579 +f 2188 1579 1578 +f 3364 540 3365 +f 2232 2235 1580 +f 2232 1580 1579 +f 2229 2304 2230 +f 2231 2230 2244 +f 1590 1580 2237 +f 2235 2237 1580 +f 1866 1138 3215 +f 2233 2231 2245 +f 2244 2245 2231 +f 1581 2239 2240 +f 2234 2233 2246 +f 2245 2246 2233 +f 2239 1581 1584 +f 2239 1584 2242 +f 3365 539 538 +f 2242 1584 1585 +f 2242 1585 2243 +f 542 541 3368 +f 2243 1585 1586 +f 2243 1586 2249 +f 2249 1586 1587 +f 2249 1587 2250 +f 2247 2236 2246 +f 2236 2234 2246 +f 2248 2238 2247 +f 2228 2211 2227 +f 2227 2241 2248 +f 2219 2213 2228 +f 2241 2227 2211 +f 2238 2248 2241 +f 2236 2247 2238 +f 2244 2230 2304 +f 2250 1587 1588 +f 2250 1588 2251 +f 2251 1588 1589 +f 2251 1589 2253 +f 2107 2255 2252 +f 2107 2252 2096 +f 2237 2257 1590 +f 2258 2274 2256 +f 2255 2256 2254 +f 2254 2256 2274 +f 2254 2252 2255 +f 2257 2259 1591 +f 2257 1591 1590 +f 2259 2261 1591 +f 1589 1592 2263 +f 1589 2263 2253 +f 1639 2264 1592 +f 2263 1592 2264 +f 1167 2052 1170 +f 2054 1170 2052 +f 2260 2322 2271 +f 2271 2272 2260 +f 2262 2260 2272 +f 2272 2273 2262 +f 1543 1548 2273 +f 1548 2262 2273 +f 2270 2271 2322 +f 2269 2270 2322 +f 2322 2321 2269 +f 2267 2269 2321 +f 1167 2051 2053 +f 2275 2274 2258 +f 3258 1884 1885 +f 2258 2281 2275 +f 2200 2199 2278 +f 2281 2282 2276 +f 2276 2275 2281 +f 2277 2276 2282 +f 197 338 198 +f 2282 2283 2277 +f 2278 2277 2283 +f 2048 1145 2049 +f 1141 2049 1145 +f 3284 3283 1907 +f 1907 3283 1898 +f 2283 2284 2278 +f 2279 2278 2284 +f 2284 2285 2279 +f 2280 2279 2285 +f 2060 2063 1295 +f 1294 1295 2063 +f 2285 2309 2280 +f 3284 1907 1904 +f 1295 1096 2060 +f 1295 1299 1096 +f 2266 2268 1593 +f 2266 1593 1650 +f 2063 2062 1099 +f 2268 2803 1593 +f 2286 2280 2309 +f 2309 2310 2286 +f 2261 2290 1594 +f 2261 1594 1591 +f 1650 2295 2266 +f 2287 2286 2310 +f 2310 2311 2287 +f 7 275 274 +f 2290 2292 1595 +f 2290 1595 1594 +f 1905 1909 3282 +f 2300 2301 2291 +f 2292 2296 1596 +f 2292 1596 1595 +f 3291 1911 3292 +f 2296 2297 1597 +f 2296 1597 1596 +f 2297 2299 1598 +f 2297 1598 1597 +f 2293 2291 2301 +f 2301 2302 2293 +f 2294 2293 2302 +f 2302 2303 2294 +f 2294 2303 2229 +f 2304 2229 2303 +f 2307 2846 2306 +f 2312 2300 2289 +f 2291 2289 2300 +f 2289 2288 2312 +f 2311 2312 2288 +f 2288 2287 2311 +f 1513 2128 2314 +f 532 527 210 +f 2316 2315 2325 +f 3270 1007 3264 +f 2336 2314 2318 +f 2128 2175 2314 +f 2325 2326 2316 +f 2317 2316 2326 +f 2326 2328 2317 +f 2299 2305 1598 +f 2319 2317 2328 +f 2328 2329 2319 +f 2324 2126 1599 +f 1556 1599 2126 +f 3215 3246 1866 +f 2324 1599 1600 +f 2324 1600 2327 +f 2320 2319 2329 +f 2329 2265 2320 +f 2265 2267 2320 +f 2321 2320 2267 +f 2327 1600 1601 +f 2327 1601 2330 +f 524 16 18 +f 2064 1899 2186 +f 2323 2325 2315 +f 2330 1601 1602 +f 2330 1602 2332 +f 531 524 18 +f 1797 2056 2069 +f 2009 2069 2186 +f 2336 2337 2339 +f 2336 2339 2340 +f 2338 2335 1603 +f 2338 1603 1604 +f 2333 2331 2369 +f 2323 2313 2331 +f 3248 1879 1878 +f 2342 2338 1604 +f 2342 1604 1605 +f 2334 2333 2369 +f 2340 1951 2314 +f 2340 2314 2336 +f 2344 2342 1605 +f 2344 1605 1606 +f 2369 2341 2334 +f 1954 1951 2339 +f 2340 2339 1951 +f 2346 2344 1606 +f 2346 1606 1607 +f 3259 1885 3247 +f 2339 2337 1516 +f 2337 2318 1516 +f 2348 2346 1607 +f 2348 1607 1608 +f 2350 2348 1608 +f 2336 2318 2337 +f 2353 2332 1609 +f 1602 1609 2332 +f 1885 1880 3247 +f 2347 2369 2349 +f 2353 1609 1610 +f 2353 1610 2355 +f 3247 1879 3248 +f 2369 2360 2351 +f 2355 1610 1611 +f 2355 1611 2357 +f 1879 3247 1880 +f 2354 2360 2356 +f 2357 1611 1612 +f 2357 1612 2359 +f 540 3364 3363 +f 2359 1612 1613 +f 2359 1613 2362 +f 2361 2358 2360 +f 2358 2356 2360 +f 2363 2364 2365 +f 2363 2365 2366 +f 2370 2150 1614 +f 1562 1614 2150 +f 2372 2373 2368 +f 2367 2368 2373 +f 2354 2352 2360 +f 2352 2351 2360 +f 2351 2349 2369 +f 2369 2347 2345 +f 2369 2345 2343 +f 2369 2343 2341 +f 2369 2331 2313 +f 2313 2323 2315 +f 2371 2370 1614 +f 2371 1614 1615 +f 2374 2078 2119 +f 2371 1615 1572 +f 1903 3280 1904 +f 2374 2387 2078 +f 2335 1635 1603 +f 712 2377 2079 +f 712 2079 682 +f 2375 2376 2380 +f 2377 2378 2080 +f 2377 2080 2079 +f 2375 2380 2381 +f 2378 2382 2081 +f 2378 2081 2080 +f 2382 2385 2082 +f 2382 2082 2081 +f 2385 2386 2082 +f 2387 2094 2078 +f 372 191 215 +f 77 2383 2384 +f 1904 3279 3284 +f 2387 2388 2095 +f 2387 2095 2094 +f 77 2384 73 +f 2127 2083 2391 +f 2389 2391 2083 +f 2394 2389 2083 +f 2394 2083 2084 +f 2396 2393 2367 +f 2392 2367 2393 +f 2394 2084 2085 +f 2394 2085 2398 +f 133 545 544 +f 2398 2085 2086 +f 2398 2086 2399 +f 2401 2367 2403 +f 2401 2397 2367 +f 2397 2396 2367 +f 2399 2086 2089 +f 2399 2089 2400 +f 2400 2089 2090 +f 2400 2090 2402 +f 210 209 532 +f 2373 2403 2367 +f 2402 2090 2091 +f 2402 2091 2405 +f 2405 2091 2092 +f 2405 2092 2407 +f 2407 2092 2093 +f 2407 2093 2409 +f 2404 2403 2373 +f 2409 2093 2095 +f 2409 2095 2388 +f 2406 2404 2373 +f 3292 1911 1910 +f 2430 2429 2406 +f 2373 2430 2406 +f 1911 3291 81 +f 2413 2101 2414 +f 2408 2406 2428 +f 2413 2415 2102 +f 2413 2102 2101 +f 2410 2408 2428 +f 3374 3373 569 +f 2415 2417 2103 +f 2415 2103 2102 +f 2417 2418 2104 +f 2417 2104 2103 +f 349 348 195 +f 2418 2419 2105 +f 2418 2105 2104 +f 576 3381 560 +f 1909 2088 3287 +f 2438 2437 2373 +f 2435 2433 2373 +f 2411 2410 2425 +f 2428 2425 2410 +f 2419 2421 2106 +f 2419 2106 2105 +f 124 2087 99 +f 2445 2443 2373 +f 349 195 191 +f 2 655 6 +f 2421 2422 2107 +f 2421 2107 2106 +f 2422 2424 2107 +f 3376 566 560 +f 2446 2447 2416 +f 2097 2096 2426 +f 2097 2426 2427 +f 2423 2446 2412 +f 2416 2412 2446 +f 2412 2411 2423 +f 2425 2423 2411 +f 2431 2432 2098 +f 2193 2098 2432 +f 2431 2098 2099 +f 2431 2099 2434 +f 2429 2428 2406 +f 2434 2099 2100 +f 2434 2100 2436 +f 2433 2430 2373 +f 82 520 545 +f 133 544 549 +f 2436 2100 2097 +f 2436 2097 2427 +f 2435 2373 2437 +f 551 156 548 +f 2440 918 2108 +f 788 2108 918 +f 2440 2108 2109 +f 2440 2109 2442 +f 2439 2438 2373 +f 2442 2109 2110 +f 2442 2110 2444 +f 212 527 526 +f 2443 2441 2373 +f 2441 2439 2373 +f 3372 3245 572 +f 2444 2110 2111 +f 2444 2111 2448 +f 2420 2416 2447 +f 570 569 3373 +f 2448 2111 2113 +f 2448 2113 2450 +f 569 568 3374 +f 2450 2113 2114 +f 2450 2114 2452 +f 2451 2420 2447 +f 2449 2420 2451 +f 2452 2114 2115 +f 2452 2115 2453 +f 570 3373 571 +f 2453 2115 2117 +f 2453 2117 2456 +f 2461 2420 2454 +f 571 3377 572 +f 2456 2117 2458 +f 2420 2449 2457 +f 2457 2455 2420 +f 2455 2454 2420 +f 2119 2460 2374 +f 2454 2459 2461 +f 3376 560 3381 +f 2463 2462 2118 +f 2463 2118 2125 +f 2459 2627 2461 +f 2476 2460 2119 +f 2476 2119 2122 +f 814 696 2851 +f 576 574 3381 +f 2466 1628 1627 +f 2466 1627 2379 +f 2465 2363 2468 +f 2470 2471 1616 +f 1634 1616 2471 +f 2462 2467 2120 +f 2462 2120 2118 +f 3189 482 484 +f 2469 2468 2363 +f 2366 2469 2363 +f 2472 2470 1616 +f 2472 1616 1617 +f 2386 2473 2123 +f 2386 2123 2082 +f 2534 106 111 +f 3191 3189 484 +f 2475 2472 1617 +f 2475 1617 1618 +f 2478 2475 1618 +f 2478 1618 1621 +f 2473 2476 2122 +f 2473 2122 2123 +f 108 2547 118 +f 2480 2463 2125 +f 2481 2478 1621 +f 2481 1621 1622 +f 2482 2480 2125 +f 2482 2125 2127 +f 2483 2481 1622 +f 2483 1622 1623 +f 2464 2521 2465 +f 2363 2465 2521 +f 2521 2464 2479 +f 2477 2503 2479 +f 2474 2503 2477 +f 2391 2482 2127 +f 2485 2483 1623 +f 2485 1623 1624 +f 2486 2458 2129 +f 2117 2129 2458 +f 2486 2129 2131 +f 2486 2131 2487 +f 2487 2131 2133 +f 2487 2133 2491 +f 2491 2133 2134 +f 2491 2134 2492 +f 2490 2484 2474 +f 3304 673 3298 +f 2134 2140 2495 +f 2134 2495 2492 +f 2494 2474 2496 +f 2489 2496 2474 +f 2461 2488 2474 +f 2494 2490 2474 +f 2489 2474 2488 +f 767 3313 669 +f 2495 2140 2141 +f 2495 2141 2497 +f 2497 2141 2142 +f 2497 2142 2500 +f 674 673 3304 +f 2501 2499 2521 +f 2498 2521 2499 +f 2500 2142 2143 +f 2500 2143 2502 +f 2502 2143 2144 +f 2502 2144 2504 +f 2504 2144 2145 +f 2504 2145 2507 +f 2513 2147 2467 +f 2503 2501 2479 +f 2506 2505 2474 +f 2511 2507 2145 +f 2511 2145 2149 +f 2509 2506 2474 +f 2513 2514 2147 +f 2510 2509 2474 +f 2512 2510 2474 +f 2120 2467 2147 +f 2516 2512 2474 +f 323 200 198 +f 2508 2515 3254 +f 2493 2508 3254 +f 2518 2511 2149 +f 2518 2149 2154 +f 2517 2516 2474 +f 2474 2484 2517 +f 2519 2520 2152 +f 2505 2503 2474 +f 2521 2479 2501 +f 2514 2519 2152 +f 2514 2152 2147 +f 2547 2533 2596 +f 516 3218 508 +f 949 2518 2154 +f 949 2154 789 +f 2524 2523 2375 +f 2522 2375 2523 +f 796 2156 969 +f 2526 2527 2159 +f 2526 2159 2160 +f 2525 2524 2375 +f 2531 2530 2375 +f 2536 2532 2528 +f 2529 2526 2160 +f 2529 2160 2162 +f 1153 1158 3019 +f 2375 2530 2525 +f 2534 936 2533 +f 2538 936 2534 +f 2554 936 2538 +f 2535 2529 2162 +f 2535 2162 2164 +f 2534 2533 108 +f 2375 2528 2531 +f 2532 2531 2528 +f 323 309 200 +f 2543 936 2554 +f 2596 2533 936 +f 2537 2536 2528 +f 2540 2535 2164 +f 2540 2164 2166 +f 111 2538 2534 +f 2537 2528 2539 +f 2541 2539 2528 +f 2542 2541 2528 +f 2546 2540 2166 +f 2546 2166 2167 +f 2543 115 116 +f 2543 116 2544 +f 213 634 636 +f 2528 2570 2542 +f 2548 2546 2167 +f 2548 2167 2168 +f 2533 2547 108 +f 2545 2542 2570 +f 2172 2159 2527 +f 2552 2548 2168 +f 2552 2168 2170 +f 2549 2545 2570 +f 2543 2544 936 +f 2550 2549 2570 +f 125 115 2554 +f 2543 2554 115 +f 2551 2550 2570 +f 2553 2551 2570 +f 2557 2552 2170 +f 2557 2170 2173 +f 2555 2553 2570 +f 2527 2559 2172 +f 111 125 2538 +f 2554 2538 125 +f 2556 2555 2570 +f 2558 2556 2570 +f 2560 2558 2570 +f 116 314 2544 +f 2562 2557 2173 +f 2562 2173 2176 +f 2561 2560 2570 +f 2561 2570 2564 +f 2172 2559 2156 +f 2564 2570 2563 +f 2565 2562 2176 +f 2565 2176 2178 +f 2566 2563 2570 +f 144 2649 2643 +f 148 2657 2656 +f 2568 2565 2178 +f 2568 2178 2180 +f 2570 2567 2566 +f 2569 2485 1624 +f 2569 1624 1626 +f 2567 2570 2627 +f 2466 2569 1626 +f 2466 1626 1628 +f 2520 2568 2180 +f 2520 2180 2152 +f 2335 2573 1635 +f 2156 2559 969 +f 2571 2570 2528 +f 1627 1635 2573 +f 1627 2573 2379 +f 2201 2576 2194 +f 2575 2194 2576 +f 2649 144 166 +f 2577 2195 2194 +f 2577 2194 2575 +f 2574 2528 2579 +f 2579 2528 2381 +f 2572 2528 2574 +f 2571 2528 2572 +f 2375 2381 2528 +f 2578 2196 2195 +f 2578 2195 2577 +f 2581 2197 2196 +f 2581 2196 2578 +f 2579 2381 2580 +f 583 317 3254 +f 2583 2198 2197 +f 2583 2197 2581 +f 2582 2580 2381 +f 2515 3384 2585 +f 2583 2414 2198 +f 2101 2198 2414 +f 655 641 213 +f 3393 2588 2585 +f 2589 2590 2182 +f 2586 2383 2587 +f 213 636 655 +f 2592 2589 2182 +f 2592 2182 2184 +f 2584 2582 2381 +f 2515 2585 3254 +f 2588 583 2585 +f 3254 2585 583 +f 2593 2592 2184 +f 2593 2184 2187 +f 2597 2595 2383 +f 2591 2587 2383 +f 2594 2593 2187 +f 2594 2187 2190 +f 2591 2383 2595 +f 2598 2594 2190 +f 2598 2190 2191 +f 1424 417 1785 +f 2600 2598 2191 +f 2600 2191 2192 +f 2599 2597 77 +f 2383 77 2597 +f 2603 2600 2192 +f 2603 2192 2193 +f 1138 1043 3215 +f 2602 2601 77 +f 2601 2599 77 +f 309 179 200 +f 2603 2193 2432 +f 443 453 2596 +f 2642 2643 518 +f 2604 2602 77 +f 443 2596 417 +f 2596 936 417 +f 2605 2604 77 +f 77 91 2606 +f 2606 2605 77 +f 2610 2201 2200 +f 2610 2200 2608 +f 1424 253 417 +f 2201 2610 2576 +f 2277 2199 2777 +f 2614 2777 2199 +f 2590 2614 2199 +f 2590 2199 2182 +f 117 113 77 +f 110 105 77 +f 2613 2606 91 +f 2607 2606 2612 +f 2609 2607 2611 +f 2612 2611 2607 +f 2613 2612 2606 +f 2615 2207 2616 +f 2611 2619 2609 +f 2618 2208 2207 +f 2618 2207 2615 +f 2620 2209 2208 +f 2620 2208 2618 +f 2617 2609 2619 +f 3062 3191 402 +f 2620 2621 2210 +f 2620 2210 2209 +f 2621 2625 2205 +f 2621 2205 2210 +f 498 2624 499 +f 2628 2629 2203 +f 212 634 213 +f 2631 2628 2203 +f 2631 2203 2204 +f 2623 2461 2627 +f 2488 2461 2623 +f 2567 2627 2459 +f 499 2624 2630 +f 552 583 2626 +f 2622 2626 583 +f 2588 2622 583 +f 2627 2648 2632 +f 2625 2631 2204 +f 2625 2204 2205 +f 2633 2219 2634 +f 2623 2627 2632 +f 2635 2636 1493 +f 2636 2664 1493 +f 2637 2220 2219 +f 2637 2219 2633 +f 2640 2221 2220 +f 2640 2220 2637 +f 1494 2027 1493 +f 2639 2638 2645 +f 2596 518 2643 +f 2643 2649 2596 +f 2644 2222 2221 +f 2644 2221 2640 +f 2645 2646 2641 +f 2641 2639 2645 +f 2647 2224 2222 +f 2647 2222 2644 +f 2649 2670 2596 +f 2670 2656 2596 +f 2624 2711 2630 +f 2711 2652 2630 +f 2711 1493 2652 +f 2651 2225 2224 +f 2651 2224 2647 +f 2654 2226 2225 +f 2654 2225 2651 +f 2632 2648 2653 +f 2656 2657 2596 +f 2547 2596 2657 +f 2658 2650 1493 +f 2650 2652 1493 +f 2654 2616 2226 +f 2207 2226 2616 +f 2642 518 2662 +f 2664 2658 1493 +f 2661 2663 2211 +f 2659 2655 2648 +f 2655 2653 2648 +f 2636 504 2664 +f 2666 2661 2211 +f 2666 2211 2213 +f 2660 2659 2648 +f 2667 2665 2648 +f 2665 2660 2648 +f 2669 2666 2213 +f 2669 2213 2214 +f 504 2658 2664 +f 2671 2669 2214 +f 2671 2214 2217 +f 2656 2670 166 +f 2689 2648 2691 +f 2668 2648 2687 +f 2667 2648 2668 +f 2685 2693 2648 +f 2629 2671 2217 +f 2629 2217 2203 +f 2674 2227 2675 +f 2670 2649 166 +f 2677 2228 2227 +f 2677 2227 2674 +f 2673 2699 2672 +f 2677 2634 2228 +f 2219 2228 2634 +f 2672 2699 2676 +f 2657 148 2547 +f 2680 2681 2682 +f 2680 2682 2683 +f 2684 2246 2245 +f 2684 2245 2686 +f 2683 1990 2680 +f 1991 2680 1990 +f 2688 2247 2246 +f 2688 2246 2684 +f 1526 552 962 +f 2682 1990 2683 +f 2690 2248 2247 +f 2690 2247 2688 +f 482 3189 3199 +f 2687 2648 2689 +f 2690 2675 2248 +f 2227 2248 2675 +f 518 3366 2692 +f 482 3199 3188 +f 2294 2229 2695 +f 2694 2695 2229 +f 2691 2648 2693 +f 484 402 3191 +f 518 2692 2662 +f 2696 2693 2685 +f 2698 2694 2229 +f 2698 2229 2230 +f 2692 136 2662 +f 2685 2679 2696 +f 1613 1630 2700 +f 1613 2700 2362 +f 2701 2698 2230 +f 2701 2230 2231 +f 2702 2218 2711 +f 2223 4 2216 +f 2700 1630 1631 +f 2700 1631 2704 +f 2679 2678 2697 +f 2697 2696 2679 +f 2705 2701 2231 +f 2705 2231 2233 +f 2704 1631 1632 +f 2704 1632 2706 +f 2788 2711 2218 +f 2707 2705 2233 +f 2707 2233 2234 +f 2706 1632 1633 +f 2706 1633 2708 +f 2725 2645 2703 +f 2703 2699 2725 +f 2697 2676 2699 +f 2678 2676 2697 +f 498 479 2702 +f 2708 1633 1634 +f 2708 1634 2710 +f 2709 2707 2234 +f 2709 2234 2236 +f 2638 2703 2645 +f 2713 2709 2236 +f 2713 2236 2238 +f 2710 1634 2471 +f 2716 2714 2725 +f 2712 2725 2714 +f 2715 2713 2238 +f 2715 2238 2241 +f 1997 3214 1044 +f 1608 1636 2350 +f 2717 2350 1636 +f 2663 2715 2241 +f 2663 2241 2211 +f 2718 2716 2725 +f 2720 2717 1636 +f 2720 1636 1637 +f 2721 2723 2244 +f 2721 2244 2304 +f 1581 2240 1637 +f 2720 1637 2240 +f 2722 2719 2725 +f 2719 2718 2725 +f 2245 2244 2723 +f 2245 2723 2686 +f 1639 2726 2264 +f 2424 2727 2255 +f 2424 2255 2107 +f 2725 2699 2722 +f 2724 2699 2673 +f 2722 2699 2724 +f 3218 516 3231 +f 3019 312 2981 +f 2727 2728 2256 +f 2727 2256 2255 +f 532 1315 527 +f 2728 2730 2258 +f 2728 2258 2256 +f 247 242 7 +f 2730 2732 2258 +f 2619 2729 2617 +f 2731 2617 2729 +f 2729 728 2731 +f 2726 1639 1640 +f 2726 1640 2733 +f 2734 2735 2392 +f 2734 2392 2393 +f 2736 2426 2252 +f 2096 2252 2426 +f 2733 1640 1642 +f 2733 1642 2737 +f 2736 2252 2254 +f 2736 2254 2738 +f 2737 1642 1643 +f 2737 1643 2740 +f 2739 2734 2393 +f 2739 2393 2396 +f 2274 2741 2254 +f 2738 2254 2741 +f 2740 1643 1644 +f 2740 1644 2742 +f 2743 2744 2260 +f 2322 2260 2744 +f 2745 2739 2396 +f 2745 2396 2397 +f 2742 1644 1645 +f 2742 1645 2746 +f 2743 2260 2262 +f 2743 2262 2747 +f 2711 2847 2844 +f 3397 225 217 +f 2746 1645 1646 +f 2746 1646 2748 +f 2747 2262 1548 +f 2747 1548 1985 +f 2749 2745 2397 +f 2748 1646 1647 +f 2748 1647 2752 +f 2753 2754 2265 +f 2753 2265 2329 +f 2735 2368 2367 +f 2735 2367 2392 +f 1598 2305 1648 +f 2755 1648 2305 +f 2756 2267 2265 +f 2756 2265 2754 +f 2752 1647 1649 +f 2752 1649 2757 +f 2756 2758 2269 +f 2756 2269 2267 +f 2759 2766 1648 +f 2758 2762 2270 +f 2758 2270 2269 +f 2755 2759 1648 +f 2762 2763 2271 +f 2762 2271 2270 +f 2757 1649 2772 +f 1486 1487 2764 +f 2763 2765 2272 +f 2763 2272 2271 +f 1650 2766 2295 +f 2765 2767 2273 +f 2765 2273 2272 +f 2761 2764 1487 +f 1486 2764 2135 +f 2766 1650 1648 +f 1543 2273 1940 +f 2767 1940 2273 +f 2769 2608 2278 +f 2200 2278 2608 +f 2768 2770 1653 +f 2768 1653 1652 +f 2274 2771 2741 +f 1649 1654 2772 +f 2771 2274 2275 +f 2771 2275 2773 +f 2772 1654 1655 +f 2772 1655 2774 +f 2773 2275 2276 +f 2773 2276 2775 +f 2774 1655 1656 +f 2774 1656 2776 +f 2775 2276 2277 +f 2775 2277 2777 +f 3133 2761 2760 +f 2776 1656 1657 +f 2776 1657 2778 +f 2778 1657 1658 +f 2778 1658 2779 +f 2769 2278 2279 +f 2769 2279 2780 +f 2780 2279 2280 +f 2780 2280 2781 +f 2779 1658 1663 +f 2779 1663 2782 +f 2281 2258 2783 +f 2732 2783 2258 +f 2784 2782 1663 +f 2784 1663 1664 +f 2785 2784 1664 +f 2785 1664 1665 +f 2783 2786 2281 +f 2787 2785 1665 +f 2787 1665 1666 +f 2624 2702 2711 +f 2786 2789 2282 +f 2786 2282 2281 +f 2790 2787 1666 +f 2790 1666 1667 +f 2789 2791 2283 +f 2789 2283 2282 +f 2788 2847 2711 +f 2793 2790 1667 +f 2793 1667 1668 +f 2791 2795 2284 +f 2791 2284 2283 +f 311 3018 314 +f 2795 2797 2285 +f 2795 2285 2284 +f 2796 2793 1668 +f 2796 1668 1669 +f 3023 2544 314 +f 2788 2792 2847 +f 2797 2833 2285 +f 1653 2770 2796 +f 1653 2796 1669 +f 2799 2781 2286 +f 2280 2286 2781 +f 2750 2816 2794 +f 2798 1671 1670 +f 2800 793 794 +f 2800 794 2801 +f 2798 2768 1671 +f 1652 1671 2768 +f 2799 2286 2287 +f 2799 2287 2802 +f 2137 2801 794 +f 2855 2851 2792 +f 2794 2855 2792 +f 2803 1682 1593 +f 2802 2287 2288 +f 2802 2288 2804 +f 2803 2805 1683 +f 2803 1683 1682 +f 2804 2288 2289 +f 2804 2289 2806 +f 2807 2808 1672 +f 2792 2788 2809 +f 2806 2289 2291 +f 2806 2291 2810 +f 2811 2807 1672 +f 2811 1672 1673 +f 2812 2810 2291 +f 2812 2291 2293 +f 2811 1673 1675 +f 2811 1675 2813 +f 2814 2812 2293 +f 2814 2293 2294 +f 2813 1675 1676 +f 2813 1676 2815 +f 2695 2814 2294 +f 2815 1676 1677 +f 2815 1677 2817 +f 3361 2307 2306 +f 2818 2819 2300 +f 2817 1677 1678 +f 2817 1678 2820 +f 2819 2821 2301 +f 2819 2301 2300 +f 2820 1678 1679 +f 2820 1679 2822 +f 2824 2751 2823 +f 2823 2760 1488 +f 1487 1488 2761 +f 2816 2750 2824 +f 2751 2824 2750 +f 2760 2823 2751 +f 2761 1488 2760 +f 2821 2825 2302 +f 2821 2302 2301 +f 2822 1679 1680 +f 2822 1680 2826 +f 2825 2827 2303 +f 2825 2303 2302 +f 2826 1680 1681 +f 2826 1681 2828 +f 2829 2304 2303 +f 2829 2303 2827 +f 2828 1681 1683 +f 2828 1683 2805 +f 3298 669 3313 +f 2304 2829 2721 +f 2831 2832 1684 +f 2831 1684 1685 +f 2831 1685 2834 +f 2833 2309 2285 +f 2834 1685 1686 +f 2834 1686 2836 +f 2833 2835 2310 +f 2833 2310 2309 +f 2835 2837 2311 +f 2835 2311 2310 +f 2836 1686 2838 +f 2837 2839 2312 +f 2837 2312 2311 +f 2840 1687 1823 +f 2839 2818 2312 +f 2300 2312 2818 +f 2841 1688 1687 +f 2841 1687 2840 +f 2308 2846 2307 +f 2846 2830 2306 +f 2843 2842 2313 +f 2843 2313 2315 +f 3214 1521 3218 +f 1752 1706 2830 +f 2845 2843 2315 +f 2845 2315 2316 +f 2298 2306 2830 +f 2848 2845 2316 +f 2848 2316 2317 +f 2852 2848 2317 +f 2852 2317 2319 +f 1961 1484 2844 +f 2853 2852 2319 +f 2853 2319 2320 +f 2801 3143 2800 +f 2800 3143 805 +f 854 1955 1999 +f 2854 2853 2320 +f 2854 2320 2321 +f 2847 2792 2851 +f 2816 2855 2794 +f 2869 2857 2323 +f 2856 2854 2321 +f 2856 2321 2322 +f 2857 2858 2323 +f 2325 2323 2858 +f 741 769 284 +f 922 1991 1973 +f 2856 2322 2744 +f 2859 1793 1467 +f 2860 2326 2325 +f 2860 2325 2858 +f 2859 2861 1793 +f 2862 2328 2326 +f 2862 2326 2860 +f 1803 1794 2863 +f 2864 2329 2328 +f 2864 2328 2862 +f 1804 1803 2865 +f 2863 2865 1803 +f 2329 2864 2753 +f 1852 1804 2865 +f 336 205 3441 +f 2867 2361 2360 +f 2867 2360 2866 +f 923 922 1973 +f 2308 2395 2850 +f 2308 2850 2846 +f 2323 2331 2869 +f 2869 2331 2333 +f 2869 2333 2870 +f 2395 2390 2850 +f 2849 2850 2390 +f 2390 2907 2849 +f 2870 2333 2334 +f 2870 2334 2871 +f 2871 2334 2341 +f 2871 2341 2872 +f 2905 2930 2861 +f 2859 2905 2861 +f 2872 2341 2343 +f 2872 2343 2873 +f 2841 2874 1689 +f 2841 1689 1688 +f 2865 2875 1852 +f 2874 2876 1690 +f 2874 1690 1689 +f 2873 2343 2345 +f 2873 2345 2877 +f 2875 2878 1852 +f 2876 2879 1691 +f 2876 1691 1690 +f 2880 2877 2345 +f 2880 2345 2347 +f 1862 2878 2881 +f 2879 2882 1692 +f 2879 1692 1691 +f 2883 2880 2347 +f 2883 2347 2349 +f 2882 2884 1693 +f 2882 1693 1692 +f 3123 3128 2875 +f 2885 2883 2349 +f 2885 2349 2351 +f 2884 2886 1693 +f 1696 1695 2888 +f 1696 2888 2889 +f 2887 2885 2351 +f 2887 2351 2352 +f 2888 1695 1699 +f 2888 1699 2891 +f 2892 2887 2352 +f 2892 2352 2354 +f 2891 1699 1700 +f 2891 1700 2893 +f 2894 2892 2354 +f 2894 2354 2356 +f 2893 1700 1702 +f 2893 1702 2896 +f 2898 2894 2356 +f 2898 2356 2358 +f 2896 1702 1703 +f 2896 1703 2899 +f 1776 1780 2897 +f 2899 1703 1704 +f 2899 1704 2900 +f 2867 2898 2358 +f 2867 2358 2361 +f 2900 1704 1705 +f 2900 1705 2902 +f 2842 2903 2369 +f 2842 2369 2313 +f 2907 2908 2868 +f 2868 2849 2907 +f 2903 2866 2369 +f 2360 2369 2866 +f 2902 1705 2904 +f 2906 2838 1707 +f 1686 1707 2838 +f 2897 17 1776 +f 9 1776 17 +f 2906 1707 1696 +f 2906 1696 2889 +f 2633 2634 2559 +f 2723 2721 274 +f 7 274 2829 +f 2721 2829 274 +f 2827 7 2829 +f 2825 7 2827 +f 2819 2866 2821 +f 2466 2379 2903 +f 2886 2909 1710 +f 2886 1710 1693 +f 2908 17 2890 +f 2897 2890 17 +f 2890 2868 2908 +f 2909 2910 1711 +f 2909 1711 1710 +f 2910 2911 1712 +f 2910 1712 1711 +f 2911 2912 1713 +f 2911 1713 1712 +f 2912 2913 1714 +f 2912 1714 1713 +f 711 709 2374 +f 2378 2377 2374 +f 2377 712 2374 +f 712 711 2374 +f 1249 2374 707 +f 709 707 2374 +f 2913 2914 1714 +f 2374 1249 2387 +f 2915 2962 1715 +f 2378 2374 2382 +f 2386 2385 2374 +f 2916 2915 1715 +f 2916 1715 1716 +f 2382 2374 2385 +f 2917 2916 1716 +f 2917 1716 1717 +f 2918 2917 1717 +f 2918 1717 1718 +f 2808 2918 1718 +f 2808 1718 1672 +f 2920 1721 1720 +f 2920 1720 2919 +f 2921 1722 1721 +f 2921 1721 2920 +f 1722 2921 2922 +f 2398 2575 2394 +f 2399 2575 2398 +f 2389 2394 2575 +f 2400 2575 2399 +f 2402 2575 2400 +f 2405 2575 2402 +f 2407 2575 2405 +f 2409 2575 2407 +f 2388 2577 2409 +f 2923 2924 1725 +f 2923 1725 1726 +f 2415 2413 2387 +f 2414 2583 2387 +f 2413 2414 2387 +f 2925 2923 1726 +f 2925 1726 1727 +f 2415 2387 2417 +f 2417 2387 2418 +f 2926 2925 1727 +f 2926 1727 1729 +f 2421 2419 1249 +f 2927 2926 1729 +f 2927 1729 1730 +f 1735 1725 2924 +f 2427 2426 2593 +f 2436 2427 2593 +f 2426 2736 2593 +f 2736 2738 2593 +f 2928 2927 1730 +f 2928 1730 1732 +f 2929 2928 1732 +f 2929 1732 1733 +f 2442 869 2440 +f 2444 869 2442 +f 2448 869 2444 +f 2450 869 2448 +f 2452 869 2450 +f 2453 869 2452 +f 2456 869 2453 +f 2458 849 2456 +f 2476 2473 2460 +f 2386 2374 2473 +f 1706 1963 2298 +f 2462 2575 2467 +f 2374 2460 2473 +f 2480 2482 2575 +f 2482 2391 2575 +f 2391 2389 2575 +f 2463 2480 2575 +f 2462 2463 2575 +f 2486 849 2458 +f 2487 849 2486 +f 2491 849 2487 +f 2492 849 2491 +f 2495 957 2492 +f 2681 2680 992 +f 2931 2930 384 +f 370 572 3245 +f 2497 949 2495 +f 2500 949 2497 +f 2502 949 2500 +f 2504 2518 2502 +f 2507 2518 2504 +f 2511 2518 2507 +f 949 2502 2518 +f 948 2495 949 +f 2865 2863 2931 +f 2932 2749 2401 +f 2397 2401 2749 +f 2932 2401 2403 +f 2932 2403 2934 +f 2905 2859 2933 +f 2934 2403 2404 +f 2934 2404 2935 +f 2933 2901 376 +f 2935 2404 2406 +f 2935 2406 2936 +f 2933 2859 2901 +f 2936 2406 2408 +f 2936 2408 2937 +f 1044 3214 1043 +f 853 1958 1957 +f 2937 2408 2410 +f 2937 2410 2938 +f 2930 2931 2863 +f 2938 2410 2411 +f 2938 2411 2939 +f 923 1973 1959 +f 2939 2411 2412 +f 2939 2412 2940 +f 2548 2552 2535 +f 2552 2557 2535 +f 2557 2562 2535 +f 2540 2546 2535 +f 2546 2548 2535 +f 2562 2565 2535 +f 2565 2568 2535 +f 2568 2520 2535 +f 2520 2519 2535 +f 2527 2526 2519 +f 2514 2654 2519 +f 2519 2654 2527 +f 2940 2412 2941 +f 2943 2420 2944 +f 2529 2535 2519 +f 2942 2929 1733 +f 2942 1733 1736 +f 2945 2941 2416 +f 2412 2416 2941 +f 2924 2946 1735 +f 2945 2416 2420 +f 2945 2420 2943 +f 2445 2373 2948 +f 2372 2948 2373 +f 2947 2942 1736 +f 2947 1736 1739 +f 2949 2950 2423 +f 2951 2947 1739 +f 2951 1739 1740 +f 2952 2949 2423 +f 2952 2423 2425 +f 2953 2952 2425 +f 2953 2425 2428 +f 2954 2951 1740 +f 2954 1740 1741 +f 2955 2953 2428 +f 2955 2428 2429 +f 2955 2429 2430 +f 2955 2430 2957 +f 2956 2954 1741 +f 2956 1741 1743 +f 2559 2677 274 +f 2957 2430 2433 +f 2957 2433 2958 +f 2959 2956 1743 +f 2959 1743 1744 +f 361 3223 371 +f 594 3273 3274 +f 2958 2433 2435 +f 2958 2435 2960 +f 1670 1735 2946 +f 2960 2435 2437 +f 2960 2437 2961 +f 2575 2409 2577 +f 2962 2959 1744 +f 2962 1744 1746 +f 2961 2437 2438 +f 2961 2438 2963 +f 2577 2388 2578 +f 2962 1746 1715 +f 2578 2388 2581 +f 2963 2438 2439 +f 2963 2439 2964 +f 3239 364 3242 +f 1670 2946 2798 +f 2581 2388 2583 +f 2964 2439 2441 +f 2964 2441 2965 +f 2388 2387 2583 +f 2967 1768 1767 +f 2967 1767 2966 +f 2965 2441 2443 +f 2965 2443 2968 +f 2969 2919 1748 +f 1720 1748 2919 +f 2968 2443 2445 +f 2968 2445 2948 +f 2970 2971 2447 +f 2970 2447 2446 +f 2969 1748 1749 +f 2969 1749 2972 +f 2598 2600 2432 +f 2603 2432 2600 +f 2594 2598 2432 +f 2593 2594 2432 +f 2432 2431 2593 +f 2431 2434 2593 +f 2434 2436 2593 +f 370 3245 3253 +f 2950 2970 2446 +f 2950 2446 2423 +f 2972 1749 1751 +f 2972 1751 2973 +f 368 3253 3242 +f 2631 2625 2810 +f 2974 2975 2449 +f 2973 1751 1756 +f 2973 1756 2976 +f 2608 2467 2610 +f 2467 2575 2576 +f 2977 2974 2449 +f 2977 2449 2451 +f 2976 1756 1757 +f 2976 1757 2978 +f 2610 2467 2576 +f 2447 2971 2977 +f 2447 2977 2451 +f 2978 1757 1758 +f 2978 1758 2979 +f 2777 2614 2590 +f 2777 2590 2589 +f 2544 3023 936 +f 2983 2989 1527 +f 3154 1527 2989 +f 2980 2982 2454 +f 2979 1758 1759 +f 2979 1759 2984 +f 2985 2980 2454 +f 2985 2454 2455 +f 1527 1270 3019 +f 2467 2608 2513 +f 2986 2984 1759 +f 2986 1759 1760 +f 2987 2985 2455 +f 2987 2455 2457 +f 654 3274 3289 +f 2615 2513 2618 +f 2988 2986 1760 +f 2988 1760 1761 +f 2975 2987 2457 +f 2975 2457 2449 +f 2608 2618 2513 +f 2989 3049 3154 +f 2991 2944 2461 +f 2420 2461 2944 +f 2990 2988 1761 +f 2990 1761 1762 +f 2620 2618 2608 +f 2992 2993 2459 +f 2993 3127 2459 +f 2994 2990 1762 +f 2994 1762 1763 +f 2621 2620 2608 +f 2625 2621 2608 +f 2608 2810 2625 +f 2454 2982 2459 +f 2995 2459 2982 +f 298 3049 194 +f 194 3049 2989 +f 2996 2994 1763 +f 2996 1763 1764 +f 2459 2995 2992 +f 2628 2810 2629 +f 2997 2996 1764 +f 2997 1764 1765 +f 2998 2999 2488 +f 2461 3000 2991 +f 2967 2997 1765 +f 2967 1765 1768 +f 2527 2644 2559 +f 2526 2529 2519 +f 2474 3001 2461 +f 3000 2461 3001 +f 3002 2904 1769 +f 1705 1769 2904 +f 2634 2677 2559 +f 3270 1000 1007 +f 2637 2559 2640 +f 2513 2654 2514 +f 874 1129 1769 +f 3002 1769 1129 +f 3003 3004 2464 +f 2640 2559 2644 +f 3005 3025 1836 +f 3005 1836 1810 +f 3006 3003 2464 +f 3006 2464 2465 +f 2644 2527 2647 +f 3007 3005 1810 +f 3007 1810 1811 +f 3008 3006 2465 +f 3008 2465 2468 +f 2647 2527 2651 +f 2615 2616 2513 +f 3009 3007 1811 +f 3009 1811 1814 +f 3010 3008 2468 +f 3010 2468 2469 +f 2651 2527 2654 +f 240 3399 3422 +f 2365 3010 2469 +f 2365 2469 2366 +f 3011 3009 1814 +f 3011 1814 1816 +f 2654 2513 2616 +f 240 3422 3398 +f 2363 2521 2364 +f 3012 3011 1816 +f 3012 1816 1817 +f 2474 3013 3001 +f 3014 3012 1817 +f 3014 1817 1819 +f 2671 2695 2669 +f 2666 2669 2695 +f 2661 2666 2695 +f 3013 2474 2477 +f 3013 2477 3015 +f 3016 3014 1819 +f 3016 1819 1820 +f 3017 3015 2477 +f 3017 2477 2479 +f 2832 3016 1820 +f 2832 1820 1684 +f 2633 2559 2637 +f 2690 274 2675 +f 3004 3017 2479 +f 3004 2479 2464 +f 3018 936 3023 +f 3019 2981 1527 +f 1722 2922 1823 +f 3020 1823 2922 +f 2675 274 2674 +f 2674 274 2677 +f 311 3019 3018 +f 3021 3022 2484 +f 2863 2861 2930 +f 1823 3020 2840 +f 3024 3021 2484 +f 2490 3030 2484 +f 2684 2686 274 +f 2686 2723 274 +f 3025 3026 1836 +f 3023 314 3018 +f 3027 3028 2489 +f 3027 2489 2488 +f 3029 1839 3026 +f 1836 3026 1839 +f 2688 2684 274 +f 2690 2688 274 +f 3024 2484 3030 +f 1839 3029 3031 +f 3028 3040 2489 +f 3031 3032 1840 +f 3031 1840 1839 +f 2981 2983 1527 +f 2999 3027 2488 +f 3032 1164 1840 +f 3033 3030 2490 +f 1920 1824 3035 +f 3034 3035 1824 +f 2931 2895 2865 +f 2875 2865 2895 +f 3036 3033 2490 +f 3036 2490 2494 +f 1827 1826 3037 +f 1827 3037 3039 +f 3040 2496 2489 +f 2695 2694 2698 +f 2695 2698 2701 +f 2695 2701 2705 +f 2695 2705 2707 +f 2695 2707 2709 +f 2695 2709 2713 +f 2695 2713 2715 +f 2663 2661 2695 +f 2715 2663 2695 +f 2671 2629 2695 +f 3037 1826 1829 +f 3037 1829 3041 +f 3042 3036 2494 +f 2298 3359 2306 +f 3040 3042 2494 +f 3040 2494 2496 +f 3038 1945 3051 +f 1249 2727 2424 +f 2424 2422 1249 +f 2419 2418 1249 +f 2387 1249 2418 +f 2422 2421 1249 +f 3044 3045 2498 +f 3044 2498 2499 +f 2727 1249 2728 +f 2728 1249 2730 +f 2756 2754 2730 +f 1249 2756 2730 +f 3047 357 360 +f 3048 3044 2499 +f 3048 2499 2501 +f 360 2901 3047 +f 2771 2773 2593 +f 2741 2771 2593 +f 3045 2521 2498 +f 2126 2324 1985 +f 3050 3048 2501 +f 3050 2501 2503 +f 3041 1829 1832 +f 3041 1832 3043 +f 3052 3050 2503 +f 3052 2503 2505 +f 853 852 1958 +f 2864 2862 2786 +f 2786 2783 2864 +f 3043 1832 1834 +f 3043 1834 3053 +f 3054 3052 2505 +f 3054 2505 2506 +f 2783 2732 2753 +f 3053 1834 1835 +f 3053 1835 3055 +f 3056 3054 2506 +f 3056 2506 2509 +f 2756 1249 2758 +f 3055 1835 1837 +f 3055 1837 3057 +f 3058 3056 2509 +f 3058 2509 2510 +f 2758 1249 2762 +f 2763 2762 1249 +f 3038 357 3047 +f 3057 1837 1149 +f 3059 3058 2510 +f 3059 2510 2512 +f 3273 607 557 +f 3038 2859 1945 +f 3047 2859 3038 +f 2901 2859 3047 +f 2763 1249 2765 +f 3060 3059 2512 +f 3060 2512 2516 +f 1827 3039 3034 +f 1827 3034 1824 +f 2765 1249 2767 +f 3063 3065 1841 +f 3063 1841 1843 +f 3064 3060 2516 +f 3064 2516 2517 +f 3065 2966 1841 +f 1767 1841 2966 +f 3022 3064 2517 +f 3022 2517 2484 +f 3066 3067 408 +f 3068 1915 3069 +f 2608 2769 2780 +f 2608 2780 2781 +f 2781 2799 2608 +f 3067 405 404 +f 3045 3070 2521 +f 3071 3063 1843 +f 1967 1966 914 +f 3067 404 408 +f 2521 3070 2364 +f 917 915 1968 +f 3072 2522 2523 +f 3072 2523 3073 +f 2589 2592 2775 +f 2777 2589 2775 +f 2592 2593 2775 +f 2773 2775 2593 +f 2738 2741 2593 +f 3074 1915 3068 +f 1915 3074 1918 +f 3075 1918 3074 +f 3073 2523 2524 +f 3073 2524 3076 +f 2732 2730 2754 +f 2753 2864 2783 +f 1843 3088 3071 +f 2754 2753 2732 +f 2791 2857 2795 +f 3061 3067 1944 +f 3076 2524 2525 +f 3076 2525 3077 +f 2376 2375 3072 +f 2797 2867 2833 +f 3077 2525 3078 +f 2522 3072 2375 +f 1280 3264 1007 +f 3062 3061 1943 +f 3079 3078 2530 +f 2525 2530 3078 +f 3302 3232 612 +f 3079 2530 2531 +f 3079 2531 3081 +f 3080 1919 1918 +f 3080 1918 3075 +f 2810 2608 2806 +f 2804 2806 2608 +f 2802 2804 2608 +f 2799 2802 2608 +f 2812 2629 2810 +f 2814 2629 2812 +f 2695 2629 2814 +f 2628 2631 2810 +f 1843 1846 3088 +f 3081 2531 2532 +f 3081 2532 3083 +f 2818 2839 2866 +f 3084 1919 3080 +f 3083 2532 2536 +f 3083 2536 3085 +f 2819 2818 2866 +f 7 2821 2866 +f 1919 3084 1921 +f 3086 1921 3084 +f 3085 2536 2537 +f 3085 2537 3087 +f 3087 2537 2539 +f 3087 2539 3089 +f 3090 1921 3086 +f 264 3401 246 +f 3089 2539 2541 +f 3089 2541 3091 +f 1921 3090 1846 +f 3088 1846 3090 +f 3091 2541 2542 +f 3091 2542 3093 +f 1929 1848 3094 +f 3092 3094 1848 +f 2825 2821 7 +f 3093 2542 2545 +f 3093 2545 3095 +f 3096 3092 1848 +f 3096 1848 1849 +f 2833 2867 2835 +f 3095 2545 3097 +f 3098 3096 1849 +f 3098 1849 1914 +f 2835 2867 2837 +f 3099 3097 2549 +f 2545 2549 3097 +f 2867 2866 2837 +f 2839 2837 2866 +f 3100 3098 1914 +f 3100 1914 1916 +f 516 3229 3231 +f 3099 2549 2550 +f 3099 2550 3102 +f 3101 3100 1916 +f 3101 1916 1917 +f 3102 2550 2551 +f 3102 2551 3103 +f 3104 3101 1917 +f 3104 1917 1920 +f 3103 2551 2553 +f 3103 2553 3105 +f 3035 3104 1920 +f 359 3046 3082 +f 3105 2553 2555 +f 3105 2555 3106 +f 3107 3069 1939 +f 1915 1939 3069 +f 2853 2355 2852 +f 2852 2355 2848 +f 2848 2355 2845 +f 2845 2355 2843 +f 2854 2355 2853 +f 2856 2355 2854 +f 2744 2355 2856 +f 2743 2355 2744 +f 3106 2555 2556 +f 3106 2556 3108 +f 3082 3046 1945 +f 919 1922 1191 +f 3109 1191 1922 +f 3108 2556 2558 +f 3108 2558 3110 +f 3111 3109 1922 +f 3111 1922 1923 +f 3399 244 3401 +f 2797 2795 2869 +f 2869 2870 2797 +f 3110 2558 2560 +f 3110 2560 3112 +f 3113 3111 1923 +f 3113 1923 1924 +f 2869 2795 2857 +f 3112 2560 2561 +f 3112 2561 3115 +f 3114 3113 1924 +f 3114 1924 1925 +f 2791 2789 2857 +f 3115 2561 3117 +f 3116 3114 1925 +f 3116 1925 1927 +f 3223 3185 3227 +f 3227 3185 3049 +f 2858 2857 2789 +f 2789 2786 2858 +f 3067 3066 1946 +f 1946 1944 3067 +f 1945 1946 3066 +f 1945 3066 3082 +f 3046 3051 1945 +f 3118 2564 2563 +f 3118 2563 3121 +f 3119 3116 1927 +f 3119 1927 1928 +f 3118 3117 2564 +f 2561 2564 3117 +f 516 517 3229 +f 3124 3119 1928 +f 3124 1928 1929 +f 2860 2858 2786 +f 2862 2860 2786 +f 2566 3125 2563 +f 3121 2563 3125 +f 3094 3124 1929 +f 3126 2567 3127 +f 1200 3129 1932 +f 1200 1932 935 +f 2566 3130 3125 +f 3132 1933 1932 +f 3132 1932 3129 +f 3130 2566 2567 +f 3130 2567 3126 +f 3134 1934 1933 +f 3134 1933 3132 +f 3135 3136 2627 +f 3137 1935 1934 +f 3137 1934 3134 +f 2627 2570 3135 +f 3139 3135 2570 +f 3141 1936 1935 +f 3141 1935 3137 +f 3142 3139 2570 +f 3142 2570 2571 +f 3142 2571 2572 +f 3142 2572 3144 +f 2873 2797 2872 +f 2877 2797 2873 +f 2880 2797 2877 +f 2883 2797 2880 +f 2871 2872 2797 +f 2870 2871 2797 +f 2885 2797 2883 +f 2887 2797 2885 +f 2892 2797 2887 +f 2898 2797 2894 +f 2867 2797 2898 +f 2892 2894 2797 +f 3144 2572 2574 +f 3144 2574 3145 +f 2842 2466 2903 +f 2881 2878 3131 +f 7 2866 2903 +f 3145 2574 3146 +f 3120 3173 3133 +f 3147 3146 2579 +f 2574 2579 3146 +f 3200 3262 274 +f 3267 800 274 +f 3147 2579 2580 +f 3147 2580 3148 +f 2895 3123 2875 +f 2878 2875 3128 +f 3148 2580 2582 +f 3148 2582 3149 +f 809 813 3133 +f 813 805 3143 +f 3150 439 3138 +f 3149 2582 2584 +f 3149 2584 3152 +f 3153 2586 2587 +f 3153 2587 3155 +f 3154 3192 3156 +f 3155 2587 2591 +f 3155 2591 3157 +f 2380 3152 2584 +f 2792 2809 3151 +f 3128 3131 2878 +f 2881 3131 3150 +f 2881 3150 3138 +f 2383 2586 3153 +f 3192 3195 3156 +f 2595 3158 2591 +f 3157 2591 3158 +f 2584 2381 2380 +f 442 3140 3138 +f 3153 2384 2383 +f 2595 3159 3158 +f 3138 3140 2881 +f 3159 2595 2597 +f 3159 2597 3161 +f 3160 1937 1936 +f 3160 1936 3141 +f 3156 3198 3151 +f 3162 1938 1937 +f 3162 1937 3160 +f 445 3164 3140 +f 3161 2597 2599 +f 3161 2599 3163 +f 3167 1939 1938 +f 3167 1938 3162 +f 3163 2599 2601 +f 3163 2601 3168 +f 1939 3167 3107 +f 3164 2881 3140 +f 3168 2601 2602 +f 3168 2602 3169 +f 3171 3164 445 +f 3169 2602 2604 +f 3169 2604 3172 +f 612 674 3302 +f 3172 2604 2605 +f 3172 2605 3174 +f 449 3175 3171 +f 3176 3174 2605 +f 3176 2605 2606 +f 3175 1961 3171 +f 3171 445 449 +f 3177 3176 2606 +f 3177 2606 2607 +f 3178 3177 2607 +f 3178 2607 2609 +f 3361 2306 3359 +f 3180 3178 2609 +f 3122 3170 3120 +f 3165 3122 3166 +f 809 3133 3173 +f 3151 3166 3122 +f 3165 3170 3122 +f 3173 3120 3170 +f 3181 3182 2611 +f 449 483 3179 +f 596 594 3274 +f 3183 3181 2611 +f 3183 2611 2612 +f 3184 3183 2612 +f 3184 2612 2613 +f 3179 3175 449 +f 546 3269 547 +f 226 3184 2613 +f 226 2613 91 +f 3171 1961 3164 +f 2881 3164 1961 +f 3179 1961 3175 +f 3186 3180 2617 +f 2609 2617 3180 +f 3185 801 3190 +f 3187 2729 2619 +f 547 3269 557 +f 3182 3187 2619 +f 3182 2619 2611 +f 2567 2459 3127 +f 3190 2493 3192 +f 3269 3271 557 +f 2648 2627 3194 +f 3193 3194 2627 +f 1783 3195 3192 +f 3192 2493 1783 +f 483 3188 3179 +f 2488 2623 2998 +f 3196 2998 2623 +f 2493 3190 3386 +f 3188 1961 3179 +f 3196 2623 3197 +f 1783 3198 3195 +f 3136 3193 2627 +f 596 3274 654 +f 1949 1948 3191 +f 3191 3062 1949 +f 3201 2646 2645 +f 3201 2645 3200 +f 3202 3197 2632 +f 2623 2632 3197 +f 3189 3191 1948 +f 3202 2632 3203 +f 2844 1862 2881 +f 3204 3205 2638 +f 3206 3204 2638 +f 3206 2638 2639 +f 669 3298 673 +f 1948 1961 3189 +f 1943 1949 3062 +f 1943 3061 1944 +f 3192 3154 3185 +f 3190 3192 3185 +f 3207 3206 2639 +f 3207 2639 2641 +f 1961 2844 2881 +f 3201 3207 2641 +f 3201 2641 2646 +f 3198 3156 3195 +f 3166 3151 3198 +f 3208 3209 2648 +f 3194 3208 2648 +f 1788 317 1429 +f 3210 3203 2653 +f 2632 2653 3203 +f 1429 317 1430 +f 3210 2653 2655 +f 3210 2655 3211 +f 337 1430 317 +f 3211 2655 2659 +f 3211 2659 3212 +f 1953 2012 1992 +f 347 1427 1431 +f 3212 2659 2660 +f 3212 2660 3213 +f 1431 1430 347 +f 3213 2660 2665 +f 3213 2665 3216 +f 391 1439 315 +f 3216 2665 2667 +f 3216 2667 3217 +f 1428 1427 315 +f 3217 2667 2668 +f 3217 2668 3219 +f 3359 2298 2046 +f 1428 315 1439 +f 2077 2035 2030 +f 3219 2668 3220 +f 1439 391 741 +f 769 741 391 +f 3221 3222 2673 +f 3221 2673 2672 +f 337 347 1430 +f 7 2903 2379 +f 2768 2798 2573 +f 7 2573 2798 +f 2967 2966 2946 +f 3132 7 3134 +f 3129 1200 7 +f 3137 3134 7 +f 3224 3185 3223 +f 3225 3221 2672 +f 3225 2672 2676 +f 3223 361 3224 +f 3218 3231 3269 +f 3226 3225 2676 +f 3226 2676 2678 +f 3154 3049 3185 +f 3228 3226 2678 +f 3228 2678 2679 +f 2308 3360 2395 +f 1436 288 1434 +f 1942 1941 1249 +f 1436 287 288 +f 3230 3228 2679 +f 3230 2679 2685 +f 294 243 1419 +f 2020 2011 2010 +f 3227 371 3223 +f 3209 3230 2685 +f 3209 2685 2648 +f 3233 3220 2687 +f 2668 2687 3220 +f 1249 1941 1940 +f 1940 2767 1249 +f 1419 1435 294 +f 3233 2687 2689 +f 3233 2689 3235 +f 1422 251 253 +f 1942 1249 1979 +f 3235 2689 2691 +f 3235 2691 3236 +f 3224 374 3249 +f 1979 1249 1981 +f 1422 1423 251 +f 3236 2691 2693 +f 3236 2693 3237 +f 1981 1249 1982 +f 3253 3245 889 +f 3224 3249 3185 +f 3239 889 3238 +f 3242 889 3239 +f 3232 3234 517 +f 251 1423 243 +f 3237 2693 2696 +f 3237 2696 3240 +f 363 364 3238 +f 517 3234 3229 +f 3240 2696 2697 +f 3240 2697 3241 +f 3253 889 3242 +f 3241 2697 2699 +f 3241 2699 3243 +f 3244 3243 2699 +f 3244 2699 2703 +f 3205 3244 2703 +f 3205 2703 2638 +f 1435 1434 294 +f 3238 889 3249 +f 3262 3200 2725 +f 2645 2725 3200 +f 3370 2390 2395 +f 3249 374 3238 +f 3250 3251 2712 +f 3250 2712 2714 +f 1423 1419 243 +f 1424 1422 253 +f 2031 2019 2030 +f 3252 3250 2714 +f 3252 2714 2716 +f 2307 3360 2308 +f 3372 3377 889 +f 2830 2846 3387 +f 1878 3246 3248 +f 3255 3252 2716 +f 3255 2716 2718 +f 2844 2847 1862 +f 3256 3255 2718 +f 3256 2718 2719 +f 1785 417 936 +f 3432 326 327 +f 3257 3256 2719 +f 3257 2719 2722 +f 322 3432 327 +f 2725 2712 3251 +f 3247 3279 3259 +f 3388 3387 2846 +f 3260 3257 2722 +f 3260 2722 2724 +f 1788 3254 317 +f 3279 3280 3258 +f 3258 3259 3279 +f 1982 1249 1983 +f 3222 3260 2724 +f 3222 2724 2673 +f 3251 3262 2725 +f 1985 1986 1988 +f 1985 1988 1989 +f 1985 1989 2124 +f 1985 2124 2126 +f 2324 2327 1985 +f 2032 2034 2019 +f 1983 1249 2130 +f 3258 3261 1884 +f 2731 3186 2617 +f 1885 3259 3258 +f 1001 3254 3263 +f 950 2493 1001 +f 280 936 1127 +f 1001 3263 1795 +f 3267 3186 2731 +f 3254 3272 3265 +f 3254 3265 3266 +f 1964 1706 1995 +f 2729 3268 798 +f 800 3267 728 +f 2731 728 3267 +f 953 3266 3265 +f 2130 1249 2132 +f 3187 3268 2729 +f 2132 1249 2136 +f 2138 1249 2139 +f 2136 1249 2138 +f 3270 3269 546 +f 953 956 3266 +f 3270 3218 3269 +f 280 281 936 +f 2077 2076 2035 +f 956 959 3266 +f 2365 2364 266 +f 3263 3254 3266 +f 3229 3234 3271 +f 3263 3266 959 +f 2384 266 73 +f 2380 266 2384 +f 2376 266 2380 +f 3072 2372 2376 +f 266 2376 2372 +f 2368 266 2372 +f 1249 80 266 +f 3355 3272 1862 +f 3403 2907 2390 +f 2745 3010 2739 +f 2734 2739 3010 +f 2735 2734 3010 +f 2749 3010 2745 +f 2365 2735 3010 +f 3269 3231 3271 +f 3370 3403 2390 +f 2365 266 2735 +f 667 1780 66 +f 11 66 1780 +f 991 3272 3355 +f 3254 1862 3272 +f 2735 266 2368 +f 666 2890 667 +f 1780 667 2897 +f 992 1991 922 +f 3215 3264 3246 +f 1958 852 1959 +f 991 967 3272 +f 3214 3218 3270 +f 3215 3214 3270 +f 3264 3215 3270 +f 557 3271 3273 +f 967 970 3272 +f 2935 3010 2934 +f 2936 3010 2935 +f 2937 3010 2936 +f 2932 2934 3010 +f 2938 3010 2937 +f 2939 3010 2938 +f 2940 3010 2939 +f 2941 3010 2940 +f 2945 3010 2941 +f 2944 3001 2943 +f 2749 2932 3010 +f 2943 3010 2945 +f 532 535 1315 +f 3265 3272 970 +f 16 524 525 +f 45 16 528 +f 3276 275 3275 +f 3276 3277 275 +f 3232 3302 3273 +f 2023 2036 2029 +f 970 975 3265 +f 975 953 3265 +f 2953 2955 2952 +f 2949 2952 2955 +f 2955 2957 2949 +f 2950 2949 2957 +f 2950 2957 2958 +f 2960 2971 2958 +f 2961 2977 2960 +f 2963 2977 2961 +f 2964 2974 2963 +f 2965 2975 2964 +f 2968 2985 2965 +f 2948 2985 2968 +f 3232 3273 3234 +f 3229 3271 3231 +f 3271 3234 3273 +f 959 974 3263 +f 2023 2029 2016 +f 974 1795 3263 +f 3285 3278 536 +f 2950 2958 2970 +f 2970 2958 2971 +f 2974 2964 2975 +f 2977 2963 2974 +f 2971 2960 2977 +f 2030 2035 2031 +f 1000 3270 2005 +f 1311 1315 535 +f 2372 3072 2948 +f 3302 3303 3274 +f 3274 3273 3302 +f 2019 2034 2000 +f 818 814 2851 +f 3353 3355 1862 +f 1049 1999 1044 +f 1997 1044 1999 +f 1999 1049 854 +f 2034 1977 2001 +f 2987 2965 2985 +f 2975 2965 2987 +f 2985 2948 2980 +f 915 914 1966 +f 2993 2992 2995 +f 2993 2995 2982 +f 1966 1968 915 +f 2001 1980 2003 +f 920 1970 986 +f 1990 986 1970 +f 3284 3248 3283 +f 3283 3246 3264 +f 1977 1980 2001 +f 2991 3000 3001 +f 3001 3013 2943 +f 2991 3001 2944 +f 2008 1967 996 +f 2032 2019 2031 +f 3279 3247 3284 +f 3261 3258 3280 +f 3248 3246 3283 +f 1970 920 1968 +f 917 1968 920 +f 535 536 1311 +f 3291 3292 3281 +f 119 3291 3282 +f 3248 3284 3247 +f 3006 3008 2943 +f 3010 2943 3008 +f 3003 3006 2943 +f 3279 1904 3280 +f 2682 1291 1990 +f 1291 1292 1990 +f 3015 3017 2943 +f 3017 3004 2943 +f 3004 3003 2943 +f 3013 3015 2943 +f 1296 2681 992 +f 3024 3030 3044 +f 3030 3033 3044 +f 2999 3197 3201 +f 3202 3203 3201 +f 3283 3264 1898 +f 3028 3045 3040 +f 3033 3036 3044 +f 2004 1984 1995 +f 1995 1984 1964 +f 3036 3042 3044 +f 3042 3040 3044 +f 1353 3286 275 +f 3286 3295 275 +f 3045 3044 3040 +f 851 1959 852 +f 248 3286 1353 +f 3280 1903 3281 +f 851 923 1959 +f 3052 3054 3048 +f 3054 3056 3048 +f 3050 3052 3048 +f 3056 3058 3048 +f 3058 3059 3048 +f 3044 3048 3059 +f 3059 3060 3044 +f 3060 3064 3044 +f 3064 3022 3044 +f 3022 3021 3044 +f 3021 3024 3044 +f 2013 2012 2017 +f 1953 2017 2012 +f 2150 2171 2148 +f 2146 2153 2169 +f 2139 2153 2146 +f 2153 2139 1249 +f 2148 2171 2151 +f 3282 1909 3287 +f 2013 2017 2010 +f 914 996 1967 +f 2171 2169 2151 +f 2155 2153 1249 +f 2011 2020 2014 +f 1000 2005 996 +f 2008 996 2005 +f 3200 274 3070 +f 3288 3311 3289 +f 2155 1249 2157 +f 2023 2011 2014 +f 2158 1249 2161 +f 3076 3077 3117 +f 3117 3118 3076 +f 3078 3117 3077 +f 3118 3121 3076 +f 2016 2015 2023 +f 3298 3297 3288 +f 3298 3288 3289 +f 2015 2011 2023 +f 2153 2151 2169 +f 3121 3125 3073 +f 2371 2171 2150 +f 3290 3287 3318 +f 2004 1987 1984 +f 2087 3318 3287 +f 2163 1249 2165 +f 2177 2165 1249 +f 2163 2161 1249 +f 2158 2157 1249 +f 2003 1980 1987 +f 2177 1249 2179 +f 2682 2681 1291 +f 1296 1291 2681 +f 2179 1249 2181 +f 2003 1987 2004 +f 3087 3089 3083 +f 3089 3091 3083 +f 3085 3087 3083 +f 3091 3093 3083 +f 3093 3095 3083 +f 3095 3097 3083 +f 3097 3099 3083 +f 3099 3102 3083 +f 3081 3083 3102 +f 2181 1249 2183 +f 1991 992 2680 +f 3290 124 122 +f 2183 1249 2185 +f 2185 1249 2188 +f 3280 3281 3261 +f 3292 3261 3281 +f 3281 3282 3291 +f 3282 3287 119 +f 120 119 3287 +f 2188 1249 2232 +f 3102 3103 3081 +f 3103 3105 3081 +f 3079 3081 3105 +f 3105 3106 3079 +f 3106 3108 3079 +f 3108 3110 3079 +f 3110 3112 3079 +f 3078 3079 3112 +f 3078 3112 3115 +f 3115 3117 3078 +f 467 466 3293 +f 467 3293 580 +f 2232 1249 2235 +f 3292 1910 1884 +f 577 561 559 +f 3130 3126 3073 +f 3073 3076 3121 +f 3072 3073 3126 +f 3072 2980 2948 +f 3127 2982 3126 +f 2980 3126 2982 +f 3125 3130 3073 +f 3261 3292 1884 +f 2240 2239 2242 +f 2243 2350 2242 +f 2249 2346 2243 +f 2250 2342 2249 +f 2251 2342 2250 +f 2253 2342 2251 +f 3126 2980 3072 +f 577 575 561 +f 2000 2034 2001 +f 2237 2235 1249 +f 580 3294 585 +f 2257 1249 2259 +f 2261 2259 1249 +f 122 120 3287 +f 122 3287 3290 +f 3295 3296 275 +f 3305 275 3296 +f 3146 3186 3145 +f 3144 3145 3186 +f 3142 3144 3186 +f 3139 3142 3186 +f 3313 3311 3297 +f 3293 3294 580 +f 3298 3313 3297 +f 3149 3186 3148 +f 3147 3148 3186 +f 3152 3186 3149 +f 3153 3186 3152 +f 3155 3186 3153 +f 3157 3186 3155 +f 3158 3186 3157 +f 3146 3147 3186 +f 3151 3122 2750 +f 3301 275 3305 +f 3298 3289 3304 +f 3289 3274 3304 +f 3303 3304 3274 +f 3133 2751 3120 +f 3306 275 3301 +f 3152 2380 3153 +f 264 531 10 +f 2384 3153 2380 +f 2751 3133 2760 +f 3275 275 3306 +f 3176 3177 3174 +f 3172 3174 3177 +f 3169 3172 3177 +f 3168 3169 3177 +f 3177 3178 3168 +f 3163 3168 3178 +f 3161 3163 3178 +f 3178 3180 3161 +f 3159 3161 3180 +f 3180 3186 3159 +f 2764 2761 3133 +f 3300 3299 27 +f 3181 3183 257 +f 3184 257 3183 +f 3307 3300 27 +f 2764 3143 2135 +f 3158 3159 3186 +f 3308 3307 27 +f 3182 3181 257 +f 257 267 3182 +f 3288 3297 3311 +f 3127 2993 2982 +f 27 3316 3309 +f 3312 3310 3316 +f 3193 3136 3194 +f 3135 3194 3136 +f 3317 3315 3316 +f 3315 3314 3316 +f 3314 3312 3316 +f 3198 2851 2855 +f 3202 3201 3197 +f 3196 3197 2998 +f 2998 3197 2999 +f 3290 3318 124 +f 3321 3322 3320 +f 124 3318 2087 +f 3070 3045 3200 +f 3201 3200 3045 +f 3045 3028 3201 +f 3028 3027 3201 +f 3165 3166 2816 +f 3341 3319 201 +f 3323 3322 3326 +f 3321 3326 3322 +f 2816 2824 3165 +f 3027 2999 3201 +f 3207 3201 3210 +f 3203 3210 3201 +f 3210 3211 3207 +f 3327 3328 3323 +f 3327 3323 3326 +f 3170 3165 2824 +f 3208 3194 3186 +f 3135 3186 3194 +f 3209 3208 3186 +f 2824 3173 3170 +f 3324 3323 3328 +f 3328 3329 3324 +f 3324 3330 3325 +f 3330 3324 3329 +f 3331 3325 3330 +f 3294 3325 3331 +f 3217 3219 3206 +f 3219 3220 3206 +f 3216 3217 3206 +f 3220 3233 3206 +f 3204 3206 3233 +f 3206 3207 3216 +f 3205 3204 3233 +f 3213 3216 3207 +f 3198 2816 3166 +f 46 1091 3332 +f 2751 2750 3120 +f 2750 3122 3120 +f 3225 3186 3221 +f 3226 3186 3225 +f 3228 3230 3186 +f 3230 3209 3186 +f 1082 3334 3333 +f 3333 3332 1082 +f 2794 2792 3151 +f 3334 27 3335 +f 3244 3205 3237 +f 3243 3244 3240 +f 3237 3240 3244 +f 3241 3243 3240 +f 3236 3237 3205 +f 3235 3236 3205 +f 3233 3235 3205 +f 3211 3212 3207 +f 3212 3213 3207 +f 2750 2794 3151 +f 530 45 528 +f 3252 3186 3250 +f 3251 3250 3186 +f 3186 3252 3255 +f 3186 3255 3256 +f 3186 3256 3257 +f 3260 3222 3186 +f 3222 3221 3186 +f 3226 3228 3186 +f 3257 3260 3186 +f 3135 3139 3186 +f 3267 3251 3186 +f 2764 3133 3143 +f 3251 3267 3262 +f 539 3365 540 +f 3262 3267 274 +f 798 3268 3187 +f 800 802 274 +f 802 850 274 +f 2137 2135 3143 +f 538 3367 3365 +f 490 496 275 +f 3286 248 235 +f 3338 3339 190 +f 3339 3340 190 +f 201 190 3340 +f 3340 3341 201 +f 3319 3320 201 +f 3322 201 3320 +f 3337 3338 187 +f 190 187 3338 +f 2851 3198 818 +f 3345 3344 3351 +f 3343 3351 3344 +f 2816 3198 2855 +f 794 1475 2137 +f 3305 233 3301 +f 3345 3351 3346 +f 3351 40 3347 +f 3347 3346 3351 +f 2809 2215 4 +f 388 375 2809 +f 379 388 2809 +f 3350 3349 40 +f 3349 3348 40 +f 3348 3347 40 +f 3352 3350 40 +f 985 3353 984 +f 3354 3352 40 +f 40 1097 3354 +f 3355 3353 985 +f 3354 1097 26 +f 1862 2847 3353 +f 3356 696 1199 +f 26 1097 28 +f 33 1092 46 +f 28 1094 33 +f 1092 33 1094 +f 1091 46 1092 +f 995 3353 3356 +f 995 984 3353 +f 385 58 165 +f 58 63 165 +f 985 1062 3355 +f 1062 991 3355 +f 174 165 63 +f 63 3336 174 +f 178 174 3336 +f 3336 3337 178 +f 1061 995 3356 +f 187 178 3337 +f 301 302 936 +f 379 2809 4 +f 207 228 278 +f 291 286 238 +f 228 238 286 +f 286 278 228 +f 238 250 291 +f 295 291 250 +f 299 295 250 +f 275 7 6 +f 250 263 299 +f 381 299 263 +f 263 269 381 +f 269 272 381 +f 385 381 272 +f 58 385 272 +f 2046 2047 3359 +f 403 397 455 +f 397 394 455 +f 407 403 455 +f 413 407 455 +f 418 413 455 +f 419 418 455 +f 419 455 431 +f 3294 431 455 +f 3294 455 451 +f 3325 3294 451 +f 3360 2307 3362 +f 437 431 3294 +f 3294 3293 437 +f 444 437 3293 +f 3293 459 444 +f 3368 3369 543 +f 461 459 3293 +f 3293 466 463 +f 461 3293 463 +f 1766 1750 648 +f 555 455 515 +f 455 394 515 +f 551 550 156 +f 550 155 156 +f 473 575 481 +f 207 555 486 +f 486 481 207 +f 3388 2846 2850 +f 488 486 555 +f 492 488 555 +f 494 492 555 +f 497 494 555 +f 1752 1962 3357 +f 555 207 556 +f 278 556 207 +f 515 512 555 +f 512 509 555 +f 509 497 555 +f 2908 54 17 +f 207 481 575 +f 561 575 562 +f 567 575 473 +f 564 575 567 +f 562 575 564 +f 3316 27 590 +f 25 590 27 +f 590 591 3317 +f 590 3317 3316 +f 597 595 3299 +f 139 549 548 +f 598 597 3299 +f 598 3299 3300 +f 1706 586 3342 +f 598 3300 3307 +f 598 3307 599 +f 599 3307 3308 +f 599 3308 600 +f 600 3308 3309 +f 600 3309 601 +f 3359 2047 3358 +f 548 156 139 +f 601 3309 3310 +f 601 3310 602 +f 602 3310 3312 +f 602 3312 603 +f 603 3312 3314 +f 603 3314 604 +f 604 3314 3315 +f 604 3315 605 +f 326 155 550 +f 605 3315 3317 +f 605 3317 591 +f 592 3319 593 +f 606 3320 3319 +f 606 3319 592 +f 608 3321 3320 +f 608 3320 606 +f 3321 608 609 +f 609 610 3326 +f 609 3326 3321 +f 610 611 3327 +f 610 3327 3326 +f 3372 572 3377 +f 650 1754 3357 +f 611 613 3328 +f 611 3328 3327 +f 1766 648 1745 +f 613 615 3329 +f 613 3329 3328 +f 615 616 3330 +f 615 3330 3329 +f 616 617 3331 +f 616 3331 3330 +f 617 585 3294 +f 617 3294 3331 +f 201 3322 203 +f 618 203 3322 +f 1771 1745 694 +f 619 618 3322 +f 619 3322 3323 +f 521 520 78 +f 619 3323 3324 +f 619 3324 620 +f 1993 3357 1992 +f 520 82 78 +f 620 3324 3325 +f 620 3325 621 +f 88 523 87 +f 451 452 3325 +f 621 3325 452 +f 2395 3360 3371 +f 624 44 46 +f 624 46 3332 +f 625 624 3332 +f 625 3332 3333 +f 1697 589 588 +f 521 78 87 +f 626 625 3333 +f 626 3333 3334 +f 627 626 3334 +f 627 3334 3335 +f 3362 2307 3361 +f 595 627 3335 +f 595 3335 3299 +f 628 3341 3340 +f 628 3340 629 +f 1697 588 1701 +f 587 1701 588 +f 628 593 3341 +f 3319 3341 593 +f 63 161 3336 +f 631 3336 161 +f 3359 3382 3361 +f 632 3337 3336 +f 632 3336 631 +f 633 3338 3337 +f 633 3337 632 +f 635 3339 3338 +f 635 3338 633 +f 2264 2342 2263 +f 3340 3339 635 +f 3340 635 629 +f 638 637 3343 +f 638 3343 3344 +f 2266 2297 2268 +f 2292 2290 2268 +f 1249 2268 2261 +f 2257 2237 1249 +f 529 67 51 +f 1249 2803 2268 +f 2290 2261 2268 +f 639 638 3344 +f 639 3344 3345 +f 2292 2268 2296 +f 2296 2268 2297 +f 2297 2266 2299 +f 640 639 3345 +f 640 3345 3346 +f 653 3351 637 +f 642 640 3346 +f 642 3346 3347 +f 2327 2330 1985 +f 2330 2332 1985 +f 2332 2353 1985 +f 2353 2355 1985 +f 2747 1985 2355 +f 643 642 3347 +f 643 3347 3348 +f 2346 2249 2344 +f 2344 2249 2342 +f 2342 2742 2338 +f 2338 2746 2335 +f 2726 2342 2264 +f 2348 2243 2346 +f 3343 637 3351 +f 644 643 3348 +f 644 3348 3349 +f 2743 2747 2355 +f 2359 2842 2357 +f 2362 2842 2359 +f 623 1745 648 +f 2150 2370 2371 +f 530 51 45 +f 645 644 3349 +f 645 3349 3350 +f 2357 2843 2355 +f 2842 2362 2466 +f 2843 2357 2842 +f 529 523 67 +f 646 645 3350 +f 646 3350 3352 +f 2569 2466 2362 +f 523 88 67 +f 647 646 3352 +f 647 3352 3354 +f 1415 40 653 +f 3351 653 40 +f 2475 2478 2700 +f 2472 2475 2700 +f 2478 2481 2700 +f 2481 2483 2700 +f 2483 2485 2700 +f 2362 2700 2485 +f 2569 2362 2485 +f 2470 2472 2700 +f 23 647 3354 +f 23 3354 26 +f 3363 3364 518 +f 3364 3365 518 +f 2335 2768 2573 +f 7 2379 2573 +f 2706 2708 2704 +f 2708 2710 2704 +f 2710 2471 2704 +f 2700 2704 2471 +f 2471 2470 2700 +f 1779 745 1778 +f 1771 694 1779 +f 745 1779 694 +f 2737 2342 2733 +f 2733 2342 2726 +f 2740 2342 2737 +f 2742 2342 2740 +f 2746 2338 2742 +f 2748 2335 2746 +f 2752 2335 2748 +f 2757 2335 2752 +f 2757 2772 2335 +f 2350 2243 2348 +f 2717 2242 2350 +f 2720 2240 2717 +f 2242 2717 2240 +f 2263 2342 2253 +f 2299 2266 2305 +f 3366 537 2692 +f 274 266 2364 +f 2755 2295 2759 +f 2755 2305 2295 +f 3366 518 3367 +f 2766 2759 2295 +f 2295 2305 2266 +f 537 3366 538 +f 3367 538 3366 +f 3367 518 3365 +f 3342 1499 1706 +f 2778 2335 2776 +f 2774 2776 2335 +f 2779 2335 2778 +f 2782 2335 2779 +f 2784 2335 2782 +f 2785 2335 2784 +f 2787 2335 2785 +f 2790 2335 2787 +f 2793 2335 2790 +f 2796 2335 2793 +f 2768 2335 2770 +f 2772 2774 2335 +f 2770 2335 2796 +f 1521 3368 518 +f 2876 2874 1249 +f 2921 2920 2805 +f 2811 2813 2807 +f 2808 2807 2813 +f 2808 2813 2815 +f 2808 2815 2817 +f 2808 2817 2820 +f 2822 2917 2820 +f 2826 2917 2822 +f 2828 2920 2826 +f 2805 2920 2828 +f 587 1708 1701 +f 2834 1125 2831 +f 2836 1125 2834 +f 2838 1125 2836 +f 2874 2841 2803 +f 2805 2803 2840 +f 2841 2840 2803 +f 2803 1249 2874 +f 2876 1249 2879 +f 3359 3358 3382 +f 2879 1249 2882 +f 2909 2886 1249 +f 2882 1249 2884 +f 2884 1249 2886 +f 3358 47 3383 +f 587 586 1708 +f 3362 3361 3387 +f 2902 2904 2900 +f 2899 2900 2904 +f 2904 3002 2899 +f 2896 2899 3002 +f 3002 1129 2896 +f 2893 2896 1129 +f 1128 1130 2891 +f 2891 2893 1129 +f 1129 1128 2891 +f 2909 1249 2910 +f 2913 2912 55 +f 1249 55 2910 +f 2911 2910 55 +f 2912 2911 55 +f 895 889 3377 +f 1441 895 1521 +f 3371 3370 2395 +f 3375 1521 3374 +f 2916 2920 2915 +f 2918 2820 2917 +f 2808 2820 2918 +f 2917 2826 2920 +f 2919 2915 2920 +f 2916 2917 2920 +f 3387 3388 3360 +f 2921 2805 2922 +f 3374 568 3375 +f 3377 1521 895 +f 3373 1521 3377 +f 571 3373 3377 +f 2942 2919 2929 +f 2947 2919 2942 +f 2926 2927 2919 +f 2928 2919 2927 +f 2929 2919 2928 +f 2925 2926 2919 +f 2923 2925 2919 +f 2956 2919 2954 +f 2951 2954 2919 +f 2959 2919 2956 +f 2915 2919 2962 +f 2962 2919 2959 +f 1755 650 652 +f 2850 2849 3388 +f 3376 1521 3378 +f 2924 2923 2919 +f 3378 566 3376 +f 3378 3375 566 +f 568 566 3375 +f 545 133 134 +f 3400 2868 2890 +f 549 139 140 +f 2849 2868 3389 +f 134 82 545 +f 549 140 133 +f 3402 54 2908 +f 155 326 3432 +f 3390 1227 962 +f 2626 3390 962 +f 2798 2946 7 +f 1709 1708 586 +f 7 2946 2966 +f 2907 3402 2908 +f 2919 2967 2924 +f 2946 2924 2967 +f 2947 2951 2919 +f 2907 3403 3402 +f 3375 3378 1521 +f 3381 1521 3376 +f 3380 3369 1521 +f 3369 3368 1521 +f 3363 518 3368 +f 3379 574 3380 +f 2058 2050 3382 +f 3381 3379 1521 +f 3379 3380 1521 +f 3379 3381 574 +f 2978 2979 2973 +f 2979 2984 2973 +f 2976 2978 2973 +f 2984 2986 2973 +f 2986 2988 2973 +f 2988 2990 2973 +f 2990 2994 2973 +f 2972 2973 2994 +f 2994 2996 2972 +f 2996 2997 2972 +f 2969 2972 2997 +f 2997 2967 2969 +f 2919 2969 2967 +f 3383 468 2058 +f 3380 573 3369 +f 3382 3358 3383 +f 3007 1125 3005 +f 3031 3029 1125 +f 1125 3007 3009 +f 1125 3009 3011 +f 1125 3011 3012 +f 1125 3012 3014 +f 1125 3014 3016 +f 2832 2831 1125 +f 3016 2832 1125 +f 1130 1131 2891 +f 2888 2891 1131 +f 1131 1132 2888 +f 3386 3399 3385 +f 3385 3401 3384 +f 2922 2805 3020 +f 2840 3020 2805 +f 2508 2493 3386 +f 3385 2508 3386 +f 3387 3361 3382 +f 2515 2508 3384 +f 3385 3384 2508 +f 649 648 1750 +f 3393 2585 3384 +f 3029 3026 3005 +f 3025 3005 3026 +f 3005 1125 3029 +f 1164 3032 1125 +f 3031 1125 3032 +f 1752 3357 1754 +f 3370 3371 3389 +f 3391 3392 18 +f 3392 3393 29 +f 10 29 3393 +f 10 3393 3384 +f 2588 3393 3392 +f 3382 2830 3387 +f 3034 3041 3035 +f 3039 3037 3034 +f 3037 3041 3034 +f 3043 3035 3041 +f 3053 3035 3043 +f 3055 3035 3053 +f 3055 3057 3035 +f 3057 1149 3035 +f 1149 1148 3035 +f 3392 3391 2588 +f 2622 2588 3391 +f 2626 2622 3390 +f 3391 3390 2622 +f 3063 3090 3065 +f 3065 3068 3069 +f 3141 7 3160 +f 3388 2849 3389 +f 2966 3065 7 +f 623 694 1745 +f 3071 3088 3063 +f 3074 3065 3075 +f 3068 3065 3074 +f 3090 3063 3088 +f 3075 3065 3080 +f 1992 3357 1962 +f 3084 3065 3086 +f 3080 3065 3084 +f 3086 3065 3090 +f 3389 2868 3395 +f 3092 3104 3094 +f 3096 3104 3092 +f 3098 3104 3096 +f 3100 3104 3098 +f 3101 3104 3100 +f 3035 3094 3104 +f 3388 3389 3371 +f 3395 3403 3389 +f 3069 3107 3065 +f 3398 3396 218 +f 3111 3035 3109 +f 3113 3035 3111 +f 3114 3035 3113 +f 3116 3035 3114 +f 3119 3035 3116 +f 3124 3035 3119 +f 3094 3035 3124 +f 1191 3109 3035 +f 1185 1184 3035 +f 1200 1198 7 +f 3360 3362 3387 +f 3371 3360 3388 +f 3129 7 3132 +f 3400 3402 3395 +f 3395 2868 3400 +f 3065 3160 7 +f 3137 7 3141 +f 666 3400 2890 +f 264 10 3401 +f 3160 3065 3162 +f 666 54 3400 +f 3162 3065 3167 +f 3167 3065 3107 +f 225 3394 205 +f 3397 1218 3404 +f 3394 225 3404 +f 3412 874 3411 +f 3411 874 3410 +f 882 874 3412 +f 3410 874 3409 +f 3408 3409 1769 +f 3407 3408 1769 +f 1705 1704 3406 +f 1769 1705 3407 +f 882 883 875 +f 875 874 882 +f 1769 3409 874 +f 630 1737 1734 +f 3404 1218 3394 +f 968 965 3416 +f 3415 3416 965 +f 630 1734 622 +f 3403 3395 3402 +f 3370 3389 3403 +f 3402 3400 54 +f 1218 3397 3386 +f 3398 3386 3396 +f 85 1781 56 +f 3417 968 3416 +f 3418 3413 3417 +f 3413 968 3417 +f 3419 3414 3418 +f 3413 3418 3414 +f 47 56 3383 +f 3426 3427 3421 +f 3428 3463 3424 +f 652 1750 1755 +f 649 1750 652 +f 3396 3386 3397 +f 3422 3386 3398 +f 3399 3386 3422 +f 3419 3425 3414 +f 1754 650 1755 +f 10 3384 3401 +f 3424 3423 3428 +f 3427 3428 3423 +f 3423 3420 3427 +f 3420 3421 3427 +f 3421 3425 3426 +f 3419 3426 3425 +f 2914 3429 3405 +f 2914 3405 1714 +f 3401 3385 3399 +f 3429 3430 3406 +f 3429 3406 3405 +f 3431 3432 322 +f 3430 3433 3407 +f 3430 3407 3406 +f 3433 3434 3408 +f 3433 3408 3407 +f 1737 630 1698 +f 1218 1222 3431 +f 3434 3435 3409 +f 3434 3409 3408 +f 3394 3441 205 +f 3435 3436 3410 +f 3435 3410 3409 +f 3436 3437 3411 +f 3436 3411 3410 +f 589 1697 1698 +f 3437 3438 3412 +f 3437 3412 3411 +f 589 1698 630 +f 882 3412 1116 +f 3438 1116 3412 +f 971 1226 3415 +f 3439 3415 1226 +f 3439 3440 3416 +f 3439 3416 3415 +f 219 232 3277 +f 3440 3442 3417 +f 3440 3417 3416 +f 1709 586 1706 +f 3442 3443 3418 +f 3442 3418 3417 +f 3443 3444 3419 +f 3443 3419 3418 +f 3444 3445 3419 +f 3446 1248 3413 +f 968 3413 1248 +f 3432 3431 1222 +f 3431 3441 1218 +f 3441 3394 1218 +f 235 3295 3286 +f 3446 3413 3414 +f 3446 3414 3447 +f 1218 3386 3190 +f 3447 3414 3448 +f 1719 1778 614 +f 3445 3449 3426 +f 3445 3426 3419 +f 744 614 1778 +f 3449 3450 3427 +f 3449 3427 3426 +f 622 1734 1724 +f 3450 3451 3428 +f 3450 3428 3427 +f 3451 64 3428 +f 614 622 1719 +f 3421 3420 3452 +f 3421 3452 3453 +f 622 1724 1719 +f 3452 3420 3423 +f 3452 3423 3454 +f 16 525 528 +f 45 3391 16 +f 3454 3423 3424 +f 3454 3424 3455 +f 1020 1229 3424 +f 3455 3424 1229 +f 67 3390 51 +f 3456 3448 3425 +f 3414 3425 3448 +f 3382 3383 2058 +f 3456 3425 3421 +f 3456 3421 3453 +f 2049 3481 2047 +f 3434 3433 55 +f 1781 534 56 +f 3433 3430 55 +f 2914 2913 55 +f 3429 2914 55 +f 1142 3438 1225 +f 1139 3438 1142 +f 3430 3429 55 +f 3434 55 3435 +f 3436 3439 3437 +f 234 3296 3295 +f 3437 1225 3438 +f 3438 1139 1116 +f 235 234 3295 +f 3442 3440 55 +f 1226 3437 3439 +f 1225 3437 1226 +f 223 3301 233 +f 3439 3436 3440 +f 3440 3436 55 +f 3442 55 3443 +f 3443 55 3444 +f 3445 3444 55 +f 223 3306 3301 +f 3447 3448 3446 +f 3448 3453 3446 +f 3445 55 3449 +f 3450 3449 55 +f 64 3451 55 +f 3450 55 3451 +f 3456 3453 3448 +f 1248 3446 3453 +f 1248 3453 3452 +f 1248 3452 3454 +f 1248 3454 3455 +f 1248 3455 1229 +f 223 3275 3306 +f 536 3457 275 +f 1247 275 3457 +f 3458 1247 3457 +f 536 182 3457 +f 233 3305 3296 +f 3460 1247 3458 +f 3460 3459 1247 +f 231 3285 3277 +f 3459 309 1247 +f 3475 109 3358 +f 390 3461 3462 +f 275 3277 536 +f 181 3458 3457 +f 3462 3461 2049 +f 3461 412 3481 +f 179 3459 180 +f 1474 3462 2049 +f 3481 3476 2047 +f 3462 1620 390 +f 181 180 3458 +f 180 3460 3458 +f 1620 3462 1474 +f 1023 1021 3464 +f 3464 1020 3463 +f 3424 3463 1020 +f 231 262 3278 +f 1058 1056 3467 +f 3468 1058 3467 +f 3465 3466 1056 +f 3466 3467 1056 +f 232 231 3277 +f 3468 3477 1058 +f 3469 3465 1056 +f 3285 231 3278 +f 3470 1058 3477 +f 3477 3479 3470 +f 3479 3480 3471 +f 3471 3470 3479 +f 15 14 3472 +f 3472 3471 15 +f 3480 15 3471 +f 3358 3476 3475 +f 3474 3473 20 +f 14 20 3473 +f 20 32 3474 +f 3473 3472 14 +f 3310 3309 3316 +f 3309 3308 27 +f 3299 3335 27 +f 1082 27 3334 +f 109 114 3358 +f 41 43 1063 +f 1065 1063 43 +f 43 50 1065 +f 1066 1065 50 +f 50 1084 1066 +f 38 41 1063 +f 36 38 3478 +f 3478 3474 36 +f 1063 3478 38 +f 64 3463 3428 +f 3461 3481 2049 +f 3358 2047 3476 +f 64 68 3464 +f 64 3464 3463 +f 1023 3464 69 +f 68 69 3464 +f 61 60 3469 +f 61 3469 1033 +f 60 70 3465 +f 60 3465 3469 +f 72 3466 3465 +f 72 3465 70 +f 72 75 3467 +f 72 3467 3466 +f 75 84 3468 +f 75 3468 3467 +f 223 220 3275 +f 86 101 3468 +f 84 86 3468 +f 1058 3470 90 +f 3277 3276 219 +f 90 3470 3471 +f 90 3471 92 +f 92 3471 3472 +f 92 3472 93 +f 93 3472 3473 +f 93 3473 94 +f 3475 3476 468 +f 94 3473 3474 +f 94 3474 95 +f 3475 468 464 +f 3477 3468 101 +f 95 3474 3478 +f 95 3478 96 +f 3475 464 109 +f 101 104 3477 +f 3479 3477 104 +f 468 3481 412 +f 1063 98 3478 +f 96 3478 98 +f 3481 468 3476 +f 104 107 3479 +f 107 112 3480 +f 107 3480 3479 +f 112 12 15 +f 112 15 3480 +# 6982 faces + + #end of obj_0 + diff --git a/resources/meshes/Hellbot_Magna_2_230.obj b/resources/meshes/Hellbot_Magna_2_230.obj new file mode 100644 index 0000000000..0a23384817 --- /dev/null +++ b/resources/meshes/Hellbot_Magna_2_230.obj @@ -0,0 +1,924 @@ +# Exported from 3D Builder +mtllib Hellbot_Magna_2_230.mtl + +o Object.1 +v 112.500000 117.499786 0.999789 188 188 188 +v -112.500008 117.499786 0.999789 188 188 188 +v -117.500000 112.499794 -1.000200 188 188 188 +v -112.500008 117.499786 -1.000208 188 188 188 +v -71.801117 -118.044769 -0.999806 188 188 188 +v -71.132141 -118.454727 -0.999806 188 188 188 +v -70.535538 -118.964279 -0.999805 188 188 188 +v 71.321274 -118.163330 -0.999806 188 188 188 +v 72.108124 -117.798447 -0.999807 188 188 188 +v 72.946182 -117.575027 1.000190 188 188 188 +v 73.810242 -117.499802 1.000190 188 188 188 +v 73.810242 -117.499802 -0.999807 188 188 188 +v 117.500000 -112.499817 -0.999816 188 188 188 +v 117.438446 -113.281998 -0.999815 188 188 188 +v 112.500000 -117.499802 -0.999807 188 188 188 +v 117.438446 -113.281998 1.000183 188 188 188 +v 117.500000 -112.499817 1.000182 188 188 188 +v 117.500000 112.499794 -1.000200 188 188 188 +v 117.500000 112.499794 0.999797 188 188 188 +v 117.438446 113.281960 -1.000201 188 188 188 +v 117.438446 113.281960 0.999797 188 188 188 +v 117.255280 114.044876 0.999794 188 188 188 +v 116.955032 114.769745 -1.000203 188 188 188 +v 116.955032 114.769745 0.999793 188 188 188 +v 116.545074 115.438713 0.999792 188 188 188 +v 116.035522 116.035316 0.999792 188 188 188 +v 116.035522 116.035316 -1.000206 188 188 188 +v 115.438919 116.544868 -1.000207 188 188 188 +v 115.438919 116.544868 0.999790 188 188 188 +v 114.769943 116.954811 -1.000207 188 188 188 +v 114.045090 117.255066 0.999789 188 188 188 +v 114.769943 116.954819 0.999789 188 188 188 +v 113.282166 117.438225 -1.000208 188 188 188 +v 71.321274 -118.163330 1.000192 188 188 188 +v 58.189739 -127.499786 -0.999790 188 188 188 +v 70.609329 -118.658691 -0.999805 188 188 188 +v 60.678722 -126.836258 -0.999791 188 188 188 +v 59.891872 -127.201157 -0.999791 188 188 188 +v 61.390667 -126.340897 -0.999792 188 188 188 +v 61.390667 -126.340897 1.000205 188 188 188 +v -114.769958 116.954819 0.999789 188 188 188 +v -115.438934 116.544868 -1.000207 188 188 188 +v -115.438934 116.544868 0.999790 188 188 188 +v -116.035538 116.035316 -1.000206 188 188 188 +v -116.545090 115.438713 -1.000205 188 188 188 +v -116.545090 115.438713 0.999792 188 188 188 +v -116.955032 114.769745 0.999793 188 188 188 +v -117.255287 114.044876 0.999794 188 188 188 +v -117.438446 113.281960 -1.000201 188 188 188 +v -117.255287 114.044876 -1.000203 188 188 188 +v -117.438446 113.281960 0.999797 188 188 188 +v -117.500000 112.499794 0.999797 188 188 188 +v -116.955032 114.769745 -1.000203 188 188 188 +v -116.035538 116.035316 0.999792 188 188 188 +v -114.045090 117.255066 0.999789 188 188 188 +v -114.769958 116.954811 -1.000207 188 188 188 +v -117.500000 -112.499817 1.000182 188 188 188 +v -117.500000 -112.499817 -0.999816 188 188 188 +v -117.438446 -113.281998 -0.999815 188 188 188 +v -117.438446 -113.281998 1.000183 188 188 188 +v -117.255287 -114.044907 -0.999813 188 188 188 +v -74.071075 -117.499802 -0.999807 188 188 188 +v -116.955032 -114.769775 1.000185 188 188 188 +v -117.255287 -114.044907 1.000184 188 188 188 +v -116.545090 -115.438751 1.000187 188 188 188 +v -116.035538 -116.035355 -0.999810 188 188 188 +v -116.545090 -115.438751 -0.999811 188 188 188 +v -116.035538 -116.035355 1.000188 188 188 188 +v -115.438934 -116.544891 -0.999809 188 188 188 +v -115.438934 -116.544891 1.000188 188 188 188 +v -114.769958 -116.954834 1.000189 188 188 188 +v -114.769958 -116.954834 -0.999808 188 188 188 +v -114.045090 -117.255081 -0.999808 188 188 188 +v -113.282173 -117.438248 -0.999807 188 188 188 +v -113.282173 -117.438248 1.000190 188 188 188 +v -114.045090 -117.255081 1.000189 188 188 188 +v -112.500008 -117.499802 -0.999807 188 188 188 +v -112.500008 -117.499802 1.000190 188 188 188 +v -74.071075 -117.499802 1.000190 188 188 188 +v -116.955032 -114.769775 -0.999812 188 188 188 +v -73.288895 -117.561371 1.000190 188 188 188 +v -72.525986 -117.744522 1.000190 188 188 188 +v -71.801117 -118.044769 1.000190 188 188 188 +v -70.535538 -118.964279 1.000193 188 188 188 +v -71.132141 -118.454727 1.000192 188 188 188 +v -63.464474 -126.035324 1.000204 188 188 188 +v -62.198891 -126.954819 -0.999791 188 188 188 +v -62.867863 -126.544876 1.000205 188 188 188 +v -61.474022 -127.255066 -0.999791 188 188 188 +v -62.198891 -126.954819 1.000206 188 188 188 +v -59.928940 -127.499786 -0.999790 188 188 188 +v -60.711113 -127.438232 -0.999790 188 188 188 +v -60.711113 -127.438232 1.000206 188 188 188 +v -61.474022 -127.255066 1.000206 188 188 188 +v -59.928940 -127.499786 1.000208 188 188 188 +v 58.189739 -127.499786 1.000208 188 188 188 +v 59.053814 -127.424561 1.000206 188 188 188 +v 59.891872 -127.201157 1.000206 188 188 188 +v 60.678722 -126.836258 1.000205 188 188 188 +v 59.053814 -127.424561 -0.999790 188 188 188 +v -62.867863 -126.544876 -0.999792 188 188 188 +v 70.609329 -118.658691 1.000192 188 188 188 +v 114.045090 117.255066 -1.000208 188 188 188 +v 116.545074 115.438713 -1.000205 188 188 188 +v 117.255280 114.044876 -1.000203 188 188 188 +v 117.255280 -114.044907 1.000184 188 188 188 +v 116.955032 -114.769775 1.000185 188 188 188 +v 113.282166 -117.438248 -0.999807 188 188 188 +v 114.769943 -116.954834 -0.999808 188 188 188 +v 116.955032 -114.769775 -0.999812 188 188 188 +v 116.545074 -115.438751 1.000187 188 188 188 +v 116.035522 -116.035355 1.000188 188 188 188 +v 115.438919 -116.544891 1.000188 188 188 188 +v 116.035522 -116.035355 -0.999810 188 188 188 +v 114.769943 -116.954834 1.000189 188 188 188 +v 114.045090 -117.255081 1.000189 188 188 188 +v 113.282166 -117.438248 1.000190 188 188 188 +v 114.045090 -117.255081 -0.999808 188 188 188 +v 112.500000 -117.499802 1.000190 188 188 188 +v 115.438919 -116.544891 -0.999809 188 188 188 +v 116.545074 -115.438751 -0.999811 188 188 188 +v 117.255280 -114.044907 -0.999813 188 188 188 +v 72.108124 -117.798447 1.000190 188 188 188 +v -63.464474 -126.035324 -0.999793 188 188 188 +v -72.525986 -117.744522 -0.999807 188 188 188 +v -73.288895 -117.561371 -0.999807 188 188 188 +v -114.045090 117.255066 -1.000208 188 188 188 +v -113.282173 117.438225 0.999789 188 188 188 +v -113.282173 117.438225 -1.000208 188 188 188 +v 72.946182 -117.575027 -0.999807 188 188 188 +v 113.282166 117.438225 0.999789 188 188 188 +v 112.500000 117.499786 -1.000208 188 188 188 + +v 112.500000 117.499786 0.999789 188 188 188 +v -112.500008 117.499786 -1.000208 188 188 188 +v -112.500008 117.499786 0.999789 188 188 188 +v -112.500008 117.499786 -1.000208 188 188 188 +v -113.282173 117.438225 -1.000208 188 188 188 +v -112.500008 117.499786 -1.000208 188 188 188 +v -117.500000 112.499794 -1.000200 188 188 188 +v -112.500008 117.499786 -1.000208 188 188 188 +v -117.500000 -112.499817 -0.999816 188 188 188 +v -112.500008 117.499786 -1.000208 188 188 188 +v -74.071075 -117.499802 -0.999807 188 188 188 +v -112.500008 117.499786 -1.000208 188 188 188 +v -73.288895 -117.561371 -0.999807 188 188 188 +v -112.500008 117.499786 -1.000208 188 188 188 +v -72.525986 -117.744522 -0.999807 188 188 188 +v -112.500008 117.499786 -1.000208 188 188 188 +v -71.801117 -118.044769 -0.999806 188 188 188 +v -112.500008 117.499786 -1.000208 188 188 188 +v -71.132141 -118.454727 -0.999806 188 188 188 +v -112.500008 117.499786 -1.000208 188 188 188 +v -70.535538 -118.964279 -0.999805 188 188 188 +v -112.500008 117.499786 -1.000208 188 188 188 +v 71.321274 -118.163330 -0.999806 188 188 188 +v -112.500008 117.499786 -1.000208 188 188 188 +v 72.108124 -117.798447 -0.999807 188 188 188 +v -112.500008 117.499786 -1.000208 188 188 188 +v 72.108124 -117.798447 -0.999807 188 188 188 +v 72.946182 -117.575027 -0.999807 188 188 188 +v 72.946182 -117.575027 1.000190 188 188 188 +v 72.946182 -117.575027 -0.999807 188 188 188 +v 73.810242 -117.499802 1.000190 188 188 188 +v 72.946182 -117.575027 -0.999807 188 188 188 +v 73.810242 -117.499802 1.000190 188 188 188 +v 73.810242 -117.499802 -0.999807 188 188 188 +v 112.500000 -117.499802 -0.999807 188 188 188 +v 73.810242 -117.499802 -0.999807 188 188 188 +v 112.500000 -117.499802 -0.999807 188 188 188 +v 117.500000 -112.499817 -0.999816 188 188 188 +v 117.438446 -113.281998 -0.999815 188 188 188 +v 117.500000 -112.499817 -0.999816 188 188 188 +v 117.438446 -113.281998 1.000183 188 188 188 +v 117.500000 -112.499817 -0.999816 188 188 188 +v 117.500000 -112.499817 1.000182 188 188 188 +v 117.500000 -112.499817 -0.999816 188 188 188 +v 117.500000 -112.499817 1.000182 188 188 188 +v 117.500000 112.499794 -1.000200 188 188 188 +v 117.500000 112.499794 0.999797 188 188 188 +v 117.500000 112.499794 -1.000200 188 188 188 +v 117.500000 112.499794 0.999797 188 188 188 +v 117.438446 113.281960 -1.000201 188 188 188 +v 117.438446 113.281960 0.999797 188 188 188 +v 117.438446 113.281960 -1.000201 188 188 188 +v 117.438446 113.281960 0.999797 188 188 188 +v 117.255280 114.044876 -1.000203 188 188 188 +v 117.255280 114.044876 0.999794 188 188 188 +v 117.255280 114.044876 -1.000203 188 188 188 +v 117.255280 114.044876 0.999794 188 188 188 +v 116.955032 114.769745 -1.000203 188 188 188 +v 116.955032 114.769745 0.999793 188 188 188 +v 116.955032 114.769745 -1.000203 188 188 188 +v 116.955032 114.769745 0.999793 188 188 188 +v 116.545074 115.438713 -1.000205 188 188 188 +v 116.545074 115.438713 0.999792 188 188 188 +v 116.545074 115.438713 -1.000205 188 188 188 +v 116.545074 115.438713 0.999792 188 188 188 +v 116.035522 116.035316 -1.000206 188 188 188 +v 116.035522 116.035316 0.999792 188 188 188 +v 116.035522 116.035316 -1.000206 188 188 188 +v 116.035522 116.035316 0.999792 188 188 188 +v 115.438919 116.544868 -1.000207 188 188 188 +v 115.438919 116.544868 0.999790 188 188 188 +v 115.438919 116.544868 -1.000207 188 188 188 +v 115.438919 116.544868 0.999790 188 188 188 +v 114.769943 116.954811 -1.000207 188 188 188 +v 114.769943 116.954819 0.999789 188 188 188 +v 114.769943 116.954811 -1.000207 188 188 188 +v 114.769943 116.954819 0.999789 188 188 188 +v 114.045090 117.255066 -1.000208 188 188 188 +v 114.045090 117.255066 0.999789 188 188 188 +v 114.045090 117.255066 -1.000208 188 188 188 +v 114.045090 117.255066 0.999789 188 188 188 +v 113.282166 117.438225 -1.000208 188 188 188 +v 113.282166 117.438225 0.999789 188 188 188 +v 113.282166 117.438225 -1.000208 188 188 188 +v 112.500000 117.499786 -1.000208 188 188 188 +v 71.321274 -118.163330 -0.999806 188 188 188 +v 71.321274 -118.163330 1.000192 188 188 188 +v 71.321274 -118.163330 -0.999806 188 188 188 +v 70.609329 -118.658691 -0.999805 188 188 188 +v 71.321274 -118.163330 -0.999806 188 188 188 +v -63.464474 -126.035324 -0.999793 188 188 188 +v 70.609329 -118.658691 -0.999805 188 188 188 +v -59.928940 -127.499786 -0.999790 188 188 188 +v 70.609329 -118.658691 -0.999805 188 188 188 +v 58.189739 -127.499786 -0.999790 188 188 188 +v 70.609329 -118.658691 -0.999805 188 188 188 +v 59.053814 -127.424561 -0.999790 188 188 188 +v 70.609329 -118.658691 -0.999805 188 188 188 +v 59.891872 -127.201157 -0.999791 188 188 188 +v 70.609329 -118.658691 -0.999805 188 188 188 +v 60.678722 -126.836258 -0.999791 188 188 188 +v 70.609329 -118.658691 -0.999805 188 188 188 +v 61.390667 -126.340897 -0.999792 188 188 188 +v 70.609329 -118.658691 -0.999805 188 188 188 +v 61.390667 -126.340897 1.000205 188 188 188 +v 70.609329 -118.658691 -0.999805 188 188 188 +v -114.045090 117.255066 0.999789 188 188 188 +v -114.045090 117.255066 -1.000208 188 188 188 +v -117.500000 112.499794 -1.000200 188 188 188 +v -114.769958 116.954811 -1.000207 188 188 188 +v -114.045090 117.255066 -1.000208 188 188 188 +v -117.500000 112.499794 -1.000200 188 188 188 +v -114.769958 116.954811 -1.000207 188 188 188 +v -115.438934 116.544868 -1.000207 188 188 188 +v -114.769958 116.954811 -1.000207 188 188 188 +v -114.769958 116.954819 0.999789 188 188 188 +v -115.438934 116.544868 -1.000207 188 188 188 +v -115.438934 116.544868 0.999790 188 188 188 +v -115.438934 116.544868 -1.000207 188 188 188 +v -115.438934 116.544868 0.999790 188 188 188 +v -116.035538 116.035316 -1.000206 188 188 188 +v -116.035538 116.035316 0.999792 188 188 188 +v -116.035538 116.035316 -1.000206 188 188 188 +v -117.500000 112.499794 -1.000200 188 188 188 +v -116.545090 115.438713 -1.000205 188 188 188 +v -116.035538 116.035316 -1.000206 188 188 188 +v -117.500000 112.499794 -1.000200 188 188 188 +v -116.545090 115.438713 -1.000205 188 188 188 +v -116.955032 114.769745 -1.000203 188 188 188 +v -116.545090 115.438713 -1.000205 188 188 188 +v -116.545090 115.438713 0.999792 188 188 188 +v -116.955032 114.769745 -1.000203 188 188 188 +v -116.955032 114.769745 0.999793 188 188 188 +v -116.955032 114.769745 -1.000203 188 188 188 +v -116.955032 114.769745 0.999793 188 188 188 +v -117.255287 114.044876 -1.000203 188 188 188 +v -117.255287 114.044876 0.999794 188 188 188 +v -117.255287 114.044876 -1.000203 188 188 188 +v -117.500000 112.499794 -1.000200 188 188 188 +v -117.438446 113.281960 -1.000201 188 188 188 +v -117.255287 114.044876 -1.000203 188 188 188 +v -117.500000 112.499794 -1.000200 188 188 188 +v -117.438446 113.281960 -1.000201 188 188 188 +v -117.438446 113.281960 0.999797 188 188 188 +v -117.500000 112.499794 -1.000200 188 188 188 +v -117.438446 113.281960 0.999797 188 188 188 +v -117.255287 114.044876 0.999794 188 188 188 +v -117.438446 113.281960 -1.000201 188 188 188 +v -117.500000 112.499794 -1.000200 188 188 188 +v -117.255287 114.044876 -1.000203 188 188 188 +v -116.955032 114.769745 -1.000203 188 188 188 +v -116.545090 115.438713 0.999792 188 188 188 +v -116.035538 116.035316 0.999792 188 188 188 +v -116.545090 115.438713 -1.000205 188 188 188 +v -117.500000 112.499794 -1.000200 188 188 188 +v -116.035538 116.035316 -1.000206 188 188 188 +v -115.438934 116.544868 -1.000207 188 188 188 +v -114.769958 116.954819 0.999789 188 188 188 +v -114.045090 117.255066 0.999789 188 188 188 +v -114.769958 116.954811 -1.000207 188 188 188 +v -114.045090 117.255066 -1.000208 188 188 188 +v -113.282173 117.438225 0.999789 188 188 188 +v -113.282173 117.438225 -1.000208 188 188 188 +v -117.500000 112.499794 0.999797 188 188 188 +v -117.500000 -112.499817 -0.999816 188 188 188 +v -117.500000 -112.499817 1.000182 188 188 188 +v -117.500000 -112.499817 -0.999816 188 188 188 +v -117.500000 -112.499817 1.000182 188 188 188 +v -117.438446 -113.281998 -0.999815 188 188 188 +v -117.438446 -113.281998 1.000183 188 188 188 +v -117.438446 -113.281998 -0.999815 188 188 188 +v -74.071075 -117.499802 -0.999807 188 188 188 +v -117.255287 -114.044907 -0.999813 188 188 188 +v -117.438446 -113.281998 -0.999815 188 188 188 +v -74.071075 -117.499802 -0.999807 188 188 188 +v -117.255287 -114.044907 -0.999813 188 188 188 +v -116.955032 -114.769775 -0.999812 188 188 188 +v -117.255287 -114.044907 -0.999813 188 188 188 +v -117.255287 -114.044907 1.000184 188 188 188 +v -116.955032 -114.769775 -0.999812 188 188 188 +v -116.955032 -114.769775 1.000185 188 188 188 +v -116.955032 -114.769775 -0.999812 188 188 188 +v -116.955032 -114.769775 1.000185 188 188 188 +v -116.545090 -115.438751 -0.999811 188 188 188 +v -116.545090 -115.438751 1.000187 188 188 188 +v -116.545090 -115.438751 -0.999811 188 188 188 +v -74.071075 -117.499802 -0.999807 188 188 188 +v -116.035538 -116.035355 -0.999810 188 188 188 +v -116.545090 -115.438751 -0.999811 188 188 188 +v -74.071075 -117.499802 -0.999807 188 188 188 +v -116.035538 -116.035355 -0.999810 188 188 188 +v -115.438934 -116.544891 -0.999809 188 188 188 +v -116.035538 -116.035355 -0.999810 188 188 188 +v -116.035538 -116.035355 1.000188 188 188 188 +v -115.438934 -116.544891 -0.999809 188 188 188 +v -115.438934 -116.544891 1.000188 188 188 188 +v -115.438934 -116.544891 -0.999809 188 188 188 +v -115.438934 -116.544891 1.000188 188 188 188 +v -114.769958 -116.954834 -0.999808 188 188 188 +v -114.769958 -116.954834 1.000189 188 188 188 +v -114.769958 -116.954834 -0.999808 188 188 188 +v -74.071075 -117.499802 -0.999807 188 188 188 +v -114.045090 -117.255081 -0.999808 188 188 188 +v -114.769958 -116.954834 -0.999808 188 188 188 +v -74.071075 -117.499802 -0.999807 188 188 188 +v -114.045090 -117.255081 -0.999808 188 188 188 +v -112.500008 -117.499802 -0.999807 188 188 188 +v -114.045090 -117.255081 -0.999808 188 188 188 +v -113.282173 -117.438248 -0.999807 188 188 188 +v -114.045090 -117.255081 -0.999808 188 188 188 +v -114.045090 -117.255081 1.000189 188 188 188 +v -113.282173 -117.438248 -0.999807 188 188 188 +v -113.282173 -117.438248 1.000190 188 188 188 +v -112.500008 -117.499802 -0.999807 188 188 188 +v -112.500008 -117.499802 -0.999807 188 188 188 +v -113.282173 -117.438248 1.000190 188 188 188 +v -113.282173 -117.438248 -0.999807 188 188 188 +v -74.071075 -117.499802 -0.999807 188 188 188 +v -112.500008 -117.499802 1.000190 188 188 188 +v -112.500008 -117.499802 -0.999807 188 188 188 +v -112.500008 -117.499802 1.000190 188 188 188 +v -74.071075 -117.499802 -0.999807 188 188 188 +v -114.045090 -117.255081 1.000189 188 188 188 +v -114.769958 -116.954834 1.000189 188 188 188 +v -114.045090 -117.255081 -0.999808 188 188 188 +v -74.071075 -117.499802 -0.999807 188 188 188 +v -114.769958 -116.954834 -0.999808 188 188 188 +v -115.438934 -116.544891 -0.999809 188 188 188 +v -116.035538 -116.035355 1.000188 188 188 188 +v -116.545090 -115.438751 1.000187 188 188 188 +v -116.035538 -116.035355 -0.999810 188 188 188 +v -74.071075 -117.499802 -0.999807 188 188 188 +v -116.545090 -115.438751 -0.999811 188 188 188 +v -116.955032 -114.769775 -0.999812 188 188 188 +v -117.255287 -114.044907 1.000184 188 188 188 +v -117.438446 -113.281998 1.000183 188 188 188 +v -117.255287 -114.044907 -0.999813 188 188 188 +v -74.071075 -117.499802 1.000190 188 188 188 +v -74.071075 -117.499802 -0.999807 188 188 188 +v -73.288895 -117.561371 1.000190 188 188 188 +v -73.288895 -117.561371 -0.999807 188 188 188 +v -72.525986 -117.744522 1.000190 188 188 188 +v -72.525986 -117.744522 -0.999807 188 188 188 +v -71.801117 -118.044769 1.000190 188 188 188 +v -71.801117 -118.044769 -0.999806 188 188 188 +v -71.132141 -118.454727 1.000192 188 188 188 +v -71.132141 -118.454727 -0.999806 188 188 188 +v -70.535538 -118.964279 1.000193 188 188 188 +v -63.464474 -126.035324 -0.999793 188 188 188 +v -63.464474 -126.035324 1.000204 188 188 188 +v -63.464474 -126.035324 -0.999793 188 188 188 +v -63.464474 -126.035324 -0.999793 188 188 188 +v -70.535538 -118.964279 1.000193 188 188 188 +v -70.535538 -118.964279 -0.999805 188 188 188 +v -63.464474 -126.035324 1.000204 188 188 188 +v -62.867863 -126.544876 -0.999792 188 188 188 +v -62.867863 -126.544876 1.000205 188 188 188 +v -62.867863 -126.544876 -0.999792 188 188 188 +v -59.928940 -127.499786 -0.999790 188 188 188 +v -62.198891 -126.954819 -0.999791 188 188 188 +v -62.867863 -126.544876 -0.999792 188 188 188 +v -59.928940 -127.499786 -0.999790 188 188 188 +v -62.198891 -126.954819 -0.999791 188 188 188 +v -61.474022 -127.255066 -0.999791 188 188 188 +v -62.198891 -126.954819 -0.999791 188 188 188 +v -59.928940 -127.499786 -0.999790 188 188 188 +v -61.474022 -127.255066 -0.999791 188 188 188 +v -60.711113 -127.438232 -0.999790 188 188 188 +v -61.474022 -127.255066 -0.999791 188 188 188 +v -59.928940 -127.499786 -0.999790 188 188 188 +v -60.711113 -127.438232 -0.999790 188 188 188 +v -62.198891 -126.954819 1.000206 188 188 188 +v -62.867863 -126.544876 1.000205 188 188 188 +v -62.198891 -126.954819 -0.999791 188 188 188 +v -61.474022 -127.255066 1.000206 188 188 188 +v -62.198891 -126.954819 1.000206 188 188 188 +v -61.474022 -127.255066 -0.999791 188 188 188 +v -60.711113 -127.438232 1.000206 188 188 188 +v -61.474022 -127.255066 1.000206 188 188 188 +v -60.711113 -127.438232 -0.999790 188 188 188 +v -60.711113 -127.438232 1.000206 188 188 188 +v -59.928940 -127.499786 -0.999790 188 188 188 +v -59.928940 -127.499786 1.000208 188 188 188 +v 58.189739 -127.499786 -0.999790 188 188 188 +v 58.189739 -127.499786 1.000208 188 188 188 +v 59.053814 -127.424561 -0.999790 188 188 188 +v 59.053814 -127.424561 1.000206 188 188 188 +v 59.891872 -127.201157 -0.999791 188 188 188 +v 59.891872 -127.201157 1.000206 188 188 188 +v 60.678722 -126.836258 -0.999791 188 188 188 +v 61.390667 -126.340897 1.000205 188 188 188 +v 60.678722 -126.836258 1.000205 188 188 188 +v 61.390667 -126.340897 -0.999792 188 188 188 +v 60.678722 -126.836258 1.000205 188 188 188 +v 60.678722 -126.836258 -0.999791 188 188 188 +v 61.390667 -126.340897 -0.999792 188 188 188 +v 59.891872 -127.201157 1.000206 188 188 188 +v 59.891872 -127.201157 -0.999791 188 188 188 +v 60.678722 -126.836258 -0.999791 188 188 188 +v 59.053814 -127.424561 1.000206 188 188 188 +v 59.053814 -127.424561 -0.999790 188 188 188 +v 59.891872 -127.201157 -0.999791 188 188 188 +v 58.189739 -127.499786 1.000208 188 188 188 +v 58.189739 -127.499786 -0.999790 188 188 188 +v 59.053814 -127.424561 -0.999790 188 188 188 +v 58.189739 -127.499786 -0.999790 188 188 188 +v -59.928940 -127.499786 1.000208 188 188 188 +v -59.928940 -127.499786 -0.999790 188 188 188 +v -59.928940 -127.499786 -0.999790 188 188 188 +v -62.867863 -126.544876 -0.999792 188 188 188 +v -63.464474 -126.035324 -0.999793 188 188 188 +v 71.321274 -118.163330 1.000192 188 188 188 +v 70.609329 -118.658691 1.000192 188 188 188 +v 70.609329 -118.658691 -0.999805 188 188 188 +v 113.282166 117.438225 -1.000208 188 188 188 +v 114.045090 117.255066 -1.000208 188 188 188 +v 112.500000 117.499786 -1.000208 188 188 188 +v 114.045090 117.255066 -1.000208 188 188 188 +v 114.769943 116.954811 -1.000207 188 188 188 +v 112.500000 117.499786 -1.000208 188 188 188 +v 114.769943 116.954811 -1.000207 188 188 188 +v 115.438919 116.544868 -1.000207 188 188 188 +v 112.500000 117.499786 -1.000208 188 188 188 +v 115.438919 116.544868 -1.000207 188 188 188 +v 116.035522 116.035316 -1.000206 188 188 188 +v 112.500000 117.499786 -1.000208 188 188 188 +v 116.035522 116.035316 -1.000206 188 188 188 +v 116.545074 115.438713 -1.000205 188 188 188 +v 112.500000 117.499786 -1.000208 188 188 188 +v 116.545074 115.438713 -1.000205 188 188 188 +v 116.955032 114.769745 -1.000203 188 188 188 +v 112.500000 117.499786 -1.000208 188 188 188 +v 116.955032 114.769745 -1.000203 188 188 188 +v 117.255280 114.044876 -1.000203 188 188 188 +v 112.500000 117.499786 -1.000208 188 188 188 +v 117.255280 114.044876 -1.000203 188 188 188 +v 117.438446 113.281960 -1.000201 188 188 188 +v 112.500000 117.499786 -1.000208 188 188 188 +v 117.438446 113.281960 -1.000201 188 188 188 +v 117.500000 112.499794 -1.000200 188 188 188 +v 112.500000 117.499786 -1.000208 188 188 188 +v 117.500000 112.499794 -1.000200 188 188 188 +v 73.810242 -117.499802 -0.999807 188 188 188 +v 112.500000 117.499786 -1.000208 188 188 188 +v 117.438446 -113.281998 1.000183 188 188 188 +v 117.438446 -113.281998 -0.999815 188 188 188 +v 117.255280 -114.044907 1.000184 188 188 188 +v 117.438446 -113.281998 -0.999815 188 188 188 +v 117.255280 -114.044907 1.000184 188 188 188 +v 117.255280 -114.044907 -0.999813 188 188 188 +v 116.955032 -114.769775 1.000185 188 188 188 +v 117.255280 -114.044907 -0.999813 188 188 188 +v 116.955032 -114.769775 -0.999812 188 188 188 +v 112.500000 -117.499802 -0.999807 188 188 188 +v 117.255280 -114.044907 -0.999813 188 188 188 +v 112.500000 -117.499802 -0.999807 188 188 188 +v 116.955032 -114.769775 -0.999812 188 188 188 +v 113.282166 -117.438248 -0.999807 188 188 188 +v 116.955032 -114.769775 -0.999812 188 188 188 +v 114.045090 -117.255081 -0.999808 188 188 188 +v 116.955032 -114.769775 -0.999812 188 188 188 +v 114.769943 -116.954834 -0.999808 188 188 188 +v 116.955032 -114.769775 -0.999812 188 188 188 +v 116.545074 -115.438751 -0.999811 188 188 188 +v 116.955032 -114.769775 -0.999812 188 188 188 +v 116.545074 -115.438751 1.000187 188 188 188 +v 116.545074 -115.438751 -0.999811 188 188 188 +v 116.035522 -116.035355 1.000188 188 188 188 +v 116.545074 -115.438751 -0.999811 188 188 188 +v 116.035522 -116.035355 1.000188 188 188 188 +v 116.035522 -116.035355 -0.999810 188 188 188 +v 115.438919 -116.544891 1.000188 188 188 188 +v 116.035522 -116.035355 -0.999810 188 188 188 +v 115.438919 -116.544891 -0.999809 188 188 188 +v 114.769943 -116.954834 -0.999808 188 188 188 +v 116.035522 -116.035355 -0.999810 188 188 188 +v 114.769943 -116.954834 -0.999808 188 188 188 +v 115.438919 -116.544891 -0.999809 188 188 188 +v 114.769943 -116.954834 1.000189 188 188 188 +v 114.769943 -116.954834 -0.999808 188 188 188 +v 114.045090 -117.255081 1.000189 188 188 188 +v 114.045090 -117.255081 -0.999808 188 188 188 +v 113.282166 -117.438248 1.000190 188 188 188 +v 113.282166 -117.438248 -0.999807 188 188 188 +v 115.438919 -116.544891 1.000188 188 188 188 +v 114.769943 -116.954834 1.000189 188 188 188 +v 115.438919 -116.544891 -0.999809 188 188 188 +v 116.035522 -116.035355 -0.999810 188 188 188 +v 114.769943 -116.954834 -0.999808 188 188 188 +v 116.545074 -115.438751 -0.999811 188 188 188 +v 114.045090 -117.255081 1.000189 188 188 188 +v 114.045090 -117.255081 -0.999808 188 188 188 +v 114.769943 -116.954834 -0.999808 188 188 188 +v 113.282166 -117.438248 1.000190 188 188 188 +v 113.282166 -117.438248 -0.999807 188 188 188 +v 114.045090 -117.255081 -0.999808 188 188 188 +v 112.500000 -117.499802 1.000190 188 188 188 +v 112.500000 -117.499802 -0.999807 188 188 188 +v 113.282166 -117.438248 -0.999807 188 188 188 +v 116.955032 -114.769775 1.000185 188 188 188 +v 116.545074 -115.438751 1.000187 188 188 188 +v 116.955032 -114.769775 -0.999812 188 188 188 +v 117.255280 -114.044907 -0.999813 188 188 188 +v 112.500000 -117.499802 -0.999807 188 188 188 +v 117.438446 -113.281998 -0.999815 188 188 188 +v 117.500000 -112.499817 -0.999816 188 188 188 +v 73.810242 -117.499802 -0.999807 188 188 188 +v 117.500000 112.499794 -1.000200 188 188 188 +v 112.500000 -117.499802 1.000190 188 188 188 +v 73.810242 -117.499802 1.000190 188 188 188 +v 112.500000 -117.499802 -0.999807 188 188 188 +v 73.810242 -117.499802 -0.999807 188 188 188 +v 72.946182 -117.575027 -0.999807 188 188 188 +v 112.500000 117.499786 -1.000208 188 188 188 +v 72.946182 -117.575027 1.000190 188 188 188 +v 72.108124 -117.798447 1.000190 188 188 188 +v 72.108124 -117.798447 -0.999807 188 188 188 +v 72.108124 -117.798447 1.000190 188 188 188 +v 71.321274 -118.163330 -0.999806 188 188 188 +v 72.108124 -117.798447 -0.999807 188 188 188 +v -63.464474 -126.035324 -0.999793 188 188 188 +v -70.535538 -118.964279 -0.999805 188 188 188 +v 71.321274 -118.163330 -0.999806 188 188 188 +v -70.535538 -118.964279 -0.999805 188 188 188 +v -70.535538 -118.964279 1.000193 188 188 188 +v -71.132141 -118.454727 -0.999806 188 188 188 +v -71.132141 -118.454727 -0.999806 188 188 188 +v -71.132141 -118.454727 1.000192 188 188 188 +v -71.801117 -118.044769 -0.999806 188 188 188 +v -71.801117 -118.044769 -0.999806 188 188 188 +v -71.801117 -118.044769 1.000190 188 188 188 +v -72.525986 -117.744522 -0.999807 188 188 188 +v -72.525986 -117.744522 -0.999807 188 188 188 +v -72.525986 -117.744522 1.000190 188 188 188 +v -73.288895 -117.561371 -0.999807 188 188 188 +v -73.288895 -117.561371 -0.999807 188 188 188 +v -73.288895 -117.561371 1.000190 188 188 188 +v -74.071075 -117.499802 -0.999807 188 188 188 +v -74.071075 -117.499802 -0.999807 188 188 188 +v -117.438446 -113.281998 -0.999815 188 188 188 +v -117.500000 -112.499817 -0.999816 188 188 188 +v -117.500000 -112.499817 -0.999816 188 188 188 +v -117.500000 112.499794 0.999797 188 188 188 +v -117.500000 112.499794 -1.000200 188 188 188 +v -117.500000 112.499794 -1.000200 188 188 188 +v -114.045090 117.255066 -1.000208 188 188 188 +v -113.282173 117.438225 -1.000208 188 188 188 +v -113.282173 117.438225 0.999789 188 188 188 +v -112.500008 117.499786 0.999789 188 188 188 +v -113.282173 117.438225 -1.000208 188 188 188 +v 112.500000 117.499786 -1.000208 188 188 188 +v 72.946182 -117.575027 -0.999807 188 188 188 +v -112.500008 117.499786 -1.000208 188 188 188 +v 112.500000 117.499786 0.999789 188 188 188 +v 113.282166 117.438225 0.999789 188 188 188 +v 112.500000 117.499786 -1.000208 188 188 188 + +f 1 132 4 +f 2 133 134 +f 129 135 136 +f 3 137 138 +f 58 139 140 +f 62 141 142 +f 126 143 144 +f 125 145 146 +f 5 147 148 +f 6 149 150 +f 7 151 152 +f 8 153 154 +f 9 155 156 +f 130 157 158 +f 10 159 160 +f 11 161 162 +f 163 164 12 +f 15 165 166 +f 167 168 13 +f 14 169 170 +f 16 171 172 +f 17 173 174 +f 175 176 18 +f 19 177 178 +f 179 180 20 +f 21 181 182 +f 183 184 105 +f 22 185 186 +f 187 188 23 +f 24 189 190 +f 191 192 104 +f 25 193 194 +f 195 196 27 +f 26 197 198 +f 199 200 28 +f 29 201 202 +f 203 204 30 +f 32 205 206 +f 207 208 103 +f 31 209 210 +f 211 212 33 +f 131 213 214 +f 215 216 217 +f 123 34 218 +f 219 36 220 +f 221 124 222 +f 91 223 224 +f 35 225 226 +f 100 227 228 +f 38 229 230 +f 37 231 232 +f 39 233 234 +f 40 235 236 +f 102 237 238 +f 55 128 127 +f 56 239 240 +f 241 242 243 +f 244 42 245 +f 246 41 247 +f 43 248 249 +f 44 250 251 +f 54 252 253 +f 45 254 255 +f 256 257 258 +f 259 53 260 +f 261 46 262 +f 47 263 264 +f 50 265 266 +f 48 267 268 +f 49 269 270 +f 271 272 273 +f 274 51 275 +f 52 276 277 +f 278 279 280 +f 281 282 283 +f 284 285 286 +f 287 288 289 +f 290 291 292 +f 293 294 295 +f 57 296 297 +f 59 298 299 +f 60 300 301 +f 61 302 303 +f 304 305 306 +f 307 80 308 +f 309 64 310 +f 63 311 312 +f 67 313 314 +f 65 315 316 +f 66 317 318 +f 319 320 321 +f 322 69 323 +f 324 68 325 +f 70 326 327 +f 72 328 329 +f 71 330 331 +f 73 332 333 +f 334 335 336 +f 337 77 338 +f 339 74 340 +f 341 76 342 +f 75 343 344 +f 78 345 346 +f 347 348 349 +f 350 351 352 +f 79 353 354 +f 355 356 357 +f 358 359 360 +f 361 362 363 +f 364 365 366 +f 367 368 369 +f 81 370 371 +f 82 372 373 +f 83 374 375 +f 85 376 377 +f 84 378 379 +f 86 380 381 +f 101 382 383 +f 384 385 386 +f 88 387 388 +f 87 389 390 +f 391 392 393 +f 394 89 395 +f 396 90 397 +f 398 92 399 +f 400 94 401 +f 402 93 403 +f 404 405 406 +f 407 408 409 +f 410 411 412 +f 95 413 414 +f 96 415 416 +f 97 417 418 +f 98 419 420 +f 99 421 422 +f 423 424 425 +f 426 427 428 +f 429 430 431 +f 432 433 434 +f 435 436 437 +f 438 439 440 +f 441 442 443 +f 444 445 446 +f 447 448 449 +f 450 451 452 +f 453 454 455 +f 456 457 458 +f 459 460 461 +f 462 463 464 +f 465 466 467 +f 468 469 470 +f 471 472 473 +f 474 475 476 +f 477 106 478 +f 479 122 480 +f 481 107 482 +f 483 110 484 +f 485 486 487 +f 108 488 489 +f 118 490 491 +f 109 492 493 +f 121 494 495 +f 111 496 497 +f 498 112 499 +f 500 114 501 +f 502 113 503 +f 504 120 505 +f 506 507 508 +f 115 509 510 +f 511 116 512 +f 513 117 514 +f 515 119 516 +f 517 518 519 +f 520 521 522 +f 523 524 525 +f 526 527 528 +f 529 530 531 +f 532 533 534 +f 535 536 537 +f 538 539 540 +f 541 542 543 +f 544 545 546 +f 547 548 549 +f 550 551 552 +f 553 554 555 +f 556 557 558 +f 559 560 561 +f 562 563 564 +f 565 566 567 +f 568 569 570 +f 571 572 573 +f 574 575 576 +f 577 578 579 +f 580 581 582 +f 583 584 585 +f 586 587 588 + +vt 0.791673 0.050126 +vt 0.960614 0.977504 +vt 0.037522 0.977504 +vt 0.794901 0.051562 +vt 0.963823 0.977262 +vt 0.966953 0.976541 +vt 0.969927 0.975360 +vt 0.972672 0.973746 +vt 0.975119 0.971741 +vt 0.977210 0.969393 +vt 0.978892 0.966761 +vt 0.980123 0.963908 +vt 0.980875 0.960906 +vt 0.981128 0.957828 +vt 0.798339 0.052441 +vt 0.981128 0.072413 +vt 0.980875 0.069335 +vt 0.801884 0.052737 +vt 0.980123 0.066333 +vt 0.978892 0.063480 +vt 0.977210 0.060848 +vt 0.975119 0.058500 +vt 0.972672 0.056495 +vt 0.969927 0.054882 +vt 0.966953 0.053700 +vt 0.960614 0.052737 +vt 0.963823 0.052979 +vt 0.788752 0.048177 +vt 0.750931 0.017946 +vt 0.748011 0.015996 +vt 0.744782 0.014560 +vt 0.741344 0.013681 +vt 0.737799 0.013385 +vt 0.207239 0.048979 +vt 0.253201 0.013385 +vt 0.209687 0.046974 +vt 0.249993 0.013627 +vt 0.246863 0.014348 +vt 0.243889 0.015530 +vt 0.241144 0.017143 +vt 0.238696 0.019148 +vt 0.204494 0.050593 +vt 0.201520 0.051774 +vt 0.198390 0.052495 +vt 0.195181 0.052737 +vt 0.017009 0.957828 +vt 0.017009 0.072413 +vt 0.037522 0.052737 +vt 0.017261 0.069335 +vt 0.018012 0.066333 +vt 0.019244 0.063480 +vt 0.020926 0.060848 +vt 0.023017 0.058500 +vt 0.025464 0.056495 +vt 0.028209 0.054882 +vt 0.031183 0.053700 +vt 0.034313 0.052979 +vt 0.034313 0.977262 +vt 0.031183 0.976541 +vt 0.028209 0.975360 +vt 0.025464 0.973746 +vt 0.023017 0.971741 +vt 0.020926 0.969393 +vt 0.019244 0.966761 +vt 0.018012 0.963908 +vt 0.017261 0.960906 + +usemtl Mat_0 +f 123/4 31/6 131/5 +f 123/4 131/5 1/2 +f 34/1 123/4 1/2 +f 40/29 102/28 2/3 +f 99/30 40/29 2/3 +f 98/31 99/30 2/3 +f 97/32 98/31 2/3 +f 96/33 97/32 2/3 +f 85/34 96/33 2/3 +f 83/42 85/34 2/3 +f 82/43 83/42 2/3 +f 81/44 82/43 2/3 +f 79/45 81/44 2/3 +f 52/46 79/45 2/3 +f 128/58 52/46 2/3 +f 55/59 52/46 128/58 +f 51/66 52/46 48/65 +f 48/65 52/46 47/64 +f 47/64 52/46 46/63 +f 46/63 52/46 54/62 +f 54/62 52/46 43/61 +f 43/61 52/46 41/60 +f 41/60 52/46 55/59 +f 57/47 79/45 52/46 +f 75/57 78/48 76/56 +f 76/56 78/48 71/55 +f 71/55 78/48 70/54 +f 70/54 78/48 68/53 +f 68/53 78/48 65/52 +f 65/52 78/48 63/51 +f 63/51 78/48 64/50 +f 64/50 78/48 60/49 +f 60/49 78/48 57/47 +f 78/48 79/45 57/47 +f 95/35 96/33 85/34 +f 84/36 95/35 85/34 +f 93/37 95/35 84/36 +f 94/38 93/37 84/36 +f 90/39 94/38 84/36 +f 88/40 90/39 84/36 +f 86/41 88/40 84/36 +f 102/28 34/1 2/3 +f 123/4 32/7 31/6 +f 123/4 29/8 32/7 +f 123/4 26/9 29/8 +f 123/4 25/10 26/9 +f 123/4 24/11 25/10 +f 123/4 22/12 24/11 +f 123/4 21/13 22/12 +f 123/4 19/14 21/13 +f 123/4 10/15 19/14 +f 10/15 17/16 19/14 +f 10/15 16/17 17/16 +f 11/18 116/25 115/24 +f 11/18 115/24 113/23 +f 11/18 119/26 116/25 +f 119/26 117/27 116/25 +f 11/18 113/23 112/22 +f 11/18 112/22 111/21 +f 11/18 111/21 107/20 +f 11/18 107/20 106/19 +f 11/18 106/19 16/17 +f 10/15 11/18 16/17 +f 34/1 1/2 2/3 + diff --git a/resources/meshes/Hellbot_Magna_2_300.obj b/resources/meshes/Hellbot_Magna_2_300.obj new file mode 100644 index 0000000000..4f80fea99d --- /dev/null +++ b/resources/meshes/Hellbot_Magna_2_300.obj @@ -0,0 +1,952 @@ +# Exported from 3D Builder +mtllib Hellbot_Magna_2_300.mtl + +o Object.1 +v 150.000000 154.999985 0.999812 188 188 188 +v -150.782166 154.938431 -1.000188 188 188 188 +v -110.315590 -155.146835 -0.999824 188 188 188 +v -109.121323 -155.878708 -0.999823 188 188 188 +v -150.000000 154.999985 -1.000188 188 188 188 +v 110.315582 -155.146835 -0.999824 188 188 188 +v 110.773346 -155.036942 1.000176 188 188 188 +v 111.242645 -155.000015 1.000176 188 188 188 +v 110.773346 -155.036942 -0.999824 188 188 188 +v 150.000000 -155.000015 -0.999824 188 188 188 +v 111.242645 -155.000015 -0.999824 188 188 188 +v 155.000000 149.999985 -1.000182 188 188 188 +v 150.782166 154.938431 0.999812 188 188 188 +v 151.545074 154.755280 0.999812 188 188 188 +v 150.782166 154.938431 -1.000188 188 188 188 +v 152.269958 154.455017 0.999812 188 188 188 +v 152.938934 154.045074 -1.000187 188 188 188 +v 151.545074 154.755280 -1.000188 188 188 188 +v 153.535522 153.535538 0.999813 188 188 188 +v 153.535522 153.535522 -1.000187 188 188 188 +v 152.938934 154.045074 0.999813 188 188 188 +v 154.045105 152.938919 0.999814 188 188 188 +v 154.045105 152.938919 -1.000186 188 188 188 +v 154.455048 152.269943 0.999815 188 188 188 +v 154.755280 151.545074 0.999816 188 188 188 +v 154.455048 152.269943 -1.000185 188 188 188 +v 154.938446 150.782166 0.999817 188 188 188 +v 154.755280 151.545074 -1.000184 188 188 188 +v 152.269958 154.455017 -1.000188 188 188 188 +v 155.000000 -150.000015 1.000170 188 188 188 +v 154.938446 -150.782181 1.000171 188 188 188 +v 154.938446 -150.782181 -0.999829 188 188 188 +v 151.545074 -154.755295 -0.999824 188 188 188 +v 155.000000 -150.000015 -0.999830 188 188 188 +v 150.782166 -154.938431 -0.999824 188 188 188 +v 150.000000 -155.000015 1.000176 188 188 188 +v 154.755280 -151.545090 1.000172 188 188 188 +v 154.455048 -152.269974 1.000172 188 188 188 +v 154.455048 -152.269974 -0.999827 188 188 188 +v 154.755280 -151.545090 -0.999828 188 188 188 +v 154.045105 -152.938919 -0.999827 188 188 188 +v 153.535522 -153.535538 1.000174 188 188 188 +v 153.535522 -153.535538 -0.999826 188 188 188 +v 152.938934 -154.045090 1.000175 188 188 188 +v 152.938934 -154.045090 -0.999825 188 188 188 +v 151.545074 -154.755295 1.000176 188 188 188 +v 154.045105 -152.938919 1.000173 188 188 188 +v 152.269958 -154.455032 1.000175 188 188 188 +v 152.269958 -154.455032 -0.999825 188 188 188 +v 150.782166 -154.938431 1.000176 188 188 188 +v 155.000000 149.999985 0.999818 188 188 188 +v 154.938446 150.782166 -1.000183 188 188 188 +v -110.315590 -155.146835 1.000176 188 188 188 +v -110.773338 -155.036942 1.000176 188 188 188 +v -109.880669 -155.326981 1.000176 188 188 188 +v -109.479286 -155.572952 1.000177 188 188 188 +v -109.121323 -155.878708 1.000177 188 188 188 +v -109.479286 -155.572952 -0.999824 188 188 188 +v -100.878677 -164.121323 1.000187 188 188 188 +v -100.520714 -164.427048 -0.999813 188 188 188 +v -99.226662 -164.963089 -0.999812 188 188 188 +v -99.684410 -164.853195 -0.999813 188 188 188 +v -98.757355 -165.000015 -0.999812 188 188 188 +v 98.757355 -165.000015 -0.999812 188 188 188 +v 100.878677 -164.121323 1.000187 188 188 188 +v 100.878677 -164.121323 -0.999814 188 188 188 +v 100.520721 -164.427048 1.000187 188 188 188 +v 100.520721 -164.427048 -0.999813 188 188 188 +v 100.119324 -164.673019 1.000187 188 188 188 +v 99.684418 -164.853195 1.000187 188 188 188 +v 99.684418 -164.853195 -0.999813 188 188 188 +v 100.119324 -164.673019 -0.999813 188 188 188 +v 99.226669 -164.963089 1.000188 188 188 188 +v 99.226669 -164.963089 -0.999812 188 188 188 +v -98.757355 -165.000015 1.000188 188 188 188 +v -100.878677 -164.121323 -0.999814 188 188 188 +v 109.479279 -155.572952 -0.999824 188 188 188 +v -99.684410 -164.853195 1.000187 188 188 188 +v -100.119324 -164.673019 -0.999813 188 188 188 +v -100.520714 -164.427048 1.000187 188 188 188 +v -100.119324 -164.673019 1.000187 188 188 188 +v -99.226662 -164.963089 1.000188 188 188 188 +v 98.757355 -165.000015 1.000188 188 188 188 +v 109.121338 -155.878708 1.000177 188 188 188 +v 109.121338 -155.878708 -0.999823 188 188 188 +v 109.479279 -155.572952 1.000177 188 188 188 +v 110.315582 -155.146835 1.000176 188 188 188 +v 109.880676 -155.326981 1.000176 188 188 188 +v 109.880676 -155.326981 -0.999824 188 188 188 +v -109.880669 -155.326981 -0.999824 188 188 188 +v -110.773338 -155.036942 -0.999824 188 188 188 +v -111.242638 -155.000015 1.000176 188 188 188 +v -151.545074 -154.755295 -0.999824 188 188 188 +v -152.938934 -154.045090 -0.999825 188 188 188 +v -111.242638 -155.000015 -0.999824 188 188 188 +v -153.535522 -153.535538 -0.999826 188 188 188 +v -154.755280 -151.545090 -0.999828 188 188 188 +v -154.938446 -150.782181 1.000171 188 188 188 +v -154.938446 -150.782181 -0.999829 188 188 188 +v -155.000000 -150.000015 1.000170 188 188 188 +v -155.000000 149.999985 0.999818 188 188 188 +v -155.000000 -150.000015 -0.999830 188 188 188 +v -151.545074 154.755280 0.999812 188 188 188 +v -150.782166 154.938431 0.999812 188 188 188 +v -152.938934 154.045074 -1.000187 188 188 188 +v -154.045090 152.938919 -1.000186 188 188 188 +v -154.455032 152.269943 -1.000185 188 188 188 +v -151.545074 154.755280 -1.000188 188 188 188 +v -155.000000 149.999985 -1.000182 188 188 188 +v -154.938446 150.782166 0.999817 188 188 188 +v -154.755280 151.545074 0.999816 188 188 188 +v -154.938446 150.782166 -1.000183 188 188 188 +v -152.938934 154.045074 0.999813 188 188 188 +v -152.269958 154.455017 0.999812 188 188 188 +v -153.535522 153.535538 0.999813 188 188 188 +v -153.535522 153.535522 -1.000187 188 188 188 +v -154.045090 152.938919 0.999814 188 188 188 +v -154.455032 152.269943 0.999815 188 188 188 +v -154.755280 151.545074 -1.000184 188 188 188 +v -152.269958 154.455017 -1.000188 188 188 188 +v -151.545074 -154.755295 1.000176 188 188 188 +v -150.782166 -154.938431 -0.999824 188 188 188 +v -150.782166 -154.938431 1.000176 188 188 188 +v -152.269958 -154.455032 1.000175 188 188 188 +v -152.269958 -154.455032 -0.999825 188 188 188 +v -153.535522 -153.535538 1.000174 188 188 188 +v -154.045090 -152.938919 1.000173 188 188 188 +v -154.455032 -152.269974 1.000172 188 188 188 +v -154.045090 -152.938919 -0.999827 188 188 188 +v -154.755280 -151.545090 1.000172 188 188 188 +v -154.455032 -152.269974 -0.999827 188 188 188 +v -152.938934 -154.045090 1.000175 188 188 188 +v -150.000000 -155.000015 -0.999824 188 188 188 +v -150.000000 -155.000015 1.000176 188 188 188 +v -150.000000 154.999985 0.999812 188 188 188 +v 150.000000 154.999985 -1.000188 188 188 188 + +v 150.000000 154.999985 0.999812 188 188 188 +v -150.000000 154.999985 -1.000188 188 188 188 +v -150.000000 154.999985 0.999812 188 188 188 +v -150.000000 154.999985 -1.000188 188 188 188 +v -150.782166 154.938431 -1.000188 188 188 188 +v -150.000000 154.999985 -1.000188 188 188 188 +v -155.000000 149.999985 -1.000182 188 188 188 +v -150.000000 154.999985 -1.000188 188 188 188 +v -155.000000 -150.000015 -0.999830 188 188 188 +v -150.000000 154.999985 -1.000188 188 188 188 +v -111.242638 -155.000015 -0.999824 188 188 188 +v -150.000000 154.999985 -1.000188 188 188 188 +v -110.773338 -155.036942 -0.999824 188 188 188 +v -150.000000 154.999985 -1.000188 188 188 188 +v -110.315590 -155.146835 -0.999824 188 188 188 +v -150.000000 154.999985 -1.000188 188 188 188 +v -109.880669 -155.326981 -0.999824 188 188 188 +v -150.000000 154.999985 -1.000188 188 188 188 +v -109.479286 -155.572952 -0.999824 188 188 188 +v -150.000000 154.999985 -1.000188 188 188 188 +v -109.121323 -155.878708 -0.999823 188 188 188 +v -150.000000 154.999985 -1.000188 188 188 188 +v 109.479279 -155.572952 -0.999824 188 188 188 +v -150.000000 154.999985 -1.000188 188 188 188 +v 109.880676 -155.326981 -0.999824 188 188 188 +v -150.000000 154.999985 -1.000188 188 188 188 +v 110.315582 -155.146835 -0.999824 188 188 188 +v -150.000000 154.999985 -1.000188 188 188 188 +v 110.315582 -155.146835 -0.999824 188 188 188 +v 110.773346 -155.036942 -0.999824 188 188 188 +v 110.773346 -155.036942 1.000176 188 188 188 +v 110.773346 -155.036942 -0.999824 188 188 188 +v 111.242645 -155.000015 1.000176 188 188 188 +v 110.773346 -155.036942 -0.999824 188 188 188 +v 111.242645 -155.000015 1.000176 188 188 188 +v 111.242645 -155.000015 -0.999824 188 188 188 +v 150.000000 -155.000015 -0.999824 188 188 188 +v 111.242645 -155.000015 -0.999824 188 188 188 +v 150.000000 154.999985 -1.000188 188 188 188 +v 150.000000 -155.000015 -0.999824 188 188 188 +v 150.000000 154.999985 -1.000188 188 188 188 +v 155.000000 149.999985 -1.000182 188 188 188 +v 150.000000 154.999985 -1.000188 188 188 188 +v 154.938446 150.782166 -1.000183 188 188 188 +v 150.000000 154.999985 -1.000188 188 188 188 +v 154.755280 151.545074 -1.000184 188 188 188 +v 150.000000 154.999985 -1.000188 188 188 188 +v 154.455048 152.269943 -1.000185 188 188 188 +v 150.000000 154.999985 -1.000188 188 188 188 +v 154.045105 152.938919 -1.000186 188 188 188 +v 150.000000 154.999985 -1.000188 188 188 188 +v 153.535522 153.535522 -1.000187 188 188 188 +v 150.000000 154.999985 -1.000188 188 188 188 +v 150.782166 154.938431 -1.000188 188 188 188 +v 150.000000 154.999985 -1.000188 188 188 188 +v 150.782166 154.938431 0.999812 188 188 188 +v 150.782166 154.938431 -1.000188 188 188 188 +v 151.545074 154.755280 0.999812 188 188 188 +v 150.782166 154.938431 -1.000188 188 188 188 +v 151.545074 154.755280 0.999812 188 188 188 +v 151.545074 154.755280 -1.000188 188 188 188 +v 152.269958 154.455017 0.999812 188 188 188 +v 151.545074 154.755280 -1.000188 188 188 188 +v 152.269958 154.455017 -1.000188 188 188 188 +v 151.545074 154.755280 -1.000188 188 188 188 +v 152.938934 154.045074 -1.000187 188 188 188 +v 153.535522 153.535522 -1.000187 188 188 188 +v 151.545074 154.755280 -1.000188 188 188 188 +v 153.535522 153.535522 -1.000187 188 188 188 +v 152.938934 154.045074 -1.000187 188 188 188 +v 153.535522 153.535538 0.999813 188 188 188 +v 152.938934 154.045074 -1.000187 188 188 188 +v 154.045105 152.938919 -1.000186 188 188 188 +v 154.455048 152.269943 0.999815 188 188 188 +v 154.455048 152.269943 -1.000185 188 188 188 +v 154.755280 151.545074 0.999816 188 188 188 +v 154.755280 151.545074 -1.000184 188 188 188 +v 154.938446 150.782166 0.999817 188 188 188 +v 154.938446 150.782166 -1.000183 188 188 188 +v 153.535522 153.535538 0.999813 188 188 188 +v 154.045105 152.938919 0.999814 188 188 188 +v 153.535522 153.535522 -1.000187 188 188 188 +v 152.938934 154.045074 0.999813 188 188 188 +v 152.938934 154.045074 -1.000187 188 188 188 +v 152.269958 154.455017 -1.000188 188 188 188 +v 152.269958 154.455017 0.999812 188 188 188 +v 152.938934 154.045074 0.999813 188 188 188 +v 152.269958 154.455017 -1.000188 188 188 188 +v 155.000000 -150.000015 1.000170 188 188 188 +v 155.000000 -150.000015 -0.999830 188 188 188 +v 155.000000 149.999985 -1.000182 188 188 188 +v 154.938446 -150.782181 1.000171 188 188 188 +v 155.000000 -150.000015 -0.999830 188 188 188 +v 154.938446 -150.782181 -0.999829 188 188 188 +v 155.000000 -150.000015 -0.999830 188 188 188 +v 151.545074 -154.755295 -0.999824 188 188 188 +v 155.000000 -150.000015 -0.999830 188 188 188 +v 150.782166 -154.938431 -0.999824 188 188 188 +v 150.000000 -155.000015 -0.999824 188 188 188 +v 155.000000 -150.000015 -0.999830 188 188 188 +v 150.000000 -155.000015 -0.999824 188 188 188 +v 150.782166 -154.938431 -0.999824 188 188 188 +v 150.000000 -155.000015 1.000176 188 188 188 +v 150.782166 -154.938431 -0.999824 188 188 188 +v 154.755280 -151.545090 1.000172 188 188 188 +v 154.755280 -151.545090 -0.999828 188 188 188 +v 154.938446 -150.782181 -0.999829 188 188 188 +v 154.455048 -152.269974 1.000172 188 188 188 +v 154.755280 -151.545090 -0.999828 188 188 188 +v 154.455048 -152.269974 -0.999827 188 188 188 +v 151.545074 -154.755295 -0.999824 188 188 188 +v 154.755280 -151.545090 -0.999828 188 188 188 +v 151.545074 -154.755295 -0.999824 188 188 188 +v 154.455048 -152.269974 -0.999827 188 188 188 +v 154.045105 -152.938919 -0.999827 188 188 188 +v 154.455048 -152.269974 -0.999827 188 188 188 +v 151.545074 -154.755295 -0.999824 188 188 188 +v 154.045105 -152.938919 -0.999827 188 188 188 +v 153.535522 -153.535538 -0.999826 188 188 188 +v 154.045105 -152.938919 -0.999827 188 188 188 +v 151.545074 -154.755295 -0.999824 188 188 188 +v 153.535522 -153.535538 -0.999826 188 188 188 +v 152.938934 -154.045090 -0.999825 188 188 188 +v 153.535522 -153.535538 -0.999826 188 188 188 +v 151.545074 -154.755295 -0.999824 188 188 188 +v 152.938934 -154.045090 -0.999825 188 188 188 +v 152.269958 -154.455032 -0.999825 188 188 188 +v 152.938934 -154.045090 -0.999825 188 188 188 +v 151.545074 -154.755295 -0.999824 188 188 188 +v 152.269958 -154.455032 -0.999825 188 188 188 +v 154.455048 -152.269974 1.000172 188 188 188 +v 154.045105 -152.938919 1.000173 188 188 188 +v 154.455048 -152.269974 -0.999827 188 188 188 +v 154.045105 -152.938919 1.000173 188 188 188 +v 153.535522 -153.535538 1.000174 188 188 188 +v 154.045105 -152.938919 -0.999827 188 188 188 +v 153.535522 -153.535538 1.000174 188 188 188 +v 152.938934 -154.045090 1.000175 188 188 188 +v 153.535522 -153.535538 -0.999826 188 188 188 +v 152.938934 -154.045090 1.000175 188 188 188 +v 152.269958 -154.455032 1.000175 188 188 188 +v 152.938934 -154.045090 -0.999825 188 188 188 +v 152.269958 -154.455032 1.000175 188 188 188 +v 151.545074 -154.755295 1.000176 188 188 188 +v 152.269958 -154.455032 -0.999825 188 188 188 +v 151.545074 -154.755295 1.000176 188 188 188 +v 150.782166 -154.938431 1.000176 188 188 188 +v 151.545074 -154.755295 -0.999824 188 188 188 +v 150.782166 -154.938431 1.000176 188 188 188 +v 150.782166 -154.938431 -0.999824 188 188 188 +v 151.545074 -154.755295 -0.999824 188 188 188 +v 154.755280 -151.545090 -0.999828 188 188 188 +v 151.545074 -154.755295 -0.999824 188 188 188 +v 154.938446 -150.782181 -0.999829 188 188 188 +v 154.938446 -150.782181 1.000171 188 188 188 +v 154.755280 -151.545090 1.000172 188 188 188 +v 154.938446 -150.782181 -0.999829 188 188 188 +v 155.000000 149.999985 0.999818 188 188 188 +v 155.000000 -150.000015 1.000170 188 188 188 +v 155.000000 149.999985 -1.000182 188 188 188 +v 151.545074 154.755280 -1.000188 188 188 188 +v 153.535522 153.535522 -1.000187 188 188 188 +v 150.782166 154.938431 -1.000188 188 188 188 +v 154.045105 152.938919 0.999814 188 188 188 +v 154.045105 152.938919 -1.000186 188 188 188 +v 153.535522 153.535522 -1.000187 188 188 188 +v 154.455048 152.269943 0.999815 188 188 188 +v 154.455048 152.269943 -1.000185 188 188 188 +v 154.045105 152.938919 -1.000186 188 188 188 +v 154.755280 151.545074 0.999816 188 188 188 +v 154.755280 151.545074 -1.000184 188 188 188 +v 154.455048 152.269943 -1.000185 188 188 188 +v 154.938446 150.782166 0.999817 188 188 188 +v 154.938446 150.782166 -1.000183 188 188 188 +v 154.755280 151.545074 -1.000184 188 188 188 +v 155.000000 149.999985 0.999818 188 188 188 +v 155.000000 149.999985 -1.000182 188 188 188 +v 154.938446 150.782166 -1.000183 188 188 188 +v 155.000000 -150.000015 -0.999830 188 188 188 +v 150.000000 -155.000015 -0.999824 188 188 188 +v 155.000000 149.999985 -1.000182 188 188 188 +v 150.000000 -155.000015 1.000176 188 188 188 +v 111.242645 -155.000015 1.000176 188 188 188 +v 150.000000 -155.000015 -0.999824 188 188 188 +v 111.242645 -155.000015 -0.999824 188 188 188 +v 110.773346 -155.036942 -0.999824 188 188 188 +v 150.000000 154.999985 -1.000188 188 188 188 +v -110.773338 -155.036942 -0.999824 188 188 188 +v -110.315590 -155.146835 1.000176 188 188 188 +v -110.315590 -155.146835 -0.999824 188 188 188 +v -109.880669 -155.326981 1.000176 188 188 188 +v -109.880669 -155.326981 -0.999824 188 188 188 +v -109.479286 -155.572952 1.000177 188 188 188 +v -109.479286 -155.572952 -0.999824 188 188 188 +v -109.121323 -155.878708 1.000177 188 188 188 +v -100.878677 -164.121323 1.000187 188 188 188 +v -100.878677 -164.121323 -0.999814 188 188 188 +v -100.520714 -164.427048 -0.999813 188 188 188 +v -100.878677 -164.121323 -0.999814 188 188 188 +v -100.119324 -164.673019 -0.999813 188 188 188 +v -100.878677 -164.121323 -0.999814 188 188 188 +v -99.684410 -164.853195 -0.999813 188 188 188 +v -100.878677 -164.121323 -0.999814 188 188 188 +v -99.226662 -164.963089 -0.999812 188 188 188 +v -100.878677 -164.121323 -0.999814 188 188 188 +v -98.757355 -165.000015 -0.999812 188 188 188 +v -100.878677 -164.121323 -0.999814 188 188 188 +v -98.757355 -165.000015 -0.999812 188 188 188 +v 109.121338 -155.878708 -0.999823 188 188 188 +v 98.757355 -165.000015 -0.999812 188 188 188 +v 109.121338 -155.878708 -0.999823 188 188 188 +v 99.226669 -164.963089 -0.999812 188 188 188 +v 109.121338 -155.878708 -0.999823 188 188 188 +v 99.684418 -164.853195 -0.999813 188 188 188 +v 109.121338 -155.878708 -0.999823 188 188 188 +v 100.119324 -164.673019 -0.999813 188 188 188 +v 109.121338 -155.878708 -0.999823 188 188 188 +v 100.878677 -164.121323 -0.999814 188 188 188 +v 109.121338 -155.878708 -0.999823 188 188 188 +v 100.878677 -164.121323 1.000187 188 188 188 +v 100.878677 -164.121323 -0.999814 188 188 188 +v 100.520721 -164.427048 1.000187 188 188 188 +v 100.878677 -164.121323 -0.999814 188 188 188 +v 100.520721 -164.427048 1.000187 188 188 188 +v 100.520721 -164.427048 -0.999813 188 188 188 +v 100.119324 -164.673019 1.000187 188 188 188 +v 100.119324 -164.673019 -0.999813 188 188 188 +v 100.520721 -164.427048 -0.999813 188 188 188 +v 100.119324 -164.673019 1.000187 188 188 188 +v 100.119324 -164.673019 -0.999813 188 188 188 +v 99.684418 -164.853195 1.000187 188 188 188 +v 99.684418 -164.853195 -0.999813 188 188 188 +v 100.520721 -164.427048 -0.999813 188 188 188 +v 100.119324 -164.673019 -0.999813 188 188 188 +v 100.878677 -164.121323 -0.999814 188 188 188 +v 99.684418 -164.853195 1.000187 188 188 188 +v 99.684418 -164.853195 -0.999813 188 188 188 +v 100.119324 -164.673019 -0.999813 188 188 188 +v 99.226669 -164.963089 1.000188 188 188 188 +v 99.226669 -164.963089 -0.999812 188 188 188 +v 99.684418 -164.853195 -0.999813 188 188 188 +v 99.226669 -164.963089 1.000188 188 188 188 +v 99.226669 -164.963089 -0.999812 188 188 188 +v 98.757355 -165.000015 1.000188 188 188 188 +v 98.757355 -165.000015 -0.999812 188 188 188 +v 99.226669 -164.963089 -0.999812 188 188 188 +v 98.757355 -165.000015 -0.999812 188 188 188 +v -98.757355 -165.000015 -0.999812 188 188 188 +v 109.121338 -155.878708 -0.999823 188 188 188 +v -100.878677 -164.121323 -0.999814 188 188 188 +v 109.479279 -155.572952 -0.999824 188 188 188 +v 109.121338 -155.878708 -0.999823 188 188 188 +v 109.479279 -155.572952 -0.999824 188 188 188 +v -98.757355 -165.000015 -0.999812 188 188 188 +v -99.226662 -164.963089 -0.999812 188 188 188 +v -99.226662 -164.963089 -0.999812 188 188 188 +v -99.684410 -164.853195 -0.999813 188 188 188 +v -99.684410 -164.853195 -0.999813 188 188 188 +v -100.119324 -164.673019 -0.999813 188 188 188 +v -100.119324 -164.673019 1.000187 188 188 188 +v -100.119324 -164.673019 -0.999813 188 188 188 +v -100.119324 -164.673019 -0.999813 188 188 188 +v -100.520714 -164.427048 1.000187 188 188 188 +v -100.520714 -164.427048 -0.999813 188 188 188 +v -100.520714 -164.427048 1.000187 188 188 188 +v -100.878677 -164.121323 1.000187 188 188 188 +v -100.520714 -164.427048 -0.999813 188 188 188 +v -100.878677 -164.121323 -0.999814 188 188 188 +v -109.121323 -155.878708 1.000177 188 188 188 +v -109.121323 -155.878708 -0.999823 188 188 188 +v -99.684410 -164.853195 1.000187 188 188 188 +v -100.119324 -164.673019 1.000187 188 188 188 +v -99.684410 -164.853195 -0.999813 188 188 188 +v -99.226662 -164.963089 1.000188 188 188 188 +v -99.684410 -164.853195 1.000187 188 188 188 +v -99.226662 -164.963089 -0.999812 188 188 188 +v -98.757355 -165.000015 1.000188 188 188 188 +v -99.226662 -164.963089 1.000188 188 188 188 +v -98.757355 -165.000015 -0.999812 188 188 188 +v 98.757355 -165.000015 1.000188 188 188 188 +v -98.757355 -165.000015 1.000188 188 188 188 +v 98.757355 -165.000015 -0.999812 188 188 188 +v 100.878677 -164.121323 1.000187 188 188 188 +v 109.121338 -155.878708 -0.999823 188 188 188 +v 109.479279 -155.572952 1.000177 188 188 188 +v 109.121338 -155.878708 1.000177 188 188 188 +v 109.121338 -155.878708 -0.999823 188 188 188 +v 109.479279 -155.572952 1.000177 188 188 188 +v 109.479279 -155.572952 -0.999824 188 188 188 +v 109.880676 -155.326981 1.000176 188 188 188 +v 109.880676 -155.326981 -0.999824 188 188 188 +v 110.773346 -155.036942 1.000176 188 188 188 +v 110.315582 -155.146835 1.000176 188 188 188 +v 110.315582 -155.146835 -0.999824 188 188 188 +v 110.315582 -155.146835 1.000176 188 188 188 +v 109.880676 -155.326981 -0.999824 188 188 188 +v 110.315582 -155.146835 -0.999824 188 188 188 +v 109.880676 -155.326981 1.000176 188 188 188 +v 109.479279 -155.572952 -0.999824 188 188 188 +v 109.880676 -155.326981 -0.999824 188 188 188 +v -100.878677 -164.121323 -0.999814 188 188 188 +v -109.121323 -155.878708 -0.999823 188 188 188 +v 109.479279 -155.572952 -0.999824 188 188 188 +v -109.121323 -155.878708 -0.999823 188 188 188 +v -109.121323 -155.878708 1.000177 188 188 188 +v -109.479286 -155.572952 -0.999824 188 188 188 +v -109.479286 -155.572952 -0.999824 188 188 188 +v -109.479286 -155.572952 1.000177 188 188 188 +v -109.880669 -155.326981 -0.999824 188 188 188 +v -109.880669 -155.326981 -0.999824 188 188 188 +v -109.880669 -155.326981 1.000176 188 188 188 +v -110.315590 -155.146835 -0.999824 188 188 188 +v -110.315590 -155.146835 -0.999824 188 188 188 +v -110.315590 -155.146835 1.000176 188 188 188 +v -110.773338 -155.036942 -0.999824 188 188 188 +v -110.773338 -155.036942 -0.999824 188 188 188 +v -110.773338 -155.036942 1.000176 188 188 188 +v -111.242638 -155.000015 -0.999824 188 188 188 +v -110.773338 -155.036942 1.000176 188 188 188 +v -111.242638 -155.000015 -0.999824 188 188 188 +v -111.242638 -155.000015 1.000176 188 188 188 +v -111.242638 -155.000015 -0.999824 188 188 188 +v -111.242638 -155.000015 -0.999824 188 188 188 +v -150.000000 -155.000015 1.000176 188 188 188 +v -111.242638 -155.000015 -0.999824 188 188 188 +v -150.000000 -155.000015 -0.999824 188 188 188 +v -111.242638 -155.000015 -0.999824 188 188 188 +v -151.545074 -154.755295 -0.999824 188 188 188 +v -111.242638 -155.000015 -0.999824 188 188 188 +v -152.269958 -154.455032 -0.999825 188 188 188 +v -111.242638 -155.000015 -0.999824 188 188 188 +v -152.938934 -154.045090 -0.999825 188 188 188 +v -111.242638 -155.000015 -0.999824 188 188 188 +v -153.535522 -153.535538 -0.999826 188 188 188 +v -111.242638 -155.000015 -0.999824 188 188 188 +v -154.045090 -152.938919 -0.999827 188 188 188 +v -111.242638 -155.000015 -0.999824 188 188 188 +v -154.455032 -152.269974 -0.999827 188 188 188 +v -111.242638 -155.000015 -0.999824 188 188 188 +v -154.755280 -151.545090 -0.999828 188 188 188 +v -154.755280 -151.545090 -0.999828 188 188 188 +v -154.938446 -150.782181 -0.999829 188 188 188 +v -154.938446 -150.782181 1.000171 188 188 188 +v -154.938446 -150.782181 -0.999829 188 188 188 +v -154.938446 -150.782181 -0.999829 188 188 188 +v -155.000000 -150.000015 1.000170 188 188 188 +v -155.000000 -150.000015 -0.999830 188 188 188 +v -155.000000 -150.000015 1.000170 188 188 188 +v -155.000000 -150.000015 -0.999830 188 188 188 +v -151.545074 154.755280 0.999812 188 188 188 +v -151.545074 154.755280 -1.000188 188 188 188 +v -152.269958 154.455017 -1.000188 188 188 188 +v -151.545074 154.755280 -1.000188 188 188 188 +v -152.938934 154.045074 -1.000187 188 188 188 +v -151.545074 154.755280 -1.000188 188 188 188 +v -153.535522 153.535522 -1.000187 188 188 188 +v -151.545074 154.755280 -1.000188 188 188 188 +v -154.045090 152.938919 -1.000186 188 188 188 +v -151.545074 154.755280 -1.000188 188 188 188 +v -154.455032 152.269943 -1.000185 188 188 188 +v -151.545074 154.755280 -1.000188 188 188 188 +v -154.755280 151.545074 -1.000184 188 188 188 +v -151.545074 154.755280 -1.000188 188 188 188 +v -155.000000 149.999985 -1.000182 188 188 188 +v -154.938446 150.782166 -1.000183 188 188 188 +v -151.545074 154.755280 -1.000188 188 188 188 +v -155.000000 149.999985 -1.000182 188 188 188 +v -154.938446 150.782166 -1.000183 188 188 188 +v -154.938446 150.782166 0.999817 188 188 188 +v -154.938446 150.782166 -1.000183 188 188 188 +v -152.938934 154.045074 -1.000187 188 188 188 +v -152.938934 154.045074 0.999813 188 188 188 +v -153.535522 153.535522 -1.000187 188 188 188 +v -153.535522 153.535538 0.999813 188 188 188 +v -154.045090 152.938919 -1.000186 188 188 188 +v -154.045090 152.938919 0.999814 188 188 188 +v -154.455032 152.269943 -1.000185 188 188 188 +v -154.755280 151.545074 0.999816 188 188 188 +v -154.455032 152.269943 0.999815 188 188 188 +v -154.755280 151.545074 -1.000184 188 188 188 +v -155.000000 149.999985 0.999818 188 188 188 +v -154.938446 150.782166 0.999817 188 188 188 +v -155.000000 149.999985 -1.000182 188 188 188 +v -154.938446 150.782166 -1.000183 188 188 188 +v -154.755280 151.545074 0.999816 188 188 188 +v -154.755280 151.545074 -1.000184 188 188 188 +v -154.755280 151.545074 -1.000184 188 188 188 +v -154.455032 152.269943 0.999815 188 188 188 +v -154.455032 152.269943 -1.000185 188 188 188 +v -154.455032 152.269943 -1.000185 188 188 188 +v -154.045090 152.938919 0.999814 188 188 188 +v -154.045090 152.938919 -1.000186 188 188 188 +v -154.045090 152.938919 -1.000186 188 188 188 +v -153.535522 153.535538 0.999813 188 188 188 +v -153.535522 153.535522 -1.000187 188 188 188 +v -153.535522 153.535522 -1.000187 188 188 188 +v -152.938934 154.045074 0.999813 188 188 188 +v -152.938934 154.045074 -1.000187 188 188 188 +v -152.938934 154.045074 -1.000187 188 188 188 +v -152.269958 154.455017 0.999812 188 188 188 +v -152.269958 154.455017 -1.000188 188 188 188 +v -152.269958 154.455017 0.999812 188 188 188 +v -151.545074 154.755280 0.999812 188 188 188 +v -152.269958 154.455017 -1.000188 188 188 188 +v -151.545074 154.755280 -1.000188 188 188 188 +v -150.782166 154.938431 0.999812 188 188 188 +v -150.782166 154.938431 -1.000188 188 188 188 +v -150.000000 -155.000015 -0.999824 188 188 188 +v -150.782166 -154.938431 1.000176 188 188 188 +v -150.782166 -154.938431 -0.999824 188 188 188 +v -150.782166 -154.938431 -0.999824 188 188 188 +v -151.545074 -154.755295 1.000176 188 188 188 +v -151.545074 -154.755295 -0.999824 188 188 188 +v -151.545074 -154.755295 1.000176 188 188 188 +v -151.545074 -154.755295 -0.999824 188 188 188 +v -152.269958 -154.455032 1.000175 188 188 188 +v -152.269958 -154.455032 -0.999825 188 188 188 +v -152.938934 -154.045090 1.000175 188 188 188 +v -152.938934 -154.045090 -0.999825 188 188 188 +v -153.535522 -153.535538 1.000174 188 188 188 +v -153.535522 -153.535538 -0.999826 188 188 188 +v -154.045090 -152.938919 1.000173 188 188 188 +v -154.045090 -152.938919 -0.999827 188 188 188 +v -154.455032 -152.269974 1.000172 188 188 188 +v -154.455032 -152.269974 -0.999827 188 188 188 +v -154.755280 -151.545090 1.000172 188 188 188 +v -154.938446 -150.782181 1.000171 188 188 188 +v -154.755280 -151.545090 -0.999828 188 188 188 +v -154.455032 -152.269974 -0.999827 188 188 188 +v -154.755280 -151.545090 1.000172 188 188 188 +v -154.755280 -151.545090 -0.999828 188 188 188 +v -154.045090 -152.938919 -0.999827 188 188 188 +v -154.455032 -152.269974 1.000172 188 188 188 +v -154.455032 -152.269974 -0.999827 188 188 188 +v -153.535522 -153.535538 -0.999826 188 188 188 +v -154.045090 -152.938919 1.000173 188 188 188 +v -154.045090 -152.938919 -0.999827 188 188 188 +v -152.938934 -154.045090 -0.999825 188 188 188 +v -153.535522 -153.535538 1.000174 188 188 188 +v -153.535522 -153.535538 -0.999826 188 188 188 +v -152.269958 -154.455032 -0.999825 188 188 188 +v -152.938934 -154.045090 1.000175 188 188 188 +v -152.938934 -154.045090 -0.999825 188 188 188 +v -151.545074 -154.755295 -0.999824 188 188 188 +v -152.269958 -154.455032 1.000175 188 188 188 +v -152.269958 -154.455032 -0.999825 188 188 188 +v -150.000000 -155.000015 -0.999824 188 188 188 +v -150.782166 -154.938431 -0.999824 188 188 188 +v -151.545074 -154.755295 -0.999824 188 188 188 +v -150.000000 -155.000015 1.000176 188 188 188 +v -150.782166 -154.938431 1.000176 188 188 188 +v -150.000000 -155.000015 -0.999824 188 188 188 +v -111.242638 -155.000015 -0.999824 188 188 188 +v -154.938446 -150.782181 -0.999829 188 188 188 +v -155.000000 -150.000015 -0.999830 188 188 188 +v -155.000000 -150.000015 -0.999830 188 188 188 +v -155.000000 149.999985 0.999818 188 188 188 +v -155.000000 149.999985 -1.000182 188 188 188 +v -155.000000 149.999985 -1.000182 188 188 188 +v -151.545074 154.755280 -1.000188 188 188 188 +v -150.782166 154.938431 -1.000188 188 188 188 +v -150.782166 154.938431 0.999812 188 188 188 +v -150.000000 154.999985 0.999812 188 188 188 +v -150.782166 154.938431 -1.000188 188 188 188 +v 150.000000 154.999985 -1.000188 188 188 188 +v 110.773346 -155.036942 -0.999824 188 188 188 +v -150.000000 154.999985 -1.000188 188 188 188 +v 150.000000 154.999985 0.999812 188 188 188 +v 150.782166 154.938431 0.999812 188 188 188 +v 150.000000 154.999985 -1.000188 188 188 188 + +f 1 136 5 +f 135 137 138 +f 2 139 140 +f 109 141 142 +f 102 143 144 +f 95 145 146 +f 91 147 148 +f 3 149 150 +f 90 151 152 +f 58 153 154 +f 4 155 156 +f 77 157 158 +f 89 159 160 +f 6 161 162 +f 9 163 164 +f 7 165 166 +f 8 167 168 +f 169 170 11 +f 10 171 172 +f 173 174 175 +f 12 176 177 +f 52 178 179 +f 28 180 181 +f 26 182 183 +f 23 184 185 +f 20 186 187 +f 15 188 189 +f 13 190 191 +f 192 14 193 +f 194 18 195 +f 196 16 197 +f 198 29 199 +f 200 17 201 +f 202 203 204 +f 19 205 206 +f 21 207 208 +f 22 24 209 +f 210 25 211 +f 212 27 213 +f 214 51 215 +f 216 217 218 +f 219 220 221 +f 222 223 224 +f 30 31 34 +f 225 226 227 +f 228 32 229 +f 230 33 231 +f 232 35 233 +f 234 235 236 +f 36 237 238 +f 50 239 240 +f 37 38 40 +f 241 242 243 +f 244 39 245 +f 246 247 248 +f 41 249 250 +f 47 251 252 +f 43 253 254 +f 42 255 256 +f 45 257 258 +f 44 259 260 +f 49 261 262 +f 48 263 264 +f 46 265 266 +f 267 268 269 +f 270 271 272 +f 273 274 275 +f 276 277 278 +f 279 280 281 +f 282 283 284 +f 285 286 287 +f 288 289 290 +f 291 292 293 +f 294 295 296 +f 297 298 299 +f 300 301 302 +f 303 304 305 +f 306 307 308 +f 309 310 311 +f 312 313 314 +f 315 316 317 +f 318 319 320 +f 321 322 323 +f 53 54 324 +f 55 325 326 +f 56 327 328 +f 57 329 330 +f 59 331 76 +f 60 332 333 +f 79 334 335 +f 62 336 337 +f 61 338 339 +f 63 340 341 +f 342 343 85 +f 64 344 345 +f 74 346 347 +f 71 348 349 +f 72 350 351 +f 66 352 353 +f 65 354 355 +f 356 67 357 +f 358 68 359 +f 360 69 361 +f 362 363 364 +f 365 70 366 +f 367 73 368 +f 369 370 371 +f 372 373 374 +f 375 376 377 +f 378 83 379 +f 380 381 382 +f 383 75 384 +f 385 386 387 +f 86 388 389 +f 390 82 391 +f 392 78 393 +f 394 81 395 +f 396 80 397 +f 398 399 400 +f 401 402 403 +f 404 405 406 +f 407 408 409 +f 410 411 412 +f 413 414 415 +f 416 417 418 +f 84 419 420 +f 421 422 423 +f 88 424 425 +f 87 426 427 +f 428 429 430 +f 431 432 433 +f 434 435 436 +f 437 438 439 +f 440 441 442 +f 443 444 445 +f 446 447 448 +f 449 450 451 +f 452 453 454 +f 455 92 456 +f 457 134 458 +f 459 460 133 +f 461 462 93 +f 463 464 125 +f 465 466 94 +f 467 468 96 +f 469 470 129 +f 471 472 131 +f 473 474 97 +f 475 476 99 +f 477 98 478 +f 479 100 480 +f 481 482 483 +f 484 101 485 +f 103 104 108 +f 120 486 487 +f 105 488 489 +f 116 490 491 +f 106 492 493 +f 107 494 495 +f 119 496 497 +f 112 498 499 +f 500 501 502 +f 503 110 504 +f 505 111 506 +f 113 114 507 +f 115 508 509 +f 117 510 511 +f 118 512 513 +f 514 515 516 +f 517 518 519 +f 520 521 522 +f 523 524 525 +f 526 527 528 +f 529 530 531 +f 532 533 534 +f 535 536 537 +f 538 539 540 +f 541 542 543 +f 123 121 122 +f 544 545 546 +f 547 548 549 +f 550 124 551 +f 552 132 553 +f 554 126 555 +f 556 127 557 +f 558 128 559 +f 560 130 561 +f 562 563 564 +f 565 566 567 +f 568 569 570 +f 571 572 573 +f 574 575 576 +f 577 578 579 +f 580 581 582 +f 583 584 585 +f 586 587 588 +f 589 590 591 +f 592 593 594 +f 595 596 597 +f 598 599 600 +f 601 602 603 +f 604 605 606 + +vt 0.141107 0.030794 +vt 0.973115 0.989068 +vt 0.015953 0.989068 +vt 0.142567 0.030455 +vt 0.143955 0.029898 +vt 0.145236 0.029138 +vt 0.842690 0.028192 +vt 0.843832 0.029138 +vt 0.845113 0.029898 +vt 0.846500 0.030455 +vt 0.847961 0.030794 +vt 0.849458 0.030908 +vt 0.989068 0.046363 +vt 0.989068 0.973614 +vt 0.975610 0.988877 +vt 0.978045 0.988311 +vt 0.980357 0.987383 +vt 0.982492 0.986116 +vt 0.984395 0.984541 +vt 0.988871 0.976031 +vt 0.988287 0.978389 +vt 0.986021 0.982697 +vt 0.987329 0.980630 +vt 0.988871 0.043945 +vt 0.988287 0.041587 +vt 0.987329 0.039346 +vt 0.986021 0.037279 +vt 0.984395 0.035435 +vt 0.982492 0.033860 +vt 0.980357 0.032593 +vt 0.978045 0.031665 +vt 0.973115 0.030908 +vt 0.975610 0.031099 +vt 0.816391 0.002716 +vt 0.146378 0.028192 +vt 0.809623 0.000000 +vt 0.811121 0.000114 +vt 0.812581 0.000454 +vt 0.813969 0.001011 +vt 0.815249 0.001771 +vt 0.179444 0.000000 +vt 0.177947 0.000114 +vt 0.176487 0.000454 +vt 0.175099 0.001011 +vt 0.172676 0.002716 +vt 0.173818 0.001771 +vt 0.139610 0.030908 +vt 0.000000 0.973614 +vt 0.000000 0.046363 +vt 0.015953 0.030908 +vt 0.013457 0.031099 +vt 0.011023 0.031665 +vt 0.008710 0.032593 +vt 0.006576 0.033860 +vt 0.004672 0.035435 +vt 0.003047 0.037279 +vt 0.001739 0.039346 +vt 0.000781 0.041587 +vt 0.000196 0.043945 +vt 0.013457 0.988877 +vt 0.011023 0.988311 +vt 0.000196 0.976031 +vt 0.000781 0.978389 +vt 0.008710 0.987383 +vt 0.006576 0.986116 +vt 0.004672 0.984541 +vt 0.003047 0.982697 +vt 0.001739 0.980630 + +usemtl Mat_0 +f 51/14 19/19 21/18 +f 51/14 21/18 16/17 +f 51/14 27/20 19/19 +f 27/20 25/21 19/19 +f 25/21 22/22 19/19 +f 25/21 24/23 22/22 +f 51/14 16/17 14/16 +f 51/14 14/16 13/15 +f 51/14 13/15 1/2 +f 30/13 51/14 1/2 +f 8/12 30/13 1/2 +f 8/12 31/24 30/13 +f 36/32 50/33 46/31 +f 8/12 36/32 46/31 +f 8/12 46/31 48/30 +f 8/12 48/30 44/29 +f 8/12 44/29 42/28 +f 8/12 42/28 47/27 +f 8/12 47/27 38/26 +f 8/12 38/26 37/25 +f 8/12 37/25 31/24 +f 7/11 8/12 1/2 +f 87/10 7/11 1/2 +f 88/9 87/10 1/2 +f 86/8 88/9 1/2 +f 84/7 86/8 1/2 +f 56/6 84/7 1/2 +f 55/5 56/6 1/2 +f 53/4 55/5 1/2 +f 54/1 53/4 1/2 +f 65/34 84/7 56/6 +f 57/35 65/34 56/6 +f 83/36 65/34 57/35 +f 75/41 83/36 57/35 +f 82/42 75/41 57/35 +f 78/43 82/42 57/35 +f 81/44 78/43 57/35 +f 59/45 81/44 57/35 +f 70/38 69/39 65/34 +f 73/37 70/38 65/34 +f 69/39 67/40 65/34 +f 80/46 81/44 59/45 +f 83/36 73/37 65/34 +f 100/49 92/47 101/48 +f 101/48 92/47 135/3 +f 104/60 101/48 135/3 +f 103/61 101/48 104/60 +f 111/63 110/62 103/61 +f 114/64 111/63 103/61 +f 113/65 111/63 114/64 +f 115/66 111/63 113/65 +f 117/67 111/63 115/66 +f 118/68 111/63 117/67 +f 110/62 101/48 103/61 +f 98/59 130/58 100/49 +f 130/58 128/57 100/49 +f 128/57 127/56 100/49 +f 127/56 126/55 100/49 +f 126/55 132/54 100/49 +f 132/54 124/53 100/49 +f 124/53 121/52 100/49 +f 121/52 123/51 100/49 +f 123/51 134/50 100/49 +f 134/50 92/47 100/49 +f 92/47 54/1 135/3 +f 54/1 1/2 135/3 + diff --git a/resources/meshes/STREAM20PRO_platform.STL b/resources/meshes/STREAM20PRO_platform.STL new file mode 100644 index 0000000000..c9cdf046e1 Binary files /dev/null and b/resources/meshes/STREAM20PRO_platform.STL differ diff --git a/resources/meshes/STREAM30PRO_platform.STL b/resources/meshes/STREAM30PRO_platform.STL new file mode 100644 index 0000000000..f525305e08 Binary files /dev/null and b/resources/meshes/STREAM30PRO_platform.STL differ diff --git a/resources/meshes/STREAM30ULTRA_platform.STL b/resources/meshes/STREAM30ULTRA_platform.STL new file mode 100644 index 0000000000..57d41a0b81 Binary files /dev/null and b/resources/meshes/STREAM30ULTRA_platform.STL differ diff --git a/resources/meshes/anycubic_i3_mega_s_platform.3mf b/resources/meshes/anycubic_i3_mega_s_platform.3mf new file mode 100644 index 0000000000..b3dca3a75a Binary files /dev/null and b/resources/meshes/anycubic_i3_mega_s_platform.3mf differ diff --git a/resources/meshes/anycubic_i3_mega_x_platform.stl b/resources/meshes/anycubic_i3_mega_x_platform.stl new file mode 100644 index 0000000000..261e03160b Binary files /dev/null and b/resources/meshes/anycubic_i3_mega_x_platform.stl differ diff --git a/resources/meshes/arjun300_platform.stl b/resources/meshes/arjun300_platform.stl new file mode 100644 index 0000000000..5cceb5919b Binary files /dev/null and b/resources/meshes/arjun300_platform.stl differ diff --git a/resources/meshes/diy220_platform.obj b/resources/meshes/diy220_platform.obj new file mode 100644 index 0000000000..9364251a9b --- /dev/null +++ b/resources/meshes/diy220_platform.obj @@ -0,0 +1,30683 @@ +v -101 146.778 -20.2 +v -100.5 146.644 -20.2 +v -100.76 146.678 -20.2 +v -101.207 146.937 -20.2 +v -101.5 148.714 -20.2 +v 100.5 146.644 -20.2 +v -101.5 147.645 -20.2 +v -101.366 147.145 -20.2 +v 101.5 148.714 -20.2 +v 101.366 147.145 -20.2 +v 101.207 146.937 -20.2 +v -101.07 150.43 28.974 +v 101.07 150.432 28.974 +v 101.5 147.645 -20.2 +v 101.07 149.364 29.018 +v 101.036 152.6 32.923 +v 101.026 152.6 34.136 +v 101.05 151.046 31.207 +v 100.977 152.6 34.47 +v 100.905 150.182 32.734 +v 101.04 150.58 32.434 +v 101.066 149.407 29.557 +v -101.05 151.046 31.207 +v -101.036 152.6 32.923 +v -100.024 152.6 35.233 +v -100.036 150.54 33.621 +v 100.024 152.6 35.233 +v 100.036 150.54 33.621 +v 100.04 149.782 33.03 +v -100.137 152.6 35.226 +v -100.04 149.782 33.03 +v 100.052 149.164 31.512 +v -100.052 149.164 31.512 +v 100.066 148.415 29.674 +v 100.07 148.364 29.044 +v -100.066 148.414 29.674 +v -100.07 148.364 29.044 +v 100.565 148.548 29.661 +v 100.54 149.89 32.952 +v 100.57 148.498 29.044 +v 100.93 148.91 29.619 +v 100.936 148.864 29.034 +v 100.61 152.6 35.026 +v 100.517 152.6 35.078 +v 100.878 152.6 34.684 +v 100.83 152.6 34.788 +v 100.335 152.6 35.18 +v 101 146.778 -20.2 +v 100.76 146.68 -20.2 +v -101.026 152.6 34.136 +v -101.04 150.58 32.434 +v -101.066 149.407 29.557 +v -100.956 152.6 34.537 +v -100.905 150.18 32.734 +v -101.07 149.363 29.018 +v -100.93 148.91 29.619 +v -100.936 148.864 29.034 +v -100.565 148.548 29.661 +v -100.57 148.498 29.044 +v -100.54 149.89 32.952 +v -100.752 152.6 34.89 +v -100.874 152.6 34.68 +v -100.516 152.6 35.08 +v -100.46 152.6 35.124 +v -1.514 113.112 -18.516 +v -2.132 113.03 -18.719 +v -2.98 112.182 -18.614 +v -1.453 112.95 -18.446 +v -0.356 113.376 -18.445 +v -2.43 112.42 -18.512 +v -0.993 113.462 -18.65 +v -1.58 113.284 -18.685 +v -2.642 112.708 -18.751 +v -3.107 112.314 -18.783 +v -3.83 111.013 -18.689 +v -2.188 113.134 -18.953 +v -2.712 112.802 -18.985 +v -3.69 111.617 -18.829 +v -3.405 112.174 -19.033 +v -2.706 112.794 -19.393 +v -3.208 112.417 -19.222 +v -3.788 111.683 -19.063 +v -3.81 111.698 -19.268 +v -3.995 111.094 -18.858 +v -4.1 111.146 -19.092 +v -3.183 112.39 -19.425 +v -4.137 110.973 -19.636 +v -3.32 112.098 -19.637 +v -2.411 112.842 -19.637 +v -2.184 113.126 -19.36 +v -1.356 113.286 -19.634 +v -1.621 113.394 -18.92 +v -1.017 113.567 -19.292 +v -0.372 113.564 -19.452 +v -0.023 113.337 -19.637 +v -0.38 113.667 -19.256 +v -1.019 113.576 -18.885 +v 0.24 113.574 -19.416 +v 0.246 113.677 -19.22 +v 0.246 113.687 -18.812 +v -0.381 113.677 -18.848 +v -0.371 113.56 -18.614 +v 0.24 113.57 -18.578 +v 0.858 113.612 -18.775 +v 0.836 113.496 -18.54 +v 1.458 113.443 -19.144 +v 1.461 113.452 -18.736 +v 1.365 113.166 -18.333 +v 1.423 113.34 -18.502 +v 0.22 113.212 -18.338 +v 1.841 112.78 -18.222 +v 3.157 111.73 -18.098 +v 2.89 112.265 -18.21 +v 3.014 111.613 -18.096 +v 1.758 112.613 -18.22 +v 2.532 112.784 -18.42 +v 3.63 111.37 -18.125 +v 3.433 111.96 -18.337 +v 3.014 112.4 -18.38 +v 3.746 110.778 -18.01 +v 4.014 110.578 -18.058 +v 4.087 109.41 -17.894 +v 3.902 109.397 -17.892 +v 3.576 110.703 -18.008 +v 4.26 109.422 -17.965 +v 4.358 110.042 -18.18 +v 3.83 108.328 -17.796 +v 3.71 109.383 -17.97 +v 3.642 108.367 -17.873 +v 3.462 107.3 -17.694 +v 4.011 108.29 -17.798 +v 3.529 108.887 -18.096 +v 3.528 109.37 -18.144 +v 3.463 108.404 -18.047 +v 3.293 107.39 -17.771 +v 3.328 107.923 -17.996 +v 2.437 106.06 -17.535 +v 3.627 107.215 -17.696 +v 2.698 106.56 -17.667 +v 2.876 107.063 -17.894 +v 3.13 107.475 -17.945 +v 1.73 105.827 -17.538 +v 2.203 106.354 -17.786 +v 2.565 106.686 -17.84 +v 3.01 107.54 -18.357 +v 3.199 107.97 -18.408 +v 1.646 105.99 -17.711 +v 2.14 106.433 -17.983 +v 2.465 106.78 -18.253 +v 1.598 106.08 -17.908 +v 0.723 105.658 -17.598 +v 0.76 105.478 -17.424 +v 2.118 106.46 -18.199 +v 1.151 105.92 -18.067 +v 1.6 106.076 -18.35 +v -0.227 105.59 -17.487 +v -0.238 105.408 -17.314 +v 0.8 105.29 -17.347 +v -0.25 105.217 -17.236 +v -0.72 105.658 -17.43 +v -1.265 105.622 -17.198 +v -1.33 105.442 -17.12 +v 0.264 105.73 -17.958 +v -0.218 105.728 -17.9 +v -1.203 105.794 -17.372 +v 0.703 105.753 -18.238 +v -0.22 105.688 -18.127 +v -1.156 105.923 -17.784 +v -1.66 105.997 -17.313 +v -2.082 106.26 -17.256 +v -1.596 106.12 -17.726 +v -1.17 105.886 -18.011 +v -2.19 106.113 -17.082 +v -2.758 106.905 -17.147 +v -3.2 107.222 -16.916 +v -3.365 107.125 -16.838 +v -2.302 105.958 -17.005 +v -3.043 107.316 -17.09 +v -3.265 107.76 -17.032 +v -2.322 106.637 -17.618 +v -2.924 107.386 -17.502 +v -3.425 108.235 -16.974 +v -3.292 108.27 -17.386 +v -2.959 107.366 -17.73 +v -2.766 106.9 -17.986 +v -2.024 106.34 -17.895 +v -2.088 106.253 -18.094 +v -1.207 105.784 -18.21 +v -1.327 105.45 -18.445 +v -2.55 106.394 -18.211 +v -0.227 105.58 -18.326 +v 0.29 105.4 -18.551 +v 0.725 105.648 -18.436 +v 1.65 105.98 -18.55 +v 1.736 105.816 -18.717 +v 2.142 106.43 -18.426 +v 2.21 106.346 -18.625 +v 2.707 106.552 -18.846 +v 2.797 107.12 -18.533 +v 2.573 106.68 -18.68 +v 3.328 108.432 -18.46 +v 3.367 108.424 -18.687 +v 3.14 107.47 -18.783 +v 3.473 108.402 -18.886 +v 3.43 109.363 -18.783 +v 3.39 109.36 -18.556 +v 3.538 109.37 -18.982 +v 3.654 108.364 -19.053 +v 3.723 109.384 -19.15 +v 3.035 106.95 -18.9 +v 3.998 108.293 -19.123 +v 3.454 107.305 -19.019 +v 3.615 107.22 -19.021 +v 1.9 105.505 -18.788 +v 2.544 105.926 -18.863 +v 0.834 105.123 -18.674 +v -3.052 107.31 -17.928 +v -3.21 107.216 -18.095 +v -3.435 108.232 -17.812 +v -3.614 108.186 -17.98 +v -3.526 108.724 -17.754 +v -3.879 108.684 -17.99 +v -3.357 107.13 -18.163 +v -3.715 110.317 -17.816 +v -3.68 109.75 -17.806 +v -2.297 105.966 -18.33 +v -3.513 107.037 -18.166 +v -2.404 105.82 -18.332 +v -3.333 106.443 -18.148 +v -2.516 105.664 -18.256 +v -4.059 108.664 -17.992 +v -3.677 106.94 -18.09 +v -4.25 108.643 -17.917 +v -3.888 110.373 -17.818 +v -4.14 108.05 -17.974 +v -4.214 109.842 -17.801 +v -3.385 111.406 -17.703 +v -4.07 110.43 -17.743 +v -4.458 109.25 -17.687 +v -4.432 108.622 -17.744 +v -4.395 109.873 -17.63 +v -4.245 110.488 -17.57 +v -4.01 111.074 -17.513 +v -3.543 111.513 -17.627 +v -4.102 111.12 -17.316 +v -3.696 111.616 -17.455 +v -4.343 110.52 -17.374 +v -2.787 112.363 -17.518 +v -2.199 112.562 -17.536 +v -2.907 112.503 -17.346 +v -2.302 112.723 -17.46 +v -0.595 113.16 -17.362 +v -2.101 112.41 -17.533 +v -3.234 111.304 -17.7 +v -2.81 111.578 -17.581 +v -3.356 110.756 -17.69 +v -0.569 112.982 -17.36 +v -1.207 113.222 -17.344 +v -0.623 113.35 -17.287 +v -1.85 113.177 -17.23 +v -1.26 113.398 -17.172 +v -0.025 113.58 -17.057 +v 0.576 113.356 -17.172 +v -0.65 113.533 -17.115 +v -1.288 113.498 -16.976 +v -1.894 113.27 -17.034 +v -0.665 113.635 -16.918 +v -0.025 113.683 -16.86 +v 0.601 113.54 -17 +v -0.025 113.693 -16.453 +v -0.667 113.645 -16.51 +v 0.615 113.64 -16.803 +v 0.616 113.65 -16.395 +v 1.221 113.41 -16.941 +v 1.17 113.232 -17.113 +v 1.118 113.048 -17.189 +v 1.815 113.194 -16.883 +v 2.27 112.743 -16.998 +v 2.168 112.58 -17.073 +v 1.25 113.51 -16.745 +v 1.86 113.297 -16.279 +v 1.857 113.288 -16.686 +v 1.252 113.518 -16.337 +v 2.367 112.9 -16.826 +v 2.884 112.655 -16.578 +v 2.427 112.995 -16.221 +v 1.813 113.19 -16.045 +v 1.22 113.405 -16.103 +v 0.6 113.534 -16.16 +v 1.738 113.022 -15.876 +v 0.576 113.352 -15.992 +v 2.816 112.572 -15.936 +v 2.89 112.663 -16.17 +v 3.364 112.218 -16.112 +v 2.7 112.43 -15.767 +v 3.277 112.138 -15.878 +v 3.357 112.21 -16.52 +v 3.767 111.712 -16.054 +v 3.67 111.646 -15.82 +v 4.092 111.16 -15.996 +v 3.758 111.707 -16.462 +v 3.28 112.14 -16.716 +v 3.673 111.648 -16.658 +v 3.522 111.544 -16.83 +v 3.145 112.016 -16.888 +v 3.99 111.108 -16.6 +v 4.083 111.154 -16.404 +v 4.232 110.525 -16.542 +v 4.33 110.557 -16.346 +v 4.387 109.92 -16.485 +v 4.488 109.94 -16.288 +v 4.498 109.94 -15.88 +v 4.34 110.56 -15.938 +v 4.455 109.297 -16.427 +v 4.558 109.3 -16.23 +v 4.568 109.302 -15.823 +v 4.45 109.297 -15.59 +v 4.382 109.92 -15.647 +v 4.201 109.887 -15.478 +v 4.228 110.523 -15.704 +v 3.822 111.024 -15.593 +v 3.987 111.106 -15.762 +v 3.375 111.443 -15.58 +v 2.175 112.592 -15.748 +v 1.122 113.06 -15.864 +v -0.597 113.174 -16.037 +v -0.025 113.575 -16.219 +v -0.623 113.346 -16.107 +v -1.773 113.006 -16.223 +v -2.206 112.573 -16.21 +v -0.65 113.528 -16.276 +v -1.258 113.394 -16.334 +v -1.85 113.173 -16.392 +v -2.399 112.875 -16.45 +v -2.784 112.36 -16.338 +v -3.215 111.932 -16.397 +v -2.904 112.5 -16.507 +v -1.898 113.28 -16.626 +v -2.462 112.974 -16.683 +v -1.29 113.507 -16.568 +v -2.457 112.966 -17.091 +v -2.98 112.59 -16.741 +v -2.974 112.58 -17.15 +v -2.401 112.88 -17.288 +v -3.442 112.13 -16.8 +v -3.434 112.124 -17.207 +v -3.353 112.053 -16.566 +v -3.79 111.68 -16.85 +v -4.111 111.124 -16.908 +v -4.005 111.072 -16.674 +v -4.353 110.523 -16.966 +v -4.24 110.486 -16.732 +v -4.497 109.89 -17.432 +v -4.507 109.892 -17.025 +v -4.39 109.872 -16.79 +v -3.84 110.99 -16.505 +v -4.56 109.252 -17.49 +v -4.57 109.252 -17.082 +v 4.03 109.856 -15.408 +v 4.057 110.467 -16.715 +v 4.017 109.853 -16.733 +v 3.364 111.435 -16.906 +v 4.206 109.887 -16.657 +v 3.84 109.82 -16.73 +v 3.215 111.333 -16.903 +v 2.072 112.427 -17.07 +v 1.069 112.874 -17.186 +v -1.389 105.28 -18.448 +v -0.25 105.226 -18.56 +v -0.262 105.045 -18.564 +v -3.516 108.725 -16.916 +v -3.536 109.222 -16.858 +v -3.38 108.74 -17.328 +v -3.419 108.736 -17.556 +v -3.351 109.694 -17.213 +v -3.497 109.72 -17.639 +v -3.377 110.208 -17.58 +v -3.698 108.705 -16.742 +v 2.552 105.916 -17.537 +v 3.524 112.034 -18.571 +v 3.094 112.488 -18.613 +v 3.886 111.527 -18.528 +v 3.516 112.028 -18.979 +v 3.087 112.48 -19.021 +v 2.6 112.88 -18.655 +v 2.594 112.873 -19.063 +v 2.002 113.098 -18.462 +v 2.055 113.203 -18.696 +v 2.05 113.194 -19.104 +v 3.017 112.404 -19.218 +v 2.535 112.788 -19.26 +v 2.004 113.102 -19.3 +v 1.425 113.345 -19.34 +v 1.921 112.938 -19.472 +v 0.802 113.32 -19.551 +v 1.835 112.767 -19.548 +v 0.767 113.132 -19.627 +v 2.893 112.27 -19.39 +v 3.147 111.723 -19.423 +v 1.754 112.605 -19.545 +v 0.733 112.954 -19.624 +v 3.007 111.607 -19.42 +v 3.294 111.845 -19.348 +v 3.733 110.772 -19.336 +v 3.908 110.85 -19.26 +v 3.436 111.962 -19.175 +v 3.79 111.468 -19.132 +v 4.073 109.41 -19.22 +v 4.182 110.005 -19.191 +v 3.892 109.396 -19.217 +v 3.508 110.394 -19.243 +v 4.264 109.422 -19.144 +v 4.077 110.924 -19.088 +v 4.363 110.043 -19.019 +v 4.288 110.677 -18.869 +v 4.448 109.435 -18.972 +v 4.322 110.69 -18.666 +v 4.464 110.065 -18.822 +v 4.473 110.067 -18.415 +v 4.18 110.97 -18.484 +v 3.786 111.466 -18.294 +v 4.186 110.64 -18.227 +v 4.56 109.443 -18.368 +v 4.443 109.435 -18.134 +v 4.55 109.443 -18.775 +v -4.362 110.583 -19.325 +v -4.561 109.22 -19.637 +v -4.52 109.98 -19.352 +v -4.336 110.575 -19.12 +v -4.377 109.954 -18.913 +v -4.493 109.976 -19.147 +v -4.594 109.358 -19.378 +v -4.266 109.34 -18.77 +v -3.674 110.936 -18.618 +v -4.026 109.887 -18.674 +v -3.618 108.202 -15.403 +v -3.283 107.777 -15.293 +v -3.22 107.233 -15.519 +v -3.73 109.243 -15.288 +v -3.44 108.248 -15.236 +v -2.78 106.915 -15.409 +v -2.157 106.075 -15.692 +v -3.783 108.16 -15.471 +v -3.057 106.694 -15.644 +v -1.842 105.68 -15.812 +v -1.284 105.615 -15.801 +v -0.81 105.303 -15.927 +v -3.2 106.582 -15.647 +v -1.928 105.52 -15.814 +v -0.25 105.397 -15.918 +v -0.848 105.126 -15.93 +v 0.83 105.307 -16.1 +v 0.869 105.13 -16.103 +v -0.287 104.856 -15.912 +v 0.91 104.943 -16.028 +v 0.794 105.473 -16.033 +v 1.776 105.84 -16.148 +v 2.32 105.983 -16.274 +v 0.755 105.654 -15.865 +v 1.23 105.794 -15.923 +v 2.109 106.268 -16.038 +v 2.97 106.86 -16.322 +v 3.375 107.163 -16.441 +v 3.068 107.34 -16.206 +v 3.459 107.72 -16.43 +v 2.49 106.594 -16.096 +v 2.975 107.395 -16.007 +v 3.338 108.292 -16.123 +v 3.443 108.266 -16.321 +v 3.713 108.744 -16.547 +v 3.529 108.762 -16.38 +v 3.15 107.844 -15.837 +v 3.3 108.302 -15.895 +v 3.382 108.777 -15.954 +v 3.49 109.757 -16.495 +v 3.384 109.738 -16.296 +v 3.672 109.79 -16.662 +v 3.787 108.18 -16.557 +v 3.344 109.73 -16.069 +v 3.518 108.763 -15.541 +v 3.278 107.792 -15.425 +v 3.059 107.346 -15.368 +v 2.705 107.062 -15.728 +v 2.483 106.6 -15.258 +v 3.433 108.268 -15.483 +v 3.217 107.254 -15.194 +v 3.61 108.224 -15.31 +v 3.534 109.26 -15.6 +v 3.66 109.788 -15.483 +v 3.796 108.178 -15.232 +v 3.383 107.158 -15.116 +v 3.848 109.822 -15.406 +v 2.325 105.975 -14.95 +v 3.543 107.065 -15.118 +v 2.212 106.13 -15.026 +v 0.832 105.298 -14.776 +v 1.683 106.01 -15.143 +v 0.791 105.485 -14.853 +v 2.103 106.277 -15.2 +v 2.386 106.7 -15.67 +v 1.618 106.13 -15.555 +v 1.227 105.804 -15.084 +v 0.752 105.664 -15.027 +v 0.723 105.8 -15.44 +v 1.193 105.895 -15.724 +v 0.732 105.76 -15.667 +v 0.26 105.593 -14.97 +v -0.237 105.592 -14.912 +v -0.228 105.73 -15.324 +v -0.773 105.48 -14.68 +v -0.735 105.66 -14.854 +v -1.216 105.8 -14.796 +v -1.756 105.84 -14.564 +v -1.846 105.672 -14.487 +v -0.813 105.294 -14.602 +v -0.706 105.795 -15.266 +v -1.67 106.002 -14.738 +v -2.914 106.808 -14.397 +v -3.064 106.69 -14.32 +v -1.17 105.928 -15.208 +v -2.433 106.553 -14.628 +v -0.715 105.756 -15.493 +v -1.965 106.346 -15.099 +v -1.624 106.088 -15.377 +v -2.77 106.922 -14.57 +v -2.339 106.653 -15.04 +v -2.44 106.545 -15.467 +v -1.674 105.993 -15.576 +v -3.051 107.332 -14.513 +v -2.933 107.4 -14.925 +v -3.607 108.205 -14.224 +v -3.274 107.78 -14.455 +v -3.43 108.25 -14.398 +v -3.296 108.284 -14.81 +v -3.517 108.74 -14.34 +v -3.535 109.237 -14.282 +v -3.398 109.232 -14.694 +v -3.546 109.237 -15.12 +v -3.335 108.274 -15.037 +v -3.494 109.738 -15.062 +v -3.388 109.72 -14.864 +v -3.183 107.818 -15.094 +v -3.547 110.283 -15.172 +v -3.183 110.687 -14.947 +v -3.843 109.8 -15.298 +v -3.502 110.844 -15.182 +v -0.737 105.65 -15.692 +v -0.238 105.58 -15.75 +v 2.428 105.837 -16.276 +v 3.532 107.072 -16.444 +v 1.483 105.11 -16.085 +v 2.542 105.683 -16.2 +v -3.959 108.116 -15.474 +v -3.35 106.463 -15.571 +v -2.941 106.017 -15.63 +v -2.018 105.352 -15.738 +v -4.022 109.832 -15.3 +v -4.21 109.865 -15.225 +v -4.273 109.26 -15.283 +v -3.664 110.924 -15.184 +v -4.144 108.07 -15.398 +v -2.647 112.23 -15.017 +v -3.836 111.008 -15.109 +v -3.118 111.172 -15.063 +v -2.53 112.093 -15.014 +v -2.771 112.377 -14.942 +v -1.14 113.043 -14.844 +v -3.202 111.954 -15 +v -4.001 111.09 -14.937 +v -4.238 110.51 -14.994 +v -3.34 112.076 -14.827 +v -4.336 110.542 -14.798 +v -3.811 111.63 -14.69 +v -3.418 112.144 -14.63 +v -2.89 112.517 -14.77 +v -2.957 112.595 -14.573 +v -2.386 112.888 -14.712 +v -1.754 113.02 -14.826 +v -2.441 112.975 -14.515 +v -1.83 113.187 -14.654 +v -2.447 112.983 -14.107 +v -2.964 112.603 -14.165 +v -1.872 113.28 -14.457 +v -1.245 113.403 -14.596 +v -1.193 113.226 -14.769 +v -1.09 112.868 -14.842 +v 0.573 113.164 -14.67 +v -0.006 113.395 -14.653 +v -0.632 113.535 -14.539 +v -1.274 113.502 -14.4 +v -0.646 113.637 -14.342 +v -0.006 113.58 -14.48 +v 0.6 113.353 -14.595 +v -0.006 113.683 -14.284 +v 0.626 113.536 -14.423 +v -0.006 113.693 -13.877 +v -0.648 113.647 -13.934 +v -1.276 113.512 -13.992 +v -0.631 113.53 -13.7 +v -1.244 113.4 -13.758 +v -1.828 113.183 -13.815 +v -1.876 113.29 -14.05 +v -2.384 112.884 -13.873 +v -1.192 113.222 -13.59 +v -2.285 112.728 -13.704 +v -1.144 113.055 -13.519 +v -0.006 113.39 -13.474 +v -2.656 112.24 -13.692 +v -2.888 112.513 -13.93 +v -3.2 111.95 -13.82 +v -3.337 112.073 -13.989 +v -3.568 111.468 -13.878 +v -3.721 111.57 -14.047 +v -3.425 112.15 -14.223 +v -3.82 111.634 -14.281 +v -4.06 110.45 -13.987 +v -4.234 110.508 -14.156 +v -4.103 111.14 -14.332 +v -4.346 110.545 -14.39 +v -4.387 109.896 -14.214 +v -4.493 109.915 -14.856 +v -4.503 109.917 -14.448 +v -4.392 109.897 -15.052 +v -4.56 109.27 -14.914 +v -4.457 109.267 -15.11 +v -4.57 109.27 -14.506 +v -4.536 108.63 -14.972 +v -4.434 108.64 -15.168 +v 0.575 113.177 -13.345 +v 1.682 112.856 -13.23 +v 1.19 113.222 -13.357 +v 0.625 113.53 -13.584 +v -0.006 113.575 -13.642 +v 2.32 112.923 -13.418 +v 1.242 113.4 -13.526 +v 2.224 112.766 -13.249 +v 3.027 111.88 -13.062 +v 3.527 111.527 -13.075 +v 3.292 112.122 -13.301 +v 2.836 112.556 -13.36 +v 3.68 111.63 -13.244 +v 3.997 111.086 -13.186 +v 4.058 110.452 -12.96 +v 3.893 110.398 -12.89 +v 4.103 111.138 -13.42 +v 3.776 111.697 -13.478 +v 4.345 110.546 -13.362 +v 4.233 110.51 -13.128 +v 4.385 109.9 -13.07 +v 4.267 109.272 -12.844 +v 4.501 109.922 -13.305 +v 4.335 110.543 -13.77 +v 4.094 111.133 -13.828 +v 4.001 111.088 -14.024 +v 3.768 111.692 -13.886 +v 4.237 110.51 -13.967 +v 3.836 111.007 -14.196 +v 3.683 111.633 -14.082 +v 3.371 112.195 -13.943 +v 3.159 112 -14.312 +v 3.295 112.125 -14.14 +v 4.062 110.453 -14.14 +v 3.88 110.393 -14.214 +v 4.06 108.686 -14.04 +v 3.708 110.337 -14.212 +v 2.884 111.75 -14.385 +v 3.018 111.872 -14.388 +v 4.272 109.272 -14.024 +v 3.778 107.572 -13.925 +v 3.88 108.705 -14.038 +v 4.25 108.665 -13.965 +v 4.456 109.278 -13.851 +v 4.39 109.902 -13.91 +v 3.618 108.203 -13.912 +v 3.73 109.253 -14.029 +v 3.61 107.64 -13.923 +v 3.25 107.286 -13.804 +v 2.726 106.328 -13.755 +v 3.282 107.775 -13.687 +v 3.527 108.743 -13.803 +v 2.81 106.957 -13.578 +v 3.182 107.816 -13.489 +v 3.42 108.754 -13.604 +v 3.545 109.246 -13.861 +v 3.397 109.24 -13.435 +v 3.295 108.284 -13.319 +v 3.38 108.758 -13.377 +v 3.428 108.25 -12.907 +v 3.272 107.78 -12.85 +v 2.96 107.45 -13.21 +v 2.803 106.963 -12.74 +v 2.478 106.582 -13.52 +v 2.694 107.047 -13.152 +v 2.47 106.59 -12.682 +v 1.672 105.992 -13.404 +v 2.01 106.38 -13.036 +v 2.207 106.11 -13.63 +v 1.22 105.79 -13.347 +v 1.621 106.088 -13.206 +v 1.283 105.616 -13.514 +v 1.342 105.456 -13.582 +v 0.259 105.398 -13.4 +v -0.283 105.228 -13.409 +v -0.258 105.582 -13.173 +v 0.246 105.582 -13.232 +v -0.794 105.473 -13.283 +v -1.356 105.462 -13.293 +v -1.42 105.292 -13.296 +v -0.297 105.048 -13.411 +v -1.723 105.81 -13.174 +v -1.233 105.794 -13.058 +v -2.453 106.557 -12.89 +v -2.067 106.237 -12.948 +v -2.698 106.3 -13.126 +v -2.933 106.812 -13 +v -1.196 105.896 -12.86 +v -0.25 105.69 -12.975 +v -1.57 106.105 -12.58 +v -0.724 105.8 -12.69 +v 0.236 105.73 -12.806 +v -0.247 105.73 -12.747 +v -1.23 105.804 -12.22 +v -2.061 106.246 -12.11 +v -0.753 105.664 -12.277 +v -2.572 106.432 -11.878 +v -1.293 105.632 -12.046 +v -2.446 106.565 -12.052 +v -3.448 107.723 -11.705 +v -3.626 107.65 -11.628 +v -2.705 106.294 -11.8 +v -2.78 106.933 -11.995 +v -1.981 106.357 -12.522 +v -3.06 107.347 -11.936 +v -2.671 107.018 -12.407 +v -3.432 108.265 -11.821 +v -3.718 109.264 -11.532 +v -3.279 107.79 -11.88 +v -3.518 108.755 -11.764 +v -3.151 107.843 -12.291 +v -3.07 107.342 -12.775 +v -2.976 107.396 -12.576 +v -3.188 107.828 -12.519 +v -3.288 107.787 -12.717 +v -3.382 108.77 -12.176 +v -3.529 108.753 -12.602 +v -3.46 107.718 -12.885 +v -3.713 108.734 -12.77 +v -3.438 109.253 -12.345 +v -3.545 109.257 -12.544 +v -3.398 109.25 -12.118 +v -3.48 109.755 -11.647 +v -3.367 110.24 -12.428 +v -3.264 110.205 -12.23 +v -3.673 109.79 -12.653 +v -3.617 107.654 -12.953 +v -3.9 109.27 -12.78 +v -3.876 110.408 -12.666 +v -3.704 110.35 -12.664 +v -4.081 109.278 -12.782 +v -3.368 110.73 -12.544 +v -2.91 111.72 -12.496 +v -2.408 111.972 -12.37 +v -4.273 109.285 -12.706 +v -4.252 108.678 -12.764 +v -3.963 107.514 -12.88 +v -3.785 107.586 -12.955 +v -4.435 108.66 -12.592 +v -4.327 108.04 -12.65 +v -3.7 106.977 -12.937 +v -2.956 106.032 -13.053 +v -2.824 106.17 -13.128 +v -2.491 105.646 -13.11 +v -1.486 105.112 -13.22 +v -4.457 109.292 -12.534 +v -4.388 109.92 -12.476 +v -4.057 110.468 -12.59 +v -4.538 108.648 -12.396 +v -4.56 109.296 -12.337 +v -3.046 111.84 -12.499 +v -3.189 111.97 -12.423 +v -1.663 112.85 -12.326 +v -3.558 111.49 -12.481 +v -1.59 112.685 -12.323 +v 0.017 113.204 -12.152 +v -2.269 112.744 -12.308 +v -1.741 113.026 -12.25 +v 0.016 113.023 -12.15 +v 0.018 113.396 -12.077 +v -0.588 113.355 -12.135 +v 1.154 113.038 -12.036 +v 1.103 112.864 -12.034 +v 1.208 113.22 -11.96 +v 2.615 112.257 -11.87 +v 2.499 112.118 -11.866 +v 2.737 112.404 -11.794 +v 3.67 110.91 -11.696 +v 2.247 112.757 -11.852 +v 1.26 113.398 -11.789 +v 0.649 113.533 -11.846 +v 2.344 112.914 -11.68 +v 1.824 113.302 -11.54 +v 0.664 113.635 -11.65 +v 0.02 113.683 -11.708 +v 0.019 113.58 -11.904 +v 1.292 113.506 -11.184 +v 0.665 113.645 -11.242 +v 0.648 113.528 -11.008 +v 1.78 113.204 -10.9 +v 1.828 113.31 -11.133 +v 0.019 113.575 -11.066 +v 0.02 113.693 -11.3 +v 0.621 113.346 -10.839 +v -0.613 113.533 -11.124 +v -0.587 113.35 -10.955 +v -0.629 113.65 -11.358 +v -1.226 113.403 -11.182 +v -1.74 113.022 -11.07 +v 0.017 113.218 -10.827 +v -1.669 112.863 -11 +v -1.815 113.19 -11.24 +v -1.258 113.517 -11.416 +v -2.364 112.896 -11.297 +v -2.755 112.384 -11.186 +v -1.862 113.297 -11.474 +v -1.255 113.507 -11.824 +v -1.858 113.288 -11.881 +v -2.421 112.988 -11.939 +v -2.427 112.996 -11.53 +v -2.874 112.524 -11.355 +v -2.95 112.614 -11.59 +v -2.366 112.9 -12.135 +v -2.943 112.607 -11.997 +v -1.816 113.194 -12.078 +v -1.227 113.408 -12.02 +v -2.877 112.528 -12.193 +v -3.403 112.16 -12.054 +v -3.326 112.092 -12.25 +v -3.41 112.167 -11.647 +v -3.798 111.65 -12.112 +v -3.712 111.593 -12.309 +v -4.232 110.526 -12.418 +v -4.117 111.086 -12.17 +v -4.126 111.09 -11.763 +v -3.806 111.656 -11.704 +v -4.34 110.562 -11.814 +v -4.49 109.938 -12.28 +v -4.02 111.04 -11.529 +v -3.708 111.59 -11.47 +v -4.383 109.92 -11.637 +v -3.854 110.96 -11.36 +v -4.5 109.94 -11.872 +v -4.57 109.296 -11.93 +v -3.323 112.09 -11.412 +v -3.056 111.85 -11.173 +v -0.613 113.537 -11.962 +v -0.627 113.64 -11.766 +v 1.158 113.05 -10.71 +v 1.707 113.035 -10.73 +v 2.623 112.267 -10.544 +v 2.342 112.91 -10.84 +v 2.245 112.754 -10.672 +v 3.683 110.916 -10.37 +v 3.167 111.985 -10.556 +v 2.852 112.542 -10.783 +v 2.928 112.633 -11.017 +v 2.404 113.01 -11.075 +v 2.398 113.002 -11.483 +v 3.39 112.188 -10.96 +v 2.921 112.625 -11.425 +v 2.855 112.546 -11.621 +v 3.383 112.18 -11.367 +v 3.306 112.112 -11.564 +v 3.696 111.614 -11.506 +v 3.544 111.51 -11.678 +v 3.782 111.672 -11.31 +v 4.008 111.075 -11.448 +v 3.843 110.994 -11.62 +v 4.082 109.243 -11.522 +v 4.211 109.852 -11.505 +v 4.242 110.493 -11.39 +v 4.101 111.12 -11.252 +v 4.34 110.524 -11.194 +v 4.393 109.884 -11.333 +v 4.494 109.9 -11.136 +v 4.457 109.254 -11.275 +v 4.273 109.248 -11.447 +v 4.139 108.053 -11.331 +v 3.954 108.1 -11.407 +v 3.71 106.998 -11.222 +v 3.224 106.614 -11.24 +v 1.913 105.513 -11.066 +v 3.08 106.725 -11.237 +v 3.778 108.146 -11.404 +v 3.9 109.237 -11.52 +v 3.508 110.83 -11.694 +v 1.828 105.673 -11.064 +v 0.26 105.045 -10.893 +v 0.25 105.226 -10.89 +v -0.885 105.134 -10.777 +v -0.29 105.4 -10.764 +v 0.763 105.468 -10.88 +v -0.846 105.31 -10.775 +v -2.396 105.813 -10.61 +v -2.29 105.96 -10.607 +v -1.256 105.606 -10.656 +v -3.541 107.085 -10.437 +v -1.995 105.34 -10.592 +v -0.926 104.947 -10.702 +v -3.384 107.175 -10.434 +v -3.707 106.99 -10.361 +v -4.065 108.72 -10.263 +v -3.373 106.494 -10.419 +v -2.508 105.658 -10.534 +v -3.884 108.738 -10.26 +v -4.152 108.103 -10.246 +v -4.255 108.702 -10.188 +v -4.015 109.868 -10.148 +v -3.837 109.835 -10.145 +v -4.203 109.903 -10.072 +v -3.388 111.4 -9.98 +v -3.848 110.985 -9.963 +v -4.384 109.937 -9.9 +v -4.456 109.315 -9.957 +v -2.156 112.59 -9.807 +v -3.238 111.3 -9.978 +v -3.547 111.508 -9.905 +v -4.014 111.065 -9.79 +v -4.347 110.507 -9.652 +v -4.559 109.32 -9.76 +v -4.107 111.11 -9.594 +v -3.7 111.61 -9.732 +v -2.741 112.402 -9.79 +v -3.314 112.104 -9.675 +v -3.785 111.67 -9.536 +v -3.39 112.173 -9.478 +v -2.86 112.543 -9.617 +v -2.257 112.752 -9.732 +v -2.925 112.622 -9.42 +v -2.354 112.91 -9.56 +v -3.398 112.18 -9.07 +v -3.794 111.674 -9.128 +v -3.31 112.1 -8.836 +v -3.696 111.61 -8.894 +v -2.932 112.63 -9.012 +v -4.01 111.063 -8.952 +v -4.116 111.114 -9.186 +v -4.356 110.51 -9.244 +v -4.244 110.475 -9.01 +v -4.495 109.958 -9.296 +v -4.569 109.32 -9.353 +v -3.174 111.978 -8.668 +v -2.163 112.6 -8.482 +v -2.255 112.75 -8.552 +v -2.856 112.54 -8.778 +v -3.4 111.41 -8.655 +v -4.069 110.42 -8.841 +v -2.352 112.905 -8.72 +v -2.414 113.005 -8.955 +v -1.845 113.304 -8.898 +v -2.409 112.996 -9.363 +v -1.797 113.197 -8.663 +v -1.24 113.522 -8.84 +v -1.84 113.295 -9.305 +v -1.8 113.2 -9.502 +v -1.209 113.413 -9.444 +v -1.237 113.512 -9.248 +v -1.159 113.235 -9.616 +v -0.589 113.54 -9.386 +v -0.564 113.36 -9.558 +v -0.602 113.643 -9.19 +v 0.042 113.58 -9.328 +v 0.61 113.158 -9.518 +v -0.54 113.17 -9.634 +v 0.638 113.347 -9.442 +v -0.515 112.99 -9.631 +v -2.06 112.436 -9.805 +v 2.163 112.584 -9.35 +v 0.583 112.98 -9.516 +v 0.666 113.53 -9.27 +v 1.731 113.03 -9.333 +v 2.265 112.746 -9.275 +v 3.393 111.393 -9.178 +v 2.067 112.43 -9.348 +v 1.806 113.198 -9.16 +v 1.237 113.512 -9.023 +v 0.043 113.683 -9.131 +v 2.362 112.903 -9.103 +v 1.848 113.292 -8.964 +v 1.24 113.52 -8.615 +v 0.683 113.64 -8.666 +v 0.043 113.693 -8.724 +v 1.208 113.408 -8.38 +v 0.042 113.575 -8.49 +v 1.852 113.302 -8.557 +v 1.158 113.23 -8.212 +v 0.04 113.392 -8.32 +v 1.804 113.194 -8.322 +v -0.588 113.537 -8.547 +v -1.158 113.23 -8.437 +v 0.612 113.17 -8.193 +v -0.54 113.182 -8.308 +v -0.604 113.653 -8.782 +v -1.208 113.408 -8.606 +v 2.17 112.595 -8.025 +v 1.73 113.026 -8.154 +v 2.747 112.39 -8.038 +v 3.404 111.4 -7.852 +v 3.548 111.497 -7.923 +v 3.319 112.09 -8.149 +v 2.866 112.53 -8.207 +v 2.36 112.9 -8.264 +v 3.701 111.6 -8.091 +v 4.012 111.056 -8.034 +v 3.8 111.665 -8.326 +v 3.407 112.17 -8.383 +v 2.941 112.62 -8.44 +v 3.4 112.163 -8.79 +v 4.118 111.107 -8.268 +v 3.79 111.66 -8.733 +v 4.356 110.51 -8.21 +v 4.109 111.103 -8.676 +v 3.705 111.602 -8.93 +v 3.322 112.094 -8.987 +v 2.935 112.613 -8.849 +v 4.016 111.058 -8.872 +v 3.552 111.5 -9.102 +v 3.185 111.972 -9.16 +v 2.868 112.534 -9.045 +v 2.417 112.99 -8.906 +v 4.027 109.797 -9.004 +v 3.242 111.292 -9.175 +v 3.848 109.767 -9.002 +v 4.056 108.65 -8.888 +v 4.216 109.83 -8.929 +v 4.072 110.42 -8.987 +v 3.876 108.67 -8.886 +v 3.535 107.076 -8.721 +v 4.246 108.627 -8.813 +v 3.378 107.167 -8.718 +v 3.965 107.524 -8.704 +v 2.825 106.173 -8.605 +v 4.429 108.605 -8.64 +v 4.458 109.23 -8.698 +v 4.56 109.233 -8.502 +v 4.5 109.877 -8.56 +v 4.397 109.86 -8.756 +v 4.346 110.506 -8.618 +v 4.248 110.475 -8.814 +v 2.7 106.303 -8.603 +v 1.368 105.272 -8.432 +v 0.218 105.224 -8.315 +v 1.815 105.665 -8.488 +v -1.707 105.41 -8.131 +v -0 105.388 -8.225 +v 0.739 105.462 -8.304 +v -0.583 105.08 -8.24 +v 1.735 105.816 -8.42 +v 0.702 105.643 -8.137 +v 1.65 105.98 -8.253 +v 0.198 105.578 -8.08 +v 2.454 106.56 -8.368 +v 2.582 106.426 -8.535 +v 3.07 107.345 -8.483 +v 3.23 107.252 -8.65 +v 2.38 106.638 -8.169 +v 2.977 107.4 -8.284 +v 3.29 107.795 -8.541 +v 3.624 108.23 -8.767 +v 3.523 108.71 -8.65 +v 3.731 109.213 -8.876 +v 3.498 109.708 -8.766 +v 3.555 110.254 -8.992 +v 3.416 108.723 -8.452 +v 3.392 109.69 -8.568 +v 3.301 108.31 -8.173 +v 3.398 109.205 -8.282 +v 3.28 107.8 -7.703 +v 2.943 107.42 -8.057 +v 2.352 106.666 -7.941 +v 3.062 107.35 -7.645 +v 2.783 106.94 -7.587 +v 2.447 106.567 -7.53 +v 3.22 107.258 -7.471 +v 2.574 106.435 -7.355 +v 2.067 106.25 -7.472 +v 1.31 105.434 -7.105 +v 2.706 106.297 -7.278 +v 1.246 105.615 -7.182 +v 1.645 105.99 -7.414 +v 1.185 105.787 -7.356 +v 0.7 105.653 -7.298 +v 0.208 105.406 -7.068 +v 1.58 106.11 -7.826 +v 1.139 105.917 -7.768 +v 1.6 106.075 -8.054 +v 0.198 105.59 -7.241 +v -0.53 105.44 -6.99 +v -0.558 105.25 -6.913 +v -0.505 105.62 -7.164 +v 0.192 105.69 -7.438 +v -1.002 105.728 -7.109 +v -1.555 105.74 -6.881 +v -1.479 105.907 -7.055 +v -0 105.72 -7.631 +v -0.963 105.86 -7.521 +v -1.922 106.15 -7.003 +v -1.848 106.267 -7.415 +v -1.87 106.233 -7.642 +v -1.483 105.897 -7.893 +v -2.413 106.535 -6.94 +v -2.538 106.4 -6.766 +v -2.32 106.635 -7.352 +v -2.347 106.606 -7.58 +v -2.42 106.527 -7.778 +v -1.928 106.143 -7.841 +v -3.059 107.322 -7.678 +v -2.966 107.377 -7.48 +v -2.931 107.397 -7.252 +v -3.05 107.327 -6.84 +v -3.274 107.78 -6.792 +v -3.43 108.26 -6.745 +v -3.297 108.293 -7.157 +v -3.208 107.235 -6.666 +v -3.608 108.215 -6.571 +v -3.52 108.763 -6.699 +v -4.094 109.297 -6.404 +v -2.669 106.26 -6.689 +v -1.635 105.567 -6.804 +v -3.382 108.777 -7.11 +v -3.534 109.273 -6.653 +v -3.422 108.773 -7.338 +v -3.53 108.762 -7.537 +v -3.437 109.27 -7.293 +v -3.397 109.267 -7.066 +v -3.34 109.753 -7.022 +v -3.73 109.282 -7.66 +v -3.476 109.78 -6.61 +v -3.62 108.212 -7.75 +v -3.9 109.29 -7.727 +v -3.284 107.778 -7.63 +v -3.218 107.228 -7.845 +v -3.612 107.643 -7.865 +v -2.546 106.392 -7.945 +v -2.028 105.987 -8.008 +v -3.52 107.05 -7.916 +v -3.96 108.127 -7.821 +v -3.957 107.502 -7.792 +v -3.336 106.447 -7.89 +v -2.786 106.135 -8.016 +v -4.253 108.688 -7.7 +v -4.08 109.297 -7.73 +v -4.325 108.035 -7.574 +v -4.436 108.67 -7.527 +v -4.272 109.305 -7.654 +v -3.863 110.444 -7.643 +v -3.347 111.46 -7.562 +v -4.044 110.506 -7.568 +v -4.456 109.313 -7.482 +v -4.382 109.95 -7.438 +v -4.54 108.66 -7.33 +v -4.559 109.318 -7.285 +v -4.483 109.97 -7.241 +v -4.218 110.566 -7.395 +v -4.315 110.6 -7.199 +v -3.984 111.12 -7.356 +v -4.077 111.167 -7.16 +v -3.654 111.676 -7.315 +v -3.503 111.57 -7.487 +v -4.085 111.172 -6.752 +v -3.739 111.735 -7.118 +v -4.325 110.603 -6.79 +v -4.377 109.95 -6.6 +v -4.214 110.564 -6.557 +v -4.493 109.97 -6.833 +v -4.569 109.318 -6.878 +v -3.98 111.12 -6.517 +v -3.747 111.74 -6.71 +v -3.816 111.036 -6.349 +v -3.65 111.673 -6.476 +v -3.33 112.254 -6.67 +v -3.5 111.568 -6.307 +v -3.245 112.173 -6.436 +v -2.846 112.7 -6.631 +v -3.324 112.247 -7.078 +v -3.248 112.176 -7.274 +v -2.84 112.692 -7.04 +v -2.775 112.612 -7.236 +v -2.66 112.467 -7.408 +v -2.252 112.968 -7.198 +v -2.304 113.057 -7.002 +v -2.309 113.066 -6.594 +v -1.603 113.082 -7.334 +v -1.672 113.252 -7.162 +v -1.711 113.348 -6.965 +v -2.772 112.608 -6.397 +v -2.25 112.964 -6.36 +v -1.715 113.357 -6.557 +v -1.68 113.156 -6.207 +v -2.876 112.15 -6.205 +v -1.082 113.562 -6.521 +v -0.854 113.43 -6.205 +v -0.43 113.673 -6.486 +v 0 113.575 -6.205 +v 0.231 113.688 -6.453 +v -0.428 113.663 -6.894 +v -1.08 113.552 -6.93 +v -0.419 113.56 -7.09 +v -1.056 113.452 -7.126 +v 0.23 113.678 -6.86 +v 0.225 113.575 -7.057 +v 0.87 113.61 -6.42 +v 1.51 113.378 -6.206 +v 1.507 113.427 -6.797 +v 0.868 113.6 -6.829 +v 0.849 113.5 -7.025 +v 0.216 113.39 -7.23 +v 1.472 113.33 -6.994 +v 1.412 113.156 -7.166 +v 2.067 113.072 -6.963 +v 2.51 112.582 -7.106 +v 2.852 112.044 -7.153 +v 1.348 112.975 -7.241 +v 2.617 112.73 -6.933 +v 2.114 113.164 -6.766 +v 2.985 112.18 -7.077 +v 3.114 112.313 -6.905 +v 2.678 112.815 -6.737 +v 2.7 112.845 -6.534 +v 2.132 113.197 -6.564 +v 3.186 112.387 -6.708 +v 3.212 112.413 -6.506 +v 3.532 111.843 -6.878 +v 3.614 111.906 -6.682 +v 3.643 111.93 -6.48 +v 2.956 112.594 -6.205 +v 3.95 111.395 -6.205 +v 3.98 111.352 -6.655 +v 3.89 111.302 -6.852 +v 4.262 110.75 -6.63 +v 4.165 110.713 -6.827 +v 3.729 111.212 -7.024 +v 4.354 110.085 -6.802 +v 4.174 110.045 -6.974 +v 4.455 110.107 -6.606 +v 4.444 109.504 -6.781 +v 4.269 108.866 -6.931 +v 4.078 108.877 -7.007 +v 3.988 110.004 -7.05 +v 4.453 108.855 -6.76 +v 4.547 109.513 -6.585 +v 4.366 108.21 -6.738 +v 4.556 108.85 -6.563 +v 4.017 107.657 -6.89 +v 3.837 107.723 -6.966 +v 3.1 106.177 -6.84 +v 2.961 106.308 -6.916 +v 2.242 105.478 -6.813 +v 1.397 105.315 -6.884 +v 2.83 106.433 -6.913 +v 1.255 105.692 -6.74 +v 1.958 105.94 -6.818 +v 3.667 107.785 -6.963 +v 3.055 106.977 -6.862 +v 3.897 108.888 -7.004 +v 3.72 109.442 -6.959 +v 3.486 110.454 -7.004 +v 3.562 111.118 -7.1 +v 2.725 111.914 -7.15 +v 1.289 112.804 -7.239 +v 0.197 113.018 -7.302 +v 0.206 113.2 -7.305 +v -1.464 112.736 -7.407 +v -0.401 113.377 -7.263 +v -1.532 112.904 -7.41 +v -2.541 112.318 -7.483 +v -2.429 112.176 -7.48 +v -2.72 111.678 -7.452 +v -3.335 110.795 -7.533 +v 2.572 106.678 -6.678 +v 2.904 107.083 -6.695 +v 3.333 107.906 -6.728 +v 3.507 107.843 -6.896 +v 1.86 106.098 -6.65 +v 1.192 105.865 -6.5 +v 1.804 106.19 -6.452 +v 2.494 106.752 -6.479 +v 1.173 105.916 -6.205 +v 2.32 106.628 -6.205 +v 2.847 107.256 -6.205 +v 3.261 108.138 -6.206 +v 3.367 108.42 -6.55 +v 3.417 109.13 -6.205 +v 3.542 108.91 -6.77 +v 3.434 108.916 -6.57 +v 3.464 109.888 -6.812 +v 3.175 110.335 -6.41 +v 2.956 111.4 -7.056 +v 4.296 110.763 -6.427 +v 4.572 109.676 -6.206 +v -1.058 105.54 -8.115 +v -0.506 105.61 -8.002 +v 0.192 105.686 -7.88 +v 0.673 105.788 -7.71 +v -2.323 105.532 -8.003 +v 3.513 108.712 -7.812 +v 3.695 108.69 -7.638 +v 3.386 107.162 -7.394 +v 3.536 109.208 -7.87 +v 3.352 109.684 -8.34 +v 3.885 108.67 -7.561 +v 0.24 104.852 -8.242 +v 1.432 105.092 -8.357 +v 2.422 113 -8.499 +v 4.243 110.473 -7.976 +v 4.509 109.878 -8.152 +v 4.068 110.418 -7.807 +v 4.393 109.86 -7.918 +v 4.57 109.234 -8.094 +v -4.541 108.674 -9.819 +v -4.438 108.684 -10.016 +v -4.331 108.06 -10.074 +v -3.556 110.255 -10.026 +v -3.73 109.283 -10.135 +v -2.774 111.618 -9.852 +v -3.193 110.667 -9.8 +v -3.488 109.77 -9.91 +v -2.943 111.102 -9.742 +v -3.382 109.75 -9.71 +v -3.424 108.784 -9.827 +v -3.397 109.27 -9.541 +v -3.531 108.773 -10.025 +v -3.384 108.787 -9.6 +v -3.302 108.312 -9.658 +v -3.446 108.276 -10.084 +v -3.478 109.768 -9.072 +v -3.534 109.275 -9.13 +v -2.982 107.406 -10 +v -2.948 107.426 -9.773 +v -3.076 107.352 -10.2 +v -3.625 108.232 -10.25 +v -3.236 107.26 -10.366 +v -2.8 106.94 -10.256 +v -2.714 107.007 -10.058 +v -2.36 106.674 -9.888 +v -2.591 106.434 -10.482 +v -1.586 106.113 -10.004 +v -2.081 106.247 -10.372 +v -1.144 105.92 -10.062 +v -1.655 105.983 -10.43 +v -0.745 105.763 -10.34 +v -0.769 105.658 -10.54 +v -0.265 105.73 -10.17 +v 0.22 105.688 -10.456 +v 0.226 105.58 -10.655 +v 0.726 105.65 -10.713 +v 0.217 105.728 -10.229 +v 0.695 105.793 -10.287 +v 1.662 105.986 -10.829 +v 1.611 106.082 -10.63 +v 1.749 105.823 -10.996 +v 2.083 106.25 -10.886 +v 2.02 106.337 -10.687 +v 1.593 106.117 -10.402 +v 2.365 106.68 -10.518 +v 2.596 106.44 -11.111 +v 2.8 106.943 -11.002 +v 2.95 107.433 -10.633 +v 3.47 107.746 -11.285 +v 3.08 107.36 -11.06 +v 3.33 108.262 -10.97 +v 3.16 107.87 -10.692 +v 2.792 106.95 -10.163 +v 2.46 106.58 -10.106 +v 2.937 106.837 -9.99 +v 3.07 107.365 -10.221 +v 1.743 105.834 -9.816 +v 2.076 106.258 -10.048 +v 1.202 105.794 -9.933 +v 0.238 105.408 -9.643 +v 1.657 105.996 -9.99 +v 0.723 105.66 -9.875 +v 0.226 105.59 -9.817 +v -0.275 105.594 -9.759 +v -0.766 105.668 -9.701 +v -0.806 105.49 -9.527 +v -1.65 105.992 -9.592 +v -2.182 106.107 -9.36 +v -0.848 105.302 -9.45 +v -2.295 105.952 -9.283 +v 0.25 105.217 -9.566 +v 1.833 105.665 -9.74 +v 3.088 106.72 -9.912 +v 3.424 108.237 -10.33 +v 3.602 108.192 -10.157 +v 3.787 108.144 -10.08 +v 3.515 108.726 -10.388 +v 3.718 109.232 -10.272 +v 3.398 109.222 -10.858 +v 3.378 108.74 -10.8 +v 3.535 109.226 -10.446 +v 3.349 109.702 -10.917 +v -2.075 106.256 -9.534 +v -2.456 106.575 -9.476 +v -3.226 107.266 -9.187 +v -2.79 106.947 -9.418 +v -3.067 107.357 -9.36 +v -3.284 107.805 -9.303 +v -3.703 108.756 -9.013 +v -3.436 108.28 -9.245 +v -3.52 108.774 -9.187 +v 3.434 108.235 -11.17 +v 3.438 109.223 -11.086 +v 3.709 108.704 -11.394 +v 3.546 109.227 -11.285 +v 3.677 109.76 -11.51 +v 3.494 109.728 -11.343 +v 2.51 105.66 -11.048 +v 3.375 106.497 -11.164 +v 4.56 109.257 -11.078 +v 4.11 111.124 -10.844 +v 3.79 111.678 -10.901 +v 4.35 110.528 -10.786 +v 4.238 110.49 -10.552 +v 4.004 111.073 -10.61 +v 4.504 109.903 -10.729 +v 4.57 109.257 -10.67 +v 4.388 109.883 -10.494 +v 4.207 109.852 -10.326 +v 3.839 110.992 -10.44 +v 3.692 111.612 -10.667 +v 3.303 112.11 -10.725 +v -1.36 105.453 -11.968 +v -0.27 105.41 -12.161 +v -0.284 105.22 -12.084 +v -0.257 105.593 -12.335 +v 0.245 105.592 -12.393 +v 1.28 105.627 -12.335 +v 0.738 105.662 -12.45 +v 1.169 105.928 -12.92 +v 1.216 105.8 -12.509 +v 1.667 106.002 -12.566 +v 2.091 106.27 -12.624 +v 2.598 106.458 -12.508 +v 1.183 105.89 -13.148 +v 3.442 107.71 -12.675 +v 3.699 108.724 -12.79 +v 3.619 107.637 -12.598 +v 2.732 106.32 -12.43 +v 3.517 108.744 -12.965 +v 3.534 109.246 -13.023 +v 3.89 108.704 -12.714 +v 1.345 105.447 -12.258 +v 1.404 105.286 -13.585 +v 0.297 104.856 -13.394 +v 1.47 105.106 -13.51 +v 2.852 106.198 -13.758 +v 1.755 113.018 -14.48 +v 1.676 112.844 -14.555 +v 2.722 112.418 -14.37 +v 1.602 112.68 -14.552 +v 2.839 112.56 -14.198 +v 1.83 113.186 -14.307 +v 2.376 113.015 -14.06 +v 2.905 112.64 -14.001 +v 2.381 113.023 -13.652 +v 3.379 112.2 -13.535 +v 2.91 112.647 -13.593 +v 1.877 113.29 -13.703 +v 1.272 113.502 -14.168 +v 1.275 113.512 -13.76 +v 0.64 113.638 -14.226 +v 0.642 113.648 -13.818 +v 1.243 113.403 -14.365 +v 0.547 112.985 -14.668 +v 4.491 109.92 -13.712 +v 4.559 109.282 -13.655 +v 4.569 109.282 -13.247 +v 4.451 109.278 -13.013 +v -3.957 107.5 -15.456 +v 0.262 105.032 -9.568 +v 0.874 104.94 -9.696 +v 1.92 105.5 -9.741 +v -0.332 104.862 -9.58 +v -0.888 105.12 -9.452 +v -1.437 105.1 -9.47 +v -2.403 105.802 -9.284 +v -2.079 105.18 -9.582 +v -1.499 104.926 -9.64 +v -1.993 105.343 -9.413 +v -2.682 105.417 -9.758 +v -2.134 105.076 -9.816 +v -2.613 105.512 -9.524 +v -2.965 106.047 -9.297 +v -3.092 105.914 -9.466 +v -3.174 105.83 -9.7 +v -2.676 105.425 -10.166 +v -2.129 105.085 -10.224 +v -1.538 104.815 -9.874 +v -2.616 105.51 -10.362 +v -2.08 105.176 -10.42 +v -1.535 104.824 -10.282 +v -3.167 105.837 -10.108 +v -3.096 105.91 -10.304 +v -0.966 104.768 -10.53 +v -0.99 104.657 -9.925 +v -0.355 104.572 -10.39 +v -0.347 104.675 -10.587 +v 0.273 104.854 -10.817 +v 0.285 104.67 -10.645 +v 0.291 104.567 -10.448 +v 0.912 104.756 -10.703 +v 0.875 104.936 -10.876 +v 0.933 104.655 -10.507 +v 1.55 104.83 -10.564 +v 1.516 104.927 -10.76 +v 2.003 105.344 -10.99 +v 2.09 105.18 -10.819 +v 2.138 105.09 -10.622 +v 0.935 104.645 -10.1 +v 1.554 104.82 -10.157 +v 0.911 104.76 -9.865 +v 0.292 104.557 -10.04 +v 1.514 104.93 -9.923 +v 2.087 105.185 -9.98 +v 2.142 105.08 -10.214 +v 2 105.347 -9.811 +v 0.285 104.675 -9.807 +v -0.356 104.562 -9.983 +v -0.347 104.68 -9.749 +v 2.97 106.053 -9.927 +v 3.234 106.606 -9.914 +v 3.97 107.548 -10.1 +v 3.966 108.097 -10.081 +v 3.707 107 -10.042 +v 4.244 108.644 -10.21 +v 4.095 109.243 -10.197 +v 4.14 107.48 -10.27 +v 3.867 106.91 -10.211 +v 3.517 106.386 -10.153 +v 3.61 106.314 -10.387 +v 3.97 106.85 -10.445 +v 3.18 105.836 -10.33 +v 3.098 105.92 -10.096 +v 2.615 105.515 -10.038 +v 2.684 105.42 -10.272 +v 2.679 105.428 -10.68 +v 2.618 105.51 -10.876 +v 3.173 105.844 -10.738 +v 3.102 105.918 -10.934 +v 3.602 106.32 -10.795 +v 3.52 106.384 -10.992 +v 3.87 106.907 -11.05 +v 3.96 106.856 -10.853 +v 4.317 108.007 -11.16 +v 4.241 107.44 -10.911 +v 4.534 108.61 -11.02 +v 4.431 108.623 -11.217 +v 4.25 107.437 -10.504 +v 4.427 107.98 -10.555 +v 4.427 108.623 -10.378 +v 4.544 108.61 -10.612 +v 4.452 109.254 -10.436 +v -3.518 106.38 -10.246 +v -3.6 106.317 -10.05 +v -3.867 106.898 -10.19 +v -4.14 107.462 -10.131 +v -3.956 106.846 -9.993 +v -4.236 107.424 -9.935 +v -3.965 106.84 -9.585 +v -3.515 106.383 -9.408 +v -3.608 106.31 -9.642 +v -4.245 107.42 -9.527 +v -3.863 106.9 -9.35 +v -3.703 106.992 -9.182 +v -3.553 107.078 -9.112 +v -4.148 108.104 -9.066 +v -4.136 107.464 -9.293 +v -4.327 108.06 -9.235 +v -4.441 108.033 -9.47 +v -4.434 108.684 -9.177 +v -4.551 108.673 -9.411 +v -4.431 108.035 -9.877 +v -4.451 109.315 -9.12 +v -4.267 109.307 -8.95 +v -4.078 108.72 -8.938 +v -4.028 109.87 -8.822 +v -3.893 108.737 -8.936 +v -3.392 107.17 -9.11 +v -3.846 109.837 -8.82 +v -3.658 109.802 -8.898 +v -3.245 111.305 -8.653 +v -3.087 111.198 -8.73 +v -2.065 112.444 -8.48 +v -1.964 112.28 -8.557 +v -0.517 112.998 -8.306 +v -0.491 112.81 -8.384 +v 0.584 112.988 -8.19 +v 0.555 112.8 -8.268 +v 2.072 112.438 -8.023 +v 1.97 112.276 -8.1 +v 3.25 111.298 -7.85 +v 0.033 112.658 -8.5 +v 0.528 112.618 -8.442 +v -0.467 112.627 -8.558 +v -0.449 112.49 -8.97 +v -0.922 112.393 -9.028 +v 1.432 112.355 -8.333 +v 0.032 112.52 -8.912 +v -0.454 112.53 -9.197 +v 0.922 112.393 -8.803 +v 0.513 112.52 -9.081 +v 1.874 112.12 -8.274 +v 1.377 112.23 -8.745 +v 1.88 112.13 -9.113 +v 1.436 112.364 -9.17 +v 0.53 112.628 -9.28 +v 2.4 111.978 -9.223 +v 2.643 111.486 -8.997 +v 1.012 112.713 -9.396 +v 0.035 112.853 -9.505 +v -0.468 112.637 -9.396 +v -1.012 112.713 -9.621 +v -0.962 112.535 -9.454 +v -1.873 112.134 -9.57 +v -1.816 112.042 -9.37 +v -1.97 112.29 -9.737 +v -2.205 111.76 -9.428 +v -2.275 111.843 -9.627 +v -1.795 112.01 -9.143 +v -0.959 112.525 -8.616 +v -2.527 111.395 -9.259 +v -1.867 112.125 -8.731 +v -1.427 112.357 -8.673 +v -3.06 110.603 -9.374 +v -2.629 111.487 -8.846 +v -2.268 111.835 -8.788 +v -2.935 111.096 -8.904 +v -3.184 110.663 -8.962 +v -3.24 110.154 -9.432 +v 3.101 111.198 -9.107 +v 2.947 111.095 -8.94 +v 3.38 110.198 -8.824 +v 2.858 111.035 -8.741 +v 2.562 111.414 -8.798 +v 2.187 111.723 -8.63 +v 2.825 111.013 -8.514 +v 3.238 110.153 -8.398 +v 3.37 110.195 -7.986 +v 3.488 109.707 -7.928 +v 3.668 109.737 -7.754 +v 3.185 110.657 -8.044 +v 3.09 111.19 -7.928 +v 2.939 111.09 -8.102 +v 2.635 111.48 -8.159 +v 2.275 111.828 -8.217 +v 3.857 109.77 -7.677 +v 4.04 109.8 -7.679 +v 4.069 108.647 -7.563 +v 4.27 109.226 -7.69 +v 3.546 107.07 -7.396 +v 4.147 108.103 -7.582 +v 2.955 106.037 -7.35 +v 3.697 106.983 -7.466 +v 2.834 106.163 -7.28 +v 4.326 108.06 -7.751 +v 4.132 107.456 -7.693 +v 3.856 106.89 -7.635 +v 3.505 106.373 -7.577 +v 4.241 107.412 -7.927 +v 3.958 106.832 -7.87 +v 3.598 106.3 -7.811 +v 3.082 105.905 -7.52 +v 3.163 105.82 -7.753 +v 3.157 105.827 -8.161 +v 3.59 106.306 -8.22 +v 3.95 106.837 -8.277 +v 4.232 107.416 -8.335 +v 3.509 106.37 -8.416 +v 3.86 106.888 -8.473 +v 3.085 105.9 -8.358 +v 2.958 106.034 -8.53 +v 3.7 106.98 -8.646 +v 4.136 107.455 -8.531 +v 4.43 108.034 -8.393 +v 2.606 105.502 -8.3 +v 1.988 105.335 -8.415 +v 2.073 105.172 -8.243 +v 2.667 105.418 -8.104 +v 0.883 104.75 -8.127 +v 1.494 104.918 -8.184 +v -0.61 104.89 -8.164 +v 0.25 104.668 -8.07 +v 0.903 104.648 -7.93 +v -0.001 104.558 -7.851 +v -0.636 104.707 -7.992 +v -0.65 104.605 -7.796 +v 0.257 104.528 -7.67 +v -1.263 104.844 -7.937 +v -1.295 104.735 -7.333 +v -1.293 104.745 -7.74 +v -0.652 104.595 -7.388 +v 0.256 104.555 -7.465 +v -0.636 104.712 -7.154 +v -0.001 104.666 -7.21 +v -1.262 104.848 -7.099 +v -1.912 104.966 -7.28 +v -0.001 104.85 -7.04 +v -1.21 105.025 -6.93 +v 0.882 104.754 -7.288 +v 0.845 104.934 -7.12 +v 0.23 105.03 -6.992 +v -0.585 105.066 -6.915 +v 1.492 104.923 -7.346 +v 1.905 105.493 -7.165 +v 1.986 105.34 -7.235 +v 0.905 104.638 -7.522 +v 1.532 104.812 -7.58 +v 2.071 105.176 -7.404 +v 1.528 104.82 -7.988 +v 2.126 105.072 -7.638 +v 2.604 105.506 -7.462 +v 2.672 105.41 -7.696 +v 2.121 105.08 -8.046 +v -2.227 105.68 -6.753 +v -1.785 105.24 -6.876 +v -2.914 105.998 -6.76 +v -2.795 106.125 -6.69 +v -1.862 105.073 -7.045 +v -3.04 105.864 -6.93 +v -2.485 105.282 -7.227 +v -3.568 106.26 -7.113 +v -3.12 105.778 -7.164 +v -3.476 106.335 -6.88 +v -2.5 105.26 -7.432 +v -1.907 104.975 -7.687 +v -2.423 105.377 -7.831 +v -1.864 105.07 -7.884 +v -3.113 105.785 -7.571 +v -3.56 106.267 -7.52 +v -3.48 106.332 -7.717 +v -3.845 106.86 -7.668 +v -4.127 107.432 -7.62 +v -3.934 106.808 -7.472 +v -4.223 107.393 -7.424 +v -4.425 108.01 -7.377 +v -3.942 106.803 -7.064 +v -4.232 107.39 -7.016 +v -3.84 106.862 -6.83 +v -4.123 107.434 -6.782 +v -4.434 108.008 -6.97 +v -4.32 108.036 -6.735 +v -4.55 108.658 -6.923 +v -3.682 106.955 -6.66 +v -4.142 108.08 -6.566 +v -3.792 107.57 -6.543 +v -3.373 107.138 -6.589 +v -3.844 109.848 -6.358 +v -3.875 110.448 -6.318 +v -2.945 111.695 -6.205 +v -4.197 109.915 -6.43 +v -1.905 112.304 -6.205 +v -0.764 112.65 -6.205 +v 0 112.694 -6.205 +v 1.024 112.47 -6.207 +v 1.71 112.16 -6.205 +v 2.554 111.454 -6.205 +v 3.321 110.06 -6.205 +v 4.6 108.886 -6.206 +v 4.263 107.337 -6.205 +v 3.263 105.812 -6.205 +v 1.59 104.784 -6.205 +v -4.268 109.305 -6.474 +v -4.451 109.313 -6.643 +v -4.432 108.67 -6.689 +v 4.44 108.03 -7.985 +v 4.541 108.592 -8.036 +v 4.453 109.23 -7.86 +v -1.883 112.128 -12.145 +v -2.193 111.718 -11.777 +v -2.83 111.006 -11.893 +v -1.825 112.036 -11.946 +v -1.445 112.36 -12.088 +v -2.646 111.484 -12.26 +v -1.52 112.53 -12.255 +v -1.401 112.262 -11.89 +v -1.385 112.226 -11.662 +v -0.488 112.634 -11.972 +v -0.513 112.817 -12.14 +v 0.543 112.814 -12.024 +v 0.015 112.668 -11.914 +v 1.002 112.523 -11.799 +v 1.492 112.542 -11.915 +v 0.014 112.56 -11.716 +v 1.865 112.14 -11.69 +v 0.972 112.42 -11.6 +v 2.767 111.624 -11.74 +v 2.271 111.845 -11.631 +v 0.494 112.484 -11.43 +v 1.359 112.237 -11.321 +v 2.94 111.105 -11.516 +v 1.787 112.013 -11.263 +v 1.86 112.13 -10.85 +v 2.265 111.837 -10.793 +v 0.014 112.52 -11.488 +v 1 112.513 -10.96 +v 2.382 111.978 -10.62 +v 2.623 111.493 -10.735 +v 2.52 111.4 -11.148 +v 3.344 110.75 -10.446 +v 2.932 111.1 -10.677 +v 3.18 110.67 -10.62 +v 3.365 110.21 -10.562 +v 3.056 110.61 -11.032 +v 3.484 109.726 -10.505 +v 3.91 109.237 -10.195 +v 3.516 110.835 -10.369 +v 2.505 112.125 -10.542 +v 1.051 112.69 -10.786 +v 1.105 112.873 -10.71 +v 0.514 112.62 -11.018 +v 0.015 112.84 -10.902 +v 0.016 113.032 -10.825 +v -1.515 112.52 -11.076 +v -1.593 112.694 -10.998 +v -2.775 111.6 -11.249 +v -2.918 111.727 -11.171 +v -3.53 110.293 -11.416 +v -3.888 110.412 -11.34 +v -3.712 110.354 -11.339 +v -4.202 109.886 -11.468 +v -4.452 109.292 -11.696 +v -4.248 108.68 -11.585 +v -4.095 109.278 -11.456 +v -4.43 108.66 -11.754 +v -4.323 108.042 -11.811 +v -4.548 108.647 -11.988 +v -4.427 108.016 -12.453 +v -4.437 108.014 -12.046 +v -3.959 107.516 -11.7 +v -4.13 107.447 -11.87 +v -4.238 107.402 -12.103 +v -4.229 107.406 -12.51 +v -3.855 106.887 -11.926 +v -3.798 107.58 -11.63 +v -3.356 106.48 -11.816 +v -3.957 106.828 -12.16 +v -3.5 106.365 -11.984 +v -3.948 106.833 -12.568 +v -3.593 106.292 -12.219 +v -3.08 105.902 -12.042 +v -3.155 105.824 -12.684 +v -3.162 105.817 -12.276 +v -3.585 106.3 -12.626 +v -4.133 107.445 -12.708 +v -3.859 106.885 -12.765 +v -3.504 106.362 -12.823 +v -2.598 105.496 -12.938 +v -3.083 105.898 -12.88 +v -1.55 104.94 -13.048 +v -2.106 105.073 -12.8 +v -0.971 104.662 -12.909 +v -0.95 104.763 -13.105 +v -0.31 104.857 -13.336 +v -0.331 104.57 -12.967 +v -0.324 104.673 -13.164 +v -1.59 104.833 -12.444 +v -0.973 104.653 -12.501 +v 0.317 104.57 -13.025 +v 0.317 104.56 -12.617 +v -0.332 104.56 -12.56 +v 0.31 104.673 -13.222 +v 0.952 104.66 -13.083 +v 0.31 104.677 -12.383 +v 0.93 104.764 -12.44 +v 0.954 104.65 -12.675 +v -0.323 104.678 -12.325 +v 0.296 104.86 -12.214 +v 1.532 104.937 -12.499 +v 1.468 105.11 -12.33 +v 1.572 104.827 -12.733 +v 1.569 104.836 -13.14 +v 2.1 105.192 -12.556 +v 2.525 105.677 -12.445 +v 1.409 105.273 -12.26 +v 2.156 105.09 -12.79 +v 2.634 105.53 -12.614 +v 2.15 105.097 -13.198 +v 2.704 105.434 -12.848 +v 3.111 105.933 -12.672 +v 2.698 105.442 -13.256 +v 3.187 105.856 -13.314 +v 3.194 105.85 -12.906 +v 1.533 104.933 -13.337 +v 2.102 105.188 -13.394 +v 2.637 105.525 -13.452 +v 3.115 105.93 -13.51 +v 3.615 106.337 -13.372 +v 3.53 106.403 -12.73 +v 3.623 106.33 -12.964 +v 3.533 106.4 -13.568 +v 3.973 106.88 -13.43 +v 3.981 106.874 -13.022 +v 2.986 106.06 -13.682 +v 3.387 106.513 -13.74 +v 4.125 107.43 -13.677 +v 4.422 107.998 -13.538 +v 4.23 107.386 -13.073 +v 4.322 108.024 -13.735 +v 4.432 107.996 -13.13 +v 4.536 108.635 -13.597 +v 3.955 107.5 -13.85 +v 4.434 108.646 -13.793 +v 2.015 105.35 -13.567 +v 0.93 104.76 -13.28 +v 4.546 108.634 -13.189 +v 4.43 108.646 -12.955 +v 4.318 108.025 -12.897 +v 4.14 108.07 -12.728 +v 4.073 108.684 -12.716 +v 3.79 107.567 -12.6 +v 3.719 107.022 -12.62 +v 3.879 106.93 -12.788 +v 2.862 106.19 -12.432 +v 3.384 106.515 -12.56 +v -0.298 105.034 -12.086 +v -1.424 105.28 -11.97 +v -0.909 104.947 -12.098 +v -2.056 105.17 -12.158 +v -0.948 104.768 -12.267 +v -1.971 105.332 -11.99 +v -2.11 105.064 -12.392 +v -2.664 105.404 -12.334 +v -2.659 105.412 -12.742 +v -2.596 105.5 -12.1 +v -2.833 106.16 -11.803 +v -3.91 109.27 -11.454 +v -3.357 110.236 -11.59 +v -2.944 111.082 -11.48 +v -3.345 109.73 -12.06 +v -2.282 111.823 -11.365 +v -2.638 111.477 -11.422 +v -3.068 110.585 -11.95 +v -1.877 112.12 -11.307 +v -0.973 112.52 -11.192 +v -1.44 112.352 -11.25 +v -0.486 112.624 -11.134 +v 0.015 112.658 -11.076 +v -0.468 112.488 -11.546 +v -2.953 111.088 -12.319 +v -3.535 109.257 -11.706 +v 3.535 110.28 -12.964 +v 3.717 110.34 -12.887 +v 2.749 111.627 -13.138 +v 2.89 111.756 -13.06 +v 1.527 112.513 -13.305 +v 1.606 112.687 -13.228 +v 0.522 112.804 -13.42 +v 0.549 112.994 -13.343 +v 1.452 112.346 -13.479 +v 0.986 112.518 -13.536 +v 0.477 112.487 -14.006 +v 0.948 112.386 -13.948 +v 2.252 111.848 -13.37 +v 0.496 112.623 -13.594 +v -0.005 112.52 -14.065 +v 0.482 112.526 -14.234 +v 1.412 112.257 -14.118 +v 1.77 112.022 -13.84 +v 2.614 111.504 -13.311 +v 2.164 111.742 -13.781 +v 2.621 111.51 -14.15 +v 2.258 111.856 -14.208 +v 1.456 112.355 -14.317 +v 1.944 112.306 -14.433 +v 3.083 111.224 -14.26 +v 3.183 110.686 -14.034 +v 1.04 112.705 -14.542 +v 0.498 112.633 -14.433 +v -0.005 112.853 -14.658 +v -0.005 112.668 -14.49 +v -0.99 112.528 -14.606 +v -0.96 112.424 -14.408 +v -1.042 112.705 -14.774 +v -1.411 112.257 -14.465 +v -1.456 112.356 -14.664 +v -0.95 112.386 -14.18 +v -0.005 112.657 -13.653 +v -0.987 112.518 -13.768 +v -1.82 111.993 -14.296 +v -0.501 112.622 -13.71 +v -1.893 112.11 -13.883 +v -2.547 111.374 -14.41 +v -1.451 112.346 -13.825 +v -1.039 112.693 -13.594 +v -1.092 112.877 -13.517 +v -2.412 111.954 -13.767 +v -2.536 112.1 -13.69 +v -3.676 110.93 -13.86 +v -3.51 110.848 -13.857 +v -3.338 110.763 -13.934 +v -4.035 109.834 -13.975 +v -3.664 109.768 -14.05 +v -3.853 109.802 -13.973 +v -3.174 110.682 -14.108 +v -3.362 110.223 -14.166 +v -3.348 109.713 -14.636 +v -3.231 110.18 -14.578 +v -2.65 111.465 -13.999 +v -3.484 109.737 -14.224 +v -2.84 110.99 -14.47 +v -3.086 110.64 -14.748 +v -2.658 111.472 -14.837 +v -2.3 111.822 -14.78 +v -1.997 112.274 -14.89 +v -2.293 111.814 -13.94 +v -3.792 108.158 -14.146 +v -3.972 108.112 -14.148 +v -3.21 106.573 -14.321 +v -4.14 108.07 -14.219 +v -3.684 106.96 -14.334 +v -4.269 109.26 -14.103 +v -1.934 105.51 -14.489 +v -2.469 105.636 -14.508 +v -1.469 105.11 -14.616 +v -0.851 105.113 -14.604 +v 0.872 105.117 -14.778 +v -0.287 104.86 -14.733 +v 2.033 105.365 -14.964 +v 2.436 105.826 -14.95 +v 0.909 104.947 -14.848 +v 3.398 106.535 -15.137 +v 2.998 106.08 -15.08 +v 3.127 105.948 -15.248 +v 3.545 106.424 -15.306 +v 3.958 107.516 -15.246 +v 2.648 105.54 -15.19 +v 2.718 105.444 -15.424 +v 3.21 105.864 -15.482 +v 2.12 105.204 -15.132 +v 2.176 105.1 -15.367 +v 2.712 105.452 -15.832 +v 3.202 105.87 -15.89 +v 3.638 106.352 -15.54 +v 3.63 106.358 -15.948 +v 3.13 105.945 -16.086 +v 2.651 105.535 -16.028 +v 2.172 105.11 -15.774 +v 2.122 105.2 -15.97 +v 3 106.076 -16.259 +v 3.857 106.883 -16.196 +v 3.697 106.976 -16.368 +v 4.132 107.445 -16.253 +v 4.228 107.407 -16.057 +v 4.149 108.09 -16.484 +v 3.963 108.137 -16.56 +v 4.252 108.69 -16.542 +v 4.436 108.67 -16.37 +v 4.328 108.046 -16.312 +v 4.428 108.02 -16.115 +v 3.955 106.827 -15.592 +v 4.237 107.403 -15.65 +v 4.128 107.447 -15.415 +v 4.323 108.047 -15.473 +v 4.437 108.02 -15.707 +v 4.431 108.67 -15.531 +v 4.248 108.69 -15.362 +v 4.548 108.66 -15.766 +v 4.538 108.66 -16.173 +v 3.976 108.134 -15.234 +v 3.065 111.23 -15.656 +v 3.222 111.338 -15.579 +v 1.975 112.273 -15.823 +v 2.076 112.435 -15.746 +v 1.019 112.7 -15.939 +v 1.071 112.883 -15.862 +v 1.878 112.118 -15.997 +v 1.44 112.352 -16.055 +v 0.93 112.39 -16.525 +v 1.384 112.226 -16.467 +v 2.602 111.516 -15.888 +v 0.968 112.523 -16.113 +v 0.458 112.49 -16.583 +v 0.942 112.43 -16.752 +v 2.149 111.754 -16.358 +v 1.826 112.035 -16.637 +v 2.914 111.126 -15.83 +v 2.501 111.423 -16.3 +v 2.922 111.13 -16.668 +v 2.61 111.523 -16.726 +v 1.883 112.127 -16.835 +v 3.34 110.784 -16.778 +v 3.367 110.238 -16.552 +v 2.36 112.012 -16.952 +v 0.971 112.533 -16.95 +v 1.519 112.53 -17.06 +v 0.503 112.82 -17.177 +v 0.478 112.635 -17.01 +v -0.502 112.524 -16.926 +v -0.517 112.63 -17.125 +v -0.544 112.814 -17.292 +v -0.971 112.42 -16.983 +v -1.002 112.524 -17.182 +v -0.496 112.484 -16.698 +v 0.477 112.625 -16.17 +v -0.516 112.62 -16.286 +v -1.411 112.214 -16.814 +v -0.02 112.658 -16.229 +v -1.468 112.338 -16.402 +v -2.216 111.7 -16.93 +v -0.999 112.514 -16.344 +v -0.542 112.802 -16.112 +v -0.57 112.99 -16.035 +v -2.003 112.256 -16.286 +v -2.106 112.417 -16.208 +v -3.083 111.202 -16.453 +v -3.396 111.413 -16.378 +v -3.242 111.31 -16.376 +v -2.932 111.1 -16.627 +v -3.18 110.67 -16.684 +v -3.542 110.26 -16.568 +v -3.724 110.32 -16.491 +v -3.9 110.377 -16.493 +v -4.21 109.84 -16.622 +v -4.072 108.663 -16.667 +v -3.888 108.683 -16.665 +v -3.524 107.03 -16.84 +v -4.245 108.643 -16.737 +v -4.135 108.05 -16.795 +v -2.411 105.808 -17.007 +v -2.917 106 -17.027 +v -2.005 105.35 -17.134 +v -1.393 105.268 -17.122 +v -0.869 104.94 -17.25 +v -0.262 105.032 -17.238 +v 0.837 105.11 -17.349 +v 0.332 104.862 -17.367 +v 1.987 105.34 -17.532 +v 0.346 104.68 -17.536 +v -0.285 104.675 -17.477 +v 3.097 106.18 -17.662 +v 1.508 104.928 -17.645 +v 2.073 105.177 -17.701 +v 3.78 107.134 -17.766 +v 3.622 106.53 -17.884 +v 3.23 106.055 -17.83 +v 4.181 108.255 -17.868 +v 4.191 107.613 -17.986 +v 4.444 108.827 -18.086 +v 4.361 108.218 -18.037 +v 4.302 107.573 -18.22 +v 4.477 108.194 -18.271 +v 4.562 108.82 -18.32 +v 4.449 108.827 -18.924 +v 4.366 108.217 -18.876 +v 4.196 107.61 -18.825 +v 4.293 107.576 -18.628 +v 3.947 107.046 -18.774 +v 4.185 108.254 -19.048 +v 4.039 106.998 -18.577 +v 4.047 106.993 -18.17 +v 3.626 106.526 -18.722 +v 3.71 106.466 -18.525 +v 3.718 106.46 -18.118 +v 3.943 107.048 -17.935 +v 3.316 105.974 -18.065 +v 3.234 106.05 -18.67 +v 3.309 105.98 -18.472 +v 3.784 107.132 -18.946 +v 2.663 105.776 -18.787 +v 1.448 105.097 -18.656 +v 1.51 104.924 -18.484 +v 0.873 104.935 -18.599 +v 2.778 105.632 -18.615 +v 0.911 104.755 -18.426 +v -0.274 104.854 -18.488 +v 1.545 104.827 -18.287 +v 0.355 104.572 -18.177 +v -0.286 104.67 -18.316 +v 0.934 104.644 -17.822 +v 2.123 105.082 -18.343 +v 1.548 104.818 -17.88 +v -0.292 104.568 -18.12 +v 0.355 104.562 -17.77 +v -0.907 104.755 -18.258 +v -0.293 104.558 -17.712 +v -0.928 104.654 -18.062 +v -0.93 104.644 -17.654 +v -0.906 104.76 -17.42 +v -1.555 104.82 -17.596 +v -1.552 104.83 -18.003 +v -1.517 104.927 -18.2 +v -2.142 105.092 -17.945 +v -2.094 105.183 -18.142 +v -2.147 105.083 -17.538 +v -1.515 104.93 -17.361 +v -2.092 105.187 -17.303 +v -2.691 105.424 -17.48 +v -3.042 105.866 -17.196 +v -3.565 106.257 -17.371 +v -3.473 106.33 -17.137 +v -3.14 105.76 -17.635 +v -2.707 105.402 -17.685 +v -3.933 106.788 -17.314 +v -3.557 106.263 -17.78 +v -3.832 106.848 -17.08 +v -3.674 106.942 -16.91 +v -4.112 107.407 -17.022 +v -4.22 107.362 -17.256 +v -3.925 106.793 -17.721 +v -4.417 107.978 -17.606 +v -4.211 107.366 -17.664 +v -4.427 107.976 -17.198 +v -4.313 108.005 -16.964 +v -4.545 108.61 -17.14 +v -4.428 108.623 -16.906 +v -4.535 108.61 -17.548 +v -4.453 109.25 -16.848 +v -4.318 108.004 -17.802 +v -4.116 107.405 -17.86 +v -3.836 106.845 -17.918 +v -3.477 106.327 -17.976 +v -3.116 105.788 -17.838 +v -2.624 105.516 -18.084 +v -1.454 105.1 -18.372 +v 2.127 105.073 -17.936 +v 2.14 105.05 -18.14 +v 2.848 105.544 -18.01 +v 2.842 105.552 -18.418 +v 3.172 111.085 -19.31 +v 3.243 110.556 -19.098 +v 2.734 111.38 -19.185 +v 2.525 111.87 -19.395 +v 2.89 110.91 -18.716 +v 2.327 111.653 -19.029 +v 3.47 109.855 -19.029 +v 2.3 111.624 -18.802 +v 1.546 112.192 -19.111 +v 2.4 111.733 -19.228 +v 1.594 112.288 -19.31 +v 1.086 112.34 -18.924 +v 1.528 112.156 -18.884 +v 1.678 112.453 -19.477 +v 0.185 112.555 -19.227 +v 1.133 112.48 -19.35 +v 0.7 112.787 -19.556 +v 0.19 112.663 -19.426 +v -0.284 112.508 -19.036 +v 0.183 112.516 -19 +v -0.79 112.578 -19.499 +v -0.311 112.84 -19.63 +v -0.767 112.472 -19.3 +v -1.367 112.49 -19.637 +v -1.205 112.298 -19.107 +v -2.04 111.89 -19.4 +v -2.186 111.97 -19.636 +v -2.372 111.557 -19.205 +v -2.561 111.417 -19.448 +v -2.016 111.858 -19.174 +v -0.788 112.567 -18.66 +v -0.295 112.645 -18.624 +v -1.693 112.226 -18.729 +v 0.2 112.836 -18.414 +v -1.32 112.598 -18.522 +v 0.19 112.653 -18.588 +v 0.664 112.595 -18.55 +v 1.672 112.442 -18.298 +v 1.13 112.47 -18.512 +v 1.59 112.28 -18.472 +v 2.01 112.03 -18.43 +v 2.867 111.49 -18.173 +v 2.393 111.725 -18.39 +v 2.726 111.374 -18.347 +v 2.647 111.31 -18.544 +v 3.401 110.625 -18.086 +v 3.46 109.852 -18.19 +v 3.234 110.55 -18.26 +v 3.14 110.51 -18.456 +v 3.195 110.28 -18.65 +v 3.144 110.512 -18.9 +v 0.21 113.027 -18.336 +v -2.207 112.116 -18.588 +v -2.098 111.97 -18.761 +v -2.558 111.414 -19.006 +v -1.387 112.777 -18.444 +v -2.32 112.27 -18.51 +v -2.77 111.605 -18.635 +v -2.913 111.733 -18.558 +v -3.528 110.304 -18.722 +v -2.634 111.482 -18.809 +v -2.93 111.103 -18.839 +v -3.354 110.245 -18.896 +v -3.049 110.627 -19.28 +v -2.816 111.026 -19.25 +v -3.03 110.89 -19.636 +v -3.368 109.988 -19.637 +v -3.396 109.296 -19.361 +v -3.455 109.114 -19.637 +v -3.34 109.757 -19.335 +v -3.433 108.983 -19.163 +v -3.535 108.98 -18.966 +v -3.475 109.782 -18.923 +v -3.349 108.528 -19.403 +v -3.71 110.365 -18.645 +v -3.718 108.972 -18.793 +v -3.91 108.964 -18.715 +v -4.068 107.82 -18.836 +v -3.903 107.872 -18.765 +v -3.544 107.987 -18.84 +v -3.726 107.928 -18.763 +v -3.58 106.787 -18.88 +v -2.72 106.055 -18.85 +v -3.279 106.984 -18.807 +v -4.45 109.35 -18.94 +v -4.388 108.345 -18.98 +v -4.244 107.763 -19.004 +v -3.734 106.687 -19.048 +v -2.33 105.54 -18.94 +v -4.13 107.156 -19.261 +v -2.958 105.787 -19.089 +v -3.832 106.623 -19.283 +v -3.466 106.135 -19.303 +v -4.504 108.324 -19.215 +v -4.424 107.896 -19.635 +v -4.083 106.996 -19.636 +v -3.036 105.7 -19.323 +v -3.131 105.74 -19.636 +v -2.43 105.386 -19.11 +v -2.494 105.287 -19.344 +v -1.727 104.862 -19.637 +v -1.968 104.992 -19.362 +v -0.763 104.918 -18.991 +v -1.369 104.88 -19.144 +v -1.405 104.768 -19.378 +v -0.817 104.62 -19.394 +v -0.25 104.528 -19.637 +v -0.796 104.737 -19.16 +v 0.338 104.86 -19.02 +v -1.26 105.22 -18.905 +v 0.362 104.56 -19.422 +v 0.353 104.677 -19.188 +v 0.955 104.647 -19.436 +v 1.521 104.966 -19.162 +v 1.428 105.215 -18.974 +v 1.59 104.774 -19.637 +v -2.597 106.194 -18.848 +v -1.202 105.397 -18.903 +v 0.295 105.41 -19.024 +v -4.57 108.938 -19.19 +v -3.367 110.205 -16.742 +v -3.487 109.717 -16.8 +v -3.237 110.163 -17.154 +v -3.057 110.61 -17.096 +v -2.306 111.803 -16.517 +v -2.56 111.36 -16.988 +v -2.85 111.045 -17.266 +v -3.274 110.175 -17.382 +v -1.905 112.102 -16.46 +v -1.91 112.11 -17.298 +v -1.55 112.516 -17.407 +v -2.313 111.81 -17.356 +v -2.94 111.106 -17.465 +v 3.264 110.204 -16.354 +v 3.042 110.636 -16.184 +v 3.48 109.755 -15.657 +v 3.357 110.234 -15.714 +v 3.165 110.697 -15.772 +v 1.547 104.94 -15.913 +v 1.583 104.842 -15.716 +v 0.949 104.763 -15.856 +v 0.973 104.653 -15.251 +v 0.97 104.662 -15.659 +v 1.586 104.833 -15.308 +v 0.328 104.674 -15.798 +v 0.336 104.57 -15.601 +v 0.336 104.56 -15.194 +v -0.3 104.672 -15.74 +v -0.888 104.94 -15.854 +v -0.306 104.57 -15.544 +v -0.926 104.758 -15.682 +v -1.534 104.933 -15.624 +v -0.948 104.657 -15.485 +v -0.307 104.56 -15.136 +v -1.572 104.827 -15.02 +v -1.57 104.836 -15.427 +v -0.95 104.648 -15.078 +v -1.532 104.937 -14.785 +v -2.158 105.09 -14.962 +v -0.926 104.763 -14.844 +v -2.637 105.398 -15.319 +v -2.105 105.19 -15.566 +v -2.575 105.485 -14.677 +v -2.643 105.39 -14.91 +v -3.146 105.8 -14.852 +v -3.065 105.887 -14.618 +v -3.139 105.81 -15.26 +v -3.582 106.278 -14.795 +v -3.49 106.35 -14.56 +v -3.843 106.867 -14.503 +v -3.944 106.808 -14.737 +v -3.574 106.284 -15.202 +v -4.232 107.388 -14.679 +v -4.223 107.392 -15.087 +v -3.936 106.813 -15.145 +v -4.123 107.433 -14.445 +v -4.433 107.995 -14.622 +v -4.319 108.024 -14.387 +v -4.546 108.628 -14.564 +v -4.423 107.998 -15.03 +v -4.43 108.64 -14.33 +v -4.452 109.267 -14.272 +v -4.323 108.023 -15.226 +v -4.127 107.43 -15.283 +v -3.847 106.865 -15.341 +v -3.493 106.348 -15.399 +v -3.068 105.884 -15.457 +v -0.299 104.676 -14.902 +v 0.328 104.678 -14.96 +v 0.948 104.768 -15.017 +v 1.546 104.943 -15.074 +v 3.546 110.284 -14.144 +v 3.37 110.226 -13.977 +v 3.086 110.638 -13.835 +v 2.808 111.036 -13.666 +v 3.268 110.193 -13.778 +v 3.23 110.18 -13.55 +v 2.921 111.114 -13.254 +v 3.174 110.68 -13.196 +v 3.36 110.223 -13.138 +v 3.482 109.74 -13.08 +v 2.85 111.044 -11.317 +v 3.092 110.628 -11.26 +v 3.189 110.675 -11.458 +v 3.355 110.756 -11.626 +v -3.519 110.326 -6.393 +v -3.717 109.28 -6.48 +v -3.16 110.707 -6.528 +v -2.899 111.147 -6.486 +v -3.049 111.252 -6.312 +v -3.038 110.646 -6.94 +v -2.577 111.544 -6.446 +v -2.201 111.89 -6.407 +v -1.786 112.173 -6.37 +v -2.786 111.07 -6.898 +v -2.819 111.092 -7.126 +v -2.506 111.478 -7.086 +v -2.116 111.782 -6.82 +v -2.907 111.153 -7.324 +v -3.356 110.27 -7.405 +v -2.208 111.898 -7.246 +v -2.14 111.813 -7.047 +v -1.4 112.58 -7.34 +v -1.33 112.408 -7.172 +v -1.29 112.307 -6.973 +v -1.275 112.27 -6.746 +v -0.35 112.837 -7.268 +v -0.333 112.652 -7.1 +v 0.71 112.785 -7.203 +v 0.18 112.664 -7.067 +v 1.73 112.428 -7.14 +v 3.094 110.856 -6.862 +v 2.477 111.66 -6.915 +v 3 110.803 -6.663 +v 2.402 111.583 -6.716 +v 2.019 111.906 -6.745 +v 2.082 111.993 -6.943 +v 1.171 112.47 -7.004 +v 1.575 112.133 -6.547 +v 1.136 112.367 -6.805 +v 1.995 111.873 -6.517 +v 2.693 111.196 -6.462 +v 0.647 112.458 -6.61 +v 0.174 112.556 -6.868 +v -0.32 112.505 -6.675 +v -0.805 112.423 -6.71 +v -0.323 112.545 -6.902 +v -1.327 112.398 -6.333 +v 2.965 110.784 -6.436 +v 3.388 109.413 -6.365 +v -3.118 107.088 -18.885 +v -3.484 108.504 -18.99 +v -2.965 107.188 -19.058 +v -2.47 106.337 -18.925 +v -2.348 106.474 -19.099 +v -1.143 105.58 -18.98 +v -1.93 106.155 -19.12 +v -1.522 105.927 -19.137 +v -1.874 106.24 -19.317 +v -2.28 106.55 -19.296 +v -1.658 106.15 -19.636 +v -0.813 105.814 -19.636 +v -1.087 105.754 -19.154 +v -0.172 105.688 -19.382 +v 0.179 105.723 -19.637 +v 0.28 105.593 -19.198 +v 0.717 105.76 -19.408 +v 1.156 105.962 -19.625 +v 0.739 105.66 -19.211 +v 1.274 105.64 -19.033 +v -2.33 106.615 -19.636 +v -2.88 107.244 -19.255 +v -2.834 107.203 -19.637 +v -3.239 108.084 -19.427 +v -3.293 108.07 -19.637 +v 1.56 104.864 -6.543 +v 1.502 105.02 -6.724 +v 2.393 105.234 -6.444 +v 2.874 105.574 -6.457 +v 2.34 105.322 -6.64 +v 3.309 105.98 -6.471 +v 3.735 106.5 -6.488 +v 3.234 106.05 -6.668 +v 3.65 106.56 -6.685 +v 4.19 107.594 -6.718 +v 4.287 107.56 -6.522 +v 4.467 108.19 -6.541 +v 121.986 -105.908 -18.516 +v 121.368 -105.99 -18.719 +v 120.52 -106.84 -18.614 +v 122.048 -106.07 -18.446 +v 123.144 -105.644 -18.445 +v 121.07 -106.6 -18.512 +v 122.508 -105.56 -18.65 +v 121.92 -105.737 -18.685 +v 123.72 -105.81 -18.338 +v 125.342 -106.242 -18.222 +v 124.865 -105.854 -18.333 +v 125.26 -106.407 -18.22 +v 126.658 -107.29 -18.098 +v 126.39 -106.755 -18.21 +v 126.515 -107.407 -18.096 +v 127.246 -108.243 -18.01 +v 127.13 -107.652 -18.125 +v 127.077 -108.318 -18.008 +v 127.587 -109.61 -17.894 +v 127.514 -108.443 -18.058 +v 127.402 -109.624 -17.892 +v 127.33 -110.693 -17.796 +v 127.512 -110.73 -17.798 +v 123.71 -105.994 -18.336 +v 126.963 -111.72 -17.694 +v 127.127 -111.806 -17.696 +v 125.937 -112.96 -17.536 +v 126.933 -107.06 -18.337 +v 127.687 -108.38 -18.227 +v 127.287 -107.555 -18.294 +v 126.033 -106.236 -18.42 +v 126.515 -106.62 -18.38 +v 126.594 -106.533 -18.613 +v 126.1 -106.14 -18.655 +v 125.503 -105.922 -18.462 +v 124.337 -105.525 -18.54 +v 124.924 -105.68 -18.502 +v 125.556 -105.817 -18.696 +v 126.094 -106.148 -19.063 +v 125.55 -105.826 -19.104 +v 124.96 -105.57 -18.736 +v 124.36 -105.41 -18.775 +v 124.958 -105.578 -19.144 +v 125.505 -105.918 -19.3 +v 126.035 -106.232 -19.26 +v 124.925 -105.676 -19.34 +v 123.746 -105.344 -19.22 +v 123.74 -105.447 -19.416 +v 125.422 -106.083 -19.472 +v 126.393 -106.752 -19.39 +v 126.518 -106.616 -19.218 +v 125.336 -106.254 -19.548 +v 124.303 -105.7 -19.551 +v 126.647 -107.298 -19.423 +v 124.267 -105.89 -19.627 +v 123.478 -105.684 -19.637 +v 123.13 -105.457 -19.452 +v 122.144 -105.735 -19.634 +v 123.12 -105.354 -19.256 +v 122.484 -105.454 -19.292 +v 121.097 -106.175 -19.636 +v 121.317 -105.895 -19.36 +v 121.88 -105.627 -18.92 +v 122.482 -105.444 -18.885 +v 120.794 -106.226 -19.393 +v 121.312 -105.886 -18.953 +v 120.318 -106.63 -19.425 +v 119.752 -107.404 -19.636 +v 120.79 -106.218 -18.985 +v 120.292 -106.603 -19.222 +v 120.858 -106.313 -18.751 +v 120.393 -106.707 -18.783 +v 120.096 -106.847 -19.033 +v 119.713 -107.338 -19.063 +v 119.81 -107.404 -18.829 +v 119.67 -108.008 -18.689 +v 123.12 -105.344 -18.848 +v 123.13 -105.46 -18.614 +v 123.747 -105.334 -18.812 +v 123.74 -105.45 -18.578 +v 119.827 -108.085 -18.618 +v 119.506 -107.926 -18.858 +v 119.234 -109.68 -18.77 +v 119.475 -109.134 -18.674 +v 119.124 -109.067 -18.913 +v 119.4 -107.874 -19.092 +v 119.164 -108.446 -19.12 +v 119.05 -109.67 -18.94 +v 119.432 -111.202 -18.836 +v 119.598 -111.15 -18.765 +v 119.113 -110.676 -18.98 +v 119.257 -111.258 -19.004 +v 119.008 -109.045 -19.147 +v 118.93 -110.083 -19.19 +v 118.98 -109.04 -19.352 +v 118.904 -110.084 -19.396 +v 118.997 -110.697 -19.215 +v 119.145 -111.294 -19.239 +v 119.418 -112.026 -19.636 +v 119.37 -111.864 -19.261 +v 119.015 -110.715 -19.637 +v 118.97 -109.6 -19.637 +v 119.344 -108.087 -19.636 +v 119.14 -108.437 -19.325 +v 126.795 -107.176 -19.348 +v 126.937 -107.06 -19.176 +v 127.29 -107.553 -19.132 +v 127.41 -108.17 -19.26 +v 126.588 -106.54 -19.021 +v 127.016 -106.993 -18.979 +v 127.024 -106.986 -18.571 +v 127.387 -107.493 -18.528 +v 127.823 -108.33 -18.666 +v 127.788 -108.344 -18.869 +v 127.577 -108.096 -19.088 +v 127.68 -108.05 -18.484 +v 123.146 -114.45 -10.39 +v 122.534 -114.253 -10.53 +v 123.154 -114.346 -10.587 +v 123.792 -114.453 -10.449 +v 122.51 -114.364 -9.925 +v 123.145 -114.46 -9.983 +v 121.966 -114.196 -10.282 +v 121.962 -114.206 -9.874 +v 122.002 -114.095 -9.64 +v 123.154 -114.342 -9.749 +v 123.793 -114.463 -10.04 +v 123.785 -114.346 -9.807 +v 123.168 -114.158 -9.58 +v 124.374 -114.08 -9.696 +v 124.412 -114.26 -9.865 +v 124.436 -114.375 -10.1 +v 125.015 -114.09 -9.923 +v 125.5 -113.673 -9.811 +v 123.762 -113.99 -9.568 +v 125.42 -113.52 -9.741 +v 125.055 -114.2 -10.157 +v 125.588 -113.836 -9.98 +v 126.116 -113.506 -10.038 +v 126.47 -112.968 -9.927 +v 125.643 -113.94 -10.214 +v 125.05 -114.19 -10.564 +v 125.638 -113.93 -10.622 +v 126.185 -113.6 -10.272 +v 126.18 -113.593 -10.68 +v 126.6 -113.1 -10.096 +v 126.68 -113.184 -10.33 +v 125.59 -113.84 -10.819 +v 126.674 -113.177 -10.738 +v 126.118 -113.51 -10.876 +v 125.016 -114.093 -10.76 +v 125.503 -113.677 -10.99 +v 126.01 -113.36 -11.048 +v 126.602 -113.103 -10.934 +v 127.102 -112.7 -10.795 +v 126.875 -112.524 -11.164 +v 127.02 -112.637 -10.992 +v 125.414 -113.508 -11.066 +v 127.37 -112.114 -11.05 +v 127.21 -112.022 -11.222 +v 126.724 -112.407 -11.24 +v 127.46 -112.165 -10.853 +v 127.11 -112.707 -10.387 +v 127.47 -112.17 -10.445 +v 127.75 -111.584 -10.504 +v 127.74 -111.58 -10.911 +v 127.017 -112.634 -10.153 +v 127.367 -112.11 -10.211 +v 127.47 -111.473 -10.1 +v 127.64 -111.54 -10.27 +v 127.927 -111.042 -10.555 +v 127.927 -110.397 -10.378 +v 127.744 -110.377 -10.21 +v 126.735 -112.415 -9.914 +v 127.467 -110.923 -10.081 +v 125.333 -113.356 -9.74 +v 126.588 -112.3 -9.912 +v 127.595 -109.778 -10.197 +v 127.707 -109.17 -10.326 +v 127.953 -109.767 -10.436 +v 127.89 -109.138 -10.494 +v 127.74 -108.53 -10.552 +v 127.34 -108.03 -10.44 +v 128.044 -110.41 -10.612 +v 128.07 -109.763 -10.67 +v 128.005 -109.117 -10.729 +v 127.85 -108.493 -10.786 +v 127.505 -107.948 -10.61 +v 127.61 -107.896 -10.844 +v 128.034 -110.41 -11.02 +v 127.818 -111.014 -11.16 +v 127.932 -110.398 -11.217 +v 128.06 -109.764 -11.078 +v 127.995 -109.12 -11.136 +v 127.957 -109.767 -11.275 +v 127.773 -109.772 -11.447 +v 127.64 -110.968 -11.331 +v 127.893 -109.137 -11.333 +v 127.84 -108.496 -11.194 +v 127.743 -108.528 -11.39 +v 127.602 -107.9 -11.252 +v 127.712 -109.168 -11.505 +v 127.343 -108.027 -11.62 +v 127.51 -107.946 -11.448 +v 127.582 -109.778 -11.522 +v 127.17 -108.11 -11.696 +v 127.044 -107.51 -11.678 +v 127.454 -110.92 -11.407 +v 123.75 -113.804 -9.566 +v 122.653 -113.72 -9.45 +v 122.613 -113.9 -9.452 +v 121.206 -113.068 -9.283 +v 121.318 -112.913 -9.36 +v 120.11 -111.85 -9.11 +v 121.097 -113.22 -9.285 +v 120.275 -111.755 -9.187 +v 119.607 -110.283 -8.936 +v 119.798 -110.265 -9.013 +v 119.655 -109.184 -8.82 +v 119.423 -110.302 -8.938 +v 119.948 -111.942 -9.112 +v 119.843 -109.22 -8.898 +v 120.255 -107.715 -8.653 +v 119.472 -109.15 -8.822 +v 120.414 -107.822 -8.73 +v 120.023 -109.252 -9.072 +v 119.966 -109.746 -9.13 +v 121.435 -106.577 -8.48 +v 120.1 -107.612 -8.655 +v 122.984 -106.022 -8.306 +v 121.338 -106.42 -8.482 +v 121.536 -106.74 -8.557 +v 123.01 -106.212 -8.384 +v 124.084 -106.032 -8.19 +v 124.056 -106.222 -8.268 +v 125.573 -106.582 -8.023 +v 124.03 -106.403 -8.442 +v 123.533 -106.363 -8.5 +v 125.47 -106.745 -8.1 +v 126.75 -107.723 -7.85 +v 124.933 -106.666 -8.333 +v 126.59 -107.83 -7.928 +v 125.776 -107.193 -8.217 +v 125.374 -106.9 -8.275 +v 123.532 -106.5 -8.912 +v 124.422 -106.628 -8.803 +v 124.877 -106.79 -8.745 +v 126.136 -107.54 -8.159 +v 125.687 -107.298 -8.63 +v 126.686 -108.364 -8.044 +v 126.44 -107.932 -8.102 +v 126.325 -108.008 -8.514 +v 126.143 -107.534 -8.997 +v 126.87 -108.826 -7.986 +v 126.74 -108.868 -8.398 +v 125.38 -106.89 -9.113 +v 125.9 -107.043 -9.223 +v 124.512 -106.308 -9.396 +v 124.937 -106.656 -9.17 +v 124.014 -106.5 -9.081 +v 126.743 -107.728 -9.175 +v 125.568 -106.59 -9.348 +v 126.6 -107.823 -9.107 +v 127.35 -109.253 -9.002 +v 127.056 -108.767 -8.992 +v 126.448 -107.926 -8.94 +v 126.88 -108.823 -8.825 +v 126.358 -107.986 -8.741 +v 126.063 -107.606 -8.798 +v 127.556 -110.372 -8.888 +v 127.376 -110.35 -8.886 +v 127.527 -109.223 -9.004 +v 127.035 -111.944 -8.721 +v 126.878 -111.854 -8.719 +v 126.326 -112.848 -8.605 +v 126.893 -107.627 -9.178 +v 125.664 -106.436 -9.35 +v 124.083 -106.042 -9.516 +v 124.11 -105.862 -9.518 +v 123.535 -106.167 -9.505 +v 122.985 -106.032 -9.631 +v 124.03 -106.393 -9.28 +v 122.49 -106.308 -9.621 +v 123.032 -106.383 -9.396 +v 121.44 -106.585 -9.805 +v 121.53 -106.73 -9.737 +v 122.54 -106.486 -9.454 +v 121.628 -106.887 -9.57 +v 123.046 -106.49 -9.197 +v 123.05 -106.53 -8.97 +v 122.58 -106.628 -9.028 +v 121.685 -106.978 -9.37 +v 122.542 -106.496 -8.616 +v 121.706 -107.012 -9.143 +v 123.033 -106.394 -8.558 +v 122.073 -106.664 -8.673 +v 121.633 -106.895 -8.731 +v 121.233 -107.185 -8.789 +v 120.872 -107.533 -8.847 +v 120.974 -107.625 -9.259 +v 120.566 -107.925 -8.904 +v 120.44 -108.418 -9.374 +v 120.317 -108.358 -8.962 +v 120.26 -108.867 -9.433 +v 120.557 -107.92 -9.742 +v 121.226 -107.177 -9.627 +v 120.12 -109.27 -9.711 +v 120.103 -109.752 -9.541 +v 120.117 -110.233 -9.6 +v 120.077 -110.237 -9.827 +v 120.198 -110.71 -9.658 +v 120.013 -109.25 -9.91 +v 119.97 -110.248 -10.025 +v 120.055 -110.744 -10.084 +v 119.77 -109.737 -10.135 +v 120.307 -108.353 -9.8 +v 119.944 -108.765 -10.026 +v 119.875 -110.788 -10.25 +v 119.664 -109.185 -10.145 +v 119.616 -110.282 -10.26 +v 120.263 -107.72 -9.978 +v 120.727 -107.403 -9.852 +v 121.295 -107.26 -9.428 +v 119.98 -110.247 -9.187 +v 120.217 -111.215 -9.303 +v 120.065 -110.742 -9.245 +v 120.552 -111.595 -9.773 +v 120.433 -111.663 -9.36 +v 122.064 -113.922 -9.471 +v 121.422 -113.84 -9.582 +v 121.508 -113.678 -9.413 +v 120.536 -112.974 -9.297 +v 120.887 -113.508 -9.524 +v 120.818 -113.604 -9.758 +v 121.367 -113.945 -9.816 +v 121.372 -113.936 -10.224 +v 120.326 -113.19 -9.7 +v 120.824 -113.596 -10.166 +v 120.408 -113.106 -9.466 +v 119.893 -112.71 -9.642 +v 119.9 -112.704 -10.05 +v 120.333 -113.184 -10.108 +v 120.885 -113.512 -10.362 +v 120.405 -113.11 -10.304 +v 120.993 -113.363 -10.534 +v 121.42 -113.845 -10.42 +v 119.982 -112.64 -10.246 +v 120.127 -112.527 -10.419 +v 119.634 -112.123 -10.19 +v 119.794 -112.03 -10.361 +v 119.544 -112.174 -9.993 +v 121.506 -113.682 -10.592 +v 119.96 -111.936 -10.437 +v 121.105 -113.208 -10.61 +v 122.574 -114.073 -10.702 +v 122.616 -113.887 -10.777 +v 123.773 -114.166 -10.817 +v 123.785 -114.35 -10.645 +v 124.413 -114.264 -10.703 +v 124.375 -114.084 -10.876 +v 123.76 -113.976 -10.893 +v 124.434 -114.365 -10.507 +v 119.536 -112.18 -9.585 +v 119.256 -111.6 -9.527 +v 119.265 -111.597 -9.935 +v 119.638 -112.12 -9.35 +v 119.365 -111.557 -9.293 +v 119.986 -112.637 -9.408 +v 119.797 -112.03 -9.182 +v 119.352 -110.916 -9.066 +v 119.174 -110.96 -9.235 +v 126.123 -107.528 -10.735 +v 125.882 -107.043 -10.62 +v 125.765 -107.183 -10.793 +v 126.432 -107.922 -10.677 +v 126.844 -108.27 -10.446 +v 125.287 -107.008 -11.263 +v 126.02 -107.62 -11.148 +v 125.36 -106.89 -10.85 +v 124.86 -106.784 -11.321 +v 126.44 -107.916 -11.516 +v 125.772 -107.175 -11.631 +v 124.472 -106.6 -11.6 +v 123.995 -106.536 -11.43 +v 124.5 -106.507 -10.96 +v 123.515 -106.46 -11.716 +v 123.515 -106.5 -11.488 +v 125.365 -106.882 -11.69 +v 124.503 -106.497 -11.799 +v 123.033 -106.533 -11.546 +v 123.013 -106.386 -11.972 +v 123.515 -106.352 -11.914 +v 124.015 -106.4 -11.018 +v 124.552 -106.332 -10.786 +v 123.516 -106.18 -10.902 +v 123.515 -106.363 -11.076 +v 126.005 -106.896 -10.542 +v 124.606 -106.148 -10.71 +v 127.017 -108.186 -10.369 +v 123.517 -105.988 -10.825 +v 121.985 -106.502 -11.076 +v 121.832 -106.158 -11 +v 121.907 -106.327 -10.998 +v 120.726 -107.42 -11.249 +v 120.583 -107.294 -11.171 +v 120.445 -107.17 -11.173 +v 119.612 -108.608 -11.34 +v 119.788 -108.667 -11.339 +v 119.97 -108.727 -11.416 +v 119.406 -109.743 -11.456 +v 119.59 -109.75 -11.454 +v 119.782 -109.757 -11.532 +v 120.144 -108.785 -11.59 +v 120.02 -109.266 -11.648 +v 120.556 -107.94 -11.48 +v 120.103 -109.77 -12.118 +v 120.155 -109.29 -12.06 +v 120.862 -107.543 -11.422 +v 120.432 -108.435 -11.95 +v 121.22 -107.197 -11.365 +v 120.67 -108.015 -11.893 +v 120.854 -107.536 -12.26 +v 120.236 -108.816 -12.23 +v 121.618 -106.893 -12.145 +v 121.307 -107.302 -11.777 +v 121.623 -106.902 -11.307 +v 121.675 -106.985 -11.946 +v 122.116 -106.795 -11.662 +v 122.06 -106.67 -11.25 +v 122.527 -106.5 -11.192 +v 122.1 -106.758 -11.89 +v 123.014 -106.397 -11.134 +v 122.055 -106.66 -12.088 +v 122.987 -106.203 -12.14 +v 121.98 -106.49 -12.255 +v 124.043 -106.207 -12.024 +v 123.517 -105.997 -12.15 +v 121.91 -106.335 -12.323 +v 121.093 -107.048 -12.37 +v 120.132 -108.292 -12.544 +v 120.59 -107.3 -12.496 +v 120.548 -107.933 -12.319 +v 119.797 -108.67 -12.664 +v 119.828 -109.23 -12.653 +v 120.134 -108.782 -12.428 +v 120.063 -109.768 -12.345 +v 119.955 -109.764 -12.544 +v 119.6 -109.75 -12.78 +v 119.788 -110.286 -12.77 +v 119.972 -110.267 -12.602 +v 120.12 -110.252 -12.176 +v 120.312 -111.193 -12.519 +v 120.212 -111.233 -12.717 +v 120.35 -111.178 -12.291 +v 119.965 -109.764 -11.706 +v 119.982 -110.266 -11.764 +v 120.068 -110.756 -11.821 +v 120.052 -111.298 -11.705 +v 120.222 -111.23 -11.88 +v 120.44 -111.673 -11.936 +v 120.83 -112.003 -12.407 +v 119.875 -111.37 -11.628 +v 120.928 -112.588 -11.878 +v 119.703 -111.44 -11.63 +v 120.796 -112.727 -11.8 +v 120.668 -112.86 -11.803 +v 122.076 -113.742 -11.97 +v 122.14 -113.568 -11.968 +v 122.592 -114.073 -12.098 +v 123.203 -113.986 -12.086 +v 121.53 -113.69 -11.99 +v 120.145 -112.542 -11.816 +v 120.42 -113.12 -12.042 +v 120.905 -113.52 -12.1 +v 121.445 -113.852 -12.158 +v 119.542 -111.505 -11.7 +v 119.646 -112.133 -11.926 +v 120 -112.655 -11.984 +v 119.252 -110.342 -11.585 +v 119.37 -111.574 -11.87 +v 119.178 -110.978 -11.811 +v 119.544 -112.192 -12.16 +v 119.262 -111.618 -12.103 +v 119.908 -112.728 -12.219 +v 119.552 -112.187 -12.568 +v 119.272 -111.615 -12.51 +v 119.916 -112.722 -12.626 +v 120.346 -113.197 -12.684 +v 120.34 -113.204 -12.276 +v 120.842 -113.61 -12.742 +v 120.836 -113.617 -12.334 +v 121.39 -113.956 -12.392 +v 121.91 -114.187 -12.444 +v 122.552 -114.253 -12.267 +v 121.395 -113.947 -12.8 +v 122.53 -114.358 -12.909 +v 122.527 -114.368 -12.501 +v 123.177 -114.343 -12.325 +v 123.797 -114.16 -12.214 +v 123.168 -114.46 -12.56 +v 123.81 -114.344 -12.383 +v 123.17 -114.45 -12.967 +v 123.818 -114.46 -12.617 +v 124.43 -114.256 -12.44 +v 124.91 -113.748 -12.26 +v 124.97 -113.91 -12.33 +v 124.455 -114.372 -12.675 +v 125.032 -114.083 -12.499 +v 123.817 -114.45 -13.025 +v 124.453 -114.362 -13.083 +v 125.073 -114.194 -12.733 +v 125.07 -114.185 -13.14 +v 125.6 -113.828 -12.556 +v 126.026 -113.344 -12.445 +v 126.134 -113.492 -12.614 +v 125.656 -113.932 -12.79 +v 125.65 -113.923 -13.198 +v 124.43 -114.26 -13.28 +v 125.034 -114.088 -13.337 +v 126.198 -113.58 -13.256 +v 126.204 -113.587 -12.848 +v 125.603 -113.832 -13.394 +v 126.612 -113.088 -12.672 +v 126.687 -113.165 -13.314 +v 126.694 -113.172 -12.906 +v 126.137 -113.495 -13.453 +v 125.516 -113.67 -13.567 +v 124.97 -113.915 -13.51 +v 124.905 -113.735 -13.585 +v 123.797 -114.164 -13.394 +v 123.204 -113.973 -13.411 +v 126.486 -112.96 -13.682 +v 126.615 -113.09 -13.51 +v 126.353 -112.822 -13.758 +v 126.888 -112.508 -13.74 +v 127.034 -112.62 -13.568 +v 127.116 -112.683 -13.372 +v 127.626 -111.59 -13.678 +v 127.473 -112.142 -13.43 +v 127.455 -111.52 -13.85 +v 127.278 -111.45 -13.925 +v 127.75 -110.355 -13.965 +v 127.823 -110.997 -13.735 +v 127.923 -111.022 -13.538 +v 127.73 -111.634 -13.073 +v 127.482 -112.147 -13.022 +v 128.037 -110.386 -13.597 +v 127.932 -111.025 -13.13 +v 127.934 -110.375 -13.793 +v 128.06 -109.74 -13.655 +v 128.07 -109.738 -13.247 +v 128.047 -110.387 -13.189 +v 127.818 -110.996 -12.897 +v 127.93 -110.375 -12.955 +v 127.38 -112.09 -12.788 +v 127.64 -110.95 -12.728 +v 127.768 -109.75 -12.844 +v 127.952 -109.742 -13.013 +v 127.886 -109.12 -13.07 +v 127.574 -110.336 -12.716 +v 127.558 -108.57 -12.96 +v 127.393 -108.623 -12.89 +v 127.733 -108.512 -13.128 +v 128.002 -109.1 -13.305 +v 127.845 -108.475 -13.362 +v 127.498 -107.935 -13.186 +v 127.603 -107.883 -13.42 +v 127.29 -111.454 -12.6 +v 127.22 -112 -12.62 +v 126.362 -112.832 -12.432 +v 126.233 -112.7 -12.43 +v 127.03 -112.617 -12.73 +v 126.884 -112.505 -12.56 +v 124.845 -113.573 -12.258 +v 127.124 -112.69 -12.964 +v 123.216 -113.802 -12.084 +v 127.992 -109.1 -13.712 +v 127.956 -109.742 -13.851 +v 127.89 -109.118 -13.91 +v 127.836 -108.478 -13.77 +v 127.594 -107.887 -13.828 +v 127.738 -108.51 -13.967 +v 127.502 -107.933 -14.024 +v 127.563 -108.568 -14.14 +v 127.337 -108.014 -14.196 +v 127.56 -110.335 -14.04 +v 127.38 -108.627 -14.214 +v 127.772 -109.75 -14.024 +v 126.66 -107.02 -14.312 +v 126.518 -107.15 -14.388 +v 123.19 -114.164 -13.336 +v 122.08 -113.73 -13.296 +v 122.015 -113.908 -13.22 +v 120.677 -112.85 -13.128 +v 121.95 -114.08 -13.048 +v 122.55 -114.257 -13.106 +v 121.01 -113.375 -13.11 +v 120.545 -112.99 -13.053 +v 120.902 -113.525 -12.938 +v 123.177 -114.348 -13.164 +v 123.81 -114.348 -13.222 +v 120.417 -113.122 -12.88 +v 119.997 -112.658 -12.823 +v 119.8 -112.043 -12.937 +v 119.642 -112.136 -12.765 +v 119.883 -111.367 -12.953 +v 124.603 -106.157 -12.034 +v 124.992 -106.48 -11.915 +v 126 -106.903 -11.866 +v 126.268 -107.397 -11.74 +v 127.008 -108.19 -11.694 +v 126.855 -108.265 -11.626 +v 126.35 -107.977 -11.317 +v 126.69 -108.346 -11.458 +v 127.177 -109.26 -11.51 +v 126.592 -108.393 -11.26 +v 126.556 -108.41 -11.032 +v 126.115 -106.763 -11.87 +v 124.654 -105.983 -12.036 +v 127.4 -109.783 -11.52 +v 127.28 -110.875 -11.404 +v 126.58 -112.295 -11.237 +v 123.517 -105.816 -12.152 +v 126.68 -108.35 -10.62 +v 122.69 -113.718 -15.927 +v 122.217 -113.405 -15.801 +v 123.25 -113.624 -15.918 +v 124.33 -113.713 -16.1 +v 121.658 -113.34 -15.812 +v 121.343 -112.946 -15.692 +v 121.826 -113.027 -15.576 +v 122.763 -113.37 -15.692 +v 120.443 -112.326 -15.644 +v 120.28 -111.788 -15.519 +v 120.72 -112.106 -15.409 +v 121.06 -112.475 -15.467 +v 121.877 -112.932 -15.378 +v 122.786 -113.265 -15.493 +v 123.262 -113.44 -15.75 +v 122.33 -113.093 -15.208 +v 122.794 -113.226 -15.266 +v 123.272 -113.292 -15.324 +v 124.255 -113.367 -15.866 +v 124.232 -113.26 -15.667 +v 124.295 -113.547 -16.033 +v 124.73 -113.227 -15.923 +v 124.694 -113.126 -15.724 +v 124.224 -113.222 -15.44 +v 125.118 -112.89 -15.555 +v 125.277 -113.182 -16.148 +v 125.61 -112.752 -16.038 +v 125.887 -112.32 -15.67 +v 125.82 -113.038 -16.274 +v 126.47 -112.16 -16.322 +v 125.99 -112.427 -16.096 +v 126.475 -111.626 -16.007 +v 126.206 -111.958 -15.729 +v 125.603 -112.744 -15.2 +v 125.184 -113.01 -15.143 +v 126.65 -111.177 -15.837 +v 125.983 -112.42 -15.258 +v 126.568 -111.68 -16.206 +v 126.838 -110.73 -16.123 +v 126.943 -110.755 -16.322 +v 126.96 -111.302 -16.43 +v 127.03 -110.258 -16.38 +v 126.8 -110.72 -15.895 +v 126.882 -110.243 -15.954 +v 127.213 -110.277 -16.547 +v 126.875 -111.858 -16.441 +v 127.288 -110.84 -16.557 +v 126.99 -109.264 -16.495 +v 127.172 -109.23 -16.662 +v 127.34 -109.2 -16.73 +v 126.867 -108.783 -16.552 +v 126.884 -109.283 -16.296 +v 126.765 -108.817 -16.354 +v 126.84 -108.236 -16.778 +v 126.543 -108.384 -16.184 +v 126.845 -109.29 -16.069 +v 125.928 -113.184 -16.276 +v 124.37 -113.89 -16.103 +v 122.652 -113.895 -15.93 +v 121.573 -113.5 -15.814 +v 120.3 -112.44 -15.647 +v 119.54 -110.905 -15.474 +v 119.717 -110.86 -15.471 +v 119.48 -109.19 -15.3 +v 119.657 -109.22 -15.298 +v 119.29 -109.156 -15.225 +v 119.836 -108.097 -15.184 +v 119.228 -109.76 -15.283 +v 119.356 -110.952 -15.398 +v 120 -108.177 -15.182 +v 120.853 -106.79 -15.017 +v 120.97 -106.928 -15.015 +v 122.36 -105.978 -14.844 +v 120.73 -106.644 -14.942 +v 120.298 -107.067 -15 +v 119.664 -108.012 -15.109 +v 122.307 -105.794 -14.769 +v 124.073 -105.857 -14.67 +v 121.746 -106 -14.826 +v 123.495 -105.625 -14.653 +v 124.1 -105.667 -14.595 +v 125.177 -106.177 -14.555 +v 123.494 -105.44 -14.48 +v 122.87 -105.486 -14.539 +v 124.744 -105.617 -14.365 +v 124.126 -105.485 -14.423 +v 125.255 -106.002 -14.48 +v 125.33 -105.834 -14.307 +v 126.222 -106.603 -14.37 +v 124.773 -105.518 -14.168 +v 124.14 -105.383 -14.226 +v 123.494 -105.338 -14.284 +v 124.775 -105.51 -13.76 +v 124.142 -105.373 -13.818 +v 125.378 -105.73 -13.703 +v 125.876 -106.006 -14.06 +v 124.742 -105.622 -13.526 +v 124.125 -105.49 -13.584 +v 123.494 -105.446 -13.642 +v 123.494 -105.328 -13.877 +v 124.69 -105.798 -13.357 +v 123.495 -105.63 -13.474 +v 125.82 -106.098 -13.418 +v 125.182 -106.165 -13.23 +v 124.075 -105.843 -13.345 +v 125.725 -106.255 -13.249 +v 126.41 -106.374 -13.593 +v 125.882 -105.997 -13.652 +v 126.336 -106.465 -13.36 +v 126.405 -106.382 -14.001 +v 126.88 -106.82 -13.535 +v 126.34 -106.46 -14.198 +v 126.795 -106.896 -14.14 +v 127.183 -107.387 -14.082 +v 126.872 -106.826 -13.943 +v 127.27 -107.33 -13.886 +v 127.277 -107.323 -13.478 +v 126.792 -106.9 -13.301 +v 127.028 -107.493 -13.075 +v 127.18 -107.39 -13.244 +v 126.528 -107.14 -13.062 +v 127.217 -108.68 -12.887 +v 126.39 -107.265 -13.06 +v 127.39 -110.317 -12.714 +v 127.12 -111.384 -12.598 +v 125.106 -106.334 -13.228 +v 124.05 -106.027 -13.343 +v 122.357 -105.965 -13.519 +v 122.308 -105.798 -13.59 +v 121.215 -106.292 -13.704 +v 120.845 -106.78 -13.692 +v 122.87 -105.49 -13.7 +v 122.257 -105.622 -13.758 +v 121.673 -105.838 -13.815 +v 122.853 -105.374 -13.934 +v 122.224 -105.51 -13.992 +v 121.624 -105.73 -14.05 +v 121.117 -106.137 -13.873 +v 122.227 -105.518 -14.4 +v 121.628 -105.74 -14.457 +v 122.854 -105.384 -14.342 +v 122.256 -105.617 -14.596 +v 121.67 -105.833 -14.654 +v 121.06 -106.046 -14.515 +v 121.114 -106.133 -14.712 +v 120.543 -106.425 -14.573 +v 120.61 -106.504 -14.77 +v 121.054 -106.037 -14.108 +v 120.083 -106.877 -14.63 +v 120.537 -106.418 -14.165 +v 120.16 -106.945 -14.827 +v 119.69 -107.392 -14.69 +v 119.5 -107.93 -14.937 +v 120.075 -106.87 -14.223 +v 119.68 -107.386 -14.281 +v 119.164 -108.48 -14.798 +v 119.398 -107.88 -14.332 +v 119.262 -108.51 -14.994 +v 119.007 -109.106 -14.856 +v 119.155 -108.476 -14.39 +v 119.78 -107.45 -14.047 +v 119.267 -108.512 -14.156 +v 119.44 -108.57 -13.987 +v 119.933 -107.552 -13.878 +v 120.163 -106.948 -13.989 +v 119.113 -109.124 -14.214 +v 118.997 -109.104 -14.448 +v 119.232 -109.76 -14.103 +v 119.048 -109.754 -14.272 +v 118.93 -109.75 -14.506 +v 119.07 -110.38 -14.33 +v 119.36 -110.95 -14.219 +v 119.465 -109.187 -13.975 +v 118.954 -110.392 -14.564 +v 119.182 -110.996 -14.388 +v 119.068 -111.025 -14.622 +v 119.377 -111.588 -14.445 +v 119.27 -111.632 -14.68 +v 118.94 -109.75 -14.914 +v 118.964 -110.39 -14.972 +v 119.11 -109.124 -15.052 +v 119.044 -109.753 -15.11 +v 119.067 -110.38 -15.168 +v 119.077 -111.023 -15.03 +v 119.177 -110.997 -15.226 +v 119.278 -111.63 -15.087 +v 119.373 -111.59 -15.283 +v 119.544 -111.52 -15.456 +v 119.654 -112.156 -15.341 +v 120.15 -112.558 -15.571 +v 119.824 -108.09 -13.86 +v 120.3 -107.07 -13.82 +v 120.613 -106.507 -13.93 +v 126.778 -111.23 -15.425 +v 126.56 -111.675 -15.368 +v 125.712 -112.89 -15.026 +v 126.718 -111.766 -15.194 +v 124.333 -113.722 -14.776 +v 125.826 -113.045 -14.95 +v 124.292 -113.535 -14.853 +v 124.728 -113.217 -15.084 +v 123.76 -113.427 -14.97 +v 124.253 -113.356 -15.027 +v 122.727 -113.54 -14.68 +v 123.263 -113.43 -14.912 +v 122.766 -113.36 -14.854 +v 122.284 -113.222 -14.796 +v 121.83 -113.018 -14.738 +v 121.744 -113.18 -14.564 +v 121.067 -112.468 -14.628 +v 121.535 -112.674 -15.1 +v 120.586 -112.213 -14.397 +v 120.73 -112.1 -14.57 +v 120.45 -111.69 -14.513 +v 120.436 -112.332 -14.32 +v 121.16 -112.368 -15.04 +v 120.568 -111.62 -14.925 +v 120.227 -111.24 -14.455 +v 120.217 -111.244 -15.293 +v 119.882 -110.82 -15.403 +v 120.06 -110.773 -15.236 +v 119.77 -109.777 -15.288 +v 121.654 -113.348 -14.487 +v 122.688 -113.727 -14.602 +v 127.11 -110.796 -15.31 +v 126.883 -111.863 -15.116 +v 126.933 -110.752 -15.483 +v 127.02 -110.257 -15.541 +v 127.034 -109.76 -15.6 +v 126.98 -109.266 -15.657 +v 127.16 -109.233 -15.483 +v 126.857 -108.786 -15.714 +v 126.666 -108.323 -15.772 +v 126.565 -107.79 -15.656 +v 127.35 -109.198 -15.406 +v 126.723 -107.683 -15.579 +v 127.297 -110.842 -15.232 +v 127.512 -107.965 -8.034 +v 127.856 -108.51 -8.21 +v 127.618 -107.914 -8.268 +v 127.57 -108.603 -7.807 +v 127.744 -108.547 -7.976 +v 128.01 -109.142 -8.152 +v 127.893 -109.162 -7.918 +v 127.77 -109.795 -7.69 +v 127.54 -109.22 -7.679 +v 128.07 -109.787 -8.094 +v 127.954 -109.79 -7.86 +v 127.826 -110.96 -7.751 +v 127.57 -110.374 -7.563 +v 127.648 -110.918 -7.582 +v 128.04 -110.428 -8.036 +v 127.94 -110.99 -7.985 +v 127.632 -111.564 -7.693 +v 127.742 -111.608 -7.927 +v 127.047 -111.95 -7.396 +v 127.197 -112.038 -7.466 +v 127.458 -112.19 -7.87 +v 127.357 -112.13 -7.635 +v 127.732 -111.604 -8.335 +v 127.93 -110.987 -8.393 +v 127.45 -112.184 -8.277 +v 127.36 -112.132 -8.473 +v 127.637 -111.566 -8.531 +v 127.098 -112.72 -7.811 +v 127.006 -112.648 -7.577 +v 126.657 -113.194 -8.161 +v 127.09 -112.714 -8.22 +v 126.664 -113.2 -7.753 +v 127.01 -112.65 -8.416 +v 127.2 -112.04 -8.646 +v 126.586 -113.12 -8.358 +v 126.458 -112.986 -8.53 +v 126.107 -113.52 -8.3 +v 124.87 -113.748 -8.432 +v 125.488 -113.685 -8.415 +v 126.167 -113.602 -8.104 +v 125.574 -113.848 -8.243 +v 124.933 -113.93 -8.357 +v 122.918 -113.942 -8.24 +v 124.383 -114.27 -8.127 +v 123.74 -114.17 -8.242 +v 124.994 -114.102 -8.185 +v 125.622 -113.94 -8.046 +v 125.03 -114.2 -7.988 +v 123.75 -114.353 -8.07 +v 124.404 -114.373 -7.93 +v 122.89 -114.13 -8.164 +v 121.793 -113.61 -8.131 +v 121.177 -113.49 -8.003 +v 122.864 -114.313 -7.992 +v 122.237 -114.177 -7.937 +v 123.5 -114.463 -7.851 +v 122.85 -114.416 -7.796 +v 122.208 -114.276 -7.74 +v 121.636 -113.952 -7.884 +v 122.848 -114.425 -7.388 +v 123.758 -114.492 -7.67 +v 122.865 -114.31 -7.154 +v 123.5 -114.355 -7.21 +v 122.205 -114.285 -7.333 +v 123.756 -114.466 -7.465 +v 124.382 -114.267 -7.288 +v 124.406 -114.382 -7.523 +v 123.5 -114.17 -7.04 +v 124.346 -114.087 -7.12 +v 124.993 -114.098 -7.346 +v 125.032 -114.21 -7.58 +v 125.572 -113.844 -7.404 +v 125.486 -113.68 -7.235 +v 123.73 -113.99 -6.992 +v 125.405 -113.528 -7.165 +v 126.104 -113.515 -7.462 +v 126.455 -112.983 -7.35 +v 126.335 -112.858 -7.28 +v 125.627 -113.95 -7.638 +v 126.173 -113.61 -7.696 +v 126.582 -113.116 -7.52 +v 126.207 -112.724 -7.278 +v 124.81 -113.586 -7.105 +v 122.942 -113.77 -6.913 +v 121.865 -113.454 -6.804 +v 122.916 -113.955 -6.915 +v 121.274 -113.34 -6.753 +v 120.832 -112.76 -6.689 +v 120.705 -112.895 -6.69 +v 120.128 -111.883 -6.589 +v 120.962 -112.62 -6.766 +v 119.708 -111.45 -6.543 +v 119.406 -109.723 -6.404 +v 120.293 -111.786 -6.666 +v 119.657 -109.172 -6.358 +v 119.625 -108.572 -6.318 +v 119.892 -110.805 -6.571 +v 120.556 -107.326 -6.205 +v 120.625 -106.87 -6.205 +v 121.38 -106.163 -6.205 +v 121.595 -106.717 -6.205 +v 122.227 -105.685 -6.206 +v 122.736 -106.372 -6.205 +v 124.106 -105.46 -6.205 +v 123.526 -106.326 -6.205 +v 125.892 -106.07 -6.205 +v 124.91 -106.702 -6.206 +v 125.897 -107.384 -6.205 +v 127.132 -107.073 -6.205 +v 126.87 -109.1 -6.205 +v 128.074 -109.357 -6.206 +v 126.87 -110.385 -6.206 +v 128.02 -110.788 -6.206 +v 126.527 -111.483 -6.206 +v 127.438 -112.332 -6.205 +v 125.82 -112.392 -6.205 +v 126.326 -113.568 -6.207 +v 124.674 -113.104 -6.205 +v 125.086 -114.228 -6.205 +v 120.227 -111.24 -6.792 +v 120.45 -111.693 -6.84 +v 120.07 -110.76 -6.745 +v 120.57 -111.624 -7.252 +v 119.98 -110.258 -6.699 +v 119.783 -109.74 -6.48 +v 120.203 -110.727 -7.157 +v 119.966 -109.747 -6.653 +v 120.025 -109.242 -6.61 +v 119.982 -108.694 -6.393 +v 120.118 -110.244 -7.11 +v 120.34 -108.313 -6.528 +v 120.103 -109.753 -7.066 +v 120.063 -109.752 -7.293 +v 120.078 -110.248 -7.338 +v 120.16 -109.267 -7.022 +v 120.145 -108.75 -7.405 +v 119.97 -110.26 -7.537 +v 119.77 -109.74 -7.66 +v 120.217 -111.243 -7.63 +v 120.535 -111.644 -7.48 +v 119.88 -110.808 -7.75 +v 119.6 -109.732 -7.727 +v 119.888 -111.378 -7.865 +v 120.682 -107.93 -7.126 +v 120.593 -107.867 -7.325 +v 120.995 -107.543 -7.086 +v 120.714 -107.952 -6.898 +v 120.463 -108.375 -6.94 +v 120.165 -108.226 -7.533 +v 120.154 -107.56 -7.562 +v 120.96 -106.703 -7.483 +v 120.78 -107.342 -7.452 +v 121.072 -106.845 -7.48 +v 122.1 -106.442 -7.34 +v 121.293 -107.123 -7.246 +v 122.17 -106.613 -7.172 +v 121.36 -107.207 -7.047 +v 122.037 -106.284 -7.407 +v 123.15 -106.184 -7.268 +v 122.534 -105.934 -7.374 +v 123.698 -106.002 -7.302 +v 124.21 -106.236 -7.203 +v 123.68 -106.357 -7.067 +v 123.167 -106.368 -7.1 +v 124.79 -106.216 -7.239 +v 125.23 -106.592 -7.14 +v 126.352 -106.977 -7.153 +v 126.226 -107.106 -7.15 +v 126.457 -107.62 -7.056 +v 127.488 -109.017 -7.05 +v 126.987 -108.567 -7.004 +v 126.595 -108.165 -6.862 +v 125.978 -107.36 -6.915 +v 126.713 -108.672 -6.638 +v 126.5 -108.217 -6.663 +v 125.496 -107.147 -6.517 +v 125.52 -107.115 -6.745 +v 125.582 -107.028 -6.943 +v 124.672 -106.55 -7.004 +v 125.076 -106.887 -6.547 +v 124.636 -106.653 -6.805 +v 124.147 -106.562 -6.61 +v 123.674 -106.465 -6.868 +v 123.18 -106.515 -6.675 +v 123.178 -106.476 -6.902 +v 124.154 -106.527 -6.394 +v 122.696 -106.598 -6.71 +v 122.225 -106.75 -6.746 +v 126.193 -107.824 -6.462 +v 126.466 -108.237 -6.436 +v 122.21 -106.713 -6.973 +v 121.385 -107.24 -6.82 +v 122.174 -106.623 -6.333 +v 121.714 -106.848 -6.37 +v 121.3 -107.13 -6.407 +v 120.924 -107.476 -6.446 +v 120.452 -107.768 -6.312 +v 120.602 -107.873 -6.486 +v 126.964 -109.133 -6.812 +v 126.676 -108.686 -6.41 +v 122.29 -113.996 -6.93 +v 121.715 -113.78 -6.876 +v 122.238 -114.172 -7.099 +v 121.638 -113.947 -7.045 +v 120.587 -113.022 -6.76 +v 120.46 -113.157 -6.93 +v 121.016 -113.738 -7.227 +v 121.59 -114.054 -7.28 +v 121.593 -114.045 -7.687 +v 121 -113.76 -7.432 +v 120.38 -113.243 -7.164 +v 121.077 -113.643 -7.831 +v 120.388 -113.236 -7.571 +v 119.94 -112.753 -7.52 +v 119.932 -112.76 -7.113 +v 119.567 -112.213 -7.472 +v 119.558 -112.218 -7.064 +v 120.024 -112.686 -6.88 +v 119.818 -112.065 -6.66 +v 119.66 -112.158 -6.83 +v 119.268 -111.63 -7.016 +v 119.278 -111.627 -7.424 +v 119.377 -111.587 -6.782 +v 119.36 -110.94 -6.566 +v 119.18 -110.984 -6.735 +v 119.233 -109.716 -6.474 +v 120.02 -112.69 -7.717 +v 120.164 -112.574 -7.89 +v 119.656 -112.16 -7.668 +v 120.714 -112.886 -8.016 +v 127.466 -111.497 -8.704 +v 127.746 -110.394 -8.813 +v 127.93 -110.415 -8.64 +v 128.06 -109.787 -8.502 +v 127.958 -109.79 -8.698 +v 127.716 -109.192 -8.929 +v 127.573 -108.602 -8.987 +v 127.748 -108.546 -8.815 +v 127.898 -109.16 -8.756 +v 128 -109.144 -8.56 +v 127.847 -108.514 -8.618 +v 127.61 -107.918 -8.676 +v 127.516 -107.963 -8.872 +v 127.052 -107.52 -9.102 +v 120.984 -113.356 -18.256 +v 119.988 -111.984 -18.166 +v 121.097 -113.2 -18.332 +v 122.047 -113.92 -18.372 +v 120.876 -113.505 -18.084 +v 121.407 -113.838 -18.142 +v 120.167 -112.578 -18.148 +v 122.112 -113.74 -18.448 +v 123.227 -114.166 -18.488 +v 123.24 -113.975 -18.564 +v 122.593 -114.266 -18.258 +v 123.215 -114.35 -18.316 +v 124.374 -114.085 -18.599 +v 124.412 -114.266 -18.426 +v 124.335 -113.898 -18.674 +v 125.01 -114.097 -18.484 +v 124.948 -113.923 -18.656 +v 125.045 -114.194 -18.287 +v 123.855 -114.45 -18.177 +v 123.208 -114.453 -18.12 +v 123.856 -114.46 -17.77 +v 124.435 -114.377 -17.822 +v 122.57 -114.377 -17.654 +v 122.572 -114.367 -18.062 +v 123.208 -114.463 -17.712 +v 123.847 -114.342 -17.536 +v 125.01 -114.092 -17.645 +v 125.05 -114.203 -17.88 +v 123.832 -114.158 -17.367 +v 125.487 -113.68 -17.532 +v 123.215 -114.345 -17.477 +v 122.594 -114.26 -17.42 +v 122.632 -114.08 -17.25 +v 123.238 -113.99 -17.238 +v 124.337 -113.91 -17.349 +v 122.107 -113.753 -17.122 +v 121.495 -113.67 -17.134 +v 121.985 -114.09 -17.361 +v 121.945 -114.2 -17.596 +v 121.353 -113.938 -17.538 +v 121.41 -113.834 -17.303 +v 121.95 -114.19 -18.003 +v 121.358 -113.93 -17.945 +v 121.984 -114.094 -18.2 +v 120.81 -113.597 -17.48 +v 120.458 -113.154 -17.196 +v 119.935 -112.764 -17.372 +v 120.36 -113.26 -17.635 +v 120.794 -113.618 -17.685 +v 120.584 -113.02 -17.027 +v 120.027 -112.69 -17.137 +v 121.09 -113.212 -17.007 +v 119.976 -111.99 -16.84 +v 119.827 -112.08 -16.91 +v 119.67 -112.173 -17.08 +v 119.567 -112.233 -17.314 +v 119.365 -110.97 -16.795 +v 119.388 -111.614 -17.022 +v 119.428 -110.358 -16.667 +v 119.256 -110.378 -16.737 +v 119.187 -111.015 -16.964 +v 119.28 -111.66 -17.256 +v 120.385 -113.233 -17.838 +v 120.024 -112.693 -17.976 +v 119.943 -112.758 -17.78 +v 119.665 -112.175 -17.918 +v 119.823 -112.08 -18.09 +v 119.576 -112.228 -17.721 +v 119.384 -111.615 -17.86 +v 119.29 -111.655 -17.664 +v 126.053 -113.105 -17.537 +v 124.3 -113.73 -17.347 +v 123.25 -113.804 -17.236 +v 126.598 -112.84 -17.662 +v 125.573 -113.844 -17.701 +v 125.23 -113.193 -17.538 +v 127.28 -111.887 -17.766 +v 127.682 -110.766 -17.868 +v 127.76 -109.6 -17.965 +v 127.692 -111.408 -17.986 +v 127.945 -110.194 -18.086 +v 127.862 -110.803 -18.037 +v 127.86 -108.978 -18.18 +v 127.944 -109.586 -18.134 +v 127.977 -110.827 -18.271 +v 128.062 -110.2 -18.32 +v 127.803 -111.448 -18.22 +v 127.548 -112.027 -18.17 +v 127.793 -111.444 -18.628 +v 127.444 -111.973 -17.935 +v 127.22 -112.56 -18.118 +v 127.54 -112.023 -18.577 +v 127.123 -112.492 -17.884 +v 126.817 -113.047 -18.065 +v 127.21 -112.555 -18.525 +v 127.448 -111.975 -18.774 +v 127.127 -112.495 -18.722 +v 126.734 -112.97 -18.67 +v 126.81 -113.04 -18.472 +v 126.73 -112.966 -17.83 +v 126.35 -113.477 -18.01 +v 126.278 -113.388 -18.615 +v 126.343 -113.47 -18.418 +v 126.164 -113.244 -18.787 +v 127.285 -111.89 -18.946 +v 126.044 -113.094 -18.863 +v 125.4 -113.515 -18.788 +v 127.115 -111.8 -19.021 +v 127.686 -110.766 -19.048 +v 127.696 -111.41 -18.825 +v 127.498 -110.728 -19.123 +v 127.95 -110.194 -18.924 +v 127.866 -110.804 -18.876 +v 127.765 -109.598 -19.144 +v 128.05 -109.578 -18.776 +v 127.948 -109.585 -18.972 +v 128.06 -109.577 -18.368 +v 127.964 -108.956 -18.822 +v 127.863 -108.977 -19.02 +v 127.974 -108.954 -18.415 +v 127.683 -109.015 -19.191 +v 127.574 -109.612 -19.22 +v 127.234 -108.248 -19.336 +v 125.623 -113.94 -18.343 +v 125.64 -113.972 -18.14 +v 125.628 -113.948 -17.936 +v 122.17 -113.58 -17.12 +v 121.198 -113.062 -17.005 +v 120.136 -111.896 -16.838 +v 120.3 -111.798 -16.916 +v 119.612 -110.337 -16.665 +v 120.235 -111.26 -17.032 +v 119.803 -110.316 -16.742 +v 120.458 -111.705 -17.09 +v 119.777 -108.7 -16.491 +v 119.96 -108.76 -16.569 +v 120.258 -107.71 -16.376 +v 119.6 -108.644 -16.493 +v 120.105 -107.607 -16.378 +v 120.417 -107.818 -16.453 +v 121.394 -106.603 -16.208 +v 120.57 -107.92 -16.627 +v 120.32 -108.35 -16.684 +v 121.497 -106.765 -16.286 +v 122.93 -106.03 -16.035 +v 122.958 -106.22 -16.112 +v 121.195 -107.217 -16.517 +v 122.032 -106.682 -16.402 +v 121.596 -106.92 -16.46 +v 120.444 -108.41 -17.096 +v 120.94 -107.662 -16.988 +v 121.284 -107.32 -16.93 +v 122.09 -106.807 -16.814 +v 122.502 -106.507 -16.344 +v 121.59 -106.91 -17.298 +v 122.5 -106.497 -17.182 +v 120.65 -107.975 -17.266 +v 121.188 -107.21 -17.356 +v 121.95 -106.504 -17.408 +v 120.69 -107.443 -17.581 +v 120.56 -107.915 -17.465 +v 120.226 -108.845 -17.382 +v 121.4 -106.61 -17.533 +v 120.266 -107.716 -17.7 +v 120.144 -108.265 -17.69 +v 120.123 -108.812 -17.58 +v 119.785 -108.703 -17.816 +v 119.82 -109.27 -17.806 +v 120.004 -109.302 -17.639 +v 119.974 -110.297 -17.754 +v 119.887 -110.835 -17.98 +v 120.082 -110.285 -17.556 +v 120.15 -109.327 -17.213 +v 120.12 -110.28 -17.328 +v 120.21 -110.75 -17.386 +v 120.264 -108.858 -17.154 +v 120.133 -108.815 -16.742 +v 120.014 -109.303 -16.8 +v 119.964 -109.798 -16.858 +v 119.985 -110.296 -16.916 +v 120.076 -110.786 -16.974 +v 120.576 -111.635 -17.502 +v 120.066 -110.788 -17.812 +v 120.542 -111.655 -17.73 +v 119.622 -110.336 -17.99 +v 122.93 -106.04 -17.36 +v 124.57 -106.147 -17.186 +v 124.004 -106.202 -17.177 +v 122.956 -106.207 -17.292 +v 122.983 -106.39 -17.125 +v 123.98 -106.385 -17.01 +v 125.02 -106.49 -17.06 +v 124.472 -106.488 -16.951 +v 123 -106.497 -16.926 +v 122.53 -106.6 -16.983 +v 123.005 -106.536 -16.698 +v 123.96 -106.532 -16.583 +v 124.442 -106.592 -16.752 +v 125.384 -106.894 -16.835 +v 125.326 -106.986 -16.637 +v 124.884 -106.795 -16.467 +v 124.43 -106.63 -16.525 +v 126.11 -107.497 -16.726 +v 125.86 -107.01 -16.952 +v 126.423 -107.89 -16.668 +v 125.65 -107.266 -16.358 +v 125.572 -106.593 -17.07 +v 126.715 -107.688 -16.903 +v 126.865 -107.585 -16.906 +v 125.668 -106.44 -17.073 +v 127.518 -109.167 -16.733 +v 127.464 -110.884 -16.56 +v 127.032 -111.95 -16.444 +v 124.62 -105.972 -17.189 +v 122.905 -105.86 -17.362 +v 126 -107.597 -16.3 +v 125.378 -106.903 -15.997 +v 126.103 -107.504 -15.888 +v 124.94 -106.67 -16.055 +v 125.475 -106.748 -15.823 +v 124.52 -106.322 -15.94 +v 124.47 -106.498 -16.113 +v 123.977 -106.396 -16.17 +v 123.48 -106.363 -16.229 +v 122.985 -106.4 -16.286 +v 125.577 -106.586 -15.746 +v 124.572 -106.138 -15.862 +v 126.414 -107.895 -15.83 +v 121.294 -106.447 -16.21 +v 125.77 -106.278 -16.998 +v 124.67 -105.788 -17.113 +v 126.646 -107.004 -16.888 +v 125.868 -106.122 -16.826 +v 125.315 -105.827 -16.883 +v 124.077 -105.664 -17.172 +v 122.877 -105.67 -17.287 +v 123.476 -105.44 -17.057 +v 124.102 -105.482 -17 +v 122.293 -105.8 -17.344 +v 122.85 -105.488 -17.115 +v 122.24 -105.622 -17.172 +v 121.198 -106.297 -17.46 +v 121.3 -106.458 -17.536 +v 121.65 -105.843 -17.23 +v 121.607 -105.75 -17.034 +v 122.212 -105.523 -16.976 +v 122.835 -105.386 -16.918 +v 121.603 -105.74 -16.626 +v 122.834 -105.376 -16.51 +v 122.21 -105.514 -16.568 +v 121.044 -106.055 -17.091 +v 121.1 -106.142 -17.288 +v 120.526 -106.44 -17.15 +v 121.038 -106.047 -16.683 +v 120.594 -106.518 -17.346 +v 120.52 -106.432 -16.741 +v 120.06 -106.89 -16.8 +v 120.066 -106.896 -17.207 +v 120.596 -106.52 -16.507 +v 121.102 -106.146 -16.45 +v 120.147 -106.967 -16.566 +v 119.71 -107.34 -16.85 +v 119.805 -107.405 -17.455 +v 119.398 -107.9 -17.316 +v 119.495 -107.95 -16.674 +v 119.39 -107.897 -16.908 +v 120.286 -107.088 -16.397 +v 119.66 -108.03 -16.505 +v 119.26 -108.534 -16.732 +v 119.148 -108.498 -16.966 +v 119.157 -108.5 -17.374 +v 119.49 -107.947 -17.513 +v 119.255 -108.533 -17.57 +v 119.003 -109.13 -17.432 +v 118.993 -109.13 -17.025 +v 119.11 -109.15 -16.79 +v 119.29 -109.18 -16.622 +v 119.047 -109.772 -16.848 +v 118.94 -109.77 -17.49 +v 118.93 -109.77 -17.082 +v 119.105 -109.148 -17.63 +v 119.043 -109.772 -17.687 +v 118.966 -110.41 -17.548 +v 118.956 -110.41 -17.14 +v 119.083 -111.042 -17.606 +v 119.073 -111.045 -17.198 +v 119.068 -110.4 -17.744 +v 119.25 -110.378 -17.917 +v 119.183 -111.017 -17.802 +v 119.36 -110.97 -17.974 +v 119.442 -110.357 -17.992 +v 119.613 -108.648 -17.818 +v 120.144 -111.89 -18.163 +v 119.287 -109.18 -17.801 +v 119.43 -108.59 -17.743 +v 120.116 -107.615 -17.703 +v 119.957 -107.508 -17.627 +v 120.714 -106.657 -17.518 +v 121.204 -113.055 -18.33 +v 122.173 -113.57 -18.445 +v 120.95 -112.627 -18.211 +v 123.25 -113.794 -18.56 +v 125.237 -113.204 -18.717 +v 123.79 -113.62 -18.551 +v 126.207 -112.47 -18.846 +v 121.412 -112.768 -18.094 +v 120.29 -111.804 -18.095 +v 120.734 -112.122 -17.986 +v 122.294 -113.236 -18.21 +v 123.273 -113.44 -18.326 +v 122.33 -113.135 -18.011 +v 123.28 -113.332 -18.127 +v 124.225 -113.373 -18.436 +v 124.203 -113.267 -18.238 +v 125.15 -113.04 -18.55 +v 125.1 -112.945 -18.35 +v 124.652 -113.1 -18.067 +v 123.765 -113.29 -17.958 +v 125.618 -112.56 -18.199 +v 125.643 -112.59 -18.426 +v 125.1 -112.94 -17.908 +v 125.71 -112.675 -18.625 +v 125.966 -112.24 -18.253 +v 126.073 -112.342 -18.68 +v 126.297 -111.9 -18.533 +v 126.51 -111.482 -18.357 +v 125.704 -112.667 -17.787 +v 125.64 -112.587 -17.983 +v 126.7 -111.05 -18.408 +v 126.377 -111.958 -17.894 +v 126.066 -112.334 -17.84 +v 126.198 -112.46 -17.667 +v 126.793 -111.63 -17.771 +v 126.63 -111.546 -17.945 +v 127.143 -110.654 -17.873 +v 126.828 -111.097 -17.996 +v 126.83 -110.59 -18.46 +v 126.963 -110.617 -18.047 +v 127.21 -109.638 -17.97 +v 127.03 -110.133 -18.096 +v 126.89 -109.66 -18.556 +v 126.93 -109.657 -18.783 +v 126.868 -110.597 -18.687 +v 126.695 -108.74 -18.65 +v 126.973 -110.62 -18.886 +v 127.04 -109.65 -18.982 +v 126.64 -111.55 -18.784 +v 126.535 -112.072 -18.9 +v 126.955 -111.716 -19.019 +v 127.154 -110.657 -19.053 +v 127.393 -109.625 -19.217 +v 127.223 -109.637 -19.15 +v 127.008 -108.627 -19.243 +v 126.97 -109.166 -19.029 +v 126.744 -108.465 -19.098 +v 126.645 -108.51 -18.9 +v 126.39 -108.11 -18.716 +v 127.028 -109.65 -18.144 +v 126.96 -109.168 -18.19 +v 126.64 -108.51 -18.456 +v 126.902 -108.395 -18.086 +v 126.734 -108.47 -18.26 +v 126.148 -107.71 -18.544 +v 126.367 -107.53 -18.173 +v 125.146 -113.03 -17.712 +v 124.26 -113.542 -17.424 +v 124.223 -113.363 -17.598 +v 123.262 -113.613 -17.314 +v 123.274 -113.43 -17.487 +v 122.78 -113.363 -17.43 +v 122.235 -113.4 -17.198 +v 123.283 -113.293 -17.9 +v 122.297 -113.226 -17.372 +v 121.84 -113.023 -17.313 +v 121.31 -112.908 -17.082 +v 122.344 -113.097 -17.784 +v 121.42 -112.76 -17.256 +v 121.904 -112.902 -17.726 +v 120.743 -112.116 -17.147 +v 121.18 -112.383 -17.618 +v 121.476 -112.68 -17.895 +v 120.45 -111.71 -17.928 +v 119.073 -110.398 -16.906 +v 120.716 -106.66 -16.338 +v 122.903 -105.846 -16.037 +v 121.728 -106.015 -16.223 +v 121.65 -105.847 -16.392 +v 122.878 -105.674 -16.107 +v 122.243 -105.627 -16.334 +v 124.622 -105.96 -15.864 +v 124.076 -105.67 -15.992 +v 122.85 -105.492 -16.276 +v 123.476 -105.445 -16.219 +v 123.475 -105.328 -16.453 +v 124.1 -105.486 -16.16 +v 124.117 -105.37 -16.395 +v 123.475 -105.338 -16.86 +v 124.116 -105.38 -16.803 +v 124.72 -105.61 -16.941 +v 124.75 -105.512 -16.745 +v 125.357 -105.732 -16.686 +v 125.36 -105.723 -16.279 +v 124.753 -105.502 -16.337 +v 124.72 -105.616 -16.103 +v 125.313 -105.83 -16.045 +v 125.928 -106.026 -16.221 +v 125.24 -106 -15.876 +v 126.316 -106.45 -15.936 +v 126.385 -106.366 -16.578 +v 126.39 -106.358 -16.17 +v 126.778 -106.883 -15.878 +v 126.864 -106.803 -16.112 +v 126.2 -106.59 -15.767 +v 127.17 -107.375 -15.82 +v 127.267 -107.308 -16.054 +v 126.875 -107.578 -15.58 +v 125.675 -106.428 -15.748 +v 127.323 -107.996 -15.593 +v 127.487 -107.914 -15.762 +v 127.593 -107.862 -15.996 +v 127.53 -109.165 -15.408 +v 127.702 -109.134 -15.478 +v 127.728 -108.498 -15.704 +v 127.84 -108.46 -15.938 +v 127.477 -110.887 -15.234 +v 127.044 -111.956 -15.118 +v 126.857 -106.81 -16.52 +v 126.78 -106.88 -16.716 +v 127.022 -107.477 -16.83 +v 127.174 -107.372 -16.658 +v 127.26 -107.314 -16.462 +v 127.49 -107.912 -16.6 +v 127.584 -107.866 -16.404 +v 121.246 -106.272 -8.552 +v 120.327 -107.042 -8.668 +v 122.96 -105.84 -8.308 +v 122.343 -105.79 -8.437 +v 119.432 -108.602 -8.841 +v 119.805 -107.412 -8.894 +v 119.49 -107.958 -8.952 +v 119.256 -108.546 -9.01 +v 119.233 -109.714 -8.95 +v 119.05 -109.706 -9.12 +v 119.067 -110.337 -9.177 +v 119.005 -109.063 -9.296 +v 118.932 -109.7 -9.353 +v 118.95 -110.348 -9.411 +v 118.942 -109.7 -9.76 +v 118.96 -110.347 -9.82 +v 119.144 -108.51 -9.244 +v 119.154 -108.513 -9.652 +v 119.385 -107.906 -9.186 +v 119.394 -107.91 -9.594 +v 119.487 -107.956 -9.79 +v 119.116 -109.084 -9.9 +v 119.045 -109.706 -9.957 +v 119.297 -109.117 -10.072 +v 119.652 -108.036 -9.963 +v 119.8 -107.41 -9.733 +v 119.954 -107.512 -9.905 +v 120.112 -107.62 -9.98 +v 119.486 -109.152 -10.148 +v 119.245 -110.32 -10.188 +v 121.345 -106.43 -9.807 +v 119.436 -110.3 -10.263 +v 120.117 -111.845 -10.434 +v 119.348 -110.917 -10.246 +v 119.36 -111.558 -10.131 +v 121.21 -113.06 -10.607 +v 122.655 -113.71 -10.775 +v 123.75 -113.795 -10.89 +v 125.33 -113.348 -11.064 +v 123.21 -113.62 -10.764 +v 124.264 -113.553 -10.88 +v 122.732 -113.363 -10.54 +v 123.727 -113.44 -10.655 +v 122.245 -113.415 -10.656 +v 121.42 -112.773 -10.372 +v 121.845 -113.038 -10.43 +v 120.91 -112.586 -10.482 +v 120.264 -111.76 -10.366 +v 120.7 -112.08 -10.256 +v 120.424 -111.668 -10.2 +v 120.787 -112.014 -10.058 +v 121.14 -112.347 -9.888 +v 121.914 -112.907 -10.004 +v 120.518 -111.615 -10 +v 122.357 -113.1 -10.062 +v 121.426 -112.765 -9.534 +v 121.045 -112.446 -9.476 +v 122.755 -113.258 -10.34 +v 123.236 -113.29 -10.17 +v 121.85 -113.03 -9.592 +v 123.72 -113.333 -10.456 +v 123.717 -113.293 -10.229 +v 122.734 -113.353 -9.701 +v 122.694 -113.532 -9.527 +v 123.225 -113.427 -9.759 +v 123.738 -113.613 -9.643 +v 123.726 -113.43 -9.817 +v 124.196 -113.227 -10.287 +v 124.224 -113.362 -9.875 +v 124.703 -113.226 -9.933 +v 125.093 -112.904 -10.402 +v 125.243 -113.187 -9.817 +v 125.158 -113.025 -9.99 +v 125.112 -112.94 -10.63 +v 125.52 -112.684 -10.687 +v 125.865 -112.342 -10.518 +v 125.577 -112.763 -10.048 +v 125.96 -112.44 -10.106 +v 126.437 -112.184 -9.99 +v 125.583 -112.77 -10.886 +v 126.45 -111.588 -10.633 +v 125.162 -113.034 -10.829 +v 125.25 -113.198 -10.996 +v 126.096 -112.58 -11.111 +v 126.3 -112.077 -11.002 +v 126.66 -111.152 -10.692 +v 126.292 -112.07 -10.163 +v 126.57 -111.656 -10.221 +v 126.83 -110.76 -10.97 +v 126.88 -110.28 -10.8 +v 126.58 -111.66 -11.06 +v 126.97 -111.275 -11.285 +v 126.935 -110.786 -11.17 +v 126.938 -109.797 -11.086 +v 126.898 -109.798 -10.858 +v 126.925 -110.783 -10.33 +v 127.102 -110.83 -10.157 +v 127.015 -110.295 -10.388 +v 127.22 -109.79 -10.272 +v 127.287 -110.877 -10.08 +v 127.41 -109.783 -10.195 +v 126.865 -108.812 -10.562 +v 126.985 -109.295 -10.505 +v 127.036 -109.794 -10.446 +v 126.85 -109.318 -10.917 +v 126.995 -109.293 -11.343 +v 127.046 -109.794 -11.285 +v 127.21 -110.317 -11.394 +v 124.226 -113.372 -10.713 +v 120.71 -112.073 -9.418 +v 119.17 -110.96 -10.074 +v 119.062 -110.337 -10.016 +v 119.07 -110.986 -9.877 +v 121.244 -106.268 -9.732 +v 122.96 -105.852 -9.634 +v 120.76 -106.62 -9.79 +v 122.342 -105.785 -9.616 +v 122.936 -105.662 -9.558 +v 122.292 -105.608 -9.444 +v 121.7 -105.82 -9.502 +v 123.542 -105.44 -9.328 +v 122.912 -105.48 -9.386 +v 124.14 -105.673 -9.443 +v 124.166 -105.49 -9.27 +v 125.232 -105.99 -9.333 +v 122.898 -105.377 -9.19 +v 123.543 -105.337 -9.131 +v 122.264 -105.51 -9.248 +v 122.26 -105.5 -8.84 +v 123.543 -105.327 -8.724 +v 122.897 -105.367 -8.782 +v 124.183 -105.38 -8.666 +v 124.738 -105.51 -9.023 +v 122.912 -105.484 -8.547 +v 123.542 -105.445 -8.49 +v 122.293 -105.612 -8.606 +v 123.54 -105.63 -8.32 +v 124.708 -105.613 -8.38 +v 124.74 -105.5 -8.615 +v 125.304 -105.827 -8.322 +v 125.352 -105.72 -8.557 +v 124.66 -105.79 -8.212 +v 125.348 -105.728 -8.964 +v 125.923 -106.022 -8.499 +v 125.23 -105.995 -8.154 +v 125.86 -106.122 -8.264 +v 125.67 -106.425 -8.025 +v 124.112 -105.85 -8.193 +v 126.248 -106.63 -8.038 +v 126.442 -106.4 -8.441 +v 126.366 -106.49 -8.207 +v 126.904 -107.62 -7.852 +v 127.05 -107.523 -7.923 +v 126.82 -106.93 -8.149 +v 126.907 -106.85 -8.383 +v 127.202 -107.42 -8.091 +v 127.3 -107.355 -8.326 +v 127.385 -110.352 -7.561 +v 127.358 -109.252 -7.677 +v 126.886 -111.858 -7.394 +v 121.703 -105.824 -8.663 +v 121.656 -105.716 -8.898 +v 121.15 -106.116 -8.721 +v 120.644 -106.48 -8.778 +v 121.087 -106.016 -8.955 +v 121.66 -105.725 -9.305 +v 121.092 -106.024 -9.363 +v 121.146 -106.112 -9.56 +v 120.575 -106.4 -9.42 +v 120.57 -106.39 -9.013 +v 120.64 -106.478 -9.617 +v 120.11 -106.847 -9.478 +v 120.102 -106.84 -9.07 +v 120.187 -106.916 -9.675 +v 119.715 -107.352 -9.536 +v 119.707 -107.346 -9.128 +v 120.19 -106.92 -8.837 +v 125.917 -106.03 -8.906 +v 126.435 -106.408 -8.849 +v 126.9 -106.857 -8.79 +v 126.37 -106.487 -9.045 +v 125.863 -106.118 -9.103 +v 125.306 -105.823 -9.16 +v 125.765 -106.274 -9.275 +v 126.823 -106.926 -8.987 +v 126.685 -107.05 -9.16 +v 127.205 -107.418 -8.93 +v 127.29 -107.36 -8.733 +v 119.06 -110.988 -9.47 +v 119.92 -112.233 -18.88 +v 119.767 -112.334 -19.048 +v 121.17 -113.48 -18.94 +v 120.78 -112.966 -18.85 +v 120.543 -113.234 -19.089 +v 121.07 -113.635 -19.11 +v 122.738 -114.103 -18.991 +v 122.24 -113.8 -18.905 +v 120.034 -112.886 -19.303 +v 120.465 -113.322 -19.323 +v 119.668 -112.398 -19.283 +v 120.368 -113.278 -19.636 +v 121.007 -113.733 -19.344 +v 121.773 -114.16 -19.637 +v 121.533 -114.03 -19.362 +v 123.25 -114.493 -19.637 +v 122.684 -114.4 -19.394 +v 122.095 -114.252 -19.378 +v 122.132 -114.14 -19.144 +v 122.705 -114.284 -19.16 +v 123.863 -114.46 -19.422 +v 123.853 -114.343 -19.188 +v 123.84 -114.16 -19.02 +v 123.296 -113.993 -18.936 +v 125.055 -114.147 -19.303 +v 124.89 -113.693 -18.954 +v 124.456 -114.373 -19.436 +v 125.092 -114.25 -19.637 +v 126.353 -106.478 -10.783 +v 126.89 -106.833 -10.96 +v 126.428 -106.388 -11.017 +v 125.746 -106.267 -10.672 +v 125.842 -106.11 -10.84 +v 126.804 -106.912 -10.725 +v 126.667 -107.035 -10.556 +v 127.29 -107.343 -10.901 +v 127.193 -107.41 -10.667 +v 127.183 -108.105 -10.37 +v 126.124 -106.753 -10.544 +v 125.207 -105.986 -10.73 +v 124.658 -105.97 -10.71 +v 123.518 -105.803 -10.827 +v 124.122 -105.674 -10.839 +v 125.28 -105.817 -10.9 +v 124.148 -105.492 -11.008 +v 123.52 -105.445 -11.066 +v 122.913 -105.67 -10.955 +v 125.904 -106.01 -11.075 +v 125.328 -105.71 -11.133 +v 124.792 -105.514 -11.184 +v 125.9 -106.02 -11.483 +v 125.324 -105.718 -11.54 +v 124.164 -105.386 -11.65 +v 124.165 -105.376 -11.242 +v 125.845 -106.107 -11.68 +v 124.76 -105.623 -11.789 +v 126.356 -106.475 -11.621 +v 126.422 -106.396 -11.425 +v 126.883 -106.84 -11.367 +v 126.807 -106.91 -11.564 +v 126.238 -106.616 -11.794 +v 127.197 -107.406 -11.506 +v 127.282 -107.35 -11.31 +v 124.708 -105.8 -11.96 +v 125.748 -106.263 -11.852 +v 124.15 -105.488 -11.846 +v 123.518 -105.625 -12.077 +v 123.52 -105.44 -11.904 +v 122.887 -105.483 -11.962 +v 122.913 -105.666 -12.135 +v 123.52 -105.337 -11.708 +v 122.873 -105.38 -11.766 +v 123.52 -105.327 -11.3 +v 122.872 -105.37 -11.358 +v 122.245 -105.514 -11.824 +v 122.275 -105.617 -11.182 +v 122.242 -105.504 -11.416 +v 122.888 -105.488 -11.124 +v 121.686 -105.83 -11.24 +v 121.76 -106 -11.07 +v 120.745 -106.637 -11.186 +v 121.136 -106.124 -11.297 +v 121.638 -105.723 -11.474 +v 120.627 -106.496 -11.355 +v 121.074 -106.024 -11.53 +v 121.642 -105.733 -11.881 +v 121.08 -106.033 -11.939 +v 120.55 -106.406 -11.59 +v 120.178 -106.932 -11.412 +v 120.09 -106.854 -11.647 +v 120.097 -106.86 -12.054 +v 120.557 -106.414 -11.997 +v 121.684 -105.827 -12.078 +v 121.134 -106.12 -12.135 +v 120.624 -106.493 -12.193 +v 119.703 -107.37 -12.112 +v 120.174 -106.93 -12.25 +v 120.312 -107.052 -12.423 +v 121.232 -106.276 -12.308 +v 121.76 -105.995 -12.25 +v 122.274 -105.613 -12.02 +v 121.837 -106.17 -12.326 +v 120.454 -107.18 -12.499 +v 119.942 -107.53 -12.481 +v 119.443 -108.552 -12.59 +v 119.625 -108.613 -12.666 +v 119.42 -109.743 -12.782 +v 119.228 -109.736 -12.706 +v 119.268 -108.494 -12.418 +v 119.113 -109.1 -12.476 +v 119.79 -107.427 -12.309 +v 119.383 -107.934 -12.17 +v 119.01 -109.082 -12.28 +v 119.044 -109.73 -12.534 +v 118.94 -109.725 -12.337 +v 119.16 -108.46 -11.814 +v 119 -109.08 -11.872 +v 119.374 -107.93 -11.763 +v 119.695 -107.365 -11.704 +v 119.48 -107.98 -11.529 +v 119.117 -109.102 -11.637 +v 119.048 -109.73 -11.696 +v 118.93 -109.724 -11.93 +v 119.298 -109.135 -11.468 +v 119.646 -108.06 -11.36 +v 119.793 -107.43 -11.47 +v 119.946 -107.532 -11.302 +v 119.07 -110.36 -11.754 +v 118.952 -110.373 -11.988 +v 119.064 -111.007 -12.046 +v 119.073 -111.004 -12.453 +v 118.962 -110.372 -12.396 +v 119.065 -110.362 -12.592 +v 119.173 -110.98 -12.65 +v 119.248 -110.343 -12.764 +v 119.538 -111.507 -12.88 +v 119.367 -111.576 -12.708 +v 119.715 -111.435 -12.955 +v 120.802 -112.72 -13.126 +v 122.144 -113.56 -13.293 +v 123.217 -113.792 -13.409 +v 124.842 -113.565 -13.582 +v 126.226 -112.693 -13.755 +v 127.11 -111.38 -13.923 +v 126.75 -111.734 -13.804 +v 127.118 -110.818 -13.912 +v 127.38 -110.316 -14.038 +v 127.23 -109.768 -14.029 +v 126.782 -111.245 -13.687 +v 127.027 -110.278 -13.803 +v 127.208 -108.684 -14.212 +v 127.045 -109.774 -13.861 +v 126.87 -108.794 -13.977 +v 127.047 -108.737 -14.144 +v 126.92 -110.266 -13.604 +v 126.77 -108.828 -13.778 +v 126.897 -109.78 -13.435 +v 126.682 -111.204 -13.489 +v 126.88 -110.262 -13.377 +v 126.795 -110.736 -13.319 +v 126.73 -108.84 -13.55 +v 126.587 -108.383 -13.835 +v 126.308 -107.984 -13.666 +v 126.684 -108.335 -14.034 +v 126.93 -110.77 -12.907 +v 126.773 -111.24 -12.85 +v 126.942 -111.31 -12.675 +v 127.2 -110.296 -12.79 +v 127.017 -110.277 -12.965 +v 126.1 -112.562 -12.508 +v 126.303 -112.058 -12.74 +v 124.78 -113.394 -12.335 +v 123.23 -113.61 -12.161 +v 122.207 -113.388 -12.046 +v 122.27 -113.216 -12.22 +v 122.748 -113.356 -12.277 +v 121.44 -112.775 -12.11 +v 123.253 -113.29 -12.747 +v 122.777 -113.222 -12.69 +v 120.72 -112.088 -11.995 +v 121.055 -112.456 -12.052 +v 121.93 -112.916 -12.58 +v 122.305 -113.125 -12.86 +v 123.25 -113.33 -12.975 +v 121.048 -112.463 -12.89 +v 121.52 -112.663 -12.522 +v 121.433 -112.784 -12.948 +v 122.267 -113.226 -13.058 +v 120.568 -112.21 -13 +v 121.778 -113.21 -13.174 +v 120.43 -111.68 -12.775 +v 120.524 -111.624 -12.576 +v 120.04 -111.303 -12.885 +v 122.706 -113.547 -13.283 +v 123.243 -113.438 -13.174 +v 123.76 -113.623 -13.4 +v 123.747 -113.44 -13.232 +v 124.72 -113.23 -13.347 +v 124.784 -113.405 -13.514 +v 124.683 -113.13 -13.148 +v 123.736 -113.29 -12.806 +v 124.67 -113.093 -12.92 +v 123.746 -113.428 -12.393 +v 123.244 -113.428 -12.335 +v 125.122 -112.933 -13.206 +v 125.173 -113.028 -13.404 +v 125.51 -112.64 -13.036 +v 125.707 -112.91 -13.63 +v 125.978 -112.44 -13.52 +v 126.194 -111.974 -13.152 +v 126.46 -111.57 -13.21 +v 125.97 -112.43 -12.682 +v 125.592 -112.752 -12.624 +v 125.168 -113.02 -12.566 +v 124.717 -113.222 -12.509 +v 124.238 -113.36 -12.45 +v 126.31 -112.064 -13.578 +v 127.035 -109.775 -13.023 +v 126.982 -109.28 -13.08 +v 127.035 -108.74 -12.964 +v 126.25 -107.394 -13.138 +v 126.86 -108.798 -13.138 +v 126.674 -108.34 -13.196 +v 121.503 -106.747 -14.89 +v 122.045 -106.665 -14.664 +v 121.2 -107.198 -14.78 +v 122.41 -106.152 -14.842 +v 122.458 -106.315 -14.774 +v 120.382 -107.848 -15.063 +v 124.048 -106.036 -14.668 +v 123.495 -106.168 -14.658 +v 122.51 -106.493 -14.606 +v 124.54 -106.315 -14.542 +v 123.496 -106.353 -14.49 +v 123.998 -106.388 -14.433 +v 125.102 -106.342 -14.552 +v 124.957 -106.666 -14.317 +v 125.444 -106.714 -14.433 +v 123.983 -106.494 -14.234 +v 125.76 -107.164 -14.208 +v 124.912 -106.764 -14.118 +v 126.122 -107.51 -14.15 +v 126.583 -107.797 -14.26 +v 126.384 -107.27 -14.385 +v 125.665 -107.278 -13.782 +v 125.27 -106.998 -13.84 +v 126.114 -107.517 -13.311 +v 126.422 -107.907 -13.254 +v 125.752 -107.172 -13.37 +v 124.952 -106.675 -13.479 +v 125.028 -106.508 -13.305 +v 124.448 -106.635 -13.948 +v 124.487 -106.503 -13.536 +v 123.977 -106.534 -14.006 +v 124.022 -106.216 -13.42 +v 123.997 -106.398 -13.594 +v 123.496 -106.5 -14.065 +v 123.496 -106.363 -13.653 +v 122.55 -106.635 -14.18 +v 122.54 -106.597 -14.408 +v 123 -106.4 -13.71 +v 122.513 -106.503 -13.768 +v 121.68 -107.028 -14.296 +v 122.09 -106.763 -14.465 +v 121.608 -106.912 -13.883 +v 120.954 -107.647 -14.411 +v 122.05 -106.674 -13.825 +v 122.462 -106.327 -13.594 +v 121.09 -107.067 -13.767 +v 121.208 -107.206 -13.94 +v 120.66 -108.03 -14.47 +v 120.85 -107.556 -13.999 +v 120.27 -108.84 -14.578 +v 120.414 -108.38 -14.748 +v 120.843 -107.55 -14.837 +v 120.317 -108.334 -14.947 +v 120.113 -109.3 -14.864 +v 120.327 -108.338 -14.108 +v 120.152 -109.308 -14.636 +v 120.14 -108.798 -14.166 +v 120.162 -108.257 -13.934 +v 120.102 -109.788 -14.694 +v 120.017 -109.284 -14.224 +v 119.836 -109.252 -14.05 +v 120.965 -106.92 -13.69 +v 119.99 -108.173 -13.857 +v 122.408 -106.143 -13.517 +v 119.648 -109.22 -13.973 +v 119.894 -110.816 -14.224 +v 119.53 -110.908 -14.148 +v 119.708 -110.863 -14.146 +v 119.984 -110.28 -14.34 +v 119.965 -109.784 -14.282 +v 120.07 -110.77 -14.398 +v 120.205 -110.737 -14.81 +v 120.29 -112.447 -14.321 +v 121.567 -113.512 -14.489 +v 122.65 -113.908 -14.604 +v 124.372 -113.904 -14.778 +v 123.214 -114.16 -14.733 +v 125.936 -113.194 -14.95 +v 124.41 -114.073 -14.848 +v 125.533 -113.655 -14.964 +v 126.9 -112.486 -15.138 +v 126.498 -112.942 -15.08 +v 126.627 -113.073 -15.248 +v 127.045 -112.597 -15.306 +v 127.458 -111.504 -15.246 +v 127.824 -110.973 -15.473 +v 127.75 -110.33 -15.362 +v 127.63 -111.573 -15.415 +v 127.932 -110.35 -15.531 +v 127.95 -109.724 -15.59 +v 127.938 -111.002 -15.707 +v 128.05 -110.362 -15.766 +v 128.07 -109.72 -15.823 +v 127.883 -109.1 -15.647 +v 128 -109.08 -15.88 +v 127.738 -111.618 -15.65 +v 127.928 -111 -16.115 +v 127.455 -112.194 -15.592 +v 127.73 -111.614 -16.057 +v 127.13 -112.662 -15.948 +v 127.14 -112.668 -15.54 +v 127.633 -111.575 -16.254 +v 127.357 -112.137 -16.196 +v 126.703 -113.15 -15.89 +v 126.63 -113.076 -16.086 +v 126.71 -113.157 -15.482 +v 126.22 -113.576 -15.424 +v 126.213 -113.568 -15.832 +v 126.152 -113.485 -16.028 +v 126.042 -113.337 -16.2 +v 126.5 -112.945 -16.259 +v 125.623 -113.82 -15.97 +v 125.677 -113.92 -15.367 +v 125.672 -113.912 -15.774 +v 126.15 -113.482 -15.19 +v 125.62 -113.817 -15.132 +v 125.087 -114.188 -15.309 +v 125.083 -114.18 -15.716 +v 125.048 -114.082 -15.913 +v 124.473 -114.368 -15.251 +v 124.47 -114.358 -15.66 +v 124.45 -114.257 -15.856 +v 125.046 -114.078 -15.074 +v 124.448 -114.253 -15.017 +v 123.837 -114.46 -15.194 +v 123.836 -114.45 -15.601 +v 123.83 -114.347 -15.798 +v 124.41 -114.077 -16.028 +v 123.214 -114.165 -15.912 +v 123.2 -114.35 -15.74 +v 123.194 -114.462 -15.136 +v 123.194 -114.452 -15.544 +v 123.828 -114.343 -14.96 +v 123.202 -114.344 -14.902 +v 122.553 -114.363 -15.485 +v 122.55 -114.373 -15.078 +v 122.574 -114.262 -15.682 +v 121.93 -114.185 -15.427 +v 121.967 -114.088 -15.624 +v 121.928 -114.194 -15.02 +v 122.575 -114.258 -14.844 +v 121.968 -114.084 -14.785 +v 122.032 -113.91 -14.616 +v 121.342 -113.93 -14.962 +v 120.926 -113.535 -14.677 +v 121.032 -113.385 -14.508 +v 120.01 -112.67 -14.56 +v 120.436 -113.134 -14.618 +v 119.816 -112.06 -14.334 +v 119.658 -112.153 -14.503 +v 119.556 -112.213 -14.737 +v 119.918 -112.743 -14.795 +v 120.355 -113.22 -14.853 +v 119.926 -112.737 -15.202 +v 120.858 -113.63 -14.91 +v 120.362 -113.212 -15.26 +v 120.863 -113.623 -15.319 +v 119.565 -112.208 -15.145 +v 120.433 -113.137 -15.457 +v 121.396 -113.83 -15.566 +v 120.56 -113.003 -15.63 +v 121.483 -113.67 -15.738 +v 120.007 -112.672 -15.399 +v 122.612 -114.082 -15.854 +v 124.984 -113.91 -16.085 +v 127.198 -112.045 -16.368 +v 127.65 -110.93 -16.484 +v 127.753 -110.332 -16.542 +v 127.828 -110.974 -16.312 +v 127.936 -110.35 -16.37 +v 128.04 -110.36 -16.173 +v 128.06 -109.72 -16.23 +v 127.956 -109.724 -16.428 +v 127.706 -109.133 -16.657 +v 127.732 -108.496 -16.542 +v 127.558 -108.554 -16.715 +v 127.887 -109.1 -16.485 +v 127.99 -109.082 -16.289 +v 127.83 -108.464 -16.346 +v 120.007 -109.282 -15.062 +v 119.955 -109.783 -15.12 +v 119.953 -108.737 -15.172 +v 120.166 -110.746 -15.037 +v 120.317 -111.203 -15.094 +v 126.284 -112.082 -7.587 +v 126.72 -111.762 -7.471 +v 126.562 -111.67 -7.645 +v 125.947 -112.453 -7.53 +v 126.074 -112.586 -7.355 +v 126.443 -111.602 -8.057 +v 126.78 -111.22 -7.703 +v 126.802 -110.71 -8.173 +v 125.852 -112.354 -7.941 +v 126.478 -111.622 -8.285 +v 126.79 -111.225 -8.541 +v 125.955 -112.46 -8.368 +v 125.88 -112.383 -8.169 +v 126.57 -111.676 -8.483 +v 125.236 -113.205 -8.42 +v 125.15 -113.04 -8.253 +v 126.083 -112.595 -8.535 +v 125.1 -112.945 -8.054 +v 125.08 -112.91 -7.826 +v 124.24 -113.56 -8.304 +v 124.203 -113.378 -8.137 +v 123.7 -113.442 -8.08 +v 124.64 -113.104 -7.768 +v 123.5 -113.632 -8.225 +v 123.72 -113.797 -8.315 +v 125.315 -113.355 -8.488 +v 122.994 -113.41 -8.002 +v 122.443 -113.48 -8.115 +v 121.472 -113.033 -8.008 +v 122.017 -113.123 -7.893 +v 123.5 -113.3 -7.631 +v 123.693 -113.334 -7.88 +v 124.173 -113.233 -7.71 +v 123.692 -113.33 -7.438 +v 122.498 -113.292 -7.109 +v 122.537 -113.16 -7.521 +v 124.2 -113.367 -7.298 +v 123.698 -113.432 -7.241 +v 123.708 -113.615 -7.068 +v 124.747 -113.406 -7.182 +v 124.685 -113.233 -7.356 +v 122.996 -113.4 -7.164 +v 122.97 -113.582 -6.99 +v 121.945 -113.28 -6.881 +v 125.568 -112.77 -7.472 +v 127.013 -110.31 -7.812 +v 127.195 -110.33 -7.638 +v 127.036 -109.813 -7.87 +v 127.17 -109.284 -7.754 +v 126.853 -109.337 -8.34 +v 126.9 -109.816 -8.282 +v 126.916 -110.298 -8.452 +v 126.892 -109.33 -8.568 +v 127.023 -110.31 -8.65 +v 127.125 -110.79 -8.767 +v 126.73 -111.768 -8.65 +v 127 -109.312 -8.766 +v 127.232 -109.808 -8.876 +v 126.2 -112.717 -8.603 +v 126.988 -109.314 -7.928 +v 125.145 -113.032 -7.414 +v 122.022 -113.114 -7.055 +v 121.578 -112.87 -7.003 +v 121.087 -112.486 -6.94 +v 121.653 -112.754 -7.415 +v 121.18 -112.385 -7.352 +v 121.63 -112.787 -7.642 +v 121.08 -112.494 -7.778 +v 121.154 -112.415 -7.58 +v 121.572 -112.878 -7.841 +v 120.954 -112.63 -7.945 +v 119.98 -111.97 -7.916 +v 120.282 -111.792 -7.845 +v 120.442 -111.698 -7.678 +v 119.54 -110.894 -7.821 +v 119.544 -111.52 -7.792 +v 119.247 -110.332 -7.7 +v 119.42 -109.724 -7.73 +v 119.176 -110.985 -7.574 +v 119.064 -110.35 -7.527 +v 119.23 -109.716 -7.654 +v 119.638 -108.576 -7.643 +v 119.457 -108.514 -7.568 +v 119.045 -109.708 -7.482 +v 119.12 -109.07 -7.438 +v 119.283 -108.455 -7.395 +v 119.516 -107.9 -7.356 +v 119.997 -107.45 -7.487 +v 119.846 -107.345 -7.315 +v 120.252 -106.844 -7.275 +v 120.84 -106.553 -7.408 +v 119.185 -108.42 -7.199 +v 119.424 -107.853 -7.16 +v 119.762 -107.286 -7.118 +v 120.177 -106.774 -7.078 +v 120.725 -106.41 -7.236 +v 119.753 -107.28 -6.71 +v 120.17 -106.767 -6.67 +v 119.415 -107.85 -6.752 +v 119.287 -108.456 -6.557 +v 119.52 -107.902 -6.517 +v 119.176 -108.418 -6.79 +v 119.85 -107.347 -6.476 +v 120.255 -106.847 -6.436 +v 120.655 -106.32 -6.631 +v 119.684 -107.984 -6.349 +v 120 -107.453 -6.307 +v 119.304 -109.105 -6.43 +v 120.728 -106.413 -6.397 +v 121.25 -106.056 -6.36 +v 121.192 -105.955 -6.594 +v 121.786 -105.663 -6.557 +v 121.79 -105.673 -6.965 +v 121.197 -105.963 -7.002 +v 120.66 -106.328 -7.04 +v 122.418 -105.46 -6.521 +v 123.07 -105.348 -6.486 +v 122.42 -105.468 -6.93 +v 123.732 -105.333 -6.453 +v 123.072 -105.358 -6.894 +v 123.082 -105.46 -7.09 +v 122.445 -105.57 -7.126 +v 123.73 -105.343 -6.86 +v 123.726 -105.446 -7.057 +v 124.37 -105.41 -6.42 +v 124.37 -105.42 -6.829 +v 124.35 -105.522 -7.025 +v 123.717 -105.63 -7.23 +v 123.1 -105.644 -7.263 +v 124.912 -105.865 -7.166 +v 124.85 -106.045 -7.241 +v 123.707 -105.82 -7.305 +v 124.973 -105.69 -6.994 +v 126.01 -106.44 -7.106 +v 125.567 -105.948 -6.963 +v 125.007 -105.593 -6.797 +v 126.118 -106.29 -6.933 +v 125.615 -105.857 -6.766 +v 126.486 -106.84 -7.077 +v 127.062 -107.902 -7.1 +v 127.23 -107.81 -7.024 +v 127.032 -107.177 -6.878 +v 126.614 -106.708 -6.905 +v 126.178 -106.206 -6.737 +v 126.686 -106.634 -6.708 +v 127.39 -107.72 -6.852 +v 127.114 -107.114 -6.682 +v 127.666 -108.307 -6.827 +v 127.48 -107.668 -6.655 +v 127.512 -107.65 -6.453 +v 127.143 -107.092 -6.48 +v 126.712 -106.608 -6.506 +v 126.2 -106.176 -6.534 +v 125.632 -105.824 -6.564 +v 125.02 -105.558 -6.594 +v 127.762 -108.27 -6.63 +v 127.797 -108.257 -6.427 +v 121.897 -105.94 -7.334 +v 121.828 -105.768 -7.162 +v 121.25 -106.052 -7.199 +v 127.578 -110.144 -7.007 +v 127.338 -111.298 -6.966 +v 127.397 -110.133 -7.004 +v 127.22 -109.58 -6.959 +v 127.007 -111.178 -6.896 +v 127.043 -110.112 -6.77 +v 127.167 -111.236 -6.963 +v 126.462 -112.712 -6.916 +v 126.33 -112.588 -6.913 +v 126.556 -112.044 -6.862 +v 126.834 -111.114 -6.728 +v 125.458 -113.08 -6.818 +v 126.073 -112.343 -6.678 +v 126.404 -111.938 -6.695 +v 126.868 -110.602 -6.55 +v 125.36 -112.922 -6.65 +v 125.995 -112.27 -6.479 +v 126.935 -110.105 -6.57 +v 126.89 -109.608 -6.365 +v 125.305 -112.83 -6.452 +v 124.693 -113.156 -6.5 +v 124.756 -113.33 -6.74 +v 124.835 -113.546 -6.862 +v 124.95 -113.847 -6.852 +v 119.123 -109.07 -6.6 +v 119.05 -109.708 -6.643 +v 119.07 -110.35 -6.689 +v 119.007 -109.05 -6.833 +v 118.932 -109.703 -6.878 +v 118.95 -110.362 -6.923 +v 118.96 -110.36 -7.33 +v 118.94 -109.703 -7.285 +v 119.066 -111.013 -6.97 +v 119.076 -111.01 -7.377 +v 119.017 -109.05 -7.241 +v 119.373 -111.588 -7.62 +v 125.173 -106.578 -18.298 +v 126.226 -107.646 -18.347 +v 125.894 -107.295 -18.39 +v 125.51 -106.99 -18.43 +v 123.7 -106.185 -18.414 +v 122.18 -106.423 -18.522 +v 122.114 -106.244 -18.444 +v 121.294 -106.904 -18.588 +v 122.712 -106.453 -18.66 +v 121.807 -106.795 -18.729 +v 121.18 -106.75 -18.51 +v 120.73 -107.416 -18.635 +v 120.588 -107.288 -18.558 +v 119.973 -108.717 -18.722 +v 120.867 -107.538 -18.809 +v 120.57 -107.918 -18.839 +v 120.146 -108.775 -18.896 +v 119.79 -108.656 -18.645 +v 119.782 -110.05 -18.793 +v 119.59 -110.057 -18.715 +v 119.774 -111.092 -18.764 +v 120.222 -112.037 -18.807 +v 120.903 -112.827 -18.848 +v 122.298 -113.623 -18.903 +v 123.81 -113.802 -18.947 +v 119.956 -111.034 -18.84 +v 119.965 -110.042 -18.966 +v 120.017 -110.516 -18.99 +v 120.382 -111.932 -18.885 +v 120.536 -111.832 -19.059 +v 120.62 -111.777 -19.255 +v 120.262 -110.936 -19.427 +v 120.152 -110.492 -19.403 +v 120.557 -111.652 -19.636 +v 120.094 -110.464 -19.637 +v 120.067 -110.038 -19.163 +v 120.104 -109.725 -19.361 +v 120.025 -109.238 -18.923 +v 120.16 -109.264 -19.335 +v 120.452 -108.394 -19.28 +v 120.07 -109.4 -19.636 +v 120.24 -108.806 -19.535 +v 120.527 -107.975 -19.637 +v 120.684 -107.995 -19.25 +v 120.942 -107.606 -19.006 +v 121.13 -107.463 -19.205 +v 120.94 -107.603 -19.448 +v 121.51 -106.915 -19.636 +v 121.46 -107.13 -19.4 +v 121.484 -107.163 -19.174 +v 121.403 -107.052 -18.761 +v 122.295 -106.723 -19.108 +v 122.28 -106.685 -19.335 +v 122.68 -106.31 -19.637 +v 122.734 -106.548 -19.3 +v 122.71 -106.443 -19.5 +v 123.205 -106.376 -18.624 +v 123.217 -106.512 -19.036 +v 123.69 -106.368 -18.588 +v 124.164 -106.426 -18.55 +v 123.683 -106.505 -19 +v 123.685 -106.465 -19.227 +v 124.63 -106.55 -18.512 +v 125.09 -106.742 -18.472 +v 124.587 -106.68 -18.924 +v 125.028 -106.864 -18.884 +v 125.095 -106.732 -19.31 +v 125.046 -106.83 -19.111 +v 125.8 -107.397 -18.802 +v 125.828 -107.367 -19.029 +v 125.9 -107.288 -19.228 +v 126.234 -107.64 -19.185 +v 126.026 -107.152 -19.395 +v 126.673 -107.935 -19.31 +v 126.508 -107.413 -19.42 +v 125.178 -106.567 -19.477 +v 125.254 -106.416 -19.545 +v 124.233 -106.067 -19.624 +v 124.2 -106.234 -19.556 +v 123.69 -106.357 -19.426 +v 124.634 -106.54 -19.35 +v 121.03 -112.684 -18.925 +v 121.152 -112.547 -19.1 +v 122.357 -113.44 -18.98 +v 121.978 -113.094 -19.138 +v 121.627 -112.78 -19.317 +v 121.22 -112.47 -19.296 +v 121.13 -112.357 -19.637 +v 121.794 -112.85 -19.637 +v 122.66 -113.198 -19.636 +v 122.413 -113.267 -19.154 +v 123.578 -113.3 -19.637 +v 122.87 -113.38 -19.17 +v 123.795 -113.61 -19.025 +v 123.78 -113.428 -19.198 +v 124.218 -113.26 -19.408 +v 124.69 -113.152 -19.33 +v 124.77 -113.368 -19.063 +v 124.673 -113.12 -19.637 +v 125.075 -114.2 -6.427 +v 125.894 -113.787 -6.444 +v 125.84 -113.7 -6.64 +v 126.734 -112.97 -6.668 +v 126.81 -113.042 -6.471 +v 125.743 -113.542 -6.813 +v 126.6 -112.844 -6.84 +v 127.15 -112.462 -6.685 +v 127.235 -112.52 -6.488 +v 127.547 -112.01 -6.505 +v 127.69 -111.426 -6.718 +v 127.787 -111.462 -6.522 +v 127.967 -110.83 -6.541 +v 127.517 -111.363 -6.89 +v 127.866 -110.81 -6.738 +v 128.056 -110.172 -6.563 +v 127.953 -110.166 -6.76 +v 128.048 -109.508 -6.585 +v 127.77 -110.155 -6.931 +v 127.945 -109.517 -6.781 +v 127.956 -108.913 -6.606 +v 127.855 -108.936 -6.802 +v 127.675 -108.975 -6.975 +v -127.345 -108.046 -18.516 +v -127.738 -108.53 -18.719 +v -127.768 -109.73 -18.614 +v -127.19 -108.122 -18.446 +v -126.687 -107.058 -18.445 +v -127.533 -109.18 -18.512 +v -127.51 -107.966 -18.685 +v -126.156 -106.78 -18.338 +v -126.036 -106.92 -18.336 +v -124.628 -106.156 -18.22 +v -124.682 -105.978 -18.222 +v -127.022 -108.202 -18.444 +v -127.58 -111.163 -18.689 +v -127.414 -111.11 -18.618 +v -126.948 -112.114 -18.674 +v -127.952 -109.722 -18.783 +v -127.895 -110.63 -18.829 +v -127.756 -111.217 -18.858 +v -126.746 -112.676 -18.77 +v -127.885 -109.116 -18.751 +v -128 -109.095 -18.985 +v -128.07 -110.028 -19.033 +v -128.01 -110.648 -19.063 +v -128.038 -110.652 -19.268 +v -128.096 -109.716 -19.222 +v -127.85 -108.494 -18.953 +v -127.617 -107.915 -18.92 +v -127.905 -110.897 -19.637 +v -127.894 -111.26 -19.297 +v -128.06 -109.718 -19.425 +v -127.67 -111.84 -19.325 +v -127.81 -108.854 -19.637 +v -126.992 -112.8 -19.637 +v -127.868 -111.252 -19.092 +v -127.646 -111.83 -19.12 +v -127.37 -112.386 -19.352 +v -126.335 -113.49 -19.637 +v -126.996 -112.89 -19.378 +v -127.348 -112.37 -19.147 +v -127.25 -112.308 -18.913 +v -126.886 -112.796 -18.94 +v -126.69 -113.178 -19.19 +v -126.22 -113.577 -19.215 +v -126.15 -113.483 -18.98 +v -125.555 -113.644 -18.836 +v -125.644 -113.805 -19.004 +v -124.49 -114.056 -18.88 +v -125.472 -113.492 -18.765 +v -125.7 -113.91 -19.239 +v -124.533 -114.235 -19.048 +v -125.144 -114.168 -19.261 +v -122.725 -114.1 -18.94 +v -123.363 -113.996 -18.85 +v -123.35 -114.354 -19.089 +v -124.56 -114.35 -19.283 +v -123.96 -114.45 -19.303 +v -125 -114.25 -19.636 +v -123.267 -114.515 -19.637 +v -123.347 -114.47 -19.323 +v -122.692 -114.28 -19.11 +v -122.67 -114.397 -19.344 +v -122.086 -114.25 -19.362 +v -121.82 -114.178 -19.637 +v -121.16 -113.474 -18.991 +v -121.574 -113.918 -19.144 +v -121.523 -114.024 -19.378 +v -120.995 -113.726 -19.394 +v -120.52 -113.404 -19.637 +v -121.06 -113.627 -19.16 +v -121.73 -113.595 -18.905 +v -120.322 -112.757 -19.02 +v -120.098 -112.96 -19.422 +v -120.185 -112.88 -19.188 +v -119.728 -112.488 -19.436 +v -119.45 -111.91 -19.303 +v -119.745 -111.765 -18.978 +v -120.59 -112.517 -18.947 +v -123.37 -113.81 -18.848 +v -124.407 -113.707 -18.807 +v -125.382 -113.33 -18.764 +v -126.228 -112.704 -18.715 +v -127.047 -111.55 -18.645 +v -127.41 -110.01 -18.558 +v -127.35 -109.21 -18.51 +v -119.354 -111.958 -19.637 +v -127.99 -109.097 -19.393 +v -127.84 -108.497 -19.36 +v -127.608 -107.92 -19.327 +v -123.028 -106.017 -18.096 +v -123.006 -105.833 -18.098 +v -121.994 -106.29 -18.008 +v -121.923 -106.12 -18.01 +v -120.86 -107.014 -17.892 +v -120.988 -107.155 -17.97 +v -120.176 -107.84 -17.796 +v -122.068 -106.467 -18.086 +v -120.338 -107.94 -17.873 +v -119.735 -108.837 -17.694 +v -119.92 -108.89 -17.771 +v -120.26 -108.478 -17.996 +v -120.494 -108.036 -18.047 +v -120.78 -107.64 -18.096 +v -119.626 -110.442 -17.535 +v -119.977 -111.098 -17.538 +v -119.442 -110.468 -17.537 +v -119.78 -109.9 -17.667 +v -120.15 -111.04 -17.711 +v -119.997 -110.39 -17.787 +v -119.963 -109.9 -17.84 +v -119.997 -109.413 -17.894 +v -120.228 -108.976 -18.357 +v -120.098 -110.376 -17.983 +v -120.1 -109.9 -18.253 +v -120.247 -111.006 -17.908 +v -120.133 -110.37 -18.199 +v -120.243 -111.007 -18.35 +v -120.094 -110.377 -18.426 +v -120.093 -109.427 -18.533 +v -119.987 -110.392 -18.625 +v -120.14 -111.042 -18.55 +v -119.966 -111.102 -18.717 +v -119.768 -109.9 -18.846 +v -119.953 -109.9 -18.68 +v -120.584 -111.92 -18.436 +v -120.086 -108.936 -18.783 +v -120.387 -108.533 -18.408 +v -119.803 -109.386 -18.9 +v -119.633 -111.215 -18.788 +v -119.744 -108.84 -19.019 +v -120.03 -107.748 -19.123 +v -120.485 -108.03 -18.886 +v -120.096 -108.94 -17.945 +v -120.61 -108.11 -18.46 +v -120.577 -108.088 -18.687 +v -121.205 -107.392 -18.556 +v -121.112 -107.29 -18.144 +v -121.98 -106.86 -18.65 +v -121.178 -107.362 -18.783 +v -121.105 -107.283 -18.982 +v -120.328 -107.934 -19.053 +v -121.487 -106.98 -19.029 +v -120.98 -107.146 -19.15 +v -120.865 -107.02 -19.217 +v -121.83 -106.562 -19.243 +v -122.176 -106.726 -18.9 +v -122.135 -106.627 -19.098 +v -120.743 -106.887 -19.22 +v -122.55 -106.29 -19.31 +v -123.072 -106.378 -19.185 +v -123.555 -106.46 -19.029 +v -122.635 -106.613 -18.716 +v -122.178 -106.73 -18.456 +v -123.086 -106.49 -18.544 +v -123.554 -106.5 -18.802 +v -122.14 -106.636 -18.26 +v -121.493 -106.987 -18.19 +v -123.074 -106.39 -18.347 +v -123.05 -106.207 -18.173 +v -123.556 -106.363 -18.39 +v -124.573 -106.34 -18.298 +v -124.043 -106.405 -18.43 +v -124.48 -106.646 -18.884 +v -124.52 -106.514 -18.472 +v -124.928 -106.816 -18.924 +v -124.986 -106.69 -18.512 +v -125.41 -106.922 -18.55 +v -125.912 -107.067 -18.414 +v -125.704 -107.31 -19 +v -125.793 -107.206 -18.588 +v -126.037 -107.637 -19.036 +v -126.14 -107.546 -18.624 +v -126.444 -107.942 -18.66 +v -126.85 -108.285 -18.522 +v -126.56 -108.424 -19.108 +v -126.865 -108.812 -18.729 +v -126.847 -109.302 -19.174 +v -127.162 -109.245 -18.588 +v -127.036 -110 -18.809 +v -127.054 -111 -18.694 +v -124.523 -106.504 -19.31 +v -124.492 -106.608 -19.111 +v -125.73 -107.28 -19.227 +v -123.556 -106.353 -19.228 +v -123.56 -106.168 -19.395 +v -124.576 -106.327 -19.477 +v -124.625 -106.165 -19.545 +v -123.03 -106.026 -19.42 +v -125.606 -106.615 -19.624 +v -124.99 -106.682 -19.35 +v -125.515 -106.758 -19.556 +v -126.565 -107.86 -19.637 +v -125.8 -107.198 -19.426 +v -126.363 -107.996 -19.3 +v -126.452 -107.936 -19.499 +v -126.597 -108.407 -19.335 +v -119.57 -108.79 -19.021 +v -119.456 -110.466 -18.863 +v -119.68 -111.822 -18.656 +v -120.143 -112.226 -18.674 +v -119.516 -111.905 -18.484 +v -119.985 -112.335 -18.599 +v -119.266 -110.493 -18.787 +v -120.885 -113.036 -18.564 +v -119.834 -112.44 -18.426 +v -120.762 -113.183 -18.488 +v -119.424 -111.95 -18.287 +v -119.18 -111.37 -18.343 +v -120.644 -113.324 -18.316 +v -120.11 -112.956 -18.177 +v -121.153 -113.69 -18.258 +v -120.578 -113.404 -18.12 +v -119.74 -112.504 -17.822 +v -119.415 -111.956 -17.88 +v -120.104 -112.962 -17.77 +v -120.572 -113.41 -17.712 +v -121.093 -113.787 -17.654 +v -120.647 -113.32 -17.477 +v -121.668 -114.09 -17.596 +v -121.672 -114.08 -18.003 +v -121.1 -113.78 -18.062 +v -121.155 -113.687 -17.42 +v -122.278 -114.307 -17.538 +v -121.715 -113.982 -17.361 +v -121.252 -113.53 -17.25 +v -122.31 -114.193 -17.303 +v -122.36 -114.016 -17.134 +v -122.908 -114.434 -17.48 +v -122.28 -114.297 -17.945 +v -123.467 -114.354 -17.196 +v -123.468 -114.17 -17.027 +v -122.97 -113.962 -17.007 +v -121.86 -113.654 -17.122 +v -124.1 -114.315 -17.137 +v -124.115 -114.43 -17.371 +v -124.665 -114.01 -16.91 +v -124.618 -113.842 -16.84 +v -124.567 -113.663 -16.838 +v -126.02 -112.893 -16.665 +v -126.14 -113.035 -16.667 +v -127.027 -111.593 -16.491 +v -127.194 -111.673 -16.493 +v -125.763 -113.522 -16.795 +v -126.25 -113.168 -16.737 +v -126.37 -113.308 -16.906 +v -125.86 -113.678 -16.964 +v -125.303 -113.973 -17.022 +v -127.05 -112.275 -16.622 +v -126.818 -112.872 -16.848 +v -127.573 -111.185 -16.505 +v -127.516 -111.828 -16.732 +v -127.202 -112.377 -16.79 +v -127.3 -112.442 -17.025 +v -126.906 -112.95 -17.082 +v -127.622 -111.88 -16.966 +v -127.613 -111.874 -17.374 +v -126.9 -112.944 -17.49 +v -127.292 -112.437 -17.432 +v -126.438 -113.39 -17.548 +v -126.445 -113.4 -17.14 +v -125.918 -113.77 -17.606 +v -125.923 -113.777 -17.198 +v -126.822 -112.875 -17.687 +v -126.372 -113.312 -17.744 +v -125.35 -114.08 -17.256 +v -125.863 -113.68 -17.802 +v -125.347 -114.072 -17.664 +v -124.745 -114.29 -17.721 +v -124.747 -114.3 -17.314 +v -124.715 -114.186 -17.08 +v -125.305 -113.977 -17.86 +v -124.113 -114.42 -17.78 +v -124.716 -114.19 -17.918 +v -123.466 -114.5 -17.635 +v -123.466 -114.462 -17.838 +v -122.904 -114.46 -17.685 +v -124.1 -114.32 -17.976 +v -122.922 -114.32 -18.084 +v -122.31 -114.197 -18.142 +v -124.075 -114.137 -18.148 +v -122.946 -114.14 -18.256 +v -124.666 -114.013 -18.09 +v -124.614 -113.83 -18.166 +v -122.97 -113.95 -18.332 +v -121.787 -113.817 -18.372 +v -126.13 -113.025 -17.992 +v -125.766 -113.525 -17.974 +v -126.253 -113.17 -17.917 +v -127.182 -111.667 -17.818 +v -127.053 -112.277 -17.801 +v -127.354 -111.75 -17.743 +v -127.528 -110.57 -17.703 +v -127.206 -112.38 -17.63 +v -127.52 -111.83 -17.57 +v -127.717 -110.603 -17.627 +v -127.753 -111.242 -17.513 +v -127.464 -108.916 -17.536 +v -127.898 -110.633 -17.455 +v -127.753 -109.465 -17.518 +v -127.85 -111.273 -17.316 +v -127.86 -111.276 -16.908 +v -128.058 -110.084 -17.207 +v -128.01 -110.652 -16.85 +v -127.936 -109.447 -17.346 +v -127.65 -108.87 -17.46 +v -127.828 -108.826 -17.288 +v -128.04 -109.436 -17.15 +v -128.068 -110.085 -16.8 +v -127.938 -108.8 -16.683 +v -128.05 -109.435 -16.741 +v -127.928 -108.8 -17.091 +v -127.95 -110.08 -16.566 +v -127.932 -109.447 -16.507 +v -127.748 -111.24 -16.674 +v -127.767 -110.073 -16.397 +v -127.824 -108.827 -16.45 +v -127.74 -108.188 -16.626 +v -127.63 -108.232 -16.392 +v -127.46 -108.3 -16.223 +v -127.75 -109.466 -16.338 +v -127.455 -107.606 -16.568 +v -127.353 -107.665 -16.334 +v -126.86 -107.263 -16.107 +v -126.723 -107.37 -16.037 +v -127.477 -108.913 -16.21 +v -127.54 -110.574 -16.378 +v -126.577 -107.484 -16.035 +v -127.297 -108.958 -16.208 +v -125.312 -106.433 -15.862 +v -125.398 -106.27 -15.864 +v -124.275 -106.066 -15.746 +v -124.31 -105.884 -15.748 +v -122.688 -106.073 -15.579 +v -122.65 -105.892 -15.58 +v -121.19 -106.742 -15.406 +v -122.728 -106.26 -15.656 +v -121.304 -106.897 -15.483 +v -120.097 -107.97 -15.232 +v -120.264 -108.065 -15.31 +v -119.695 -108.995 -15.116 +v -119.88 -109.04 -15.194 +v -119.648 -110.58 -14.95 +v -119.836 -110.548 -15.026 +v -120.06 -109.082 -15.368 +v -120.207 -108.608 -15.425 +v -120.138 -110.997 -15.143 +v -120.017 -110.516 -15.2 +v -119.965 -110.02 -15.258 +v -120.542 -108.223 -15.895 +v -120.335 -108.658 -15.837 +v -120.12 -109.53 -15.728 +v -120.102 -110.014 -15.67 +v -120.268 -110.955 -15.555 +v -120.007 -110.517 -16.038 +v -120.317 -111.466 -15.923 +v -120.154 -109.104 -16.007 +v -120.508 -108.204 -16.123 +v -119.954 -110.02 -16.096 +v -120.05 -109.08 -16.206 +v -119.79 -109.495 -16.322 +v -120.414 -108.15 -16.322 +v -120.025 -108.536 -16.43 +v -119.657 -110.58 -16.274 +v -119.704 -108.997 -16.441 +v -119.952 -111.058 -16.148 +v -120.547 -107.618 -16.547 +v -120.105 -107.975 -16.557 +v -120.693 -107.73 -16.38 +v -121.406 -107.036 -16.495 +v -121.297 -106.887 -16.662 +v -121.196 -106.75 -16.73 +v -120.81 -107.82 -15.954 +v -121.47 -107.123 -16.296 +v -120.423 -108.155 -15.483 +v -120.7 -107.737 -15.541 +v -121.493 -107.155 -16.069 +v -121.877 -106.868 -16.354 +v -121.412 -107.045 -15.657 +v -122.336 -106.706 -16.184 +v -121.032 -107.366 -15.6 +v -121.83 -106.782 -15.714 +v -121.826 -106.772 -16.552 +v -122.29 -106.577 -15.772 +v -123.27 -106.508 -16.3 +v -122.222 -106.394 -16.778 +v -122.764 -106.43 -16.668 +v -122.766 -106.44 -15.83 +v -123.753 -106.51 -16.358 +v -124.18 -106.53 -16.637 +v -123.778 -106.178 -16.952 +v -123.26 -106.36 -16.726 +v -124.633 -106.695 -16.467 +v -123.26 -106.37 -15.888 +v -124.2 -106.433 -15.997 +v -125.075 -106.887 -16.525 +v -125.093 -106.852 -16.752 +v -124.68 -106.565 -16.055 +v -124.237 -106.254 -15.823 +v -125.223 -106.603 -15.939 +v -126.427 -107.603 -16.112 +v -125.14 -106.765 -16.113 +v -125.566 -107.03 -16.17 +v -125.948 -107.347 -16.229 +v -127.11 -109.004 -16.286 +v -126.78 -108.576 -16.402 +v -126.933 -109.048 -16.46 +v -126.283 -107.716 -16.286 +v -126.56 -108.125 -16.344 +v -126.652 -108.627 -16.814 +v -126.174 -107.8 -16.698 +v -125.486 -107.14 -16.583 +v -125.143 -106.756 -16.951 +v -125.572 -107.02 -17.01 +v -124.202 -106.423 -16.835 +v -126.206 -107.776 -16.926 +v -126.29 -107.71 -17.125 +v -125.68 -106.87 -17.177 +v -124.744 -106.38 -17.06 +v -126.436 -107.595 -17.292 +v -125.308 -106.44 -17.186 +v -126.57 -107.49 -17.36 +v -126.475 -108.174 -16.983 +v -126.57 -108.12 -17.182 +v -124.273 -106.075 -17.07 +v -122.69 -106.082 -16.903 +v -120.273 -112.095 -16.1 +v -120.413 -112 -16.033 +v -127.358 -110.543 -16.376 +v -127.73 -108.192 -17.034 +v -127.635 -108.23 -17.23 +v -121.864 -113.642 -18.448 +v -121.713 -113.986 -18.2 +v -120.328 -112.76 -17.367 +v -120.876 -113.046 -17.238 +v -120.19 -112.884 -17.536 +v -119.456 -111.275 -17.532 +v -120.132 -112.234 -17.349 +v -119.52 -111.903 -17.645 +v -119.145 -111.38 -18.14 +v -124.01 -113.283 -19.636 +v -124.297 -113.243 -19.255 +v -122.998 -113.274 -19.636 +v -125.202 -113 -19.015 +v -125.136 -112.88 -19.427 +v -124.32 -113.342 -19.058 +v -123.385 -113.334 -19.296 +v -122.877 -113.28 -19.317 +v -121.84 -112.87 -19.636 +v -123.382 -113.436 -19.1 +v -125.29 -113.162 -18.84 +v -124.363 -113.52 -18.885 +v -123.375 -113.62 -18.925 +v -122.406 -113.264 -19.137 +v -121.97 -113.09 -19.154 +v -121.102 -112.314 -19.637 +v -121.892 -113.255 -18.98 +v -126.095 -112.567 -18.793 +v -126.63 -111.91 -18.75 +v -125.967 -112.436 -18.966 +v -125.603 -112.745 -18.99 +v -126.707 -111.392 -18.896 +v -126.476 -111.812 -18.923 +v -126.99 -110.48 -18.839 +v -126.36 -111.737 -19.335 +v -126.748 -110.905 -19.28 +v -126.982 -109.277 -18.761 +v -126.934 -109.996 -19.006 +v -126.54 -111.59 -19.637 +v -126.786 -110.917 -19.507 +v -126.084 -112.11 -19.361 +v -126.98 -110.55 -19.637 +v -126.002 -112.282 -19.637 +v -126.938 -109.996 -19.448 +v -126.897 -109.764 -19.205 +v -126.886 -109.295 -19.4 +v -127 -109.104 -19.636 +v -125.52 -112.634 -19.403 +v -125.165 -112.93 -19.637 +v -125.896 -112.363 -19.163 +v -121.81 -113.428 -18.903 +v -120.732 -112.39 -19.025 +v -121.563 -112.86 -19.17 +v -120.868 -112.266 -19.198 +v -120.4 -111.442 -19.33 +v -120.18 -111.547 -19.033 +v -120.666 -111.844 -19.408 +v -126.59 -112.59 -6.404 +v -126.722 -112.703 -6.474 +v -125.79 -113.504 -6.566 +v -126.79 -112.017 -6.358 +v -127.225 -111.604 -6.318 +v -127.09 -112.212 -6.43 +v -125.183 -113.635 -6.543 +v -124.58 -113.66 -6.589 +v -127.408 -110.06 -6.205 +v -127.672 -109.68 -6.205 +v -127.587 -111.136 -6.349 +v -127.246 -112.31 -6.6 +v -127.55 -111.752 -6.557 +v -127.723 -110.533 -6.307 +v -127.905 -110.56 -6.476 +v -127.763 -111.19 -6.517 +v -127.875 -111.224 -6.752 +v -127.657 -111.8 -6.79 +v -128.02 -110.578 -6.71 +v -128.073 -109.92 -6.67 +v -127.955 -109.92 -6.436 +v -127.91 -109.278 -6.397 +v -128.028 -109.26 -6.631 +v -127.777 -108.66 -6.36 +v -127.89 -108.627 -6.594 +v -127.61 -108.647 -6.205 +v -127.073 -108.902 -6.205 +v -126.62 -108.065 -6.206 +v -127.024 -107.215 -6.205 +v -125.97 -107.33 -6.205 +v -125.87 -106.076 -6.207 +v -125.51 -106.99 -6.205 +v -125.06 -106.767 -6.209 +v -124.676 -105.522 -6.206 +v -124.35 -106.517 -6.205 +v -122.81 -105.35 -6.205 +v -123.253 -106.45 -6.205 +v -121.737 -106.933 -6.205 +v -120.565 -106.352 -6.206 +v -121.026 -107.54 -6.205 +v -119.987 -106.923 -6.206 +v -120.475 -108.337 -6.206 +v -119.332 -107.973 -6.205 +v -118.98 -108.914 -6.205 +v -120.17 -109.2 -6.205 +v -120.098 -110.084 -6.205 +v -118.926 -110.628 -6.207 +v -120.42 -111.424 -6.205 +v -119.365 -111.952 -6.205 +v -127.66 -108.007 -6.557 +v -127.553 -108.055 -6.323 +v -128.01 -110.576 -7.118 +v -127.648 -111.797 -7.199 +v -127.866 -111.22 -7.16 +v -127.345 -112.375 -6.833 +v -127.336 -112.37 -7.241 +v -127.554 -111.754 -7.395 +v -127.767 -111.19 -7.356 +v -127.91 -110.56 -7.315 +v -127.727 -110.534 -7.487 +v -127.387 -111.678 -7.568 +v -127.25 -112.314 -7.438 +v -126.943 -112.895 -7.285 +v -126.865 -112.827 -7.482 +v -126.726 -112.706 -7.654 +v -127.213 -111.598 -7.643 +v -127.538 -110.505 -7.562 +v -126.288 -113.14 -7.7 +v -126.58 -112.58 -7.73 +v -126.408 -113.28 -7.527 +v -126.475 -113.358 -7.33 +v -125.89 -113.664 -7.574 +v -125.945 -113.75 -7.377 +v -125.69 -113.347 -7.821 +v -125.256 -113.797 -7.792 +v -125.374 -114.06 -7.424 +v -125.332 -113.965 -7.62 +v -125.95 -113.76 -6.97 +v -124.76 -114.285 -7.472 +v -125.378 -114.068 -7.016 +v -124.733 -114.186 -7.668 +v -124.12 -114.42 -7.52 +v -124.764 -114.295 -7.064 +v -124.732 -114.18 -6.83 +v -125.33 -113.96 -6.782 +v -124.104 -114.314 -6.88 +v -124.12 -114.43 -7.113 +v -124.68 -114.005 -6.66 +v -125.888 -113.66 -6.735 +v -123.464 -114.17 -6.76 +v -123.466 -113.996 -6.69 +v -123.463 -114.354 -6.93 +v -123.462 -114.472 -7.164 +v -122.66 -114.395 -7.227 +v -122.065 -114.118 -7.045 +v -122.124 -113.944 -6.876 +v -122.748 -113.927 -6.753 +v -121.558 -113.704 -6.93 +v -122.027 -114.23 -7.28 +v -121.475 -113.868 -7.099 +v -120.926 -113.536 -7.154 +v -120.56 -113 -7.04 +v -121.133 -113.244 -6.915 +v -121.42 -113.973 -7.333 +v -122.03 -114.22 -7.687 +v -121.426 -113.964 -7.74 +v -120.858 -113.632 -7.388 +v -120.864 -113.623 -7.796 +v -122.064 -114.122 -7.884 +v -121.473 -113.872 -7.937 +v -120.152 -113.054 -7.67 +v -120.924 -113.54 -7.992 +v -120.36 -113.21 -7.851 +v -122.715 -114.102 -8.003 +v -121.03 -113.39 -8.164 +v -122.68 -114.283 -7.831 +v -123.466 -113.983 -8.016 +v -122.185 -113.766 -8.131 +v -124.08 -114.136 -7.89 +v -124.63 -113.825 -7.916 +v -124.105 -114.318 -7.717 +v -123.462 -114.462 -7.571 +v -122.656 -114.42 -7.432 +v -121.14 -113.233 -8.24 +v -120.388 -112.832 -8.242 +v -120.254 -112.958 -8.07 +v -120.66 -112.576 -8.315 +v -119.858 -111.75 -8.432 +v -119.688 -111.837 -8.357 +v -119.85 -112.463 -8.127 +v -119.766 -112.523 -7.93 +v -119.524 -111.92 -8.185 +v -119.432 -111.967 -7.988 +v -119.452 -111.278 -8.415 +v -119.278 -111.337 -8.243 +v -119.18 -111.37 -8.046 +v -119.805 -111.158 -8.488 +v -119.602 -110.085 -8.603 +v -119.42 -110.094 -8.605 +v -119.704 -108.992 -8.719 +v -119.528 -108.95 -8.721 +v -120.378 -107.56 -8.886 +v -120.233 -107.45 -8.888 +v -121.153 -106.782 -9.002 +v -120.172 -113.036 -7.465 +v -119.758 -112.528 -7.523 +v -120.434 -113.132 -7.21 +v -119.854 -112.46 -7.288 +v -119.423 -111.97 -7.58 +v -119.528 -111.918 -7.346 +v -120.005 -112.355 -7.12 +v -119.456 -111.276 -7.235 +v -120.518 -112.71 -6.992 +v -119.17 -111.373 -7.638 +v -123.467 -113.81 -6.689 +v -122.24 -113.604 -6.804 +v -126.405 -113.277 -6.689 +v -126.86 -112.824 -6.643 +v -126.95 -112.9 -6.878 +v -126.482 -113.366 -6.923 +v -127.544 -109.33 -7.483 +v -127.96 -109.92 -7.275 +v -127.733 -109.303 -7.408 +v -127.916 -109.277 -7.236 +v -128.063 -109.92 -7.078 +v -127.78 -108.658 -7.199 +v -128.018 -109.263 -7.04 +v -127.88 -108.63 -7.002 +v -127.65 -108.01 -6.965 +v -127.557 -108.053 -7.162 +v -127.56 -109.465 -15.017 +v -127.38 -109.485 -15.015 +v -127.226 -111.06 -15.182 +v -127.026 -107.84 -14.844 +v -127.4 -111.114 -15.184 +v -126.87 -107.93 -14.842 +v -125.867 -106.572 -14.67 +v -125.762 -106.72 -14.668 +v -124.846 -106.045 -14.555 +v -124.786 -106.216 -14.552 +v -123.204 -105.827 -14.388 +v -123.217 -106.008 -14.385 +v -121.56 -106.306 -14.214 +v -121.647 -106.465 -14.212 +v -120.255 -107.42 -14.04 +v -120.103 -107.305 -13.965 +v -119.693 -108.423 -13.925 +v -120.505 -106.85 -14.024 +v -121.47 -106.137 -14.14 +v -119.515 -108.354 -13.85 +v -119.42 -110.057 -13.758 +v -119.247 -109.46 -13.74 +v -119.343 -108.287 -13.678 +v -119.61 -107.72 -13.735 +v -119.228 -110.064 -13.682 +v -119.064 -109.44 -13.568 +v -119.074 -108.792 -13.43 +v -119.52 -107.67 -13.538 +v -119.956 -107.193 -13.793 +v -119.874 -107.13 -13.597 +v -119.237 -108.246 -13.073 +v -119.51 -107.665 -13.13 +v -120.304 -106.645 -13.655 +v -120.297 -106.638 -13.247 +v -119.866 -107.124 -13.189 +v -120.376 -106.72 -13.851 +v -120.853 -106.31 -13.91 +v -120.792 -106.228 -13.712 +v -121.333 -105.884 -13.77 +v -120.786 -106.22 -13.305 +v -121.382 -105.975 -13.967 +v -121.915 -105.622 -13.828 +v -121.33 -105.876 -13.362 +v -120.856 -106.315 -13.07 +v -121.385 -105.98 -13.128 +v -121.952 -105.723 -13.186 +v -121.91 -105.612 -13.42 +v -121.472 -106.14 -12.96 +v -120.38 -106.722 -13.013 +v -120.508 -106.853 -12.844 +v -119.96 -107.196 -12.955 +v -119.774 -107.813 -12.728 +v -120.244 -107.413 -12.716 +v -121.554 -106.294 -12.89 +v -122.597 -105.726 -13.075 +v -122.558 -105.546 -13.244 +v -123.177 -105.457 -13.301 +v -124.395 -105.724 -13.249 +v -123.203 -105.814 -13.062 +v -122.533 -105.43 -13.478 +v -122.535 -105.44 -13.886 +v -123.17 -105.35 -13.943 +v -123.17 -105.34 -13.535 +v -121.95 -105.72 -14.024 +v -122.557 -105.542 -14.082 +v -123.177 -105.452 -14.14 +v -123.814 -105.348 -14.001 +v -123.807 -105.456 -13.36 +v -123.815 -105.338 -13.593 +v -123.807 -105.45 -14.198 +v -124.456 -105.44 -14.06 +v -124.458 -105.43 -13.652 +v -123.19 -105.636 -14.312 +v -123.794 -105.635 -14.37 +v -124.97 -105.69 -14.307 +v -125.593 -105.845 -14.168 +v -125.007 -105.583 -13.703 +v -124.434 -105.545 -13.418 +v -125.543 -105.94 -13.526 +v -125.46 -106.105 -13.357 +v -125.597 -105.837 -13.76 +v -126.082 -106.27 -13.584 +v -126.443 -106.806 -13.474 +v -124.85 -106.032 -13.23 +v -125.875 -106.56 -13.345 +v -126.57 -106.672 -13.642 +v -126.993 -107.135 -13.7 +v -127.188 -107.745 -13.59 +v -126.15 -106.174 -13.818 +v -126.65 -106.587 -13.877 +v -127.085 -107.062 -13.934 +v -127.346 -107.652 -13.758 +v -127.448 -107.593 -13.992 +v -126.144 -106.182 -14.226 +v -125.545 -105.937 -14.365 +v -126.085 -106.266 -14.423 +v -126.644 -106.594 -14.284 +v -124.91 -105.864 -14.48 +v -125.978 -106.416 -14.595 +v -126.573 -106.67 -14.48 +v -127.077 -107.068 -14.342 +v -126.996 -107.132 -14.539 +v -127.44 -107.598 -14.4 +v -126.446 -106.803 -14.653 +v -127.19 -107.743 -14.769 +v -127.35 -107.65 -14.596 +v -127.722 -108.17 -14.457 +v -127.626 -108.21 -14.654 +v -127.73 -108.166 -14.05 +v -127.456 -108.28 -14.826 +v -127.823 -108.81 -14.712 +v -127.75 -109.445 -14.942 +v -122.015 -105.89 -14.196 +v -120.39 -107.525 -12.714 +v -119.853 -108.485 -12.598 +v -119.68 -108.418 -12.6 +v -119.59 -110.05 -12.43 +v -119.406 -110.057 -12.432 +v -119.782 -110.043 -12.508 +v -119.996 -111.64 -12.258 +v -119.83 -111.72 -12.26 +v -120.167 -111.554 -12.335 +v -121.02 -112.926 -12.084 +v -120.903 -113.07 -12.086 +v -121.142 -112.778 -12.161 +v -121.962 -113.496 -11.968 +v -121.89 -113.667 -11.97 +v -122.037 -113.32 -12.046 +v -123.516 -113.812 -11.8 +v -122.11 -113.152 -12.22 +v -121.667 -112.925 -12.277 +v -123.516 -113.62 -11.878 +v -125.118 -113.462 -11.628 +v -123.515 -113.437 -12.052 +v -123.016 -113.404 -12.11 +v -124.01 -113.4 -11.995 +v -125.04 -113.287 -11.705 +v -126.44 -112.48 -11.454 +v -126.295 -112.355 -11.532 +v -127.042 -111.56 -11.339 +v -126.868 -111.48 -11.416 +v -127.41 -110.017 -11.171 +v -126.702 -111.4 -11.59 +v -127.22 -110.01 -11.249 +v -126.46 -111.835 -11.648 +v -126.985 -110.503 -11.48 +v -126.055 -112.143 -12.118 +v -126.346 -111.76 -12.06 +v -127.036 -110.006 -11.422 +v -127.015 -109.51 -11.365 +v -126.938 -108.477 -11.076 +v -126.734 -110.95 -11.95 +v -126.614 -111.36 -12.23 +v -126.084 -112.17 -12.345 +v -125.71 -112.482 -12.176 +v -126.166 -112.24 -12.544 +v -125.807 -112.595 -12.602 +v -126.712 -111.406 -12.428 +v -126.996 -110.505 -12.319 +v -127.046 -110.006 -12.26 +v -126.624 -111.942 -12.653 +v -127.05 -111.05 -12.544 +v -125.927 -112.735 -12.77 +v -127.033 -111.556 -12.664 +v -126.432 -112.475 -12.78 +v -127.4 -110.017 -12.496 +v -127.21 -109.488 -12.37 +v -127.582 -110.022 -12.499 +v -127.197 -111.633 -12.666 +v -126.568 -112.595 -12.782 +v -125.114 -113.453 -12.953 +v -125.19 -113.618 -12.955 +v -123.516 -113.803 -13.126 +v -123.517 -113.984 -13.128 +v -125.044 -113.298 -12.885 +v -124.038 -113.593 -13 +v -124.968 -113.13 -12.717 +v -124.503 -113.303 -12.775 +v -123.515 -113.448 -12.89 +v -122.47 -113.487 -13.174 +v -121.965 -113.488 -13.293 +v -123.015 -113.414 -12.948 +v -122.105 -113.16 -13.058 +v -121.566 -113.092 -13.283 +v -121.026 -112.92 -13.409 +v -121.25 -112.644 -13.174 +v -120.75 -112.422 -13.4 +v -122.147 -113.062 -12.86 +v -121.32 -112.56 -12.975 +v -121.738 -112.808 -12.69 +v -122.562 -113.168 -12.58 +v -120.886 -112.297 -13.232 +v -120.995 -112.198 -12.806 +v -121.345 -112.53 -12.747 +v -120.42 -111.43 -13.148 +v -120.322 -111.477 -13.347 +v -120.454 -111.41 -12.92 +v -120.156 -111.56 -13.514 +v -120.004 -111.635 -13.582 +v -123.035 -113.268 -12.522 +v -123.99 -113.264 -12.407 +v -124.5 -113.293 -11.936 +v -124.963 -113.12 -11.88 +v -124.906 -112.995 -12.291 +v -124.472 -113.2 -12.576 +v -124.923 -113.032 -12.519 +v -125.4 -112.883 -11.821 +v -125.8 -112.587 -11.764 +v -126.158 -112.234 -11.706 +v -121.258 -112.636 -12.335 +v -120.893 -112.29 -12.393 +v -120.584 -111.9 -12.45 +v -120.33 -111.472 -12.509 +v -120.143 -111.015 -12.566 +v -120.155 -110.505 -13.036 +v -127.274 -108.338 -12.326 +v -126.298 -106.925 -12.152 +v -127.106 -108.408 -12.323 +v -126.174 -107.057 -12.15 +v -125.358 -106.264 -12.036 +v -125.648 -106.847 -12.024 +v -126.416 -107.57 -12.14 +v -125.276 -106.425 -12.034 +v -123.762 -105.825 -11.87 +v -123.75 -106.005 -11.866 +v -122.068 -106.075 -11.696 +v -122.132 -106.245 -11.694 +v -120.623 -107.002 -11.522 +v -120.488 -106.866 -11.447 +v -119.93 -107.918 -11.407 +v -120.948 -106.47 -11.505 +v -122 -105.896 -11.62 +v -119.762 -107.826 -11.331 +v -119.436 -109.5 -11.24 +v -119.347 -108.885 -11.222 +v -119.6 -107.736 -11.16 +v -119.942 -107.21 -11.217 +v -119.245 -109.48 -11.164 +v -119.628 -111.2 -11.066 +v -119.168 -108.84 -11.05 +v -119.267 -108.2 -10.911 +v -119.86 -107.15 -11.02 +v -120.358 -106.736 -11.275 +v -120.285 -106.662 -11.078 +v -119.852 -107.143 -10.612 +v -119.502 -107.68 -10.555 +v -120.278 -106.655 -10.67 +v -120.77 -106.232 -10.729 +v -120.777 -106.24 -11.136 +v -120.838 -106.323 -11.333 +v -121.366 -105.984 -11.39 +v -121.317 -105.894 -11.194 +v -121.312 -105.885 -10.786 +v -121.9 -105.627 -11.252 +v -121.937 -105.723 -11.448 +v -121.897 -105.617 -10.844 +v -122.512 -105.446 -11.31 +v -121.37 -105.988 -10.552 +v -121.938 -105.728 -10.61 +v -122.51 -105.436 -10.901 +v -122.536 -105.55 -10.667 +v -122.003 -105.9 -10.44 +v -120.84 -106.326 -10.494 +v -120.95 -106.474 -10.326 +v -120.36 -106.74 -10.436 +v -120.093 -107.325 -10.21 +v -120.613 -106.993 -10.197 +v -122.064 -106.063 -10.37 +v -123.174 -105.642 -10.556 +v -123.16 -105.46 -10.725 +v -123.785 -105.454 -10.783 +v -124.955 -105.885 -10.73 +v -123.762 -105.81 -10.544 +v -123.15 -105.34 -10.96 +v -123.152 -105.35 -11.367 +v -123.792 -105.347 -11.425 +v -123.793 -105.337 -11.017 +v -122.535 -105.547 -11.506 +v -123.16 -105.454 -11.564 +v -123.786 -105.45 -11.621 +v -124.43 -105.433 -11.483 +v -124.41 -105.54 -10.84 +v -124.433 -105.423 -11.075 +v -124.41 -105.534 -11.68 +v -125.055 -105.61 -11.54 +v -125.058 -105.602 -11.133 +v -123.774 -105.634 -11.794 +v -124.372 -105.715 -11.852 +v -125.53 -105.93 -11.789 +v -126.125 -106.168 -11.65 +v -125.58 -105.83 -11.184 +v -125.018 -105.712 -10.9 +v -126.063 -106.256 -11.008 +v -125.957 -106.407 -10.839 +v -126.13 -106.16 -11.242 +v -126.552 -106.655 -11.066 +v -126.837 -107.235 -10.955 +v -125.365 -106.252 -10.71 +v -126.307 -106.916 -10.827 +v -126.633 -106.57 -11.3 +v -126.98 -107.12 -11.124 +v -127.337 -107.636 -11.182 +v -127.073 -107.047 -11.358 +v -127.438 -107.576 -11.416 +v -126.626 -106.577 -11.708 +v -126.066 -106.253 -11.846 +v -126.555 -106.652 -11.904 +v -127.065 -107.053 -11.766 +v -125.446 -106.094 -11.96 +v -126.43 -106.786 -12.077 +v -126.84 -107.233 -12.135 +v -126.984 -107.118 -11.962 +v -127.34 -107.634 -12.02 +v -127.43 -107.58 -11.824 +v -127.45 -108.265 -12.25 +v -127.64 -108.832 -12.308 +v -127.62 -108.195 -12.078 +v -127.818 -108.786 -12.135 +v -127.716 -108.155 -11.881 +v -127.725 -108.152 -11.474 +v -127.773 -110.028 -12.423 +v -122.574 -105.726 -11.678 +v -120.744 -107.124 -10.195 +v -120.08 -108.002 -10.08 +v -119.918 -107.912 -10.081 +v -119.607 -109.516 -9.912 +v -119.423 -109.498 -9.914 +v -119.792 -111.146 -9.74 +v -119.616 -111.205 -9.741 +v -120.632 -112.56 -9.566 +v -119.973 -111.085 -9.817 +v -120.496 -112.686 -9.568 +v -120.772 -112.43 -9.643 +v -121.486 -113.253 -9.45 +v -121.39 -113.412 -9.452 +v -121.585 -113.09 -9.527 +v -122.984 -113.778 -9.283 +v -122.96 -113.96 -9.285 +v -124.618 -113.65 -9.11 +v -123.01 -113.588 -9.36 +v -124.564 -113.465 -9.187 +v -126.06 -112.858 -8.936 +v -125.935 -112.713 -9.013 +v -126.783 -112.027 -8.82 +v -126.622 -111.923 -8.898 +v -127.358 -110.548 -8.653 +v -127.17 -110.517 -8.73 +v -126.468 -111.823 -9.072 +v -126.17 -112.22 -9.13 +v -127.285 -108.91 -8.48 +v -127.036 -109.992 -8.847 +v -127.1 -108.96 -8.557 +v -126.988 -110.486 -8.904 +v -126.87 -110.972 -8.962 +v -126.74 -110.93 -9.374 +v -126.898 -109.988 -9.259 +v -127.013 -109.49 -8.789 +v -126.922 -109.005 -8.731 +v -126.79 -109.04 -9.143 +v -126.763 -108.534 -8.673 +v -127 -110.488 -9.742 +v -126.56 -111.38 -9.433 +v -127.024 -109.49 -9.627 +v -126.386 -111.77 -9.711 +v -126.86 -111.524 -10.026 +v -126.88 -110.975 -9.8 +v -127.23 -109.997 -9.852 +v -126.477 -111.83 -9.91 +v -125.75 -112.5 -9.827 +v -126.066 -112.13 -9.541 +v -126.317 -112.35 -10.135 +v -125.822 -112.582 -10.025 +v -125.418 -112.884 -10.084 +v -125.725 -112.47 -9.6 +v -125.338 -112.76 -9.658 +v -125.815 -112.574 -9.187 +v -125.413 -112.875 -9.245 +v -124.977 -113.114 -9.303 +v -124.472 -113.158 -9.773 +v -124.51 -113.29 -9.36 +v -124.028 -113.397 -9.418 +v -123.53 -113.437 -9.476 +v -123.528 -113.3 -9.888 +v -124.014 -113.3 -10.058 +v -124.483 -113.196 -10 +v -122.58 -113.173 -10.004 +v -124.03 -113.408 -10.256 +v -123.033 -113.406 -9.534 +v -123.032 -113.417 -10.372 +v -122.126 -113.01 -10.062 +v -124.514 -113.3 -10.2 +v -124.567 -113.477 -10.366 +v -123.53 -113.632 -10.482 +v -125.518 -113.04 -10.25 +v -124.616 -113.64 -10.434 +v -122.985 -113.768 -10.607 +v -121.992 -113.314 -10.656 +v -126.054 -112.85 -10.26 +v -126.927 -112.12 -10.148 +v -126.775 -112.022 -10.145 +v -126.173 -112.988 -10.263 +v -127.527 -110.577 -9.98 +v -127.35 -110.547 -9.978 +v -127.276 -108.913 -9.805 +v -127.11 -108.956 -9.737 +v -126.536 -107.448 -9.631 +v -126.706 -107.99 -9.621 +v -126.932 -109.003 -9.57 +v -126.916 -109.503 -9.428 +v -126.547 -108.085 -9.454 +v -126.828 -109.03 -9.37 +v -126.043 -107.168 -9.505 +v -125.836 -106.55 -9.518 +v -126.677 -107.334 -9.634 +v -125.733 -106.7 -9.516 +v -124.314 -105.898 -9.35 +v -124.278 -106.076 -9.348 +v -122.602 -105.916 -9.178 +v -122.642 -106.093 -9.175 +v -121.044 -106.637 -9.004 +v -120.93 -106.484 -8.929 +v -121.44 -106.155 -8.987 +v -122.56 -105.73 -9.102 +v -120.08 -107.336 -8.813 +v -119.524 -108.33 -8.704 +v -119.932 -107.226 -8.64 +v -120.342 -106.752 -8.698 +v -119.342 -108.905 -8.646 +v -119.352 -108.26 -8.531 +v -119.537 -107.64 -8.393 +v -120.268 -106.68 -8.502 +v -120.818 -106.337 -8.756 +v -120.756 -106.255 -8.56 +v -120.26 -106.672 -8.094 +v -119.842 -107.158 -8.036 +v -120.75 -106.247 -8.152 +v -121.296 -105.894 -8.21 +v -121.3 -105.903 -8.618 +v -121.35 -105.994 -8.815 +v -121.92 -105.73 -8.872 +v -121.883 -105.634 -8.676 +v -121.88 -105.625 -8.268 +v -122.497 -105.45 -8.733 +v -122.52 -105.55 -8.93 +v -122.495 -105.44 -8.326 +v -123.128 -105.353 -8.79 +v -121.92 -105.735 -8.034 +v -122.52 -105.554 -8.091 +v -123.127 -105.343 -8.383 +v -123.137 -105.46 -8.149 +v -123.774 -105.346 -8.849 +v -123.136 -105.456 -8.987 +v -123.15 -105.64 -9.16 +v -123.768 -105.45 -9.045 +v -123.775 -105.336 -8.441 +v -124.41 -105.43 -8.906 +v -123.768 -105.454 -8.207 +v -124.41 -105.42 -8.499 +v -124.388 -105.535 -8.264 +v -124.39 -105.53 -9.103 +v -125.03 -105.602 -8.964 +v -124.352 -105.71 -9.275 +v -124.996 -105.7 -9.16 +v -125.034 -105.592 -8.557 +v -125.624 -105.863 -9.023 +v -125.63 -105.854 -8.615 +v -124.934 -105.872 -9.333 +v -126.05 -106.243 -9.27 +v -126.61 -106.56 -9.131 +v -126.116 -106.15 -8.666 +v -125.574 -105.958 -8.38 +v -124.994 -105.703 -8.322 +v -126.536 -106.64 -8.49 +v -125.49 -106.12 -8.212 +v -126.41 -106.774 -8.32 +v -126.616 -106.553 -8.724 +v -126.966 -107.1 -8.547 +v -127.17 -107.714 -8.437 +v -125.844 -106.54 -8.193 +v -127.057 -107.027 -8.782 +v -127.327 -107.62 -8.606 +v -127.428 -107.56 -8.84 +v -123.757 -105.637 -8.038 +v -124.317 -105.885 -8.025 +v -122.56 -105.733 -7.923 +v -121.44 -106.16 -7.807 +v -122.6 -105.903 -7.852 +v -121.352 -105.998 -7.976 +v -120.82 -106.34 -7.918 +v -120.345 -106.755 -7.86 +v -120.475 -106.885 -7.69 +v -119.63 -107.692 -7.751 +v -119.79 -107.784 -7.582 +v -120.222 -107.443 -7.563 +v -121.036 -106.627 -7.679 +v -119.346 -108.906 -7.466 +v -119.357 -108.263 -7.693 +v -119.515 -108.947 -7.396 +v -119.234 -110.103 -7.35 +v -119.065 -109.48 -7.577 +v -119.167 -108.863 -7.635 +v -119.053 -108.836 -7.87 +v -119.247 -108.22 -7.927 +v -118.948 -109.47 -7.811 +v -119.05 -110.112 -7.52 +v -118.933 -110.117 -7.753 +v -118.943 -110.117 -8.161 +v -119.063 -108.838 -8.277 +v -118.958 -109.47 -8.22 +v -119.007 -110.752 -7.696 +v -119.123 -110.73 -7.462 +v -119.017 -110.75 -8.104 +v -119.282 -111.336 -7.404 +v -119.408 -110.095 -7.28 +v -119.62 -111.22 -7.165 +v -119.06 -109.48 -8.416 +v -119.163 -108.862 -8.473 +v -119.256 -108.224 -8.335 +v -119.046 -110.112 -8.358 +v -119.118 -110.73 -8.3 +v -119.23 -110.103 -8.53 +v -119.53 -107.634 -7.985 +v -127.05 -107.033 -9.19 +v -126.54 -106.636 -9.328 +v -126.97 -107.098 -9.386 +v -127.42 -107.565 -9.248 +v -125.946 -106.394 -9.443 +v -126.826 -107.214 -9.558 +v -127.172 -107.712 -9.616 +v -127.33 -107.618 -9.444 +v -127.613 -108.178 -9.502 +v -127.708 -108.138 -9.305 +v -127.636 -108.818 -9.732 +v -127.45 -108.867 -9.807 +v -127.746 -109.406 -9.79 +v -127.815 -108.772 -9.56 +v -127.716 -110.61 -9.905 +v -127.718 -108.134 -8.898 +v -126.42 -108.16 -9.028 +v -124.667 -113.814 -10.437 +v -122.54 -113.316 -10.43 +v -121.674 -112.94 -10.54 +v -121.15 -112.8 -10.764 +v -121.49 -113.245 -10.775 +v -121.73 -112.848 -10.34 +v -120.978 -112.24 -10.456 +v -120.9 -112.312 -10.655 +v -121.36 -112.54 -10.17 +v -122.544 -113.306 -9.592 +v -121.007 -112.212 -10.229 +v -121.68 -112.932 -9.701 +v -120.705 -111.835 -10.287 +v -120.584 -111.92 -10.713 +v -120.432 -112.024 -10.88 +v -120.24 -110.995 -10.63 +v -120.137 -111.03 -10.829 +v -120.277 -110.983 -10.402 +v -120.638 -112.554 -10.89 +v -119.8 -111.143 -11.064 +v -121.272 -112.648 -9.759 +v -120.906 -112.305 -9.817 +v -120.592 -111.913 -9.875 +v -120.338 -111.485 -9.933 +v -120.147 -111.026 -9.99 +v -119.537 -108.308 -10.1 +v -119.367 -108.24 -10.27 +v -119.946 -107.214 -10.378 +v -119.233 -110.08 -9.927 +v -119.067 -109.463 -10.153 +v -119.172 -108.843 -10.211 +v -119.45 -111.26 -9.811 +v -119.12 -110.715 -10.038 +v -119.05 -110.088 -10.096 +v -118.932 -110.093 -10.33 +v -118.95 -109.452 -10.387 +v -119.058 -108.815 -10.445 +v -119.068 -108.817 -10.853 +v -118.96 -109.452 -10.795 +v -119.257 -108.196 -10.504 +v -119.062 -109.463 -10.992 +v -118.942 -110.093 -10.738 +v -119.045 -110.09 -10.934 +v -119.116 -110.716 -10.876 +v -119.297 -110.683 -11.048 +v -119.015 -110.735 -10.68 +v -119.272 -111.32 -10.819 +v -119.447 -111.26 -10.99 +v -119.175 -111.353 -10.622 +v -119.005 -110.737 -10.272 +v -119.165 -111.356 -10.214 +v -119.277 -111.318 -9.98 +v -119.518 -111.897 -9.923 +v -119.413 -111.95 -10.157 +v -119.99 -112.33 -9.696 +v -119.422 -111.945 -10.564 +v -126.95 -108.473 -12.255 +v -126.778 -108.544 -12.088 +v -126.272 -107.687 -11.972 +v -126.935 -109.014 -12.145 +v -126.85 -110.48 -11.893 +v -126.83 -109.04 -11.946 +v -126.88 -109.525 -11.777 +v -126.678 -108.585 -11.89 +v -126.642 -108.6 -11.662 +v -126.925 -109.017 -11.307 +v -126.77 -108.547 -11.25 +v -119.357 -108.863 -12.62 +v -119.18 -108.818 -12.788 +v -119.613 -107.723 -12.897 +v -119.298 -110.66 -12.445 +v -119.048 -110.07 -12.672 +v -119.07 -109.442 -12.73 +v -119.674 -111.8 -12.33 +v -119.272 -111.304 -12.556 +v -119.117 -110.693 -12.614 +v -119 -110.714 -12.848 +v -118.93 -110.075 -12.906 +v -118.952 -109.43 -12.964 +v -118.94 -110.075 -13.314 +v -119.16 -111.34 -12.79 +v -119.17 -111.338 -13.198 +v -119.01 -110.712 -13.256 +v -118.96 -109.43 -13.372 +v -119.065 -108.79 -13.022 +v -119.044 -110.07 -13.51 +v -119.112 -110.693 -13.452 +v -119.268 -111.306 -13.394 +v -119.443 -111.248 -13.567 +v -119.51 -111.88 -12.499 +v -119.404 -111.933 -12.733 +v -119.413 -111.928 -13.14 +v -126.756 -112.052 -15.298 +v -126.907 -112.152 -15.3 +v -127.174 -110.557 -15.063 +v -126.873 -111.498 -15.172 +v -126.29 -112.378 -15.288 +v -125.583 -113.2 -15.471 +v -125.68 -113.354 -15.474 +v -124.048 -113.764 -15.644 +v -124.073 -113.943 -15.647 +v -122.468 -113.663 -15.812 +v -122.018 -113.326 -15.801 +v -121.46 -113.227 -15.927 +v -122.97 -113.594 -15.692 +v -122.562 -113.32 -15.576 +v -121.118 -112.773 -15.918 +v -121.646 -112.925 -15.692 +v -120.566 -111.895 -15.865 +v -121.236 -112.63 -15.75 +v -121.702 -112.832 -15.493 +v -120.656 -111.834 -15.667 +v -121.33 -112.517 -15.324 +v -120.414 -111.42 -15.724 +v -120.69 -111.812 -15.44 +v -121.723 -112.8 -15.266 +v -122.15 -113.02 -15.208 +v -122.096 -113.147 -14.796 +v -122.565 -113.31 -14.738 +v -123.498 -113.437 -14.628 +v -123.016 -113.265 -15.099 +v -122.59 -113.217 -15.377 +v -124.022 -113.584 -14.397 +v -122.516 -113.488 -14.564 +v -123.996 -113.402 -14.57 +v -123.998 -113.413 -15.409 +v -123.498 -113.3 -15.04 +v -124.482 -113.298 -14.513 +v -124.957 -113.135 -15.293 +v -124.444 -113.166 -14.925 +v -124.952 -113.125 -14.455 +v -125.486 -113.046 -14.224 +v -124.912 -113.036 -15.094 +v -125.315 -112.775 -14.81 +v -125.388 -112.89 -14.398 +v -125.79 -112.597 -14.34 +v -126.604 -111.952 -14.05 +v -125.336 -112.81 -15.037 +v -126.042 -112.157 -14.694 +v -126.144 -112.25 -14.282 +v -125.394 -112.9 -15.236 +v -126.152 -112.255 -15.12 +v -125.492 -113.056 -15.403 +v -124.536 -113.485 -15.519 +v -126.46 -111.856 -15.062 +v -126.37 -111.797 -14.864 +v -126.887 -110.954 -14.947 +v -127.046 -110.023 -14.837 +v -126.784 -110.922 -14.748 +v -126.573 -111.355 -14.578 +v -126.336 -111.775 -14.636 +v -127.027 -109.522 -14.78 +v -126.846 -110.5 -14.47 +v -127.12 -108.987 -14.89 +v -126.782 -108.555 -14.664 +v -126.898 -110.018 -14.411 +v -126.723 -108.016 -14.774 +v -126.563 -108.11 -14.606 +v -126.682 -108.596 -14.465 +v -126.796 -109.068 -14.296 +v -126.072 -107.196 -14.658 +v -126.47 -108.164 -14.408 +v -126.435 -108.184 -14.18 +v -127.035 -110.023 -13.999 +v -127.017 -109.524 -13.94 +v -126.877 -110.95 -14.108 +v -127.2 -109.504 -13.767 +v -126.93 -109.035 -13.883 +v -127.39 -109.484 -13.69 +v -127.052 -111.006 -13.934 +v -126.712 -108.023 -13.594 +v -126.697 -111.414 -14.166 +v -126.45 -111.85 -14.224 +v -127.235 -111.063 -13.857 +v -126.763 -112.057 -13.973 +v -125.588 -113.208 -14.146 +v -124.05 -113.773 -14.32 +v -122.466 -113.672 -14.487 +v -121.556 -113.072 -14.68 +v -121.36 -113.393 -14.604 +v -121.456 -113.235 -14.602 +v -122.417 -113.85 -14.489 +v -120.112 -112.204 -14.778 +v -120.265 -112.1 -14.776 +v -119.465 -110.613 -14.95 +v -120.423 -111.992 -14.853 +v -119.514 -108.952 -15.118 +v -119.936 -107.88 -15.234 +v -121.082 -106.592 -15.408 +v -120.326 -111.462 -15.084 +v -120.883 -112.28 -14.97 +v -120.575 -111.89 -15.027 +v -121.243 -112.623 -14.912 +v -121.65 -112.916 -14.854 +v -126.773 -108.56 -13.825 +v -123.498 -113.448 -15.467 +v -120.728 -112.4 -18.551 +v -121.228 -112.624 -18.326 +v -120.672 -111.86 -18.238 +v -121.937 -113.476 -18.445 +v -122.08 -113.15 -18.21 +v -121.297 -112.54 -18.127 +v -120.463 -111.428 -18.067 +v -120.975 -112.177 -17.958 +v -121.71 -112.79 -17.842 +v -122.122 -113.052 -18.011 +v -121.638 -112.907 -17.43 +v -122.083 -113.14 -17.372 +v -122.555 -113.31 -17.313 +v -122.138 -113.015 -17.784 +v -121.235 -112.616 -17.487 +v -122.01 -113.31 -17.198 +v -121.117 -112.757 -17.314 +v -123.042 -113.407 -17.256 +v -123.018 -113.59 -17.082 +v -122.592 -113.176 -17.726 +v -123.976 -113.405 -17.147 +v -124.515 -113.48 -16.916 +v -122.993 -113.778 -17.005 +v -125.896 -112.746 -16.742 +v -124.932 -113.134 -17.032 +v -124.465 -113.303 -17.09 +v -126.854 -111.51 -16.568 +v -127.17 -110.512 -16.453 +v -126.99 -110.482 -16.627 +v -126.873 -110.965 -16.684 +v -127.02 -109.54 -16.517 +v -126.565 -111.37 -17.154 +v -126.742 -110.923 -17.096 +v -126.69 -111.43 -16.742 +v -126.325 -111.79 -17.213 +v -126.6 -111.388 -17.382 +v -126.892 -110.465 -17.266 +v -126.897 -110.037 -16.988 +v -126.882 -109.554 -16.93 +v -127 -110.483 -17.465 +v -126.698 -111.435 -17.58 +v -126.448 -111.872 -17.639 +v -127.23 -110.05 -17.581 +v -127.06 -111.023 -17.69 +v -127.03 -109.54 -17.356 +v -126.602 -111.975 -17.806 +v -127.35 -110.542 -17.7 +v -127.018 -111.59 -17.816 +v -127.288 -108.96 -17.533 +v -126.013 -112.886 -17.99 +v -125.478 -113.065 -17.98 +v -124.565 -113.655 -18.163 +v -125.785 -112.614 -17.754 +v -125.38 -112.908 -17.812 +v -124.468 -113.313 -17.928 +v -124.518 -113.49 -18.095 +v -123.472 -113.632 -18.211 +v -122.994 -113.77 -18.33 +v -123.977 -113.416 -17.986 +v -124.438 -113.21 -17.73 +v -124.427 -113.17 -17.502 +v -125.302 -112.783 -17.386 +v -123.04 -113.417 -18.094 +v -123.475 -113.3 -17.618 +v -123.054 -113.31 -17.895 +v -125.375 -112.9 -16.974 +v -125.778 -112.606 -16.916 +v -126.135 -112.26 -16.858 +v -125.69 -112.5 -17.328 +v -125.715 -112.532 -17.556 +v -126.44 -111.867 -16.8 +v -121 -112.897 -18.56 +v -126.713 -107.378 -17.362 +v -125.392 -106.28 -17.189 +v -124.31 -105.897 -17.073 +v -122.652 -105.905 -16.906 +v -121.09 -106.603 -16.733 +v -120.976 -106.45 -16.657 +v -119.947 -107.886 -16.56 +v -119.78 -107.79 -16.484 +v -119.527 -108.955 -16.444 +v -120.118 -107.286 -16.542 +v -119.34 -108.91 -16.368 +v -119.478 -110.61 -16.276 +v -119.227 -110.043 -16.259 +v -119.162 -108.868 -16.196 +v -119.35 -108.27 -16.253 +v -119.29 -110.644 -16.2 +v -119.043 -110.05 -16.086 +v -118.965 -109.405 -15.948 +v -119.253 -108.233 -16.057 +v -119.62 -107.7 -16.312 +v -119.53 -107.65 -16.115 +v -119.052 -108.842 -15.592 +v -119.243 -108.23 -15.65 +v -118.94 -110.053 -15.89 +v -119.11 -110.676 -16.028 +v -119.26 -111.283 -15.97 +v -119.007 -110.694 -15.832 +v -119.163 -111.315 -15.774 +v -118.955 -109.404 -15.54 +v -119.072 -109.417 -15.306 +v -119.353 -108.272 -15.415 +v -118.93 -110.053 -15.482 +v -119.047 -110.05 -15.248 +v -119.255 -109.437 -15.137 +v -119.524 -108.34 -15.246 +v -119.625 -107.703 -15.473 +v -120.12 -107.29 -15.362 +v -119.522 -107.645 -15.707 +v -119.975 -107.176 -15.531 +v -119.882 -107.104 -15.766 +v -120.392 -106.71 -15.59 +v -120.317 -106.63 -16.23 +v -120.31 -106.624 -15.823 +v -119.89 -107.11 -16.173 +v -119.972 -107.174 -16.37 +v -120.807 -106.217 -16.289 +v -120.39 -106.705 -16.427 +v -120.8 -106.21 -15.88 +v -120.87 -106.304 -15.647 +v -121.347 -105.878 -16.346 +v -120.868 -106.3 -16.485 +v -121.396 -105.97 -16.542 +v -121.342 -105.87 -15.938 +v -121.937 -105.614 -16.404 +v -121.483 -106.13 -16.715 +v -121.973 -105.71 -16.6 +v -122.613 -105.718 -16.83 +v -122.574 -105.538 -16.658 +v -122.553 -105.437 -16.462 +v -121.934 -105.605 -15.996 +v -122.55 -105.427 -16.054 +v -123.19 -105.348 -16.52 +v -123.198 -105.45 -16.716 +v -123.19 -105.338 -16.112 +v -123.84 -105.34 -16.17 +v -123.84 -105.35 -16.578 +v -122.575 -105.542 -15.82 +v -123.2 -105.455 -15.878 +v -123.832 -105.458 -15.936 +v -124.405 -105.418 -16.221 +v -124.383 -105.53 -16.826 +v -125.02 -105.598 -16.686 +v -125.024 -105.59 -16.279 +v -124.985 -105.7 -16.045 +v -123.818 -105.64 -15.767 +v -124.924 -105.873 -15.876 +v -125.564 -105.952 -16.103 +v -125.614 -105.856 -16.745 +v -125.618 -105.848 -16.337 +v -124.987 -105.696 -16.883 +v -126.17 -106.19 -16.395 +v -125.566 -105.948 -16.941 +v -126.165 -106.197 -16.803 +v -126.102 -106.284 -16.16 +v -125.994 -106.434 -15.992 +v -126.584 -106.685 -16.219 +v -126.665 -106.6 -16.453 +v -127.004 -107.15 -16.276 +v -127.097 -107.076 -16.51 +v -123.21 -105.64 -15.709 +v -122.037 -105.888 -15.593 +v -120.98 -106.452 -15.478 +v -121.398 -105.973 -15.704 +v -121.974 -105.715 -15.762 +v -126.658 -106.607 -16.86 +v -127.09 -107.083 -16.918 +v -126.104 -106.28 -17 +v -126.587 -106.682 -17.057 +v -127.447 -107.61 -16.976 +v -127.008 -107.146 -17.115 +v -125.997 -106.43 -17.172 +v -126.863 -107.26 -17.287 +v -127.357 -107.663 -17.172 +v -127.198 -107.755 -17.344 +v -125.48 -106.11 -17.113 +v -124.346 -105.71 -16.998 +v -123.21 -105.634 -16.888 +v -119.44 -111.225 -14.964 +v -119.23 -110.043 -15.08 +v -119.113 -110.675 -15.19 +v -119.968 -112.302 -14.848 +v -119.503 -111.867 -15.074 +v -119.265 -111.282 -15.132 +v -119.154 -111.32 -15.367 +v -118.997 -110.696 -15.424 +v -119.397 -111.92 -15.308 +v -119.406 -111.914 -15.716 +v -126.943 -109.046 -17.298 +v -126.96 -108.503 -17.408 +v -121.933 -113.484 -17.12 +v -120.995 -112.904 -17.236 +v -120.442 -112.02 -17.424 +v -120.592 -111.915 -17.598 +v -120.284 -112.128 -17.347 +v -119.557 -108.786 -17.696 +v -120.018 -107.74 -17.798 +v -120.734 -106.877 -17.894 +v -126.998 -110.424 -6.486 +v -126.753 -110.884 -6.94 +v -127.037 -109.915 -6.446 +v -126.884 -110.924 -6.528 +v -127.18 -110.45 -6.312 +v -126.862 -110.404 -6.898 +v -126.36 -111.74 -7.022 +v -126.9 -110.41 -7.126 +v -127.002 -109.406 -6.407 +v -126.882 -111.447 -6.393 +v -126.896 -108.915 -6.37 +v -126.307 -112.342 -6.48 +v -126.474 -111.814 -6.61 +v -126.065 -112.13 -7.066 +v -126.17 -112.222 -6.653 +v -125.717 -112.477 -7.11 +v -125.494 -113.04 -6.571 +v -125.806 -112.58 -6.699 +v -125.322 -112.77 -7.157 +v -125.743 -112.507 -7.338 +v -126.095 -112.158 -7.293 +v -125.813 -112.59 -7.537 +v -124.45 -113.206 -7.48 +v -124.44 -113.167 -7.252 +v -125.396 -112.885 -6.745 +v -124.953 -113.124 -6.792 +v -124.478 -113.3 -6.84 +v -123.472 -113.3 -7.352 +v -123.47 -113.34 -7.58 +v -124.53 -113.476 -6.666 +v -123.47 -113.436 -6.94 +v -122.876 -113.242 -7.415 +v -122.85 -113.377 -7.003 +v -123.47 -113.62 -6.766 +v -122.302 -113.422 -6.881 +v -121.35 -112.936 -6.99 +v -122.36 -113.25 -7.055 +v -121.892 -113.05 -7.109 +v -121.24 -113.092 -6.913 +v -120.012 -111.672 -7.105 +v -120.792 -112.45 -7.068 +v -120.183 -111.585 -7.182 +v -119.593 -110.086 -7.278 +v -119.784 -110.077 -7.355 +v -119.696 -108.99 -7.394 +v -120.37 -107.554 -7.561 +v -120.925 -112.326 -7.241 +v -120.605 -111.933 -7.298 +v -121.456 -112.787 -7.164 +v -121.16 -112.367 -7.631 +v -121.954 -112.928 -7.521 +v -121 -112.256 -7.438 +v -120.468 -111.44 -7.768 +v -120.28 -110.996 -7.826 +v -120.15 -111.04 -7.414 +v -120.346 -111.502 -7.356 +v -120.718 -111.854 -7.71 +v -122.87 -113.28 -7.642 +v -122.357 -113.26 -7.893 +v -122.85 -113.387 -7.841 +v -123.47 -113.447 -7.778 +v -124.48 -113.31 -7.678 +v -124.532 -113.487 -7.845 +v -122.815 -113.57 -8.008 +v -123.47 -113.632 -7.945 +v -121.803 -113.224 -8.115 +v -125.103 -113.458 -7.865 +v -125.5 -113.05 -7.75 +v -126.445 -112.46 -7.727 +v -127.07 -110.98 -7.533 +v -126.725 -111.375 -7.405 +v -127.008 -110.426 -7.325 +v -127.233 -109.916 -7.452 +v -127.013 -109.404 -7.246 +v -126.94 -109.914 -7.086 +v -127.364 -109.355 -7.48 +v -126.895 -108.354 -7.34 +v -126.93 -107.688 -7.374 +v -127.05 -108.284 -7.407 +v -126.727 -108.43 -7.172 +v -126.31 -107.445 -7.268 +v -126.04 -106.936 -7.302 +v -126.157 -106.8 -7.305 +v -124.617 -105.972 -7.21 +v -125.1 -106.34 -7.239 +v -123.443 -105.816 -7.153 +v -123.445 -105.998 -7.15 +v -122.29 -106 -7.1 +v -121.215 -106.514 -7.05 +v -121.108 -106.356 -6.975 +v -120.374 -107.27 -7.007 +v -120.227 -107.147 -6.931 +v -120.513 -107.387 -7.004 +v -121.022 -107.107 -6.959 +v -120.54 -106.563 -6.781 +v -119.578 -108.197 -6.89 +v -119.754 -108.273 -6.966 +v -120.086 -107.028 -6.76 +v -119.706 -107.555 -6.738 +v -119.416 -109.902 -6.916 +v -119.92 -108.345 -6.963 +v -119.224 -109.902 -6.84 +v -119.73 -111.765 -6.852 +v -119.597 -109.902 -6.913 +v -119.366 -111 -6.813 +v -119.977 -111.647 -6.863 +v -119.04 -109.902 -6.668 +v -119.41 -108.123 -6.718 +v -119.088 -109.245 -6.685 +v -119.188 -111.046 -6.64 +v -119.088 -111.072 -6.444 +v -119.432 -111.92 -6.48 +v -118.937 -109.902 -6.471 +v -118.986 -109.23 -6.488 +v -119.112 -108.645 -6.505 +v -119.618 -107.5 -6.541 +v -120.007 -106.96 -6.563 +v -120.47 -106.486 -6.585 +v -120.947 -106.118 -6.606 +v -121.514 -105.75 -6.427 +v -121.005 -106.203 -6.802 +v -121.53 -105.785 -6.63 +v -121.574 -105.878 -6.827 +v -122.15 -105.542 -6.655 +v -122.138 -105.506 -6.453 +v -122.18 -105.64 -6.852 +v -122.795 -105.392 -6.682 +v -122.234 -105.816 -7.024 +v -122.81 -105.494 -6.878 +v -123.44 -105.625 -7.077 +v -123.436 -105.338 -6.708 +v -122.79 -105.355 -6.48 +v -123.438 -105.44 -6.905 +v -124.1 -105.377 -6.737 +v -123.436 -105.3 -6.506 +v -124.104 -105.34 -6.534 +v -124.75 -105.51 -6.766 +v -124.086 -105.48 -6.933 +v -124.062 -105.662 -7.106 +v -124.72 -105.61 -6.963 +v -125.253 -106 -7.166 +v -125.37 -105.738 -6.797 +v -125.33 -105.833 -6.994 +v -126.282 -106.653 -7.23 +v -125.897 -106.14 -7.025 +v -126.86 -106.967 -7.09 +v -126.402 -106.513 -7.057 +v -126.72 -107.088 -7.263 +v -126.47 -106.435 -6.86 +v -125.953 -106.052 -6.829 +v -125.386 -105.705 -6.594 +v -126.475 -106.427 -6.453 +v -126.937 -106.9 -6.894 +v -126.944 -106.893 -6.486 +v -127.333 -107.428 -6.93 +v -127.342 -107.423 -6.521 +v -127.247 -107.484 -7.126 +v -127.39 -108.13 -7.334 +v -126.802 -108.942 -7.01 +v -126.9 -109.914 -6.858 +v -126.866 -109.425 -6.82 +v -126.316 -112.35 -7.66 +v -124.957 -113.134 -7.63 +v -121.45 -112.795 -8.002 +v -120.93 -112.608 -8.225 +v -120.918 -112.333 -8.08 +v -120.996 -112.26 -7.88 +v -120.445 -112.046 -8.304 +v -120.597 -111.94 -8.137 +v -120.14 -111.043 -8.253 +v -120.243 -111.008 -8.054 +v -119.966 -111.103 -8.42 +v -120.23 -111.523 -6.74 +v -120.394 -111.44 -6.5 +v -126.877 -107.926 -13.517 +v -127.038 -107.832 -13.519 +v -127.574 -109.464 -13.692 +v -125.767 -106.712 -13.343 +v -127.64 -108.855 -13.704 +v -124.79 -106.207 -13.228 +v -123.217 -105.998 -13.06 +v -121.642 -106.457 -12.887 +v -121.733 -106.626 -12.964 +v -120.544 -107.64 -12.79 +v -120.032 -108.555 -12.675 +v -120.203 -108.62 -12.85 +v -120.414 -108.17 -12.907 +v -119.98 -109.536 -12.74 +v -120.798 -107.836 -13.377 +v -120.534 -108.238 -13.319 +v -120.69 -107.753 -12.965 +v -121.118 -107.474 -13.435 +v -120.767 -107.812 -13.604 +v -120.294 -108.656 -13.489 +v -120.202 -109.074 -13.21 +v -119.965 -110.036 -12.682 +v -120.02 -110.53 -12.624 +v -120.118 -109.55 -13.152 +v -119.955 -110.036 -13.52 +v -119.88 -108.994 -13.804 +v -119.97 -109.535 -13.578 +v -119.827 -110.564 -13.63 +v -120.133 -111.018 -13.404 +v -119.6 -110.05 -13.755 +v -120.236 -110.984 -13.206 +v -120.193 -108.617 -13.687 +v -119.862 -108.49 -13.923 +v -120.243 -108.076 -13.912 +v -120.68 -107.746 -13.803 +v -120.4 -107.53 -14.038 +v -120.885 -107.237 -14.029 +v -121.015 -107.37 -13.861 +v -121.867 -106.873 -13.778 +v -121.815 -106.778 -13.977 +v -121.728 -106.615 -14.144 +v -122.305 -106.675 -13.835 +v -122.268 -106.574 -14.034 +v -121.886 -106.908 -13.55 +v -121.022 -107.376 -13.023 +v -121.82 -106.787 -13.138 +v -122.78 -106.577 -13.666 +v -121.4 -107.054 -13.08 +v -122.752 -106.443 -13.254 +v -123.734 -106.508 -13.782 +v -122.27 -106.583 -13.196 +v -123.23 -106.19 -13.138 +v -124.726 -106.388 -13.305 +v -124.666 -106.56 -13.479 +v -125.656 -106.868 -13.42 +v -125.122 -106.757 -13.536 +v -125.55 -107.018 -13.594 +v -125.937 -107.337 -13.653 +v -126.273 -107.705 -13.71 +v -125.843 -107.437 -14.065 +v -126.554 -108.115 -13.768 +v -125.47 -107.13 -14.006 +v -125.494 -107.097 -14.234 +v -125.06 -106.88 -13.948 +v -123.744 -106.37 -13.37 +v -124.213 -106.576 -13.84 +v -124.634 -106.653 -14.118 +v -123.244 -106.372 -13.311 +v -123.243 -106.362 -14.15 +v -124.67 -106.55 -14.317 +v -123.744 -106.36 -14.208 +v -124.282 -106.25 -14.433 +v -122.71 -106.252 -14.26 +v -125.212 -106.583 -14.542 +v -125.556 -107.01 -14.433 +v -125.945 -107.33 -14.49 +v -127.622 -108.21 -13.815 +v -127.82 -108.81 -13.873 +v -127.93 -109.426 -13.93 +v -127.77 -110.048 -13.82 +v -127.933 -108.78 -14.107 +v -128.047 -109.413 -14.165 +v -127.952 -110.055 -13.989 +v -127.704 -110.652 -13.878 +v -127.412 -111.118 -13.86 +v -127.885 -110.684 -14.047 +v -127.36 -111.728 -13.987 +v -128.07 -110.06 -14.223 +v -128 -110.705 -14.281 +v -127.866 -111.26 -14.332 +v -127.526 -111.807 -14.156 +v -128.06 -110.06 -14.63 +v -127.99 -110.703 -14.69 +v -127.624 -111.853 -14.798 +v -127.633 -111.857 -14.39 +v -127.216 -112.357 -14.214 +v -127.315 -112.42 -14.448 +v -127.306 -112.416 -14.856 +v -127.53 -111.81 -14.994 +v -127.757 -111.225 -14.937 +v -127.22 -112.36 -15.052 +v -126.91 -112.93 -14.914 +v -126.92 -112.936 -14.506 +v -126.83 -112.858 -14.272 +v -126.452 -113.378 -14.972 +v -126.46 -113.386 -14.564 +v -126.383 -113.296 -14.33 +v -126.834 -112.86 -15.11 +v -127.066 -112.257 -15.225 +v -126.696 -112.74 -15.283 +v -126.386 -113.3 -15.168 +v -125.936 -113.758 -15.03 +v -125.782 -113.515 -15.398 +v -125.88 -113.67 -15.226 +v -125.255 -113.798 -15.456 +v -125.33 -113.966 -15.283 +v -125.373 -114.06 -15.087 +v -125.94 -113.767 -14.622 +v -125.377 -114.07 -14.679 +v -124.77 -114.292 -14.737 +v -124.767 -114.283 -15.145 +v -124.738 -114.184 -15.341 +v -124.14 -114.417 -15.202 +v -124.737 -114.18 -14.503 +v -124.125 -114.31 -14.56 +v -124.142 -114.427 -14.795 +v -125.33 -113.962 -14.445 +v -124.686 -114.003 -14.334 +v -123.497 -114.355 -14.618 +v -123.497 -114.17 -14.45 +v -123.497 -114.463 -15.26 +v -123.497 -114.473 -14.853 +v -122.866 -114.31 -14.677 +v -122.892 -114.127 -14.508 +v -124.075 -113.957 -14.321 +v -121.805 -113.82 -14.616 +v -125.687 -113.365 -14.148 +v -120.775 -113.188 -14.733 +v -121.172 -113.698 -14.844 +v -120.658 -113.33 -14.902 +v -120.204 -112.897 -14.96 +v -121.732 -113.99 -14.785 +v -121.685 -114.097 -15.02 +v -121.11 -113.798 -15.078 +v -120.582 -113.42 -15.136 +v -121.115 -113.79 -15.485 +v -122.29 -114.31 -14.962 +v -121.69 -114.088 -15.427 +v -121.73 -113.993 -15.624 +v -121.17 -113.702 -15.682 +v -120.59 -113.413 -15.544 +v -120.125 -112.97 -15.601 +v -120.117 -112.976 -15.194 +v -120.655 -113.333 -15.74 +v -121.266 -113.545 -15.854 +v -120.772 -113.19 -15.912 +v -120.2 -112.9 -15.798 +v -119.727 -112.466 -15.66 +v -119.965 -112.304 -16.028 +v -119.812 -112.408 -15.856 +v -121.366 -113.382 -15.93 +v -120.123 -112.197 -16.103 +v -119.664 -111.787 -16.085 +v -119.5 -111.87 -15.913 +v -122.42 -113.838 -15.814 +v -124.1 -114.133 -15.571 +v -123.497 -114.175 -15.63 +v -124.126 -114.315 -15.399 +v -123.497 -114.36 -15.457 +v -122.32 -114.2 -15.566 +v -122.85 -114.416 -15.319 +v -122.37 -114.023 -15.738 +v -122.85 -114.426 -14.91 +v -119.72 -112.472 -15.251 +v -119.816 -112.405 -15.017 +v -126.918 -112.16 -13.975 +v -126.693 -112.736 -14.103 +v -125.78 -113.512 -14.219 +v -125.878 -113.667 -14.388 +v -127.582 -111.17 -15.109 +v -127.773 -110.05 -15 +v -127.957 -110.055 -14.827 +v -127.934 -109.425 -14.77 +v -128.037 -109.414 -14.573 +v -127.923 -108.784 -14.515 +v -122.924 -106.212 -7.056 +v -122.45 -106.51 -6.862 +v -123.45 -106.353 -6.915 +v -121.888 -106.533 -7.004 +v -124.52 -106.31 -7.14 +v -121.515 -106.96 -6.812 +v -120.076 -108.413 -6.896 +v -120.784 -107.615 -6.77 +v -122.48 -106.614 -6.663 +v -120.867 -107.685 -6.57 +v -122.032 -106.833 -6.41 +v -120.246 -108.486 -6.728 +v -120.574 -108.09 -6.55 +v -121.243 -107.356 -6.365 +v -122.493 -106.652 -6.436 +v -119.99 -109.38 -6.695 +v -119.807 -109.352 -6.862 +v -119.952 -109.9 -6.678 +v -119.89 -110.86 -6.818 +v -120.06 -109.9 -6.479 +v -120.07 -110.812 -6.65 +v -120.174 -110.784 -6.452 +v -122.975 -106.54 -6.462 +v -123.947 -106.53 -6.517 +v -123.452 -106.46 -6.716 +v -124.43 -106.63 -6.547 +v -123.952 -106.49 -6.745 +v -125.328 -107.033 -6.61 +v -125.35 -107 -6.836 +v -123.966 -106.383 -6.943 +v -124.955 -106.664 -7.004 +v -125.506 -106.752 -7.203 +v -125.808 -107.206 -7.067 +v -126.06 -107.664 -6.675 +v -126.172 -107.567 -7.1 +v -126.09 -107.638 -6.902 +v -126.356 -108.058 -6.71 +v -126.593 -108.492 -6.746 +v -119.23 -109.9 -17.662 +v -119.282 -111.334 -17.701 +v -119.39 -108.74 -17.766 +v -119.046 -109.9 -17.83 +v -119.088 -109.287 -17.884 +v -119.87 -107.65 -17.868 +v -119.213 -108.69 -17.935 +v -119.42 -108.11 -17.986 +v -118.97 -109.27 -18.118 +v -118.928 -109.9 -18.065 +v -118.972 -110.534 -18.01 +v -118.938 -109.9 -18.472 +v -119.11 -108.66 -18.577 +v -119.1 -108.657 -18.17 +v -119.322 -108.066 -18.628 +v -119.313 -108.062 -18.22 +v -119.208 -108.688 -18.774 +v -119.083 -109.286 -18.722 +v -119.386 -108.738 -18.946 +v -119.417 -108.107 -18.825 +v -119.04 -109.9 -18.67 +v -119.084 -110.518 -18.615 +v -118.98 -110.533 -18.418 +v -119.17 -111.372 -17.936 +v -119.867 -107.648 -19.048 +v -119.71 -107.55 -18.876 +v -120.614 -106.746 -19.144 +v -120.07 -107.05 -18.924 +v -119.614 -107.49 -18.271 +v -120.42 -106.534 -18.776 +v -119.983 -106.98 -18.32 +v -120.49 -106.61 -18.972 +v -119.714 -107.553 -18.037 +v -120.073 -107.054 -18.086 +v -120.413 -106.527 -18.368 +v -120.492 -106.613 -18.134 +v -120.91 -106.143 -18.822 +v -120.97 -106.228 -19.019 +v -121.46 -105.82 -18.869 +v -121.444 -105.787 -18.666 +v -120.906 -106.135 -18.415 +v -120.972 -106.23 -18.18 +v -120.617 -106.75 -17.965 +v -121.508 -105.916 -18.227 +v -121.59 -106.08 -18.058 +v -121.74 -105.68 -18.484 +v -122.413 -105.77 -18.125 +v -122.367 -105.593 -18.294 +v -123.568 -105.63 -18.21 +v -122.963 -105.478 -18.337 +v -125.294 -106.025 -18.333 +v -125.904 -106.15 -18.54 +v -127.207 -107.434 -18.65 +v -126.388 -106.507 -18.578 +v -126.824 -106.935 -18.614 +v -126.912 -106.857 -18.848 +v -127.305 -107.37 -18.885 +v -126.464 -106.418 -18.812 +v -125.968 -106.05 -18.775 +v -126.457 -106.425 -19.22 +v -125.42 -105.752 -18.736 +v -125.417 -105.76 -19.144 +v -126.905 -106.863 -19.256 +v -126.39 -106.504 -19.416 +v -127.297 -107.374 -19.292 +v -126.828 -106.932 -19.452 +v -127.202 -107.665 -19.637 +v -126.418 -106.857 -19.637 +v -125.807 -106.3 -19.551 +v -125.704 -106.462 -19.627 +v -125.373 -105.855 -19.34 +v -124.733 -105.808 -19.472 +v -124.678 -105.99 -19.548 +v -124.786 -105.632 -19.3 +v -124.816 -105.533 -19.104 +v -124.185 -105.494 -19.26 +v -123.568 -105.625 -19.39 +v -123.008 -105.846 -19.423 +v -124.2 -105.392 -19.063 +v -123.57 -105.44 -19.218 +v -124.82 -105.523 -18.696 +v -124.202 -105.382 -18.655 +v -123.573 -105.328 -18.613 +v -123.572 -105.338 -19.021 +v -122.962 -105.473 -19.176 +v -122.985 -105.656 -19.348 +v -121.928 -106.132 -19.336 +v -121.854 -105.955 -19.26 +v -122.366 -105.588 -19.132 +v -122.95 -105.37 -18.979 +v -122.95 -105.36 -18.571 +v -122.337 -105.48 -18.528 +v -121.784 -105.785 -19.088 +v -123.57 -105.445 -18.38 +v -124.184 -105.5 -18.42 +v -124.785 -105.636 -18.462 +v -125.37 -105.86 -18.502 +v -121.074 -106.38 -19.191 +v -122.64 -106.084 -7.85 +v -124.28 -106.067 -8.023 +v -121.147 -106.775 -7.677 +v -121.263 -106.928 -7.754 +v -120.523 -107.67 -7.638 +v -119.882 -109.034 -7.471 +v -120.67 -107.78 -7.812 +v -120.995 -107.403 -7.87 +v -120.025 -110.56 -7.472 +v -119.967 -110.068 -7.53 +v -119.98 -109.567 -7.587 +v -120.104 -110.06 -7.941 +v -120.194 -109.11 -8.057 +v -120.06 -109.077 -7.645 +v -120.547 -108.215 -8.173 +v -120.155 -109.1 -8.285 +v -120.2 -108.596 -8.541 +v -120.21 -108.6 -7.703 +v -121.092 -107.5 -8.282 +v -121.455 -107.184 -8.34 +v -120.748 -107.837 -8.452 +v -121.43 -107.152 -8.568 +v -120.662 -107.772 -8.65 +v -121.366 -107.066 -8.766 +v -121.79 -106.792 -8.825 +v -121.86 -106.922 -8.398 +v -121.373 -107.074 -7.928 +v -121.795 -106.8 -7.986 +v -122.753 -106.583 -8.514 +v -122.744 -106.544 -8.741 +v -122.682 -106.27 -7.928 +v -122.246 -106.593 -8.044 +v -122.723 -106.45 -8.102 +v -123.212 -106.375 -8.159 +v -123.713 -106.37 -8.217 +v -124.242 -106.254 -8.1 +v -123.704 -106.507 -8.63 +v -124.64 -106.697 -8.745 +v -124.205 -106.434 -8.275 +v -123.22 -106.472 -8.798 +v -123.21 -106.364 -8.997 +v -124.207 -106.424 -9.113 +v -125.083 -106.892 -8.803 +v -124.687 -106.568 -8.333 +v -125.817 -107.41 -8.912 +v -125.468 -107.08 -9.081 +v -125.524 -107 -8.442 +v -126.176 -107.74 -9.197 +v -126.145 -107.764 -8.97 +v -125.91 -107.31 -8.5 +v -125.628 -106.85 -8.268 +v -126.252 -107.678 -8.558 +v -126.394 -107.562 -8.384 +v -125.738 -106.692 -8.19 +v -126.543 -107.442 -8.306 +v -126.538 -108.09 -8.616 +v -126.26 -107.67 -9.396 +v -125.53 -106.99 -9.28 +v -124.69 -106.558 -9.17 +v -125.238 -106.597 -9.396 +v -123.724 -106.175 -9.223 +v -122.68 -106.26 -9.107 +v -121.7 -106.63 -8.992 +v -122.72 -106.44 -8.94 +v -120.856 -107.265 -8.876 +v -120.258 -108.05 -8.767 +v -119.87 -109.032 -8.65 +v -119.772 -110.077 -8.535 +v -120.05 -109.075 -8.483 +v -119.957 -110.068 -8.368 +v -120.064 -110.063 -8.169 +v -126.687 -107.326 -8.308 +v -127.464 -108.864 -8.482 +v -127.54 -110.58 -8.655 +v -127.632 -108.82 -8.552 +v -127.77 -110.01 -8.668 +v -127.61 -108.18 -8.663 +v -127.81 -108.773 -8.721 +v -127.925 -109.385 -8.778 +v -127.924 -108.743 -8.955 +v -128.042 -109.372 -9.013 +v -127.953 -110.016 -8.837 +v -128.07 -110.02 -9.07 +v -127.893 -110.638 -8.894 +v -128.01 -110.658 -9.128 +v -127.745 -111.25 -8.952 +v -127.57 -111.195 -8.783 +v -127.848 -111.283 -9.594 +v -127.858 -111.286 -9.186 +v -128 -110.656 -9.536 +v -127.617 -111.89 -9.244 +v -127.51 -111.838 -9.01 +v -127.608 -111.885 -9.652 +v -127.337 -112.386 -9.296 +v -126.863 -112.822 -9.12 +v -127.345 -111.758 -8.841 +v -126.724 -112.702 -8.95 +v -126.944 -112.893 -9.76 +v -126.95 -112.9 -9.353 +v -126.416 -113.268 -9.177 +v -125.81 -113.492 -9.066 +v -126.938 -112.128 -8.822 +v -126.182 -112.998 -8.938 +v -126.493 -113.357 -9.411 +v -125.91 -113.647 -9.235 +v -126.486 -113.35 -9.82 +v -125.973 -113.746 -9.47 +v -125.36 -113.948 -9.293 +v -125.405 -114.046 -9.935 +v -125.41 -114.055 -9.527 +v -125.967 -113.737 -9.877 +v -126.866 -112.825 -9.957 +v -126.42 -113.272 -10.016 +v -125.91 -113.65 -10.074 +v -126.298 -113.132 -10.188 +v -127.242 -112.325 -9.9 +v -127.087 -112.225 -10.072 +v -127.75 -111.252 -9.79 +v -127.574 -111.196 -9.963 +v -127.898 -110.64 -9.733 +v -127.957 -110.016 -9.675 +v -127.93 -109.385 -9.617 +v -128.06 -110.02 -9.478 +v -128.032 -109.373 -9.42 +v -127.914 -108.746 -9.363 +v -125.812 -113.496 -10.246 +v -124.722 -113.997 -10.361 +v -125.36 -113.952 -10.131 +v -124.775 -114.174 -10.19 +v -124.804 -114.272 -9.993 +v -124.14 -114.127 -10.419 +v -124.166 -114.31 -10.246 +v -122.936 -114.138 -10.534 +v -122.96 -113.948 -10.61 +v -123.536 -114.36 -10.304 +v -124.182 -114.41 -10.05 +v -123.537 -114.462 -10.108 +v -124.183 -114.42 -9.642 +v -123.537 -114.472 -9.7 +v -124.807 -114.282 -9.585 +v -122.898 -114.423 -10.166 +v -122.91 -114.32 -10.362 +v -122.266 -114.293 -10.224 +v -122.896 -114.433 -9.758 +v -123.536 -114.354 -9.466 +v -122.912 -114.316 -9.524 +v -122.264 -114.302 -9.816 +v -122.295 -114.19 -9.582 +v -123.535 -114.17 -9.297 +v -122.345 -114.012 -9.413 +v -124.165 -114.305 -9.408 +v -124.72 -113.993 -9.182 +v -124.67 -113.826 -9.112 +v -121.774 -113.806 -9.471 +v -121.7 -113.974 -9.64 +v -120.81 -113.217 -9.58 +v -120.694 -113.36 -9.749 +v -120.233 -112.93 -9.807 +v -121.146 -113.82 -9.925 +v -120.62 -113.452 -9.983 +v -120.147 -113.01 -10.04 +v -119.838 -112.436 -9.865 +v -119.74 -112.503 -10.1 +v -120.626 -113.444 -10.39 +v -120.154 -113.002 -10.449 +v -121.656 -114.073 -10.282 +v -121.204 -113.723 -10.53 +v -120.69 -113.364 -10.587 +v -122.294 -114.193 -10.42 +v -121.652 -114.082 -9.874 +v -122.344 -114.016 -10.592 +v -121.3 -113.565 -10.702 +v -121.398 -113.4 -10.777 +v -120.365 -112.807 -10.817 +v -120.505 -112.677 -10.893 +v -119.985 -112.333 -10.876 +v -119.616 -109.517 -11.237 +v -120.088 -108.006 -11.404 +v -120.75 -107.13 -11.52 +v -119.514 -111.9 -10.76 +v -119.834 -112.438 -10.703 +v -120.23 -112.932 -10.645 +v -119.75 -112.497 -10.507 +v -124.773 -114.17 -9.35 +v -125.456 -107.12 -11.43 +v -124.66 -106.704 -11.321 +v -124.222 -106.437 -10.85 +v -125.065 -106.838 -11.6 +v -125.11 -106.75 -10.96 +v -125.83 -107.424 -11.488 +v -125.857 -107.395 -11.716 +v -123.727 -106.37 -10.793 +v -123.738 -106.187 -10.62 +v -125.535 -107.007 -11.018 +v -125.193 -106.588 -10.786 +v -126.156 -107.78 -11.546 +v -125.924 -107.324 -11.076 +v -126.05 -107.19 -10.902 +v -123.75 -105.996 -10.542 +v -125.28 -106.417 -10.71 +v -122.13 -106.236 -10.369 +v -122.196 -106.416 -10.446 +v -120.88 -107.26 -10.272 +v -120.247 -108.095 -10.157 +v -120.678 -107.767 -10.388 +v -121.008 -107.39 -10.446 +v -121.39 -107.063 -10.505 +v -121.808 -106.794 -10.562 +v -119.798 -109.535 -9.99 +v -119.966 -110.05 -10.106 +v -119.98 -109.553 -10.163 +v -120.064 -109.06 -10.221 +v -120.408 -108.184 -10.33 +v -120.023 -110.547 -10.048 +v -120.104 -110.044 -10.518 +v -120.197 -109.093 -10.633 +v -120.345 -108.633 -10.692 +v -119.97 -109.552 -11.002 +v -120.013 -110.55 -10.886 +v -120.788 -107.85 -10.8 +v -120.493 -108.23 -10.97 +v -121.105 -107.487 -10.858 +v -121.076 -107.46 -11.086 +v -120.398 -108.18 -11.17 +v -120.054 -109.058 -11.06 +v -121.47 -107.173 -10.917 +v -121.382 -107.054 -11.343 +v -121 -107.383 -11.285 +v -122.308 -106.716 -11.032 +v -122.26 -106.587 -10.62 +v -123.24 -106.51 -11.148 +v -122.294 -106.68 -11.26 +v -122.755 -106.542 -11.317 +v -122.734 -106.447 -10.677 +v -123.23 -106.374 -10.735 +v -124.194 -106.572 -11.263 +v -123.727 -106.36 -11.631 +v -122.732 -106.437 -11.516 +v -124.772 -106.39 -11.915 +v -124.224 -106.427 -11.69 +v -123.215 -106.18 -11.74 +v -125.114 -106.74 -11.799 +v -125.93 -107.316 -11.914 +v -121.272 -106.906 -11.51 +v -122.19 -106.404 -11.626 +v -122.256 -106.577 -11.458 +v -120.522 -107.65 -11.394 +v -120.037 -108.51 -11.285 +v -119.77 -110.058 -11.111 +v -119.96 -111.088 -10.996 +v -120.12 -110.53 -10.687 +v -126.18 -107.05 -10.825 +v -127.286 -108.333 -11 +v -127.115 -108.404 -10.998 +v -127.447 -108.267 -11.07 +v -127.744 -109.43 -11.186 +v -127.595 -110.023 -11.173 +v -127.617 -108.197 -11.24 +v -127.813 -108.788 -11.297 +v -127.927 -108.758 -11.53 +v -127.927 -109.408 -11.355 +v -128.044 -109.395 -11.59 +v -127.953 -110.033 -11.412 +v -128.07 -110.037 -11.647 +v -127.89 -110.66 -11.47 +v -127.71 -110.628 -11.302 +v -128.006 -110.68 -11.704 +v -127.737 -111.274 -11.529 +v -127.562 -111.217 -11.36 +v -127.075 -112.237 -11.468 +v -127.21 -111.64 -11.34 +v -126.578 -112.604 -11.456 +v -126.277 -113.144 -11.585 +v -125.195 -113.63 -11.63 +v -125.267 -113.79 -11.7 +v -124.116 -114.126 -11.816 +v -123.517 -113.997 -11.803 +v -125.893 -113.657 -11.811 +v -125.343 -113.956 -11.87 +v -124.76 -114.173 -11.926 +v -126.397 -113.284 -11.754 +v -126.473 -113.373 -11.988 +v -125.957 -113.756 -12.046 +v -125.392 -114.063 -12.103 +v -124.792 -114.286 -12.16 +v -124.142 -114.308 -11.984 +v -125.388 -114.054 -12.51 +v -124.79 -114.276 -12.568 +v -125.95 -113.748 -12.453 +v -125.896 -113.66 -12.65 +v -125.345 -113.96 -12.708 +v -124.158 -114.414 -12.626 +v -124.76 -114.177 -12.765 +v -125.27 -113.792 -12.88 +v -126.4 -113.287 -12.592 +v -126.28 -113.147 -12.764 +v -126.467 -113.366 -12.396 +v -126.85 -112.843 -12.534 +v -126.712 -112.72 -12.706 +v -127.37 -111.714 -12.59 +v -127.233 -112.34 -12.476 +v -126.928 -112.91 -12.337 +v -126.936 -112.917 -11.93 +v -127.328 -112.402 -11.872 +v -127.32 -112.396 -12.28 +v -127.537 -111.793 -12.418 +v -127.64 -111.84 -11.814 +v -127.84 -111.307 -12.17 +v -127.23 -112.337 -11.637 +v -126.847 -112.84 -11.696 +v -127.85 -111.31 -11.763 +v -127.996 -110.678 -12.112 +v -128.06 -110.037 -12.054 +v -127.957 -110.034 -12.25 +v -127.894 -110.66 -12.309 +v -128.034 -109.397 -11.997 +v -127.932 -109.408 -12.193 +v -127.918 -108.76 -11.939 +v -127.713 -110.63 -12.481 +v -124.708 -114 -12.937 +v -123.518 -114.175 -13.053 +v -124.143 -114.312 -12.823 +v -123.52 -114.36 -12.88 +v -123.52 -114.463 -12.684 +v -122.915 -114.135 -13.11 +v -122.89 -114.318 -12.938 +v -122.876 -114.42 -12.742 +v -124.16 -114.424 -12.219 +v -123.52 -114.473 -12.276 +v -123.52 -114.355 -12.042 +v -122.875 -114.43 -12.334 +v -122.89 -114.313 -12.1 +v -122.916 -114.13 -11.931 +v -122.27 -114.182 -12.158 +v -122.322 -114.005 -11.99 +v -122.24 -114.295 -12.392 +v -121.702 -114.104 -12.444 +v -121.19 -113.71 -12.267 +v -121.287 -113.553 -12.098 +v -120.676 -113.346 -12.325 +v -120.353 -112.786 -12.214 +v -121.13 -113.81 -12.501 +v -120.602 -113.437 -12.56 +v -120.217 -112.91 -12.383 +v -121.136 -113.802 -12.909 +v -120.608 -113.43 -12.967 +v -120.13 -112.99 -12.617 +v -121.19 -113.714 -13.105 +v -120.673 -113.35 -13.164 +v -120.138 -112.983 -13.025 +v -119.738 -112.48 -13.083 +v -119.73 -112.487 -12.675 +v -119.827 -112.42 -12.44 +v -120.214 -112.914 -13.222 +v -120.79 -113.207 -13.336 +v -120.35 -112.79 -13.394 +v -119.823 -112.423 -13.28 +v -119.67 -111.8 -13.51 +v -119.505 -111.882 -13.337 +v -120.91 -113.06 -13.411 +v -119.842 -111.715 -13.585 +v -121.894 -113.654 -13.296 +v -121.82 -113.83 -13.22 +v -121.746 -114 -13.048 +v -122.242 -114.285 -12.8 +v -126.264 -107.693 -11.134 +v -126.546 -108.103 -11.192 +v -126.625 -108.477 -6.53 +v -120.434 -111.428 -19.637 +v -1.51 106.538 -24.8 +v -5.393 103.925 -24.8 +v -4.312 102.995 -24.8 +v -3.075 102.287 -24.8 +v -2.204 107.102 -24.8 +v -6.279 105.042 -24.8 +v -2.7 107.846 -24.8 +v -6.937 106.307 -24.8 +v -7.344 107.674 -24.8 +v -2.955 108.703 -24.8 +v -7.484 109.093 -24.8 +v -2.946 109.597 -24.8 +v -7.354 110.513 -24.8 +v -2.674 110.45 -24.8 +v -6.957 111.882 -24.8 +v -2.163 111.183 -24.8 +v -6.309 113.152 -24.8 +v -1.459 111.733 -24.8 +v -4.357 115.214 -24.8 +v -0.623 112.052 -24.8 +v -1.78 116.403 -24.8 +v 0.27 112.11 -24.8 +v -0.37 116.61 -24.8 +v -0.68 106.203 -24.8 +v -1.726 101.826 -24.8 +v -0.313 101.628 -24.8 +v 0.21 106.127 -24.8 +v 1.91 111.448 -24.8 +v 3.742 115.63 -24.8 +v 1.14 111.902 -24.8 +v 2.51 110.786 -24.8 +v 5.894 113.78 -24.8 +v 2.442 116.217 -24.8 +v 1.055 116.548 -24.8 +v 2.89 109.977 -24.8 +v 6.67 112.582 -24.8 +v 3.016 109.09 -24.8 +v 7.479 109.86 -24.8 +v 7.204 111.26 -24.8 +v 7.22 107.034 -24.8 +v 7.484 108.435 -24.8 +v 2.873 108.208 -24.8 +v 6.695 105.71 -24.8 +v 2.478 107.406 -24.8 +v 5.928 104.506 -24.8 +v 4.948 103.47 -24.8 +v 1.863 106.757 -24.8 +v 3.79 102.64 -24.8 +v 1.084 106.317 -24.8 +v 2.495 102.042 -24.8 +v 1.11 101.7 -24.8 +v 4.906 114.807 -24.8 +v 7.204 111.26 -27.8 +v 7.479 109.86 -27.8 +v 6.67 112.582 -27.8 +v 5.894 113.78 -27.8 +v 4.906 114.807 -27.8 +v 3.742 115.63 -27.8 +v 2.442 116.217 -27.8 +v 1.055 116.548 -27.8 +v -0.37 116.61 -27.8 +v -1.78 116.403 -27.8 +v -3.125 115.93 -27.8 +v -4.357 115.214 -27.8 +v -3.125 115.93 -24.8 +v -5.432 114.276 -27.8 +v -6.309 113.152 -27.8 +v -5.432 114.276 -24.8 +v -6.957 111.882 -27.8 +v -7.354 110.513 -27.8 +v 7.484 108.435 -27.8 +v 7.22 107.034 -27.8 +v 6.695 105.71 -27.8 +v 5.928 104.506 -27.8 +v 4.948 103.47 -27.8 +v 3.79 102.64 -27.8 +v 2.495 102.042 -27.8 +v 1.11 101.7 -27.8 +v -0.313 101.628 -27.8 +v -1.726 101.826 -27.8 +v -3.075 102.287 -27.8 +v -4.312 102.995 -27.8 +v -5.393 103.925 -27.8 +v -6.279 105.042 -27.8 +v -6.937 106.307 -27.8 +v -7.344 107.674 -27.8 +v -7.484 109.093 -27.8 +v 0.016 109.12 -27.8 +v 2.873 108.208 -6.221 +v 3.016 109.09 -6.221 +v 0.016 109.12 -6.221 +v 2.478 107.406 -6.221 +v 2.89 109.977 -6.221 +v 2.51 110.786 -6.221 +v 1.91 111.448 -6.221 +v 1.14 111.902 -6.221 +v 0.27 112.11 -6.221 +v -0.623 112.052 -6.221 +v -1.459 111.733 -6.221 +v -2.163 111.183 -6.221 +v -2.674 110.45 -6.221 +v -2.946 109.597 -6.221 +v -2.955 108.703 -6.221 +v -2.7 107.846 -6.221 +v -2.204 107.102 -6.221 +v -1.51 106.538 -6.221 +v -0.68 106.203 -6.221 +v 1.084 106.317 -6.221 +v 1.863 106.757 -6.221 +v 0.21 106.127 -6.221 +v -125.026 -112.483 -24.8 +v -128.91 -115.096 -24.8 +v -127.828 -116.025 -24.8 +v -126.59 -116.734 -24.8 +v -124.196 -112.818 -24.8 +v -125.72 -111.92 -24.8 +v -129.794 -113.978 -24.8 +v -126.216 -111.175 -24.8 +v -130.452 -112.713 -24.8 +v -126.47 -110.318 -24.8 +v -130.86 -111.347 -24.8 +v -126.462 -109.424 -24.8 +v -131 -109.928 -24.8 +v -126.19 -108.572 -24.8 +v -130.473 -107.138 -24.8 +v -130.87 -108.508 -24.8 +v -125.68 -107.838 -24.8 +v -129.824 -105.87 -24.8 +v -124.974 -107.287 -24.8 +v -127.873 -103.807 -24.8 +v -128.947 -104.745 -24.8 +v -124.14 -106.97 -24.8 +v -125.295 -102.618 -24.8 +v -126.64 -103.09 -24.8 +v -123.246 -106.91 -24.8 +v -123.885 -102.41 -24.8 +v -122.376 -107.118 -24.8 +v -121.073 -102.803 -24.8 +v -122.46 -102.472 -24.8 +v -121.606 -107.573 -24.8 +v -119.774 -103.39 -24.8 +v -121.005 -108.235 -24.8 +v -117.622 -105.242 -24.8 +v -118.61 -104.214 -24.8 +v -120.625 -109.044 -24.8 +v -116.847 -106.44 -24.8 +v -120.5 -109.93 -24.8 +v -116.037 -109.16 -24.8 +v -116.312 -107.76 -24.8 +v -116.296 -111.986 -24.8 +v -116.03 -110.585 -24.8 +v -120.642 -110.813 -24.8 +v -116.82 -113.312 -24.8 +v -121.038 -111.614 -24.8 +v -117.587 -114.514 -24.8 +v -121.653 -112.264 -24.8 +v -118.568 -115.55 -24.8 +v -122.432 -112.703 -24.8 +v -119.726 -116.38 -24.8 +v -123.305 -112.894 -24.8 +v -122.405 -117.32 -24.8 +v -121.02 -116.978 -24.8 +v -123.83 -117.393 -24.8 +v -125.24 -117.195 -24.8 +v -116.312 -107.76 -27.8 +v -116.037 -109.16 -27.8 +v -116.847 -106.44 -27.8 +v -116.03 -110.585 -27.8 +v -116.296 -111.986 -27.8 +v -117.622 -105.242 -27.8 +v -118.61 -104.214 -27.8 +v -119.774 -103.39 -27.8 +v -121.073 -102.803 -27.8 +v -122.46 -102.472 -27.8 +v -123.885 -102.41 -27.8 +v -125.295 -102.618 -27.8 +v -126.64 -103.09 -27.8 +v -127.873 -103.807 -27.8 +v -128.947 -104.745 -27.8 +v -129.824 -105.87 -27.8 +v -130.473 -107.138 -27.8 +v -116.82 -113.312 -27.8 +v -117.587 -114.514 -27.8 +v -118.568 -115.55 -27.8 +v -119.726 -116.38 -27.8 +v -121.02 -116.978 -27.8 +v -122.405 -117.32 -27.8 +v -123.83 -117.393 -27.8 +v -125.24 -117.195 -27.8 +v -126.59 -116.734 -27.8 +v -127.828 -116.025 -27.8 +v -128.91 -115.096 -27.8 +v -129.794 -113.978 -27.8 +v -130.452 -112.713 -27.8 +v -130.86 -111.347 -27.8 +v -131 -109.928 -27.8 +v -130.87 -108.508 -27.8 +v -123.5 -109.9 -27.8 +v -120.642 -110.813 -6.221 +v -120.5 -109.93 -6.221 +v -123.5 -109.9 -6.221 +v -121.038 -111.614 -6.221 +v -120.625 -109.044 -6.221 +v -121.005 -108.235 -6.221 +v -121.606 -107.573 -6.221 +v -122.376 -107.118 -6.221 +v -123.246 -106.91 -6.221 +v -124.14 -106.97 -6.221 +v -124.974 -107.287 -6.221 +v -125.68 -107.838 -6.221 +v -126.19 -108.572 -6.221 +v -126.462 -109.424 -6.221 +v -126.47 -110.318 -6.221 +v -126.216 -111.175 -6.221 +v -125.72 -111.92 -6.221 +v -125.026 -112.483 -6.221 +v -124.196 -112.818 -6.221 +v -122.432 -112.703 -6.221 +v -121.653 -112.264 -6.221 +v -123.305 -112.894 -6.221 +v 122.402 -112.692 -24.8 +v 118.98 -115.885 -24.8 +v 120.194 -116.632 -24.8 +v 121.528 -117.136 -24.8 +v 123.273 -112.89 -24.8 +v 121.627 -112.244 -24.8 +v 117.93 -114.92 -24.8 +v 121.02 -111.588 -24.8 +v 117.08 -113.776 -24.8 +v 120.632 -110.782 -24.8 +v 116.462 -112.49 -24.8 +v 120.5 -109.897 -24.8 +v 116.1 -111.112 -24.8 +v 120.634 -109.013 -24.8 +v 116.178 -108.274 -24.8 +v 116.003 -109.69 -24.8 +v 121.023 -108.208 -24.8 +v 116.618 -106.918 -24.8 +v 121.632 -107.553 -24.8 +v 118.22 -104.574 -24.8 +v 117.307 -105.67 -24.8 +v 122.406 -107.106 -24.8 +v 120.577 -102.993 -24.8 +v 119.323 -103.67 -24.8 +v 123.278 -106.908 -24.8 +v 121.937 -102.565 -24.8 +v 124.17 -106.976 -24.8 +v 124.775 -102.51 -24.8 +v 123.354 -102.4 -24.8 +v 125.002 -107.303 -24.8 +v 126.15 -102.884 -24.8 +v 125.7 -107.86 -24.8 +v 128.57 -104.372 -24.8 +v 127.43 -103.513 -24.8 +v 126.204 -108.6 -24.8 +v 129.523 -105.43 -24.8 +v 126.467 -109.455 -24.8 +v 130.753 -107.99 -24.8 +v 130.26 -106.652 -24.8 +v 130.943 -110.822 -24.8 +v 130.983 -109.397 -24.8 +v 126.466 -110.35 -24.8 +v 130.634 -112.214 -24.8 +v 126.202 -111.204 -24.8 +v 130.067 -113.523 -24.8 +v 125.697 -111.942 -24.8 +v 129.263 -114.7 -24.8 +v 124.998 -112.5 -24.8 +v 128.25 -115.704 -24.8 +v 124.165 -112.825 -24.8 +v 125.753 -117.054 -24.8 +v 127.066 -116.498 -24.8 +v 124.358 -117.35 -24.8 +v 122.933 -117.38 -24.8 +v 130.26 -106.652 -27.8 +v 130.753 -107.99 -27.8 +v 130.983 -109.397 -27.8 +v 130.943 -110.822 -27.8 +v 130.634 -112.214 -27.8 +v 130.067 -113.523 -27.8 +v 129.263 -114.7 -27.8 +v 128.25 -115.704 -27.8 +v 127.066 -116.498 -27.8 +v 125.753 -117.054 -27.8 +v 124.358 -117.35 -27.8 +v 122.933 -117.38 -27.8 +v 121.528 -117.136 -27.8 +v 120.194 -116.632 -27.8 +v 118.98 -115.885 -27.8 +v 117.93 -114.92 -27.8 +v 117.08 -113.776 -27.8 +v 116.462 -112.49 -27.8 +v 116.1 -111.112 -27.8 +v 116.003 -109.69 -27.8 +v 116.178 -108.274 -27.8 +v 116.618 -106.918 -27.8 +v 117.307 -105.67 -27.8 +v 118.22 -104.574 -27.8 +v 119.323 -103.67 -27.8 +v 120.577 -102.993 -27.8 +v 121.937 -102.565 -27.8 +v 123.354 -102.4 -27.8 +v 124.775 -102.51 -27.8 +v 126.15 -102.884 -27.8 +v 127.43 -103.513 -27.8 +v 128.57 -104.372 -27.8 +v 129.523 -105.43 -27.8 +v 123.5 -109.9 -27.8 +v 126.466 -110.35 -6.221 +v 126.467 -109.455 -6.221 +v 123.5 -109.9 -6.221 +v 126.202 -111.204 -6.221 +v 126.204 -108.6 -6.221 +v 125.7 -107.86 -6.221 +v 125.002 -107.303 -6.221 +v 124.17 -106.976 -6.221 +v 123.278 -106.908 -6.221 +v 122.406 -107.106 -6.221 +v 121.632 -107.553 -6.221 +v 121.023 -108.208 -6.221 +v 120.634 -109.013 -6.221 +v 120.5 -109.897 -6.221 +v 120.632 -110.782 -6.221 +v 121.02 -111.588 -6.221 +v 121.627 -112.244 -6.221 +v 122.402 -112.692 -6.221 +v 123.273 -112.89 -6.221 +v 124.998 -112.5 -6.221 +v 125.697 -111.942 -6.221 +v 124.165 -112.825 -6.221 +v 112.485 109.668 -4.844 +v 112.608 109.823 -5.064 +v 112.398 110.105 -5.075 +v 112.237 109.878 -4.784 +v 112.488 109.625 -4.815 +v 112.51 109.647 -4.85 +v 112.37 110.12 -5.075 +v 112.416 110.13 -5.1 +v 112.217 109.7 -4.658 +v 112.485 109.363 -4.754 +v 112.217 109.363 -4.583 +v 112.215 109.363 -4.582 +v 111.902 109.723 -4.602 +v 111.902 109.725 -4.603 +v 112.217 108.837 -4.583 +v 112.215 108.837 -4.582 +v 111.902 109.363 -4.522 +v 111.902 108.837 -4.522 +v 112.217 108.5 -4.658 +v 111.902 108.478 -4.602 +v 112.485 108.837 -4.754 +v 112.488 108.837 -4.756 +v 112.488 109.363 -4.756 +v 112.488 108.575 -4.815 +v 112.672 108.837 -5.013 +v 112.672 109.363 -5.013 +v 112.53 109.61 -4.87 +v 112.683 109.382 -5.035 +v 112.615 109.814 -5.063 +v 112.716 109.382 -5.081 +v 112.683 108.818 -5.035 +v 112.645 109.828 -5.095 +v 112.763 109.382 -5.111 +v 112.716 108.818 -5.081 +v 112.636 108.446 -5.06 +v 112.667 108.435 -5.093 +v 112.707 108.42 -5.115 +v 112.763 108.818 -5.111 +v 112.6 108.386 -5.063 +v 112.454 108.1 -5.1 +v 112.478 108.07 -5.116 +v 112.53 108.59 -4.87 +v 112.51 108.553 -4.85 +v 112.485 108.532 -4.844 +v 112.434 108.124 -5.075 +v 112.237 108.322 -4.784 +v 112.37 108.083 -5.075 +v 112.217 108.314 -4.787 +v 111.902 108.475 -4.603 +v 110.098 108.475 -4.603 +v 111.902 108.186 -4.826 +v 110.098 108.478 -4.602 +v 110.098 108.837 -4.522 +v 109.785 108.837 -4.582 +v 109.783 108.5 -4.658 +v 110.098 108.186 -4.826 +v 112.015 107.982 -5.068 +v 109.985 107.982 -5.068 +v 109.783 108.314 -4.787 +v 109.746 108.018 -5.075 +v 109.763 108.322 -4.784 +v 109.783 108.837 -4.583 +v 109.63 108.08 -5.075 +v 109.735 107.988 -5.1 +v 109.584 108.07 -5.1 +v 109.602 108.095 -5.075 +v 109.562 108.04 -5.117 +v 109.985 107.93 -5.106 +v 109.985 107.95 -5.097 +v 109.722 107.953 -5.116 +v 109.318 108.356 -5.115 +v 109.54 108.007 -5.122 +v 109.708 107.916 -5.122 +v 109.985 107.91 -5.116 +v 109.985 107.867 -5.122 +v 112.015 107.867 -5.122 +v 112.015 107.91 -5.116 +v 100.1 109.1 -5.122 +v 99.942 108.406 -5.122 +v 103.5 106.588 -5.122 +v 99.942 109.794 -5.122 +v 109.277 108.337 -5.122 +v 99.498 110.35 -5.122 +v 98.856 110.66 -5.122 +v 109.18 108.818 -5.122 +v 98.5 114.05 -5.122 +v 98.144 110.66 -5.122 +v 109.18 109.382 -5.122 +v 97.273 113.896 -5.122 +v 109.25 109.795 -5.122 +v 103.5 114.05 -5.122 +v 96.123 113.442 -5.122 +v 97.502 110.35 -5.122 +v 95.12 112.717 -5.122 +v 97.058 109.794 -5.122 +v 94.33 111.767 -5.122 +v 93.799 110.65 -5.122 +v 96.9 109.1 -5.122 +v 93.561 109.436 -5.122 +v 97.058 108.406 -5.122 +v 93.632 108.2 -5.122 +v 94.007 107.023 -5.122 +v 94.172 106.793 -5.122 +v 94.41 106.64 -5.122 +v 94.688 106.588 -5.122 +v 94.911 106.588 -5.122 +v 95.215 106.523 -5.122 +v 95.466 106.342 -5.122 +v 97.502 107.85 -5.122 +v 96.338 105.616 -5.122 +v 98.144 107.54 -5.122 +v 97.376 105.157 -5.122 +v 98.5 105 -5.122 +v 98.856 107.54 -5.122 +v 99.624 105.157 -5.122 +v 99.498 107.85 -5.122 +v 100.662 105.616 -5.122 +v 101.534 106.342 -5.122 +v 102.09 106.588 -5.122 +v 101.785 106.523 -5.122 +v 118.5 106.588 -5.122 +v 103.5 106.406 -5.146 +v 118.5 106.406 -5.146 +v 103.5 106.238 -5.216 +v 118.5 106.238 -5.216 +v 103.5 105.65 -5.555 +v 118.5 105.65 -5.555 +v 104.25 105 -5.93 +v 103.875 105.087 -5.88 +v 103.6 105.325 -5.743 +v 117.75 105 -5.93 +v 118.4 105.325 -5.743 +v 118.125 105.087 -5.88 +v 112.504 108.04 -5.122 +v 112.34 107.936 -5.122 +v 119.91 106.588 -5.122 +v 112.82 108.818 -5.122 +v 112.75 108.405 -5.122 +v 112.156 107.88 -5.122 +v 120.215 106.523 -5.122 +v 123.144 107.54 -5.122 +v 120.466 106.342 -5.122 +v 122.502 107.85 -5.122 +v 121.338 105.616 -5.122 +v 122.376 105.157 -5.122 +v 123.5 105 -5.122 +v 123.856 107.54 -5.122 +v 122.058 108.406 -5.122 +v 121.9 109.1 -5.122 +v 112.82 109.382 -5.122 +v 122.058 109.794 -5.122 +v 112.682 109.844 -5.115 +v 112.723 109.863 -5.122 +v 112.324 107.972 -5.117 +v 112.308 108.006 -5.1 +v 112.15 107.92 -5.116 +v 112.137 107.988 -5.073 +v 112.142 107.957 -5.1 +v 112.295 108.035 -5.076 +v 112.015 107.95 -5.097 +v 112.015 107.93 -5.106 +v 112.46 110.193 -5.122 +v 123.5 114.05 -5.122 +v 112.438 110.16 -5.117 +v 112.292 110.284 -5.122 +v 118.5 114.05 -5.122 +v 122.502 110.35 -5.122 +v 123.144 110.66 -5.122 +v 124.727 113.896 -5.122 +v 123.856 110.66 -5.122 +v 125.877 113.442 -5.122 +v 124.498 110.35 -5.122 +v 126.88 112.717 -5.122 +v 124.942 109.794 -5.122 +v 127.67 111.767 -5.122 +v 128.2 110.65 -5.122 +v 125.1 109.1 -5.122 +v 128.44 109.436 -5.122 +v 128.368 108.2 -5.122 +v 124.942 108.406 -5.122 +v 127.993 107.023 -5.122 +v 127.59 106.64 -5.122 +v 127.828 106.793 -5.122 +v 127.312 106.588 -5.122 +v 127.09 106.588 -5.122 +v 126.785 106.523 -5.122 +v 126.534 106.342 -5.122 +v 124.498 107.85 -5.122 +v 125.662 105.616 -5.122 +v 124.624 105.157 -5.122 +v 112.015 110.333 -5.122 +v 112.015 110.29 -5.116 +v 112.278 110.247 -5.116 +v 109.985 110.333 -5.122 +v 109.985 110.29 -5.116 +v 109.85 110.28 -5.116 +v 109.844 110.32 -5.122 +v 109.66 110.264 -5.122 +v 109.676 110.228 -5.117 +v 109.496 110.16 -5.122 +v 109.522 110.13 -5.116 +v 112.265 110.212 -5.1 +v 112.254 110.182 -5.075 +v 112.217 109.886 -4.787 +v 110.098 109.363 -4.522 +v 110.098 109.725 -4.603 +v 110.098 109.723 -4.602 +v 111.902 110.015 -4.826 +v 112.015 110.218 -5.068 +v 110.098 110.015 -4.826 +v 109.985 110.218 -5.068 +v 109.985 110.25 -5.097 +v 112.015 110.25 -5.097 +v 109.783 109.886 -4.787 +v 109.863 110.212 -5.073 +v 109.783 109.7 -4.658 +v 109.785 109.363 -4.582 +v 109.783 109.363 -4.583 +v 109.763 109.878 -4.784 +v 109.512 109.625 -4.815 +v 109.515 109.363 -4.754 +v 109.515 109.668 -4.844 +v 109.566 110.076 -5.075 +v 109.63 110.117 -5.075 +v 109.49 109.647 -4.85 +v 109.4 109.814 -5.063 +v 109.546 110.1 -5.1 +v 109.705 110.165 -5.076 +v 109.692 110.194 -5.1 +v 109.858 110.243 -5.1 +v 109.985 110.27 -5.106 +v 112.015 110.27 -5.106 +v 109.333 109.765 -5.093 +v 109.364 109.754 -5.06 +v 109.47 109.61 -4.87 +v 109.317 109.382 -5.035 +v 109.328 109.363 -5.013 +v 109.328 108.837 -5.013 +v 109.512 109.363 -4.756 +v 109.512 108.837 -4.756 +v 109.317 108.818 -5.035 +v 109.47 108.59 -4.87 +v 109.515 108.837 -4.754 +v 109.512 108.575 -4.815 +v 109.49 108.553 -4.85 +v 109.515 108.532 -4.844 +v 109.392 108.377 -5.064 +v 109.385 108.386 -5.063 +v 109.355 108.373 -5.095 +v 109.284 108.818 -5.081 +v 109.237 108.818 -5.111 +v 109.284 109.382 -5.081 +v 109.237 109.382 -5.111 +v 109.293 109.78 -5.115 +v 110.098 108.837 -4.872 +v 111.902 108.837 -4.872 +v 110.098 108.625 -4.92 +v 109.914 108.837 -4.907 +v 111.902 108.625 -4.92 +v 112.086 108.837 -4.907 +v 110.098 108.624 -4.92 +v 109.913 108.64 -4.952 +v 109.913 108.837 -4.908 +v 109.9 108.534 -5.026 +v 109.913 108.53 -5.028 +v 110.098 108.454 -5.05 +v 109.985 108.25 -5.293 +v 109.91 108.244 -5.308 +v 109.768 108.293 -5.316 +v 109.732 108.318 -5.315 +v 109.81 108.264 -5.318 +v 109.664 108.237 -5.4 +v 109.767 108.17 -5.401 +v 109.985 108.142 -5.39 +v 109.892 108.14 -5.396 +v 109.715 108.057 -5.454 +v 109.584 108.14 -5.454 +v 109.478 108.266 -5.452 +v 109.584 108.34 -5.393 +v 109.463 108.07 -5.472 +v 109.5 108.043 -5.472 +v 109.37 108.19 -5.472 +v 109.4 108.438 -5.448 +v 109.307 108.273 -5.472 +v 109.263 108.385 -5.472 +v 109.22 108.494 -5.472 +v 109.366 108.818 -5.437 +v 109.66 107.934 -5.472 +v 109.87 108.014 -5.453 +v 109.85 107.883 -5.472 +v 109.893 107.872 -5.472 +v 109.985 108.01 -5.45 +v 109.985 108.076 -5.42 +v 109.985 107.867 -5.472 +v 112.015 108.076 -5.42 +v 112.015 108.01 -5.45 +v 112.015 108.142 -5.39 +v 112.015 108.25 -5.293 +v 112.11 108.14 -5.397 +v 112.132 108.014 -5.453 +v 112.015 107.867 -5.472 +v 112.155 107.888 -5.472 +v 112.264 107.904 -5.472 +v 112.285 108.057 -5.454 +v 112.233 108.17 -5.401 +v 121.9 109.1 -5.472 +v 122.058 109.794 -5.472 +v 112.337 107.943 -5.472 +v 122.058 108.406 -5.472 +v 118.5 106.588 -5.472 +v 119.91 106.588 -5.472 +v 103.5 106.588 -5.472 +v 102.09 106.588 -5.472 +v 101.785 106.523 -5.472 +v 109.18 108.818 -5.472 +v 101.534 106.342 -5.472 +v 99.942 108.406 -5.472 +v 109.18 109.382 -5.472 +v 109.184 109.476 -5.472 +v 109.208 109.604 -5.472 +v 109.238 109.765 -5.472 +v 109.354 110.002 -5.472 +v 109.5 110.156 -5.472 +v 109.528 110.186 -5.472 +v 109.663 110.257 -5.472 +v 109.736 110.296 -5.472 +v 100.1 109.1 -5.472 +v 99.942 109.794 -5.472 +v 109.985 110.333 -5.472 +v 99.498 110.35 -5.472 +v 112.015 110.333 -5.472 +v 103.5 114.05 -5.472 +v 98.5 114.05 -5.472 +v 98.856 110.66 -5.472 +v 97.273 113.896 -5.472 +v 98.144 110.66 -5.472 +v 96.123 113.442 -5.472 +v 97.502 110.35 -5.472 +v 95.12 112.717 -5.472 +v 97.058 109.794 -5.472 +v 94.33 111.767 -5.472 +v 96.9 109.1 -5.472 +v 93.799 110.65 -5.472 +v 97.058 108.406 -5.472 +v 93.632 108.2 -5.472 +v 93.561 109.436 -5.472 +v 94.007 107.023 -5.472 +v 94.172 106.793 -5.472 +v 94.41 106.64 -5.472 +v 94.688 106.588 -5.472 +v 94.911 106.588 -5.472 +v 95.215 106.523 -5.472 +v 95.466 106.342 -5.472 +v 96.338 105.616 -5.472 +v 97.502 107.85 -5.472 +v 97.376 105.157 -5.472 +v 98.144 107.54 -5.472 +v 98.5 105 -5.472 +v 98.856 107.54 -5.472 +v 99.624 105.157 -5.472 +v 100.662 105.616 -5.472 +v 99.498 107.85 -5.472 +v 122.502 110.35 -5.472 +v 118.5 114.05 -5.472 +v 112.15 110.317 -5.472 +v 112.107 110.33 -5.472 +v 123.144 110.66 -5.472 +v 123.5 114.05 -5.472 +v 123.856 110.66 -5.472 +v 124.727 113.896 -5.472 +v 125.877 113.442 -5.472 +v 124.498 110.35 -5.472 +v 126.88 112.717 -5.472 +v 124.942 109.794 -5.472 +v 127.67 111.767 -5.472 +v 128.2 110.65 -5.472 +v 125.1 109.1 -5.472 +v 128.44 109.436 -5.472 +v 128.368 108.2 -5.472 +v 124.942 108.406 -5.472 +v 127.993 107.023 -5.472 +v 127.828 106.793 -5.472 +v 127.59 106.64 -5.472 +v 127.312 106.588 -5.472 +v 127.09 106.588 -5.472 +v 126.785 106.523 -5.472 +v 126.534 106.342 -5.472 +v 124.498 107.85 -5.472 +v 125.662 105.616 -5.472 +v 123.856 107.54 -5.472 +v 124.624 105.157 -5.472 +v 123.5 105 -5.472 +v 123.144 107.54 -5.472 +v 122.376 105.157 -5.472 +v 122.502 107.85 -5.472 +v 121.338 105.616 -5.472 +v 120.466 106.342 -5.472 +v 120.215 106.523 -5.472 +v 112.34 110.266 -5.472 +v 112.5 110.157 -5.472 +v 112.285 110.143 -5.454 +v 112.13 110.186 -5.453 +v 112.537 110.13 -5.472 +v 112.416 110.06 -5.454 +v 112.108 110.06 -5.396 +v 112.233 110.03 -5.401 +v 112.015 110.19 -5.45 +v 109.985 110.19 -5.45 +v 109.845 110.312 -5.472 +v 109.868 110.186 -5.453 +v 109.715 110.143 -5.454 +v 109.582 110.057 -5.454 +v 109.477 109.93 -5.452 +v 112.522 109.934 -5.452 +v 112.336 109.963 -5.4 +v 112.63 110.01 -5.472 +v 112.693 109.927 -5.472 +v 112.737 109.815 -5.472 +v 112.6 109.762 -5.448 +v 112.78 109.706 -5.472 +v 112.475 109.382 -5.336 +v 112.47 109.712 -5.378 +v 112.634 109.382 -5.437 +v 112.416 109.86 -5.393 +v 112.82 109.382 -5.472 +v 112.475 108.818 -5.336 +v 112.634 108.818 -5.437 +v 112.82 108.818 -5.472 +v 112.488 108.648 -5.359 +v 112.816 108.724 -5.472 +v 112.634 108.623 -5.443 +v 112.792 108.596 -5.472 +v 112.762 108.435 -5.472 +v 112.523 108.27 -5.452 +v 112.646 108.198 -5.472 +v 112.5 108.044 -5.472 +v 112.418 108.143 -5.454 +v 112.417 108.344 -5.392 +v 112.472 108.014 -5.472 +v 112.337 108.238 -5.4 +v 112.33 108.406 -5.299 +v 112.232 108.294 -5.316 +v 112.27 108.32 -5.315 +v 112.1 108.534 -5.026 +v 112.347 108.503 -5.273 +v 112.246 108.683 -5.044 +v 112.087 108.64 -4.952 +v 112.087 108.53 -5.028 +v 112.245 108.658 -5.062 +v 111.902 108.454 -5.05 +v 112.092 108.244 -5.308 +v 112.19 108.264 -5.318 +v 111.902 108.624 -4.92 +v 112.245 108.837 -5.009 +v 112.087 108.837 -4.908 +v 111.902 109.363 -4.872 +v 112.086 109.363 -4.907 +v 112.087 109.363 -4.908 +v 111.902 109.575 -4.92 +v 112.087 109.56 -4.952 +v 112.245 109.363 -5.009 +v 112.1 109.666 -5.026 +v 112.246 109.517 -5.044 +v 111.902 109.576 -4.92 +v 112.087 109.67 -5.028 +v 112.246 108.837 -5.01 +v 112.246 109.363 -5.01 +v 112.355 108.837 -5.16 +v 112.272 108.69 -5.077 +v 112.355 109.363 -5.16 +v 112.365 108.818 -5.183 +v 112.26 108.67 -5.065 +v 112.378 108.667 -5.23 +v 112.365 109.382 -5.183 +v 112.367 109.672 -5.269 +v 112.356 109.706 -5.277 +v 112.272 109.51 -5.077 +v 112.26 109.53 -5.065 +v 112.245 109.542 -5.062 +v 112.328 109.796 -5.3 +v 112.268 109.882 -5.315 +v 112.232 109.907 -5.316 +v 112.09 109.956 -5.308 +v 112.19 109.936 -5.318 +v 110.098 109.363 -4.872 +v 110.098 109.575 -4.92 +v 110.098 109.576 -4.92 +v 111.902 109.746 -5.05 +v 110.098 109.746 -5.05 +v 109.913 109.56 -4.952 +v 109.985 109.95 -5.293 +v 112.015 109.95 -5.293 +v 112.015 110.058 -5.39 +v 109.985 110.058 -5.39 +v 112.015 110.124 -5.42 +v 109.89 110.06 -5.397 +v 109.985 110.124 -5.42 +v 109.767 110.03 -5.401 +v 109.663 109.962 -5.4 +v 109.81 109.936 -5.318 +v 109.768 109.907 -5.316 +v 109.67 109.794 -5.299 +v 109.583 109.856 -5.392 +v 109.73 109.88 -5.315 +v 109.913 109.67 -5.028 +v 109.9 109.666 -5.026 +v 109.908 109.956 -5.308 +v 109.754 109.517 -5.044 +v 109.755 109.363 -5.009 +v 109.913 109.363 -4.908 +v 109.914 109.363 -4.907 +v 109.755 108.837 -5.009 +v 109.754 109.363 -5.01 +v 109.754 108.837 -5.01 +v 109.754 108.683 -5.044 +v 109.645 109.363 -5.16 +v 109.728 109.51 -5.077 +v 109.645 108.837 -5.16 +v 109.635 109.382 -5.183 +v 109.635 108.818 -5.183 +v 109.728 108.69 -5.077 +v 109.633 108.528 -5.269 +v 109.525 108.818 -5.336 +v 109.53 108.488 -5.378 +v 109.622 109.533 -5.23 +v 109.525 109.382 -5.336 +v 109.644 108.494 -5.277 +v 109.74 108.67 -5.065 +v 109.755 108.658 -5.062 +v 109.672 108.404 -5.3 +v 109.366 109.382 -5.437 +v 109.512 109.552 -5.359 +v 109.366 109.577 -5.443 +v 109.653 109.697 -5.273 +v 109.755 109.542 -5.062 +v 109.74 109.53 -5.065 +v 118.5 108.8 -0.476 +v 118.5 108.64 -0.786 +v 118.5 108.933 -0.514 +v 118.5 107.227 0.343 +v 118.5 108.905 -0.863 +v 118.5 107.065 0.032 +v 118.5 109.07 -0.498 +v 118.5 109.18 -0.83 +v 118.5 113.832 1.06 +v 118.5 113.94 0.728 +v 118.5 114.158 1.087 +v 118.5 114.104 0.741 +v 118.5 114.46 0.962 +v 118.5 114.255 0.679 +v 118.5 114.674 0.713 +v 118.5 114.362 0.554 +v 118.5 114.75 0.395 +v 118.5 114.4 0.395 +v 118.4 106.894 0.516 +v 118.4 106.733 0.205 +v 118.125 106.65 0.642 +v 118.125 106.49 0.332 +v 117.75 106.562 0.689 +v 117.75 106.4 0.378 +v 104.25 106.562 0.689 +v 104.25 106.4 0.378 +v 103.875 106.65 0.642 +v 103.875 106.49 0.332 +v 118.5 114.225 -5.075 +v 118.5 114.4 -5.378 +v 118.5 114.353 -4.947 +v 118.5 114.656 -5.122 +v 118.5 114.4 -4.772 +v 118.5 114.75 -4.772 +v 118.5 106.413 -5.519 +v 118.5 105.825 -5.858 +v 118.4 105.5 -6.046 +v 118.125 105.262 -6.183 +v 117.75 105.175 -6.233 +v 104.25 105.175 -6.233 +v 103.875 105.262 -6.183 +v 103.5 106.413 -5.519 +v 103.6 105.5 -6.046 +v 103.5 105.825 -5.858 +v 103.5 114.4 -5.378 +v 103.5 114.656 -5.122 +v 103.5 114.75 -4.772 +v 103.5 114.75 0.395 +v 103.325 114.797 0.395 +v 103.325 114.797 -4.772 +v 118.675 114.797 -4.772 +v 103.5 114.674 0.713 +v 118.675 114.797 0.395 +v 119.676 115.375 -4.772 +v 119.676 115.375 0.395 +v 120.326 115.75 -4.022 +v 120 115.563 -4.671 +v 120.326 115.75 -0.355 +v 120.24 115.7 0.02 +v 120 115.563 0.295 +v 120.24 115.7 -4.397 +v 103.5 114.46 0.962 +v 103.5 114.158 1.087 +v 103.5 113.832 1.06 +v 103.5 109.07 -0.498 +v 103.5 108.933 -0.514 +v 103.5 108.8 -0.476 +v 103.6 106.894 0.516 +v 103.5 107.227 0.343 +v 103.5 108.64 -0.786 +v 103.6 106.733 0.205 +v 103.5 107.065 0.032 +v 103.5 108.905 -0.863 +v 103.5 109.18 -0.83 +v 103.5 113.94 0.728 +v 103.5 114.104 0.741 +v 103.5 114.255 0.679 +v 103.5 114.362 0.554 +v 103.5 114.4 0.395 +v 118.68 114.424 -4.772 +v 118.68 114.424 0.395 +v 103.5 114.4 -4.772 +v 103.32 114.424 0.395 +v 103.5 114.353 -4.947 +v 103.32 114.424 -4.772 +v 103.15 114.494 0.395 +v 103.15 114.494 -4.772 +v 103.5 114.225 -5.075 +v 118.85 114.494 -4.772 +v 118.85 114.494 0.395 +v 119.85 115.072 -4.772 +v 119.85 115.072 0.395 +v 120.5 115.447 -4.022 +v 120.414 115.397 -4.397 +v 120.176 115.26 -4.671 +v 120.5 115.447 -0.355 +v 120.176 115.26 0.295 +v 120.414 115.397 0.02 +v 102.324 115.375 0.395 +v 102.15 115.072 0.395 +v 102.15 115.072 -4.772 +v 102.324 115.375 -4.772 +v 101.824 115.26 -4.671 +v 102 115.563 -4.671 +v 101.586 115.397 -4.397 +v 101.76 115.7 -4.397 +v 101.5 115.447 -4.022 +v 101.674 115.75 -4.022 +v 101.5 115.447 -0.355 +v 101.674 115.75 -0.355 +v 101.586 115.397 0.02 +v 101.76 115.7 0.02 +v 101.824 115.26 0.295 +v 102 115.563 0.295 +v -109.515 109.668 -4.844 +v -109.392 109.823 -5.064 +v -109.602 110.105 -5.075 +v -109.763 109.878 -4.784 +v -109.512 109.625 -4.815 +v -109.49 109.647 -4.85 +v -109.63 110.12 -5.075 +v -109.584 110.13 -5.1 +v -109.783 109.886 -4.786 +v -109.783 109.7 -4.658 +v -109.746 110.182 -5.075 +v -110.098 110.014 -4.826 +v -109.985 110.218 -5.068 +v -109.735 110.212 -5.1 +v -111.902 110.014 -4.826 +v -112.015 110.218 -5.068 +v -110.098 109.725 -4.602 +v -112.015 110.25 -5.097 +v -109.985 110.25 -5.097 +v -112.217 109.886 -4.786 +v -112.137 110.212 -5.073 +v -111.902 109.725 -4.602 +v -110.098 109.722 -4.602 +v -111.902 109.722 -4.602 +v -110.098 109.363 -4.522 +v -109.785 109.363 -4.582 +v -109.515 109.363 -4.754 +v -109.783 109.363 -4.583 +v -109.515 108.837 -4.754 +v -109.512 109.363 -4.756 +v -109.783 108.837 -4.583 +v -109.47 109.61 -4.87 +v -109.512 108.837 -4.756 +v -109.328 109.363 -5.013 +v -109.317 109.382 -5.035 +v -109.385 109.814 -5.063 +v -109.284 109.382 -5.08 +v -109.355 109.827 -5.095 +v -109.317 108.818 -5.035 +v -109.328 108.837 -5.013 +v -109.364 108.446 -5.06 +v -109.47 108.59 -4.87 +v -109.512 108.575 -4.815 +v -109.333 108.435 -5.093 +v -109.284 108.818 -5.08 +v -109.4 108.386 -5.063 +v -109.49 108.553 -4.85 +v -109.515 108.532 -4.844 +v -109.566 108.124 -5.075 +v -109.546 108.1 -5.1 +v -109.763 108.322 -4.784 +v -109.783 108.5 -4.658 +v -109.522 108.07 -5.116 +v -109.293 108.42 -5.114 +v -109.237 108.818 -5.111 +v -109.237 109.382 -5.111 +v -109.18 108.818 -5.122 +v -109.18 109.382 -5.122 +v -109.318 109.844 -5.115 +v -109.562 110.16 -5.116 +v -109.722 110.247 -5.116 +v -109.985 110.27 -5.106 +v -109.985 110.29 -5.116 +v -112.015 110.27 -5.106 +v -112.015 110.29 -5.116 +v -112.15 110.28 -5.116 +v -112.142 110.243 -5.1 +v -112.308 110.194 -5.1 +v -112.295 110.165 -5.076 +v -112.237 109.878 -4.784 +v -112.217 109.7 -4.658 +v -112.37 110.117 -5.075 +v -109.25 108.405 -5.122 +v -112.015 110.333 -5.122 +v -109.985 110.333 -5.122 +v -109.708 110.284 -5.122 +v -112.156 110.32 -5.122 +v -112.34 110.264 -5.122 +v -118.5 114.05 -5.122 +v -112.504 110.16 -5.122 +v -112.324 110.228 -5.116 +v -123.5 114.05 -5.122 +v -112.75 109.795 -5.122 +v -103.5 114.05 -5.122 +v -109.54 110.193 -5.122 +v -98.5 114.05 -5.122 +v -109.277 109.863 -5.122 +v -99.942 109.794 -5.122 +v -99.498 110.35 -5.122 +v -98.856 110.66 -5.122 +v -97.273 113.896 -5.122 +v -100.1 109.1 -5.122 +v -99.942 108.406 -5.122 +v -99.498 107.85 -5.122 +v -102.09 106.588 -5.122 +v -98.856 107.54 -5.122 +v -103.5 106.588 -5.122 +v -101.785 106.523 -5.122 +v -101.534 106.342 -5.122 +v -100.662 105.616 -5.122 +v -99.624 105.157 -5.122 +v -98.5 105 -5.122 +v -98.144 107.54 -5.122 +v -97.376 105.157 -5.122 +v -97.502 107.85 -5.122 +v -96.338 105.616 -5.122 +v -97.058 108.406 -5.122 +v -95.466 106.342 -5.122 +v -95.215 106.523 -5.122 +v -94.911 106.588 -5.122 +v -94.688 106.588 -5.122 +v -94.41 106.64 -5.122 +v -93.632 108.2 -5.122 +v -96.9 109.1 -5.122 +v -94.007 107.023 -5.122 +v -94.172 106.793 -5.122 +v -93.561 109.436 -5.122 +v -93.799 110.65 -5.122 +v -97.058 109.794 -5.122 +v -94.33 111.766 -5.122 +v -97.502 110.35 -5.122 +v -95.12 112.717 -5.122 +v -96.123 113.442 -5.122 +v -98.144 110.66 -5.122 +v -109.496 108.04 -5.122 +v -109.66 107.936 -5.122 +v -109.844 107.88 -5.122 +v -109.985 107.867 -5.122 +v -118.5 106.588 -5.122 +v -118.5 106.406 -5.146 +v -103.5 106.406 -5.146 +v -112.015 107.867 -5.122 +v -122.058 108.406 -5.122 +v -119.91 106.588 -5.122 +v -120.215 106.523 -5.122 +v -122.502 107.85 -5.122 +v -121.338 105.616 -5.122 +v -120.466 106.342 -5.122 +v -121.9 109.1 -5.122 +v -112.015 107.91 -5.116 +v -112.292 107.916 -5.122 +v -109.985 107.91 -5.116 +v -109.85 107.92 -5.116 +v -112.015 107.93 -5.106 +v -112.278 107.953 -5.116 +v -112.438 108.04 -5.116 +v -112.46 108.007 -5.122 +v -112.265 107.988 -5.1 +v -109.985 107.93 -5.106 +v -112.015 107.95 -5.097 +v -109.985 107.95 -5.097 +v -109.858 107.957 -5.1 +v -112.015 107.982 -5.068 +v -112.254 108.018 -5.075 +v -112.416 108.07 -5.1 +v -109.985 107.982 -5.068 +v -111.902 108.186 -4.826 +v -109.863 107.988 -5.073 +v -109.692 108.006 -5.1 +v -109.783 108.314 -4.786 +v -109.705 108.035 -5.076 +v -110.098 108.186 -4.826 +v -111.902 108.475 -4.602 +v -110.098 108.475 -4.602 +v -111.902 108.478 -4.602 +v -112.217 108.5 -4.658 +v -110.098 108.478 -4.602 +v -111.902 108.837 -4.522 +v -112.215 108.837 -4.582 +v -110.098 108.837 -4.522 +v -109.785 108.837 -4.582 +v -109.63 108.083 -5.075 +v -109.676 107.972 -5.116 +v -112.488 108.575 -4.815 +v -112.237 108.322 -4.784 +v -112.217 108.314 -4.786 +v -112.485 108.837 -4.754 +v -112.217 108.837 -4.583 +v -112.37 108.08 -5.075 +v -112.398 108.095 -5.075 +v -112.485 108.532 -4.844 +v -112.608 108.377 -5.064 +v -112.645 108.372 -5.095 +v -112.682 108.356 -5.115 +v -112.51 108.553 -4.85 +v -112.615 108.386 -5.063 +v -112.53 108.59 -4.87 +v -112.683 108.818 -5.035 +v -112.716 108.818 -5.08 +v -112.672 108.837 -5.013 +v -112.488 108.837 -4.756 +v -112.488 109.363 -4.756 +v -112.485 109.363 -4.754 +v -112.683 109.382 -5.035 +v -112.672 109.363 -5.013 +v -112.636 109.754 -5.06 +v -112.716 109.382 -5.08 +v -112.667 109.765 -5.093 +v -112.488 109.625 -4.815 +v -112.53 109.61 -4.87 +v -112.485 109.668 -4.844 +v -112.51 109.647 -4.85 +v -112.6 109.814 -5.063 +v -112.434 110.076 -5.075 +v -112.454 110.1 -5.1 +v -112.478 110.13 -5.116 +v -112.707 109.78 -5.114 +v -112.763 109.382 -5.111 +v -112.82 109.382 -5.122 +v -112.763 108.818 -5.111 +v -112.82 108.818 -5.122 +v -112.723 108.337 -5.122 +v -123.144 110.66 -5.122 +v -123.856 110.66 -5.122 +v -122.502 110.35 -5.122 +v -122.058 109.794 -5.122 +v -125.877 113.442 -5.122 +v -124.498 110.35 -5.122 +v -124.727 113.895 -5.122 +v -126.88 112.717 -5.122 +v -124.942 109.794 -5.122 +v -127.67 111.766 -5.122 +v -128.2 110.65 -5.122 +v -125.1 109.1 -5.122 +v -128.44 109.436 -5.122 +v -128.368 108.2 -5.122 +v -124.942 108.406 -5.122 +v -127.993 107.023 -5.122 +v -127.828 106.793 -5.122 +v -127.59 106.64 -5.122 +v -127.312 106.588 -5.122 +v -127.09 106.588 -5.122 +v -126.785 106.523 -5.122 +v -126.534 106.342 -5.122 +v -124.498 107.85 -5.122 +v -125.662 105.616 -5.122 +v -123.856 107.54 -5.122 +v -124.624 105.157 -5.122 +v -123.5 105 -5.122 +v -123.144 107.54 -5.122 +v -122.376 105.157 -5.122 +v -112.215 109.363 -4.582 +v -112.217 109.363 -4.583 +v -111.902 109.363 -4.522 +v -118.5 106.238 -5.216 +v -103.5 106.238 -5.216 +v -118.5 105.65 -5.555 +v -103.5 105.65 -5.555 +v -117.75 105 -5.93 +v -118.125 105.087 -5.88 +v -118.4 105.325 -5.743 +v -104.25 105 -5.93 +v -103.6 105.325 -5.743 +v -103.875 105.087 -5.88 +v -111.902 108.837 -4.872 +v -110.098 108.837 -4.872 +v -111.902 108.625 -4.92 +v -112.086 108.837 -4.907 +v -110.098 108.625 -4.92 +v -109.914 108.837 -4.907 +v -111.902 108.624 -4.92 +v -112.087 108.64 -4.952 +v -112.086 109.363 -4.907 +v -111.902 109.363 -4.872 +v -111.902 109.575 -4.92 +v -112.087 109.56 -4.952 +v -110.098 109.363 -4.872 +v -112.246 109.517 -5.044 +v -112.1 109.666 -5.026 +v -112.245 109.363 -5.009 +v -112.087 109.363 -4.908 +v -111.902 109.576 -4.92 +v -110.098 109.575 -4.92 +v -112.087 108.837 -4.908 +v -112.245 108.837 -5.009 +v -112.246 109.363 -5.01 +v -112.246 108.837 -5.01 +v -112.246 108.683 -5.044 +v -112.355 109.363 -5.16 +v -112.272 109.51 -5.077 +v -112.355 108.837 -5.16 +v -112.365 109.382 -5.183 +v -112.365 108.818 -5.183 +v -112.272 108.69 -5.077 +v -112.367 108.528 -5.269 +v -112.475 108.818 -5.336 +v -112.47 108.488 -5.378 +v -112.378 109.533 -5.23 +v -112.475 109.382 -5.336 +v -112.634 108.818 -5.437 +v -112.6 108.438 -5.448 +v -112.356 108.494 -5.277 +v -112.416 108.34 -5.392 +v -112.26 108.67 -5.065 +v -112.245 108.658 -5.062 +v -112.328 108.404 -5.3 +v -112.336 108.237 -5.4 +v -112.522 108.266 -5.452 +v -112.268 108.318 -5.315 +v -112.1 108.534 -5.026 +v -112.087 108.53 -5.028 +v -112.232 108.293 -5.316 +v -112.09 108.244 -5.308 +v -112.19 108.264 -5.318 +v -112.233 108.17 -5.401 +v -112.015 108.25 -5.293 +v -112.015 108.142 -5.39 +v -112.108 108.14 -5.396 +v -112.285 108.057 -5.454 +v -112.416 108.14 -5.454 +v -112.13 108.014 -5.453 +v -112.5 108.043 -5.472 +v -112.34 107.934 -5.472 +v -112.537 108.07 -5.472 +v -118.5 106.588 -5.472 +v -112.15 107.883 -5.472 +v -112.107 107.87 -5.472 +v -112.015 107.867 -5.472 +v -112.015 108.01 -5.45 +v -103.5 106.588 -5.472 +v -109.985 107.867 -5.472 +v -99.942 108.406 -5.472 +v -102.09 106.588 -5.472 +v -100.1 109.1 -5.472 +v -101.785 106.523 -5.472 +v -99.498 107.85 -5.472 +v -100.662 105.616 -5.472 +v -101.534 106.342 -5.472 +v -98.856 107.54 -5.472 +v -99.624 105.157 -5.472 +v -98.144 107.54 -5.472 +v -98.5 105 -5.472 +v -97.502 107.85 -5.472 +v -96.338 105.616 -5.472 +v -97.376 105.157 -5.472 +v -97.058 108.406 -5.472 +v -95.466 106.342 -5.472 +v -95.215 106.523 -5.472 +v -94.911 106.588 -5.472 +v -94.688 106.588 -5.472 +v -94.41 106.64 -5.472 +v -94.172 106.793 -5.472 +v -94.007 107.023 -5.472 +v -93.632 108.2 -5.472 +v -96.9 109.1 -5.472 +v -93.561 109.436 -5.472 +v -97.058 109.794 -5.472 +v -93.799 110.65 -5.472 +v -97.502 110.35 -5.472 +v -95.12 112.717 -5.472 +v -94.33 111.766 -5.472 +v -98.144 110.66 -5.472 +v -96.123 113.442 -5.472 +v -98.856 110.66 -5.472 +v -98.5 114.05 -5.472 +v -97.273 113.896 -5.472 +v -99.498 110.35 -5.472 +v -103.5 114.05 -5.472 +v -99.942 109.794 -5.472 +v -118.5 114.05 -5.472 +v -109.736 107.904 -5.472 +v -109.663 107.943 -5.472 +v -109.37 110.01 -5.472 +v -109.463 110.13 -5.472 +v -109.85 110.317 -5.472 +v -109.5 110.157 -5.472 +v -109.66 110.266 -5.472 +v -109.528 108.014 -5.472 +v -109.5 108.044 -5.472 +v -109.354 108.198 -5.472 +v -109.22 109.706 -5.472 +v -109.263 109.815 -5.472 +v -109.307 109.927 -5.472 +v -109.238 108.435 -5.472 +v -109.208 108.596 -5.472 +v -109.184 108.724 -5.472 +v -109.18 108.818 -5.472 +v -109.18 109.382 -5.472 +v -109.868 108.014 -5.453 +v -109.715 108.057 -5.454 +v -109.582 108.143 -5.454 +v -109.767 108.17 -5.401 +v -109.477 108.27 -5.452 +v -109.663 108.238 -5.4 +v -109.366 108.623 -5.443 +v -109.583 108.344 -5.392 +v -109.768 108.293 -5.316 +v -109.73 108.32 -5.315 +v -109.81 108.264 -5.318 +v -109.913 108.53 -5.028 +v -109.9 108.534 -5.026 +v -109.908 108.244 -5.308 +v -109.89 108.14 -5.397 +v -109.913 108.64 -4.952 +v -110.098 108.454 -5.05 +v -109.985 108.25 -5.293 +v -109.985 108.142 -5.39 +v -109.985 108.076 -5.42 +v -111.902 108.454 -5.05 +v -110.098 108.624 -4.92 +v -109.913 108.837 -4.908 +v -112.015 108.076 -5.42 +v -109.985 108.01 -5.45 +v -109.845 107.888 -5.472 +v -109.893 110.328 -5.472 +v -109.985 110.333 -5.472 +v -112.015 110.333 -5.472 +v -122.502 110.35 -5.472 +v -123.5 114.05 -5.472 +v -122.058 109.794 -5.472 +v -121.9 109.1 -5.472 +v -112.015 110.19 -5.45 +v -112.155 110.312 -5.472 +v -123.144 110.66 -5.472 +v -124.727 113.895 -5.472 +v -123.856 110.66 -5.472 +v -125.877 113.442 -5.472 +v -124.498 110.35 -5.472 +v -126.88 112.717 -5.472 +v -124.942 109.794 -5.472 +v -127.67 111.766 -5.472 +v -125.1 109.1 -5.472 +v -128.2 110.65 -5.472 +v -124.942 108.406 -5.472 +v -128.368 108.2 -5.472 +v -128.44 109.436 -5.472 +v -127.993 107.023 -5.472 +v -127.828 106.793 -5.472 +v -127.59 106.64 -5.472 +v -127.312 106.588 -5.472 +v -127.09 106.588 -5.472 +v -126.785 106.523 -5.472 +v -126.534 106.342 -5.472 +v -125.662 105.616 -5.472 +v -124.498 107.85 -5.472 +v -124.624 105.157 -5.472 +v -123.856 107.54 -5.472 +v -123.5 105 -5.472 +v -123.144 107.54 -5.472 +v -122.376 105.157 -5.472 +v -121.338 105.616 -5.472 +v -122.502 107.85 -5.472 +v -120.466 106.342 -5.472 +v -122.058 108.406 -5.472 +v -120.215 106.523 -5.472 +v -112.82 108.818 -5.472 +v -112.78 108.494 -5.472 +v -112.82 109.382 -5.472 +v -112.634 109.382 -5.437 +v -119.91 106.588 -5.472 +v -112.737 108.385 -5.472 +v -112.488 109.552 -5.359 +v -112.347 109.697 -5.273 +v -112.245 109.542 -5.062 +v -112.33 109.794 -5.299 +v -112.26 109.53 -5.065 +v -112.232 109.906 -5.316 +v -112.27 109.88 -5.315 +v -112.417 109.856 -5.392 +v -112.337 109.962 -5.4 +v -112.19 109.936 -5.318 +v -112.087 109.67 -5.028 +v -112.233 110.03 -5.401 +v -112.418 110.057 -5.454 +v -112.285 110.143 -5.454 +v -112.523 109.93 -5.452 +v -112.5 110.156 -5.472 +v -112.472 110.186 -5.472 +v -112.634 109.577 -5.443 +v -112.762 109.765 -5.472 +v -112.646 110.002 -5.472 +v -112.816 109.476 -5.472 +v -112.792 109.604 -5.472 +v -112.337 110.257 -5.472 +v -112.264 110.296 -5.472 +v -112.132 110.186 -5.453 +v -112.11 110.06 -5.397 +v -109.985 110.19 -5.45 +v -109.87 110.186 -5.453 +v -109.715 110.143 -5.454 +v -109.584 110.06 -5.454 +v -109.478 109.934 -5.452 +v -112.693 108.273 -5.472 +v -112.63 108.19 -5.472 +v -110.098 109.576 -4.92 +v -109.913 109.56 -4.952 +v -109.914 109.363 -4.907 +v -110.098 109.746 -5.05 +v -109.913 109.67 -5.028 +v -111.902 109.746 -5.05 +v -112.015 109.95 -5.293 +v -109.985 109.95 -5.293 +v -112.092 109.956 -5.308 +v -112.015 110.058 -5.39 +v -112.015 110.124 -5.42 +v -109.985 110.124 -5.42 +v -109.985 110.058 -5.39 +v -109.892 110.06 -5.396 +v -109.91 109.956 -5.308 +v -109.767 110.03 -5.401 +v -109.664 109.963 -5.4 +v -109.768 109.907 -5.316 +v -109.81 109.936 -5.318 +v -109.584 109.86 -5.392 +v -109.732 109.882 -5.315 +v -109.4 109.762 -5.448 +v -109.644 109.706 -5.277 +v -109.672 109.796 -5.3 +v -109.53 109.712 -5.378 +v -109.9 109.666 -5.026 +v -109.755 109.542 -5.062 +v -109.754 109.517 -5.044 +v -109.74 109.53 -5.065 +v -109.728 109.51 -5.077 +v -109.645 109.363 -5.16 +v -109.633 109.672 -5.269 +v -109.635 109.382 -5.183 +v -109.635 108.818 -5.183 +v -109.525 109.382 -5.336 +v -109.366 109.382 -5.437 +v -109.525 108.818 -5.336 +v -109.366 108.818 -5.437 +v -109.512 108.648 -5.359 +v -109.622 108.667 -5.23 +v -109.67 108.406 -5.299 +v -109.653 108.503 -5.273 +v -109.754 108.683 -5.044 +v -109.755 108.658 -5.062 +v -109.755 108.837 -5.009 +v -109.913 109.363 -4.908 +v -109.755 109.363 -5.009 +v -109.754 108.837 -5.01 +v -109.754 109.363 -5.01 +v -109.645 108.837 -5.16 +v -109.728 108.69 -5.077 +v -109.74 108.67 -5.065 +v -103.5 108.8 -0.476 +v -103.5 108.64 -0.786 +v -103.5 108.933 -0.514 +v -103.5 107.227 0.343 +v -103.5 108.905 -0.863 +v -103.5 107.065 0.032 +v -103.5 109.07 -0.498 +v -103.5 109.18 -0.83 +v -103.5 113.832 1.06 +v -103.5 113.94 0.728 +v -103.5 114.158 1.087 +v -103.5 114.104 0.741 +v -103.5 114.46 0.962 +v -103.5 114.255 0.679 +v -103.5 114.673 0.713 +v -103.5 114.362 0.554 +v -103.5 114.75 0.395 +v -103.5 114.4 0.395 +v -103.6 106.894 0.516 +v -103.6 106.733 0.205 +v -103.875 106.65 0.642 +v -103.875 106.49 0.332 +v -103.5 114.225 -5.075 +v -103.5 114.4 -5.378 +v -103.5 114.353 -4.947 +v -103.5 114.656 -5.122 +v -103.5 114.4 -4.772 +v -103.5 114.75 -4.772 +v -103.5 106.413 -5.519 +v -103.5 105.825 -5.858 +v -103.6 105.5 -6.046 +v -103.875 105.262 -6.183 +v -104.25 105.175 -6.233 +v -117.75 105.175 -6.233 +v -118.5 106.413 -5.519 +v -118.125 105.262 -6.183 +v -118.4 105.5 -6.046 +v -118.5 105.825 -5.858 +v -118.5 114.4 -5.378 +v -118.5 114.656 -5.122 +v -118.5 114.75 -4.772 +v -118.5 114.75 0.395 +v -118.675 114.797 0.395 +v -118.675 114.797 -4.772 +v -103.325 114.797 -4.772 +v -118.5 114.673 0.713 +v -103.325 114.797 0.395 +v -118.5 114.46 0.962 +v -118.5 114.158 1.087 +v -119.676 115.375 -4.772 +v -119.676 115.375 0.395 +v -120.326 115.75 -4.022 +v -120.24 115.7 -4.397 +v -120 115.563 -4.671 +v -120.326 115.75 -0.355 +v -120 115.562 0.295 +v -120.24 115.7 0.02 +v -118.5 113.832 1.06 +v -118.5 109.07 -0.498 +v -118.5 108.933 -0.514 +v -118.5 108.8 -0.476 +v -118.4 106.894 0.516 +v -118.125 106.65 0.642 +v -118.5 107.227 0.343 +v -117.75 106.562 0.689 +v -104.25 106.562 0.689 +v -117.75 106.4 0.378 +v -104.25 106.4 0.378 +v -118.125 106.49 0.332 +v -118.4 106.733 0.205 +v -118.5 107.065 0.032 +v -118.5 108.64 -0.786 +v -118.5 108.905 -0.863 +v -118.5 109.18 -0.83 +v -118.5 113.94 0.728 +v -118.5 114.104 0.741 +v -118.5 114.255 0.679 +v -118.5 114.362 0.554 +v -118.5 114.4 0.395 +v -103.32 114.424 -4.772 +v -103.32 114.424 0.395 +v -118.5 114.4 -4.772 +v -118.68 114.424 0.395 +v -118.5 114.353 -4.947 +v -118.68 114.424 -4.772 +v -118.85 114.494 0.395 +v -118.85 114.494 -4.772 +v -119.85 115.072 -4.772 +v -119.85 115.072 0.395 +v -120.5 115.447 -4.022 +v -120.176 115.26 -4.671 +v -120.5 115.447 -0.355 +v -120.414 115.397 0.02 +v -120.176 115.26 0.295 +v -120.414 115.397 -4.397 +v -118.5 114.225 -5.075 +v -103.15 114.494 -4.772 +v -103.15 114.494 0.395 +v -102.15 115.072 0.395 +v -102.324 115.375 0.395 +v -102.324 115.375 -4.772 +v -102.15 115.072 -4.772 +v -102 115.563 -4.671 +v -101.824 115.26 -4.671 +v -101.76 115.7 -4.397 +v -101.586 115.397 -4.397 +v -101.674 115.75 -4.022 +v -101.5 115.447 -4.022 +v -101.674 115.75 -0.355 +v -101.5 115.447 -0.355 +v -101.76 115.7 0.02 +v -101.586 115.397 0.02 +v -102 115.563 0.295 +v -101.824 115.26 0.295 +v 93.32 -120.02 -3.846 +v 93.603 -120.302 -3.846 +v 93.522 -120.383 -3.272 +v 93.24 -120.1 -3.272 +v 93.55 -119.79 -4.333 +v 93.833 -120.072 -4.333 +v 93.894 -119.445 -4.658 +v 94.177 -119.728 -4.658 +v 94.3 -119.04 -4.772 +v 94.583 -119.322 -4.772 +v 93.24 -120.1 -1.104 +v 93.522 -120.383 -1.104 +v 93.603 -120.302 -0.53 +v 93.32 -120.02 -0.53 +v 93.833 -120.072 -0.043 +v 93.55 -119.79 -0.043 +v 94.177 -119.728 0.282 +v 93.894 -119.445 0.282 +v 94.583 -119.322 0.396 +v 94.3 -119.04 0.396 +v 112 -107.178 0.406 +v 112 -107.366 0.759 +v 112.574 -107.466 0.705 +v 112.574 -107.28 0.352 +v 100 -107.178 0.406 +v 100 -107.366 0.759 +v 99.426 -107.28 0.352 +v 99.426 -107.466 0.705 +v 98.94 -107.566 0.2 +v 98.94 -107.753 0.552 +v 98.614 -107.995 -0.03 +v 98.614 -108.183 0.324 +v 98.5 -108.502 -0.299 +v 98.5 -108.69 0.054 +v 98.5 -109.37 -0.76 +v 98.5 -109.557 -0.406 +v 98.5 -109.69 -0.446 +v 98.5 -109.656 -0.844 +v 98.5 -109.83 -0.43 +v 98.5 -109.953 -0.81 +v 98.5 -114.568 1.11 +v 98.5 -114.692 0.73 +v 98.5 -114.917 1.137 +v 98.5 -114.855 0.742 +v 98.5 -115.24 1.003 +v 98.5 -115.006 0.68 +v 98.5 -115.468 0.737 +v 98.5 -115.112 0.555 +v 98.5 -115.55 0.396 +v 98.5 -115.15 0.396 +v 113.06 -107.753 0.552 +v 113.06 -107.566 0.2 +v 113.386 -108.183 0.324 +v 113.386 -107.995 -0.03 +v 113.5 -108.69 0.054 +v 113.5 -108.502 -0.299 +v 113.5 -109.557 -0.406 +v 113.5 -109.37 -0.76 +v 113.5 -109.69 -0.446 +v 113.5 -109.656 -0.844 +v 113.5 -109.83 -0.43 +v 113.5 -109.953 -0.81 +v 113.5 -114.568 1.11 +v 113.5 -114.692 0.73 +v 113.5 -114.855 0.742 +v 113.5 -114.917 1.137 +v 113.5 -115.006 0.68 +v 113.5 -115.24 1.003 +v 113.5 -115.112 0.555 +v 113.5 -115.468 0.737 +v 113.5 -115.15 0.396 +v 113.5 -115.55 0.396 +v 113.5 -115.55 -4.772 +v 113.5 -115.15 -4.772 +v 113.5 -115.103 -4.947 +v 113.5 -115.45 -5.147 +v 113.5 -114.975 -5.075 +v 113.5 -115.175 -5.421 +v 113.5 -114.8 -5.122 +v 113.5 -114.8 -5.522 +v 113.5 -106.197 -5.672 +v 113.5 -106.397 -6.018 +v 113.386 -105.9 -6.305 +v 113.386 -105.7 -5.959 +v 113.5 -106.976 -5.222 +v 113.5 -107.176 -5.569 +v 113.5 -107.35 -5.522 +v 113.5 -107.35 -5.122 +v 113.06 -105.48 -6.549 +v 113.06 -105.28 -6.202 +v 112.574 -105.197 -6.711 +v 112.574 -104.997 -6.365 +v 112 -105.098 -6.768 +v 112 -104.898 -6.422 +v 100 -105.098 -6.768 +v 100 -104.898 -6.422 +v 99.426 -105.197 -6.711 +v 99.426 -104.997 -6.365 +v 98.94 -105.48 -6.549 +v 98.94 -105.28 -6.202 +v 98.614 -105.9 -6.305 +v 98.614 -105.7 -5.959 +v 98.5 -106.397 -6.018 +v 98.5 -106.197 -5.672 +v 98.5 -107.176 -5.569 +v 98.5 -106.976 -5.222 +v 98.5 -107.35 -5.522 +v 98.5 -107.35 -5.122 +v 98.5 -114.8 -5.522 +v 98.5 -114.8 -5.122 +v 98.5 -114.975 -5.075 +v 98.5 -115.175 -5.421 +v 98.5 -115.103 -4.947 +v 98.5 -115.45 -5.147 +v 98.5 -115.15 -4.772 +v 98.5 -115.55 -4.772 +v 127.57 -107.35 -5.522 +v 127.57 -107.35 -5.122 +v 127.64 -107.363 -5.122 +v 127.64 -107.363 -5.522 +v 126.806 -107.35 -5.522 +v 126.806 -107.35 -5.122 +v 126.722 -107.332 -5.522 +v 126.722 -107.332 -5.122 +v 126.653 -107.28 -5.522 +v 126.653 -107.28 -5.122 +v 125.763 -106.48 -5.522 +v 125.763 -106.48 -5.122 +v 124.682 -105.974 -5.522 +v 124.682 -105.974 -5.122 +v 123.5 -105.8 -5.522 +v 123.5 -105.8 -5.122 +v 122.318 -105.974 -5.522 +v 122.318 -105.974 -5.122 +v 121.237 -106.48 -5.522 +v 121.237 -106.48 -5.122 +v 120.347 -107.28 -5.522 +v 120.347 -107.28 -5.122 +v 120.278 -107.332 -5.522 +v 120.278 -107.332 -5.122 +v 120.194 -107.35 -5.522 +v 120.194 -107.35 -5.122 +v 127.7 -107.398 -5.122 +v 127.7 -107.398 -5.522 +v 127.744 -107.45 -5.122 +v 127.744 -107.45 -5.522 +v 98.213 -115.207 -4.772 +v 98.213 -115.207 0.396 +v 97.97 -115.37 -4.772 +v 97.97 -115.37 0.396 +v 125.95 -114.144 -5.122 +v 126.965 -113.365 -5.122 +v 124.244 -111.317 -5.122 +v 124.768 -114.633 -5.122 +v 124.817 -110.81 -5.122 +v 127.743 -112.35 -5.122 +v 123.5 -111.5 -5.122 +v 123.5 -114.8 -5.122 +v 122.756 -111.317 -5.122 +v 122.183 -110.81 -5.122 +v 121.912 -110.093 -5.122 +v 122.004 -109.333 -5.122 +v 122.44 -108.702 -5.122 +v 123.117 -108.347 -5.122 +v 123.883 -108.347 -5.122 +v 124.56 -108.702 -5.122 +v 124.996 -109.333 -5.122 +v 128.233 -108.633 -5.122 +v 128.4 -109.9 -5.122 +v 125.088 -110.093 -5.122 +v 128.233 -111.17 -5.122 +v 125.088 -110.093 -5.522 +v 124.996 -109.333 -5.522 +v 128.233 -108.633 -5.522 +v 128.4 -109.9 -5.522 +v 128.233 -111.17 -5.522 +v 124.817 -110.81 -5.522 +v 124.56 -108.702 -5.522 +v 123.883 -108.347 -5.522 +v 123.117 -108.347 -5.522 +v 122.44 -108.702 -5.522 +v 122.004 -109.333 -5.522 +v 121.912 -110.093 -5.522 +v 122.183 -110.81 -5.522 +v 123.5 -114.8 -5.522 +v 122.756 -111.317 -5.522 +v 123.5 -111.5 -5.522 +v 124.768 -114.633 -5.522 +v 124.244 -111.317 -5.522 +v 125.95 -114.144 -5.522 +v 126.965 -113.365 -5.522 +v 127.743 -112.35 -5.522 +v 98.366 -115.577 -4.772 +v 98.366 -115.577 0.396 +v 98.252 -115.653 -4.772 +v 98.252 -115.653 0.396 +v -93.894 -119.445 -4.658 +v -94.177 -119.728 -4.658 +v -94.583 -119.322 -4.772 +v -94.3 -119.04 -4.772 +v -93.55 -119.79 -4.333 +v -93.833 -120.072 -4.333 +v -93.32 -120.02 -3.846 +v -93.603 -120.302 -3.846 +v -93.24 -120.1 -3.272 +v -93.522 -120.383 -3.272 +v -93.24 -120.1 -1.104 +v -93.522 -120.383 -1.104 +v -93.32 -120.02 -0.53 +v -93.603 -120.302 -0.53 +v -93.55 -119.79 -0.043 +v -93.833 -120.072 -0.043 +v -93.894 -119.445 0.282 +v -94.177 -119.728 0.282 +v -94.3 -119.04 0.396 +v -94.583 -119.322 0.396 +v -113.5 -108.502 -0.299 +v -113.5 -108.69 0.054 +v -113.386 -108.183 0.324 +v -113.386 -107.995 -0.03 +v -113.5 -109.37 -0.76 +v -113.5 -109.557 -0.406 +v -113.5 -109.69 -0.446 +v -113.5 -109.656 -0.844 +v -113.5 -109.83 -0.43 +v -113.5 -109.953 -0.81 +v -113.5 -114.568 1.11 +v -113.5 -114.692 0.73 +v -113.5 -114.917 1.137 +v -113.5 -114.855 0.742 +v -113.5 -115.24 1.003 +v -113.5 -115.006 0.68 +v -113.5 -115.468 0.737 +v -113.5 -115.112 0.555 +v -113.5 -115.55 0.396 +v -113.5 -115.15 0.396 +v -113.5 -115.55 -4.772 +v -113.5 -115.15 -4.772 +v -113.5 -115.45 -5.147 +v -113.5 -115.103 -4.947 +v -113.5 -115.175 -5.421 +v -113.5 -114.975 -5.075 +v -113.5 -114.8 -5.522 +v -113.5 -114.8 -5.122 +v -113.06 -107.753 0.552 +v -113.06 -107.566 0.2 +v -112.574 -107.466 0.705 +v -112.574 -107.28 0.352 +v -112 -107.366 0.759 +v -112 -107.178 0.406 +v -100 -107.366 0.759 +v -100 -107.178 0.406 +v -99.426 -107.466 0.705 +v -99.426 -107.28 0.352 +v -98.94 -107.753 0.552 +v -98.94 -107.566 0.2 +v -98.614 -108.183 0.324 +v -98.614 -107.995 -0.03 +v -98.5 -108.69 0.054 +v -98.5 -108.502 -0.299 +v -98.5 -109.557 -0.406 +v -98.5 -109.37 -0.76 +v -98.5 -109.69 -0.446 +v -98.5 -109.656 -0.844 +v -98.5 -109.83 -0.43 +v -98.5 -109.953 -0.81 +v -98.5 -114.568 1.11 +v -98.5 -114.692 0.73 +v -98.5 -114.855 0.742 +v -98.5 -114.917 1.137 +v -98.5 -115.006 0.68 +v -98.5 -115.24 1.003 +v -98.5 -115.112 0.555 +v -98.5 -115.468 0.737 +v -98.5 -115.15 0.396 +v -98.5 -115.55 0.396 +v -112 -104.898 -6.422 +v -112 -105.098 -6.768 +v -112.574 -105.197 -6.711 +v -112.574 -104.997 -6.365 +v -100 -104.898 -6.422 +v -100 -105.098 -6.768 +v -99.426 -104.997 -6.365 +v -99.426 -105.197 -6.711 +v -98.94 -105.28 -6.202 +v -98.94 -105.48 -6.549 +v -98.614 -105.7 -5.959 +v -98.614 -105.9 -6.305 +v -98.5 -106.197 -5.672 +v -98.5 -106.397 -6.018 +v -98.5 -106.976 -5.222 +v -98.5 -107.176 -5.569 +v -98.5 -107.35 -5.122 +v -98.5 -107.35 -5.522 +v -98.5 -114.8 -5.122 +v -98.5 -114.8 -5.522 +v -98.5 -114.975 -5.075 +v -98.5 -115.175 -5.421 +v -98.5 -115.103 -4.947 +v -98.5 -115.45 -5.147 +v -98.5 -115.15 -4.772 +v -98.5 -115.55 -4.772 +v -113.06 -105.48 -6.549 +v -113.06 -105.28 -6.202 +v -113.386 -105.9 -6.305 +v -113.386 -105.7 -5.959 +v -113.5 -106.397 -6.018 +v -113.5 -106.197 -5.672 +v -113.5 -107.176 -5.569 +v -113.5 -106.976 -5.222 +v -113.5 -107.35 -5.122 +v -113.5 -107.35 -5.522 +v -127.744 -107.45 -5.522 +v -127.744 -107.45 -5.122 +v -127.7 -107.398 -5.122 +v -127.7 -107.398 -5.522 +v -127.64 -107.363 -5.122 +v -127.64 -107.363 -5.522 +v -127.57 -107.35 -5.122 +v -127.57 -107.35 -5.522 +v -126.806 -107.35 -5.122 +v -126.806 -107.35 -5.522 +v -126.722 -107.332 -5.522 +v -126.722 -107.332 -5.122 +v -126.653 -107.28 -5.522 +v -126.653 -107.28 -5.122 +v -125.763 -106.48 -5.122 +v -125.763 -106.48 -5.522 +v -124.682 -105.974 -5.122 +v -124.682 -105.974 -5.522 +v -123.5 -105.8 -5.122 +v -123.5 -105.8 -5.522 +v -122.318 -105.974 -5.122 +v -122.318 -105.974 -5.522 +v -121.237 -106.48 -5.122 +v -121.237 -106.48 -5.522 +v -120.347 -107.28 -5.122 +v -120.347 -107.28 -5.522 +v -120.278 -107.332 -5.522 +v -120.278 -107.332 -5.122 +v -120.194 -107.35 -5.522 +v -120.194 -107.35 -5.122 +v -98.213 -115.207 0.396 +v -98.213 -115.207 -4.772 +v -97.97 -115.37 0.396 +v -97.97 -115.37 -4.772 +v -123.5 -114.8 -5.122 +v -123.5 -111.5 -5.122 +v -124.768 -114.633 -5.122 +v -122.183 -110.81 -5.122 +v -122.756 -111.317 -5.122 +v -124.244 -111.317 -5.122 +v -125.95 -114.144 -5.122 +v -124.817 -110.81 -5.122 +v -126.965 -113.365 -5.122 +v -125.088 -110.093 -5.122 +v -128.233 -111.17 -5.122 +v -127.743 -112.35 -5.122 +v -124.996 -109.333 -5.122 +v -128.233 -108.633 -5.122 +v -128.4 -109.9 -5.122 +v -124.56 -108.702 -5.122 +v -123.883 -108.347 -5.122 +v -123.117 -108.347 -5.122 +v -122.44 -108.702 -5.122 +v -122.004 -109.333 -5.122 +v -121.912 -110.093 -5.122 +v -121.912 -110.093 -5.522 +v -122.004 -109.333 -5.522 +v -122.183 -110.81 -5.522 +v -122.44 -108.702 -5.522 +v -123.117 -108.347 -5.522 +v -123.883 -108.347 -5.522 +v -124.56 -108.702 -5.522 +v -124.996 -109.333 -5.522 +v -128.233 -108.633 -5.522 +v -128.4 -109.9 -5.522 +v -125.088 -110.093 -5.522 +v -128.233 -111.17 -5.522 +v -124.817 -110.81 -5.522 +v -127.743 -112.35 -5.522 +v -126.965 -113.365 -5.522 +v -124.244 -111.317 -5.522 +v -125.95 -114.144 -5.522 +v -123.5 -111.5 -5.522 +v -124.768 -114.633 -5.522 +v -122.756 -111.317 -5.522 +v -123.5 -114.8 -5.522 +v -98.366 -115.577 -4.772 +v -98.366 -115.577 0.396 +v -98.252 -115.653 0.396 +v -98.252 -115.653 -4.772 +v 128.5 109.1 -0.6 +v 128.5 -109.9 -0.6 +v 128.5 109.1 -4.6 +v 127.83 111.6 -4.6 +v 127.83 111.6 -0.6 +v 128.5 -109.9 -4.6 +v 127.83 -112.4 -0.6 +v 127.83 -112.4 -4.6 +v 126 -114.23 -0.6 +v 126 -114.23 -4.6 +v 123.5 -114.9 -0.6 +v 123.5 -114.9 -4.6 +v 126 113.43 -4.6 +v 126 113.43 -0.6 +v 123.5 114.1 -4.6 +v -123.5 114.1 -4.6 +v 123.5 114.1 -0.6 +v -123.5 114.1 -0.6 +v -123.5 -114.9 -0.6 +v -128.5 -109.9 -0.6 +v -128.5 109.1 -0.6 +v -127.83 111.6 -0.6 +v -126 113.43 -0.6 +v -127.83 -112.4 -0.6 +v -126 -114.23 -0.6 +v -123.5 -114.9 -4.6 +v -128.5 109.1 -4.6 +v -126 113.43 -4.6 +v -128.5 -109.9 -4.6 +v -127.83 111.6 -4.6 +v -127.83 -112.4 -4.6 +v -126 -114.23 -4.6 +v 127.657 -112.678 -4.6 +v 127.037 -113.437 -4.6 +v 127.657 -112.678 -6.2 +v 128.12 -111.814 -4.6 +v 128.12 -111.814 -6.2 +v 127.037 -113.437 -6.2 +v 126.278 -114.06 -4.6 +v 126.278 -114.06 -6.2 +v 125.414 -114.52 -4.6 +v 125.414 -114.52 -6.2 +v 124.477 -114.806 -4.6 +v 124.477 -114.806 -6.2 +v 123.498 -114.9 -4.6 +v 123.498 -114.9 -6.2 +v 117.75 -114.9 -6.2 +v 117.75 -114.9 -4.6 +v 104.25 -114.9 -6.2 +v 104.25 -114.9 -4.6 +v 49.25 -114.9 -6.2 +v 49.25 -114.9 -4.6 +v 128.283 -111.275 -4.6 +v 128.283 -111.275 -6.2 +v 128.403 -110.877 -4.6 +v 128.403 -110.877 -6.2 +v 128.5 -109.9 -4.6 +v 128.5 -109.9 -6.2 +v 128.5 -0.4 -4.6 +v 128.5 -0.4 -6.2 +v 128.5 107.725 -4.6 +v 128.5 107.725 -6.2 +v 128.5 109.102 -4.6 +v 128.5 109.102 -6.2 +v 128.227 110.475 -4.6 +v 128.227 110.475 -6.2 +v 128.12 111.016 -4.6 +v 128.12 111.016 -6.2 +v 127.035 112.638 -6.2 +v 127.035 112.638 -4.6 +v 125.412 113.72 -6.2 +v 125.412 113.72 -4.6 +v 123.5 114.1 -6.2 +v 123.5 114.1 -4.6 +v 117.75 114.1 -6.2 +v 117.75 114.1 -4.6 +v 104.25 114.1 -6.2 +v 104.25 114.1 -4.6 +v 49.25 114.1 -6.2 +v 49.25 114.1 -4.6 +v -123.498 114.1 -6.2 +v -123.498 114.1 -4.6 +v -117.75 114.1 -6.2 +v -125.412 113.72 -6.2 +v -117.75 114.1 -4.6 +v -125.412 113.72 -4.6 +v -104.25 114.1 -6.2 +v -104.25 114.1 -4.6 +v -49.25 114.1 -6.2 +v -49.25 114.1 -4.6 +v -126.75 112.828 -4.6 +v -126.75 112.828 -6.2 +v -127.035 112.638 -4.6 +v -127.035 112.638 -6.2 +v -128.12 111.016 -6.2 +v -128.12 111.016 -4.6 +v -128.227 110.475 -6.2 +v -128.227 110.475 -4.6 +v -128.5 109.102 -6.2 +v -128.5 109.102 -4.6 +v -128.5 107.725 -4.6 +v -128.5 107.725 -6.2 +v -128.5 -0.4 -4.6 +v -128.5 -0.4 -6.2 +v -128.5 -109.9 -4.6 +v -128.5 -109.9 -6.2 +v -128.403 -110.877 -4.6 +v -128.403 -110.877 -6.2 +v -128.282 -111.275 -4.6 +v -128.282 -111.275 -6.2 +v -128.12 -111.814 -4.6 +v -128.12 -111.814 -6.2 +v -127.656 -112.678 -4.6 +v -127.656 -112.678 -6.2 +v -127.034 -113.437 -4.6 +v -127.034 -113.437 -6.2 +v -126.75 -113.67 -4.6 +v -126.75 -113.67 -6.2 +v -126.277 -114.06 -4.6 +v -126.277 -114.06 -6.2 +v -125.414 -114.52 -4.6 +v -125.414 -114.52 -6.2 +v -124.476 -114.806 -4.6 +v -124.476 -114.806 -6.2 +v -123.498 -114.9 -4.6 +v -123.498 -114.9 -6.2 +v -117.75 -114.9 -4.6 +v -117.75 -114.9 -6.2 +v -104.25 -114.9 -4.6 +v -104.25 -114.9 -6.2 +v -49.25 -114.9 -4.6 +v -49.25 -114.9 -6.2 +v 97.75 110.4 -4.6 +v 98.034 110.475 -4.6 +v 49.25 110.475 -4.6 +v 97.2 109.85 -4.6 +v 98.5 110.6 -4.6 +v 98.966 110.475 -4.6 +v 104.25 110.475 -4.6 +v 117.75 110.475 -4.6 +v 99.25 110.4 -4.6 +v 99.8 109.85 -4.6 +v 104.25 107.725 -4.6 +v 100 109.1 -4.6 +v 99.8 108.35 -4.6 +v 99.25 107.8 -4.6 +v 98.966 107.725 -4.6 +v 98.5 107.6 -4.6 +v 104.25 -0.4 -4.6 +v 98.034 107.725 -4.6 +v 49.25 107.725 -4.6 +v 49.25 -0.4 -4.6 +v 0 107.6 -4.6 +v 0.467 107.725 -4.6 +v 104.25 -111.275 -4.6 +v 49.25 -111.275 -4.6 +v 123.033 -111.275 -4.6 +v 117.75 -111.275 -4.6 +v 123.5 -111.4 -4.6 +v 122.75 -111.2 -4.6 +v 122.2 -110.65 -4.6 +v 122 -109.9 -4.6 +v 122.2 -109.15 -4.6 +v 122.75 -108.6 -4.6 +v 117.75 -0.4 -4.6 +v 123.5 -108.4 -4.6 +v 124.25 -108.6 -4.6 +v 124.8 -109.15 -4.6 +v 125 -109.9 -4.6 +v 124.8 -110.65 -4.6 +v 124.25 -111.2 -4.6 +v 123.967 -111.275 -4.6 +v 123.967 107.725 -4.6 +v 123.5 107.6 -4.6 +v 123.033 107.725 -4.6 +v 124.25 107.8 -4.6 +v 124.8 108.35 -4.6 +v 125 109.1 -4.6 +v 124.8 109.85 -4.6 +v 124.25 110.4 -4.6 +v 123.966 110.475 -4.6 +v 123.5 110.6 -4.6 +v 123.034 110.475 -4.6 +v 122.75 110.4 -4.6 +v 122.2 109.85 -4.6 +v 122 109.1 -4.6 +v 117.75 107.725 -4.6 +v 122.2 108.35 -4.6 +v 122.75 107.8 -4.6 +v 113.5 109.35 -4.6 +v 113.5 108.85 -4.6 +v 113.423 108.467 -4.6 +v 113.207 108.143 -4.6 +v 112.882 107.926 -4.6 +v 112.5 107.85 -4.6 +v 113.423 109.733 -4.6 +v 112.882 110.274 -4.6 +v 113.207 110.057 -4.6 +v 112.5 110.35 -4.6 +v 113.33 -109.094 -4.6 +v 112.695 -108.67 -4.6 +v 112.882 -108.726 -4.6 +v 113.055 -108.82 -4.6 +v 113.207 -108.943 -4.6 +v 108.943 -108.82 -4.6 +v 109.117 -108.726 -4.6 +v 109.304 -108.67 -4.6 +v 109.5 -108.65 -4.6 +v 112.5 -108.65 -4.6 +v 113.424 -109.267 -4.6 +v 113.48 -109.455 -4.6 +v 113.5 -109.65 -4.6 +v 113.5 -110.15 -4.6 +v 113.48 -110.345 -4.6 +v 113.424 -110.533 -4.6 +v 113.33 -110.705 -4.6 +v 113.207 -110.856 -4.6 +v 113.055 -110.982 -4.6 +v 112.882 -111.074 -4.6 +v 112.695 -111.13 -4.6 +v 112.5 -111.15 -4.6 +v 108.793 -108.943 -4.6 +v 108.575 -109.267 -4.6 +v 108.667 -109.094 -4.6 +v 108.52 -109.455 -4.6 +v 108.5 -109.65 -4.6 +v 108.5 -110.15 -4.6 +v 108.52 -110.345 -4.6 +v 108.575 -110.533 -4.6 +v 108.667 -110.705 -4.6 +v 108.793 -110.856 -4.6 +v 108.943 -110.982 -4.6 +v 109.117 -111.074 -4.6 +v 109.304 -111.13 -4.6 +v 109.5 -111.15 -4.6 +v 108.5 108.85 -4.6 +v 108.634 108.35 -4.6 +v 109.5 107.85 -4.6 +v 109 107.984 -4.6 +v 108.5 109.35 -4.6 +v 108.634 109.85 -4.6 +v 109 110.216 -4.6 +v 109.5 110.35 -4.6 +v 1.3 109.85 -4.6 +v 1.5 109.1 -4.6 +v 97.75 107.8 -4.6 +v 97.2 108.35 -4.6 +v 97 109.1 -4.6 +v 0.466 110.475 -4.6 +v 0.75 110.4 -4.6 +v 0 110.6 -4.6 +v -49.25 110.475 -4.6 +v -98.034 110.475 -4.6 +v -49.25 107.725 -4.6 +v -1.5 109.1 -4.6 +v -1.3 109.85 -4.6 +v -97.75 110.4 -4.6 +v -97.2 109.85 -4.6 +v -0.466 110.475 -4.6 +v -0.75 110.4 -4.6 +v -104.25 110.475 -4.6 +v -98.966 110.475 -4.6 +v -98.5 110.6 -4.6 +v -99.25 110.4 -4.6 +v -99.8 109.85 -4.6 +v -100 109.1 -4.6 +v -104.25 107.725 -4.6 +v -99.8 108.35 -4.6 +v -99.25 107.8 -4.6 +v -98.966 107.725 -4.6 +v -104.25 -0.4 -4.6 +v -98.5 107.6 -4.6 +v -98.034 107.725 -4.6 +v -49.25 -0.4 -4.6 +v -0.467 107.725 -4.6 +v -49.25 -111.275 -4.6 +v -97 109.1 -4.6 +v -97.2 108.35 -4.6 +v -97.75 107.8 -4.6 +v -117.75 107.725 -4.6 +v -117.75 -0.4 -4.6 +v -104.25 -111.275 -4.6 +v -108.67 -109.094 -4.6 +v -109.305 -108.67 -4.6 +v -109.118 -108.726 -4.6 +v -108.945 -108.82 -4.6 +v -108.793 -108.943 -4.6 +v -113.057 -108.82 -4.6 +v -112.883 -108.726 -4.6 +v -112.696 -108.67 -4.6 +v -112.5 -108.65 -4.6 +v -109.5 -108.65 -4.6 +v -113.207 -108.943 -4.6 +v -113.333 -109.094 -4.6 +v -113.425 -109.267 -4.6 +v -113.48 -109.455 -4.6 +v -117.75 -111.275 -4.6 +v -113.5 -109.65 -4.6 +v -113.5 -110.15 -4.6 +v -113.48 -110.345 -4.6 +v -113.425 -110.533 -4.6 +v -113.333 -110.705 -4.6 +v -113.207 -110.856 -4.6 +v -113.057 -110.982 -4.6 +v -112.883 -111.074 -4.6 +v -112.696 -111.13 -4.6 +v -112.5 -111.15 -4.6 +v -122.75 -108.6 -4.6 +v -122.2 -109.15 -4.6 +v -122 -109.9 -4.6 +v -122.2 -110.65 -4.6 +v -122.75 -111.2 -4.6 +v -123.034 -111.275 -4.6 +v -123.5 -111.4 -4.6 +v -123.966 -111.275 -4.6 +v -126.75 -111.275 -4.6 +v -124.25 -111.2 -4.6 +v -126.75 107.725 -4.6 +v -126.75 -0.4 -4.6 +v -126.75 110.475 -4.6 +v -123.966 110.475 -4.6 +v -124.25 110.4 -4.6 +v -123.5 110.6 -4.6 +v -123.034 110.475 -4.6 +v -122.75 110.4 -4.6 +v -117.75 110.475 -4.6 +v -109.5 110.35 -4.6 +v -109 110.216 -4.6 +v -108.634 109.85 -4.6 +v -108.5 109.35 -4.6 +v -108.5 108.85 -4.6 +v -108.577 108.467 -4.6 +v -108.793 108.143 -4.6 +v -109.118 107.926 -4.6 +v -109.5 107.85 -4.6 +v -122.2 109.85 -4.6 +v -113.366 109.85 -4.6 +v -113 110.216 -4.6 +v -112.5 110.35 -4.6 +v -113.5 108.85 -4.6 +v -113.5 109.35 -4.6 +v -122 109.1 -4.6 +v -122.2 108.35 -4.6 +v -122.75 107.8 -4.6 +v -123.034 107.725 -4.6 +v -123.5 107.6 -4.6 +v -123.966 107.725 -4.6 +v -124.25 107.8 -4.6 +v -124.8 108.35 -4.6 +v -125 109.1 -4.6 +v -124.8 109.85 -4.6 +v -124.8 -109.15 -4.6 +v -123.5 -108.4 -4.6 +v -124.25 -108.6 -4.6 +v -124.8 -110.65 -4.6 +v -125 -109.9 -4.6 +v -113.207 108.143 -4.6 +v -113.424 108.467 -4.6 +v -112.5 107.85 -4.6 +v -112.883 107.926 -4.6 +v -108.576 -109.267 -4.6 +v -108.52 -109.455 -4.6 +v -108.5 -109.65 -4.6 +v -108.5 -110.15 -4.6 +v -108.52 -110.345 -4.6 +v -108.576 -110.533 -4.6 +v -108.67 -110.705 -4.6 +v -108.793 -110.856 -4.6 +v -108.945 -110.982 -4.6 +v -109.118 -111.074 -4.6 +v -109.305 -111.13 -4.6 +v -109.5 -111.15 -4.6 +v 1.3 108.35 -4.6 +v 0.75 107.8 -4.6 +v -0.75 107.8 -4.6 +v -1.3 108.35 -4.6 +v -113.366 109.85 -6.2 +v -113.5 109.35 -6.2 +v -117.75 110.475 -6.2 +v -113 110.216 -6.2 +v -117.75 107.725 -6.2 +v -113.5 108.85 -6.2 +v -113.424 108.467 -6.2 +v -113.207 108.143 -6.2 +v -112.883 107.926 -6.2 +v -112.5 107.85 -6.2 +v -122.75 107.8 -6.2 +v -122.2 108.35 -6.2 +v -122 109.1 -6.2 +v -123.034 107.725 -6.2 +v -117.75 -0.4 -6.2 +v -104.25 -0.4 -6.2 +v -104.25 107.725 -6.2 +v -122.2 109.85 -6.2 +v -122.75 110.4 -6.2 +v -112.5 110.35 -6.2 +v -123.034 110.475 -6.2 +v -104.25 110.475 -6.2 +v -123.5 110.6 -6.2 +v -49.25 110.475 -6.2 +v -98.034 110.475 -6.2 +v -98.5 110.6 -6.2 +v -98.966 110.475 -6.2 +v 0 110.6 -6.2 +v 49.25 110.475 -6.2 +v 98.034 110.475 -6.2 +v 98.5 110.6 -6.2 +v 98.966 110.475 -6.2 +v 104.25 110.475 -6.2 +v 117.75 110.475 -6.2 +v 97.75 110.4 -6.2 +v 49.25 107.725 -6.2 +v 97.2 109.85 -6.2 +v 97 109.1 -6.2 +v 97.2 108.35 -6.2 +v 97.75 107.8 -6.2 +v 98.034 107.725 -6.2 +v 0.75 107.8 -6.2 +v 0.467 107.725 -6.2 +v 49.25 -0.4 -6.2 +v 1.5 109.1 -6.2 +v 1.3 109.85 -6.2 +v 0.75 110.4 -6.2 +v 0.466 110.475 -6.2 +v 104.25 -0.4 -6.2 +v 98.5 107.6 -6.2 +v 104.25 -111.275 -6.2 +v 49.25 -111.275 -6.2 +v 123.033 -111.275 -6.2 +v 117.75 -111.275 -6.2 +v 122.75 -111.2 -6.2 +v 123.5 -111.4 -6.2 +v 123.967 -111.275 -6.2 +v 124.25 -111.2 -6.2 +v 124.8 -110.65 -6.2 +v 125 -109.9 -6.2 +v 124.8 -109.15 -6.2 +v 124.25 -108.6 -6.2 +v 123.5 -108.4 -6.2 +v 117.75 -0.4 -6.2 +v 122.75 -108.6 -6.2 +v 122.2 -109.15 -6.2 +v 122 -109.9 -6.2 +v 122.2 -110.65 -6.2 +v 112.882 -111.074 -6.2 +v 113.055 -110.982 -6.2 +v 113.207 -110.856 -6.2 +v 113.33 -110.705 -6.2 +v 113.424 -110.533 -6.2 +v 113.48 -110.345 -6.2 +v 113.5 -110.15 -6.2 +v 113.5 -109.65 -6.2 +v 112.5 -111.15 -6.2 +v 112.695 -111.13 -6.2 +v 113.48 -109.455 -6.2 +v 113.424 -109.267 -6.2 +v 113.33 -109.094 -6.2 +v 104.25 107.725 -6.2 +v 117.75 107.725 -6.2 +v 123.033 107.725 -6.2 +v 113.207 -108.943 -6.2 +v 113.055 -108.82 -6.2 +v 112.882 -108.726 -6.2 +v 112.695 -108.67 -6.2 +v 112.5 -108.65 -6.2 +v 109.5 -108.65 -6.2 +v 109.304 -108.67 -6.2 +v 109.117 -108.726 -6.2 +v 108.943 -108.82 -6.2 +v 98.966 107.725 -6.2 +v 108.793 -108.943 -6.2 +v 99.25 107.8 -6.2 +v 99.8 108.35 -6.2 +v 100 109.1 -6.2 +v 99.8 109.85 -6.2 +v 99.25 110.4 -6.2 +v 108.634 109.85 -6.2 +v 108.5 109.35 -6.2 +v 109.5 110.35 -6.2 +v 109 110.216 -6.2 +v 108.5 108.85 -6.2 +v 108.634 108.35 -6.2 +v 109 107.984 -6.2 +v 109.5 107.85 -6.2 +v 108.5 -110.15 -6.2 +v 108.52 -110.345 -6.2 +v 108.575 -110.533 -6.2 +v 108.667 -110.705 -6.2 +v 108.793 -110.856 -6.2 +v 108.667 -109.094 -6.2 +v 108.575 -109.267 -6.2 +v 108.52 -109.455 -6.2 +v 108.5 -109.65 -6.2 +v 108.943 -110.982 -6.2 +v 109.117 -111.074 -6.2 +v 109.304 -111.13 -6.2 +v 109.5 -111.15 -6.2 +v 123.967 107.725 -6.2 +v 123.5 107.6 -6.2 +v 124.25 107.8 -6.2 +v 124.8 108.35 -6.2 +v 125 109.1 -6.2 +v 124.8 109.85 -6.2 +v 124.25 110.4 -6.2 +v 123.966 110.475 -6.2 +v 123.5 110.6 -6.2 +v 123.034 110.475 -6.2 +v 122.75 110.4 -6.2 +v 122.2 109.85 -6.2 +v 122 109.1 -6.2 +v 122.2 108.35 -6.2 +v 122.75 107.8 -6.2 +v 112.5 107.85 -6.2 +v 112.882 107.926 -6.2 +v 113.207 108.143 -6.2 +v 113.423 108.467 -6.2 +v 113.5 108.85 -6.2 +v 113.5 109.35 -6.2 +v 113.423 109.733 -6.2 +v 112.882 110.274 -6.2 +v 113.207 110.057 -6.2 +v 112.5 110.35 -6.2 +v -99.25 110.4 -6.2 +v -99.8 109.85 -6.2 +v -100 109.1 -6.2 +v -99.8 108.35 -6.2 +v -99.25 107.8 -6.2 +v -98.966 107.725 -6.2 +v -98.5 107.6 -6.2 +v -98.034 107.725 -6.2 +v -49.25 107.725 -6.2 +v -49.25 -0.4 -6.2 +v -0.467 107.725 -6.2 +v -0.75 110.4 -6.2 +v -1.3 109.85 -6.2 +v -1.5 109.1 -6.2 +v -97.75 107.8 -6.2 +v -49.25 -111.275 -6.2 +v -104.25 -111.275 -6.2 +v -117.75 -111.275 -6.2 +v -123.034 -111.275 -6.2 +v -123.5 -111.4 -6.2 +v -122.75 -111.2 -6.2 +v -122.2 -110.65 -6.2 +v -122 -109.9 -6.2 +v -122.2 -109.15 -6.2 +v -122.75 -108.6 -6.2 +v -126.75 -0.4 -6.2 +v -123.5 -108.4 -6.2 +v -124.25 -108.6 -6.2 +v -124.8 -109.15 -6.2 +v -126.75 -111.275 -6.2 +v -125 -109.9 -6.2 +v -124.8 -110.65 -6.2 +v -124.25 -111.2 -6.2 +v -123.966 -111.275 -6.2 +v -126.75 107.725 -6.2 +v -126.75 110.475 -6.2 +v -123.966 110.475 -6.2 +v -124.25 110.4 -6.2 +v -124.8 109.85 -6.2 +v -124.8 108.35 -6.2 +v -124.25 107.8 -6.2 +v -123.966 107.725 -6.2 +v -125 109.1 -6.2 +v -123.5 107.6 -6.2 +v -113.207 -108.943 -6.2 +v -108.67 -109.094 -6.2 +v -108.793 -108.943 -6.2 +v -112.696 -108.67 -6.2 +v -112.883 -108.726 -6.2 +v -113.057 -108.82 -6.2 +v -108.945 -108.82 -6.2 +v -109.118 -108.726 -6.2 +v -109.305 -108.67 -6.2 +v -109.5 -108.65 -6.2 +v -112.5 -108.65 -6.2 +v -108.576 -109.267 -6.2 +v -108.52 -109.455 -6.2 +v -108.5 -109.65 -6.2 +v -108.5 -110.15 -6.2 +v -108.52 -110.345 -6.2 +v -108.576 -110.533 -6.2 +v -108.67 -110.705 -6.2 +v -108.793 -110.856 -6.2 +v -108.945 -110.982 -6.2 +v -109.118 -111.074 -6.2 +v -109.305 -111.13 -6.2 +v -109.5 -111.15 -6.2 +v -113.333 -109.094 -6.2 +v -113.425 -109.267 -6.2 +v -113.48 -109.455 -6.2 +v -113.5 -109.65 -6.2 +v -113.5 -110.15 -6.2 +v -113.48 -110.345 -6.2 +v -113.425 -110.533 -6.2 +v -113.333 -110.705 -6.2 +v -113.207 -110.856 -6.2 +v -113.057 -110.982 -6.2 +v -112.883 -111.074 -6.2 +v -112.696 -111.13 -6.2 +v -112.5 -111.15 -6.2 +v -97.2 108.35 -6.2 +v -97 109.1 -6.2 +v -97.2 109.85 -6.2 +v -97.75 110.4 -6.2 +v -0.466 110.475 -6.2 +v -109.118 107.926 -6.2 +v -108.793 108.143 -6.2 +v -109.5 107.85 -6.2 +v -108.577 108.467 -6.2 +v -108.5 108.85 -6.2 +v -108.5 109.35 -6.2 +v -108.634 109.85 -6.2 +v -109 110.216 -6.2 +v -109.5 110.35 -6.2 +v 1.3 108.35 -6.2 +v 0 107.6 -6.2 +v -1.3 108.35 -6.2 +v -0.75 107.8 -6.2 +v 122.036 -94.626 -21.882 +v 101.377 158.248 -21.882 +v 102.42 158.248 -20.258 +v 123.073 -94.54 -20.258 +v 121.66 -94.657 -22.218 +v 99.747 158.248 -22.922 +v 102.7 158.248 -18.7 +v 123.35 -94.52 -18.7 +v 102.7 158.248 -10.15 +v 122.698 -86.545 -10.15 +v 123.35 -94.52 -18.15 +v 123.024 -90.532 -11.222 +v 123.263 -93.45 -14.15 +v 120.4 -94.855 -22.874 +v 98.184 158.248 -23.2 +v 120.11 -94.9 -23.026 +v 118.89 -95.176 -23.2 +v 120.36 -94.763 -18.7 +v 99.69 158.248 -18.7 +v 99.596 158.248 -19.22 +v 120.267 -94.77 -19.22 +v 120.36 -94.763 -18.15 +v 99.69 158.248 -10.15 +v 119.708 -86.79 -10.15 +v 120.034 -90.776 -11.222 +v 120.273 -93.695 -14.15 +v 99.248 158.248 -19.76 +v 119.922 -94.8 -19.76 +v 98.705 158.248 -20.107 +v 119.384 -94.936 -20.096 +v 119.797 -94.81 -19.873 +v 98.184 158.248 -20.2 +v 118.89 -95.176 -20.2 +v 119.312 -94.958 -20.134 +v 117.875 -95.903 -23.2 +v 117.875 -95.903 -20.2 +v 116.904 -97.444 -23.2 +v 116.904 -97.444 -20.2 +v 116.718 -99.256 -23.2 +v 116.718 -99.256 -20.2 +v 117.353 -100.963 -23.2 +v 117.353 -100.963 -20.2 +v -98.184 158.247 -20.2 +v -98.184 158.247 -23.2 +v -98.705 158.247 -20.107 +v -99.747 158.247 -22.922 +v -99.248 158.247 -19.76 +v -101.377 158.247 -21.882 +v -99.596 158.247 -19.22 +v -102.42 158.247 -20.258 +v -99.69 158.247 -18.7 +v -102.7 158.247 -18.7 +v -99.69 158.247 -10.15 +v -102.7 158.247 -10.15 +v -119.312 -94.958 -20.134 +v -120.418 -94.852 -22.89 +v -118.89 -95.176 -20.2 +v -119.384 -94.936 -20.096 +v -120.594 -94.815 -22.854 +v -118.89 -95.176 -23.2 +v -117.875 -95.903 -20.2 +v -117.875 -95.903 -23.2 +v -116.904 -97.444 -20.2 +v -116.904 -97.444 -23.2 +v -116.718 -99.256 -20.2 +v -116.718 -99.256 -23.2 +v -117.353 -100.963 -20.2 +v -117.353 -100.963 -23.2 +v -121.66 -94.657 -22.218 +v -119.797 -94.81 -19.873 +v -122.036 -94.626 -21.882 +v -119.922 -94.8 -19.76 +v -123.073 -94.54 -20.258 +v -120.267 -94.77 -19.22 +v -123.35 -94.52 -18.7 +v -120.36 -94.763 -18.7 +v -120.36 -94.763 -18.15 +v -123.35 -94.52 -18.15 +v -120.273 -93.695 -14.15 +v -123.263 -93.45 -14.15 +v -120.034 -90.776 -11.222 +v -123.024 -90.532 -11.222 +v -119.708 -86.79 -10.15 +v -122.698 -86.545 -10.15 +v 131 -109.9 -20.2 +v 130.24 -106.607 -20.2 +v 128.11 -103.983 -20.2 +v 125.043 -102.56 -20.2 +v 121.664 -102.628 -20.2 +v 131 -114.9 -20.2 +v 120.422 -102.74 -20.2 +v -131 -114.9 -20.2 +v -118.68 -102.21 -20.2 +v 118.68 -102.21 -20.2 +v -128.11 -103.983 -20.2 +v -130.24 -106.607 -20.2 +v -125.043 -102.56 -20.2 +v -131 -109.9 -20.2 +v -121.664 -102.628 -20.2 +v -120.422 -102.74 -20.2 +v 118.68 -102.21 -23.2 +v 120.422 -102.74 -23.2 +v 121.664 -102.628 -23.2 +v 125.043 -102.56 -23.2 +v 128.11 -103.983 -23.2 +v 130.24 -106.607 -23.2 +v -131 -114.9 -23.2 +v 131 -114.9 -23.2 +v -118.68 -102.21 -23.2 +v 131 -109.9 -23.2 +v -131 -109.9 -23.2 +v -130.24 -106.607 -23.2 +v -128.11 -103.983 -23.2 +v -125.043 -102.56 -23.2 +v -121.664 -102.628 -23.2 +v -120.422 -102.74 -23.2 +v 131 -118.9 -16.2 +v 131 -118.9 -16.17 +v 131 -121.9 -16.2 +v 131 -118.364 -18.2 +v 131 -121.9 -16.17 +v 130.196 -118.9 -13.17 +v 131 -120.963 -19.7 +v 131 -116.9 -19.664 +v 131 -118.4 -22.262 +v 130.196 -121.9 -13.17 +v 128 -118.9 -10.974 +v 128 -121.9 -10.974 +v 125 -118.9 -10.17 +v 125 -121.9 -10.17 +v 88.5 -118.9 -10.17 +v 88.5 -121.9 -10.17 +v 86.848 -121.9 -9.812 +v 86.848 -118.9 -9.812 +v 78.618 -118.9 -7.09 +v 78.618 -121.9 -7.09 +v 70 -118.9 -6.17 +v 70 -121.9 -6.17 +v -131 -121.9 -16.2 +v -131 -121.9 -16.17 +v -131 -118.9 -16.2 +v -131 -120.963 -19.7 +v -131 -118.9 -16.17 +v -130.196 -121.9 -13.17 +v -131 -118.364 -18.2 +v -131 -118.4 -22.262 +v -131 -116.9 -19.664 +v -130.196 -118.9 -13.17 +v -128 -121.9 -10.974 +v -128 -118.9 -10.974 +v -125 -121.9 -10.17 +v -125 -118.9 -10.17 +v -88.5 -118.9 -10.17 +v -88.5 -121.9 -10.17 +v -86.848 -118.9 -9.812 +v -86.848 -121.9 -9.812 +v -78.618 -121.9 -7.09 +v -78.618 -118.9 -7.09 +v -70 -121.9 -6.17 +v -70 -118.9 -6.17 +vt 0 1 +vt 0.998 1.8 +vt 0.002 1.8 +vt 1 0.8 +vt 0 0.8 +f 1/1 2/1 3/1 +f 4/1 2/1 1/1 +f 5/1 6/1 2/1 +f 7/1 2/1 4/1 +f 7/1 4/1 8/1 +f 5/1 2/1 7/1 +f 9/1 6/1 5/1 +f 10/1 11/1 6/1 +f 12/1 13/1 5/1 +f 5/1 13/1 9/1 +f 14/1 9/1 15/1 +f 15/1 9/1 13/1 +f 16/1 17/1 18/1 +f 17/1 19/1 20/1 +f 18/1 21/1 13/1 +f 18/1 17/1 21/1 +f 13/1 21/1 22/1 +f 13/1 22/1 15/1 +f 13/1 12/1 23/1 +f 18/1 23/1 24/1 +f 13/1 23/1 18/1 +f 18/1 24/1 16/1 +f 25/1 26/1 27/1 +f 27/1 26/1 28/1 +f 28/1 26/1 29/1 +f 25/1 30/1 26/1 +f 29/1 31/1 32/1 +f 32/1 33/1 34/1 +f 34/1 33/1 35/1 +f 29/1 26/1 31/1 +f 32/1 31/1 33/1 +f 35/1 33/1 36/1 +f 35/1 36/1 37/1 +f 32/1 34/1 38/1 +f 39/1 32/1 38/1 +f 38/1 35/1 40/1 +f 20/1 38/1 41/1 +f 41/1 40/1 42/1 +f 21/1 41/1 22/1 +f 22/1 42/1 15/1 +f 28/1 29/1 39/1 +f 43/1 44/1 39/1 +f 39/1 44/1 28/1 +f 39/1 45/1 46/1 +f 39/1 46/1 43/1 +f 28/1 44/1 47/1 +f 28/1 47/1 27/1 +f 20/1 19/1 45/1 +f 20/1 21/1 17/1 +f 20/1 45/1 39/1 +f 34/1 35/1 38/1 +f 38/1 40/1 41/1 +f 39/1 38/1 20/1 +f 41/1 42/1 22/1 +f 20/1 41/1 21/1 +f 29/1 32/1 39/1 +f 15/1 42/1 14/1 +f 14/1 42/1 10/1 +f 10/1 42/1 11/1 +f 11/1 40/1 48/1 +f 48/1 40/1 49/1 +f 49/1 35/1 6/1 +f 11/1 42/1 40/1 +f 49/1 40/1 35/1 +f 12/1 5/1 7/1 +f 50/1 24/1 51/1 +f 51/1 23/1 52/1 +f 53/1 51/1 54/1 +f 52/1 12/1 55/1 +f 54/1 52/1 56/1 +f 55/1 12/1 7/1 +f 56/1 55/1 57/1 +f 58/1 57/1 59/1 +f 60/1 56/1 58/1 +f 33/1 58/1 36/1 +f 60/1 58/1 33/1 +f 36/1 59/1 37/1 +f 51/1 24/1 23/1 +f 52/1 23/1 12/1 +f 50/1 51/1 53/1 +f 60/1 61/1 54/1 +f 54/1 61/1 62/1 +f 54/1 62/1 53/1 +f 60/1 63/1 61/1 +f 33/1 31/1 60/1 +f 60/1 64/1 63/1 +f 26/1 30/1 64/1 +f 60/1 31/1 26/1 +f 26/1 64/1 60/1 +f 52/1 55/1 56/1 +f 51/1 52/1 54/1 +f 56/1 57/1 58/1 +f 54/1 56/1 60/1 +f 58/1 59/1 36/1 +f 2/1 37/1 3/1 +f 3/1 59/1 1/1 +f 1/1 59/1 4/1 +f 4/1 57/1 8/1 +f 8/1 55/1 7/1 +f 3/1 37/1 59/1 +f 4/1 59/1 57/1 +f 8/1 57/1 55/1 +f 16/1 44/1 43/1 +f 53/1 62/1 50/1 +f 50/1 62/1 16/1 +f 50/1 16/1 24/1 +f 27/1 44/1 16/1 +f 19/1 17/1 45/1 +f 45/1 16/1 46/1 +f 46/1 16/1 43/1 +f 45/1 17/1 16/1 +f 25/1 63/1 30/1 +f 25/1 62/1 63/1 +f 30/1 63/1 64/1 +f 63/1 62/1 61/1 +f 47/1 44/1 27/1 +f 27/1 16/1 25/1 +f 25/1 16/1 62/1 +f 35/2 37/3 6/4 +f 6/4 37/3 2/5 +f 9/1 14/1 6/1 +f 6/1 14/1 10/1 +f 6/1 11/1 48/1 +f 6/1 48/1 49/1 +f 65/1 66/1 67/1 +f 68/1 69/1 65/1 +f 68/1 65/1 70/1 +f 69/1 71/1 65/1 +f 65/1 71/1 72/1 +f 65/1 72/1 66/1 +f 67/1 66/1 73/1 +f 67/1 73/1 74/1 +f 67/1 74/1 75/1 +f 73/1 76/1 77/1 +f 73/1 77/1 74/1 +f 66/1 76/1 73/1 +f 75/1 74/1 78/1 +f 74/1 77/1 79/1 +f 74/1 79/1 78/1 +f 76/1 80/1 77/1 +f 77/1 80/1 81/1 +f 77/1 81/1 79/1 +f 78/1 79/1 82/1 +f 79/1 81/1 83/1 +f 79/1 83/1 82/1 +f 78/1 82/1 84/1 +f 84/1 82/1 85/1 +f 82/1 83/1 85/1 +f 83/1 81/1 86/1 +f 87/1 85/1 83/1 +f 86/1 88/1 83/1 +f 83/1 88/1 87/1 +f 86/1 81/1 80/1 +f 89/1 86/1 80/1 +f 86/1 89/1 88/1 +f 89/1 80/1 90/1 +f 89/1 90/1 91/1 +f 90/1 92/1 93/1 +f 91/1 90/1 93/1 +f 92/1 90/1 76/1 +f 76/1 90/1 80/1 +f 91/1 93/1 94/1 +f 94/1 95/1 91/1 +f 94/1 93/1 96/1 +f 93/1 92/1 97/1 +f 93/1 97/1 96/1 +f 94/1 96/1 98/1 +f 95/1 94/1 98/1 +f 98/1 96/1 99/1 +f 100/1 99/1 96/1 +f 100/1 96/1 101/1 +f 101/1 96/1 97/1 +f 72/1 97/1 92/1 +f 71/1 101/1 97/1 +f 71/1 97/1 72/1 +f 102/1 100/1 101/1 +f 102/1 101/1 71/1 +f 103/1 104/1 100/1 +f 103/1 100/1 102/1 +f 104/1 99/1 100/1 +f 69/1 103/1 102/1 +f 69/1 102/1 71/1 +f 69/1 105/1 103/1 +f 105/1 104/1 103/1 +f 99/1 104/1 106/1 +f 105/1 107/1 104/1 +f 106/1 104/1 107/1 +f 108/1 105/1 69/1 +f 108/1 109/1 105/1 +f 109/1 107/1 105/1 +f 110/1 69/1 68/1 +f 111/1 108/1 110/1 +f 112/1 113/1 111/1 +f 111/1 113/1 108/1 +f 114/1 111/1 115/1 +f 113/1 116/1 108/1 +f 112/1 117/1 113/1 +f 117/1 118/1 113/1 +f 113/1 119/1 116/1 +f 113/1 118/1 119/1 +f 120/1 121/1 117/1 +f 120/1 117/1 112/1 +f 122/1 121/1 120/1 +f 123/1 122/1 120/1 +f 123/1 120/1 124/1 +f 122/1 125/1 121/1 +f 125/1 126/1 121/1 +f 127/1 122/1 123/1 +f 128/1 127/1 123/1 +f 129/1 130/1 127/1 +f 129/1 127/1 128/1 +f 130/1 131/1 127/1 +f 132/1 129/1 128/1 +f 132/1 128/1 133/1 +f 134/1 129/1 132/1 +f 135/1 130/1 129/1 +f 136/1 135/1 129/1 +f 136/1 129/1 134/1 +f 135/1 137/1 130/1 +f 137/1 138/1 130/1 +f 139/1 137/1 135/1 +f 140/1 139/1 135/1 +f 140/1 135/1 141/1 +f 141/1 135/1 136/1 +f 142/1 137/1 139/1 +f 143/1 142/1 139/1 +f 143/1 139/1 144/1 +f 144/1 139/1 140/1 +f 140/1 145/1 144/1 +f 141/1 146/1 140/1 +f 144/1 145/1 143/1 +f 147/1 142/1 143/1 +f 143/1 148/1 147/1 +f 143/1 149/1 148/1 +f 147/1 148/1 150/1 +f 147/1 150/1 151/1 +f 147/1 152/1 142/1 +f 151/1 152/1 147/1 +f 148/1 149/1 153/1 +f 148/1 153/1 150/1 +f 151/1 150/1 154/1 +f 153/1 155/1 150/1 +f 150/1 155/1 154/1 +f 151/1 154/1 156/1 +f 156/1 157/1 151/1 +f 151/1 157/1 152/1 +f 152/1 158/1 142/1 +f 157/1 159/1 152/1 +f 152/1 159/1 158/1 +f 160/1 161/1 157/1 +f 161/1 162/1 157/1 +f 157/1 162/1 159/1 +f 160/1 157/1 156/1 +f 154/1 163/1 156/1 +f 156/1 163/1 160/1 +f 160/1 163/1 164/1 +f 160/1 164/1 165/1 +f 165/1 161/1 160/1 +f 163/1 166/1 167/1 +f 163/1 167/1 164/1 +f 154/1 166/1 163/1 +f 165/1 164/1 168/1 +f 164/1 167/1 168/1 +f 165/1 168/1 169/1 +f 169/1 161/1 165/1 +f 169/1 168/1 170/1 +f 170/1 168/1 171/1 +f 168/1 167/1 172/1 +f 168/1 172/1 171/1 +f 169/1 173/1 161/1 +f 170/1 173/1 169/1 +f 170/1 171/1 174/1 +f 174/1 175/1 170/1 +f 170/1 175/1 173/1 +f 173/1 176/1 177/1 +f 175/1 176/1 173/1 +f 173/1 177/1 161/1 +f 161/1 177/1 162/1 +f 178/1 175/1 174/1 +f 179/1 175/1 178/1 +f 171/1 180/1 174/1 +f 174/1 180/1 178/1 +f 178/1 180/1 181/1 +f 178/1 181/1 179/1 +f 179/1 181/1 182/1 +f 182/1 181/1 183/1 +f 184/1 183/1 181/1 +f 184/1 181/1 185/1 +f 185/1 181/1 180/1 +f 180/1 171/1 186/1 +f 185/1 180/1 186/1 +f 186/1 171/1 172/1 +f 186/1 172/1 187/1 +f 185/1 186/1 187/1 +f 187/1 172/1 188/1 +f 188/1 172/1 167/1 +f 187/1 188/1 189/1 +f 190/1 187/1 189/1 +f 190/1 185/1 187/1 +f 191/1 189/1 188/1 +f 188/1 167/1 191/1 +f 191/1 167/1 166/1 +f 191/1 192/1 189/1 +f 191/1 166/1 193/1 +f 193/1 192/1 191/1 +f 154/1 155/1 166/1 +f 193/1 166/1 155/1 +f 194/1 195/1 193/1 +f 193/1 195/1 192/1 +f 193/1 155/1 194/1 +f 153/1 196/1 155/1 +f 194/1 155/1 196/1 +f 197/1 195/1 194/1 +f 194/1 196/1 197/1 +f 197/1 198/1 195/1 +f 149/1 199/1 197/1 +f 149/1 197/1 196/1 +f 200/1 198/1 197/1 +f 200/1 197/1 199/1 +f 149/1 196/1 153/1 +f 145/1 149/1 143/1 +f 145/1 199/1 149/1 +f 145/1 146/1 199/1 +f 140/1 146/1 145/1 +f 141/1 201/1 146/1 +f 201/1 202/1 146/1 +f 203/1 199/1 146/1 +f 203/1 146/1 202/1 +f 200/1 199/1 203/1 +f 203/1 202/1 204/1 +f 201/1 205/1 202/1 +f 204/1 202/1 205/1 +f 134/1 206/1 201/1 +f 134/1 201/1 136/1 +f 206/1 205/1 201/1 +f 204/1 205/1 207/1 +f 133/1 206/1 132/1 +f 132/1 206/1 134/1 +f 136/1 201/1 141/1 +f 207/1 208/1 204/1 +f 207/1 209/1 208/1 +f 203/1 210/1 200/1 +f 200/1 210/1 198/1 +f 203/1 211/1 210/1 +f 212/1 210/1 211/1 +f 204/1 211/1 203/1 +f 213/1 212/1 211/1 +f 214/1 210/1 212/1 +f 215/1 214/1 212/1 +f 195/1 214/1 216/1 +f 195/1 198/1 214/1 +f 217/1 184/1 185/1 +f 218/1 185/1 190/1 +f 218/1 217/1 185/1 +f 219/1 184/1 217/1 +f 220/1 219/1 217/1 +f 220/1 217/1 218/1 +f 219/1 221/1 184/1 +f 221/1 183/1 184/1 +f 220/1 221/1 219/1 +f 222/1 220/1 223/1 +f 224/1 225/1 222/1 +f 223/1 218/1 190/1 +f 223/1 190/1 226/1 +f 223/1 220/1 218/1 +f 227/1 223/1 226/1 +f 227/1 226/1 228/1 +f 228/1 226/1 189/1 +f 226/1 190/1 189/1 +f 229/1 227/1 230/1 +f 231/1 223/1 227/1 +f 232/1 231/1 227/1 +f 231/1 222/1 223/1 +f 233/1 234/1 231/1 +f 233/1 231/1 235/1 +f 234/1 222/1 231/1 +f 235/1 231/1 232/1 +f 234/1 224/1 222/1 +f 236/1 234/1 233/1 +f 237/1 224/1 234/1 +f 238/1 237/1 234/1 +f 238/1 234/1 236/1 +f 239/1 236/1 233/1 +f 239/1 233/1 240/1 +f 241/1 238/1 236/1 +f 241/1 236/1 239/1 +f 242/1 238/1 241/1 +f 243/1 238/1 242/1 +f 243/1 244/1 238/1 +f 244/1 237/1 238/1 +f 245/1 246/1 243/1 +f 245/1 243/1 247/1 +f 246/1 244/1 243/1 +f 246/1 248/1 244/1 +f 248/1 249/1 244/1 +f 244/1 249/1 237/1 +f 250/1 248/1 246/1 +f 250/1 251/1 248/1 +f 251/1 249/1 248/1 +f 251/1 252/1 249/1 +f 252/1 253/1 249/1 +f 249/1 253/1 254/1 +f 249/1 254/1 237/1 +f 237/1 254/1 224/1 +f 254/1 255/1 256/1 +f 224/1 256/1 225/1 +f 222/1 225/1 220/1 +f 252/1 257/1 253/1 +f 258/1 252/1 251/1 +f 259/1 252/1 258/1 +f 260/1 258/1 251/1 +f 261/1 259/1 258/1 +f 261/1 258/1 260/1 +f 262/1 263/1 259/1 +f 264/1 259/1 261/1 +f 262/1 259/1 264/1 +f 265/1 264/1 261/1 +f 265/1 261/1 266/1 +f 266/1 261/1 260/1 +f 267/1 264/1 265/1 +f 267/1 262/1 264/1 +f 268/1 262/1 267/1 +f 269/1 263/1 262/1 +f 268/1 269/1 262/1 +f 270/1 268/1 267/1 +f 270/1 267/1 271/1 +f 271/1 267/1 265/1 +f 272/1 269/1 268/1 +f 273/1 272/1 268/1 +f 273/1 268/1 270/1 +f 272/1 274/1 269/1 +f 269/1 275/1 263/1 +f 274/1 275/1 269/1 +f 263/1 276/1 259/1 +f 275/1 276/1 263/1 +f 277/1 278/1 275/1 +f 278/1 279/1 275/1 +f 275/1 279/1 276/1 +f 277/1 275/1 274/1 +f 280/1 274/1 272/1 +f 280/1 277/1 274/1 +f 280/1 272/1 273/1 +f 281/1 282/1 280/1 +f 281/1 280/1 283/1 +f 283/1 280/1 273/1 +f 282/1 277/1 280/1 +f 282/1 284/1 277/1 +f 284/1 278/1 277/1 +f 285/1 284/1 282/1 +f 286/1 285/1 282/1 +f 286/1 282/1 281/1 +f 287/1 281/1 288/1 +f 288/1 281/1 283/1 +f 287/1 286/1 281/1 +f 288/1 283/1 289/1 +f 289/1 283/1 273/1 +f 290/1 287/1 288/1 +f 291/1 288/1 289/1 +f 290/1 288/1 291/1 +f 290/1 292/1 287/1 +f 292/1 286/1 287/1 +f 292/1 293/1 286/1 +f 293/1 285/1 286/1 +f 292/1 294/1 293/1 +f 295/1 296/1 292/1 +f 296/1 294/1 292/1 +f 295/1 292/1 290/1 +f 294/1 297/1 293/1 +f 297/1 285/1 293/1 +f 296/1 298/1 294/1 +f 298/1 297/1 294/1 +f 299/1 298/1 296/1 +f 295/1 299/1 296/1 +f 300/1 301/1 298/1 +f 298/1 301/1 297/1 +f 299/1 300/1 298/1 +f 297/1 302/1 285/1 +f 301/1 303/1 297/1 +f 297/1 303/1 302/1 +f 285/1 302/1 284/1 +f 303/1 304/1 302/1 +f 302/1 304/1 305/1 +f 302/1 305/1 284/1 +f 301/1 306/1 303/1 +f 306/1 304/1 303/1 +f 307/1 306/1 301/1 +f 300/1 307/1 301/1 +f 307/1 308/1 306/1 +f 309/1 307/1 300/1 +f 309/1 308/1 307/1 +f 309/1 310/1 308/1 +f 311/1 310/1 309/1 +f 312/1 311/1 309/1 +f 312/1 309/1 313/1 +f 313/1 309/1 300/1 +f 311/1 314/1 310/1 +f 315/1 314/1 311/1 +f 316/1 315/1 311/1 +f 317/1 316/1 318/1 +f 316/1 311/1 312/1 +f 318/1 316/1 312/1 +f 319/1 317/1 318/1 +f 318/1 312/1 320/1 +f 319/1 318/1 320/1 +f 319/1 320/1 321/1 +f 320/1 312/1 313/1 +f 320/1 313/1 322/1 +f 321/1 320/1 322/1 +f 321/1 322/1 299/1 +f 321/1 299/1 295/1 +f 323/1 321/1 295/1 +f 322/1 300/1 299/1 +f 322/1 313/1 300/1 +f 324/1 295/1 290/1 +f 323/1 295/1 324/1 +f 324/1 290/1 325/1 +f 325/1 290/1 291/1 +f 325/1 291/1 326/1 +f 291/1 327/1 328/1 +f 326/1 291/1 328/1 +f 291/1 289/1 327/1 +f 326/1 329/1 330/1 +f 326/1 328/1 329/1 +f 328/1 331/1 332/1 +f 328/1 332/1 329/1 +f 328/1 327/1 331/1 +f 329/1 333/1 334/1 +f 329/1 334/1 335/1 +f 329/1 332/1 333/1 +f 330/1 329/1 335/1 +f 330/1 335/1 336/1 +f 335/1 337/1 336/1 +f 335/1 334/1 337/1 +f 333/1 338/1 334/1 +f 334/1 339/1 337/1 +f 334/1 338/1 339/1 +f 333/1 340/1 338/1 +f 332/1 340/1 333/1 +f 338/1 266/1 341/1 +f 265/1 266/1 338/1 +f 340/1 265/1 338/1 +f 338/1 341/1 339/1 +f 337/1 339/1 342/1 +f 339/1 341/1 343/1 +f 339/1 343/1 342/1 +f 266/1 260/1 341/1 +f 341/1 260/1 344/1 +f 341/1 344/1 343/1 +f 342/1 343/1 345/1 +f 343/1 346/1 345/1 +f 343/1 250/1 346/1 +f 343/1 344/1 250/1 +f 347/1 342/1 345/1 +f 337/1 342/1 347/1 +f 347/1 345/1 348/1 +f 345/1 346/1 348/1 +f 348/1 346/1 245/1 +f 346/1 246/1 245/1 +f 346/1 250/1 246/1 +f 344/1 251/1 250/1 +f 260/1 251/1 344/1 +f 348/1 245/1 349/1 +f 349/1 245/1 247/1 +f 347/1 348/1 350/1 +f 350/1 348/1 349/1 +f 349/1 247/1 351/1 +f 352/1 349/1 351/1 +f 350/1 349/1 352/1 +f 247/1 242/1 353/1 +f 247/1 353/1 354/1 +f 351/1 247/1 354/1 +f 247/1 243/1 242/1 +f 352/1 351/1 355/1 +f 355/1 351/1 354/1 +f 356/1 350/1 352/1 +f 356/1 347/1 350/1 +f 336/1 347/1 356/1 +f 336/1 337/1 347/1 +f 354/1 357/1 358/1 +f 354/1 353/1 357/1 +f 353/1 241/1 357/1 +f 357/1 241/1 239/1 +f 353/1 242/1 241/1 +f 271/1 265/1 340/1 +f 331/1 271/1 332/1 +f 331/1 270/1 271/1 +f 332/1 271/1 340/1 +f 327/1 270/1 331/1 +f 327/1 273/1 270/1 +f 289/1 273/1 327/1 +f 359/1 321/1 323/1 +f 359/1 319/1 321/1 +f 360/1 361/1 304/1 +f 304/1 361/1 362/1 +f 304/1 362/1 305/1 +f 306/1 360/1 304/1 +f 308/1 363/1 360/1 +f 363/1 361/1 360/1 +f 308/1 360/1 306/1 +f 361/1 364/1 365/1 +f 362/1 365/1 366/1 +f 305/1 362/1 278/1 +f 278/1 362/1 279/1 +f 284/1 305/1 278/1 +f 279/1 366/1 367/1 +f 279/1 367/1 276/1 +f 276/1 367/1 257/1 +f 276/1 257/1 252/1 +f 259/1 276/1 252/1 +f 310/1 363/1 308/1 +f 314/1 363/1 310/1 +f 228/1 189/1 368/1 +f 369/1 368/1 189/1 +f 369/1 370/1 368/1 +f 182/1 183/1 371/1 +f 372/1 183/1 373/1 +f 374/1 373/1 183/1 +f 374/1 375/1 373/1 +f 376/1 374/1 221/1 +f 376/1 375/1 374/1 +f 374/1 183/1 221/1 +f 225/1 376/1 221/1 +f 225/1 377/1 376/1 +f 225/1 221/1 220/1 +f 182/1 378/1 179/1 +f 179/1 378/1 175/1 +f 158/1 379/1 142/1 +f 124/1 112/1 114/1 +f 119/1 380/1 381/1 +f 118/1 380/1 119/1 +f 119/1 381/1 116/1 +f 118/1 382/1 380/1 +f 382/1 383/1 380/1 +f 380/1 383/1 384/1 +f 380/1 384/1 381/1 +f 116/1 381/1 385/1 +f 381/1 384/1 386/1 +f 381/1 386/1 385/1 +f 116/1 385/1 387/1 +f 108/1 116/1 387/1 +f 387/1 385/1 388/1 +f 385/1 386/1 389/1 +f 385/1 389/1 388/1 +f 390/1 386/1 384/1 +f 391/1 389/1 386/1 +f 391/1 386/1 390/1 +f 106/1 107/1 389/1 +f 392/1 389/1 391/1 +f 392/1 106/1 389/1 +f 388/1 389/1 107/1 +f 109/1 388/1 107/1 +f 387/1 388/1 109/1 +f 108/1 387/1 109/1 +f 98/1 99/1 106/1 +f 98/1 106/1 393/1 +f 393/1 106/1 392/1 +f 394/1 393/1 392/1 +f 394/1 392/1 391/1 +f 395/1 98/1 393/1 +f 395/1 393/1 394/1 +f 95/1 98/1 395/1 +f 395/1 396/1 397/1 +f 395/1 397/1 95/1 +f 394/1 396/1 395/1 +f 398/1 399/1 394/1 +f 394/1 399/1 396/1 +f 394/1 391/1 398/1 +f 396/1 400/1 401/1 +f 399/1 402/1 400/1 +f 403/1 404/1 399/1 +f 403/1 399/1 398/1 +f 405/1 404/1 403/1 +f 398/1 390/1 403/1 +f 403/1 406/1 407/1 +f 403/1 390/1 406/1 +f 403/1 407/1 405/1 +f 405/1 408/1 404/1 +f 409/1 408/1 405/1 +f 410/1 411/1 408/1 +f 412/1 408/1 409/1 +f 410/1 208/1 209/1 +f 405/1 407/1 413/1 +f 405/1 413/1 409/1 +f 409/1 413/1 414/1 +f 413/1 415/1 414/1 +f 413/1 407/1 415/1 +f 409/1 414/1 412/1 +f 412/1 414/1 416/1 +f 407/1 417/1 415/1 +f 415/1 417/1 418/1 +f 414/1 415/1 418/1 +f 406/1 383/1 407/1 +f 383/1 382/1 407/1 +f 407/1 382/1 417/1 +f 419/1 418/1 417/1 +f 419/1 417/1 420/1 +f 420/1 417/1 382/1 +f 421/1 420/1 382/1 +f 421/1 382/1 118/1 +f 422/1 419/1 420/1 +f 422/1 420/1 421/1 +f 126/1 423/1 419/1 +f 126/1 419/1 422/1 +f 423/1 418/1 419/1 +f 424/1 423/1 126/1 +f 423/1 425/1 418/1 +f 414/1 418/1 416/1 +f 416/1 418/1 425/1 +f 117/1 422/1 421/1 +f 117/1 421/1 118/1 +f 121/1 422/1 117/1 +f 121/1 126/1 422/1 +f 125/1 424/1 126/1 +f 406/1 384/1 383/1 +f 390/1 384/1 406/1 +f 398/1 391/1 390/1 +f 401/1 95/1 397/1 +f 72/1 92/1 66/1 +f 66/1 92/1 76/1 +f 426/1 85/1 87/1 +f 427/1 428/1 87/1 +f 87/1 428/1 426/1 +f 85/1 426/1 429/1 +f 429/1 426/1 428/1 +f 84/1 85/1 429/1 +f 430/1 429/1 431/1 +f 84/1 429/1 430/1 +f 429/1 428/1 431/1 +f 427/1 432/1 428/1 +f 431/1 428/1 432/1 +f 75/1 78/1 84/1 +f 75/1 84/1 433/1 +f 70/1 67/1 75/1 +f 70/1 75/1 434/1 +f 435/1 75/1 433/1 +f 70/1 65/1 67/1 +f 433/1 84/1 430/1 +f 436/1 437/1 438/1 +f 439/1 440/1 436/1 +f 436/1 440/1 437/1 +f 438/1 441/1 442/1 +f 438/1 437/1 441/1 +f 443/1 438/1 444/1 +f 443/1 436/1 438/1 +f 443/1 439/1 436/1 +f 444/1 438/1 442/1 +f 444/1 442/1 445/1 +f 445/1 446/1 447/1 +f 448/1 445/1 449/1 +f 449/1 445/1 447/1 +f 445/1 442/1 446/1 +f 447/1 446/1 450/1 +f 451/1 447/1 452/1 +f 447/1 450/1 452/1 +f 449/1 447/1 451/1 +f 451/1 452/1 453/1 +f 454/1 451/1 455/1 +f 452/1 450/1 456/1 +f 452/1 456/1 457/1 +f 452/1 457/1 458/1 +f 450/1 459/1 456/1 +f 456/1 459/1 460/1 +f 456/1 460/1 457/1 +f 457/1 461/1 462/1 +f 458/1 457/1 462/1 +f 457/1 460/1 461/1 +f 458/1 462/1 463/1 +f 462/1 464/1 465/1 +f 462/1 466/1 464/1 +f 462/1 461/1 466/1 +f 466/1 467/1 464/1 +f 464/1 467/1 468/1 +f 464/1 468/1 469/1 +f 465/1 464/1 469/1 +f 465/1 469/1 470/1 +f 470/1 469/1 471/1 +f 469/1 468/1 471/1 +f 467/1 472/1 468/1 +f 468/1 472/1 473/1 +f 468/1 473/1 474/1 +f 468/1 474/1 471/1 +f 470/1 471/1 475/1 +f 471/1 476/1 475/1 +f 470/1 475/1 477/1 +f 478/1 470/1 364/1 +f 476/1 474/1 479/1 +f 480/1 479/1 474/1 +f 481/1 474/1 473/1 +f 482/1 473/1 472/1 +f 472/1 483/1 484/1 +f 467/1 483/1 472/1 +f 481/1 473/1 482/1 +f 485/1 474/1 481/1 +f 482/1 486/1 481/1 +f 481/1 486/1 487/1 +f 481/1 487/1 485/1 +f 480/1 474/1 485/1 +f 488/1 479/1 480/1 +f 485/1 487/1 480/1 +f 480/1 487/1 488/1 +f 488/1 487/1 489/1 +f 487/1 490/1 489/1 +f 486/1 491/1 487/1 +f 487/1 491/1 490/1 +f 489/1 490/1 492/1 +f 486/1 493/1 491/1 +f 493/1 494/1 491/1 +f 482/1 495/1 486/1 +f 495/1 493/1 486/1 +f 495/1 496/1 493/1 +f 497/1 498/1 495/1 +f 498/1 496/1 495/1 +f 499/1 495/1 484/1 +f 484/1 495/1 482/1 +f 497/1 495/1 499/1 +f 482/1 472/1 484/1 +f 484/1 483/1 499/1 +f 499/1 483/1 500/1 +f 499/1 500/1 497/1 +f 461/1 500/1 483/1 +f 461/1 483/1 467/1 +f 497/1 500/1 501/1 +f 461/1 460/1 500/1 +f 460/1 501/1 500/1 +f 466/1 461/1 467/1 +f 497/1 501/1 502/1 +f 502/1 501/1 503/1 +f 503/1 501/1 504/1 +f 505/1 504/1 501/1 +f 505/1 501/1 460/1 +f 459/1 505/1 460/1 +f 459/1 506/1 505/1 +f 506/1 504/1 505/1 +f 503/1 504/1 507/1 +f 507/1 504/1 508/1 +f 508/1 504/1 509/1 +f 506/1 509/1 504/1 +f 503/1 498/1 502/1 +f 507/1 498/1 503/1 +f 502/1 498/1 497/1 +f 507/1 510/1 498/1 +f 508/1 510/1 507/1 +f 508/1 509/1 511/1 +f 511/1 510/1 508/1 +f 512/1 513/1 510/1 +f 512/1 510/1 511/1 +f 513/1 514/1 510/1 +f 510/1 514/1 515/1 +f 510/1 515/1 498/1 +f 511/1 509/1 512/1 +f 512/1 516/1 517/1 +f 512/1 509/1 516/1 +f 517/1 513/1 512/1 +f 517/1 518/1 513/1 +f 518/1 519/1 513/1 +f 513/1 519/1 514/1 +f 517/1 516/1 520/1 +f 517/1 520/1 521/1 +f 521/1 518/1 517/1 +f 522/1 520/1 516/1 +f 522/1 516/1 509/1 +f 520/1 523/1 521/1 +f 524/1 523/1 520/1 +f 524/1 520/1 522/1 +f 521/1 523/1 525/1 +f 525/1 518/1 521/1 +f 525/1 523/1 526/1 +f 441/1 526/1 523/1 +f 441/1 523/1 524/1 +f 527/1 441/1 524/1 +f 527/1 524/1 528/1 +f 528/1 524/1 522/1 +f 441/1 437/1 526/1 +f 442/1 441/1 527/1 +f 525/1 526/1 529/1 +f 529/1 526/1 530/1 +f 437/1 530/1 526/1 +f 529/1 518/1 525/1 +f 529/1 531/1 518/1 +f 532/1 531/1 529/1 +f 529/1 530/1 532/1 +f 532/1 530/1 533/1 +f 533/1 530/1 534/1 +f 533/1 531/1 532/1 +f 533/1 534/1 535/1 +f 536/1 534/1 537/1 +f 538/1 537/1 539/1 +f 539/1 537/1 534/1 +f 439/1 540/1 538/1 +f 439/1 538/1 440/1 +f 540/1 541/1 538/1 +f 538/1 539/1 440/1 +f 440/1 539/1 542/1 +f 539/1 534/1 542/1 +f 542/1 534/1 530/1 +f 440/1 542/1 437/1 +f 542/1 530/1 437/1 +f 543/1 540/1 439/1 +f 543/1 544/1 540/1 +f 545/1 439/1 443/1 +f 546/1 543/1 545/1 +f 442/1 527/1 528/1 +f 442/1 528/1 446/1 +f 446/1 528/1 547/1 +f 528/1 522/1 547/1 +f 446/1 547/1 450/1 +f 547/1 522/1 548/1 +f 450/1 547/1 548/1 +f 522/1 509/1 548/1 +f 548/1 506/1 459/1 +f 450/1 548/1 459/1 +f 548/1 509/1 506/1 +f 498/1 515/1 496/1 +f 463/1 465/1 478/1 +f 463/1 462/1 465/1 +f 478/1 465/1 470/1 +f 549/1 458/1 463/1 +f 550/1 463/1 478/1 +f 453/1 452/1 458/1 +f 551/1 453/1 552/1 +f 553/1 444/1 448/1 +f 448/1 444/1 445/1 +f 554/1 553/1 448/1 +f 555/1 448/1 556/1 +f 553/1 443/1 444/1 +f 557/1 545/1 443/1 +f 557/1 443/1 553/1 +f 558/1 557/1 559/1 +f 558/1 560/1 557/1 +f 559/1 557/1 561/1 +f 560/1 545/1 557/1 +f 561/1 557/1 553/1 +f 560/1 546/1 545/1 +f 545/1 543/1 439/1 +f 562/1 546/1 560/1 +f 563/1 560/1 558/1 +f 563/1 562/1 560/1 +f 546/1 564/1 543/1 +f 562/1 565/1 546/1 +f 566/1 567/1 562/1 +f 566/1 562/1 568/1 +f 567/1 565/1 562/1 +f 568/1 562/1 563/1 +f 569/1 568/1 563/1 +f 570/1 563/1 558/1 +f 569/1 563/1 570/1 +f 571/1 568/1 569/1 +f 571/1 566/1 568/1 +f 572/1 569/1 570/1 +f 573/1 571/1 569/1 +f 574/1 575/1 571/1 +f 574/1 571/1 573/1 +f 575/1 566/1 571/1 +f 576/1 577/1 575/1 +f 576/1 575/1 574/1 +f 577/1 566/1 575/1 +f 577/1 578/1 566/1 +f 578/1 567/1 566/1 +f 579/1 580/1 577/1 +f 579/1 577/1 576/1 +f 580/1 578/1 577/1 +f 581/1 579/1 576/1 +f 581/1 576/1 582/1 +f 582/1 576/1 574/1 +f 583/1 580/1 579/1 +f 583/1 579/1 581/1 +f 583/1 584/1 580/1 +f 584/1 585/1 580/1 +f 580/1 585/1 578/1 +f 585/1 567/1 578/1 +f 567/1 586/1 565/1 +f 585/1 587/1 567/1 +f 588/1 587/1 585/1 +f 589/1 585/1 584/1 +f 589/1 588/1 585/1 +f 590/1 589/1 584/1 +f 590/1 584/1 583/1 +f 591/1 589/1 590/1 +f 591/1 592/1 589/1 +f 592/1 588/1 589/1 +f 592/1 593/1 588/1 +f 593/1 587/1 588/1 +f 594/1 595/1 592/1 +f 594/1 592/1 591/1 +f 595/1 593/1 592/1 +f 596/1 591/1 597/1 +f 597/1 591/1 590/1 +f 596/1 594/1 591/1 +f 597/1 590/1 598/1 +f 598/1 590/1 583/1 +f 599/1 597/1 600/1 +f 599/1 596/1 597/1 +f 600/1 597/1 598/1 +f 601/1 598/1 602/1 +f 598/1 583/1 602/1 +f 600/1 598/1 601/1 +f 602/1 583/1 581/1 +f 603/1 602/1 581/1 +f 601/1 602/1 603/1 +f 604/1 600/1 601/1 +f 605/1 601/1 603/1 +f 604/1 601/1 605/1 +f 604/1 599/1 600/1 +f 606/1 604/1 605/1 +f 606/1 607/1 604/1 +f 607/1 599/1 604/1 +f 606/1 605/1 608/1 +f 605/1 603/1 609/1 +f 608/1 605/1 610/1 +f 605/1 609/1 610/1 +f 603/1 581/1 609/1 +f 609/1 581/1 582/1 +f 609/1 582/1 611/1 +f 610/1 609/1 611/1 +f 610/1 611/1 612/1 +f 612/1 611/1 613/1 +f 611/1 582/1 614/1 +f 611/1 614/1 613/1 +f 582/1 574/1 614/1 +f 613/1 614/1 615/1 +f 614/1 574/1 615/1 +f 616/1 613/1 617/1 +f 613/1 615/1 618/1 +f 612/1 613/1 616/1 +f 613/1 618/1 617/1 +f 615/1 573/1 618/1 +f 574/1 573/1 615/1 +f 618/1 573/1 572/1 +f 617/1 618/1 619/1 +f 618/1 572/1 619/1 +f 617/1 619/1 620/1 +f 619/1 572/1 621/1 +f 619/1 621/1 622/1 +f 620/1 619/1 622/1 +f 572/1 570/1 621/1 +f 573/1 569/1 572/1 +f 621/1 570/1 623/1 +f 621/1 623/1 624/1 +f 624/1 623/1 625/1 +f 622/1 621/1 626/1 +f 621/1 624/1 626/1 +f 624/1 625/1 627/1 +f 627/1 625/1 628/1 +f 629/1 607/1 606/1 +f 630/1 631/1 629/1 +f 629/1 631/1 607/1 +f 607/1 632/1 633/1 +f 607/1 633/1 599/1 +f 631/1 632/1 607/1 +f 631/1 634/1 635/1 +f 631/1 635/1 632/1 +f 630/1 636/1 631/1 +f 636/1 634/1 631/1 +f 637/1 636/1 630/1 +f 637/1 638/1 636/1 +f 636/1 639/1 640/1 +f 638/1 639/1 636/1 +f 636/1 640/1 634/1 +f 638/1 641/1 639/1 +f 638/1 642/1 641/1 +f 643/1 642/1 638/1 +f 644/1 643/1 638/1 +f 642/1 645/1 641/1 +f 641/1 646/1 639/1 +f 641/1 645/1 646/1 +f 642/1 647/1 645/1 +f 648/1 647/1 642/1 +f 643/1 648/1 642/1 +f 643/1 649/1 648/1 +f 650/1 649/1 643/1 +f 649/1 651/1 648/1 +f 648/1 651/1 647/1 +f 651/1 652/1 647/1 +f 647/1 652/1 653/1 +f 647/1 653/1 645/1 +f 645/1 653/1 646/1 +f 653/1 654/1 655/1 +f 653/1 655/1 646/1 +f 653/1 656/1 654/1 +f 652/1 656/1 653/1 +f 654/1 657/1 658/1 +f 655/1 654/1 658/1 +f 646/1 655/1 659/1 +f 655/1 658/1 659/1 +f 658/1 660/1 661/1 +f 658/1 657/1 660/1 +f 659/1 658/1 661/1 +f 662/1 663/1 657/1 +f 654/1 662/1 657/1 +f 657/1 663/1 660/1 +f 664/1 665/1 663/1 +f 663/1 665/1 666/1 +f 663/1 666/1 667/1 +f 662/1 664/1 663/1 +f 660/1 663/1 667/1 +f 668/1 664/1 662/1 +f 669/1 670/1 664/1 +f 664/1 670/1 665/1 +f 671/1 664/1 668/1 +f 672/1 668/1 673/1 +f 673/1 668/1 662/1 +f 673/1 662/1 656/1 +f 656/1 662/1 654/1 +f 670/1 674/1 675/1 +f 669/1 676/1 670/1 +f 676/1 677/1 674/1 +f 676/1 674/1 670/1 +f 678/1 677/1 676/1 +f 674/1 679/1 680/1 +f 677/1 679/1 674/1 +f 674/1 680/1 675/1 +f 677/1 681/1 679/1 +f 681/1 682/1 679/1 +f 679/1 682/1 683/1 +f 679/1 683/1 680/1 +f 680/1 683/1 684/1 +f 675/1 680/1 684/1 +f 670/1 675/1 665/1 +f 683/1 685/1 684/1 +f 682/1 686/1 683/1 +f 683/1 686/1 687/1 +f 683/1 687/1 685/1 +f 688/1 685/1 687/1 +f 689/1 687/1 686/1 +f 682/1 690/1 686/1 +f 686/1 690/1 691/1 +f 692/1 693/1 690/1 +f 692/1 690/1 682/1 +f 694/1 690/1 693/1 +f 692/1 695/1 693/1 +f 695/1 696/1 693/1 +f 697/1 695/1 692/1 +f 698/1 699/1 695/1 +f 700/1 698/1 695/1 +f 700/1 695/1 697/1 +f 699/1 696/1 695/1 +f 697/1 692/1 677/1 +f 701/1 697/1 678/1 +f 678/1 697/1 677/1 +f 701/1 700/1 697/1 +f 702/1 698/1 700/1 +f 701/1 702/1 700/1 +f 703/1 702/1 701/1 +f 702/1 704/1 705/1 +f 702/1 705/1 698/1 +f 703/1 706/1 702/1 +f 706/1 704/1 702/1 +f 707/1 706/1 703/1 +f 708/1 707/1 703/1 +f 708/1 703/1 709/1 +f 709/1 703/1 701/1 +f 710/1 711/1 706/1 +f 706/1 711/1 704/1 +f 707/1 710/1 706/1 +f 710/1 712/1 713/1 +f 714/1 715/1 710/1 +f 715/1 712/1 710/1 +f 710/1 713/1 711/1 +f 714/1 710/1 707/1 +f 713/1 716/1 711/1 +f 711/1 716/1 717/1 +f 711/1 717/1 704/1 +f 713/1 712/1 716/1 +f 712/1 718/1 716/1 +f 716/1 718/1 719/1 +f 716/1 719/1 717/1 +f 704/1 717/1 705/1 +f 717/1 720/1 705/1 +f 717/1 721/1 720/1 +f 717/1 719/1 721/1 +f 722/1 721/1 719/1 +f 722/1 719/1 723/1 +f 719/1 718/1 723/1 +f 724/1 721/1 722/1 +f 724/1 720/1 721/1 +f 722/1 725/1 726/1 +f 723/1 725/1 722/1 +f 722/1 726/1 724/1 +f 727/1 725/1 723/1 +f 723/1 718/1 727/1 +f 728/1 729/1 725/1 +f 725/1 730/1 726/1 +f 731/1 725/1 727/1 +f 731/1 728/1 725/1 +f 727/1 718/1 732/1 +f 727/1 732/1 731/1 +f 733/1 728/1 731/1 +f 731/1 732/1 734/1 +f 731/1 734/1 733/1 +f 735/1 736/1 728/1 +f 737/1 728/1 733/1 +f 735/1 728/1 737/1 +f 733/1 734/1 737/1 +f 738/1 736/1 735/1 +f 735/1 739/1 738/1 +f 740/1 734/1 732/1 +f 741/1 739/1 734/1 +f 741/1 734/1 740/1 +f 737/1 734/1 739/1 +f 742/1 739/1 741/1 +f 743/1 742/1 741/1 +f 743/1 741/1 740/1 +f 742/1 744/1 739/1 +f 745/1 744/1 742/1 +f 745/1 742/1 743/1 +f 746/1 743/1 740/1 +f 747/1 745/1 743/1 +f 747/1 743/1 746/1 +f 748/1 744/1 745/1 +f 747/1 749/1 745/1 +f 749/1 748/1 745/1 +f 748/1 750/1 744/1 +f 751/1 744/1 750/1 +f 752/1 753/1 748/1 +f 752/1 748/1 749/1 +f 754/1 749/1 747/1 +f 754/1 752/1 749/1 +f 746/1 740/1 715/1 +f 755/1 746/1 715/1 +f 755/1 747/1 746/1 +f 712/1 740/1 732/1 +f 715/1 740/1 712/1 +f 755/1 715/1 714/1 +f 756/1 747/1 755/1 +f 756/1 754/1 747/1 +f 757/1 758/1 756/1 +f 757/1 756/1 759/1 +f 758/1 754/1 756/1 +f 758/1 760/1 754/1 +f 761/1 762/1 760/1 +f 763/1 757/1 759/1 +f 764/1 759/1 765/1 +f 763/1 759/1 764/1 +f 759/1 756/1 755/1 +f 759/1 755/1 766/1 +f 765/1 759/1 766/1 +f 767/1 764/1 768/1 +f 768/1 764/1 765/1 +f 767/1 763/1 764/1 +f 765/1 766/1 769/1 +f 769/1 766/1 770/1 +f 766/1 755/1 714/1 +f 766/1 714/1 771/1 +f 771/1 714/1 707/1 +f 771/1 707/1 708/1 +f 772/1 771/1 773/1 +f 774/1 763/1 767/1 +f 775/1 776/1 763/1 +f 775/1 763/1 774/1 +f 776/1 757/1 763/1 +f 777/1 774/1 767/1 +f 778/1 774/1 777/1 +f 776/1 779/1 757/1 +f 779/1 758/1 757/1 +f 780/1 781/1 779/1 +f 781/1 761/1 779/1 +f 779/1 761/1 758/1 +f 780/1 779/1 782/1 +f 782/1 779/1 776/1 +f 781/1 783/1 761/1 +f 784/1 783/1 781/1 +f 785/1 781/1 780/1 +f 786/1 781/1 785/1 +f 786/1 784/1 781/1 +f 784/1 787/1 783/1 +f 788/1 784/1 789/1 +f 790/1 787/1 784/1 +f 788/1 790/1 784/1 +f 789/1 784/1 786/1 +f 790/1 791/1 787/1 +f 792/1 790/1 788/1 +f 792/1 793/1 790/1 +f 793/1 791/1 790/1 +f 793/1 794/1 791/1 +f 795/1 796/1 793/1 +f 795/1 793/1 797/1 +f 796/1 794/1 793/1 +f 797/1 793/1 792/1 +f 798/1 797/1 792/1 +f 798/1 792/1 799/1 +f 799/1 792/1 788/1 +f 800/1 797/1 798/1 +f 800/1 795/1 797/1 +f 801/1 800/1 798/1 +f 801/1 798/1 802/1 +f 802/1 798/1 799/1 +f 802/1 799/1 803/1 +f 803/1 799/1 804/1 +f 799/1 788/1 804/1 +f 805/1 801/1 802/1 +f 805/1 802/1 806/1 +f 806/1 802/1 803/1 +f 807/1 805/1 806/1 +f 808/1 809/1 805/1 +f 809/1 801/1 805/1 +f 808/1 805/1 807/1 +f 810/1 806/1 811/1 +f 807/1 806/1 810/1 +f 806/1 803/1 811/1 +f 812/1 808/1 807/1 +f 812/1 807/1 810/1 +f 810/1 811/1 813/1 +f 812/1 810/1 814/1 +f 814/1 810/1 813/1 +f 813/1 811/1 815/1 +f 811/1 803/1 815/1 +f 813/1 815/1 816/1 +f 814/1 813/1 816/1 +f 814/1 816/1 817/1 +f 818/1 812/1 814/1 +f 818/1 814/1 819/1 +f 819/1 814/1 817/1 +f 817/1 816/1 820/1 +f 816/1 815/1 821/1 +f 816/1 821/1 820/1 +f 817/1 822/1 823/1 +f 819/1 817/1 823/1 +f 817/1 820/1 822/1 +f 820/1 824/1 822/1 +f 820/1 821/1 824/1 +f 815/1 825/1 821/1 +f 821/1 825/1 826/1 +f 821/1 826/1 824/1 +f 824/1 826/1 827/1 +f 824/1 827/1 828/1 +f 822/1 824/1 828/1 +f 823/1 822/1 829/1 +f 822/1 828/1 829/1 +f 829/1 828/1 830/1 +f 828/1 827/1 830/1 +f 827/1 831/1 832/1 +f 827/1 833/1 831/1 +f 827/1 832/1 830/1 +f 826/1 833/1 827/1 +f 825/1 834/1 826/1 +f 826/1 834/1 833/1 +f 834/1 786/1 833/1 +f 833/1 786/1 831/1 +f 831/1 785/1 835/1 +f 832/1 831/1 835/1 +f 831/1 786/1 785/1 +f 832/1 835/1 836/1 +f 830/1 832/1 836/1 +f 835/1 785/1 780/1 +f 835/1 780/1 837/1 +f 836/1 835/1 837/1 +f 830/1 836/1 838/1 +f 838/1 836/1 839/1 +f 836/1 837/1 839/1 +f 839/1 837/1 840/1 +f 837/1 780/1 840/1 +f 840/1 780/1 782/1 +f 840/1 782/1 841/1 +f 839/1 840/1 842/1 +f 842/1 840/1 841/1 +f 839/1 842/1 843/1 +f 838/1 839/1 844/1 +f 844/1 839/1 843/1 +f 845/1 842/1 846/1 +f 843/1 842/1 845/1 +f 847/1 843/1 845/1 +f 847/1 844/1 843/1 +f 848/1 844/1 847/1 +f 848/1 838/1 844/1 +f 847/1 845/1 849/1 +f 850/1 848/1 847/1 +f 849/1 845/1 851/1 +f 845/1 846/1 851/1 +f 851/1 846/1 778/1 +f 851/1 778/1 852/1 +f 850/1 853/1 848/1 +f 853/1 838/1 848/1 +f 853/1 830/1 838/1 +f 823/1 829/1 853/1 +f 829/1 830/1 853/1 +f 823/1 853/1 850/1 +f 854/1 823/1 850/1 +f 841/1 782/1 776/1 +f 841/1 776/1 775/1 +f 846/1 841/1 775/1 +f 846/1 775/1 778/1 +f 778/1 775/1 774/1 +f 842/1 841/1 846/1 +f 834/1 789/1 786/1 +f 855/1 789/1 834/1 +f 825/1 855/1 834/1 +f 855/1 788/1 789/1 +f 856/1 804/1 855/1 +f 804/1 788/1 855/1 +f 856/1 855/1 825/1 +f 815/1 856/1 825/1 +f 803/1 856/1 815/1 +f 803/1 804/1 856/1 +f 857/1 812/1 818/1 +f 857/1 858/1 812/1 +f 859/1 858/1 857/1 +f 858/1 808/1 812/1 +f 858/1 860/1 808/1 +f 859/1 861/1 858/1 +f 861/1 860/1 858/1 +f 862/1 863/1 859/1 +f 864/1 865/1 860/1 +f 861/1 864/1 860/1 +f 860/1 865/1 866/1 +f 860/1 866/1 808/1 +f 808/1 866/1 809/1 +f 865/1 867/1 866/1 +f 866/1 867/1 809/1 +f 864/1 868/1 865/1 +f 868/1 869/1 865/1 +f 865/1 869/1 867/1 +f 869/1 870/1 867/1 +f 867/1 870/1 800/1 +f 867/1 800/1 801/1 +f 867/1 801/1 809/1 +f 868/1 871/1 869/1 +f 869/1 872/1 870/1 +f 871/1 872/1 869/1 +f 872/1 795/1 870/1 +f 870/1 795/1 800/1 +f 873/1 874/1 872/1 +f 872/1 874/1 795/1 +f 871/1 873/1 872/1 +f 875/1 873/1 871/1 +f 875/1 871/1 868/1 +f 875/1 876/1 873/1 +f 876/1 877/1 873/1 +f 873/1 877/1 874/1 +f 877/1 796/1 874/1 +f 874/1 796/1 795/1 +f 877/1 878/1 796/1 +f 879/1 878/1 877/1 +f 880/1 879/1 877/1 +f 880/1 877/1 876/1 +f 881/1 880/1 876/1 +f 881/1 876/1 875/1 +f 882/1 883/1 880/1 +f 882/1 880/1 881/1 +f 884/1 883/1 882/1 +f 884/1 885/1 883/1 +f 885/1 886/1 883/1 +f 883/1 886/1 879/1 +f 883/1 879/1 880/1 +f 886/1 878/1 879/1 +f 887/1 888/1 886/1 +f 886/1 888/1 878/1 +f 889/1 890/1 887/1 +f 891/1 892/1 890/1 +f 890/1 892/1 893/1 +f 890/1 893/1 888/1 +f 888/1 893/1 894/1 +f 888/1 894/1 878/1 +f 878/1 894/1 895/1 +f 878/1 895/1 796/1 +f 796/1 895/1 794/1 +f 891/1 896/1 892/1 +f 897/1 896/1 891/1 +f 897/1 898/1 896/1 +f 899/1 898/1 897/1 +f 898/1 900/1 901/1 +f 902/1 900/1 898/1 +f 899/1 902/1 898/1 +f 898/1 901/1 896/1 +f 903/1 902/1 899/1 +f 903/1 904/1 902/1 +f 904/1 905/1 902/1 +f 902/1 905/1 900/1 +f 906/1 904/1 903/1 +f 907/1 903/1 908/1 +f 906/1 909/1 904/1 +f 910/1 911/1 906/1 +f 910/1 906/1 912/1 +f 911/1 909/1 906/1 +f 912/1 906/1 913/1 +f 911/1 914/1 909/1 +f 915/1 911/1 910/1 +f 916/1 911/1 915/1 +f 917/1 914/1 911/1 +f 916/1 917/1 911/1 +f 917/1 918/1 914/1 +f 919/1 920/1 917/1 +f 919/1 917/1 916/1 +f 920/1 918/1 917/1 +f 921/1 920/1 919/1 +f 922/1 919/1 923/1 +f 923/1 919/1 916/1 +f 922/1 921/1 919/1 +f 924/1 925/1 920/1 +f 920/1 925/1 918/1 +f 926/1 924/1 920/1 +f 926/1 920/1 921/1 +f 927/1 926/1 921/1 +f 927/1 921/1 922/1 +f 928/1 927/1 922/1 +f 929/1 922/1 923/1 +f 930/1 931/1 927/1 +f 930/1 927/1 928/1 +f 931/1 926/1 927/1 +f 932/1 924/1 926/1 +f 933/1 926/1 931/1 +f 933/1 932/1 926/1 +f 934/1 933/1 931/1 +f 934/1 931/1 930/1 +f 935/1 936/1 933/1 +f 935/1 933/1 934/1 +f 936/1 932/1 933/1 +f 936/1 937/1 932/1 +f 937/1 924/1 932/1 +f 938/1 936/1 935/1 +f 938/1 939/1 936/1 +f 939/1 937/1 936/1 +f 940/1 935/1 934/1 +f 938/1 935/1 940/1 +f 940/1 934/1 941/1 +f 941/1 934/1 930/1 +f 942/1 940/1 943/1 +f 942/1 944/1 940/1 +f 944/1 938/1 940/1 +f 943/1 940/1 941/1 +f 943/1 941/1 945/1 +f 941/1 930/1 946/1 +f 945/1 941/1 946/1 +f 930/1 928/1 947/1 +f 946/1 930/1 947/1 +f 948/1 946/1 947/1 +f 945/1 946/1 948/1 +f 948/1 947/1 949/1 +f 947/1 928/1 949/1 +f 928/1 922/1 929/1 +f 949/1 928/1 929/1 +f 949/1 929/1 950/1 +f 951/1 942/1 943/1 +f 952/1 953/1 951/1 +f 951/1 954/1 942/1 +f 955/1 951/1 956/1 +f 953/1 954/1 951/1 +f 954/1 944/1 942/1 +f 957/1 958/1 954/1 +f 954/1 958/1 944/1 +f 953/1 957/1 954/1 +f 958/1 938/1 944/1 +f 957/1 959/1 958/1 +f 959/1 960/1 958/1 +f 958/1 960/1 938/1 +f 961/1 959/1 957/1 +f 953/1 961/1 957/1 +f 962/1 963/1 959/1 +f 959/1 963/1 960/1 +f 961/1 962/1 959/1 +f 960/1 964/1 939/1 +f 960/1 939/1 938/1 +f 963/1 964/1 960/1 +f 963/1 965/1 964/1 +f 966/1 965/1 963/1 +f 962/1 966/1 963/1 +f 964/1 937/1 939/1 +f 965/1 967/1 964/1 +f 964/1 967/1 937/1 +f 968/1 969/1 965/1 +f 965/1 969/1 967/1 +f 966/1 968/1 965/1 +f 970/1 968/1 966/1 +f 970/1 966/1 962/1 +f 970/1 971/1 968/1 +f 971/1 969/1 968/1 +f 969/1 972/1 973/1 +f 971/1 974/1 969/1 +f 974/1 972/1 969/1 +f 969/1 973/1 967/1 +f 967/1 973/1 937/1 +f 937/1 973/1 924/1 +f 972/1 975/1 973/1 +f 973/1 975/1 976/1 +f 973/1 976/1 924/1 +f 977/1 978/1 972/1 +f 972/1 978/1 975/1 +f 974/1 977/1 972/1 +f 979/1 974/1 971/1 +f 979/1 980/1 974/1 +f 980/1 977/1 974/1 +f 981/1 977/1 980/1 +f 982/1 983/1 977/1 +f 977/1 983/1 978/1 +f 981/1 982/1 977/1 +f 984/1 981/1 980/1 +f 984/1 980/1 979/1 +f 985/1 984/1 979/1 +f 986/1 979/1 971/1 +f 985/1 979/1 986/1 +f 987/1 981/1 984/1 +f 988/1 984/1 985/1 +f 988/1 987/1 984/1 +f 989/1 985/1 990/1 +f 990/1 985/1 986/1 +f 988/1 985/1 989/1 +f 990/1 986/1 991/1 +f 991/1 986/1 970/1 +f 986/1 971/1 970/1 +f 992/1 989/1 990/1 +f 993/1 990/1 991/1 +f 992/1 990/1 993/1 +f 994/1 988/1 989/1 +f 992/1 994/1 989/1 +f 995/1 992/1 996/1 +f 996/1 992/1 993/1 +f 997/1 994/1 992/1 +f 995/1 997/1 992/1 +f 996/1 993/1 998/1 +f 993/1 991/1 998/1 +f 996/1 998/1 999/1 +f 1000/1 996/1 1001/1 +f 1000/1 995/1 996/1 +f 1001/1 996/1 999/1 +f 998/1 1002/1 1003/1 +f 999/1 998/1 1003/1 +f 998/1 991/1 1002/1 +f 999/1 1003/1 961/1 +f 999/1 961/1 953/1 +f 1001/1 999/1 952/1 +f 1003/1 962/1 961/1 +f 1003/1 1002/1 962/1 +f 991/1 970/1 1002/1 +f 1002/1 970/1 962/1 +f 952/1 999/1 953/1 +f 1004/1 1005/1 995/1 +f 1005/1 997/1 995/1 +f 1004/1 995/1 1000/1 +f 1004/1 1006/1 1005/1 +f 1007/1 1006/1 1004/1 +f 1007/1 1008/1 1006/1 +f 1006/1 1009/1 1010/1 +f 1006/1 1011/1 1005/1 +f 1008/1 1009/1 1006/1 +f 1006/1 1010/1 1011/1 +f 1008/1 1012/1 1009/1 +f 1008/1 1013/1 1012/1 +f 1009/1 1014/1 1015/1 +f 1009/1 1015/1 1010/1 +f 1012/1 1014/1 1009/1 +f 1010/1 1016/1 1011/1 +f 1010/1 1015/1 1016/1 +f 1014/1 1017/1 1015/1 +f 1015/1 1017/1 1016/1 +f 1012/1 1018/1 1014/1 +f 1018/1 1019/1 1014/1 +f 1014/1 1019/1 1017/1 +f 1013/1 1018/1 1012/1 +f 1013/1 1020/1 1018/1 +f 1020/1 1021/1 1018/1 +f 1018/1 1021/1 1019/1 +f 1019/1 1022/1 1017/1 +f 1017/1 1022/1 1023/1 +f 1017/1 1023/1 1024/1 +f 1017/1 1024/1 1016/1 +f 1025/1 1026/1 1022/1 +f 1019/1 1025/1 1022/1 +f 1022/1 1026/1 1023/1 +f 1023/1 1027/1 1028/1 +f 1024/1 1023/1 1028/1 +f 1023/1 1026/1 1027/1 +f 1024/1 1028/1 1029/1 +f 1016/1 1024/1 1029/1 +f 1028/1 981/1 987/1 +f 1028/1 1027/1 981/1 +f 1029/1 1028/1 987/1 +f 1027/1 982/1 981/1 +f 1026/1 982/1 1027/1 +f 1026/1 1030/1 982/1 +f 1030/1 1031/1 982/1 +f 982/1 1031/1 983/1 +f 1030/1 1032/1 1031/1 +f 1033/1 1032/1 1030/1 +f 1034/1 1033/1 1030/1 +f 1035/1 1030/1 1026/1 +f 1034/1 1030/1 1035/1 +f 1033/1 1036/1 1032/1 +f 1037/1 1036/1 1033/1 +f 1038/1 1033/1 1034/1 +f 1037/1 1039/1 1036/1 +f 1040/1 1037/1 1038/1 +f 1041/1 1039/1 1037/1 +f 1042/1 1038/1 1043/1 +f 1043/1 1038/1 1034/1 +f 1044/1 1043/1 1045/1 +f 1045/1 1043/1 1046/1 +f 1043/1 1034/1 1046/1 +f 1045/1 1046/1 1047/1 +f 1047/1 1046/1 1048/1 +f 1046/1 1034/1 1048/1 +f 1048/1 1034/1 1035/1 +f 1047/1 1048/1 1021/1 +f 1021/1 1048/1 1025/1 +f 1048/1 1035/1 1025/1 +f 1025/1 1035/1 1026/1 +f 1021/1 1025/1 1019/1 +f 1041/1 1049/1 1039/1 +f 1050/1 1049/1 1041/1 +f 1050/1 1051/1 1052/1 +f 1053/1 1054/1 1051/1 +f 1051/1 1055/1 1052/1 +f 1056/1 1053/1 1051/1 +f 1051/1 1054/1 1055/1 +f 1052/1 1057/1 1049/1 +f 1052/1 1055/1 1057/1 +f 1055/1 1058/1 1059/1 +f 1055/1 1059/1 1057/1 +f 1054/1 1060/1 1055/1 +f 1055/1 1060/1 1058/1 +f 1057/1 1059/1 1061/1 +f 1049/1 1057/1 1062/1 +f 1057/1 1061/1 1062/1 +f 1049/1 1062/1 1039/1 +f 1062/1 1061/1 1063/1 +f 1039/1 1062/1 1064/1 +f 1062/1 1063/1 1064/1 +f 1059/1 1065/1 1061/1 +f 1061/1 1065/1 1066/1 +f 1061/1 1066/1 1063/1 +f 1063/1 1066/1 1067/1 +f 1064/1 1063/1 1067/1 +f 1039/1 1064/1 1068/1 +f 1064/1 1067/1 1068/1 +f 1039/1 1068/1 1036/1 +f 1068/1 1069/1 1070/1 +f 1068/1 1067/1 1069/1 +f 1036/1 1068/1 1070/1 +f 1036/1 1070/1 1032/1 +f 1070/1 1069/1 1071/1 +f 1032/1 1070/1 1072/1 +f 1067/1 1073/1 1069/1 +f 1069/1 1073/1 1074/1 +f 1069/1 1074/1 1071/1 +f 1067/1 1075/1 1073/1 +f 1073/1 1075/1 1076/1 +f 1073/1 1076/1 1074/1 +f 1076/1 1075/1 1077/1 +f 1067/1 1078/1 1075/1 +f 1066/1 1078/1 1067/1 +f 1065/1 1079/1 1066/1 +f 1066/1 1079/1 1078/1 +f 1080/1 1075/1 1078/1 +f 1080/1 1078/1 1081/1 +f 1081/1 1078/1 1082/1 +f 1082/1 1078/1 1079/1 +f 1081/1 1083/1 1080/1 +f 1080/1 1083/1 1077/1 +f 1077/1 1075/1 1080/1 +f 1082/1 1084/1 1081/1 +f 1081/1 1084/1 1083/1 +f 1085/1 1084/1 1082/1 +f 1082/1 1079/1 1085/1 +f 1084/1 1086/1 1087/1 +f 1085/1 1088/1 1084/1 +f 1088/1 1086/1 1084/1 +f 1084/1 1087/1 1083/1 +f 1089/1 1088/1 1085/1 +f 1085/1 1079/1 1089/1 +f 1090/1 1088/1 1089/1 +f 1091/1 1088/1 1090/1 +f 1091/1 1092/1 1088/1 +f 1089/1 1079/1 1093/1 +f 1089/1 1093/1 1090/1 +f 1065/1 1093/1 1079/1 +f 1090/1 1093/1 1091/1 +f 1091/1 1093/1 1094/1 +f 1058/1 1094/1 1093/1 +f 1058/1 1093/1 1095/1 +f 1095/1 1093/1 1065/1 +f 1096/1 1092/1 1091/1 +f 1091/1 1094/1 1096/1 +f 1097/1 1098/1 1092/1 +f 1096/1 1097/1 1092/1 +f 1099/1 1097/1 1096/1 +f 1096/1 1094/1 1100/1 +f 1096/1 1100/1 1099/1 +f 1101/1 1102/1 1097/1 +f 1101/1 1097/1 1099/1 +f 1099/1 1100/1 1101/1 +f 1103/1 1102/1 1101/1 +f 1100/1 1104/1 1101/1 +f 1101/1 1104/1 1105/1 +f 1101/1 1105/1 1103/1 +f 1106/1 1102/1 1103/1 +f 1103/1 1105/1 1106/1 +f 1106/1 1105/1 1107/1 +f 1108/1 1107/1 1105/1 +f 1108/1 1105/1 1109/1 +f 1109/1 1105/1 1104/1 +f 1110/1 1111/1 1106/1 +f 1106/1 1107/1 1110/1 +f 1106/1 1111/1 1102/1 +f 1110/1 1107/1 1112/1 +f 1113/1 1112/1 1107/1 +f 1113/1 1107/1 1108/1 +f 1114/1 1113/1 1108/1 +f 1114/1 1108/1 1115/1 +f 1115/1 1108/1 1109/1 +f 1116/1 1117/1 1113/1 +f 1116/1 1113/1 1114/1 +f 1117/1 1118/1 1113/1 +f 1113/1 1118/1 1112/1 +f 1110/1 1112/1 1119/1 +f 1119/1 1112/1 1118/1 +f 1119/1 1118/1 1120/1 +f 1120/1 1118/1 1121/1 +f 1121/1 1118/1 1122/1 +f 1119/1 1123/1 1110/1 +f 1120/1 1123/1 1119/1 +f 1121/1 1124/1 1120/1 +f 1120/1 1124/1 1123/1 +f 1121/1 1122/1 1125/1 +f 1110/1 1123/1 1111/1 +f 1124/1 1126/1 1123/1 +f 1111/1 1127/1 1102/1 +f 1102/1 1127/1 1128/1 +f 1102/1 1128/1 1097/1 +f 1097/1 1128/1 1098/1 +f 1129/1 1130/1 1122/1 +f 1129/1 1122/1 1131/1 +f 1132/1 1122/1 1117/1 +f 1117/1 1122/1 1118/1 +f 1131/1 1122/1 1132/1 +f 1133/1 1129/1 1131/1 +f 1133/1 1131/1 1132/1 +f 1134/1 1133/1 1135/1 +f 1134/1 1129/1 1133/1 +f 1133/1 1132/1 1136/1 +f 1134/1 1137/1 1129/1 +f 1136/1 1132/1 1138/1 +f 1136/1 1138/1 1139/1 +f 1138/1 1140/1 1141/1 +f 1132/1 1140/1 1138/1 +f 1142/1 1138/1 1141/1 +f 1139/1 1138/1 1142/1 +f 1140/1 1132/1 1117/1 +f 1140/1 1117/1 1116/1 +f 1141/1 1140/1 1116/1 +f 1141/1 1116/1 1114/1 +f 1141/1 1114/1 1143/1 +f 1143/1 1114/1 1144/1 +f 1144/1 1114/1 1115/1 +f 1145/1 1141/1 1143/1 +f 1145/1 1143/1 1144/1 +f 1142/1 1141/1 1145/1 +f 1146/1 1142/1 1145/1 +f 1146/1 1145/1 1147/1 +f 1148/1 1145/1 1149/1 +f 1145/1 1144/1 1149/1 +f 1139/1 1142/1 1146/1 +f 1147/1 1150/1 1146/1 +f 1146/1 1150/1 1151/1 +f 1146/1 1151/1 1139/1 +f 1147/1 1152/1 1150/1 +f 1152/1 1153/1 1150/1 +f 1150/1 1153/1 1154/1 +f 1150/1 1154/1 1151/1 +f 1151/1 1154/1 1155/1 +f 1151/1 1155/1 1139/1 +f 1139/1 1155/1 1156/1 +f 1155/1 1157/1 1156/1 +f 1154/1 1157/1 1155/1 +f 1158/1 1159/1 1154/1 +f 1154/1 1159/1 1157/1 +f 1153/1 1158/1 1154/1 +f 1153/1 1160/1 1158/1 +f 1160/1 1161/1 1158/1 +f 1158/1 1161/1 1159/1 +f 1161/1 1162/1 1159/1 +f 1159/1 1162/1 1163/1 +f 1159/1 1163/1 1157/1 +f 1162/1 1164/1 1163/1 +f 1163/1 1164/1 1165/1 +f 1163/1 1165/1 1157/1 +f 1164/1 1166/1 1165/1 +f 1165/1 1166/1 1167/1 +f 1165/1 1167/1 1168/1 +f 1157/1 1165/1 1168/1 +f 1169/1 1170/1 1166/1 +f 1164/1 1169/1 1166/1 +f 1171/1 1169/1 1164/1 +f 1162/1 1171/1 1164/1 +f 1172/1 1173/1 1171/1 +f 1171/1 1173/1 1169/1 +f 1174/1 1172/1 1171/1 +f 1174/1 1171/1 1162/1 +f 1161/1 1174/1 1162/1 +f 1175/1 1174/1 1161/1 +f 1173/1 1176/1 1169/1 +f 1169/1 1176/1 1177/1 +f 1169/1 1177/1 1170/1 +f 1176/1 1178/1 1179/1 +f 1176/1 1179/1 1177/1 +f 1177/1 1179/1 1180/1 +f 1177/1 1180/1 1170/1 +f 1178/1 1181/1 1179/1 +f 1179/1 1181/1 1182/1 +f 1179/1 1182/1 1180/1 +f 1180/1 1182/1 1183/1 +f 1180/1 1183/1 1184/1 +f 1170/1 1180/1 1184/1 +f 1170/1 1184/1 1185/1 +f 1166/1 1170/1 1167/1 +f 1167/1 1170/1 1185/1 +f 1184/1 1183/1 1186/1 +f 1184/1 1186/1 1187/1 +f 1185/1 1184/1 1187/1 +f 1185/1 1187/1 1188/1 +f 1167/1 1185/1 1168/1 +f 1168/1 1185/1 1188/1 +f 1187/1 1186/1 1189/1 +f 1187/1 1189/1 1188/1 +f 1190/1 1189/1 1186/1 +f 1190/1 1186/1 1191/1 +f 1191/1 1186/1 1183/1 +f 1188/1 1189/1 1192/1 +f 1193/1 1192/1 1189/1 +f 1193/1 1189/1 1190/1 +f 1191/1 1194/1 1190/1 +f 1190/1 1194/1 1193/1 +f 1195/1 1196/1 1191/1 +f 1191/1 1196/1 1197/1 +f 1191/1 1197/1 1194/1 +f 1191/1 1183/1 1195/1 +f 1198/1 1196/1 1195/1 +f 1198/1 1195/1 1199/1 +f 1195/1 1183/1 1182/1 +f 1195/1 1182/1 1199/1 +f 1196/1 1198/1 1197/1 +f 1197/1 1198/1 1200/1 +f 1197/1 1200/1 1194/1 +f 1198/1 1201/1 1200/1 +f 1200/1 1201/1 1202/1 +f 1201/1 1203/1 1202/1 +f 1202/1 1203/1 1204/1 +f 1202/1 1204/1 1205/1 +f 1200/1 1202/1 1206/1 +f 1206/1 1202/1 1205/1 +f 1194/1 1200/1 1206/1 +f 1206/1 1205/1 1207/1 +f 1194/1 1206/1 1208/1 +f 1208/1 1206/1 1207/1 +f 1205/1 1204/1 1209/1 +f 1205/1 1209/1 1210/1 +f 1207/1 1205/1 1210/1 +f 1203/1 1211/1 1204/1 +f 1211/1 1209/1 1204/1 +f 1203/1 1212/1 1211/1 +f 1212/1 1213/1 1211/1 +f 1213/1 1214/1 1211/1 +f 1211/1 1214/1 1209/1 +f 1214/1 1215/1 1209/1 +f 1210/1 1209/1 1215/1 +f 1210/1 1215/1 1216/1 +f 1207/1 1210/1 1216/1 +f 1217/1 1218/1 1215/1 +f 1214/1 1217/1 1215/1 +f 1216/1 1215/1 1218/1 +f 1213/1 1217/1 1214/1 +f 1219/1 1218/1 1217/1 +f 1213/1 1219/1 1217/1 +f 1220/1 1221/1 1218/1 +f 1218/1 1221/1 1222/1 +f 1219/1 1220/1 1218/1 +f 1216/1 1218/1 1222/1 +f 1223/1 1220/1 1219/1 +f 1224/1 1223/1 1219/1 +f 1224/1 1219/1 1213/1 +f 1225/1 1221/1 1220/1 +f 1223/1 1225/1 1220/1 +f 1226/1 1225/1 1223/1 +f 1227/1 1226/1 1223/1 +f 1227/1 1223/1 1224/1 +f 1228/1 1227/1 1224/1 +f 1228/1 1224/1 1229/1 +f 1229/1 1224/1 1213/1 +f 1230/1 1226/1 1227/1 +f 1231/1 1230/1 1227/1 +f 1231/1 1227/1 1228/1 +f 1232/1 1225/1 1226/1 +f 1230/1 1232/1 1226/1 +f 1233/1 1232/1 1230/1 +f 1234/1 1233/1 1230/1 +f 1234/1 1230/1 1231/1 +f 1231/1 1235/1 1234/1 +f 1228/1 1235/1 1231/1 +f 1229/1 1235/1 1228/1 +f 1229/1 1212/1 1235/1 +f 1229/1 1213/1 1212/1 +f 1236/1 1234/1 1235/1 +f 1236/1 1237/1 1234/1 +f 1237/1 1233/1 1234/1 +f 1237/1 1238/1 1233/1 +f 1233/1 1238/1 1232/1 +f 1239/1 1240/1 1237/1 +f 1237/1 1240/1 1238/1 +f 1240/1 1241/1 1238/1 +f 1238/1 1241/1 1232/1 +f 1242/1 1243/1 1240/1 +f 1240/1 1243/1 1241/1 +f 1239/1 1242/1 1240/1 +f 1244/1 1242/1 1239/1 +f 1245/1 1243/1 1242/1 +f 1244/1 1245/1 1242/1 +f 1246/1 1247/1 1243/1 +f 1243/1 1247/1 1248/1 +f 1243/1 1248/1 1241/1 +f 1245/1 1246/1 1243/1 +f 1249/1 1246/1 1245/1 +f 1250/1 1249/1 1245/1 +f 1250/1 1245/1 1244/1 +f 1251/1 1246/1 1249/1 +f 1252/1 1249/1 1250/1 +f 1251/1 1253/1 1246/1 +f 1253/1 1254/1 1246/1 +f 1246/1 1254/1 1247/1 +f 1255/1 1256/1 1253/1 +f 1257/1 1258/1 1255/1 +f 1258/1 1259/1 1256/1 +f 1258/1 1260/1 1261/1 +f 1256/1 1259/1 1262/1 +f 1258/1 1261/1 1259/1 +f 1259/1 1261/1 1263/1 +f 1256/1 1262/1 1254/1 +f 1254/1 1262/1 1264/1 +f 1254/1 1264/1 1247/1 +f 1264/1 1265/1 1247/1 +f 1247/1 1266/1 1248/1 +f 1267/1 1248/1 1268/1 +f 1241/1 1248/1 1267/1 +f 1267/1 1268/1 1221/1 +f 1241/1 1267/1 1225/1 +f 1225/1 1267/1 1221/1 +f 1221/1 1268/1 1269/1 +f 1221/1 1269/1 1222/1 +f 1270/1 1222/1 1269/1 +f 1271/1 1216/1 1222/1 +f 1271/1 1222/1 1270/1 +f 1270/1 1272/1 1271/1 +f 1273/1 1216/1 1271/1 +f 1192/1 1273/1 1271/1 +f 1271/1 1272/1 1274/1 +f 1271/1 1274/1 1192/1 +f 1273/1 1207/1 1216/1 +f 1208/1 1207/1 1273/1 +f 1192/1 1208/1 1273/1 +f 1193/1 1208/1 1192/1 +f 1188/1 1192/1 1274/1 +f 1275/1 1188/1 1274/1 +f 1275/1 1274/1 1276/1 +f 1276/1 1274/1 1272/1 +f 1168/1 1188/1 1275/1 +f 1156/1 1168/1 1275/1 +f 1275/1 1276/1 1277/1 +f 1156/1 1275/1 1278/1 +f 1157/1 1168/1 1156/1 +f 1193/1 1194/1 1208/1 +f 1232/1 1241/1 1225/1 +f 1261/1 1279/1 1263/1 +f 1263/1 1279/1 1280/1 +f 1263/1 1280/1 1281/1 +f 1263/1 1281/1 1282/1 +f 1259/1 1263/1 1262/1 +f 1262/1 1263/1 1282/1 +f 1260/1 1283/1 1261/1 +f 1261/1 1283/1 1279/1 +f 1260/1 1284/1 1283/1 +f 1283/1 1284/1 1285/1 +f 1283/1 1285/1 1286/1 +f 1283/1 1286/1 1279/1 +f 1284/1 1287/1 1285/1 +f 1285/1 1287/1 1288/1 +f 1285/1 1288/1 1286/1 +f 1286/1 1288/1 1289/1 +f 1286/1 1289/1 1279/1 +f 1279/1 1289/1 1280/1 +f 1280/1 1289/1 1290/1 +f 1280/1 1290/1 1291/1 +f 1291/1 1290/1 1292/1 +f 1281/1 1280/1 1291/1 +f 1281/1 1291/1 1293/1 +f 1293/1 1291/1 1294/1 +f 1291/1 1292/1 1294/1 +f 1282/1 1281/1 1293/1 +f 1293/1 1294/1 1295/1 +f 1282/1 1293/1 1265/1 +f 1265/1 1293/1 1295/1 +f 1295/1 1294/1 1296/1 +f 1265/1 1295/1 1266/1 +f 1262/1 1282/1 1264/1 +f 1264/1 1282/1 1265/1 +f 1247/1 1265/1 1266/1 +f 1248/1 1266/1 1297/1 +f 1298/1 1237/1 1236/1 +f 1298/1 1239/1 1237/1 +f 1236/1 1299/1 1298/1 +f 1298/1 1299/1 1244/1 +f 1299/1 1250/1 1244/1 +f 1244/1 1239/1 1298/1 +f 1199/1 1182/1 1181/1 +f 1149/1 1300/1 1053/1 +f 1149/1 1144/1 1300/1 +f 1144/1 1109/1 1300/1 +f 1300/1 1109/1 1301/1 +f 1300/1 1301/1 1054/1 +f 1053/1 1300/1 1054/1 +f 1144/1 1115/1 1109/1 +f 1301/1 1109/1 1104/1 +f 1301/1 1104/1 1302/1 +f 1301/1 1302/1 1060/1 +f 1054/1 1301/1 1060/1 +f 1100/1 1303/1 1104/1 +f 1302/1 1104/1 1303/1 +f 1302/1 1303/1 1060/1 +f 1060/1 1303/1 1094/1 +f 1060/1 1094/1 1058/1 +f 1094/1 1303/1 1100/1 +f 1059/1 1058/1 1095/1 +f 1059/1 1095/1 1065/1 +f 1304/1 1149/1 1053/1 +f 1077/1 1083/1 1305/1 +f 1305/1 1083/1 1306/1 +f 1083/1 1087/1 1307/1 +f 1083/1 1307/1 1306/1 +f 1305/1 1076/1 1077/1 +f 1308/1 1309/1 1305/1 +f 1306/1 1307/1 1310/1 +f 1311/1 1056/1 1312/1 +f 1029/1 987/1 988/1 +f 1016/1 1029/1 1313/1 +f 1313/1 1029/1 988/1 +f 1313/1 988/1 994/1 +f 1011/1 1016/1 1313/1 +f 1011/1 1313/1 997/1 +f 997/1 1313/1 994/1 +f 1005/1 1011/1 997/1 +f 1020/1 1047/1 1021/1 +f 1314/1 1020/1 1013/1 +f 1314/1 1315/1 1020/1 +f 1315/1 1045/1 1020/1 +f 1045/1 1047/1 1020/1 +f 1316/1 1314/1 1013/1 +f 1317/1 1315/1 1314/1 +f 1316/1 1317/1 1314/1 +f 1316/1 1013/1 1008/1 +f 1007/1 1316/1 1008/1 +f 1318/1 1045/1 1315/1 +f 1318/1 1044/1 1045/1 +f 924/1 976/1 925/1 +f 1319/1 923/1 1320/1 +f 929/1 923/1 1319/1 +f 923/1 916/1 1320/1 +f 1320/1 916/1 1321/1 +f 1321/1 916/1 915/1 +f 918/1 1322/1 1323/1 +f 918/1 1323/1 914/1 +f 925/1 1324/1 1322/1 +f 925/1 1322/1 918/1 +f 1322/1 1325/1 1326/1 +f 1322/1 1326/1 1323/1 +f 1325/1 1327/1 1328/1 +f 1326/1 1328/1 1329/1 +f 1328/1 1330/1 1329/1 +f 1323/1 1326/1 1331/1 +f 1326/1 1329/1 1331/1 +f 1329/1 1332/1 1333/1 +f 1329/1 1330/1 1332/1 +f 1331/1 1329/1 1334/1 +f 1329/1 1333/1 1334/1 +f 1335/1 1332/1 1330/1 +f 1336/1 1333/1 1332/1 +f 1337/1 1333/1 1338/1 +f 1334/1 1333/1 1337/1 +f 1334/1 1337/1 1339/1 +f 1340/1 1334/1 1339/1 +f 1340/1 1331/1 1334/1 +f 1323/1 1331/1 1340/1 +f 914/1 1340/1 909/1 +f 909/1 1340/1 1341/1 +f 914/1 1323/1 1340/1 +f 1340/1 1339/1 1341/1 +f 1341/1 1339/1 1342/1 +f 1339/1 1337/1 1343/1 +f 1339/1 1343/1 1342/1 +f 1337/1 1338/1 1343/1 +f 1343/1 1338/1 1344/1 +f 1343/1 1344/1 1342/1 +f 1341/1 1342/1 1345/1 +f 1342/1 1344/1 1346/1 +f 1347/1 1342/1 1346/1 +f 1345/1 1342/1 1347/1 +f 909/1 1341/1 1345/1 +f 909/1 1345/1 904/1 +f 904/1 1345/1 905/1 +f 1345/1 1347/1 905/1 +f 1347/1 1346/1 1348/1 +f 1349/1 1347/1 1350/1 +f 1347/1 1348/1 1350/1 +f 905/1 1347/1 1349/1 +f 905/1 1351/1 900/1 +f 905/1 1349/1 1351/1 +f 1349/1 1350/1 1351/1 +f 1350/1 1348/1 1352/1 +f 1350/1 1352/1 1353/1 +f 1351/1 1350/1 1353/1 +f 1351/1 1353/1 1354/1 +f 900/1 1351/1 1354/1 +f 900/1 1354/1 901/1 +f 901/1 1354/1 1355/1 +f 1354/1 1353/1 1355/1 +f 1353/1 1352/1 1356/1 +f 1353/1 1357/1 1355/1 +f 1353/1 1356/1 1357/1 +f 901/1 1355/1 1358/1 +f 1355/1 1357/1 1359/1 +f 1355/1 1359/1 1358/1 +f 896/1 901/1 1360/1 +f 901/1 1358/1 1360/1 +f 1360/1 1358/1 1361/1 +f 1358/1 1359/1 1362/1 +f 1358/1 1362/1 1361/1 +f 1359/1 1357/1 1363/1 +f 1359/1 1363/1 1362/1 +f 1362/1 1364/1 1361/1 +f 1362/1 1363/1 1364/1 +f 1365/1 1361/1 1366/1 +f 1360/1 1361/1 1365/1 +f 1361/1 1364/1 1367/1 +f 1366/1 1361/1 1367/1 +f 896/1 1360/1 1365/1 +f 896/1 1365/1 892/1 +f 1365/1 1366/1 1368/1 +f 892/1 1365/1 1368/1 +f 1369/1 1366/1 1370/1 +f 1366/1 1367/1 1371/1 +f 1366/1 1371/1 1370/1 +f 1368/1 1366/1 1369/1 +f 1372/1 1371/1 1367/1 +f 1372/1 1367/1 1373/1 +f 1373/1 1367/1 1364/1 +f 1373/1 1374/1 1372/1 +f 1372/1 1374/1 1375/1 +f 1375/1 1371/1 1372/1 +f 1373/1 1376/1 1374/1 +f 1377/1 1376/1 1373/1 +f 1373/1 1364/1 1377/1 +f 1378/1 1379/1 1376/1 +f 1380/1 1376/1 1377/1 +f 1378/1 1376/1 1380/1 +f 1377/1 1364/1 1380/1 +f 1380/1 1364/1 1363/1 +f 1380/1 1363/1 1378/1 +f 1381/1 1379/1 1378/1 +f 1378/1 1363/1 1381/1 +f 1381/1 1363/1 1357/1 +f 1382/1 1379/1 1381/1 +f 1381/1 1357/1 1382/1 +f 1382/1 1357/1 1383/1 +f 1383/1 1357/1 1356/1 +f 1383/1 1379/1 1382/1 +f 1384/1 1385/1 1383/1 +f 1383/1 1385/1 1379/1 +f 1383/1 1356/1 1384/1 +f 1384/1 1356/1 1352/1 +f 1386/1 1387/1 1384/1 +f 1384/1 1387/1 1385/1 +f 1384/1 1352/1 1386/1 +f 1385/1 1388/1 1379/1 +f 1385/1 1389/1 1388/1 +f 1379/1 1388/1 1390/1 +f 1379/1 1390/1 1376/1 +f 1376/1 1390/1 1391/1 +f 1376/1 1391/1 1374/1 +f 1374/1 1391/1 1392/1 +f 1393/1 1374/1 1394/1 +f 1374/1 1392/1 1394/1 +f 1375/1 1374/1 1393/1 +f 1394/1 1392/1 1395/1 +f 1396/1 1394/1 1397/1 +f 1393/1 1394/1 1396/1 +f 1396/1 1398/1 1393/1 +f 1393/1 1399/1 1375/1 +f 1396/1 1397/1 1400/1 +f 1400/1 1401/1 1396/1 +f 1387/1 1389/1 1385/1 +f 1402/1 1387/1 1386/1 +f 1403/1 1387/1 1402/1 +f 1403/1 1404/1 1387/1 +f 1386/1 1348/1 1402/1 +f 1402/1 1348/1 1346/1 +f 1402/1 1346/1 1403/1 +f 1352/1 1348/1 1386/1 +f 1405/1 1404/1 1403/1 +f 1403/1 1346/1 1344/1 +f 1403/1 1344/1 1405/1 +f 1406/1 1404/1 1405/1 +f 1407/1 1404/1 1406/1 +f 1407/1 1408/1 1404/1 +f 1405/1 1344/1 1406/1 +f 1406/1 1344/1 1338/1 +f 1406/1 1338/1 1407/1 +f 1409/1 1408/1 1407/1 +f 1407/1 1338/1 1409/1 +f 1409/1 1338/1 1333/1 +f 1409/1 1333/1 1410/1 +f 1369/1 1370/1 1411/1 +f 1368/1 1369/1 1411/1 +f 1370/1 1399/1 1412/1 +f 1411/1 1370/1 1412/1 +f 1370/1 1371/1 1399/1 +f 1368/1 1411/1 1413/1 +f 1413/1 1411/1 1414/1 +f 1411/1 1412/1 1414/1 +f 892/1 1368/1 893/1 +f 893/1 1368/1 1413/1 +f 893/1 1413/1 894/1 +f 1413/1 1414/1 1415/1 +f 1415/1 1414/1 1416/1 +f 1412/1 1401/1 1416/1 +f 1412/1 1399/1 1398/1 +f 1393/1 1398/1 1399/1 +f 1399/1 1371/1 1375/1 +f 894/1 1413/1 1415/1 +f 1417/1 891/1 1418/1 +f 1419/1 885/1 884/1 +f 1420/1 881/1 875/1 +f 1420/1 875/1 1421/1 +f 1421/1 875/1 868/1 +f 1422/1 882/1 881/1 +f 1422/1 881/1 1420/1 +f 1423/1 1422/1 1424/1 +f 1423/1 1425/1 1422/1 +f 1424/1 1422/1 1420/1 +f 1425/1 882/1 1422/1 +f 1425/1 884/1 882/1 +f 1426/1 1419/1 1425/1 +f 1427/1 1425/1 1423/1 +f 1419/1 884/1 1425/1 +f 1428/1 1427/1 1423/1 +f 1429/1 1423/1 1424/1 +f 1428/1 1423/1 1429/1 +f 1429/1 1424/1 1430/1 +f 1424/1 1420/1 1430/1 +f 1429/1 1430/1 863/1 +f 1430/1 1420/1 1421/1 +f 1430/1 1421/1 1431/1 +f 863/1 1430/1 1431/1 +f 863/1 864/1 861/1 +f 863/1 1431/1 864/1 +f 859/1 863/1 861/1 +f 1431/1 1421/1 868/1 +f 1431/1 868/1 864/1 +f 712/1 732/1 718/1 +f 737/1 739/1 735/1 +f 738/1 739/1 744/1 +f 726/1 1432/1 1433/1 +f 726/1 730/1 1432/1 +f 724/1 726/1 1433/1 +f 1433/1 1432/1 1434/1 +f 1435/1 1433/1 1436/1 +f 1433/1 1434/1 1437/1 +f 1438/1 1433/1 1437/1 +f 724/1 1433/1 1435/1 +f 1436/1 1433/1 1438/1 +f 1435/1 720/1 724/1 +f 1436/1 720/1 1435/1 +f 1438/1 1439/1 1436/1 +f 1436/1 1439/1 720/1 +f 1438/1 1437/1 1440/1 +f 1440/1 1439/1 1438/1 +f 1440/1 1437/1 1441/1 +f 1442/1 1437/1 1443/1 +f 1441/1 1437/1 1442/1 +f 1441/1 696/1 1440/1 +f 1440/1 696/1 1439/1 +f 1444/1 720/1 1439/1 +f 1444/1 1439/1 699/1 +f 699/1 1439/1 696/1 +f 705/1 720/1 1444/1 +f 705/1 1444/1 698/1 +f 698/1 1444/1 699/1 +f 1442/1 693/1 696/1 +f 1442/1 696/1 1441/1 +f 1442/1 1443/1 694/1 +f 694/1 693/1 1442/1 +f 694/1 1443/1 691/1 +f 691/1 690/1 694/1 +f 691/1 1443/1 689/1 +f 689/1 686/1 691/1 +f 689/1 1445/1 688/1 +f 689/1 1443/1 1445/1 +f 688/1 687/1 689/1 +f 688/1 1445/1 1446/1 +f 1445/1 1447/1 1446/1 +f 1445/1 1448/1 1447/1 +f 1443/1 1448/1 1445/1 +f 688/1 1446/1 1449/1 +f 1449/1 685/1 688/1 +f 1449/1 1446/1 1450/1 +f 1446/1 1447/1 1451/1 +f 1443/1 1452/1 1448/1 +f 1437/1 1452/1 1443/1 +f 1437/1 1434/1 1452/1 +f 709/1 701/1 1453/1 +f 1454/1 709/1 1455/1 +f 677/1 692/1 681/1 +f 681/1 692/1 682/1 +f 1456/1 678/1 676/1 +f 1456/1 676/1 669/1 +f 1453/1 678/1 1456/1 +f 1453/1 701/1 678/1 +f 1457/1 667/1 1458/1 +f 660/1 667/1 1459/1 +f 667/1 666/1 1460/1 +f 667/1 1460/1 1458/1 +f 1459/1 667/1 1457/1 +f 661/1 660/1 1461/1 +f 1461/1 660/1 1459/1 +f 1461/1 1459/1 1462/1 +f 1462/1 1459/1 1457/1 +f 1463/1 1461/1 1462/1 +f 1464/1 661/1 1461/1 +f 1464/1 1461/1 1463/1 +f 659/1 661/1 1464/1 +f 1464/1 1463/1 1465/1 +f 1466/1 659/1 1464/1 +f 1466/1 1464/1 1467/1 +f 1467/1 1464/1 1465/1 +f 1468/1 1463/1 1469/1 +f 1463/1 1462/1 1469/1 +f 1465/1 1463/1 1468/1 +f 634/1 1467/1 1465/1 +f 634/1 1465/1 1468/1 +f 640/1 1467/1 634/1 +f 640/1 1466/1 1467/1 +f 646/1 659/1 1466/1 +f 639/1 1466/1 640/1 +f 639/1 646/1 1466/1 +f 634/1 1468/1 635/1 +f 1468/1 1469/1 1470/1 +f 635/1 1468/1 1470/1 +f 635/1 1470/1 632/1 +f 1470/1 1469/1 1471/1 +f 1470/1 1471/1 1472/1 +f 632/1 1470/1 1472/1 +f 632/1 1472/1 633/1 +f 633/1 1472/1 596/1 +f 1472/1 1471/1 596/1 +f 1471/1 595/1 594/1 +f 1471/1 594/1 596/1 +f 1471/1 1473/1 595/1 +f 1469/1 1473/1 1471/1 +f 633/1 596/1 599/1 +f 1462/1 1457/1 1473/1 +f 1473/1 1457/1 593/1 +f 1469/1 1462/1 1473/1 +f 1473/1 593/1 595/1 +f 1457/1 1458/1 593/1 +f 593/1 1458/1 587/1 +f 1458/1 1460/1 1474/1 +f 1458/1 1474/1 587/1 +f 587/1 1474/1 586/1 +f 587/1 586/1 567/1 +f 652/1 673/1 656/1 +f 1475/1 673/1 652/1 +f 1475/1 672/1 673/1 +f 1476/1 672/1 1475/1 +f 651/1 1475/1 652/1 +f 649/1 1477/1 651/1 +f 1477/1 1475/1 651/1 +f 1477/1 1476/1 1475/1 +f 1478/1 1477/1 649/1 +f 644/1 638/1 637/1 +f 570/1 558/1 623/1 +f 623/1 558/1 625/1 +f 625/1 558/1 559/1 +f 625/1 559/1 628/1 +f 628/1 559/1 561/1 +f 561/1 553/1 1479/1 +f 1479/1 553/1 554/1 +f 1480/1 1481/1 1482/1 +f 1480/1 1483/1 1481/1 +f 1484/1 1483/1 1480/1 +f 1388/1 1484/1 1480/1 +f 1388/1 1480/1 1390/1 +f 1390/1 1480/1 1482/1 +f 1484/1 1485/1 1483/1 +f 1486/1 1485/1 1484/1 +f 1389/1 1486/1 1484/1 +f 1389/1 1484/1 1388/1 +f 1485/1 1487/1 1488/1 +f 1485/1 1488/1 1483/1 +f 1489/1 1487/1 1485/1 +f 1486/1 1489/1 1485/1 +f 1487/1 1490/1 1491/1 +f 1487/1 1491/1 1488/1 +f 1489/1 1492/1 1487/1 +f 1492/1 1490/1 1487/1 +f 1493/1 1492/1 1489/1 +f 1486/1 1493/1 1489/1 +f 1494/1 1495/1 1492/1 +f 1493/1 1494/1 1492/1 +f 1492/1 1495/1 1490/1 +f 1495/1 1496/1 1490/1 +f 1490/1 1496/1 1497/1 +f 1490/1 1497/1 1491/1 +f 1491/1 1497/1 1498/1 +f 1488/1 1491/1 1498/1 +f 1496/1 1499/1 1497/1 +f 1497/1 1500/1 1501/1 +f 1497/1 1499/1 1500/1 +f 1497/1 1501/1 1498/1 +f 1502/1 1503/1 1496/1 +f 1495/1 1502/1 1496/1 +f 1496/1 1503/1 1499/1 +f 1499/1 913/1 1500/1 +f 1503/1 913/1 1499/1 +f 1500/1 907/1 1504/1 +f 1501/1 1500/1 1504/1 +f 1500/1 913/1 907/1 +f 1498/1 1501/1 1505/1 +f 1501/1 1504/1 1506/1 +f 1505/1 1501/1 1506/1 +f 1504/1 907/1 908/1 +f 1506/1 1504/1 1507/1 +f 1504/1 908/1 1507/1 +f 913/1 903/1 907/1 +f 913/1 906/1 903/1 +f 1503/1 912/1 913/1 +f 908/1 903/1 899/1 +f 908/1 899/1 1508/1 +f 1507/1 908/1 1508/1 +f 1507/1 1508/1 1509/1 +f 1510/1 1507/1 1509/1 +f 1506/1 1507/1 1510/1 +f 1509/1 1508/1 1511/1 +f 1511/1 1508/1 1512/1 +f 1508/1 897/1 1512/1 +f 1508/1 899/1 897/1 +f 1513/1 1509/1 1511/1 +f 1510/1 1509/1 1513/1 +f 1513/1 1511/1 1514/1 +f 1511/1 1512/1 1515/1 +f 1514/1 1511/1 1515/1 +f 1515/1 1512/1 1516/1 +f 1515/1 1516/1 1517/1 +f 1518/1 1515/1 1517/1 +f 1514/1 1515/1 1518/1 +f 1519/1 1513/1 1514/1 +f 1519/1 1514/1 1520/1 +f 1520/1 1514/1 1518/1 +f 1510/1 1513/1 1519/1 +f 1521/1 1522/1 1519/1 +f 1521/1 1519/1 1523/1 +f 1523/1 1519/1 1520/1 +f 1522/1 1510/1 1519/1 +f 1523/1 1520/1 1524/1 +f 1524/1 1520/1 1525/1 +f 1520/1 1518/1 1525/1 +f 1481/1 1523/1 1526/1 +f 1481/1 1521/1 1523/1 +f 1526/1 1523/1 1524/1 +f 1527/1 1522/1 1521/1 +f 1481/1 1527/1 1521/1 +f 1528/1 1510/1 1522/1 +f 1527/1 1528/1 1522/1 +f 1528/1 1506/1 1510/1 +f 1505/1 1506/1 1528/1 +f 1529/1 1505/1 1528/1 +f 1529/1 1528/1 1527/1 +f 1483/1 1527/1 1481/1 +f 1483/1 1529/1 1527/1 +f 1482/1 1481/1 1526/1 +f 1482/1 1530/1 1531/1 +f 1482/1 1526/1 1530/1 +f 1390/1 1482/1 1391/1 +f 1391/1 1482/1 1531/1 +f 1531/1 1532/1 1533/1 +f 1531/1 1530/1 1534/1 +f 1531/1 1534/1 1532/1 +f 1533/1 1535/1 1536/1 +f 1533/1 1532/1 1535/1 +f 1532/1 1537/1 1535/1 +f 1532/1 1538/1 1537/1 +f 1534/1 1538/1 1532/1 +f 1530/1 1539/1 1534/1 +f 1534/1 1539/1 1538/1 +f 1539/1 1540/1 1538/1 +f 1538/1 1540/1 1541/1 +f 1538/1 1541/1 1537/1 +f 1539/1 1542/1 1540/1 +f 1543/1 1542/1 1539/1 +f 1530/1 1543/1 1539/1 +f 1526/1 1544/1 1530/1 +f 1530/1 1544/1 1543/1 +f 1543/1 1545/1 1542/1 +f 1544/1 1545/1 1543/1 +f 1526/1 1524/1 1544/1 +f 1524/1 1525/1 1544/1 +f 1544/1 1525/1 1545/1 +f 1525/1 1546/1 1545/1 +f 1545/1 1546/1 1542/1 +f 1525/1 1518/1 1546/1 +f 1518/1 1517/1 1546/1 +f 1546/1 1517/1 1547/1 +f 1546/1 1548/1 1542/1 +f 1546/1 1547/1 1548/1 +f 1517/1 1516/1 1547/1 +f 1548/1 1547/1 1549/1 +f 1547/1 1417/1 1549/1 +f 1547/1 1516/1 1417/1 +f 1542/1 1548/1 1550/1 +f 1548/1 1549/1 1550/1 +f 1549/1 1417/1 1418/1 +f 1550/1 1549/1 1551/1 +f 1549/1 1418/1 1551/1 +f 1516/1 891/1 1417/1 +f 1516/1 897/1 891/1 +f 1418/1 891/1 890/1 +f 1418/1 890/1 889/1 +f 1551/1 1418/1 1552/1 +f 1552/1 1418/1 889/1 +f 1550/1 1551/1 1553/1 +f 1553/1 1551/1 1552/1 +f 1552/1 889/1 1554/1 +f 1555/1 1552/1 1554/1 +f 1553/1 1552/1 1555/1 +f 1554/1 889/1 887/1 +f 1556/1 1554/1 1557/1 +f 1554/1 887/1 1557/1 +f 887/1 890/1 888/1 +f 1557/1 887/1 886/1 +f 1557/1 886/1 885/1 +f 1419/1 1557/1 885/1 +f 1556/1 1557/1 1419/1 +f 1555/1 1554/1 1556/1 +f 1558/1 1555/1 1559/1 +f 1553/1 1555/1 1558/1 +f 1559/1 1555/1 1556/1 +f 1537/1 1558/1 1559/1 +f 1541/1 1553/1 1558/1 +f 1537/1 1541/1 1558/1 +f 1537/1 1559/1 1560/1 +f 1559/1 1556/1 1561/1 +f 1560/1 1559/1 1561/1 +f 1561/1 1556/1 1419/1 +f 1561/1 1419/1 1426/1 +f 1562/1 1561/1 1426/1 +f 1560/1 1561/1 1562/1 +f 1535/1 1560/1 1562/1 +f 1535/1 1537/1 1560/1 +f 1562/1 1426/1 1427/1 +f 1535/1 1562/1 1428/1 +f 1428/1 1562/1 1427/1 +f 1427/1 1426/1 1425/1 +f 1536/1 1535/1 1428/1 +f 862/1 1428/1 1429/1 +f 1540/1 1553/1 1541/1 +f 1542/1 1550/1 1540/1 +f 1540/1 1550/1 1553/1 +f 1483/1 1488/1 1529/1 +f 1488/1 1505/1 1529/1 +f 1488/1 1498/1 1505/1 +f 1563/1 910/1 912/1 +f 1563/1 912/1 1503/1 +f 1502/1 1563/1 1503/1 +f 1564/1 1565/1 1563/1 +f 1565/1 910/1 1563/1 +f 1564/1 1563/1 1502/1 +f 1566/1 915/1 910/1 +f 1566/1 910/1 1565/1 +f 1567/1 1566/1 1565/1 +f 1567/1 1565/1 1564/1 +f 1568/1 1321/1 1566/1 +f 1321/1 915/1 1566/1 +f 1568/1 1566/1 1567/1 +f 1569/1 1567/1 1564/1 +f 1570/1 1569/1 1571/1 +f 1572/1 1567/1 1569/1 +f 1569/1 1564/1 1571/1 +f 1573/1 1572/1 1569/1 +f 1573/1 1569/1 1570/1 +f 1494/1 1571/1 1495/1 +f 1570/1 1571/1 1494/1 +f 1571/1 1564/1 1495/1 +f 1493/1 1570/1 1494/1 +f 1574/1 1570/1 1493/1 +f 1575/1 1574/1 1493/1 +f 1575/1 1493/1 1486/1 +f 1574/1 1573/1 1570/1 +f 1576/1 1577/1 1574/1 +f 1574/1 1577/1 1573/1 +f 1575/1 1576/1 1574/1 +f 1577/1 1572/1 1573/1 +f 1576/1 1578/1 1577/1 +f 1577/1 1579/1 1572/1 +f 1578/1 1579/1 1577/1 +f 1576/1 1580/1 1578/1 +f 1580/1 1581/1 1578/1 +f 1578/1 1581/1 1579/1 +f 1581/1 1319/1 1579/1 +f 1579/1 1568/1 1572/1 +f 1319/1 1582/1 1579/1 +f 1579/1 1582/1 1568/1 +f 1572/1 1568/1 1567/1 +f 950/1 929/1 1319/1 +f 950/1 1319/1 1581/1 +f 1580/1 950/1 1581/1 +f 1583/1 950/1 1580/1 +f 1583/1 949/1 950/1 +f 948/1 949/1 1583/1 +f 1584/1 1583/1 1580/1 +f 1584/1 948/1 1583/1 +f 956/1 948/1 1584/1 +f 956/1 945/1 948/1 +f 1585/1 1584/1 1576/1 +f 1586/1 956/1 1584/1 +f 1584/1 1580/1 1576/1 +f 1586/1 1584/1 1585/1 +f 1585/1 1576/1 1575/1 +f 1587/1 1585/1 1575/1 +f 1587/1 1575/1 1588/1 +f 1588/1 1575/1 1486/1 +f 1408/1 1589/1 1587/1 +f 1408/1 1587/1 1404/1 +f 1404/1 1587/1 1588/1 +f 1589/1 1585/1 1587/1 +f 1589/1 1586/1 1585/1 +f 1590/1 1591/1 1589/1 +f 1590/1 1589/1 1408/1 +f 1591/1 1586/1 1589/1 +f 1336/1 1590/1 1408/1 +f 1335/1 1590/1 1336/1 +f 1335/1 1592/1 1590/1 +f 1592/1 1591/1 1590/1 +f 1592/1 1593/1 1591/1 +f 1593/1 955/1 1591/1 +f 1591/1 955/1 1586/1 +f 955/1 956/1 1586/1 +f 952/1 951/1 955/1 +f 1593/1 952/1 955/1 +f 1594/1 1595/1 1593/1 +f 1595/1 952/1 1593/1 +f 1594/1 1593/1 1592/1 +f 1595/1 1001/1 952/1 +f 1596/1 1595/1 1594/1 +f 1596/1 1597/1 1595/1 +f 1597/1 1001/1 1595/1 +f 1597/1 1000/1 1001/1 +f 1598/1 1597/1 1596/1 +f 1599/1 1000/1 1597/1 +f 1598/1 1599/1 1597/1 +f 1599/1 1004/1 1000/1 +f 1600/1 1599/1 1598/1 +f 1600/1 1601/1 1599/1 +f 1601/1 1004/1 1599/1 +f 1602/1 1598/1 1596/1 +f 1603/1 1598/1 1602/1 +f 1603/1 1600/1 1598/1 +f 1602/1 1596/1 1604/1 +f 1602/1 1605/1 1603/1 +f 1604/1 1606/1 1602/1 +f 1602/1 1606/1 1605/1 +f 1607/1 1600/1 1603/1 +f 1603/1 1605/1 1608/1 +f 1603/1 1608/1 1607/1 +f 1609/1 1608/1 1605/1 +f 1609/1 1605/1 1606/1 +f 1608/1 1610/1 1607/1 +f 1611/1 1610/1 1608/1 +f 1611/1 1608/1 1609/1 +f 1612/1 1600/1 1607/1 +f 1607/1 1610/1 1612/1 +f 1612/1 1610/1 1613/1 +f 1614/1 1613/1 1610/1 +f 1614/1 1610/1 1611/1 +f 1615/1 1614/1 1611/1 +f 1615/1 1611/1 1616/1 +f 1616/1 1611/1 1609/1 +f 1617/1 1618/1 1614/1 +f 1614/1 1618/1 1613/1 +f 1619/1 1614/1 1615/1 +f 1617/1 1614/1 1619/1 +f 1619/1 1615/1 1616/1 +f 1619/1 1616/1 1620/1 +f 1616/1 1609/1 1621/1 +f 1620/1 1616/1 1621/1 +f 978/1 1619/1 1620/1 +f 983/1 1617/1 1619/1 +f 983/1 1619/1 978/1 +f 978/1 1620/1 975/1 +f 1620/1 1621/1 1622/1 +f 975/1 1620/1 1622/1 +f 1621/1 1609/1 1623/1 +f 1622/1 1621/1 1623/1 +f 1609/1 1606/1 1623/1 +f 1622/1 1623/1 1624/1 +f 1623/1 1625/1 1624/1 +f 1623/1 1606/1 1625/1 +f 1622/1 1624/1 1626/1 +f 975/1 1622/1 976/1 +f 976/1 1622/1 1626/1 +f 1624/1 1625/1 1627/1 +f 1624/1 1627/1 1628/1 +f 1626/1 1624/1 1628/1 +f 1625/1 1629/1 1627/1 +f 1625/1 1606/1 1629/1 +f 1630/1 1629/1 1606/1 +f 1630/1 1606/1 1604/1 +f 1627/1 1629/1 1631/1 +f 1632/1 1631/1 1629/1 +f 1632/1 1629/1 1633/1 +f 1633/1 1629/1 1630/1 +f 1627/1 1631/1 1628/1 +f 1628/1 1631/1 1634/1 +f 1635/1 1634/1 1631/1 +f 1635/1 1631/1 1636/1 +f 1636/1 1631/1 1632/1 +f 1632/1 1594/1 1636/1 +f 1633/1 1594/1 1632/1 +f 1633/1 1596/1 1594/1 +f 1630/1 1596/1 1633/1 +f 1604/1 1596/1 1630/1 +f 1635/1 1594/1 1592/1 +f 1636/1 1594/1 1635/1 +f 1635/1 1592/1 1637/1 +f 1637/1 1634/1 1635/1 +f 1638/1 1592/1 1335/1 +f 1637/1 1592/1 1638/1 +f 1638/1 1639/1 1637/1 +f 1335/1 1330/1 1638/1 +f 1336/1 1332/1 1335/1 +f 1336/1 1408/1 1410/1 +f 1410/1 1333/1 1336/1 +f 1410/1 1408/1 1409/1 +f 1327/1 1634/1 1639/1 +f 1327/1 1628/1 1634/1 +f 1637/1 1639/1 1634/1 +f 1327/1 1639/1 1328/1 +f 1330/1 1639/1 1638/1 +f 1328/1 1639/1 1330/1 +f 1325/1 1328/1 1326/1 +f 1322/1 1327/1 1325/1 +f 1324/1 1327/1 1322/1 +f 1324/1 1628/1 1327/1 +f 1626/1 1628/1 1324/1 +f 976/1 1324/1 925/1 +f 976/1 1626/1 1324/1 +f 1031/1 1640/1 1617/1 +f 1031/1 1617/1 983/1 +f 1032/1 1072/1 1031/1 +f 1031/1 1072/1 1640/1 +f 1640/1 1641/1 1618/1 +f 1640/1 1618/1 1617/1 +f 1072/1 1641/1 1640/1 +f 1072/1 1071/1 1642/1 +f 1070/1 1071/1 1072/1 +f 1072/1 1642/1 1641/1 +f 1642/1 1643/1 1641/1 +f 1641/1 1643/1 1644/1 +f 1641/1 1644/1 1618/1 +f 1644/1 1645/1 1618/1 +f 1618/1 1645/1 1613/1 +f 1643/1 1646/1 1644/1 +f 1644/1 1646/1 1645/1 +f 1642/1 1647/1 1643/1 +f 1643/1 1647/1 1646/1 +f 1074/1 1309/1 1647/1 +f 1074/1 1647/1 1642/1 +f 1071/1 1074/1 1642/1 +f 1074/1 1076/1 1309/1 +f 1305/1 1309/1 1076/1 +f 1308/1 1647/1 1309/1 +f 1648/1 1646/1 1647/1 +f 1648/1 1647/1 1649/1 +f 1648/1 1650/1 1651/1 +f 1649/1 1650/1 1648/1 +f 1651/1 1646/1 1648/1 +f 1651/1 1652/1 1653/1 +f 1651/1 1650/1 1652/1 +f 1653/1 1646/1 1651/1 +f 1653/1 1645/1 1646/1 +f 1653/1 1652/1 1654/1 +f 1654/1 1645/1 1653/1 +f 1654/1 1652/1 1655/1 +f 1655/1 1652/1 1600/1 +f 1655/1 1645/1 1654/1 +f 1655/1 1613/1 1645/1 +f 1655/1 1600/1 1612/1 +f 1612/1 1613/1 1655/1 +f 1652/1 1601/1 1600/1 +f 1652/1 1656/1 1601/1 +f 1650/1 1656/1 1652/1 +f 1656/1 1007/1 1601/1 +f 1601/1 1007/1 1004/1 +f 1650/1 1310/1 1656/1 +f 1310/1 1657/1 1656/1 +f 1656/1 1657/1 1007/1 +f 1308/1 1650/1 1649/1 +f 1306/1 1310/1 1650/1 +f 1308/1 1306/1 1650/1 +f 1307/1 1658/1 1310/1 +f 1310/1 1658/1 1657/1 +f 1657/1 1316/1 1007/1 +f 1658/1 1659/1 1657/1 +f 1660/1 1661/1 1658/1 +f 1658/1 1661/1 1659/1 +f 1660/1 1662/1 1663/1 +f 1664/1 1662/1 1660/1 +f 1660/1 1663/1 1661/1 +f 1661/1 1665/1 1659/1 +f 1663/1 1666/1 1661/1 +f 1661/1 1666/1 1665/1 +f 1663/1 1667/1 1666/1 +f 1662/1 1668/1 1663/1 +f 1663/1 1668/1 1667/1 +f 1666/1 1669/1 1665/1 +f 1667/1 1670/1 1666/1 +f 1666/1 1670/1 1669/1 +f 1668/1 1671/1 1667/1 +f 1667/1 1671/1 1670/1 +f 1672/1 1673/1 1668/1 +f 1668/1 1673/1 1671/1 +f 1662/1 1672/1 1668/1 +f 1674/1 1675/1 1671/1 +f 1671/1 1675/1 1676/1 +f 1673/1 1674/1 1671/1 +f 1671/1 1676/1 1670/1 +f 1670/1 1676/1 1677/1 +f 1670/1 1677/1 1669/1 +f 1676/1 1678/1 1679/1 +f 1676/1 1679/1 1677/1 +f 1675/1 1678/1 1676/1 +f 1674/1 1680/1 1675/1 +f 1675/1 1680/1 1678/1 +f 1680/1 1681/1 1678/1 +f 1678/1 1681/1 1682/1 +f 1678/1 1682/1 1679/1 +f 1677/1 1679/1 1683/1 +f 1679/1 1682/1 1683/1 +f 1677/1 1683/1 1684/1 +f 1683/1 1040/1 1042/1 +f 1684/1 1683/1 1042/1 +f 1683/1 1682/1 1040/1 +f 1682/1 1037/1 1040/1 +f 1042/1 1040/1 1038/1 +f 1044/1 1042/1 1043/1 +f 1038/1 1037/1 1033/1 +f 1682/1 1041/1 1037/1 +f 1681/1 1041/1 1682/1 +f 1681/1 1050/1 1041/1 +f 1685/1 1686/1 1681/1 +f 1685/1 1681/1 1680/1 +f 1674/1 1685/1 1680/1 +f 1687/1 1686/1 1685/1 +f 1688/1 1687/1 1685/1 +f 1688/1 1685/1 1674/1 +f 1312/1 1050/1 1686/1 +f 1687/1 1312/1 1686/1 +f 1050/1 1052/1 1049/1 +f 1312/1 1056/1 1050/1 +f 1689/1 1312/1 1690/1 +f 1690/1 1312/1 1687/1 +f 1689/1 1311/1 1312/1 +f 1056/1 1051/1 1050/1 +f 1691/1 1056/1 1311/1 +f 1692/1 1691/1 1311/1 +f 1692/1 1311/1 1689/1 +f 1693/1 1692/1 1689/1 +f 1694/1 1692/1 1693/1 +f 1695/1 1691/1 1692/1 +f 1694/1 1695/1 1692/1 +f 1696/1 1694/1 1697/1 +f 1697/1 1694/1 1693/1 +f 1696/1 1695/1 1694/1 +f 1698/1 1691/1 1695/1 +f 1696/1 1698/1 1695/1 +f 1699/1 1700/1 1696/1 +f 1699/1 1696/1 1701/1 +f 1701/1 1696/1 1697/1 +f 1700/1 1698/1 1696/1 +f 1701/1 1697/1 1702/1 +f 1702/1 1697/1 1693/1 +f 1703/1 1699/1 1701/1 +f 1703/1 1701/1 1704/1 +f 1704/1 1701/1 1702/1 +f 1705/1 1706/1 1699/1 +f 1705/1 1699/1 1703/1 +f 1706/1 1700/1 1699/1 +f 1707/1 1703/1 1704/1 +f 1708/1 1703/1 1707/1 +f 1708/1 1705/1 1703/1 +f 1704/1 1702/1 1709/1 +f 1707/1 1704/1 1710/1 +f 1710/1 1704/1 1709/1 +f 1711/1 1707/1 1710/1 +f 1712/1 1707/1 1711/1 +f 1712/1 1708/1 1707/1 +f 1710/1 1709/1 1713/1 +f 1714/1 1710/1 1715/1 +f 1711/1 1710/1 1714/1 +f 1710/1 1713/1 1715/1 +f 1709/1 1702/1 1716/1 +f 1709/1 1716/1 1713/1 +f 1713/1 1717/1 1718/1 +f 1715/1 1713/1 1718/1 +f 1713/1 1716/1 1717/1 +f 1702/1 1693/1 1716/1 +f 1716/1 1693/1 1719/1 +f 1716/1 1719/1 1717/1 +f 1718/1 1717/1 1720/1 +f 1717/1 1719/1 1720/1 +f 1715/1 1718/1 1721/1 +f 1718/1 1720/1 1721/1 +f 1721/1 1720/1 1722/1 +f 1719/1 1723/1 1720/1 +f 1720/1 1688/1 1722/1 +f 1720/1 1723/1 1688/1 +f 1693/1 1689/1 1719/1 +f 1719/1 1689/1 1690/1 +f 1719/1 1690/1 1723/1 +f 1723/1 1690/1 1687/1 +f 1723/1 1687/1 1688/1 +f 1722/1 1688/1 1674/1 +f 1722/1 1674/1 1673/1 +f 1721/1 1722/1 1672/1 +f 1672/1 1722/1 1673/1 +f 1662/1 1721/1 1672/1 +f 1664/1 1715/1 1662/1 +f 1715/1 1721/1 1662/1 +f 1714/1 1715/1 1664/1 +f 1086/1 1714/1 1664/1 +f 1086/1 1664/1 1087/1 +f 1087/1 1664/1 1660/1 +f 1098/1 1711/1 1086/1 +f 1128/1 1712/1 1098/1 +f 1098/1 1712/1 1711/1 +f 1086/1 1711/1 1714/1 +f 1724/1 1708/1 1712/1 +f 1724/1 1725/1 1708/1 +f 1726/1 1725/1 1724/1 +f 1727/1 1726/1 1724/1 +f 1727/1 1724/1 1127/1 +f 1127/1 1724/1 1128/1 +f 1708/1 1728/1 1705/1 +f 1725/1 1728/1 1708/1 +f 1729/1 1728/1 1725/1 +f 1726/1 1729/1 1725/1 +f 1729/1 1730/1 1728/1 +f 1728/1 1730/1 1706/1 +f 1728/1 1706/1 1705/1 +f 1731/1 1732/1 1729/1 +f 1729/1 1732/1 1730/1 +f 1733/1 1731/1 1729/1 +f 1733/1 1729/1 1726/1 +f 1730/1 1734/1 1735/1 +f 1730/1 1735/1 1706/1 +f 1730/1 1732/1 1734/1 +f 1706/1 1735/1 1700/1 +f 1734/1 1736/1 1735/1 +f 1735/1 1736/1 1737/1 +f 1735/1 1737/1 1700/1 +f 1732/1 1738/1 1734/1 +f 1734/1 1738/1 1736/1 +f 1739/1 1732/1 1731/1 +f 1739/1 1738/1 1732/1 +f 1739/1 1740/1 1738/1 +f 1738/1 1740/1 1736/1 +f 1740/1 1148/1 1736/1 +f 1736/1 1148/1 1304/1 +f 1736/1 1304/1 1737/1 +f 1737/1 1304/1 1698/1 +f 1700/1 1737/1 1698/1 +f 1698/1 1304/1 1691/1 +f 1304/1 1053/1 1691/1 +f 1148/1 1149/1 1304/1 +f 1147/1 1148/1 1741/1 +f 1147/1 1145/1 1148/1 +f 1741/1 1148/1 1740/1 +f 1741/1 1740/1 1739/1 +f 1742/1 1147/1 1741/1 +f 1742/1 1741/1 1743/1 +f 1743/1 1741/1 1739/1 +f 1742/1 1152/1 1147/1 +f 1743/1 1744/1 1742/1 +f 1742/1 1744/1 1152/1 +f 1744/1 1745/1 1152/1 +f 1152/1 1745/1 1153/1 +f 1745/1 1160/1 1153/1 +f 1743/1 1739/1 1746/1 +f 1746/1 1739/1 1731/1 +f 1746/1 1747/1 1743/1 +f 1743/1 1747/1 1744/1 +f 1733/1 1748/1 1746/1 +f 1746/1 1748/1 1747/1 +f 1746/1 1731/1 1733/1 +f 1748/1 1749/1 1747/1 +f 1747/1 1749/1 1750/1 +f 1747/1 1750/1 1744/1 +f 1744/1 1750/1 1745/1 +f 1749/1 1751/1 1750/1 +f 1750/1 1751/1 1752/1 +f 1750/1 1752/1 1160/1 +f 1750/1 1160/1 1745/1 +f 1753/1 1754/1 1749/1 +f 1749/1 1754/1 1751/1 +f 1748/1 1753/1 1749/1 +f 1733/1 1753/1 1748/1 +f 1726/1 1753/1 1733/1 +f 1755/1 1754/1 1753/1 +f 1755/1 1753/1 1727/1 +f 1727/1 1753/1 1726/1 +f 1126/1 1755/1 1756/1 +f 1756/1 1755/1 1727/1 +f 1126/1 1754/1 1755/1 +f 1756/1 1727/1 1127/1 +f 1123/1 1756/1 1111/1 +f 1123/1 1126/1 1756/1 +f 1111/1 1756/1 1127/1 +f 1757/1 1758/1 1126/1 +f 1124/1 1757/1 1126/1 +f 1759/1 1758/1 1757/1 +f 1759/1 1199/1 1758/1 +f 1199/1 1178/1 1758/1 +f 1758/1 1760/1 1126/1 +f 1199/1 1759/1 1198/1 +f 1198/1 1759/1 1761/1 +f 1199/1 1181/1 1178/1 +f 1762/1 1201/1 1761/1 +f 1198/1 1761/1 1201/1 +f 1763/1 1203/1 1762/1 +f 1762/1 1203/1 1201/1 +f 1764/1 1212/1 1763/1 +f 1763/1 1212/1 1203/1 +f 1212/1 1764/1 1765/1 +f 1212/1 1765/1 1235/1 +f 1235/1 1765/1 1766/1 +f 1235/1 1766/1 1236/1 +f 1236/1 1766/1 1767/1 +f 1767/1 1299/1 1236/1 +f 1292/1 1768/1 1767/1 +f 1767/1 1768/1 1299/1 +f 1768/1 1292/1 1290/1 +f 1768/1 1290/1 1769/1 +f 1769/1 1290/1 1770/1 +f 1290/1 1289/1 1770/1 +f 1770/1 1289/1 1288/1 +f 1287/1 1771/1 1770/1 +f 1287/1 1770/1 1288/1 +f 1126/1 1760/1 1772/1 +f 1126/1 1772/1 1754/1 +f 1772/1 1760/1 1172/1 +f 1773/1 1772/1 1172/1 +f 1754/1 1772/1 1774/1 +f 1774/1 1772/1 1773/1 +f 1751/1 1754/1 1774/1 +f 1774/1 1773/1 1175/1 +f 1751/1 1774/1 1752/1 +f 1752/1 1774/1 1175/1 +f 1773/1 1172/1 1174/1 +f 1175/1 1773/1 1174/1 +f 1172/1 1760/1 1173/1 +f 1760/1 1178/1 1173/1 +f 1173/1 1178/1 1176/1 +f 1758/1 1178/1 1760/1 +f 1752/1 1175/1 1160/1 +f 1160/1 1175/1 1161/1 +f 1691/1 1053/1 1056/1 +f 1128/1 1724/1 1712/1 +f 1087/1 1660/1 1307/1 +f 1307/1 1660/1 1658/1 +f 1684/1 1042/1 1044/1 +f 1665/1 1669/1 1775/1 +f 1669/1 1677/1 1775/1 +f 1665/1 1775/1 1776/1 +f 1665/1 1776/1 1777/1 +f 1659/1 1665/1 1777/1 +f 1677/1 1684/1 1775/1 +f 1775/1 1684/1 1776/1 +f 1776/1 1684/1 1044/1 +f 1776/1 1044/1 1318/1 +f 1777/1 1776/1 1318/1 +f 1659/1 1777/1 1317/1 +f 1777/1 1318/1 1317/1 +f 1659/1 1317/1 1316/1 +f 1657/1 1659/1 1316/1 +f 1317/1 1318/1 1315/1 +f 1305/1 1306/1 1308/1 +f 1649/1 1647/1 1308/1 +f 951/1 943/1 956/1 +f 956/1 943/1 945/1 +f 1387/1 1588/1 1389/1 +f 1588/1 1486/1 1389/1 +f 1564/1 1502/1 1495/1 +f 1582/1 1321/1 1568/1 +f 1319/1 1320/1 1582/1 +f 1582/1 1320/1 1321/1 +f 1778/1 1779/1 1780/1 +f 1781/1 1779/1 1778/1 +f 1782/1 1781/1 1778/1 +f 1783/1 1778/1 1780/1 +f 762/1 1778/1 1783/1 +f 1784/1 1778/1 762/1 +f 1784/1 1782/1 1778/1 +f 1785/1 1786/1 1781/1 +f 1781/1 1786/1 1779/1 +f 1782/1 1785/1 1781/1 +f 1787/1 1785/1 1782/1 +f 1788/1 1782/1 1784/1 +f 1788/1 1787/1 1782/1 +f 783/1 1788/1 1784/1 +f 783/1 1784/1 762/1 +f 762/1 1783/1 760/1 +f 783/1 762/1 761/1 +f 787/1 1788/1 783/1 +f 787/1 1789/1 1788/1 +f 1789/1 1790/1 1788/1 +f 1788/1 1790/1 1787/1 +f 791/1 1789/1 787/1 +f 1789/1 1791/1 1790/1 +f 1792/1 1791/1 1789/1 +f 791/1 1792/1 1789/1 +f 1791/1 1793/1 1790/1 +f 1790/1 1793/1 1787/1 +f 1792/1 1794/1 1791/1 +f 1794/1 1795/1 1791/1 +f 1791/1 1795/1 1793/1 +f 794/1 1792/1 791/1 +f 1796/1 1797/1 1792/1 +f 794/1 1796/1 1792/1 +f 1792/1 1797/1 1794/1 +f 1794/1 1797/1 1795/1 +f 1795/1 1798/1 1793/1 +f 1797/1 1799/1 1795/1 +f 1795/1 1799/1 1798/1 +f 1796/1 1800/1 1797/1 +f 1797/1 1801/1 1799/1 +f 1797/1 1800/1 1801/1 +f 1798/1 1799/1 1802/1 +f 1802/1 1799/1 1803/1 +f 1803/1 1799/1 1801/1 +f 1793/1 1798/1 1804/1 +f 1805/1 1804/1 1798/1 +f 1805/1 1798/1 1802/1 +f 1803/1 1806/1 1802/1 +f 1802/1 1806/1 1805/1 +f 1807/1 1806/1 1803/1 +f 1803/1 1801/1 1807/1 +f 1800/1 1808/1 1801/1 +f 1807/1 1801/1 1808/1 +f 1807/1 1809/1 1806/1 +f 1810/1 1809/1 1807/1 +f 1807/1 1808/1 1810/1 +f 1810/1 1808/1 1811/1 +f 1811/1 1809/1 1810/1 +f 1812/1 1397/1 1809/1 +f 1812/1 1809/1 1811/1 +f 1811/1 1813/1 1812/1 +f 1812/1 1813/1 1814/1 +f 1814/1 1397/1 1812/1 +f 1394/1 1395/1 1397/1 +f 1397/1 1395/1 1815/1 +f 1400/1 1397/1 1814/1 +f 1397/1 1815/1 1809/1 +f 1392/1 1533/1 1395/1 +f 1395/1 1533/1 1536/1 +f 1395/1 1536/1 1815/1 +f 1815/1 1536/1 862/1 +f 1815/1 862/1 1816/1 +f 1809/1 1815/1 1816/1 +f 1809/1 1816/1 1806/1 +f 1806/1 1816/1 1817/1 +f 1816/1 862/1 859/1 +f 1816/1 859/1 1817/1 +f 1536/1 1428/1 862/1 +f 1806/1 1817/1 1818/1 +f 1818/1 1817/1 1819/1 +f 1817/1 859/1 857/1 +f 1817/1 857/1 1819/1 +f 1805/1 1806/1 1818/1 +f 1805/1 1818/1 1820/1 +f 1818/1 1819/1 1821/1 +f 1820/1 1818/1 1821/1 +f 1821/1 1819/1 1822/1 +f 1819/1 857/1 818/1 +f 1819/1 818/1 1822/1 +f 1821/1 1822/1 1823/1 +f 1822/1 818/1 819/1 +f 1822/1 819/1 1824/1 +f 1823/1 1822/1 1824/1 +f 1823/1 1824/1 1825/1 +f 1825/1 1824/1 1826/1 +f 1824/1 819/1 854/1 +f 1824/1 854/1 1826/1 +f 1825/1 1826/1 1827/1 +f 1826/1 854/1 1828/1 +f 1826/1 1828/1 1829/1 +f 1827/1 1826/1 1829/1 +f 854/1 850/1 1828/1 +f 1828/1 850/1 1830/1 +f 850/1 847/1 1830/1 +f 1830/1 849/1 1831/1 +f 1830/1 1831/1 1832/1 +f 1833/1 1830/1 1832/1 +f 1830/1 847/1 849/1 +f 849/1 851/1 1831/1 +f 1832/1 1831/1 1834/1 +f 1831/1 851/1 852/1 +f 1831/1 852/1 1834/1 +f 1832/1 1834/1 1835/1 +f 1834/1 852/1 1836/1 +f 1834/1 1836/1 1835/1 +f 852/1 778/1 1836/1 +f 1836/1 1837/1 1838/1 +f 1835/1 1836/1 1838/1 +f 778/1 777/1 1836/1 +f 1836/1 777/1 1837/1 +f 1839/1 1835/1 1840/1 +f 1835/1 1838/1 1840/1 +f 1832/1 1835/1 1839/1 +f 1840/1 1838/1 1841/1 +f 1838/1 1837/1 1842/1 +f 1838/1 1842/1 1841/1 +f 1839/1 1840/1 1843/1 +f 1840/1 1841/1 1843/1 +f 1844/1 1832/1 1839/1 +f 1844/1 1839/1 1845/1 +f 1839/1 1843/1 1845/1 +f 1843/1 1846/1 1847/1 +f 1845/1 1843/1 1847/1 +f 1843/1 1841/1 1846/1 +f 1841/1 1842/1 1848/1 +f 1841/1 1848/1 1846/1 +f 1847/1 1846/1 1849/1 +f 1846/1 1848/1 1849/1 +f 1847/1 1849/1 1850/1 +f 1845/1 1847/1 1850/1 +f 1849/1 1851/1 1852/1 +f 1849/1 1853/1 1851/1 +f 1848/1 1853/1 1849/1 +f 1850/1 1849/1 1852/1 +f 1848/1 1854/1 1855/1 +f 1842/1 1854/1 1848/1 +f 1848/1 1855/1 1853/1 +f 1853/1 1856/1 1851/1 +f 1853/1 1855/1 1856/1 +f 1855/1 769/1 1856/1 +f 1854/1 765/1 1855/1 +f 1855/1 765/1 769/1 +f 1842/1 768/1 1854/1 +f 1837/1 768/1 1842/1 +f 777/1 767/1 1837/1 +f 1837/1 767/1 768/1 +f 768/1 765/1 1854/1 +f 1856/1 769/1 770/1 +f 1857/1 770/1 772/1 +f 1858/1 770/1 1857/1 +f 1856/1 770/1 1858/1 +f 770/1 771/1 772/1 +f 770/1 766/1 771/1 +f 1857/1 772/1 1859/1 +f 1859/1 772/1 773/1 +f 1860/1 1859/1 1861/1 +f 1860/1 1857/1 1859/1 +f 1859/1 773/1 1862/1 +f 1861/1 1859/1 1862/1 +f 773/1 771/1 708/1 +f 1862/1 773/1 1863/1 +f 773/1 708/1 1863/1 +f 1861/1 1862/1 1864/1 +f 1862/1 1863/1 1865/1 +f 1864/1 1862/1 1865/1 +f 1866/1 1861/1 1867/1 +f 1867/1 1861/1 1864/1 +f 1866/1 1860/1 1861/1 +f 1864/1 1868/1 1869/1 +f 1867/1 1864/1 1870/1 +f 1870/1 1864/1 1869/1 +f 1864/1 1865/1 1868/1 +f 1865/1 1863/1 1871/1 +f 1868/1 1865/1 1871/1 +f 1868/1 1871/1 1872/1 +f 1869/1 1868/1 1872/1 +f 1873/1 1870/1 1869/1 +f 1873/1 1869/1 1874/1 +f 1869/1 1872/1 1875/1 +f 1874/1 1869/1 1875/1 +f 1876/1 1867/1 1870/1 +f 1876/1 1870/1 1873/1 +f 1877/1 1873/1 1874/1 +f 1877/1 1876/1 1873/1 +f 1874/1 1875/1 1878/1 +f 1877/1 1874/1 1879/1 +f 1879/1 1874/1 1878/1 +f 1878/1 1875/1 1880/1 +f 1875/1 1872/1 1881/1 +f 1875/1 1881/1 1880/1 +f 1879/1 1878/1 1882/1 +f 1878/1 1880/1 1882/1 +f 1879/1 1882/1 1883/1 +f 1884/1 1877/1 1879/1 +f 1884/1 1879/1 1883/1 +f 1882/1 1880/1 1885/1 +f 1883/1 1882/1 1886/1 +f 1882/1 1885/1 1886/1 +f 1880/1 1881/1 1887/1 +f 1880/1 1887/1 1885/1 +f 1885/1 1887/1 1888/1 +f 1886/1 1885/1 1888/1 +f 1883/1 1886/1 1889/1 +f 1886/1 1888/1 1889/1 +f 1888/1 1890/1 1891/1 +f 1889/1 1888/1 1892/1 +f 1887/1 1890/1 1888/1 +f 1888/1 1891/1 1892/1 +f 1881/1 1893/1 1887/1 +f 1887/1 1894/1 1890/1 +f 1887/1 1893/1 1894/1 +f 1890/1 1895/1 1891/1 +f 1890/1 1894/1 1895/1 +f 1891/1 1895/1 1896/1 +f 1892/1 1891/1 1897/1 +f 1891/1 1896/1 1897/1 +f 1898/1 1892/1 1899/1 +f 1889/1 1892/1 1898/1 +f 1892/1 1897/1 1899/1 +f 1897/1 1896/1 1900/1 +f 1897/1 1900/1 1901/1 +f 1897/1 1901/1 1902/1 +f 1899/1 1897/1 1902/1 +f 1895/1 1903/1 1896/1 +f 1896/1 1903/1 1900/1 +f 1900/1 1904/1 1905/1 +f 1901/1 1900/1 1905/1 +f 1900/1 1903/1 1904/1 +f 1901/1 1905/1 1906/1 +f 1907/1 1901/1 1906/1 +f 1906/1 1905/1 1908/1 +f 1907/1 1906/1 1909/1 +f 1909/1 1906/1 1910/1 +f 1905/1 1904/1 1911/1 +f 1905/1 1911/1 1908/1 +f 1906/1 1908/1 1910/1 +f 1910/1 1908/1 1912/1 +f 1910/1 1912/1 1476/1 +f 1476/1 1912/1 672/1 +f 1904/1 1456/1 1911/1 +f 1908/1 1911/1 671/1 +f 1911/1 1456/1 669/1 +f 1911/1 669/1 671/1 +f 1903/1 1456/1 1904/1 +f 1903/1 1453/1 1456/1 +f 1895/1 1913/1 1903/1 +f 1894/1 1913/1 1895/1 +f 1455/1 1453/1 1913/1 +f 1894/1 1455/1 1913/1 +f 1893/1 1455/1 1894/1 +f 1914/1 1455/1 1893/1 +f 1914/1 1454/1 1455/1 +f 1455/1 709/1 1453/1 +f 1881/1 1914/1 1893/1 +f 1871/1 1454/1 1914/1 +f 1872/1 1871/1 1914/1 +f 1872/1 1914/1 1881/1 +f 1871/1 1863/1 1454/1 +f 1863/1 709/1 1454/1 +f 1863/1 708/1 709/1 +f 1908/1 671/1 1912/1 +f 1912/1 671/1 672/1 +f 672/1 671/1 668/1 +f 671/1 669/1 664/1 +f 1910/1 1476/1 1477/1 +f 1909/1 1910/1 1915/1 +f 1915/1 1910/1 1477/1 +f 1478/1 1915/1 1477/1 +f 1916/1 1915/1 1478/1 +f 1916/1 1909/1 1915/1 +f 1917/1 1909/1 1916/1 +f 1917/1 1907/1 1909/1 +f 650/1 1916/1 1478/1 +f 1918/1 1917/1 1916/1 +f 1918/1 1916/1 650/1 +f 650/1 1478/1 649/1 +f 1919/1 1918/1 650/1 +f 1920/1 1921/1 1918/1 +f 1918/1 1922/1 1917/1 +f 1921/1 1922/1 1918/1 +f 1920/1 1918/1 1919/1 +f 1922/1 1907/1 1917/1 +f 1922/1 1902/1 1907/1 +f 1898/1 1899/1 1922/1 +f 1921/1 1898/1 1922/1 +f 1922/1 1899/1 1902/1 +f 1923/1 1924/1 1921/1 +f 1923/1 1921/1 1920/1 +f 1924/1 1898/1 1921/1 +f 1924/1 1889/1 1898/1 +f 1923/1 1883/1 1924/1 +f 1883/1 1889/1 1924/1 +f 1884/1 1883/1 1923/1 +f 1452/1 1884/1 1923/1 +f 1925/1 1877/1 1884/1 +f 1434/1 1925/1 1884/1 +f 1434/1 1884/1 1452/1 +f 1926/1 1927/1 1925/1 +f 1432/1 1926/1 1925/1 +f 1432/1 1925/1 1434/1 +f 1925/1 1927/1 1877/1 +f 1927/1 1876/1 1877/1 +f 1927/1 1928/1 1929/1 +f 1927/1 1929/1 1876/1 +f 1930/1 1928/1 1927/1 +f 1926/1 1930/1 1927/1 +f 1929/1 1867/1 1876/1 +f 1929/1 1866/1 1867/1 +f 1928/1 1866/1 1929/1 +f 1928/1 1931/1 1866/1 +f 1931/1 1860/1 1866/1 +f 1928/1 1932/1 1931/1 +f 1933/1 1860/1 1931/1 +f 1932/1 1933/1 1931/1 +f 1933/1 1857/1 1860/1 +f 1933/1 1858/1 1857/1 +f 1852/1 1851/1 1933/1 +f 1852/1 1933/1 1932/1 +f 1851/1 1858/1 1933/1 +f 1934/1 1852/1 1932/1 +f 1934/1 1932/1 1928/1 +f 1850/1 1852/1 1934/1 +f 1930/1 1934/1 1928/1 +f 1930/1 1850/1 1934/1 +f 1845/1 1850/1 1930/1 +f 1935/1 1845/1 1930/1 +f 1935/1 1930/1 1926/1 +f 1844/1 1845/1 1935/1 +f 1833/1 1832/1 1844/1 +f 1936/1 1833/1 1844/1 +f 1936/1 1844/1 729/1 +f 729/1 1844/1 1935/1 +f 1829/1 1828/1 1833/1 +f 1829/1 1833/1 1936/1 +f 1828/1 1830/1 1833/1 +f 736/1 1936/1 728/1 +f 736/1 1829/1 1936/1 +f 728/1 1936/1 729/1 +f 729/1 1935/1 730/1 +f 725/1 729/1 730/1 +f 730/1 1935/1 1926/1 +f 730/1 1926/1 1432/1 +f 1827/1 1829/1 736/1 +f 1937/1 1825/1 1827/1 +f 751/1 1827/1 736/1 +f 1937/1 1827/1 751/1 +f 1938/1 1825/1 1937/1 +f 751/1 750/1 1937/1 +f 1937/1 1939/1 1938/1 +f 1940/1 1825/1 1941/1 +f 1940/1 1823/1 1825/1 +f 1941/1 1825/1 1938/1 +f 1938/1 1942/1 1941/1 +f 1941/1 1942/1 1780/1 +f 1941/1 1780/1 1940/1 +f 1943/1 1823/1 1940/1 +f 1940/1 1780/1 1779/1 +f 1940/1 1779/1 1943/1 +f 1944/1 1821/1 1823/1 +f 1944/1 1823/1 1945/1 +f 1945/1 1823/1 1943/1 +f 1943/1 1779/1 1945/1 +f 1945/1 1779/1 1786/1 +f 1945/1 1786/1 1944/1 +f 1946/1 1821/1 1944/1 +f 1944/1 1786/1 1946/1 +f 1947/1 1821/1 1946/1 +f 1820/1 1821/1 1947/1 +f 1946/1 1786/1 1948/1 +f 1946/1 1948/1 1947/1 +f 1785/1 1948/1 1786/1 +f 1793/1 1804/1 1948/1 +f 1793/1 1948/1 1787/1 +f 1787/1 1948/1 1785/1 +f 1947/1 1948/1 1820/1 +f 1820/1 1948/1 1804/1 +f 1820/1 1804/1 1805/1 +f 1783/1 1780/1 1942/1 +f 1949/1 1783/1 753/1 +f 1783/1 1942/1 753/1 +f 760/1 1783/1 1949/1 +f 753/1 1942/1 1939/1 +f 1939/1 1942/1 1938/1 +f 753/1 1939/1 748/1 +f 1949/1 753/1 752/1 +f 760/1 1949/1 752/1 +f 760/1 752/1 754/1 +f 748/1 1939/1 750/1 +f 1937/1 750/1 1939/1 +f 751/1 736/1 1950/1 +f 1950/1 744/1 751/1 +f 1950/1 736/1 738/1 +f 738/1 744/1 1950/1 +f 1851/1 1856/1 1858/1 +f 1452/1 1923/1 1448/1 +f 1448/1 1923/1 1920/1 +f 1448/1 1920/1 1447/1 +f 1447/1 1920/1 1919/1 +f 1447/1 1919/1 1451/1 +f 1451/1 1919/1 644/1 +f 1919/1 650/1 644/1 +f 1951/1 1451/1 1952/1 +f 1451/1 644/1 1952/1 +f 1446/1 1451/1 1951/1 +f 1952/1 644/1 637/1 +f 644/1 650/1 643/1 +f 1953/1 1952/1 1954/1 +f 1951/1 1952/1 1953/1 +f 1952/1 637/1 1954/1 +f 1954/1 637/1 630/1 +f 1955/1 1954/1 1956/1 +f 1954/1 630/1 1956/1 +f 1953/1 1954/1 1955/1 +f 1956/1 630/1 629/1 +f 1957/1 1956/1 1958/1 +f 1956/1 629/1 1958/1 +f 1955/1 1956/1 1957/1 +f 1959/1 1955/1 1960/1 +f 1959/1 1953/1 1955/1 +f 1960/1 1955/1 1957/1 +f 1960/1 1961/1 1959/1 +f 1959/1 1961/1 1962/1 +f 1959/1 1962/1 1963/1 +f 1963/1 1953/1 1959/1 +f 1964/1 1965/1 1960/1 +f 1960/1 1965/1 1961/1 +f 1960/1 1957/1 1964/1 +f 1966/1 1962/1 1961/1 +f 1966/1 1961/1 1965/1 +f 1967/1 1962/1 1966/1 +f 1962/1 1968/1 1963/1 +f 1967/1 1968/1 1962/1 +f 1963/1 1968/1 1969/1 +f 1969/1 1953/1 1963/1 +f 1969/1 1968/1 1970/1 +f 1971/1 1968/1 1967/1 +f 1971/1 1970/1 1968/1 +f 1972/1 1971/1 1967/1 +f 1972/1 1967/1 1973/1 +f 1973/1 1967/1 1966/1 +f 1974/1 1971/1 1972/1 +f 1975/1 1971/1 1974/1 +f 1971/1 1976/1 1970/1 +f 1975/1 1976/1 1971/1 +f 1974/1 1972/1 1973/1 +f 1977/1 1973/1 1978/1 +f 1973/1 1966/1 1978/1 +f 1974/1 1973/1 1977/1 +f 1460/1 1974/1 1977/1 +f 666/1 1975/1 1974/1 +f 666/1 1974/1 1460/1 +f 1474/1 1977/1 1979/1 +f 1460/1 1977/1 1474/1 +f 1977/1 1978/1 1979/1 +f 1978/1 1966/1 1980/1 +f 1979/1 1978/1 1980/1 +f 1966/1 1965/1 1980/1 +f 1979/1 1980/1 1981/1 +f 1980/1 1982/1 1981/1 +f 1980/1 1965/1 1982/1 +f 1979/1 1981/1 1983/1 +f 1474/1 1979/1 586/1 +f 586/1 1979/1 1983/1 +f 1981/1 1982/1 1984/1 +f 1981/1 1984/1 1985/1 +f 1983/1 1981/1 1985/1 +f 1982/1 1986/1 1984/1 +f 1982/1 1965/1 1986/1 +f 1987/1 1986/1 1965/1 +f 1987/1 1965/1 1964/1 +f 1988/1 1989/1 1986/1 +f 1988/1 1986/1 1990/1 +f 1990/1 1986/1 1987/1 +f 1984/1 1986/1 1989/1 +f 1984/1 1989/1 1985/1 +f 1991/1 1992/1 1989/1 +f 1991/1 1989/1 1993/1 +f 1993/1 1989/1 1988/1 +f 1985/1 1989/1 1992/1 +f 1988/1 1994/1 1993/1 +f 1990/1 1994/1 1988/1 +f 1990/1 1957/1 1994/1 +f 1987/1 1957/1 1990/1 +f 1964/1 1957/1 1987/1 +f 1957/1 1958/1 1994/1 +f 1994/1 1958/1 1995/1 +f 1958/1 629/1 606/1 +f 1958/1 606/1 1995/1 +f 1994/1 1995/1 1996/1 +f 1996/1 1995/1 1997/1 +f 1995/1 606/1 608/1 +f 1995/1 608/1 1997/1 +f 1997/1 608/1 1998/1 +f 1997/1 1998/1 1999/1 +f 1996/1 1997/1 2000/1 +f 2000/1 1997/1 1999/1 +f 608/1 612/1 1998/1 +f 1998/1 616/1 2001/1 +f 1999/1 1998/1 2001/1 +f 2000/1 1999/1 2002/1 +f 1999/1 2001/1 2003/1 +f 2002/1 1999/1 2003/1 +f 2004/1 2000/1 2005/1 +f 2005/1 2000/1 2002/1 +f 2004/1 1996/1 2000/1 +f 2005/1 2006/1 2004/1 +f 2004/1 2007/1 2008/1 +f 2008/1 1996/1 2004/1 +f 2009/1 537/1 2005/1 +f 2005/1 2002/1 2009/1 +f 536/1 537/1 2009/1 +f 2005/1 537/1 2006/1 +f 2004/1 2006/1 2007/1 +f 541/1 2007/1 2006/1 +f 2007/1 2010/1 2008/1 +f 2011/1 2010/1 2007/1 +f 2011/1 2007/1 541/1 +f 544/1 2011/1 541/1 +f 544/1 541/1 540/1 +f 541/1 2006/1 537/1 +f 541/1 537/1 538/1 +f 2012/1 2013/1 2011/1 +f 2012/1 2011/1 544/1 +f 2013/1 2010/1 2011/1 +f 564/1 2012/1 544/1 +f 564/1 544/1 543/1 +f 564/1 2013/1 2012/1 +f 2013/1 1985/1 1992/1 +f 2014/1 1985/1 2013/1 +f 2014/1 2013/1 564/1 +f 2013/1 1992/1 2010/1 +f 565/1 564/1 546/1 +f 565/1 2014/1 564/1 +f 586/1 2014/1 565/1 +f 1983/1 1985/1 2014/1 +f 586/1 1983/1 2014/1 +f 2008/1 2010/1 2015/1 +f 2015/1 2010/1 1992/1 +f 2015/1 1992/1 1991/1 +f 1991/1 1996/1 2015/1 +f 2015/1 1996/1 2008/1 +f 1993/1 1994/1 1991/1 +f 1991/1 1994/1 1996/1 +f 2009/1 2002/1 536/1 +f 2002/1 2003/1 531/1 +f 535/1 2002/1 531/1 +f 536/1 2002/1 535/1 +f 535/1 534/1 536/1 +f 535/1 531/1 533/1 +f 531/1 2003/1 2016/1 +f 531/1 2016/1 518/1 +f 2003/1 2017/1 2016/1 +f 2003/1 2001/1 2017/1 +f 2016/1 2017/1 2018/1 +f 2016/1 2018/1 519/1 +f 518/1 2016/1 519/1 +f 2017/1 2019/1 2020/1 +f 2001/1 2021/1 2017/1 +f 2017/1 2021/1 2019/1 +f 2017/1 2020/1 2018/1 +f 519/1 2018/1 2022/1 +f 2018/1 2023/1 2022/1 +f 519/1 2022/1 514/1 +f 2022/1 2023/1 2024/1 +f 514/1 2022/1 2025/1 +f 2022/1 2024/1 2025/1 +f 514/1 2025/1 515/1 +f 515/1 2025/1 2026/1 +f 2025/1 2024/1 2027/1 +f 515/1 2026/1 496/1 +f 2026/1 2028/1 2029/1 +f 496/1 2026/1 2029/1 +f 2026/1 2027/1 2030/1 +f 2025/1 2027/1 2026/1 +f 2026/1 2030/1 2028/1 +f 2029/1 2031/1 494/1 +f 2029/1 2028/1 2032/1 +f 2029/1 2032/1 2031/1 +f 2031/1 2033/1 2034/1 +f 2032/1 2033/1 2031/1 +f 2031/1 2034/1 2035/1 +f 494/1 2031/1 2035/1 +f 2032/1 2036/1 2033/1 +f 2028/1 2036/1 2032/1 +f 2036/1 2037/1 2033/1 +f 2033/1 2037/1 2038/1 +f 2033/1 2038/1 2034/1 +f 2039/1 2040/1 2036/1 +f 2036/1 2040/1 2037/1 +f 2028/1 2039/1 2036/1 +f 2040/1 2041/1 2037/1 +f 2037/1 2041/1 2042/1 +f 2037/1 2042/1 2038/1 +f 2038/1 2042/1 2043/1 +f 2034/1 2038/1 2043/1 +f 2042/1 2044/1 2043/1 +f 2042/1 2045/1 2044/1 +f 2041/1 2046/1 2042/1 +f 2042/1 2046/1 2045/1 +f 2040/1 2047/1 2041/1 +f 2047/1 2048/1 2041/1 +f 2041/1 2048/1 2046/1 +f 2046/1 552/1 2045/1 +f 2048/1 552/1 2046/1 +f 2045/1 552/1 2049/1 +f 2044/1 2045/1 2050/1 +f 2045/1 2049/1 2050/1 +f 552/1 453/1 549/1 +f 552/1 549/1 2049/1 +f 2048/1 551/1 552/1 +f 2049/1 549/1 2051/1 +f 2050/1 2049/1 2051/1 +f 2050/1 2051/1 2052/1 +f 2053/1 2050/1 2052/1 +f 2051/1 549/1 550/1 +f 2051/1 550/1 2054/1 +f 2052/1 2051/1 2054/1 +f 453/1 458/1 549/1 +f 549/1 463/1 550/1 +f 2054/1 550/1 2055/1 +f 550/1 478/1 2055/1 +f 363/1 2055/1 361/1 +f 2055/1 478/1 364/1 +f 2055/1 364/1 361/1 +f 2056/1 2055/1 363/1 +f 2054/1 2055/1 2056/1 +f 314/1 2056/1 363/1 +f 2057/1 2054/1 2056/1 +f 2057/1 2056/1 314/1 +f 2058/1 2054/1 2057/1 +f 2052/1 2054/1 2058/1 +f 361/1 365/1 362/1 +f 362/1 366/1 279/1 +f 2053/1 2052/1 2059/1 +f 2059/1 2052/1 2058/1 +f 2060/1 2044/1 2053/1 +f 2060/1 2053/1 2061/1 +f 2061/1 2053/1 2059/1 +f 2044/1 2050/1 2053/1 +f 2043/1 2044/1 2060/1 +f 2034/1 2043/1 2060/1 +f 2034/1 2060/1 2062/1 +f 2062/1 2060/1 2061/1 +f 2062/1 2061/1 2063/1 +f 2063/1 2061/1 2064/1 +f 2061/1 2059/1 2064/1 +f 2035/1 2062/1 2063/1 +f 2035/1 2034/1 2062/1 +f 2063/1 2064/1 2065/1 +f 2066/1 2063/1 2065/1 +f 2035/1 2063/1 2066/1 +f 2065/1 2064/1 2067/1 +f 2064/1 2059/1 2067/1 +f 2065/1 2067/1 317/1 +f 2066/1 2065/1 317/1 +f 2066/1 317/1 319/1 +f 317/1 2067/1 316/1 +f 2067/1 2068/1 315/1 +f 2067/1 315/1 316/1 +f 2059/1 2068/1 2067/1 +f 2059/1 2058/1 2068/1 +f 2068/1 2058/1 2057/1 +f 2068/1 2057/1 315/1 +f 315/1 2057/1 314/1 +f 2069/1 2035/1 2066/1 +f 494/1 2035/1 2069/1 +f 493/1 2029/1 494/1 +f 491/1 494/1 2069/1 +f 496/1 2029/1 493/1 +f 491/1 2069/1 490/1 +f 490/1 2069/1 359/1 +f 2069/1 2066/1 359/1 +f 490/1 359/1 492/1 +f 492/1 359/1 323/1 +f 359/1 2066/1 319/1 +f 2070/1 492/1 2071/1 +f 489/1 492/1 2070/1 +f 492/1 323/1 2071/1 +f 2071/1 323/1 324/1 +f 2072/1 2071/1 2073/1 +f 2070/1 2071/1 2072/1 +f 2071/1 324/1 2073/1 +f 2073/1 324/1 325/1 +f 2074/1 2073/1 2075/1 +f 2072/1 2073/1 2074/1 +f 2073/1 325/1 2075/1 +f 2076/1 2070/1 2072/1 +f 2076/1 2072/1 2077/1 +f 2077/1 2072/1 2074/1 +f 2077/1 2078/1 2076/1 +f 2076/1 2078/1 2079/1 +f 2076/1 2079/1 2080/1 +f 2080/1 2070/1 2076/1 +f 2081/1 2082/1 2077/1 +f 2077/1 2082/1 2078/1 +f 2077/1 2074/1 2081/1 +f 2083/1 2079/1 2078/1 +f 2083/1 2078/1 2082/1 +f 2079/1 2084/1 2080/1 +f 2085/1 2084/1 2079/1 +f 2085/1 2079/1 2083/1 +f 2080/1 2084/1 2086/1 +f 2086/1 2070/1 2080/1 +f 2086/1 2084/1 2087/1 +f 2088/1 2087/1 2084/1 +f 2088/1 2084/1 2085/1 +f 2089/1 2088/1 2085/1 +f 2089/1 2085/1 2090/1 +f 2090/1 2085/1 2083/1 +f 2091/1 2092/1 2088/1 +f 2088/1 2092/1 2087/1 +f 2091/1 2088/1 2093/1 +f 2093/1 2088/1 2089/1 +f 2093/1 2089/1 2090/1 +f 2090/1 2083/1 2094/1 +f 2093/1 2090/1 2095/1 +f 2095/1 2090/1 2094/1 +f 366/1 2093/1 2095/1 +f 365/1 2091/1 2093/1 +f 365/1 2093/1 366/1 +f 367/1 2095/1 2096/1 +f 366/1 2095/1 367/1 +f 2095/1 2094/1 2096/1 +f 2094/1 2083/1 2097/1 +f 2096/1 2094/1 2097/1 +f 2083/1 2082/1 2097/1 +f 2097/1 2098/1 2099/1 +f 2096/1 2097/1 2099/1 +f 2097/1 2082/1 2098/1 +f 257/1 2096/1 2100/1 +f 2096/1 2099/1 2100/1 +f 367/1 2096/1 257/1 +f 2099/1 2098/1 2101/1 +f 2099/1 2101/1 2102/1 +f 2100/1 2099/1 2102/1 +f 2098/1 2082/1 2103/1 +f 2098/1 2103/1 2101/1 +f 2104/1 2103/1 2082/1 +f 2104/1 2082/1 2081/1 +f 2105/1 2106/1 2103/1 +f 2105/1 2103/1 2107/1 +f 2107/1 2103/1 2104/1 +f 2101/1 2103/1 2106/1 +f 2101/1 2106/1 2102/1 +f 2108/1 2109/1 2106/1 +f 2108/1 2106/1 2110/1 +f 2110/1 2106/1 2105/1 +f 2102/1 2106/1 2109/1 +f 2107/1 2111/1 2105/1 +f 2105/1 2111/1 2110/1 +f 2107/1 2074/1 2111/1 +f 2104/1 2074/1 2107/1 +f 2081/1 2074/1 2104/1 +f 2074/1 2075/1 2111/1 +f 2111/1 2075/1 2112/1 +f 2075/1 325/1 326/1 +f 2075/1 326/1 2112/1 +f 2111/1 2112/1 2113/1 +f 2113/1 2112/1 2114/1 +f 2112/1 326/1 330/1 +f 2112/1 330/1 2114/1 +f 2113/1 2114/1 2115/1 +f 2114/1 330/1 2116/1 +f 2114/1 2116/1 2117/1 +f 2115/1 2114/1 2117/1 +f 2118/1 2115/1 2119/1 +f 2118/1 2113/1 2115/1 +f 2115/1 2117/1 2120/1 +f 2119/1 2115/1 2120/1 +f 2120/1 2117/1 2121/1 +f 2117/1 2116/1 2122/1 +f 2117/1 2122/1 2121/1 +f 2116/1 356/1 2122/1 +f 2122/1 356/1 2123/1 +f 2121/1 2122/1 2124/1 +f 2122/1 2123/1 2124/1 +f 2121/1 2124/1 2125/1 +f 2120/1 2121/1 378/1 +f 378/1 2121/1 2125/1 +f 2125/1 2124/1 2126/1 +f 2124/1 2127/1 2128/1 +f 2124/1 2123/1 2127/1 +f 2124/1 2128/1 2126/1 +f 378/1 2125/1 175/1 +f 2125/1 2126/1 176/1 +f 175/1 2125/1 176/1 +f 176/1 2126/1 2129/1 +f 176/1 2129/1 177/1 +f 2126/1 2130/1 2129/1 +f 2129/1 2130/1 2131/1 +f 177/1 2129/1 2132/1 +f 2129/1 2131/1 2132/1 +f 177/1 2132/1 162/1 +f 2132/1 2131/1 2133/1 +f 2132/1 2133/1 2134/1 +f 162/1 2132/1 2134/1 +f 162/1 2134/1 159/1 +f 159/1 2134/1 2135/1 +f 159/1 2135/1 158/1 +f 2134/1 2136/1 2135/1 +f 2134/1 2133/1 2136/1 +f 2135/1 2137/1 379/1 +f 2136/1 2137/1 2135/1 +f 2136/1 2138/1 2137/1 +f 2136/1 2139/1 2138/1 +f 2133/1 2139/1 2136/1 +f 379/1 2137/1 2140/1 +f 2137/1 2141/1 2142/1 +f 2137/1 2142/1 2140/1 +f 2138/1 2141/1 2137/1 +f 379/1 2140/1 138/1 +f 138/1 2140/1 2143/1 +f 2140/1 2144/1 2143/1 +f 2140/1 2145/1 2144/1 +f 2140/1 2142/1 2145/1 +f 138/1 2143/1 131/1 +f 137/1 379/1 138/1 +f 131/1 2143/1 2146/1 +f 2143/1 2147/1 2146/1 +f 131/1 2146/1 122/1 +f 130/1 138/1 131/1 +f 127/1 131/1 122/1 +f 122/1 2146/1 125/1 +f 2146/1 2148/1 125/1 +f 2146/1 2147/1 2149/1 +f 2146/1 2149/1 2148/1 +f 2149/1 2150/1 2151/1 +f 2147/1 2150/1 2149/1 +f 2149/1 2151/1 2148/1 +f 2148/1 2151/1 2152/1 +f 125/1 2148/1 424/1 +f 2148/1 2152/1 424/1 +f 424/1 2152/1 423/1 +f 425/1 2152/1 2153/1 +f 2153/1 2152/1 2151/1 +f 2152/1 425/1 423/1 +f 416/1 425/1 2153/1 +f 2153/1 2151/1 2154/1 +f 2155/1 2154/1 2156/1 +f 2154/1 2151/1 2156/1 +f 2155/1 2156/1 2157/1 +f 2158/1 2154/1 2155/1 +f 2157/1 2156/1 2159/1 +f 2160/1 2159/1 2156/1 +f 2160/1 2156/1 2150/1 +f 2150/1 2156/1 2151/1 +f 2157/1 2159/1 2161/1 +f 2161/1 2159/1 2162/1 +f 2163/1 2162/1 2159/1 +f 2163/1 2159/1 2160/1 +f 2147/1 2160/1 2150/1 +f 2164/1 2163/1 2160/1 +f 2164/1 2160/1 2147/1 +f 2144/1 2165/1 2163/1 +f 2144/1 2163/1 2164/1 +f 2165/1 2162/1 2163/1 +f 2161/1 2162/1 2166/1 +f 2166/1 2162/1 2167/1 +f 2165/1 2167/1 2162/1 +f 2168/1 2157/1 2161/1 +f 2168/1 2155/1 2157/1 +f 2158/1 2155/1 2168/1 +f 2168/1 2161/1 2169/1 +f 2168/1 215/1 213/1 +f 2168/1 213/1 2158/1 +f 2158/1 211/1 412/1 +f 412/1 2153/1 2158/1 +f 2158/1 213/1 211/1 +f 215/1 212/1 213/1 +f 2169/1 214/1 215/1 +f 2169/1 215/1 2168/1 +f 2170/1 214/1 2169/1 +f 214/1 2170/1 216/1 +f 2170/1 2171/1 2172/1 +f 2170/1 2173/1 2171/1 +f 2169/1 2173/1 2170/1 +f 216/1 2170/1 2172/1 +f 216/1 2172/1 370/1 +f 2172/1 2174/1 2175/1 +f 2172/1 2171/1 2174/1 +f 370/1 2172/1 2175/1 +f 2171/1 2176/1 2174/1 +f 2174/1 2177/1 2178/1 +f 2175/1 2174/1 2178/1 +f 2174/1 2176/1 2177/1 +f 2176/1 2179/1 2177/1 +f 2180/1 2181/1 2176/1 +f 2171/1 2180/1 2176/1 +f 2176/1 2181/1 2179/1 +f 2182/1 2178/1 2177/1 +f 2182/1 2177/1 2183/1 +f 2177/1 2179/1 2183/1 +f 2184/1 2175/1 2178/1 +f 2184/1 2178/1 2182/1 +f 2182/1 2183/1 2185/1 +f 2186/1 2184/1 2182/1 +f 2187/1 2186/1 2182/1 +f 2187/1 2182/1 2185/1 +f 2185/1 2183/1 2138/1 +f 2138/1 2183/1 2179/1 +f 2139/1 2187/1 2185/1 +f 2139/1 2185/1 2138/1 +f 2188/1 2187/1 2139/1 +f 2189/1 2190/1 2187/1 +f 2188/1 2189/1 2187/1 +f 2190/1 2186/1 2187/1 +f 2190/1 2191/1 2186/1 +f 2186/1 2191/1 2184/1 +f 2192/1 2193/1 2190/1 +f 2190/1 2193/1 2191/1 +f 2194/1 2192/1 2190/1 +f 2194/1 2190/1 2189/1 +f 2195/1 2189/1 2188/1 +f 2195/1 2194/1 2189/1 +f 2133/1 2195/1 2188/1 +f 2133/1 2188/1 2139/1 +f 2196/1 2194/1 2195/1 +f 2131/1 2196/1 2195/1 +f 2131/1 2195/1 2133/1 +f 2197/1 2192/1 2194/1 +f 2196/1 2197/1 2194/1 +f 2198/1 2197/1 2196/1 +f 2131/1 2198/1 2196/1 +f 2130/1 2198/1 2131/1 +f 2198/1 2199/1 2197/1 +f 2200/1 2199/1 2198/1 +f 2130/1 2200/1 2198/1 +f 2199/1 2201/1 2197/1 +f 2197/1 2201/1 2202/1 +f 2197/1 2202/1 2192/1 +f 2200/1 2203/1 2199/1 +f 2203/1 2204/1 2199/1 +f 2199/1 2204/1 2201/1 +f 2205/1 2203/1 2200/1 +f 2206/1 2205/1 2200/1 +f 2206/1 2200/1 2130/1 +f 2126/1 2206/1 2130/1 +f 2126/1 2128/1 2206/1 +f 2128/1 2207/1 2206/1 +f 2206/1 2207/1 2205/1 +f 2205/1 2208/1 2203/1 +f 2207/1 2208/1 2205/1 +f 2208/1 2209/1 2203/1 +f 2203/1 2209/1 2204/1 +f 2210/1 2211/1 2208/1 +f 2212/1 2210/1 2208/1 +f 2207/1 2212/1 2208/1 +f 2208/1 2211/1 2209/1 +f 2213/1 2212/1 2207/1 +f 2128/1 2213/1 2207/1 +f 2214/1 2210/1 2212/1 +f 2213/1 2214/1 2212/1 +f 2215/1 2214/1 2213/1 +f 2128/1 2215/1 2213/1 +f 2215/1 358/1 2214/1 +f 358/1 2216/1 2214/1 +f 2214/1 2216/1 2210/1 +f 2127/1 2217/1 2215/1 +f 2127/1 2215/1 2128/1 +f 2217/1 358/1 2215/1 +f 2217/1 354/1 358/1 +f 358/1 357/1 2216/1 +f 2216/1 240/1 2210/1 +f 357/1 239/1 2216/1 +f 2216/1 239/1 240/1 +f 2210/1 240/1 2218/1 +f 2210/1 2218/1 2211/1 +f 2211/1 2218/1 2219/1 +f 2211/1 2219/1 2209/1 +f 2209/1 2219/1 2220/1 +f 2209/1 2220/1 2204/1 +f 2204/1 2220/1 2221/1 +f 2220/1 232/1 2221/1 +f 2219/1 232/1 2220/1 +f 2204/1 2221/1 2222/1 +f 2204/1 2222/1 2201/1 +f 2222/1 2221/1 2223/1 +f 2221/1 232/1 229/1 +f 2221/1 229/1 2223/1 +f 232/1 227/1 229/1 +f 2219/1 235/1 232/1 +f 2218/1 235/1 2219/1 +f 2218/1 233/1 235/1 +f 240/1 233/1 2218/1 +f 2223/1 229/1 230/1 +f 230/1 227/1 228/1 +f 2193/1 230/1 2224/1 +f 230/1 228/1 2224/1 +f 2223/1 230/1 2193/1 +f 2224/1 228/1 368/1 +f 2224/1 368/1 2175/1 +f 2224/1 2175/1 2184/1 +f 2193/1 2224/1 2191/1 +f 2191/1 2224/1 2184/1 +f 2192/1 2223/1 2193/1 +f 2202/1 2222/1 2192/1 +f 2222/1 2223/1 2192/1 +f 2201/1 2222/1 2202/1 +f 370/1 2175/1 368/1 +f 355/1 354/1 2217/1 +f 2123/1 355/1 2217/1 +f 2123/1 352/1 355/1 +f 356/1 352/1 2123/1 +f 2123/1 2217/1 2127/1 +f 2138/1 2179/1 2141/1 +f 2141/1 2179/1 2181/1 +f 2141/1 2181/1 2142/1 +f 2142/1 2181/1 2225/1 +f 2180/1 2226/1 2181/1 +f 2181/1 2226/1 2225/1 +f 2142/1 2225/1 2227/1 +f 2142/1 2227/1 2145/1 +f 2225/1 2226/1 2227/1 +f 2228/1 2226/1 2180/1 +f 2227/1 2226/1 2228/1 +f 2173/1 2180/1 2171/1 +f 2173/1 2228/1 2180/1 +f 2227/1 2228/1 2167/1 +f 2173/1 2167/1 2228/1 +f 2145/1 2227/1 2165/1 +f 2227/1 2167/1 2165/1 +f 2145/1 2165/1 2144/1 +f 2143/1 2144/1 2164/1 +f 2143/1 2164/1 2147/1 +f 2166/1 2167/1 2173/1 +f 2169/1 2166/1 2173/1 +f 2169/1 2161/1 2166/1 +f 211/1 208/1 410/1 +f 412/1 211/1 408/1 +f 211/1 410/1 408/1 +f 410/1 209/1 411/1 +f 408/1 411/1 2229/1 +f 408/1 2229/1 402/1 +f 2230/1 2229/1 411/1 +f 2231/1 2232/1 2229/1 +f 2231/1 2229/1 2230/1 +f 2233/1 2234/1 2230/1 +f 2231/1 2230/1 2234/1 +f 2230/1 411/1 2235/1 +f 2235/1 411/1 209/1 +f 2235/1 209/1 207/1 +f 2236/1 2237/1 2234/1 +f 2236/1 2234/1 2233/1 +f 2231/1 2234/1 2238/1 +f 2238/1 2234/1 2237/1 +f 2238/1 2232/1 2231/1 +f 2239/1 2232/1 2238/1 +f 2238/1 2237/1 2239/1 +f 2240/1 2239/1 2237/1 +f 2240/1 2237/1 2241/1 +f 2241/1 2237/1 2236/1 +f 2239/1 2242/1 2232/1 +f 2240/1 2243/1 2239/1 +f 2244/1 2242/1 2239/1 +f 2244/1 2239/1 2243/1 +f 400/1 2232/1 2242/1 +f 401/1 2242/1 2245/1 +f 400/1 2242/1 401/1 +f 2244/1 2245/1 2242/1 +f 2246/1 2245/1 2244/1 +f 2244/1 2243/1 2246/1 +f 2247/1 2246/1 2243/1 +f 2247/1 2243/1 2248/1 +f 2248/1 2243/1 2240/1 +f 2249/1 2250/1 2246/1 +f 2247/1 2251/1 2246/1 +f 2249/1 2246/1 2251/1 +f 2246/1 2250/1 2245/1 +f 2250/1 401/1 2245/1 +f 2250/1 2249/1 2252/1 +f 2249/1 2251/1 2252/1 +f 2253/1 2254/1 2251/1 +f 2252/1 2251/1 2254/1 +f 2253/1 2251/1 2247/1 +f 2252/1 2254/1 2255/1 +f 2256/1 2257/1 2254/1 +f 2256/1 2254/1 2258/1 +f 2255/1 2254/1 2257/1 +f 2258/1 2254/1 2253/1 +f 2258/1 2253/1 2259/1 +f 2259/1 2253/1 2260/1 +f 2260/1 2253/1 2247/1 +f 2261/1 2258/1 2259/1 +f 2261/1 2256/1 2258/1 +f 2260/1 2262/1 2259/1 +f 2259/1 2262/1 2263/1 +f 2259/1 2263/1 2261/1 +f 2264/1 2262/1 2260/1 +f 2260/1 2247/1 2264/1 +f 2264/1 2247/1 2265/1 +f 2265/1 2247/1 2248/1 +f 2265/1 2262/1 2264/1 +f 2265/1 2266/1 2262/1 +f 2267/1 2266/1 2265/1 +f 2265/1 2248/1 2267/1 +f 2267/1 2248/1 2268/1 +f 2248/1 2240/1 2268/1 +f 2268/1 2266/1 2267/1 +f 2269/1 2270/1 2266/1 +f 2269/1 2266/1 2268/1 +f 2268/1 2240/1 2269/1 +f 2269/1 2240/1 2241/1 +f 2271/1 2270/1 2269/1 +f 2269/1 2241/1 2271/1 +f 2271/1 2241/1 2236/1 +f 2272/1 2270/1 2271/1 +f 2271/1 2236/1 2272/1 +f 2272/1 2236/1 2273/1 +f 2273/1 2236/1 2233/1 +f 2274/1 2270/1 2272/1 +f 2272/1 2273/1 2274/1 +f 2274/1 124/1 2270/1 +f 2270/1 124/1 114/1 +f 2270/1 114/1 2266/1 +f 2274/1 123/1 124/1 +f 124/1 120/1 112/1 +f 128/1 123/1 2274/1 +f 133/1 128/1 2275/1 +f 2276/1 128/1 2274/1 +f 2275/1 2277/1 133/1 +f 2274/1 2273/1 2276/1 +f 2273/1 2233/1 2276/1 +f 2276/1 2233/1 2277/1 +f 2277/1 2233/1 2278/1 +f 2233/1 2279/1 2278/1 +f 2275/1 128/1 2276/1 +f 2276/1 2277/1 2275/1 +f 2277/1 2278/1 133/1 +f 133/1 2278/1 206/1 +f 206/1 2278/1 205/1 +f 207/1 205/1 2278/1 +f 207/1 2278/1 2235/1 +f 2235/1 2278/1 2279/1 +f 2233/1 2230/1 2279/1 +f 2235/1 2279/1 2230/1 +f 114/1 112/1 111/1 +f 2266/1 114/1 115/1 +f 2266/1 115/1 2262/1 +f 2262/1 115/1 2280/1 +f 115/1 111/1 110/1 +f 115/1 110/1 2280/1 +f 110/1 108/1 69/1 +f 2261/1 2263/1 2281/1 +f 2261/1 2281/1 2282/1 +f 2282/1 2283/1 2261/1 +f 2262/1 2280/1 2263/1 +f 2263/1 2280/1 2284/1 +f 2263/1 2284/1 2281/1 +f 2280/1 110/1 68/1 +f 2280/1 68/1 2284/1 +f 2281/1 2284/1 2285/1 +f 2281/1 2285/1 2286/1 +f 2286/1 2285/1 2287/1 +f 2284/1 70/1 2285/1 +f 2285/1 70/1 2287/1 +f 2286/1 2287/1 2288/1 +f 2289/1 2281/1 2286/1 +f 2289/1 2286/1 2290/1 +f 2291/1 2286/1 2288/1 +f 2282/1 2281/1 2289/1 +f 2289/1 2283/1 2282/1 +f 2290/1 2292/1 2289/1 +f 2289/1 2293/1 2283/1 +f 2283/1 2293/1 2256/1 +f 2283/1 2256/1 2261/1 +f 2289/1 2292/1 2293/1 +f 2292/1 2294/1 2293/1 +f 2293/1 2257/1 2256/1 +f 2294/1 2257/1 2293/1 +f 2292/1 2295/1 2294/1 +f 2255/1 2257/1 2294/1 +f 2296/1 2297/1 2295/1 +f 2296/1 2295/1 2298/1 +f 2298/1 2295/1 2292/1 +f 2299/1 2296/1 2291/1 +f 2291/1 2296/1 2298/1 +f 2300/1 2299/1 2301/1 +f 2300/1 2302/1 2299/1 +f 2301/1 2288/1 2300/1 +f 2298/1 2292/1 2290/1 +f 2291/1 2298/1 2290/1 +f 2290/1 2286/1 2291/1 +f 2288/1 2287/1 2303/1 +f 2288/1 2303/1 2304/1 +f 2291/1 2288/1 2301/1 +f 2300/1 2288/1 2304/1 +f 2287/1 70/1 434/1 +f 2287/1 434/1 2303/1 +f 2284/1 68/1 70/1 +f 2304/1 2303/1 2305/1 +f 2303/1 434/1 435/1 +f 2303/1 435/1 2305/1 +f 434/1 75/1 435/1 +f 435/1 433/1 2306/1 +f 435/1 2306/1 2307/1 +f 2305/1 435/1 2307/1 +f 2304/1 2305/1 2308/1 +f 2308/1 2305/1 2309/1 +f 2305/1 2307/1 2309/1 +f 2307/1 2306/1 2310/1 +f 2307/1 2310/1 2311/1 +f 2309/1 2307/1 2312/1 +f 433/1 2313/1 2306/1 +f 2306/1 2313/1 2314/1 +f 2306/1 2314/1 2315/1 +f 2306/1 2315/1 2310/1 +f 433/1 430/1 2313/1 +f 2310/1 2315/1 2316/1 +f 2310/1 2316/1 2317/1 +f 2311/1 2310/1 2317/1 +f 2315/1 2318/1 2316/1 +f 2317/1 2316/1 2319/1 +f 2316/1 2320/1 2321/1 +f 2316/1 2318/1 2320/1 +f 2316/1 2321/1 2319/1 +f 2318/1 2322/1 2323/1 +f 2315/1 2322/1 2318/1 +f 2323/1 2324/1 2318/1 +f 2318/1 2324/1 2320/1 +f 2320/1 2324/1 2321/1 +f 2319/1 2321/1 2325/1 +f 2321/1 2324/1 2326/1 +f 2321/1 2326/1 2325/1 +f 2327/1 2325/1 2328/1 +f 2319/1 2325/1 2327/1 +f 2325/1 2326/1 2328/1 +f 2328/1 2326/1 2329/1 +f 2327/1 2328/1 2330/1 +f 2328/1 2329/1 2330/1 +f 2317/1 2319/1 2327/1 +f 2317/1 2327/1 2331/1 +f 2331/1 2327/1 2332/1 +f 2327/1 2330/1 2332/1 +f 2332/1 2330/1 2333/1 +f 2329/1 2333/1 2330/1 +f 2333/1 2329/1 2334/1 +f 2329/1 2335/1 2334/1 +f 2333/1 2334/1 2336/1 +f 2332/1 2333/1 2336/1 +f 2331/1 2332/1 2336/1 +f 2331/1 2336/1 2337/1 +f 2331/1 2337/1 2338/1 +f 2334/1 2339/1 2336/1 +f 2336/1 2339/1 2340/1 +f 2336/1 2340/1 2337/1 +f 2334/1 2335/1 2339/1 +f 2339/1 2341/1 2340/1 +f 2341/1 2342/1 2340/1 +f 2337/1 2340/1 2342/1 +f 2342/1 2343/1 2337/1 +f 2338/1 2337/1 2343/1 +f 2341/1 2344/1 2342/1 +f 2311/1 2317/1 2338/1 +f 2338/1 2317/1 2331/1 +f 2345/1 2338/1 2346/1 +f 2346/1 2338/1 2347/1 +f 2312/1 2311/1 2345/1 +f 2345/1 2311/1 2338/1 +f 2323/1 432/1 427/1 +f 2323/1 2322/1 432/1 +f 431/1 432/1 2348/1 +f 2348/1 432/1 2322/1 +f 2314/1 2348/1 2322/1 +f 2314/1 2322/1 2315/1 +f 2313/1 431/1 2348/1 +f 2313/1 2348/1 2314/1 +f 430/1 431/1 2313/1 +f 2301/1 2299/1 2291/1 +f 401/1 91/1 95/1 +f 402/1 2232/1 400/1 +f 399/1 400/1 396/1 +f 402/1 2229/1 2232/1 +f 396/1 401/1 397/1 +f 404/1 402/1 399/1 +f 404/1 408/1 402/1 +f 2158/1 2153/1 2154/1 +f 142/1 379/1 137/1 +f 158/1 2135/1 379/1 +f 2349/1 2120/1 2350/1 +f 2119/1 2120/1 2349/1 +f 2350/1 2120/1 372/1 +f 372/1 2120/1 378/1 +f 2119/1 2351/1 2118/1 +f 2118/1 2351/1 2352/1 +f 2118/1 2352/1 2353/1 +f 2352/1 2354/1 2353/1 +f 2355/1 2354/1 2352/1 +f 2355/1 2352/1 2356/1 +f 2356/1 2352/1 2351/1 +f 2353/1 2113/1 2118/1 +f 2353/1 2354/1 2357/1 +f 2357/1 2113/1 2353/1 +f 2357/1 2354/1 2109/1 +f 2358/1 2109/1 2354/1 +f 2358/1 2354/1 2355/1 +f 2357/1 2109/1 2108/1 +f 2108/1 2113/1 2357/1 +f 2108/1 2111/1 2113/1 +f 2110/1 2111/1 2108/1 +f 2358/1 2102/1 2109/1 +f 2100/1 2102/1 2359/1 +f 2359/1 2102/1 2358/1 +f 257/1 2100/1 2359/1 +f 2359/1 2358/1 255/1 +f 255/1 2358/1 2360/1 +f 255/1 2360/1 2361/1 +f 255/1 2361/1 256/1 +f 253/1 2359/1 255/1 +f 2360/1 2358/1 2355/1 +f 2360/1 2355/1 2361/1 +f 2361/1 2355/1 2356/1 +f 2361/1 2356/1 377/1 +f 256/1 2361/1 377/1 +f 256/1 377/1 225/1 +f 377/1 2356/1 376/1 +f 2356/1 2351/1 375/1 +f 2356/1 375/1 376/1 +f 2119/1 375/1 2351/1 +f 2350/1 373/1 375/1 +f 2350/1 375/1 2349/1 +f 372/1 373/1 2350/1 +f 2349/1 375/1 2119/1 +f 257/1 2359/1 253/1 +f 253/1 255/1 254/1 +f 254/1 256/1 224/1 +f 364/1 477/1 2091/1 +f 364/1 470/1 477/1 +f 477/1 2092/1 2091/1 +f 364/1 2091/1 365/1 +f 477/1 475/1 2092/1 +f 475/1 2362/1 2092/1 +f 2362/1 2363/1 2092/1 +f 2092/1 2363/1 2087/1 +f 475/1 476/1 2362/1 +f 476/1 479/1 2362/1 +f 2362/1 479/1 2363/1 +f 471/1 474/1 476/1 +f 2364/1 2363/1 479/1 +f 2364/1 479/1 488/1 +f 2365/1 2363/1 2364/1 +f 2366/1 2363/1 2365/1 +f 2365/1 489/1 2366/1 +f 2086/1 2087/1 2366/1 +f 2366/1 2087/1 2363/1 +f 2366/1 489/1 2070/1 +f 2366/1 2070/1 2086/1 +f 455/1 453/1 551/1 +f 2367/1 551/1 2048/1 +f 2367/1 455/1 551/1 +f 2368/1 2367/1 2047/1 +f 2047/1 2367/1 2048/1 +f 2369/1 455/1 2367/1 +f 2368/1 2369/1 2367/1 +f 2368/1 2047/1 2040/1 +f 2370/1 2371/1 2368/1 +f 2370/1 2368/1 2372/1 +f 2372/1 2368/1 2040/1 +f 2371/1 2369/1 2368/1 +f 2371/1 2373/1 2369/1 +f 2373/1 455/1 2369/1 +f 2374/1 2373/1 2371/1 +f 2375/1 2374/1 2371/1 +f 2375/1 2371/1 2370/1 +f 2374/1 2376/1 2373/1 +f 2373/1 454/1 455/1 +f 2376/1 454/1 2373/1 +f 455/1 451/1 453/1 +f 2377/1 451/1 454/1 +f 2376/1 2377/1 454/1 +f 2378/1 2376/1 2374/1 +f 2378/1 2379/1 2376/1 +f 2379/1 2377/1 2376/1 +f 2380/1 556/1 2377/1 +f 556/1 449/1 2377/1 +f 2377/1 449/1 451/1 +f 2380/1 2377/1 2379/1 +f 2381/1 2379/1 2378/1 +f 2381/1 2380/1 2379/1 +f 2382/1 2378/1 2374/1 +f 2381/1 2378/1 2382/1 +f 2383/1 2384/1 2381/1 +f 2383/1 2381/1 2385/1 +f 2385/1 2381/1 2382/1 +f 2384/1 2380/1 2381/1 +f 2386/1 2387/1 2383/1 +f 2386/1 2383/1 2388/1 +f 2388/1 2383/1 2385/1 +f 2387/1 2384/1 2383/1 +f 2387/1 2389/1 2384/1 +f 2389/1 2390/1 2384/1 +f 2384/1 2390/1 2380/1 +f 2391/1 2392/1 2387/1 +f 2391/1 2387/1 2386/1 +f 2392/1 2389/1 2387/1 +f 2024/1 2391/1 2386/1 +f 2024/1 2386/1 2388/1 +f 2391/1 2393/1 2392/1 +f 2023/1 2391/1 2024/1 +f 2023/1 2394/1 2391/1 +f 2394/1 2393/1 2391/1 +f 2395/1 2389/1 2392/1 +f 2393/1 2395/1 2392/1 +f 2396/1 2395/1 2393/1 +f 2394/1 2396/1 2393/1 +f 2397/1 2396/1 2394/1 +f 2023/1 2397/1 2394/1 +f 2020/1 2397/1 2023/1 +f 2018/1 2020/1 2023/1 +f 2020/1 2398/1 2397/1 +f 2398/1 2399/1 2397/1 +f 2397/1 2399/1 2396/1 +f 2399/1 2400/1 2396/1 +f 2396/1 2400/1 2395/1 +f 2398/1 2401/1 2399/1 +f 2402/1 2403/1 2399/1 +f 2399/1 2403/1 2400/1 +f 2401/1 2402/1 2399/1 +f 2020/1 2404/1 2398/1 +f 2404/1 2401/1 2398/1 +f 2019/1 2404/1 2020/1 +f 2404/1 2405/1 2401/1 +f 2406/1 2405/1 2404/1 +f 2019/1 2406/1 2404/1 +f 2405/1 2402/1 2401/1 +f 2407/1 2408/1 2405/1 +f 2405/1 2408/1 2402/1 +f 2406/1 2407/1 2405/1 +f 2019/1 2409/1 2406/1 +f 2409/1 2407/1 2406/1 +f 2021/1 2409/1 2019/1 +f 2410/1 626/1 2409/1 +f 2409/1 626/1 2407/1 +f 2021/1 2410/1 2409/1 +f 626/1 627/1 2407/1 +f 2407/1 627/1 2408/1 +f 2410/1 622/1 626/1 +f 626/1 624/1 627/1 +f 2021/1 620/1 2410/1 +f 620/1 622/1 2410/1 +f 616/1 620/1 2021/1 +f 2001/1 616/1 2021/1 +f 616/1 617/1 620/1 +f 1998/1 612/1 616/1 +f 608/1 610/1 612/1 +f 2408/1 2411/1 2402/1 +f 2402/1 2411/1 2412/1 +f 2402/1 2412/1 2403/1 +f 627/1 628/1 2408/1 +f 2408/1 628/1 2411/1 +f 2403/1 2413/1 2400/1 +f 2403/1 2412/1 2413/1 +f 2400/1 2413/1 2414/1 +f 2413/1 554/1 2414/1 +f 2412/1 1479/1 2413/1 +f 2400/1 2414/1 2395/1 +f 2414/1 554/1 2415/1 +f 2395/1 2414/1 2415/1 +f 554/1 448/1 555/1 +f 2413/1 1479/1 554/1 +f 2415/1 554/1 555/1 +f 2412/1 561/1 1479/1 +f 2411/1 561/1 2412/1 +f 628/1 561/1 2411/1 +f 2390/1 555/1 556/1 +f 2415/1 555/1 2390/1 +f 2389/1 2415/1 2390/1 +f 2390/1 556/1 2380/1 +f 556/1 448/1 449/1 +f 2395/1 2415/1 2389/1 +f 2024/1 2388/1 2027/1 +f 2388/1 2385/1 2416/1 +f 2027/1 2388/1 2416/1 +f 2027/1 2417/1 2030/1 +f 2027/1 2416/1 2417/1 +f 2416/1 2385/1 2382/1 +f 2416/1 2382/1 2417/1 +f 2417/1 2382/1 2375/1 +f 2030/1 2417/1 2418/1 +f 2417/1 2375/1 2418/1 +f 2030/1 2418/1 2419/1 +f 2030/1 2419/1 2028/1 +f 2418/1 2370/1 2419/1 +f 2418/1 2375/1 2370/1 +f 2382/1 2374/1 2375/1 +f 2419/1 2370/1 2372/1 +f 2419/1 2372/1 2039/1 +f 2028/1 2419/1 2039/1 +f 2039/1 2372/1 2040/1 +f 665/1 2420/1 1975/1 +f 665/1 675/1 2420/1 +f 2420/1 2421/1 1976/1 +f 2420/1 1976/1 1975/1 +f 2421/1 2422/1 1976/1 +f 1976/1 2423/1 1970/1 +f 2422/1 2423/1 1976/1 +f 675/1 2421/1 2420/1 +f 675/1 684/1 2421/1 +f 684/1 2424/1 2421/1 +f 684/1 685/1 2424/1 +f 2421/1 2424/1 2422/1 +f 2424/1 685/1 2425/1 +f 2424/1 2425/1 2422/1 +f 2422/1 2425/1 2423/1 +f 1969/1 1970/1 2426/1 +f 2426/1 1970/1 2423/1 +f 2426/1 1953/1 1969/1 +f 2426/1 2423/1 2427/1 +f 2427/1 1951/1 2426/1 +f 2426/1 1951/1 1953/1 +f 2427/1 2423/1 2428/1 +f 2428/1 2423/1 2425/1 +f 2428/1 2425/1 2429/1 +f 2428/1 1951/1 2427/1 +f 2429/1 1951/1 2428/1 +f 2429/1 1446/1 1951/1 +f 2429/1 2425/1 1450/1 +f 1450/1 1446/1 2429/1 +f 1450/1 2425/1 685/1 +f 665/1 1975/1 666/1 +f 1902/1 1901/1 1907/1 +f 1392/1 1531/1 1533/1 +f 1391/1 1531/1 1392/1 +f 2430/1 1813/1 1808/1 +f 2430/1 1808/1 1800/1 +f 1811/1 1808/1 1813/1 +f 2431/1 1813/1 2430/1 +f 2432/1 2431/1 2430/1 +f 2432/1 2430/1 1800/1 +f 2431/1 1401/1 1813/1 +f 1814/1 1813/1 1401/1 +f 1416/1 1401/1 2431/1 +f 1416/1 2431/1 2432/1 +f 2433/1 2432/1 1800/1 +f 1415/1 2432/1 2433/1 +f 1415/1 1416/1 2432/1 +f 2433/1 1800/1 1796/1 +f 895/1 1415/1 2433/1 +f 894/1 1415/1 895/1 +f 895/1 1796/1 794/1 +f 895/1 2433/1 1796/1 +f 1414/1 1412/1 1416/1 +f 1412/1 1398/1 1401/1 +f 1396/1 1401/1 1398/1 +f 1814/1 1401/1 1400/1 +f 1137/1 2434/1 2435/1 +f 1137/1 1130/1 1129/1 +f 2436/1 2434/1 1137/1 +f 1137/1 2435/1 1130/1 +f 1134/1 2436/1 1137/1 +f 1130/1 2435/1 1125/1 +f 1125/1 2435/1 1124/1 +f 2435/1 1757/1 1124/1 +f 1125/1 1122/1 1130/1 +f 1125/1 1124/1 1121/1 +f 2437/1 2438/1 2436/1 +f 1135/1 2439/1 2436/1 +f 2436/1 2439/1 2437/1 +f 2436/1 2438/1 2434/1 +f 2440/1 2438/1 2437/1 +f 2437/1 2439/1 2440/1 +f 2441/1 1759/1 2438/1 +f 2438/1 1759/1 2434/1 +f 2440/1 2441/1 2438/1 +f 2434/1 1757/1 2435/1 +f 2434/1 1759/1 1757/1 +f 1761/1 1759/1 2441/1 +f 2442/1 1761/1 2441/1 +f 2443/1 2442/1 2441/1 +f 2440/1 2443/1 2441/1 +f 2439/1 2443/1 2440/1 +f 2444/1 2445/1 2443/1 +f 2443/1 2445/1 2446/1 +f 2443/1 2446/1 2442/1 +f 2439/1 2444/1 2443/1 +f 2444/1 2447/1 2445/1 +f 2448/1 2447/1 2444/1 +f 1135/1 2448/1 2444/1 +f 2447/1 2449/1 2445/1 +f 2445/1 2449/1 2450/1 +f 2445/1 2450/1 2446/1 +f 2447/1 1277/1 2449/1 +f 1278/1 1277/1 2447/1 +f 1277/1 2451/1 2449/1 +f 2449/1 2451/1 2452/1 +f 2449/1 2452/1 2450/1 +f 2450/1 2452/1 2453/1 +f 2450/1 2453/1 2454/1 +f 2446/1 2450/1 2454/1 +f 2451/1 2455/1 2452/1 +f 2452/1 2455/1 2456/1 +f 2453/1 2452/1 2456/1 +f 2451/1 1272/1 2455/1 +f 1276/1 1272/1 2451/1 +f 2455/1 1270/1 2457/1 +f 2455/1 2457/1 2458/1 +f 2458/1 2456/1 2455/1 +f 1270/1 2455/1 1272/1 +f 1270/1 1269/1 2457/1 +f 2457/1 1269/1 2459/1 +f 1268/1 2459/1 1269/1 +f 1248/1 1297/1 1268/1 +f 1266/1 2460/1 1297/1 +f 1297/1 2460/1 2461/1 +f 1297/1 2461/1 2459/1 +f 1266/1 1295/1 2460/1 +f 1295/1 2462/1 2460/1 +f 2460/1 2462/1 2463/1 +f 2460/1 2463/1 2461/1 +f 2461/1 2463/1 2464/1 +f 2461/1 2464/1 2465/1 +f 2459/1 2461/1 2465/1 +f 2466/1 2459/1 2465/1 +f 2457/1 2459/1 2466/1 +f 2465/1 2464/1 2467/1 +f 2468/1 2466/1 2465/1 +f 2468/1 2465/1 2467/1 +f 2463/1 2469/1 2464/1 +f 2467/1 2464/1 2469/1 +f 2462/1 2470/1 2463/1 +f 2463/1 2470/1 2469/1 +f 1766/1 1765/1 2469/1 +f 2470/1 1766/1 2469/1 +f 1765/1 2467/1 2469/1 +f 2471/1 2468/1 2467/1 +f 2471/1 2467/1 1764/1 +f 1764/1 2467/1 1765/1 +f 2472/1 2466/1 2468/1 +f 2472/1 2468/1 2471/1 +f 1764/1 2473/1 2471/1 +f 2471/1 2473/1 2472/1 +f 1764/1 1763/1 2473/1 +f 2474/1 2475/1 2473/1 +f 2474/1 2473/1 1763/1 +f 2472/1 2473/1 2475/1 +f 2458/1 2466/1 2472/1 +f 2472/1 2475/1 2458/1 +f 2456/1 2475/1 2474/1 +f 2458/1 2475/1 2456/1 +f 2454/1 2456/1 2474/1 +f 2454/1 2474/1 1763/1 +f 2453/1 2456/1 2454/1 +f 1762/1 2454/1 1763/1 +f 2446/1 2454/1 2476/1 +f 2476/1 2454/1 1762/1 +f 1762/1 1761/1 2476/1 +f 2442/1 2446/1 2476/1 +f 2442/1 2476/1 1761/1 +f 2458/1 2457/1 2466/1 +f 1766/1 2477/1 1767/1 +f 2470/1 2477/1 1766/1 +f 1296/1 1767/1 2477/1 +f 2462/1 1296/1 2477/1 +f 2462/1 2477/1 2470/1 +f 1767/1 2478/1 1292/1 +f 1294/1 1292/1 2478/1 +f 1295/1 1296/1 2462/1 +f 1133/1 2448/1 1135/1 +f 1134/1 1135/1 2436/1 +f 1135/1 2444/1 2439/1 +f 2308/1 2309/1 2479/1 +f 2480/1 2308/1 2481/1 +f 2481/1 2308/1 2479/1 +f 2479/1 2309/1 2312/1 +f 2479/1 2312/1 2482/1 +f 2481/1 2479/1 2483/1 +f 2483/1 2479/1 2482/1 +f 2482/1 2312/1 2345/1 +f 2482/1 2345/1 2484/1 +f 2483/1 2482/1 2485/1 +f 2486/1 2482/1 2484/1 +f 2485/1 2487/1 2483/1 +f 2483/1 2487/1 2488/1 +f 2483/1 2488/1 2481/1 +f 2485/1 2489/1 2487/1 +f 2487/1 2489/1 2488/1 +f 2485/1 2482/1 2486/1 +f 2486/1 2490/1 2485/1 +f 2485/1 2490/1 2489/1 +f 2486/1 2484/1 2491/1 +f 2491/1 2490/1 2486/1 +f 2491/1 2492/1 2490/1 +f 2490/1 2492/1 2493/1 +f 2491/1 2484/1 2494/1 +f 2494/1 2492/1 2491/1 +f 2494/1 2495/1 2492/1 +f 2492/1 2495/1 2493/1 +f 2496/1 2493/1 2495/1 +f 2497/1 2496/1 2495/1 +f 2497/1 2495/1 2494/1 +f 2494/1 2484/1 2347/1 +f 2494/1 2347/1 2497/1 +f 2497/1 2347/1 2498/1 +f 2498/1 2496/1 2497/1 +f 2343/1 2498/1 2347/1 +f 2484/1 2346/1 2347/1 +f 2338/1 2343/1 2347/1 +f 2484/1 2345/1 2346/1 +f 2481/1 2488/1 2499/1 +f 2489/1 2499/1 2488/1 +f 2481/1 2500/1 2480/1 +f 2481/1 2499/1 2500/1 +f 2500/1 2499/1 2501/1 +f 2500/1 2501/1 2502/1 +f 2500/1 2502/1 2480/1 +f 2501/1 2503/1 2502/1 +f 2480/1 2502/1 2300/1 +f 2300/1 2502/1 2302/1 +f 2502/1 2503/1 2302/1 +f 2302/1 2503/1 2297/1 +f 2299/1 2302/1 2296/1 +f 2302/1 2297/1 2296/1 +f 2480/1 2304/1 2308/1 +f 2300/1 2304/1 2480/1 +f 2339/1 2344/1 2341/1 +f 2344/1 2339/1 2335/1 +f 488/1 489/1 2364/1 +f 2364/1 489/1 2365/1 +f 371/1 183/1 372/1 +f 1450/1 685/1 1449/1 +f 2496/1 2344/1 2493/1 +f 2344/1 2335/1 2493/1 +f 2499/1 2326/1 2501/1 +f 2489/1 2329/1 2499/1 +f 2499/1 2329/1 2326/1 +f 2501/1 2326/1 2324/1 +f 2501/1 2324/1 2503/1 +f 2324/1 2323/1 2503/1 +f 2503/1 2323/1 427/1 +f 427/1 2297/1 2503/1 +f 87/1 2295/1 427/1 +f 427/1 2295/1 2297/1 +f 87/1 2294/1 2295/1 +f 2294/1 87/1 88/1 +f 2294/1 88/1 2255/1 +f 2255/1 88/1 89/1 +f 2255/1 89/1 2252/1 +f 2252/1 89/1 91/1 +f 2252/1 91/1 2250/1 +f 2490/1 2329/1 2489/1 +f 2493/1 2335/1 2490/1 +f 2490/1 2335/1 2329/1 +f 2250/1 91/1 401/1 +f 2344/1 2496/1 2498/1 +f 2343/1 2342/1 2344/1 +f 2498/1 2343/1 2344/1 +f 1260/1 1258/1 2504/1 +f 1284/1 1260/1 2504/1 +f 2505/1 2504/1 1258/1 +f 1284/1 2504/1 1287/1 +f 1287/1 2504/1 1771/1 +f 204/1 208/1 211/1 +f 2506/1 1770/1 1771/1 +f 1770/1 2506/1 2507/1 +f 2506/1 2504/1 2508/1 +f 2506/1 2508/1 2507/1 +f 1771/1 2504/1 2506/1 +f 2509/1 1770/1 2507/1 +f 1770/1 2509/1 2510/1 +f 2510/1 1769/1 1770/1 +f 2507/1 2508/1 2511/1 +f 2507/1 2511/1 2509/1 +f 2504/1 2505/1 2508/1 +f 2508/1 2505/1 1257/1 +f 2508/1 1257/1 2511/1 +f 2511/1 1257/1 1255/1 +f 2511/1 1255/1 2512/1 +f 2509/1 2511/1 2510/1 +f 2510/1 2511/1 2512/1 +f 2505/1 1258/1 1257/1 +f 1255/1 1258/1 1256/1 +f 2512/1 1255/1 2513/1 +f 2513/1 1255/1 1253/1 +f 2510/1 2512/1 2513/1 +f 2513/1 1253/1 1251/1 +f 2510/1 2513/1 2514/1 +f 2514/1 2513/1 2515/1 +f 2515/1 2513/1 1251/1 +f 1253/1 1256/1 1254/1 +f 2515/1 1251/1 1252/1 +f 1252/1 1251/1 1249/1 +f 1769/1 2510/1 2514/1 +f 1768/1 1769/1 2515/1 +f 2515/1 1769/1 2514/1 +f 2515/1 1252/1 1768/1 +f 1768/1 1252/1 1250/1 +f 1768/1 1250/1 1299/1 +f 214/1 198/1 210/1 +f 412/1 416/1 2153/1 +f 1767/1 1296/1 2478/1 +f 1294/1 2478/1 1296/1 +f 192/1 370/1 369/1 +f 192/1 369/1 189/1 +f 195/1 216/1 370/1 +f 371/1 378/1 182/1 +f 195/1 370/1 192/1 +f 1088/1 1098/1 1086/1 +f 819/1 823/1 854/1 +f 330/1 336/1 2116/1 +f 2116/1 336/1 356/1 +f 1404/1 1588/1 1387/1 +f 761/1 760/1 758/1 +f 2312/1 2307/1 2311/1 +f 1512/1 897/1 1516/1 +f 1268/1 1297/1 2459/1 +f 1686/1 1050/1 1681/1 +f 372/1 378/1 371/1 +f 1092/1 1098/1 1088/1 +f 1277/1 1276/1 2451/1 +f 1278/1 1275/1 1277/1 +f 1139/1 1156/1 1278/1 +f 1133/1 1139/1 2448/1 +f 2448/1 1278/1 2447/1 +f 1139/1 1278/1 2448/1 +f 862/1 1429/1 863/1 +f 1136/1 1139/1 1133/1 +f 1913/1 1453/1 1903/1 +f 2516/1 2517/1 2518/1 +f 2519/1 2520/1 2516/1 +f 2519/1 2516/1 2521/1 +f 2521/1 2516/1 2518/1 +f 2520/1 2522/1 2516/1 +f 2516/1 2523/1 2517/1 +f 2516/1 2522/1 2523/1 +f 2524/1 2520/1 2519/1 +f 2525/1 2526/1 2524/1 +f 2524/1 2526/1 2520/1 +f 2527/1 2525/1 2524/1 +f 2528/1 2529/1 2525/1 +f 2525/1 2529/1 2526/1 +f 2530/1 2528/1 2525/1 +f 2531/1 2532/1 2528/1 +f 2528/1 2532/1 2529/1 +f 2533/1 2531/1 2528/1 +f 2534/1 2535/1 2531/1 +f 2531/1 2535/1 2532/1 +f 2536/1 2534/1 2531/1 +f 2537/1 2538/1 2534/1 +f 2537/1 2534/1 2536/1 +f 2536/1 2531/1 2533/1 +f 2533/1 2528/1 2530/1 +f 2530/1 2525/1 2527/1 +f 2527/1 2524/1 2539/1 +f 2539/1 2524/1 2519/1 +f 2540/1 2538/1 2537/1 +f 2540/1 2541/1 2538/1 +f 2542/1 2541/1 2540/1 +f 2532/1 2543/1 2529/1 +f 2535/1 2544/1 2532/1 +f 2532/1 2544/1 2545/1 +f 2532/1 2545/1 2543/1 +f 2529/1 2546/1 2526/1 +f 2529/1 2547/1 2546/1 +f 2529/1 2543/1 2547/1 +f 2546/1 2548/1 2549/1 +f 2526/1 2546/1 2550/1 +f 2546/1 2549/1 2550/1 +f 2547/1 2548/1 2546/1 +f 2526/1 2551/1 2520/1 +f 2526/1 2550/1 2552/1 +f 2526/1 2552/1 2551/1 +f 2550/1 2549/1 2553/1 +f 2550/1 2553/1 2552/1 +f 2548/1 2554/1 2549/1 +f 2549/1 2554/1 2555/1 +f 2549/1 2555/1 2553/1 +f 2552/1 2553/1 2556/1 +f 2553/1 2555/1 2556/1 +f 2552/1 2556/1 2551/1 +f 2551/1 2556/1 2557/1 +f 2558/1 2556/1 2555/1 +f 2558/1 2557/1 2556/1 +f 2559/1 2555/1 2560/1 +f 2560/1 2555/1 2554/1 +f 2559/1 2558/1 2555/1 +f 2561/1 2558/1 2559/1 +f 2562/1 2557/1 2558/1 +f 2563/1 2562/1 2558/1 +f 2563/1 2558/1 2561/1 +f 2564/1 2561/1 2559/1 +f 2564/1 2559/1 2560/1 +f 2565/1 2560/1 2566/1 +f 2560/1 2554/1 2566/1 +f 2564/1 2560/1 2565/1 +f 2564/1 2567/1 2568/1 +f 2568/1 2561/1 2564/1 +f 2565/1 2569/1 2564/1 +f 2564/1 2569/1 2567/1 +f 2568/1 2563/1 2561/1 +f 2568/1 2567/1 2570/1 +f 2571/1 2563/1 2568/1 +f 2568/1 2570/1 2571/1 +f 2572/1 2571/1 2573/1 +f 2571/1 2572/1 2563/1 +f 2572/1 2574/1 2563/1 +f 2573/1 2575/1 2572/1 +f 2572/1 2575/1 2574/1 +f 2576/1 2577/1 2573/1 +f 2573/1 2577/1 2575/1 +f 2577/1 2578/1 2575/1 +f 2575/1 2579/1 2574/1 +f 2575/1 2578/1 2579/1 +f 2576/1 2580/1 2577/1 +f 2578/1 2577/1 2581/1 +f 2581/1 2577/1 2580/1 +f 2576/1 2582/1 2580/1 +f 2582/1 2576/1 2583/1 +f 2581/1 2580/1 2584/1 +f 2584/1 2580/1 2585/1 +f 2582/1 2585/1 2580/1 +f 2586/1 2581/1 2584/1 +f 2517/1 2578/1 2581/1 +f 2517/1 2581/1 2586/1 +f 2587/1 2584/1 2588/1 +f 2586/1 2584/1 2587/1 +f 2584/1 2585/1 2588/1 +f 2583/1 2585/1 2582/1 +f 2583/1 2589/1 2585/1 +f 2588/1 2585/1 2589/1 +f 2590/1 2588/1 2589/1 +f 2587/1 2588/1 2590/1 +f 2518/1 2586/1 2587/1 +f 2518/1 2587/1 2591/1 +f 2591/1 2587/1 2590/1 +f 2518/1 2517/1 2586/1 +f 2523/1 2578/1 2517/1 +f 2523/1 2579/1 2578/1 +f 2522/1 2579/1 2523/1 +f 2522/1 2592/1 2579/1 +f 2592/1 2574/1 2579/1 +f 2520/1 2593/1 2522/1 +f 2593/1 2592/1 2522/1 +f 2593/1 2594/1 2592/1 +f 2594/1 2574/1 2592/1 +f 2563/1 2574/1 2562/1 +f 2594/1 2562/1 2574/1 +f 2595/1 2557/1 2594/1 +f 2595/1 2594/1 2593/1 +f 2557/1 2562/1 2594/1 +f 2520/1 2595/1 2593/1 +f 2520/1 2551/1 2595/1 +f 2551/1 2557/1 2595/1 +f 2521/1 2518/1 2591/1 +f 2521/1 2591/1 2596/1 +f 2591/1 2590/1 2597/1 +f 2591/1 2597/1 2598/1 +f 2596/1 2591/1 2599/1 +f 2599/1 2591/1 2598/1 +f 2590/1 2589/1 2597/1 +f 2598/1 2597/1 2600/1 +f 2597/1 2589/1 2601/1 +f 2597/1 2601/1 2602/1 +f 2597/1 2602/1 2600/1 +f 2598/1 2600/1 2603/1 +f 2598/1 2603/1 2604/1 +f 2599/1 2598/1 2604/1 +f 2599/1 2604/1 2605/1 +f 2604/1 2603/1 2606/1 +f 2604/1 2606/1 2607/1 +f 2603/1 2608/1 2609/1 +f 2603/1 2609/1 2606/1 +f 2600/1 2608/1 2603/1 +f 2600/1 2602/1 2608/1 +f 2602/1 2610/1 2608/1 +f 2608/1 2610/1 2611/1 +f 2608/1 2611/1 2609/1 +f 2606/1 2609/1 2612/1 +f 2609/1 2611/1 2612/1 +f 2606/1 2612/1 2607/1 +f 2607/1 2612/1 2613/1 +f 2613/1 2614/1 2615/1 +f 2616/1 2612/1 2611/1 +f 2611/1 2617/1 2616/1 +f 2617/1 2611/1 2610/1 +f 2613/1 2612/1 2616/1 +f 2616/1 2614/1 2613/1 +f 2617/1 2610/1 2618/1 +f 2618/1 2610/1 2619/1 +f 2602/1 2619/1 2610/1 +f 2618/1 2589/1 2583/1 +f 2619/1 2601/1 2618/1 +f 2618/1 2601/1 2589/1 +f 2601/1 2619/1 2602/1 +f 2620/1 2569/1 2565/1 +f 2620/1 2621/1 2622/1 +f 2620/1 2622/1 2623/1 +f 2565/1 2566/1 2620/1 +f 2620/1 2566/1 2621/1 +f 2566/1 2624/1 2621/1 +f 2621/1 2624/1 2625/1 +f 2621/1 2625/1 2622/1 +f 2566/1 2554/1 2624/1 +f 2548/1 2624/1 2554/1 +f 2626/1 2624/1 2548/1 +f 2626/1 2625/1 2624/1 +f 2627/1 2625/1 2626/1 +f 2622/1 2628/1 2629/1 +f 2625/1 2627/1 2622/1 +f 2622/1 2627/1 2628/1 +f 2630/1 2622/1 2629/1 +f 2631/1 2628/1 2627/1 +f 2547/1 2626/1 2548/1 +f 2543/1 2626/1 2547/1 +f 2543/1 2627/1 2626/1 +f 2545/1 2627/1 2543/1 +f 2545/1 2631/1 2627/1 +f 2544/1 2631/1 2545/1 +f 2632/1 2633/1 2634/1 +f 2632/1 2634/1 2635/1 +f 2636/1 2632/1 2637/1 +f 2637/1 2632/1 2635/1 +f 2638/1 2633/1 2632/1 +f 2636/1 2638/1 2632/1 +f 2639/1 2638/1 2636/1 +f 2640/1 2639/1 2636/1 +f 2640/1 2636/1 2641/1 +f 2641/1 2636/1 2637/1 +f 2637/1 2635/1 2642/1 +f 2643/1 2637/1 2642/1 +f 2641/1 2637/1 2643/1 +f 2644/1 2640/1 2641/1 +f 2644/1 2641/1 2643/1 +f 2644/1 2643/1 2645/1 +f 2643/1 2642/1 2646/1 +f 2645/1 2643/1 2646/1 +f 2642/1 2635/1 2647/1 +f 2646/1 2642/1 2647/1 +f 2645/1 2646/1 2648/1 +f 2646/1 2647/1 2648/1 +f 2645/1 2648/1 2649/1 +f 2650/1 2644/1 2645/1 +f 2650/1 2645/1 2651/1 +f 2651/1 2645/1 2649/1 +f 2648/1 2652/1 2653/1 +f 2649/1 2648/1 2653/1 +f 2648/1 2647/1 2652/1 +f 2649/1 2653/1 2654/1 +f 2649/1 2654/1 2655/1 +f 2651/1 2649/1 2655/1 +f 2653/1 2652/1 2656/1 +f 2653/1 2656/1 2654/1 +f 2647/1 2657/1 2652/1 +f 2652/1 2657/1 2658/1 +f 2652/1 2658/1 2656/1 +f 2654/1 2656/1 2659/1 +f 2656/1 2658/1 2660/1 +f 2656/1 2660/1 2659/1 +f 2654/1 2659/1 2661/1 +f 2655/1 2654/1 2661/1 +f 2661/1 2659/1 2662/1 +f 2659/1 2660/1 2662/1 +f 2658/1 2663/1 2660/1 +f 2660/1 2664/1 2662/1 +f 2660/1 2663/1 2665/1 +f 2660/1 2665/1 2664/1 +f 2658/1 2666/1 2663/1 +f 2657/1 2666/1 2658/1 +f 2666/1 2667/1 2663/1 +f 2663/1 2667/1 2665/1 +f 2665/1 2668/1 2669/1 +f 2664/1 2665/1 2669/1 +f 2665/1 2667/1 2668/1 +f 2662/1 2664/1 2670/1 +f 2664/1 2669/1 2670/1 +f 2669/1 2668/1 2671/1 +f 2670/1 2669/1 2672/1 +f 2669/1 2671/1 2672/1 +f 2667/1 2673/1 2668/1 +f 2668/1 2673/1 2671/1 +f 2672/1 2671/1 2674/1 +f 2674/1 2671/1 2675/1 +f 2671/1 2676/1 2675/1 +f 2671/1 2673/1 2676/1 +f 2677/1 2672/1 2674/1 +f 2670/1 2672/1 2677/1 +f 2662/1 2670/1 2678/1 +f 2678/1 2670/1 2677/1 +f 2678/1 2677/1 2679/1 +f 2679/1 2677/1 2680/1 +f 2677/1 2681/1 2680/1 +f 2677/1 2674/1 2681/1 +f 2682/1 2662/1 2678/1 +f 2682/1 2678/1 2683/1 +f 2683/1 2678/1 2679/1 +f 2661/1 2662/1 2682/1 +f 2655/1 2661/1 2682/1 +f 2684/1 2682/1 2683/1 +f 2655/1 2682/1 2684/1 +f 2684/1 2683/1 2685/1 +f 2683/1 2679/1 2685/1 +f 2685/1 2679/1 2680/1 +f 2685/1 2680/1 2686/1 +f 2680/1 2681/1 2686/1 +f 2685/1 2686/1 2687/1 +f 2684/1 2685/1 2688/1 +f 2688/1 2685/1 2687/1 +f 2689/1 2684/1 2690/1 +f 2690/1 2684/1 2688/1 +f 2689/1 2655/1 2684/1 +f 2651/1 2655/1 2689/1 +f 2691/1 2651/1 2689/1 +f 2692/1 2689/1 2690/1 +f 2690/1 2688/1 2693/1 +f 2693/1 2688/1 2694/1 +f 2688/1 2695/1 2694/1 +f 2688/1 2687/1 2695/1 +f 2694/1 2696/1 2697/1 +f 2694/1 2697/1 2698/1 +f 2694/1 2695/1 2696/1 +f 2695/1 2699/1 2700/1 +f 2695/1 2700/1 2696/1 +f 2687/1 2699/1 2695/1 +f 2696/1 2700/1 2701/1 +f 2696/1 2701/1 2697/1 +f 2697/1 2702/1 2703/1 +f 2697/1 2701/1 2702/1 +f 2703/1 2702/1 2704/1 +f 2687/1 2686/1 2699/1 +f 2686/1 2705/1 2699/1 +f 2686/1 2681/1 2705/1 +f 2705/1 2706/1 2707/1 +f 2705/1 2707/1 2708/1 +f 2681/1 2706/1 2705/1 +f 2699/1 2705/1 2708/1 +f 2699/1 2708/1 2700/1 +f 2708/1 2709/1 2701/1 +f 2700/1 2708/1 2701/1 +f 2708/1 2707/1 2710/1 +f 2708/1 2710/1 2709/1 +f 2707/1 2711/1 2710/1 +f 2706/1 2712/1 2707/1 +f 2707/1 2712/1 2711/1 +f 2709/1 2710/1 2713/1 +f 2710/1 2711/1 2713/1 +f 2709/1 2713/1 2714/1 +f 2701/1 2709/1 2714/1 +f 2701/1 2714/1 2702/1 +f 2714/1 2713/1 2715/1 +f 2702/1 2714/1 2716/1 +f 2714/1 2715/1 2716/1 +f 2713/1 2717/1 2715/1 +f 2713/1 2711/1 2717/1 +f 2715/1 2717/1 2718/1 +f 2715/1 2718/1 2719/1 +f 2716/1 2715/1 2719/1 +f 2702/1 2716/1 2704/1 +f 2717/1 2720/1 2718/1 +f 2718/1 2720/1 2721/1 +f 2718/1 2721/1 2722/1 +f 2711/1 2720/1 2717/1 +f 2711/1 2723/1 2720/1 +f 2712/1 2723/1 2711/1 +f 2712/1 2676/1 2723/1 +f 2706/1 2675/1 2712/1 +f 2675/1 2676/1 2712/1 +f 2674/1 2675/1 2706/1 +f 2681/1 2674/1 2706/1 +f 2724/1 2650/1 2651/1 +f 2724/1 2651/1 2691/1 +f 2725/1 2650/1 2724/1 +f 2725/1 2726/1 2650/1 +f 2727/1 2726/1 2725/1 +f 2728/1 2729/1 2727/1 +f 2729/1 2730/1 2727/1 +f 2727/1 2730/1 2726/1 +f 2731/1 2729/1 2728/1 +f 2731/1 2732/1 2729/1 +f 2733/1 2732/1 2731/1 +f 2734/1 2735/1 2732/1 +f 2732/1 2735/1 2736/1 +f 2732/1 2736/1 2729/1 +f 2733/1 2734/1 2732/1 +f 2737/1 2734/1 2733/1 +f 2738/1 2739/1 2734/1 +f 2734/1 2739/1 2735/1 +f 2737/1 2738/1 2734/1 +f 2740/1 2738/1 2737/1 +f 2741/1 2737/1 2742/1 +f 2742/1 2737/1 2733/1 +f 2741/1 2740/1 2737/1 +f 2740/1 2743/1 2738/1 +f 2743/1 2744/1 2738/1 +f 2738/1 2744/1 2739/1 +f 2745/1 2746/1 2743/1 +f 2743/1 2746/1 2744/1 +f 2747/1 2745/1 2743/1 +f 2747/1 2743/1 2740/1 +f 2748/1 2749/1 2745/1 +f 2748/1 2745/1 2747/1 +f 2750/1 2751/1 2749/1 +f 2750/1 2749/1 2748/1 +f 2752/1 2750/1 2753/1 +f 2753/1 2750/1 2748/1 +f 2752/1 2754/1 2750/1 +f 2754/1 2751/1 2750/1 +f 2754/1 2755/1 2751/1 +f 2756/1 2754/1 2752/1 +f 2757/1 2755/1 2754/1 +f 2758/1 2754/1 2759/1 +f 2759/1 2754/1 2756/1 +f 2758/1 2757/1 2754/1 +f 2752/1 2760/1 2756/1 +f 2760/1 2761/1 2756/1 +f 2756/1 2761/1 2759/1 +f 2759/1 2761/1 2762/1 +f 2759/1 2762/1 2758/1 +f 2763/1 2757/1 2758/1 +f 2758/1 2762/1 2764/1 +f 2758/1 2764/1 2763/1 +f 2765/1 2757/1 2766/1 +f 2766/1 2757/1 2763/1 +f 2763/1 2764/1 2766/1 +f 2766/1 2764/1 2767/1 +f 2768/1 2764/1 2762/1 +f 2766/1 2767/1 2765/1 +f 2769/1 2767/1 2770/1 +f 2771/1 2768/1 2762/1 +f 2771/1 2762/1 2761/1 +f 2772/1 2768/1 2771/1 +f 2773/1 2771/1 2774/1 +f 2774/1 2771/1 2775/1 +f 2772/1 2771/1 2773/1 +f 2776/1 2772/1 2777/1 +f 2777/1 2772/1 2773/1 +f 2776/1 2778/1 2772/1 +f 2778/1 2768/1 2772/1 +f 2779/1 2780/1 2776/1 +f 2776/1 2780/1 2778/1 +f 2780/1 2781/1 2778/1 +f 2778/1 2781/1 2768/1 +f 2780/1 2782/1 2781/1 +f 2782/1 2783/1 2781/1 +f 2781/1 2783/1 2784/1 +f 2781/1 2784/1 2768/1 +f 2782/1 2770/1 2783/1 +f 2783/1 2770/1 2767/1 +f 2783/1 2767/1 2784/1 +f 2784/1 2767/1 2764/1 +f 2784/1 2764/1 2768/1 +f 2785/1 2786/1 2779/1 +f 2785/1 2779/1 2787/1 +f 2787/1 2779/1 2776/1 +f 2788/1 2786/1 2785/1 +f 2788/1 2789/1 2786/1 +f 2790/1 2789/1 2788/1 +f 2787/1 2776/1 2791/1 +f 2791/1 2776/1 2777/1 +f 2791/1 2777/1 2792/1 +f 2792/1 2777/1 2793/1 +f 2792/1 2793/1 2794/1 +f 2793/1 2773/1 2795/1 +f 2793/1 2795/1 2796/1 +f 2777/1 2773/1 2793/1 +f 2794/1 2793/1 2796/1 +f 2773/1 2774/1 2797/1 +f 2773/1 2797/1 2795/1 +f 2796/1 2795/1 2798/1 +f 2795/1 2797/1 2799/1 +f 2795/1 2799/1 2798/1 +f 2796/1 2798/1 2800/1 +f 2800/1 2798/1 2801/1 +f 2798/1 2802/1 2803/1 +f 2798/1 2799/1 2802/1 +f 2798/1 2803/1 2801/1 +f 2797/1 2804/1 2799/1 +f 2799/1 2804/1 2802/1 +f 2774/1 2775/1 2797/1 +f 2797/1 2775/1 2804/1 +f 2775/1 2760/1 2804/1 +f 2804/1 2760/1 2805/1 +f 2804/1 2805/1 2806/1 +f 2804/1 2806/1 2802/1 +f 2802/1 2807/1 2803/1 +f 2802/1 2806/1 2807/1 +f 2808/1 2809/1 2806/1 +f 2808/1 2806/1 2810/1 +f 2810/1 2806/1 2753/1 +f 2753/1 2806/1 2805/1 +f 2807/1 2806/1 2809/1 +f 2753/1 2805/1 2752/1 +f 2752/1 2805/1 2760/1 +f 2775/1 2761/1 2760/1 +f 2771/1 2761/1 2775/1 +f 2753/1 2748/1 2810/1 +f 2810/1 2748/1 2808/1 +f 2808/1 2748/1 2811/1 +f 2811/1 2809/1 2808/1 +f 2811/1 2748/1 2747/1 +f 2811/1 2747/1 2812/1 +f 2812/1 2809/1 2811/1 +f 2813/1 2747/1 2814/1 +f 2812/1 2747/1 2813/1 +f 2814/1 2747/1 2740/1 +f 2813/1 2815/1 2812/1 +f 2812/1 2815/1 2809/1 +f 2814/1 2815/1 2813/1 +f 2814/1 2740/1 2816/1 +f 2816/1 2817/1 2814/1 +f 2814/1 2817/1 2815/1 +f 2816/1 2740/1 2818/1 +f 2818/1 2740/1 2741/1 +f 2818/1 2819/1 2816/1 +f 2816/1 2819/1 2817/1 +f 2820/1 2817/1 2819/1 +f 2820/1 2821/1 2817/1 +f 2821/1 2815/1 2817/1 +f 2820/1 2819/1 2822/1 +f 2823/1 2819/1 2818/1 +f 2822/1 2819/1 2823/1 +f 2741/1 2823/1 2818/1 +f 2742/1 2824/1 2741/1 +f 2741/1 2824/1 2823/1 +f 2825/1 2823/1 2824/1 +f 2822/1 2823/1 2825/1 +f 2825/1 2824/1 2826/1 +f 2827/1 2822/1 2825/1 +f 2827/1 2825/1 2828/1 +f 2828/1 2825/1 2829/1 +f 2825/1 2826/1 2829/1 +f 2830/1 2827/1 2828/1 +f 2831/1 2822/1 2827/1 +f 2832/1 2827/1 2830/1 +f 2832/1 2831/1 2827/1 +f 2830/1 2828/1 2833/1 +f 2833/1 2828/1 2829/1 +f 2834/1 2830/1 2835/1 +f 2834/1 2832/1 2830/1 +f 2836/1 2837/1 2832/1 +f 2837/1 2820/1 2832/1 +f 2836/1 2832/1 2834/1 +f 2832/1 2820/1 2831/1 +f 2831/1 2820/1 2822/1 +f 2837/1 2821/1 2820/1 +f 2801/1 2821/1 2837/1 +f 2800/1 2837/1 2836/1 +f 2800/1 2801/1 2837/1 +f 2801/1 2803/1 2821/1 +f 2838/1 2815/1 2821/1 +f 2803/1 2838/1 2821/1 +f 2803/1 2807/1 2838/1 +f 2838/1 2809/1 2815/1 +f 2807/1 2809/1 2838/1 +f 2742/1 2826/1 2824/1 +f 2742/1 2733/1 2839/1 +f 2839/1 2826/1 2742/1 +f 2840/1 2733/1 2731/1 +f 2841/1 2733/1 2840/1 +f 2839/1 2733/1 2841/1 +f 2841/1 2826/1 2839/1 +f 2841/1 2842/1 2826/1 +f 2840/1 2842/1 2841/1 +f 2840/1 2731/1 2843/1 +f 2843/1 2842/1 2840/1 +f 2729/1 2736/1 2730/1 +f 2726/1 2644/1 2650/1 +f 2730/1 2844/1 2726/1 +f 2726/1 2844/1 2644/1 +f 2844/1 2640/1 2644/1 +f 2844/1 2845/1 2640/1 +f 2730/1 2846/1 2844/1 +f 2846/1 2845/1 2844/1 +f 2736/1 2847/1 2730/1 +f 2730/1 2847/1 2846/1 +f 2847/1 2848/1 2846/1 +f 2846/1 2848/1 2845/1 +f 2848/1 2849/1 2845/1 +f 2845/1 2849/1 2850/1 +f 2845/1 2850/1 2640/1 +f 2640/1 2850/1 2639/1 +f 2849/1 2851/1 2850/1 +f 2850/1 2851/1 2639/1 +f 2848/1 2852/1 2849/1 +f 2852/1 2853/1 2849/1 +f 2849/1 2853/1 2851/1 +f 2847/1 2854/1 2848/1 +f 2854/1 2852/1 2848/1 +f 2854/1 2855/1 2852/1 +f 2855/1 2856/1 2852/1 +f 2852/1 2857/1 2853/1 +f 2856/1 2857/1 2852/1 +f 2853/1 2858/1 2851/1 +f 2857/1 2859/1 2853/1 +f 2853/1 2859/1 2858/1 +f 2858/1 2860/1 2861/1 +f 2851/1 2858/1 2861/1 +f 2859/1 2860/1 2858/1 +f 2857/1 2862/1 2859/1 +f 2862/1 2863/1 2859/1 +f 2859/1 2863/1 2860/1 +f 2856/1 2862/1 2857/1 +f 2864/1 2865/1 2862/1 +f 2862/1 2865/1 2863/1 +f 2856/1 2864/1 2862/1 +f 2866/1 2864/1 2856/1 +f 2861/1 2860/1 2867/1 +f 2860/1 2868/1 2869/1 +f 2860/1 2869/1 2867/1 +f 2867/1 2869/1 2870/1 +f 2861/1 2867/1 2633/1 +f 2633/1 2867/1 2870/1 +f 2870/1 2869/1 2871/1 +f 2870/1 2871/1 2872/1 +f 2633/1 2870/1 2634/1 +f 2634/1 2870/1 2872/1 +f 2638/1 2861/1 2633/1 +f 2851/1 2638/1 2639/1 +f 2851/1 2861/1 2638/1 +f 2873/1 2872/1 2874/1 +f 2874/1 2872/1 2875/1 +f 2872/1 2876/1 2875/1 +f 2634/1 2872/1 2873/1 +f 2872/1 2871/1 2876/1 +f 2635/1 2634/1 2873/1 +f 2877/1 2873/1 2874/1 +f 2635/1 2873/1 2877/1 +f 2657/1 2874/1 2666/1 +f 2877/1 2874/1 2657/1 +f 2874/1 2875/1 2666/1 +f 2875/1 2876/1 2667/1 +f 2666/1 2875/1 2667/1 +f 2667/1 2876/1 2673/1 +f 2647/1 2877/1 2657/1 +f 2635/1 2877/1 2647/1 +f 2878/1 2866/1 2856/1 +f 2878/1 2856/1 2855/1 +f 2879/1 2880/1 2866/1 +f 2879/1 2866/1 2878/1 +f 2881/1 2879/1 2878/1 +f 2882/1 2879/1 2881/1 +f 2881/1 2878/1 2883/1 +f 2883/1 2878/1 2855/1 +f 2883/1 2855/1 2854/1 +f 2884/1 2883/1 2847/1 +f 2847/1 2883/1 2854/1 +f 2884/1 2881/1 2883/1 +f 2884/1 2882/1 2881/1 +f 2885/1 2882/1 2884/1 +f 2885/1 2886/1 2882/1 +f 2736/1 2884/1 2847/1 +f 2736/1 2885/1 2884/1 +f 2735/1 2885/1 2736/1 +f 2887/1 2888/1 2889/1 +f 2890/1 2891/1 2887/1 +f 2889/1 2892/1 2887/1 +f 2887/1 2892/1 2893/1 +f 2887/1 2893/1 2890/1 +f 2887/1 2891/1 2888/1 +f 2889/1 2888/1 2894/1 +f 2894/1 2895/1 2889/1 +f 2889/1 2895/1 2892/1 +f 2896/1 2893/1 2892/1 +f 2897/1 2892/1 2895/1 +f 2897/1 2895/1 2898/1 +f 2898/1 2895/1 2899/1 +f 2899/1 2895/1 2894/1 +f 2894/1 2888/1 2900/1 +f 2900/1 2899/1 2894/1 +f 2898/1 2899/1 2901/1 +f 2901/1 2899/1 2902/1 +f 2900/1 2902/1 2899/1 +f 2903/1 2898/1 2904/1 +f 2904/1 2898/1 2901/1 +f 2901/1 2905/1 2906/1 +f 2904/1 2901/1 2907/1 +f 2907/1 2901/1 2906/1 +f 2901/1 2902/1 2905/1 +f 2908/1 2902/1 2900/1 +f 2908/1 2905/1 2902/1 +f 2908/1 2909/1 2910/1 +f 2908/1 2910/1 2911/1 +f 2900/1 2909/1 2908/1 +f 2911/1 2905/1 2908/1 +f 2900/1 2888/1 2909/1 +f 2888/1 2912/1 2909/1 +f 2909/1 2913/1 2910/1 +f 2909/1 2912/1 2913/1 +f 2891/1 2914/1 2888/1 +f 2888/1 2914/1 2912/1 +f 2910/1 2913/1 2915/1 +f 2910/1 2915/1 2916/1 +f 2915/1 2917/1 2918/1 +f 2916/1 2915/1 2918/1 +f 2916/1 2918/1 2919/1 +f 2919/1 2918/1 2920/1 +f 2918/1 2917/1 2921/1 +f 2918/1 2921/1 2920/1 +f 2920/1 2921/1 2922/1 +f 2920/1 2922/1 2923/1 +f 2924/1 2920/1 2923/1 +f 2919/1 2920/1 2924/1 +f 2923/1 2922/1 2925/1 +f 2923/1 2925/1 2926/1 +f 2924/1 2923/1 2927/1 +f 2927/1 2923/1 2926/1 +f 2928/1 2924/1 2929/1 +f 2928/1 2919/1 2924/1 +f 2929/1 2924/1 2927/1 +f 2930/1 2919/1 2928/1 +f 2929/1 2931/1 2928/1 +f 2928/1 2931/1 2932/1 +f 2928/1 2932/1 2930/1 +f 2933/1 2919/1 2930/1 +f 2932/1 2934/1 2930/1 +f 2930/1 2934/1 2933/1 +f 2935/1 2919/1 2933/1 +f 2935/1 2916/1 2919/1 +f 2933/1 2934/1 2936/1 +f 2933/1 2936/1 2935/1 +f 2937/1 2934/1 2938/1 +f 2937/1 2936/1 2934/1 +f 2938/1 2934/1 2932/1 +f 2939/1 2940/1 2936/1 +f 2937/1 2939/1 2936/1 +f 2935/1 2936/1 2940/1 +f 2941/1 2916/1 2935/1 +f 2935/1 2940/1 2941/1 +f 2942/1 2943/1 2940/1 +f 2942/1 2940/1 2939/1 +f 2941/1 2940/1 2944/1 +f 2944/1 2940/1 2943/1 +f 2944/1 2916/1 2941/1 +f 2945/1 2916/1 2944/1 +f 2944/1 2943/1 2945/1 +f 2946/1 2943/1 2942/1 +f 2946/1 2905/1 2943/1 +f 2945/1 2943/1 2947/1 +f 2947/1 2943/1 2905/1 +f 2948/1 2946/1 2942/1 +f 2948/1 2942/1 2939/1 +f 2906/1 2905/1 2946/1 +f 2906/1 2946/1 2948/1 +f 2947/1 2905/1 2911/1 +f 2947/1 2910/1 2945/1 +f 2911/1 2910/1 2947/1 +f 2945/1 2910/1 2916/1 +f 2949/1 2948/1 2950/1 +f 2950/1 2948/1 2939/1 +f 2949/1 2906/1 2948/1 +f 2949/1 2907/1 2906/1 +f 2951/1 2907/1 2949/1 +f 2952/1 2949/1 2953/1 +f 2952/1 2951/1 2949/1 +f 2953/1 2949/1 2950/1 +f 2950/1 2939/1 2954/1 +f 2953/1 2950/1 2954/1 +f 2954/1 2939/1 2937/1 +f 2954/1 2937/1 2955/1 +f 2953/1 2954/1 2956/1 +f 2956/1 2954/1 2955/1 +f 2957/1 2937/1 2938/1 +f 2955/1 2937/1 2957/1 +f 2958/1 2955/1 2959/1 +f 2955/1 2957/1 2960/1 +f 2956/1 2955/1 2958/1 +f 2955/1 2960/1 2959/1 +f 2957/1 2938/1 2960/1 +f 2938/1 2932/1 2961/1 +f 2960/1 2938/1 2961/1 +f 2959/1 2960/1 2962/1 +f 2960/1 2961/1 2962/1 +f 2963/1 2959/1 2964/1 +f 2958/1 2959/1 2963/1 +f 2959/1 2962/1 2964/1 +f 2964/1 2962/1 2965/1 +f 2962/1 2961/1 2965/1 +f 2961/1 2966/1 2965/1 +f 2961/1 2932/1 2931/1 +f 2961/1 2931/1 2966/1 +f 2965/1 2966/1 2967/1 +f 2965/1 2967/1 2968/1 +f 2967/1 2966/1 2969/1 +f 2929/1 2966/1 2931/1 +f 2929/1 2927/1 2970/1 +f 2970/1 2966/1 2929/1 +f 2971/1 2969/1 2966/1 +f 2971/1 2966/1 2970/1 +f 2970/1 2927/1 2971/1 +f 2972/1 2927/1 2973/1 +f 2927/1 2926/1 2973/1 +f 2971/1 2927/1 2972/1 +f 2972/1 2969/1 2971/1 +f 2974/1 2969/1 2972/1 +f 2972/1 2973/1 2974/1 +f 2974/1 2973/1 2975/1 +f 2975/1 2976/1 2974/1 +f 2973/1 2926/1 2977/1 +f 2973/1 2977/1 2978/1 +f 2926/1 2979/1 2977/1 +f 2978/1 2977/1 2980/1 +f 2977/1 2979/1 2981/1 +f 2977/1 2981/1 2980/1 +f 2926/1 2925/1 2979/1 +f 2980/1 2981/1 2982/1 +f 2980/1 2982/1 2983/1 +f 2982/1 2984/1 2985/1 +f 2981/1 2986/1 2982/1 +f 2982/1 2986/1 2984/1 +f 2979/1 2987/1 2981/1 +f 2981/1 2987/1 2986/1 +f 2986/1 2988/1 2989/1 +f 2986/1 2989/1 2990/1 +f 2987/1 2988/1 2986/1 +f 2986/1 2990/1 2984/1 +f 2991/1 2992/1 2987/1 +f 2987/1 2993/1 2988/1 +f 2987/1 2992/1 2993/1 +f 2979/1 2991/1 2987/1 +f 2979/1 2994/1 2991/1 +f 2925/1 2994/1 2979/1 +f 2991/1 2995/1 2992/1 +f 2994/1 2996/1 2991/1 +f 2991/1 2996/1 2995/1 +f 2992/1 2997/1 2993/1 +f 2992/1 2998/1 2997/1 +f 2995/1 2998/1 2992/1 +f 2993/1 2997/1 2999/1 +f 2993/1 2999/1 2988/1 +f 2998/1 3000/1 2997/1 +f 2998/1 3001/1 3000/1 +f 2997/1 3000/1 2999/1 +f 3000/1 3002/1 2999/1 +f 2999/1 3003/1 3004/1 +f 2999/1 3002/1 3003/1 +f 3004/1 3003/1 3005/1 +f 3004/1 3005/1 3006/1 +f 2988/1 2999/1 3004/1 +f 2988/1 3004/1 2989/1 +f 2989/1 3004/1 3006/1 +f 2989/1 3006/1 2990/1 +f 2990/1 3006/1 3007/1 +f 3006/1 3005/1 3007/1 +f 2990/1 3007/1 3008/1 +f 2984/1 2990/1 3009/1 +f 2990/1 3008/1 3009/1 +f 3007/1 3010/1 3008/1 +f 3005/1 3010/1 3007/1 +f 3008/1 3011/1 3012/1 +f 3008/1 3010/1 3011/1 +f 3009/1 3008/1 3012/1 +f 2984/1 3009/1 3013/1 +f 3009/1 3012/1 3013/1 +f 2985/1 2984/1 3014/1 +f 2984/1 3013/1 3014/1 +f 3013/1 3012/1 3015/1 +f 3013/1 3015/1 3016/1 +f 3014/1 3013/1 3016/1 +f 3012/1 3011/1 3017/1 +f 3012/1 3017/1 3015/1 +f 3016/1 3015/1 3018/1 +f 3015/1 3017/1 3018/1 +f 3014/1 3016/1 3019/1 +f 3016/1 3018/1 3019/1 +f 3020/1 3014/1 3021/1 +f 2985/1 3014/1 3020/1 +f 3014/1 3019/1 3021/1 +f 3019/1 3018/1 3022/1 +f 3019/1 3022/1 3023/1 +f 3021/1 3019/1 3023/1 +f 3017/1 3024/1 3018/1 +f 3018/1 3025/1 3022/1 +f 3018/1 3024/1 3025/1 +f 3023/1 3022/1 3026/1 +f 3022/1 3025/1 3027/1 +f 3022/1 3027/1 3026/1 +f 3023/1 3026/1 3028/1 +f 3021/1 3023/1 3028/1 +f 3020/1 3021/1 3029/1 +f 3021/1 3028/1 3029/1 +f 3029/1 3028/1 3030/1 +f 3028/1 3026/1 3031/1 +f 3028/1 3031/1 3030/1 +f 3026/1 3027/1 3032/1 +f 3026/1 3032/1 3031/1 +f 3027/1 3033/1 3034/1 +f 3027/1 3034/1 3032/1 +f 3025/1 3033/1 3027/1 +f 3032/1 3035/1 3036/1 +f 3032/1 3037/1 3035/1 +f 3031/1 3032/1 3036/1 +f 3032/1 3034/1 3037/1 +f 3030/1 3031/1 3036/1 +f 3030/1 3036/1 3038/1 +f 3029/1 3030/1 3038/1 +f 3036/1 3039/1 3040/1 +f 3036/1 3035/1 3039/1 +f 3038/1 3036/1 3040/1 +f 3035/1 3041/1 3039/1 +f 3035/1 3037/1 3041/1 +f 3037/1 3042/1 3041/1 +f 3034/1 3043/1 3037/1 +f 3037/1 3043/1 3042/1 +f 3033/1 3043/1 3034/1 +f 3043/1 3044/1 3042/1 +f 3033/1 3045/1 3043/1 +f 3043/1 3046/1 3044/1 +f 3045/1 3046/1 3043/1 +f 3041/1 3042/1 3047/1 +f 3042/1 3044/1 3047/1 +f 3039/1 3041/1 3048/1 +f 3041/1 3047/1 3048/1 +f 3047/1 3049/1 3050/1 +f 3048/1 3047/1 3051/1 +f 3051/1 3047/1 3050/1 +f 3047/1 3044/1 3049/1 +f 3039/1 3048/1 3052/1 +f 3052/1 3048/1 3051/1 +f 3051/1 3050/1 3053/1 +f 3054/1 3051/1 3053/1 +f 3052/1 3051/1 3054/1 +f 3050/1 3049/1 3055/1 +f 3053/1 3050/1 3055/1 +f 3055/1 3049/1 3056/1 +f 3055/1 3056/1 3057/1 +f 3053/1 3055/1 3058/1 +f 3058/1 3055/1 3057/1 +f 3059/1 3053/1 3058/1 +f 3054/1 3053/1 3059/1 +f 3060/1 3054/1 3059/1 +f 3061/1 3054/1 3060/1 +f 3052/1 3054/1 3061/1 +f 3059/1 3058/1 3062/1 +f 3060/1 3059/1 3063/1 +f 3063/1 3059/1 3062/1 +f 3058/1 3057/1 3064/1 +f 3062/1 3058/1 3064/1 +f 3062/1 3064/1 3065/1 +f 3062/1 3065/1 3066/1 +f 3063/1 3062/1 3067/1 +f 3067/1 3062/1 3066/1 +f 3068/1 3063/1 3069/1 +f 3069/1 3063/1 3067/1 +f 3068/1 3060/1 3063/1 +f 3070/1 3060/1 3068/1 +f 3071/1 3068/1 3069/1 +f 3071/1 3070/1 3068/1 +f 3072/1 3069/1 3073/1 +f 3071/1 3069/1 3072/1 +f 3069/1 3067/1 3073/1 +f 3073/1 3067/1 3066/1 +f 3072/1 3073/1 3074/1 +f 3073/1 3066/1 3074/1 +f 3075/1 3071/1 3072/1 +f 3072/1 3074/1 3076/1 +f 3075/1 3072/1 3077/1 +f 3077/1 3072/1 3076/1 +f 3076/1 3074/1 3078/1 +f 3074/1 3066/1 3079/1 +f 3074/1 3079/1 3078/1 +f 3078/1 3079/1 3080/1 +f 3078/1 3080/1 3081/1 +f 3081/1 3080/1 3082/1 +f 3083/1 3071/1 3075/1 +f 3083/1 3084/1 3071/1 +f 3085/1 3084/1 3083/1 +f 3086/1 3085/1 3083/1 +f 3084/1 3070/1 3071/1 +f 3084/1 3087/1 3070/1 +f 3088/1 3087/1 3084/1 +f 3085/1 3088/1 3084/1 +f 3020/1 3029/1 3085/1 +f 3085/1 3029/1 3088/1 +f 3089/1 3020/1 3085/1 +f 3029/1 3038/1 3088/1 +f 3088/1 3038/1 3087/1 +f 3038/1 3040/1 3087/1 +f 3087/1 3040/1 3090/1 +f 3087/1 3090/1 3070/1 +f 3040/1 3039/1 3052/1 +f 3040/1 3052/1 3090/1 +f 3070/1 3090/1 3061/1 +f 3090/1 3052/1 3061/1 +f 3070/1 3061/1 3060/1 +f 3091/1 2985/1 3020/1 +f 3091/1 3020/1 3089/1 +f 3089/1 3085/1 3086/1 +f 2983/1 2985/1 3091/1 +f 2983/1 2982/1 2985/1 +f 3066/1 3065/1 3092/1 +f 3066/1 3092/1 3079/1 +f 3065/1 3064/1 3093/1 +f 3065/1 3093/1 3092/1 +f 3092/1 3093/1 3094/1 +f 3079/1 3092/1 3095/1 +f 3079/1 3095/1 3080/1 +f 3080/1 3095/1 3096/1 +f 3080/1 3096/1 3082/1 +f 3095/1 3097/1 3096/1 +f 3095/1 3094/1 3097/1 +f 3092/1 3094/1 3095/1 +f 3096/1 3097/1 3098/1 +f 3097/1 3099/1 3098/1 +f 3094/1 3099/1 3097/1 +f 3098/1 3099/1 3100/1 +f 3099/1 3101/1 3102/1 +f 3094/1 3103/1 3099/1 +f 3103/1 3101/1 3099/1 +f 3099/1 3102/1 3100/1 +f 3100/1 3102/1 3104/1 +f 3104/1 3102/1 3105/1 +f 3057/1 3056/1 3101/1 +f 3057/1 3101/1 3103/1 +f 3093/1 3103/1 3094/1 +f 3093/1 3057/1 3103/1 +f 3064/1 3057/1 3093/1 +f 3106/1 3107/1 3046/1 +f 3106/1 3046/1 3045/1 +f 3108/1 3107/1 3106/1 +f 3108/1 3109/1 3107/1 +f 3110/1 3108/1 3111/1 +f 3111/1 3108/1 3106/1 +f 3110/1 3112/1 3108/1 +f 3112/1 3109/1 3108/1 +f 3113/1 3109/1 3112/1 +f 3114/1 3112/1 3110/1 +f 3114/1 3113/1 3112/1 +f 3011/1 3110/1 3111/1 +f 3010/1 3110/1 3011/1 +f 3010/1 3114/1 3110/1 +f 3011/1 3111/1 3017/1 +f 3111/1 3106/1 3115/1 +f 3017/1 3111/1 3115/1 +f 3017/1 3115/1 3024/1 +f 3115/1 3106/1 3116/1 +f 3024/1 3115/1 3116/1 +f 3116/1 3106/1 3045/1 +f 3025/1 3116/1 3033/1 +f 3116/1 3045/1 3033/1 +f 3024/1 3116/1 3025/1 +f 3005/1 3114/1 3010/1 +f 3005/1 3117/1 3114/1 +f 3117/1 3113/1 3114/1 +f 3003/1 3117/1 3005/1 +f 3118/1 3113/1 3117/1 +f 3003/1 3118/1 3117/1 +f 3118/1 3119/1 3113/1 +f 3002/1 3120/1 3118/1 +f 3120/1 3119/1 3118/1 +f 3002/1 3118/1 3003/1 +f 3000/1 3120/1 3002/1 +f 2963/1 2964/1 3121/1 +f 2951/1 2904/1 2907/1 +f 3122/1 2951/1 2952/1 +f 3123/1 2904/1 2951/1 +f 3122/1 3123/1 2951/1 +f 3123/1 2903/1 2904/1 +f 3124/1 3123/1 3122/1 +f 3124/1 3125/1 3123/1 +f 3125/1 2897/1 3123/1 +f 3123/1 2897/1 2903/1 +f 2903/1 2897/1 2898/1 +f 2897/1 2896/1 2892/1 +f 3125/1 2896/1 2897/1 +f 3126/1 3127/1 3125/1 +f 3126/1 3125/1 3124/1 +f 3127/1 2896/1 3125/1 +f 3128/1 2893/1 2896/1 +f 3129/1 3128/1 2896/1 +f 3127/1 3129/1 2896/1 +f 3126/1 3130/1 3127/1 +f 3129/1 3131/1 3128/1 +f 3131/1 3132/1 3128/1 +f 3128/1 3132/1 2893/1 +f 3133/1 3124/1 3122/1 +f 3133/1 3122/1 3134/1 +f 3134/1 3122/1 2952/1 +f 2721/1 3124/1 3133/1 +f 2721/1 3126/1 3124/1 +f 2720/1 3126/1 2721/1 +f 2720/1 3135/1 3126/1 +f 2723/1 3135/1 2720/1 +f 2723/1 3136/1 3135/1 +f 2676/1 3136/1 2723/1 +f 2676/1 3137/1 3136/1 +f 3134/1 2952/1 3138/1 +f 3138/1 2952/1 2953/1 +f 3139/1 2891/1 2890/1 +f 2890/1 2893/1 3139/1 +f 3139/1 2893/1 3132/1 +f 3140/1 3141/1 3142/1 +f 3140/1 3142/1 3143/1 +f 3144/1 3141/1 3140/1 +f 3144/1 3145/1 3141/1 +f 3141/1 3146/1 3147/1 +f 3145/1 3146/1 3141/1 +f 3141/1 3147/1 3142/1 +f 3148/1 3145/1 3144/1 +f 3149/1 3150/1 3145/1 +f 3148/1 3149/1 3145/1 +f 3145/1 3151/1 3146/1 +f 3145/1 3150/1 3151/1 +f 3151/1 3152/1 3146/1 +f 3146/1 3152/1 3153/1 +f 3146/1 3153/1 3147/1 +f 3147/1 3153/1 3154/1 +f 3142/1 3147/1 3154/1 +f 3152/1 3155/1 3153/1 +f 3153/1 3155/1 3156/1 +f 3153/1 3156/1 3157/1 +f 3153/1 3157/1 3154/1 +f 3142/1 3154/1 3158/1 +f 3154/1 3159/1 3158/1 +f 3154/1 3157/1 3159/1 +f 3142/1 3158/1 3160/1 +f 3143/1 3142/1 3160/1 +f 3160/1 3158/1 3161/1 +f 3158/1 3159/1 3162/1 +f 3158/1 3162/1 3161/1 +f 3159/1 3157/1 3163/1 +f 3159/1 3163/1 3162/1 +f 3162/1 3163/1 3164/1 +f 3162/1 3164/1 3161/1 +f 3165/1 3161/1 3166/1 +f 3166/1 3161/1 3167/1 +f 3161/1 3164/1 3167/1 +f 3160/1 3161/1 3165/1 +f 3143/1 3160/1 3165/1 +f 3143/1 3165/1 3168/1 +f 3165/1 3166/1 3169/1 +f 3168/1 3165/1 3169/1 +f 3170/1 3166/1 3171/1 +f 3169/1 3166/1 3170/1 +f 3166/1 3167/1 3172/1 +f 3166/1 3172/1 3171/1 +f 3173/1 3172/1 3167/1 +f 3173/1 3167/1 3174/1 +f 3174/1 3167/1 3164/1 +f 3175/1 3172/1 3176/1 +f 3176/1 3172/1 3173/1 +f 3171/1 3172/1 3175/1 +f 3170/1 3171/1 3177/1 +f 3177/1 3171/1 3178/1 +f 3171/1 3175/1 3178/1 +f 3169/1 3170/1 3177/1 +f 3177/1 3178/1 3179/1 +f 3180/1 3177/1 3179/1 +f 3169/1 3177/1 3180/1 +f 3179/1 3178/1 3181/1 +f 3178/1 3175/1 3182/1 +f 3178/1 3182/1 3183/1 +f 3178/1 3183/1 3181/1 +f 3180/1 3179/1 3184/1 +f 3184/1 3179/1 3181/1 +f 3185/1 3169/1 3180/1 +f 3185/1 3180/1 3186/1 +f 3186/1 3180/1 3184/1 +f 3184/1 3181/1 3187/1 +f 3184/1 3187/1 3188/1 +f 3186/1 3184/1 3189/1 +f 3189/1 3184/1 3188/1 +f 3188/1 3187/1 3190/1 +f 3181/1 3191/1 3187/1 +f 3187/1 3191/1 3192/1 +f 3187/1 3192/1 3190/1 +f 3188/1 3190/1 3193/1 +f 3192/1 3194/1 3190/1 +f 3191/1 3195/1 3192/1 +f 3192/1 3195/1 3194/1 +f 3181/1 3183/1 3191/1 +f 3191/1 3183/1 3195/1 +f 3196/1 3168/1 3185/1 +f 3197/1 3168/1 3196/1 +f 3197/1 3143/1 3168/1 +f 3198/1 3143/1 3197/1 +f 3198/1 3140/1 3143/1 +f 3199/1 3140/1 3198/1 +f 3199/1 3144/1 3140/1 +f 3200/1 3144/1 3199/1 +f 3200/1 3148/1 3144/1 +f 3201/1 3148/1 3200/1 +f 3201/1 3202/1 3148/1 +f 3203/1 3202/1 3201/1 +f 3203/1 3204/1 3202/1 +f 3205/1 3206/1 3203/1 +f 3205/1 3203/1 3207/1 +f 3206/1 3204/1 3203/1 +f 3208/1 3203/1 3201/1 +f 3207/1 3203/1 3208/1 +f 3206/1 3209/1 3204/1 +f 3210/1 3209/1 3206/1 +f 3210/1 3211/1 3209/1 +f 3212/1 3211/1 3210/1 +f 3213/1 3212/1 3210/1 +f 3213/1 3210/1 3214/1 +f 3215/1 3210/1 3206/1 +f 3214/1 3210/1 3215/1 +f 3216/1 3217/1 3212/1 +f 3216/1 3212/1 3218/1 +f 3218/1 3212/1 3213/1 +f 3219/1 3217/1 3216/1 +f 3220/1 3217/1 3219/1 +f 3220/1 3221/1 3217/1 +f 3222/1 3220/1 3219/1 +f 3222/1 3219/1 3223/1 +f 3223/1 3219/1 3216/1 +f 3224/1 3220/1 3225/1 +f 3224/1 3226/1 3220/1 +f 3226/1 3221/1 3220/1 +f 3225/1 3220/1 3222/1 +f 3226/1 3105/1 3221/1 +f 3227/1 3228/1 3226/1 +f 3227/1 3226/1 3224/1 +f 3228/1 3105/1 3226/1 +f 3229/1 3227/1 3224/1 +f 3230/1 3224/1 3225/1 +f 3229/1 3224/1 3230/1 +f 3230/1 3225/1 3231/1 +f 3231/1 3225/1 3222/1 +f 3232/1 3229/1 3230/1 +f 3232/1 3230/1 3233/1 +f 3233/1 3230/1 3231/1 +f 3234/1 3235/1 3229/1 +f 3235/1 3227/1 3229/1 +f 3234/1 3229/1 3232/1 +f 3236/1 3232/1 3237/1 +f 3237/1 3232/1 3233/1 +f 3236/1 3234/1 3232/1 +f 3237/1 3233/1 3238/1 +f 3238/1 3233/1 3239/1 +f 3233/1 3231/1 3239/1 +f 3240/1 3236/1 3237/1 +f 3241/1 3237/1 3238/1 +f 3240/1 3237/1 3241/1 +f 3240/1 3242/1 3236/1 +f 3242/1 3234/1 3236/1 +f 3243/1 3240/1 3244/1 +f 3244/1 3240/1 3241/1 +f 3245/1 3242/1 3240/1 +f 3243/1 3245/1 3240/1 +f 3242/1 3246/1 3247/1 +f 3248/1 3246/1 3242/1 +f 3242/1 3247/1 3234/1 +f 3245/1 3248/1 3242/1 +f 3246/1 3249/1 3247/1 +f 3248/1 3250/1 3246/1 +f 3247/1 3235/1 3234/1 +f 3249/1 3235/1 3247/1 +f 3249/1 3251/1 3235/1 +f 3235/1 3251/1 3227/1 +f 3251/1 3228/1 3227/1 +f 3249/1 3252/1 3251/1 +f 3252/1 3104/1 3251/1 +f 3251/1 3104/1 3228/1 +f 3104/1 3105/1 3228/1 +f 3253/1 3104/1 3252/1 +f 3253/1 3100/1 3104/1 +f 3254/1 3253/1 3252/1 +f 3254/1 3252/1 3249/1 +f 3098/1 3100/1 3253/1 +f 3255/1 3098/1 3253/1 +f 3255/1 3253/1 3254/1 +f 3096/1 3098/1 3255/1 +f 3096/1 3255/1 3256/1 +f 3256/1 3255/1 3254/1 +f 3256/1 3254/1 3250/1 +f 3250/1 3254/1 3249/1 +f 3250/1 3249/1 3246/1 +f 3082/1 3096/1 3256/1 +f 3257/1 3256/1 3250/1 +f 3257/1 3250/1 3248/1 +f 3245/1 3257/1 3248/1 +f 3258/1 3259/1 3257/1 +f 3258/1 3257/1 3245/1 +f 3259/1 3256/1 3257/1 +f 3259/1 3082/1 3256/1 +f 3081/1 3082/1 3259/1 +f 3258/1 3081/1 3259/1 +f 3077/1 3076/1 3258/1 +f 3077/1 3258/1 3260/1 +f 3260/1 3258/1 3245/1 +f 3076/1 3081/1 3258/1 +f 3260/1 3245/1 3243/1 +f 3261/1 3077/1 3260/1 +f 3261/1 3260/1 3262/1 +f 3262/1 3260/1 3243/1 +f 3263/1 3075/1 3077/1 +f 3263/1 3077/1 3261/1 +f 3264/1 3075/1 3263/1 +f 3264/1 3083/1 3075/1 +f 3086/1 3083/1 3264/1 +f 3262/1 3243/1 3265/1 +f 3265/1 3243/1 3244/1 +f 3265/1 3244/1 3266/1 +f 3266/1 3244/1 3267/1 +f 3244/1 3241/1 3267/1 +f 3267/1 3268/1 3269/1 +f 3267/1 3241/1 3268/1 +f 3267/1 3269/1 3270/1 +f 3241/1 3271/1 3268/1 +f 3241/1 3238/1 3271/1 +f 3268/1 3271/1 3272/1 +f 3268/1 3272/1 3273/1 +f 3268/1 3273/1 3269/1 +f 3271/1 3274/1 3272/1 +f 3271/1 3239/1 3274/1 +f 3238/1 3239/1 3271/1 +f 3272/1 3274/1 3275/1 +f 3272/1 3275/1 3273/1 +f 3273/1 3276/1 3277/1 +f 3273/1 3275/1 3276/1 +f 3269/1 3273/1 3277/1 +f 3274/1 3278/1 3275/1 +f 3275/1 3278/1 3279/1 +f 3275/1 3279/1 3276/1 +f 3239/1 3280/1 3274/1 +f 3274/1 3280/1 3278/1 +f 3239/1 3231/1 3280/1 +f 3280/1 3222/1 3223/1 +f 3231/1 3222/1 3280/1 +f 3280/1 3223/1 3278/1 +f 3278/1 3281/1 3279/1 +f 3278/1 3223/1 3281/1 +f 3223/1 3216/1 3281/1 +f 3279/1 3281/1 3282/1 +f 3281/1 3216/1 3282/1 +f 3282/1 3216/1 3218/1 +f 3283/1 3282/1 3284/1 +f 3279/1 3282/1 3283/1 +f 3282/1 3218/1 3284/1 +f 3284/1 3218/1 3213/1 +f 3283/1 3284/1 3285/1 +f 3285/1 3284/1 3286/1 +f 3284/1 3213/1 3286/1 +f 3287/1 3283/1 3285/1 +f 3279/1 3283/1 3287/1 +f 3285/1 3286/1 3288/1 +f 3287/1 3285/1 3289/1 +f 3289/1 3285/1 3288/1 +f 3288/1 3286/1 3290/1 +f 3286/1 3213/1 3290/1 +f 3290/1 3213/1 3214/1 +f 3288/1 3290/1 3291/1 +f 3290/1 3214/1 3292/1 +f 3291/1 3290/1 3292/1 +f 3289/1 3288/1 3293/1 +f 3293/1 3288/1 3294/1 +f 3288/1 3291/1 3294/1 +f 3291/1 3292/1 3295/1 +f 3294/1 3291/1 3296/1 +f 3296/1 3291/1 3295/1 +f 3292/1 3214/1 3215/1 +f 3292/1 3215/1 3297/1 +f 3295/1 3292/1 3297/1 +f 3295/1 3297/1 3298/1 +f 3296/1 3295/1 3299/1 +f 3299/1 3295/1 3298/1 +f 3300/1 3296/1 3301/1 +f 3300/1 3294/1 3296/1 +f 3301/1 3296/1 3299/1 +f 3300/1 3293/1 3294/1 +f 3302/1 3300/1 3301/1 +f 3303/1 3304/1 3300/1 +f 3303/1 3300/1 3302/1 +f 3304/1 3293/1 3300/1 +f 3302/1 3301/1 3305/1 +f 3301/1 3299/1 3305/1 +f 3305/1 3299/1 3306/1 +f 3299/1 3298/1 3306/1 +f 3307/1 3305/1 3308/1 +f 3305/1 3306/1 3308/1 +f 3302/1 3305/1 3307/1 +f 3308/1 3306/1 3309/1 +f 3306/1 3298/1 3309/1 +f 3308/1 3309/1 3310/1 +f 3307/1 3308/1 3310/1 +f 3307/1 3310/1 3311/1 +f 3312/1 3302/1 3307/1 +f 3310/1 3309/1 3313/1 +f 3311/1 3310/1 3314/1 +f 3310/1 3313/1 3314/1 +f 3314/1 3313/1 3315/1 +f 3314/1 3315/1 3316/1 +f 3316/1 3315/1 3317/1 +f 3298/1 3318/1 3309/1 +f 3309/1 3318/1 3319/1 +f 3309/1 3319/1 3313/1 +f 3298/1 3320/1 3318/1 +f 3318/1 3320/1 3321/1 +f 3318/1 3321/1 3319/1 +f 3298/1 3297/1 3320/1 +f 3297/1 3205/1 3320/1 +f 3320/1 3205/1 3321/1 +f 3321/1 3205/1 3207/1 +f 3319/1 3321/1 3322/1 +f 3321/1 3207/1 3322/1 +f 3319/1 3322/1 3323/1 +f 3323/1 3322/1 3324/1 +f 3322/1 3207/1 3208/1 +f 3322/1 3208/1 3324/1 +f 3323/1 3324/1 3325/1 +f 3325/1 3324/1 3326/1 +f 3324/1 3208/1 3326/1 +f 3208/1 3201/1 3327/1 +f 3326/1 3208/1 3327/1 +f 3326/1 3327/1 3328/1 +f 3327/1 3201/1 3329/1 +f 3328/1 3327/1 3329/1 +f 3329/1 3201/1 3200/1 +f 3215/1 3206/1 3205/1 +f 3297/1 3215/1 3205/1 +f 3313/1 3319/1 3323/1 +f 3313/1 3323/1 3315/1 +f 3315/1 3323/1 3325/1 +f 3315/1 3325/1 3317/1 +f 3330/1 3302/1 3312/1 +f 3330/1 3303/1 3302/1 +f 3270/1 3303/1 3330/1 +f 3270/1 3331/1 3303/1 +f 3331/1 3304/1 3303/1 +f 3270/1 3269/1 3331/1 +f 3331/1 3332/1 3304/1 +f 3269/1 3332/1 3331/1 +f 3304/1 3289/1 3293/1 +f 3332/1 3289/1 3304/1 +f 3332/1 3287/1 3289/1 +f 3269/1 3277/1 3332/1 +f 3277/1 3287/1 3332/1 +f 3277/1 3276/1 3287/1 +f 3276/1 3279/1 3287/1 +f 3076/1 3078/1 3081/1 +f 3168/1 3169/1 3185/1 +f 3333/1 3182/1 3334/1 +f 3334/1 3182/1 3175/1 +f 3333/1 3183/1 3182/1 +f 3334/1 3175/1 3176/1 +f 3334/1 3335/1 3336/1 +f 3176/1 3335/1 3334/1 +f 3334/1 3336/1 3333/1 +f 3173/1 3335/1 3176/1 +f 3174/1 3335/1 3173/1 +f 3335/1 3337/1 3338/1 +f 3174/1 3339/1 3335/1 +f 3335/1 3338/1 3336/1 +f 3339/1 3337/1 3335/1 +f 3174/1 3164/1 3340/1 +f 3340/1 3339/1 3174/1 +f 3341/1 3339/1 3342/1 +f 3342/1 3339/1 3340/1 +f 3341/1 3343/1 3339/1 +f 3340/1 3164/1 3342/1 +f 3342/1 3164/1 3163/1 +f 3342/1 3163/1 3341/1 +f 3341/1 3163/1 3344/1 +f 3344/1 3343/1 3341/1 +f 3344/1 3163/1 3157/1 +f 3344/1 3157/1 3345/1 +f 3345/1 3343/1 3344/1 +f 3345/1 3157/1 3346/1 +f 3346/1 3157/1 3156/1 +f 3346/1 3343/1 3345/1 +f 3346/1 3156/1 3347/1 +f 3346/1 3348/1 3343/1 +f 3347/1 3348/1 3346/1 +f 3347/1 3156/1 3155/1 +f 3347/1 3155/1 3349/1 +f 3155/1 3350/1 3349/1 +f 3152/1 3350/1 3155/1 +f 3347/1 3351/1 3348/1 +f 3349/1 3351/1 3347/1 +f 3349/1 3350/1 3352/1 +f 3352/1 3351/1 3349/1 +f 3353/1 3351/1 3352/1 +f 3351/1 3354/1 3348/1 +f 3352/1 3350/1 3355/1 +f 3352/1 3355/1 3353/1 +f 3353/1 3355/1 3356/1 +f 3353/1 3356/1 3357/1 +f 3358/1 3356/1 3355/1 +f 3150/1 3355/1 3350/1 +f 3150/1 3358/1 3355/1 +f 3359/1 3360/1 3358/1 +f 3359/1 3358/1 3149/1 +f 3149/1 3358/1 3150/1 +f 3151/1 3150/1 3152/1 +f 3150/1 3350/1 3152/1 +f 3202/1 3359/1 3149/1 +f 3202/1 3149/1 3148/1 +f 3202/1 3361/1 3359/1 +f 3348/1 3354/1 3362/1 +f 3348/1 3362/1 3343/1 +f 3343/1 3362/1 3363/1 +f 3343/1 3363/1 3339/1 +f 3339/1 3363/1 3337/1 +f 3333/1 3336/1 3364/1 +f 3336/1 3365/1 3364/1 +f 3336/1 3338/1 3365/1 +f 3366/1 3183/1 3333/1 +f 3333/1 3364/1 3366/1 +f 3367/1 3183/1 3366/1 +f 3366/1 3364/1 3367/1 +f 3367/1 3195/1 3183/1 +f 3367/1 3364/1 3368/1 +f 3368/1 3195/1 3367/1 +f 3369/1 3194/1 3195/1 +f 3369/1 3195/1 3368/1 +f 3368/1 3370/1 3369/1 +f 3368/1 3364/1 3370/1 +f 3369/1 3370/1 3371/1 +f 3371/1 3194/1 3369/1 +f 3372/1 3194/1 3371/1 +f 3371/1 3370/1 3372/1 +f 3372/1 3370/1 3373/1 +f 3370/1 3374/1 3373/1 +f 3373/1 3374/1 3375/1 +f 3364/1 3376/1 3370/1 +f 3370/1 3376/1 3374/1 +f 3364/1 3365/1 3376/1 +f 3377/1 3378/1 3379/1 +f 3380/1 3381/1 3377/1 +f 3381/1 3378/1 3377/1 +f 3381/1 3382/1 3378/1 +f 3380/1 3383/1 3381/1 +f 3383/1 3382/1 3381/1 +f 3384/1 3383/1 3380/1 +f 3385/1 3384/1 3380/1 +f 3383/1 3386/1 3382/1 +f 3387/1 3386/1 3383/1 +f 3384/1 3387/1 3383/1 +f 3384/1 3388/1 3387/1 +f 3389/1 3390/1 3384/1 +f 3390/1 3388/1 3384/1 +f 3389/1 3384/1 3385/1 +f 3387/1 3391/1 3386/1 +f 3388/1 3391/1 3387/1 +f 3388/1 3392/1 3391/1 +f 3393/1 3394/1 3388/1 +f 3388/1 3394/1 3392/1 +f 3390/1 3393/1 3388/1 +f 3395/1 3390/1 3389/1 +f 3396/1 3393/1 3390/1 +f 3395/1 3396/1 3390/1 +f 3393/1 3397/1 3394/1 +f 3398/1 3397/1 3393/1 +f 3396/1 3398/1 3393/1 +f 3397/1 3399/1 3394/1 +f 3394/1 3399/1 3392/1 +f 3399/1 3400/1 3392/1 +f 3392/1 3400/1 3391/1 +f 3401/1 3402/1 3399/1 +f 3399/1 3402/1 3403/1 +f 3399/1 3403/1 3400/1 +f 3397/1 3401/1 3399/1 +f 3398/1 3404/1 3397/1 +f 3404/1 3401/1 3397/1 +f 3405/1 3404/1 3398/1 +f 3396/1 3405/1 3398/1 +f 3406/1 3407/1 3404/1 +f 3405/1 3408/1 3404/1 +f 3408/1 3406/1 3404/1 +f 3404/1 3407/1 3401/1 +f 3401/1 3409/1 3402/1 +f 3407/1 3409/1 3401/1 +f 3402/1 3410/1 3403/1 +f 3409/1 3410/1 3402/1 +f 3411/1 3412/1 3409/1 +f 3409/1 3412/1 3410/1 +f 3407/1 3411/1 3409/1 +f 3406/1 3411/1 3407/1 +f 3406/1 3413/1 3411/1 +f 3413/1 3412/1 3411/1 +f 3412/1 2790/1 3410/1 +f 3412/1 3414/1 2790/1 +f 3415/1 3414/1 3412/1 +f 3413/1 3415/1 3412/1 +f 3416/1 3417/1 3413/1 +f 3416/1 3413/1 3406/1 +f 3417/1 3415/1 3413/1 +f 3418/1 3414/1 3415/1 +f 3417/1 3418/1 3415/1 +f 3418/1 3419/1 3414/1 +f 3420/1 3421/1 3418/1 +f 3420/1 3418/1 3422/1 +f 3421/1 3419/1 3418/1 +f 3422/1 3418/1 3417/1 +f 3423/1 3422/1 3417/1 +f 3423/1 3417/1 3416/1 +f 3424/1 3420/1 3422/1 +f 3424/1 3422/1 3423/1 +f 3425/1 3421/1 3420/1 +f 3426/1 3425/1 3420/1 +f 3426/1 3420/1 3424/1 +f 3427/1 3419/1 3421/1 +f 3425/1 3427/1 3421/1 +f 3427/1 3428/1 3419/1 +f 3429/1 3428/1 3427/1 +f 3430/1 3427/1 3425/1 +f 3431/1 3429/1 3427/1 +f 3431/1 3427/1 3430/1 +f 3432/1 3425/1 3426/1 +f 3432/1 3430/1 3425/1 +f 3433/1 3431/1 3430/1 +f 3433/1 3430/1 3432/1 +f 3434/1 3435/1 3431/1 +f 3434/1 3431/1 3433/1 +f 3435/1 3429/1 3431/1 +f 3434/1 3433/1 3436/1 +f 3436/1 3433/1 3432/1 +f 3436/1 3432/1 3437/1 +f 3437/1 3432/1 3426/1 +f 3438/1 3436/1 3439/1 +f 3438/1 3440/1 3436/1 +f 3440/1 3434/1 3436/1 +f 3436/1 3437/1 3441/1 +f 3439/1 3436/1 3441/1 +f 3441/1 3437/1 3426/1 +f 3442/1 3441/1 3443/1 +f 3439/1 3441/1 3442/1 +f 3441/1 3426/1 3443/1 +f 3444/1 3439/1 3445/1 +f 3445/1 3439/1 3442/1 +f 3444/1 3438/1 3439/1 +f 3445/1 3442/1 3446/1 +f 3442/1 3443/1 3446/1 +f 3446/1 3443/1 3447/1 +f 3443/1 3426/1 3424/1 +f 3443/1 3424/1 3447/1 +f 3446/1 3447/1 3448/1 +f 3449/1 3446/1 3448/1 +f 3445/1 3446/1 3449/1 +f 3450/1 3444/1 3445/1 +f 3450/1 3445/1 3451/1 +f 3451/1 3445/1 3449/1 +f 3449/1 3448/1 3452/1 +f 3449/1 3452/1 3453/1 +f 3451/1 3449/1 3454/1 +f 3454/1 3449/1 3453/1 +f 3448/1 3455/1 3452/1 +f 3448/1 3447/1 3455/1 +f 3447/1 3424/1 3455/1 +f 3424/1 3423/1 3455/1 +f 3455/1 3423/1 3416/1 +f 3455/1 3416/1 3456/1 +f 3452/1 3455/1 3456/1 +f 3453/1 3452/1 3457/1 +f 3452/1 3456/1 3457/1 +f 3456/1 3416/1 3406/1 +f 3456/1 3406/1 3408/1 +f 3457/1 3456/1 3408/1 +f 3453/1 3457/1 3405/1 +f 3457/1 3408/1 3405/1 +f 3453/1 3405/1 3396/1 +f 3395/1 3453/1 3396/1 +f 3454/1 3453/1 3395/1 +f 3458/1 3454/1 3395/1 +f 3459/1 3454/1 3458/1 +f 3460/1 3450/1 3459/1 +f 3459/1 3450/1 3451/1 +f 3459/1 3451/1 3454/1 +f 3461/1 3462/1 3460/1 +f 3460/1 3462/1 3450/1 +f 3461/1 3463/1 3462/1 +f 3464/1 3463/1 3461/1 +f 3465/1 3463/1 3464/1 +f 3466/1 3465/1 3464/1 +f 3467/1 3466/1 3464/1 +f 3466/1 3468/1 3465/1 +f 3469/1 3468/1 3466/1 +f 3470/1 3469/1 3466/1 +f 3470/1 3466/1 3467/1 +f 3471/1 3472/1 3469/1 +f 3473/1 3471/1 3469/1 +f 3474/1 3472/1 3471/1 +f 3475/1 3474/1 3476/1 +f 3476/1 3474/1 3477/1 +f 3476/1 3477/1 3478/1 +f 3479/1 3478/1 3477/1 +f 3479/1 3480/1 3478/1 +f 3481/1 3480/1 3479/1 +f 3482/1 3480/1 3483/1 +f 3483/1 3480/1 3481/1 +f 3482/1 3483/1 3484/1 +f 3482/1 3484/1 3485/1 +f 3485/1 3484/1 3486/1 +f 3486/1 3487/1 3485/1 +f 3487/1 3486/1 3488/1 +f 3487/1 3488/1 3489/1 +f 3489/1 3488/1 3490/1 +f 3489/1 3490/1 3491/1 +f 3491/1 3490/1 3492/1 +f 3492/1 3493/1 3491/1 +f 3494/1 3493/1 3492/1 +f 3494/1 3495/1 3493/1 +f 3496/1 3473/1 3470/1 +f 3496/1 3470/1 3497/1 +f 3473/1 3469/1 3470/1 +f 3498/1 3473/1 3496/1 +f 3496/1 3499/1 3498/1 +f 3500/1 3473/1 3498/1 +f 3500/1 3501/1 3473/1 +f 3501/1 3471/1 3473/1 +f 3498/1 3499/1 3502/1 +f 3498/1 3502/1 3500/1 +f 3503/1 3501/1 3500/1 +f 3500/1 3502/1 3503/1 +f 3504/1 3505/1 3501/1 +f 3504/1 3501/1 3503/1 +f 3506/1 3503/1 3502/1 +f 3504/1 3503/1 3506/1 +f 3507/1 3505/1 3504/1 +f 3508/1 3507/1 3504/1 +f 3508/1 3504/1 3506/1 +f 3508/1 3506/1 3509/1 +f 3509/1 3506/1 3510/1 +f 3508/1 3509/1 3511/1 +f 3508/1 3511/1 3507/1 +f 3509/1 3512/1 3511/1 +f 3509/1 3510/1 3513/1 +f 3509/1 3513/1 3514/1 +f 3510/1 3502/1 3513/1 +f 3506/1 3502/1 3510/1 +f 3515/1 3513/1 3516/1 +f 3514/1 3513/1 3517/1 +f 3513/1 3502/1 3516/1 +f 3518/1 3517/1 3519/1 +f 3511/1 3512/1 3520/1 +f 3520/1 3521/1 3522/1 +f 3520/1 3522/1 3523/1 +f 3512/1 3521/1 3520/1 +f 3524/1 3520/1 3523/1 +f 3511/1 3520/1 3524/1 +f 3512/1 3525/1 3521/1 +f 3518/1 3525/1 3512/1 +f 3509/1 3518/1 3512/1 +f 3526/1 3527/1 3525/1 +f 3525/1 3527/1 3528/1 +f 3525/1 3528/1 3521/1 +f 3528/1 3529/1 3530/1 +f 3528/1 3530/1 3531/1 +f 3521/1 3528/1 3531/1 +f 3521/1 3531/1 3522/1 +f 3531/1 3530/1 3532/1 +f 3531/1 3532/1 3533/1 +f 3522/1 3531/1 3533/1 +f 3530/1 3534/1 3535/1 +f 3530/1 3535/1 3532/1 +f 3529/1 3534/1 3530/1 +f 3529/1 3536/1 3534/1 +f 3537/1 3535/1 3534/1 +f 3535/1 3537/1 3538/1 +f 3535/1 3538/1 3539/1 +f 3532/1 3535/1 3540/1 +f 3539/1 3540/1 3535/1 +f 3537/1 3541/1 3538/1 +f 3538/1 3541/1 3542/1 +f 3543/1 3544/1 3541/1 +f 3544/1 3542/1 3541/1 +f 3544/1 3545/1 3542/1 +f 3546/1 3545/1 3544/1 +f 3547/1 3548/1 3545/1 +f 3545/1 3548/1 3549/1 +f 3545/1 3549/1 3542/1 +f 3546/1 3547/1 3545/1 +f 3548/1 3550/1 3551/1 +f 3548/1 3551/1 3549/1 +f 3549/1 3551/1 3552/1 +f 3549/1 3553/1 3554/1 +f 3542/1 3549/1 3554/1 +f 3555/1 3542/1 3554/1 +f 3538/1 3542/1 3555/1 +f 3554/1 3553/1 3556/1 +f 3557/1 3555/1 3554/1 +f 3557/1 3554/1 3556/1 +f 3549/1 3552/1 3553/1 +f 3556/1 3553/1 3552/1 +f 3558/1 3557/1 3556/1 +f 3559/1 3555/1 3557/1 +f 3559/1 3557/1 3558/1 +f 3539/1 3538/1 3555/1 +f 3539/1 3555/1 3559/1 +f 3558/1 3560/1 3559/1 +f 3559/1 3560/1 3561/1 +f 3559/1 3561/1 3539/1 +f 3558/1 3556/1 3483/1 +f 3562/1 3558/1 3483/1 +f 3562/1 3560/1 3558/1 +f 3563/1 3561/1 3560/1 +f 3563/1 3560/1 3481/1 +f 3562/1 3481/1 3560/1 +f 3540/1 3561/1 3563/1 +f 3539/1 3561/1 3540/1 +f 3564/1 3540/1 3563/1 +f 3564/1 3563/1 3481/1 +f 3483/1 3481/1 3562/1 +f 3483/1 3556/1 3484/1 +f 3556/1 3552/1 3484/1 +f 3565/1 3566/1 3484/1 +f 3565/1 3484/1 3552/1 +f 3551/1 3565/1 3552/1 +f 3567/1 3540/1 3564/1 +f 3533/1 3567/1 3564/1 +f 3479/1 3564/1 3481/1 +f 3568/1 3533/1 3564/1 +f 3568/1 3564/1 3569/1 +f 3569/1 3564/1 3479/1 +f 3567/1 3532/1 3540/1 +f 3533/1 3532/1 3567/1 +f 3522/1 3533/1 3568/1 +f 3570/1 3568/1 3569/1 +f 3523/1 3522/1 3568/1 +f 3523/1 3568/1 3570/1 +f 3479/1 3477/1 3569/1 +f 3570/1 3569/1 3477/1 +f 3570/1 3477/1 3571/1 +f 3523/1 3570/1 3571/1 +f 3524/1 3523/1 3572/1 +f 3572/1 3523/1 3571/1 +f 3572/1 3571/1 3573/1 +f 3477/1 3474/1 3571/1 +f 3571/1 3474/1 3573/1 +f 3572/1 3573/1 3574/1 +f 3574/1 3524/1 3572/1 +f 3511/1 3524/1 3507/1 +f 3507/1 3524/1 3574/1 +f 3574/1 3573/1 3507/1 +f 3507/1 3573/1 3505/1 +f 3573/1 3474/1 3505/1 +f 3505/1 3474/1 3471/1 +f 3505/1 3471/1 3501/1 +f 3550/1 3566/1 3551/1 +f 3575/1 3576/1 3550/1 +f 3550/1 3576/1 3566/1 +f 3484/1 3566/1 3486/1 +f 3518/1 3526/1 3525/1 +f 3462/1 3444/1 3450/1 +f 3462/1 3577/1 3444/1 +f 3463/1 3577/1 3462/1 +f 3577/1 3438/1 3444/1 +f 3463/1 3578/1 3577/1 +f 3577/1 3579/1 3438/1 +f 3578/1 3580/1 3577/1 +f 3577/1 3580/1 3579/1 +f 3581/1 3578/1 3463/1 +f 3465/1 3581/1 3463/1 +f 3582/1 3580/1 3578/1 +f 3581/1 3582/1 3578/1 +f 3580/1 3583/1 3584/1 +f 3580/1 3584/1 3579/1 +f 3582/1 3583/1 3580/1 +f 3579/1 3584/1 3440/1 +f 3579/1 3440/1 3438/1 +f 3583/1 3585/1 3584/1 +f 3584/1 3585/1 3434/1 +f 3584/1 3434/1 3440/1 +f 3583/1 3586/1 3585/1 +f 3582/1 3587/1 3583/1 +f 3583/1 3587/1 3586/1 +f 3586/1 3588/1 3585/1 +f 3585/1 3588/1 3435/1 +f 3585/1 3435/1 3434/1 +f 3587/1 3589/1 3586/1 +f 3586/1 3589/1 3588/1 +f 3590/1 3589/1 3587/1 +f 3590/1 3587/1 3591/1 +f 3591/1 3587/1 3582/1 +f 3592/1 3590/1 3593/1 +f 3593/1 3590/1 3591/1 +f 3594/1 3591/1 3582/1 +f 3594/1 3582/1 3581/1 +f 3581/1 3595/1 3594/1 +f 3594/1 3595/1 3596/1 +f 3594/1 3596/1 3593/1 +f 3593/1 3591/1 3594/1 +f 3593/1 3596/1 3597/1 +f 3593/1 3597/1 3592/1 +f 3592/1 3597/1 3598/1 +f 3596/1 3599/1 3597/1 +f 3596/1 3595/1 3599/1 +f 3595/1 3600/1 3599/1 +f 3599/1 3600/1 3601/1 +f 3469/1 3602/1 3600/1 +f 3469/1 3600/1 3468/1 +f 3468/1 3600/1 3595/1 +f 3468/1 3595/1 3465/1 +f 3465/1 3595/1 3581/1 +f 3603/1 3604/1 3588/1 +f 3588/1 3604/1 3429/1 +f 3589/1 3603/1 3588/1 +f 3588/1 3429/1 3435/1 +f 3605/1 3603/1 3590/1 +f 3590/1 3603/1 3589/1 +f 3605/1 3604/1 3603/1 +f 3604/1 3606/1 3429/1 +f 3429/1 3606/1 3428/1 +f 3592/1 3605/1 3590/1 +f 3410/1 2790/1 2788/1 +f 3410/1 2788/1 3607/1 +f 3403/1 3410/1 3607/1 +f 3608/1 2788/1 2785/1 +f 3607/1 2788/1 3608/1 +f 3403/1 3607/1 3609/1 +f 3609/1 3607/1 3608/1 +f 3400/1 3403/1 3609/1 +f 3610/1 3609/1 3611/1 +f 3609/1 3608/1 3611/1 +f 3400/1 3609/1 3610/1 +f 3611/1 3608/1 3612/1 +f 3608/1 2785/1 3612/1 +f 3612/1 2785/1 2787/1 +f 3612/1 2787/1 3613/1 +f 3614/1 3612/1 3613/1 +f 3615/1 3612/1 3614/1 +f 3611/1 3612/1 3615/1 +f 3610/1 3611/1 3616/1 +f 3616/1 3611/1 3615/1 +f 3617/1 3615/1 3614/1 +f 3616/1 3615/1 3617/1 +f 3617/1 3614/1 3618/1 +f 3618/1 3614/1 3619/1 +f 3614/1 3613/1 3619/1 +f 3619/1 3613/1 3620/1 +f 3613/1 2787/1 3620/1 +f 3620/1 2787/1 2791/1 +f 3378/1 3618/1 3379/1 +f 3378/1 3617/1 3618/1 +f 3616/1 3617/1 3378/1 +f 3382/1 3616/1 3378/1 +f 3386/1 3616/1 3382/1 +f 3386/1 3610/1 3616/1 +f 3391/1 3610/1 3386/1 +f 3391/1 3400/1 3610/1 +f 3621/1 3622/1 3623/1 +f 3621/1 3623/1 3624/1 +f 3625/1 3621/1 3626/1 +f 3625/1 3627/1 3621/1 +f 3626/1 3621/1 3624/1 +f 3624/1 3623/1 3628/1 +f 3624/1 3628/1 3629/1 +f 3630/1 3629/1 3628/1 +f 3624/1 3629/1 3631/1 +f 3631/1 3629/1 3632/1 +f 3633/1 3634/1 3629/1 +f 3629/1 3634/1 3632/1 +f 3630/1 3633/1 3629/1 +f 3635/1 3633/1 3630/1 +f 3633/1 3636/1 3634/1 +f 3637/1 3636/1 3633/1 +f 3635/1 3637/1 3633/1 +f 3636/1 3638/1 3634/1 +f 3634/1 3639/1 3632/1 +f 3634/1 3638/1 3639/1 +f 3631/1 3632/1 3640/1 +f 3640/1 3632/1 3639/1 +f 3640/1 3639/1 3641/1 +f 3638/1 3642/1 3639/1 +f 3639/1 3642/1 3641/1 +f 3643/1 3644/1 3640/1 +f 3640/1 3641/1 3645/1 +f 3644/1 3631/1 3640/1 +f 3643/1 3640/1 3645/1 +f 3645/1 3641/1 3646/1 +f 3646/1 3641/1 3642/1 +f 3647/1 3642/1 3648/1 +f 3646/1 3642/1 3647/1 +f 3642/1 3638/1 3648/1 +f 3649/1 3646/1 3650/1 +f 3649/1 3651/1 3646/1 +f 3646/1 3647/1 3650/1 +f 3651/1 3645/1 3646/1 +f 3651/1 3643/1 3645/1 +f 3652/1 3643/1 3651/1 +f 3653/1 3652/1 3651/1 +f 3653/1 3651/1 3649/1 +f 3654/1 3653/1 3649/1 +f 3649/1 3650/1 3655/1 +f 3654/1 3649/1 3655/1 +f 3656/1 3657/1 3653/1 +f 3657/1 3658/1 3653/1 +f 3653/1 3658/1 3652/1 +f 3656/1 3653/1 3654/1 +f 3652/1 3659/1 3643/1 +f 3658/1 3659/1 3652/1 +f 3658/1 3660/1 3659/1 +f 3661/1 3660/1 3658/1 +f 3657/1 3661/1 3658/1 +f 3660/1 3662/1 3659/1 +f 3659/1 3662/1 3643/1 +f 3662/1 3644/1 3643/1 +f 3663/1 3626/1 3662/1 +f 3662/1 3626/1 3664/1 +f 3660/1 3663/1 3662/1 +f 3662/1 3664/1 3644/1 +f 3661/1 3665/1 3660/1 +f 3665/1 3663/1 3660/1 +f 3666/1 3665/1 3661/1 +f 3657/1 3666/1 3661/1 +f 3667/1 3668/1 3665/1 +f 3665/1 3668/1 3669/1 +f 3665/1 3669/1 3663/1 +f 3666/1 3667/1 3665/1 +f 3670/1 3666/1 3657/1 +f 3671/1 3667/1 3666/1 +f 3670/1 3671/1 3666/1 +f 3672/1 3670/1 3657/1 +f 3672/1 3657/1 3656/1 +f 3673/1 3674/1 3670/1 +f 3674/1 3671/1 3670/1 +f 3673/1 3670/1 3672/1 +f 3675/1 3676/1 3671/1 +f 3671/1 3676/1 3667/1 +f 3674/1 3675/1 3671/1 +f 3673/1 3677/1 3674/1 +f 3674/1 3678/1 3675/1 +f 3677/1 3678/1 3674/1 +f 3679/1 3677/1 3673/1 +f 3679/1 3680/1 3677/1 +f 3677/1 3681/1 3678/1 +f 3678/1 3682/1 3675/1 +f 3675/1 3682/1 3676/1 +f 3683/1 3625/1 3663/1 +f 3663/1 3625/1 3626/1 +f 3669/1 3683/1 3663/1 +f 3684/1 3627/1 3625/1 +f 3683/1 3684/1 3625/1 +f 3685/1 3686/1 3684/1 +f 3684/1 3687/1 3627/1 +f 3686/1 3687/1 3684/1 +f 3685/1 3684/1 3683/1 +f 3688/1 3686/1 3685/1 +f 3688/1 3689/1 3686/1 +f 3690/1 3689/1 3688/1 +f 3668/1 3683/1 3669/1 +f 3685/1 3683/1 3668/1 +f 3667/1 3685/1 3668/1 +f 3676/1 3688/1 3685/1 +f 3676/1 3685/1 3667/1 +f 3682/1 3688/1 3676/1 +f 3682/1 3690/1 3688/1 +f 3626/1 3624/1 3664/1 +f 3664/1 3624/1 3631/1 +f 3644/1 3664/1 3631/1 +f 3655/1 3650/1 3691/1 +f 3692/1 3655/1 3691/1 +f 3693/1 3654/1 3655/1 +f 3693/1 3655/1 3692/1 +f 3691/1 3650/1 3694/1 +f 3650/1 3695/1 3694/1 +f 3650/1 3647/1 3695/1 +f 3691/1 3694/1 2541/1 +f 3696/1 3691/1 2542/1 +f 2541/1 3694/1 3697/1 +f 2541/1 3697/1 2538/1 +f 2542/1 3691/1 2541/1 +f 2538/1 3697/1 3698/1 +f 2538/1 3698/1 2534/1 +f 2534/1 3698/1 3699/1 +f 3697/1 3700/1 3698/1 +f 3698/1 3701/1 3699/1 +f 3698/1 3702/1 3701/1 +f 3698/1 3700/1 3702/1 +f 2534/1 3699/1 2535/1 +f 3699/1 3703/1 2535/1 +f 3699/1 3704/1 3703/1 +f 3699/1 3701/1 3704/1 +f 3701/1 3705/1 3706/1 +f 3702/1 3705/1 3701/1 +f 3701/1 3706/1 3704/1 +f 3702/1 3707/1 3705/1 +f 3700/1 3707/1 3702/1 +f 3700/1 3708/1 3707/1 +f 3708/1 3709/1 3707/1 +f 3707/1 3709/1 3705/1 +f 3710/1 3711/1 3708/1 +f 3710/1 3708/1 3700/1 +f 3711/1 3712/1 3708/1 +f 3708/1 3712/1 3709/1 +f 3713/1 3711/1 3710/1 +f 3697/1 3710/1 3700/1 +f 3697/1 3713/1 3710/1 +f 3713/1 3714/1 3711/1 +f 3714/1 3715/1 3711/1 +f 3711/1 3715/1 3712/1 +f 3716/1 3712/1 3717/1 +f 3717/1 3712/1 3715/1 +f 3716/1 3709/1 3712/1 +f 3717/1 3715/1 3718/1 +f 3718/1 3715/1 3719/1 +f 3714/1 3719/1 3715/1 +f 3720/1 3721/1 3714/1 +f 3720/1 3714/1 3713/1 +f 3721/1 3719/1 3714/1 +f 3718/1 3719/1 3722/1 +f 3721/1 3723/1 3719/1 +f 3722/1 3719/1 3723/1 +f 3724/1 3718/1 3722/1 +f 3724/1 3717/1 3718/1 +f 3725/1 3716/1 3717/1 +f 3725/1 3717/1 3724/1 +f 3724/1 3722/1 3637/1 +f 3724/1 3726/1 3725/1 +f 3637/1 3727/1 3724/1 +f 3724/1 3727/1 3726/1 +f 3725/1 3728/1 3729/1 +f 3725/1 3730/1 3716/1 +f 3725/1 3726/1 3728/1 +f 3729/1 3730/1 3725/1 +f 3729/1 3728/1 3731/1 +f 3729/1 3732/1 3733/1 +f 3729/1 3731/1 3734/1 +f 3734/1 3732/1 3729/1 +f 3729/1 3733/1 3730/1 +f 3730/1 3733/1 3709/1 +f 3730/1 3709/1 3716/1 +f 3732/1 3705/1 3733/1 +f 3733/1 3705/1 3709/1 +f 3732/1 3706/1 3705/1 +f 3735/1 3706/1 3732/1 +f 3734/1 3736/1 3732/1 +f 3736/1 3735/1 3732/1 +f 3706/1 3735/1 3737/1 +f 3736/1 3738/1 3735/1 +f 3737/1 3735/1 3738/1 +f 3739/1 3738/1 3736/1 +f 3734/1 3739/1 3736/1 +f 2629/1 2628/1 3738/1 +f 3740/1 3738/1 2628/1 +f 3739/1 2629/1 3738/1 +f 3741/1 3739/1 3734/1 +f 2630/1 2629/1 3739/1 +f 3741/1 2630/1 3739/1 +f 3741/1 3742/1 2623/1 +f 2623/1 2630/1 3741/1 +f 3734/1 3742/1 3741/1 +f 3734/1 3731/1 3742/1 +f 2623/1 3742/1 3743/1 +f 2623/1 3743/1 2620/1 +f 2623/1 2622/1 2630/1 +f 2620/1 3743/1 2569/1 +f 3737/1 3738/1 3740/1 +f 3727/1 3637/1 3635/1 +f 3637/1 3722/1 3636/1 +f 3722/1 3744/1 3636/1 +f 3722/1 3723/1 3744/1 +f 3636/1 3744/1 3638/1 +f 3723/1 3745/1 3744/1 +f 3744/1 3745/1 3638/1 +f 3721/1 3745/1 3723/1 +f 3648/1 3638/1 3745/1 +f 3648/1 3745/1 3746/1 +f 3746/1 3745/1 3721/1 +f 3695/1 3746/1 3721/1 +f 3695/1 3721/1 3720/1 +f 3695/1 3648/1 3746/1 +f 3647/1 3648/1 3695/1 +f 3694/1 3695/1 3720/1 +f 3694/1 3720/1 3713/1 +f 3694/1 3713/1 3697/1 +f 3704/1 3706/1 3737/1 +f 3704/1 3737/1 3703/1 +f 3703/1 3737/1 3740/1 +f 2535/1 3703/1 2544/1 +f 3703/1 3740/1 2544/1 +f 2544/1 3740/1 2631/1 +f 3740/1 2628/1 2631/1 +f 3747/1 3654/1 3693/1 +f 3748/1 3656/1 3747/1 +f 3747/1 3656/1 3654/1 +f 3749/1 3672/1 3748/1 +f 3748/1 3672/1 3656/1 +f 3750/1 3751/1 3749/1 +f 3752/1 3753/1 3750/1 +f 3752/1 3750/1 3754/1 +f 3753/1 3751/1 3750/1 +f 3753/1 3755/1 3751/1 +f 3756/1 3755/1 3753/1 +f 3755/1 3679/1 3751/1 +f 3756/1 3757/1 3755/1 +f 3755/1 3758/1 3679/1 +f 3751/1 3679/1 3673/1 +f 3751/1 3673/1 3749/1 +f 3749/1 3673/1 3672/1 +f 3757/1 3759/1 3758/1 +f 3757/1 3758/1 3755/1 +f 3760/1 3757/1 3756/1 +f 3760/1 3761/1 3757/1 +f 3762/1 3760/1 3763/1 +f 3762/1 3764/1 3760/1 +f 3763/1 3760/1 3756/1 +f 3764/1 3761/1 3760/1 +f 3764/1 3765/1 3761/1 +f 3766/1 3765/1 3764/1 +f 3767/1 3764/1 3762/1 +f 3768/1 3766/1 3764/1 +f 3768/1 3764/1 3769/1 +f 3769/1 3764/1 3767/1 +f 3762/1 3770/1 3767/1 +f 3770/1 3771/1 3767/1 +f 3767/1 3771/1 3769/1 +f 3769/1 3771/1 3772/1 +f 3769/1 3772/1 3768/1 +f 3768/1 3772/1 3773/1 +f 3768/1 3773/1 3774/1 +f 3774/1 3766/1 3768/1 +f 3775/1 3776/1 3772/1 +f 3776/1 3773/1 3772/1 +f 3775/1 3772/1 3771/1 +f 3775/1 3771/1 3777/1 +f 3777/1 3771/1 3770/1 +f 3778/1 3775/1 3777/1 +f 3779/1 3775/1 3780/1 +f 3780/1 3775/1 3778/1 +f 3779/1 3776/1 3775/1 +f 3778/1 3777/1 3781/1 +f 3781/1 3777/1 3782/1 +f 3777/1 3770/1 3782/1 +f 3780/1 3778/1 3781/1 +f 3783/1 3779/1 3780/1 +f 3784/1 3780/1 3785/1 +f 3780/1 3781/1 3785/1 +f 3783/1 3780/1 3784/1 +f 3781/1 3782/1 3786/1 +f 3785/1 3781/1 3786/1 +f 3784/1 3785/1 3787/1 +f 3785/1 3786/1 3788/1 +f 3787/1 3785/1 3788/1 +f 3786/1 3782/1 3789/1 +f 3788/1 3786/1 3789/1 +f 3788/1 3790/1 3791/1 +f 3788/1 3789/1 3790/1 +f 3789/1 3792/1 3790/1 +f 3782/1 3793/1 3789/1 +f 3789/1 3793/1 3792/1 +f 3792/1 3793/1 3794/1 +f 3792/1 3794/1 3795/1 +f 3792/1 3795/1 3790/1 +f 3782/1 3796/1 3793/1 +f 3782/1 3770/1 3796/1 +f 3763/1 3796/1 3762/1 +f 3762/1 3796/1 3770/1 +f 3763/1 3793/1 3796/1 +f 3797/1 3793/1 3763/1 +f 3763/1 3756/1 3797/1 +f 3798/1 3794/1 3793/1 +f 3798/1 3793/1 3797/1 +f 3797/1 3756/1 3798/1 +f 3799/1 3756/1 3753/1 +f 3798/1 3756/1 3799/1 +f 3799/1 3794/1 3798/1 +f 3799/1 3795/1 3794/1 +f 3800/1 3795/1 3799/1 +f 3799/1 3753/1 3800/1 +f 3801/1 3753/1 3752/1 +f 3800/1 3753/1 3801/1 +f 3801/1 3795/1 3800/1 +f 3801/1 3802/1 3795/1 +f 3752/1 3802/1 3801/1 +f 3803/1 3790/1 3804/1 +f 3791/1 3790/1 3803/1 +f 3790/1 3795/1 3804/1 +f 3787/1 3788/1 3805/1 +f 3806/1 3779/1 3783/1 +f 3807/1 3808/1 3806/1 +f 3806/1 3808/1 3809/1 +f 3806/1 3809/1 3779/1 +f 3809/1 3776/1 3779/1 +f 3809/1 3810/1 3776/1 +f 3808/1 3810/1 3809/1 +f 3808/1 3811/1 3810/1 +f 3812/1 3813/1 3808/1 +f 3808/1 3813/1 3811/1 +f 3807/1 3812/1 3808/1 +f 3811/1 3814/1 3810/1 +f 3810/1 3814/1 3815/1 +f 3810/1 3815/1 3776/1 +f 3815/1 3773/1 3776/1 +f 3814/1 3816/1 3815/1 +f 3815/1 3816/1 3773/1 +f 3811/1 3817/1 3814/1 +f 3814/1 3817/1 3816/1 +f 3813/1 3818/1 3811/1 +f 3818/1 3817/1 3811/1 +f 3812/1 3819/1 3813/1 +f 3819/1 3818/1 3813/1 +f 3819/1 3820/1 3818/1 +f 3820/1 3821/1 3818/1 +f 3818/1 3821/1 3822/1 +f 3818/1 3822/1 3817/1 +f 3823/1 3820/1 3819/1 +f 3824/1 3819/1 3812/1 +f 3824/1 3823/1 3819/1 +f 3823/1 3825/1 3820/1 +f 3820/1 3826/1 3821/1 +f 3824/1 3825/1 3823/1 +f 3827/1 3824/1 3812/1 +f 3828/1 3193/1 3824/1 +f 3828/1 3824/1 3827/1 +f 3193/1 3825/1 3824/1 +f 3827/1 3812/1 3807/1 +f 3829/1 3828/1 3827/1 +f 3829/1 3827/1 3830/1 +f 3831/1 3828/1 3829/1 +f 3831/1 3189/1 3828/1 +f 3832/1 3189/1 3831/1 +f 3832/1 3186/1 3189/1 +f 3833/1 3186/1 3832/1 +f 3833/1 3185/1 3186/1 +f 3196/1 3185/1 3833/1 +f 3830/1 3827/1 3807/1 +f 3830/1 3807/1 3834/1 +f 3834/1 3807/1 3806/1 +f 3834/1 3806/1 3835/1 +f 3835/1 3806/1 3783/1 +f 3825/1 3190/1 3836/1 +f 3193/1 3190/1 3825/1 +f 3189/1 3188/1 3193/1 +f 3189/1 3193/1 3828/1 +f 3837/1 3822/1 3821/1 +f 3837/1 3821/1 3838/1 +f 3821/1 3826/1 3838/1 +f 3839/1 3822/1 3837/1 +f 3839/1 3817/1 3822/1 +f 3839/1 3840/1 3841/1 +f 3842/1 3817/1 3839/1 +f 3839/1 3841/1 3842/1 +f 3837/1 3840/1 3839/1 +f 3843/1 3816/1 3817/1 +f 3843/1 3817/1 3842/1 +f 3842/1 3841/1 3843/1 +f 3844/1 3816/1 3843/1 +f 3843/1 3841/1 3844/1 +f 3845/1 3773/1 3816/1 +f 3845/1 3816/1 3844/1 +f 3844/1 3841/1 3766/1 +f 3844/1 3766/1 3845/1 +f 3774/1 3773/1 3845/1 +f 3845/1 3766/1 3774/1 +f 3841/1 3846/1 3847/1 +f 3841/1 3847/1 3766/1 +f 3840/1 3846/1 3841/1 +f 3840/1 3375/1 3846/1 +f 3373/1 3375/1 3840/1 +f 3837/1 3373/1 3840/1 +f 3838/1 3373/1 3837/1 +f 3372/1 3373/1 3848/1 +f 3848/1 3373/1 3838/1 +f 3838/1 3826/1 3848/1 +f 3848/1 3826/1 3836/1 +f 3848/1 3836/1 3372/1 +f 3372/1 3836/1 3194/1 +f 3190/1 3194/1 3836/1 +f 3825/1 3836/1 3826/1 +f 3825/1 3826/1 3820/1 +f 3766/1 3847/1 3765/1 +f 3765/1 3849/1 3761/1 +f 3761/1 3849/1 3759/1 +f 3761/1 3759/1 3757/1 +f 3850/1 3830/1 3851/1 +f 3852/1 3829/1 3850/1 +f 3850/1 3829/1 3830/1 +f 3853/1 3852/1 3850/1 +f 3854/1 3850/1 3851/1 +f 3853/1 3850/1 3854/1 +f 3851/1 3830/1 3834/1 +f 3851/1 3834/1 3855/1 +f 3855/1 3834/1 3856/1 +f 3856/1 3834/1 3835/1 +f 3857/1 3855/1 3856/1 +f 3858/1 3851/1 3855/1 +f 3858/1 3855/1 3857/1 +f 3856/1 3835/1 3859/1 +f 3857/1 3856/1 3860/1 +f 3861/1 3856/1 3859/1 +f 3860/1 3856/1 3861/1 +f 3862/1 3835/1 3863/1 +f 3859/1 3835/1 3862/1 +f 3864/1 3859/1 3862/1 +f 3861/1 3859/1 3864/1 +f 3865/1 3861/1 3864/1 +f 3866/1 3860/1 3861/1 +f 3866/1 3861/1 3865/1 +f 3867/1 3860/1 3866/1 +f 3867/1 3857/1 3860/1 +f 3866/1 3865/1 3868/1 +f 3869/1 3867/1 3866/1 +f 3869/1 3866/1 3870/1 +f 3870/1 3866/1 3868/1 +f 3865/1 3864/1 3871/1 +f 3868/1 3865/1 3871/1 +f 3871/1 3864/1 3872/1 +f 3864/1 3862/1 3872/1 +f 3871/1 3872/1 3873/1 +f 3868/1 3871/1 3874/1 +f 3874/1 3871/1 3873/1 +f 3873/1 3872/1 3875/1 +f 3872/1 3862/1 3875/1 +f 3874/1 3873/1 3876/1 +f 3876/1 3873/1 3877/1 +f 3873/1 3878/1 3877/1 +f 3873/1 3875/1 3878/1 +f 3879/1 3874/1 3876/1 +f 3880/1 3874/1 3879/1 +f 3880/1 3868/1 3874/1 +f 3881/1 3876/1 3877/1 +f 3879/1 3876/1 3881/1 +f 3877/1 3878/1 3882/1 +f 3881/1 3877/1 3882/1 +f 3878/1 3883/1 3884/1 +f 3882/1 3878/1 3884/1 +f 3878/1 3875/1 3883/1 +f 3885/1 3882/1 3886/1 +f 3881/1 3882/1 3885/1 +f 3882/1 3884/1 3886/1 +f 3887/1 3879/1 3881/1 +f 3888/1 3881/1 3885/1 +f 3887/1 3881/1 3888/1 +f 3885/1 3886/1 3889/1 +f 3888/1 3885/1 3889/1 +f 3889/1 3886/1 3890/1 +f 3886/1 3884/1 3891/1 +f 3886/1 3891/1 3890/1 +f 3884/1 3883/1 3892/1 +f 3884/1 3892/1 3891/1 +f 3891/1 3893/1 3894/1 +f 3890/1 3891/1 3895/1 +f 3891/1 3894/1 3895/1 +f 3891/1 3892/1 3893/1 +f 3896/1 3890/1 3895/1 +f 3889/1 3890/1 3896/1 +f 3897/1 3889/1 3896/1 +f 3888/1 3889/1 3897/1 +f 3897/1 3896/1 3898/1 +f 3896/1 3895/1 3898/1 +f 3895/1 3894/1 3899/1 +f 3895/1 3899/1 3900/1 +f 3898/1 3895/1 3900/1 +f 3894/1 3901/1 3899/1 +f 3894/1 3893/1 3901/1 +f 3899/1 3901/1 3902/1 +f 3900/1 3899/1 3903/1 +f 3899/1 3902/1 3903/1 +f 3900/1 3903/1 3904/1 +f 3904/1 3903/1 3905/1 +f 3904/1 3905/1 3906/1 +f 3905/1 3690/1 3682/1 +f 3906/1 3905/1 3682/1 +f 3903/1 3907/1 3905/1 +f 3903/1 3902/1 3907/1 +f 3902/1 3908/1 3907/1 +f 3905/1 3907/1 3909/1 +f 3907/1 3908/1 3909/1 +f 3905/1 3909/1 3690/1 +f 3690/1 3909/1 3689/1 +f 3909/1 3908/1 3910/1 +f 3909/1 3910/1 3689/1 +f 3689/1 3910/1 3687/1 +f 3689/1 3687/1 3686/1 +f 3908/1 3911/1 3910/1 +f 3910/1 3911/1 3687/1 +f 3687/1 3622/1 3627/1 +f 3687/1 3911/1 3622/1 +f 3908/1 3912/1 3911/1 +f 3911/1 3913/1 3622/1 +f 3914/1 3912/1 3908/1 +f 3915/1 3912/1 3914/1 +f 3915/1 3916/1 3912/1 +f 3902/1 3914/1 3908/1 +f 3901/1 3915/1 3914/1 +f 3901/1 3914/1 3902/1 +f 3892/1 3917/1 3915/1 +f 3893/1 3915/1 3901/1 +f 3917/1 3916/1 3915/1 +f 3892/1 3915/1 3893/1 +f 3917/1 3863/1 3916/1 +f 3916/1 3787/1 3912/1 +f 3883/1 3917/1 3892/1 +f 3918/1 3863/1 3917/1 +f 3883/1 3918/1 3917/1 +f 3862/1 3863/1 3918/1 +f 3875/1 3862/1 3918/1 +f 3875/1 3918/1 3883/1 +f 3912/1 3787/1 3805/1 +f 3912/1 3805/1 3911/1 +f 3916/1 3784/1 3787/1 +f 3863/1 3784/1 3916/1 +f 3863/1 3783/1 3784/1 +f 3835/1 3783/1 3863/1 +f 3911/1 3805/1 3913/1 +f 3622/1 3913/1 3919/1 +f 3622/1 3919/1 3623/1 +f 3623/1 3919/1 3920/1 +f 3919/1 3921/1 3920/1 +f 3623/1 3920/1 3628/1 +f 3922/1 3628/1 3920/1 +f 3922/1 3630/1 3628/1 +f 3923/1 3635/1 3630/1 +f 3923/1 3630/1 3924/1 +f 3924/1 3630/1 3922/1 +f 3923/1 3727/1 3635/1 +f 3923/1 3925/1 3727/1 +f 3924/1 3922/1 3920/1 +f 3921/1 3926/1 3920/1 +f 3927/1 3928/1 3921/1 +f 3921/1 3928/1 3926/1 +f 3913/1 3921/1 3919/1 +f 3913/1 3927/1 3921/1 +f 3926/1 3929/1 3920/1 +f 3930/1 3924/1 3920/1 +f 3930/1 3920/1 3929/1 +f 3926/1 3931/1 3929/1 +f 3929/1 3931/1 3932/1 +f 3929/1 3932/1 3930/1 +f 3933/1 3924/1 3930/1 +f 3930/1 3932/1 3934/1 +f 3930/1 3934/1 3933/1 +f 3933/1 3923/1 3924/1 +f 3935/1 3923/1 3933/1 +f 3933/1 3934/1 3936/1 +f 3933/1 3936/1 3935/1 +f 3937/1 3936/1 3934/1 +f 3938/1 3934/1 3932/1 +f 3937/1 3934/1 3938/1 +f 3939/1 3940/1 3936/1 +f 3941/1 3936/1 3937/1 +f 3935/1 3936/1 3940/1 +f 3939/1 3936/1 3941/1 +f 3942/1 3923/1 3935/1 +f 3935/1 3940/1 3942/1 +f 3942/1 3925/1 3923/1 +f 3943/1 3942/1 3940/1 +f 3944/1 3925/1 3942/1 +f 3943/1 3945/1 3942/1 +f 3944/1 3942/1 3945/1 +f 3943/1 3940/1 3939/1 +f 3946/1 3943/1 3947/1 +f 3947/1 3943/1 3948/1 +f 3948/1 3943/1 3939/1 +f 3946/1 3945/1 3943/1 +f 3946/1 3949/1 3945/1 +f 3950/1 3946/1 3951/1 +f 3951/1 3946/1 3947/1 +f 3950/1 3949/1 3946/1 +f 3951/1 3952/1 3950/1 +f 3950/1 3952/1 3953/1 +f 3950/1 3953/1 3954/1 +f 3954/1 3949/1 3950/1 +f 3947/1 3952/1 3951/1 +f 3696/1 2542/1 3952/1 +f 3952/1 2542/1 3953/1 +f 3947/1 3696/1 3952/1 +f 3953/1 2542/1 2540/1 +f 3953/1 2540/1 3955/1 +f 3954/1 3953/1 3956/1 +f 3956/1 3953/1 3955/1 +f 3956/1 3957/1 3954/1 +f 3954/1 3957/1 3949/1 +f 3956/1 3955/1 3958/1 +f 3958/1 3957/1 3956/1 +f 3955/1 2540/1 2537/1 +f 3955/1 2537/1 3959/1 +f 3958/1 3955/1 3960/1 +f 3960/1 3955/1 3959/1 +f 3960/1 3961/1 3958/1 +f 3958/1 3961/1 3957/1 +f 3957/1 3962/1 3963/1 +f 3957/1 3963/1 3949/1 +f 3961/1 3962/1 3957/1 +f 3961/1 3964/1 3962/1 +f 3965/1 3963/1 3962/1 +f 3965/1 3962/1 3966/1 +f 3966/1 3962/1 3964/1 +f 3967/1 3949/1 3963/1 +f 3967/1 3963/1 3965/1 +f 3967/1 3945/1 3949/1 +f 3944/1 3945/1 3967/1 +f 3967/1 3968/1 3944/1 +f 3944/1 3968/1 3925/1 +f 3965/1 3731/1 3967/1 +f 3967/1 3731/1 3968/1 +f 3727/1 3925/1 3968/1 +f 3727/1 3968/1 3969/1 +f 3969/1 3968/1 3731/1 +f 3731/1 3970/1 3971/1 +f 3966/1 3970/1 3965/1 +f 3971/1 3970/1 3972/1 +f 3966/1 3972/1 3970/1 +f 3971/1 3972/1 3973/1 +f 3974/1 3972/1 3966/1 +f 3974/1 3973/1 3972/1 +f 3966/1 3964/1 3974/1 +f 3975/1 3973/1 3974/1 +f 3974/1 3964/1 3976/1 +f 3974/1 3976/1 3975/1 +f 3977/1 3975/1 3976/1 +f 3978/1 3964/1 3961/1 +f 3978/1 3961/1 3960/1 +f 3960/1 3959/1 3978/1 +f 3978/1 3959/1 3979/1 +f 3979/1 3980/1 3978/1 +f 3980/1 3964/1 3978/1 +f 3959/1 2537/1 2536/1 +f 3959/1 2536/1 3981/1 +f 3979/1 3959/1 3982/1 +f 3982/1 3959/1 3981/1 +f 3982/1 3980/1 3979/1 +f 3982/1 3977/1 3980/1 +f 3981/1 3983/1 3982/1 +f 3981/1 2536/1 2533/1 +f 3981/1 2533/1 3984/1 +f 3984/1 2533/1 2530/1 +f 3692/1 3691/1 3696/1 +f 3985/1 3696/1 3947/1 +f 3985/1 3986/1 3696/1 +f 3986/1 3692/1 3696/1 +f 3986/1 3693/1 3692/1 +f 3987/1 3986/1 3985/1 +f 3987/1 3988/1 3986/1 +f 3988/1 3693/1 3986/1 +f 3947/1 3948/1 3985/1 +f 3985/1 3948/1 3941/1 +f 3985/1 3941/1 3987/1 +f 3987/1 3941/1 3937/1 +f 3987/1 3937/1 3989/1 +f 3989/1 3988/1 3987/1 +f 3948/1 3939/1 3941/1 +f 3990/1 3988/1 3989/1 +f 3988/1 3747/1 3693/1 +f 3990/1 3991/1 3988/1 +f 3991/1 3747/1 3988/1 +f 3937/1 3938/1 3989/1 +f 3989/1 3938/1 3990/1 +f 3990/1 3938/1 3992/1 +f 3990/1 3992/1 3993/1 +f 3993/1 3991/1 3990/1 +f 3994/1 3995/1 3991/1 +f 3991/1 3748/1 3747/1 +f 3995/1 3748/1 3991/1 +f 3994/1 3991/1 3993/1 +f 3993/1 3992/1 3996/1 +f 3993/1 3996/1 3994/1 +f 3992/1 3932/1 3996/1 +f 3938/1 3932/1 3992/1 +f 3994/1 3996/1 3997/1 +f 3997/1 3996/1 3998/1 +f 3996/1 3932/1 3931/1 +f 3996/1 3931/1 3998/1 +f 3997/1 3995/1 3994/1 +f 3997/1 3998/1 3999/1 +f 3997/1 3750/1 3995/1 +f 3999/1 3750/1 3997/1 +f 3999/1 4000/1 3754/1 +f 3754/1 3750/1 3999/1 +f 3750/1 3749/1 3995/1 +f 3995/1 3749/1 3748/1 +f 3754/1 4000/1 3802/1 +f 3754/1 3802/1 3752/1 +f 4000/1 3998/1 4001/1 +f 4001/1 3998/1 3931/1 +f 3998/1 4000/1 3999/1 +f 3928/1 3802/1 4000/1 +f 3928/1 4000/1 4001/1 +f 4001/1 3931/1 3926/1 +f 3928/1 4001/1 3926/1 +f 4002/1 3804/1 3928/1 +f 3927/1 4002/1 3928/1 +f 3804/1 3802/1 3928/1 +f 3804/1 3795/1 3802/1 +f 3803/1 3804/1 4002/1 +f 3791/1 3803/1 4002/1 +f 3791/1 4002/1 3927/1 +f 3913/1 3791/1 3927/1 +f 3805/1 3788/1 3791/1 +f 3805/1 3791/1 3913/1 +f 3627/1 3622/1 3621/1 +f 4003/1 3900/1 3904/1 +f 3898/1 3900/1 4003/1 +f 4003/1 3904/1 3681/1 +f 3677/1 4003/1 3681/1 +f 3680/1 4003/1 3677/1 +f 3680/1 3898/1 4003/1 +f 3681/1 3904/1 3906/1 +f 3681/1 3906/1 3678/1 +f 3678/1 3906/1 3682/1 +f 3897/1 3898/1 3680/1 +f 3679/1 3897/1 3680/1 +f 3758/1 3897/1 3679/1 +f 3758/1 3888/1 3897/1 +f 3759/1 3888/1 3758/1 +f 3759/1 3887/1 3888/1 +f 3849/1 3887/1 3759/1 +f 4004/1 3879/1 3887/1 +f 3849/1 4004/1 3887/1 +f 3765/1 4005/1 3849/1 +f 4005/1 4006/1 3849/1 +f 3849/1 4006/1 4004/1 +f 4006/1 3880/1 4004/1 +f 4004/1 3880/1 3879/1 +f 4006/1 4007/1 3880/1 +f 4008/1 4009/1 4006/1 +f 4006/1 4009/1 4007/1 +f 4005/1 4008/1 4006/1 +f 4010/1 4011/1 4005/1 +f 3847/1 4010/1 4005/1 +f 4005/1 4011/1 4008/1 +f 4008/1 4012/1 4009/1 +f 4011/1 4013/1 4008/1 +f 4008/1 4013/1 4012/1 +f 4013/1 4014/1 4012/1 +f 4012/1 3869/1 4009/1 +f 4012/1 4014/1 3869/1 +f 4015/1 4016/1 4013/1 +f 4013/1 4016/1 4014/1 +f 4011/1 4015/1 4013/1 +f 4016/1 4017/1 4014/1 +f 4014/1 4017/1 3867/1 +f 4014/1 3867/1 3869/1 +f 4009/1 3869/1 3870/1 +f 4009/1 3870/1 4007/1 +f 4007/1 3870/1 3868/1 +f 4007/1 3868/1 3880/1 +f 4017/1 3857/1 3867/1 +f 4017/1 3858/1 3857/1 +f 4018/1 4019/1 3858/1 +f 4018/1 3858/1 4017/1 +f 4019/1 3851/1 3858/1 +f 4020/1 4019/1 4018/1 +f 4020/1 4018/1 4016/1 +f 4016/1 4018/1 4017/1 +f 4020/1 3854/1 4019/1 +f 3854/1 3851/1 4019/1 +f 4021/1 3854/1 4020/1 +f 4022/1 4021/1 4020/1 +f 4022/1 4020/1 4023/1 +f 4023/1 4020/1 4016/1 +f 4015/1 4023/1 4016/1 +f 4024/1 4023/1 4015/1 +f 4024/1 4022/1 4023/1 +f 4025/1 4026/1 4022/1 +f 4026/1 4021/1 4022/1 +f 4025/1 4022/1 4024/1 +f 4027/1 4025/1 4024/1 +f 4011/1 4024/1 4015/1 +f 4027/1 4024/1 4011/1 +f 4027/1 4028/1 4025/1 +f 4028/1 4026/1 4025/1 +f 4026/1 4029/1 4021/1 +f 4030/1 4029/1 4026/1 +f 4028/1 4030/1 4026/1 +f 4031/1 4032/1 4028/1 +f 4033/1 4031/1 4028/1 +f 4033/1 4028/1 4027/1 +f 4028/1 4032/1 4030/1 +f 4034/1 4035/1 4031/1 +f 4033/1 4034/1 4031/1 +f 4031/1 4035/1 4032/1 +f 4036/1 4033/1 4037/1 +f 4036/1 4038/1 4033/1 +f 4038/1 4034/1 4033/1 +f 4037/1 4033/1 4027/1 +f 4038/1 4039/1 4034/1 +f 4034/1 4040/1 4035/1 +f 4039/1 4040/1 4034/1 +f 4041/1 4042/1 4038/1 +f 4041/1 4038/1 4036/1 +f 4038/1 4043/1 4039/1 +f 4043/1 4044/1 4039/1 +f 3374/1 4041/1 4036/1 +f 3374/1 4036/1 3375/1 +f 3375/1 4036/1 4037/1 +f 3376/1 4045/1 4041/1 +f 3376/1 4041/1 3374/1 +f 3365/1 4045/1 3376/1 +f 3365/1 4046/1 4045/1 +f 3338/1 4046/1 3365/1 +f 4037/1 4027/1 4010/1 +f 4010/1 4027/1 4011/1 +f 3846/1 4037/1 4010/1 +f 3375/1 4037/1 3846/1 +f 3846/1 4010/1 3847/1 +f 4047/1 4029/1 4030/1 +f 4032/1 4047/1 4030/1 +f 4029/1 3853/1 4021/1 +f 4047/1 4048/1 4029/1 +f 4029/1 4048/1 3853/1 +f 4048/1 3852/1 3853/1 +f 4021/1 3853/1 3854/1 +f 4048/1 4049/1 3852/1 +f 4047/1 4050/1 4048/1 +f 4050/1 4049/1 4048/1 +f 4051/1 4050/1 4047/1 +f 4035/1 4051/1 4047/1 +f 4035/1 4047/1 4032/1 +f 4052/1 4049/1 4050/1 +f 4051/1 4052/1 4050/1 +f 4049/1 3829/1 3852/1 +f 4053/1 4052/1 4051/1 +f 4040/1 4051/1 4035/1 +f 4040/1 4053/1 4051/1 +f 3847/1 4005/1 3765/1 +f 2746/1 4054/1 4055/1 +f 2746/1 4055/1 2744/1 +f 4056/1 4057/1 2746/1 +f 2746/1 4057/1 4054/1 +f 2744/1 4058/1 2739/1 +f 2744/1 4055/1 4058/1 +f 4058/1 4059/1 4060/1 +f 4055/1 4059/1 4058/1 +f 4058/1 4061/1 4062/1 +f 2739/1 4058/1 4062/1 +f 4058/1 4060/1 4061/1 +f 2739/1 4062/1 2735/1 +f 4062/1 4061/1 4063/1 +f 4062/1 4064/1 2885/1 +f 4062/1 4063/1 4064/1 +f 2735/1 4062/1 2885/1 +f 4061/1 4065/1 4063/1 +f 4063/1 4065/1 4066/1 +f 4063/1 4066/1 4064/1 +f 2885/1 4064/1 2886/1 +f 4064/1 4067/1 2886/1 +f 4064/1 4066/1 4067/1 +f 4065/1 4068/1 4066/1 +f 4066/1 4068/1 4069/1 +f 4066/1 4069/1 4067/1 +f 4070/1 4071/1 4065/1 +f 4061/1 4070/1 4065/1 +f 4061/1 4072/1 4070/1 +f 4072/1 4073/1 4070/1 +f 4073/1 4071/1 4070/1 +f 4065/1 4071/1 4068/1 +f 4071/1 4074/1 4075/1 +f 4073/1 4074/1 4071/1 +f 4071/1 4075/1 4068/1 +f 4068/1 4076/1 4069/1 +f 4068/1 4075/1 4076/1 +f 4075/1 4077/1 4076/1 +f 4074/1 4078/1 4075/1 +f 4075/1 4078/1 4077/1 +f 4073/1 4079/1 4074/1 +f 4079/1 4080/1 4074/1 +f 4074/1 4080/1 4078/1 +f 4078/1 4081/1 4077/1 +f 4080/1 4081/1 4078/1 +f 4077/1 4081/1 4082/1 +f 4076/1 4077/1 4083/1 +f 4077/1 4082/1 4083/1 +f 4080/1 4084/1 4081/1 +f 4084/1 2836/1 4081/1 +f 4081/1 2836/1 2834/1 +f 4081/1 2834/1 4082/1 +f 4083/1 4082/1 4085/1 +f 4082/1 2834/1 2835/1 +f 4082/1 2835/1 4085/1 +f 2865/1 4085/1 2868/1 +f 4085/1 2835/1 4086/1 +f 4085/1 4086/1 2868/1 +f 4083/1 4085/1 4087/1 +f 4087/1 4085/1 2865/1 +f 2865/1 2868/1 2863/1 +f 4088/1 2865/1 2864/1 +f 4088/1 4087/1 2865/1 +f 2863/1 2868/1 2860/1 +f 2868/1 4089/1 2869/1 +f 2868/1 4086/1 4089/1 +f 2869/1 4089/1 4090/1 +f 2869/1 4090/1 2871/1 +f 2871/1 4090/1 4091/1 +f 2871/1 4091/1 2876/1 +f 2876/1 4091/1 4092/1 +f 2876/1 4092/1 2673/1 +f 2673/1 4092/1 3137/1 +f 2673/1 3137/1 2676/1 +f 4091/1 4093/1 4094/1 +f 4091/1 4094/1 4092/1 +f 4090/1 4093/1 4091/1 +f 4093/1 4095/1 4096/1 +f 4097/1 4095/1 4093/1 +f 4093/1 4096/1 4094/1 +f 4090/1 4097/1 4093/1 +f 4089/1 4097/1 4090/1 +f 4097/1 4098/1 4099/1 +f 4089/1 4100/1 4097/1 +f 4097/1 4099/1 4095/1 +f 4100/1 4098/1 4097/1 +f 4086/1 4100/1 4089/1 +f 4086/1 4101/1 4100/1 +f 4101/1 4102/1 4100/1 +f 4100/1 4102/1 4098/1 +f 2835/1 2833/1 4086/1 +f 4086/1 2833/1 4101/1 +f 2833/1 4103/1 4101/1 +f 4101/1 4103/1 4102/1 +f 4104/1 4105/1 4102/1 +f 4102/1 4105/1 4106/1 +f 4103/1 4104/1 4102/1 +f 4098/1 4102/1 4106/1 +f 2833/1 2829/1 4103/1 +f 2829/1 4107/1 4103/1 +f 4103/1 4107/1 4104/1 +f 2835/1 2830/1 2833/1 +f 4104/1 2842/1 4105/1 +f 4107/1 2842/1 4104/1 +f 2829/1 2826/1 4107/1 +f 4107/1 2826/1 2842/1 +f 4098/1 4106/1 4108/1 +f 4109/1 4108/1 4106/1 +f 4110/1 4106/1 4105/1 +f 4098/1 4108/1 4111/1 +f 4099/1 4098/1 4111/1 +f 4111/1 4108/1 4112/1 +f 4112/1 4108/1 4113/1 +f 4113/1 4108/1 4109/1 +f 4099/1 4111/1 4095/1 +f 4095/1 4111/1 4114/1 +f 4111/1 4112/1 4114/1 +f 4114/1 4112/1 4115/1 +f 4116/1 4115/1 4112/1 +f 4116/1 4112/1 4113/1 +f 4113/1 2728/1 4116/1 +f 4109/1 2728/1 4113/1 +f 4110/1 2728/1 4109/1 +f 4109/1 4106/1 4110/1 +f 2728/1 2727/1 4117/1 +f 4116/1 2728/1 4117/1 +f 4110/1 2731/1 2728/1 +f 4116/1 4117/1 4118/1 +f 4118/1 4115/1 4116/1 +f 4117/1 2725/1 4119/1 +f 4118/1 4117/1 4119/1 +f 4117/1 2727/1 2725/1 +f 4118/1 4119/1 4120/1 +f 4120/1 4121/1 4118/1 +f 4118/1 4121/1 4115/1 +f 4120/1 4119/1 4122/1 +f 4122/1 4121/1 4120/1 +f 4122/1 4119/1 4123/1 +f 4123/1 4124/1 4122/1 +f 4122/1 4124/1 4121/1 +f 4123/1 4119/1 4125/1 +f 4123/1 4125/1 4126/1 +f 4126/1 4124/1 4123/1 +f 4127/1 4121/1 4124/1 +f 4127/1 4124/1 4128/1 +f 4128/1 4124/1 4129/1 +f 4126/1 4129/1 4124/1 +f 4126/1 4125/1 4130/1 +f 4130/1 4129/1 4126/1 +f 4131/1 4125/1 4132/1 +f 4130/1 4125/1 4131/1 +f 4131/1 4129/1 4130/1 +f 4133/1 4129/1 4134/1 +f 4128/1 4129/1 4133/1 +f 4131/1 4134/1 4129/1 +f 4135/1 4127/1 4128/1 +f 4135/1 4128/1 4133/1 +f 4136/1 4133/1 4137/1 +f 4138/1 4133/1 4134/1 +f 4137/1 4133/1 4138/1 +f 4136/1 4135/1 4133/1 +f 4138/1 4134/1 4139/1 +f 4140/1 4139/1 4134/1 +f 4140/1 4134/1 4131/1 +f 4131/1 4132/1 4140/1 +f 4140/1 4132/1 4141/1 +f 4141/1 4139/1 4140/1 +f 4138/1 4139/1 4142/1 +f 4142/1 4139/1 4143/1 +f 4143/1 4139/1 4141/1 +f 4144/1 4138/1 4142/1 +f 4145/1 4138/1 4144/1 +f 4137/1 4138/1 4145/1 +f 4144/1 4142/1 4146/1 +f 4145/1 4144/1 4146/1 +f 4146/1 4142/1 4147/1 +f 4142/1 4143/1 4147/1 +f 4147/1 4143/1 4148/1 +f 4149/1 4148/1 4143/1 +f 4149/1 4143/1 4141/1 +f 4141/1 4132/1 4149/1 +f 4149/1 4150/1 4151/1 +f 4149/1 4132/1 4150/1 +f 4151/1 4148/1 4149/1 +f 4132/1 2692/1 4150/1 +f 4125/1 2691/1 4132/1 +f 4132/1 2691/1 2692/1 +f 4151/1 4150/1 4152/1 +f 4150/1 2692/1 4153/1 +f 4150/1 4153/1 4152/1 +f 4152/1 4153/1 4154/1 +f 4152/1 4154/1 2891/1 +f 2891/1 4154/1 2914/1 +f 4155/1 4152/1 2891/1 +f 4156/1 4152/1 4155/1 +f 4157/1 4152/1 4156/1 +f 4151/1 4152/1 4157/1 +f 4155/1 2891/1 3139/1 +f 3139/1 3132/1 4155/1 +f 4155/1 3132/1 4156/1 +f 4156/1 3132/1 4158/1 +f 4156/1 4158/1 4157/1 +f 4157/1 4158/1 4151/1 +f 4151/1 4158/1 4148/1 +f 4125/1 2724/1 2691/1 +f 4119/1 2724/1 4125/1 +f 4119/1 2725/1 2724/1 +f 4147/1 4148/1 4158/1 +f 4147/1 4158/1 4159/1 +f 4146/1 4147/1 4160/1 +f 4160/1 4147/1 4159/1 +f 3131/1 4158/1 3132/1 +f 4159/1 4158/1 3131/1 +f 4159/1 3131/1 3129/1 +f 3130/1 4160/1 4159/1 +f 3130/1 4159/1 3129/1 +f 4161/1 4146/1 4160/1 +f 4161/1 4160/1 3130/1 +f 4145/1 4146/1 4161/1 +f 3136/1 4161/1 3135/1 +f 3135/1 4161/1 3130/1 +f 3136/1 4145/1 4161/1 +f 3135/1 3130/1 3126/1 +f 3130/1 3129/1 3127/1 +f 3137/1 4145/1 3136/1 +f 3137/1 4137/1 4145/1 +f 4092/1 4137/1 3137/1 +f 4092/1 4136/1 4137/1 +f 4092/1 4094/1 4136/1 +f 4094/1 4135/1 4136/1 +f 4094/1 4096/1 4162/1 +f 4094/1 4162/1 4135/1 +f 4162/1 4127/1 4135/1 +f 4114/1 4121/1 4162/1 +f 4162/1 4121/1 4127/1 +f 4096/1 4114/1 4162/1 +f 4095/1 4114/1 4096/1 +f 4114/1 4115/1 4121/1 +f 4163/1 2731/1 4110/1 +f 2843/1 2731/1 4163/1 +f 4110/1 4105/1 4163/1 +f 4163/1 4105/1 2843/1 +f 2843/1 4105/1 2842/1 +f 4164/1 4083/1 4087/1 +f 4164/1 4087/1 4088/1 +f 2880/1 4164/1 4088/1 +f 4165/1 4083/1 4164/1 +f 4166/1 4164/1 2880/1 +f 4166/1 4165/1 4164/1 +f 4076/1 4083/1 4165/1 +f 4069/1 4165/1 4166/1 +f 4069/1 4076/1 4165/1 +f 2880/1 4088/1 2866/1 +f 2866/1 4088/1 2864/1 +f 4084/1 2800/1 2836/1 +f 4167/1 4168/1 4084/1 +f 4167/1 4084/1 4169/1 +f 4168/1 2800/1 4084/1 +f 4169/1 4084/1 4080/1 +f 4170/1 4168/1 4167/1 +f 4171/1 4168/1 4170/1 +f 4171/1 2794/1 4168/1 +f 4172/1 4170/1 4173/1 +f 4173/1 4170/1 4167/1 +f 4172/1 4171/1 4170/1 +f 4174/1 4171/1 4175/1 +f 4175/1 4171/1 4172/1 +f 4176/1 2794/1 4171/1 +f 4174/1 4176/1 4171/1 +f 4176/1 2792/1 2794/1 +f 4177/1 4178/1 4176/1 +f 4178/1 2792/1 4176/1 +f 4177/1 4176/1 4174/1 +f 4179/1 4174/1 4175/1 +f 4180/1 4177/1 4174/1 +f 4180/1 4174/1 4179/1 +f 4181/1 4175/1 4172/1 +f 4179/1 4175/1 4181/1 +f 4179/1 4181/1 4182/1 +f 4183/1 4180/1 4179/1 +f 4183/1 4179/1 4184/1 +f 4184/1 4179/1 4182/1 +f 4185/1 4180/1 4183/1 +f 4186/1 4177/1 4180/1 +f 4185/1 4186/1 4180/1 +f 4187/1 4183/1 4184/1 +f 4188/1 4183/1 4187/1 +f 4188/1 4185/1 4183/1 +f 4189/1 4184/1 4182/1 +f 4187/1 4184/1 4189/1 +f 4190/1 4188/1 4187/1 +f 4057/1 4187/1 4189/1 +f 4190/1 4187/1 4057/1 +f 4190/1 4191/1 4188/1 +f 4191/1 4185/1 4188/1 +f 4191/1 4192/1 4185/1 +f 4192/1 4186/1 4185/1 +f 4193/1 4194/1 4191/1 +f 4195/1 4191/1 4190/1 +f 4191/1 4194/1 4192/1 +f 4195/1 4193/1 4191/1 +f 4194/1 4196/1 4192/1 +f 4196/1 4186/1 4192/1 +f 4193/1 4197/1 4194/1 +f 4197/1 4196/1 4194/1 +f 4198/1 4193/1 4195/1 +f 4198/1 4199/1 4193/1 +f 4199/1 4197/1 4193/1 +f 4200/1 4198/1 4195/1 +f 4201/1 4195/1 4190/1 +f 4200/1 4195/1 4201/1 +f 4200/1 4202/1 4198/1 +f 4202/1 4199/1 4198/1 +f 4199/1 4203/1 4197/1 +f 4204/1 4203/1 4199/1 +f 4202/1 4204/1 4199/1 +f 4205/1 4206/1 4202/1 +f 4206/1 4207/1 4202/1 +f 4205/1 4202/1 4200/1 +f 4202/1 4207/1 4204/1 +f 4207/1 4208/1 4204/1 +f 4204/1 4208/1 4203/1 +f 4206/1 4209/1 4207/1 +f 4207/1 4210/1 4208/1 +f 4209/1 4210/1 4207/1 +f 3380/1 3377/1 4206/1 +f 4206/1 3377/1 4209/1 +f 4205/1 3380/1 4206/1 +f 3377/1 3379/1 4209/1 +f 4209/1 3379/1 4210/1 +f 3385/1 3380/1 4205/1 +f 4211/1 3389/1 3385/1 +f 4211/1 3385/1 4212/1 +f 4212/1 3385/1 4205/1 +f 4213/1 3389/1 4211/1 +f 4213/1 3395/1 3389/1 +f 3458/1 3395/1 4213/1 +f 4212/1 4205/1 2755/1 +f 2755/1 4205/1 4200/1 +f 2755/1 4200/1 2751/1 +f 2751/1 4200/1 4201/1 +f 2751/1 4201/1 2749/1 +f 4201/1 4190/1 4056/1 +f 2749/1 4201/1 4056/1 +f 4056/1 4190/1 4057/1 +f 4057/1 4189/1 4214/1 +f 4057/1 4214/1 4054/1 +f 4189/1 4182/1 4214/1 +f 4214/1 4182/1 4215/1 +f 4214/1 4215/1 4216/1 +f 4054/1 4214/1 4216/1 +f 4054/1 4216/1 4217/1 +f 4054/1 4217/1 4055/1 +f 4216/1 4218/1 4217/1 +f 4216/1 4215/1 4218/1 +f 4182/1 4219/1 4215/1 +f 4215/1 4219/1 4220/1 +f 4215/1 4220/1 4218/1 +f 4182/1 4181/1 4219/1 +f 4219/1 4172/1 4173/1 +f 4219/1 4173/1 4220/1 +f 4181/1 4172/1 4219/1 +f 4220/1 4221/1 4222/1 +f 4220/1 4173/1 4221/1 +f 4218/1 4220/1 4222/1 +f 4217/1 4218/1 4223/1 +f 4218/1 4222/1 4223/1 +f 4222/1 4221/1 4224/1 +f 4222/1 4224/1 4225/1 +f 4223/1 4222/1 4226/1 +f 4222/1 4225/1 4226/1 +f 4173/1 4167/1 4221/1 +f 4221/1 4167/1 4224/1 +f 4224/1 4169/1 4227/1 +f 4225/1 4224/1 4227/1 +f 4224/1 4167/1 4169/1 +f 4226/1 4225/1 4228/1 +f 4225/1 4227/1 4228/1 +f 4227/1 4169/1 4080/1 +f 4228/1 4227/1 4079/1 +f 4227/1 4080/1 4079/1 +f 4226/1 4228/1 4229/1 +f 4229/1 4228/1 4073/1 +f 4228/1 4079/1 4073/1 +f 4059/1 4226/1 4229/1 +f 4060/1 4229/1 4072/1 +f 4229/1 4073/1 4072/1 +f 4059/1 4229/1 4060/1 +f 4055/1 4230/1 4059/1 +f 4230/1 4226/1 4059/1 +f 4055/1 4217/1 4230/1 +f 4217/1 4223/1 4230/1 +f 4230/1 4223/1 4226/1 +f 4060/1 4072/1 4061/1 +f 4203/1 4231/1 4197/1 +f 4197/1 4231/1 4196/1 +f 4203/1 4232/1 4231/1 +f 4208/1 4233/1 4203/1 +f 4233/1 4232/1 4203/1 +f 4232/1 4234/1 4231/1 +f 4231/1 4234/1 4235/1 +f 4231/1 4235/1 4196/1 +f 4196/1 4235/1 4236/1 +f 4196/1 4236/1 4186/1 +f 4235/1 4237/1 4236/1 +f 4234/1 4237/1 4235/1 +f 4238/1 4239/1 4234/1 +f 4232/1 4238/1 4234/1 +f 4234/1 4239/1 4237/1 +f 4233/1 4238/1 4232/1 +f 4240/1 3620/1 4238/1 +f 4233/1 4240/1 4238/1 +f 4238/1 3620/1 4239/1 +f 4239/1 2791/1 4237/1 +f 3620/1 2791/1 4239/1 +f 3619/1 3620/1 4240/1 +f 4241/1 3619/1 4240/1 +f 4241/1 4240/1 4233/1 +f 4210/1 4241/1 4233/1 +f 4210/1 4233/1 4208/1 +f 3379/1 3618/1 4241/1 +f 3379/1 4241/1 4210/1 +f 3618/1 3619/1 4241/1 +f 4237/1 2791/1 2792/1 +f 4236/1 4237/1 4178/1 +f 4237/1 2792/1 4178/1 +f 4186/1 4236/1 4177/1 +f 4236/1 4178/1 4177/1 +f 4067/1 4069/1 4242/1 +f 4069/1 4166/1 4242/1 +f 4242/1 4166/1 2880/1 +f 4242/1 2880/1 2879/1 +f 2882/1 4242/1 2879/1 +f 2886/1 4067/1 4242/1 +f 2886/1 4242/1 2882/1 +f 2604/1 2607/1 4243/1 +f 2605/1 2604/1 4243/1 +f 4243/1 2607/1 4244/1 +f 2607/1 2613/1 2615/1 +f 2607/1 2615/1 4244/1 +f 4243/1 4244/1 4245/1 +f 2605/1 4243/1 4246/1 +f 4246/1 4243/1 4245/1 +f 4245/1 4244/1 4247/1 +f 4245/1 4247/1 4248/1 +f 4245/1 4248/1 4249/1 +f 4246/1 4245/1 4250/1 +f 4250/1 4245/1 4249/1 +f 4247/1 4251/1 4252/1 +f 4244/1 4251/1 4247/1 +f 4247/1 4252/1 4248/1 +f 4244/1 4253/1 4251/1 +f 4251/1 4254/1 4252/1 +f 4248/1 4252/1 4255/1 +f 4252/1 4254/1 4255/1 +f 4255/1 4254/1 4256/1 +f 4251/1 2614/1 4254/1 +f 4248/1 4255/1 4257/1 +f 4255/1 4256/1 4257/1 +f 4256/1 4258/1 4259/1 +f 4260/1 4256/1 4259/1 +f 4256/1 4260/1 4257/1 +f 4261/1 4257/1 4260/1 +f 4248/1 4257/1 4261/1 +f 4260/1 4259/1 4262/1 +f 4261/1 4260/1 4262/1 +f 4259/1 4258/1 4263/1 +f 4259/1 4263/1 4262/1 +f 4249/1 4261/1 4262/1 +f 4262/1 4263/1 4264/1 +f 4262/1 4264/1 4265/1 +f 4249/1 4262/1 4265/1 +f 4249/1 4248/1 4261/1 +f 4250/1 4249/1 4266/1 +f 4249/1 4265/1 4266/1 +f 4265/1 4264/1 4267/1 +f 4267/1 4268/1 4265/1 +f 4265/1 4268/1 4266/1 +f 4263/1 4269/1 4264/1 +f 4269/1 4267/1 4264/1 +f 4269/1 4270/1 4267/1 +f 4263/1 4270/1 4269/1 +f 4270/1 4263/1 4258/1 +f 4253/1 2614/1 4251/1 +f 4244/1 2615/1 4253/1 +f 2615/1 2614/1 4253/1 +f 4271/1 4272/1 4273/1 +f 4274/1 4271/1 4275/1 +f 4271/1 4273/1 4275/1 +f 4276/1 4272/1 4271/1 +f 4277/1 4276/1 4271/1 +f 4277/1 4271/1 4274/1 +f 4276/1 4278/1 4272/1 +f 4279/1 4278/1 4276/1 +f 4277/1 4279/1 4276/1 +f 2698/1 4279/1 4277/1 +f 4280/1 2698/1 4277/1 +f 4280/1 4277/1 4281/1 +f 4281/1 4277/1 4274/1 +f 4279/1 2704/1 4278/1 +f 2698/1 2703/1 4279/1 +f 2703/1 2704/1 4279/1 +f 2698/1 2697/1 2703/1 +f 4280/1 2694/1 2698/1 +f 2693/1 2694/1 4280/1 +f 4153/1 2690/1 2693/1 +f 4153/1 2693/1 4154/1 +f 4154/1 2693/1 4280/1 +f 2692/1 2690/1 4153/1 +f 2691/1 2689/1 2692/1 +f 4154/1 4280/1 2914/1 +f 2914/1 4280/1 4281/1 +f 2914/1 4281/1 2912/1 +f 4281/1 4282/1 4283/1 +f 2912/1 4281/1 4283/1 +f 4281/1 4274/1 4282/1 +f 2912/1 4283/1 2913/1 +f 2913/1 4283/1 4284/1 +f 4283/1 4285/1 4284/1 +f 4283/1 4282/1 4285/1 +f 4274/1 4275/1 4282/1 +f 4282/1 4275/1 4286/1 +f 4282/1 4286/1 4285/1 +f 4285/1 4287/1 4288/1 +f 4285/1 4286/1 4287/1 +f 4284/1 4285/1 4289/1 +f 4285/1 4288/1 4289/1 +f 4286/1 4290/1 4291/1 +f 4275/1 4290/1 4286/1 +f 4286/1 4291/1 4292/1 +f 4286/1 4292/1 4287/1 +f 4275/1 4273/1 4290/1 +f 4273/1 4293/1 4290/1 +f 4290/1 4293/1 4291/1 +f 4293/1 4294/1 4291/1 +f 4291/1 4294/1 4292/1 +f 4292/1 4294/1 4295/1 +f 4287/1 4292/1 4296/1 +f 4292/1 4295/1 4296/1 +f 4293/1 4297/1 4294/1 +f 4294/1 4298/1 4295/1 +f 4294/1 4297/1 4298/1 +f 4293/1 4299/1 4297/1 +f 4300/1 4299/1 4293/1 +f 4273/1 4300/1 4293/1 +f 4272/1 4300/1 4273/1 +f 4301/1 4302/1 4300/1 +f 4300/1 4302/1 4299/1 +f 4272/1 4301/1 4300/1 +f 4299/1 4303/1 4297/1 +f 4302/1 4303/1 4299/1 +f 4304/1 2722/1 4302/1 +f 4302/1 2722/1 4303/1 +f 4301/1 4304/1 4302/1 +f 4305/1 4304/1 4301/1 +f 4305/1 4301/1 4272/1 +f 4278/1 4305/1 4272/1 +f 2704/1 4305/1 4278/1 +f 2704/1 2716/1 4305/1 +f 4305/1 2719/1 4304/1 +f 2716/1 2719/1 4305/1 +f 2719/1 2718/1 4304/1 +f 4304/1 2718/1 2722/1 +f 2722/1 2721/1 4303/1 +f 4303/1 2721/1 3133/1 +f 4306/1 3133/1 3134/1 +f 4307/1 3133/1 4306/1 +f 4303/1 3133/1 4307/1 +f 4298/1 4306/1 4308/1 +f 4308/1 4306/1 4309/1 +f 4298/1 4307/1 4306/1 +f 4306/1 3134/1 4309/1 +f 4309/1 3134/1 3138/1 +f 4308/1 4309/1 4310/1 +f 4310/1 4309/1 4311/1 +f 4311/1 4309/1 4312/1 +f 4309/1 3138/1 4312/1 +f 4295/1 4298/1 4308/1 +f 4313/1 4308/1 4310/1 +f 4295/1 4308/1 4313/1 +f 4297/1 4307/1 4298/1 +f 4297/1 4303/1 4307/1 +f 4313/1 4310/1 4314/1 +f 4296/1 4295/1 4313/1 +f 4296/1 4313/1 4315/1 +f 4315/1 4313/1 4316/1 +f 4313/1 4314/1 4316/1 +f 4314/1 4310/1 4311/1 +f 4316/1 4314/1 4317/1 +f 4314/1 4311/1 4317/1 +f 4318/1 4316/1 4319/1 +f 4320/1 4315/1 4316/1 +f 4320/1 4316/1 4318/1 +f 4316/1 4317/1 4319/1 +f 4288/1 4296/1 4315/1 +f 4288/1 4315/1 4320/1 +f 4287/1 4296/1 4288/1 +f 4289/1 4288/1 4320/1 +f 4289/1 4320/1 4318/1 +f 4318/1 4319/1 4321/1 +f 4289/1 4318/1 4322/1 +f 4322/1 4318/1 4321/1 +f 2917/1 4289/1 4322/1 +f 4284/1 4289/1 2917/1 +f 2917/1 4322/1 4323/1 +f 4322/1 4324/1 4323/1 +f 4322/1 4321/1 4324/1 +f 4321/1 4319/1 4325/1 +f 4321/1 4325/1 4324/1 +f 4323/1 4324/1 4326/1 +f 4324/1 4325/1 4327/1 +f 4324/1 4327/1 4326/1 +f 4319/1 4328/1 4325/1 +f 4325/1 4328/1 4329/1 +f 4325/1 4329/1 4327/1 +f 4327/1 4329/1 4330/1 +f 4326/1 4327/1 4330/1 +f 4326/1 4330/1 4331/1 +f 4323/1 4326/1 4331/1 +f 4331/1 4330/1 4332/1 +f 4330/1 4333/1 4332/1 +f 4330/1 4334/1 4333/1 +f 4329/1 4334/1 4330/1 +f 4328/1 4335/1 4329/1 +f 4329/1 4335/1 4336/1 +f 4329/1 4336/1 4334/1 +f 4334/1 4336/1 4337/1 +f 4334/1 4337/1 4333/1 +f 4332/1 4333/1 4338/1 +f 4333/1 4337/1 4339/1 +f 4333/1 4339/1 4338/1 +f 4337/1 4340/1 4339/1 +f 4336/1 4341/1 4337/1 +f 4337/1 4341/1 4340/1 +f 4335/1 4342/1 4336/1 +f 4336/1 4342/1 4341/1 +f 4328/1 4343/1 4335/1 +f 4343/1 4342/1 4335/1 +f 4342/1 4344/1 4341/1 +f 4342/1 3138/1 4344/1 +f 4343/1 4312/1 4342/1 +f 4312/1 3138/1 4342/1 +f 4341/1 4344/1 4340/1 +f 4344/1 2956/1 4345/1 +f 4340/1 4344/1 4345/1 +f 4344/1 2953/1 2956/1 +f 4345/1 2956/1 2958/1 +f 4340/1 4345/1 4346/1 +f 4347/1 4345/1 4348/1 +f 4346/1 4345/1 4347/1 +f 4345/1 2958/1 4348/1 +f 4348/1 2958/1 2963/1 +f 4348/1 2963/1 4349/1 +f 4347/1 4348/1 4350/1 +f 4350/1 4348/1 4349/1 +f 4351/1 4346/1 4347/1 +f 4351/1 4347/1 4352/1 +f 4352/1 4347/1 4350/1 +f 4353/1 4340/1 4346/1 +f 4353/1 4346/1 4351/1 +f 4339/1 4340/1 4353/1 +f 4338/1 4353/1 4354/1 +f 4354/1 4353/1 4351/1 +f 4338/1 4339/1 4353/1 +f 4355/1 4351/1 4352/1 +f 4354/1 4351/1 4355/1 +f 4352/1 4350/1 4356/1 +f 4355/1 4352/1 4357/1 +f 4357/1 4352/1 4356/1 +f 4358/1 4355/1 4359/1 +f 4359/1 4355/1 4357/1 +f 4358/1 4354/1 4355/1 +f 4360/1 4354/1 4358/1 +f 4338/1 4354/1 4360/1 +f 4332/1 4338/1 4361/1 +f 4361/1 4338/1 4360/1 +f 4362/1 4361/1 4360/1 +f 4362/1 4360/1 4358/1 +f 4363/1 4358/1 4359/1 +f 4362/1 4358/1 4363/1 +f 4364/1 4359/1 4365/1 +f 4359/1 4357/1 4365/1 +f 4363/1 4359/1 4364/1 +f 4366/1 4363/1 4364/1 +f 4366/1 4362/1 4363/1 +f 4367/1 4368/1 4362/1 +f 4368/1 4361/1 4362/1 +f 4367/1 4362/1 4366/1 +f 4368/1 4332/1 4361/1 +f 4331/1 4332/1 4368/1 +f 4369/1 4368/1 4367/1 +f 4369/1 4331/1 4368/1 +f 2922/1 4367/1 4366/1 +f 2921/1 4369/1 4367/1 +f 2921/1 4367/1 2922/1 +f 2921/1 4323/1 4369/1 +f 4323/1 4331/1 4369/1 +f 2917/1 4323/1 2921/1 +f 2915/1 4284/1 2917/1 +f 2913/1 4284/1 2915/1 +f 2922/1 4366/1 2925/1 +f 2925/1 4366/1 2994/1 +f 4366/1 4364/1 2994/1 +f 2994/1 4370/1 2996/1 +f 2994/1 4364/1 4370/1 +f 4364/1 4365/1 4370/1 +f 4370/1 4371/1 2996/1 +f 4370/1 4365/1 4371/1 +f 2996/1 4371/1 4372/1 +f 2996/1 4372/1 2995/1 +f 4372/1 4373/1 3001/1 +f 4372/1 3001/1 2998/1 +f 2995/1 4372/1 2998/1 +f 4371/1 4373/1 4372/1 +f 4371/1 4374/1 4373/1 +f 4357/1 4374/1 4371/1 +f 4365/1 4357/1 4371/1 +f 4357/1 4356/1 4374/1 +f 4356/1 4350/1 4375/1 +f 4374/1 4356/1 4375/1 +f 4374/1 4375/1 4373/1 +f 4373/1 4375/1 4376/1 +f 4375/1 4350/1 4377/1 +f 4375/1 4377/1 4376/1 +f 4350/1 4349/1 4377/1 +f 4377/1 4349/1 4378/1 +f 4376/1 4377/1 4378/1 +f 4376/1 4378/1 4379/1 +f 3001/1 4376/1 4379/1 +f 4373/1 4376/1 3001/1 +f 4379/1 4378/1 3120/1 +f 3120/1 4378/1 3119/1 +f 4378/1 4380/1 3119/1 +f 4378/1 4349/1 4380/1 +f 4349/1 3121/1 4380/1 +f 4349/1 2963/1 3121/1 +f 4380/1 3121/1 4381/1 +f 4380/1 4381/1 3109/1 +f 3109/1 4381/1 4382/1 +f 3113/1 4380/1 3109/1 +f 3119/1 4380/1 3113/1 +f 3109/1 4382/1 3107/1 +f 3107/1 4382/1 4383/1 +f 3107/1 4383/1 3046/1 +f 3046/1 4383/1 4384/1 +f 3046/1 4384/1 3044/1 +f 3044/1 4384/1 4385/1 +f 3044/1 4385/1 3049/1 +f 3049/1 4385/1 4386/1 +f 4386/1 4387/1 4388/1 +f 4385/1 4387/1 4386/1 +f 4386/1 4388/1 4389/1 +f 4389/1 4388/1 4390/1 +f 4387/1 4391/1 4388/1 +f 4388/1 4391/1 4392/1 +f 4388/1 4392/1 4390/1 +f 4389/1 4390/1 4393/1 +f 4390/1 4392/1 4394/1 +f 4390/1 4394/1 4395/1 +f 4393/1 4390/1 4396/1 +f 4390/1 4395/1 4396/1 +f 4391/1 4397/1 4392/1 +f 4392/1 4397/1 4394/1 +f 4394/1 4398/1 4395/1 +f 4397/1 4399/1 4394/1 +f 4394/1 4399/1 4398/1 +f 4391/1 4400/1 4397/1 +f 4397/1 4401/1 4399/1 +f 4400/1 4402/1 4397/1 +f 4397/1 4402/1 4401/1 +f 4398/1 4399/1 4403/1 +f 4398/1 4403/1 4404/1 +f 4404/1 4405/1 4406/1 +f 4407/1 4401/1 4408/1 +f 4408/1 4401/1 4402/1 +f 4407/1 4399/1 4401/1 +f 4407/1 4409/1 4410/1 +f 4407/1 4410/1 4411/1 +f 4408/1 4409/1 4407/1 +f 4411/1 4399/1 4407/1 +f 4408/1 4412/1 4409/1 +f 4413/1 4412/1 4408/1 +f 4408/1 4402/1 4413/1 +f 4412/1 3086/1 4409/1 +f 4409/1 3264/1 4410/1 +f 4409/1 3086/1 3264/1 +f 4412/1 3089/1 3086/1 +f 4414/1 3089/1 4412/1 +f 4414/1 3091/1 3089/1 +f 4415/1 3091/1 4414/1 +f 4415/1 2983/1 3091/1 +f 4416/1 2980/1 2983/1 +f 4416/1 2983/1 4415/1 +f 4417/1 2978/1 4416/1 +f 4417/1 4416/1 4418/1 +f 2978/1 2980/1 4416/1 +f 4418/1 4416/1 4415/1 +f 4419/1 2978/1 4417/1 +f 4418/1 4420/1 4417/1 +f 4417/1 4420/1 4421/1 +f 4417/1 4421/1 4419/1 +f 4422/1 2978/1 4423/1 +f 4422/1 2973/1 2978/1 +f 4423/1 2978/1 4419/1 +f 4421/1 4424/1 4419/1 +f 4419/1 4424/1 4423/1 +f 4425/1 4421/1 4426/1 +f 4426/1 4421/1 4420/1 +f 4425/1 4424/1 4421/1 +f 4427/1 4424/1 4425/1 +f 4427/1 4428/1 4424/1 +f 4423/1 4424/1 4428/1 +f 4429/1 4427/1 4425/1 +f 4429/1 4425/1 4430/1 +f 4430/1 4425/1 4426/1 +f 4431/1 4427/1 4432/1 +f 4432/1 4427/1 4429/1 +f 4427/1 4433/1 4428/1 +f 4433/1 2976/1 4428/1 +f 4434/1 2976/1 4433/1 +f 4435/1 2968/1 4433/1 +f 4431/1 4433/1 4427/1 +f 4435/1 4433/1 4431/1 +f 2968/1 4434/1 4433/1 +f 4434/1 2969/1 2976/1 +f 2967/1 2969/1 4434/1 +f 2968/1 2967/1 4434/1 +f 2964/1 2965/1 2968/1 +f 2964/1 2968/1 4435/1 +f 3121/1 4435/1 4431/1 +f 3121/1 2964/1 4435/1 +f 3121/1 4431/1 4381/1 +f 4381/1 4431/1 4432/1 +f 4381/1 4432/1 4382/1 +f 4382/1 4432/1 4436/1 +f 4432/1 4429/1 4430/1 +f 4432/1 4430/1 4436/1 +f 4382/1 4436/1 4383/1 +f 4436/1 4430/1 4437/1 +f 4436/1 4437/1 4438/1 +f 4383/1 4436/1 4438/1 +f 4430/1 4426/1 4437/1 +f 4438/1 4437/1 4439/1 +f 4437/1 4426/1 4439/1 +f 4438/1 4439/1 4440/1 +f 4438/1 4440/1 4441/1 +f 4384/1 4438/1 4441/1 +f 4383/1 4438/1 4384/1 +f 4439/1 4442/1 4440/1 +f 4426/1 4443/1 4439/1 +f 4439/1 4443/1 4442/1 +f 4426/1 4420/1 4443/1 +f 4442/1 4443/1 4444/1 +f 4445/1 4444/1 4443/1 +f 4445/1 4443/1 4446/1 +f 4446/1 4443/1 4418/1 +f 4418/1 4443/1 4420/1 +f 4440/1 4442/1 4447/1 +f 4442/1 4444/1 4447/1 +f 4440/1 4447/1 4448/1 +f 4447/1 4444/1 4449/1 +f 4447/1 4449/1 4448/1 +f 4450/1 4448/1 4451/1 +f 4451/1 4448/1 4452/1 +f 4441/1 4440/1 4448/1 +f 4441/1 4448/1 4450/1 +f 4448/1 4449/1 4452/1 +f 4451/1 4452/1 4453/1 +f 4454/1 4453/1 4452/1 +f 4454/1 4452/1 4455/1 +f 4455/1 4452/1 4449/1 +f 4451/1 4453/1 4400/1 +f 4400/1 4453/1 4402/1 +f 4402/1 4453/1 4413/1 +f 4413/1 4453/1 4454/1 +f 4454/1 4412/1 4413/1 +f 4455/1 4412/1 4454/1 +f 4456/1 4414/1 4455/1 +f 4455/1 4414/1 4412/1 +f 4455/1 4449/1 4456/1 +f 4457/1 4414/1 4456/1 +f 4456/1 4449/1 4457/1 +f 4458/1 4414/1 4457/1 +f 4458/1 4415/1 4414/1 +f 4457/1 4449/1 4444/1 +f 4457/1 4444/1 4458/1 +f 4445/1 4415/1 4458/1 +f 4458/1 4444/1 4445/1 +f 4418/1 4415/1 4446/1 +f 4446/1 4415/1 4445/1 +f 4459/1 4451/1 4400/1 +f 4459/1 4400/1 4391/1 +f 4387/1 4451/1 4459/1 +f 4387/1 4459/1 4391/1 +f 4450/1 4451/1 4387/1 +f 4385/1 4450/1 4387/1 +f 4384/1 4441/1 4450/1 +f 4384/1 4450/1 4385/1 +f 4423/1 4428/1 4422/1 +f 4422/1 4428/1 2976/1 +f 2975/1 2973/1 4422/1 +f 4422/1 2976/1 2975/1 +f 2974/1 2976/1 2969/1 +f 4410/1 3264/1 3263/1 +f 4460/1 4410/1 4461/1 +f 4411/1 4410/1 4460/1 +f 4461/1 4410/1 4462/1 +f 4410/1 3263/1 4462/1 +f 4462/1 3263/1 3261/1 +f 4462/1 3261/1 4463/1 +f 4463/1 3261/1 3262/1 +f 4464/1 4462/1 4465/1 +f 4461/1 4462/1 4464/1 +f 4465/1 4405/1 4464/1 +f 4464/1 4403/1 4461/1 +f 4461/1 4403/1 4460/1 +f 4460/1 4403/1 4399/1 +f 4460/1 4399/1 4411/1 +f 3000/1 4379/1 3120/1 +f 3001/1 4379/1 3000/1 +f 3138/1 2953/1 4344/1 +f 4311/1 4312/1 4343/1 +f 4317/1 4311/1 4343/1 +f 4317/1 4343/1 4328/1 +f 4319/1 4317/1 4328/1 +f 4466/1 4467/1 4468/1 +f 4469/1 4470/1 4466/1 +f 4469/1 4466/1 3211/1 +f 4470/1 4467/1 4466/1 +f 4466/1 4468/1 4471/1 +f 3211/1 4466/1 4471/1 +f 4472/1 4473/1 4469/1 +f 4469/1 4473/1 4470/1 +f 4473/1 4474/1 4470/1 +f 4470/1 4474/1 4467/1 +f 4472/1 4475/1 4473/1 +f 4473/1 4476/1 4474/1 +f 4475/1 4477/1 4473/1 +f 4473/1 4477/1 4476/1 +f 4478/1 4475/1 4472/1 +f 3221/1 4478/1 4472/1 +f 4475/1 4479/1 4477/1 +f 4480/1 4479/1 4475/1 +f 4478/1 4480/1 4475/1 +f 4479/1 4481/1 4477/1 +f 4477/1 4481/1 4476/1 +f 4480/1 4482/1 4479/1 +f 4482/1 4483/1 4479/1 +f 4479/1 4483/1 4481/1 +f 4480/1 4484/1 4482/1 +f 4485/1 4484/1 4480/1 +f 4486/1 4480/1 4478/1 +f 4486/1 4485/1 4480/1 +f 4482/1 4484/1 4483/1 +f 4484/1 4487/1 4488/1 +f 4485/1 4406/1 4484/1 +f 4484/1 4406/1 4487/1 +f 4489/1 4488/1 4487/1 +f 4490/1 4487/1 4405/1 +f 4406/1 4405/1 4487/1 +f 4490/1 4405/1 4465/1 +f 4464/1 4405/1 4403/1 +f 4465/1 4462/1 4490/1 +f 4490/1 4462/1 4463/1 +f 4491/1 4463/1 4492/1 +f 4490/1 4463/1 4489/1 +f 4489/1 4463/1 4491/1 +f 4463/1 3262/1 4493/1 +f 4492/1 4463/1 4493/1 +f 4492/1 4494/1 4491/1 +f 4494/1 4488/1 4491/1 +f 4491/1 4488/1 4489/1 +f 4492/1 4493/1 4495/1 +f 4495/1 4496/1 4492/1 +f 4492/1 4496/1 4494/1 +f 4493/1 3262/1 3265/1 +f 4493/1 3265/1 4497/1 +f 4495/1 4493/1 4497/1 +f 4498/1 4499/1 4495/1 +f 4495/1 4499/1 4496/1 +f 4495/1 4497/1 4498/1 +f 4481/1 4494/1 4496/1 +f 4481/1 4496/1 4499/1 +f 4500/1 4501/1 4499/1 +f 4500/1 4499/1 4498/1 +f 4481/1 4499/1 4476/1 +f 4476/1 4499/1 4502/1 +f 4502/1 4499/1 4501/1 +f 4498/1 4497/1 4500/1 +f 4503/1 4501/1 4500/1 +f 4500/1 4497/1 4503/1 +f 4504/1 4505/1 4501/1 +f 4504/1 4501/1 4503/1 +f 4506/1 4501/1 4505/1 +f 4502/1 4501/1 4506/1 +f 4476/1 4502/1 4474/1 +f 4474/1 4502/1 4506/1 +f 4474/1 4506/1 4467/1 +f 4506/1 4505/1 4467/1 +f 4507/1 4508/1 4505/1 +f 4507/1 4505/1 4509/1 +f 4509/1 4505/1 4504/1 +f 4467/1 4505/1 4508/1 +f 4503/1 4510/1 4504/1 +f 4504/1 4510/1 4509/1 +f 4503/1 4497/1 4510/1 +f 4509/1 4510/1 4507/1 +f 4507/1 4510/1 4511/1 +f 4512/1 4508/1 4507/1 +f 4507/1 4511/1 4512/1 +f 4512/1 4513/1 4508/1 +f 4468/1 4508/1 4513/1 +f 4468/1 4467/1 4508/1 +f 4514/1 4513/1 4512/1 +f 4512/1 4511/1 4514/1 +f 4515/1 4513/1 4514/1 +f 4468/1 4513/1 4516/1 +f 4516/1 4513/1 4515/1 +f 4517/1 4468/1 4516/1 +f 4471/1 4468/1 4517/1 +f 4518/1 4516/1 4519/1 +f 4517/1 4516/1 4518/1 +f 4516/1 4515/1 4519/1 +f 4520/1 4521/1 4515/1 +f 4520/1 4515/1 4514/1 +f 4519/1 4515/1 4521/1 +f 4514/1 4511/1 4520/1 +f 4522/1 4521/1 4520/1 +f 4520/1 4511/1 4523/1 +f 4520/1 4523/1 4522/1 +f 4522/1 4524/1 4521/1 +f 4525/1 4524/1 4522/1 +f 4522/1 4523/1 4526/1 +f 4522/1 4526/1 4525/1 +f 4511/1 4527/1 4523/1 +f 4523/1 4527/1 4528/1 +f 4523/1 4528/1 4526/1 +f 4510/1 4529/1 4511/1 +f 4511/1 4529/1 4527/1 +f 4527/1 3330/1 4528/1 +f 4528/1 3330/1 3312/1 +f 4528/1 3312/1 4530/1 +f 4526/1 4528/1 4530/1 +f 4527/1 3270/1 3330/1 +f 4529/1 3270/1 4527/1 +f 4510/1 3266/1 4529/1 +f 4497/1 3266/1 4510/1 +f 4497/1 3265/1 3266/1 +f 4529/1 3267/1 3270/1 +f 3266/1 3267/1 4529/1 +f 4526/1 4530/1 4531/1 +f 4530/1 4532/1 4533/1 +f 4531/1 4530/1 4533/1 +f 4534/1 4526/1 4531/1 +f 4535/1 4526/1 4534/1 +f 4525/1 4526/1 4535/1 +f 4536/1 4537/1 4534/1 +f 4534/1 4537/1 4535/1 +f 4534/1 4531/1 4536/1 +f 3353/1 4531/1 3351/1 +f 4536/1 4531/1 3357/1 +f 3357/1 4531/1 3353/1 +f 3357/1 3356/1 4536/1 +f 4536/1 3356/1 4537/1 +f 4535/1 4537/1 4524/1 +f 4535/1 4524/1 4525/1 +f 4531/1 4533/1 3351/1 +f 3351/1 4533/1 3354/1 +f 4533/1 4538/1 3354/1 +f 3354/1 4538/1 4539/1 +f 3354/1 4539/1 3362/1 +f 4533/1 4532/1 4538/1 +f 4530/1 3312/1 4532/1 +f 3362/1 4539/1 4540/1 +f 3362/1 4540/1 3363/1 +f 3363/1 4540/1 4541/1 +f 4540/1 4542/1 4541/1 +f 3363/1 4541/1 3337/1 +f 3337/1 4541/1 4543/1 +f 4541/1 4544/1 4545/1 +f 4541/1 4545/1 4543/1 +f 3337/1 4543/1 3338/1 +f 4543/1 4546/1 4046/1 +f 3338/1 4543/1 4046/1 +f 4543/1 4547/1 4546/1 +f 4543/1 4545/1 4547/1 +f 4546/1 4548/1 4549/1 +f 4546/1 4549/1 4550/1 +f 4046/1 4546/1 4550/1 +f 4547/1 4548/1 4546/1 +f 4046/1 4550/1 4045/1 +f 4550/1 4551/1 4552/1 +f 4045/1 4550/1 4552/1 +f 4550/1 4553/1 4551/1 +f 4550/1 4549/1 4553/1 +f 4045/1 4552/1 4041/1 +f 4552/1 4554/1 4555/1 +f 4552/1 4551/1 4554/1 +f 4552/1 4555/1 4042/1 +f 4041/1 4552/1 4042/1 +f 4554/1 4556/1 4557/1 +f 4554/1 4557/1 4555/1 +f 4551/1 4556/1 4554/1 +f 4555/1 4557/1 4558/1 +f 4555/1 4558/1 4559/1 +f 4042/1 4555/1 4559/1 +f 4042/1 4559/1 4043/1 +f 4042/1 4043/1 4038/1 +f 4559/1 4560/1 4043/1 +f 4559/1 4558/1 4560/1 +f 4043/1 4560/1 4044/1 +f 4039/1 4044/1 4040/1 +f 4551/1 4561/1 4556/1 +f 4561/1 4562/1 4556/1 +f 4556/1 4562/1 4557/1 +f 4553/1 4561/1 4551/1 +f 4553/1 4563/1 4561/1 +f 4563/1 4564/1 4561/1 +f 4561/1 4564/1 4562/1 +f 4549/1 4563/1 4553/1 +f 4563/1 4565/1 4564/1 +f 4566/1 4565/1 4563/1 +f 4549/1 4566/1 4563/1 +f 4564/1 4567/1 4562/1 +f 4565/1 4568/1 4564/1 +f 4564/1 4568/1 4567/1 +f 4569/1 4565/1 4566/1 +f 4569/1 4570/1 4565/1 +f 4565/1 4570/1 4568/1 +f 4549/1 4571/1 4566/1 +f 4571/1 4569/1 4566/1 +f 4548/1 4571/1 4549/1 +f 4572/1 4569/1 4571/1 +f 4548/1 4572/1 4571/1 +f 4573/1 4574/1 4569/1 +f 4569/1 4574/1 4570/1 +f 4572/1 4573/1 4569/1 +f 4574/1 4575/1 4570/1 +f 4570/1 4576/1 4568/1 +f 4570/1 4575/1 4576/1 +f 4577/1 4575/1 4574/1 +f 4573/1 4577/1 4574/1 +f 4578/1 4579/1 4573/1 +f 4578/1 4573/1 4572/1 +f 4579/1 4577/1 4573/1 +f 4580/1 4578/1 4572/1 +f 4580/1 4572/1 4548/1 +f 4547/1 4580/1 4548/1 +f 4545/1 4581/1 4580/1 +f 4545/1 4580/1 4547/1 +f 4581/1 4578/1 4580/1 +f 4581/1 4582/1 4578/1 +f 4582/1 4583/1 4578/1 +f 4583/1 4579/1 4578/1 +f 4583/1 4584/1 4579/1 +f 4579/1 4584/1 4577/1 +f 4585/1 4586/1 4583/1 +f 4585/1 4583/1 4582/1 +f 4586/1 4587/1 4583/1 +f 4583/1 4587/1 4584/1 +f 4588/1 4585/1 4582/1 +f 4588/1 4582/1 4581/1 +f 4545/1 4588/1 4581/1 +f 4544/1 4588/1 4545/1 +f 4589/1 4585/1 4588/1 +f 4544/1 4589/1 4588/1 +f 4589/1 4590/1 4585/1 +f 4590/1 4586/1 4585/1 +f 4591/1 4592/1 4586/1 +f 4586/1 4592/1 4587/1 +f 4590/1 4591/1 4586/1 +f 4587/1 4593/1 4584/1 +f 4592/1 4593/1 4587/1 +f 4592/1 4594/1 4593/1 +f 4591/1 4595/1 4592/1 +f 4595/1 4594/1 4592/1 +f 4596/1 4597/1 4591/1 +f 4597/1 4595/1 4591/1 +f 4596/1 4591/1 4590/1 +f 4598/1 4590/1 4589/1 +f 4598/1 4596/1 4590/1 +f 4544/1 4598/1 4589/1 +f 4599/1 4596/1 4598/1 +f 4542/1 4598/1 4544/1 +f 4542/1 4599/1 4598/1 +f 4600/1 4597/1 4596/1 +f 4601/1 4600/1 4596/1 +f 4599/1 4601/1 4596/1 +f 4600/1 4602/1 4597/1 +f 4597/1 4602/1 4595/1 +f 4603/1 4604/1 4600/1 +f 4600/1 4604/1 4602/1 +f 4605/1 4603/1 4600/1 +f 4605/1 4600/1 4601/1 +f 4606/1 4605/1 4601/1 +f 4606/1 4601/1 4599/1 +f 4542/1 4606/1 4599/1 +f 4607/1 4605/1 4606/1 +f 4608/1 4606/1 4542/1 +f 4608/1 4607/1 4606/1 +f 4609/1 4603/1 4605/1 +f 4607/1 4609/1 4605/1 +f 4610/1 4609/1 4607/1 +f 4608/1 4610/1 4607/1 +f 4539/1 4611/1 4608/1 +f 4611/1 4610/1 4608/1 +f 4540/1 4608/1 4542/1 +f 4539/1 4608/1 4540/1 +f 4538/1 4611/1 4539/1 +f 4611/1 4612/1 4613/1 +f 4614/1 4612/1 4611/1 +f 4611/1 4613/1 4610/1 +f 4538/1 4614/1 4611/1 +f 4532/1 4614/1 4538/1 +f 4614/1 4615/1 4612/1 +f 3311/1 3316/1 4614/1 +f 4532/1 3311/1 4614/1 +f 4614/1 3316/1 4615/1 +f 3312/1 3307/1 4532/1 +f 4532/1 3307/1 3311/1 +f 3311/1 3314/1 3316/1 +f 3316/1 3317/1 4615/1 +f 4615/1 3317/1 4616/1 +f 4615/1 4616/1 4612/1 +f 3317/1 3325/1 4616/1 +f 4612/1 4616/1 4617/1 +f 4612/1 4617/1 4613/1 +f 4613/1 4617/1 4618/1 +f 4616/1 4619/1 4617/1 +f 4613/1 4618/1 4610/1 +f 4610/1 4618/1 4620/1 +f 4617/1 4621/1 4618/1 +f 4610/1 4620/1 4609/1 +f 4618/1 4621/1 4620/1 +f 4621/1 4622/1 4620/1 +f 4620/1 4622/1 4609/1 +f 4617/1 4619/1 4621/1 +f 4616/1 4623/1 4619/1 +f 3325/1 4623/1 4616/1 +f 4609/1 4622/1 4603/1 +f 4621/1 4624/1 4622/1 +f 4622/1 4624/1 4625/1 +f 4622/1 4625/1 4603/1 +f 4603/1 4625/1 4604/1 +f 4625/1 4626/1 4627/1 +f 4625/1 4627/1 4604/1 +f 4624/1 4626/1 4625/1 +f 4628/1 3329/1 4624/1 +f 4621/1 4628/1 4624/1 +f 4624/1 3329/1 4626/1 +f 4619/1 4628/1 4621/1 +f 4619/1 3328/1 4628/1 +f 3328/1 3329/1 4628/1 +f 3329/1 3200/1 4626/1 +f 4626/1 3200/1 4627/1 +f 4604/1 4627/1 4629/1 +f 4627/1 3200/1 3199/1 +f 4627/1 3199/1 4629/1 +f 4604/1 4629/1 4602/1 +f 4595/1 4629/1 4594/1 +f 4602/1 4629/1 4595/1 +f 4629/1 3199/1 3198/1 +f 4629/1 3198/1 4594/1 +f 4594/1 3198/1 4593/1 +f 4593/1 3198/1 3197/1 +f 4584/1 4593/1 4630/1 +f 4593/1 3197/1 4630/1 +f 4630/1 3197/1 4575/1 +f 4575/1 3197/1 3196/1 +f 4584/1 4630/1 4577/1 +f 4577/1 4630/1 4575/1 +f 4575/1 3196/1 4576/1 +f 4631/1 3196/1 3833/1 +f 4576/1 3196/1 4631/1 +f 4568/1 4576/1 4631/1 +f 4631/1 3833/1 4632/1 +f 4567/1 4631/1 4632/1 +f 4568/1 4631/1 4567/1 +f 4632/1 3833/1 3832/1 +f 4632/1 3832/1 4633/1 +f 4634/1 4632/1 4635/1 +f 4635/1 4632/1 4633/1 +f 4567/1 4632/1 4634/1 +f 4562/1 4567/1 4634/1 +f 4562/1 4634/1 4636/1 +f 4636/1 4634/1 4635/1 +f 4636/1 4635/1 4637/1 +f 4637/1 4635/1 4638/1 +f 4635/1 4633/1 4638/1 +f 4633/1 3832/1 4639/1 +f 4638/1 4633/1 4639/1 +f 4639/1 3832/1 3831/1 +f 4640/1 4639/1 4641/1 +f 4639/1 3831/1 4641/1 +f 4642/1 4639/1 4640/1 +f 4638/1 4639/1 4642/1 +f 4637/1 4638/1 4643/1 +f 4643/1 4638/1 4642/1 +f 4643/1 4642/1 4644/1 +f 4644/1 4642/1 4640/1 +f 4644/1 4640/1 4053/1 +f 4053/1 4640/1 4052/1 +f 4640/1 4641/1 4052/1 +f 4052/1 4641/1 4049/1 +f 4641/1 3831/1 4049/1 +f 4049/1 3831/1 3829/1 +f 4644/1 4053/1 4040/1 +f 4560/1 4643/1 4644/1 +f 4560/1 4644/1 4044/1 +f 4044/1 4644/1 4040/1 +f 4558/1 4643/1 4560/1 +f 4557/1 4637/1 4558/1 +f 4558/1 4637/1 4643/1 +f 4562/1 4636/1 4557/1 +f 4557/1 4636/1 4637/1 +f 4623/1 3328/1 4619/1 +f 4623/1 3326/1 3328/1 +f 3325/1 3326/1 4623/1 +f 4541/1 4542/1 4544/1 +f 4518/1 4519/1 4645/1 +f 4645/1 4519/1 4646/1 +f 4519/1 4521/1 4524/1 +f 4519/1 4524/1 4646/1 +f 4647/1 4518/1 4645/1 +f 4471/1 4518/1 4647/1 +f 4471/1 4517/1 4518/1 +f 4647/1 4645/1 3361/1 +f 3361/1 4645/1 4646/1 +f 3209/1 4471/1 4647/1 +f 3209/1 4647/1 3204/1 +f 3204/1 4647/1 3361/1 +f 3211/1 4471/1 3209/1 +f 3361/1 4646/1 3360/1 +f 3361/1 3360/1 3359/1 +f 3204/1 3361/1 3202/1 +f 4646/1 4648/1 3360/1 +f 3360/1 4648/1 4649/1 +f 3360/1 4649/1 3358/1 +f 4646/1 4524/1 4648/1 +f 4648/1 4524/1 4537/1 +f 4648/1 4537/1 4649/1 +f 4649/1 3356/1 3358/1 +f 4483/1 4494/1 4481/1 +f 4483/1 4488/1 4494/1 +f 4484/1 4488/1 4483/1 +f 4489/1 4487/1 4490/1 +f 4395/1 4404/1 4406/1 +f 4396/1 4395/1 4406/1 +f 4396/1 4406/1 4485/1 +f 4395/1 4398/1 4404/1 +f 4404/1 4403/1 4405/1 +f 4393/1 4396/1 4485/1 +f 4393/1 4485/1 4486/1 +f 3105/1 4486/1 4478/1 +f 3105/1 4478/1 3221/1 +f 3102/1 4486/1 3105/1 +f 3102/1 4393/1 4486/1 +f 3101/1 4393/1 3102/1 +f 3101/1 4389/1 4393/1 +f 3056/1 4389/1 3101/1 +f 3056/1 4386/1 4389/1 +f 3049/1 4386/1 3056/1 +f 3221/1 4472/1 3217/1 +f 3217/1 4472/1 4469/1 +f 4650/1 4651/1 4652/1 +f 4653/1 4654/1 4650/1 +f 4650/1 4654/1 4651/1 +f 4652/1 4655/1 4650/1 +f 4650/1 4655/1 4653/1 +f 4656/1 4657/1 4652/1 +f 4652/1 4657/1 4655/1 +f 4652/1 4651/1 4656/1 +f 4653/1 4655/1 4658/1 +f 4659/1 4658/1 4655/1 +f 4659/1 4655/1 4660/1 +f 4660/1 4655/1 4657/1 +f 4661/1 4662/1 4659/1 +f 4661/1 4659/1 4663/1 +f 4663/1 4659/1 4660/1 +f 4662/1 4658/1 4659/1 +f 4664/1 4665/1 4661/1 +f 4664/1 4661/1 4666/1 +f 4665/1 4662/1 4661/1 +f 4666/1 4661/1 4663/1 +f 4665/1 4667/1 4662/1 +f 4667/1 4668/1 4662/1 +f 4662/1 4668/1 4658/1 +f 4669/1 4670/1 4665/1 +f 4669/1 4665/1 4664/1 +f 4665/1 4670/1 4667/1 +f 4670/1 4668/1 4667/1 +f 4669/1 4671/1 4670/1 +f 4671/1 4672/1 4670/1 +f 4670/1 4672/1 4668/1 +f 4673/1 4671/1 4669/1 +f 4674/1 4673/1 4669/1 +f 4674/1 4669/1 4675/1 +f 4675/1 4669/1 4664/1 +f 3428/1 4673/1 4674/1 +f 4673/1 4676/1 4671/1 +f 3428/1 4677/1 4673/1 +f 4677/1 4676/1 4673/1 +f 3606/1 4677/1 3428/1 +f 3606/1 4678/1 4677/1 +f 4677/1 4679/1 4676/1 +f 4676/1 4679/1 4680/1 +f 4676/1 4680/1 4681/1 +f 4676/1 4681/1 4671/1 +f 4681/1 4680/1 4682/1 +f 4681/1 4682/1 4671/1 +f 4683/1 4682/1 4680/1 +f 4683/1 4680/1 4684/1 +f 4684/1 4680/1 4685/1 +f 4679/1 4685/1 4680/1 +f 4672/1 4682/1 4683/1 +f 4671/1 4682/1 4672/1 +f 4686/1 4672/1 4687/1 +f 4687/1 4672/1 4683/1 +f 4686/1 4668/1 4672/1 +f 4686/1 4688/1 4689/1 +f 4687/1 4688/1 4686/1 +f 4686/1 4689/1 4690/1 +f 4690/1 4668/1 4686/1 +f 4691/1 4692/1 4687/1 +f 4687/1 4692/1 4688/1 +f 4687/1 4683/1 4691/1 +f 4691/1 4683/1 4684/1 +f 4684/1 4692/1 4691/1 +f 4692/1 3460/1 4688/1 +f 4692/1 3461/1 3460/1 +f 4693/1 3461/1 4692/1 +f 4684/1 4693/1 4692/1 +f 4689/1 3460/1 3459/1 +f 4689/1 3459/1 4654/1 +f 4654/1 3459/1 3458/1 +f 4694/1 4654/1 4653/1 +f 4694/1 4689/1 4654/1 +f 4654/1 3458/1 4651/1 +f 4651/1 3458/1 4213/1 +f 4695/1 4651/1 4696/1 +f 4651/1 4213/1 4696/1 +f 4656/1 4651/1 4695/1 +f 4696/1 4213/1 4211/1 +f 4697/1 4696/1 4698/1 +f 4695/1 4696/1 4697/1 +f 4696/1 4211/1 4698/1 +f 4697/1 4699/1 4695/1 +f 4695/1 4699/1 4700/1 +f 4695/1 4700/1 4656/1 +f 4700/1 4657/1 4656/1 +f 4701/1 4700/1 4702/1 +f 4660/1 4701/1 4703/1 +f 4703/1 4701/1 4702/1 +f 4660/1 4657/1 4701/1 +f 4701/1 4657/1 4700/1 +f 4704/1 4660/1 4703/1 +f 4705/1 4663/1 4660/1 +f 4705/1 4660/1 4704/1 +f 4703/1 4702/1 4706/1 +f 4704/1 4703/1 4707/1 +f 4707/1 4703/1 4706/1 +f 2789/1 4705/1 4704/1 +f 2786/1 4704/1 4707/1 +f 2789/1 4704/1 2786/1 +f 2789/1 4666/1 4705/1 +f 4666/1 4663/1 4705/1 +f 4708/1 4666/1 2789/1 +f 2790/1 4708/1 2789/1 +f 4708/1 4664/1 4666/1 +f 3414/1 4675/1 4708/1 +f 3414/1 4708/1 2790/1 +f 4675/1 4664/1 4708/1 +f 3419/1 4674/1 3414/1 +f 3414/1 4674/1 4675/1 +f 3419/1 3428/1 4674/1 +f 2786/1 4707/1 2779/1 +f 2779/1 4707/1 2780/1 +f 4707/1 4706/1 2780/1 +f 2780/1 4706/1 2782/1 +f 4706/1 4702/1 2782/1 +f 4702/1 2770/1 2782/1 +f 4702/1 4700/1 4699/1 +f 4702/1 4699/1 2770/1 +f 4697/1 2770/1 4699/1 +f 4697/1 4698/1 4709/1 +f 4709/1 2770/1 4697/1 +f 2769/1 2770/1 4709/1 +f 4709/1 4698/1 2769/1 +f 2769/1 4698/1 2765/1 +f 4698/1 4211/1 4212/1 +f 2765/1 4698/1 2757/1 +f 4698/1 4212/1 2757/1 +f 2765/1 2767/1 2769/1 +f 2757/1 4212/1 2755/1 +f 4690/1 4689/1 4710/1 +f 4710/1 4689/1 4694/1 +f 4710/1 4668/1 4690/1 +f 4694/1 4658/1 4710/1 +f 4710/1 4658/1 4668/1 +f 4653/1 4658/1 4694/1 +f 4711/1 4693/1 4684/1 +f 4693/1 3464/1 3461/1 +f 4712/1 3467/1 4693/1 +f 3467/1 3464/1 4693/1 +f 4712/1 4693/1 4711/1 +f 4684/1 4685/1 4711/1 +f 4711/1 4685/1 4712/1 +f 4713/1 3467/1 4712/1 +f 4712/1 4714/1 4713/1 +f 4712/1 4685/1 4714/1 +f 4713/1 3470/1 3467/1 +f 3497/1 3470/1 4713/1 +f 4713/1 4714/1 4715/1 +f 4713/1 4715/1 3497/1 +f 4716/1 4714/1 4685/1 +f 4717/1 4718/1 4716/1 +f 4717/1 4716/1 4719/1 +f 4719/1 4716/1 4679/1 +f 4718/1 4714/1 4716/1 +f 4716/1 4685/1 4679/1 +f 4678/1 4719/1 4679/1 +f 4678/1 4717/1 4719/1 +f 4678/1 4679/1 4677/1 +f 4720/1 4717/1 4678/1 +f 4721/1 4720/1 4678/1 +f 4721/1 4678/1 3606/1 +f 4722/1 4717/1 4720/1 +f 4721/1 4722/1 4720/1 +f 4723/1 4718/1 4717/1 +f 4722/1 4723/1 4717/1 +f 4722/1 3515/1 4723/1 +f 3515/1 3516/1 4723/1 +f 4723/1 3516/1 4718/1 +f 3516/1 3499/1 4718/1 +f 4718/1 3499/1 4715/1 +f 4718/1 4715/1 4714/1 +f 3516/1 3502/1 3499/1 +f 3513/1 3515/1 3517/1 +f 3517/1 3515/1 4722/1 +f 3519/1 3517/1 4722/1 +f 3514/1 3517/1 3518/1 +f 3519/1 4722/1 4721/1 +f 4724/1 3519/1 4721/1 +f 4724/1 4721/1 4725/1 +f 4725/1 4726/1 4724/1 +f 4724/1 4726/1 4727/1 +f 4724/1 4727/1 3518/1 +f 3518/1 3519/1 4724/1 +f 4728/1 4729/1 4726/1 +f 4726/1 4729/1 4730/1 +f 4726/1 4730/1 4727/1 +f 4725/1 4728/1 4726/1 +f 4727/1 4730/1 4731/1 +f 4727/1 4731/1 3518/1 +f 3518/1 4731/1 3526/1 +f 4731/1 4732/1 3526/1 +f 4730/1 4732/1 4731/1 +f 4733/1 4734/1 4730/1 +f 4730/1 4734/1 4732/1 +f 4729/1 4733/1 4730/1 +f 4735/1 4736/1 4732/1 +f 4732/1 4736/1 4737/1 +f 4732/1 4737/1 3526/1 +f 4734/1 4735/1 4732/1 +f 3526/1 4737/1 3527/1 +f 4738/1 4739/1 4737/1 +f 4737/1 4739/1 4740/1 +f 4737/1 4740/1 3527/1 +f 4736/1 4738/1 4737/1 +f 4741/1 4742/1 4736/1 +f 4736/1 4742/1 4738/1 +f 4735/1 4741/1 4736/1 +f 4742/1 4743/1 4738/1 +f 4738/1 4743/1 4739/1 +f 4743/1 4744/1 4739/1 +f 4739/1 4744/1 4745/1 +f 4739/1 4745/1 4740/1 +f 4746/1 4747/1 4743/1 +f 4743/1 4747/1 4744/1 +f 4748/1 4746/1 4743/1 +f 4748/1 4743/1 4742/1 +f 4741/1 4748/1 4742/1 +f 4749/1 4750/1 4748/1 +f 4748/1 4750/1 4746/1 +f 4751/1 4749/1 4748/1 +f 4751/1 4748/1 4741/1 +f 4750/1 4752/1 4746/1 +f 4746/1 4752/1 4747/1 +f 4752/1 4753/1 4747/1 +f 4747/1 4753/1 4754/1 +f 4747/1 4754/1 4744/1 +f 4755/1 4756/1 4752/1 +f 4752/1 4756/1 4753/1 +f 4750/1 4755/1 4752/1 +f 4749/1 4755/1 4750/1 +f 4757/1 4755/1 4749/1 +f 3475/1 4756/1 4755/1 +f 3475/1 4755/1 3472/1 +f 3472/1 4755/1 4757/1 +f 3475/1 4753/1 4756/1 +f 4758/1 4754/1 4753/1 +f 4758/1 4753/1 3475/1 +f 3476/1 4758/1 3475/1 +f 3474/1 3475/1 3472/1 +f 3476/1 4759/1 4758/1 +f 4758/1 4759/1 4760/1 +f 4760/1 4754/1 4758/1 +f 4759/1 3476/1 3478/1 +f 4759/1 3478/1 4761/1 +f 4760/1 4759/1 4761/1 +f 4760/1 4761/1 4762/1 +f 4760/1 4762/1 4763/1 +f 4763/1 4764/1 4760/1 +f 4760/1 4764/1 4754/1 +f 4761/1 3478/1 4765/1 +f 4761/1 4765/1 4762/1 +f 4766/1 3478/1 3480/1 +f 4765/1 3478/1 4766/1 +f 4765/1 4766/1 4767/1 +f 4762/1 4765/1 4767/1 +f 4766/1 4768/1 4769/1 +f 4767/1 4766/1 4769/1 +f 4767/1 4769/1 4770/1 +f 4762/1 4767/1 4771/1 +f 4771/1 4767/1 4770/1 +f 4769/1 4768/1 4772/1 +f 4769/1 4772/1 4773/1 +f 4770/1 4769/1 4773/1 +f 3480/1 4774/1 4768/1 +f 3480/1 4768/1 4766/1 +f 4774/1 4772/1 4768/1 +f 4775/1 4776/1 4772/1 +f 4774/1 4775/1 4772/1 +f 4773/1 4772/1 4776/1 +f 4773/1 4776/1 4777/1 +f 4770/1 4773/1 4777/1 +f 4771/1 4770/1 4778/1 +f 4778/1 4770/1 4777/1 +f 4777/1 4776/1 4779/1 +f 4777/1 4779/1 4780/1 +f 4781/1 4777/1 4780/1 +f 4778/1 4777/1 4781/1 +f 4782/1 4779/1 4776/1 +f 4775/1 4782/1 4776/1 +f 4783/1 3543/1 4779/1 +f 4779/1 3543/1 4780/1 +f 4784/1 4783/1 4779/1 +f 4784/1 4779/1 4782/1 +f 4785/1 4784/1 4782/1 +f 4785/1 4782/1 4775/1 +f 4786/1 4783/1 4784/1 +f 4787/1 4786/1 4784/1 +f 4787/1 4784/1 4785/1 +f 4788/1 3543/1 4783/1 +f 4786/1 4788/1 4783/1 +f 4788/1 4789/1 3543/1 +f 4790/1 4789/1 4788/1 +f 4791/1 4790/1 4788/1 +f 4791/1 4788/1 4792/1 +f 4792/1 4788/1 4786/1 +f 4793/1 4792/1 4786/1 +f 4793/1 4786/1 4787/1 +f 4794/1 4791/1 4792/1 +f 4794/1 4792/1 4793/1 +f 4795/1 4790/1 4791/1 +f 4796/1 4795/1 4791/1 +f 4796/1 4791/1 4794/1 +f 4797/1 4790/1 4795/1 +f 4798/1 4797/1 4795/1 +f 4798/1 4795/1 4796/1 +f 4799/1 4798/1 4796/1 +f 4799/1 4796/1 4800/1 +f 4800/1 4796/1 4794/1 +f 4800/1 4794/1 4801/1 +f 4801/1 4794/1 4793/1 +f 3485/1 4799/1 4800/1 +f 4801/1 3485/1 4800/1 +f 4801/1 4793/1 4802/1 +f 4802/1 4793/1 4787/1 +f 4802/1 4787/1 4803/1 +f 4803/1 4787/1 4785/1 +f 4803/1 3482/1 4802/1 +f 3482/1 4803/1 4804/1 +f 4803/1 4785/1 4804/1 +f 4804/1 4785/1 4775/1 +f 4774/1 3480/1 4804/1 +f 4804/1 3480/1 3482/1 +f 4804/1 4775/1 4774/1 +f 4802/1 3482/1 3485/1 +f 4802/1 3485/1 4801/1 +f 4805/1 4797/1 4798/1 +f 4806/1 4805/1 4798/1 +f 4806/1 4798/1 4799/1 +f 3536/1 4778/1 4781/1 +f 4807/1 4778/1 3536/1 +f 4740/1 4807/1 3536/1 +f 3527/1 4740/1 3536/1 +f 4807/1 4771/1 4778/1 +f 4808/1 4771/1 4807/1 +f 4740/1 4809/1 4807/1 +f 4808/1 4807/1 4809/1 +f 4745/1 4809/1 4740/1 +f 4745/1 4764/1 4809/1 +f 4808/1 4809/1 4763/1 +f 4763/1 4809/1 4764/1 +f 4763/1 4762/1 4808/1 +f 4808/1 4762/1 4771/1 +f 4744/1 4754/1 4764/1 +f 4744/1 4764/1 4745/1 +f 3527/1 3536/1 3529/1 +f 3536/1 4781/1 3537/1 +f 3537/1 3534/1 3536/1 +f 4781/1 4780/1 3537/1 +f 3537/1 4780/1 3541/1 +f 3543/1 3541/1 4780/1 +f 4789/1 3544/1 3543/1 +f 4789/1 3546/1 3544/1 +f 4810/1 3547/1 3546/1 +f 4811/1 4812/1 4810/1 +f 4812/1 4813/1 4810/1 +f 4810/1 4813/1 3547/1 +f 4813/1 3575/1 3547/1 +f 3547/1 3575/1 3548/1 +f 4814/1 4815/1 4813/1 +f 4813/1 4815/1 3575/1 +f 4812/1 4814/1 4813/1 +f 4811/1 4816/1 4812/1 +f 4816/1 4814/1 4812/1 +f 4817/1 4816/1 4811/1 +f 4817/1 4818/1 4816/1 +f 4818/1 4819/1 4816/1 +f 4816/1 4819/1 4814/1 +f 4819/1 4820/1 4814/1 +f 4814/1 4820/1 4815/1 +f 4821/1 4822/1 4819/1 +f 4819/1 4822/1 4823/1 +f 4819/1 4823/1 4820/1 +f 4818/1 4821/1 4819/1 +f 4820/1 4823/1 4824/1 +f 4820/1 4824/1 4815/1 +f 4822/1 3490/1 4823/1 +f 4823/1 3490/1 4824/1 +f 4825/1 4826/1 4822/1 +f 4826/1 3490/1 4822/1 +f 4821/1 4825/1 4822/1 +f 4826/1 3492/1 3490/1 +f 4824/1 3490/1 3488/1 +f 4815/1 4824/1 4827/1 +f 4824/1 3488/1 4827/1 +f 3486/1 4828/1 3488/1 +f 4827/1 3488/1 4828/1 +f 4815/1 4827/1 3575/1 +f 3575/1 4827/1 3576/1 +f 3575/1 3550/1 3548/1 +f 4829/1 3494/1 3492/1 +f 4829/1 3492/1 4826/1 +f 4825/1 4830/1 4829/1 +f 4825/1 4829/1 4826/1 +f 4830/1 3494/1 4829/1 +f 4831/1 4830/1 4825/1 +f 4831/1 4825/1 4821/1 +f 4832/1 4831/1 4821/1 +f 4832/1 4821/1 4818/1 +f 4833/1 4832/1 4818/1 +f 4833/1 4818/1 4817/1 +f 3527/1 3529/1 3528/1 +f 3602/1 4757/1 4834/1 +f 4834/1 4757/1 4749/1 +f 3472/1 4757/1 3469/1 +f 3469/1 4757/1 3602/1 +f 4835/1 3602/1 4834/1 +f 3600/1 3602/1 4836/1 +f 4836/1 3602/1 4835/1 +f 4835/1 4834/1 4837/1 +f 4836/1 4835/1 4838/1 +f 4838/1 4835/1 4837/1 +f 3601/1 3600/1 4836/1 +f 3601/1 4836/1 4839/1 +f 4839/1 4836/1 4838/1 +f 4839/1 4838/1 4840/1 +f 4840/1 4838/1 4841/1 +f 4842/1 4839/1 4840/1 +f 4842/1 4840/1 4843/1 +f 3598/1 4842/1 4843/1 +f 3597/1 4842/1 3598/1 +f 3599/1 3601/1 4842/1 +f 4842/1 3601/1 4839/1 +f 3597/1 3599/1 4842/1 +f 4838/1 4837/1 4841/1 +f 4841/1 4837/1 4844/1 +f 4841/1 4844/1 4734/1 +f 4733/1 4841/1 4734/1 +f 4837/1 4834/1 4751/1 +f 4837/1 4751/1 4844/1 +f 4844/1 4751/1 4741/1 +f 4844/1 4741/1 4735/1 +f 4734/1 4844/1 4735/1 +f 4834/1 4749/1 4751/1 +f 4840/1 4841/1 4733/1 +f 4729/1 4840/1 4733/1 +f 4843/1 4840/1 4729/1 +f 4728/1 4843/1 4729/1 +f 3598/1 4843/1 4728/1 +f 4845/1 3598/1 4728/1 +f 4845/1 4728/1 4725/1 +f 3592/1 3598/1 4845/1 +f 4845/1 4725/1 3605/1 +f 4845/1 3605/1 3592/1 +f 4725/1 3604/1 3605/1 +f 4725/1 4721/1 3604/1 +f 3604/1 4721/1 3606/1 +f 3497/1 4715/1 3499/1 +f 3497/1 3499/1 3496/1 +f 3984/1 2530/1 4846/1 +f 3981/1 3984/1 4847/1 +f 4847/1 3984/1 4848/1 +f 4848/1 3984/1 4849/1 +f 4849/1 3984/1 4846/1 +f 4846/1 2530/1 2527/1 +f 4846/1 2527/1 4850/1 +f 4850/1 2527/1 2539/1 +f 4850/1 2539/1 4851/1 +f 4851/1 2539/1 4852/1 +f 2539/1 2519/1 4852/1 +f 4851/1 4852/1 4853/1 +f 4854/1 4850/1 4851/1 +f 4854/1 4851/1 4855/1 +f 4855/1 4851/1 4853/1 +f 4853/1 4852/1 4856/1 +f 4852/1 2521/1 4856/1 +f 4853/1 4856/1 4857/1 +f 4857/1 4856/1 4858/1 +f 4857/1 4858/1 4859/1 +f 4860/1 4853/1 4857/1 +f 4860/1 4857/1 4861/1 +f 4861/1 4857/1 4862/1 +f 4862/1 4857/1 4859/1 +f 4859/1 4858/1 4863/1 +f 4858/1 2596/1 4863/1 +f 4859/1 4863/1 4864/1 +f 4864/1 4863/1 4865/1 +f 4863/1 2596/1 2599/1 +f 4863/1 2599/1 4865/1 +f 4858/1 2521/1 2596/1 +f 4856/1 2521/1 4858/1 +f 4852/1 2519/1 2521/1 +f 4865/1 2599/1 2605/1 +f 4865/1 2605/1 4866/1 +f 4866/1 2605/1 4867/1 +f 4867/1 2605/1 4246/1 +f 4867/1 4246/1 4868/1 +f 4868/1 4246/1 4250/1 +f 4868/1 4250/1 4869/1 +f 4869/1 4250/1 4266/1 +f 4869/1 4266/1 4870/1 +f 4864/1 4865/1 4871/1 +f 4871/1 4865/1 4866/1 +f 4872/1 4859/1 4864/1 +f 4872/1 4864/1 4873/1 +f 4873/1 4864/1 4871/1 +f 4871/1 4866/1 4874/1 +f 4873/1 4871/1 4875/1 +f 4875/1 4871/1 4874/1 +f 4874/1 4866/1 4867/1 +f 4875/1 4876/1 4873/1 +f 4873/1 4877/1 4872/1 +f 4872/1 4877/1 4878/1 +f 4877/1 4879/1 4880/1 +f 4872/1 4878/1 4881/1 +f 4881/1 4878/1 4882/1 +f 4872/1 4881/1 4883/1 +f 4883/1 4881/1 4862/1 +f 4881/1 4882/1 4862/1 +f 4862/1 4882/1 4884/1 +f 4862/1 4859/1 4883/1 +f 4862/1 4884/1 4861/1 +f 4883/1 4859/1 4872/1 +f 4884/1 4885/1 4861/1 +f 4861/1 4885/1 4860/1 +f 4884/1 4886/1 4887/1 +f 4882/1 4880/1 4886/1 +f 4888/1 4887/1 4886/1 +f 4882/1 4886/1 4884/1 +f 4885/1 4887/1 4889/1 +f 4884/1 4887/1 4885/1 +f 4888/1 4889/1 4887/1 +f 4860/1 4885/1 4889/1 +f 4860/1 4889/1 4890/1 +f 4890/1 4889/1 4891/1 +f 4888/1 4892/1 4889/1 +f 4889/1 4892/1 4891/1 +f 4893/1 4892/1 4888/1 +f 4891/1 4892/1 4894/1 +f 4893/1 4894/1 4892/1 +f 4890/1 4891/1 4855/1 +f 4855/1 4891/1 4895/1 +f 4891/1 4894/1 4895/1 +f 4860/1 4890/1 4896/1 +f 4896/1 4890/1 4855/1 +f 4855/1 4853/1 4896/1 +f 4855/1 4895/1 4854/1 +f 4895/1 4897/1 4854/1 +f 4895/1 4894/1 4897/1 +f 4897/1 4894/1 4898/1 +f 4898/1 4894/1 4893/1 +f 4899/1 4898/1 4893/1 +f 4897/1 4898/1 4900/1 +f 4899/1 4901/1 4898/1 +f 4901/1 4900/1 4898/1 +f 4854/1 4897/1 4902/1 +f 4902/1 4897/1 4903/1 +f 4897/1 4900/1 4903/1 +f 4902/1 4850/1 4854/1 +f 4904/1 4850/1 4902/1 +f 4902/1 4903/1 4904/1 +f 4904/1 4903/1 4905/1 +f 4905/1 4903/1 4906/1 +f 4903/1 4900/1 4907/1 +f 4903/1 4907/1 4906/1 +f 4905/1 4850/1 4904/1 +f 4905/1 4846/1 4850/1 +f 4908/1 4846/1 4905/1 +f 4905/1 4906/1 4908/1 +f 4908/1 4906/1 4909/1 +f 4906/1 4910/1 4909/1 +f 4906/1 4907/1 4910/1 +f 4909/1 4846/1 4908/1 +f 4849/1 4846/1 4909/1 +f 4909/1 4910/1 4849/1 +f 4849/1 4910/1 4911/1 +f 4910/1 4907/1 4912/1 +f 4910/1 4912/1 4913/1 +f 4910/1 4913/1 4911/1 +f 4849/1 4911/1 4848/1 +f 4848/1 4911/1 4914/1 +f 4911/1 4913/1 4914/1 +f 4914/1 4913/1 4915/1 +f 4916/1 4915/1 4913/1 +f 4916/1 4913/1 4912/1 +f 4914/1 4915/1 3977/1 +f 3977/1 4915/1 3975/1 +f 4917/1 4915/1 4916/1 +f 4916/1 4918/1 4917/1 +f 4912/1 4918/1 4916/1 +f 4917/1 4919/1 3975/1 +f 4917/1 4918/1 4919/1 +f 4917/1 3975/1 4915/1 +f 4920/1 4919/1 4918/1 +f 4912/1 4921/1 4918/1 +f 4922/1 4918/1 4921/1 +f 4920/1 4918/1 4922/1 +f 3742/1 4919/1 4920/1 +f 3742/1 3973/1 4919/1 +f 3975/1 4919/1 3973/1 +f 3971/1 3973/1 3742/1 +f 3731/1 3971/1 3742/1 +f 3728/1 3969/1 3731/1 +f 3726/1 3969/1 3728/1 +f 3726/1 3727/1 3969/1 +f 4922/1 4921/1 4923/1 +f 2569/1 4920/1 4922/1 +f 4923/1 2573/1 2571/1 +f 4923/1 2571/1 2570/1 +f 4899/1 4923/1 4924/1 +f 4923/1 4921/1 4924/1 +f 4925/1 4899/1 4924/1 +f 4925/1 4924/1 4926/1 +f 4926/1 4924/1 4921/1 +f 4926/1 4921/1 4912/1 +f 4926/1 4912/1 4907/1 +f 4926/1 4907/1 4925/1 +f 4901/1 4899/1 4925/1 +f 4925/1 4907/1 4900/1 +f 4925/1 4900/1 4901/1 +f 3743/1 3742/1 4920/1 +f 3743/1 4920/1 2569/1 +f 2569/1 4922/1 2567/1 +f 2567/1 4922/1 4923/1 +f 2567/1 4923/1 2570/1 +f 4848/1 4914/1 4847/1 +f 4847/1 4914/1 3983/1 +f 3983/1 4914/1 3977/1 +f 4847/1 3983/1 3981/1 +f 3983/1 3977/1 3982/1 +f 3980/1 3977/1 3964/1 +f 4896/1 4853/1 4860/1 +f 4878/1 4880/1 4882/1 +f 4877/1 4880/1 4878/1 +f 4876/1 4879/1 4877/1 +f 4874/1 4867/1 4927/1 +f 4875/1 4874/1 4928/1 +f 4928/1 4874/1 4927/1 +f 4927/1 4867/1 4868/1 +f 4927/1 4868/1 4929/1 +f 4928/1 4927/1 4930/1 +f 4930/1 4927/1 4929/1 +f 4930/1 4931/1 4928/1 +f 4928/1 4931/1 4932/1 +f 4928/1 4932/1 4875/1 +f 4875/1 4933/1 4876/1 +f 4876/1 4877/1 4873/1 +f 4931/1 4934/1 4932/1 +f 4875/1 4932/1 4933/1 +f 4934/1 4933/1 4932/1 +f 4931/1 4935/1 4934/1 +f 4930/1 4935/1 4931/1 +f 4936/1 4937/1 4935/1 +f 4936/1 4935/1 4930/1 +f 4930/1 4929/1 4936/1 +f 4936/1 4929/1 4938/1 +f 4938/1 4937/1 4936/1 +f 4929/1 4868/1 4869/1 +f 4929/1 4869/1 4939/1 +f 4938/1 4929/1 4940/1 +f 4940/1 4929/1 4939/1 +f 4940/1 4941/1 4938/1 +f 4940/1 4939/1 4942/1 +f 4939/1 4869/1 4870/1 +f 4939/1 4870/1 4943/1 +f 4939/1 4943/1 4942/1 +f 4870/1 4266/1 4268/1 +f 4870/1 4268/1 4943/1 +f 4942/1 4941/1 4940/1 +f 4941/1 4942/1 4944/1 +f 4941/1 4944/1 4937/1 +f 4941/1 4937/1 4938/1 +f 4876/1 4933/1 4879/1 +f 4933/1 4254/1 4879/1 +f 4934/1 4256/1 4933/1 +f 4933/1 4256/1 4254/1 +f 4879/1 4254/1 2614/1 +f 4879/1 2614/1 4880/1 +f 2614/1 2616/1 4880/1 +f 2616/1 4886/1 4880/1 +f 2617/1 4886/1 2616/1 +f 2618/1 4888/1 4886/1 +f 2618/1 4886/1 2617/1 +f 4888/1 2618/1 2583/1 +f 4888/1 2583/1 4893/1 +f 4893/1 2583/1 2576/1 +f 4893/1 2576/1 4899/1 +f 4899/1 2576/1 2573/1 +f 4899/1 2573/1 4923/1 +f 4935/1 4258/1 4256/1 +f 4935/1 4256/1 4934/1 +f 4937/1 4258/1 4935/1 +f 4270/1 4258/1 4937/1 +f 4270/1 4937/1 4944/1 +f 4942/1 4270/1 4944/1 +f 4270/1 4942/1 4943/1 +f 4943/1 4268/1 4270/1 +f 4270/1 4268/1 4267/1 +f 4831/1 4832/1 4945/1 +f 4830/1 4831/1 4945/1 +f 4945/1 4832/1 4833/1 +f 4830/1 4945/1 3494/1 +f 3494/1 4945/1 3495/1 +f 3493/1 3495/1 4946/1 +f 4946/1 4947/1 3493/1 +f 3493/1 4947/1 4948/1 +f 3493/1 4948/1 4949/1 +f 4946/1 3495/1 4945/1 +f 4945/1 4947/1 4946/1 +f 4945/1 4833/1 4947/1 +f 4947/1 4833/1 4950/1 +f 4947/1 4950/1 4948/1 +f 4948/1 4950/1 4951/1 +f 4948/1 4951/1 4952/1 +f 4949/1 4948/1 4953/1 +f 4953/1 4948/1 4952/1 +f 4949/1 3491/1 3493/1 +f 3491/1 4949/1 4953/1 +f 4954/1 3491/1 4953/1 +f 4953/1 4952/1 4954/1 +f 4952/1 4951/1 4955/1 +f 4954/1 4952/1 4955/1 +f 3491/1 4954/1 4956/1 +f 4954/1 4955/1 4956/1 +f 4956/1 3489/1 3491/1 +f 4956/1 4955/1 4957/1 +f 4956/1 4957/1 3489/1 +f 4955/1 4951/1 4958/1 +f 4955/1 4958/1 4959/1 +f 4957/1 4955/1 4959/1 +f 4957/1 4959/1 4960/1 +f 3489/1 4957/1 4960/1 +f 3489/1 4960/1 3487/1 +f 4960/1 4959/1 4961/1 +f 4960/1 4961/1 4962/1 +f 4960/1 4962/1 3487/1 +f 4959/1 4958/1 4963/1 +f 4959/1 4963/1 4961/1 +f 4961/1 4963/1 4964/1 +f 4962/1 4961/1 4964/1 +f 4962/1 4964/1 4965/1 +f 3487/1 4962/1 4965/1 +f 4806/1 3487/1 4965/1 +f 4965/1 4964/1 4966/1 +f 4965/1 4966/1 4805/1 +f 4965/1 4805/1 4806/1 +f 4964/1 4963/1 4967/1 +f 4964/1 4967/1 4966/1 +f 4966/1 4967/1 4797/1 +f 4805/1 4966/1 4797/1 +f 4963/1 4810/1 4967/1 +f 4967/1 4810/1 3546/1 +f 4967/1 3546/1 4790/1 +f 4797/1 4967/1 4790/1 +f 4963/1 4811/1 4810/1 +f 4958/1 4817/1 4811/1 +f 4958/1 4811/1 4963/1 +f 4951/1 4817/1 4958/1 +f 4951/1 4833/1 4817/1 +f 4950/1 4833/1 4951/1 +f 4790/1 3546/1 4789/1 +f 3485/1 3487/1 4806/1 +f 4799/1 3485/1 4806/1 +f 3486/1 3576/1 4828/1 +f 4827/1 4828/1 3576/1 +f 3965/1 3970/1 3731/1 +f 3977/1 3976/1 3964/1 +f 2794/1 2796/1 4168/1 +f 4168/1 2796/1 2800/1 +f 3217/1 4469/1 3212/1 +f 3212/1 4469/1 3211/1 +f 2749/1 4056/1 2745/1 +f 2745/1 4056/1 2746/1 +f 3576/1 3486/1 3566/1 +f 3551/1 3566/1 3565/1 +f 3514/1 3518/1 3509/1 +f 4649/1 4537/1 3356/1 +f 4688/1 3460/1 4689/1 +f 4968/1 4969/1 4970/1 +f 4971/1 4972/1 4968/1 +f 4971/1 4968/1 4973/1 +f 4973/1 4968/1 4970/1 +f 4968/1 4974/1 4969/1 +f 4975/1 4972/1 4971/1 +f 4976/1 4975/1 4971/1 +f 4977/1 4978/1 4975/1 +f 4977/1 4975/1 4976/1 +f 4976/1 4971/1 4979/1 +f 4979/1 4971/1 4973/1 +f 4973/1 4970/1 4980/1 +f 4973/1 4980/1 4981/1 +f 4981/1 4980/1 4982/1 +f 4970/1 4983/1 4980/1 +f 4980/1 4983/1 4984/1 +f 4980/1 4984/1 4985/1 +f 4980/1 4985/1 4986/1 +f 4982/1 4980/1 4986/1 +f 4970/1 4969/1 4987/1 +f 4970/1 4987/1 4983/1 +f 4983/1 4988/1 4989/1 +f 4983/1 4989/1 4984/1 +f 4987/1 4988/1 4983/1 +f 4984/1 4989/1 4990/1 +f 4984/1 4990/1 4985/1 +f 4989/1 4991/1 4990/1 +f 4988/1 4992/1 4989/1 +f 4989/1 4992/1 4991/1 +f 4987/1 4993/1 4988/1 +f 4969/1 4993/1 4987/1 +f 4969/1 4994/1 4993/1 +f 4974/1 4994/1 4969/1 +f 4995/1 4996/1 4991/1 +f 4990/1 4991/1 4996/1 +f 4991/1 4992/1 4997/1 +f 4997/1 4995/1 4991/1 +f 4996/1 4995/1 4998/1 +f 4997/1 4999/1 4995/1 +f 4998/1 4995/1 5000/1 +f 5001/1 4996/1 4998/1 +f 4990/1 4996/1 5001/1 +f 5001/1 4998/1 5002/1 +f 5000/1 5003/1 4998/1 +f 5002/1 4998/1 5003/1 +f 5004/1 5005/1 5000/1 +f 5000/1 5005/1 5003/1 +f 5006/1 5003/1 5005/1 +f 5002/1 5003/1 5006/1 +f 4985/1 5001/1 5002/1 +f 4985/1 5002/1 5007/1 +f 5007/1 5002/1 5006/1 +f 4985/1 4990/1 5001/1 +f 4986/1 4985/1 5007/1 +f 4986/1 5007/1 5008/1 +f 5007/1 5006/1 5008/1 +f 5008/1 5006/1 5009/1 +f 5006/1 5005/1 5009/1 +f 5009/1 5005/1 5010/1 +f 5004/1 5010/1 5005/1 +f 5008/1 5009/1 5011/1 +f 5011/1 5009/1 5010/1 +f 4986/1 5008/1 5012/1 +f 5012/1 5008/1 5011/1 +f 4982/1 4986/1 5012/1 +f 5012/1 5011/1 5013/1 +f 5012/1 5013/1 5014/1 +f 4982/1 5012/1 5015/1 +f 5015/1 5012/1 5014/1 +f 5011/1 5010/1 5013/1 +f 5013/1 5010/1 5016/1 +f 5016/1 5010/1 5004/1 +f 5014/1 5013/1 5017/1 +f 5013/1 5016/1 5018/1 +f 5013/1 5018/1 5017/1 +f 5014/1 5017/1 5019/1 +f 5015/1 5014/1 5020/1 +f 5020/1 5014/1 5019/1 +f 5019/1 5017/1 5021/1 +f 5017/1 5022/1 5023/1 +f 5017/1 5018/1 5022/1 +f 5017/1 5023/1 5021/1 +f 5018/1 5024/1 5022/1 +f 5016/1 5024/1 5018/1 +f 5004/1 5024/1 5016/1 +f 5023/1 5024/1 5025/1 +f 5022/1 5024/1 5023/1 +f 5025/1 5026/1 5023/1 +f 5021/1 5023/1 5026/1 +f 5019/1 5021/1 5027/1 +f 5021/1 5026/1 5027/1 +f 5027/1 5026/1 5028/1 +f 5026/1 5025/1 5028/1 +f 5028/1 5025/1 5029/1 +f 5029/1 5025/1 5030/1 +f 5027/1 5028/1 5029/1 +f 5019/1 5027/1 5031/1 +f 5031/1 5027/1 5032/1 +f 5027/1 5029/1 5032/1 +f 5032/1 5029/1 5033/1 +f 5030/1 5033/1 5029/1 +f 5033/1 5030/1 5034/1 +f 5030/1 5035/1 5034/1 +f 5033/1 5034/1 5036/1 +f 5032/1 5033/1 5036/1 +f 5031/1 5032/1 5036/1 +f 5037/1 5019/1 5031/1 +f 5031/1 5036/1 5038/1 +f 5031/1 5038/1 5037/1 +f 5034/1 5039/1 5036/1 +f 5036/1 5039/1 5040/1 +f 5036/1 5040/1 5038/1 +f 5034/1 5035/1 5039/1 +f 5039/1 5041/1 5040/1 +f 5041/1 5042/1 5040/1 +f 5040/1 5042/1 5043/1 +f 5038/1 5040/1 5043/1 +f 5037/1 5038/1 5043/1 +f 5037/1 5043/1 5044/1 +f 5020/1 5019/1 5037/1 +f 5045/1 5020/1 5037/1 +f 5046/1 5020/1 5045/1 +f 5046/1 5015/1 5020/1 +f 5047/1 5015/1 5046/1 +f 5048/1 4982/1 5015/1 +f 5048/1 5015/1 5047/1 +f 5049/1 4982/1 5048/1 +f 5049/1 4981/1 4982/1 +f 5050/1 4981/1 5049/1 +f 5050/1 4973/1 4981/1 +f 5051/1 4973/1 5050/1 +f 4979/1 4973/1 5051/1 +f 5041/1 5052/1 5042/1 +f 4999/1 5053/1 5054/1 +f 4999/1 5054/1 5055/1 +f 4999/1 4997/1 5053/1 +f 4997/1 4992/1 5053/1 +f 4994/1 5054/1 4993/1 +f 5054/1 4994/1 5055/1 +f 4993/1 5054/1 5053/1 +f 4993/1 5053/1 4988/1 +f 4988/1 5053/1 4992/1 +f 5056/1 4978/1 4977/1 +f 5056/1 5057/1 4978/1 +f 5058/1 5057/1 5056/1 +f 5058/1 5059/1 5057/1 +f 5060/1 5059/1 5058/1 +f 5061/1 5062/1 5060/1 +f 5061/1 5060/1 5063/1 +f 5063/1 5060/1 5058/1 +f 5064/1 5065/1 5062/1 +f 5064/1 5062/1 5061/1 +f 5066/1 5065/1 5064/1 +f 5067/1 5066/1 5064/1 +f 5067/1 5064/1 5068/1 +f 5068/1 5064/1 5069/1 +f 5069/1 5064/1 5061/1 +f 5066/1 5070/1 5065/1 +f 5071/1 5072/1 5070/1 +f 5073/1 5070/1 5066/1 +f 5074/1 5071/1 5075/1 +f 5075/1 5071/1 5073/1 +f 5075/1 5073/1 5076/1 +f 5076/1 5073/1 5077/1 +f 5077/1 5073/1 5066/1 +f 5076/1 5078/1 5075/1 +f 5075/1 5079/1 5074/1 +f 5075/1 5080/1 5079/1 +f 5074/1 5079/1 5081/1 +f 5079/1 5082/1 5081/1 +f 5079/1 5080/1 5082/1 +f 5082/1 5083/1 5081/1 +f 5078/1 5080/1 5075/1 +f 5080/1 5084/1 5082/1 +f 5078/1 5085/1 5080/1 +f 5080/1 5085/1 5086/1 +f 5082/1 5084/1 5083/1 +f 5087/1 5083/1 5084/1 +f 5087/1 5084/1 5086/1 +f 5080/1 5086/1 5084/1 +f 5086/1 5088/1 5087/1 +f 5086/1 5089/1 5088/1 +f 5090/1 5089/1 5086/1 +f 5090/1 5086/1 5085/1 +f 5087/1 5088/1 5091/1 +f 5090/1 5085/1 5092/1 +f 5092/1 5085/1 5093/1 +f 5092/1 5094/1 5090/1 +f 5090/1 5094/1 5089/1 +f 5095/1 5089/1 5094/1 +f 5096/1 5094/1 5097/1 +f 5092/1 5097/1 5094/1 +f 5095/1 5094/1 5096/1 +f 5098/1 5097/1 5092/1 +f 5099/1 5100/1 5093/1 +f 5099/1 5093/1 5077/1 +f 5077/1 5093/1 5078/1 +f 5092/1 5093/1 5101/1 +f 5078/1 5093/1 5085/1 +f 5100/1 5101/1 5093/1 +f 5077/1 5066/1 5099/1 +f 5077/1 5078/1 5076/1 +f 5099/1 5066/1 5067/1 +f 5068/1 5100/1 5067/1 +f 5067/1 5100/1 5099/1 +f 5069/1 5102/1 5068/1 +f 5068/1 5102/1 5100/1 +f 5069/1 5061/1 5103/1 +f 5103/1 5102/1 5069/1 +f 5103/1 5104/1 5102/1 +f 5102/1 5105/1 5100/1 +f 5102/1 5104/1 5105/1 +f 5100/1 5105/1 5101/1 +f 5098/1 5105/1 5106/1 +f 5098/1 5101/1 5105/1 +f 5106/1 5105/1 5104/1 +f 5092/1 5101/1 5098/1 +f 5106/1 5107/1 5098/1 +f 5106/1 5104/1 5108/1 +f 5108/1 5109/1 5106/1 +f 5106/1 5109/1 5107/1 +f 5110/1 5107/1 5109/1 +f 5097/1 5107/1 5110/1 +f 5108/1 5111/1 5109/1 +f 5110/1 5109/1 5111/1 +f 5108/1 5112/1 5113/1 +f 5113/1 5111/1 5108/1 +f 5108/1 5104/1 5112/1 +f 5114/1 5111/1 5115/1 +f 5113/1 5115/1 5111/1 +f 5116/1 5113/1 5117/1 +f 5116/1 5115/1 5113/1 +f 5118/1 5117/1 5113/1 +f 5118/1 5113/1 5112/1 +f 5118/1 5112/1 5104/1 +f 5119/1 5118/1 5104/1 +f 5119/1 5104/1 5103/1 +f 5120/1 5121/1 5118/1 +f 5120/1 5118/1 5122/1 +f 5122/1 5118/1 5119/1 +f 5121/1 5117/1 5118/1 +f 5122/1 5119/1 5123/1 +f 5123/1 5119/1 5103/1 +f 5103/1 5061/1 5123/1 +f 5123/1 5061/1 5122/1 +f 5122/1 5061/1 5063/1 +f 5063/1 5120/1 5122/1 +f 5124/1 5120/1 5063/1 +f 5124/1 5121/1 5120/1 +f 5063/1 5058/1 5125/1 +f 5063/1 5125/1 5124/1 +f 5124/1 5125/1 5126/1 +f 5126/1 5121/1 5124/1 +f 5125/1 5058/1 5056/1 +f 5125/1 5056/1 5127/1 +f 5126/1 5125/1 5128/1 +f 5128/1 5125/1 5127/1 +f 5128/1 5129/1 5126/1 +f 5126/1 5129/1 5121/1 +f 5128/1 5127/1 5130/1 +f 5130/1 5131/1 5128/1 +f 5128/1 5131/1 5129/1 +f 5130/1 5127/1 5132/1 +f 5132/1 5127/1 5133/1 +f 5133/1 5127/1 5134/1 +f 5132/1 5135/1 5130/1 +f 5135/1 5131/1 5130/1 +f 5133/1 5135/1 5132/1 +f 5133/1 5134/1 5136/1 +f 5136/1 5137/1 5133/1 +f 5133/1 5137/1 5135/1 +f 5136/1 5134/1 5138/1 +f 5138/1 5134/1 5139/1 +f 5139/1 5134/1 5140/1 +f 5138/1 5137/1 5136/1 +f 5138/1 5141/1 5137/1 +f 5139/1 5141/1 5138/1 +f 5139/1 5140/1 5142/1 +f 5142/1 5143/1 5139/1 +f 5134/1 4976/1 5140/1 +f 5140/1 4976/1 4979/1 +f 5140/1 4979/1 5144/1 +f 5127/1 4977/1 5134/1 +f 5134/1 4977/1 4976/1 +f 5127/1 5056/1 4977/1 +f 5144/1 4979/1 5051/1 +f 5145/1 5144/1 5051/1 +f 5051/1 5050/1 5146/1 +f 5131/1 5147/1 5148/1 +f 5131/1 5148/1 5129/1 +f 5131/1 5149/1 5147/1 +f 5135/1 5149/1 5131/1 +f 5150/1 5148/1 5147/1 +f 5150/1 5117/1 5148/1 +f 5129/1 5148/1 5121/1 +f 5121/1 5148/1 5117/1 +f 5116/1 5117/1 5150/1 +f 5147/1 5151/1 5150/1 +f 5150/1 5151/1 5116/1 +f 5116/1 5151/1 5115/1 +f 5147/1 5152/1 5151/1 +f 5153/1 5151/1 5152/1 +f 5154/1 5115/1 5151/1 +f 5154/1 5151/1 5153/1 +f 5114/1 5115/1 5154/1 +f 5153/1 5152/1 5155/1 +f 5156/1 5157/1 5152/1 +f 5156/1 5152/1 5147/1 +f 5155/1 5152/1 5157/1 +f 5158/1 5155/1 5157/1 +f 5159/1 5157/1 5156/1 +f 5159/1 5158/1 5157/1 +f 5156/1 5147/1 5149/1 +f 5156/1 5149/1 5159/1 +f 5159/1 5160/1 5161/1 +f 5161/1 5158/1 5159/1 +f 5159/1 5149/1 5160/1 +f 5158/1 5161/1 5162/1 +f 5161/1 5160/1 5162/1 +f 5141/1 5162/1 5160/1 +f 5141/1 5160/1 5137/1 +f 5137/1 5149/1 5135/1 +f 5137/1 5160/1 5149/1 +f 5163/1 5096/1 5097/1 +f 5097/1 5110/1 5114/1 +f 5164/1 5096/1 5163/1 +f 5164/1 5095/1 5096/1 +f 5095/1 5165/1 5166/1 +f 5165/1 5167/1 5168/1 +f 5165/1 5095/1 5169/1 +f 5166/1 5165/1 5168/1 +f 5166/1 5168/1 5170/1 +f 5168/1 5171/1 5172/1 +f 5168/1 5167/1 5171/1 +f 5170/1 5168/1 5172/1 +f 5167/1 5173/1 5171/1 +f 5167/1 5174/1 5173/1 +f 5172/1 5171/1 5175/1 +f 5171/1 5173/1 5176/1 +f 5171/1 5176/1 5175/1 +f 5177/1 5172/1 5175/1 +f 5177/1 5175/1 5178/1 +f 5178/1 5175/1 5176/1 +f 5173/1 5179/1 5176/1 +f 5173/1 5180/1 5179/1 +f 5176/1 5179/1 5181/1 +f 5178/1 5176/1 5181/1 +f 5178/1 5181/1 5182/1 +f 5183/1 5178/1 5182/1 +f 5184/1 5183/1 5182/1 +f 5185/1 5186/1 5183/1 +f 5186/1 5187/1 5183/1 +f 5183/1 5187/1 5178/1 +f 5188/1 5185/1 5183/1 +f 5188/1 5183/1 5184/1 +f 5189/1 5186/1 5185/1 +f 5190/1 5189/1 5185/1 +f 5190/1 5185/1 5188/1 +f 5191/1 5190/1 5188/1 +f 5191/1 5188/1 5184/1 +f 5192/1 5189/1 5190/1 +f 5193/1 5192/1 5190/1 +f 5193/1 5190/1 5191/1 +f 5194/1 5195/1 5189/1 +f 5189/1 5195/1 5186/1 +f 5192/1 5194/1 5189/1 +f 5196/1 5194/1 5192/1 +f 5193/1 5196/1 5192/1 +f 5197/1 5196/1 5193/1 +f 5198/1 5197/1 5193/1 +f 5198/1 5193/1 5199/1 +f 5199/1 5193/1 5191/1 +f 5200/1 5201/1 5196/1 +f 5196/1 5201/1 5194/1 +f 5197/1 5200/1 5196/1 +f 5202/1 5200/1 5197/1 +f 5203/1 5202/1 5197/1 +f 5203/1 5197/1 5198/1 +f 5204/1 5203/1 5198/1 +f 5205/1 5203/1 5204/1 +f 5205/1 5206/1 5203/1 +f 5207/1 5206/1 5205/1 +f 5207/1 5208/1 5206/1 +f 5206/1 5209/1 5203/1 +f 5203/1 5209/1 5202/1 +f 5210/1 5211/1 5209/1 +f 5209/1 5211/1 5212/1 +f 5209/1 5212/1 5213/1 +f 5209/1 5213/1 5202/1 +f 5206/1 5210/1 5209/1 +f 5214/1 5215/1 5210/1 +f 5210/1 5215/1 5211/1 +f 5206/1 5214/1 5210/1 +f 5208/1 5214/1 5206/1 +f 5216/1 5217/1 5214/1 +f 5214/1 5217/1 5218/1 +f 5214/1 5218/1 5215/1 +f 5208/1 5216/1 5214/1 +f 5218/1 5219/1 5215/1 +f 5215/1 5219/1 5220/1 +f 5215/1 5220/1 5211/1 +f 5217/1 5221/1 5218/1 +f 5218/1 5221/1 5219/1 +f 5221/1 5222/1 5219/1 +f 5219/1 5223/1 5220/1 +f 5222/1 5224/1 5219/1 +f 5219/1 5224/1 5223/1 +f 5220/1 5225/1 5226/1 +f 5220/1 5223/1 5225/1 +f 5211/1 5220/1 5226/1 +f 5211/1 5226/1 5212/1 +f 5226/1 5225/1 5227/1 +f 5212/1 5226/1 5228/1 +f 5226/1 5227/1 5228/1 +f 5223/1 5229/1 5225/1 +f 5225/1 5229/1 5230/1 +f 5225/1 5230/1 5227/1 +f 5228/1 5227/1 5231/1 +f 5227/1 5230/1 5232/1 +f 5227/1 5232/1 5233/1 +f 5227/1 5233/1 5231/1 +f 5212/1 5228/1 5213/1 +f 5213/1 5228/1 5231/1 +f 5231/1 5234/1 5235/1 +f 5231/1 5233/1 5234/1 +f 5213/1 5231/1 5236/1 +f 5236/1 5231/1 5235/1 +f 5233/1 5232/1 5237/1 +f 5233/1 5237/1 5234/1 +f 5235/1 5234/1 5238/1 +f 5234/1 5237/1 5239/1 +f 5234/1 5239/1 5238/1 +f 5235/1 5238/1 5201/1 +f 5236/1 5235/1 5200/1 +f 5200/1 5235/1 5201/1 +f 5202/1 5213/1 5236/1 +f 5202/1 5236/1 5200/1 +f 5201/1 5238/1 5240/1 +f 5201/1 5240/1 5194/1 +f 5238/1 5241/1 5240/1 +f 5240/1 5241/1 5242/1 +f 5194/1 5240/1 5242/1 +f 5194/1 5242/1 5195/1 +f 5242/1 5241/1 5195/1 +f 5238/1 5243/1 5241/1 +f 5241/1 5243/1 5244/1 +f 5241/1 5244/1 5195/1 +f 5195/1 5244/1 5245/1 +f 5195/1 5245/1 5186/1 +f 5243/1 5246/1 5244/1 +f 5244/1 5246/1 5247/1 +f 5244/1 5247/1 5245/1 +f 5239/1 5248/1 5243/1 +f 5243/1 5248/1 5246/1 +f 5238/1 5239/1 5243/1 +f 5248/1 5249/1 5246/1 +f 5246/1 5249/1 5247/1 +f 5247/1 5249/1 5250/1 +f 5247/1 5250/1 5251/1 +f 5245/1 5247/1 5251/1 +f 5248/1 5252/1 5249/1 +f 5253/1 5252/1 5248/1 +f 5237/1 5253/1 5248/1 +f 5237/1 5248/1 5239/1 +f 5254/1 5255/1 5252/1 +f 5254/1 5252/1 5253/1 +f 5232/1 5254/1 5253/1 +f 5232/1 5253/1 5237/1 +f 5256/1 5255/1 5254/1 +f 5229/1 5256/1 5254/1 +f 5229/1 5254/1 5230/1 +f 5230/1 5254/1 5232/1 +f 5257/1 5258/1 5255/1 +f 5257/1 5255/1 5256/1 +f 5259/1 5257/1 5256/1 +f 5259/1 5256/1 5229/1 +f 5223/1 5259/1 5229/1 +f 5260/1 5257/1 5259/1 +f 5224/1 5260/1 5259/1 +f 5224/1 5259/1 5223/1 +f 5261/1 5258/1 5257/1 +f 5262/1 5261/1 5257/1 +f 5262/1 5257/1 5260/1 +f 5261/1 5263/1 5258/1 +f 5264/1 5265/1 5261/1 +f 5264/1 5261/1 5262/1 +f 5266/1 5264/1 5262/1 +f 5266/1 5262/1 5222/1 +f 5222/1 5262/1 5260/1 +f 5222/1 5260/1 5224/1 +f 5267/1 5266/1 5222/1 +f 5267/1 5222/1 5221/1 +f 5268/1 5264/1 5266/1 +f 5269/1 5268/1 5266/1 +f 5269/1 5266/1 5267/1 +f 5270/1 5265/1 5264/1 +f 5268/1 5270/1 5264/1 +f 5270/1 5271/1 5265/1 +f 5272/1 5271/1 5270/1 +f 5273/1 5272/1 5270/1 +f 5273/1 5270/1 5268/1 +f 5273/1 5268/1 5274/1 +f 5274/1 5268/1 5269/1 +f 5275/1 5273/1 5276/1 +f 5276/1 5273/1 5274/1 +f 5275/1 5277/1 5273/1 +f 5278/1 5274/1 5269/1 +f 5279/1 5276/1 5278/1 +f 5278/1 5276/1 5274/1 +f 5278/1 5269/1 5280/1 +f 5281/1 5279/1 5278/1 +f 5281/1 5278/1 5216/1 +f 5216/1 5278/1 5280/1 +f 5279/1 5275/1 5276/1 +f 5282/1 5283/1 5275/1 +f 5282/1 5275/1 5279/1 +f 5284/1 5283/1 5282/1 +f 5285/1 5284/1 5282/1 +f 5285/1 5282/1 5286/1 +f 5286/1 5282/1 5279/1 +f 5284/1 5287/1 5283/1 +f 5288/1 5287/1 5284/1 +f 5285/1 5288/1 5284/1 +f 5289/1 5288/1 5285/1 +f 5290/1 5289/1 5285/1 +f 5290/1 5285/1 5291/1 +f 5291/1 5285/1 5286/1 +f 5286/1 5279/1 5281/1 +f 5291/1 5286/1 5281/1 +f 5291/1 5281/1 5292/1 +f 5292/1 5281/1 5216/1 +f 5293/1 5291/1 5294/1 +f 5293/1 5290/1 5291/1 +f 5294/1 5291/1 5292/1 +f 5295/1 5290/1 5293/1 +f 5295/1 5296/1 5290/1 +f 5297/1 5296/1 5295/1 +f 5297/1 5298/1 5296/1 +f 5299/1 5298/1 5297/1 +f 5299/1 5300/1 5298/1 +f 5301/1 5300/1 5299/1 +f 5302/1 5301/1 5299/1 +f 5303/1 5304/1 5301/1 +f 5305/1 5304/1 5303/1 +f 5303/1 5301/1 5302/1 +f 5305/1 5306/1 5304/1 +f 5307/1 5308/1 5306/1 +f 5307/1 5306/1 5305/1 +f 5309/1 5308/1 5307/1 +f 5310/1 5309/1 5307/1 +f 5310/1 5307/1 5311/1 +f 5311/1 5307/1 5305/1 +f 5312/1 5309/1 5313/1 +f 5313/1 5309/1 5314/1 +f 5314/1 5309/1 5310/1 +f 5311/1 5315/1 5310/1 +f 5310/1 5315/1 5316/1 +f 5310/1 5316/1 5314/1 +f 5316/1 5317/1 5314/1 +f 5314/1 5317/1 5313/1 +f 5313/1 5317/1 5318/1 +f 5313/1 5318/1 5312/1 +f 5312/1 5318/1 5319/1 +f 5320/1 5318/1 5317/1 +f 5321/1 5319/1 5318/1 +f 5320/1 5317/1 5322/1 +f 5322/1 5317/1 5316/1 +f 5322/1 5316/1 5323/1 +f 5324/1 5322/1 5325/1 +f 5325/1 5322/1 5323/1 +f 5326/1 5324/1 5325/1 +f 5326/1 5320/1 5324/1 +f 5324/1 5320/1 5322/1 +f 5325/1 5323/1 5327/1 +f 5326/1 5325/1 5328/1 +f 5328/1 5325/1 5327/1 +f 5329/1 5326/1 5330/1 +f 5329/1 5331/1 5326/1 +f 5331/1 5320/1 5326/1 +f 5330/1 5326/1 5328/1 +f 5328/1 5327/1 5332/1 +f 5333/1 5328/1 5332/1 +f 5330/1 5328/1 5333/1 +f 5332/1 5327/1 5334/1 +f 5327/1 5323/1 5334/1 +f 5332/1 5335/1 5336/1 +f 5332/1 5334/1 5335/1 +f 5333/1 5332/1 5337/1 +f 5337/1 5332/1 5336/1 +f 5323/1 5338/1 5334/1 +f 5334/1 5339/1 5335/1 +f 5334/1 5338/1 5339/1 +f 5323/1 5315/1 5338/1 +f 5323/1 5316/1 5315/1 +f 5311/1 5338/1 5315/1 +f 5340/1 5338/1 5311/1 +f 5311/1 5305/1 5340/1 +f 5341/1 5338/1 5340/1 +f 5340/1 5305/1 5341/1 +f 5341/1 5342/1 5338/1 +f 5339/1 5338/1 5342/1 +f 5339/1 5342/1 5343/1 +f 5335/1 5339/1 5343/1 +f 5344/1 5345/1 5342/1 +f 5344/1 5342/1 5346/1 +f 5346/1 5342/1 5341/1 +f 5343/1 5342/1 5345/1 +f 5341/1 5305/1 5346/1 +f 5346/1 5305/1 5303/1 +f 5346/1 5303/1 5344/1 +f 5347/1 5345/1 5344/1 +f 5344/1 5303/1 5347/1 +f 5343/1 5345/1 5348/1 +f 5349/1 5350/1 5345/1 +f 5349/1 5345/1 5347/1 +f 5348/1 5345/1 5350/1 +f 5335/1 5343/1 5348/1 +f 5336/1 5335/1 5348/1 +f 5336/1 5348/1 5351/1 +f 5351/1 5348/1 5352/1 +f 5352/1 5348/1 5350/1 +f 5353/1 5354/1 5350/1 +f 5353/1 5350/1 5349/1 +f 5352/1 5350/1 5354/1 +f 5352/1 5354/1 5355/1 +f 5356/1 5352/1 5357/1 +f 5357/1 5352/1 5355/1 +f 5351/1 5352/1 5356/1 +f 5358/1 5354/1 5359/1 +f 5359/1 5354/1 5353/1 +f 5355/1 5354/1 5358/1 +f 5349/1 5302/1 5353/1 +f 5353/1 5302/1 5359/1 +f 5360/1 5358/1 5359/1 +f 5359/1 5302/1 5360/1 +f 5360/1 5361/1 5358/1 +f 5355/1 5358/1 5362/1 +f 5362/1 5358/1 5361/1 +f 5363/1 5361/1 5360/1 +f 5360/1 5302/1 5364/1 +f 5360/1 5364/1 5363/1 +f 5302/1 5299/1 5364/1 +f 5349/1 5303/1 5302/1 +f 5364/1 5299/1 5297/1 +f 5364/1 5297/1 5365/1 +f 5363/1 5364/1 5365/1 +f 5365/1 5297/1 5295/1 +f 5365/1 5295/1 5366/1 +f 5363/1 5365/1 5367/1 +f 5367/1 5365/1 5368/1 +f 5368/1 5365/1 5369/1 +f 5369/1 5365/1 5366/1 +f 5366/1 5295/1 5293/1 +f 5366/1 5293/1 5370/1 +f 5370/1 5293/1 5294/1 +f 5371/1 5366/1 5370/1 +f 5371/1 5370/1 5372/1 +f 5369/1 5366/1 5373/1 +f 5373/1 5366/1 5374/1 +f 5374/1 5366/1 5371/1 +f 5371/1 5375/1 5374/1 +f 5374/1 5375/1 5373/1 +f 5373/1 5375/1 5376/1 +f 5373/1 5376/1 5369/1 +f 5369/1 5376/1 5368/1 +f 5368/1 5376/1 5377/1 +f 5368/1 5377/1 5367/1 +f 5367/1 5377/1 5363/1 +f 5363/1 5377/1 5361/1 +f 5362/1 5361/1 5377/1 +f 5378/1 5362/1 5379/1 +f 5380/1 5355/1 5362/1 +f 5362/1 5377/1 5379/1 +f 5380/1 5362/1 5378/1 +f 5379/1 5377/1 5381/1 +f 5381/1 5377/1 5376/1 +f 5379/1 5381/1 5382/1 +f 5383/1 5378/1 5379/1 +f 5383/1 5379/1 5382/1 +f 5384/1 5378/1 5383/1 +f 5384/1 5380/1 5378/1 +f 5383/1 5382/1 5385/1 +f 5386/1 5384/1 5383/1 +f 5386/1 5383/1 5387/1 +f 5387/1 5383/1 5385/1 +f 5382/1 5381/1 5388/1 +f 5382/1 5388/1 5389/1 +f 5385/1 5382/1 5389/1 +f 5381/1 5376/1 5388/1 +f 5388/1 5376/1 5375/1 +f 5388/1 5375/1 5389/1 +f 5390/1 5384/1 5386/1 +f 5356/1 5380/1 5384/1 +f 5390/1 5356/1 5384/1 +f 5391/1 5356/1 5390/1 +f 5391/1 5351/1 5356/1 +f 5356/1 5357/1 5380/1 +f 5357/1 5355/1 5380/1 +f 5337/1 5336/1 5351/1 +f 5337/1 5351/1 5391/1 +f 5347/1 5303/1 5349/1 +f 5331/1 5321/1 5320/1 +f 5320/1 5321/1 5318/1 +f 5392/1 5393/1 5331/1 +f 5393/1 5321/1 5331/1 +f 5392/1 5331/1 5329/1 +f 5394/1 5292/1 5208/1 +f 5294/1 5292/1 5394/1 +f 5292/1 5216/1 5208/1 +f 5394/1 5208/1 5207/1 +f 5216/1 5280/1 5217/1 +f 5280/1 5269/1 5267/1 +f 5280/1 5267/1 5217/1 +f 5217/1 5267/1 5221/1 +f 5283/1 5277/1 5275/1 +f 5277/1 5272/1 5273/1 +f 5283/1 5395/1 5277/1 +f 5277/1 5396/1 5272/1 +f 5395/1 5396/1 5277/1 +f 5251/1 5397/1 5172/1 +f 5251/1 5172/1 5177/1 +f 5251/1 5250/1 5397/1 +f 5245/1 5251/1 5398/1 +f 5398/1 5251/1 5177/1 +f 5170/1 5172/1 5397/1 +f 5187/1 5398/1 5177/1 +f 5187/1 5177/1 5178/1 +f 5186/1 5245/1 5398/1 +f 5186/1 5398/1 5187/1 +f 5191/1 5184/1 5399/1 +f 5199/1 5191/1 5400/1 +f 5400/1 5191/1 5399/1 +f 5184/1 5182/1 5401/1 +f 5399/1 5184/1 5401/1 +f 5399/1 5401/1 5402/1 +f 5399/1 5402/1 5403/1 +f 5400/1 5399/1 5403/1 +f 5182/1 5181/1 5401/1 +f 5401/1 5179/1 5404/1 +f 5401/1 5181/1 5179/1 +f 5401/1 5404/1 5402/1 +f 5404/1 5179/1 5180/1 +f 5174/1 5180/1 5173/1 +f 5174/1 5405/1 5180/1 +f 5169/1 5095/1 5164/1 +f 5110/1 5111/1 5114/1 +f 5406/1 5407/1 5408/1 +f 5407/1 5406/1 5409/1 +f 5409/1 5406/1 5410/1 +f 5411/1 5412/1 5407/1 +f 5411/1 5407/1 5409/1 +f 5412/1 5408/1 5407/1 +f 5413/1 5414/1 5408/1 +f 5413/1 5408/1 5412/1 +f 5415/1 5413/1 5412/1 +f 5415/1 5412/1 5411/1 +f 5409/1 5416/1 5411/1 +f 5411/1 5416/1 5417/1 +f 5411/1 5417/1 5415/1 +f 5415/1 5417/1 5418/1 +f 5415/1 5418/1 5419/1 +f 5419/1 5413/1 5415/1 +f 5419/1 5414/1 5413/1 +f 5420/1 5421/1 5414/1 +f 5420/1 5414/1 5419/1 +f 5419/1 5418/1 5422/1 +f 5419/1 5422/1 5420/1 +f 5417/1 5046/1 5418/1 +f 5418/1 5046/1 5045/1 +f 5418/1 5045/1 5422/1 +f 5416/1 5047/1 5417/1 +f 5417/1 5047/1 5046/1 +f 5416/1 5048/1 5047/1 +f 5423/1 5049/1 5048/1 +f 5423/1 5048/1 5416/1 +f 5424/1 5049/1 5423/1 +f 5425/1 5424/1 5423/1 +f 5425/1 5423/1 5426/1 +f 5426/1 5423/1 5416/1 +f 5146/1 5050/1 5049/1 +f 5146/1 5049/1 5424/1 +f 5427/1 5146/1 5424/1 +f 5427/1 5424/1 5428/1 +f 5428/1 5424/1 5425/1 +f 5429/1 5051/1 5146/1 +f 5429/1 5146/1 5427/1 +f 5145/1 5051/1 5429/1 +f 5427/1 5430/1 5429/1 +f 5430/1 5431/1 5429/1 +f 5429/1 5431/1 5145/1 +f 5432/1 5144/1 5145/1 +f 5145/1 5433/1 5432/1 +f 5145/1 5431/1 5433/1 +f 5430/1 5434/1 5431/1 +f 5431/1 5435/1 5433/1 +f 5431/1 5434/1 5435/1 +f 5427/1 5436/1 5430/1 +f 5436/1 5434/1 5430/1 +f 5437/1 5435/1 5434/1 +f 5436/1 5438/1 5434/1 +f 5437/1 5439/1 5435/1 +f 5433/1 5435/1 5439/1 +f 5433/1 5440/1 5142/1 +f 5433/1 5439/1 5440/1 +f 5142/1 5440/1 5143/1 +f 5440/1 5439/1 5441/1 +f 5440/1 5441/1 5143/1 +f 5442/1 5439/1 5437/1 +f 5442/1 5441/1 5439/1 +f 5162/1 5441/1 5442/1 +f 5141/1 5441/1 5162/1 +f 5143/1 5441/1 5141/1 +f 5158/1 5162/1 5442/1 +f 5143/1 5141/1 5139/1 +f 5443/1 5444/1 5438/1 +f 5443/1 5438/1 5436/1 +f 5425/1 5410/1 5443/1 +f 5425/1 5443/1 5445/1 +f 5445/1 5443/1 5436/1 +f 5410/1 5444/1 5443/1 +f 5406/1 5444/1 5410/1 +f 5409/1 5410/1 5426/1 +f 5426/1 5410/1 5425/1 +f 5425/1 5445/1 5428/1 +f 5428/1 5445/1 5427/1 +f 5445/1 5436/1 5427/1 +f 5426/1 5416/1 5409/1 +f 5432/1 5433/1 5142/1 +f 5142/1 5144/1 5432/1 +f 5142/1 5140/1 5144/1 +f 5422/1 5045/1 5446/1 +f 5422/1 5446/1 5447/1 +f 5420/1 5422/1 5448/1 +f 5448/1 5422/1 5449/1 +f 5449/1 5422/1 5447/1 +f 5045/1 5037/1 5446/1 +f 5447/1 5446/1 5044/1 +f 5446/1 5037/1 5044/1 +f 5449/1 5447/1 5450/1 +f 5044/1 5451/1 5447/1 +f 5450/1 5447/1 5451/1 +f 5449/1 5452/1 5448/1 +f 5448/1 5421/1 5420/1 +f 5043/1 5451/1 5044/1 +f 5453/1 5454/1 5455/1 +f 5456/1 5457/1 5453/1 +f 5457/1 5458/1 5453/1 +f 5453/1 5458/1 5454/1 +f 5453/1 5459/1 5460/1 +f 5453/1 5455/1 5459/1 +f 5461/1 5457/1 5456/1 +f 5461/1 5462/1 5457/1 +f 5462/1 5463/1 5457/1 +f 5457/1 5463/1 5458/1 +f 5464/1 5458/1 5465/1 +f 5458/1 5463/1 5465/1 +f 5454/1 5458/1 5464/1 +f 5462/1 5466/1 5463/1 +f 5463/1 5466/1 5467/1 +f 5465/1 5463/1 5468/1 +f 5468/1 5463/1 5467/1 +f 5465/1 5468/1 5469/1 +f 5464/1 5465/1 5470/1 +f 5470/1 5465/1 5469/1 +f 5468/1 5467/1 5471/1 +f 5469/1 5468/1 5471/1 +f 5471/1 5467/1 5472/1 +f 5467/1 5466/1 5473/1 +f 5467/1 5473/1 5472/1 +f 5462/1 5473/1 5466/1 +f 5474/1 5475/1 5473/1 +f 5472/1 5473/1 5475/1 +f 5474/1 5473/1 5462/1 +f 5474/1 5476/1 5477/1 +f 5477/1 5475/1 5474/1 +f 5478/1 5474/1 5462/1 +f 5478/1 5476/1 5474/1 +f 5462/1 5461/1 5478/1 +f 5478/1 5461/1 5479/1 +f 5478/1 5479/1 5480/1 +f 5478/1 5480/1 5481/1 +f 5482/1 5481/1 5480/1 +f 5482/1 5483/1 5481/1 +f 5484/1 5483/1 5482/1 +f 5484/1 5485/1 5483/1 +f 5483/1 5485/1 5486/1 +f 5486/1 5485/1 5487/1 +f 5486/1 5487/1 5488/1 +f 5488/1 5487/1 5489/1 +f 5490/1 5491/1 5488/1 +f 5488/1 5489/1 5490/1 +f 5492/1 5493/1 5490/1 +f 5490/1 5493/1 5491/1 +f 5493/1 5492/1 5494/1 +f 5493/1 5494/1 5495/1 +f 5495/1 5494/1 5496/1 +f 5496/1 5494/1 5497/1 +f 5496/1 5497/1 5498/1 +f 5498/1 5499/1 5496/1 +f 5500/1 5499/1 5498/1 +f 5500/1 5501/1 5499/1 +f 5477/1 5476/1 5502/1 +f 5476/1 5503/1 5502/1 +f 5476/1 5478/1 5503/1 +f 5478/1 5481/1 5503/1 +f 5469/1 5471/1 5504/1 +f 5471/1 5472/1 5504/1 +f 5470/1 5469/1 5505/1 +f 5469/1 5504/1 5506/1 +f 5505/1 5469/1 5506/1 +f 5507/1 5470/1 5508/1 +f 5507/1 5464/1 5470/1 +f 5508/1 5470/1 5505/1 +f 5509/1 5505/1 5510/1 +f 5508/1 5505/1 5509/1 +f 5505/1 5506/1 5510/1 +f 5510/1 5506/1 5511/1 +f 5506/1 5504/1 5511/1 +f 5510/1 5511/1 5512/1 +f 5513/1 5510/1 5512/1 +f 5509/1 5510/1 5513/1 +f 5514/1 5508/1 5509/1 +f 5514/1 5509/1 5513/1 +f 5515/1 5507/1 5508/1 +f 5515/1 5508/1 5514/1 +f 5516/1 5514/1 5517/1 +f 5516/1 5515/1 5514/1 +f 5517/1 5514/1 5513/1 +f 5517/1 5513/1 5518/1 +f 5518/1 5513/1 5519/1 +f 5513/1 5512/1 5519/1 +f 5520/1 5517/1 5521/1 +f 5522/1 5516/1 5517/1 +f 5521/1 5517/1 5518/1 +f 5520/1 5522/1 5517/1 +f 5523/1 5515/1 5516/1 +f 5522/1 5523/1 5516/1 +f 5524/1 5525/1 5522/1 +f 5524/1 5522/1 5520/1 +f 5525/1 5523/1 5522/1 +f 5526/1 5520/1 5521/1 +f 5527/1 5524/1 5520/1 +f 5527/1 5520/1 5526/1 +f 5528/1 5525/1 5524/1 +f 5529/1 5528/1 5524/1 +f 5529/1 5524/1 5527/1 +f 5528/1 5530/1 5525/1 +f 5530/1 5523/1 5525/1 +f 5531/1 5532/1 5528/1 +f 5532/1 5530/1 5528/1 +f 5531/1 5528/1 5529/1 +f 5529/1 5527/1 5533/1 +f 5529/1 5533/1 5531/1 +f 5531/1 5533/1 5534/1 +f 5535/1 5532/1 5531/1 +f 5531/1 5534/1 5535/1 +f 5535/1 5536/1 5532/1 +f 5536/1 5537/1 5532/1 +f 5532/1 5537/1 5530/1 +f 5538/1 5536/1 5535/1 +f 5535/1 5539/1 5538/1 +f 5535/1 5534/1 5539/1 +f 5538/1 5540/1 5536/1 +f 5536/1 5540/1 5537/1 +f 5537/1 5541/1 5530/1 +f 5537/1 5455/1 5541/1 +f 5540/1 5455/1 5537/1 +f 5459/1 5455/1 5540/1 +f 5542/1 5540/1 5538/1 +f 5543/1 5540/1 5542/1 +f 5459/1 5540/1 5543/1 +f 5538/1 5539/1 5544/1 +f 5538/1 5544/1 5542/1 +f 5534/1 5545/1 5539/1 +f 5539/1 5545/1 5544/1 +f 5544/1 5545/1 5546/1 +f 5544/1 5547/1 5548/1 +f 5544/1 5546/1 5547/1 +f 5542/1 5544/1 5548/1 +f 5542/1 5548/1 5549/1 +f 5543/1 5542/1 5549/1 +f 5548/1 5547/1 5550/1 +f 5549/1 5548/1 5550/1 +f 5547/1 5546/1 5551/1 +f 5547/1 5551/1 5552/1 +f 5550/1 5547/1 5552/1 +f 5550/1 5552/1 5553/1 +f 5550/1 5553/1 5554/1 +f 5549/1 5550/1 5555/1 +f 5555/1 5550/1 5554/1 +f 5552/1 5551/1 5556/1 +f 5552/1 5556/1 5553/1 +f 5551/1 5557/1 5558/1 +f 5551/1 5558/1 5556/1 +f 5546/1 5557/1 5551/1 +f 5553/1 5556/1 5559/1 +f 5556/1 5558/1 5560/1 +f 5556/1 5560/1 5559/1 +f 5557/1 5561/1 5558/1 +f 5558/1 5561/1 5562/1 +f 5558/1 5562/1 5560/1 +f 5559/1 5560/1 5563/1 +f 5560/1 5562/1 5564/1 +f 5560/1 5564/1 5565/1 +f 5560/1 5565/1 5563/1 +f 5561/1 5566/1 5562/1 +f 5562/1 5566/1 5567/1 +f 5562/1 5567/1 5564/1 +f 5568/1 5566/1 5561/1 +f 5557/1 5568/1 5561/1 +f 5566/1 5569/1 5570/1 +f 5566/1 5570/1 5567/1 +f 5568/1 5571/1 5566/1 +f 5571/1 5569/1 5566/1 +f 5571/1 5572/1 5569/1 +f 5573/1 5571/1 5568/1 +f 5527/1 5572/1 5571/1 +f 5527/1 5571/1 5533/1 +f 5533/1 5571/1 5573/1 +f 5526/1 5572/1 5527/1 +f 5574/1 5573/1 5568/1 +f 5533/1 5573/1 5534/1 +f 5534/1 5573/1 5574/1 +f 5545/1 5574/1 5575/1 +f 5575/1 5574/1 5568/1 +f 5534/1 5574/1 5545/1 +f 5546/1 5545/1 5575/1 +f 5546/1 5575/1 5557/1 +f 5575/1 5568/1 5557/1 +f 5567/1 5570/1 5576/1 +f 5567/1 5576/1 5577/1 +f 5564/1 5567/1 5578/1 +f 5578/1 5567/1 5577/1 +f 5576/1 5570/1 5579/1 +f 5576/1 5579/1 5580/1 +f 5577/1 5576/1 5581/1 +f 5581/1 5576/1 5580/1 +f 5578/1 5577/1 5582/1 +f 5582/1 5577/1 5581/1 +f 5565/1 5564/1 5578/1 +f 5565/1 5578/1 5583/1 +f 5583/1 5578/1 5582/1 +f 5582/1 5581/1 5584/1 +f 5583/1 5582/1 5585/1 +f 5585/1 5582/1 5584/1 +f 5581/1 5580/1 5586/1 +f 5584/1 5581/1 5587/1 +f 5587/1 5581/1 5586/1 +f 5585/1 5584/1 5588/1 +f 5588/1 5584/1 5587/1 +f 5580/1 5579/1 5589/1 +f 5580/1 5590/1 5591/1 +f 5591/1 5590/1 5592/1 +f 5591/1 5592/1 5593/1 +f 5593/1 5592/1 5594/1 +f 5593/1 5594/1 5595/1 +f 5595/1 5594/1 5596/1 +f 5563/1 5565/1 5583/1 +f 5559/1 5563/1 5597/1 +f 5597/1 5563/1 5598/1 +f 5563/1 5583/1 5598/1 +f 5553/1 5559/1 5599/1 +f 5599/1 5559/1 5597/1 +f 5599/1 5597/1 5600/1 +f 5600/1 5597/1 5598/1 +f 5598/1 5585/1 5601/1 +f 5598/1 5583/1 5585/1 +f 5600/1 5598/1 5602/1 +f 5603/1 5599/1 5600/1 +f 5603/1 5600/1 5602/1 +f 5554/1 5553/1 5599/1 +f 5554/1 5599/1 5603/1 +f 5603/1 5602/1 5604/1 +f 5605/1 5554/1 5603/1 +f 5602/1 5598/1 5601/1 +f 5601/1 5585/1 5606/1 +f 5585/1 5588/1 5606/1 +f 5555/1 5554/1 5605/1 +f 5460/1 5459/1 5543/1 +f 5460/1 5543/1 5607/1 +f 5543/1 5549/1 5607/1 +f 5607/1 5549/1 5608/1 +f 5608/1 5549/1 5555/1 +f 5455/1 5454/1 5609/1 +f 5541/1 5455/1 5609/1 +f 5610/1 5454/1 5464/1 +f 5609/1 5454/1 5610/1 +f 5609/1 5610/1 5611/1 +f 5612/1 5609/1 5611/1 +f 5541/1 5609/1 5612/1 +f 5530/1 5541/1 5612/1 +f 5612/1 5611/1 5523/1 +f 5530/1 5612/1 5523/1 +f 5611/1 5507/1 5515/1 +f 5523/1 5611/1 5515/1 +f 5611/1 5610/1 5507/1 +f 5610/1 5464/1 5507/1 +f 5519/1 5512/1 5613/1 +f 5512/1 5614/1 5615/1 +f 5512/1 5615/1 5613/1 +f 5511/1 5614/1 5512/1 +f 5511/1 5504/1 5614/1 +f 5614/1 5616/1 5615/1 +f 5504/1 5617/1 5614/1 +f 5614/1 5617/1 5616/1 +f 5616/1 5618/1 5615/1 +f 5617/1 5619/1 5616/1 +f 5616/1 5619/1 5618/1 +f 5617/1 5475/1 5619/1 +f 5504/1 5472/1 5617/1 +f 5472/1 5475/1 5617/1 +f 5620/1 5619/1 5477/1 +f 5477/1 5619/1 5475/1 +f 5477/1 5621/1 5620/1 +f 5622/1 5618/1 5620/1 +f 5620/1 5618/1 5619/1 +f 5620/1 5621/1 5622/1 +f 5477/1 5502/1 5621/1 +f 5623/1 5624/1 5625/1 +f 5626/1 5624/1 5623/1 +f 5623/1 5625/1 5627/1 +f 5626/1 5628/1 5624/1 +f 5629/1 5628/1 5626/1 +f 5629/1 5630/1 5628/1 +f 5631/1 5630/1 5629/1 +f 5631/1 5632/1 5630/1 +f 5633/1 5632/1 5631/1 +f 5633/1 5634/1 5632/1 +f 5635/1 5634/1 5633/1 +f 5635/1 5636/1 5634/1 +f 5637/1 5636/1 5635/1 +f 5638/1 5639/1 5637/1 +f 5638/1 5637/1 5640/1 +f 5640/1 5637/1 5641/1 +f 5641/1 5637/1 5635/1 +f 5642/1 5643/1 5639/1 +f 5642/1 5639/1 5638/1 +f 5644/1 5643/1 5642/1 +f 5645/1 5644/1 5642/1 +f 5645/1 5642/1 5646/1 +f 5646/1 5642/1 5638/1 +f 5647/1 5643/1 5644/1 +f 5648/1 5647/1 5644/1 +f 5648/1 5644/1 5645/1 +f 5649/1 5648/1 5645/1 +f 5649/1 5645/1 5650/1 +f 5650/1 5645/1 5646/1 +f 5646/1 5638/1 5651/1 +f 5650/1 5646/1 5652/1 +f 5652/1 5646/1 5651/1 +f 5653/1 5649/1 5650/1 +f 5654/1 5650/1 5652/1 +f 5653/1 5650/1 5654/1 +f 5652/1 5651/1 5655/1 +f 5652/1 5655/1 5656/1 +f 5657/1 5652/1 5656/1 +f 5654/1 5652/1 5657/1 +f 5651/1 5638/1 5658/1 +f 5655/1 5651/1 5658/1 +f 5658/1 5638/1 5640/1 +f 5658/1 5640/1 5659/1 +f 5655/1 5658/1 5660/1 +f 5660/1 5658/1 5659/1 +f 5656/1 5655/1 5660/1 +f 5660/1 5659/1 5661/1 +f 5662/1 5660/1 5661/1 +f 5656/1 5660/1 5662/1 +f 5659/1 5640/1 5641/1 +f 5659/1 5641/1 5663/1 +f 5661/1 5659/1 5663/1 +f 5661/1 5663/1 5664/1 +f 5665/1 5661/1 5664/1 +f 5662/1 5661/1 5665/1 +f 5666/1 5656/1 5662/1 +f 5666/1 5662/1 5667/1 +f 5667/1 5662/1 5665/1 +f 5667/1 5665/1 5668/1 +f 5668/1 5665/1 5669/1 +f 5665/1 5664/1 5669/1 +f 5670/1 5666/1 5667/1 +f 5670/1 5667/1 5668/1 +f 5671/1 5656/1 5666/1 +f 5672/1 5671/1 5666/1 +f 5672/1 5666/1 5670/1 +f 5671/1 5657/1 5656/1 +f 5673/1 5657/1 5671/1 +f 5672/1 5673/1 5671/1 +f 5674/1 5673/1 5672/1 +f 5675/1 5674/1 5672/1 +f 5675/1 5672/1 5676/1 +f 5676/1 5672/1 5670/1 +f 5670/1 5668/1 5677/1 +f 5676/1 5670/1 5677/1 +f 5677/1 5668/1 5678/1 +f 5677/1 5678/1 5679/1 +f 5677/1 5679/1 5680/1 +f 5676/1 5677/1 5681/1 +f 5681/1 5677/1 5680/1 +f 5668/1 5669/1 5678/1 +f 5678/1 5669/1 5682/1 +f 5678/1 5682/1 5679/1 +f 5669/1 5664/1 5682/1 +f 5664/1 5683/1 5682/1 +f 5682/1 5683/1 5684/1 +f 5679/1 5682/1 5685/1 +f 5682/1 5684/1 5685/1 +f 5664/1 5663/1 5686/1 +f 5664/1 5686/1 5683/1 +f 5683/1 5686/1 5687/1 +f 5683/1 5687/1 5684/1 +f 5684/1 5687/1 5688/1 +f 5684/1 5688/1 5689/1 +f 5685/1 5684/1 5689/1 +f 5679/1 5685/1 5690/1 +f 5690/1 5685/1 5691/1 +f 5685/1 5689/1 5691/1 +f 5689/1 5688/1 5692/1 +f 5689/1 5692/1 5693/1 +f 5689/1 5693/1 5694/1 +f 5691/1 5689/1 5694/1 +f 5687/1 5695/1 5688/1 +f 5688/1 5695/1 5692/1 +f 5692/1 5695/1 5696/1 +f 5692/1 5696/1 5697/1 +f 5693/1 5692/1 5697/1 +f 5693/1 5697/1 5698/1 +f 5694/1 5693/1 5699/1 +f 5699/1 5693/1 5698/1 +f 5700/1 5691/1 5694/1 +f 5700/1 5694/1 5699/1 +f 5690/1 5691/1 5700/1 +f 5700/1 5699/1 5701/1 +f 5680/1 5690/1 5700/1 +f 5680/1 5700/1 5702/1 +f 5702/1 5700/1 5701/1 +f 5701/1 5699/1 5703/1 +f 5699/1 5698/1 5703/1 +f 5701/1 5703/1 5704/1 +f 5702/1 5701/1 5704/1 +f 5702/1 5704/1 5705/1 +f 5706/1 5680/1 5702/1 +f 5706/1 5702/1 5707/1 +f 5707/1 5702/1 5705/1 +f 5680/1 5679/1 5690/1 +f 5681/1 5680/1 5706/1 +f 5705/1 5704/1 5708/1 +f 5705/1 5708/1 5709/1 +f 5705/1 5709/1 5710/1 +f 5704/1 5711/1 5708/1 +f 5708/1 5711/1 5712/1 +f 5708/1 5712/1 5709/1 +f 5709/1 5712/1 5713/1 +f 5709/1 5713/1 5714/1 +f 5710/1 5709/1 5714/1 +f 5714/1 5713/1 5715/1 +f 5704/1 5703/1 5711/1 +f 5703/1 5698/1 5716/1 +f 5703/1 5716/1 5711/1 +f 5711/1 5716/1 5712/1 +f 5698/1 5717/1 5716/1 +f 5716/1 5717/1 5718/1 +f 5716/1 5718/1 5719/1 +f 5716/1 5719/1 5712/1 +f 5698/1 5697/1 5717/1 +f 5697/1 5720/1 5717/1 +f 5717/1 5720/1 5721/1 +f 5717/1 5721/1 5718/1 +f 5718/1 5721/1 5722/1 +f 5719/1 5718/1 5722/1 +f 5719/1 5722/1 5723/1 +f 5712/1 5719/1 5723/1 +f 5712/1 5723/1 5713/1 +f 5723/1 5722/1 5724/1 +f 5723/1 5724/1 5725/1 +f 5713/1 5723/1 5725/1 +f 5722/1 5721/1 5726/1 +f 5722/1 5726/1 5724/1 +f 5724/1 5726/1 5727/1 +f 5724/1 5727/1 5728/1 +f 5725/1 5724/1 5728/1 +f 5715/1 5725/1 5729/1 +f 5725/1 5728/1 5729/1 +f 5713/1 5725/1 5715/1 +f 5728/1 5727/1 5730/1 +f 5729/1 5728/1 5730/1 +f 5715/1 5729/1 5731/1 +f 5730/1 5727/1 5732/1 +f 5730/1 5732/1 5733/1 +f 5727/1 5626/1 5732/1 +f 5732/1 5626/1 5734/1 +f 5727/1 5629/1 5626/1 +f 5734/1 5626/1 5623/1 +f 5721/1 5631/1 5629/1 +f 5721/1 5629/1 5726/1 +f 5726/1 5629/1 5727/1 +f 5720/1 5631/1 5721/1 +f 5720/1 5633/1 5631/1 +f 5696/1 5633/1 5720/1 +f 5697/1 5696/1 5720/1 +f 5695/1 5635/1 5633/1 +f 5695/1 5633/1 5696/1 +f 5735/1 5635/1 5695/1 +f 5687/1 5735/1 5695/1 +f 5641/1 5635/1 5735/1 +f 5686/1 5641/1 5735/1 +f 5686/1 5735/1 5687/1 +f 5663/1 5641/1 5686/1 +f 5736/1 5675/1 5676/1 +f 5737/1 5675/1 5736/1 +f 5737/1 5738/1 5675/1 +f 5739/1 5738/1 5737/1 +f 5739/1 5740/1 5738/1 +f 5741/1 5742/1 5739/1 +f 5742/1 5740/1 5739/1 +f 5742/1 5743/1 5740/1 +f 5744/1 5745/1 5742/1 +f 5744/1 5742/1 5741/1 +f 5745/1 5743/1 5742/1 +f 5745/1 5746/1 5743/1 +f 5747/1 5748/1 5745/1 +f 5747/1 5745/1 5744/1 +f 5748/1 5746/1 5745/1 +f 5748/1 5749/1 5746/1 +f 5750/1 5751/1 5748/1 +f 5750/1 5748/1 5747/1 +f 5751/1 5749/1 5748/1 +f 5752/1 5750/1 5753/1 +f 5752/1 5754/1 5750/1 +f 5753/1 5750/1 5747/1 +f 5754/1 5751/1 5750/1 +f 5754/1 5755/1 5751/1 +f 5756/1 5754/1 5757/1 +f 5757/1 5754/1 5752/1 +f 5758/1 5754/1 5756/1 +f 5758/1 5759/1 5754/1 +f 5759/1 5755/1 5754/1 +f 5759/1 5760/1 5755/1 +f 5761/1 5760/1 5759/1 +f 5761/1 5762/1 5760/1 +f 5763/1 5764/1 5762/1 +f 5763/1 5762/1 5761/1 +f 5765/1 5766/1 5763/1 +f 5765/1 5763/1 5767/1 +f 5767/1 5763/1 5761/1 +f 5766/1 5764/1 5763/1 +f 5768/1 5766/1 5765/1 +f 5767/1 5769/1 5765/1 +f 5765/1 5769/1 5770/1 +f 5765/1 5770/1 5768/1 +f 5771/1 5766/1 5768/1 +f 5772/1 5773/1 5766/1 +f 5772/1 5766/1 5771/1 +f 5768/1 5774/1 5771/1 +f 5770/1 5774/1 5768/1 +f 5775/1 5770/1 5776/1 +f 5776/1 5770/1 5769/1 +f 5775/1 5774/1 5770/1 +f 5776/1 5769/1 5777/1 +f 5767/1 5777/1 5769/1 +f 5778/1 5776/1 5779/1 +f 5780/1 5775/1 5776/1 +f 5780/1 5776/1 5778/1 +f 5776/1 5777/1 5779/1 +f 5781/1 5775/1 5780/1 +f 5782/1 5774/1 5775/1 +f 5781/1 5782/1 5775/1 +f 5783/1 5780/1 5778/1 +f 5784/1 5781/1 5780/1 +f 5784/1 5780/1 5783/1 +f 5785/1 5778/1 5779/1 +f 5783/1 5778/1 5785/1 +f 5786/1 5784/1 5783/1 +f 5786/1 5783/1 5787/1 +f 5787/1 5783/1 5785/1 +f 5784/1 5782/1 5781/1 +f 5788/1 5789/1 5784/1 +f 5788/1 5784/1 5786/1 +f 5789/1 5782/1 5784/1 +f 5790/1 5788/1 5786/1 +f 5790/1 5786/1 5791/1 +f 5791/1 5786/1 5787/1 +f 5791/1 5787/1 5792/1 +f 5787/1 5785/1 5793/1 +f 5792/1 5787/1 5793/1 +f 5792/1 5793/1 5794/1 +f 5794/1 5793/1 5795/1 +f 5794/1 5795/1 5796/1 +f 5793/1 5785/1 5797/1 +f 5793/1 5797/1 5798/1 +f 5793/1 5798/1 5795/1 +f 5785/1 5779/1 5799/1 +f 5785/1 5799/1 5797/1 +f 5797/1 5799/1 5800/1 +f 5797/1 5800/1 5798/1 +f 5798/1 5800/1 5801/1 +f 5795/1 5798/1 5802/1 +f 5798/1 5801/1 5802/1 +f 5795/1 5802/1 5803/1 +f 5802/1 5801/1 5804/1 +f 5802/1 5804/1 5805/1 +f 5802/1 5805/1 5806/1 +f 5803/1 5802/1 5806/1 +f 5803/1 5806/1 5807/1 +f 5806/1 5808/1 5809/1 +f 5806/1 5805/1 5808/1 +f 5807/1 5806/1 5809/1 +f 5804/1 5810/1 5805/1 +f 5805/1 5811/1 5808/1 +f 5805/1 5810/1 5811/1 +f 5804/1 5801/1 5810/1 +f 5810/1 5812/1 5811/1 +f 5801/1 5813/1 5810/1 +f 5810/1 5813/1 5812/1 +f 5808/1 5811/1 5814/1 +f 5811/1 5815/1 5814/1 +f 5811/1 5812/1 5816/1 +f 5811/1 5816/1 5815/1 +f 5809/1 5808/1 5814/1 +f 5814/1 5817/1 5818/1 +f 5809/1 5814/1 5818/1 +f 5814/1 5815/1 5817/1 +f 5817/1 5815/1 5819/1 +f 5809/1 5818/1 5820/1 +f 5821/1 5809/1 5820/1 +f 5807/1 5809/1 5821/1 +f 5752/1 5816/1 5812/1 +f 5753/1 5815/1 5816/1 +f 5752/1 5812/1 5757/1 +f 5753/1 5816/1 5752/1 +f 5812/1 5813/1 5757/1 +f 5757/1 5813/1 5756/1 +f 5801/1 5822/1 5813/1 +f 5756/1 5813/1 5822/1 +f 5756/1 5822/1 5758/1 +f 5801/1 5800/1 5822/1 +f 5800/1 5823/1 5822/1 +f 5758/1 5822/1 5823/1 +f 5824/1 5759/1 5758/1 +f 5758/1 5823/1 5824/1 +f 5825/1 5823/1 5826/1 +f 5827/1 5823/1 5800/1 +f 5824/1 5823/1 5825/1 +f 5827/1 5826/1 5823/1 +f 5799/1 5827/1 5800/1 +f 5799/1 5828/1 5827/1 +f 5828/1 5826/1 5827/1 +f 5828/1 5777/1 5826/1 +f 5825/1 5826/1 5829/1 +f 5829/1 5826/1 5830/1 +f 5830/1 5826/1 5777/1 +f 5829/1 5759/1 5825/1 +f 5825/1 5759/1 5824/1 +f 5829/1 5761/1 5759/1 +f 5830/1 5761/1 5829/1 +f 5831/1 5761/1 5830/1 +f 5830/1 5777/1 5831/1 +f 5779/1 5777/1 5828/1 +f 5831/1 5777/1 5767/1 +f 5779/1 5828/1 5799/1 +f 5767/1 5761/1 5831/1 +f 5753/1 5747/1 5832/1 +f 5832/1 5815/1 5753/1 +f 5832/1 5747/1 5833/1 +f 5833/1 5747/1 5834/1 +f 5834/1 5747/1 5744/1 +f 5833/1 5815/1 5832/1 +f 5833/1 5819/1 5815/1 +f 5834/1 5819/1 5833/1 +f 5834/1 5744/1 5835/1 +f 5835/1 5819/1 5834/1 +f 5835/1 5744/1 5836/1 +f 5836/1 5837/1 5835/1 +f 5838/1 5788/1 5790/1 +f 5839/1 5840/1 5838/1 +f 5838/1 5840/1 5788/1 +f 5839/1 5841/1 5840/1 +f 5842/1 5841/1 5839/1 +f 5841/1 5843/1 5844/1 +f 5841/1 5844/1 5840/1 +f 5842/1 5845/1 5841/1 +f 5846/1 5845/1 5842/1 +f 5846/1 5847/1 5845/1 +f 5848/1 5847/1 5846/1 +f 5848/1 5849/1 5847/1 +f 5850/1 5849/1 5848/1 +f 5851/1 5852/1 5850/1 +f 5851/1 5850/1 5853/1 +f 5853/1 5850/1 5854/1 +f 5855/1 5856/1 5852/1 +f 5855/1 5852/1 5851/1 +f 5857/1 5856/1 5855/1 +f 5858/1 5857/1 5855/1 +f 5858/1 5855/1 5859/1 +f 5859/1 5855/1 5851/1 +f 5860/1 5861/1 5856/1 +f 5860/1 5856/1 5857/1 +f 5862/1 5860/1 5857/1 +f 5862/1 5857/1 5858/1 +f 5863/1 5862/1 5858/1 +f 5863/1 5858/1 5864/1 +f 5864/1 5858/1 5859/1 +f 5859/1 5851/1 5865/1 +f 5864/1 5859/1 5866/1 +f 5866/1 5859/1 5865/1 +f 5867/1 5864/1 5866/1 +f 5868/1 5864/1 5867/1 +f 5868/1 5863/1 5864/1 +f 5867/1 5866/1 5869/1 +f 5869/1 5866/1 5870/1 +f 5866/1 5865/1 5871/1 +f 5866/1 5871/1 5870/1 +f 5865/1 5851/1 5872/1 +f 5871/1 5865/1 5872/1 +f 5872/1 5851/1 5853/1 +f 5872/1 5853/1 5873/1 +f 5871/1 5872/1 5874/1 +f 5874/1 5872/1 5873/1 +f 5870/1 5871/1 5874/1 +f 5875/1 5874/1 5876/1 +f 5874/1 5873/1 5876/1 +f 5870/1 5874/1 5875/1 +f 5873/1 5853/1 5854/1 +f 5873/1 5854/1 5877/1 +f 5876/1 5873/1 5877/1 +f 5878/1 5876/1 5879/1 +f 5876/1 5877/1 5879/1 +f 5875/1 5876/1 5878/1 +f 5880/1 5870/1 5875/1 +f 5880/1 5875/1 5881/1 +f 5881/1 5875/1 5878/1 +f 5878/1 5879/1 5882/1 +f 5881/1 5878/1 5883/1 +f 5883/1 5878/1 5882/1 +f 5884/1 5880/1 5881/1 +f 5884/1 5881/1 5883/1 +f 5885/1 5870/1 5880/1 +f 5886/1 5885/1 5880/1 +f 5886/1 5880/1 5884/1 +f 5885/1 5869/1 5870/1 +f 5887/1 5869/1 5885/1 +f 5886/1 5887/1 5885/1 +f 5888/1 5887/1 5886/1 +f 5889/1 5888/1 5886/1 +f 5889/1 5886/1 5890/1 +f 5890/1 5886/1 5884/1 +f 5884/1 5883/1 5891/1 +f 5890/1 5884/1 5891/1 +f 5891/1 5883/1 5892/1 +f 5891/1 5892/1 5893/1 +f 5891/1 5893/1 5894/1 +f 5890/1 5891/1 5895/1 +f 5895/1 5891/1 5894/1 +f 5883/1 5882/1 5892/1 +f 5892/1 5882/1 5896/1 +f 5892/1 5896/1 5893/1 +f 5882/1 5879/1 5896/1 +f 5879/1 5897/1 5896/1 +f 5896/1 5897/1 5898/1 +f 5893/1 5896/1 5899/1 +f 5896/1 5898/1 5899/1 +f 5879/1 5877/1 5900/1 +f 5879/1 5900/1 5897/1 +f 5897/1 5900/1 5901/1 +f 5897/1 5901/1 5898/1 +f 5898/1 5901/1 5902/1 +f 5898/1 5902/1 5903/1 +f 5899/1 5898/1 5903/1 +f 5893/1 5899/1 5904/1 +f 5904/1 5899/1 5905/1 +f 5899/1 5903/1 5905/1 +f 5903/1 5902/1 5906/1 +f 5903/1 5906/1 5907/1 +f 5903/1 5907/1 5908/1 +f 5905/1 5903/1 5908/1 +f 5901/1 5909/1 5902/1 +f 5902/1 5909/1 5906/1 +f 5906/1 5909/1 5910/1 +f 5906/1 5910/1 5911/1 +f 5907/1 5906/1 5911/1 +f 5907/1 5911/1 5912/1 +f 5908/1 5907/1 5913/1 +f 5913/1 5907/1 5912/1 +f 5914/1 5905/1 5908/1 +f 5914/1 5908/1 5913/1 +f 5904/1 5905/1 5914/1 +f 5914/1 5913/1 5915/1 +f 5894/1 5904/1 5914/1 +f 5894/1 5914/1 5916/1 +f 5916/1 5914/1 5915/1 +f 5915/1 5913/1 5917/1 +f 5913/1 5912/1 5917/1 +f 5915/1 5917/1 5918/1 +f 5916/1 5915/1 5918/1 +f 5916/1 5918/1 5919/1 +f 5920/1 5894/1 5916/1 +f 5920/1 5916/1 5921/1 +f 5921/1 5916/1 5919/1 +f 5918/1 5917/1 5922/1 +f 5918/1 5922/1 5923/1 +f 5919/1 5918/1 5923/1 +f 5919/1 5923/1 5924/1 +f 5923/1 5922/1 5925/1 +f 5923/1 5925/1 5924/1 +f 5924/1 5925/1 5926/1 +f 5895/1 5894/1 5920/1 +f 5894/1 5893/1 5904/1 +f 5917/1 5912/1 5927/1 +f 5917/1 5927/1 5922/1 +f 5912/1 5911/1 5928/1 +f 5912/1 5928/1 5927/1 +f 5922/1 5927/1 5925/1 +f 5927/1 5928/1 5929/1 +f 5927/1 5929/1 5930/1 +f 5927/1 5930/1 5925/1 +f 5911/1 5931/1 5928/1 +f 5928/1 5931/1 5932/1 +f 5928/1 5932/1 5929/1 +f 5911/1 5910/1 5931/1 +f 5910/1 5846/1 5931/1 +f 5931/1 5846/1 5842/1 +f 5931/1 5842/1 5932/1 +f 5932/1 5842/1 5839/1 +f 5932/1 5839/1 5933/1 +f 5929/1 5932/1 5934/1 +f 5934/1 5932/1 5933/1 +f 5930/1 5929/1 5934/1 +f 5934/1 5933/1 5935/1 +f 5930/1 5934/1 5936/1 +f 5936/1 5934/1 5935/1 +f 5933/1 5839/1 5937/1 +f 5935/1 5933/1 5937/1 +f 5937/1 5839/1 5838/1 +f 5937/1 5838/1 5938/1 +f 5935/1 5937/1 5939/1 +f 5939/1 5937/1 5940/1 +f 5940/1 5937/1 5938/1 +f 5936/1 5935/1 5941/1 +f 5941/1 5935/1 5939/1 +f 5926/1 5936/1 5941/1 +f 5926/1 5941/1 5942/1 +f 5925/1 5936/1 5926/1 +f 5925/1 5930/1 5936/1 +f 5938/1 5838/1 5943/1 +f 5943/1 5838/1 5790/1 +f 5909/1 5848/1 5846/1 +f 5909/1 5846/1 5910/1 +f 5944/1 5848/1 5909/1 +f 5901/1 5944/1 5909/1 +f 5854/1 5850/1 5848/1 +f 5854/1 5848/1 5944/1 +f 5900/1 5854/1 5944/1 +f 5900/1 5944/1 5901/1 +f 5877/1 5854/1 5900/1 +f 5945/1 5889/1 5890/1 +f 5946/1 5889/1 5945/1 +f 5946/1 5947/1 5889/1 +f 5948/1 5947/1 5946/1 +f 5948/1 5949/1 5947/1 +f 5950/1 5949/1 5948/1 +f 5950/1 5951/1 5949/1 +f 5952/1 5951/1 5950/1 +f 5953/1 5952/1 5950/1 +f 5952/1 5954/1 5951/1 +f 5955/1 5956/1 5952/1 +f 5955/1 5952/1 5953/1 +f 5956/1 5954/1 5952/1 +f 5956/1 5957/1 5954/1 +f 5958/1 5959/1 5956/1 +f 5958/1 5956/1 5955/1 +f 5959/1 5957/1 5956/1 +f 5959/1 5960/1 5957/1 +f 5961/1 5960/1 5959/1 +f 5962/1 5961/1 5959/1 +f 5962/1 5959/1 5958/1 +f 5963/1 5964/1 5961/1 +f 5963/1 5961/1 5962/1 +f 5965/1 5964/1 5963/1 +f 5965/1 5966/1 5964/1 +f 5967/1 5968/1 5966/1 +f 5967/1 5966/1 5965/1 +f 5969/1 5968/1 5967/1 +f 5970/1 5969/1 5967/1 +f 5970/1 5967/1 5971/1 +f 5971/1 5967/1 5965/1 +f 5969/1 5972/1 5968/1 +f 5973/1 5974/1 5969/1 +f 5973/1 5969/1 5975/1 +f 5975/1 5969/1 5976/1 +f 5976/1 5969/1 5970/1 +f 5975/1 5977/1 5973/1 +f 5973/1 5978/1 5979/1 +f 5973/1 5977/1 5978/1 +f 5979/1 5974/1 5973/1 +f 5980/1 5974/1 5979/1 +f 5979/1 5978/1 5980/1 +f 5980/1 5978/1 5981/1 +f 5980/1 5981/1 5982/1 +f 5983/1 5977/1 5984/1 +f 5975/1 5984/1 5977/1 +f 5983/1 5985/1 5977/1 +f 5985/1 5978/1 5977/1 +f 5983/1 5984/1 5986/1 +f 5987/1 5983/1 5988/1 +f 5989/1 5983/1 5987/1 +f 5988/1 5986/1 5990/1 +f 5988/1 5983/1 5986/1 +f 5987/1 5988/1 5990/1 +f 5990/1 5986/1 5991/1 +f 5986/1 5992/1 5991/1 +f 5986/1 5984/1 5992/1 +f 5993/1 5990/1 5994/1 +f 5987/1 5990/1 5993/1 +f 5990/1 5991/1 5994/1 +f 5994/1 5991/1 5995/1 +f 5991/1 5992/1 5996/1 +f 5991/1 5997/1 5995/1 +f 5991/1 5996/1 5997/1 +f 5992/1 5984/1 5976/1 +f 5970/1 5992/1 5976/1 +f 5970/1 5996/1 5992/1 +f 5971/1 5996/1 5970/1 +f 5971/1 5997/1 5996/1 +f 5998/1 5997/1 5971/1 +f 5971/1 5965/1 5998/1 +f 5999/1 5997/1 5998/1 +f 5998/1 5965/1 5999/1 +f 5999/1 5965/1 6000/1 +f 6000/1 5965/1 5963/1 +f 5999/1 6001/1 5997/1 +f 6000/1 6001/1 5999/1 +f 6002/1 6001/1 6000/1 +f 6000/1 5963/1 6002/1 +f 6002/1 5963/1 6003/1 +f 6003/1 5963/1 6004/1 +f 6004/1 5963/1 5962/1 +f 6003/1 6005/1 6002/1 +f 6002/1 6005/1 6001/1 +f 6006/1 6001/1 6005/1 +f 6007/1 6001/1 6006/1 +f 6007/1 5997/1 6001/1 +f 6004/1 6008/1 6005/1 +f 6009/1 6005/1 6008/1 +f 6004/1 6005/1 6003/1 +f 6006/1 6005/1 6009/1 +f 6010/1 6008/1 6004/1 +f 6004/1 5962/1 6010/1 +f 6011/1 6008/1 6012/1 +f 6010/1 6012/1 6008/1 +f 6011/1 6009/1 6008/1 +f 6013/1 6006/1 6009/1 +f 6014/1 6013/1 6009/1 +f 6014/1 6009/1 6015/1 +f 6015/1 6009/1 6011/1 +f 6016/1 6013/1 6014/1 +f 5995/1 6007/1 6013/1 +f 6016/1 5995/1 6013/1 +f 6013/1 6007/1 6006/1 +f 6017/1 6016/1 6014/1 +f 6017/1 6014/1 6015/1 +f 6017/1 6015/1 6018/1 +f 6018/1 6015/1 6019/1 +f 6015/1 6011/1 6019/1 +f 6020/1 6016/1 6017/1 +f 6021/1 6022/1 6020/1 +f 6021/1 6020/1 6023/1 +f 6023/1 6020/1 6017/1 +f 6022/1 5993/1 6020/1 +f 6020/1 5993/1 6016/1 +f 6024/1 6022/1 6021/1 +f 6024/1 6025/1 6022/1 +f 6025/1 5987/1 6022/1 +f 6022/1 5987/1 5993/1 +f 5993/1 5994/1 6016/1 +f 6016/1 5994/1 5995/1 +f 5995/1 5997/1 6007/1 +f 6025/1 5989/1 5987/1 +f 6026/1 5989/1 6025/1 +f 6026/1 6027/1 5989/1 +f 5989/1 5985/1 5983/1 +f 6027/1 5985/1 5989/1 +f 6028/1 6029/1 6026/1 +f 6026/1 6029/1 6027/1 +f 6027/1 6030/1 5985/1 +f 6029/1 6030/1 6027/1 +f 6031/1 5978/1 5985/1 +f 6030/1 6031/1 5985/1 +f 6032/1 6033/1 6030/1 +f 6029/1 6032/1 6030/1 +f 6030/1 6033/1 6031/1 +f 6028/1 6034/1 6029/1 +f 6035/1 6028/1 6036/1 +f 6036/1 6028/1 6026/1 +f 6035/1 6037/1 6028/1 +f 6038/1 6037/1 6035/1 +f 6038/1 6039/1 6037/1 +f 6040/1 6039/1 6038/1 +f 6040/1 6041/1 6039/1 +f 6042/1 6041/1 6040/1 +f 6042/1 5596/1 6041/1 +f 5595/1 5596/1 6042/1 +f 6043/1 5595/1 6042/1 +f 6043/1 6042/1 6044/1 +f 6044/1 6042/1 6045/1 +f 6046/1 5593/1 5595/1 +f 6046/1 5595/1 6043/1 +f 6047/1 5593/1 6046/1 +f 6048/1 6047/1 6046/1 +f 6048/1 6046/1 6049/1 +f 6049/1 6046/1 6043/1 +f 6050/1 5591/1 5593/1 +f 6050/1 5593/1 6047/1 +f 6051/1 6050/1 6047/1 +f 6051/1 6047/1 6048/1 +f 6052/1 6051/1 6048/1 +f 6052/1 6048/1 6053/1 +f 6053/1 6048/1 6049/1 +f 6049/1 6043/1 6054/1 +f 6053/1 6049/1 6055/1 +f 6055/1 6049/1 6054/1 +f 6056/1 6053/1 6055/1 +f 6057/1 6053/1 6056/1 +f 6057/1 6052/1 6053/1 +f 6058/1 6055/1 6059/1 +f 6056/1 6055/1 6058/1 +f 6055/1 6054/1 6060/1 +f 6055/1 6060/1 6059/1 +f 6054/1 6043/1 6061/1 +f 6060/1 6054/1 6061/1 +f 6061/1 6043/1 6044/1 +f 6061/1 6044/1 6062/1 +f 6060/1 6061/1 6063/1 +f 6063/1 6061/1 6062/1 +f 6059/1 6060/1 6063/1 +f 6064/1 6063/1 6065/1 +f 6059/1 6063/1 6064/1 +f 6063/1 6062/1 6065/1 +f 6062/1 6044/1 6045/1 +f 6062/1 6045/1 6066/1 +f 6065/1 6062/1 6066/1 +f 6064/1 6065/1 6067/1 +f 6065/1 6066/1 6068/1 +f 6067/1 6065/1 6068/1 +f 6069/1 6059/1 6064/1 +f 6069/1 6064/1 6070/1 +f 6070/1 6064/1 6067/1 +f 6067/1 6068/1 6071/1 +f 6070/1 6067/1 6072/1 +f 6072/1 6067/1 6071/1 +f 6071/1 6068/1 6073/1 +f 6068/1 6066/1 6074/1 +f 6068/1 6074/1 6073/1 +f 6066/1 6045/1 6074/1 +f 6074/1 6045/1 6075/1 +f 6074/1 6075/1 6076/1 +f 6073/1 6074/1 6076/1 +f 6077/1 6073/1 6078/1 +f 6073/1 6076/1 6078/1 +f 6071/1 6073/1 6077/1 +f 6072/1 6071/1 6079/1 +f 6079/1 6071/1 6077/1 +f 6077/1 6078/1 6080/1 +f 6079/1 6077/1 6081/1 +f 6081/1 6077/1 6080/1 +f 6078/1 6076/1 6082/1 +f 6078/1 6082/1 6083/1 +f 6080/1 6078/1 6083/1 +f 6076/1 6075/1 6084/1 +f 6076/1 6084/1 6082/1 +f 6082/1 6084/1 6085/1 +f 6083/1 6082/1 6085/1 +f 6080/1 6083/1 6086/1 +f 6083/1 6085/1 6087/1 +f 6086/1 6083/1 6088/1 +f 6083/1 6087/1 6088/1 +f 6085/1 6084/1 6089/1 +f 6085/1 6089/1 6090/1 +f 6087/1 6085/1 6090/1 +f 6087/1 6090/1 6091/1 +f 6088/1 6087/1 6092/1 +f 6092/1 6087/1 6091/1 +f 6093/1 6086/1 6088/1 +f 6093/1 6088/1 6092/1 +f 6094/1 6086/1 6093/1 +f 6093/1 6092/1 6095/1 +f 6096/1 6094/1 6093/1 +f 6096/1 6093/1 6097/1 +f 6097/1 6093/1 6095/1 +f 6095/1 6092/1 6098/1 +f 6095/1 6098/1 6099/1 +f 6097/1 6095/1 6099/1 +f 6097/1 6099/1 6100/1 +f 6101/1 6096/1 6097/1 +f 6099/1 6098/1 6102/1 +f 6099/1 6102/1 6103/1 +f 6100/1 6099/1 6103/1 +f 6103/1 6102/1 6104/1 +f 6105/1 6081/1 6096/1 +f 6096/1 6081/1 6094/1 +f 6106/1 6105/1 6096/1 +f 6106/1 6096/1 6101/1 +f 6081/1 6080/1 6094/1 +f 6105/1 6079/1 6081/1 +f 6094/1 6080/1 6086/1 +f 6105/1 6072/1 6079/1 +f 6107/1 6070/1 6072/1 +f 6107/1 6072/1 6105/1 +f 6108/1 6069/1 6107/1 +f 6107/1 6069/1 6070/1 +f 6109/1 6108/1 6107/1 +f 6109/1 6107/1 6105/1 +f 6110/1 6059/1 6069/1 +f 6108/1 6110/1 6069/1 +f 6111/1 6058/1 6110/1 +f 6110/1 6058/1 6059/1 +f 6108/1 6111/1 6110/1 +f 6112/1 6056/1 6111/1 +f 6111/1 6056/1 6058/1 +f 6113/1 6112/1 6111/1 +f 6113/1 6111/1 6108/1 +f 6114/1 6057/1 6112/1 +f 6112/1 6057/1 6056/1 +f 6113/1 6114/1 6112/1 +f 6115/1 6114/1 6113/1 +f 6116/1 6115/1 6113/1 +f 6116/1 6113/1 6117/1 +f 6117/1 6113/1 6108/1 +f 6118/1 6119/1 6115/1 +f 6115/1 6119/1 6114/1 +f 6120/1 6118/1 6115/1 +f 6120/1 6115/1 6116/1 +f 6121/1 6122/1 6118/1 +f 6118/1 6122/1 6123/1 +f 6118/1 6123/1 6119/1 +f 6120/1 6121/1 6118/1 +f 6123/1 6124/1 6119/1 +f 6119/1 6124/1 6125/1 +f 6119/1 6125/1 6114/1 +f 6122/1 6126/1 6123/1 +f 6123/1 6126/1 6124/1 +f 6127/1 6128/1 6122/1 +f 6122/1 6128/1 6126/1 +f 6121/1 6127/1 6122/1 +f 6128/1 6129/1 6126/1 +f 6126/1 6130/1 6124/1 +f 6129/1 6131/1 6126/1 +f 6126/1 6131/1 6130/1 +f 6132/1 6129/1 6128/1 +f 6127/1 6132/1 6128/1 +f 6133/1 6132/1 6127/1 +f 6121/1 6133/1 6127/1 +f 6132/1 6134/1 6129/1 +f 5606/1 6134/1 6132/1 +f 5606/1 5588/1 6134/1 +f 6135/1 5606/1 6133/1 +f 6133/1 5606/1 6132/1 +f 5604/1 6135/1 6133/1 +f 5604/1 6133/1 6121/1 +f 6136/1 5604/1 6121/1 +f 6136/1 6121/1 6120/1 +f 5604/1 5602/1 6135/1 +f 6137/1 5603/1 5604/1 +f 6137/1 5604/1 6136/1 +f 5602/1 5601/1 6135/1 +f 6135/1 5601/1 5606/1 +f 5605/1 5603/1 6137/1 +f 6131/1 6138/1 6130/1 +f 6130/1 6138/1 6139/1 +f 6130/1 6139/1 6140/1 +f 6124/1 6130/1 6140/1 +f 6129/1 6141/1 6131/1 +f 6131/1 6141/1 6138/1 +f 6134/1 6142/1 6129/1 +f 6129/1 6142/1 6141/1 +f 6142/1 6143/1 6141/1 +f 6141/1 6143/1 6138/1 +f 5587/1 5586/1 6142/1 +f 6142/1 5586/1 6143/1 +f 6134/1 5587/1 6142/1 +f 5588/1 5587/1 6134/1 +f 5586/1 5580/1 6143/1 +f 6143/1 5580/1 5591/1 +f 6143/1 5591/1 6050/1 +f 6138/1 6143/1 6050/1 +f 6138/1 6050/1 6139/1 +f 6139/1 6050/1 6051/1 +f 6140/1 6139/1 6051/1 +f 6140/1 6051/1 6052/1 +f 6125/1 6140/1 6144/1 +f 6124/1 6140/1 6125/1 +f 6140/1 6052/1 6144/1 +f 6144/1 6052/1 6057/1 +f 6114/1 6125/1 6144/1 +f 6114/1 6144/1 6057/1 +f 6117/1 6108/1 6109/1 +f 6109/1 6105/1 6106/1 +f 6098/1 6091/1 6145/1 +f 6092/1 6091/1 6098/1 +f 6091/1 6090/1 6146/1 +f 6091/1 6146/1 6145/1 +f 6098/1 6145/1 6102/1 +f 6102/1 6145/1 6104/1 +f 6145/1 6146/1 6147/1 +f 6145/1 6147/1 6148/1 +f 6145/1 6148/1 6104/1 +f 6090/1 6149/1 6146/1 +f 6146/1 6149/1 6150/1 +f 6146/1 6150/1 6147/1 +f 6090/1 6089/1 6149/1 +f 6089/1 6038/1 6149/1 +f 6149/1 6038/1 6035/1 +f 6149/1 6035/1 6150/1 +f 6150/1 6035/1 6036/1 +f 6150/1 6036/1 6151/1 +f 6147/1 6150/1 6152/1 +f 6152/1 6150/1 6151/1 +f 6148/1 6147/1 6152/1 +f 6152/1 6151/1 6153/1 +f 6148/1 6152/1 6154/1 +f 6154/1 6152/1 6153/1 +f 6151/1 6036/1 6155/1 +f 6153/1 6151/1 6155/1 +f 6155/1 6036/1 6156/1 +f 6155/1 6156/1 6157/1 +f 6153/1 6155/1 6158/1 +f 6157/1 6156/1 6159/1 +f 6104/1 6154/1 6160/1 +f 6104/1 6148/1 6154/1 +f 6084/1 6040/1 6038/1 +f 6084/1 6038/1 6089/1 +f 6075/1 6040/1 6084/1 +f 6045/1 6042/1 6040/1 +f 6045/1 6040/1 6075/1 +f 6036/1 6026/1 6156/1 +f 6156/1 6026/1 6025/1 +f 6156/1 6025/1 6024/1 +f 6033/1 5981/1 6031/1 +f 6031/1 5981/1 5978/1 +f 6033/1 6161/1 5981/1 +f 6032/1 6161/1 6033/1 +f 6023/1 6017/1 6162/1 +f 6162/1 6017/1 6018/1 +f 6019/1 6011/1 6163/1 +f 6019/1 6163/1 6164/1 +f 6019/1 6164/1 6165/1 +f 6018/1 6019/1 6166/1 +f 6166/1 6019/1 6165/1 +f 6163/1 6011/1 6167/1 +f 6011/1 6012/1 6167/1 +f 6163/1 6167/1 6164/1 +f 6164/1 6167/1 6168/1 +f 6165/1 6164/1 6169/1 +f 6164/1 6168/1 6169/1 +f 6167/1 6012/1 6170/1 +f 6167/1 6170/1 6168/1 +f 6170/1 6012/1 6171/1 +f 6168/1 6170/1 6172/1 +f 6173/1 6172/1 6170/1 +f 6168/1 6172/1 6174/1 +f 6168/1 6174/1 6175/1 +f 6169/1 6168/1 6175/1 +f 6176/1 6169/1 6175/1 +f 6165/1 6169/1 6176/1 +f 6175/1 6177/1 6178/1 +f 6177/1 6174/1 6179/1 +f 6180/1 6165/1 6176/1 +f 6180/1 6176/1 6181/1 +f 6166/1 6165/1 6180/1 +f 6182/1 6174/1 6172/1 +f 6182/1 6172/1 6173/1 +f 6183/1 6174/1 6182/1 +f 6173/1 5958/1 6182/1 +f 6182/1 5958/1 5955/1 +f 6182/1 5955/1 6183/1 +f 6184/1 6174/1 6183/1 +f 6183/1 5955/1 6184/1 +f 6184/1 5955/1 6185/1 +f 6185/1 5955/1 5953/1 +f 6184/1 6179/1 6174/1 +f 6185/1 6179/1 6184/1 +f 6186/1 6179/1 6185/1 +f 6185/1 5953/1 6186/1 +f 6173/1 5962/1 5958/1 +f 6010/1 5962/1 6171/1 +f 6171/1 5962/1 6173/1 +f 6171/1 6012/1 6010/1 +f 6173/1 6170/1 6171/1 +f 5976/1 5984/1 5975/1 +f 5947/1 5888/1 5889/1 +f 5949/1 6187/1 5947/1 +f 5947/1 6187/1 5888/1 +f 6187/1 6188/1 5888/1 +f 5888/1 6188/1 6189/1 +f 5888/1 6189/1 5887/1 +f 6190/1 6191/1 6187/1 +f 6187/1 6191/1 6192/1 +f 6187/1 6192/1 6188/1 +f 5949/1 6190/1 6187/1 +f 5951/1 6190/1 5949/1 +f 6193/1 6194/1 6190/1 +f 6190/1 6194/1 6195/1 +f 6190/1 6195/1 6191/1 +f 5951/1 6193/1 6190/1 +f 6195/1 6196/1 6191/1 +f 6191/1 6196/1 6197/1 +f 6191/1 6197/1 6192/1 +f 6192/1 6197/1 6198/1 +f 6192/1 6198/1 6188/1 +f 6197/1 6199/1 6198/1 +f 6197/1 6200/1 6199/1 +f 6196/1 6200/1 6197/1 +f 6198/1 6199/1 6201/1 +f 6188/1 6198/1 6201/1 +f 6188/1 6201/1 5868/1 +f 6188/1 5868/1 6189/1 +f 6199/1 5863/1 6201/1 +f 6201/1 5863/1 5868/1 +f 6200/1 6202/1 6199/1 +f 6199/1 6202/1 5862/1 +f 6199/1 5862/1 5863/1 +f 6203/1 6204/1 6200/1 +f 6200/1 6204/1 6202/1 +f 6204/1 5860/1 6202/1 +f 6202/1 5860/1 5862/1 +f 6205/1 6206/1 6204/1 +f 6204/1 6206/1 5860/1 +f 6203/1 6205/1 6204/1 +f 6207/1 6205/1 6203/1 +f 6208/1 6209/1 6205/1 +f 6205/1 6209/1 6206/1 +f 6207/1 6208/1 6205/1 +f 6209/1 5861/1 6206/1 +f 6206/1 5861/1 5860/1 +f 6210/1 6208/1 6207/1 +f 6189/1 5868/1 5867/1 +f 6189/1 5867/1 5887/1 +f 5887/1 5867/1 5869/1 +f 6196/1 6203/1 6200/1 +f 6207/1 6203/1 6196/1 +f 6195/1 6211/1 6196/1 +f 6211/1 6207/1 6196/1 +f 6212/1 6207/1 6211/1 +f 6212/1 6210/1 6207/1 +f 6194/1 6212/1 6211/1 +f 6194/1 6211/1 6195/1 +f 6213/1 6212/1 6194/1 +f 6193/1 6213/1 6194/1 +f 6214/1 6215/1 6213/1 +f 6213/1 6215/1 6212/1 +f 6193/1 6214/1 6213/1 +f 6216/1 6214/1 6193/1 +f 5951/1 6216/1 6193/1 +f 5954/1 6216/1 5951/1 +f 6215/1 6210/1 6212/1 +f 6215/1 6217/1 6210/1 +f 5840/1 5844/1 6218/1 +f 5840/1 6218/1 5789/1 +f 5840/1 5789/1 5788/1 +f 5844/1 6219/1 6218/1 +f 5844/1 6220/1 6219/1 +f 6218/1 6219/1 6221/1 +f 6218/1 6221/1 5789/1 +f 5789/1 6221/1 5782/1 +f 5782/1 6221/1 6222/1 +f 6219/1 6223/1 6221/1 +f 6223/1 6224/1 6221/1 +f 6219/1 6225/1 6223/1 +f 6225/1 6226/1 6223/1 +f 6223/1 6226/1 6224/1 +f 5782/1 6222/1 5774/1 +f 5771/1 5774/1 6222/1 +f 5771/1 6222/1 5772/1 +f 5772/1 6222/1 6224/1 +f 6221/1 6224/1 6222/1 +f 5772/1 6224/1 6227/1 +f 6227/1 5773/1 5772/1 +f 6228/1 6224/1 6226/1 +f 6227/1 6224/1 6228/1 +f 5738/1 5674/1 5675/1 +f 5740/1 6229/1 5738/1 +f 5738/1 6229/1 5674/1 +f 6229/1 6230/1 5674/1 +f 5674/1 6230/1 6231/1 +f 5674/1 6231/1 5673/1 +f 6232/1 6233/1 6229/1 +f 6229/1 6233/1 6234/1 +f 6229/1 6234/1 6230/1 +f 5740/1 6232/1 6229/1 +f 5743/1 6232/1 5740/1 +f 6235/1 6236/1 6232/1 +f 6232/1 6236/1 6237/1 +f 6232/1 6237/1 6233/1 +f 5743/1 6235/1 6232/1 +f 6237/1 6238/1 6233/1 +f 6233/1 6238/1 6239/1 +f 6233/1 6239/1 6234/1 +f 6234/1 6239/1 6240/1 +f 6234/1 6240/1 6230/1 +f 6238/1 6241/1 6239/1 +f 6242/1 6243/1 6238/1 +f 6243/1 6244/1 6238/1 +f 6238/1 6244/1 6241/1 +f 6239/1 6241/1 6245/1 +f 6239/1 6245/1 6240/1 +f 6230/1 6240/1 6246/1 +f 6240/1 6245/1 6246/1 +f 6230/1 6246/1 5653/1 +f 6230/1 5653/1 6231/1 +f 6245/1 5649/1 6246/1 +f 6246/1 5649/1 5653/1 +f 6231/1 5653/1 5654/1 +f 6231/1 5654/1 5673/1 +f 5673/1 5654/1 5657/1 +f 6245/1 5648/1 5649/1 +f 6241/1 6247/1 6245/1 +f 6245/1 6247/1 5648/1 +f 6247/1 5647/1 5648/1 +f 6248/1 5647/1 6247/1 +f 6241/1 6248/1 6247/1 +f 6244/1 6248/1 6241/1 +f 6249/1 6250/1 6248/1 +f 6248/1 6250/1 5647/1 +f 6244/1 6249/1 6248/1 +f 6243/1 6249/1 6244/1 +f 6236/1 6242/1 6237/1 +f 6237/1 6242/1 6238/1 +f 6251/1 6252/1 6236/1 +f 6236/1 6252/1 6242/1 +f 6235/1 6251/1 6236/1 +f 6252/1 6243/1 6242/1 +f 6252/1 6253/1 6243/1 +f 5627/1 5625/1 6254/1 +f 5627/1 6254/1 6255/1 +f 5625/1 6256/1 6257/1 +f 5624/1 6256/1 5625/1 +f 5625/1 6257/1 6254/1 +f 6254/1 6257/1 6258/1 +f 6255/1 6254/1 6259/1 +f 6254/1 6258/1 6259/1 +f 6255/1 6259/1 6260/1 +f 6260/1 6259/1 6261/1 +f 6260/1 6261/1 6262/1 +f 6262/1 6261/1 6263/1 +f 6263/1 6264/1 6265/1 +f 6263/1 6266/1 6264/1 +f 6261/1 6266/1 6263/1 +f 6266/1 6267/1 6264/1 +f 6265/1 6264/1 6268/1 +f 6264/1 6269/1 6268/1 +f 6264/1 6267/1 6269/1 +f 6265/1 6268/1 5392/1 +f 5392/1 6268/1 5393/1 +f 6268/1 6270/1 5393/1 +f 6268/1 6269/1 6271/1 +f 6268/1 6271/1 6270/1 +f 6269/1 6272/1 6271/1 +f 6267/1 6272/1 6269/1 +f 6271/1 6273/1 6270/1 +f 6271/1 6274/1 6273/1 +f 6272/1 6274/1 6271/1 +f 6270/1 6273/1 6275/1 +f 6270/1 6275/1 5321/1 +f 5393/1 6270/1 5321/1 +f 6273/1 6276/1 6275/1 +f 6273/1 6274/1 6276/1 +f 6272/1 6277/1 6274/1 +f 6272/1 6278/1 6277/1 +f 6279/1 6277/1 6280/1 +f 6280/1 6277/1 6278/1 +f 6279/1 6274/1 6277/1 +f 6280/1 6278/1 6281/1 +f 6278/1 6282/1 6281/1 +f 6283/1 6278/1 6272/1 +f 6283/1 6282/1 6278/1 +f 6281/1 6284/1 6280/1 +f 6280/1 6284/1 6285/1 +f 6280/1 6285/1 6279/1 +f 6281/1 6282/1 6286/1 +f 6286/1 6284/1 6281/1 +f 6287/1 6288/1 6282/1 +f 6286/1 6282/1 6288/1 +f 6287/1 6282/1 6283/1 +f 6286/1 6288/1 6289/1 +f 6289/1 6284/1 6286/1 +f 6287/1 6290/1 6288/1 +f 6289/1 6288/1 6291/1 +f 6290/1 6291/1 6288/1 +f 6289/1 6291/1 6292/1 +f 6292/1 6293/1 6289/1 +f 6289/1 6293/1 6284/1 +f 6294/1 6291/1 6290/1 +f 6294/1 6295/1 6291/1 +f 6292/1 6291/1 6296/1 +f 6296/1 6291/1 6295/1 +f 6296/1 6293/1 6292/1 +f 6297/1 6298/1 6293/1 +f 6297/1 6293/1 6296/1 +f 6296/1 6295/1 6297/1 +f 6299/1 6300/1 6295/1 +f 6299/1 6295/1 6294/1 +f 6297/1 6295/1 6301/1 +f 6301/1 6295/1 6300/1 +f 6302/1 6299/1 6294/1 +f 6302/1 6294/1 6290/1 +f 6303/1 6300/1 6299/1 +f 6303/1 6299/1 6302/1 +f 6258/1 6302/1 6304/1 +f 6258/1 6303/1 6302/1 +f 6304/1 6302/1 6290/1 +f 6304/1 6290/1 6305/1 +f 6305/1 6290/1 6287/1 +f 6259/1 6258/1 6304/1 +f 6259/1 6304/1 6305/1 +f 6257/1 6306/1 6258/1 +f 6258/1 6306/1 6303/1 +f 6306/1 6307/1 6303/1 +f 6307/1 6300/1 6303/1 +f 6257/1 6308/1 6306/1 +f 6308/1 6307/1 6306/1 +f 6256/1 6308/1 6257/1 +f 6309/1 6310/1 6308/1 +f 6308/1 6310/1 6307/1 +f 6256/1 6309/1 6308/1 +f 6307/1 6311/1 6312/1 +f 6310/1 6311/1 6307/1 +f 6307/1 6312/1 6300/1 +f 6313/1 6314/1 6310/1 +f 6309/1 6313/1 6310/1 +f 6310/1 6314/1 6311/1 +f 6256/1 6313/1 6309/1 +f 5624/1 6315/1 6256/1 +f 6315/1 6313/1 6256/1 +f 6313/1 6316/1 6317/1 +f 6315/1 6316/1 6313/1 +f 6313/1 6317/1 6314/1 +f 5628/1 6318/1 6315/1 +f 5628/1 6315/1 5624/1 +f 6318/1 6316/1 6315/1 +f 6319/1 6320/1 6316/1 +f 6320/1 6321/1 6316/1 +f 6318/1 6319/1 6316/1 +f 5628/1 6322/1 6318/1 +f 6319/1 6323/1 6320/1 +f 6320/1 6324/1 6321/1 +f 6311/1 6314/1 6325/1 +f 6325/1 6314/1 6326/1 +f 6326/1 6314/1 6317/1 +f 6327/1 6312/1 6311/1 +f 6327/1 6311/1 6325/1 +f 6326/1 6328/1 6325/1 +f 6325/1 6328/1 6327/1 +f 6326/1 6317/1 6329/1 +f 6329/1 6328/1 6326/1 +f 6328/1 6330/1 6331/1 +f 6329/1 6332/1 6328/1 +f 6327/1 6328/1 6331/1 +f 6333/1 6312/1 6327/1 +f 6327/1 6331/1 6333/1 +f 6333/1 6300/1 6312/1 +f 6334/1 6300/1 6333/1 +f 6333/1 6331/1 6298/1 +f 6333/1 6298/1 6334/1 +f 6331/1 6330/1 6335/1 +f 6331/1 6335/1 6298/1 +f 6298/1 6335/1 6336/1 +f 6298/1 6336/1 6293/1 +f 6334/1 6298/1 6301/1 +f 6301/1 6298/1 6297/1 +f 6301/1 6300/1 6334/1 +f 6293/1 6336/1 6337/1 +f 6293/1 6337/1 6284/1 +f 6284/1 6337/1 6338/1 +f 6284/1 6338/1 6285/1 +f 6285/1 6338/1 6339/1 +f 6285/1 6339/1 6340/1 +f 6279/1 6285/1 6340/1 +f 6339/1 6341/1 6342/1 +f 6338/1 6343/1 6339/1 +f 6339/1 6343/1 6341/1 +f 6340/1 6339/1 6342/1 +f 6342/1 6341/1 6344/1 +f 6342/1 6344/1 6345/1 +f 6345/1 6344/1 6346/1 +f 6345/1 6346/1 5308/1 +f 6347/1 6342/1 6345/1 +f 5308/1 6346/1 6348/1 +f 5308/1 6348/1 5306/1 +f 5309/1 6345/1 5308/1 +f 5306/1 6348/1 6349/1 +f 5306/1 6349/1 5304/1 +f 5304/1 6349/1 6350/1 +f 5304/1 6350/1 5301/1 +f 5301/1 6350/1 5300/1 +f 6347/1 6345/1 5309/1 +f 5312/1 6347/1 5309/1 +f 5312/1 5319/1 6351/1 +f 6351/1 6347/1 5312/1 +f 6352/1 6340/1 6347/1 +f 6352/1 6347/1 6353/1 +f 6353/1 6347/1 6351/1 +f 6351/1 5319/1 6353/1 +f 6353/1 5319/1 6276/1 +f 6353/1 6276/1 6352/1 +f 6352/1 6276/1 6354/1 +f 6354/1 6340/1 6352/1 +f 6340/1 6342/1 6347/1 +f 6279/1 6340/1 6355/1 +f 6355/1 6340/1 6354/1 +f 6354/1 6276/1 6274/1 +f 6354/1 6274/1 6355/1 +f 6355/1 6274/1 6279/1 +f 6356/1 6332/1 6329/1 +f 6329/1 6321/1 6356/1 +f 6329/1 6317/1 6321/1 +f 6316/1 6321/1 6317/1 +f 6305/1 6287/1 6266/1 +f 6261/1 6305/1 6266/1 +f 6259/1 6305/1 6261/1 +f 6357/1 6287/1 6283/1 +f 6266/1 6287/1 6357/1 +f 6266/1 6357/1 6267/1 +f 6357/1 6283/1 6267/1 +f 6267/1 6283/1 6272/1 +f 6275/1 6276/1 5319/1 +f 6275/1 5319/1 5321/1 +f 5091/1 6358/1 6359/1 +f 5091/1 5088/1 6358/1 +f 5091/1 5083/1 5087/1 +f 6359/1 6360/1 5091/1 +f 5091/1 6360/1 5083/1 +f 6359/1 6358/1 6361/1 +f 6359/1 6361/1 6362/1 +f 6362/1 6363/1 6359/1 +f 6359/1 6363/1 6360/1 +f 6364/1 6360/1 6365/1 +f 6364/1 5083/1 6360/1 +f 6365/1 6360/1 6363/1 +f 6365/1 6363/1 6366/1 +f 6366/1 6363/1 6367/1 +f 6362/1 6367/1 6363/1 +f 6368/1 6365/1 6366/1 +f 6368/1 6366/1 6369/1 +f 6369/1 6366/1 6370/1 +f 6370/1 6366/1 6371/1 +f 6366/1 6367/1 6371/1 +f 6372/1 6365/1 6368/1 +f 6369/1 6373/1 6368/1 +f 6368/1 6373/1 6374/1 +f 6368/1 6374/1 6372/1 +f 6370/1 6373/1 6369/1 +f 6370/1 6371/1 6375/1 +f 6375/1 6376/1 6370/1 +f 6370/1 6376/1 6373/1 +f 6375/1 6371/1 6377/1 +f 6371/1 6367/1 6377/1 +f 6375/1 6377/1 6378/1 +f 6378/1 6379/1 6375/1 +f 6375/1 6379/1 6376/1 +f 6379/1 5204/1 6376/1 +f 6376/1 5204/1 6380/1 +f 6376/1 6380/1 6373/1 +f 6379/1 5205/1 5204/1 +f 6381/1 5205/1 6379/1 +f 6382/1 6381/1 6379/1 +f 6382/1 6379/1 6383/1 +f 6383/1 6379/1 6378/1 +f 6381/1 5207/1 5205/1 +f 6384/1 5207/1 6381/1 +f 6384/1 5394/1 5207/1 +f 6385/1 5294/1 5394/1 +f 6385/1 5394/1 6384/1 +f 5370/1 5294/1 6385/1 +f 6386/1 5370/1 6385/1 +f 6386/1 6385/1 6387/1 +f 6387/1 6385/1 6384/1 +f 5372/1 5370/1 6388/1 +f 6388/1 5370/1 6386/1 +f 6387/1 6389/1 6386/1 +f 6386/1 6389/1 6390/1 +f 6386/1 6390/1 6388/1 +f 6391/1 6392/1 6387/1 +f 6387/1 6392/1 6389/1 +f 6387/1 6384/1 6391/1 +f 6393/1 6389/1 6392/1 +f 6393/1 6390/1 6389/1 +f 6394/1 6395/1 6390/1 +f 6390/1 6395/1 6388/1 +f 6394/1 6390/1 6393/1 +f 6388/1 6395/1 5372/1 +f 5372/1 6395/1 6396/1 +f 5371/1 6396/1 5375/1 +f 5372/1 6396/1 5371/1 +f 6397/1 6393/1 6398/1 +f 6397/1 6394/1 6393/1 +f 6398/1 6393/1 6399/1 +f 6393/1 6392/1 6399/1 +f 6400/1 6397/1 6401/1 +f 6401/1 6397/1 6398/1 +f 6402/1 6394/1 6397/1 +f 6400/1 6402/1 6397/1 +f 6401/1 6398/1 6403/1 +f 6403/1 6398/1 6399/1 +f 6404/1 6400/1 6401/1 +f 6404/1 6401/1 6405/1 +f 6405/1 6401/1 6403/1 +f 5258/1 6404/1 6405/1 +f 5263/1 6404/1 5258/1 +f 5263/1 6406/1 6404/1 +f 5258/1 6405/1 5255/1 +f 6405/1 6403/1 6407/1 +f 5255/1 6405/1 6407/1 +f 6407/1 6403/1 6408/1 +f 6407/1 6408/1 6409/1 +f 6408/1 6410/1 6411/1 +f 6408/1 6411/1 6412/1 +f 6403/1 6410/1 6408/1 +f 6408/1 6412/1 6413/1 +f 6409/1 6408/1 6413/1 +f 6409/1 6413/1 6414/1 +f 6409/1 6414/1 6415/1 +f 6413/1 6412/1 6416/1 +f 6413/1 6416/1 6414/1 +f 6411/1 6417/1 6412/1 +f 6412/1 6417/1 6416/1 +f 6411/1 6410/1 6417/1 +f 6417/1 6418/1 6416/1 +f 6410/1 6419/1 6417/1 +f 6417/1 6419/1 6418/1 +f 6414/1 6416/1 6420/1 +f 6416/1 6418/1 6421/1 +f 6416/1 6422/1 6420/1 +f 6416/1 6421/1 6422/1 +f 6422/1 6367/1 6420/1 +f 6420/1 6367/1 6362/1 +f 6420/1 6362/1 6361/1 +f 6414/1 6420/1 6361/1 +f 6421/1 6377/1 6422/1 +f 6422/1 6377/1 6367/1 +f 6377/1 6421/1 6378/1 +f 6378/1 6421/1 6383/1 +f 6383/1 6421/1 6418/1 +f 6383/1 6418/1 6382/1 +f 6382/1 6418/1 6423/1 +f 6423/1 6381/1 6382/1 +f 6423/1 6418/1 6419/1 +f 6423/1 6419/1 6424/1 +f 6424/1 6381/1 6423/1 +f 6425/1 6384/1 6381/1 +f 6425/1 6381/1 6424/1 +f 6424/1 6419/1 6425/1 +f 6425/1 6419/1 6426/1 +f 6427/1 6419/1 6410/1 +f 6427/1 6426/1 6419/1 +f 6425/1 6426/1 6428/1 +f 6428/1 6384/1 6425/1 +f 6391/1 6384/1 6428/1 +f 6428/1 6426/1 6392/1 +f 6428/1 6392/1 6391/1 +f 6427/1 6392/1 6426/1 +f 6399/1 6392/1 6427/1 +f 6399/1 6427/1 6410/1 +f 6403/1 6399/1 6410/1 +f 6415/1 6414/1 6361/1 +f 6358/1 6429/1 6361/1 +f 5255/1 6407/1 5252/1 +f 5252/1 6407/1 6409/1 +f 5252/1 6409/1 5249/1 +f 5249/1 6409/1 6415/1 +f 6430/1 5387/1 6406/1 +f 6430/1 6406/1 5263/1 +f 6431/1 5387/1 6430/1 +f 6431/1 5386/1 5387/1 +f 6432/1 5386/1 6431/1 +f 6432/1 5390/1 5386/1 +f 6433/1 5390/1 6432/1 +f 6433/1 5391/1 5390/1 +f 6434/1 5391/1 6433/1 +f 6435/1 6436/1 6434/1 +f 6437/1 6438/1 6436/1 +f 6437/1 6436/1 6439/1 +f 6439/1 6436/1 6435/1 +f 6440/1 6441/1 6438/1 +f 6440/1 6438/1 6437/1 +f 6442/1 6441/1 6440/1 +f 6443/1 6442/1 6440/1 +f 6443/1 6440/1 6444/1 +f 6444/1 6440/1 6437/1 +f 6445/1 6441/1 6442/1 +f 6446/1 6445/1 6442/1 +f 6446/1 6442/1 6443/1 +f 6447/1 6446/1 6443/1 +f 6447/1 6443/1 6448/1 +f 6448/1 6443/1 6444/1 +f 6444/1 6437/1 6449/1 +f 6448/1 6444/1 6450/1 +f 6450/1 6444/1 6449/1 +f 6451/1 6448/1 6452/1 +f 6452/1 6448/1 6450/1 +f 6451/1 6447/1 6448/1 +f 6453/1 6446/1 6447/1 +f 6454/1 6445/1 6446/1 +f 6453/1 6454/1 6446/1 +f 6455/1 6445/1 6454/1 +f 6456/1 6455/1 6454/1 +f 6456/1 6454/1 6453/1 +f 6457/1 6455/1 6456/1 +f 6458/1 6447/1 6451/1 +f 6459/1 6458/1 6451/1 +f 6459/1 6451/1 6460/1 +f 6460/1 6451/1 6452/1 +f 6461/1 6453/1 6458/1 +f 6453/1 6447/1 6458/1 +f 6459/1 6461/1 6458/1 +f 6462/1 6461/1 6459/1 +f 6463/1 6462/1 6459/1 +f 6463/1 6459/1 6464/1 +f 6464/1 6459/1 6460/1 +f 6460/1 6452/1 6465/1 +f 6464/1 6460/1 6465/1 +f 6464/1 6465/1 6466/1 +f 6348/1 6463/1 6464/1 +f 6348/1 6464/1 6349/1 +f 6349/1 6464/1 6466/1 +f 6465/1 6452/1 6467/1 +f 6465/1 6467/1 6468/1 +f 6466/1 6465/1 6468/1 +f 6452/1 6450/1 6467/1 +f 6467/1 6450/1 6469/1 +f 6468/1 6467/1 6469/1 +f 6468/1 6469/1 6470/1 +f 6466/1 6468/1 6470/1 +f 6469/1 6471/1 6472/1 +f 6450/1 6473/1 6469/1 +f 6469/1 6473/1 6471/1 +f 6470/1 6469/1 6472/1 +f 6450/1 6449/1 6473/1 +f 6473/1 6449/1 6474/1 +f 6473/1 6474/1 6471/1 +f 6472/1 6471/1 6475/1 +f 6471/1 6474/1 6476/1 +f 6471/1 6476/1 6475/1 +f 6472/1 6475/1 6477/1 +f 6470/1 6472/1 6478/1 +f 6478/1 6472/1 6477/1 +f 6477/1 6475/1 6479/1 +f 6475/1 6476/1 6480/1 +f 6475/1 6480/1 6479/1 +f 6474/1 6439/1 6476/1 +f 6476/1 6439/1 6435/1 +f 6476/1 6435/1 6480/1 +f 6480/1 6435/1 6481/1 +f 6479/1 6480/1 6481/1 +f 6477/1 6479/1 6482/1 +f 6482/1 6479/1 6483/1 +f 6479/1 6481/1 6483/1 +f 6481/1 6435/1 6484/1 +f 6481/1 6484/1 6485/1 +f 6483/1 6481/1 6485/1 +f 6435/1 6434/1 6484/1 +f 6484/1 6434/1 6486/1 +f 6485/1 6484/1 6486/1 +f 6485/1 6486/1 6487/1 +f 6483/1 6485/1 6488/1 +f 6488/1 6485/1 6487/1 +f 6482/1 6483/1 6489/1 +f 6489/1 6483/1 6488/1 +f 6489/1 6488/1 6490/1 +f 6490/1 6488/1 6491/1 +f 6488/1 6487/1 6491/1 +f 6487/1 6486/1 6492/1 +f 6491/1 6487/1 6492/1 +f 6490/1 6491/1 6493/1 +f 6493/1 6491/1 6494/1 +f 6491/1 6492/1 6495/1 +f 6491/1 6495/1 6494/1 +f 6496/1 6489/1 6490/1 +f 6496/1 6490/1 6497/1 +f 6497/1 6490/1 6493/1 +f 6497/1 6493/1 6498/1 +f 6498/1 6493/1 6494/1 +f 6494/1 6495/1 6499/1 +f 6498/1 6494/1 6499/1 +f 6495/1 6492/1 6500/1 +f 6495/1 6500/1 6501/1 +f 6499/1 6495/1 6501/1 +f 6499/1 6501/1 6502/1 +f 6498/1 6499/1 6503/1 +f 6503/1 6499/1 6502/1 +f 6504/1 6497/1 6498/1 +f 6504/1 6498/1 6505/1 +f 6505/1 6498/1 6503/1 +f 6503/1 6502/1 6506/1 +f 6505/1 6503/1 6506/1 +f 6502/1 6507/1 6508/1 +f 6502/1 6501/1 6507/1 +f 6506/1 6502/1 6508/1 +f 6501/1 6500/1 6509/1 +f 6501/1 6509/1 6507/1 +f 6508/1 6507/1 6510/1 +f 6507/1 6509/1 6511/1 +f 6507/1 6511/1 6512/1 +f 6507/1 6512/1 6510/1 +f 6506/1 6508/1 6513/1 +f 6513/1 6508/1 6510/1 +f 6505/1 6506/1 6514/1 +f 6514/1 6506/1 6513/1 +f 6513/1 6510/1 6515/1 +f 6514/1 6513/1 6515/1 +f 6514/1 6515/1 5289/1 +f 5296/1 6505/1 6514/1 +f 5296/1 6514/1 5290/1 +f 5290/1 6514/1 5289/1 +f 6515/1 6510/1 6516/1 +f 6515/1 6516/1 6517/1 +f 5289/1 6515/1 6517/1 +f 5289/1 6517/1 5288/1 +f 6517/1 6516/1 6518/1 +f 6517/1 6518/1 5288/1 +f 5288/1 6518/1 5287/1 +f 5298/1 6505/1 5296/1 +f 5298/1 6504/1 6505/1 +f 5300/1 6504/1 5298/1 +f 6519/1 6497/1 6504/1 +f 5300/1 6519/1 6504/1 +f 6350/1 6520/1 5300/1 +f 5300/1 6520/1 6519/1 +f 6520/1 6496/1 6519/1 +f 6519/1 6496/1 6497/1 +f 6521/1 6522/1 6520/1 +f 6520/1 6522/1 6523/1 +f 6520/1 6523/1 6496/1 +f 6350/1 6521/1 6520/1 +f 6349/1 6466/1 6350/1 +f 6350/1 6466/1 6521/1 +f 6466/1 6470/1 6521/1 +f 6521/1 6470/1 6478/1 +f 6521/1 6478/1 6522/1 +f 6478/1 6477/1 6522/1 +f 6522/1 6477/1 6482/1 +f 6522/1 6482/1 6523/1 +f 6523/1 6482/1 6489/1 +f 6523/1 6489/1 6496/1 +f 6510/1 6524/1 6516/1 +f 6510/1 6512/1 6524/1 +f 6516/1 6524/1 6525/1 +f 6512/1 6526/1 6524/1 +f 6524/1 6526/1 6527/1 +f 6524/1 6527/1 6525/1 +f 6516/1 6525/1 6518/1 +f 6518/1 6525/1 6528/1 +f 6525/1 6527/1 6529/1 +f 6526/1 6530/1 6527/1 +f 6527/1 6530/1 6531/1 +f 6527/1 6531/1 6529/1 +f 6529/1 6531/1 6532/1 +f 6525/1 6529/1 6528/1 +f 6528/1 6529/1 6532/1 +f 6530/1 6431/1 6531/1 +f 6531/1 6431/1 6430/1 +f 6531/1 6430/1 6533/1 +f 6532/1 6531/1 6533/1 +f 6534/1 6431/1 6530/1 +f 6526/1 6534/1 6530/1 +f 6534/1 6432/1 6431/1 +f 6535/1 6432/1 6534/1 +f 6509/1 6535/1 6534/1 +f 6509/1 6534/1 6511/1 +f 6511/1 6534/1 6526/1 +f 6512/1 6511/1 6526/1 +f 6500/1 6535/1 6509/1 +f 6536/1 6433/1 6535/1 +f 6535/1 6433/1 6432/1 +f 6500/1 6536/1 6535/1 +f 6492/1 6536/1 6500/1 +f 6486/1 6433/1 6536/1 +f 6492/1 6486/1 6536/1 +f 6486/1 6434/1 6433/1 +f 6533/1 6430/1 5271/1 +f 6532/1 6533/1 5396/1 +f 5396/1 6533/1 5271/1 +f 5271/1 6430/1 5263/1 +f 5271/1 5263/1 5265/1 +f 5396/1 5271/1 5272/1 +f 5395/1 6532/1 5396/1 +f 6528/1 6532/1 5395/1 +f 6528/1 5395/1 5283/1 +f 6518/1 6528/1 5287/1 +f 5287/1 6528/1 5283/1 +f 5265/1 5263/1 5261/1 +f 6474/1 6437/1 6439/1 +f 6449/1 6437/1 6474/1 +f 6346/1 6463/1 6348/1 +f 6344/1 6537/1 6346/1 +f 6346/1 6537/1 6538/1 +f 6346/1 6538/1 6463/1 +f 6538/1 6462/1 6463/1 +f 6537/1 6539/1 6538/1 +f 6538/1 6539/1 6462/1 +f 6540/1 6541/1 6537/1 +f 6537/1 6541/1 6542/1 +f 6537/1 6542/1 6539/1 +f 6344/1 6540/1 6537/1 +f 6542/1 6543/1 6539/1 +f 6539/1 6543/1 6544/1 +f 6539/1 6544/1 6462/1 +f 6462/1 6544/1 6461/1 +f 6543/1 6456/1 6544/1 +f 6544/1 6453/1 6461/1 +f 6544/1 6456/1 6453/1 +f 6543/1 6457/1 6456/1 +f 6545/1 6546/1 6543/1 +f 6546/1 6457/1 6543/1 +f 6542/1 6545/1 6543/1 +f 6541/1 6545/1 6542/1 +f 6400/1 6547/1 6402/1 +f 6548/1 6547/1 6400/1 +f 6406/1 6548/1 6400/1 +f 6406/1 6400/1 6404/1 +f 6547/1 6396/1 6395/1 +f 6547/1 6395/1 6394/1 +f 5389/1 5375/1 6396/1 +f 6402/1 6547/1 6394/1 +f 6547/1 5389/1 6396/1 +f 6548/1 5389/1 6547/1 +f 5385/1 5389/1 6548/1 +f 5387/1 5385/1 6548/1 +f 5387/1 6548/1 6406/1 +f 6373/1 6380/1 6549/1 +f 6373/1 6549/1 6374/1 +f 6374/1 6549/1 6550/1 +f 6374/1 6550/1 6551/1 +f 6372/1 6374/1 6552/1 +f 6552/1 6374/1 6551/1 +f 6551/1 6550/1 6553/1 +f 6551/1 6553/1 5071/1 +f 6552/1 6551/1 5074/1 +f 5074/1 6551/1 5071/1 +f 5074/1 5081/1 6552/1 +f 6552/1 5081/1 6364/1 +f 6552/1 6364/1 6372/1 +f 6364/1 6365/1 6372/1 +f 5081/1 5083/1 6364/1 +f 5071/1 5070/1 5073/1 +f 6553/1 5072/1 5071/1 +f 5070/1 6554/1 5065/1 +f 5070/1 5072/1 6554/1 +f 5065/1 6554/1 6555/1 +f 5065/1 6555/1 5062/1 +f 5062/1 6555/1 6556/1 +f 5062/1 6556/1 5060/1 +f 5060/1 6556/1 5059/1 +f 6553/1 5403/1 5072/1 +f 6550/1 5403/1 6553/1 +f 6550/1 5400/1 5403/1 +f 6549/1 5400/1 6550/1 +f 6549/1 5199/1 5400/1 +f 6380/1 5199/1 6549/1 +f 6380/1 5198/1 5199/1 +f 5204/1 5198/1 6380/1 +f 6557/1 6558/1 6559/1 +f 6560/1 6558/1 6557/1 +f 6559/1 6561/1 6557/1 +f 6557/1 6561/1 6560/1 +f 6558/1 6562/1 6559/1 +f 6563/1 6558/1 6560/1 +f 6563/1 6564/1 6558/1 +f 6559/1 6562/1 6565/1 +f 6559/1 6565/1 6561/1 +f 6565/1 5461/1 6561/1 +f 6561/1 5461/1 6566/1 +f 6560/1 6561/1 6566/1 +f 6562/1 6567/1 6565/1 +f 5479/1 5461/1 6565/1 +f 6567/1 5479/1 6565/1 +f 6566/1 5461/1 5456/1 +f 6566/1 5456/1 6568/1 +f 6560/1 6566/1 6569/1 +f 6569/1 6566/1 6568/1 +f 6570/1 6560/1 6569/1 +f 6569/1 6571/1 6572/1 +f 6570/1 6569/1 6572/1 +f 6569/1 6568/1 6571/1 +f 6568/1 5456/1 6573/1 +f 6571/1 6568/1 6574/1 +f 6574/1 6568/1 6573/1 +f 6574/1 6575/1 6571/1 +f 6572/1 6571/1 6575/1 +f 6572/1 6575/1 6576/1 +f 6570/1 6572/1 6577/1 +f 6577/1 6572/1 6576/1 +f 6576/1 6575/1 6578/1 +f 6577/1 6576/1 6578/1 +f 6579/1 6575/1 6580/1 +f 6581/1 6580/1 6575/1 +f 6581/1 6575/1 6574/1 +f 6578/1 6575/1 6579/1 +f 6574/1 6573/1 6581/1 +f 6582/1 6580/1 6581/1 +f 6581/1 6573/1 6582/1 +f 6583/1 6580/1 6582/1 +f 6583/1 6584/1 6580/1 +f 6579/1 6580/1 6585/1 +f 6585/1 6580/1 6584/1 +f 6582/1 6573/1 6586/1 +f 6582/1 6586/1 6583/1 +f 6587/1 6584/1 6583/1 +f 6583/1 6586/1 6587/1 +f 6587/1 6588/1 6584/1 +f 6585/1 6584/1 6588/1 +f 6589/1 6588/1 6587/1 +f 6587/1 6586/1 6590/1 +f 6587/1 6590/1 6589/1 +f 6573/1 5453/1 6586/1 +f 6586/1 5453/1 5460/1 +f 6586/1 5460/1 6590/1 +f 6590/1 5460/1 5607/1 +f 6590/1 5607/1 6591/1 +f 6589/1 6590/1 6591/1 +f 6591/1 5607/1 5608/1 +f 6591/1 5608/1 6592/1 +f 6589/1 6591/1 6593/1 +f 6593/1 6591/1 6594/1 +f 6594/1 6591/1 6592/1 +f 5608/1 5555/1 6595/1 +f 6592/1 5608/1 6595/1 +f 6595/1 5555/1 5605/1 +f 6595/1 5605/1 6596/1 +f 6592/1 6595/1 6597/1 +f 6598/1 6595/1 6596/1 +f 6596/1 5605/1 6137/1 +f 6596/1 6137/1 6136/1 +f 6596/1 6136/1 6599/1 +f 6598/1 6596/1 6600/1 +f 6599/1 6136/1 6120/1 +f 6599/1 6120/1 6601/1 +f 6601/1 6120/1 6116/1 +f 6601/1 6116/1 6602/1 +f 6602/1 6116/1 6117/1 +f 6603/1 6592/1 6597/1 +f 6603/1 6597/1 6604/1 +f 6604/1 6597/1 6598/1 +f 6594/1 6592/1 6605/1 +f 6605/1 6592/1 6603/1 +f 6594/1 6606/1 6607/1 +f 6594/1 6607/1 6593/1 +f 6608/1 6606/1 6594/1 +f 6605/1 6608/1 6594/1 +f 6603/1 6608/1 6605/1 +f 6603/1 6609/1 6608/1 +f 6604/1 6610/1 6609/1 +f 6604/1 6609/1 6603/1 +f 6611/1 6610/1 6612/1 +f 6612/1 6610/1 6604/1 +f 6612/1 6598/1 6611/1 +f 6604/1 6598/1 6612/1 +f 6608/1 6613/1 6606/1 +f 6593/1 6607/1 6589/1 +f 6589/1 6607/1 6588/1 +f 6614/1 6588/1 6607/1 +f 6615/1 6607/1 6606/1 +f 6614/1 6607/1 6615/1 +f 6585/1 6588/1 6614/1 +f 6616/1 6614/1 6615/1 +f 6617/1 6585/1 6614/1 +f 6617/1 6614/1 6616/1 +f 6618/1 6585/1 6617/1 +f 6618/1 6579/1 6585/1 +f 6619/1 6618/1 6617/1 +f 6620/1 6617/1 6616/1 +f 6619/1 6617/1 6621/1 +f 6621/1 6617/1 6620/1 +f 6620/1 6616/1 6615/1 +f 5572/1 6621/1 6620/1 +f 5572/1 6620/1 5569/1 +f 5569/1 6620/1 6622/1 +f 6620/1 6615/1 6622/1 +f 5572/1 6619/1 6621/1 +f 6623/1 6619/1 5572/1 +f 5526/1 6623/1 5572/1 +f 6623/1 6624/1 6619/1 +f 6625/1 6623/1 5526/1 +f 6625/1 6624/1 6623/1 +f 5526/1 5521/1 6625/1 +f 5521/1 5518/1 6625/1 +f 6625/1 5518/1 5519/1 +f 6625/1 5519/1 6626/1 +f 6577/1 6625/1 6627/1 +f 6625/1 6626/1 6627/1 +f 5519/1 5613/1 6626/1 +f 6627/1 6626/1 6628/1 +f 6626/1 5613/1 6629/1 +f 6626/1 6629/1 6628/1 +f 6577/1 6627/1 6563/1 +f 6563/1 6627/1 6564/1 +f 6627/1 6628/1 6564/1 +f 6628/1 6630/1 6631/1 +f 6628/1 6629/1 6630/1 +f 6564/1 6628/1 6631/1 +f 5613/1 6632/1 6629/1 +f 6629/1 6633/1 6630/1 +f 6629/1 6632/1 6633/1 +f 5613/1 6634/1 6632/1 +f 6632/1 6635/1 6633/1 +f 6632/1 6634/1 6635/1 +f 6630/1 6633/1 6636/1 +f 6633/1 6635/1 6637/1 +f 6638/1 6635/1 6634/1 +f 6634/1 6639/1 6638/1 +f 6639/1 6640/1 6638/1 +f 6638/1 6640/1 6641/1 +f 6642/1 6643/1 6640/1 +f 6640/1 6643/1 6641/1 +f 6644/1 6643/1 6642/1 +f 6644/1 6645/1 6643/1 +f 6646/1 6647/1 6645/1 +f 6648/1 6647/1 6646/1 +f 6649/1 6650/1 6647/1 +f 6651/1 6648/1 6646/1 +f 6652/1 6653/1 6648/1 +f 6654/1 6648/1 6651/1 +f 6655/1 6648/1 6654/1 +f 6648/1 6653/1 6647/1 +f 6655/1 6652/1 6648/1 +f 6653/1 6649/1 6647/1 +f 6656/1 6657/1 6653/1 +f 6652/1 6656/1 6653/1 +f 6653/1 6657/1 6649/1 +f 6658/1 6656/1 6652/1 +f 6659/1 6660/1 6656/1 +f 6658/1 6659/1 6656/1 +f 6656/1 6660/1 6657/1 +f 6661/1 6659/1 6658/1 +f 6659/1 6662/1 6660/1 +f 6663/1 6661/1 6658/1 +f 6664/1 6658/1 6652/1 +f 6665/1 6658/1 6664/1 +f 6663/1 6658/1 6665/1 +f 6666/1 6661/1 6663/1 +f 6666/1 6659/1 6661/1 +f 5499/1 6666/1 6663/1 +f 6667/1 6666/1 5499/1 +f 6668/1 6666/1 6667/1 +f 6668/1 6659/1 6666/1 +f 5499/1 6663/1 6669/1 +f 6669/1 6663/1 6670/1 +f 6670/1 6663/1 6665/1 +f 5496/1 6669/1 6670/1 +f 6669/1 5496/1 5499/1 +f 6670/1 6671/1 5496/1 +f 6670/1 6665/1 6671/1 +f 5496/1 6671/1 5495/1 +f 5495/1 6671/1 6672/1 +f 6671/1 6665/1 6664/1 +f 6671/1 6664/1 6672/1 +f 6672/1 5493/1 5495/1 +f 6672/1 6664/1 6655/1 +f 6672/1 6673/1 5493/1 +f 6672/1 6655/1 6673/1 +f 6664/1 6652/1 6655/1 +f 6673/1 6655/1 6654/1 +f 5493/1 6673/1 6674/1 +f 6673/1 6654/1 6674/1 +f 5493/1 6674/1 5491/1 +f 5491/1 6674/1 6675/1 +f 6674/1 6654/1 6651/1 +f 6674/1 6651/1 6675/1 +f 6676/1 5491/1 6675/1 +f 6675/1 6651/1 6677/1 +f 6675/1 6678/1 6676/1 +f 6675/1 6677/1 6678/1 +f 6651/1 6646/1 6677/1 +f 6677/1 6646/1 6679/1 +f 6678/1 6677/1 6679/1 +f 6676/1 6678/1 6680/1 +f 6678/1 6679/1 6680/1 +f 6676/1 6680/1 6681/1 +f 6680/1 6679/1 6682/1 +f 6680/1 6682/1 6683/1 +f 6681/1 6680/1 6683/1 +f 6679/1 6684/1 6682/1 +f 6679/1 6646/1 6684/1 +f 6646/1 6645/1 6684/1 +f 6685/1 6684/1 6686/1 +f 6682/1 6684/1 6685/1 +f 6684/1 6644/1 6686/1 +f 6684/1 6645/1 6644/1 +f 6683/1 6682/1 6685/1 +f 6683/1 6685/1 6687/1 +f 6681/1 6683/1 6688/1 +f 6688/1 6683/1 6687/1 +f 6687/1 6685/1 6689/1 +f 6685/1 6686/1 6689/1 +f 6687/1 6689/1 6690/1 +f 6688/1 6687/1 6691/1 +f 6691/1 6687/1 6690/1 +f 6691/1 5488/1 6688/1 +f 5488/1 6681/1 6688/1 +f 6691/1 6690/1 6692/1 +f 6692/1 5488/1 6691/1 +f 6692/1 6690/1 6693/1 +f 6690/1 6689/1 6694/1 +f 6690/1 6694/1 6693/1 +f 6689/1 6686/1 6694/1 +f 6694/1 6695/1 6696/1 +f 6694/1 6686/1 6695/1 +f 6693/1 6694/1 6696/1 +f 6696/1 6695/1 6697/1 +f 6686/1 6642/1 6695/1 +f 6695/1 6642/1 6640/1 +f 6695/1 6640/1 6697/1 +f 6693/1 6696/1 6698/1 +f 6698/1 6696/1 6699/1 +f 6696/1 6697/1 6699/1 +f 6700/1 6697/1 6640/1 +f 6699/1 6697/1 6701/1 +f 6700/1 6701/1 6697/1 +f 6639/1 6700/1 6640/1 +f 6702/1 6703/1 6700/1 +f 6703/1 6701/1 6700/1 +f 6704/1 6702/1 6700/1 +f 6704/1 6700/1 6639/1 +f 6703/1 6705/1 6701/1 +f 6706/1 6699/1 6701/1 +f 6706/1 6701/1 6705/1 +f 6698/1 6699/1 6706/1 +f 5483/1 6706/1 6705/1 +f 6707/1 6698/1 6706/1 +f 6707/1 6706/1 5483/1 +f 5483/1 6705/1 6708/1 +f 6709/1 6708/1 6705/1 +f 5486/1 6707/1 5483/1 +f 6693/1 6698/1 6707/1 +f 5486/1 6693/1 6707/1 +f 6692/1 6693/1 5486/1 +f 6692/1 5486/1 5488/1 +f 5488/1 5491/1 6676/1 +f 6681/1 5488/1 6676/1 +f 6710/1 6708/1 6709/1 +f 6711/1 6710/1 6709/1 +f 6712/1 6710/1 6711/1 +f 6713/1 6711/1 6702/1 +f 6711/1 6709/1 6702/1 +f 5621/1 6711/1 6713/1 +f 5621/1 6712/1 6711/1 +f 5502/1 6712/1 5621/1 +f 5622/1 5621/1 6713/1 +f 6714/1 6713/1 6704/1 +f 6713/1 6702/1 6704/1 +f 5622/1 6713/1 6714/1 +f 6702/1 6709/1 6703/1 +f 6709/1 6705/1 6703/1 +f 5615/1 5618/1 6714/1 +f 5622/1 6714/1 5618/1 +f 6714/1 6704/1 6634/1 +f 5615/1 6714/1 6634/1 +f 6634/1 6704/1 6639/1 +f 5613/1 5615/1 6634/1 +f 6686/1 6644/1 6642/1 +f 5501/1 6668/1 6667/1 +f 6630/1 6636/1 6715/1 +f 6631/1 6630/1 6716/1 +f 6716/1 6630/1 6715/1 +f 6564/1 6631/1 6562/1 +f 6562/1 6631/1 6716/1 +f 6562/1 6716/1 6567/1 +f 6716/1 6715/1 6717/1 +f 6558/1 6564/1 6562/1 +f 6716/1 6717/1 6567/1 +f 6570/1 6563/1 6560/1 +f 6570/1 6577/1 6563/1 +f 6577/1 6578/1 6718/1 +f 6719/1 6578/1 6579/1 +f 6578/1 6719/1 6624/1 +f 6718/1 6578/1 6624/1 +f 6718/1 6624/1 6625/1 +f 6624/1 6719/1 6619/1 +f 6719/1 6579/1 6618/1 +f 6619/1 6719/1 6618/1 +f 6622/1 6615/1 6720/1 +f 5569/1 6622/1 5570/1 +f 5570/1 6622/1 6721/1 +f 6622/1 6720/1 6721/1 +f 6720/1 6615/1 6606/1 +f 6721/1 6720/1 6722/1 +f 6720/1 6723/1 6722/1 +f 6720/1 6606/1 6723/1 +f 6721/1 6722/1 6724/1 +f 5570/1 6721/1 5579/1 +f 5579/1 6721/1 6724/1 +f 6723/1 6613/1 6722/1 +f 6722/1 6609/1 6725/1 +f 6722/1 6613/1 6609/1 +f 6724/1 6722/1 6725/1 +f 6723/1 6606/1 6613/1 +f 6609/1 6613/1 6608/1 +f 6726/1 6725/1 6727/1 +f 6724/1 6726/1 6728/1 +f 5579/1 6724/1 5589/1 +f 6729/1 6662/1 5501/1 +f 6730/1 6729/1 5501/1 +f 5501/1 6662/1 6659/1 +f 6730/1 5501/1 5500/1 +f 6668/1 5501/1 6659/1 +f 6731/1 6732/1 6733/1 +f 6731/1 6733/1 6330/1 +f 6734/1 6732/1 6731/1 +f 6732/1 5710/1 6735/1 +f 6732/1 6735/1 6733/1 +f 6734/1 5707/1 6732/1 +f 6736/1 5707/1 6734/1 +f 6736/1 5706/1 5707/1 +f 5707/1 5705/1 6732/1 +f 6737/1 5706/1 6736/1 +f 6737/1 5681/1 5706/1 +f 6738/1 5681/1 6737/1 +f 6738/1 5676/1 5681/1 +f 5736/1 5676/1 6738/1 +f 6739/1 5736/1 6738/1 +f 6740/1 5737/1 5736/1 +f 6741/1 5739/1 5737/1 +f 6741/1 5737/1 6740/1 +f 6742/1 6741/1 6743/1 +f 6743/1 6741/1 6740/1 +f 6742/1 5741/1 6741/1 +f 5741/1 5739/1 6741/1 +f 6744/1 5741/1 6742/1 +f 6743/1 6745/1 6742/1 +f 6742/1 6746/1 6744/1 +f 6742/1 6745/1 6746/1 +f 6743/1 6740/1 6747/1 +f 6747/1 6748/1 6743/1 +f 6743/1 6748/1 6745/1 +f 6749/1 6746/1 6745/1 +f 6749/1 6745/1 6748/1 +f 6750/1 6746/1 6749/1 +f 6750/1 6751/1 6746/1 +f 6746/1 6751/1 6744/1 +f 6752/1 5741/1 6744/1 +f 6744/1 6751/1 6752/1 +f 6753/1 5741/1 6752/1 +f 6752/1 6754/1 6753/1 +f 5836/1 5744/1 6753/1 +f 6753/1 5744/1 5741/1 +f 6753/1 5837/1 5836/1 +f 6753/1 6754/1 5837/1 +f 5835/1 5837/1 5819/1 +f 6755/1 6751/1 6750/1 +f 6752/1 6751/1 6754/1 +f 6755/1 6754/1 6751/1 +f 6756/1 6755/1 6757/1 +f 6758/1 6755/1 6756/1 +f 6755/1 6759/1 6754/1 +f 6759/1 5837/1 6754/1 +f 6758/1 6759/1 6755/1 +f 5821/1 5820/1 6758/1 +f 5821/1 6758/1 6760/1 +f 6760/1 6758/1 6756/1 +f 5820/1 6759/1 6758/1 +f 5820/1 5818/1 6759/1 +f 5818/1 6761/1 6759/1 +f 6761/1 5837/1 6759/1 +f 5818/1 5817/1 6761/1 +f 6761/1 5819/1 5837/1 +f 5817/1 5819/1 6761/1 +f 6756/1 6757/1 6762/1 +f 6760/1 6756/1 6763/1 +f 6763/1 6756/1 6764/1 +f 6756/1 6762/1 6764/1 +f 6757/1 6755/1 6750/1 +f 6757/1 6750/1 6762/1 +f 6762/1 6749/1 6765/1 +f 6764/1 6762/1 6765/1 +f 6762/1 6750/1 6749/1 +f 6763/1 6764/1 6766/1 +f 6766/1 6764/1 6767/1 +f 6764/1 6765/1 6767/1 +f 6765/1 6749/1 6768/1 +f 6767/1 6765/1 6768/1 +f 6749/1 6748/1 6768/1 +f 6768/1 6748/1 6769/1 +f 6767/1 6768/1 6770/1 +f 6768/1 6769/1 6770/1 +f 6767/1 6770/1 6771/1 +f 6766/1 6767/1 5636/1 +f 5636/1 6767/1 6771/1 +f 6770/1 6772/1 6773/1 +f 6770/1 6769/1 6772/1 +f 6771/1 6770/1 6773/1 +f 6769/1 6748/1 6774/1 +f 6769/1 6774/1 6772/1 +f 6775/1 6774/1 6748/1 +f 6775/1 6748/1 6747/1 +f 6776/1 6777/1 6774/1 +f 6776/1 6774/1 6778/1 +f 6778/1 6774/1 6775/1 +f 6772/1 6774/1 6777/1 +f 6772/1 6777/1 6773/1 +f 6779/1 6780/1 6777/1 +f 6779/1 6777/1 6781/1 +f 6781/1 6777/1 6776/1 +f 6773/1 6777/1 6780/1 +f 6776/1 6739/1 6781/1 +f 6778/1 6739/1 6776/1 +f 6778/1 6740/1 6739/1 +f 6775/1 6740/1 6778/1 +f 6747/1 6740/1 6775/1 +f 6740/1 5736/1 6739/1 +f 6739/1 6738/1 6782/1 +f 6782/1 6738/1 6737/1 +f 6782/1 6737/1 6783/1 +f 6783/1 6737/1 6736/1 +f 6784/1 6782/1 6783/1 +f 6783/1 6736/1 6785/1 +f 6784/1 6783/1 6786/1 +f 6786/1 6783/1 6785/1 +f 6785/1 6736/1 6734/1 +f 6785/1 6734/1 6332/1 +f 6332/1 6734/1 6731/1 +f 6332/1 6731/1 6328/1 +f 6328/1 6731/1 6330/1 +f 6786/1 6785/1 6787/1 +f 6787/1 6785/1 6788/1 +f 6788/1 6785/1 6789/1 +f 6789/1 6785/1 6332/1 +f 6788/1 6790/1 6787/1 +f 6787/1 6790/1 6786/1 +f 6789/1 6324/1 6788/1 +f 6788/1 6324/1 6790/1 +f 6791/1 6324/1 6789/1 +f 6789/1 6332/1 6791/1 +f 6791/1 6332/1 6356/1 +f 6356/1 6321/1 6791/1 +f 6791/1 6321/1 6324/1 +f 6786/1 6790/1 6792/1 +f 6786/1 6792/1 6784/1 +f 6793/1 6794/1 6792/1 +f 6784/1 6792/1 6794/1 +f 6793/1 6792/1 6790/1 +f 6795/1 6782/1 6784/1 +f 6784/1 6794/1 6795/1 +f 6794/1 6796/1 6795/1 +f 6797/1 6796/1 6794/1 +f 6797/1 6794/1 6793/1 +f 6795/1 6796/1 6798/1 +f 6798/1 6782/1 6795/1 +f 6779/1 6739/1 6782/1 +f 6779/1 6782/1 6798/1 +f 6798/1 6796/1 6780/1 +f 6798/1 6780/1 6779/1 +f 6799/1 6780/1 6796/1 +f 6799/1 6796/1 6797/1 +f 6800/1 6797/1 6793/1 +f 6801/1 6799/1 6797/1 +f 6801/1 6797/1 6800/1 +f 6802/1 6799/1 6801/1 +f 6803/1 6773/1 6799/1 +f 6803/1 6799/1 6802/1 +f 6799/1 6773/1 6780/1 +f 6802/1 6801/1 6800/1 +f 6804/1 6800/1 6805/1 +f 6802/1 6800/1 6804/1 +f 6800/1 6793/1 6805/1 +f 6793/1 6790/1 6806/1 +f 6805/1 6793/1 6806/1 +f 6322/1 6805/1 6806/1 +f 6804/1 6805/1 6322/1 +f 5632/1 6802/1 6804/1 +f 5632/1 6804/1 5630/1 +f 5630/1 6804/1 6322/1 +f 6322/1 6806/1 6319/1 +f 6322/1 6319/1 6318/1 +f 5630/1 6322/1 5628/1 +f 6806/1 6323/1 6319/1 +f 6806/1 6790/1 6323/1 +f 6323/1 6790/1 6324/1 +f 6323/1 6324/1 6320/1 +f 5634/1 6802/1 5632/1 +f 5636/1 6803/1 5634/1 +f 5634/1 6803/1 6802/1 +f 5636/1 6771/1 6803/1 +f 6771/1 6773/1 6803/1 +f 6781/1 6739/1 6779/1 +f 6732/1 5705/1 5710/1 +f 5710/1 5714/1 6807/1 +f 5710/1 6807/1 6735/1 +f 5714/1 5715/1 6807/1 +f 6807/1 5715/1 5731/1 +f 6807/1 5731/1 6808/1 +f 6735/1 6807/1 6808/1 +f 6735/1 6808/1 6809/1 +f 6735/1 6809/1 6810/1 +f 6733/1 6735/1 6810/1 +f 6808/1 5731/1 6811/1 +f 6808/1 6811/1 6809/1 +f 6809/1 6811/1 6812/1 +f 6809/1 6812/1 6813/1 +f 6810/1 6809/1 6813/1 +f 6810/1 6813/1 6814/1 +f 6733/1 6810/1 6814/1 +f 6330/1 6733/1 6815/1 +f 6733/1 6814/1 6815/1 +f 6814/1 6813/1 6816/1 +f 6814/1 6816/1 6817/1 +f 6815/1 6814/1 6817/1 +f 6813/1 6812/1 6818/1 +f 6813/1 6818/1 6816/1 +f 6816/1 6818/1 6819/1 +f 6816/1 6819/1 6820/1 +f 6816/1 6820/1 6821/1 +f 6817/1 6816/1 6821/1 +f 6822/1 6823/1 6819/1 +f 6819/1 6823/1 6820/1 +f 6818/1 6822/1 6819/1 +f 6820/1 6823/1 6824/1 +f 6821/1 6820/1 6825/1 +f 6820/1 6824/1 6825/1 +f 6821/1 6825/1 6826/1 +f 6817/1 6821/1 6826/1 +f 6826/1 6825/1 6827/1 +f 6825/1 6824/1 6828/1 +f 6825/1 6828/1 6827/1 +f 6824/1 6829/1 6828/1 +f 6823/1 6830/1 6824/1 +f 6824/1 6830/1 6829/1 +f 6828/1 6829/1 6831/1 +f 6828/1 6831/1 6832/1 +f 6828/1 6832/1 6833/1 +f 6827/1 6828/1 6833/1 +f 6826/1 6827/1 6834/1 +f 6834/1 6827/1 6833/1 +f 6833/1 6835/1 6836/1 +f 6833/1 6832/1 6835/1 +f 6834/1 6833/1 6837/1 +f 6837/1 6833/1 6836/1 +f 6832/1 6831/1 6838/1 +f 6832/1 6838/1 6835/1 +f 6829/1 6839/1 6831/1 +f 6831/1 6839/1 6838/1 +f 6838/1 6839/1 6840/1 +f 6838/1 6840/1 6841/1 +f 6835/1 6838/1 6841/1 +f 6835/1 6841/1 6842/1 +f 6836/1 6835/1 6842/1 +f 6841/1 6840/1 6843/1 +f 6841/1 6843/1 6844/1 +f 6842/1 6841/1 6844/1 +f 6839/1 6255/1 6840/1 +f 6840/1 6255/1 6843/1 +f 6843/1 6255/1 6260/1 +f 6843/1 6260/1 6845/1 +f 6844/1 6843/1 6846/1 +f 6846/1 6843/1 6845/1 +f 6842/1 6844/1 6847/1 +f 6847/1 6844/1 6846/1 +f 6836/1 6842/1 6848/1 +f 6848/1 6842/1 6847/1 +f 6848/1 6847/1 6849/1 +f 6849/1 6847/1 6850/1 +f 6847/1 6846/1 6851/1 +f 6847/1 6851/1 6850/1 +f 6846/1 6845/1 6852/1 +f 6851/1 6846/1 6852/1 +f 6851/1 6852/1 6853/1 +f 6850/1 6851/1 6853/1 +f 6854/1 6849/1 6850/1 +f 6854/1 6850/1 6855/1 +f 6855/1 6850/1 6856/1 +f 6850/1 6853/1 6856/1 +f 6857/1 6848/1 6849/1 +f 6857/1 6849/1 6854/1 +f 6858/1 6857/1 6854/1 +f 6858/1 6854/1 6855/1 +f 6855/1 6856/1 6859/1 +f 6858/1 6855/1 6860/1 +f 6860/1 6855/1 6859/1 +f 6856/1 6853/1 6861/1 +f 6856/1 6861/1 6862/1 +f 6859/1 6856/1 6862/1 +f 6859/1 6862/1 6863/1 +f 6860/1 6859/1 6864/1 +f 6864/1 6859/1 6863/1 +f 6865/1 6858/1 6860/1 +f 6865/1 6860/1 6864/1 +f 6864/1 6863/1 6866/1 +f 6865/1 6864/1 6343/1 +f 6343/1 6864/1 6866/1 +f 6338/1 6865/1 6343/1 +f 6337/1 6865/1 6338/1 +f 6337/1 6867/1 6865/1 +f 6343/1 6866/1 6341/1 +f 6341/1 6866/1 6868/1 +f 6341/1 6868/1 6344/1 +f 6866/1 6869/1 6868/1 +f 6868/1 6869/1 6870/1 +f 6868/1 6870/1 6871/1 +f 6868/1 6871/1 6540/1 +f 6344/1 6868/1 6540/1 +f 6872/1 6873/1 6869/1 +f 6869/1 6873/1 6874/1 +f 6869/1 6874/1 6870/1 +f 6866/1 6872/1 6869/1 +f 6870/1 6874/1 6875/1 +f 6870/1 6875/1 6871/1 +f 6873/1 6876/1 6874/1 +f 6874/1 6876/1 6875/1 +f 6877/1 6878/1 6873/1 +f 6873/1 6878/1 6876/1 +f 6872/1 6877/1 6873/1 +f 6878/1 6879/1 6876/1 +f 6876/1 6879/1 6880/1 +f 6876/1 6880/1 6881/1 +f 6876/1 6881/1 6875/1 +f 6875/1 6882/1 6883/1 +f 6875/1 6881/1 6882/1 +f 6881/1 6880/1 6884/1 +f 6881/1 6884/1 6882/1 +f 6879/1 6885/1 6880/1 +f 6880/1 6885/1 6884/1 +f 6884/1 6885/1 6886/1 +f 6884/1 6886/1 6887/1 +f 6882/1 6884/1 6887/1 +f 6882/1 6887/1 6888/1 +f 6887/1 6886/1 6889/1 +f 6887/1 6889/1 6890/1 +f 6888/1 6887/1 6890/1 +f 6885/1 6891/1 6886/1 +f 6886/1 6891/1 6889/1 +f 6889/1 6891/1 6892/1 +f 6889/1 6892/1 6893/1 +f 6890/1 6889/1 6894/1 +f 6894/1 6889/1 6893/1 +f 6888/1 6890/1 6546/1 +f 6546/1 6890/1 6894/1 +f 6894/1 6893/1 6455/1 +f 6546/1 6894/1 6457/1 +f 6457/1 6894/1 6455/1 +f 6893/1 6892/1 6445/1 +f 6455/1 6893/1 6445/1 +f 6445/1 6892/1 6441/1 +f 6892/1 5329/1 6441/1 +f 6441/1 5329/1 5330/1 +f 6441/1 5330/1 6438/1 +f 6892/1 5392/1 5329/1 +f 6891/1 6265/1 5392/1 +f 6891/1 5392/1 6892/1 +f 6895/1 6265/1 6891/1 +f 6895/1 6263/1 6265/1 +f 6262/1 6263/1 6895/1 +f 6896/1 6260/1 6262/1 +f 6845/1 6260/1 6896/1 +f 6852/1 6845/1 6896/1 +f 6896/1 6262/1 6897/1 +f 6852/1 6896/1 6898/1 +f 6898/1 6896/1 6899/1 +f 6899/1 6896/1 6897/1 +f 6853/1 6852/1 6898/1 +f 6853/1 6898/1 6861/1 +f 6861/1 6898/1 6899/1 +f 6899/1 6897/1 6900/1 +f 6861/1 6899/1 6901/1 +f 6901/1 6899/1 6900/1 +f 6897/1 6262/1 6902/1 +f 6900/1 6897/1 6902/1 +f 6902/1 6262/1 6895/1 +f 6902/1 6895/1 6885/1 +f 6900/1 6902/1 6879/1 +f 6879/1 6902/1 6885/1 +f 6901/1 6900/1 6878/1 +f 6878/1 6900/1 6879/1 +f 6861/1 6901/1 6903/1 +f 6903/1 6901/1 6877/1 +f 6877/1 6901/1 6878/1 +f 6862/1 6861/1 6903/1 +f 6863/1 6862/1 6903/1 +f 6863/1 6903/1 6877/1 +f 6863/1 6877/1 6872/1 +f 6866/1 6863/1 6872/1 +f 6885/1 6895/1 6891/1 +f 6438/1 5333/1 6436/1 +f 6438/1 5330/1 5333/1 +f 6436/1 5333/1 5337/1 +f 6436/1 5337/1 6434/1 +f 6434/1 5337/1 5391/1 +f 6883/1 6882/1 6888/1 +f 6883/1 6888/1 6904/1 +f 6904/1 6888/1 6546/1 +f 6904/1 6546/1 6545/1 +f 6871/1 6875/1 6883/1 +f 6871/1 6883/1 6905/1 +f 6540/1 6871/1 6905/1 +f 6905/1 6883/1 6904/1 +f 6905/1 6904/1 6541/1 +f 6540/1 6905/1 6541/1 +f 6541/1 6904/1 6545/1 +f 6336/1 6906/1 6867/1 +f 6336/1 6867/1 6337/1 +f 6906/1 6907/1 6867/1 +f 6867/1 6907/1 6908/1 +f 6867/1 6908/1 6858/1 +f 6867/1 6858/1 6865/1 +f 6335/1 6906/1 6336/1 +f 6335/1 6815/1 6906/1 +f 6330/1 6815/1 6335/1 +f 6815/1 6817/1 6906/1 +f 6817/1 6826/1 6907/1 +f 6906/1 6817/1 6907/1 +f 6907/1 6826/1 6834/1 +f 6907/1 6834/1 6837/1 +f 6837/1 6836/1 6909/1 +f 6907/1 6837/1 6908/1 +f 6908/1 6837/1 6909/1 +f 6909/1 6836/1 6848/1 +f 6909/1 6848/1 6857/1 +f 6908/1 6909/1 6857/1 +f 6908/1 6857/1 6858/1 +f 6839/1 5627/1 6255/1 +f 6910/1 5627/1 6839/1 +f 6829/1 6910/1 6839/1 +f 6910/1 5623/1 5627/1 +f 6911/1 5623/1 6910/1 +f 6830/1 6910/1 6829/1 +f 6830/1 6911/1 6910/1 +f 5734/1 5623/1 6911/1 +f 6912/1 5734/1 6911/1 +f 6912/1 6911/1 6830/1 +f 6823/1 6912/1 6830/1 +f 6913/1 5734/1 6912/1 +f 6822/1 6913/1 6912/1 +f 6822/1 6912/1 6823/1 +f 5733/1 5732/1 5734/1 +f 5733/1 5734/1 6913/1 +f 6914/1 5733/1 6913/1 +f 6914/1 6913/1 6822/1 +f 6812/1 6914/1 6822/1 +f 6812/1 6822/1 6818/1 +f 6811/1 6914/1 6812/1 +f 6811/1 6915/1 6914/1 +f 5729/1 6915/1 6811/1 +f 5731/1 5729/1 6811/1 +f 5729/1 5730/1 6915/1 +f 6915/1 5730/1 5733/1 +f 6915/1 5733/1 6914/1 +f 6916/1 6917/1 6918/1 +f 6645/1 6919/1 6916/1 +f 6643/1 6916/1 6920/1 +f 6916/1 6918/1 6920/1 +f 6919/1 6917/1 6916/1 +f 6645/1 6916/1 6643/1 +f 6647/1 6919/1 6645/1 +f 6647/1 6650/1 6919/1 +f 6919/1 6921/1 6917/1 +f 6650/1 6921/1 6919/1 +f 6649/1 6922/1 6650/1 +f 6650/1 6923/1 6921/1 +f 6922/1 6923/1 6650/1 +f 6921/1 6924/1 6917/1 +f 6921/1 6925/1 6926/1 +f 6923/1 6925/1 6921/1 +f 6921/1 6926/1 6924/1 +f 6927/1 6928/1 6923/1 +f 6923/1 6928/1 6925/1 +f 6922/1 6927/1 6923/1 +f 6925/1 6929/1 6926/1 +f 6925/1 5492/1 6929/1 +f 6928/1 5492/1 6925/1 +f 6926/1 5490/1 6930/1 +f 5490/1 6926/1 6929/1 +f 6924/1 6926/1 6930/1 +f 5490/1 6929/1 5492/1 +f 6928/1 5494/1 5492/1 +f 6927/1 6931/1 6928/1 +f 6931/1 5494/1 6928/1 +f 6932/1 6931/1 6927/1 +f 6932/1 6927/1 6922/1 +f 6932/1 6933/1 6931/1 +f 6931/1 5497/1 5494/1 +f 6933/1 5497/1 6931/1 +f 6660/1 6932/1 6657/1 +f 6660/1 6934/1 6932/1 +f 6657/1 6932/1 6922/1 +f 6934/1 6933/1 6932/1 +f 6657/1 6922/1 6649/1 +f 6935/1 5497/1 6933/1 +f 6936/1 6935/1 6933/1 +f 6934/1 6936/1 6933/1 +f 6935/1 5498/1 5497/1 +f 6936/1 6937/1 6935/1 +f 6937/1 5498/1 6935/1 +f 6729/1 6730/1 6936/1 +f 6936/1 6730/1 6937/1 +f 6937/1 5500/1 5498/1 +f 6730/1 5500/1 6937/1 +f 6662/1 6729/1 6934/1 +f 6662/1 6934/1 6660/1 +f 5489/1 6930/1 5490/1 +f 6938/1 5489/1 6939/1 +f 6938/1 6930/1 5489/1 +f 5489/1 5487/1 6939/1 +f 6924/1 6930/1 6938/1 +f 6924/1 6938/1 6940/1 +f 6940/1 6938/1 6939/1 +f 5487/1 6941/1 6939/1 +f 6940/1 6939/1 6942/1 +f 6941/1 6942/1 6939/1 +f 5485/1 6941/1 5487/1 +f 6943/1 6944/1 6941/1 +f 6945/1 6942/1 6941/1 +f 6943/1 6941/1 5485/1 +f 6944/1 6945/1 6941/1 +f 6918/1 6940/1 6942/1 +f 6918/1 6942/1 6945/1 +f 6917/1 6924/1 6940/1 +f 6917/1 6940/1 6918/1 +f 6920/1 6918/1 6945/1 +f 6946/1 6920/1 6945/1 +f 6944/1 6946/1 6945/1 +f 6947/1 6920/1 6946/1 +f 6948/1 6947/1 6946/1 +f 6637/1 6947/1 6948/1 +f 6949/1 6948/1 6944/1 +f 6948/1 6950/1 6637/1 +f 6949/1 6951/1 6948/1 +f 6948/1 6946/1 6944/1 +f 6948/1 6951/1 6950/1 +f 6952/1 6951/1 6949/1 +f 6949/1 6944/1 6943/1 +f 6952/1 6949/1 5484/1 +f 6950/1 6951/1 6952/1 +f 6953/1 6950/1 6952/1 +f 6636/1 6637/1 6950/1 +f 6715/1 6636/1 6950/1 +f 6633/1 6637/1 6636/1 +f 6637/1 6638/1 6947/1 +f 6638/1 6637/1 6635/1 +f 6638/1 6641/1 6947/1 +f 6947/1 6641/1 6920/1 +f 6643/1 6920/1 6641/1 +f 5485/1 5484/1 6943/1 +f 6943/1 5484/1 6949/1 +f 5403/1 5402/1 5072/1 +f 5072/1 5402/1 6954/1 +f 5402/1 6955/1 6954/1 +f 5402/1 5404/1 6955/1 +f 5072/1 6954/1 6554/1 +f 6554/1 6954/1 6956/1 +f 6954/1 6955/1 6957/1 +f 6954/1 6957/1 6958/1 +f 6954/1 6958/1 6956/1 +f 6554/1 6956/1 6555/1 +f 6555/1 6956/1 6959/1 +f 6956/1 6958/1 6960/1 +f 6956/1 6960/1 6961/1 +f 6956/1 6961/1 6959/1 +f 6958/1 6962/1 6960/1 +f 6958/1 6963/1 6962/1 +f 6957/1 6963/1 6958/1 +f 6955/1 6964/1 6957/1 +f 6957/1 6964/1 6963/1 +f 6963/1 6965/1 6962/1 +f 6964/1 6965/1 6963/1 +f 6962/1 6966/1 6967/1 +f 6960/1 6962/1 6967/1 +f 6960/1 6967/1 6961/1 +f 6967/1 6968/1 6969/1 +f 6967/1 6966/1 6968/1 +f 6961/1 6967/1 6969/1 +f 6970/1 6966/1 6971/1 +f 6970/1 6968/1 6966/1 +f 6966/1 6962/1 6971/1 +f 6972/1 6970/1 6971/1 +f 6972/1 6973/1 6970/1 +f 6973/1 6968/1 6970/1 +f 5169/1 6971/1 6974/1 +f 6971/1 6962/1 6965/1 +f 6974/1 6971/1 6965/1 +f 6972/1 6971/1 5169/1 +f 5169/1 6974/1 6975/1 +f 5169/1 6975/1 5165/1 +f 5169/1 5164/1 6972/1 +f 6974/1 6965/1 6975/1 +f 6975/1 6965/1 6976/1 +f 5165/1 6975/1 5167/1 +f 6975/1 5174/1 5167/1 +f 6975/1 6976/1 5174/1 +f 6976/1 5405/1 5174/1 +f 6964/1 6976/1 6965/1 +f 6964/1 5405/1 6976/1 +f 6977/1 5405/1 6964/1 +f 6955/1 5180/1 6977/1 +f 6955/1 6977/1 6964/1 +f 5180/1 5405/1 6977/1 +f 5404/1 5180/1 6955/1 +f 6972/1 5163/1 6978/1 +f 6978/1 6973/1 6972/1 +f 6972/1 5164/1 5163/1 +f 6978/1 5163/1 5097/1 +f 6978/1 6979/1 6973/1 +f 6980/1 6981/1 6978/1 +f 6978/1 5097/1 6980/1 +f 6978/1 6981/1 6979/1 +f 6973/1 6979/1 6968/1 +f 6981/1 6982/1 6979/1 +f 6979/1 6982/1 6968/1 +f 6983/1 6984/1 6981/1 +f 6981/1 6984/1 6982/1 +f 6980/1 6985/1 6981/1 +f 6985/1 6983/1 6981/1 +f 6986/1 6969/1 6982/1 +f 6986/1 6982/1 6987/1 +f 6969/1 6968/1 6982/1 +f 6987/1 6982/1 6984/1 +f 6984/1 6983/1 6988/1 +f 6989/1 6984/1 6988/1 +f 6987/1 6984/1 6989/1 +f 6988/1 6983/1 6990/1 +f 6985/1 6990/1 6983/1 +f 6980/1 6991/1 6985/1 +f 6991/1 6990/1 6985/1 +f 6992/1 6993/1 6990/1 +f 6994/1 6990/1 6993/1 +f 6991/1 6992/1 6990/1 +f 6988/1 6990/1 6994/1 +f 6995/1 6988/1 6994/1 +f 6989/1 6988/1 6995/1 +f 6996/1 6987/1 6989/1 +f 6996/1 6989/1 6995/1 +f 6995/1 6994/1 6997/1 +f 6996/1 6995/1 6998/1 +f 6998/1 6995/1 6997/1 +f 6994/1 6993/1 6999/1 +f 6997/1 6994/1 6999/1 +f 6998/1 6997/1 7000/1 +f 6997/1 6999/1 7001/1 +f 7000/1 6997/1 7001/1 +f 6556/1 6996/1 6998/1 +f 6556/1 6998/1 5059/1 +f 5059/1 6998/1 7000/1 +f 6556/1 6959/1 6996/1 +f 6959/1 6987/1 6996/1 +f 6555/1 6959/1 6556/1 +f 6959/1 6961/1 6986/1 +f 6959/1 6986/1 6987/1 +f 6961/1 6969/1 6986/1 +f 5059/1 7000/1 5057/1 +f 5057/1 7000/1 7002/1 +f 7000/1 7003/1 7002/1 +f 7000/1 7001/1 7003/1 +f 5057/1 7002/1 4978/1 +f 4978/1 7002/1 7004/1 +f 4978/1 7004/1 4975/1 +f 4975/1 7004/1 4972/1 +f 7004/1 7005/1 4972/1 +f 4972/1 7006/1 4968/1 +f 4972/1 7005/1 7007/1 +f 4972/1 7008/1 7006/1 +f 4972/1 7007/1 7008/1 +f 7008/1 7009/1 7006/1 +f 7006/1 7009/1 7010/1 +f 4968/1 7006/1 4974/1 +f 7006/1 7010/1 4974/1 +f 7007/1 7011/1 7008/1 +f 7008/1 7011/1 7009/1 +f 7005/1 7012/1 7007/1 +f 7007/1 7012/1 7011/1 +f 7012/1 7013/1 7011/1 +f 7005/1 7014/1 7012/1 +f 7013/1 7012/1 7015/1 +f 7015/1 7012/1 7014/1 +f 7011/1 7013/1 7016/1 +f 7017/1 7013/1 7015/1 +f 7017/1 7016/1 7013/1 +f 7011/1 7016/1 7009/1 +f 7009/1 7016/1 7010/1 +f 7018/1 7010/1 7016/1 +f 5055/1 4994/1 7010/1 +f 5055/1 7010/1 7018/1 +f 7019/1 7018/1 7016/1 +f 7020/1 5055/1 7018/1 +f 7020/1 7018/1 7019/1 +f 7019/1 7016/1 7017/1 +f 7021/1 7019/1 7017/1 +f 7019/1 7021/1 7020/1 +f 5055/1 7020/1 4999/1 +f 7021/1 7017/1 7022/1 +f 7022/1 7023/1 7021/1 +f 7017/1 7015/1 7024/1 +f 7022/1 7017/1 7024/1 +f 7022/1 7024/1 7025/1 +f 7022/1 7026/1 7023/1 +f 7025/1 7026/1 7022/1 +f 7024/1 7015/1 7027/1 +f 7025/1 7024/1 7027/1 +f 7015/1 7014/1 7028/1 +f 7027/1 7015/1 7028/1 +f 7027/1 7028/1 7029/1 +f 7025/1 7027/1 7029/1 +f 7030/1 7031/1 7025/1 +f 7025/1 7031/1 7026/1 +f 7025/1 7029/1 7030/1 +f 7029/1 7032/1 7033/1 +f 7029/1 7028/1 7032/1 +f 7030/1 7029/1 7033/1 +f 7034/1 7028/1 7014/1 +f 7035/1 7032/1 7028/1 +f 7035/1 7028/1 7034/1 +f 7036/1 7032/1 7035/1 +f 7036/1 7037/1 7032/1 +f 7033/1 7032/1 7037/1 +f 7033/1 7037/1 7038/1 +f 7030/1 7033/1 7039/1 +f 7039/1 7033/1 7038/1 +f 7039/1 7031/1 7030/1 +f 7039/1 7040/1 7031/1 +f 7041/1 7040/1 7039/1 +f 7039/1 7042/1 7041/1 +f 7039/1 7038/1 7042/1 +f 7038/1 7037/1 7043/1 +f 7038/1 7043/1 7042/1 +f 7044/1 7043/1 7037/1 +f 7044/1 7037/1 7036/1 +f 7043/1 7045/1 7042/1 +f 7045/1 7043/1 7044/1 +f 7042/1 6993/1 6992/1 +f 7041/1 7042/1 7046/1 +f 7046/1 7042/1 6992/1 +f 7042/1 7045/1 6993/1 +f 7001/1 7045/1 7003/1 +f 6999/1 6993/1 7045/1 +f 7001/1 6999/1 7045/1 +f 7003/1 7045/1 7044/1 +f 7047/1 7044/1 7036/1 +f 7003/1 7044/1 7047/1 +f 7002/1 7003/1 7047/1 +f 7047/1 7036/1 7048/1 +f 7002/1 7047/1 7048/1 +f 7048/1 7036/1 7035/1 +f 7048/1 7035/1 7049/1 +f 7002/1 7048/1 7004/1 +f 7004/1 7048/1 7049/1 +f 7049/1 7035/1 7034/1 +f 7049/1 7034/1 7050/1 +f 7004/1 7049/1 7050/1 +f 7004/1 7050/1 7005/1 +f 7050/1 7014/1 7005/1 +f 7050/1 7034/1 7014/1 +f 7046/1 6992/1 6991/1 +f 7041/1 7046/1 7051/1 +f 7051/1 7046/1 6991/1 +f 7051/1 6991/1 6980/1 +f 6980/1 5114/1 7051/1 +f 7051/1 5114/1 7041/1 +f 7041/1 5114/1 7040/1 +f 6980/1 5097/1 5114/1 +f 4974/1 7010/1 4994/1 +f 7052/1 6109/1 6106/1 +f 7052/1 6106/1 7053/1 +f 7054/1 6109/1 7052/1 +f 7054/1 6117/1 6109/1 +f 6602/1 6117/1 7054/1 +f 7055/1 6602/1 7054/1 +f 7056/1 6601/1 6602/1 +f 7056/1 6602/1 7055/1 +f 7057/1 6601/1 7056/1 +f 7058/1 7057/1 7056/1 +f 7058/1 7056/1 7059/1 +f 7059/1 7056/1 7055/1 +f 7057/1 6599/1 6601/1 +f 6600/1 6596/1 6599/1 +f 6600/1 6599/1 7057/1 +f 7060/1 6598/1 6600/1 +f 7060/1 6600/1 7061/1 +f 7061/1 6600/1 7062/1 +f 7062/1 6600/1 7057/1 +f 7060/1 7063/1 6611/1 +f 7061/1 7063/1 7060/1 +f 6611/1 6598/1 7060/1 +f 7062/1 7064/1 7061/1 +f 7061/1 7064/1 7063/1 +f 7065/1 7064/1 7062/1 +f 7062/1 7057/1 7065/1 +f 7065/1 7066/1 7064/1 +f 7067/1 7063/1 7064/1 +f 7067/1 7064/1 7068/1 +f 7069/1 7066/1 7065/1 +f 7065/1 7057/1 7069/1 +f 7069/1 7057/1 7058/1 +f 7070/1 7066/1 7069/1 +f 7058/1 7070/1 7069/1 +f 7058/1 7071/1 7070/1 +f 7059/1 7071/1 7058/1 +f 7072/1 7066/1 7070/1 +f 7073/1 7070/1 7071/1 +f 7072/1 7070/1 7073/1 +f 7068/1 7064/1 7066/1 +f 7068/1 7066/1 7072/1 +f 7068/1 7072/1 7074/1 +f 7074/1 7072/1 7073/1 +f 7075/1 7073/1 7076/1 +f 7073/1 7071/1 7077/1 +f 7073/1 7077/1 7076/1 +f 7074/1 7073/1 7075/1 +f 7059/1 7077/1 7071/1 +f 7078/1 7077/1 7059/1 +f 7059/1 7055/1 7078/1 +f 7079/1 7080/1 7077/1 +f 7079/1 7077/1 7078/1 +f 7076/1 7077/1 7081/1 +f 7081/1 7077/1 7080/1 +f 7078/1 7055/1 7079/1 +f 7055/1 7054/1 7082/1 +f 7079/1 7055/1 7083/1 +f 7083/1 7055/1 7082/1 +f 7083/1 7080/1 7079/1 +f 7084/1 7080/1 7083/1 +f 7083/1 7082/1 7084/1 +f 7084/1 7082/1 7085/1 +f 7085/1 7082/1 7086/1 +f 7086/1 7082/1 7087/1 +f 7085/1 7088/1 7084/1 +f 7084/1 7088/1 7080/1 +f 7086/1 7088/1 7085/1 +f 7086/1 7089/1 7088/1 +f 7090/1 7089/1 7086/1 +f 7086/1 7087/1 7090/1 +f 7091/1 7080/1 7088/1 +f 7092/1 7088/1 7089/1 +f 7091/1 7088/1 7092/1 +f 7093/1 7092/1 7089/1 +f 7090/1 7094/1 7089/1 +f 7093/1 7089/1 7094/1 +f 7095/1 7094/1 7090/1 +f 7090/1 7087/1 7095/1 +f 7096/1 7094/1 7095/1 +f 7093/1 7094/1 7097/1 +f 7098/1 7096/1 7095/1 +f 7095/1 7087/1 7098/1 +f 7097/1 7094/1 7096/1 +f 7099/1 7096/1 7100/1 +f 7098/1 7100/1 7096/1 +f 7097/1 7096/1 7099/1 +f 7101/1 7100/1 7098/1 +f 7098/1 7087/1 7102/1 +f 7098/1 7102/1 7101/1 +f 7101/1 6161/1 7100/1 +f 7103/1 6161/1 7101/1 +f 7101/1 7102/1 7104/1 +f 7101/1 7104/1 7103/1 +f 7087/1 7053/1 7102/1 +f 7102/1 7053/1 7105/1 +f 7102/1 7105/1 7104/1 +f 7087/1 7052/1 7053/1 +f 7082/1 7054/1 7052/1 +f 7082/1 7052/1 7087/1 +f 7104/1 7105/1 7106/1 +f 7104/1 7106/1 5974/1 +f 7103/1 7104/1 7107/1 +f 7107/1 7104/1 5982/1 +f 5982/1 7104/1 5974/1 +f 5974/1 7106/1 5972/1 +f 5974/1 5972/1 5969/1 +f 5982/1 5974/1 5980/1 +f 5982/1 5981/1 7107/1 +f 7107/1 5981/1 6161/1 +f 7107/1 6161/1 7103/1 +f 7099/1 7100/1 6161/1 +f 7099/1 6161/1 6032/1 +f 7108/1 7099/1 6032/1 +f 7109/1 7097/1 7099/1 +f 7109/1 7099/1 7108/1 +f 6029/1 7108/1 6032/1 +f 6034/1 7109/1 7108/1 +f 6034/1 7108/1 6029/1 +f 7110/1 7097/1 7109/1 +f 7111/1 7110/1 7109/1 +f 7111/1 7109/1 6034/1 +f 7110/1 7093/1 7097/1 +f 7111/1 7093/1 7110/1 +f 7112/1 7093/1 7111/1 +f 6039/1 7112/1 7111/1 +f 6039/1 7111/1 6037/1 +f 6037/1 7111/1 6034/1 +f 6037/1 6034/1 6028/1 +f 6041/1 7112/1 6039/1 +f 7112/1 7092/1 7093/1 +f 6041/1 7113/1 7112/1 +f 7113/1 7092/1 7112/1 +f 5596/1 7114/1 6041/1 +f 6041/1 7114/1 7113/1 +f 7113/1 7115/1 7092/1 +f 7114/1 7115/1 7113/1 +f 7115/1 7091/1 7092/1 +f 7115/1 7081/1 7091/1 +f 7114/1 7076/1 7115/1 +f 7076/1 7081/1 7115/1 +f 7114/1 7075/1 7076/1 +f 5596/1 7116/1 7114/1 +f 7116/1 7075/1 7114/1 +f 5594/1 7116/1 5596/1 +f 7116/1 7074/1 7075/1 +f 5594/1 7117/1 7116/1 +f 7117/1 7074/1 7116/1 +f 5592/1 7117/1 5594/1 +f 7118/1 7068/1 7117/1 +f 7117/1 7068/1 7074/1 +f 5592/1 7118/1 7117/1 +f 5590/1 7119/1 5592/1 +f 5592/1 7119/1 7118/1 +f 7118/1 7120/1 7068/1 +f 7119/1 7120/1 7118/1 +f 7120/1 7067/1 7068/1 +f 7121/1 7067/1 7120/1 +f 7119/1 7121/1 7120/1 +f 5590/1 6728/1 7119/1 +f 6728/1 7121/1 7119/1 +f 5589/1 6728/1 5590/1 +f 6728/1 6726/1 7121/1 +f 5589/1 6724/1 6728/1 +f 7121/1 7122/1 7067/1 +f 6726/1 7122/1 7121/1 +f 7122/1 7063/1 7067/1 +f 7122/1 6610/1 7063/1 +f 6726/1 6727/1 7122/1 +f 6727/1 6610/1 7122/1 +f 6724/1 6725/1 6726/1 +f 6725/1 6609/1 6610/1 +f 6725/1 6610/1 6727/1 +f 7081/1 7080/1 7091/1 +f 6611/1 7063/1 6610/1 +f 7053/1 6106/1 6101/1 +f 7053/1 6101/1 7105/1 +f 6101/1 6097/1 7123/1 +f 7105/1 6101/1 7123/1 +f 7105/1 7123/1 7106/1 +f 7123/1 6097/1 6100/1 +f 7123/1 6100/1 7124/1 +f 7106/1 7123/1 7124/1 +f 7106/1 7124/1 5972/1 +f 5972/1 7124/1 7125/1 +f 7124/1 6100/1 7126/1 +f 7124/1 7126/1 7127/1 +f 7124/1 7127/1 7125/1 +f 6100/1 6103/1 7128/1 +f 6100/1 7128/1 7126/1 +f 7126/1 7128/1 7129/1 +f 7126/1 7129/1 7130/1 +f 7126/1 7130/1 7127/1 +f 6103/1 6104/1 7128/1 +f 7128/1 6104/1 6160/1 +f 7128/1 6160/1 7129/1 +f 7129/1 6160/1 7131/1 +f 7129/1 7131/1 7130/1 +f 7130/1 7131/1 7132/1 +f 7130/1 7132/1 7133/1 +f 7127/1 7130/1 7133/1 +f 7133/1 7132/1 7134/1 +f 7133/1 7134/1 7135/1 +f 7127/1 7133/1 7135/1 +f 7135/1 7134/1 7136/1 +f 7135/1 7136/1 7137/1 +f 7127/1 7135/1 7138/1 +f 7138/1 7135/1 7137/1 +f 7136/1 7139/1 7140/1 +f 7136/1 7141/1 7139/1 +f 7137/1 7136/1 7140/1 +f 7134/1 7141/1 7136/1 +f 7140/1 7139/1 7142/1 +f 7137/1 7140/1 7143/1 +f 7143/1 7140/1 7142/1 +f 7139/1 7144/1 7142/1 +f 7142/1 7144/1 7145/1 +f 7143/1 7142/1 7145/1 +f 7143/1 7145/1 7146/1 +f 7147/1 7137/1 7143/1 +f 7147/1 7143/1 7148/1 +f 7148/1 7143/1 7146/1 +f 7145/1 7144/1 7149/1 +f 7145/1 7149/1 7150/1 +f 7146/1 7145/1 7150/1 +f 7146/1 7150/1 7151/1 +f 7148/1 7146/1 7151/1 +f 7148/1 7151/1 7152/1 +f 7153/1 7147/1 7148/1 +f 7153/1 7148/1 7154/1 +f 7154/1 7148/1 7152/1 +f 7151/1 7150/1 7155/1 +f 7151/1 7155/1 7156/1 +f 7152/1 7151/1 7156/1 +f 7150/1 7157/1 7155/1 +f 7150/1 7149/1 7157/1 +f 7155/1 7157/1 7158/1 +f 7156/1 7155/1 7158/1 +f 7156/1 7158/1 7159/1 +f 7152/1 7156/1 7159/1 +f 7158/1 7160/1 7161/1 +f 7157/1 7162/1 7158/1 +f 7158/1 7162/1 7160/1 +f 7159/1 7158/1 7161/1 +f 7149/1 7163/1 7157/1 +f 7157/1 7163/1 7164/1 +f 7157/1 7164/1 7162/1 +f 7162/1 7164/1 7165/1 +f 7162/1 7165/1 7160/1 +f 7163/1 7166/1 7164/1 +f 7164/1 7166/1 7165/1 +f 7167/1 7168/1 7163/1 +f 7163/1 7168/1 7166/1 +f 7149/1 7167/1 7163/1 +f 7144/1 7167/1 7149/1 +f 7169/1 7170/1 7167/1 +f 7167/1 7170/1 7168/1 +f 7144/1 7169/1 7167/1 +f 7170/1 6024/1 7168/1 +f 7168/1 6024/1 6021/1 +f 7168/1 6021/1 7166/1 +f 6159/1 6024/1 7170/1 +f 7169/1 6159/1 7170/1 +f 7171/1 6159/1 7169/1 +f 7139/1 7171/1 7169/1 +f 7139/1 7169/1 7144/1 +f 6159/1 6156/1 6024/1 +f 7172/1 6157/1 6159/1 +f 7172/1 6159/1 7171/1 +f 7141/1 7172/1 7171/1 +f 7141/1 7171/1 7139/1 +f 7173/1 6157/1 7172/1 +f 7174/1 7173/1 7172/1 +f 7174/1 7172/1 7141/1 +f 7173/1 6155/1 6157/1 +f 6158/1 6155/1 7173/1 +f 7175/1 6158/1 7173/1 +f 7175/1 7173/1 7174/1 +f 7175/1 7174/1 7134/1 +f 7134/1 7174/1 7141/1 +f 7131/1 7176/1 7175/1 +f 7132/1 7175/1 7134/1 +f 7176/1 6158/1 7175/1 +f 7131/1 7175/1 7132/1 +f 7176/1 6153/1 6158/1 +f 6154/1 6153/1 7176/1 +f 6160/1 6154/1 7176/1 +f 6160/1 7176/1 7131/1 +f 7166/1 6021/1 6023/1 +f 7166/1 6023/1 7177/1 +f 7165/1 7166/1 7177/1 +f 7177/1 6023/1 7178/1 +f 7178/1 6023/1 6162/1 +f 7165/1 7177/1 7179/1 +f 7179/1 7177/1 7178/1 +f 7160/1 7165/1 7179/1 +f 7179/1 7178/1 7180/1 +f 7160/1 7179/1 7181/1 +f 7181/1 7179/1 7180/1 +f 7178/1 6162/1 7182/1 +f 7180/1 7178/1 7183/1 +f 7183/1 7178/1 7182/1 +f 7182/1 6162/1 7184/1 +f 7184/1 6162/1 7185/1 +f 7183/1 7182/1 7186/1 +f 7186/1 7182/1 7184/1 +f 7187/1 7180/1 7183/1 +f 7187/1 7183/1 7188/1 +f 7188/1 7183/1 7186/1 +f 7181/1 7180/1 7187/1 +f 7189/1 7187/1 7190/1 +f 7187/1 7188/1 7190/1 +f 7191/1 7187/1 7189/1 +f 7191/1 7181/1 7187/1 +f 7188/1 7186/1 7192/1 +f 7190/1 7188/1 7192/1 +f 7186/1 7184/1 7193/1 +f 7192/1 7186/1 7193/1 +f 7192/1 7193/1 7194/1 +f 7190/1 7192/1 7195/1 +f 7195/1 7192/1 7194/1 +f 7196/1 7189/1 7190/1 +f 7196/1 7190/1 7197/1 +f 7197/1 7190/1 7195/1 +f 7195/1 7194/1 7198/1 +f 7197/1 7195/1 7199/1 +f 7199/1 7195/1 7198/1 +f 7200/1 7196/1 7197/1 +f 7200/1 7197/1 7201/1 +f 7201/1 7197/1 7199/1 +f 7202/1 7189/1 7196/1 +f 7200/1 7202/1 7196/1 +f 7203/1 7202/1 7200/1 +f 7204/1 7203/1 7200/1 +f 7204/1 7200/1 5960/1 +f 5960/1 7200/1 7201/1 +f 7201/1 7199/1 7205/1 +f 5960/1 7201/1 7205/1 +f 5960/1 7205/1 5957/1 +f 5961/1 7204/1 5960/1 +f 7205/1 7199/1 7206/1 +f 7205/1 7206/1 7207/1 +f 5957/1 7205/1 7207/1 +f 5957/1 7207/1 5954/1 +f 7207/1 7206/1 7208/1 +f 7207/1 7208/1 7209/1 +f 7207/1 7209/1 6216/1 +f 5954/1 7207/1 6216/1 +f 7206/1 7210/1 7208/1 +f 7208/1 7210/1 7211/1 +f 7208/1 7211/1 7209/1 +f 7209/1 7211/1 7212/1 +f 7209/1 7212/1 7213/1 +f 6216/1 7209/1 7213/1 +f 6216/1 7213/1 6214/1 +f 7213/1 7212/1 7214/1 +f 7213/1 7214/1 6214/1 +f 6214/1 7214/1 6215/1 +f 7211/1 7215/1 7216/1 +f 7211/1 7216/1 7212/1 +f 7210/1 7215/1 7211/1 +f 7217/1 7218/1 7215/1 +f 7215/1 7218/1 7219/1 +f 7210/1 7217/1 7215/1 +f 7194/1 7220/1 7217/1 +f 7217/1 7220/1 7218/1 +f 7194/1 7217/1 7221/1 +f 7221/1 7217/1 7210/1 +f 7220/1 7222/1 7218/1 +f 7218/1 7222/1 7223/1 +f 7218/1 7223/1 7219/1 +f 7193/1 7184/1 7220/1 +f 7220/1 7184/1 7222/1 +f 7194/1 7193/1 7220/1 +f 7198/1 7194/1 7221/1 +f 7206/1 7198/1 7221/1 +f 7206/1 7221/1 7210/1 +f 7199/1 7198/1 7206/1 +f 7184/1 7185/1 7222/1 +f 7222/1 7185/1 7223/1 +f 7185/1 6166/1 7224/1 +f 7223/1 7185/1 7224/1 +f 7224/1 6166/1 6180/1 +f 7223/1 7224/1 7225/1 +f 7225/1 7224/1 7226/1 +f 7224/1 6180/1 7226/1 +f 7226/1 6180/1 6181/1 +f 7225/1 7226/1 7227/1 +f 7227/1 7226/1 6209/1 +f 6209/1 7226/1 5861/1 +f 7226/1 6181/1 5861/1 +f 5861/1 6181/1 7228/1 +f 5861/1 7228/1 5856/1 +f 5856/1 7228/1 7229/1 +f 5856/1 7229/1 5852/1 +f 5852/1 7229/1 7230/1 +f 5852/1 7230/1 5850/1 +f 5850/1 7230/1 5849/1 +f 7231/1 7227/1 6209/1 +f 7231/1 6209/1 6208/1 +f 7232/1 7227/1 7231/1 +f 6217/1 7232/1 7231/1 +f 6217/1 7231/1 6210/1 +f 6210/1 7231/1 6208/1 +f 7233/1 7225/1 7232/1 +f 7232/1 7225/1 7227/1 +f 7234/1 7233/1 7232/1 +f 7234/1 7232/1 6217/1 +f 7219/1 7225/1 7233/1 +f 7216/1 7219/1 7233/1 +f 7216/1 7233/1 7234/1 +f 7219/1 7223/1 7225/1 +f 7215/1 7219/1 7216/1 +f 7212/1 7216/1 7214/1 +f 7216/1 7234/1 7214/1 +f 7214/1 7234/1 6217/1 +f 7214/1 6217/1 6215/1 +f 7154/1 7152/1 7204/1 +f 7204/1 7152/1 7203/1 +f 5964/1 7154/1 7204/1 +f 5964/1 7204/1 5961/1 +f 5966/1 7154/1 5964/1 +f 5966/1 7153/1 7154/1 +f 5968/1 7153/1 5966/1 +f 7125/1 7147/1 7153/1 +f 5968/1 7125/1 7153/1 +f 5972/1 7125/1 5968/1 +f 7125/1 7127/1 7138/1 +f 7125/1 7138/1 7147/1 +f 7138/1 7137/1 7147/1 +f 7152/1 7159/1 7203/1 +f 7203/1 7159/1 7235/1 +f 7203/1 7235/1 7202/1 +f 7159/1 7161/1 7235/1 +f 7235/1 7161/1 7191/1 +f 7235/1 7191/1 7202/1 +f 7202/1 7191/1 7189/1 +f 7161/1 7181/1 7191/1 +f 7161/1 7160/1 7181/1 +f 7236/1 7237/1 7238/1 +f 7239/1 7237/1 7236/1 +f 7240/1 7241/1 7236/1 +f 7242/1 7236/1 7241/1 +f 7239/1 7236/1 7242/1 +f 7240/1 7236/1 7238/1 +f 7238/1 7237/1 7243/1 +f 7243/1 7244/1 7238/1 +f 7238/1 7244/1 7240/1 +f 7245/1 7241/1 7240/1 +f 7240/1 7244/1 7246/1 +f 7240/1 7246/1 7245/1 +f 7245/1 7247/1 7241/1 +f 7248/1 7247/1 7245/1 +f 7245/1 7246/1 7249/1 +f 7245/1 7249/1 7248/1 +f 7244/1 7250/1 7246/1 +f 7246/1 7250/1 7251/1 +f 7246/1 7251/1 7249/1 +f 7244/1 7252/1 7250/1 +f 7253/1 5945/1 7252/1 +f 7253/1 7252/1 7244/1 +f 7254/1 5945/1 7253/1 +f 7255/1 5946/1 7254/1 +f 7254/1 5946/1 5945/1 +f 7256/1 7255/1 7254/1 +f 7256/1 7254/1 7257/1 +f 7257/1 7254/1 7258/1 +f 7258/1 7254/1 7259/1 +f 7259/1 7254/1 7253/1 +f 7255/1 5948/1 5946/1 +f 7260/1 5950/1 5948/1 +f 7260/1 5948/1 7255/1 +f 5953/1 5950/1 7260/1 +f 7261/1 5953/1 7260/1 +f 7261/1 7260/1 7262/1 +f 7262/1 7260/1 7263/1 +f 7264/1 7260/1 7255/1 +f 6186/1 5953/1 7265/1 +f 7265/1 5953/1 7261/1 +f 7265/1 7266/1 6186/1 +f 6186/1 7266/1 6179/1 +f 7261/1 7266/1 7265/1 +f 7261/1 7267/1 7266/1 +f 7262/1 7268/1 7267/1 +f 7262/1 7267/1 7261/1 +f 7269/1 7267/1 7268/1 +f 7270/1 7266/1 7267/1 +f 7263/1 7268/1 7262/1 +f 7271/1 7268/1 7263/1 +f 7269/1 7268/1 7272/1 +f 7272/1 7268/1 7271/1 +f 7264/1 7271/1 7263/1 +f 7263/1 7260/1 7264/1 +f 7264/1 7273/1 7271/1 +f 7272/1 7271/1 7274/1 +f 7274/1 7271/1 7273/1 +f 7275/1 7272/1 7274/1 +f 7276/1 7272/1 7275/1 +f 7276/1 7269/1 7272/1 +f 7274/1 7277/1 7278/1 +f 7279/1 7274/1 7278/1 +f 7274/1 7273/1 7277/1 +f 7275/1 7274/1 7279/1 +f 7256/1 7277/1 7273/1 +f 7256/1 7273/1 7264/1 +f 7264/1 7255/1 7256/1 +f 7257/1 7277/1 7256/1 +f 7258/1 7277/1 7257/1 +f 7259/1 7280/1 7258/1 +f 7258/1 7280/1 7277/1 +f 7281/1 7280/1 7259/1 +f 7259/1 7253/1 7281/1 +f 7281/1 7282/1 7280/1 +f 7283/1 7277/1 7280/1 +f 7283/1 7280/1 7284/1 +f 7284/1 7280/1 7282/1 +f 7285/1 7282/1 7281/1 +f 7281/1 7253/1 7285/1 +f 7285/1 7253/1 7286/1 +f 7286/1 7253/1 7244/1 +f 7286/1 7282/1 7285/1 +f 7243/1 7287/1 7286/1 +f 7286/1 7287/1 7282/1 +f 7286/1 7244/1 7243/1 +f 7243/1 7237/1 7287/1 +f 7288/1 7287/1 7237/1 +f 7289/1 7282/1 7287/1 +f 7288/1 7289/1 7287/1 +f 7288/1 7237/1 7239/1 +f 7290/1 7288/1 7291/1 +f 7292/1 7289/1 7288/1 +f 7291/1 7288/1 7239/1 +f 7292/1 7288/1 7290/1 +f 7293/1 7239/1 7242/1 +f 7291/1 7239/1 7293/1 +f 7290/1 7291/1 7293/1 +f 7293/1 7242/1 7294/1 +f 5843/1 7293/1 7294/1 +f 7290/1 7293/1 5843/1 +f 7242/1 7241/1 7247/1 +f 7242/1 7247/1 6220/1 +f 7294/1 7242/1 6220/1 +f 5844/1 7294/1 6220/1 +f 5843/1 7294/1 5844/1 +f 5845/1 7290/1 5843/1 +f 5845/1 5843/1 5841/1 +f 5847/1 7290/1 5845/1 +f 5849/1 7292/1 5847/1 +f 5847/1 7292/1 7290/1 +f 7230/1 7295/1 5849/1 +f 5849/1 7295/1 7296/1 +f 5849/1 7296/1 7292/1 +f 7296/1 7289/1 7292/1 +f 7296/1 7297/1 7289/1 +f 7295/1 7297/1 7296/1 +f 7295/1 7278/1 7297/1 +f 7295/1 7279/1 7278/1 +f 7230/1 7298/1 7295/1 +f 7298/1 7279/1 7295/1 +f 7229/1 7298/1 7230/1 +f 7299/1 7275/1 7298/1 +f 7298/1 7275/1 7279/1 +f 7229/1 7299/1 7298/1 +f 7228/1 7299/1 7229/1 +f 7299/1 7276/1 7275/1 +f 7299/1 7269/1 7276/1 +f 7228/1 7300/1 7299/1 +f 7300/1 7269/1 7299/1 +f 6181/1 7300/1 7228/1 +f 7301/1 7270/1 7300/1 +f 7300/1 7270/1 7269/1 +f 6181/1 7301/1 7300/1 +f 7269/1 7270/1 7267/1 +f 6178/1 7302/1 7270/1 +f 7301/1 6178/1 7270/1 +f 7302/1 7266/1 7270/1 +f 6181/1 6176/1 7301/1 +f 6176/1 6178/1 7301/1 +f 6176/1 6175/1 6178/1 +f 6178/1 6177/1 7302/1 +f 6177/1 6179/1 7302/1 +f 7302/1 6179/1 7266/1 +f 6175/1 6174/1 6177/1 +f 7278/1 7283/1 7297/1 +f 7278/1 7277/1 7283/1 +f 7297/1 7283/1 7284/1 +f 7297/1 7284/1 7289/1 +f 7284/1 7282/1 7289/1 +f 6220/1 6225/1 6219/1 +f 6220/1 7247/1 6225/1 +f 6225/1 7247/1 6226/1 +f 5945/1 5890/1 7252/1 +f 7252/1 5890/1 5895/1 +f 7252/1 5895/1 7250/1 +f 7250/1 5895/1 5920/1 +f 7250/1 5920/1 7251/1 +f 7251/1 5920/1 5921/1 +f 7251/1 5921/1 7303/1 +f 5921/1 5919/1 7304/1 +f 7303/1 5921/1 7304/1 +f 7303/1 7304/1 7305/1 +f 7304/1 5919/1 7306/1 +f 7304/1 7306/1 7307/1 +f 7304/1 7307/1 7308/1 +f 7305/1 7304/1 7308/1 +f 5919/1 5924/1 7306/1 +f 7306/1 5924/1 7309/1 +f 7306/1 7309/1 7310/1 +f 7306/1 7310/1 7307/1 +f 5924/1 5926/1 7309/1 +f 7309/1 5926/1 5942/1 +f 7309/1 5942/1 7310/1 +f 7310/1 5942/1 7311/1 +f 7310/1 7311/1 7312/1 +f 7307/1 7310/1 7312/1 +f 7312/1 7311/1 7313/1 +f 7312/1 7313/1 7314/1 +f 7307/1 7312/1 7314/1 +f 7314/1 7313/1 7315/1 +f 7314/1 7315/1 7316/1 +f 7307/1 7314/1 7317/1 +f 7317/1 7314/1 7316/1 +f 7316/1 7315/1 7318/1 +f 7316/1 7318/1 7319/1 +f 7317/1 7316/1 7320/1 +f 7320/1 7316/1 7319/1 +f 7308/1 7307/1 7317/1 +f 7308/1 7317/1 7320/1 +f 7320/1 7319/1 7321/1 +f 7308/1 7320/1 7322/1 +f 7322/1 7320/1 7321/1 +f 7305/1 7308/1 5764/1 +f 5764/1 7308/1 7322/1 +f 7322/1 7321/1 7323/1 +f 5762/1 7322/1 7323/1 +f 5764/1 7322/1 5762/1 +f 7323/1 7321/1 7324/1 +f 7323/1 7324/1 7325/1 +f 5760/1 7323/1 7325/1 +f 5762/1 7323/1 5760/1 +f 7325/1 7324/1 7326/1 +f 7325/1 7326/1 7327/1 +f 7325/1 7327/1 7328/1 +f 5755/1 7325/1 7328/1 +f 5760/1 7325/1 5755/1 +f 7324/1 7329/1 7326/1 +f 7326/1 7329/1 7330/1 +f 7326/1 7330/1 7331/1 +f 7326/1 7331/1 7327/1 +f 7332/1 7333/1 7329/1 +f 7329/1 7333/1 7334/1 +f 7329/1 7334/1 7330/1 +f 7324/1 7332/1 7329/1 +f 7330/1 7334/1 7335/1 +f 7330/1 7335/1 7331/1 +f 7331/1 7335/1 7336/1 +f 7331/1 7336/1 7337/1 +f 7327/1 7331/1 7337/1 +f 7334/1 7338/1 7335/1 +f 7335/1 7339/1 7336/1 +f 7335/1 7338/1 7339/1 +f 7334/1 7340/1 7338/1 +f 7333/1 7340/1 7334/1 +f 7340/1 7341/1 7338/1 +f 7338/1 7341/1 7342/1 +f 7338/1 7342/1 7339/1 +f 7336/1 7339/1 7343/1 +f 7339/1 7342/1 7344/1 +f 7339/1 7344/1 7343/1 +f 7341/1 7345/1 7342/1 +f 7342/1 7345/1 7344/1 +f 7346/1 7347/1 7341/1 +f 7341/1 7347/1 7345/1 +f 7340/1 7346/1 7341/1 +f 7348/1 7346/1 7340/1 +f 7333/1 7348/1 7340/1 +f 7349/1 7350/1 7346/1 +f 7346/1 7350/1 7347/1 +f 7348/1 7349/1 7346/1 +f 7350/1 5792/1 7347/1 +f 7347/1 5792/1 7345/1 +f 7351/1 5791/1 7350/1 +f 7350/1 5791/1 5792/1 +f 7352/1 7351/1 7350/1 +f 7352/1 7350/1 7349/1 +f 7353/1 7352/1 7349/1 +f 7353/1 7349/1 7348/1 +f 7353/1 7348/1 7333/1 +f 7354/1 7353/1 7333/1 +f 7332/1 7354/1 7333/1 +f 7355/1 7353/1 7354/1 +f 7355/1 7356/1 7353/1 +f 7356/1 7352/1 7353/1 +f 7357/1 7351/1 7352/1 +f 7356/1 7357/1 7352/1 +f 7358/1 7356/1 7355/1 +f 7359/1 7357/1 7356/1 +f 7358/1 7359/1 7356/1 +f 7360/1 7358/1 7355/1 +f 7360/1 7355/1 7361/1 +f 7361/1 7355/1 7354/1 +f 7361/1 7354/1 7332/1 +f 7324/1 7361/1 7332/1 +f 7321/1 7360/1 7361/1 +f 7321/1 7361/1 7324/1 +f 7319/1 7358/1 7360/1 +f 7321/1 7319/1 7360/1 +f 7362/1 7359/1 7358/1 +f 7319/1 7362/1 7358/1 +f 7319/1 7318/1 7362/1 +f 7363/1 7359/1 7362/1 +f 7318/1 7363/1 7362/1 +f 7315/1 7363/1 7318/1 +f 7315/1 7364/1 7363/1 +f 7364/1 7365/1 7363/1 +f 7363/1 7365/1 7366/1 +f 7363/1 7366/1 7359/1 +f 7313/1 7364/1 7315/1 +f 7367/1 7368/1 7364/1 +f 7364/1 7368/1 7365/1 +f 7313/1 7367/1 7364/1 +f 7368/1 5943/1 7365/1 +f 7365/1 5943/1 7366/1 +f 5940/1 5938/1 7368/1 +f 7368/1 5938/1 5943/1 +f 7367/1 5940/1 7368/1 +f 7369/1 5940/1 7367/1 +f 7369/1 7367/1 7313/1 +f 7311/1 7369/1 7313/1 +f 5942/1 5941/1 7369/1 +f 5941/1 5939/1 7369/1 +f 7369/1 5939/1 5940/1 +f 5942/1 7369/1 7311/1 +f 5943/1 5790/1 7370/1 +f 7366/1 5943/1 7370/1 +f 7370/1 5790/1 7351/1 +f 7351/1 5790/1 5791/1 +f 7366/1 7370/1 7357/1 +f 7357/1 7370/1 7351/1 +f 7359/1 7366/1 7357/1 +f 7345/1 5792/1 5794/1 +f 7345/1 5794/1 7371/1 +f 7344/1 7345/1 7371/1 +f 7371/1 5794/1 7372/1 +f 7372/1 5794/1 5796/1 +f 7344/1 7371/1 7373/1 +f 7373/1 7371/1 7372/1 +f 7343/1 7344/1 7373/1 +f 7373/1 7372/1 7374/1 +f 7343/1 7373/1 7375/1 +f 7375/1 7373/1 7374/1 +f 7372/1 5796/1 7376/1 +f 7374/1 7372/1 7377/1 +f 7377/1 7372/1 7376/1 +f 7375/1 7374/1 7378/1 +f 7378/1 7374/1 7377/1 +f 7379/1 7375/1 7380/1 +f 7379/1 7343/1 7375/1 +f 7380/1 7375/1 7378/1 +f 7336/1 7343/1 7379/1 +f 7337/1 7336/1 7379/1 +f 7337/1 7379/1 7381/1 +f 7381/1 7379/1 7380/1 +f 7380/1 7378/1 7382/1 +f 7381/1 7380/1 7383/1 +f 7383/1 7380/1 7382/1 +f 7327/1 7337/1 7381/1 +f 7327/1 7381/1 7384/1 +f 7384/1 7381/1 7383/1 +f 7383/1 7382/1 7385/1 +f 7384/1 7383/1 7386/1 +f 7386/1 7383/1 7385/1 +f 7382/1 7378/1 7387/1 +f 7385/1 7382/1 7387/1 +f 7385/1 7387/1 7388/1 +f 7385/1 7388/1 7389/1 +f 7386/1 7385/1 7390/1 +f 7390/1 7385/1 7389/1 +f 7328/1 7384/1 7386/1 +f 7328/1 7386/1 5749/1 +f 5749/1 7386/1 7390/1 +f 7328/1 7327/1 7384/1 +f 7390/1 7389/1 7391/1 +f 7390/1 7391/1 7392/1 +f 5749/1 7390/1 5746/1 +f 5746/1 7390/1 7392/1 +f 7389/1 7388/1 7393/1 +f 7389/1 7393/1 7391/1 +f 7391/1 7393/1 7394/1 +f 7391/1 7394/1 7395/1 +f 7392/1 7391/1 7395/1 +f 7393/1 7396/1 7397/1 +f 7393/1 7397/1 7394/1 +f 7388/1 7396/1 7393/1 +f 7394/1 7397/1 7398/1 +f 7396/1 7399/1 7397/1 +f 7397/1 7399/1 7400/1 +f 7397/1 7400/1 7401/1 +f 7397/1 7401/1 7398/1 +f 7398/1 7401/1 7402/1 +f 7398/1 7402/1 7403/1 +f 7403/1 7402/1 6253/1 +f 7403/1 6253/1 6252/1 +f 7404/1 7398/1 7403/1 +f 7395/1 7398/1 7404/1 +f 7404/1 7403/1 6251/1 +f 7392/1 7395/1 7404/1 +f 7392/1 7404/1 6235/1 +f 6235/1 7404/1 6251/1 +f 7395/1 7394/1 7398/1 +f 6251/1 7403/1 6252/1 +f 5743/1 7392/1 6235/1 +f 5746/1 7392/1 5743/1 +f 7401/1 7400/1 7405/1 +f 7401/1 7405/1 7402/1 +f 7399/1 7406/1 7400/1 +f 7400/1 7406/1 7405/1 +f 7405/1 7406/1 7407/1 +f 7405/1 7407/1 7408/1 +f 7402/1 7405/1 7408/1 +f 7402/1 7408/1 6253/1 +f 7408/1 7407/1 7409/1 +f 7408/1 7409/1 7410/1 +f 6253/1 7408/1 7410/1 +f 7406/1 7411/1 7407/1 +f 7407/1 7411/1 7409/1 +f 7409/1 7411/1 7412/1 +f 7409/1 7412/1 6250/1 +f 7410/1 7409/1 6249/1 +f 6249/1 7409/1 6250/1 +f 6253/1 7410/1 6243/1 +f 6243/1 7410/1 6249/1 +f 6250/1 7412/1 5647/1 +f 5647/1 7412/1 5643/1 +f 7412/1 6760/1 5643/1 +f 5643/1 6763/1 5639/1 +f 5643/1 6760/1 6763/1 +f 7412/1 5821/1 6760/1 +f 7411/1 5807/1 5821/1 +f 7411/1 5821/1 7412/1 +f 7406/1 7413/1 7411/1 +f 7413/1 5807/1 7411/1 +f 7413/1 5803/1 5807/1 +f 5796/1 5803/1 7413/1 +f 7414/1 5796/1 7413/1 +f 7376/1 5796/1 7414/1 +f 7414/1 7413/1 7406/1 +f 7415/1 7376/1 7414/1 +f 7415/1 7414/1 7399/1 +f 7399/1 7414/1 7406/1 +f 7377/1 7376/1 7415/1 +f 7416/1 7377/1 7415/1 +f 7416/1 7415/1 7396/1 +f 7396/1 7415/1 7399/1 +f 7378/1 7377/1 7416/1 +f 7378/1 7416/1 7387/1 +f 7387/1 7416/1 7388/1 +f 7388/1 7416/1 7396/1 +f 5639/1 6763/1 6766/1 +f 5639/1 6766/1 5637/1 +f 5637/1 6766/1 5636/1 +f 5751/1 7328/1 5749/1 +f 5755/1 7328/1 5751/1 +f 7249/1 7251/1 7303/1 +f 7249/1 7303/1 5773/1 +f 7248/1 7249/1 7417/1 +f 7417/1 7249/1 7418/1 +f 7418/1 7249/1 5773/1 +f 5773/1 7303/1 7305/1 +f 5773/1 7305/1 5766/1 +f 5766/1 7305/1 5764/1 +f 7418/1 5773/1 6228/1 +f 6228/1 5773/1 6227/1 +f 7418/1 6226/1 7417/1 +f 6228/1 6226/1 7418/1 +f 7417/1 6226/1 7247/1 +f 7417/1 7247/1 7248/1 +f 6717/1 7419/1 5480/1 +f 6717/1 6953/1 7419/1 +f 6429/1 5170/1 5397/1 +f 6429/1 5397/1 6361/1 +f 5088/1 5166/1 5170/1 +f 5088/1 5170/1 6358/1 +f 5088/1 5089/1 5095/1 +f 5088/1 5095/1 5166/1 +f 5250/1 6361/1 5397/1 +f 5250/1 6415/1 6361/1 +f 5249/1 6415/1 5250/1 +f 5039/1 5052/1 5041/1 +f 5052/1 5039/1 5035/1 +f 5450/1 5452/1 5449/1 +f 5452/1 5450/1 7420/1 +f 5452/1 7420/1 5421/1 +f 5452/1 5421/1 5448/1 +f 5796/1 5795/1 5803/1 +f 7185/1 6018/1 6166/1 +f 6162/1 6018/1 7185/1 +f 6718/1 6625/1 6577/1 +f 5503/1 5481/1 6712/1 +f 5502/1 5503/1 6712/1 +f 6708/1 5481/1 5483/1 +f 6712/1 5481/1 6710/1 +f 6710/1 5481/1 6708/1 +f 6715/1 6950/1 6953/1 +f 6953/1 6952/1 7419/1 +f 7419/1 6952/1 5482/1 +f 5480/1 7419/1 5482/1 +f 6567/1 5480/1 5479/1 +f 6567/1 6717/1 5480/1 +f 5580/1 5589/1 5590/1 +f 5406/1 5025/1 5024/1 +f 5406/1 5024/1 5444/1 +f 5025/1 5406/1 5408/1 +f 5408/1 5030/1 5025/1 +f 5414/1 5030/1 5408/1 +f 5414/1 5035/1 5030/1 +f 5421/1 5035/1 5414/1 +f 5052/1 5035/1 5421/1 +f 5052/1 5421/1 7420/1 +f 5024/1 5004/1 5444/1 +f 5004/1 5438/1 5444/1 +f 5000/1 5438/1 5004/1 +f 5000/1 5434/1 5438/1 +f 4995/1 5437/1 5000/1 +f 5000/1 5437/1 5434/1 +f 5437/1 4995/1 5442/1 +f 5442/1 4995/1 4999/1 +f 5442/1 4999/1 5158/1 +f 5158/1 4999/1 7020/1 +f 5158/1 7020/1 7021/1 +f 5158/1 7021/1 5155/1 +f 5155/1 7021/1 7023/1 +f 7026/1 5153/1 5155/1 +f 7026/1 5155/1 7023/1 +f 7031/1 5153/1 7026/1 +f 7031/1 5154/1 5153/1 +f 7040/1 5154/1 7031/1 +f 7040/1 5114/1 5154/1 +f 6358/1 5170/1 6429/1 +f 5450/1 5052/1 7420/1 +f 5052/1 5450/1 5451/1 +f 5043/1 5042/1 5052/1 +f 5451/1 5043/1 5052/1 +f 5098/1 5107/1 5097/1 +f 6667/1 5499/1 5501/1 +f 6573/1 5456/1 5453/1 +f 6597/1 6595/1 6598/1 +f 6952/1 5484/1 5482/1 +f 6717/1 6715/1 6953/1 +f 6729/1 6936/1 6934/1 +f 7421/1 7422/1 7423/1 +f 7421/1 7423/1 7424/1 +f 7425/1 7426/1 7422/1 +f 7427/1 7428/1 7426/1 +f 7429/1 7428/1 7427/1 +f 7430/1 7431/1 7429/1 +f 7432/1 7431/1 7430/1 +f 7432/1 7433/1 7431/1 +f 7434/1 7435/1 7432/1 +f 7436/1 7437/1 7434/1 +f 7438/1 7439/1 7436/1 +f 7440/1 7441/1 7438/1 +f 7442/1 7443/1 7440/1 +f 7440/1 7443/1 7441/1 +f 7444/1 7424/1 7445/1 +f 7444/1 7446/1 7447/1 +f 7448/1 7449/1 7450/1 +f 7451/1 7452/1 7448/1 +f 7450/1 7453/1 7442/1 +f 7442/1 7454/1 7443/1 +f 7455/1 7456/1 7451/1 +f 7457/1 7458/1 7455/1 +f 7455/1 7458/1 7459/1 +f 7460/1 7461/1 7457/1 +f 7457/1 7461/1 7458/1 +f 7462/1 7463/1 7460/1 +f 7464/1 7465/1 7463/1 +f 7466/1 7465/1 7464/1 +f 7467/1 7468/1 7466/1 +f 7469/1 7470/1 7468/1 +f 7447/1 7471/1 7469/1 +f 7469/1 7471/1 7470/1 +f 7450/1 7449/1 7453/1 +f 7448/1 7472/1 7449/1 +f 7448/1 7452/1 7472/1 +f 7451/1 7456/1 7452/1 +f 7455/1 7459/1 7456/1 +f 7442/1 7453/1 7454/1 +f 7473/1 7458/1 7474/1 +f 7475/1 7459/1 7473/1 +f 7473/1 7459/1 7458/1 +f 7476/1 7456/1 7475/1 +f 7475/1 7456/1 7459/1 +f 7477/1 7452/1 7476/1 +f 7476/1 7452/1 7456/1 +f 7478/1 7472/1 7477/1 +f 7477/1 7472/1 7452/1 +f 7479/1 7449/1 7478/1 +f 7478/1 7449/1 7472/1 +f 7480/1 7453/1 7479/1 +f 7479/1 7453/1 7449/1 +f 7481/1 7454/1 7480/1 +f 7480/1 7454/1 7453/1 +f 7482/1 7443/1 7481/1 +f 7481/1 7443/1 7454/1 +f 7483/1 7441/1 7482/1 +f 7482/1 7441/1 7443/1 +f 7484/1 7485/1 7483/1 +f 7483/1 7485/1 7441/1 +f 7486/1 7439/1 7484/1 +f 7484/1 7439/1 7485/1 +f 7487/1 7488/1 7486/1 +f 7486/1 7488/1 7439/1 +f 7489/1 7437/1 7487/1 +f 7487/1 7437/1 7488/1 +f 7490/1 7435/1 7489/1 +f 7489/1 7435/1 7437/1 +f 7490/1 7433/1 7435/1 +f 7474/1 7458/1 7461/1 +f 7474/1 7461/1 7491/1 +f 7491/1 7461/1 7460/1 +f 7491/1 7460/1 7492/1 +f 7492/1 7460/1 7463/1 +f 7492/1 7463/1 7493/1 +f 7493/1 7463/1 7465/1 +f 7493/1 7465/1 7494/1 +f 7494/1 7465/1 7466/1 +f 7494/1 7466/1 7495/1 +f 7495/1 7466/1 7468/1 +f 7495/1 7468/1 7496/1 +f 7496/1 7468/1 7470/1 +f 7496/1 7470/1 7497/1 +f 7497/1 7470/1 7471/1 +f 7497/1 7471/1 7498/1 +f 7498/1 7471/1 7446/1 +f 7498/1 7446/1 7499/1 +f 7499/1 7446/1 7445/1 +f 7499/1 7445/1 7500/1 +f 7500/1 7445/1 7424/1 +f 7500/1 7424/1 7501/1 +f 7501/1 7424/1 7423/1 +f 7501/1 7423/1 7502/1 +f 7502/1 7423/1 7422/1 +f 7502/1 7422/1 7503/1 +f 7503/1 7422/1 7426/1 +f 7503/1 7426/1 7504/1 +f 7504/1 7426/1 7428/1 +f 7504/1 7428/1 7505/1 +f 7505/1 7428/1 7429/1 +f 7505/1 7429/1 7506/1 +f 7506/1 7429/1 7431/1 +f 7506/1 7431/1 7507/1 +f 7507/1 7431/1 7433/1 +f 7507/1 7433/1 7490/1 +f 7476/1 7475/1 7508/1 +f 7508/1 7477/1 7476/1 +f 7508/1 7475/1 7473/1 +f 7479/1 7478/1 7508/1 +f 7508/1 7478/1 7477/1 +f 7508/1 7473/1 7474/1 +f 7508/1 7481/1 7480/1 +f 7508/1 7480/1 7479/1 +f 7496/1 7497/1 7508/1 +f 7508/1 7497/1 7498/1 +f 7508/1 7498/1 7499/1 +f 7493/1 7494/1 7508/1 +f 7508/1 7494/1 7495/1 +f 7508/1 7495/1 7496/1 +f 7474/1 7491/1 7508/1 +f 7508/1 7491/1 7492/1 +f 7508/1 7492/1 7493/1 +f 7482/1 7481/1 7508/1 +f 7505/1 7506/1 7508/1 +f 7508/1 7506/1 7507/1 +f 7508/1 7507/1 7490/1 +f 7502/1 7503/1 7508/1 +f 7508/1 7503/1 7504/1 +f 7508/1 7504/1 7505/1 +f 7499/1 7500/1 7508/1 +f 7508/1 7500/1 7501/1 +f 7508/1 7501/1 7502/1 +f 7486/1 7484/1 7508/1 +f 7508/1 7487/1 7486/1 +f 7508/1 7484/1 7483/1 +f 7508/1 7483/1 7482/1 +f 7490/1 7489/1 7508/1 +f 7508/1 7489/1 7487/1 +f 7509/1 7510/1 7511/1 +f 7511/1 7512/1 7509/1 +f 7511/1 7510/1 7513/1 +f 7511/1 7513/1 7514/1 +f 7514/1 7515/1 7511/1 +f 7511/1 7515/1 7516/1 +f 7511/1 7516/1 7517/1 +f 7517/1 7518/1 7511/1 +f 7511/1 7518/1 7519/1 +f 7511/1 7519/1 7520/1 +f 7520/1 7521/1 7511/1 +f 7511/1 7521/1 7522/1 +f 7511/1 7522/1 7523/1 +f 7523/1 7524/1 7511/1 +f 7511/1 7524/1 7525/1 +f 7511/1 7525/1 7526/1 +f 7526/1 7527/1 7511/1 +f 7528/1 7529/1 7511/1 +f 7511/1 7529/1 7512/1 +f 7511/1 7527/1 7530/1 +f 7511/1 7530/1 7528/1 +f 7455/1 7510/1 7457/1 +f 7451/1 7513/1 7455/1 +f 7455/1 7513/1 7510/1 +f 7457/1 7510/1 7509/1 +f 7457/1 7509/1 7462/1 +f 7462/1 7509/1 7512/1 +f 7464/1 7512/1 7529/1 +f 7467/1 7529/1 7528/1 +f 7469/1 7528/1 7530/1 +f 7447/1 7530/1 7527/1 +f 7451/1 7514/1 7513/1 +f 7448/1 7514/1 7451/1 +f 7450/1 7515/1 7448/1 +f 7442/1 7516/1 7450/1 +f 7440/1 7517/1 7442/1 +f 7438/1 7518/1 7440/1 +f 7436/1 7519/1 7438/1 +f 7434/1 7520/1 7436/1 +f 7432/1 7521/1 7434/1 +f 7430/1 7522/1 7432/1 +f 7432/1 7522/1 7521/1 +f 7430/1 7523/1 7522/1 +f 7427/1 7524/1 7523/1 +f 7425/1 7525/1 7524/1 +f 7421/1 7526/1 7525/1 +f 7444/1 7527/1 7526/1 +f 7462/1 7512/1 7464/1 +f 7464/1 7529/1 7467/1 +f 7467/1 7528/1 7469/1 +f 7469/1 7530/1 7447/1 +f 7447/1 7527/1 7444/1 +f 7444/1 7526/1 7421/1 +f 7421/1 7525/1 7425/1 +f 7425/1 7524/1 7427/1 +f 7427/1 7523/1 7430/1 +f 7434/1 7521/1 7520/1 +f 7436/1 7520/1 7519/1 +f 7438/1 7519/1 7518/1 +f 7440/1 7518/1 7517/1 +f 7442/1 7517/1 7516/1 +f 7450/1 7516/1 7515/1 +f 7448/1 7515/1 7514/1 +f 7469/1 7468/1 7467/1 +f 7467/1 7466/1 7464/1 +f 7464/1 7463/1 7462/1 +f 7462/1 7460/1 7457/1 +f 7447/1 7446/1 7471/1 +f 7430/1 7429/1 7427/1 +f 7427/1 7426/1 7425/1 +f 7425/1 7422/1 7421/1 +f 7421/1 7424/1 7444/1 +f 7444/1 7445/1 7446/1 +f 7434/1 7437/1 7435/1 +f 7436/1 7488/1 7437/1 +f 7436/1 7439/1 7488/1 +f 7438/1 7485/1 7439/1 +f 7438/1 7441/1 7485/1 +f 7432/1 7435/1 7433/1 +f 7531/1 7532/1 7533/1 +f 7531/1 7533/1 7534/1 +f 7531/1 7534/1 7535/1 +f 7536/1 7532/1 7531/1 +f 7536/1 7537/1 7532/1 +f 7538/1 7537/1 7536/1 +f 7538/1 7539/1 7537/1 +f 7540/1 7541/1 7538/1 +f 7541/1 7539/1 7538/1 +f 7542/1 7543/1 7540/1 +f 7540/1 7543/1 7541/1 +f 7544/1 7545/1 7542/1 +f 7542/1 7545/1 7546/1 +f 7542/1 7546/1 7543/1 +f 7547/1 7548/1 7544/1 +f 7544/1 7548/1 7545/1 +f 7549/1 7550/1 7547/1 +f 7547/1 7550/1 7551/1 +f 7547/1 7551/1 7548/1 +f 7552/1 7553/1 7549/1 +f 7549/1 7553/1 7554/1 +f 7549/1 7554/1 7550/1 +f 7555/1 7556/1 7552/1 +f 7552/1 7556/1 7553/1 +f 7557/1 7558/1 7555/1 +f 7555/1 7558/1 7559/1 +f 7555/1 7559/1 7556/1 +f 7560/1 7561/1 7557/1 +f 7557/1 7561/1 7558/1 +f 7562/1 7563/1 7560/1 +f 7560/1 7563/1 7564/1 +f 7560/1 7564/1 7561/1 +f 7565/1 7566/1 7562/1 +f 7562/1 7566/1 7563/1 +f 7567/1 7568/1 7565/1 +f 7565/1 7568/1 7569/1 +f 7565/1 7569/1 7566/1 +f 7570/1 7571/1 7567/1 +f 7567/1 7571/1 7568/1 +f 7572/1 7570/1 7567/1 +f 7572/1 7573/1 7570/1 +f 7574/1 7573/1 7572/1 +f 7574/1 7575/1 7573/1 +f 7576/1 7577/1 7574/1 +f 7577/1 7575/1 7574/1 +f 7578/1 7579/1 7576/1 +f 7576/1 7579/1 7577/1 +f 7580/1 7581/1 7578/1 +f 7578/1 7581/1 7582/1 +f 7578/1 7582/1 7579/1 +f 7535/1 7583/1 7580/1 +f 7580/1 7583/1 7581/1 +f 7535/1 7534/1 7584/1 +f 7535/1 7584/1 7583/1 +f 7585/1 7568/1 7586/1 +f 7587/1 7569/1 7585/1 +f 7585/1 7569/1 7568/1 +f 7586/1 7568/1 7571/1 +f 7586/1 7571/1 7588/1 +f 7588/1 7571/1 7570/1 +f 7588/1 7570/1 7589/1 +f 7587/1 7566/1 7569/1 +f 7590/1 7566/1 7587/1 +f 7590/1 7563/1 7566/1 +f 7591/1 7563/1 7590/1 +f 7591/1 7564/1 7563/1 +f 7592/1 7564/1 7591/1 +f 7592/1 7561/1 7564/1 +f 7593/1 7561/1 7592/1 +f 7593/1 7558/1 7561/1 +f 7594/1 7558/1 7593/1 +f 7594/1 7559/1 7558/1 +f 7595/1 7559/1 7594/1 +f 7595/1 7556/1 7559/1 +f 7596/1 7556/1 7595/1 +f 7596/1 7553/1 7556/1 +f 7597/1 7553/1 7596/1 +f 7597/1 7554/1 7553/1 +f 7598/1 7554/1 7597/1 +f 7598/1 7550/1 7554/1 +f 7599/1 7550/1 7598/1 +f 7599/1 7551/1 7550/1 +f 7600/1 7551/1 7599/1 +f 7600/1 7548/1 7551/1 +f 7601/1 7548/1 7600/1 +f 7601/1 7545/1 7548/1 +f 7589/1 7570/1 7573/1 +f 7589/1 7573/1 7602/1 +f 7602/1 7573/1 7575/1 +f 7602/1 7575/1 7603/1 +f 7603/1 7575/1 7577/1 +f 7603/1 7577/1 7604/1 +f 7604/1 7577/1 7579/1 +f 7604/1 7579/1 7605/1 +f 7605/1 7579/1 7582/1 +f 7605/1 7582/1 7606/1 +f 7606/1 7582/1 7581/1 +f 7606/1 7581/1 7607/1 +f 7607/1 7581/1 7583/1 +f 7607/1 7583/1 7608/1 +f 7608/1 7583/1 7584/1 +f 7608/1 7584/1 7609/1 +f 7609/1 7584/1 7534/1 +f 7609/1 7534/1 7610/1 +f 7610/1 7534/1 7533/1 +f 7610/1 7533/1 7611/1 +f 7611/1 7533/1 7532/1 +f 7611/1 7532/1 7612/1 +f 7612/1 7532/1 7537/1 +f 7612/1 7537/1 7613/1 +f 7613/1 7537/1 7539/1 +f 7613/1 7539/1 7614/1 +f 7614/1 7539/1 7541/1 +f 7614/1 7541/1 7615/1 +f 7615/1 7541/1 7543/1 +f 7615/1 7543/1 7616/1 +f 7616/1 7543/1 7546/1 +f 7616/1 7546/1 7617/1 +f 7617/1 7546/1 7545/1 +f 7617/1 7545/1 7601/1 +f 7590/1 7587/1 7618/1 +f 7618/1 7591/1 7590/1 +f 7618/1 7587/1 7585/1 +f 7618/1 7585/1 7586/1 +f 7586/1 7588/1 7618/1 +f 7618/1 7588/1 7589/1 +f 7618/1 7589/1 7602/1 +f 7602/1 7603/1 7618/1 +f 7618/1 7603/1 7604/1 +f 7618/1 7604/1 7605/1 +f 7605/1 7606/1 7618/1 +f 7618/1 7606/1 7607/1 +f 7618/1 7607/1 7608/1 +f 7608/1 7609/1 7618/1 +f 7618/1 7609/1 7610/1 +f 7618/1 7610/1 7611/1 +f 7611/1 7612/1 7618/1 +f 7618/1 7612/1 7613/1 +f 7618/1 7613/1 7614/1 +f 7614/1 7615/1 7618/1 +f 7618/1 7615/1 7616/1 +f 7618/1 7616/1 7617/1 +f 7617/1 7601/1 7618/1 +f 7618/1 7601/1 7600/1 +f 7618/1 7600/1 7599/1 +f 7599/1 7598/1 7618/1 +f 7618/1 7598/1 7597/1 +f 7618/1 7597/1 7596/1 +f 7596/1 7595/1 7618/1 +f 7593/1 7592/1 7618/1 +f 7618/1 7592/1 7591/1 +f 7618/1 7595/1 7594/1 +f 7618/1 7594/1 7593/1 +f 7619/1 7620/1 7621/1 +f 7621/1 7622/1 7619/1 +f 7621/1 7620/1 7623/1 +f 7621/1 7623/1 7624/1 +f 7624/1 7625/1 7621/1 +f 7621/1 7625/1 7626/1 +f 7621/1 7626/1 7627/1 +f 7627/1 7628/1 7621/1 +f 7621/1 7628/1 7629/1 +f 7621/1 7629/1 7630/1 +f 7630/1 7631/1 7621/1 +f 7621/1 7631/1 7632/1 +f 7621/1 7632/1 7633/1 +f 7633/1 7634/1 7621/1 +f 7621/1 7634/1 7635/1 +f 7621/1 7635/1 7636/1 +f 7636/1 7637/1 7621/1 +f 7638/1 7639/1 7621/1 +f 7621/1 7639/1 7622/1 +f 7621/1 7637/1 7640/1 +f 7621/1 7640/1 7638/1 +f 7565/1 7620/1 7567/1 +f 7562/1 7623/1 7565/1 +f 7565/1 7623/1 7620/1 +f 7567/1 7620/1 7619/1 +f 7567/1 7619/1 7572/1 +f 7562/1 7624/1 7623/1 +f 7560/1 7624/1 7562/1 +f 7560/1 7625/1 7624/1 +f 7557/1 7625/1 7560/1 +f 7557/1 7626/1 7625/1 +f 7555/1 7626/1 7557/1 +f 7555/1 7627/1 7626/1 +f 7552/1 7627/1 7555/1 +f 7552/1 7628/1 7627/1 +f 7549/1 7628/1 7552/1 +f 7549/1 7629/1 7628/1 +f 7547/1 7629/1 7549/1 +f 7547/1 7630/1 7629/1 +f 7544/1 7630/1 7547/1 +f 7544/1 7631/1 7630/1 +f 7572/1 7619/1 7622/1 +f 7572/1 7622/1 7574/1 +f 7574/1 7622/1 7639/1 +f 7574/1 7639/1 7576/1 +f 7576/1 7639/1 7638/1 +f 7576/1 7638/1 7578/1 +f 7578/1 7638/1 7640/1 +f 7578/1 7640/1 7580/1 +f 7580/1 7640/1 7637/1 +f 7580/1 7637/1 7535/1 +f 7535/1 7637/1 7636/1 +f 7535/1 7636/1 7531/1 +f 7531/1 7636/1 7635/1 +f 7531/1 7635/1 7536/1 +f 7536/1 7635/1 7634/1 +f 7536/1 7634/1 7538/1 +f 7538/1 7634/1 7633/1 +f 7538/1 7633/1 7540/1 +f 7540/1 7633/1 7632/1 +f 7540/1 7632/1 7542/1 +f 7542/1 7632/1 7631/1 +f 7542/1 7631/1 7544/1 +f 7641/1 7642/1 7643/1 +f 7641/1 7643/1 7644/1 +f 7641/1 7644/1 7645/1 +f 7646/1 7642/1 7641/1 +f 7646/1 7647/1 7642/1 +f 7648/1 7647/1 7646/1 +f 7648/1 7649/1 7647/1 +f 7650/1 7651/1 7648/1 +f 7651/1 7649/1 7648/1 +f 7652/1 7653/1 7650/1 +f 7650/1 7653/1 7651/1 +f 7654/1 7655/1 7652/1 +f 7652/1 7655/1 7656/1 +f 7652/1 7656/1 7653/1 +f 7657/1 7658/1 7654/1 +f 7654/1 7658/1 7655/1 +f 7659/1 7660/1 7657/1 +f 7657/1 7660/1 7661/1 +f 7657/1 7661/1 7658/1 +f 7662/1 7663/1 7659/1 +f 7659/1 7663/1 7664/1 +f 7659/1 7664/1 7660/1 +f 7665/1 7666/1 7662/1 +f 7662/1 7666/1 7663/1 +f 7667/1 7668/1 7665/1 +f 7665/1 7668/1 7669/1 +f 7665/1 7669/1 7666/1 +f 7670/1 7671/1 7667/1 +f 7667/1 7671/1 7668/1 +f 7672/1 7673/1 7670/1 +f 7670/1 7673/1 7674/1 +f 7670/1 7674/1 7671/1 +f 7675/1 7676/1 7672/1 +f 7672/1 7676/1 7673/1 +f 7677/1 7678/1 7675/1 +f 7675/1 7678/1 7679/1 +f 7675/1 7679/1 7676/1 +f 7680/1 7681/1 7677/1 +f 7677/1 7681/1 7678/1 +f 7682/1 7680/1 7677/1 +f 7682/1 7683/1 7680/1 +f 7684/1 7683/1 7682/1 +f 7684/1 7685/1 7683/1 +f 7686/1 7687/1 7684/1 +f 7687/1 7685/1 7684/1 +f 7688/1 7689/1 7686/1 +f 7686/1 7689/1 7687/1 +f 7690/1 7691/1 7688/1 +f 7688/1 7691/1 7692/1 +f 7688/1 7692/1 7689/1 +f 7645/1 7693/1 7690/1 +f 7690/1 7693/1 7691/1 +f 7645/1 7644/1 7694/1 +f 7645/1 7694/1 7693/1 +f 7695/1 7678/1 7696/1 +f 7695/1 7679/1 7678/1 +f 7696/1 7678/1 7681/1 +f 7696/1 7681/1 7697/1 +f 7697/1 7681/1 7680/1 +f 7697/1 7680/1 7698/1 +f 7698/1 7680/1 7683/1 +f 7698/1 7683/1 7699/1 +f 7699/1 7683/1 7685/1 +f 7699/1 7685/1 7700/1 +f 7700/1 7685/1 7687/1 +f 7700/1 7687/1 7701/1 +f 7701/1 7687/1 7689/1 +f 7701/1 7689/1 7702/1 +f 7702/1 7689/1 7692/1 +f 7702/1 7692/1 7703/1 +f 7703/1 7692/1 7691/1 +f 7703/1 7691/1 7704/1 +f 7704/1 7691/1 7693/1 +f 7704/1 7693/1 7705/1 +f 7705/1 7693/1 7694/1 +f 7705/1 7694/1 7706/1 +f 7706/1 7694/1 7644/1 +f 7706/1 7644/1 7707/1 +f 7707/1 7644/1 7643/1 +f 7707/1 7643/1 7708/1 +f 7708/1 7643/1 7642/1 +f 7708/1 7642/1 7709/1 +f 7709/1 7642/1 7647/1 +f 7709/1 7647/1 7710/1 +f 7710/1 7647/1 7649/1 +f 7710/1 7649/1 7711/1 +f 7711/1 7649/1 7651/1 +f 7711/1 7651/1 7712/1 +f 7712/1 7651/1 7653/1 +f 7712/1 7653/1 7713/1 +f 7713/1 7653/1 7656/1 +f 7713/1 7656/1 7714/1 +f 7714/1 7656/1 7655/1 +f 7714/1 7655/1 7715/1 +f 7715/1 7655/1 7658/1 +f 7715/1 7658/1 7716/1 +f 7716/1 7658/1 7661/1 +f 7716/1 7661/1 7717/1 +f 7717/1 7661/1 7660/1 +f 7717/1 7660/1 7718/1 +f 7718/1 7660/1 7664/1 +f 7718/1 7664/1 7719/1 +f 7719/1 7664/1 7663/1 +f 7719/1 7663/1 7720/1 +f 7720/1 7663/1 7666/1 +f 7720/1 7666/1 7721/1 +f 7721/1 7666/1 7669/1 +f 7721/1 7669/1 7722/1 +f 7722/1 7669/1 7668/1 +f 7722/1 7668/1 7723/1 +f 7723/1 7668/1 7671/1 +f 7723/1 7671/1 7724/1 +f 7724/1 7671/1 7674/1 +f 7724/1 7674/1 7725/1 +f 7725/1 7674/1 7673/1 +f 7725/1 7673/1 7726/1 +f 7726/1 7673/1 7676/1 +f 7726/1 7676/1 7727/1 +f 7727/1 7676/1 7679/1 +f 7727/1 7679/1 7695/1 +f 7726/1 7727/1 7728/1 +f 7728/1 7725/1 7726/1 +f 7728/1 7727/1 7695/1 +f 7728/1 7695/1 7696/1 +f 7696/1 7697/1 7728/1 +f 7728/1 7697/1 7698/1 +f 7728/1 7698/1 7699/1 +f 7699/1 7700/1 7728/1 +f 7728/1 7700/1 7701/1 +f 7728/1 7701/1 7702/1 +f 7702/1 7703/1 7728/1 +f 7728/1 7703/1 7704/1 +f 7728/1 7704/1 7705/1 +f 7705/1 7706/1 7728/1 +f 7728/1 7706/1 7707/1 +f 7728/1 7707/1 7708/1 +f 7708/1 7709/1 7728/1 +f 7728/1 7709/1 7710/1 +f 7728/1 7710/1 7711/1 +f 7711/1 7712/1 7728/1 +f 7728/1 7712/1 7713/1 +f 7728/1 7713/1 7714/1 +f 7714/1 7715/1 7728/1 +f 7728/1 7715/1 7716/1 +f 7728/1 7716/1 7717/1 +f 7717/1 7718/1 7728/1 +f 7728/1 7718/1 7719/1 +f 7728/1 7719/1 7720/1 +f 7720/1 7721/1 7728/1 +f 7723/1 7724/1 7728/1 +f 7728/1 7724/1 7725/1 +f 7728/1 7721/1 7722/1 +f 7728/1 7722/1 7723/1 +f 7729/1 7730/1 7731/1 +f 7731/1 7732/1 7729/1 +f 7731/1 7730/1 7733/1 +f 7731/1 7733/1 7734/1 +f 7734/1 7735/1 7731/1 +f 7731/1 7735/1 7736/1 +f 7731/1 7736/1 7737/1 +f 7737/1 7738/1 7731/1 +f 7731/1 7738/1 7739/1 +f 7731/1 7739/1 7740/1 +f 7740/1 7741/1 7731/1 +f 7731/1 7741/1 7742/1 +f 7731/1 7742/1 7743/1 +f 7743/1 7744/1 7731/1 +f 7731/1 7744/1 7745/1 +f 7731/1 7745/1 7746/1 +f 7746/1 7747/1 7731/1 +f 7748/1 7749/1 7731/1 +f 7731/1 7749/1 7732/1 +f 7731/1 7747/1 7750/1 +f 7731/1 7750/1 7748/1 +f 7675/1 7730/1 7677/1 +f 7675/1 7733/1 7730/1 +f 7677/1 7730/1 7729/1 +f 7677/1 7729/1 7682/1 +f 7682/1 7729/1 7732/1 +f 7682/1 7732/1 7684/1 +f 7684/1 7732/1 7749/1 +f 7684/1 7749/1 7686/1 +f 7686/1 7749/1 7748/1 +f 7686/1 7748/1 7688/1 +f 7688/1 7748/1 7750/1 +f 7688/1 7750/1 7690/1 +f 7690/1 7750/1 7747/1 +f 7690/1 7747/1 7645/1 +f 7645/1 7747/1 7746/1 +f 7645/1 7746/1 7641/1 +f 7641/1 7746/1 7745/1 +f 7641/1 7745/1 7646/1 +f 7646/1 7745/1 7744/1 +f 7646/1 7744/1 7648/1 +f 7648/1 7743/1 7650/1 +f 7648/1 7744/1 7743/1 +f 7650/1 7743/1 7742/1 +f 7650/1 7742/1 7652/1 +f 7652/1 7742/1 7741/1 +f 7652/1 7741/1 7654/1 +f 7654/1 7741/1 7740/1 +f 7654/1 7740/1 7657/1 +f 7657/1 7740/1 7739/1 +f 7657/1 7739/1 7659/1 +f 7659/1 7739/1 7738/1 +f 7659/1 7738/1 7662/1 +f 7662/1 7738/1 7737/1 +f 7662/1 7737/1 7665/1 +f 7665/1 7737/1 7736/1 +f 7665/1 7736/1 7667/1 +f 7667/1 7736/1 7735/1 +f 7667/1 7735/1 7670/1 +f 7670/1 7735/1 7734/1 +f 7670/1 7734/1 7672/1 +f 7672/1 7734/1 7733/1 +f 7672/1 7733/1 7675/1 +f 7751/1 7752/1 7753/1 +f 7751/1 7753/1 7754/1 +f 7755/1 7756/1 7751/1 +f 7755/1 7751/1 7754/1 +f 7756/1 7752/1 7751/1 +f 7754/1 7753/1 7757/1 +f 7752/1 7758/1 7753/1 +f 7753/1 7758/1 7757/1 +f 7755/1 7754/1 7759/1 +f 7760/1 7755/1 7759/1 +f 7760/1 7759/1 7761/1 +f 7761/1 7759/1 7762/1 +f 7763/1 7762/1 7759/1 +f 7763/1 7759/1 7764/1 +f 7765/1 7760/1 7761/1 +f 7765/1 7761/1 7766/1 +f 7761/1 7762/1 7766/1 +f 7766/1 7762/1 7767/1 +f 7767/1 7762/1 7763/1 +f 7766/1 7767/1 7768/1 +f 7769/1 7765/1 7766/1 +f 7770/1 7769/1 7766/1 +f 7770/1 7766/1 7768/1 +f 7771/1 7760/1 7765/1 +f 7769/1 7771/1 7765/1 +f 7772/1 7773/1 7771/1 +f 7771/1 7773/1 7760/1 +f 7774/1 7772/1 7771/1 +f 7774/1 7771/1 7769/1 +f 7775/1 7776/1 7772/1 +f 7772/1 7776/1 7773/1 +f 7775/1 7772/1 7774/1 +f 7776/1 7777/1 7773/1 +f 7773/1 7777/1 7755/1 +f 7773/1 7755/1 7760/1 +f 7775/1 7778/1 7776/1 +f 7776/1 7778/1 7777/1 +f 7777/1 7756/1 7755/1 +f 7777/1 7778/1 7779/1 +f 7777/1 7779/1 7756/1 +f 7778/1 7780/1 7779/1 +f 7781/1 7780/1 7778/1 +f 7781/1 7778/1 7775/1 +f 7779/1 7780/1 7782/1 +f 7779/1 7782/1 7752/1 +f 7756/1 7779/1 7752/1 +f 7780/1 7783/1 7782/1 +f 7784/1 7783/1 7780/1 +f 7784/1 7780/1 7781/1 +f 7781/1 7775/1 7785/1 +f 7786/1 7784/1 7781/1 +f 7781/1 7785/1 7786/1 +f 7786/1 7787/1 7784/1 +f 7787/1 7788/1 7784/1 +f 7788/1 7783/1 7784/1 +f 7786/1 7785/1 7789/1 +f 7786/1 7789/1 7790/1 +f 7790/1 7791/1 7786/1 +f 7786/1 7791/1 7787/1 +f 7785/1 7775/1 7792/1 +f 7785/1 7792/1 7789/1 +f 7774/1 7792/1 7775/1 +f 7792/1 7793/1 7789/1 +f 7774/1 7793/1 7792/1 +f 7789/1 7793/1 7794/1 +f 7789/1 7794/1 7795/1 +f 7789/1 7795/1 7790/1 +f 7794/1 7793/1 7774/1 +f 7794/1 7774/1 7796/1 +f 7796/1 7774/1 7769/1 +f 7795/1 7794/1 7796/1 +f 7795/1 7796/1 7797/1 +f 7790/1 7795/1 7797/1 +f 7797/1 7796/1 7798/1 +f 7796/1 7769/1 7798/1 +f 7799/1 7798/1 7769/1 +f 7799/1 7769/1 7770/1 +f 7800/1 7801/1 7799/1 +f 7800/1 7799/1 7802/1 +f 7799/1 7770/1 7802/1 +f 7801/1 7798/1 7799/1 +f 7802/1 7770/1 7768/1 +f 7803/1 7804/1 7802/1 +f 7802/1 7804/1 7805/1 +f 7802/1 7805/1 7800/1 +f 7802/1 7768/1 7803/1 +f 7800/1 7805/1 7806/1 +f 7806/1 7801/1 7800/1 +f 7801/1 7807/1 7798/1 +f 7801/1 7806/1 7807/1 +f 7807/1 7806/1 7808/1 +f 7805/1 7809/1 7806/1 +f 7809/1 7810/1 7806/1 +f 7806/1 7810/1 7808/1 +f 7805/1 7811/1 7809/1 +f 7812/1 7805/1 7804/1 +f 7811/1 7813/1 7809/1 +f 7809/1 7813/1 7810/1 +f 7814/1 7808/1 7810/1 +f 7814/1 7810/1 7815/1 +f 7815/1 7810/1 7813/1 +f 7811/1 7816/1 7813/1 +f 7816/1 7815/1 7813/1 +f 7815/1 7817/1 7814/1 +f 7818/1 7819/1 7814/1 +f 7819/1 7808/1 7814/1 +f 7814/1 7817/1 7820/1 +f 7814/1 7820/1 7818/1 +f 7821/1 7822/1 7817/1 +f 7817/1 7822/1 7823/1 +f 7817/1 7823/1 7820/1 +f 7820/1 7824/1 7818/1 +f 7825/1 7826/1 7824/1 +f 7824/1 7826/1 7827/1 +f 7824/1 7827/1 7818/1 +f 7823/1 7825/1 7824/1 +f 7820/1 7823/1 7824/1 +f 7828/1 7829/1 7825/1 +f 7825/1 7829/1 7830/1 +f 7822/1 7831/1 7828/1 +f 7822/1 7828/1 7823/1 +f 7832/1 7831/1 7822/1 +f 7832/1 7833/1 7831/1 +f 7834/1 7833/1 7832/1 +f 7832/1 7835/1 7834/1 +f 7821/1 7832/1 7822/1 +f 7834/1 7836/1 7837/1 +f 7834/1 7835/1 7838/1 +f 7834/1 7838/1 7836/1 +f 7837/1 7836/1 7839/1 +f 7836/1 7838/1 7840/1 +f 7836/1 7840/1 7841/1 +f 7837/1 7842/1 7843/1 +f 7837/1 7839/1 7842/1 +f 7843/1 7842/1 7844/1 +f 7843/1 7844/1 7845/1 +f 7845/1 7844/1 7846/1 +f 7845/1 7847/1 7848/1 +f 7845/1 7846/1 7847/1 +f 7848/1 7847/1 7849/1 +f 7850/1 7848/1 7851/1 +f 7848/1 7849/1 7851/1 +f 7852/1 7850/1 7851/1 +f 7853/1 7850/1 7852/1 +f 7854/1 7855/1 7853/1 +f 7853/1 7855/1 7850/1 +f 7855/1 7856/1 7850/1 +f 7856/1 7857/1 7850/1 +f 7850/1 7857/1 7858/1 +f 7850/1 7858/1 7859/1 +f 7859/1 7858/1 7860/1 +f 7859/1 7860/1 7861/1 +f 7860/1 7862/1 7861/1 +f 7861/1 7862/1 7863/1 +f 7861/1 7863/1 7864/1 +f 7864/1 7863/1 7865/1 +f 7864/1 7865/1 7866/1 +f 7866/1 7865/1 7867/1 +f 7866/1 7867/1 7829/1 +f 7829/1 7867/1 7868/1 +f 7830/1 7829/1 7869/1 +f 7869/1 7829/1 7870/1 +f 7829/1 7868/1 7870/1 +f 7825/1 7830/1 7826/1 +f 7826/1 7830/1 7871/1 +f 7871/1 7830/1 7872/1 +f 7823/1 7828/1 7825/1 +f 7871/1 7872/1 7873/1 +f 7873/1 7872/1 7874/1 +f 7873/1 7874/1 7875/1 +f 7876/1 7875/1 7874/1 +f 7877/1 7875/1 7876/1 +f 7878/1 7877/1 7876/1 +f 7878/1 7876/1 7879/1 +f 7879/1 7876/1 7880/1 +f 7881/1 7882/1 7877/1 +f 7881/1 7877/1 7878/1 +f 7883/1 7882/1 7881/1 +f 7871/1 7884/1 7885/1 +f 7886/1 7887/1 7871/1 +f 7871/1 7887/1 7888/1 +f 7871/1 7888/1 7884/1 +f 7826/1 7871/1 7889/1 +f 7889/1 7871/1 7885/1 +f 7890/1 7891/1 7886/1 +f 7886/1 7891/1 7887/1 +f 7890/1 7892/1 7891/1 +f 7887/1 7891/1 7893/1 +f 7891/1 7892/1 7894/1 +f 7894/1 7895/1 7891/1 +f 7891/1 7895/1 7896/1 +f 7891/1 7896/1 7897/1 +f 7893/1 7898/1 7887/1 +f 7887/1 7898/1 7899/1 +f 7888/1 7887/1 7788/1 +f 7887/1 7900/1 7788/1 +f 7887/1 7899/1 7900/1 +f 7900/1 7899/1 7901/1 +f 7902/1 7783/1 7900/1 +f 7900/1 7903/1 7902/1 +f 7788/1 7900/1 7783/1 +f 7900/1 7901/1 7903/1 +f 7787/1 7888/1 7788/1 +f 7791/1 7884/1 7888/1 +f 7791/1 7888/1 7787/1 +f 7790/1 7904/1 7791/1 +f 7904/1 7884/1 7791/1 +f 7904/1 7885/1 7884/1 +f 7905/1 7906/1 7904/1 +f 7905/1 7904/1 7790/1 +f 7906/1 7885/1 7904/1 +f 7790/1 7797/1 7905/1 +f 7907/1 7908/1 7905/1 +f 7905/1 7797/1 7909/1 +f 7905/1 7909/1 7907/1 +f 7908/1 7906/1 7905/1 +f 7797/1 7798/1 7909/1 +f 7909/1 7798/1 7907/1 +f 7798/1 7807/1 7907/1 +f 7807/1 7910/1 7907/1 +f 7907/1 7910/1 7908/1 +f 7910/1 7911/1 7908/1 +f 7908/1 7911/1 7906/1 +f 7819/1 7911/1 7910/1 +f 7819/1 7910/1 7808/1 +f 7808/1 7910/1 7807/1 +f 7818/1 7827/1 7911/1 +f 7818/1 7911/1 7819/1 +f 7911/1 7827/1 7906/1 +f 7906/1 7827/1 7826/1 +f 7826/1 7889/1 7906/1 +f 7906/1 7889/1 7885/1 +f 7902/1 7903/1 7912/1 +f 7903/1 7901/1 7913/1 +f 7903/1 7913/1 7912/1 +f 7902/1 7912/1 7914/1 +f 7914/1 7912/1 7915/1 +f 7912/1 7913/1 7916/1 +f 7912/1 7916/1 7915/1 +f 7901/1 7917/1 7913/1 +f 7913/1 7917/1 7918/1 +f 7913/1 7918/1 7919/1 +f 7919/1 7918/1 7920/1 +f 7919/1 7920/1 7921/1 +f 7921/1 7920/1 7922/1 +f 7921/1 7922/1 7923/1 +f 7922/1 7924/1 7925/1 +f 7923/1 7922/1 7925/1 +f 7925/1 7924/1 7926/1 +f 7926/1 7924/1 7927/1 +f 7926/1 7927/1 7928/1 +f 7928/1 7927/1 7929/1 +f 7929/1 7927/1 7930/1 +f 7929/1 7930/1 7931/1 +f 7931/1 7930/1 7932/1 +f 7931/1 7932/1 7933/1 +f 7930/1 7934/1 7932/1 +f 7930/1 7935/1 7934/1 +f 7936/1 7935/1 7930/1 +f 7930/1 7937/1 7936/1 +f 7938/1 7939/1 7930/1 +f 7930/1 7939/1 7937/1 +f 7897/1 7940/1 7938/1 +f 7938/1 7940/1 7939/1 +f 7897/1 7896/1 7940/1 +f 7915/1 7941/1 7942/1 +f 7914/1 7915/1 7943/1 +f 7943/1 7915/1 7942/1 +f 7916/1 7941/1 7915/1 +f 7944/1 7942/1 7941/1 +f 7945/1 7942/1 7944/1 +f 7946/1 7945/1 7944/1 +f 7944/1 7947/1 7946/1 +f 7946/1 7947/1 7948/1 +f 7946/1 7948/1 7949/1 +f 7949/1 7948/1 7950/1 +f 7949/1 7950/1 7951/1 +f 7951/1 7950/1 7840/1 +f 7916/1 7944/1 7941/1 +f 7841/1 7947/1 7944/1 +f 7841/1 7944/1 7916/1 +f 7841/1 7840/1 7950/1 +f 7841/1 7950/1 7948/1 +f 7948/1 7947/1 7841/1 +f 7952/1 7914/1 7943/1 +f 7952/1 7953/1 7758/1 +f 7758/1 7914/1 7952/1 +f 7758/1 7902/1 7914/1 +f 7758/1 7953/1 7757/1 +f 7752/1 7782/1 7758/1 +f 7782/1 7902/1 7758/1 +f 7954/1 7757/1 7953/1 +f 7782/1 7783/1 7902/1 +f 7835/1 7832/1 7821/1 +f 7767/1 7955/1 7768/1 +f 7768/1 7955/1 7803/1 +f 7764/1 7956/1 7763/1 +f 7956/1 7957/1 7763/1 +f 7763/1 7957/1 7955/1 +f 7763/1 7955/1 7767/1 +f 7754/1 7757/1 7954/1 +f 7759/1 7754/1 7954/1 +f 7954/1 7953/1 7958/1 +f 7759/1 7954/1 7958/1 +f 7764/1 7759/1 7958/1 +f 7958/1 7953/1 7959/1 +f 7960/1 7958/1 7961/1 +f 7961/1 7958/1 7959/1 +f 7958/1 7960/1 7764/1 +f 7952/1 7959/1 7953/1 +f 7961/1 7959/1 7962/1 +f 7962/1 7959/1 7963/1 +f 7963/1 7959/1 7952/1 +f 7960/1 7961/1 7964/1 +f 7964/1 7961/1 7965/1 +f 7961/1 7962/1 7965/1 +f 7960/1 7964/1 7956/1 +f 7764/1 7960/1 7956/1 +f 7956/1 7964/1 7966/1 +f 7956/1 7966/1 7957/1 +f 7957/1 7966/1 7967/1 +f 7957/1 7967/1 7955/1 +f 7966/1 7968/1 7967/1 +f 7969/1 7970/1 7966/1 +f 7969/1 7966/1 7964/1 +f 7970/1 7971/1 7966/1 +f 7966/1 7971/1 7968/1 +f 7972/1 7970/1 7969/1 +f 7973/1 7972/1 7969/1 +f 7973/1 7969/1 7974/1 +f 7974/1 7969/1 7964/1 +f 7972/1 7975/1 7970/1 +f 7976/1 7975/1 7972/1 +f 7976/1 7972/1 7973/1 +f 7976/1 7973/1 7977/1 +f 7977/1 7973/1 7974/1 +f 7974/1 7964/1 7978/1 +f 7977/1 7974/1 7979/1 +f 7979/1 7974/1 7978/1 +f 7978/1 7964/1 7965/1 +f 7979/1 7978/1 7965/1 +f 7965/1 7980/1 7979/1 +f 7980/1 7946/1 7979/1 +f 7979/1 7946/1 7949/1 +f 7979/1 7949/1 7977/1 +f 7965/1 7962/1 7980/1 +f 7962/1 7981/1 7980/1 +f 7980/1 7981/1 7946/1 +f 7981/1 7945/1 7946/1 +f 7962/1 7963/1 7981/1 +f 7981/1 7963/1 7982/1 +f 7981/1 7982/1 7945/1 +f 7945/1 7982/1 7942/1 +f 7982/1 7963/1 7952/1 +f 7952/1 7943/1 7982/1 +f 7943/1 7942/1 7982/1 +f 7983/1 7976/1 7977/1 +f 7977/1 7949/1 7951/1 +f 7977/1 7951/1 7983/1 +f 7984/1 7985/1 7976/1 +f 7985/1 7975/1 7976/1 +f 7983/1 7984/1 7976/1 +f 7986/1 7987/1 7984/1 +f 7984/1 7987/1 7985/1 +f 7986/1 7984/1 7983/1 +f 7970/1 7975/1 7985/1 +f 7970/1 7985/1 7987/1 +f 7986/1 7988/1 7987/1 +f 7987/1 7988/1 7989/1 +f 7987/1 7989/1 7970/1 +f 7970/1 7989/1 7971/1 +f 7989/1 7988/1 7990/1 +f 7989/1 7990/1 7971/1 +f 7991/1 7988/1 7986/1 +f 7988/1 7992/1 7990/1 +f 7988/1 7991/1 7992/1 +f 7971/1 7990/1 7993/1 +f 7990/1 7992/1 7994/1 +f 7990/1 7994/1 7993/1 +f 7971/1 7993/1 7968/1 +f 7968/1 7993/1 7812/1 +f 7993/1 7994/1 7805/1 +f 7993/1 7805/1 7812/1 +f 7994/1 7811/1 7805/1 +f 7992/1 7995/1 7994/1 +f 7994/1 7995/1 7996/1 +f 7994/1 7996/1 7811/1 +f 7996/1 7816/1 7811/1 +f 7995/1 7997/1 7996/1 +f 7996/1 7997/1 7816/1 +f 7992/1 7998/1 7995/1 +f 7995/1 7998/1 7997/1 +f 7998/1 7999/1 7997/1 +f 7997/1 7999/1 7815/1 +f 7997/1 7815/1 7816/1 +f 7992/1 7991/1 7998/1 +f 7991/1 8000/1 7998/1 +f 7998/1 8000/1 7999/1 +f 8000/1 8001/1 7999/1 +f 7999/1 8001/1 7821/1 +f 7999/1 7821/1 7815/1 +f 7815/1 7821/1 7817/1 +f 7821/1 8001/1 7835/1 +f 8000/1 8002/1 8001/1 +f 8001/1 8002/1 8003/1 +f 8001/1 8003/1 7835/1 +f 8000/1 7986/1 8002/1 +f 7983/1 8002/1 7986/1 +f 7983/1 8004/1 8002/1 +f 8004/1 8003/1 8002/1 +f 7835/1 8003/1 7838/1 +f 7983/1 7951/1 8004/1 +f 7951/1 7840/1 8004/1 +f 8004/1 7840/1 8003/1 +f 7991/1 7986/1 8000/1 +f 7968/1 7812/1 7967/1 +f 7967/1 7812/1 7804/1 +f 7803/1 7955/1 7967/1 +f 7967/1 7804/1 7803/1 +f 8005/1 8006/1 8007/1 +f 8007/1 8008/1 8005/1 +f 8007/1 8006/1 8009/1 +f 8006/1 8010/1 8009/1 +f 8007/1 8009/1 8011/1 +f 8011/1 8012/1 8007/1 +f 8007/1 8012/1 8008/1 +f 8012/1 8013/1 8008/1 +f 8014/1 8012/1 8015/1 +f 8011/1 8015/1 8012/1 +f 8016/1 8015/1 8011/1 +f 8015/1 8016/1 8017/1 +f 8017/1 8018/1 8015/1 +f 8015/1 8018/1 8019/1 +f 8015/1 8019/1 8014/1 +f 8014/1 8019/1 8020/1 +f 8018/1 8021/1 8019/1 +f 8022/1 8020/1 8019/1 +f 8022/1 8019/1 8023/1 +f 8023/1 8019/1 8021/1 +f 8023/1 8021/1 8018/1 +f 8017/1 8024/1 8018/1 +f 8018/1 8024/1 8025/1 +f 8018/1 8025/1 8023/1 +f 8025/1 8026/1 8023/1 +f 8023/1 8026/1 8027/1 +f 8023/1 8027/1 8022/1 +f 8022/1 8027/1 8028/1 +f 8022/1 8028/1 8029/1 +f 8030/1 8028/1 8027/1 +f 8030/1 8027/1 8031/1 +f 8031/1 8027/1 8026/1 +f 8032/1 8028/1 8030/1 +f 8033/1 8028/1 8034/1 +f 8034/1 8028/1 8032/1 +f 8034/1 8035/1 8033/1 +f 8033/1 8035/1 8036/1 +f 8037/1 8033/1 8036/1 +f 8031/1 8026/1 8038/1 +f 8038/1 8026/1 8039/1 +f 8025/1 8039/1 8026/1 +f 8038/1 8039/1 8040/1 +f 8040/1 8039/1 8041/1 +f 8042/1 8041/1 8039/1 +f 8042/1 8039/1 8043/1 +f 8043/1 8039/1 8024/1 +f 8024/1 8039/1 8025/1 +f 8044/1 8041/1 8042/1 +f 8043/1 8045/1 8042/1 +f 8042/1 8045/1 8046/1 +f 8042/1 8046/1 8044/1 +f 8024/1 8047/1 8043/1 +f 8043/1 8047/1 8045/1 +f 8017/1 8048/1 8024/1 +f 8024/1 8048/1 8047/1 +f 8049/1 8047/1 8048/1 +f 8049/1 8045/1 8047/1 +f 8050/1 8046/1 8045/1 +f 8049/1 8050/1 8045/1 +f 8044/1 8046/1 8051/1 +f 8051/1 8046/1 8052/1 +f 8052/1 8046/1 8050/1 +f 8052/1 8050/1 8053/1 +f 8053/1 8050/1 8054/1 +f 8055/1 8054/1 8050/1 +f 8055/1 8050/1 8049/1 +f 8056/1 8053/1 8057/1 +f 8057/1 8053/1 8058/1 +f 8053/1 8054/1 8058/1 +f 8059/1 8051/1 8056/1 +f 8060/1 8044/1 8051/1 +f 8060/1 8051/1 8059/1 +f 8060/1 8059/1 8061/1 +f 8062/1 8044/1 8060/1 +f 8062/1 8041/1 8044/1 +f 8040/1 8041/1 8062/1 +f 8062/1 8038/1 8040/1 +f 8031/1 8038/1 8062/1 +f 8062/1 8030/1 8031/1 +f 8062/1 8032/1 8030/1 +f 8034/1 8032/1 8062/1 +f 8062/1 8035/1 8034/1 +f 8062/1 8036/1 8035/1 +f 8063/1 8036/1 8062/1 +f 8064/1 8065/1 8036/1 +f 8064/1 8036/1 8063/1 +f 8066/1 8067/1 8064/1 +f 8067/1 8065/1 8064/1 +f 8067/1 8068/1 8065/1 +f 8069/1 8068/1 8067/1 +f 8067/1 8070/1 8069/1 +f 8067/1 8071/1 8070/1 +f 8072/1 8071/1 8067/1 +f 8067/1 8073/1 8072/1 +f 8067/1 8074/1 8073/1 +f 8075/1 8074/1 8067/1 +f 8067/1 8076/1 8075/1 +f 8077/1 8076/1 8067/1 +f 8078/1 8079/1 8077/1 +f 8080/1 8079/1 8078/1 +f 8081/1 8079/1 8082/1 +f 8082/1 8079/1 8080/1 +f 8082/1 8080/1 8083/1 +f 8083/1 8080/1 8084/1 +f 8083/1 8084/1 8085/1 +f 8085/1 8084/1 8086/1 +f 8085/1 8086/1 8087/1 +f 8087/1 8086/1 8088/1 +f 8087/1 8088/1 8089/1 +f 8090/1 8091/1 8088/1 +f 8089/1 8088/1 8091/1 +f 8092/1 8093/1 8090/1 +f 8090/1 8093/1 8091/1 +f 8094/1 8095/1 8092/1 +f 8095/1 8096/1 8092/1 +f 8092/1 8096/1 8093/1 +f 8097/1 8095/1 8094/1 +f 8094/1 8098/1 8097/1 +f 8094/1 8099/1 8098/1 +f 8100/1 8099/1 8094/1 +f 8094/1 8101/1 8100/1 +f 8094/1 8102/1 8101/1 +f 8103/1 8102/1 8094/1 +f 8103/1 8094/1 8104/1 +f 8104/1 8094/1 8105/1 +f 8104/1 8105/1 8106/1 +f 8106/1 8105/1 8107/1 +f 8106/1 8107/1 8108/1 +f 8108/1 8107/1 8109/1 +f 8108/1 8109/1 8110/1 +f 8110/1 8109/1 8111/1 +f 8111/1 8109/1 8112/1 +f 8111/1 8112/1 8066/1 +f 8066/1 8112/1 8067/1 +f 8057/1 8082/1 8113/1 +f 8113/1 8082/1 8114/1 +f 8057/1 8115/1 8082/1 +f 8082/1 8115/1 8116/1 +f 8082/1 8116/1 8081/1 +f 8113/1 8114/1 8117/1 +f 8117/1 8114/1 8118/1 +f 8117/1 8118/1 8119/1 +f 8119/1 8118/1 8120/1 +f 8119/1 8121/1 8122/1 +f 8119/1 8120/1 8121/1 +f 8122/1 8121/1 8123/1 +f 8122/1 8123/1 8124/1 +f 8123/1 8125/1 8124/1 +f 8124/1 8125/1 8126/1 +f 8124/1 8126/1 8127/1 +f 8127/1 8126/1 8128/1 +f 8129/1 8130/1 8127/1 +f 8127/1 8128/1 8129/1 +f 8131/1 8130/1 8129/1 +f 8131/1 8132/1 8130/1 +f 8130/1 8132/1 8133/1 +f 8130/1 8133/1 8134/1 +f 8134/1 8135/1 8130/1 +f 8135/1 8136/1 8130/1 +f 8130/1 8136/1 8137/1 +f 8130/1 8137/1 8138/1 +f 8138/1 8137/1 8139/1 +f 8138/1 8139/1 8140/1 +f 8140/1 8139/1 8141/1 +f 8140/1 8142/1 8143/1 +f 8140/1 8141/1 8142/1 +f 8143/1 8142/1 8144/1 +f 8143/1 8144/1 8145/1 +f 8145/1 8144/1 8146/1 +f 8145/1 8146/1 8059/1 +f 8059/1 8146/1 8147/1 +f 8061/1 8059/1 8148/1 +f 8059/1 8147/1 8148/1 +f 8057/1 8149/1 8115/1 +f 8057/1 8150/1 8149/1 +f 8150/1 8151/1 8149/1 +f 8149/1 8151/1 8152/1 +f 8149/1 8152/1 8115/1 +f 8153/1 8150/1 8057/1 +f 8153/1 8154/1 8150/1 +f 8150/1 8154/1 8151/1 +f 8155/1 8152/1 8151/1 +f 8155/1 8151/1 8156/1 +f 8156/1 8151/1 8154/1 +f 8157/1 8116/1 8152/1 +f 8115/1 8152/1 8116/1 +f 8158/1 8081/1 8157/1 +f 8081/1 8116/1 8157/1 +f 8079/1 8158/1 8159/1 +f 8159/1 8158/1 8160/1 +f 8079/1 8081/1 8158/1 +f 8159/1 8160/1 8076/1 +f 8076/1 8160/1 8161/1 +f 8076/1 8161/1 8075/1 +f 8162/1 8074/1 8161/1 +f 8075/1 8161/1 8074/1 +f 8163/1 8073/1 8162/1 +f 8162/1 8073/1 8074/1 +f 8153/1 8164/1 8154/1 +f 8156/1 8154/1 8165/1 +f 8165/1 8154/1 8164/1 +f 8166/1 8153/1 8057/1 +f 8166/1 8164/1 8153/1 +f 8057/1 8167/1 8166/1 +f 8167/1 8164/1 8166/1 +f 8057/1 8168/1 8167/1 +f 8167/1 8168/1 8169/1 +f 8169/1 8164/1 8167/1 +f 8170/1 8168/1 8057/1 +f 8169/1 8168/1 8170/1 +f 8171/1 8172/1 8169/1 +f 8171/1 8169/1 8173/1 +f 8173/1 8169/1 8170/1 +f 8172/1 8174/1 8169/1 +f 8169/1 8174/1 8164/1 +f 8057/1 8175/1 8170/1 +f 8173/1 8170/1 8175/1 +f 8176/1 8171/1 8173/1 +f 8176/1 8173/1 8177/1 +f 8177/1 8173/1 8175/1 +f 8057/1 8178/1 8175/1 +f 8177/1 8175/1 8178/1 +f 8179/1 8176/1 8177/1 +f 8178/1 8180/1 8177/1 +f 8177/1 8180/1 8181/1 +f 8177/1 8181/1 8179/1 +f 8180/1 8178/1 8057/1 +f 8057/1 8182/1 8180/1 +f 8180/1 8182/1 8181/1 +f 8181/1 8182/1 8183/1 +f 8181/1 8183/1 8184/1 +f 8179/1 8181/1 8184/1 +f 8057/1 8183/1 8182/1 +f 8185/1 8183/1 8057/1 +f 8183/1 8185/1 8184/1 +f 8184/1 8185/1 8186/1 +f 8184/1 8186/1 8187/1 +f 8179/1 8184/1 8188/1 +f 8188/1 8184/1 8187/1 +f 8057/1 8186/1 8185/1 +f 8057/1 8189/1 8186/1 +f 8187/1 8186/1 8189/1 +f 8187/1 8189/1 8054/1 +f 8188/1 8187/1 8190/1 +f 8190/1 8187/1 8054/1 +f 8191/1 8179/1 8188/1 +f 8191/1 8188/1 8190/1 +f 8190/1 8054/1 8055/1 +f 8055/1 8192/1 8190/1 +f 8190/1 8192/1 8193/1 +f 8190/1 8193/1 8191/1 +f 8058/1 8054/1 8189/1 +f 8058/1 8189/1 8057/1 +f 8194/1 8195/1 8191/1 +f 8194/1 8191/1 8193/1 +f 8195/1 8179/1 8191/1 +f 8192/1 8194/1 8193/1 +f 8196/1 8194/1 8197/1 +f 8197/1 8194/1 8198/1 +f 8196/1 8199/1 8194/1 +f 8192/1 8198/1 8194/1 +f 8199/1 8195/1 8194/1 +f 8197/1 8198/1 8200/1 +f 8201/1 8200/1 8198/1 +f 8201/1 8198/1 8202/1 +f 8202/1 8198/1 8192/1 +f 8016/1 8203/1 8200/1 +f 8048/1 8016/1 8200/1 +f 8203/1 8197/1 8200/1 +f 8048/1 8200/1 8201/1 +f 8048/1 8201/1 8049/1 +f 8049/1 8201/1 8202/1 +f 8049/1 8202/1 8055/1 +f 8055/1 8202/1 8192/1 +f 8017/1 8016/1 8048/1 +f 8011/1 8203/1 8016/1 +f 8011/1 8009/1 8203/1 +f 8009/1 8197/1 8203/1 +f 8009/1 8010/1 8197/1 +f 8204/1 8196/1 8197/1 +f 8204/1 8197/1 8205/1 +f 8205/1 8197/1 8010/1 +f 8006/1 8206/1 8010/1 +f 8010/1 8206/1 8207/1 +f 8010/1 8207/1 8205/1 +f 8205/1 8207/1 8208/1 +f 8205/1 8208/1 8204/1 +f 8209/1 8210/1 8207/1 +f 8209/1 8207/1 8206/1 +f 8210/1 8208/1 8207/1 +f 8204/1 8208/1 8211/1 +f 8210/1 8211/1 8208/1 +f 8212/1 8213/1 8210/1 +f 8214/1 8215/1 8210/1 +f 8214/1 8210/1 8209/1 +f 8213/1 8211/1 8210/1 +f 8204/1 8211/1 8216/1 +f 8216/1 8211/1 8217/1 +f 8213/1 8217/1 8211/1 +f 8216/1 8196/1 8204/1 +f 8216/1 8217/1 8218/1 +f 8218/1 8219/1 8216/1 +f 8216/1 8219/1 8196/1 +f 8218/1 8217/1 8220/1 +f 8220/1 8217/1 8213/1 +f 8219/1 8218/1 8221/1 +f 8220/1 8221/1 8218/1 +f 8219/1 8222/1 8196/1 +f 8195/1 8222/1 8219/1 +f 8195/1 8219/1 8223/1 +f 8223/1 8219/1 8221/1 +f 8196/1 8222/1 8199/1 +f 8199/1 8222/1 8195/1 +f 8223/1 8179/1 8195/1 +f 8221/1 8176/1 8223/1 +f 8223/1 8176/1 8179/1 +f 8221/1 8171/1 8176/1 +f 8224/1 8221/1 8220/1 +f 8221/1 8224/1 8171/1 +f 8224/1 8172/1 8171/1 +f 8224/1 8220/1 8225/1 +f 8224/1 8225/1 8172/1 +f 8225/1 8226/1 8172/1 +f 8172/1 8226/1 8174/1 +f 8225/1 8220/1 8227/1 +f 8225/1 8227/1 8226/1 +f 8227/1 8228/1 8226/1 +f 8226/1 8228/1 8229/1 +f 8226/1 8229/1 8230/1 +f 8226/1 8230/1 8174/1 +f 8165/1 8164/1 8174/1 +f 8174/1 8230/1 8231/1 +f 8174/1 8231/1 8165/1 +f 8230/1 8229/1 8212/1 +f 8212/1 8231/1 8230/1 +f 8229/1 8228/1 8213/1 +f 8229/1 8213/1 8212/1 +f 8213/1 8228/1 8227/1 +f 8213/1 8227/1 8220/1 +f 8212/1 8232/1 8231/1 +f 8165/1 8231/1 8232/1 +f 8165/1 8232/1 8156/1 +f 8233/1 8234/1 8232/1 +f 8215/1 8233/1 8232/1 +f 8156/1 8232/1 8234/1 +f 8206/1 8235/1 8209/1 +f 8209/1 8235/1 8236/1 +f 8209/1 8236/1 8214/1 +f 8214/1 8236/1 8237/1 +f 8235/1 8206/1 8005/1 +f 8005/1 8206/1 8006/1 +f 8214/1 8237/1 8238/1 +f 8238/1 8215/1 8214/1 +f 8238/1 8237/1 8239/1 +f 8236/1 8240/1 8237/1 +f 8237/1 8240/1 8239/1 +f 8239/1 8241/1 8238/1 +f 8238/1 8241/1 8242/1 +f 8215/1 8238/1 8242/1 +f 8212/1 8210/1 8215/1 +f 8242/1 8233/1 8215/1 +f 8215/1 8232/1 8212/1 +f 8241/1 8243/1 8242/1 +f 8242/1 8243/1 8233/1 +f 8233/1 8243/1 8155/1 +f 8233/1 8155/1 8156/1 +f 8156/1 8234/1 8233/1 +f 8244/1 8245/1 8243/1 +f 8244/1 8243/1 8241/1 +f 8245/1 8152/1 8243/1 +f 8243/1 8152/1 8155/1 +f 8246/1 8244/1 8241/1 +f 8246/1 8247/1 8244/1 +f 8247/1 8245/1 8244/1 +f 8247/1 8157/1 8245/1 +f 8157/1 8152/1 8245/1 +f 8160/1 8158/1 8247/1 +f 8246/1 8160/1 8247/1 +f 8158/1 8157/1 8247/1 +f 8248/1 8161/1 8160/1 +f 8248/1 8160/1 8246/1 +f 8249/1 8161/1 8248/1 +f 8246/1 8250/1 8248/1 +f 8248/1 8250/1 8251/1 +f 8248/1 8251/1 8249/1 +f 8249/1 8162/1 8161/1 +f 8252/1 8253/1 8249/1 +f 8253/1 8162/1 8249/1 +f 8249/1 8251/1 8254/1 +f 8249/1 8254/1 8252/1 +f 8250/1 8255/1 8251/1 +f 8251/1 8255/1 8256/1 +f 8251/1 8256/1 8254/1 +f 8257/1 8255/1 8250/1 +f 8246/1 8257/1 8250/1 +f 8240/1 8256/1 8255/1 +f 8240/1 8255/1 8239/1 +f 8257/1 8239/1 8255/1 +f 8241/1 8239/1 8257/1 +f 8241/1 8257/1 8246/1 +f 8258/1 8256/1 8240/1 +f 8259/1 8258/1 8240/1 +f 8259/1 8240/1 8260/1 +f 8260/1 8240/1 8261/1 +f 8236/1 8261/1 8240/1 +f 8013/1 8259/1 8260/1 +f 8262/1 8263/1 8259/1 +f 8262/1 8259/1 8013/1 +f 8263/1 8258/1 8259/1 +f 8012/1 8262/1 8013/1 +f 8264/1 8263/1 8262/1 +f 8265/1 8264/1 8262/1 +f 8265/1 8262/1 8012/1 +f 8264/1 8266/1 8263/1 +f 8266/1 8267/1 8263/1 +f 8263/1 8267/1 8258/1 +f 8268/1 8266/1 8264/1 +f 8268/1 8264/1 8265/1 +f 8267/1 8266/1 8269/1 +f 8268/1 8270/1 8266/1 +f 8266/1 8270/1 8269/1 +f 8265/1 8271/1 8268/1 +f 8270/1 8268/1 8272/1 +f 8272/1 8268/1 8271/1 +f 8273/1 8269/1 8270/1 +f 8270/1 8272/1 8274/1 +f 8270/1 8274/1 8273/1 +f 8275/1 8267/1 8269/1 +f 8273/1 8276/1 8269/1 +f 8269/1 8276/1 8275/1 +f 8037/1 8276/1 8273/1 +f 8273/1 8274/1 8033/1 +f 8273/1 8033/1 8037/1 +f 8272/1 8277/1 8274/1 +f 8274/1 8277/1 8029/1 +f 8274/1 8029/1 8033/1 +f 8272/1 8271/1 8277/1 +f 8271/1 8278/1 8277/1 +f 8277/1 8278/1 8279/1 +f 8277/1 8279/1 8280/1 +f 8277/1 8280/1 8029/1 +f 8029/1 8280/1 8020/1 +f 8029/1 8020/1 8022/1 +f 8033/1 8029/1 8028/1 +f 8280/1 8279/1 8014/1 +f 8014/1 8020/1 8280/1 +f 8279/1 8278/1 8265/1 +f 8279/1 8265/1 8014/1 +f 8265/1 8278/1 8271/1 +f 8014/1 8265/1 8012/1 +f 8065/1 8281/1 8037/1 +f 8037/1 8281/1 8276/1 +f 8037/1 8036/1 8065/1 +f 8065/1 8068/1 8281/1 +f 8282/1 8276/1 8281/1 +f 8068/1 8069/1 8281/1 +f 8281/1 8283/1 8282/1 +f 8275/1 8276/1 8282/1 +f 8284/1 8267/1 8275/1 +f 8275/1 8282/1 8284/1 +f 8285/1 8284/1 8256/1 +f 8256/1 8284/1 8252/1 +f 8285/1 8286/1 8284/1 +f 8284/1 8286/1 8267/1 +f 8284/1 8282/1 8252/1 +f 8267/1 8286/1 8258/1 +f 8258/1 8286/1 8285/1 +f 8258/1 8285/1 8256/1 +f 8256/1 8252/1 8254/1 +f 8252/1 8282/1 8253/1 +f 8282/1 8163/1 8253/1 +f 8253/1 8163/1 8162/1 +f 8282/1 8283/1 8163/1 +f 8069/1 8070/1 8283/1 +f 8283/1 8070/1 8071/1 +f 8281/1 8069/1 8283/1 +f 8235/1 8261/1 8236/1 +f 8287/1 8288/1 8289/1 +f 8290/1 8288/1 8287/1 +f 8289/1 8288/1 8291/1 +f 8292/1 8288/1 8290/1 +f 8289/1 8291/1 8293/1 +f 8293/1 8291/1 8294/1 +f 8295/1 8293/1 8296/1 +f 8296/1 8293/1 8294/1 +f 8296/1 8297/1 8295/1 +f 8298/1 8297/1 8296/1 +f 8298/1 8299/1 8297/1 +f 8300/1 8299/1 8298/1 +f 8300/1 8301/1 8299/1 +f 8302/1 8301/1 8300/1 +f 8302/1 8303/1 8301/1 +f 8304/1 8303/1 8302/1 +f 8292/1 8290/1 8305/1 +f 8292/1 8305/1 8306/1 +f 8306/1 8305/1 8307/1 +f 8306/1 8307/1 8308/1 +f 8308/1 8307/1 8309/1 +f 8308/1 8309/1 8310/1 +f 8311/1 8310/1 8309/1 +f 8312/1 8310/1 8311/1 +f 8312/1 8311/1 8313/1 +f 8312/1 8313/1 8314/1 +f 7916/1 8114/1 8315/1 +f 8315/1 8114/1 8316/1 +f 8315/1 8316/1 8317/1 +f 8317/1 8316/1 8318/1 +f 8317/1 8318/1 8319/1 +f 8319/1 8318/1 8320/1 +f 7875/1 8321/1 7873/1 +f 7877/1 8321/1 7875/1 +f 7873/1 8321/1 8060/1 +f 8322/1 8321/1 7877/1 +f 7873/1 8060/1 7871/1 +f 7882/1 8322/1 7877/1 +f 7882/1 8323/1 8322/1 +f 7883/1 8323/1 7882/1 +f 7883/1 8324/1 8323/1 +f 7881/1 8324/1 7883/1 +f 7881/1 8325/1 8324/1 +f 7878/1 8325/1 7881/1 +f 8326/1 8325/1 7878/1 +f 7879/1 8326/1 7878/1 +f 7879/1 8327/1 8326/1 +f 8325/1 8326/1 8328/1 +f 8322/1 8324/1 8325/1 +f 8322/1 8325/1 8321/1 +f 8321/1 8325/1 8328/1 +f 8327/1 8329/1 8326/1 +f 8326/1 8329/1 8330/1 +f 8326/1 8330/1 8328/1 +f 8321/1 8328/1 8060/1 +f 8060/1 8328/1 8062/1 +f 8323/1 8324/1 8322/1 +f 8079/1 8159/1 8077/1 +f 8077/1 8159/1 8076/1 +f 8051/1 8052/1 8056/1 +f 8056/1 8052/1 8053/1 +f 8114/1 8082/1 8331/1 +f 8114/1 8331/1 8316/1 +f 8316/1 8331/1 8332/1 +f 8316/1 8332/1 8318/1 +f 8318/1 8332/1 8333/1 +f 8318/1 8333/1 8320/1 +f 8334/1 8303/1 8333/1 +f 8333/1 8303/1 8320/1 +f 8334/1 8333/1 8335/1 +f 8335/1 8333/1 8336/1 +f 8303/1 8337/1 8320/1 +f 8303/1 8334/1 8338/1 +f 8303/1 8338/1 8301/1 +f 8339/1 8337/1 8303/1 +f 8337/1 8339/1 8340/1 +f 8340/1 8339/1 8341/1 +f 8342/1 8343/1 8340/1 +f 8342/1 8340/1 8344/1 +f 8344/1 8340/1 8341/1 +f 8344/1 8341/1 8345/1 +f 8345/1 8341/1 8346/1 +f 8347/1 8343/1 8342/1 +f 8301/1 8338/1 8348/1 +f 8301/1 8348/1 8299/1 +f 8299/1 8348/1 8349/1 +f 8299/1 8349/1 8297/1 +f 8297/1 8349/1 8350/1 +f 8297/1 8350/1 8295/1 +f 8351/1 8293/1 8350/1 +f 8350/1 8293/1 8295/1 +f 8293/1 8351/1 8289/1 +f 8289/1 8351/1 8352/1 +f 8289/1 8352/1 8287/1 +f 8287/1 8352/1 8353/1 +f 8354/1 8313/1 8355/1 +f 8355/1 8313/1 8311/1 +f 8311/1 8353/1 8355/1 +f 8309/1 8287/1 8311/1 +f 8311/1 8287/1 8353/1 +f 8309/1 8307/1 8305/1 +f 8305/1 8290/1 8309/1 +f 8309/1 8290/1 8287/1 +f 8310/1 8312/1 8356/1 +f 8292/1 8308/1 8310/1 +f 8292/1 8310/1 8288/1 +f 8288/1 8310/1 8356/1 +f 8314/1 8357/1 8312/1 +f 8312/1 8357/1 8358/1 +f 8312/1 8358/1 8356/1 +f 8306/1 8308/1 8292/1 +f 8288/1 8356/1 8359/1 +f 8288/1 8359/1 8291/1 +f 8291/1 8359/1 8360/1 +f 8291/1 8360/1 8294/1 +f 8361/1 8296/1 8360/1 +f 8360/1 8296/1 8294/1 +f 8296/1 8361/1 8298/1 +f 8298/1 8361/1 8362/1 +f 8298/1 8362/1 8300/1 +f 8300/1 8362/1 8363/1 +f 8300/1 8363/1 8302/1 +f 8302/1 8363/1 8364/1 +f 8302/1 8364/1 8304/1 +f 8304/1 8364/1 8365/1 +f 8365/1 8319/1 8304/1 +f 8304/1 8319/1 8366/1 +f 8304/1 8366/1 8367/1 +f 8368/1 8319/1 8365/1 +f 8369/1 8368/1 8365/1 +f 8319/1 8368/1 8317/1 +f 8317/1 8368/1 8370/1 +f 8369/1 8371/1 8368/1 +f 8372/1 8371/1 8369/1 +f 8372/1 8373/1 8371/1 +f 8317/1 8370/1 8315/1 +f 8315/1 8370/1 8374/1 +f 8315/1 8374/1 7916/1 +f 7916/1 8374/1 7841/1 +f 8367/1 8366/1 8375/1 +f 8367/1 8375/1 8376/1 +f 8377/1 8376/1 8375/1 +f 8378/1 8376/1 8377/1 +f 8379/1 8378/1 8377/1 +f 8379/1 8377/1 8380/1 +f 8380/1 8377/1 8381/1 +f 8382/1 8383/1 8378/1 +f 8382/1 8378/1 8379/1 +f 8384/1 8383/1 8382/1 +f 8118/1 8114/1 7913/1 +f 8118/1 7913/1 7919/1 +f 8118/1 7919/1 8120/1 +f 7913/1 8114/1 7916/1 +f 8120/1 7919/1 7921/1 +f 8120/1 7921/1 8121/1 +f 8121/1 7921/1 7923/1 +f 8121/1 7923/1 8123/1 +f 8123/1 7923/1 7925/1 +f 8123/1 7925/1 8125/1 +f 8125/1 7925/1 7926/1 +f 8125/1 7926/1 8126/1 +f 8126/1 7926/1 7928/1 +f 8126/1 7928/1 8128/1 +f 8128/1 7928/1 7929/1 +f 8128/1 7929/1 8129/1 +f 8129/1 7929/1 7931/1 +f 8129/1 7931/1 8131/1 +f 8131/1 7931/1 7933/1 +f 8131/1 7933/1 8132/1 +f 8132/1 7933/1 7932/1 +f 8132/1 7932/1 8133/1 +f 8133/1 7932/1 7934/1 +f 8133/1 7934/1 8134/1 +f 7935/1 8134/1 7934/1 +f 8135/1 8134/1 7935/1 +f 8135/1 7935/1 8136/1 +f 8136/1 7935/1 7936/1 +f 8136/1 7936/1 8137/1 +f 8137/1 7936/1 7937/1 +f 8137/1 7937/1 7939/1 +f 8137/1 7939/1 8139/1 +f 8139/1 7939/1 7940/1 +f 8139/1 7940/1 8141/1 +f 8141/1 7940/1 7896/1 +f 8141/1 7896/1 8142/1 +f 8142/1 7896/1 7895/1 +f 8142/1 7895/1 8144/1 +f 8144/1 7895/1 7894/1 +f 8144/1 7894/1 8146/1 +f 8146/1 7894/1 7892/1 +f 8146/1 7892/1 8147/1 +f 8147/1 7892/1 8148/1 +f 8148/1 7892/1 7890/1 +f 7886/1 7871/1 8061/1 +f 8061/1 7890/1 7886/1 +f 8061/1 7871/1 8060/1 +f 8148/1 7890/1 8061/1 +f 8127/1 7927/1 8124/1 +f 8130/1 7930/1 8127/1 +f 8127/1 7930/1 7927/1 +f 8124/1 7927/1 7924/1 +f 8124/1 7924/1 8122/1 +f 8122/1 7924/1 7922/1 +f 8130/1 7938/1 7930/1 +f 8138/1 7938/1 8130/1 +f 8138/1 7897/1 7938/1 +f 8140/1 7897/1 8138/1 +f 8140/1 7891/1 7897/1 +f 8143/1 7891/1 8140/1 +f 8122/1 7922/1 8119/1 +f 8119/1 7922/1 7920/1 +f 8119/1 7920/1 8117/1 +f 8117/1 7920/1 7918/1 +f 8117/1 7918/1 8113/1 +f 8113/1 7918/1 7917/1 +f 8113/1 7917/1 8057/1 +f 8057/1 7917/1 7901/1 +f 8057/1 7901/1 8056/1 +f 8056/1 7901/1 7899/1 +f 8056/1 7899/1 8059/1 +f 8059/1 7899/1 7898/1 +f 8059/1 7898/1 8145/1 +f 8145/1 7898/1 7893/1 +f 8145/1 7893/1 8143/1 +f 8143/1 7893/1 7891/1 +f 8376/1 8339/1 8367/1 +f 8378/1 8339/1 8376/1 +f 8367/1 8339/1 8303/1 +f 8341/1 8339/1 8378/1 +f 8367/1 8303/1 8304/1 +f 8383/1 8341/1 8378/1 +f 8383/1 8346/1 8341/1 +f 8384/1 8346/1 8383/1 +f 8384/1 8345/1 8346/1 +f 8382/1 8345/1 8384/1 +f 8382/1 8344/1 8345/1 +f 8379/1 8344/1 8382/1 +f 8342/1 8344/1 8379/1 +f 8380/1 8342/1 8379/1 +f 8380/1 8347/1 8342/1 +f 8381/1 8347/1 8380/1 +f 8381/1 8343/1 8347/1 +f 8377/1 8343/1 8381/1 +f 8377/1 8340/1 8343/1 +f 8319/1 8320/1 8366/1 +f 8366/1 8320/1 8337/1 +f 8366/1 8337/1 8375/1 +f 8340/1 8375/1 8337/1 +f 8377/1 8375/1 8340/1 +f 8351/1 8360/1 8352/1 +f 8351/1 8350/1 8360/1 +f 8352/1 8360/1 8359/1 +f 8360/1 8350/1 8361/1 +f 8352/1 8359/1 8353/1 +f 8353/1 8359/1 8356/1 +f 8356/1 8358/1 8353/1 +f 8353/1 8358/1 8355/1 +f 8357/1 8355/1 8358/1 +f 8357/1 8354/1 8355/1 +f 8314/1 8354/1 8357/1 +f 8314/1 8313/1 8354/1 +f 8361/1 8350/1 8362/1 +f 8362/1 8350/1 8349/1 +f 8362/1 8349/1 8363/1 +f 8363/1 8349/1 8348/1 +f 8363/1 8348/1 8364/1 +f 8364/1 8348/1 8338/1 +f 8364/1 8338/1 8365/1 +f 8365/1 8338/1 8334/1 +f 8368/1 8333/1 8370/1 +f 8370/1 8333/1 8332/1 +f 8370/1 8332/1 8374/1 +f 8374/1 8332/1 8331/1 +f 8374/1 8331/1 7841/1 +f 7841/1 8331/1 8082/1 +f 7830/1 8062/1 7872/1 +f 7872/1 8062/1 8328/1 +f 7872/1 8328/1 7874/1 +f 8328/1 8330/1 7874/1 +f 7874/1 8330/1 7876/1 +f 7876/1 8330/1 8329/1 +f 7876/1 8329/1 7880/1 +f 7880/1 8329/1 8327/1 +f 7880/1 8327/1 7879/1 +f 8082/1 8083/1 7841/1 +f 7841/1 8083/1 7836/1 +f 8085/1 7836/1 8083/1 +f 8085/1 7839/1 7836/1 +f 8087/1 7839/1 8085/1 +f 8087/1 7842/1 7839/1 +f 8089/1 7842/1 8087/1 +f 8089/1 7844/1 7842/1 +f 8091/1 7844/1 8089/1 +f 8091/1 7846/1 7844/1 +f 8093/1 7846/1 8091/1 +f 8093/1 7847/1 7846/1 +f 8096/1 7847/1 8093/1 +f 8096/1 7849/1 7847/1 +f 8095/1 7849/1 8096/1 +f 8095/1 7851/1 7849/1 +f 8097/1 7851/1 8095/1 +f 8097/1 7852/1 7851/1 +f 8098/1 7852/1 8097/1 +f 8098/1 7853/1 7852/1 +f 8100/1 8101/1 7855/1 +f 8100/1 7855/1 7854/1 +f 8100/1 7854/1 8099/1 +f 7855/1 8101/1 7856/1 +f 8102/1 7857/1 8101/1 +f 8101/1 7857/1 7856/1 +f 8066/1 7868/1 7867/1 +f 8066/1 7867/1 8111/1 +f 8064/1 7870/1 8066/1 +f 8066/1 7870/1 7868/1 +f 8111/1 7867/1 7865/1 +f 8111/1 7865/1 8110/1 +f 8110/1 7865/1 7863/1 +f 8110/1 7863/1 8108/1 +f 8108/1 7863/1 7862/1 +f 8108/1 7862/1 8106/1 +f 8106/1 7862/1 7860/1 +f 8106/1 7860/1 8104/1 +f 8064/1 7869/1 7870/1 +f 7830/1 7869/1 8062/1 +f 8062/1 7869/1 8063/1 +f 8063/1 7869/1 8064/1 +f 8104/1 7860/1 7858/1 +f 8104/1 7858/1 8103/1 +f 8103/1 7858/1 8102/1 +f 8102/1 7858/1 7857/1 +f 8092/1 7848/1 8094/1 +f 8090/1 7845/1 8092/1 +f 8092/1 7845/1 7848/1 +f 8094/1 7848/1 7850/1 +f 8094/1 7850/1 8105/1 +f 8105/1 7850/1 7859/1 +f 8090/1 7843/1 7845/1 +f 8088/1 7843/1 8090/1 +f 8088/1 7837/1 7843/1 +f 8086/1 7837/1 8088/1 +f 8086/1 7834/1 7837/1 +f 8084/1 7834/1 8086/1 +f 8084/1 7833/1 7834/1 +f 8080/1 7833/1 8084/1 +f 8105/1 7859/1 8107/1 +f 8107/1 7859/1 7861/1 +f 8107/1 7861/1 8109/1 +f 8109/1 7861/1 7864/1 +f 8109/1 7864/1 8112/1 +f 8112/1 7864/1 7866/1 +f 8112/1 7866/1 8067/1 +f 8067/1 7866/1 7829/1 +f 8067/1 7829/1 8077/1 +f 8077/1 7829/1 7828/1 +f 8077/1 7828/1 8078/1 +f 8078/1 7828/1 7831/1 +f 8078/1 7831/1 8080/1 +f 8080/1 7831/1 7833/1 +f 8365/1 8334/1 8369/1 +f 8369/1 8334/1 8335/1 +f 8369/1 8335/1 8372/1 +f 8335/1 8385/1 8372/1 +f 8372/1 8385/1 8386/1 +f 8373/1 8336/1 8371/1 +f 8373/1 8387/1 8336/1 +f 8371/1 8336/1 8333/1 +f 8336/1 8387/1 8388/1 +f 8371/1 8333/1 8368/1 +f 8389/1 8390/1 8388/1 +f 8389/1 8388/1 8387/1 +f 8391/1 8390/1 8389/1 +f 8391/1 8392/1 8390/1 +f 8393/1 8392/1 8391/1 +f 8393/1 8394/1 8392/1 +f 8395/1 8394/1 8393/1 +f 8396/1 8394/1 8395/1 +f 8397/1 8396/1 8395/1 +f 8397/1 8398/1 8396/1 +f 8399/1 8398/1 8397/1 +f 8399/1 8400/1 8398/1 +f 8373/1 8372/1 8387/1 +f 8387/1 8372/1 8386/1 +f 8393/1 8389/1 8387/1 +f 8395/1 8387/1 8386/1 +f 8395/1 8386/1 8397/1 +f 8397/1 8386/1 8399/1 +f 8391/1 8389/1 8393/1 +f 8393/1 8387/1 8395/1 +f 8385/1 8335/1 8388/1 +f 8396/1 8400/1 8385/1 +f 8396/1 8385/1 8394/1 +f 8394/1 8385/1 8388/1 +f 8388/1 8335/1 8336/1 +f 8394/1 8388/1 8392/1 +f 8392/1 8388/1 8390/1 +f 8398/1 8400/1 8396/1 +f 8099/1 7854/1 7853/1 +f 8099/1 7853/1 8098/1 +f 8386/1 8385/1 8400/1 +f 8386/1 8400/1 8399/1 +f 8013/1 8260/1 8008/1 +f 8008/1 8260/1 8261/1 +f 8008/1 8261/1 8005/1 +f 8005/1 8261/1 8235/1 +f 8283/1 8071/1 8163/1 +f 8071/1 8072/1 8163/1 +f 8163/1 8072/1 8073/1 +f 7840/1 7838/1 8003/1 +f 8401/1 8402/1 8403/1 +f 8401/1 8403/1 8404/1 +f 8405/1 8406/1 8401/1 +f 8405/1 8401/1 8404/1 +f 8406/1 8402/1 8401/1 +f 8404/1 8403/1 8407/1 +f 8402/1 8408/1 8403/1 +f 8403/1 8408/1 8407/1 +f 8404/1 8407/1 8409/1 +f 8405/1 8404/1 8410/1 +f 8410/1 8404/1 8409/1 +f 8409/1 8407/1 8411/1 +f 8408/1 8411/1 8407/1 +f 8409/1 8411/1 8412/1 +f 8410/1 8409/1 8412/1 +f 8412/1 8411/1 8413/1 +f 8414/1 8413/1 8411/1 +f 8414/1 8411/1 8408/1 +f 8415/1 8412/1 8416/1 +f 8416/1 8412/1 8413/1 +f 8412/1 8415/1 8417/1 +f 8417/1 8410/1 8412/1 +f 8416/1 8413/1 8418/1 +f 8418/1 8413/1 8419/1 +f 8419/1 8413/1 8414/1 +f 8415/1 8416/1 8420/1 +f 8420/1 8416/1 8421/1 +f 8416/1 8418/1 8421/1 +f 8415/1 8420/1 8422/1 +f 8417/1 8415/1 8422/1 +f 8417/1 8422/1 8423/1 +f 8423/1 8410/1 8417/1 +f 8422/1 8424/1 8423/1 +f 8425/1 8426/1 8423/1 +f 8423/1 8426/1 8410/1 +f 8427/1 8405/1 8410/1 +f 8427/1 8410/1 8428/1 +f 8428/1 8410/1 8426/1 +f 8429/1 8430/1 8427/1 +f 8429/1 8427/1 8431/1 +f 8431/1 8427/1 8428/1 +f 8430/1 8405/1 8427/1 +f 8432/1 8406/1 8405/1 +f 8430/1 8432/1 8405/1 +f 8433/1 8434/1 8430/1 +f 8433/1 8430/1 8429/1 +f 8434/1 8432/1 8430/1 +f 8434/1 8435/1 8432/1 +f 8432/1 8435/1 8436/1 +f 8432/1 8436/1 8406/1 +f 8406/1 8436/1 8402/1 +f 8435/1 8437/1 8436/1 +f 8436/1 8437/1 8438/1 +f 8436/1 8438/1 8402/1 +f 8439/1 8437/1 8435/1 +f 8439/1 8435/1 8440/1 +f 8440/1 8435/1 8434/1 +f 8440/1 8434/1 8433/1 +f 8439/1 8440/1 8441/1 +f 8441/1 8440/1 8442/1 +f 8443/1 8442/1 8440/1 +f 8440/1 8433/1 8443/1 +f 8444/1 8445/1 8439/1 +f 8439/1 8441/1 8444/1 +f 8445/1 8437/1 8439/1 +f 8441/1 8442/1 8446/1 +f 8444/1 8441/1 8446/1 +f 8442/1 8447/1 8446/1 +f 8443/1 8447/1 8442/1 +f 8446/1 8447/1 8448/1 +f 8446/1 8448/1 8449/1 +f 8444/1 8446/1 8450/1 +f 8446/1 8449/1 8450/1 +f 8448/1 8447/1 8443/1 +f 8449/1 8448/1 8451/1 +f 8448/1 8443/1 8451/1 +f 8451/1 8443/1 8452/1 +f 8443/1 8429/1 8452/1 +f 8452/1 8429/1 8431/1 +f 8443/1 8433/1 8429/1 +f 8450/1 8453/1 8444/1 +f 8444/1 8453/1 8454/1 +f 8444/1 8454/1 8445/1 +f 8454/1 8455/1 8445/1 +f 8455/1 8456/1 8445/1 +f 8445/1 8456/1 8437/1 +f 8457/1 8458/1 8455/1 +f 8455/1 8458/1 8456/1 +f 8437/1 8456/1 8438/1 +f 8459/1 8456/1 8458/1 +f 8438/1 8456/1 8459/1 +f 8402/1 8438/1 8408/1 +f 8438/1 8459/1 8408/1 +f 8408/1 8459/1 8460/1 +f 8408/1 8460/1 8414/1 +f 8414/1 8460/1 8461/1 +f 8462/1 8419/1 8414/1 +f 8414/1 8461/1 8462/1 +f 8461/1 8463/1 8462/1 +f 8464/1 8419/1 8462/1 +f 8464/1 8462/1 8465/1 +f 8465/1 8462/1 8463/1 +f 8418/1 8419/1 8464/1 +f 8464/1 8465/1 8466/1 +f 8418/1 8464/1 8467/1 +f 8467/1 8464/1 8466/1 +f 8421/1 8418/1 8467/1 +f 8421/1 8467/1 8468/1 +f 8469/1 8420/1 8421/1 +f 8468/1 8469/1 8421/1 +f 8470/1 8471/1 8420/1 +f 8472/1 8470/1 8420/1 +f 8473/1 8457/1 8455/1 +f 8465/1 8463/1 8474/1 +f 8466/1 8465/1 8474/1 +f 8474/1 8463/1 8475/1 +f 8476/1 8475/1 8463/1 +f 8461/1 8476/1 8463/1 +f 8474/1 8477/1 8466/1 +f 8478/1 8477/1 8479/1 +f 8479/1 8477/1 8474/1 +f 8466/1 8477/1 8478/1 +f 8479/1 8480/1 8478/1 +f 8466/1 8478/1 8481/1 +f 8481/1 8478/1 8480/1 +f 8482/1 8483/1 8479/1 +f 8479/1 8483/1 8480/1 +f 8479/1 8474/1 8484/1 +f 8484/1 8474/1 8475/1 +f 8485/1 8486/1 8484/1 +f 8485/1 8484/1 8476/1 +f 8484/1 8475/1 8476/1 +f 8487/1 8486/1 8485/1 +f 8487/1 8488/1 8486/1 +f 8488/1 8489/1 8486/1 +f 8486/1 8489/1 8490/1 +f 8486/1 8490/1 8491/1 +f 8458/1 8488/1 8487/1 +f 8458/1 8492/1 8488/1 +f 8457/1 8492/1 8458/1 +f 8457/1 8493/1 8492/1 +f 8494/1 8493/1 8457/1 +f 8495/1 8496/1 8457/1 +f 8495/1 8457/1 8497/1 +f 8497/1 8457/1 8473/1 +f 8457/1 8496/1 8494/1 +f 8498/1 8496/1 8495/1 +f 8498/1 8499/1 8496/1 +f 8496/1 8499/1 8500/1 +f 8500/1 8501/1 8496/1 +f 8496/1 8501/1 8502/1 +f 8496/1 8502/1 8503/1 +f 8503/1 8502/1 8504/1 +f 8503/1 8504/1 8505/1 +f 8505/1 8504/1 8506/1 +f 8505/1 8506/1 8507/1 +f 8507/1 8506/1 8508/1 +f 8507/1 8508/1 8509/1 +f 8509/1 8510/1 8507/1 +f 8507/1 8510/1 8511/1 +f 8507/1 8511/1 8512/1 +f 8513/1 8514/1 8507/1 +f 8513/1 8507/1 8515/1 +f 8515/1 8507/1 8512/1 +f 8515/1 8512/1 8516/1 +f 8517/1 8514/1 8513/1 +f 8518/1 8519/1 8514/1 +f 8518/1 8514/1 8517/1 +f 8520/1 8519/1 8518/1 +f 8521/1 8519/1 8520/1 +f 8522/1 8521/1 8520/1 +f 8523/1 8524/1 8521/1 +f 8523/1 8521/1 8522/1 +f 8491/1 8524/1 8523/1 +f 8491/1 8490/1 8524/1 +f 8497/1 8473/1 8525/1 +f 8497/1 8525/1 8526/1 +f 8527/1 8497/1 8526/1 +f 8528/1 8497/1 8527/1 +f 8528/1 8529/1 8497/1 +f 8497/1 8529/1 8530/1 +f 8497/1 8530/1 8531/1 +f 8532/1 8529/1 8528/1 +f 8529/1 8533/1 8534/1 +f 8532/1 8533/1 8529/1 +f 8534/1 8533/1 8535/1 +f 8536/1 8537/1 8533/1 +f 8533/1 8537/1 8538/1 +f 8533/1 8538/1 8535/1 +f 8539/1 8533/1 8532/1 +f 8532/1 8528/1 8540/1 +f 8541/1 8532/1 8540/1 +f 8540/1 8528/1 8542/1 +f 8543/1 8542/1 8528/1 +f 8528/1 8527/1 8543/1 +f 8540/1 8542/1 8544/1 +f 8545/1 8541/1 8540/1 +f 8545/1 8540/1 8544/1 +f 8546/1 8547/1 8541/1 +f 8546/1 8541/1 8545/1 +f 8548/1 8546/1 8545/1 +f 8548/1 8545/1 8544/1 +f 8544/1 8542/1 8549/1 +f 8544/1 8549/1 8550/1 +f 8544/1 8550/1 8548/1 +f 8549/1 8542/1 8543/1 +f 8550/1 8549/1 8551/1 +f 8551/1 8549/1 8552/1 +f 8552/1 8549/1 8543/1 +f 8550/1 8551/1 8553/1 +f 8550/1 8553/1 8548/1 +f 8548/1 8553/1 8554/1 +f 8548/1 8554/1 8555/1 +f 8555/1 8546/1 8548/1 +f 8553/1 8551/1 8556/1 +f 8556/1 8557/1 8553/1 +f 8557/1 8554/1 8553/1 +f 8556/1 8551/1 8558/1 +f 8558/1 8551/1 8552/1 +f 8558/1 8552/1 8559/1 +f 8552/1 8543/1 8559/1 +f 8560/1 8556/1 8558/1 +f 8561/1 8560/1 8558/1 +f 8559/1 8561/1 8558/1 +f 8562/1 8556/1 8560/1 +f 8562/1 8557/1 8556/1 +f 8557/1 8562/1 8563/1 +f 8563/1 8562/1 8564/1 +f 8562/1 8560/1 8564/1 +f 8565/1 8566/1 8563/1 +f 8563/1 8566/1 8557/1 +f 8563/1 8564/1 8565/1 +f 8564/1 8567/1 8565/1 +f 8564/1 8560/1 8452/1 +f 8564/1 8452/1 8567/1 +f 8568/1 8569/1 8565/1 +f 8565/1 8569/1 8566/1 +f 8565/1 8567/1 8570/1 +f 8565/1 8570/1 8568/1 +f 8567/1 8452/1 8571/1 +f 8567/1 8571/1 8570/1 +f 8451/1 8452/1 8560/1 +f 8452/1 8431/1 8571/1 +f 8449/1 8451/1 8572/1 +f 8572/1 8451/1 8560/1 +f 8572/1 8560/1 8561/1 +f 8450/1 8449/1 8572/1 +f 8450/1 8572/1 8559/1 +f 8559/1 8572/1 8561/1 +f 8559/1 8573/1 8450/1 +f 8450/1 8573/1 8453/1 +f 8559/1 8543/1 8573/1 +f 8543/1 8526/1 8573/1 +f 8573/1 8526/1 8525/1 +f 8573/1 8525/1 8453/1 +f 8543/1 8527/1 8526/1 +f 8453/1 8525/1 8473/1 +f 8453/1 8473/1 8454/1 +f 8454/1 8473/1 8455/1 +f 8574/1 8575/1 8566/1 +f 8566/1 8575/1 8576/1 +f 8566/1 8576/1 8557/1 +f 8577/1 8574/1 8566/1 +f 8577/1 8566/1 8578/1 +f 8578/1 8566/1 8569/1 +f 8575/1 8579/1 8576/1 +f 8576/1 8579/1 8554/1 +f 8576/1 8554/1 8557/1 +f 8575/1 8580/1 8579/1 +f 8555/1 8554/1 8579/1 +f 8580/1 8555/1 8579/1 +f 8581/1 8582/1 8580/1 +f 8581/1 8580/1 8575/1 +f 8582/1 8555/1 8580/1 +f 8582/1 8583/1 8555/1 +f 8583/1 8584/1 8555/1 +f 8555/1 8584/1 8546/1 +f 8585/1 8586/1 8582/1 +f 8585/1 8582/1 8581/1 +f 8586/1 8583/1 8582/1 +f 8574/1 8585/1 8581/1 +f 8574/1 8581/1 8575/1 +f 8587/1 8585/1 8574/1 +f 8587/1 8586/1 8585/1 +f 8587/1 8588/1 8586/1 +f 8588/1 8589/1 8586/1 +f 8586/1 8589/1 8583/1 +f 8590/1 8587/1 8591/1 +f 8591/1 8587/1 8574/1 +f 8590/1 8588/1 8587/1 +f 8591/1 8574/1 8577/1 +f 8592/1 8590/1 8591/1 +f 8592/1 8591/1 8593/1 +f 8593/1 8591/1 8577/1 +f 8588/1 8590/1 8594/1 +f 8594/1 8590/1 8595/1 +f 8595/1 8590/1 8592/1 +f 8588/1 8594/1 8589/1 +f 8594/1 8595/1 8596/1 +f 8589/1 8594/1 8597/1 +f 8598/1 8597/1 8594/1 +f 8594/1 8596/1 8598/1 +f 8599/1 8600/1 8595/1 +f 8595/1 8592/1 8599/1 +f 8596/1 8595/1 8600/1 +f 8599/1 8592/1 8593/1 +f 8601/1 8602/1 8599/1 +f 8599/1 8602/1 8600/1 +f 8601/1 8599/1 8470/1 +f 8470/1 8599/1 8471/1 +f 8599/1 8593/1 8471/1 +f 8596/1 8600/1 8603/1 +f 8600/1 8602/1 8603/1 +f 8598/1 8596/1 8603/1 +f 8603/1 8602/1 8601/1 +f 8603/1 8601/1 8604/1 +f 8598/1 8603/1 8605/1 +f 8603/1 8604/1 8605/1 +f 8604/1 8601/1 8470/1 +f 8604/1 8470/1 8472/1 +f 8605/1 8604/1 8472/1 +f 8605/1 8472/1 8468/1 +f 8468/1 8481/1 8605/1 +f 8605/1 8481/1 8606/1 +f 8605/1 8606/1 8598/1 +f 8472/1 8420/1 8469/1 +f 8468/1 8472/1 8469/1 +f 8467/1 8466/1 8468/1 +f 8468/1 8466/1 8481/1 +f 8481/1 8480/1 8606/1 +f 8606/1 8480/1 8483/1 +f 8598/1 8606/1 8607/1 +f 8606/1 8483/1 8607/1 +f 8598/1 8607/1 8597/1 +f 8607/1 8483/1 8608/1 +f 8607/1 8608/1 8597/1 +f 8482/1 8609/1 8483/1 +f 8483/1 8609/1 8608/1 +f 8610/1 8597/1 8608/1 +f 8610/1 8608/1 8611/1 +f 8611/1 8608/1 8609/1 +f 8589/1 8597/1 8610/1 +f 8584/1 8610/1 8611/1 +f 8589/1 8610/1 8583/1 +f 8583/1 8610/1 8584/1 +f 8612/1 8611/1 8613/1 +f 8613/1 8611/1 8609/1 +f 8611/1 8612/1 8584/1 +f 8613/1 8609/1 8482/1 +f 8613/1 8482/1 8614/1 +f 8613/1 8615/1 8612/1 +f 8584/1 8612/1 8547/1 +f 8612/1 8615/1 8616/1 +f 8612/1 8616/1 8547/1 +f 8584/1 8547/1 8546/1 +f 8547/1 8616/1 8539/1 +f 8547/1 8539/1 8541/1 +f 8614/1 8617/1 8618/1 +f 8614/1 8482/1 8619/1 +f 8614/1 8619/1 8617/1 +f 8618/1 8617/1 8620/1 +f 8618/1 8620/1 8621/1 +f 8621/1 8620/1 8622/1 +f 8621/1 8622/1 8623/1 +f 8621/1 8623/1 8624/1 +f 8624/1 8623/1 8625/1 +f 8624/1 8625/1 8626/1 +f 8627/1 8624/1 8626/1 +f 8628/1 8627/1 8626/1 +f 8629/1 8627/1 8628/1 +f 8630/1 8631/1 8629/1 +f 8629/1 8631/1 8627/1 +f 8631/1 8632/1 8627/1 +f 8632/1 8633/1 8627/1 +f 8627/1 8633/1 8634/1 +f 8627/1 8634/1 8635/1 +f 8635/1 8634/1 8636/1 +f 8635/1 8636/1 8637/1 +f 8636/1 8638/1 8637/1 +f 8637/1 8638/1 8639/1 +f 8637/1 8639/1 8640/1 +f 8640/1 8639/1 8641/1 +f 8640/1 8641/1 8536/1 +f 8536/1 8641/1 8537/1 +f 8422/1 8420/1 8471/1 +f 8422/1 8471/1 8424/1 +f 8424/1 8471/1 8642/1 +f 8471/1 8593/1 8643/1 +f 8471/1 8643/1 8642/1 +f 8424/1 8642/1 8644/1 +f 8423/1 8424/1 8644/1 +f 8425/1 8644/1 8570/1 +f 8570/1 8644/1 8568/1 +f 8568/1 8644/1 8642/1 +f 8642/1 8569/1 8568/1 +f 8642/1 8578/1 8569/1 +f 8643/1 8577/1 8578/1 +f 8643/1 8578/1 8642/1 +f 8593/1 8577/1 8643/1 +f 8423/1 8644/1 8425/1 +f 8541/1 8539/1 8532/1 +f 8531/1 8530/1 8645/1 +f 8531/1 8645/1 8646/1 +f 8647/1 8646/1 8645/1 +f 8648/1 8646/1 8647/1 +f 8649/1 8648/1 8647/1 +f 8649/1 8647/1 8650/1 +f 8650/1 8647/1 8651/1 +f 8652/1 8653/1 8648/1 +f 8652/1 8648/1 8649/1 +f 8654/1 8653/1 8652/1 +f 8460/1 8485/1 8476/1 +f 8460/1 8476/1 8461/1 +f 8459/1 8485/1 8460/1 +f 8458/1 8487/1 8459/1 +f 8459/1 8487/1 8485/1 +f 8655/1 8656/1 8657/1 +f 8657/1 8658/1 8655/1 +f 8657/1 8656/1 8659/1 +f 8656/1 8660/1 8659/1 +f 8657/1 8659/1 8661/1 +f 8661/1 8662/1 8657/1 +f 8657/1 8662/1 8658/1 +f 8658/1 8663/1 8655/1 +f 8655/1 8663/1 8664/1 +f 8664/1 8663/1 8665/1 +f 8665/1 8663/1 8666/1 +f 8664/1 8667/1 8655/1 +f 8655/1 8667/1 8656/1 +f 8668/1 8669/1 8666/1 +f 8670/1 8668/1 8666/1 +f 8670/1 8666/1 8671/1 +f 8665/1 8666/1 8672/1 +f 8673/1 8664/1 8665/1 +f 8667/1 8664/1 8673/1 +f 8674/1 8670/1 8671/1 +f 8675/1 8676/1 8670/1 +f 8675/1 8670/1 8674/1 +f 8676/1 8668/1 8670/1 +f 8662/1 8675/1 8674/1 +f 8677/1 8676/1 8675/1 +f 8678/1 8677/1 8675/1 +f 8678/1 8675/1 8662/1 +f 8677/1 8679/1 8676/1 +f 8679/1 8680/1 8676/1 +f 8676/1 8680/1 8668/1 +f 8681/1 8679/1 8677/1 +f 8681/1 8677/1 8678/1 +f 8680/1 8679/1 8682/1 +f 8681/1 8683/1 8679/1 +f 8679/1 8683/1 8682/1 +f 8678/1 8684/1 8681/1 +f 8683/1 8681/1 8685/1 +f 8685/1 8681/1 8684/1 +f 8686/1 8682/1 8683/1 +f 8683/1 8685/1 8687/1 +f 8683/1 8687/1 8686/1 +f 8688/1 8680/1 8682/1 +f 8686/1 8689/1 8682/1 +f 8682/1 8689/1 8688/1 +f 8690/1 8689/1 8686/1 +f 8686/1 8687/1 8691/1 +f 8686/1 8691/1 8690/1 +f 8685/1 8692/1 8687/1 +f 8687/1 8692/1 8693/1 +f 8687/1 8693/1 8691/1 +f 8685/1 8684/1 8692/1 +f 8684/1 8694/1 8692/1 +f 8692/1 8694/1 8695/1 +f 8692/1 8695/1 8696/1 +f 8692/1 8696/1 8693/1 +f 8697/1 8698/1 8693/1 +f 8693/1 8696/1 8699/1 +f 8693/1 8699/1 8697/1 +f 8691/1 8693/1 8698/1 +f 8696/1 8695/1 8700/1 +f 8700/1 8699/1 8696/1 +f 8695/1 8694/1 8678/1 +f 8695/1 8678/1 8700/1 +f 8678/1 8694/1 8684/1 +f 8700/1 8678/1 8662/1 +f 8700/1 8662/1 8701/1 +f 8701/1 8702/1 8700/1 +f 8700/1 8702/1 8699/1 +f 8697/1 8699/1 8702/1 +f 8703/1 8704/1 8702/1 +f 8701/1 8703/1 8702/1 +f 8697/1 8702/1 8705/1 +f 8705/1 8702/1 8704/1 +f 8705/1 8704/1 8703/1 +f 8706/1 8703/1 8701/1 +f 8706/1 8707/1 8703/1 +f 8703/1 8707/1 8708/1 +f 8703/1 8708/1 8705/1 +f 8708/1 8709/1 8705/1 +f 8705/1 8709/1 8710/1 +f 8705/1 8710/1 8697/1 +f 8707/1 8711/1 8708/1 +f 8708/1 8711/1 8709/1 +f 8712/1 8710/1 8709/1 +f 8712/1 8709/1 8713/1 +f 8713/1 8709/1 8711/1 +f 8714/1 8698/1 8710/1 +f 8714/1 8710/1 8712/1 +f 8697/1 8710/1 8698/1 +f 8712/1 8713/1 8715/1 +f 8715/1 8714/1 8712/1 +f 8715/1 8713/1 8716/1 +f 8713/1 8711/1 8716/1 +f 8716/1 8717/1 8715/1 +f 8715/1 8717/1 8718/1 +f 8718/1 8717/1 8719/1 +f 8719/1 8717/1 8711/1 +f 8716/1 8711/1 8717/1 +f 8715/1 8718/1 8720/1 +f 8720/1 8718/1 8721/1 +f 8720/1 8722/1 8723/1 +f 8720/1 8721/1 8722/1 +f 8722/1 8721/1 8724/1 +f 8723/1 8722/1 8725/1 +f 8726/1 8727/1 8722/1 +f 8722/1 8727/1 8728/1 +f 8722/1 8728/1 8725/1 +f 8729/1 8730/1 8726/1 +f 8726/1 8730/1 8727/1 +f 8731/1 8732/1 8729/1 +f 8729/1 8732/1 8730/1 +f 8733/1 8734/1 8731/1 +f 8731/1 8734/1 8735/1 +f 8731/1 8735/1 8732/1 +f 8736/1 8737/1 8733/1 +f 8733/1 8737/1 8734/1 +f 8736/1 8738/1 8737/1 +f 8739/1 8738/1 8736/1 +f 8740/1 8739/1 8736/1 +f 8736/1 8741/1 8740/1 +f 8736/1 8742/1 8741/1 +f 8743/1 8742/1 8736/1 +f 8743/1 8736/1 8744/1 +f 8744/1 8736/1 8745/1 +f 8745/1 8746/1 8744/1 +f 8747/1 8748/1 8745/1 +f 8745/1 8748/1 8746/1 +f 8749/1 8750/1 8747/1 +f 8750/1 8751/1 8747/1 +f 8747/1 8751/1 8748/1 +f 8752/1 8753/1 8749/1 +f 8749/1 8753/1 8750/1 +f 8754/1 8755/1 8752/1 +f 8752/1 8755/1 8756/1 +f 8752/1 8756/1 8753/1 +f 8757/1 8758/1 8754/1 +f 8754/1 8758/1 8755/1 +f 8759/1 8760/1 8757/1 +f 8757/1 8760/1 8758/1 +f 8724/1 8761/1 8759/1 +f 8759/1 8761/1 8762/1 +f 8763/1 8764/1 8759/1 +f 8759/1 8765/1 8760/1 +f 8764/1 8766/1 8759/1 +f 8759/1 8766/1 8767/1 +f 8759/1 8767/1 8765/1 +f 8762/1 8768/1 8759/1 +f 8759/1 8768/1 8769/1 +f 8759/1 8769/1 8770/1 +f 8771/1 8772/1 8759/1 +f 8759/1 8772/1 8773/1 +f 8759/1 8773/1 8763/1 +f 8770/1 8774/1 8759/1 +f 8759/1 8774/1 8775/1 +f 8759/1 8775/1 8776/1 +f 8776/1 8777/1 8759/1 +f 8759/1 8777/1 8778/1 +f 8759/1 8778/1 8771/1 +f 8761/1 8779/1 8780/1 +f 8781/1 8768/1 8780/1 +f 8761/1 8780/1 8762/1 +f 8762/1 8780/1 8768/1 +f 8782/1 8780/1 8779/1 +f 8783/1 8769/1 8781/1 +f 8781/1 8769/1 8768/1 +f 8784/1 8781/1 8780/1 +f 8785/1 8774/1 8783/1 +f 8774/1 8770/1 8783/1 +f 8783/1 8770/1 8769/1 +f 8784/1 8780/1 8782/1 +f 8786/1 8781/1 8784/1 +f 8782/1 8787/1 8784/1 +f 8784/1 8787/1 8788/1 +f 8789/1 8790/1 8787/1 +f 8787/1 8790/1 8791/1 +f 8787/1 8791/1 8788/1 +f 8782/1 8789/1 8787/1 +f 8792/1 8790/1 8789/1 +f 8793/1 8792/1 8789/1 +f 8793/1 8789/1 8782/1 +f 8794/1 8791/1 8790/1 +f 8794/1 8790/1 8795/1 +f 8792/1 8795/1 8790/1 +f 8796/1 8795/1 8792/1 +f 8796/1 8792/1 8793/1 +f 8793/1 8797/1 8796/1 +f 8782/1 8779/1 8793/1 +f 8793/1 8779/1 8798/1 +f 8793/1 8798/1 8797/1 +f 8706/1 8799/1 8796/1 +f 8796/1 8799/1 8795/1 +f 8706/1 8796/1 8707/1 +f 8707/1 8796/1 8797/1 +f 8799/1 8800/1 8795/1 +f 8800/1 8794/1 8795/1 +f 8661/1 8800/1 8799/1 +f 8799/1 8701/1 8661/1 +f 8701/1 8799/1 8706/1 +f 8661/1 8659/1 8800/1 +f 8659/1 8794/1 8800/1 +f 8661/1 8701/1 8662/1 +f 8659/1 8660/1 8794/1 +f 8801/1 8794/1 8660/1 +f 8707/1 8797/1 8802/1 +f 8802/1 8797/1 8798/1 +f 8719/1 8711/1 8802/1 +f 8802/1 8711/1 8707/1 +f 8802/1 8798/1 8719/1 +f 8719/1 8798/1 8803/1 +f 8779/1 8803/1 8798/1 +f 8719/1 8803/1 8718/1 +f 8718/1 8803/1 8721/1 +f 8721/1 8803/1 8804/1 +f 8804/1 8803/1 8779/1 +f 8804/1 8779/1 8761/1 +f 8760/1 8765/1 8805/1 +f 8760/1 8805/1 8806/1 +f 8806/1 8807/1 8760/1 +f 8760/1 8807/1 8808/1 +f 8760/1 8808/1 8809/1 +f 8808/1 8807/1 8810/1 +f 8810/1 8807/1 8811/1 +f 8807/1 8812/1 8813/1 +f 8809/1 8808/1 8814/1 +f 8809/1 8814/1 8815/1 +f 8815/1 8814/1 8816/1 +f 8815/1 8816/1 8817/1 +f 8817/1 8816/1 8818/1 +f 8817/1 8818/1 8819/1 +f 8820/1 8821/1 8818/1 +f 8819/1 8818/1 8821/1 +f 8822/1 8823/1 8820/1 +f 8820/1 8823/1 8821/1 +f 8824/1 8825/1 8822/1 +f 8825/1 8826/1 8822/1 +f 8822/1 8826/1 8823/1 +f 8827/1 8825/1 8824/1 +f 8824/1 8828/1 8827/1 +f 8824/1 8829/1 8828/1 +f 8830/1 8829/1 8824/1 +f 8824/1 8831/1 8830/1 +f 8824/1 8832/1 8831/1 +f 8833/1 8832/1 8824/1 +f 8833/1 8824/1 8834/1 +f 8834/1 8824/1 8835/1 +f 8834/1 8835/1 8836/1 +f 8836/1 8835/1 8837/1 +f 8836/1 8837/1 8838/1 +f 8838/1 8837/1 8839/1 +f 8838/1 8839/1 8840/1 +f 8840/1 8839/1 8841/1 +f 8841/1 8839/1 8842/1 +f 8841/1 8842/1 8843/1 +f 8843/1 8842/1 8844/1 +f 8843/1 8844/1 8845/1 +f 8844/1 8846/1 8845/1 +f 8845/1 8846/1 8847/1 +f 8844/1 8848/1 8846/1 +f 8846/1 8848/1 8849/1 +f 8846/1 8849/1 8690/1 +f 8690/1 8847/1 8846/1 +f 8850/1 8847/1 8715/1 +f 8715/1 8847/1 8851/1 +f 8691/1 8851/1 8847/1 +f 8690/1 8691/1 8847/1 +f 8690/1 8849/1 8689/1 +f 8852/1 8689/1 8849/1 +f 8688/1 8689/1 8852/1 +f 8853/1 8680/1 8688/1 +f 8688/1 8852/1 8853/1 +f 8854/1 8853/1 8669/1 +f 8669/1 8853/1 8855/1 +f 8854/1 8856/1 8853/1 +f 8853/1 8856/1 8680/1 +f 8853/1 8852/1 8855/1 +f 8680/1 8856/1 8668/1 +f 8668/1 8856/1 8854/1 +f 8668/1 8854/1 8669/1 +f 8857/1 8669/1 8858/1 +f 8669/1 8855/1 8858/1 +f 8855/1 8852/1 8859/1 +f 8855/1 8859/1 8860/1 +f 8860/1 8858/1 8855/1 +f 8860/1 8857/1 8858/1 +f 8861/1 8862/1 8857/1 +f 8863/1 8861/1 8857/1 +f 8863/1 8857/1 8860/1 +f 8859/1 8864/1 8860/1 +f 8860/1 8864/1 8865/1 +f 8860/1 8865/1 8863/1 +f 8852/1 8866/1 8859/1 +f 8859/1 8866/1 8864/1 +f 8866/1 8867/1 8864/1 +f 8864/1 8867/1 8868/1 +f 8864/1 8868/1 8865/1 +f 8869/1 8870/1 8866/1 +f 8870/1 8871/1 8866/1 +f 8866/1 8871/1 8867/1 +f 8852/1 8869/1 8866/1 +f 8849/1 8869/1 8852/1 +f 8872/1 8873/1 8869/1 +f 8869/1 8873/1 8870/1 +f 8849/1 8872/1 8869/1 +f 8871/1 8870/1 8844/1 +f 8844/1 8870/1 8873/1 +f 8844/1 8867/1 8871/1 +f 8844/1 8868/1 8867/1 +f 8874/1 8868/1 8844/1 +f 8874/1 8865/1 8868/1 +f 8811/1 8875/1 8844/1 +f 8844/1 8875/1 8874/1 +f 8844/1 8873/1 8872/1 +f 8872/1 8848/1 8844/1 +f 8848/1 8872/1 8849/1 +f 8813/1 8876/1 8875/1 +f 8875/1 8876/1 8865/1 +f 8875/1 8865/1 8874/1 +f 8863/1 8865/1 8876/1 +f 8813/1 8812/1 8876/1 +f 8863/1 8876/1 8877/1 +f 8807/1 8806/1 8812/1 +f 8812/1 8806/1 8878/1 +f 8806/1 8805/1 8878/1 +f 8878/1 8805/1 8879/1 +f 8765/1 8879/1 8805/1 +f 8767/1 8880/1 8879/1 +f 8767/1 8879/1 8765/1 +f 8766/1 8880/1 8767/1 +f 8766/1 8881/1 8880/1 +f 8764/1 8881/1 8766/1 +f 8764/1 8882/1 8881/1 +f 8883/1 8851/1 8691/1 +f 8691/1 8698/1 8883/1 +f 8883/1 8884/1 8715/1 +f 8715/1 8851/1 8883/1 +f 8883/1 8698/1 8884/1 +f 8884/1 8698/1 8714/1 +f 8715/1 8884/1 8714/1 +f 8673/1 8665/1 8885/1 +f 8885/1 8886/1 8673/1 +f 8673/1 8886/1 8887/1 +f 8673/1 8887/1 8667/1 +f 8885/1 8665/1 8672/1 +f 8885/1 8672/1 8888/1 +f 8888/1 8889/1 8885/1 +f 8885/1 8889/1 8886/1 +f 8888/1 8672/1 8890/1 +f 8672/1 8666/1 8890/1 +f 8890/1 8891/1 8888/1 +f 8888/1 8891/1 8892/1 +f 8889/1 8888/1 8892/1 +f 8666/1 8862/1 8890/1 +f 8891/1 8890/1 8893/1 +f 8893/1 8890/1 8862/1 +f 8666/1 8669/1 8862/1 +f 8671/1 8666/1 8663/1 +f 8893/1 8862/1 8861/1 +f 8857/1 8862/1 8669/1 +f 8891/1 8893/1 8877/1 +f 8877/1 8893/1 8861/1 +f 8877/1 8861/1 8863/1 +f 8877/1 8894/1 8891/1 +f 8877/1 8876/1 8895/1 +f 8877/1 8895/1 8894/1 +f 8895/1 8896/1 8894/1 +f 8894/1 8896/1 8897/1 +f 8894/1 8897/1 8891/1 +f 8876/1 8812/1 8895/1 +f 8812/1 8878/1 8895/1 +f 8895/1 8878/1 8896/1 +f 8878/1 8879/1 8896/1 +f 8896/1 8879/1 8897/1 +f 8897/1 8879/1 8898/1 +f 8898/1 8879/1 8880/1 +f 8899/1 8897/1 8898/1 +f 8899/1 8898/1 8900/1 +f 8898/1 8880/1 8900/1 +f 8900/1 8880/1 8881/1 +f 8900/1 8881/1 8901/1 +f 8901/1 8902/1 8900/1 +f 8900/1 8902/1 8903/1 +f 8900/1 8903/1 8899/1 +f 8901/1 8881/1 8882/1 +f 8901/1 8882/1 8904/1 +f 8904/1 8905/1 8901/1 +f 8901/1 8905/1 8902/1 +f 8906/1 8904/1 8882/1 +f 8907/1 8908/1 8904/1 +f 8904/1 8908/1 8905/1 +f 8909/1 8907/1 8904/1 +f 8909/1 8904/1 8906/1 +f 8910/1 8902/1 8905/1 +f 8910/1 8905/1 8908/1 +f 8907/1 8911/1 8908/1 +f 8908/1 8911/1 8910/1 +f 8911/1 8912/1 8910/1 +f 8910/1 8912/1 8886/1 +f 8910/1 8886/1 8889/1 +f 8889/1 8902/1 8910/1 +f 8911/1 8913/1 8912/1 +f 8907/1 8913/1 8911/1 +f 8912/1 8913/1 8914/1 +f 8914/1 8913/1 8907/1 +f 8912/1 8914/1 8915/1 +f 8916/1 8915/1 8914/1 +f 8916/1 8914/1 8907/1 +f 8917/1 8915/1 8916/1 +f 8917/1 8916/1 8909/1 +f 8916/1 8907/1 8909/1 +f 8917/1 8918/1 8915/1 +f 8917/1 8909/1 8919/1 +f 8918/1 8917/1 8919/1 +f 8919/1 8909/1 8906/1 +f 8919/1 8906/1 8920/1 +f 8918/1 8919/1 8921/1 +f 8921/1 8919/1 8920/1 +f 8920/1 8771/1 8778/1 +f 8921/1 8920/1 8922/1 +f 8922/1 8920/1 8778/1 +f 8923/1 8921/1 8922/1 +f 8918/1 8921/1 8924/1 +f 8924/1 8921/1 8923/1 +f 8777/1 8776/1 8922/1 +f 8922/1 8785/1 8923/1 +f 8922/1 8778/1 8777/1 +f 8923/1 8785/1 8783/1 +f 8923/1 8783/1 8786/1 +f 8786/1 8783/1 8781/1 +f 8925/1 8923/1 8786/1 +f 8925/1 8786/1 8784/1 +f 8791/1 8926/1 8925/1 +f 8791/1 8925/1 8788/1 +f 8926/1 8923/1 8925/1 +f 8784/1 8788/1 8925/1 +f 8927/1 8791/1 8794/1 +f 8927/1 8928/1 8791/1 +f 8928/1 8926/1 8791/1 +f 8929/1 8927/1 8794/1 +f 8929/1 8794/1 8801/1 +f 8801/1 8930/1 8929/1 +f 8929/1 8930/1 8931/1 +f 8929/1 8931/1 8932/1 +f 8932/1 8927/1 8929/1 +f 8886/1 8931/1 8930/1 +f 8932/1 8931/1 8933/1 +f 8912/1 8933/1 8931/1 +f 8912/1 8931/1 8886/1 +f 8932/1 8933/1 8934/1 +f 8934/1 8935/1 8932/1 +f 8932/1 8935/1 8927/1 +f 8934/1 8933/1 8915/1 +f 8915/1 8933/1 8912/1 +f 8935/1 8934/1 8918/1 +f 8915/1 8918/1 8934/1 +f 8935/1 8936/1 8927/1 +f 8926/1 8936/1 8935/1 +f 8926/1 8935/1 8924/1 +f 8924/1 8935/1 8918/1 +f 8927/1 8936/1 8928/1 +f 8928/1 8936/1 8926/1 +f 8924/1 8923/1 8926/1 +f 8886/1 8930/1 8887/1 +f 8899/1 8903/1 8902/1 +f 8889/1 8899/1 8902/1 +f 8892/1 8899/1 8889/1 +f 8892/1 8897/1 8899/1 +f 8891/1 8897/1 8892/1 +f 8937/1 8938/1 8939/1 +f 8940/1 8938/1 8937/1 +f 8939/1 8938/1 8941/1 +f 8942/1 8938/1 8940/1 +f 8939/1 8941/1 8943/1 +f 8943/1 8941/1 8944/1 +f 8945/1 8943/1 8946/1 +f 8946/1 8943/1 8944/1 +f 8946/1 8947/1 8945/1 +f 8948/1 8947/1 8946/1 +f 8948/1 8949/1 8947/1 +f 8950/1 8949/1 8948/1 +f 8950/1 8951/1 8949/1 +f 8952/1 8951/1 8950/1 +f 8952/1 8953/1 8951/1 +f 8954/1 8953/1 8952/1 +f 8942/1 8940/1 8955/1 +f 8942/1 8955/1 8956/1 +f 8956/1 8955/1 8957/1 +f 8956/1 8957/1 8958/1 +f 8484/1 8758/1 8959/1 +f 8959/1 8758/1 8960/1 +f 8959/1 8960/1 8961/1 +f 8961/1 8960/1 8962/1 +f 8961/1 8962/1 8963/1 +f 8963/1 8962/1 8964/1 +f 8646/1 8965/1 8531/1 +f 8648/1 8965/1 8646/1 +f 8531/1 8965/1 8720/1 +f 8966/1 8965/1 8648/1 +f 8531/1 8720/1 8497/1 +f 8653/1 8966/1 8648/1 +f 8653/1 8967/1 8966/1 +f 8654/1 8967/1 8653/1 +f 8654/1 8968/1 8967/1 +f 8969/1 8970/1 8971/1 +f 8966/1 8968/1 8969/1 +f 8966/1 8969/1 8965/1 +f 8965/1 8969/1 8971/1 +f 8972/1 8973/1 8970/1 +f 8970/1 8973/1 8974/1 +f 8970/1 8974/1 8971/1 +f 8965/1 8971/1 8720/1 +f 8720/1 8971/1 8715/1 +f 8967/1 8968/1 8966/1 +f 8807/1 8813/1 8811/1 +f 8811/1 8813/1 8875/1 +f 8845/1 8847/1 8850/1 +f 8721/1 8804/1 8724/1 +f 8724/1 8804/1 8761/1 +f 8758/1 8760/1 8975/1 +f 8758/1 8975/1 8960/1 +f 8960/1 8975/1 8976/1 +f 8960/1 8976/1 8962/1 +f 8962/1 8976/1 8977/1 +f 8962/1 8977/1 8964/1 +f 8978/1 8953/1 8977/1 +f 8977/1 8953/1 8964/1 +f 8978/1 8977/1 8979/1 +f 8979/1 8977/1 8980/1 +f 8953/1 8981/1 8964/1 +f 8953/1 8978/1 8982/1 +f 8953/1 8982/1 8951/1 +f 8983/1 8981/1 8953/1 +f 8951/1 8982/1 8984/1 +f 8951/1 8984/1 8949/1 +f 8949/1 8985/1 8947/1 +f 8986/1 8979/1 8980/1 +f 8987/1 8979/1 8986/1 +f 8988/1 8987/1 8986/1 +f 8988/1 8986/1 8989/1 +f 8989/1 8986/1 8990/1 +f 8991/1 8992/1 8987/1 +f 8991/1 8987/1 8988/1 +f 8993/1 8992/1 8991/1 +f 8949/1 8984/1 8985/1 +f 8947/1 8985/1 8994/1 +f 8947/1 8994/1 8945/1 +f 8995/1 8943/1 8994/1 +f 8994/1 8943/1 8945/1 +f 8943/1 8995/1 8939/1 +f 8939/1 8995/1 8996/1 +f 8939/1 8996/1 8937/1 +f 8937/1 8996/1 8997/1 +f 8998/1 8999/1 9000/1 +f 9000/1 8999/1 9001/1 +f 9001/1 8997/1 9000/1 +f 9002/1 8937/1 9001/1 +f 9001/1 8937/1 8997/1 +f 9002/1 8957/1 8955/1 +f 8955/1 8940/1 9002/1 +f 9002/1 8940/1 8937/1 +f 9003/1 9004/1 9001/1 +f 9003/1 9001/1 8999/1 +f 9003/1 8999/1 9005/1 +f 9001/1 9004/1 9002/1 +f 8958/1 9002/1 9004/1 +f 8958/1 8957/1 9002/1 +f 9005/1 8999/1 8998/1 +f 9005/1 8998/1 9006/1 +f 9006/1 8998/1 9000/1 +f 9006/1 9000/1 9007/1 +f 8997/1 9007/1 9000/1 +f 9008/1 9007/1 8997/1 +f 8996/1 9009/1 8997/1 +f 8997/1 9009/1 9008/1 +f 8995/1 9010/1 8996/1 +f 8996/1 9010/1 9009/1 +f 8995/1 8994/1 9010/1 +f 9010/1 8994/1 9011/1 +f 9011/1 8994/1 9012/1 +f 9012/1 8994/1 8985/1 +f 9012/1 8985/1 9013/1 +f 9013/1 8985/1 8984/1 +f 9013/1 8984/1 9014/1 +f 9014/1 8984/1 8982/1 +f 9014/1 8982/1 9015/1 +f 9015/1 8982/1 8978/1 +f 9004/1 9003/1 9008/1 +f 8942/1 8958/1 9004/1 +f 8942/1 9004/1 8938/1 +f 8938/1 9004/1 9008/1 +f 9005/1 9006/1 9003/1 +f 9003/1 9006/1 9007/1 +f 9003/1 9007/1 9008/1 +f 8956/1 8958/1 8942/1 +f 8938/1 9008/1 9009/1 +f 8938/1 9009/1 8941/1 +f 8941/1 9009/1 9010/1 +f 8941/1 9010/1 8944/1 +f 9011/1 8946/1 9010/1 +f 9010/1 8946/1 8944/1 +f 8946/1 9011/1 8948/1 +f 8948/1 9011/1 9012/1 +f 8948/1 9012/1 8950/1 +f 8950/1 9013/1 8952/1 +f 8952/1 9013/1 9014/1 +f 8952/1 9014/1 8954/1 +f 8954/1 9014/1 9015/1 +f 9015/1 8963/1 8954/1 +f 8954/1 8963/1 9016/1 +f 8954/1 9016/1 9017/1 +f 9018/1 8963/1 9015/1 +f 9019/1 9018/1 9015/1 +f 8963/1 9018/1 8961/1 +f 8961/1 9018/1 9020/1 +f 9019/1 9021/1 9018/1 +f 9022/1 9021/1 9019/1 +f 9022/1 9023/1 9021/1 +f 9023/1 9022/1 9024/1 +f 9024/1 9022/1 9025/1 +f 9026/1 9027/1 9024/1 +f 9026/1 9024/1 9028/1 +f 9028/1 9024/1 9025/1 +f 9028/1 9025/1 9029/1 +f 9029/1 9025/1 9030/1 +f 9031/1 9027/1 9026/1 +f 8961/1 9020/1 8959/1 +f 8959/1 9020/1 9032/1 +f 8959/1 9032/1 8484/1 +f 8484/1 9032/1 8479/1 +f 9017/1 9016/1 9033/1 +f 9017/1 9033/1 9034/1 +f 8950/1 9012/1 9013/1 +f 8970/1 8969/1 8649/1 +f 8650/1 8972/1 8970/1 +f 8650/1 8970/1 8649/1 +f 8649/1 8969/1 8652/1 +f 8652/1 8969/1 8968/1 +f 8652/1 8968/1 8654/1 +f 8651/1 8972/1 8650/1 +f 8651/1 8973/1 8972/1 +f 8647/1 8973/1 8651/1 +f 8647/1 8974/1 8973/1 +f 8645/1 8974/1 8647/1 +f 8971/1 8974/1 8645/1 +f 8530/1 8971/1 8645/1 +f 8530/1 8715/1 8971/1 +f 8529/1 8715/1 8530/1 +f 8755/1 8758/1 8486/1 +f 8755/1 8486/1 8491/1 +f 8755/1 8491/1 8756/1 +f 8486/1 8758/1 8484/1 +f 8756/1 8491/1 8523/1 +f 8756/1 8523/1 8753/1 +f 8753/1 8523/1 8522/1 +f 8753/1 8522/1 8750/1 +f 8750/1 8522/1 8520/1 +f 8750/1 8520/1 8751/1 +f 8751/1 8520/1 8518/1 +f 8751/1 8518/1 8748/1 +f 8748/1 8518/1 8517/1 +f 8748/1 8517/1 8746/1 +f 8746/1 8517/1 8513/1 +f 8746/1 8513/1 8744/1 +f 8744/1 8513/1 8515/1 +f 8744/1 8515/1 8743/1 +f 8743/1 8515/1 8516/1 +f 8743/1 8516/1 8742/1 +f 8739/1 8740/1 8510/1 +f 8739/1 8510/1 8738/1 +f 8510/1 8740/1 8511/1 +f 8741/1 8511/1 8740/1 +f 8738/1 8510/1 8509/1 +f 8741/1 8512/1 8511/1 +f 8737/1 8508/1 8506/1 +f 8737/1 8506/1 8734/1 +f 8738/1 8509/1 8737/1 +f 8737/1 8509/1 8508/1 +f 8734/1 8506/1 8504/1 +f 8734/1 8504/1 8735/1 +f 8735/1 8504/1 8502/1 +f 8735/1 8502/1 8732/1 +f 8732/1 8502/1 8501/1 +f 8732/1 8501/1 8730/1 +f 8730/1 8501/1 8500/1 +f 8730/1 8500/1 8727/1 +f 8727/1 8500/1 8499/1 +f 8727/1 8499/1 8728/1 +f 8728/1 8499/1 8725/1 +f 8725/1 8499/1 8498/1 +f 8725/1 8498/1 8723/1 +f 8723/1 8498/1 8495/1 +f 8495/1 8497/1 8723/1 +f 8723/1 8497/1 8720/1 +f 8745/1 8514/1 8747/1 +f 8736/1 8507/1 8745/1 +f 8745/1 8507/1 8514/1 +f 8747/1 8514/1 8519/1 +f 8747/1 8519/1 8749/1 +f 8749/1 8519/1 8521/1 +f 8749/1 8521/1 8752/1 +f 8752/1 8521/1 8524/1 +f 8752/1 8524/1 8754/1 +f 8754/1 8524/1 8490/1 +f 8754/1 8490/1 8757/1 +f 8757/1 8490/1 8489/1 +f 8736/1 8505/1 8507/1 +f 8733/1 8505/1 8736/1 +f 8757/1 8489/1 8759/1 +f 8759/1 8489/1 8488/1 +f 8759/1 8488/1 8724/1 +f 8724/1 8488/1 8492/1 +f 8724/1 8492/1 8722/1 +f 8722/1 8492/1 8493/1 +f 8722/1 8493/1 8726/1 +f 8726/1 8493/1 8494/1 +f 8726/1 8494/1 8729/1 +f 8729/1 8494/1 8496/1 +f 8729/1 8496/1 8731/1 +f 8731/1 8496/1 8503/1 +f 8731/1 8503/1 8733/1 +f 8733/1 8503/1 8505/1 +f 9034/1 8983/1 9017/1 +f 9035/1 8983/1 9034/1 +f 9017/1 8983/1 8953/1 +f 9036/1 8983/1 9035/1 +f 9017/1 8953/1 8954/1 +f 8963/1 8964/1 9016/1 +f 9016/1 8964/1 8981/1 +f 9016/1 8981/1 9033/1 +f 9037/1 9033/1 8981/1 +f 9038/1 9033/1 9037/1 +f 9038/1 9037/1 9039/1 +f 9038/1 9039/1 9040/1 +f 9040/1 9039/1 9041/1 +f 9040/1 9041/1 9042/1 +f 9042/1 9041/1 9043/1 +f 9042/1 9043/1 9044/1 +f 9043/1 9045/1 9044/1 +f 9044/1 9045/1 9046/1 +f 9046/1 9045/1 9047/1 +f 9046/1 9047/1 9048/1 +f 9048/1 9047/1 9049/1 +f 9048/1 9049/1 9050/1 +f 9035/1 9034/1 9038/1 +f 9046/1 9050/1 9035/1 +f 9046/1 9035/1 9044/1 +f 9038/1 9034/1 9033/1 +f 9044/1 9038/1 9042/1 +f 9042/1 9038/1 9040/1 +f 9048/1 9050/1 9046/1 +f 9044/1 9035/1 9038/1 +f 8981/1 8983/1 9037/1 +f 9037/1 8983/1 9036/1 +f 9043/1 9039/1 9037/1 +f 9043/1 9037/1 9045/1 +f 9045/1 9037/1 9036/1 +f 9045/1 9036/1 9047/1 +f 9047/1 9036/1 9049/1 +f 9041/1 9039/1 9043/1 +f 8742/1 8516/1 8512/1 +f 8742/1 8512/1 8741/1 +f 9050/1 9049/1 9036/1 +f 9050/1 9036/1 9035/1 +f 9018/1 8977/1 9020/1 +f 9020/1 8977/1 8976/1 +f 9020/1 8976/1 9032/1 +f 9032/1 8976/1 8975/1 +f 9032/1 8975/1 8479/1 +f 8479/1 8975/1 8760/1 +f 8760/1 8809/1 8479/1 +f 8479/1 8809/1 8482/1 +f 8815/1 8482/1 8809/1 +f 8815/1 8619/1 8482/1 +f 8817/1 8619/1 8815/1 +f 8817/1 8617/1 8619/1 +f 8827/1 8628/1 8626/1 +f 8827/1 8626/1 8825/1 +f 8828/1 8628/1 8827/1 +f 8828/1 8629/1 8628/1 +f 8829/1 8629/1 8828/1 +f 8829/1 8630/1 8629/1 +f 8830/1 8630/1 8829/1 +f 8830/1 8631/1 8630/1 +f 8830/1 8831/1 8631/1 +f 8631/1 8831/1 8632/1 +f 8832/1 8633/1 8831/1 +f 8831/1 8633/1 8632/1 +f 8833/1 8634/1 8832/1 +f 8832/1 8634/1 8633/1 +f 8834/1 8634/1 8833/1 +f 8834/1 8636/1 8634/1 +f 8836/1 8636/1 8834/1 +f 8836/1 8638/1 8636/1 +f 8838/1 8638/1 8836/1 +f 8838/1 8639/1 8638/1 +f 8840/1 8639/1 8838/1 +f 8840/1 8641/1 8639/1 +f 8841/1 8641/1 8840/1 +f 8841/1 8537/1 8641/1 +f 8825/1 8626/1 8625/1 +f 8825/1 8625/1 8826/1 +f 8826/1 8625/1 8623/1 +f 8826/1 8623/1 8823/1 +f 8823/1 8623/1 8622/1 +f 8823/1 8622/1 8821/1 +f 8821/1 8622/1 8620/1 +f 8821/1 8620/1 8819/1 +f 8819/1 8620/1 8617/1 +f 8819/1 8617/1 8817/1 +f 8843/1 8538/1 8537/1 +f 8843/1 8537/1 8841/1 +f 8845/1 8535/1 8843/1 +f 8843/1 8535/1 8538/1 +f 8529/1 8534/1 8715/1 +f 8715/1 8534/1 8850/1 +f 8850/1 8534/1 8845/1 +f 8845/1 8534/1 8535/1 +f 8822/1 8624/1 8824/1 +f 8820/1 8621/1 8822/1 +f 8822/1 8621/1 8624/1 +f 8824/1 8624/1 8627/1 +f 8824/1 8627/1 8835/1 +f 8835/1 8627/1 8635/1 +f 8835/1 8635/1 8837/1 +f 8837/1 8635/1 8637/1 +f 8837/1 8637/1 8839/1 +f 8839/1 8637/1 8640/1 +f 8820/1 8618/1 8621/1 +f 8818/1 8618/1 8820/1 +f 8839/1 8640/1 8842/1 +f 8842/1 8640/1 8536/1 +f 8842/1 8536/1 8844/1 +f 8844/1 8536/1 8533/1 +f 8844/1 8533/1 8811/1 +f 8811/1 8533/1 8539/1 +f 8811/1 8539/1 8810/1 +f 8810/1 8539/1 8616/1 +f 8810/1 8616/1 8808/1 +f 8808/1 8616/1 8615/1 +f 8808/1 8615/1 8814/1 +f 8814/1 8615/1 8613/1 +f 8814/1 8613/1 8816/1 +f 8816/1 8613/1 8614/1 +f 8816/1 8614/1 8818/1 +f 8818/1 8614/1 8618/1 +f 9015/1 8978/1 9019/1 +f 9019/1 8978/1 8979/1 +f 9019/1 8979/1 9022/1 +f 8979/1 8987/1 9022/1 +f 9022/1 8987/1 9025/1 +f 9025/1 8987/1 8992/1 +f 9025/1 8992/1 9030/1 +f 9030/1 8992/1 8993/1 +f 9030/1 8993/1 9029/1 +f 9029/1 8993/1 8991/1 +f 9029/1 8991/1 9028/1 +f 8991/1 8988/1 9028/1 +f 9028/1 8988/1 9026/1 +f 9026/1 8988/1 8989/1 +f 9026/1 8989/1 9031/1 +f 9031/1 8989/1 8990/1 +f 9031/1 8990/1 9027/1 +f 9027/1 8990/1 8986/1 +f 9027/1 8986/1 9024/1 +f 9023/1 8980/1 9021/1 +f 9023/1 9024/1 8980/1 +f 9021/1 8980/1 8977/1 +f 8980/1 9024/1 8986/1 +f 9021/1 8977/1 9018/1 +f 8674/1 8671/1 8658/1 +f 8658/1 8671/1 8663/1 +f 8662/1 8674/1 8658/1 +f 8656/1 8667/1 8660/1 +f 8660/1 8667/1 8887/1 +f 8660/1 8887/1 8801/1 +f 8801/1 8887/1 8930/1 +f 8773/1 8772/1 8906/1 +f 8906/1 8882/1 8773/1 +f 8773/1 8882/1 8763/1 +f 8906/1 8772/1 8771/1 +f 8920/1 8906/1 8771/1 +f 8763/1 8882/1 8764/1 +f 8776/1 8775/1 8785/1 +f 8922/1 8776/1 8785/1 +f 8785/1 8775/1 8774/1 +f 8431/1 8428/1 8571/1 +f 8428/1 8426/1 8571/1 +f 8571/1 8426/1 8425/1 +f 8571/1 8425/1 8570/1 +f 9051/1 9052/1 9053/1 +f 9051/1 9053/1 9054/1 +f 9055/1 9052/1 9051/1 +f 9055/1 9056/1 9052/1 +f 9057/1 9056/1 9055/1 +f 9057/1 9058/1 9056/1 +f 9059/1 9058/1 9057/1 +f 9059/1 9060/1 9058/1 +f 9061/1 9054/1 9062/1 +f 9062/1 9054/1 9053/1 +f 9061/1 9062/1 9063/1 +f 9061/1 9063/1 9064/1 +f 9064/1 9063/1 9065/1 +f 9064/1 9065/1 9066/1 +f 9066/1 9065/1 9067/1 +f 9066/1 9067/1 9068/1 +f 9068/1 9067/1 9069/1 +f 9068/1 9069/1 9070/1 +f 9071/1 9072/1 9073/1 +f 9071/1 9073/1 9074/1 +f 9075/1 9072/1 9071/1 +f 9076/1 9072/1 9075/1 +f 9077/1 9076/1 9075/1 +f 9077/1 9078/1 9076/1 +f 9079/1 9078/1 9077/1 +f 9079/1 9080/1 9078/1 +f 9081/1 9080/1 9079/1 +f 9081/1 9082/1 9080/1 +f 9083/1 9082/1 9081/1 +f 9083/1 9084/1 9082/1 +f 9085/1 9084/1 9083/1 +f 9086/1 9084/1 9085/1 +f 9086/1 9085/1 9087/1 +f 9087/1 9085/1 9088/1 +f 9087/1 9088/1 9089/1 +f 9089/1 9088/1 9090/1 +f 9091/1 9089/1 9092/1 +f 9092/1 9089/1 9090/1 +f 9092/1 9093/1 9091/1 +f 9094/1 9093/1 9092/1 +f 9094/1 9095/1 9093/1 +f 9096/1 9095/1 9094/1 +f 9096/1 9097/1 9095/1 +f 9098/1 9097/1 9096/1 +f 9098/1 9099/1 9097/1 +f 9100/1 9099/1 9098/1 +f 9074/1 9073/1 9101/1 +f 9074/1 9101/1 9102/1 +f 9102/1 9101/1 9103/1 +f 9102/1 9103/1 9104/1 +f 9104/1 9103/1 9105/1 +f 9104/1 9105/1 9106/1 +f 9107/1 9106/1 9105/1 +f 9108/1 9106/1 9107/1 +f 9109/1 9110/1 9107/1 +f 9107/1 9110/1 9108/1 +f 9111/1 9112/1 9109/1 +f 9109/1 9112/1 9110/1 +f 9111/1 9113/1 9112/1 +f 9112/1 9113/1 9114/1 +f 9114/1 9113/1 9115/1 +f 9115/1 9113/1 9116/1 +f 9115/1 9116/1 9117/1 +f 9117/1 9116/1 9118/1 +f 9117/1 9118/1 9119/1 +f 9119/1 9118/1 9120/1 +f 9119/1 9120/1 9121/1 +f 9121/1 9120/1 9122/1 +f 9122/1 9123/1 9121/1 +f 9121/1 9123/1 9124/1 +f 9124/1 9123/1 9125/1 +f 9125/1 9123/1 9126/1 +f 9125/1 9126/1 9127/1 +f 9127/1 9126/1 9128/1 +f 9127/1 9128/1 9129/1 +f 9129/1 9128/1 9130/1 +f 9131/1 9132/1 9133/1 +f 9131/1 9133/1 9134/1 +f 9135/1 9132/1 9131/1 +f 9136/1 9132/1 9135/1 +f 9136/1 9135/1 9137/1 +f 9137/1 9135/1 9138/1 +f 9134/1 9133/1 9139/1 +f 9134/1 9139/1 9140/1 +f 9140/1 9139/1 9141/1 +f 9140/1 9141/1 9142/1 +f 9142/1 9141/1 9143/1 +f 9142/1 9143/1 9144/1 +f 9145/1 9144/1 9143/1 +f 9146/1 9144/1 9145/1 +f 9147/1 9146/1 9145/1 +f 9147/1 9148/1 9146/1 +f 9149/1 9148/1 9147/1 +f 9149/1 9150/1 9148/1 +f 9151/1 9150/1 9149/1 +f 9151/1 9152/1 9150/1 +f 9153/1 9152/1 9151/1 +f 9153/1 9154/1 9152/1 +f 9155/1 9154/1 9153/1 +f 9156/1 9154/1 9155/1 +f 9157/1 9158/1 9155/1 +f 9155/1 9158/1 9156/1 +f 9157/1 9159/1 9158/1 +f 9158/1 9159/1 9160/1 +f 9160/1 9159/1 9161/1 +f 9161/1 9159/1 9162/1 +f 9161/1 9162/1 9163/1 +f 9163/1 9162/1 9164/1 +f 9163/1 9164/1 9165/1 +f 9165/1 9164/1 9166/1 +f 9167/1 9168/1 9169/1 +f 9167/1 9169/1 9170/1 +f 9171/1 9168/1 9167/1 +f 9172/1 9168/1 9171/1 +f 9173/1 9174/1 9171/1 +f 9171/1 9174/1 9172/1 +f 9175/1 9176/1 9173/1 +f 9173/1 9176/1 9174/1 +f 9177/1 9176/1 9175/1 +f 9177/1 9178/1 9176/1 +f 9179/1 9178/1 9177/1 +f 9179/1 9180/1 9178/1 +f 9181/1 9180/1 9179/1 +f 9181/1 9182/1 9180/1 +f 9183/1 9182/1 9181/1 +f 9183/1 9184/1 9182/1 +f 9185/1 9184/1 9183/1 +f 9185/1 9186/1 9184/1 +f 9187/1 9186/1 9185/1 +f 9187/1 9188/1 9186/1 +f 9189/1 9190/1 9187/1 +f 9187/1 9190/1 9188/1 +f 9191/1 9192/1 9189/1 +f 9189/1 9192/1 9190/1 +f 9137/1 9192/1 9191/1 +f 9138/1 9192/1 9137/1 +f 9170/1 9169/1 9193/1 +f 9170/1 9193/1 9194/1 +f 9194/1 9193/1 9195/1 +f 9194/1 9195/1 9196/1 +f 9083/1 9075/1 9085/1 +f 9083/1 9081/1 9075/1 +f 9085/1 9075/1 9106/1 +f 9075/1 9081/1 9079/1 +f 9075/1 9079/1 9077/1 +f 9071/1 9106/1 9075/1 +f 9085/1 9106/1 9108/1 +f 9110/1 9088/1 9085/1 +f 9110/1 9085/1 9108/1 +f 9074/1 9104/1 9106/1 +f 9074/1 9106/1 9071/1 +f 9102/1 9104/1 9074/1 +f 9112/1 9090/1 9088/1 +f 9112/1 9088/1 9110/1 +f 9112/1 9114/1 9090/1 +f 9090/1 9114/1 9092/1 +f 9114/1 9094/1 9092/1 +f 9121/1 9100/1 9119/1 +f 9121/1 9124/1 9100/1 +f 9119/1 9100/1 9098/1 +f 9100/1 9124/1 9165/1 +f 9197/1 9198/1 9100/1 +f 9197/1 9100/1 9165/1 +f 9119/1 9098/1 9117/1 +f 9117/1 9098/1 9096/1 +f 9117/1 9096/1 9115/1 +f 9115/1 9096/1 9094/1 +f 9124/1 9163/1 9165/1 +f 9125/1 9163/1 9124/1 +f 9125/1 9161/1 9163/1 +f 9127/1 9161/1 9125/1 +f 9127/1 9160/1 9161/1 +f 9129/1 9160/1 9127/1 +f 9199/1 9198/1 9197/1 +f 9199/1 9200/1 9198/1 +f 9199/1 9054/1 9200/1 +f 9059/1 9054/1 9199/1 +f 9200/1 9054/1 9061/1 +f 9200/1 9061/1 9070/1 +f 9057/1 9051/1 9054/1 +f 9057/1 9054/1 9059/1 +f 9055/1 9051/1 9057/1 +f 9061/1 9068/1 9070/1 +f 9064/1 9066/1 9061/1 +f 9061/1 9066/1 9068/1 +f 9115/1 9094/1 9114/1 +f 9201/1 9202/1 9203/1 +f 9201/1 9203/1 9204/1 +f 9203/1 9202/1 9205/1 +f 9206/1 9205/1 9202/1 +f 9204/1 9203/1 9207/1 +f 9204/1 9207/1 9208/1 +f 9208/1 9207/1 9209/1 +f 9208/1 9209/1 9129/1 +f 9129/1 9209/1 9210/1 +f 9129/1 9210/1 9160/1 +f 9160/1 9210/1 9211/1 +f 9160/1 9211/1 9212/1 +f 9158/1 9160/1 9138/1 +f 9138/1 9160/1 9212/1 +f 9138/1 9212/1 9192/1 +f 9192/1 9212/1 9190/1 +f 9213/1 9186/1 9212/1 +f 9212/1 9186/1 9188/1 +f 9212/1 9188/1 9190/1 +f 9214/1 9184/1 9213/1 +f 9213/1 9184/1 9186/1 +f 9215/1 9182/1 9214/1 +f 9214/1 9182/1 9184/1 +f 9216/1 9178/1 9215/1 +f 9215/1 9178/1 9180/1 +f 9215/1 9180/1 9182/1 +f 9217/1 9176/1 9216/1 +f 9216/1 9176/1 9178/1 +f 9217/1 9174/1 9176/1 +f 9172/1 9174/1 9217/1 +f 9168/1 9172/1 9217/1 +f 9218/1 9168/1 9217/1 +f 9218/1 9217/1 9219/1 +f 9219/1 9217/1 9220/1 +f 9195/1 9169/1 9168/1 +f 9195/1 9168/1 9218/1 +f 9193/1 9169/1 9195/1 +f 9219/1 9220/1 9221/1 +f 9221/1 9220/1 9205/1 +f 9221/1 9205/1 9206/1 +f 9156/1 9158/1 9135/1 +f 9156/1 9135/1 9154/1 +f 9135/1 9158/1 9138/1 +f 9154/1 9135/1 9131/1 +f 9131/1 9134/1 9140/1 +f 9140/1 9142/1 9131/1 +f 9131/1 9142/1 9144/1 +f 9131/1 9144/1 9154/1 +f 9154/1 9144/1 9146/1 +f 9154/1 9146/1 9148/1 +f 9150/1 9154/1 9148/1 +f 9150/1 9152/1 9154/1 +f 9132/1 9136/1 9143/1 +f 9143/1 9133/1 9132/1 +f 9143/1 9136/1 9145/1 +f 9145/1 9136/1 9155/1 +f 9137/1 9157/1 9136/1 +f 9136/1 9157/1 9155/1 +f 9141/1 9139/1 9143/1 +f 9143/1 9139/1 9133/1 +f 9145/1 9155/1 9153/1 +f 9153/1 9151/1 9145/1 +f 9145/1 9151/1 9149/1 +f 9145/1 9149/1 9147/1 +f 9222/1 9223/1 9224/1 +f 9224/1 9225/1 9222/1 +f 9222/1 9225/1 9226/1 +f 9222/1 9226/1 9227/1 +f 9223/1 9171/1 9224/1 +f 9224/1 9171/1 9167/1 +f 9224/1 9167/1 9196/1 +f 9223/1 9173/1 9171/1 +f 9175/1 9173/1 9223/1 +f 9223/1 9177/1 9175/1 +f 9228/1 9179/1 9177/1 +f 9228/1 9177/1 9223/1 +f 9229/1 9179/1 9228/1 +f 9229/1 9181/1 9179/1 +f 9230/1 9181/1 9229/1 +f 9230/1 9183/1 9181/1 +f 9231/1 9185/1 9230/1 +f 9230/1 9185/1 9183/1 +f 9232/1 9187/1 9231/1 +f 9231/1 9187/1 9185/1 +f 9233/1 9137/1 9232/1 +f 9232/1 9137/1 9191/1 +f 9191/1 9189/1 9232/1 +f 9232/1 9189/1 9187/1 +f 9159/1 9137/1 9233/1 +f 9159/1 9233/1 9130/1 +f 9130/1 9233/1 9234/1 +f 9157/1 9137/1 9159/1 +f 9130/1 9234/1 9235/1 +f 9234/1 9236/1 9235/1 +f 9235/1 9236/1 9237/1 +f 9235/1 9237/1 9238/1 +f 9238/1 9237/1 9239/1 +f 9239/1 9240/1 9238/1 +f 9227/1 9241/1 9239/1 +f 9239/1 9241/1 9240/1 +f 9227/1 9226/1 9242/1 +f 9227/1 9242/1 9241/1 +f 9196/1 9167/1 9194/1 +f 9167/1 9170/1 9194/1 +f 9123/1 9166/1 9164/1 +f 9123/1 9164/1 9126/1 +f 9123/1 9122/1 9166/1 +f 9166/1 9122/1 9099/1 +f 9166/1 9099/1 9243/1 +f 9120/1 9099/1 9122/1 +f 9120/1 9097/1 9099/1 +f 9243/1 9099/1 9244/1 +f 9243/1 9244/1 9245/1 +f 9245/1 9244/1 9246/1 +f 9060/1 9245/1 9053/1 +f 9246/1 9053/1 9245/1 +f 9069/1 9053/1 9246/1 +f 9053/1 9052/1 9060/1 +f 9069/1 9062/1 9053/1 +f 9060/1 9052/1 9056/1 +f 9060/1 9056/1 9058/1 +f 9067/1 9063/1 9062/1 +f 9067/1 9062/1 9069/1 +f 9065/1 9063/1 9067/1 +f 9118/1 9095/1 9097/1 +f 9118/1 9097/1 9120/1 +f 9116/1 9095/1 9118/1 +f 9116/1 9093/1 9095/1 +f 9126/1 9164/1 9162/1 +f 9126/1 9162/1 9128/1 +f 9128/1 9162/1 9159/1 +f 9128/1 9159/1 9130/1 +f 9113/1 9091/1 9093/1 +f 9113/1 9111/1 9091/1 +f 9091/1 9111/1 9089/1 +f 9109/1 9087/1 9111/1 +f 9111/1 9087/1 9089/1 +f 9113/1 9093/1 9116/1 +f 9107/1 9086/1 9109/1 +f 9105/1 9084/1 9107/1 +f 9107/1 9084/1 9086/1 +f 9109/1 9086/1 9087/1 +f 9072/1 9076/1 9084/1 +f 9076/1 9078/1 9084/1 +f 9084/1 9078/1 9080/1 +f 9084/1 9080/1 9082/1 +f 9105/1 9072/1 9084/1 +f 9103/1 9072/1 9105/1 +f 9103/1 9073/1 9072/1 +f 9101/1 9073/1 9103/1 +f 9196/1 9195/1 9218/1 +f 9196/1 9218/1 9224/1 +f 9224/1 9218/1 9219/1 +f 9224/1 9219/1 9225/1 +f 9225/1 9219/1 9221/1 +f 9225/1 9221/1 9226/1 +f 9226/1 9221/1 9206/1 +f 9226/1 9206/1 9242/1 +f 9242/1 9206/1 9202/1 +f 9242/1 9202/1 9241/1 +f 9241/1 9202/1 9201/1 +f 9241/1 9201/1 9240/1 +f 9240/1 9201/1 9204/1 +f 9240/1 9204/1 9238/1 +f 9238/1 9204/1 9208/1 +f 9238/1 9208/1 9235/1 +f 9208/1 9129/1 9235/1 +f 9235/1 9129/1 9130/1 +f 9237/1 9207/1 9239/1 +f 9236/1 9209/1 9237/1 +f 9237/1 9209/1 9207/1 +f 9239/1 9207/1 9203/1 +f 9239/1 9203/1 9227/1 +f 9227/1 9203/1 9205/1 +f 9227/1 9205/1 9222/1 +f 9222/1 9205/1 9220/1 +f 9222/1 9220/1 9223/1 +f 9223/1 9220/1 9217/1 +f 9236/1 9210/1 9209/1 +f 9234/1 9210/1 9236/1 +f 9223/1 9217/1 9228/1 +f 9228/1 9217/1 9216/1 +f 9228/1 9216/1 9229/1 +f 9229/1 9216/1 9215/1 +f 9229/1 9215/1 9230/1 +f 9230/1 9215/1 9214/1 +f 9230/1 9214/1 9231/1 +f 9231/1 9214/1 9213/1 +f 9231/1 9213/1 9232/1 +f 9232/1 9213/1 9212/1 +f 9232/1 9212/1 9233/1 +f 9233/1 9212/1 9211/1 +f 9233/1 9211/1 9234/1 +f 9234/1 9211/1 9210/1 +f 9245/1 9199/1 9243/1 +f 9245/1 9060/1 9199/1 +f 9243/1 9199/1 9197/1 +f 9199/1 9060/1 9059/1 +f 9243/1 9197/1 9166/1 +f 9166/1 9197/1 9165/1 +f 9099/1 9100/1 9244/1 +f 9244/1 9100/1 9198/1 +f 9244/1 9198/1 9246/1 +f 9246/1 9198/1 9200/1 +f 9200/1 9070/1 9246/1 +f 9246/1 9070/1 9069/1 +f 9247/1 9248/1 9249/1 +f 9247/1 9249/1 9250/1 +f 9251/1 9248/1 9247/1 +f 9251/1 9252/1 9248/1 +f 9253/1 9252/1 9251/1 +f 9253/1 9254/1 9252/1 +f 9255/1 9254/1 9253/1 +f 9255/1 9256/1 9254/1 +f 9255/1 9257/1 9256/1 +f 9256/1 9257/1 9258/1 +f 9259/1 9258/1 9257/1 +f 9259/1 9260/1 9258/1 +f 9261/1 9260/1 9259/1 +f 9261/1 9262/1 9260/1 +f 9263/1 9262/1 9261/1 +f 9263/1 9264/1 9262/1 +f 9265/1 9266/1 9264/1 +f 9265/1 9264/1 9263/1 +f 9267/1 9268/1 9269/1 +f 9267/1 9269/1 9270/1 +f 9267/1 9271/1 9268/1 +f 9268/1 9271/1 9272/1 +f 9272/1 9271/1 9273/1 +f 9273/1 9271/1 9274/1 +f 9273/1 9274/1 9275/1 +f 9275/1 9274/1 9276/1 +f 9277/1 9275/1 9278/1 +f 9278/1 9275/1 9276/1 +f 9278/1 9279/1 9277/1 +f 9280/1 9279/1 9278/1 +f 9280/1 9281/1 9279/1 +f 9282/1 9281/1 9280/1 +f 9282/1 9283/1 9281/1 +f 9284/1 9283/1 9282/1 +f 9284/1 9285/1 9283/1 +f 9286/1 9285/1 9284/1 +f 9287/1 9285/1 9288/1 +f 9288/1 9285/1 9286/1 +f 9288/1 9289/1 9287/1 +f 9290/1 9289/1 9288/1 +f 9290/1 9291/1 9289/1 +f 9292/1 9291/1 9290/1 +f 9292/1 9293/1 9291/1 +f 9294/1 9293/1 9292/1 +f 9270/1 9269/1 9295/1 +f 9270/1 9295/1 9296/1 +f 9296/1 9295/1 9297/1 +f 9296/1 9297/1 9298/1 +f 9298/1 9297/1 9299/1 +f 9298/1 9299/1 9300/1 +f 9299/1 9301/1 9300/1 +f 9300/1 9301/1 9302/1 +f 9302/1 9301/1 9303/1 +f 9302/1 9303/1 9304/1 +f 9304/1 9303/1 9305/1 +f 9304/1 9305/1 9306/1 +f 9306/1 9305/1 9307/1 +f 9306/1 9307/1 9308/1 +f 9308/1 9307/1 9309/1 +f 9308/1 9309/1 9310/1 +f 9309/1 9311/1 9310/1 +f 9310/1 9311/1 9312/1 +f 9313/1 9314/1 9311/1 +f 9311/1 9314/1 9312/1 +f 9315/1 9316/1 9313/1 +f 9313/1 9316/1 9314/1 +f 9315/1 9317/1 9316/1 +f 9316/1 9317/1 9318/1 +f 9318/1 9317/1 9319/1 +f 9319/1 9317/1 9320/1 +f 9319/1 9320/1 9321/1 +f 9321/1 9320/1 9322/1 +f 9321/1 9322/1 9323/1 +f 9323/1 9322/1 9324/1 +f 9323/1 9324/1 9325/1 +f 9325/1 9324/1 9326/1 +f 9327/1 9328/1 9329/1 +f 9327/1 9329/1 9330/1 +f 9327/1 9331/1 9328/1 +f 9328/1 9331/1 9332/1 +f 9332/1 9331/1 9333/1 +f 9332/1 9333/1 9334/1 +f 9334/1 9333/1 9335/1 +f 9334/1 9335/1 9336/1 +f 9336/1 9335/1 9337/1 +f 9336/1 9337/1 9338/1 +f 9338/1 9337/1 9339/1 +f 9338/1 9339/1 9340/1 +f 9339/1 9341/1 9340/1 +f 9340/1 9341/1 9342/1 +f 9343/1 9344/1 9341/1 +f 9341/1 9344/1 9342/1 +f 9345/1 9344/1 9343/1 +f 9346/1 9344/1 9345/1 +f 9347/1 9348/1 9345/1 +f 9345/1 9348/1 9346/1 +f 9349/1 9350/1 9347/1 +f 9347/1 9350/1 9348/1 +f 9351/1 9352/1 9349/1 +f 9349/1 9352/1 9350/1 +f 9330/1 9329/1 9353/1 +f 9330/1 9353/1 9354/1 +f 9354/1 9353/1 9355/1 +f 9354/1 9355/1 9356/1 +f 9356/1 9355/1 9357/1 +f 9356/1 9357/1 9358/1 +f 9357/1 9359/1 9358/1 +f 9358/1 9359/1 9360/1 +f 9360/1 9359/1 9361/1 +f 9361/1 9359/1 9362/1 +f 9363/1 9364/1 9365/1 +f 9363/1 9365/1 9366/1 +f 9366/1 9365/1 9367/1 +f 9366/1 9367/1 9368/1 +f 9368/1 9367/1 9369/1 +f 9368/1 9369/1 9370/1 +f 9369/1 9371/1 9370/1 +f 9370/1 9371/1 9372/1 +f 9372/1 9371/1 9373/1 +f 9373/1 9371/1 9374/1 +f 9373/1 9374/1 9375/1 +f 9375/1 9374/1 9376/1 +f 9375/1 9376/1 9377/1 +f 9375/1 9377/1 9378/1 +f 9378/1 9377/1 9379/1 +f 9378/1 9379/1 9380/1 +f 9380/1 9379/1 9381/1 +f 9380/1 9381/1 9382/1 +f 9382/1 9381/1 9383/1 +f 9382/1 9383/1 9384/1 +f 9384/1 9383/1 9385/1 +f 9384/1 9385/1 9386/1 +f 9386/1 9385/1 9387/1 +f 9386/1 9387/1 9388/1 +f 9388/1 9387/1 9389/1 +f 9389/1 9387/1 9390/1 +f 9389/1 9390/1 9391/1 +f 9391/1 9390/1 9392/1 +f 9392/1 9361/1 9391/1 +f 9391/1 9361/1 9362/1 +f 9300/1 9271/1 9267/1 +f 9267/1 9270/1 9300/1 +f 9300/1 9270/1 9296/1 +f 9300/1 9296/1 9298/1 +f 9271/1 9300/1 9312/1 +f 9312/1 9300/1 9302/1 +f 9271/1 9312/1 9314/1 +f 9271/1 9314/1 9274/1 +f 9312/1 9302/1 9310/1 +f 9302/1 9304/1 9306/1 +f 9310/1 9302/1 9306/1 +f 9310/1 9306/1 9308/1 +f 9274/1 9314/1 9316/1 +f 9274/1 9316/1 9276/1 +f 9318/1 9276/1 9316/1 +f 9278/1 9276/1 9318/1 +f 9280/1 9318/1 9319/1 +f 9278/1 9318/1 9280/1 +f 9280/1 9319/1 9282/1 +f 9282/1 9319/1 9321/1 +f 9282/1 9321/1 9284/1 +f 9284/1 9321/1 9323/1 +f 9284/1 9323/1 9286/1 +f 9286/1 9323/1 9325/1 +f 9288/1 9286/1 9351/1 +f 9351/1 9286/1 9325/1 +f 9351/1 9325/1 9393/1 +f 9288/1 9351/1 9290/1 +f 9290/1 9351/1 9349/1 +f 9351/1 9393/1 9394/1 +f 9394/1 9393/1 9395/1 +f 9394/1 9395/1 9396/1 +f 9396/1 9395/1 9250/1 +f 9250/1 9395/1 9265/1 +f 9253/1 9247/1 9250/1 +f 9253/1 9250/1 9255/1 +f 9255/1 9250/1 9257/1 +f 9250/1 9265/1 9257/1 +f 9265/1 9263/1 9261/1 +f 9257/1 9265/1 9261/1 +f 9257/1 9261/1 9259/1 +f 9251/1 9247/1 9253/1 +f 9290/1 9349/1 9292/1 +f 9292/1 9349/1 9347/1 +f 9292/1 9347/1 9294/1 +f 9294/1 9347/1 9345/1 +f 9397/1 9398/1 9399/1 +f 9294/1 9400/1 9397/1 +f 9397/1 9400/1 9401/1 +f 9397/1 9401/1 9398/1 +f 9399/1 9398/1 9402/1 +f 9402/1 9403/1 9399/1 +f 9404/1 9405/1 9402/1 +f 9402/1 9405/1 9403/1 +f 9406/1 9407/1 9404/1 +f 9404/1 9407/1 9408/1 +f 9404/1 9408/1 9405/1 +f 9406/1 9409/1 9410/1 +f 9410/1 9411/1 9406/1 +f 9406/1 9411/1 9407/1 +f 9409/1 9371/1 9410/1 +f 9410/1 9371/1 9369/1 +f 9410/1 9369/1 9364/1 +f 9409/1 9374/1 9371/1 +f 9376/1 9374/1 9409/1 +f 9412/1 9377/1 9409/1 +f 9409/1 9377/1 9376/1 +f 9413/1 9379/1 9412/1 +f 9412/1 9379/1 9377/1 +f 9414/1 9381/1 9413/1 +f 9413/1 9381/1 9379/1 +f 9415/1 9385/1 9414/1 +f 9414/1 9385/1 9383/1 +f 9414/1 9383/1 9381/1 +f 9416/1 9387/1 9415/1 +f 9415/1 9387/1 9385/1 +f 9417/1 9361/1 9416/1 +f 9416/1 9361/1 9392/1 +f 9392/1 9390/1 9416/1 +f 9416/1 9390/1 9387/1 +f 9345/1 9361/1 9417/1 +f 9345/1 9417/1 9294/1 +f 9294/1 9417/1 9400/1 +f 9343/1 9361/1 9345/1 +f 9364/1 9369/1 9365/1 +f 9369/1 9367/1 9365/1 +f 9343/1 9341/1 9361/1 +f 9361/1 9341/1 9360/1 +f 9341/1 9331/1 9360/1 +f 9339/1 9331/1 9341/1 +f 9360/1 9331/1 9327/1 +f 9360/1 9327/1 9358/1 +f 9337/1 9333/1 9331/1 +f 9337/1 9331/1 9339/1 +f 9335/1 9333/1 9337/1 +f 9327/1 9356/1 9358/1 +f 9330/1 9354/1 9327/1 +f 9327/1 9354/1 9356/1 +f 9359/1 9328/1 9342/1 +f 9357/1 9328/1 9359/1 +f 9359/1 9342/1 9362/1 +f 9342/1 9328/1 9332/1 +f 9355/1 9329/1 9328/1 +f 9355/1 9328/1 9357/1 +f 9342/1 9332/1 9340/1 +f 9362/1 9342/1 9344/1 +f 9334/1 9336/1 9332/1 +f 9332/1 9336/1 9338/1 +f 9332/1 9338/1 9340/1 +f 9353/1 9329/1 9355/1 +f 9346/1 9418/1 9419/1 +f 9344/1 9346/1 9362/1 +f 9362/1 9346/1 9419/1 +f 9418/1 9346/1 9420/1 +f 9420/1 9346/1 9293/1 +f 9362/1 9419/1 9391/1 +f 9391/1 9419/1 9389/1 +f 9419/1 9388/1 9389/1 +f 9421/1 9386/1 9419/1 +f 9419/1 9386/1 9388/1 +f 9422/1 9384/1 9421/1 +f 9421/1 9384/1 9386/1 +f 9423/1 9382/1 9422/1 +f 9422/1 9382/1 9384/1 +f 9424/1 9378/1 9423/1 +f 9423/1 9378/1 9380/1 +f 9423/1 9380/1 9382/1 +f 9425/1 9375/1 9424/1 +f 9424/1 9375/1 9378/1 +f 9425/1 9373/1 9375/1 +f 9372/1 9373/1 9425/1 +f 9370/1 9372/1 9425/1 +f 9426/1 9370/1 9425/1 +f 9426/1 9425/1 9427/1 +f 9427/1 9425/1 9428/1 +f 9363/1 9368/1 9370/1 +f 9363/1 9370/1 9426/1 +f 9366/1 9368/1 9363/1 +f 9427/1 9428/1 9429/1 +f 9429/1 9428/1 9430/1 +f 9429/1 9430/1 9431/1 +f 9432/1 9430/1 9433/1 +f 9431/1 9430/1 9432/1 +f 9433/1 9434/1 9432/1 +f 9435/1 9436/1 9433/1 +f 9433/1 9436/1 9434/1 +f 9437/1 9438/1 9435/1 +f 9435/1 9438/1 9436/1 +f 9420/1 9293/1 9437/1 +f 9437/1 9293/1 9438/1 +f 9293/1 9346/1 9348/1 +f 9293/1 9348/1 9291/1 +f 9291/1 9348/1 9350/1 +f 9291/1 9350/1 9289/1 +f 9289/1 9350/1 9352/1 +f 9289/1 9352/1 9287/1 +f 9326/1 9287/1 9352/1 +f 9439/1 9440/1 9352/1 +f 9352/1 9440/1 9326/1 +f 9285/1 9287/1 9326/1 +f 9285/1 9326/1 9324/1 +f 9285/1 9324/1 9283/1 +f 9283/1 9324/1 9322/1 +f 9283/1 9322/1 9281/1 +f 9281/1 9322/1 9320/1 +f 9281/1 9320/1 9279/1 +f 9439/1 9441/1 9440/1 +f 9442/1 9441/1 9439/1 +f 9442/1 9266/1 9441/1 +f 9249/1 9266/1 9442/1 +f 9249/1 9256/1 9266/1 +f 9260/1 9264/1 9266/1 +f 9260/1 9266/1 9258/1 +f 9258/1 9266/1 9256/1 +f 9248/1 9256/1 9249/1 +f 9248/1 9254/1 9256/1 +f 9252/1 9254/1 9248/1 +f 9262/1 9264/1 9260/1 +f 9279/1 9320/1 9317/1 +f 9315/1 9277/1 9317/1 +f 9275/1 9277/1 9315/1 +f 9275/1 9315/1 9273/1 +f 9273/1 9315/1 9313/1 +f 9279/1 9317/1 9277/1 +f 9273/1 9313/1 9272/1 +f 9272/1 9313/1 9311/1 +f 9311/1 9301/1 9272/1 +f 9272/1 9301/1 9299/1 +f 9272/1 9299/1 9268/1 +f 9309/1 9301/1 9311/1 +f 9307/1 9303/1 9301/1 +f 9307/1 9301/1 9309/1 +f 9305/1 9303/1 9307/1 +f 9268/1 9299/1 9295/1 +f 9268/1 9295/1 9269/1 +f 9299/1 9297/1 9295/1 +f 9438/1 9397/1 9399/1 +f 9438/1 9399/1 9436/1 +f 9293/1 9397/1 9438/1 +f 9294/1 9397/1 9293/1 +f 9436/1 9399/1 9403/1 +f 9436/1 9403/1 9434/1 +f 9434/1 9403/1 9405/1 +f 9434/1 9405/1 9432/1 +f 9432/1 9405/1 9408/1 +f 9432/1 9408/1 9431/1 +f 9431/1 9408/1 9407/1 +f 9431/1 9407/1 9429/1 +f 9429/1 9407/1 9411/1 +f 9429/1 9411/1 9427/1 +f 9427/1 9411/1 9410/1 +f 9427/1 9410/1 9426/1 +f 9426/1 9410/1 9364/1 +f 9426/1 9364/1 9363/1 +f 9435/1 9398/1 9437/1 +f 9433/1 9402/1 9435/1 +f 9435/1 9402/1 9398/1 +f 9437/1 9398/1 9401/1 +f 9437/1 9401/1 9420/1 +f 9420/1 9401/1 9400/1 +f 9433/1 9404/1 9402/1 +f 9430/1 9404/1 9433/1 +f 9430/1 9406/1 9404/1 +f 9428/1 9406/1 9430/1 +f 9428/1 9409/1 9406/1 +f 9425/1 9409/1 9428/1 +f 9420/1 9400/1 9418/1 +f 9418/1 9400/1 9417/1 +f 9418/1 9417/1 9419/1 +f 9419/1 9417/1 9416/1 +f 9419/1 9416/1 9421/1 +f 9421/1 9416/1 9415/1 +f 9421/1 9415/1 9422/1 +f 9422/1 9415/1 9414/1 +f 9422/1 9414/1 9423/1 +f 9423/1 9414/1 9413/1 +f 9423/1 9413/1 9424/1 +f 9424/1 9413/1 9412/1 +f 9424/1 9412/1 9425/1 +f 9425/1 9412/1 9409/1 +f 9352/1 9351/1 9439/1 +f 9439/1 9351/1 9394/1 +f 9439/1 9394/1 9442/1 +f 9442/1 9394/1 9396/1 +f 9249/1 9442/1 9250/1 +f 9250/1 9442/1 9396/1 +f 9441/1 9395/1 9440/1 +f 9266/1 9395/1 9441/1 +f 9440/1 9395/1 9393/1 +f 9265/1 9395/1 9266/1 +f 9440/1 9393/1 9326/1 +f 9326/1 9393/1 9325/1 +f 9443/1 9444/1 9445/1 +f 9443/1 9445/1 9446/1 +f 9443/1 9446/1 9447/1 +f 9445/1 9444/1 9448/1 +f 9449/1 9448/1 9444/1 +f 9449/1 9450/1 9448/1 +f 9451/1 9450/1 9449/1 +f 9451/1 9452/1 9450/1 +f 9453/1 9452/1 9451/1 +f 9453/1 9454/1 9452/1 +f 9447/1 9446/1 9455/1 +f 9447/1 9455/1 9456/1 +f 9457/1 9458/1 9459/1 +f 9459/1 9458/1 9460/1 +f 9453/1 9459/1 9461/1 +f 9444/1 9459/1 9453/1 +f 9461/1 9459/1 9460/1 +f 9443/1 9456/1 9459/1 +f 9443/1 9459/1 9444/1 +f 9462/1 9461/1 9463/1 +f 9463/1 9461/1 9460/1 +f 9463/1 9460/1 9464/1 +f 9464/1 9460/1 9465/1 +f 9447/1 9456/1 9443/1 +f 9444/1 9453/1 9449/1 +f 9449/1 9453/1 9451/1 +f 9466/1 9467/1 9462/1 +f 9462/1 9467/1 9461/1 +f 9457/1 9454/1 9458/1 +f 9445/1 9454/1 9457/1 +f 9445/1 9457/1 9446/1 +f 9446/1 9457/1 9455/1 +f 9458/1 9454/1 9468/1 +f 9448/1 9454/1 9445/1 +f 9469/1 9470/1 9458/1 +f 9469/1 9458/1 9471/1 +f 9471/1 9458/1 9468/1 +f 9472/1 9470/1 9469/1 +f 9450/1 9452/1 9448/1 +f 9448/1 9452/1 9454/1 +f 9471/1 9468/1 9473/1 +f 9473/1 9468/1 9474/1 +f 9456/1 9455/1 9457/1 +f 9456/1 9457/1 9459/1 +f 9460/1 9458/1 9470/1 +f 9460/1 9470/1 9465/1 +f 9465/1 9470/1 9472/1 +f 9465/1 9472/1 9464/1 +f 9464/1 9472/1 9469/1 +f 9464/1 9469/1 9463/1 +f 9469/1 9471/1 9463/1 +f 9463/1 9471/1 9462/1 +f 9462/1 9471/1 9473/1 +f 9462/1 9473/1 9466/1 +f 9466/1 9473/1 9474/1 +f 9466/1 9474/1 9467/1 +f 9467/1 9474/1 9468/1 +f 9467/1 9468/1 9461/1 +f 9468/1 9454/1 9461/1 +f 9461/1 9454/1 9453/1 +f 9475/1 9476/1 9477/1 +f 9478/1 9475/1 9479/1 +f 9479/1 9475/1 9477/1 +f 9477/1 9476/1 9480/1 +f 9476/1 9481/1 9480/1 +f 9480/1 9481/1 9482/1 +f 9481/1 9483/1 9482/1 +f 9482/1 9483/1 9484/1 +f 9483/1 9485/1 9484/1 +f 9484/1 9485/1 9486/1 +f 9485/1 9487/1 9486/1 +f 9486/1 9487/1 9488/1 +f 9488/1 9487/1 9489/1 +f 9489/1 9487/1 9490/1 +f 9489/1 9490/1 9491/1 +f 9491/1 9490/1 9492/1 +f 9491/1 9492/1 9493/1 +f 9493/1 9492/1 9494/1 +f 9478/1 9479/1 9495/1 +f 9495/1 9479/1 9496/1 +f 9495/1 9496/1 9497/1 +f 9497/1 9496/1 9498/1 +f 9499/1 9497/1 9500/1 +f 9500/1 9497/1 9498/1 +f 9499/1 9500/1 9501/1 +f 9501/1 9500/1 9502/1 +f 9501/1 9502/1 9503/1 +f 9503/1 9502/1 9504/1 +f 9503/1 9504/1 9505/1 +f 9505/1 9504/1 9506/1 +f 9505/1 9506/1 9507/1 +f 9507/1 9506/1 9508/1 +f 9507/1 9508/1 9509/1 +f 9508/1 9510/1 9509/1 +f 9509/1 9510/1 9511/1 +f 9509/1 9511/1 9512/1 +f 9512/1 9511/1 9513/1 +f 9512/1 9513/1 9514/1 +f 9514/1 9513/1 9515/1 +f 9514/1 9515/1 9516/1 +f 9517/1 9518/1 9515/1 +f 9515/1 9518/1 9516/1 +f 9519/1 9520/1 9517/1 +f 9517/1 9520/1 9518/1 +f 9521/1 9522/1 9519/1 +f 9519/1 9522/1 9520/1 +f 9523/1 9524/1 9525/1 +f 9523/1 9526/1 9524/1 +f 9525/1 9524/1 9527/1 +f 9524/1 9526/1 9528/1 +f 9525/1 9527/1 9529/1 +f 9529/1 9527/1 9530/1 +f 9529/1 9530/1 9531/1 +f 9531/1 9530/1 9532/1 +f 9531/1 9532/1 9521/1 +f 9521/1 9532/1 9522/1 +f 9528/1 9526/1 9533/1 +f 9533/1 9526/1 9534/1 +f 9533/1 9534/1 9535/1 +f 9535/1 9534/1 9536/1 +f 9535/1 9536/1 9537/1 +f 9537/1 9538/1 9535/1 +f 9539/1 9540/1 9537/1 +f 9537/1 9540/1 9538/1 +f 9541/1 9542/1 9539/1 +f 9539/1 9542/1 9540/1 +f 9542/1 9541/1 9543/1 +f 9543/1 9541/1 9544/1 +f 9543/1 9544/1 9545/1 +f 9545/1 9544/1 9546/1 +f 9545/1 9546/1 9547/1 +f 9547/1 9546/1 9548/1 +f 9549/1 9547/1 9550/1 +f 9550/1 9547/1 9548/1 +f 9549/1 9550/1 9551/1 +f 9551/1 9550/1 9552/1 +f 9551/1 9552/1 9553/1 +f 9553/1 9552/1 9554/1 +f 9555/1 9553/1 9556/1 +f 9556/1 9553/1 9554/1 +f 9557/1 9555/1 9558/1 +f 9558/1 9555/1 9556/1 +f 9558/1 9559/1 9557/1 +f 9560/1 9559/1 9558/1 +f 9560/1 9561/1 9559/1 +f 9562/1 9561/1 9560/1 +f 9563/1 9561/1 9564/1 +f 9564/1 9561/1 9562/1 +f 9565/1 9563/1 9566/1 +f 9566/1 9563/1 9564/1 +f 9567/1 9565/1 9568/1 +f 9568/1 9565/1 9566/1 +f 9568/1 9569/1 9567/1 +f 9570/1 9569/1 9568/1 +f 9570/1 9571/1 9569/1 +f 9572/1 9571/1 9570/1 +f 9572/1 9573/1 9571/1 +f 9574/1 9573/1 9572/1 +f 9493/1 9494/1 9574/1 +f 9574/1 9494/1 9573/1 +f 9575/1 9576/1 9577/1 +f 9577/1 9578/1 9575/1 +f 9520/1 9577/1 9576/1 +f 9520/1 9579/1 9580/1 +f 9522/1 9577/1 9520/1 +f 9520/1 9576/1 9579/1 +f 9580/1 9581/1 9520/1 +f 9520/1 9581/1 9582/1 +f 9520/1 9582/1 9518/1 +f 9580/1 9583/1 9581/1 +f 9581/1 9583/1 9584/1 +f 9581/1 9584/1 9585/1 +f 9585/1 9584/1 9586/1 +f 9585/1 9586/1 9587/1 +f 9588/1 9585/1 9587/1 +f 9588/1 9589/1 9585/1 +f 9590/1 9591/1 9589/1 +f 9589/1 9591/1 9585/1 +f 9592/1 9591/1 9590/1 +f 9593/1 9594/1 9592/1 +f 9592/1 9594/1 9591/1 +f 9595/1 9594/1 9596/1 +f 9593/1 9596/1 9594/1 +f 9597/1 9591/1 9594/1 +f 9597/1 9594/1 9598/1 +f 9598/1 9494/1 9492/1 +f 9598/1 9492/1 9597/1 +f 9597/1 9492/1 9490/1 +f 9490/1 9487/1 9599/1 +f 9597/1 9490/1 9600/1 +f 9600/1 9490/1 9599/1 +f 9599/1 9487/1 9601/1 +f 9601/1 9487/1 9485/1 +f 9600/1 9599/1 9602/1 +f 9602/1 9603/1 9600/1 +f 9600/1 9603/1 9604/1 +f 9600/1 9604/1 9605/1 +f 9605/1 9606/1 9607/1 +f 9605/1 9607/1 9600/1 +f 9607/1 9606/1 9501/1 +f 9501/1 9606/1 9608/1 +f 9501/1 9608/1 9609/1 +f 9499/1 9501/1 9609/1 +f 9609/1 9610/1 9499/1 +f 9499/1 9610/1 9611/1 +f 9499/1 9611/1 9497/1 +f 9497/1 9611/1 9612/1 +f 9497/1 9612/1 9495/1 +f 9495/1 9612/1 9613/1 +f 9478/1 9495/1 9614/1 +f 9495/1 9613/1 9614/1 +f 9614/1 9475/1 9478/1 +f 9601/1 9485/1 9614/1 +f 9614/1 9485/1 9483/1 +f 9614/1 9483/1 9481/1 +f 9481/1 9476/1 9614/1 +f 9614/1 9476/1 9475/1 +f 9503/1 9615/1 9501/1 +f 9615/1 9616/1 9501/1 +f 9501/1 9616/1 9617/1 +f 9501/1 9617/1 9607/1 +f 9503/1 9618/1 9615/1 +f 9619/1 9618/1 9503/1 +f 9619/1 9503/1 9620/1 +f 9620/1 9503/1 9505/1 +f 9620/1 9505/1 9621/1 +f 9621/1 9505/1 9507/1 +f 9621/1 9507/1 9622/1 +f 9509/1 9623/1 9507/1 +f 9622/1 9507/1 9623/1 +f 9512/1 9623/1 9509/1 +f 9512/1 9516/1 9623/1 +f 9516/1 9624/1 9623/1 +f 9514/1 9516/1 9512/1 +f 9518/1 9625/1 9516/1 +f 9516/1 9625/1 9624/1 +f 9518/1 9582/1 9625/1 +f 9582/1 9626/1 9625/1 +f 9582/1 9627/1 9626/1 +f 9628/1 9627/1 9582/1 +f 9628/1 9629/1 9630/1 +f 9628/1 9582/1 9629/1 +f 9630/1 9629/1 9631/1 +f 9629/1 9617/1 9631/1 +f 9629/1 9607/1 9617/1 +f 9629/1 9582/1 9632/1 +f 9629/1 9632/1 9633/1 +f 9633/1 9634/1 9629/1 +f 9629/1 9634/1 9635/1 +f 9629/1 9635/1 9636/1 +f 9636/1 9637/1 9629/1 +f 9585/1 9607/1 9629/1 +f 9582/1 9638/1 9632/1 +f 9639/1 9640/1 9582/1 +f 9582/1 9640/1 9638/1 +f 9582/1 9641/1 9639/1 +f 9585/1 9591/1 9607/1 +f 9600/1 9607/1 9642/1 +f 9643/1 9644/1 9607/1 +f 9644/1 9645/1 9607/1 +f 9607/1 9645/1 9646/1 +f 9607/1 9646/1 9642/1 +f 9591/1 9647/1 9607/1 +f 9607/1 9647/1 9648/1 +f 9607/1 9648/1 9649/1 +f 9649/1 9650/1 9607/1 +f 9607/1 9650/1 9651/1 +f 9607/1 9651/1 9643/1 +f 9600/1 9642/1 9652/1 +f 9652/1 9653/1 9600/1 +f 9600/1 9653/1 9654/1 +f 9600/1 9654/1 9655/1 +f 9655/1 9656/1 9600/1 +f 9600/1 9656/1 9657/1 +f 9600/1 9657/1 9658/1 +f 9658/1 9659/1 9600/1 +f 9600/1 9659/1 9660/1 +f 9600/1 9660/1 9661/1 +f 9661/1 9662/1 9600/1 +f 9600/1 9662/1 9663/1 +f 9591/1 9664/1 9647/1 +f 9665/1 9666/1 9591/1 +f 9666/1 9664/1 9591/1 +f 9665/1 9591/1 9597/1 +f 9667/1 9665/1 9597/1 +f 9597/1 9668/1 9667/1 +f 9597/1 9669/1 9668/1 +f 9670/1 9669/1 9597/1 +f 9597/1 9671/1 9670/1 +f 9597/1 9672/1 9671/1 +f 9673/1 9672/1 9597/1 +f 9597/1 9674/1 9673/1 +f 9597/1 9675/1 9674/1 +f 9676/1 9675/1 9597/1 +f 9597/1 9677/1 9676/1 +f 9678/1 9581/1 9585/1 +f 9678/1 9585/1 9679/1 +f 9585/1 9680/1 9681/1 +f 9585/1 9681/1 9679/1 +f 9682/1 9581/1 9678/1 +f 9682/1 9683/1 9581/1 +f 9683/1 9684/1 9581/1 +f 9581/1 9684/1 9685/1 +f 9577/1 9686/1 9593/1 +f 9593/1 9686/1 9687/1 +f 9688/1 9689/1 9593/1 +f 9593/1 9689/1 9690/1 +f 9593/1 9690/1 9577/1 +f 9522/1 9691/1 9577/1 +f 9577/1 9690/1 9578/1 +f 9593/1 9592/1 9688/1 +f 9577/1 9692/1 9686/1 +f 9691/1 9692/1 9577/1 +f 9693/1 9691/1 9522/1 +f 9693/1 9522/1 9532/1 +f 9694/1 9532/1 9695/1 +f 9696/1 9697/1 9694/1 +f 9694/1 9697/1 9698/1 +f 9694/1 9699/1 9700/1 +f 9694/1 9700/1 9696/1 +f 9694/1 9701/1 9532/1 +f 9694/1 9698/1 9702/1 +f 9702/1 9701/1 9694/1 +f 9693/1 9532/1 9701/1 +f 9695/1 9532/1 9530/1 +f 9695/1 9699/1 9694/1 +f 9703/1 9704/1 9530/1 +f 9703/1 9530/1 9527/1 +f 9695/1 9530/1 9705/1 +f 9705/1 9530/1 9704/1 +f 9706/1 9704/1 9703/1 +f 9703/1 9707/1 9706/1 +f 9703/1 9708/1 9707/1 +f 9709/1 9710/1 9708/1 +f 9709/1 9708/1 9703/1 +f 9711/1 9710/1 9709/1 +f 9709/1 9712/1 9711/1 +f 9713/1 9714/1 9712/1 +f 9709/1 9713/1 9712/1 +f 9713/1 9715/1 9714/1 +f 9716/1 9696/1 9715/1 +f 9716/1 9715/1 9713/1 +f 9717/1 9716/1 9595/1 +f 9717/1 9696/1 9716/1 +f 9718/1 9716/1 9713/1 +f 9696/1 9700/1 9719/1 +f 9696/1 9719/1 9720/1 +f 9721/1 9696/1 9720/1 +f 9721/1 9715/1 9696/1 +f 9722/1 9723/1 9713/1 +f 9722/1 9713/1 9709/1 +f 9718/1 9713/1 9724/1 +f 9724/1 9713/1 9725/1 +f 9726/1 9727/1 9713/1 +f 9727/1 9728/1 9713/1 +f 9713/1 9728/1 9729/1 +f 9713/1 9729/1 9725/1 +f 9723/1 9730/1 9713/1 +f 9713/1 9730/1 9731/1 +f 9713/1 9731/1 9732/1 +f 9732/1 9733/1 9713/1 +f 9713/1 9733/1 9734/1 +f 9713/1 9734/1 9726/1 +f 9723/1 9735/1 9730/1 +f 9736/1 9735/1 9723/1 +f 9723/1 9737/1 9736/1 +f 9738/1 9737/1 9739/1 +f 9723/1 9739/1 9737/1 +f 9739/1 9740/1 9738/1 +f 9739/1 9741/1 9740/1 +f 9742/1 9741/1 9739/1 +f 9739/1 9743/1 9742/1 +f 9739/1 9744/1 9743/1 +f 9745/1 9744/1 9739/1 +f 9739/1 9746/1 9745/1 +f 9739/1 9747/1 9746/1 +f 9748/1 9747/1 9739/1 +f 9739/1 9749/1 9748/1 +f 9750/1 9751/1 9739/1 +f 9739/1 9751/1 9752/1 +f 9752/1 9753/1 9739/1 +f 9739/1 9753/1 9754/1 +f 9739/1 9754/1 9755/1 +f 9750/1 9739/1 9723/1 +f 9755/1 9569/1 9739/1 +f 9739/1 9569/1 9571/1 +f 9739/1 9571/1 9724/1 +f 9756/1 9567/1 9755/1 +f 9755/1 9567/1 9569/1 +f 9757/1 9565/1 9756/1 +f 9756/1 9565/1 9567/1 +f 9561/1 9757/1 9559/1 +f 9559/1 9757/1 9758/1 +f 9757/1 9759/1 9758/1 +f 9561/1 9563/1 9757/1 +f 9757/1 9563/1 9565/1 +f 9559/1 9758/1 9557/1 +f 9557/1 9758/1 9555/1 +f 9553/1 9555/1 9758/1 +f 9758/1 9551/1 9553/1 +f 9758/1 9549/1 9551/1 +f 9547/1 9549/1 9758/1 +f 9545/1 9547/1 9758/1 +f 9760/1 9543/1 9545/1 +f 9760/1 9545/1 9761/1 +f 9761/1 9545/1 9758/1 +f 9542/1 9543/1 9760/1 +f 9540/1 9542/1 9762/1 +f 9762/1 9542/1 9760/1 +f 9762/1 9538/1 9540/1 +f 9762/1 9535/1 9538/1 +f 9533/1 9535/1 9762/1 +f 9533/1 9762/1 9528/1 +f 9528/1 9762/1 9763/1 +f 9528/1 9763/1 9524/1 +f 9764/1 9763/1 9762/1 +f 9763/1 9765/1 9524/1 +f 9524/1 9765/1 9766/1 +f 9524/1 9766/1 9527/1 +f 9766/1 9767/1 9768/1 +f 9527/1 9766/1 9768/1 +f 9527/1 9768/1 9703/1 +f 9769/1 9770/1 9703/1 +f 9770/1 9771/1 9703/1 +f 9703/1 9771/1 9772/1 +f 9703/1 9772/1 9709/1 +f 9709/1 9772/1 9773/1 +f 9773/1 9774/1 9709/1 +f 9709/1 9774/1 9775/1 +f 9709/1 9775/1 9776/1 +f 9776/1 9777/1 9709/1 +f 9768/1 9767/1 9778/1 +f 9768/1 9778/1 9722/1 +f 9779/1 9780/1 9768/1 +f 9768/1 9780/1 9781/1 +f 9722/1 9782/1 9768/1 +f 9768/1 9782/1 9783/1 +f 9768/1 9783/1 9779/1 +f 9722/1 9778/1 9784/1 +f 9722/1 9784/1 9785/1 +f 9786/1 9722/1 9785/1 +f 9787/1 9722/1 9786/1 +f 9788/1 9761/1 9787/1 +f 9787/1 9761/1 9723/1 +f 9787/1 9723/1 9722/1 +f 9789/1 9761/1 9788/1 +f 9790/1 9760/1 9789/1 +f 9789/1 9760/1 9761/1 +f 9790/1 9791/1 9760/1 +f 9760/1 9791/1 9792/1 +f 9760/1 9792/1 9762/1 +f 9762/1 9792/1 9793/1 +f 9762/1 9793/1 9764/1 +f 9761/1 9758/1 9794/1 +f 9795/1 9723/1 9761/1 +f 9795/1 9761/1 9796/1 +f 9796/1 9761/1 9794/1 +f 9758/1 9759/1 9797/1 +f 9758/1 9797/1 9798/1 +f 9794/1 9758/1 9798/1 +f 9750/1 9723/1 9795/1 +f 9799/1 9800/1 9722/1 +f 9722/1 9800/1 9782/1 +f 9722/1 9801/1 9802/1 +f 9722/1 9802/1 9799/1 +f 9803/1 9804/1 9724/1 +f 9724/1 9804/1 9805/1 +f 9724/1 9805/1 9806/1 +f 9806/1 9807/1 9724/1 +f 9724/1 9807/1 9808/1 +f 9724/1 9808/1 9809/1 +f 9809/1 9810/1 9724/1 +f 9724/1 9810/1 9811/1 +f 9724/1 9811/1 9812/1 +f 9724/1 9725/1 9803/1 +f 9812/1 9813/1 9724/1 +f 9724/1 9813/1 9814/1 +f 9724/1 9571/1 9573/1 +f 9724/1 9573/1 9718/1 +f 9815/1 9816/1 9593/1 +f 9593/1 9687/1 9815/1 +f 9696/1 9717/1 9817/1 +f 9817/1 9818/1 9696/1 +f 9696/1 9818/1 9697/1 +f 9595/1 9716/1 9594/1 +f 9816/1 9596/1 9593/1 +f 9581/1 9685/1 9582/1 +f 9582/1 9685/1 9641/1 +f 9629/1 9637/1 9680/1 +f 9629/1 9680/1 9585/1 +f 9703/1 9768/1 9781/1 +f 9703/1 9781/1 9769/1 +f 9709/1 9777/1 9801/1 +f 9709/1 9801/1 9722/1 +f 9600/1 9663/1 9597/1 +f 9597/1 9663/1 9677/1 +f 9598/1 9594/1 9716/1 +f 9598/1 9716/1 9718/1 +f 9718/1 9494/1 9598/1 +f 9718/1 9573/1 9494/1 +f 9724/1 9814/1 9739/1 +f 9739/1 9814/1 9749/1 +f 9819/1 9820/1 9821/1 +f 9821/1 9822/1 9819/1 +f 9821/1 9820/1 9823/1 +f 9823/1 9820/1 9824/1 +f 9823/1 9824/1 9825/1 +f 9825/1 9826/1 9823/1 +f 9823/1 9826/1 9827/1 +f 9823/1 9827/1 9828/1 +f 9829/1 9830/1 9823/1 +f 9823/1 9830/1 9831/1 +f 9823/1 9831/1 9821/1 +f 9829/1 9823/1 9832/1 +f 9832/1 9823/1 9833/1 +f 9834/1 9833/1 9823/1 +f 9834/1 9823/1 9835/1 +f 9821/1 9831/1 9836/1 +f 9821/1 9836/1 9837/1 +f 9821/1 9838/1 9822/1 +f 9837/1 9839/1 9821/1 +f 9821/1 9839/1 9525/1 +f 9821/1 9525/1 9840/1 +f 9525/1 9839/1 9523/1 +f 9523/1 9839/1 9841/1 +f 9840/1 9525/1 9529/1 +f 9531/1 9842/1 9529/1 +f 9529/1 9842/1 9843/1 +f 9529/1 9843/1 9844/1 +f 9840/1 9529/1 9845/1 +f 9845/1 9529/1 9844/1 +f 9521/1 9846/1 9531/1 +f 9847/1 9521/1 9848/1 +f 9848/1 9519/1 9849/1 +f 9848/1 9521/1 9519/1 +f 9849/1 9519/1 9850/1 +f 9851/1 9850/1 9519/1 +f 9851/1 9519/1 9852/1 +f 9852/1 9519/1 9517/1 +f 9847/1 9848/1 9853/1 +f 9854/1 9853/1 9855/1 +f 9854/1 9855/1 9856/1 +f 9856/1 9857/1 9854/1 +f 9854/1 9857/1 9858/1 +f 9854/1 9858/1 9859/1 +f 9854/1 9860/1 9847/1 +f 9861/1 9854/1 9862/1 +f 9862/1 9854/1 9859/1 +f 9847/1 9853/1 9854/1 +f 9863/1 9864/1 9847/1 +f 9847/1 9864/1 9865/1 +f 9847/1 9866/1 9521/1 +f 9865/1 9866/1 9847/1 +f 9866/1 9846/1 9521/1 +f 9862/1 9859/1 9867/1 +f 9867/1 9859/1 9868/1 +f 9867/1 9869/1 9862/1 +f 9862/1 9869/1 9870/1 +f 9869/1 9491/1 9870/1 +f 9870/1 9491/1 9493/1 +f 9489/1 9491/1 9869/1 +f 9871/1 9488/1 9489/1 +f 9871/1 9489/1 9872/1 +f 9872/1 9489/1 9869/1 +f 9872/1 9873/1 9871/1 +f 9874/1 9488/1 9871/1 +f 9874/1 9486/1 9488/1 +f 9875/1 9486/1 9874/1 +f 9875/1 9484/1 9486/1 +f 9482/1 9484/1 9875/1 +f 9875/1 9480/1 9482/1 +f 9875/1 9496/1 9479/1 +f 9479/1 9477/1 9875/1 +f 9875/1 9477/1 9480/1 +f 9875/1 9876/1 9496/1 +f 9496/1 9876/1 9877/1 +f 9496/1 9877/1 9498/1 +f 9498/1 9877/1 9878/1 +f 9498/1 9878/1 9500/1 +f 9500/1 9878/1 9879/1 +f 9500/1 9879/1 9502/1 +f 9502/1 9879/1 9880/1 +f 9502/1 9880/1 9881/1 +f 9502/1 9881/1 9882/1 +f 9882/1 9881/1 9883/1 +f 9882/1 9883/1 9872/1 +f 9872/1 9883/1 9884/1 +f 9872/1 9884/1 9885/1 +f 9885/1 9886/1 9872/1 +f 9872/1 9886/1 9873/1 +f 9887/1 9888/1 9872/1 +f 9888/1 9889/1 9872/1 +f 9872/1 9889/1 9890/1 +f 9872/1 9890/1 9891/1 +f 9891/1 9892/1 9872/1 +f 9872/1 9892/1 9893/1 +f 9872/1 9893/1 9894/1 +f 9872/1 9895/1 9896/1 +f 9872/1 9896/1 9887/1 +f 9894/1 9897/1 9872/1 +f 9872/1 9897/1 9898/1 +f 9872/1 9898/1 9882/1 +f 9882/1 9898/1 9899/1 +f 9882/1 9867/1 9900/1 +f 9882/1 9899/1 9867/1 +f 9900/1 9901/1 9882/1 +f 9882/1 9901/1 9902/1 +f 9882/1 9902/1 9502/1 +f 9867/1 9899/1 9903/1 +f 9903/1 9904/1 9867/1 +f 9867/1 9904/1 9905/1 +f 9867/1 9905/1 9906/1 +f 9906/1 9907/1 9867/1 +f 9867/1 9907/1 9908/1 +f 9867/1 9908/1 9909/1 +f 9910/1 9867/1 9909/1 +f 9910/1 9911/1 9867/1 +f 9867/1 9912/1 9900/1 +f 9867/1 9868/1 9912/1 +f 9911/1 9913/1 9867/1 +f 9867/1 9913/1 9869/1 +f 9900/1 9912/1 9914/1 +f 9900/1 9914/1 9915/1 +f 9916/1 9900/1 9915/1 +f 9917/1 9851/1 9916/1 +f 9851/1 9900/1 9916/1 +f 9917/1 9918/1 9851/1 +f 9919/1 9920/1 9851/1 +f 9851/1 9920/1 9900/1 +f 9851/1 9921/1 9922/1 +f 9851/1 9922/1 9919/1 +f 9918/1 9850/1 9851/1 +f 9920/1 9923/1 9900/1 +f 9900/1 9923/1 9924/1 +f 9900/1 9924/1 9925/1 +f 9925/1 9926/1 9900/1 +f 9927/1 9928/1 9869/1 +f 9928/1 9929/1 9869/1 +f 9869/1 9929/1 9930/1 +f 9869/1 9930/1 9931/1 +f 9913/1 9932/1 9869/1 +f 9869/1 9932/1 9933/1 +f 9933/1 9934/1 9869/1 +f 9869/1 9934/1 9935/1 +f 9869/1 9935/1 9927/1 +f 9931/1 9936/1 9869/1 +f 9869/1 9936/1 9937/1 +f 9869/1 9937/1 9938/1 +f 9939/1 9869/1 9938/1 +f 9940/1 9504/1 9502/1 +f 9502/1 9902/1 9941/1 +f 9502/1 9941/1 9940/1 +f 9940/1 9942/1 9504/1 +f 9504/1 9942/1 9943/1 +f 9504/1 9943/1 9506/1 +f 9506/1 9943/1 9944/1 +f 9506/1 9944/1 9508/1 +f 9508/1 9944/1 9945/1 +f 9946/1 9947/1 9508/1 +f 9508/1 9945/1 9946/1 +f 9510/1 9508/1 9511/1 +f 9511/1 9508/1 9947/1 +f 9511/1 9947/1 9513/1 +f 9513/1 9947/1 9515/1 +f 9948/1 9515/1 9947/1 +f 9949/1 9517/1 9515/1 +f 9949/1 9515/1 9948/1 +f 9949/1 9950/1 9852/1 +f 9852/1 9517/1 9949/1 +f 9852/1 9950/1 9951/1 +f 9852/1 9951/1 9901/1 +f 9901/1 9951/1 9952/1 +f 9901/1 9952/1 9953/1 +f 9954/1 9901/1 9953/1 +f 9954/1 9902/1 9901/1 +f 9901/1 9955/1 9956/1 +f 9901/1 9956/1 9957/1 +f 9957/1 9958/1 9901/1 +f 9901/1 9958/1 9959/1 +f 9901/1 9959/1 9852/1 +f 9852/1 9959/1 9960/1 +f 9852/1 9960/1 9961/1 +f 9962/1 9852/1 9963/1 +f 9963/1 9852/1 9961/1 +f 9962/1 9964/1 9852/1 +f 9845/1 9965/1 9840/1 +f 9840/1 9965/1 9966/1 +f 9840/1 9966/1 9835/1 +f 9835/1 9966/1 9967/1 +f 9835/1 9967/1 9968/1 +f 9968/1 9969/1 9835/1 +f 9835/1 9969/1 9970/1 +f 9835/1 9970/1 9834/1 +f 9834/1 9970/1 9971/1 +f 9834/1 9971/1 9972/1 +f 9972/1 9973/1 9974/1 +f 9972/1 9974/1 9834/1 +f 9975/1 9974/1 9973/1 +f 9842/1 9976/1 9973/1 +f 9973/1 9977/1 9978/1 +f 9979/1 9842/1 9973/1 +f 9974/1 9980/1 9834/1 +f 9980/1 9574/1 9981/1 +f 9980/1 9981/1 9834/1 +f 9572/1 9981/1 9574/1 +f 9570/1 9982/1 9572/1 +f 9572/1 9982/1 9981/1 +f 9568/1 9983/1 9570/1 +f 9570/1 9983/1 9982/1 +f 9566/1 9984/1 9568/1 +f 9568/1 9984/1 9983/1 +f 9985/1 9982/1 9983/1 +f 9986/1 9982/1 9985/1 +f 9986/1 9987/1 9982/1 +f 9982/1 9987/1 9988/1 +f 9982/1 9988/1 9833/1 +f 9833/1 9988/1 9989/1 +f 9833/1 9989/1 9990/1 +f 9990/1 9989/1 9991/1 +f 9991/1 9992/1 9990/1 +f 9990/1 9992/1 9993/1 +f 9990/1 9993/1 9994/1 +f 9994/1 9993/1 9995/1 +f 9994/1 9995/1 9996/1 +f 9997/1 9994/1 9996/1 +f 9998/1 9994/1 9997/1 +f 9564/1 9562/1 9998/1 +f 9998/1 9562/1 9994/1 +f 9564/1 9998/1 9566/1 +f 9566/1 9998/1 9984/1 +f 9562/1 9560/1 9994/1 +f 9994/1 9560/1 9558/1 +f 9994/1 9558/1 9556/1 +f 9556/1 9554/1 9994/1 +f 9994/1 9554/1 9552/1 +f 9548/1 9990/1 9994/1 +f 9548/1 9994/1 9550/1 +f 9994/1 9552/1 9550/1 +f 9546/1 9990/1 9548/1 +f 9544/1 9990/1 9546/1 +f 9541/1 9999/1 9544/1 +f 9544/1 9999/1 9990/1 +f 9539/1 10000/1 9541/1 +f 9541/1 10000/1 9999/1 +f 9539/1 9537/1 10000/1 +f 10000/1 9537/1 9534/1 +f 10000/1 9534/1 10001/1 +f 10001/1 10002/1 10000/1 +f 10000/1 10002/1 10003/1 +f 10000/1 10003/1 9999/1 +f 9537/1 9536/1 9534/1 +f 10001/1 9534/1 9526/1 +f 9523/1 9841/1 10001/1 +f 10001/1 9526/1 9523/1 +f 10004/1 10005/1 9999/1 +f 9999/1 10005/1 10006/1 +f 9999/1 10006/1 9990/1 +f 9999/1 10003/1 10007/1 +f 9999/1 10007/1 10004/1 +f 9990/1 10006/1 10008/1 +f 9832/1 9833/1 9990/1 +f 9990/1 10008/1 9832/1 +f 9833/1 10009/1 9982/1 +f 10010/1 10011/1 9833/1 +f 10012/1 10013/1 9833/1 +f 9833/1 10013/1 10014/1 +f 9833/1 10014/1 10009/1 +f 10011/1 10015/1 9833/1 +f 9833/1 10015/1 10016/1 +f 9833/1 10016/1 10017/1 +f 10017/1 10018/1 9833/1 +f 9833/1 10018/1 10019/1 +f 9833/1 10019/1 10012/1 +f 10010/1 9833/1 9834/1 +f 9834/1 9981/1 10020/1 +f 9834/1 10020/1 10010/1 +f 9981/1 10021/1 10020/1 +f 9981/1 10022/1 10021/1 +f 9981/1 10023/1 10022/1 +f 10024/1 10023/1 9981/1 +f 10025/1 10024/1 9981/1 +f 9981/1 10026/1 10025/1 +f 9981/1 10027/1 10026/1 +f 10028/1 10027/1 9981/1 +f 10029/1 10028/1 9981/1 +f 10029/1 9981/1 10030/1 +f 9981/1 10031/1 10030/1 +f 9982/1 10009/1 10032/1 +f 9982/1 10032/1 10033/1 +f 10033/1 10034/1 9982/1 +f 9982/1 10034/1 10035/1 +f 9982/1 10035/1 10036/1 +f 10036/1 10037/1 9982/1 +f 9982/1 10037/1 10038/1 +f 9982/1 10038/1 10039/1 +f 10039/1 10040/1 9982/1 +f 9982/1 10040/1 10041/1 +f 9982/1 10041/1 10042/1 +f 10042/1 10043/1 9982/1 +f 9982/1 10043/1 10044/1 +f 10045/1 10046/1 9842/1 +f 10046/1 10047/1 9842/1 +f 9842/1 10047/1 10048/1 +f 10045/1 9842/1 9979/1 +f 9531/1 10049/1 9842/1 +f 9842/1 10048/1 9843/1 +f 9979/1 9973/1 9972/1 +f 9973/1 9976/1 9977/1 +f 9842/1 10049/1 9976/1 +f 9846/1 10049/1 9531/1 +f 10050/1 10051/1 9835/1 +f 10050/1 9835/1 10052/1 +f 10051/1 10053/1 9835/1 +f 9835/1 10053/1 10054/1 +f 9835/1 10054/1 9840/1 +f 9840/1 10054/1 10055/1 +f 9840/1 10056/1 10057/1 +f 9840/1 10055/1 10056/1 +f 10057/1 10058/1 9840/1 +f 9854/1 9861/1 9860/1 +f 9847/1 9860/1 10059/1 +f 9847/1 10059/1 9863/1 +f 9975/1 10060/1 9862/1 +f 9862/1 10060/1 9861/1 +f 9978/1 10061/1 9973/1 +f 10062/1 9973/1 10061/1 +f 9862/1 9974/1 9975/1 +f 9975/1 9973/1 10062/1 +f 9870/1 9493/1 9980/1 +f 9862/1 9870/1 9974/1 +f 9974/1 9870/1 9980/1 +f 9493/1 9574/1 9980/1 +f 9939/1 9895/1 9872/1 +f 9872/1 9869/1 9939/1 +f 9982/1 10044/1 9981/1 +f 9981/1 10044/1 10031/1 +f 9926/1 9955/1 9901/1 +f 9900/1 9926/1 9901/1 +f 9852/1 9964/1 9921/1 +f 9852/1 9921/1 9851/1 +f 9840/1 10058/1 9838/1 +f 9840/1 9838/1 9821/1 +f 9835/1 9823/1 9828/1 +f 9835/1 9828/1 10052/1 +f 9792/1 10007/1 9793/1 +f 9791/1 10004/1 9792/1 +f 9792/1 10004/1 10007/1 +f 9793/1 10007/1 10003/1 +f 9793/1 10003/1 9764/1 +f 9764/1 10003/1 10002/1 +f 9791/1 10005/1 10004/1 +f 9790/1 10005/1 9791/1 +f 9790/1 10006/1 10005/1 +f 9789/1 10006/1 9790/1 +f 9789/1 10008/1 10006/1 +f 9788/1 10008/1 9789/1 +f 9788/1 9832/1 10008/1 +f 9787/1 9832/1 9788/1 +f 9787/1 9829/1 9832/1 +f 9786/1 9829/1 9787/1 +f 9764/1 10002/1 9763/1 +f 9763/1 10002/1 10001/1 +f 9763/1 10001/1 9765/1 +f 9765/1 10001/1 9841/1 +f 9765/1 9841/1 9766/1 +f 9766/1 9841/1 9839/1 +f 9766/1 9839/1 9767/1 +f 9767/1 9839/1 9837/1 +f 9767/1 9837/1 9778/1 +f 9778/1 9837/1 9836/1 +f 9778/1 9836/1 9784/1 +f 9784/1 9836/1 9831/1 +f 9784/1 9831/1 9785/1 +f 9785/1 9831/1 9830/1 +f 9785/1 9830/1 9786/1 +f 9786/1 9830/1 9829/1 +f 9783/1 9820/1 9779/1 +f 9783/1 9782/1 9820/1 +f 9779/1 9820/1 9819/1 +f 9820/1 9782/1 9824/1 +f 9779/1 9819/1 9780/1 +f 9780/1 9819/1 9822/1 +f 9782/1 9825/1 9824/1 +f 9800/1 9825/1 9782/1 +f 9800/1 9826/1 9825/1 +f 9799/1 9826/1 9800/1 +f 9799/1 9827/1 9826/1 +f 9802/1 9827/1 9799/1 +f 9802/1 9828/1 9827/1 +f 9801/1 9828/1 9802/1 +f 9801/1 9777/1 9828/1 +f 9828/1 9777/1 10052/1 +f 9776/1 10050/1 9777/1 +f 9777/1 10050/1 10052/1 +f 9780/1 9822/1 9781/1 +f 9781/1 9822/1 9838/1 +f 9769/1 9781/1 10058/1 +f 10058/1 9781/1 9838/1 +f 9769/1 10058/1 9770/1 +f 9770/1 10058/1 10057/1 +f 9770/1 10057/1 9771/1 +f 9771/1 10057/1 10056/1 +f 9771/1 10056/1 9772/1 +f 9772/1 10056/1 10055/1 +f 9773/1 9772/1 10054/1 +f 10054/1 9772/1 10055/1 +f 9773/1 10054/1 9774/1 +f 9774/1 10054/1 10053/1 +f 9774/1 10053/1 9775/1 +f 9775/1 10053/1 10051/1 +f 9775/1 10051/1 9776/1 +f 9776/1 10051/1 10050/1 +f 9697/1 9978/1 9698/1 +f 9698/1 9978/1 9977/1 +f 9698/1 9977/1 9702/1 +f 9702/1 9977/1 9976/1 +f 9702/1 9976/1 9701/1 +f 9701/1 9976/1 10049/1 +f 9701/1 10049/1 9693/1 +f 9693/1 10049/1 9846/1 +f 9693/1 9846/1 9691/1 +f 9691/1 9846/1 9866/1 +f 9691/1 9866/1 9692/1 +f 9692/1 9866/1 9865/1 +f 9692/1 9865/1 9686/1 +f 9686/1 9865/1 9864/1 +f 9686/1 9864/1 9687/1 +f 9687/1 9864/1 9863/1 +f 9687/1 9863/1 9815/1 +f 9815/1 9863/1 10059/1 +f 9815/1 10059/1 9816/1 +f 9816/1 10059/1 9860/1 +f 9816/1 9860/1 9596/1 +f 9596/1 9860/1 9861/1 +f 9596/1 9861/1 9595/1 +f 9595/1 9861/1 10060/1 +f 9595/1 10060/1 9717/1 +f 9717/1 10060/1 9975/1 +f 9717/1 9975/1 9817/1 +f 9817/1 9975/1 10062/1 +f 9817/1 10062/1 9818/1 +f 9818/1 10062/1 10061/1 +f 9818/1 10061/1 9697/1 +f 9697/1 10061/1 9978/1 +f 9798/1 9995/1 9794/1 +f 9797/1 9996/1 9798/1 +f 9798/1 9996/1 9995/1 +f 9794/1 9995/1 9993/1 +f 9797/1 9997/1 9996/1 +f 9759/1 9997/1 9797/1 +f 9759/1 9998/1 9997/1 +f 9757/1 9998/1 9759/1 +f 9757/1 9984/1 9998/1 +f 9756/1 9984/1 9757/1 +f 9756/1 9983/1 9984/1 +f 9755/1 9983/1 9756/1 +f 9755/1 9985/1 9983/1 +f 9754/1 9985/1 9755/1 +f 9754/1 9986/1 9985/1 +f 9753/1 9986/1 9754/1 +f 9794/1 9993/1 9796/1 +f 9796/1 9993/1 9992/1 +f 9796/1 9992/1 9795/1 +f 9795/1 9992/1 9991/1 +f 9795/1 9991/1 9750/1 +f 9750/1 9991/1 9989/1 +f 9750/1 9989/1 9751/1 +f 9751/1 9989/1 9988/1 +f 9751/1 9988/1 9752/1 +f 9752/1 9988/1 9987/1 +f 9752/1 9987/1 9753/1 +f 9753/1 9987/1 9986/1 +f 9733/1 9732/1 10019/1 +f 9734/1 9733/1 10018/1 +f 10018/1 9733/1 10019/1 +f 10019/1 9732/1 10012/1 +f 9732/1 9731/1 10012/1 +f 10012/1 9731/1 10013/1 +f 9731/1 9730/1 10013/1 +f 10013/1 9730/1 10014/1 +f 9730/1 9735/1 10014/1 +f 10014/1 9735/1 10009/1 +f 9735/1 9736/1 10009/1 +f 10009/1 9736/1 10032/1 +f 9736/1 9737/1 10032/1 +f 10032/1 9737/1 10033/1 +f 10017/1 9734/1 10018/1 +f 10016/1 9726/1 10017/1 +f 9726/1 9734/1 10017/1 +f 10015/1 9727/1 10016/1 +f 9727/1 9726/1 10016/1 +f 10011/1 9728/1 10015/1 +f 9728/1 9727/1 10015/1 +f 10010/1 9729/1 10011/1 +f 9729/1 9728/1 10011/1 +f 10020/1 9725/1 10010/1 +f 9725/1 9729/1 10010/1 +f 10021/1 9803/1 10020/1 +f 9803/1 9725/1 10020/1 +f 10022/1 9804/1 10021/1 +f 9804/1 9803/1 10021/1 +f 10023/1 9805/1 10022/1 +f 9805/1 9804/1 10022/1 +f 10024/1 9806/1 10023/1 +f 9806/1 9805/1 10023/1 +f 10025/1 9807/1 10024/1 +f 9807/1 9806/1 10024/1 +f 9808/1 9807/1 10025/1 +f 9737/1 9738/1 10033/1 +f 10033/1 9738/1 10034/1 +f 9738/1 9740/1 10034/1 +f 10034/1 9740/1 10035/1 +f 9740/1 9741/1 10035/1 +f 10035/1 9741/1 10036/1 +f 9741/1 9742/1 10036/1 +f 10036/1 9742/1 10037/1 +f 9742/1 9743/1 10037/1 +f 10037/1 9743/1 10038/1 +f 9743/1 9744/1 10038/1 +f 10038/1 9744/1 10039/1 +f 9744/1 9745/1 10039/1 +f 10039/1 9745/1 10040/1 +f 9745/1 9746/1 10040/1 +f 10040/1 9746/1 10041/1 +f 9746/1 9747/1 10041/1 +f 10041/1 9747/1 10042/1 +f 9747/1 9748/1 10042/1 +f 10042/1 9748/1 10043/1 +f 9748/1 9749/1 10043/1 +f 10043/1 9749/1 10044/1 +f 9749/1 9814/1 10044/1 +f 10044/1 9814/1 10031/1 +f 9814/1 9813/1 10031/1 +f 10031/1 9813/1 10030/1 +f 9813/1 9812/1 10030/1 +f 10030/1 9812/1 10029/1 +f 9812/1 9811/1 10029/1 +f 10029/1 9811/1 10028/1 +f 9811/1 9810/1 10028/1 +f 10028/1 9810/1 10027/1 +f 9810/1 9809/1 10027/1 +f 10027/1 9809/1 10026/1 +f 9809/1 9808/1 10026/1 +f 10026/1 9808/1 10025/1 +f 9708/1 9967/1 9707/1 +f 9710/1 9968/1 9708/1 +f 9708/1 9968/1 9967/1 +f 9707/1 9967/1 9966/1 +f 9707/1 9966/1 9706/1 +f 9706/1 9966/1 9965/1 +f 9710/1 9969/1 9968/1 +f 9711/1 9969/1 9710/1 +f 9711/1 9970/1 9969/1 +f 9712/1 9970/1 9711/1 +f 9712/1 9971/1 9970/1 +f 9714/1 9971/1 9712/1 +f 9714/1 9972/1 9971/1 +f 9715/1 9972/1 9714/1 +f 9715/1 9979/1 9972/1 +f 9721/1 9979/1 9715/1 +f 9706/1 9965/1 9704/1 +f 9704/1 9965/1 9845/1 +f 9704/1 9845/1 9705/1 +f 9705/1 9845/1 9844/1 +f 9705/1 9844/1 9695/1 +f 9695/1 9844/1 9843/1 +f 9695/1 9843/1 9699/1 +f 9699/1 9843/1 10048/1 +f 9699/1 10048/1 9700/1 +f 9700/1 10048/1 10047/1 +f 9700/1 10047/1 9719/1 +f 9719/1 10047/1 10046/1 +f 9719/1 10046/1 9720/1 +f 9720/1 10046/1 10045/1 +f 9720/1 10045/1 9721/1 +f 9721/1 10045/1 9979/1 +f 9690/1 9856/1 9578/1 +f 9689/1 9857/1 9690/1 +f 9690/1 9857/1 9856/1 +f 9578/1 9856/1 9855/1 +f 9578/1 9855/1 9575/1 +f 9575/1 9855/1 9853/1 +f 9575/1 9853/1 9576/1 +f 9576/1 9853/1 9848/1 +f 9576/1 9848/1 9579/1 +f 9579/1 9848/1 9849/1 +f 9579/1 9849/1 9580/1 +f 9580/1 9849/1 9850/1 +f 9580/1 9850/1 9583/1 +f 9583/1 9850/1 9918/1 +f 9689/1 9858/1 9857/1 +f 9688/1 9858/1 9689/1 +f 9583/1 9918/1 9584/1 +f 9584/1 9918/1 9917/1 +f 9584/1 9917/1 9586/1 +f 9586/1 9917/1 9916/1 +f 9586/1 9916/1 9587/1 +f 9587/1 9916/1 9915/1 +f 9587/1 9915/1 9588/1 +f 9588/1 9915/1 9914/1 +f 9588/1 9914/1 9589/1 +f 9589/1 9914/1 9912/1 +f 9589/1 9912/1 9590/1 +f 9590/1 9912/1 9868/1 +f 9590/1 9868/1 9592/1 +f 9592/1 9868/1 9859/1 +f 9592/1 9859/1 9688/1 +f 9688/1 9859/1 9858/1 +f 9682/1 9920/1 9683/1 +f 9682/1 9678/1 9920/1 +f 9683/1 9920/1 9919/1 +f 9920/1 9678/1 9923/1 +f 9683/1 9919/1 9684/1 +f 9684/1 9919/1 9922/1 +f 9684/1 9922/1 9685/1 +f 9685/1 9922/1 9921/1 +f 9641/1 9685/1 9964/1 +f 9964/1 9685/1 9921/1 +f 9641/1 9964/1 9639/1 +f 9639/1 9964/1 9962/1 +f 9678/1 9924/1 9923/1 +f 9679/1 9925/1 9924/1 +f 9679/1 9924/1 9678/1 +f 9681/1 9925/1 9679/1 +f 9680/1 9926/1 9681/1 +f 9680/1 9637/1 9926/1 +f 9681/1 9926/1 9925/1 +f 9926/1 9637/1 9955/1 +f 9636/1 9956/1 9637/1 +f 9637/1 9956/1 9955/1 +f 9635/1 9957/1 9636/1 +f 9636/1 9957/1 9956/1 +f 9634/1 9958/1 9635/1 +f 9635/1 9958/1 9957/1 +f 9633/1 9959/1 9634/1 +f 9634/1 9959/1 9958/1 +f 9633/1 9632/1 9959/1 +f 9959/1 9632/1 9960/1 +f 9638/1 9961/1 9632/1 +f 9632/1 9961/1 9960/1 +f 9640/1 9963/1 9638/1 +f 9638/1 9963/1 9961/1 +f 9639/1 9962/1 9640/1 +f 9640/1 9962/1 9963/1 +f 9628/1 9952/1 9627/1 +f 9630/1 9953/1 9628/1 +f 9628/1 9953/1 9952/1 +f 9627/1 9952/1 9951/1 +f 9627/1 9951/1 9626/1 +f 9626/1 9951/1 9950/1 +f 9626/1 9950/1 9625/1 +f 9625/1 9950/1 9949/1 +f 9625/1 9949/1 9624/1 +f 9624/1 9949/1 9948/1 +f 9624/1 9948/1 9623/1 +f 9623/1 9948/1 9947/1 +f 9623/1 9947/1 9622/1 +f 9622/1 9947/1 9946/1 +f 9630/1 9954/1 9953/1 +f 9631/1 9954/1 9630/1 +f 9622/1 9946/1 9621/1 +f 9621/1 9946/1 9945/1 +f 9621/1 9945/1 9620/1 +f 9620/1 9945/1 9944/1 +f 9620/1 9944/1 9619/1 +f 9619/1 9944/1 9943/1 +f 9619/1 9943/1 9618/1 +f 9618/1 9943/1 9942/1 +f 9618/1 9942/1 9615/1 +f 9615/1 9942/1 9940/1 +f 9615/1 9940/1 9616/1 +f 9616/1 9940/1 9941/1 +f 9616/1 9941/1 9617/1 +f 9617/1 9941/1 9902/1 +f 9617/1 9902/1 9631/1 +f 9631/1 9902/1 9954/1 +f 9650/1 9649/1 9908/1 +f 9651/1 9650/1 9907/1 +f 9907/1 9650/1 9908/1 +f 9908/1 9649/1 9909/1 +f 9649/1 9648/1 9909/1 +f 9909/1 9648/1 9910/1 +f 9648/1 9647/1 9910/1 +f 9910/1 9647/1 9911/1 +f 9647/1 9664/1 9911/1 +f 9911/1 9664/1 9913/1 +f 9664/1 9666/1 9913/1 +f 9913/1 9666/1 9932/1 +f 9666/1 9665/1 9932/1 +f 9932/1 9665/1 9933/1 +f 9665/1 9667/1 9933/1 +f 9933/1 9667/1 9934/1 +f 9667/1 9668/1 9934/1 +f 9934/1 9668/1 9935/1 +f 9668/1 9669/1 9935/1 +f 9935/1 9669/1 9927/1 +f 9669/1 9670/1 9927/1 +f 9927/1 9670/1 9928/1 +f 9670/1 9671/1 9928/1 +f 9928/1 9671/1 9929/1 +f 9906/1 9651/1 9907/1 +f 9905/1 9643/1 9906/1 +f 9643/1 9651/1 9906/1 +f 9904/1 9644/1 9905/1 +f 9644/1 9643/1 9905/1 +f 9903/1 9645/1 9904/1 +f 9645/1 9644/1 9904/1 +f 9899/1 9646/1 9903/1 +f 9646/1 9645/1 9903/1 +f 9898/1 9642/1 9899/1 +f 9642/1 9646/1 9899/1 +f 9652/1 9642/1 9898/1 +f 9671/1 9672/1 9929/1 +f 9929/1 9672/1 9930/1 +f 9672/1 9673/1 9930/1 +f 9930/1 9673/1 9931/1 +f 9673/1 9674/1 9931/1 +f 9931/1 9674/1 9936/1 +f 9674/1 9675/1 9936/1 +f 9936/1 9675/1 9937/1 +f 9675/1 9676/1 9937/1 +f 9937/1 9676/1 9938/1 +f 9676/1 9677/1 9938/1 +f 9938/1 9677/1 9939/1 +f 9677/1 9663/1 9939/1 +f 9939/1 9663/1 9895/1 +f 9663/1 9662/1 9895/1 +f 9895/1 9662/1 9896/1 +f 9662/1 9661/1 9896/1 +f 9896/1 9661/1 9887/1 +f 9661/1 9660/1 9887/1 +f 9887/1 9660/1 9888/1 +f 9660/1 9659/1 9888/1 +f 9888/1 9659/1 9889/1 +f 9659/1 9658/1 9889/1 +f 9889/1 9658/1 9890/1 +f 9658/1 9657/1 9890/1 +f 9890/1 9657/1 9891/1 +f 9657/1 9656/1 9891/1 +f 9891/1 9656/1 9892/1 +f 9656/1 9655/1 9892/1 +f 9892/1 9655/1 9893/1 +f 9655/1 9654/1 9893/1 +f 9893/1 9654/1 9894/1 +f 9654/1 9653/1 9894/1 +f 9894/1 9653/1 9897/1 +f 9653/1 9652/1 9897/1 +f 9897/1 9652/1 9898/1 +f 9604/1 9885/1 9605/1 +f 9603/1 9886/1 9604/1 +f 9604/1 9886/1 9885/1 +f 9605/1 9885/1 9884/1 +f 9605/1 9884/1 9606/1 +f 9606/1 9884/1 9883/1 +f 9606/1 9883/1 9608/1 +f 9608/1 9883/1 9881/1 +f 9608/1 9881/1 9609/1 +f 9609/1 9881/1 9880/1 +f 9609/1 9880/1 9610/1 +f 9610/1 9880/1 9879/1 +f 9610/1 9879/1 9611/1 +f 9611/1 9879/1 9878/1 +f 9611/1 9878/1 9612/1 +f 9612/1 9878/1 9877/1 +f 9612/1 9877/1 9613/1 +f 9613/1 9877/1 9876/1 +f 9613/1 9876/1 9614/1 +f 9614/1 9876/1 9875/1 +f 9614/1 9875/1 9601/1 +f 9601/1 9875/1 9874/1 +f 9601/1 9874/1 9599/1 +f 9599/1 9874/1 9871/1 +f 9599/1 9871/1 9602/1 +f 9602/1 9871/1 9873/1 +f 9602/1 9873/1 9603/1 +f 9603/1 9873/1 9886/1 +f 10063/1 10064/1 10065/1 +f 10063/1 10065/1 10066/1 +f 10063/1 10067/1 10068/1 +f 10068/1 10064/1 10063/1 +f 10066/1 10065/1 10069/1 +f 10066/1 10069/1 10070/1 +f 10069/1 10071/1 10070/1 +f 10070/1 10071/1 10072/1 +f 10070/1 10072/1 10073/1 +f 10072/1 10074/1 10075/1 +f 10073/1 10072/1 10075/1 +f 10068/1 10067/1 10076/1 +f 10068/1 10076/1 10077/1 +f 10077/1 10076/1 10078/1 +f 10077/1 10078/1 10079/1 +f 10080/1 10081/1 10082/1 +f 10080/1 10082/1 10083/1 +f 10081/1 10080/1 10084/1 +f 10085/1 10081/1 10086/1 +f 10086/1 10081/1 10084/1 +f 10086/1 10084/1 10087/1 +f 10087/1 10084/1 10088/1 +f 10083/1 10082/1 10089/1 +f 10083/1 10089/1 10090/1 +f 10091/1 10092/1 10089/1 +f 10089/1 10092/1 10093/1 +f 10089/1 10093/1 10090/1 +f 10091/1 10094/1 10095/1 +f 10095/1 10096/1 10091/1 +f 10091/1 10096/1 10092/1 +f 10084/1 10073/1 10075/1 +f 10084/1 10075/1 10088/1 +f 10073/1 10084/1 10070/1 +f 10070/1 10084/1 10080/1 +f 10088/1 10075/1 10074/1 +f 10088/1 10074/1 10087/1 +f 10087/1 10074/1 10072/1 +f 10087/1 10072/1 10086/1 +f 10083/1 10066/1 10080/1 +f 10080/1 10066/1 10070/1 +f 10090/1 10063/1 10083/1 +f 10083/1 10063/1 10066/1 +f 10093/1 10067/1 10090/1 +f 10090/1 10067/1 10063/1 +f 10092/1 10076/1 10093/1 +f 10093/1 10076/1 10067/1 +f 10096/1 10078/1 10092/1 +f 10092/1 10078/1 10076/1 +f 10095/1 10079/1 10096/1 +f 10096/1 10079/1 10078/1 +f 10079/1 10095/1 10097/1 +f 10097/1 10095/1 10098/1 +f 10097/1 10098/1 10099/1 +f 10099/1 10098/1 10100/1 +f 10099/1 10100/1 10101/1 +f 10101/1 10100/1 10102/1 +f 10101/1 10102/1 10103/1 +f 10103/1 10102/1 10104/1 +f 10086/1 10072/1 10085/1 +f 10085/1 10072/1 10071/1 +f 10085/1 10071/1 10081/1 +f 10081/1 10071/1 10069/1 +f 10081/1 10069/1 10082/1 +f 10082/1 10069/1 10065/1 +f 10082/1 10065/1 10089/1 +f 10089/1 10065/1 10064/1 +f 10089/1 10064/1 10091/1 +f 10091/1 10064/1 10068/1 +f 10091/1 10068/1 10094/1 +f 10094/1 10068/1 10077/1 +f 10094/1 10077/1 10105/1 +f 10105/1 10077/1 10106/1 +f 10105/1 10106/1 10107/1 +f 10107/1 10106/1 10108/1 +f 10107/1 10108/1 10109/1 +f 10109/1 10108/1 10110/1 +f 10109/1 10110/1 10111/1 +f 10111/1 10110/1 10112/1 +f 10111/1 10112/1 10113/1 +f 10113/1 10112/1 10114/1 +f 10113/1 10114/1 10115/1 +f 10115/1 10114/1 10116/1 +f 10117/1 10118/1 10119/1 +f 10120/1 10121/1 10117/1 +f 10117/1 10121/1 10118/1 +f 10119/1 10118/1 10122/1 +f 10119/1 10122/1 10123/1 +f 10123/1 10122/1 10124/1 +f 10123/1 10124/1 10125/1 +f 10125/1 10124/1 10126/1 +f 10125/1 10126/1 10127/1 +f 10127/1 10126/1 10128/1 +f 10127/1 10128/1 10129/1 +f 10129/1 10128/1 10130/1 +f 10120/1 10131/1 10121/1 +f 10132/1 10133/1 10131/1 +f 10132/1 10131/1 10120/1 +f 10134/1 10133/1 10132/1 +f 10134/1 10135/1 10133/1 +f 10136/1 10135/1 10134/1 +f 10136/1 10137/1 10135/1 +f 10138/1 10137/1 10136/1 +f 10138/1 10139/1 10137/1 +f 10137/1 10139/1 10140/1 +f 10140/1 10139/1 10141/1 +f 10140/1 10141/1 10142/1 +f 10142/1 10141/1 10143/1 +f 10142/1 10143/1 10144/1 +f 10144/1 10143/1 10145/1 +f 10144/1 10145/1 10146/1 +f 10137/1 10114/1 10135/1 +f 10114/1 10137/1 10140/1 +f 10135/1 10114/1 10112/1 +f 10116/1 10114/1 10146/1 +f 10146/1 10114/1 10140/1 +f 10135/1 10112/1 10110/1 +f 10110/1 10133/1 10135/1 +f 10118/1 10121/1 10110/1 +f 10121/1 10131/1 10110/1 +f 10110/1 10131/1 10133/1 +f 10110/1 10108/1 10118/1 +f 10118/1 10108/1 10106/1 +f 10118/1 10106/1 10122/1 +f 10146/1 10140/1 10144/1 +f 10144/1 10140/1 10142/1 +f 10134/1 10132/1 10107/1 +f 10107/1 10109/1 10134/1 +f 10134/1 10109/1 10111/1 +f 10134/1 10111/1 10136/1 +f 10107/1 10132/1 10120/1 +f 10107/1 10120/1 10105/1 +f 10105/1 10120/1 10117/1 +f 10105/1 10117/1 10119/1 +f 10136/1 10111/1 10113/1 +f 10136/1 10113/1 10138/1 +f 10139/1 10138/1 10113/1 +f 10115/1 10139/1 10113/1 +f 10145/1 10141/1 10139/1 +f 10145/1 10139/1 10115/1 +f 10143/1 10141/1 10145/1 +f 10146/1 10145/1 10116/1 +f 10116/1 10145/1 10115/1 +f 10095/1 10094/1 10098/1 +f 10098/1 10094/1 10105/1 +f 10098/1 10105/1 10100/1 +f 10100/1 10105/1 10119/1 +f 10100/1 10125/1 10102/1 +f 10100/1 10123/1 10125/1 +f 10102/1 10125/1 10127/1 +f 10102/1 10127/1 10104/1 +f 10104/1 10127/1 10129/1 +f 10119/1 10123/1 10100/1 +f 10147/1 10148/1 10149/1 +f 10149/1 10150/1 10147/1 +f 10147/1 10150/1 10151/1 +f 10147/1 10151/1 10152/1 +f 10152/1 10151/1 10153/1 +f 10154/1 10104/1 10155/1 +f 10104/1 10129/1 10155/1 +f 10152/1 10153/1 10154/1 +f 10154/1 10153/1 10156/1 +f 10154/1 10156/1 10104/1 +f 10157/1 10158/1 10159/1 +f 10159/1 10158/1 10160/1 +f 10159/1 10160/1 10161/1 +f 10161/1 10160/1 10154/1 +f 10161/1 10154/1 10162/1 +f 10162/1 10154/1 10155/1 +f 10103/1 10104/1 10163/1 +f 10163/1 10104/1 10156/1 +f 10163/1 10156/1 10164/1 +f 10164/1 10156/1 10153/1 +f 10164/1 10153/1 10165/1 +f 10165/1 10153/1 10151/1 +f 10150/1 10166/1 10165/1 +f 10150/1 10165/1 10151/1 +f 10149/1 10166/1 10150/1 +f 10149/1 10167/1 10166/1 +f 10148/1 10167/1 10149/1 +f 10148/1 10168/1 10167/1 +f 10169/1 10103/1 10163/1 +f 10169/1 10163/1 10170/1 +f 10169/1 10171/1 10103/1 +f 10103/1 10171/1 10130/1 +f 10103/1 10130/1 10128/1 +f 10128/1 10101/1 10103/1 +f 10126/1 10099/1 10128/1 +f 10128/1 10099/1 10101/1 +f 10124/1 10099/1 10126/1 +f 10122/1 10099/1 10124/1 +f 10122/1 10097/1 10099/1 +f 10106/1 10097/1 10122/1 +f 10077/1 10079/1 10106/1 +f 10106/1 10079/1 10097/1 +f 10167/1 10168/1 10166/1 +f 10166/1 10168/1 10172/1 +f 10166/1 10172/1 10165/1 +f 10165/1 10172/1 10170/1 +f 10165/1 10170/1 10164/1 +f 10164/1 10170/1 10163/1 +f 10173/1 10174/1 10175/1 +f 10175/1 10176/1 10173/1 +f 10173/1 10176/1 10177/1 +f 10173/1 10177/1 10169/1 +f 10169/1 10177/1 10178/1 +f 10169/1 10178/1 10171/1 +f 10179/1 10180/1 10181/1 +f 10179/1 10181/1 10182/1 +f 10181/1 10180/1 10183/1 +f 10184/1 10183/1 10180/1 +f 10182/1 10181/1 10185/1 +f 10182/1 10185/1 10186/1 +f 10186/1 10185/1 10187/1 +f 10186/1 10187/1 10152/1 +f 10152/1 10187/1 10170/1 +f 10170/1 10147/1 10152/1 +f 10172/1 10147/1 10170/1 +f 10147/1 10172/1 10168/1 +f 10147/1 10168/1 10148/1 +f 10184/1 10188/1 10183/1 +f 10189/1 10190/1 10188/1 +f 10189/1 10188/1 10184/1 +f 10191/1 10190/1 10189/1 +f 10191/1 10192/1 10190/1 +f 10193/1 10194/1 10191/1 +f 10191/1 10194/1 10192/1 +f 10194/1 10193/1 10195/1 +f 10195/1 10193/1 10196/1 +f 10197/1 10198/1 10195/1 +f 10197/1 10195/1 10196/1 +f 10199/1 10198/1 10197/1 +f 10199/1 10200/1 10198/1 +f 10201/1 10202/1 10203/1 +f 10203/1 10204/1 10201/1 +f 10203/1 10202/1 10205/1 +f 10206/1 10205/1 10202/1 +f 10207/1 10204/1 10203/1 +f 10207/1 10208/1 10204/1 +f 10209/1 10208/1 10207/1 +f 10209/1 10169/1 10208/1 +f 10154/1 10169/1 10209/1 +f 10154/1 10173/1 10169/1 +f 10160/1 10173/1 10154/1 +f 10173/1 10160/1 10158/1 +f 10173/1 10158/1 10174/1 +f 10206/1 10210/1 10205/1 +f 10211/1 10212/1 10210/1 +f 10211/1 10210/1 10206/1 +f 10213/1 10212/1 10211/1 +f 10213/1 10214/1 10212/1 +f 10214/1 10213/1 10215/1 +f 10215/1 10213/1 10216/1 +f 10215/1 10216/1 10217/1 +f 10217/1 10216/1 10218/1 +f 10219/1 10220/1 10217/1 +f 10219/1 10217/1 10218/1 +f 10221/1 10220/1 10219/1 +f 10221/1 10222/1 10220/1 +f 10217/1 10220/1 10222/1 +f 10179/1 10193/1 10191/1 +f 10191/1 10180/1 10179/1 +f 10189/1 10184/1 10191/1 +f 10191/1 10184/1 10180/1 +f 10199/1 10197/1 10196/1 +f 10210/1 10212/1 10205/1 +f 10205/1 10212/1 10214/1 +f 10205/1 10214/1 10203/1 +f 10203/1 10214/1 10215/1 +f 10179/1 10203/1 10193/1 +f 10193/1 10215/1 10196/1 +f 10196/1 10217/1 10199/1 +f 10193/1 10203/1 10215/1 +f 10196/1 10215/1 10217/1 +f 10199/1 10217/1 10222/1 +f 10222/1 10221/1 10199/1 +f 10199/1 10221/1 10200/1 +f 10195/1 10198/1 10200/1 +f 10188/1 10190/1 10183/1 +f 10183/1 10190/1 10192/1 +f 10183/1 10192/1 10181/1 +f 10181/1 10192/1 10194/1 +f 10181/1 10194/1 10201/1 +f 10218/1 10194/1 10195/1 +f 10221/1 10195/1 10200/1 +f 10221/1 10219/1 10218/1 +f 10213/1 10211/1 10206/1 +f 10206/1 10202/1 10213/1 +f 10213/1 10202/1 10201/1 +f 10213/1 10201/1 10216/1 +f 10216/1 10201/1 10194/1 +f 10216/1 10194/1 10218/1 +f 10218/1 10195/1 10221/1 +f 10129/1 10130/1 10155/1 +f 10155/1 10130/1 10171/1 +f 10155/1 10171/1 10162/1 +f 10162/1 10171/1 10178/1 +f 10162/1 10178/1 10161/1 +f 10161/1 10178/1 10177/1 +f 10176/1 10159/1 10161/1 +f 10176/1 10161/1 10177/1 +f 10175/1 10159/1 10176/1 +f 10175/1 10157/1 10159/1 +f 10174/1 10157/1 10175/1 +f 10174/1 10158/1 10157/1 +f 10181/1 10201/1 10204/1 +f 10185/1 10204/1 10208/1 +f 10187/1 10208/1 10169/1 +f 10185/1 10208/1 10187/1 +f 10187/1 10169/1 10170/1 +f 10181/1 10204/1 10185/1 +f 10152/1 10154/1 10186/1 +f 10186/1 10154/1 10209/1 +f 10186/1 10209/1 10182/1 +f 10182/1 10209/1 10207/1 +f 10179/1 10207/1 10203/1 +f 10182/1 10207/1 10179/1 \ No newline at end of file diff --git a/resources/meshes/eryone_er20_plateform.stl b/resources/meshes/eryone_er20_plateform.stl new file mode 100644 index 0000000000..a181d0f37e Binary files /dev/null and b/resources/meshes/eryone_er20_plateform.stl differ diff --git a/resources/meshes/eryone_thinker_platform.obj b/resources/meshes/eryone_thinker_platform.obj new file mode 100644 index 0000000000..874c0e61d7 --- /dev/null +++ b/resources/meshes/eryone_thinker_platform.obj @@ -0,0 +1,20623 @@ +# This file uses centimeters as units for non-parametric coordinates. + +v 195.000015 222.500015 -0.000008 +v 195.000000 197.500000 0.000000 +v 195.000000 222.500000 55.000000 +v 195.000000 197.500000 55.000000 +v 195.085190 196.852951 0.000000 +v 195.085190 196.852951 55.000000 +v 195.334946 196.250000 55.000000 +v 195.334946 196.250000 0.000000 +v 195.732239 195.732239 55.000000 +v 195.732239 195.732239 0.000000 +v 196.250000 195.334946 55.000000 +v 196.250000 195.334946 0.000000 +v 196.852951 195.085190 55.000000 +v 196.852951 195.085190 0.000000 +v 197.500015 195.000015 55.000000 +v 197.500015 195.000015 -0.000008 +v 202.500015 195.000015 -0.000008 +v 202.500015 195.000015 55.000000 +v 203.147049 195.085190 0.000000 +v 203.147049 195.085190 55.000000 +v 203.750000 195.334946 55.000000 +v 203.750000 195.334946 0.000000 +v 204.267761 195.732239 55.000000 +v 204.267761 195.732239 0.000000 +v 204.665070 196.250000 55.000000 +v 204.665070 196.250000 0.000000 +v 204.914810 196.852951 55.000000 +v 204.914825 196.852951 0.000000 +v 205.000015 197.500000 55.000000 +v 205.000015 197.500000 -0.000008 +v 205.000015 232.500015 -0.000008 +v 205.000015 232.500015 55.000000 +v 204.914825 233.147049 0.000000 +v 204.914825 233.147064 55.000000 +v 204.665070 233.750000 55.000000 +v 204.665070 233.750000 0.000000 +v 204.267761 234.267776 55.000000 +v 204.267761 234.267792 0.000000 +v 203.750000 234.665070 55.000000 +v 203.750000 234.665070 0.000000 +v 203.147049 234.914825 55.000000 +v 203.147049 234.914825 0.000000 +v 202.500000 235.000000 55.000000 +v 202.500000 235.000000 0.000000 +v 167.500000 235.000000 0.000000 +v 167.500000 235.000000 55.000000 +v 166.852951 234.914825 0.000000 +v 166.852951 234.914810 55.000000 +v 166.250000 234.665070 55.000000 +v 166.250000 234.665070 0.000000 +v 165.732239 234.267776 55.000000 +v 165.732239 234.267792 0.000000 +v 165.334946 233.750000 55.000000 +v 165.334961 233.750000 0.000000 +v 165.085190 233.147049 55.000000 +v 165.085205 233.147064 0.000000 +v 165.000000 232.500000 55.000000 +v 165.000000 232.500000 0.000000 +v 165.000000 227.500000 0.000000 +v 165.000000 227.500000 55.000000 +v 165.085190 226.852951 0.000000 +v 165.085190 226.852951 55.000000 +v 165.334946 226.250000 55.000000 +v 165.334961 226.250000 0.000000 +v 165.732239 225.732224 55.000000 +v 165.732239 225.732224 0.000000 +v 166.250000 225.334946 55.000000 +v 166.250000 225.334946 0.000000 +v 166.852951 225.085190 55.000000 +v 166.852966 225.085190 0.000000 +v 167.500000 225.000000 55.000000 +v 167.500000 225.000015 -0.000008 +v 192.500000 225.000000 0.000000 +v 192.500015 225.000015 55.000000 +v 193.147049 224.914825 0.000000 +v 193.147049 224.914810 55.000000 +v 193.750000 224.665070 55.000000 +v 193.750000 224.665070 0.000000 +v 194.267792 224.267792 55.000000 +v 194.267792 224.267792 0.000000 +v 194.665070 223.750000 55.000000 +v 194.665070 223.750000 0.000000 +v 194.914810 223.147049 55.000000 +v 194.914810 223.147049 0.000000 +vt 0.417335 0.017759 +vt 0.417335 0.018013 +vt 0.417335 0.017759 +vt 0.417335 0.018013 +vt 0.417334 0.018019 +vt 0.417334 0.018019 +vt 0.417331 0.018025 +vt 0.417331 0.018025 +vt 0.417326 0.018031 +vt 0.417326 0.018031 +vt 0.417320 0.018035 +vt 0.417320 0.018035 +vt 0.417312 0.018037 +vt 0.417312 0.018037 +vt 0.417304 0.018038 +vt 0.417304 0.018038 +vt 0.417320 0.018035 +vt 0.417326 0.018031 +vt 0.417331 0.018025 +vt 0.417240 0.018038 +vt 0.417240 0.018038 +vt 0.417232 0.018037 +vt 0.417232 0.018037 +vt 0.417224 0.018035 +vt 0.417224 0.018035 +vt 0.417218 0.018031 +vt 0.417218 0.018031 +vt 0.417213 0.018025 +vt 0.417213 0.018025 +vt 0.417209 0.018019 +vt 0.417209 0.018019 +vt 0.417208 0.018013 +vt 0.417208 0.018013 +vt 0.417213 0.018025 +vt 0.417218 0.018031 +vt 0.417224 0.018035 +vt 0.417208 0.017657 +vt 0.417208 0.017657 +vt 0.417209 0.017650 +vt 0.417209 0.017650 +vt 0.417213 0.017644 +vt 0.417213 0.017644 +vt 0.417218 0.017639 +vt 0.417218 0.017639 +vt 0.417224 0.017635 +vt 0.417224 0.017635 +vt 0.417232 0.017632 +vt 0.417232 0.017632 +vt 0.417240 0.017632 +vt 0.417240 0.017632 +vt 0.417224 0.017635 +vt 0.417218 0.017639 +vt 0.417213 0.017644 +vt 0.417685 0.017632 +vt 0.417685 0.017632 +vt 0.417693 0.017632 +vt 0.417693 0.017632 +vt 0.417701 0.017635 +vt 0.417701 0.017635 +vt 0.417707 0.017639 +vt 0.417707 0.017639 +vt 0.417712 0.017644 +vt 0.417712 0.017644 +vt 0.417715 0.017650 +vt 0.417715 0.017650 +vt 0.417716 0.017657 +vt 0.417716 0.017657 +vt 0.417712 0.017644 +vt 0.417707 0.017639 +vt 0.417701 0.017635 +vt 0.417716 0.017708 +vt 0.417716 0.017708 +vt 0.417715 0.017714 +vt 0.417715 0.017714 +vt 0.417712 0.017721 +vt 0.417712 0.017721 +vt 0.417707 0.017726 +vt 0.417707 0.017726 +vt 0.417701 0.017730 +vt 0.417701 0.017730 +vt 0.417693 0.017732 +vt 0.417693 0.017732 +vt 0.417685 0.017733 +vt 0.417685 0.017733 +vt 0.417701 0.017730 +vt 0.417707 0.017726 +vt 0.417712 0.017721 +vt 0.417367 0.017733 +vt 0.417367 0.017733 +vt 0.417359 0.017734 +vt 0.417359 0.017734 +vt 0.417351 0.017737 +vt 0.417351 0.017737 +vt 0.417345 0.017741 +vt 0.417345 0.017741 +vt 0.417340 0.017746 +vt 0.417340 0.017746 +vt 0.417336 0.017752 +vt 0.417336 0.017752 +vt 0.417340 0.017746 +vt 0.417345 0.017741 +vt 0.417351 0.017737 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.991451 -0.130482 0.000000 +vn -0.991444 -0.130535 0.000000 +vn -0.923879 -0.382685 0.000000 +vn -0.923879 -0.382684 0.000000 +vn -0.793347 -0.608770 0.000000 +vn -0.793347 -0.608770 0.000000 +vn -0.608766 -0.793350 0.000000 +vn -0.608766 -0.793350 0.000000 +vn -0.382673 -0.923884 0.000000 +vn -0.382712 -0.923868 0.000000 +vn -0.130502 -0.991448 0.000000 +vn -0.130516 -0.991446 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.130502 -0.991448 0.000000 +vn 0.130509 -0.991447 0.000000 +vn 0.382712 -0.923868 0.000000 +vn 0.382673 -0.923884 0.000000 +vn 0.608766 -0.793350 0.000000 +vn 0.608766 -0.793350 0.000000 +vn 0.793320 -0.608804 0.000000 +vn 0.793347 -0.608770 0.000000 +vn 0.923879 -0.382685 0.000000 +vn 0.923879 -0.382684 0.000000 +vn 0.991444 -0.130535 0.000001 +vn 0.991451 -0.130482 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.991436 0.130595 0.000000 +vn 0.991444 0.130535 0.000000 +vn 0.923876 0.382693 -0.000001 +vn 0.923879 0.382684 0.000000 +vn 0.793356 0.608759 0.000000 +vn 0.793338 0.608782 0.000002 +vn 0.608766 0.793350 0.000000 +vn 0.608752 0.793361 0.000000 +vn 0.382673 0.923884 0.000000 +vn 0.382712 0.923868 0.000000 +vn 0.130502 0.991448 0.000000 +vn 0.130509 0.991447 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.130516 0.991446 0.000000 +vn -0.130525 0.991445 0.000003 +vn -0.382692 0.923876 0.000000 +vn -0.382673 0.923884 0.000000 +vn -0.608766 0.793350 0.000000 +vn -0.608752 0.793361 0.000000 +vn -0.793356 0.608759 0.000002 +vn -0.793390 0.608713 -0.000001 +vn -0.923879 0.382685 -0.000001 +vn -0.923860 0.382731 0.000000 +vn -0.991444 0.130535 0.000000 +vn -0.991444 0.130532 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.991437 -0.130589 0.000001 +vn -0.991444 -0.130535 0.000000 +vn -0.923879 -0.382685 0.000000 +vn -0.923860 -0.382731 -0.000001 +vn -0.793382 -0.608724 0.000000 +vn -0.793355 -0.608759 0.000000 +vn -0.608752 -0.793361 0.000000 +vn -0.608752 -0.793361 0.000000 +vn -0.382673 -0.923884 0.000000 +vn -0.382712 -0.923868 0.000000 +vn -0.130525 -0.991445 0.000000 +vn -0.130527 -0.991445 0.000000 +vn -0.000001 -1.000000 0.000000 +vn 0.000001 -1.000000 0.000000 +vn -0.130502 -0.991448 0.000000 +vn -0.130555 -0.991441 -0.000003 +vn -0.382692 -0.923876 0.000000 +vn -0.382673 -0.923884 0.000000 +vn -0.608725 -0.793381 0.000000 +vn -0.608725 -0.793381 0.000000 +vn -0.793390 -0.608713 0.000000 +vn -0.793364 -0.608748 0.000000 +vn -0.923879 -0.382685 0.000000 +vn -0.923898 -0.382638 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000003 0.000000 1.000000 +vn -0.000014 0.000000 1.000000 +vn 0.000004 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.000014 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000001 -1.000000 +vn 0.000000 0.000001 -1.000000 +vn 0.000000 -0.000010 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000004 -1.000000 +vn 0.000000 0.000004 -1.000000 +vn 0.000000 0.000001 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000005 -1.000000 +vn 0.000000 0.000006 -1.000000 +vn 0.000000 0.000009 -1.000000 +vn 0.000000 0.000017 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000033 0.000010 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.000017 -1.000000 +vn 0.000000 -0.000017 -1.000000 +vn 0.000000 -0.000009 -1.000000 +vn 0.000000 -0.000006 -1.000000 +vn 0.000000 -0.000005 -1.000000 +vn 0.000043 -0.000014 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000002 0.000002 -1.000000 +vn 0.000000 -0.000010 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +s 1 +f 1/1/1 2/2/2 3/3/3 +f 3/3/3 2/2/2 4/4/4 +f 2/2/2 5/5/5 4/4/4 +f 4/4/4 5/5/5 6/6/6 +f 6/6/6 5/5/5 7/7/7 +f 7/7/7 5/5/5 8/8/8 +f 7/7/7 8/8/8 9/9/9 +f 9/9/9 8/8/8 10/10/10 +f 9/9/9 10/10/10 11/11/11 +f 11/11/11 10/10/10 12/12/12 +f 11/11/11 12/12/12 13/13/13 +f 13/13/13 12/12/12 14/14/14 +f 13/13/13 14/14/14 15/15/15 +f 15/15/15 14/14/14 16/16/16 +f 16/16/16 17/20/17 15/15/15 +f 15/15/15 17/20/17 18/21/18 +f 17/20/17 19/22/19 18/21/18 +f 18/21/18 19/22/19 20/23/20 +f 20/23/20 19/22/19 21/24/21 +f 21/24/21 19/22/19 22/25/22 +f 21/24/21 22/25/22 23/26/23 +f 23/26/23 22/25/22 24/27/24 +f 23/26/23 24/27/24 25/28/25 +f 25/28/25 24/27/24 26/29/26 +f 25/28/25 26/29/26 27/30/27 +f 27/30/27 26/29/26 28/31/28 +f 27/30/27 28/31/28 29/32/29 +f 29/32/29 28/31/28 30/33/30 +f 30/33/30 31/37/31 29/32/29 +f 29/32/29 31/37/31 32/38/32 +f 31/37/31 33/39/33 32/38/32 +f 32/38/32 33/39/33 34/40/34 +f 34/40/34 33/39/33 35/41/35 +f 35/41/35 33/39/33 36/42/36 +f 35/41/35 36/42/36 37/43/37 +f 37/43/37 36/42/36 38/44/38 +f 37/43/37 38/44/38 39/45/39 +f 39/45/39 38/44/38 40/46/40 +f 39/45/39 40/46/40 41/47/41 +f 41/47/41 40/46/40 42/48/42 +f 41/47/41 42/48/42 43/49/43 +f 43/49/43 42/48/42 44/50/44 +f 44/50/44 45/54/45 43/49/43 +f 43/49/43 45/54/45 46/55/46 +f 45/54/45 47/56/47 46/55/46 +f 46/55/46 47/56/47 48/57/48 +f 48/57/48 47/56/47 49/58/49 +f 49/58/49 47/56/47 50/59/50 +f 49/58/49 50/59/50 51/60/51 +f 51/60/51 50/59/50 52/61/52 +f 51/60/51 52/61/52 53/62/53 +f 53/62/53 52/61/52 54/63/54 +f 53/62/53 54/63/54 55/64/55 +f 55/64/55 54/63/54 56/65/56 +f 55/64/55 56/65/56 57/66/57 +f 57/66/57 56/65/56 58/67/58 +f 58/67/58 59/71/59 57/66/57 +f 57/66/57 59/71/59 60/72/60 +f 59/71/59 61/73/61 60/72/60 +f 60/72/60 61/73/61 62/74/62 +f 62/74/62 61/73/61 63/75/63 +f 63/75/63 61/73/61 64/76/64 +f 63/75/63 64/76/64 65/77/65 +f 65/77/65 64/76/64 66/78/66 +f 65/77/65 66/78/66 67/79/67 +f 67/79/67 66/78/66 68/80/68 +f 67/79/67 68/80/68 69/81/69 +f 69/81/69 68/80/68 70/82/70 +f 69/81/69 70/82/70 71/83/71 +f 71/83/71 70/82/70 72/84/72 +f 72/84/72 73/88/73 71/83/71 +f 71/83/71 73/88/73 74/89/74 +f 73/88/73 75/90/75 74/89/74 +f 74/89/74 75/90/75 76/91/76 +f 76/91/76 75/90/75 77/92/77 +f 77/92/77 75/90/75 78/93/78 +f 77/92/77 78/93/78 79/94/79 +f 79/94/79 78/93/78 80/95/80 +f 79/94/79 80/95/80 81/96/81 +f 81/96/81 80/95/80 82/97/82 +f 81/96/81 82/97/82 83/98/83 +f 83/98/83 82/97/82 84/99/84 +f 83/98/83 84/99/84 3/3/3 +f 3/3/3 84/99/84 1/1/1 +s 2 +f 34/40/85 35/41/86 32/38/87 +f 32/38/87 35/41/86 37/43/88 +f 32/38/87 37/43/88 39/45/89 +f 39/45/89 41/47/90 32/38/87 +f 32/38/87 41/47/90 43/49/91 +f 32/38/87 43/49/91 79/94/92 +f 79/94/92 43/49/91 77/92/93 +f 77/92/93 43/49/91 76/91/94 +f 76/91/94 43/49/91 74/89/95 +f 74/89/95 43/49/91 46/55/96 +f 74/89/95 46/55/96 71/83/97 +f 71/83/97 46/55/96 60/72/98 +f 71/83/97 60/72/98 69/81/99 +f 69/81/99 60/72/98 67/79/100 +f 67/79/100 60/72/98 65/77/101 +f 65/77/101 60/72/98 63/75/102 +f 63/75/102 60/72/98 62/74/103 +f 60/72/98 46/55/96 57/66/104 +f 57/66/104 46/55/96 48/57/105 +f 57/66/104 48/57/105 49/58/106 +f 49/58/106 51/60/107 57/66/104 +f 57/66/104 51/60/107 53/62/108 +f 57/66/104 53/62/108 55/64/109 +f 79/94/92 81/96/110 32/38/87 +f 32/38/87 81/96/110 83/98/111 +f 32/38/87 83/98/111 3/3/112 +f 32/38/87 3/3/112 29/32/113 +f 29/32/113 3/3/112 4/4/114 +f 29/32/113 4/4/114 18/21/115 +f 18/21/115 4/4/114 15/15/116 +f 15/15/116 4/4/114 13/13/117 +f 13/13/117 4/4/114 11/11/118 +f 11/11/118 4/4/114 9/9/119 +f 9/9/119 4/4/114 7/7/120 +f 7/7/120 4/4/114 6/6/121 +f 18/21/115 20/23/122 29/32/113 +f 29/32/113 20/23/122 21/24/123 +f 29/32/113 21/24/123 23/26/124 +f 23/26/124 25/28/125 29/32/113 +f 29/32/113 25/28/125 27/30/126 +s 3 +f 44/50/127 73/88/128 45/54/129 +f 45/54/129 73/88/128 72/84/130 +f 45/54/129 72/84/130 59/71/131 +f 59/71/131 72/84/130 70/82/132 +f 59/71/131 70/82/132 68/85/133 +f 42/48/134 31/37/135 44/50/127 +f 44/50/127 31/37/135 80/101/136 +f 44/50/127 80/101/136 78/102/137 +f 42/48/134 40/51/138 31/37/135 +f 31/37/135 40/51/138 38/52/139 +f 31/37/135 38/52/139 36/53/140 +f 36/53/140 33/39/141 31/37/135 +f 30/33/142 1/1/143 31/37/135 +f 31/37/135 1/1/143 84/99/144 +f 31/37/135 84/99/144 82/100/145 +f 28/31/146 26/34/147 30/33/142 +f 30/33/142 26/34/147 24/35/148 +f 30/33/142 24/35/148 22/36/149 +f 22/36/149 19/22/150 30/33/142 +f 30/33/142 19/22/150 17/20/151 +f 30/33/142 17/20/151 16/16/152 +f 30/33/142 16/16/152 2/2/153 +f 2/2/153 16/16/152 14/14/154 +f 2/2/153 14/14/154 12/17/155 +f 12/17/155 10/18/156 2/2/153 +f 2/2/153 10/18/156 8/19/157 +f 2/2/153 8/19/157 5/5/158 +f 2/2/153 1/1/143 30/33/142 +f 82/100/145 80/101/136 31/37/135 +f 78/102/137 75/90/159 44/50/127 +f 44/50/127 75/90/159 73/88/128 +f 68/85/133 66/86/160 59/71/131 +f 59/71/131 66/86/160 64/87/161 +f 59/71/131 64/87/161 61/73/162 +f 59/71/131 58/67/163 45/54/129 +f 45/54/129 58/67/163 47/56/164 +f 47/56/164 58/67/163 50/70/165 +f 50/70/165 58/67/163 52/69/166 +f 52/69/166 58/67/163 54/68/167 +f 54/68/167 58/67/163 56/65/168 +v -204.914825 196.852951 0.000000 +v -205.000000 197.500000 0.000000 +v -205.000000 197.500000 55.000000 +v -204.914810 196.852951 55.000000 +v -204.665070 196.250000 55.000000 +v -204.665070 196.250000 0.000000 +v -204.267761 195.732239 55.000000 +v -204.267761 195.732239 0.000000 +v -203.750000 195.334946 55.000000 +v -203.750000 195.334946 0.000000 +v -203.147049 195.085190 55.000000 +v -203.147064 195.085190 0.000000 +v -202.500000 195.000000 55.000000 +v -202.500000 195.000000 0.000000 +v -197.500000 195.000000 0.000000 +v -197.500000 195.000000 55.000000 +v -196.852951 195.085190 0.000000 +v -196.852951 195.085190 55.000000 +v -196.250000 195.334946 55.000000 +v -196.250000 195.334946 0.000000 +v -195.732239 195.732239 55.000000 +v -195.732239 195.732239 0.000000 +v -195.334946 196.250000 55.000000 +v -195.334946 196.250000 0.000000 +v -195.085190 196.852951 55.000000 +v -195.085190 196.852951 0.000000 +v -195.000000 197.500000 55.000000 +v -195.000000 197.500000 0.000000 +v -195.000000 222.500000 0.000000 +v -195.000015 222.500015 55.000000 +v -194.914810 223.147049 0.000000 +v -194.914810 223.147049 55.000000 +v -194.665070 223.750000 55.000000 +v -194.665070 223.750000 0.000000 +v -194.267761 224.267792 55.000000 +v -194.267761 224.267792 0.000000 +v -193.750000 224.665070 55.000000 +v -193.750000 224.665070 0.000000 +v -193.147049 224.914825 55.000000 +v -193.147049 224.914825 0.000000 +v -192.500000 225.000000 55.000000 +v -192.500015 225.000015 -0.000008 +v -167.500000 225.000015 -0.000008 +v -167.500000 225.000000 55.000000 +v -166.852951 225.085190 0.000000 +v -166.852951 225.085190 55.000000 +v -166.250000 225.334946 55.000000 +v -166.250000 225.334946 0.000000 +v -165.732239 225.732224 55.000000 +v -165.732239 225.732224 0.000000 +v -165.334946 226.250000 55.000000 +v -165.334946 226.250000 0.000000 +v -165.085190 226.852951 55.000000 +v -165.085205 226.852951 0.000000 +v -165.000000 227.500015 55.000000 +v -165.000000 227.500000 0.000000 +v -165.000000 232.500000 0.000000 +v -165.000000 232.500015 55.000000 +v -165.085190 233.147049 0.000000 +v -165.085190 233.147049 55.000000 +v -165.334946 233.750000 55.000000 +v -165.334946 233.750000 0.000000 +v -165.732239 234.267776 55.000000 +v -165.732239 234.267792 0.000000 +v -166.250000 234.665070 55.000000 +v -166.250000 234.665070 0.000000 +v -166.852951 234.914810 55.000000 +v -166.852966 234.914825 0.000000 +v -167.500000 235.000015 55.000000 +v -167.500000 235.000000 0.000000 +v -200.000015 235.000015 -0.000008 +v -200.000000 235.000015 55.000000 +v -201.294098 234.829636 0.000000 +v -202.500000 234.330124 0.000000 +v -203.535553 233.535553 0.000000 +v -204.330124 232.500000 0.000000 +v -204.829636 231.294098 0.000000 +v -205.000000 230.000000 0.000000 +v -205.000000 230.000000 55.000000 +v -204.829636 231.294098 55.000000 +v -204.330124 232.500000 55.000000 +v -203.535538 233.535553 55.000000 +v -202.500000 234.330124 55.000000 +v -201.294113 234.829636 55.000000 +vt 0.422416 0.018019 +vt 0.422417 0.018013 +vt 0.422417 0.018013 +vt 0.422415 0.018019 +vt 0.422412 0.018025 +vt 0.422412 0.018025 +vt 0.422407 0.018031 +vt 0.422407 0.018031 +vt 0.422401 0.018035 +vt 0.422401 0.018035 +vt 0.422393 0.018037 +vt 0.422393 0.018037 +vt 0.422385 0.018038 +vt 0.422385 0.018038 +vt 0.422401 0.018035 +vt 0.422407 0.018031 +vt 0.422412 0.018025 +vt 0.422321 0.018038 +vt 0.422321 0.018038 +vt 0.422313 0.018037 +vt 0.422313 0.018037 +vt 0.422305 0.018035 +vt 0.422305 0.018035 +vt 0.422299 0.018031 +vt 0.422299 0.018031 +vt 0.422294 0.018025 +vt 0.422294 0.018025 +vt 0.422291 0.018019 +vt 0.422291 0.018019 +vt 0.422290 0.018013 +vt 0.422290 0.018013 +vt 0.422294 0.018025 +vt 0.422299 0.018031 +vt 0.422305 0.018035 +vt 0.422290 0.017759 +vt 0.422290 0.017759 +vt 0.422289 0.017752 +vt 0.422289 0.017752 +vt 0.422285 0.017746 +vt 0.422285 0.017746 +vt 0.422280 0.017741 +vt 0.422280 0.017741 +vt 0.422274 0.017737 +vt 0.422274 0.017737 +vt 0.422266 0.017734 +vt 0.422266 0.017734 +vt 0.422258 0.017733 +vt 0.422258 0.017733 +vt 0.422274 0.017737 +vt 0.422280 0.017741 +vt 0.422285 0.017746 +vt 0.421940 0.017733 +vt 0.421940 0.017733 +vt 0.421932 0.017732 +vt 0.421932 0.017732 +vt 0.421924 0.017730 +vt 0.421924 0.017730 +vt 0.421918 0.017726 +vt 0.421918 0.017726 +vt 0.421913 0.017721 +vt 0.421913 0.017721 +vt 0.421910 0.017714 +vt 0.421910 0.017714 +vt 0.421908 0.017708 +vt 0.421908 0.017708 +vt 0.421913 0.017721 +vt 0.421918 0.017726 +vt 0.421924 0.017730 +vt 0.421908 0.017657 +vt 0.421908 0.017657 +vt 0.421910 0.017650 +vt 0.421910 0.017650 +vt 0.421913 0.017644 +vt 0.421913 0.017644 +vt 0.421918 0.017639 +vt 0.421918 0.017639 +vt 0.421924 0.017635 +vt 0.421924 0.017635 +vt 0.421932 0.017632 +vt 0.421932 0.017632 +vt 0.421940 0.017632 +vt 0.421940 0.017632 +vt 0.421924 0.017635 +vt 0.421918 0.017639 +vt 0.421913 0.017644 +vt 0.422353 0.017632 +vt 0.422353 0.017632 +vt 0.422370 0.017633 +vt 0.422385 0.017638 +vt 0.422398 0.017647 +vt 0.422408 0.017657 +vt 0.422415 0.017669 +vt 0.422417 0.017682 +vt 0.422417 0.017682 +vt 0.422415 0.017669 +vt 0.422408 0.017657 +vt 0.422398 0.017647 +vt 0.422385 0.017638 +vt 0.422370 0.017633 +vn -0.991451 -0.130482 0.000000 +vn -0.991451 -0.130482 0.000000 +vn -0.991444 -0.130535 0.000000 +vn -0.991451 -0.130482 0.000001 +vn -0.923879 -0.382685 0.000000 +vn -0.923879 -0.382684 0.000000 +vn -0.793347 -0.608770 0.000000 +vn -0.793321 -0.608804 0.000000 +vn -0.608766 -0.793350 0.000000 +vn -0.608766 -0.793350 0.000000 +vn -0.382673 -0.923884 0.000000 +vn -0.382712 -0.923868 0.000000 +vn -0.130525 -0.991445 0.000000 +vn -0.130532 -0.991444 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.130525 -0.991445 0.000000 +vn 0.130525 -0.991445 0.000000 +vn 0.382712 -0.923868 0.000000 +vn 0.382673 -0.923884 0.000000 +vn 0.608766 -0.793350 0.000000 +vn 0.608766 -0.793350 0.000000 +vn 0.793347 -0.608770 0.000000 +vn 0.793347 -0.608770 0.000000 +vn 0.923879 -0.382685 0.000000 +vn 0.923879 -0.382684 0.000000 +vn 0.991444 -0.130535 0.000000 +vn 0.991444 -0.130535 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.991450 -0.130485 0.000001 +vn 0.991443 -0.130538 0.000000 +vn 0.923898 -0.382638 0.000000 +vn 0.923879 -0.382684 0.000000 +vn 0.793364 -0.608748 0.000000 +vn 0.793338 -0.608782 0.000000 +vn 0.608752 -0.793361 0.000000 +vn 0.608752 -0.793361 0.000000 +vn 0.382673 -0.923884 0.000000 +vn 0.382712 -0.923868 0.000000 +vn 0.130502 -0.991448 0.000000 +vn 0.130520 -0.991446 -0.000001 +vn 0.000000 -1.000000 -0.000001 +vn 0.000000 -1.000000 0.000000 +vn 0.130516 -0.991446 0.000000 +vn 0.130525 -0.991445 0.000000 +vn 0.382712 -0.923868 0.000000 +vn 0.382673 -0.923884 0.000000 +vn 0.608752 -0.793361 0.000000 +vn 0.608752 -0.793361 0.000000 +vn 0.793356 -0.608759 0.000000 +vn 0.793355 -0.608759 0.000000 +vn 0.923879 -0.382685 0.000000 +vn 0.923879 -0.382684 0.000000 +vn 0.991444 -0.130532 0.000000 +vn 0.991444 -0.130534 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.991436 0.130592 0.000001 +vn 0.991443 0.130538 0.000000 +vn 0.923879 0.382685 0.000000 +vn 0.923879 0.382684 0.000000 +vn 0.793356 0.608759 0.000000 +vn 0.793364 0.608748 0.000002 +vn 0.608766 0.793350 0.000000 +vn 0.608752 0.793361 0.000000 +vn 0.382653 0.923892 0.000000 +vn 0.382712 0.923868 0.000000 +vn 0.130548 0.991442 0.000003 +vn 0.130527 0.991445 -0.000001 +vn 0.000000 1.000000 -0.000001 +vn 0.000000 1.000000 0.000000 +vn -0.130532 0.991444 0.000001 +vn -0.991444 0.130535 0.000000 +vn -0.991447 0.130509 0.000000 +vn -0.923879 0.382684 0.000000 +vn -0.991444 0.130535 0.000000 +vn -0.793369 0.608742 -0.000001 +vn -0.923879 0.382685 0.000000 +vn -0.608746 0.793365 0.000000 +vn -0.793369 0.608742 0.000000 +vn -0.382692 0.923876 0.000000 +vn -0.608759 0.793355 0.000000 +vn -0.382692 0.923876 -0.000001 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.000009 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.000004 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.000002 -1.000000 +vn 0.000000 -0.000005 -1.000000 +vn 0.000000 -0.000012 -1.000000 +vn 0.000000 -0.000042 -1.000000 +vn 0.000000 0.000001 -1.000000 +vn 0.000000 0.000001 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn -0.000034 -0.000008 -1.000000 +vn 0.000000 -0.000001 -1.000000 +vn 0.000000 -0.000001 -1.000000 +vn 0.000000 -0.000001 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000001 -1.000000 +vn 0.000000 0.000002 -1.000000 +vn 0.000000 0.000006 -1.000000 +vn 0.000000 0.000021 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +s 1 +f 86/104/169 85/103/170 87/105/171 +f 87/105/171 85/103/170 88/106/172 +f 88/106/172 85/103/170 89/107/173 +f 89/107/173 85/103/170 90/108/174 +f 89/107/173 90/108/174 91/109/175 +f 91/109/175 90/108/174 92/110/176 +f 91/109/175 92/110/176 93/111/177 +f 93/111/177 92/110/176 94/112/178 +f 93/111/177 94/112/178 95/113/179 +f 95/113/179 94/112/178 96/114/180 +f 95/113/179 96/114/180 97/115/181 +f 97/115/181 96/114/180 98/116/182 +f 98/116/182 99/120/183 97/115/181 +f 97/115/181 99/120/183 100/121/184 +f 99/120/183 101/122/185 100/121/184 +f 100/121/184 101/122/185 102/123/186 +f 102/123/186 101/122/185 103/124/187 +f 103/124/187 101/122/185 104/125/188 +f 103/124/187 104/125/188 105/126/189 +f 105/126/189 104/125/188 106/127/190 +f 105/126/189 106/127/190 107/128/191 +f 107/128/191 106/127/190 108/129/192 +f 107/128/191 108/129/192 109/130/193 +f 109/130/193 108/129/192 110/131/194 +f 109/130/193 110/131/194 111/132/195 +f 111/132/195 110/131/194 112/133/196 +f 112/133/196 113/137/197 111/132/195 +f 111/132/195 113/137/197 114/138/198 +f 113/137/197 115/139/199 114/138/198 +f 114/138/198 115/139/199 116/140/200 +f 116/140/200 115/139/199 117/141/201 +f 117/141/201 115/139/199 118/142/202 +f 117/141/201 118/142/202 119/143/203 +f 119/143/203 118/142/202 120/144/204 +f 119/143/203 120/144/204 121/145/205 +f 121/145/205 120/144/204 122/146/206 +f 121/145/205 122/146/206 123/147/207 +f 123/147/207 122/146/206 124/148/208 +f 123/147/207 124/148/208 125/149/209 +f 125/149/209 124/148/208 126/150/210 +f 126/150/210 127/154/211 125/149/209 +f 125/149/209 127/154/211 128/155/212 +f 127/154/211 129/156/213 128/155/212 +f 128/155/212 129/156/213 130/157/214 +f 130/157/214 129/156/213 131/158/215 +f 131/158/215 129/156/213 132/159/216 +f 131/158/215 132/159/216 133/160/217 +f 133/160/217 132/159/216 134/161/218 +f 133/160/217 134/161/218 135/162/219 +f 135/162/219 134/161/218 136/163/220 +f 135/162/219 136/163/220 137/164/221 +f 137/164/221 136/163/220 138/165/222 +f 137/164/221 138/165/222 139/166/223 +f 139/166/223 138/165/222 140/167/224 +f 140/167/224 141/171/225 139/166/223 +f 139/166/223 141/171/225 142/172/226 +f 141/171/225 143/173/227 142/172/226 +f 142/172/226 143/173/227 144/174/228 +f 144/174/228 143/173/227 145/175/229 +f 145/175/229 143/173/227 146/176/230 +f 145/175/229 146/176/230 147/177/231 +f 147/177/231 146/176/230 148/178/232 +f 147/177/231 148/178/232 149/179/233 +f 149/179/233 148/178/232 150/180/234 +f 149/179/233 150/180/234 151/181/235 +f 151/181/235 150/180/234 152/182/236 +f 151/181/235 152/182/236 153/183/237 +f 153/183/237 152/182/236 154/184/238 +f 154/184/238 155/188/239 153/183/237 +f 153/183/237 155/188/239 156/189/240 +f 156/189/240 155/188/239 157/190/241 +f 162/195/242 163/196/243 161/194/244 +f 161/194/244 163/196/243 164/197/245 +f 161/194/244 164/197/245 160/193/246 +f 160/193/246 164/197/245 165/198/247 +f 160/193/246 165/198/247 159/192/248 +f 159/192/248 165/198/247 166/199/249 +f 159/192/248 166/199/249 158/191/250 +f 158/191/250 166/199/249 167/200/251 +f 158/191/250 167/200/251 157/190/241 +f 157/190/241 167/200/251 168/201/252 +f 157/190/241 168/201/252 156/189/240 +f 162/195/242 86/104/169 163/196/243 +f 163/196/243 86/104/169 87/105/171 +s 3 +f 128/155/253 153/183/254 125/149/255 +f 125/149/255 153/183/254 156/189/256 +f 125/149/255 156/189/256 123/147/257 +f 123/147/257 156/189/256 121/145/258 +f 121/145/258 156/189/256 119/143/259 +f 119/143/259 156/189/256 163/196/260 +f 119/143/259 163/196/260 117/141/261 +f 117/141/261 163/196/260 116/140/262 +f 116/140/262 163/196/260 114/138/263 +f 114/138/263 163/196/260 87/105/264 +f 114/138/263 87/105/264 111/132/265 +f 111/132/265 87/105/264 100/121/266 +f 111/132/265 100/121/266 109/130/267 +f 109/130/267 100/121/266 107/128/268 +f 107/128/268 100/121/266 105/126/269 +f 105/126/269 100/121/266 103/124/270 +f 103/124/270 100/121/266 102/123/271 +f 130/157/272 131/158/273 128/155/253 +f 128/155/253 131/158/273 133/160/274 +f 128/155/253 133/160/274 135/162/275 +f 135/162/275 137/164/276 128/155/253 +f 128/155/253 137/164/276 139/166/277 +f 128/155/253 139/166/277 142/172/278 +f 128/155/253 142/172/278 153/183/254 +f 153/183/254 142/172/278 144/174/279 +f 153/183/254 144/174/279 145/175/280 +f 145/175/280 147/177/281 153/183/254 +f 153/183/254 147/177/281 149/179/282 +f 153/183/254 149/179/282 151/181/283 +f 168/201/284 167/200/285 156/189/256 +f 156/189/256 167/200/285 166/199/286 +f 156/189/256 166/199/286 165/198/287 +f 165/198/287 164/197/288 156/189/256 +f 156/189/256 164/197/288 163/196/260 +f 100/121/266 87/105/264 97/115/289 +f 97/115/289 87/105/264 88/106/290 +f 97/115/289 88/106/290 89/107/291 +f 89/107/291 91/109/292 97/115/289 +f 97/115/289 91/109/292 93/111/293 +f 97/115/289 93/111/293 95/113/294 +s 6 +f 141/171/295 140/167/296 127/154/297 +f 127/154/297 140/167/296 138/165/298 +f 127/154/297 138/165/298 136/168/299 +f 136/168/299 134/169/300 127/154/297 +f 127/154/297 134/169/300 132/170/301 +f 127/154/297 132/170/301 129/156/302 +f 141/171/295 127/154/297 154/184/303 +f 154/184/303 127/154/297 126/150/304 +f 154/184/303 126/150/304 155/188/305 +f 155/188/305 126/150/304 124/148/306 +f 155/188/305 124/148/306 122/151/307 +f 122/151/307 120/152/308 155/188/305 +f 155/188/305 120/152/308 162/195/309 +f 155/188/305 162/195/309 161/194/310 +f 120/152/308 118/153/311 162/195/309 +f 162/195/309 118/153/311 115/139/312 +f 162/195/309 115/139/312 113/137/313 +f 162/195/309 113/137/313 86/104/314 +f 86/104/314 113/137/313 112/133/315 +f 86/104/314 112/133/315 98/116/316 +f 98/116/316 112/133/315 99/120/317 +f 99/120/317 112/133/315 110/131/318 +f 99/120/317 110/131/318 108/134/319 +f 108/134/319 106/135/320 99/120/317 +f 99/120/317 106/135/320 104/136/321 +f 99/120/317 104/136/321 101/122/322 +f 96/114/323 94/117/324 98/116/316 +f 98/116/316 94/117/324 92/118/325 +f 98/116/316 92/118/325 90/119/326 +f 90/119/326 85/103/327 98/116/316 +f 98/116/316 85/103/327 86/104/314 +f 161/194/310 160/193/328 155/188/305 +f 155/188/305 160/193/328 159/192/329 +f 155/188/305 159/192/329 158/191/330 +f 158/191/330 157/190/331 155/188/305 +f 152/182/332 150/185/333 154/184/303 +f 154/184/303 150/185/333 148/186/334 +f 154/184/303 148/186/334 146/187/335 +f 146/187/335 143/173/336 154/184/303 +f 154/184/303 143/173/336 141/171/295 +v -202.500000 220.000000 58.995674 +v -202.500000 221.000000 58.992207 +v -202.500000 219.999695 66.000000 +v -202.500000 220.999695 66.000000 +v -202.500000 224.792953 61.207085 +v -202.500015 224.792664 63.792881 +v -202.500000 221.000000 57.414215 +v -202.500000 220.999695 67.585785 +v -202.500000 224.000000 55.000000 +v -202.500000 231.000000 55.000000 +v -202.500000 224.000000 56.000000 +v -202.500000 231.000000 56.000000 +v -202.500000 228.792953 59.792915 +v -202.500000 232.585785 56.000000 +v -202.500015 226.207062 59.792881 +v -202.500000 222.414215 56.000000 +v -202.500000 230.999695 70.000000 +v -202.500000 223.999695 70.000000 +v -202.500000 230.999695 69.000000 +v -202.500000 223.999695 69.000000 +v -202.500000 226.207047 65.207047 +v -202.500000 222.414520 69.000000 +v -202.500015 228.792664 65.207069 +v -202.500000 232.586090 69.000000 +v -205.000015 220.000015 55.000000 +v -205.000000 219.999695 70.000000 +v -205.000000 235.000000 55.000000 +v -205.000000 234.999695 70.000000 +v -202.500000 235.000000 58.992207 +v -202.500015 235.000015 65.999992 +v -202.500000 234.000000 58.992207 +v -202.500000 233.999695 66.000000 +v -202.500000 230.207047 63.792919 +v -202.500000 233.999695 67.585785 +v -202.500015 230.207062 61.207123 +v -202.500000 234.000000 57.414215 +v 202.500000 224.000000 70.000000 +v 202.500000 231.000000 70.000000 +v 202.500000 224.000000 69.000000 +v 202.500000 231.000000 69.000000 +v 202.500000 226.207077 65.207092 +v 202.500000 228.792923 65.207092 +v 202.500000 232.585785 69.000000 +v 202.500000 222.414215 69.000000 +v 202.500000 220.000000 58.995674 +v 202.500000 220.000000 66.000000 +v 202.500000 221.000000 58.992207 +v 202.500000 221.000000 66.000000 +v 202.500000 224.792938 61.207104 +v 202.500000 224.792923 63.792904 +v 202.500000 221.000000 67.585785 +v 202.500000 221.000000 57.414215 +v 202.500000 231.000000 55.000000 +v 202.500000 224.000000 55.000000 +v 202.500000 231.000000 56.000000 +v 202.500000 224.000000 56.000000 +v 202.500000 228.792938 59.792900 +v 202.500000 226.207077 59.792896 +v 202.500000 222.414215 56.000000 +v 202.500000 232.585785 56.000000 +v 202.500000 235.000000 58.992207 +v 202.500000 234.000000 58.992207 +v 202.500015 235.000015 65.999992 +v 202.500000 234.000000 66.000000 +v 202.500000 230.207077 63.792904 +v 202.500000 234.000000 57.414215 +v 202.500000 230.207077 61.207100 +v 202.500000 234.000000 67.585785 +v 205.000000 220.000000 70.000000 +v 205.000000 220.000000 55.000000 +v 205.000000 235.000000 70.000000 +v 205.000015 235.000015 55.000000 +v -199.500000 -185.000000 56.000000 +v -201.500015 -185.000015 56.000000 +v -199.500000 -185.000000 55.000000 +v -203.500000 -185.000000 55.000000 +v -202.500000 -185.000000 57.000000 +v -203.500000 -185.000000 59.000000 +v -202.500000 -185.000000 59.000000 +v -197.500000 -185.000000 60.000000 +v -198.500015 -185.000015 60.999996 +v -193.500000 -185.000000 60.000000 +v -193.500000 -185.000000 65.000000 +v -183.500000 -185.000000 60.000000 +v -183.500015 -185.000015 64.999992 +v -178.500015 -185.000015 63.999996 +v -179.500000 -185.000000 65.000000 +v -174.500000 -185.000000 68.000000 +v -175.500015 -185.000015 68.999992 +v -173.500000 -185.000000 70.000000 +v -177.500000 -185.000000 70.000000 +v -187.500000 -185.000000 56.000000 +v -189.500000 -185.000000 56.000000 +v -192.500000 -185.000000 55.000000 +v -192.500000 -185.000000 56.000000 +v -184.500000 -185.000000 55.000000 +v -184.500000 -185.000000 56.000000 +v -178.500000 -185.000000 61.000000 +v -179.500000 -185.000000 60.000000 +v -174.500000 -185.000000 57.000000 +v -175.500015 -185.000015 56.000000 +v -173.500000 -185.000000 55.000000 +v -177.500000 -185.000000 55.000000 +v -177.500000 -185.000000 56.000000 +v -173.500000 -185.000000 59.000000 +v -174.500000 -185.000000 59.000000 +v -174.500000 -185.000000 66.000000 +v -173.500000 -185.000000 66.000000 +v -177.500000 -185.000000 69.000000 +v -187.500000 -185.000000 69.000000 +v -189.500000 -185.000000 69.000000 +v -192.500000 -185.000000 70.000000 +v -192.500000 -185.000000 69.000000 +v -184.500000 -185.000000 69.000000 +v -184.500000 -185.000000 70.000000 +v -198.500000 -185.000000 64.000000 +v -197.500000 -185.000000 65.000000 +v -202.500000 -185.000000 68.000000 +v -201.500015 -185.000015 68.999992 +v -203.500000 -185.000000 70.000000 +v -199.500000 -185.000000 70.000000 +v -199.500000 -185.000000 69.000000 +v -203.500000 -185.000000 66.000000 +v -202.500000 -185.000000 66.000000 +v -179.500000 220.000000 65.000000 +v -175.500015 220.000015 68.999992 +v -183.500000 220.000000 65.000000 +v -187.500000 220.000000 69.000000 +v -184.500000 220.000000 69.000000 +v -184.500000 220.000000 70.000000 +v -192.500000 220.000000 70.000000 +v -192.500000 220.000000 69.000000 +v -189.500000 220.000000 69.000000 +v -193.500000 219.999695 65.000000 +v -197.500000 219.999695 65.000000 +v -201.500015 220.000015 68.999992 +v -199.500000 219.999695 69.000000 +v -199.500000 219.999695 70.000000 +v -203.500000 219.999695 70.000000 +v -203.500000 219.999695 66.000000 +v -202.500000 219.999695 68.000000 +v -198.500015 220.000015 63.999996 +v -198.500000 219.999695 61.000000 +v -202.500000 220.000000 57.000000 +v -203.500000 220.000000 59.000000 +v -203.500000 220.000000 55.000000 +v -199.500000 220.000000 55.000000 +v -199.500000 220.000000 56.000000 +v -201.500015 220.000015 56.000000 +v -197.500000 220.000000 60.000000 +v -193.500000 219.999695 60.000000 +v -189.500000 220.000000 56.000000 +v -192.500000 220.000000 56.000000 +v -192.500000 220.000000 55.000000 +v -184.500000 220.000000 55.000000 +v -184.500000 220.000000 56.000000 +v -187.500000 220.000000 56.000000 +v -183.500000 219.999695 60.000000 +v -179.500000 219.999695 60.000000 +v -175.500015 220.000015 56.000000 +v -177.500000 219.999695 56.000000 +v -177.500000 219.999695 55.000000 +v -173.500000 219.999695 55.000000 +v -173.500000 219.999695 59.000000 +v -174.500000 219.999695 59.000000 +v -174.500000 219.999695 57.000000 +v -178.500015 220.000015 60.999996 +v -178.500000 220.000000 64.000000 +v -174.500000 220.000000 68.000000 +v -174.500000 220.000000 66.000000 +v -173.500000 220.000000 66.000000 +v -173.500000 220.000000 70.000000 +v -177.500000 220.000000 70.000000 +v -177.500000 220.000000 69.000000 +v 174.500000 -185.000000 66.000000 +v 174.500000 -185.000000 68.000000 +v 173.500000 -185.000000 66.000000 +v 173.500000 -185.000000 70.000000 +v 175.500015 -185.000015 68.999992 +v 177.500000 -185.000000 70.000000 +v 177.500000 -185.000000 69.000000 +v 179.500000 -185.000000 65.000000 +v 178.500000 -185.000000 64.000000 +v 183.500000 -185.000000 65.000000 +v 178.500015 -185.000015 60.999996 +v 183.500000 -185.000000 60.000000 +v 179.500000 -185.000000 60.000000 +v 174.500000 -185.000000 57.000000 +v 175.500015 -185.000015 56.000000 +v 173.500000 -185.000000 55.000000 +v 177.500000 -185.000000 55.000000 +v 174.500000 -185.000000 59.000000 +v 173.500000 -185.000000 59.000000 +v 177.500000 -185.000000 56.000000 +v 187.500000 -185.000000 56.000000 +v 189.500000 -185.000000 56.000000 +v 193.500000 -185.000000 60.000000 +v 193.500015 -185.000015 64.999992 +v 189.500000 -185.000000 69.000000 +v 184.500000 -185.000000 56.000000 +v 184.500000 -185.000000 55.000000 +v 192.500000 -185.000000 55.000000 +v 192.500000 -185.000000 56.000000 +v 197.500000 -185.000000 60.000000 +v 198.500000 -185.000000 61.000000 +v 198.500015 -185.000015 63.999996 +v 197.500000 -185.000000 65.000000 +v 202.500000 -185.000000 68.000000 +v 201.500015 -185.000015 68.999992 +v 203.500000 -185.000000 70.000000 +v 199.500000 -185.000000 70.000000 +v 202.500000 -185.000000 57.000000 +v 201.500015 -185.000015 56.000000 +v 203.500000 -185.000000 55.000000 +v 199.500000 -185.000000 55.000000 +v 199.500000 -185.000000 56.000000 +v 203.500000 -185.000000 59.000000 +v 202.500000 -185.000000 59.000000 +v 202.500000 -185.000000 66.000000 +v 203.500000 -185.000000 66.000000 +v 199.500000 -185.000000 69.000000 +v 192.500000 -185.000000 69.000000 +v 192.500000 -185.000000 70.000000 +v 184.500000 -185.000000 70.000000 +v 187.500000 -185.000000 69.000000 +v 184.500000 -185.000000 69.000000 +v 198.500015 220.000015 60.999996 +v 202.500000 220.000000 57.000000 +v 198.500000 220.000000 64.000000 +v 202.500000 220.000000 68.000000 +v 203.500000 220.000000 66.000000 +v 203.500000 220.000000 70.000000 +v 199.500000 220.000000 70.000000 +v 199.500000 220.000000 69.000000 +v 201.500015 220.000015 68.999992 +v 197.500000 220.000000 65.000000 +v 193.500000 220.000000 65.000000 +v 189.500000 220.000000 69.000000 +v 192.500000 220.000000 69.000000 +v 192.500000 220.000000 70.000000 +v 184.500000 220.000000 70.000000 +v 184.500000 220.000000 69.000000 +v 187.500000 220.000000 69.000000 +v 183.500000 220.000000 65.000000 +v 179.500000 220.000000 65.000000 +v 175.500015 220.000015 68.999992 +v 177.500000 220.000000 69.000000 +v 177.500000 220.000000 70.000000 +v 173.500000 220.000000 70.000000 +v 173.500000 220.000000 66.000000 +v 174.500000 220.000000 66.000000 +v 174.500000 220.000000 68.000000 +v 178.500015 220.000015 63.999996 +v 178.500000 220.000000 61.000000 +v 174.500000 220.000000 57.000000 +v 174.500000 220.000000 59.000000 +v 173.500000 220.000000 59.000000 +v 173.500000 220.000000 55.000000 +v 177.500000 220.000000 55.000000 +v 177.500000 220.000000 56.000000 +v 175.500015 220.000015 56.000000 +v 179.500000 220.000000 60.000000 +v 183.500000 220.000000 60.000000 +v 187.500000 220.000000 56.000000 +v 184.500000 220.000000 56.000000 +v 184.500000 220.000000 55.000000 +v 192.500000 220.000000 55.000000 +v 192.500000 220.000000 56.000000 +v 189.500000 220.000000 56.000000 +v 193.500000 220.000000 60.000000 +v 197.500000 220.000000 60.000000 +v 201.500015 220.000015 56.000000 +v 199.500000 220.000000 56.000000 +v 199.500000 220.000000 55.000000 +v 203.500000 220.000000 55.000000 +v 203.500000 220.000000 59.000000 +v 173.500000 50.000000 70.000000 +v 173.500000 50.000000 68.000000 +v 173.500000 -185.000000 68.000000 +v -173.500000 50.000000 70.000000 +v -173.500000 50.000000 68.000000 +v -173.500000 -185.000000 68.000000 +v 199.500000 51.000000 70.000000 +v 201.500015 51.000004 69.999992 +v 199.500000 50.000000 70.000000 +v 203.500000 50.000000 70.000000 +v 202.500000 52.000000 70.000000 +v 203.500000 54.000000 70.000000 +v 202.500000 54.000000 70.000000 +v 197.500000 55.000000 70.000000 +v 198.500015 56.000004 69.999992 +v 193.500000 55.000000 70.000000 +v 193.500000 60.000000 70.000000 +v 183.500000 55.000000 70.000000 +v 183.500000 60.000000 70.000000 +v 178.500015 56.000004 69.999992 +v 178.500000 59.000000 70.000000 +v 187.500015 51.000004 69.999992 +v 189.500015 51.000004 69.999992 +v 184.500000 50.000000 70.000000 +v 192.500000 50.000000 70.000000 +v 192.500000 51.000000 70.000000 +v 184.500000 51.000000 70.000000 +v 179.500000 55.000000 70.000000 +v 174.500000 52.000000 70.000000 +v 175.500015 51.000004 69.999992 +v 177.500000 50.000000 70.000000 +v 177.500000 51.000000 70.000000 +v 173.500000 54.000000 70.000000 +v 174.500000 54.000000 70.000000 +v 179.500000 60.000000 70.000000 +v 174.500000 63.000000 70.000000 +v 175.500015 64.000000 69.999992 +v 173.500000 65.000000 70.000000 +v 177.500000 65.000000 70.000000 +v 174.500000 61.000000 70.000000 +v 173.500000 61.000000 70.000000 +v 177.500000 64.000000 70.000000 +v 189.500000 64.000000 70.000000 +v 187.500000 64.000000 70.000000 +v 184.500000 65.000000 70.000000 +v 184.500000 64.000000 70.000000 +v 192.500000 65.000000 70.000000 +v 192.500000 64.000000 70.000000 +v 198.500000 59.000000 70.000000 +v 197.500000 60.000000 70.000000 +v 202.500000 63.000000 70.000000 +v 201.500015 64.000000 69.999992 +v 203.500000 65.000000 70.000000 +v 199.500000 65.000000 70.000000 +v 199.500000 64.000000 70.000000 +v 203.500000 61.000000 70.000000 +v 202.500000 61.000000 70.000000 +v 201.500015 51.000004 620.000061 +v 197.500000 55.000000 620.000000 +v 193.500000 55.000000 620.000000 +v 189.500015 51.000004 620.000061 +v 192.500000 51.000000 620.000000 +v 192.500000 50.000000 620.000000 +v 184.500000 50.000000 620.000000 +v 184.500000 51.000000 620.000000 +v 187.500015 51.000004 620.000061 +v 183.500000 55.000000 620.000000 +v 179.500000 55.000000 620.000000 +v 175.500015 51.000004 620.000061 +v 177.500000 51.000000 620.000000 +v 177.500000 50.000000 620.000000 +v 173.500000 50.000000 620.000000 +v 173.500000 54.000000 620.000000 +v 174.500000 54.000000 620.000000 +v 174.500000 52.000000 620.000000 +v 178.500015 56.000004 620.000061 +v 178.500000 59.000000 620.000000 +v 174.500000 63.000000 620.000000 +v 174.500000 61.000000 620.000000 +v 173.500000 61.000000 620.000000 +v 173.500000 65.000000 620.000000 +v 177.500000 65.000000 620.000000 +v 177.500000 64.000000 620.000000 +v 175.500015 64.000000 620.000061 +v 179.500000 60.000000 620.000000 +v 183.500000 60.000000 620.000000 +v 187.500015 64.000000 620.000061 +v 184.500000 64.000000 620.000000 +v 184.500000 65.000000 620.000000 +v 192.500000 65.000000 620.000000 +v 192.500000 64.000000 620.000000 +v 189.500015 64.000000 620.000061 +v 193.500000 60.000000 620.000000 +v 197.500000 60.000000 620.000000 +v 201.500015 64.000000 620.000061 +v 199.500000 64.000000 620.000000 +v 199.500000 65.000000 620.000000 +v 203.500000 65.000000 620.000000 +v 203.500000 61.000000 620.000000 +v 202.500000 61.000000 620.000000 +v 202.500000 63.000000 620.000000 +v 198.500000 59.000000 620.000000 +v 198.500015 56.000004 620.000061 +v 202.500000 52.000000 620.000000 +v 202.500000 54.000000 620.000000 +v 203.500000 54.000000 620.000000 +v 203.500000 50.000000 620.000000 +v 199.500000 50.000000 620.000000 +v 199.500000 51.000000 620.000000 +v -174.500000 61.000000 70.000000 +v -174.500000 63.000000 70.000000 +v -173.500000 61.000000 70.000000 +v -173.500000 65.000000 70.000000 +v -175.500015 64.000000 69.999992 +v -177.500000 65.000000 70.000000 +v -177.500000 64.000000 70.000000 +v -179.500000 60.000000 70.000000 +v -178.500000 59.000000 70.000000 +v -183.500000 60.000000 70.000000 +v -178.500015 56.000004 69.999992 +v -183.500000 55.000000 70.000000 +v -179.500000 55.000000 70.000000 +v -174.500000 52.000000 70.000000 +v -175.500015 51.000004 69.999992 +v -177.500000 50.000000 70.000000 +v -174.500000 54.000000 70.000000 +v -173.500000 54.000000 70.000000 +v -177.500000 51.000000 70.000000 +v -187.500015 51.000004 69.999992 +v -189.500015 51.000004 69.999992 +v -193.500000 55.000000 70.000000 +v -193.500000 60.000000 70.000000 +v -187.500000 64.000000 70.000000 +v -189.500000 64.000000 70.000000 +v -192.500000 65.000000 70.000000 +v -192.500000 64.000000 70.000000 +v -184.500000 51.000000 70.000000 +v -184.500000 50.000000 70.000000 +v -192.500000 50.000000 70.000000 +v -192.500000 51.000000 70.000000 +v -198.500015 56.000004 69.999992 +v -197.500000 55.000000 70.000000 +v -202.500000 52.000000 70.000000 +v -201.500015 51.000004 69.999992 +v -203.500000 50.000000 70.000000 +v -199.500000 50.000000 70.000000 +v -199.500000 51.000000 70.000000 +v -203.500000 54.000000 70.000000 +v -202.500000 54.000000 70.000000 +v -198.500000 59.000000 70.000000 +v -197.500000 60.000000 70.000000 +v -202.500000 63.000000 70.000000 +v -201.500015 64.000000 69.999992 +v -203.500000 65.000000 70.000000 +v -199.500000 65.000000 70.000000 +v -202.500000 61.000000 70.000000 +v -203.500000 61.000000 70.000000 +v -199.500000 64.000000 70.000000 +v -184.500000 65.000000 70.000000 +v -184.500000 64.000000 70.000000 +v -174.500000 63.000000 620.000000 +v -178.500000 59.000000 620.000000 +v -178.500015 56.000004 620.000061 +v -174.500000 52.000000 620.000000 +v -174.500000 54.000000 620.000000 +v -173.500000 54.000000 620.000000 +v -173.500000 50.000000 620.000000 +v -177.500000 50.000000 620.000000 +v -177.500000 51.000000 620.000000 +v -175.500015 51.000004 620.000061 +v -179.500000 55.000000 620.000000 +v -183.500000 55.000000 620.000000 +v -187.500015 51.000004 620.000061 +v -184.500000 51.000000 620.000000 +v -184.500000 50.000000 620.000000 +v -192.500000 50.000000 620.000000 +v -192.500000 51.000000 620.000000 +v -189.500015 51.000004 620.000061 +v -193.500000 55.000000 620.000000 +v -197.500000 55.000000 620.000000 +v -201.500015 51.000004 620.000061 +v -199.500000 51.000000 620.000000 +v -199.500000 50.000000 620.000000 +v -203.500000 50.000000 620.000000 +v -203.500000 54.000000 620.000000 +v -202.500000 54.000000 620.000000 +v -202.500000 52.000000 620.000000 +v -198.500015 56.000004 620.000061 +v -198.500000 59.000000 620.000000 +v -202.500000 63.000000 620.000000 +v -202.500000 61.000000 620.000000 +v -203.500000 61.000000 620.000000 +v -203.500000 65.000000 620.000000 +v -199.500000 65.000000 620.000000 +v -199.500000 64.000000 620.000000 +v -201.500015 64.000000 620.000061 +v -197.500000 60.000000 620.000000 +v -193.500000 60.000000 620.000000 +v -189.500015 64.000000 620.000061 +v -192.500000 64.000000 620.000000 +v -192.500000 65.000000 620.000000 +v -184.500000 65.000000 620.000000 +v -184.500000 64.000000 620.000000 +v -187.500015 64.000000 620.000061 +v -183.500000 60.000000 620.000000 +v -179.500000 60.000000 620.000000 +v -175.500015 64.000000 620.000061 +v -177.500000 64.000000 620.000000 +v -177.500000 65.000000 620.000000 +v -173.500000 65.000000 620.000000 +v -173.500000 61.000000 620.000000 +v -174.500000 61.000000 620.000000 +v -202.500000 50.000000 623.992249 +v -202.500000 51.000000 623.992249 +v -202.500015 50.000004 631.000061 +v -202.500000 51.000000 631.000000 +v -202.500000 54.792904 628.792908 +v -202.500000 51.000000 622.414185 +v -202.500000 54.792904 626.207092 +v -202.500000 51.000000 632.585815 +v -202.500000 54.000000 621.000000 +v -202.500000 61.000000 621.000000 +v -202.500000 58.792900 624.792908 +v -202.500000 62.585785 621.000000 +v -202.500000 56.207096 624.792908 +v -202.500000 52.414215 621.000000 +v -202.500000 61.000000 635.000000 +v -202.500000 54.000000 635.000000 +v -202.500000 61.000000 634.000000 +v -202.500000 54.000000 634.000000 +v -202.500000 58.792900 630.207153 +v -202.500000 56.207096 630.207092 +v -202.500000 52.414215 634.000000 +v -202.500000 62.585785 634.000000 +v -205.000015 50.000004 620.000061 +v -205.000000 50.000000 635.000000 +v -205.000000 65.000000 620.000000 +v -205.000000 65.000000 635.000000 +v -202.500000 65.000000 623.992249 +v -202.500015 65.000000 631.000061 +v -202.500000 64.000000 623.992249 +v -202.500000 64.000000 631.000000 +v -202.500000 60.207104 626.207153 +v -202.500000 60.207104 628.792908 +v -202.500000 64.000000 632.585815 +v -202.500000 64.000000 622.414185 +v 202.500000 54.000000 635.000000 +v 202.500000 61.000000 635.000000 +v 202.500000 54.000000 634.000000 +v 202.500000 61.000000 634.000000 +v 202.500000 58.792900 630.207153 +v 202.500000 62.585785 634.000000 +v 202.500000 56.207096 630.207092 +v 202.500000 52.414215 634.000000 +v 202.500000 50.000000 623.992249 +v 202.500015 50.000004 631.000061 +v 202.500000 51.000000 623.992249 +v 202.500000 51.000000 631.000000 +v 202.500000 54.792904 628.792908 +v 202.500000 51.000000 632.585815 +v 202.500000 54.792904 626.207092 +v 202.500000 51.000000 622.414185 +v 202.500000 61.000000 621.000000 +v 202.500000 54.000000 621.000000 +v 202.500000 58.792900 624.792908 +v 202.500000 56.207096 624.792908 +v 202.500000 52.414215 621.000000 +v 202.500000 62.585785 621.000000 +v 202.500000 65.000000 623.992249 +v 202.500000 64.000000 623.992249 +v 202.500015 65.000000 631.000061 +v 202.500000 64.000000 631.000000 +v 202.500000 60.207104 626.207153 +v 202.500000 60.207104 628.792908 +v 202.500000 64.000000 622.414185 +v 202.500000 64.000000 632.585815 +v 205.000000 50.000000 635.000000 +v 205.000000 50.000000 620.000000 +v 205.000000 65.000000 635.000000 +v 205.000015 65.000000 620.000061 +vt 0.580119 0.029024 +vt 0.580191 0.029024 +vt 0.580119 0.029024 +vt 0.580191 0.029024 +vt 0.580463 0.029024 +vt 0.580463 0.029024 +vt 0.580191 0.029024 +vt 0.580191 0.029024 +vt 0.580406 0.029024 +vt 0.580907 0.029024 +vt 0.580406 0.029024 +vt 0.580907 0.029024 +vt 0.580749 0.029024 +vt 0.581020 0.029024 +vt 0.580564 0.029024 +vt 0.580292 0.029024 +vt 0.580907 0.029024 +vt 0.580406 0.029024 +vt 0.580907 0.029024 +vt 0.580406 0.029024 +vt 0.580564 0.029024 +vt 0.580292 0.029024 +vt 0.580749 0.029024 +vt 0.581020 0.029024 +vt 0.580119 0.029134 +vt 0.580119 0.029134 +vt 0.581193 0.029134 +vt 0.581193 0.029134 +vt 0.581193 0.029024 +vt 0.581193 0.029024 +vt 0.581122 0.029024 +vt 0.581122 0.029024 +vt 0.580850 0.029024 +vt 0.581122 0.029024 +vt 0.580850 0.029024 +vt 0.581122 0.029024 +vt 0.580406 0.011342 +vt 0.580907 0.011342 +vt 0.580406 0.011342 +vt 0.580907 0.011342 +vt 0.580564 0.011342 +vt 0.580749 0.011342 +vt 0.581020 0.011342 +vt 0.580292 0.011342 +vt 0.580119 0.011342 +vt 0.580119 0.011342 +vt 0.580191 0.011342 +vt 0.580191 0.011342 +vt 0.580463 0.011342 +vt 0.580463 0.011342 +vt 0.580191 0.011342 +vt 0.580191 0.011342 +vt 0.580907 0.011342 +vt 0.580406 0.011342 +vt 0.580907 0.011342 +vt 0.580406 0.011342 +vt 0.580749 0.011342 +vt 0.580564 0.011342 +vt 0.580292 0.011342 +vt 0.581020 0.011342 +vt 0.581193 0.011342 +vt 0.581122 0.011342 +vt 0.581193 0.011342 +vt 0.581122 0.011342 +vt 0.580850 0.011342 +vt 0.581122 0.011342 +vt 0.580850 0.011342 +vt 0.581122 0.011342 +vt 0.580119 0.011233 +vt 0.580119 0.011233 +vt 0.581193 0.011233 +vt 0.581193 0.011233 +vt 0.551128 0.028893 +vt 0.551128 0.028981 +vt 0.551128 0.028893 +vt 0.551128 0.029068 +vt 0.551128 0.029024 +vt 0.551128 0.029068 +vt 0.551128 0.029024 +vt 0.551128 0.028806 +vt 0.551128 0.028850 +vt 0.551128 0.028632 +vt 0.551128 0.028632 +vt 0.551128 0.028195 +vt 0.551128 0.028195 +vt 0.551128 0.027977 +vt 0.551128 0.028020 +vt 0.551128 0.027802 +vt 0.551128 0.027846 +vt 0.551128 0.027758 +vt 0.551128 0.027933 +vt 0.551128 0.028370 +vt 0.551128 0.028457 +vt 0.551128 0.028588 +vt 0.551128 0.028588 +vt 0.551128 0.028239 +vt 0.551128 0.028239 +vt 0.551128 0.027977 +vt 0.551128 0.028020 +vt 0.551128 0.027802 +vt 0.551128 0.027846 +vt 0.551128 0.027758 +vt 0.551128 0.027933 +vt 0.551128 0.027933 +vt 0.551128 0.027758 +vt 0.551128 0.027802 +vt 0.551128 0.027802 +vt 0.551128 0.027758 +vt 0.551128 0.027933 +vt 0.551128 0.028370 +vt 0.551128 0.028457 +vt 0.551128 0.028588 +vt 0.551128 0.028588 +vt 0.551128 0.028239 +vt 0.551128 0.028239 +vt 0.551128 0.028850 +vt 0.551128 0.028806 +vt 0.551128 0.029024 +vt 0.551128 0.028981 +vt 0.551128 0.029068 +vt 0.551128 0.028893 +vt 0.551128 0.028893 +vt 0.551128 0.029068 +vt 0.551128 0.029024 +vt 0.580119 0.028020 +vt 0.580119 0.027846 +vt 0.580119 0.028195 +vt 0.580119 0.028370 +vt 0.580119 0.028239 +vt 0.580119 0.028239 +vt 0.580119 0.028588 +vt 0.580119 0.028588 +vt 0.580119 0.028457 +vt 0.580119 0.028632 +vt 0.580119 0.028806 +vt 0.580119 0.028981 +vt 0.580119 0.028893 +vt 0.580119 0.028893 +vt 0.580119 0.029068 +vt 0.580119 0.029068 +vt 0.580119 0.029024 +vt 0.580119 0.028850 +vt 0.580119 0.028850 +vt 0.580119 0.029024 +vt 0.580119 0.029068 +vt 0.580119 0.029068 +vt 0.580119 0.028893 +vt 0.580119 0.028893 +vt 0.580119 0.028981 +vt 0.580119 0.028806 +vt 0.580119 0.028632 +vt 0.580119 0.028457 +vt 0.580119 0.028588 +vt 0.580119 0.028588 +vt 0.580119 0.028239 +vt 0.580119 0.028239 +vt 0.580119 0.028370 +vt 0.580119 0.028195 +vt 0.580119 0.028020 +vt 0.580119 0.027846 +vt 0.580119 0.027933 +vt 0.580119 0.027933 +vt 0.580119 0.027758 +vt 0.580119 0.027758 +vt 0.580119 0.027802 +vt 0.580119 0.027802 +vt 0.580119 0.027977 +vt 0.580119 0.027977 +vt 0.580119 0.027802 +vt 0.580119 0.027802 +vt 0.580119 0.027758 +vt 0.580119 0.027758 +vt 0.580119 0.027933 +vt 0.580119 0.027933 +vt 0.551128 0.012565 +vt 0.551128 0.012565 +vt 0.551128 0.012608 +vt 0.551128 0.012608 +vt 0.551128 0.012521 +vt 0.551128 0.012434 +vt 0.551128 0.012434 +vt 0.551128 0.012346 +vt 0.551128 0.012390 +vt 0.551128 0.012172 +vt 0.551128 0.012390 +vt 0.551128 0.012172 +vt 0.551128 0.012346 +vt 0.551128 0.012565 +vt 0.551128 0.012521 +vt 0.551128 0.012608 +vt 0.551128 0.012434 +vt 0.551128 0.012565 +vt 0.551128 0.012608 +vt 0.551128 0.012434 +vt 0.551128 0.011997 +vt 0.551128 0.011910 +vt 0.551128 0.011735 +vt 0.551128 0.011735 +vt 0.551128 0.011910 +vt 0.551128 0.012128 +vt 0.551128 0.012128 +vt 0.551128 0.011779 +vt 0.551128 0.011779 +vt 0.551128 0.011560 +vt 0.551128 0.011517 +vt 0.551128 0.011517 +vt 0.551128 0.011560 +vt 0.551128 0.011342 +vt 0.551128 0.011386 +vt 0.551128 0.011299 +vt 0.551128 0.011473 +vt 0.551128 0.011342 +vt 0.551128 0.011386 +vt 0.551128 0.011299 +vt 0.551128 0.011473 +vt 0.551128 0.011473 +vt 0.551128 0.011299 +vt 0.551128 0.011342 +vt 0.551128 0.011342 +vt 0.551128 0.011299 +vt 0.551128 0.011473 +vt 0.551128 0.011779 +vt 0.551128 0.011779 +vt 0.551128 0.012128 +vt 0.551128 0.011997 +vt 0.551128 0.012128 +vt 0.580119 0.011517 +vt 0.580119 0.011342 +vt 0.580119 0.011517 +vt 0.580119 0.011342 +vt 0.580119 0.011299 +vt 0.580119 0.011299 +vt 0.580119 0.011473 +vt 0.580119 0.011473 +vt 0.580119 0.011386 +vt 0.580119 0.011560 +vt 0.580119 0.011735 +vt 0.580119 0.011910 +vt 0.580119 0.011779 +vt 0.580119 0.011779 +vt 0.580119 0.012128 +vt 0.580119 0.012128 +vt 0.580119 0.011997 +vt 0.580119 0.012172 +vt 0.580119 0.012346 +vt 0.580119 0.012521 +vt 0.580119 0.012434 +vt 0.580119 0.012434 +vt 0.580119 0.012608 +vt 0.580119 0.012608 +vt 0.580119 0.012565 +vt 0.580119 0.012565 +vt 0.580119 0.012390 +vt 0.580119 0.012390 +vt 0.580119 0.012565 +vt 0.580119 0.012565 +vt 0.580119 0.012608 +vt 0.580119 0.012608 +vt 0.580119 0.012434 +vt 0.580119 0.012434 +vt 0.580119 0.012521 +vt 0.580119 0.012346 +vt 0.580119 0.012172 +vt 0.580119 0.011997 +vt 0.580119 0.012128 +vt 0.580119 0.012128 +vt 0.580119 0.011779 +vt 0.580119 0.011779 +vt 0.580119 0.011910 +vt 0.580119 0.011735 +vt 0.580119 0.011560 +vt 0.580119 0.011386 +vt 0.580119 0.011473 +vt 0.580119 0.011473 +vt 0.580119 0.011299 +vt 0.580119 0.011299 +vt 0.567950 0.012608 +vt 0.567950 0.012608 +vt 0.551128 0.012608 +vt 0.567950 0.027758 +vt 0.551128 0.027758 +vt 0.567950 0.027758 +vt 0.568022 0.011473 +vt 0.568022 0.011386 +vt 0.567950 0.011473 +vt 0.567950 0.011299 +vt 0.568093 0.011342 +vt 0.568237 0.011299 +vt 0.568237 0.011342 +vt 0.568308 0.011560 +vt 0.568380 0.011517 +vt 0.568308 0.011735 +vt 0.568666 0.011735 +vt 0.568308 0.012172 +vt 0.568666 0.012172 +vt 0.568380 0.012390 +vt 0.568594 0.012390 +vt 0.568022 0.011997 +vt 0.568022 0.011910 +vt 0.567950 0.012128 +vt 0.567950 0.011779 +vt 0.568022 0.011779 +vt 0.568022 0.012128 +vt 0.568308 0.012346 +vt 0.568093 0.012565 +vt 0.568022 0.012521 +vt 0.567950 0.012434 +vt 0.568022 0.012434 +vt 0.568237 0.012608 +vt 0.568237 0.012565 +vt 0.568666 0.012346 +vt 0.568881 0.012565 +vt 0.568952 0.012521 +vt 0.569024 0.012608 +vt 0.569024 0.012434 +vt 0.568738 0.012565 +vt 0.568738 0.012608 +vt 0.568952 0.012434 +vt 0.568952 0.011910 +vt 0.568952 0.011997 +vt 0.569024 0.012128 +vt 0.568952 0.012128 +vt 0.569024 0.011779 +vt 0.568952 0.011779 +vt 0.568594 0.011517 +vt 0.568666 0.011560 +vt 0.568881 0.011342 +vt 0.568952 0.011386 +vt 0.569024 0.011299 +vt 0.569024 0.011473 +vt 0.568952 0.011473 +vt 0.568738 0.011299 +vt 0.568738 0.011342 +vt 0.568022 0.011386 +vt 0.568308 0.011560 +vt 0.568308 0.011735 +vt 0.568022 0.011910 +vt 0.568022 0.011779 +vt 0.567950 0.011779 +vt 0.567950 0.012128 +vt 0.568022 0.012128 +vt 0.568022 0.011997 +vt 0.568308 0.012172 +vt 0.568308 0.012346 +vt 0.568022 0.012521 +vt 0.568022 0.012434 +vt 0.567950 0.012434 +vt 0.567950 0.012608 +vt 0.568237 0.012608 +vt 0.568237 0.012565 +vt 0.568093 0.012565 +vt 0.568380 0.012390 +vt 0.568594 0.012390 +vt 0.568881 0.012565 +vt 0.568738 0.012565 +vt 0.568738 0.012608 +vt 0.569024 0.012608 +vt 0.569024 0.012434 +vt 0.568952 0.012434 +vt 0.568952 0.012521 +vt 0.568666 0.012346 +vt 0.568666 0.012172 +vt 0.568952 0.011997 +vt 0.568952 0.012128 +vt 0.569024 0.012128 +vt 0.569024 0.011779 +vt 0.568952 0.011779 +vt 0.568952 0.011910 +vt 0.568666 0.011735 +vt 0.568666 0.011560 +vt 0.568952 0.011386 +vt 0.568952 0.011473 +vt 0.569024 0.011473 +vt 0.569024 0.011299 +vt 0.568738 0.011299 +vt 0.568738 0.011342 +vt 0.568881 0.011342 +vt 0.568594 0.011517 +vt 0.568380 0.011517 +vt 0.568093 0.011342 +vt 0.568237 0.011342 +vt 0.568237 0.011299 +vt 0.567950 0.011299 +vt 0.567950 0.011473 +vt 0.568022 0.011473 +vt 0.568738 0.027802 +vt 0.568881 0.027802 +vt 0.568738 0.027758 +vt 0.569024 0.027758 +vt 0.568952 0.027846 +vt 0.569024 0.027933 +vt 0.568952 0.027933 +vt 0.568666 0.028020 +vt 0.568594 0.027977 +vt 0.568666 0.028195 +vt 0.568380 0.027977 +vt 0.568308 0.028195 +vt 0.568308 0.028020 +vt 0.568093 0.027802 +vt 0.568022 0.027846 +vt 0.567950 0.027933 +vt 0.568237 0.027802 +vt 0.568237 0.027758 +vt 0.568022 0.027933 +vt 0.568022 0.028370 +vt 0.568022 0.028457 +vt 0.568308 0.028632 +vt 0.568666 0.028632 +vt 0.568952 0.028370 +vt 0.568952 0.028457 +vt 0.569024 0.028588 +vt 0.568952 0.028588 +vt 0.568022 0.028239 +vt 0.567950 0.028239 +vt 0.567950 0.028588 +vt 0.568022 0.028588 +vt 0.568380 0.028850 +vt 0.568308 0.028806 +vt 0.568093 0.029024 +vt 0.568022 0.028981 +vt 0.567950 0.029068 +vt 0.567950 0.028893 +vt 0.568022 0.028893 +vt 0.568237 0.029068 +vt 0.568237 0.029024 +vt 0.568594 0.028850 +vt 0.568666 0.028806 +vt 0.568881 0.029024 +vt 0.568952 0.028981 +vt 0.569024 0.029068 +vt 0.569024 0.028893 +vt 0.568738 0.029024 +vt 0.568738 0.029068 +vt 0.568952 0.028893 +vt 0.569024 0.028239 +vt 0.568952 0.028239 +vt 0.568881 0.027802 +vt 0.568594 0.027977 +vt 0.568380 0.027977 +vt 0.568093 0.027802 +vt 0.568237 0.027802 +vt 0.568237 0.027758 +vt 0.567950 0.027758 +vt 0.567950 0.027933 +vt 0.568022 0.027933 +vt 0.568022 0.027846 +vt 0.568308 0.028020 +vt 0.568308 0.028195 +vt 0.568022 0.028370 +vt 0.568022 0.028239 +vt 0.567950 0.028239 +vt 0.567950 0.028588 +vt 0.568022 0.028588 +vt 0.568022 0.028457 +vt 0.568308 0.028632 +vt 0.568308 0.028806 +vt 0.568022 0.028981 +vt 0.568022 0.028893 +vt 0.567950 0.028893 +vt 0.567950 0.029068 +vt 0.568237 0.029068 +vt 0.568237 0.029024 +vt 0.568093 0.029024 +vt 0.568380 0.028850 +vt 0.568594 0.028850 +vt 0.568881 0.029024 +vt 0.568738 0.029024 +vt 0.568738 0.029068 +vt 0.569024 0.029068 +vt 0.569024 0.028893 +vt 0.568952 0.028893 +vt 0.568952 0.028981 +vt 0.568666 0.028806 +vt 0.568666 0.028632 +vt 0.568952 0.028457 +vt 0.568952 0.028588 +vt 0.569024 0.028588 +vt 0.569024 0.028239 +vt 0.568952 0.028239 +vt 0.568952 0.028370 +vt 0.568666 0.028195 +vt 0.568666 0.028020 +vt 0.568952 0.027846 +vt 0.568952 0.027933 +vt 0.569024 0.027933 +vt 0.569024 0.027758 +vt 0.568738 0.027758 +vt 0.568738 0.027802 +vt 0.567950 0.029024 +vt 0.568022 0.029024 +vt 0.567950 0.029024 +vt 0.568022 0.029024 +vt 0.568293 0.029024 +vt 0.568022 0.029024 +vt 0.568293 0.029024 +vt 0.568022 0.029024 +vt 0.568237 0.029024 +vt 0.568738 0.029024 +vt 0.568580 0.029024 +vt 0.568851 0.029024 +vt 0.568395 0.029024 +vt 0.568123 0.029024 +vt 0.568738 0.029024 +vt 0.568237 0.029024 +vt 0.568738 0.029024 +vt 0.568237 0.029024 +vt 0.568580 0.029024 +vt 0.568395 0.029024 +vt 0.568123 0.029024 +vt 0.568851 0.029024 +vt 0.567950 0.029134 +vt 0.567950 0.029134 +vt 0.569024 0.029134 +vt 0.569024 0.029134 +vt 0.569024 0.029024 +vt 0.569024 0.029024 +vt 0.568952 0.029024 +vt 0.568952 0.029024 +vt 0.568681 0.029024 +vt 0.568681 0.029024 +vt 0.568952 0.029024 +vt 0.568952 0.029024 +vt 0.568237 0.011342 +vt 0.568738 0.011342 +vt 0.568237 0.011342 +vt 0.568738 0.011342 +vt 0.568580 0.011342 +vt 0.568851 0.011342 +vt 0.568395 0.011342 +vt 0.568123 0.011342 +vt 0.567950 0.011342 +vt 0.567950 0.011342 +vt 0.568022 0.011342 +vt 0.568022 0.011342 +vt 0.568293 0.011342 +vt 0.568022 0.011342 +vt 0.568293 0.011342 +vt 0.568022 0.011342 +vt 0.568738 0.011342 +vt 0.568237 0.011342 +vt 0.568580 0.011342 +vt 0.568395 0.011342 +vt 0.568123 0.011342 +vt 0.568851 0.011342 +vt 0.569024 0.011342 +vt 0.568952 0.011342 +vt 0.569024 0.011342 +vt 0.568952 0.011342 +vt 0.568681 0.011342 +vt 0.568681 0.011342 +vt 0.568952 0.011342 +vt 0.568952 0.011342 +vt 0.567950 0.011233 +vt 0.567950 0.011233 +vt 0.569024 0.011233 +vt 0.569024 0.011233 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000005 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000010 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000001 +vn -1.000000 0.000000 0.000001 +vn -1.000000 0.000000 0.000001 +vn -1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000002 +vn 1.000000 0.000000 0.000002 +vn 1.000000 0.000000 0.000002 +vn 1.000000 0.000000 0.000000 +vn 1.000000 -0.000005 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 -0.000010 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 -0.000010 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 -0.000009 0.000000 +vn -1.000000 -0.000009 0.000000 +vn -1.000000 -0.000009 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000005 0.000000 +vn -1.000000 0.000024 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000010 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000010 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000002 +vn -1.000000 0.000000 0.000002 +vn -1.000000 0.000000 0.000002 +vn -1.000000 0.000011 0.000000 +vn -1.000000 -0.000005 0.000000 +vn -1.000000 -0.000010 0.000000 +vn -1.000000 -0.000010 0.000000 +vn -1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000001 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -0.707105 -0.707109 +vn 0.000000 -0.707105 -0.707109 +vn 0.000000 -0.707105 -0.707109 +vn 0.000000 -0.707101 -0.707112 +vn 0.000000 -0.993800 -0.111186 +vn 0.000000 -0.993800 -0.111186 +vn 0.000000 -0.993800 0.111186 +vn 0.000000 -0.993800 0.111186 +vn 0.000000 -0.707102 0.707112 +vn 0.000000 -0.707102 0.707112 +vn 0.000000 -0.707102 0.707112 +vn 0.000000 -0.707105 0.707108 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.003468 0.999994 +vn 0.000000 0.003468 0.999994 +vn 0.000000 0.003468 0.999994 +vn 0.000000 0.003468 0.999994 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -0.000006 -1.000000 0.000000 +vn -0.000002 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.707114 -0.707100 +vn 0.000000 0.707114 -0.707100 +vn 0.000000 0.707114 -0.707100 +vn 0.000000 0.707106 -0.707107 +vn 0.000000 0.111163 -0.993802 +vn 0.000000 0.111158 -0.993803 +vn 0.000000 -0.111158 -0.993803 +vn 0.000000 -0.111163 -0.993802 +vn 0.000000 -0.707106 -0.707107 +vn 0.000000 -0.707106 -0.707107 +vn 0.000000 -0.707106 -0.707107 +vn 0.000000 -0.707114 -0.707100 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000003 1.000000 0.000000 +vn 0.000003 1.000000 0.000000 +vn 0.000003 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.000010 1.000000 -0.000007 +vn 0.000004 1.000000 0.000004 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.707105 0.707108 +vn 0.000000 0.707105 0.707108 +vn 0.000000 0.707105 0.707108 +vn 0.000000 0.707102 0.707112 +vn 0.000000 0.993805 0.111134 +vn 0.000000 0.993800 0.111186 +vn 0.000000 0.993800 -0.111186 +vn 0.000000 0.993805 -0.111135 +vn 0.000000 0.707101 -0.707112 +vn 0.000000 0.707101 -0.707112 +vn 0.000000 0.707101 -0.707112 +vn 0.000000 0.707105 -0.707109 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -0.000004 -1.000000 +vn 0.000000 -0.000004 -1.000000 +vn 0.000000 -0.000004 -1.000000 +vn 0.000000 -0.000004 -1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.707114 0.707099 +vn 0.000000 -0.707114 0.707099 +vn 0.000000 -0.707114 0.707099 +vn 0.000000 -0.707107 0.707107 +vn 0.000000 -0.111163 0.993802 +vn 0.000000 -0.111158 0.993803 +vn 0.000000 0.111158 0.993803 +vn 0.000000 0.111164 0.993802 +vn 0.000000 0.707107 0.707107 +vn 0.000000 0.707107 0.707107 +vn 0.000000 0.707107 0.707107 +vn 0.000000 0.707114 0.707099 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000008 -1.000000 0.000000 +vn 0.000008 -1.000000 0.000000 +vn 0.000008 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -0.000010 -1.000000 0.000010 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -0.000006 -1.000000 -0.000004 +vn 0.000006 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000003 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -0.000002 -1.000000 0.000000 +vn -0.000001 -1.000000 -0.000005 +vn 0.000004 -1.000000 0.000031 +vn -0.000006 -1.000000 0.000000 +vn 0.000006 -1.000000 0.000000 +vn 0.000010 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000001 -1.000000 -0.000002 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000006 -1.000000 0.000004 +vn 0.000010 -1.000000 -0.000010 +vn 0.000000 -1.000000 0.000000 +vn -0.000008 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -0.000008 -1.000000 0.000000 +vn -0.000002 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -0.000001 -1.000000 -0.000002 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -0.000006 -1.000000 0.000004 +vn -0.000010 -1.000000 -0.000010 +vn 0.000000 -1.000000 0.000000 +vn 0.000008 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -0.707108 0.000000 0.707105 +vn -0.707108 0.000000 0.707105 +vn -0.707108 0.000000 0.707105 +vn -0.707106 0.000000 0.707107 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707108 0.000000 0.707105 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.707104 0.000000 0.707110 +vn 0.707104 0.000000 0.707110 +vn 0.707104 0.000000 0.707110 +vn 0.707105 0.000000 0.707108 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn 0.000010 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -0.707108 0.000000 -0.707106 +vn -0.707108 0.000000 -0.707106 +vn -0.707108 0.000000 -0.707106 +vn -0.707107 0.000000 -0.707107 +vn -1.000000 0.000000 -0.000005 +vn -1.000000 0.000000 -0.000005 +vn -1.000000 0.000000 -0.000005 +vn -1.000000 0.000000 0.000005 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.707108 0.000000 0.707105 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.004331 0.000000 0.999991 +vn 0.004331 0.000000 0.999991 +vn 0.004331 0.000000 0.999991 +vn 0.000000 0.000011 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -0.000002 0.000000 1.000000 +vn -0.000002 0.000000 1.000000 +vn -0.000002 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.707105 0.000000 -0.707109 +vn 0.707105 0.000000 -0.707109 +vn 0.707105 0.000000 -0.707108 +vn 0.707106 0.000000 -0.707107 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.707107 0.000000 -0.707107 +vn -0.707107 0.000000 -0.707107 +vn -0.707107 0.000000 -0.707107 +vn -0.707107 0.000000 -0.707107 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.707108 0.000000 -0.707105 +vn -0.707109 0.000000 -0.707105 +vn -0.707109 0.000000 -0.707105 +vn -0.707108 0.000000 -0.707105 +vn -0.000002 0.000000 1.000000 +vn -0.000002 0.000000 1.000000 +vn -0.000002 0.000000 1.000000 +vn 0.000005 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.707106 0.000000 0.707108 +vn 0.707106 0.000000 0.707108 +vn 0.707106 0.000000 0.707108 +vn 0.707107 0.000000 0.707107 +vn 1.000000 0.000000 -0.000005 +vn 1.000000 0.000000 -0.000005 +vn 1.000000 0.000000 -0.000005 +vn 1.000000 0.000000 0.000005 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707105 0.000000 -0.707108 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.000008 0.000000 -1.000000 +vn -0.000008 0.000000 -1.000000 +vn -0.000008 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000006 1.000000 0.000000 +vn -0.000006 1.000000 0.000000 +vn -0.000006 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.000001 1.000000 0.000000 +vn 0.000003 1.000000 0.000000 +vn 0.000000 1.000000 0.000031 +vn 0.000006 1.000000 0.000000 +vn -0.000006 1.000000 0.000000 +vn -0.000010 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000008 1.000000 0.000000 +vn 0.000008 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000008 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.000003 1.000000 0.000000 +vn 0.000000 1.000000 0.000031 +vn -0.000006 1.000000 0.000000 +vn 0.000006 1.000000 0.000000 +vn 0.000010 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000001 1.000000 -0.000008 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000006 1.000000 0.000000 +vn 0.000010 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.000008 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.000008 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -0.000010 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000008 -1.000000 0.000000 +vn -0.000006 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -0.000001 -1.000000 0.000000 +vn 0.000003 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000006 -1.000000 0.000000 +vn -0.000006 -1.000000 0.000000 +vn -0.000010 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000008 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -0.000002 -1.000000 0.000000 +vn -0.000002 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000001 -1.000000 0.000000 +vn 0.000004 -1.000000 0.000031 +vn -0.000006 -1.000000 0.000000 +vn 0.000006 -1.000000 0.000000 +vn 0.000010 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000006 -1.000000 -0.000004 +vn 0.000010 -1.000000 0.000010 +vn 0.000000 -1.000000 0.000000 +vn -0.000008 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -0.000008 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.707109 0.000000 0.707105 +vn 0.707108 0.000000 0.707105 +vn 0.707108 0.000000 0.707105 +vn 0.707107 0.000000 0.707107 +vn 1.000000 0.000000 0.000005 +vn 1.000000 0.000000 0.000005 +vn 1.000000 0.000000 0.000005 +vn 1.000000 0.000000 -0.000005 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707108 0.000000 -0.707105 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.000008 0.000000 -1.000000 +vn -0.000008 0.000000 -1.000000 +vn -0.000008 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.707106 0.000000 0.707108 +vn -0.707106 0.000000 0.707108 +vn -0.707106 0.000000 0.707108 +vn -0.707104 0.000000 0.707110 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707105 0.000000 0.707108 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707108 0.000000 0.707105 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn 0.000010 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -0.707105 0.000000 -0.707108 +vn -0.707105 0.000000 -0.707108 +vn -0.707105 0.000000 -0.707109 +vn -0.707107 0.000000 -0.707107 +vn -1.000000 0.000000 0.000005 +vn -1.000000 0.000000 0.000005 +vn -1.000000 0.000000 0.000005 +vn -1.000000 0.000000 -0.000005 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.707105 0.000000 0.707108 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -0.000002 0.000000 1.000000 +vn -0.000002 0.000000 1.000000 +vn -0.000002 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.707108 0.000000 -0.707106 +vn 0.707108 0.000000 -0.707106 +vn 0.707108 0.000000 -0.707106 +vn 0.707109 0.000000 -0.707105 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.707107 0.000000 -0.707107 +vn -0.707107 0.000000 -0.707107 +vn -0.707107 0.000000 -0.707107 +vn -0.707107 0.000000 -0.707107 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.707106 0.000000 -0.707108 +vn -0.707106 0.000000 -0.707108 +vn -0.707106 0.000000 -0.707108 +vn -0.707105 0.000000 -0.707108 +vn -0.000002 0.000000 1.000000 +vn -0.000002 0.000000 1.000000 +vn -0.000002 0.000000 1.000000 +vn 0.000005 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -0.004331 0.000011 0.999991 +vn -0.004331 0.000011 0.999991 +vn -0.004331 0.000011 0.999991 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000006 1.000000 0.000000 +vn 0.000006 1.000000 0.000000 +vn 0.000006 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000003 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.000010 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000008 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.000003 1.000000 0.000000 +vn 0.000000 1.000000 -0.000031 +vn -0.000006 1.000000 0.000000 +vn 0.000006 1.000000 0.000000 +vn 0.000010 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000001 1.000000 0.000008 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000006 1.000000 0.000000 +vn 0.000010 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.000008 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.000008 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.000001 1.000000 0.000008 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.000006 1.000000 0.000000 +vn -0.000010 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000008 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.000004 -1.000000 +vn 0.000000 0.000001 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000002 0.000002 -1.000000 +vn 0.000000 -0.000002 -1.000000 +vn 0.000000 -0.000004 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000001 -1.000000 +vn 0.000000 0.000001 -1.000000 +vn 0.000000 0.000001 -1.000000 +vn 0.000000 -0.000004 -1.000000 +vn 0.000000 -0.000004 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.000004 -1.000000 +vn 0.000000 -0.000002 -1.000000 +vn -0.000002 0.000002 -1.000000 +vn 0.000000 0.000001 -1.000000 +vn 0.000000 -0.000004 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.000002 -1.000000 +vn 0.000000 -0.000001 -1.000000 +vn 0.000000 0.000004 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000001 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.000002 -1.000000 +vn 0.000000 -0.000001 -1.000000 +vn 0.000000 0.000004 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.707099 -0.707114 0.000000 +vn -0.707099 -0.707114 0.000000 +vn -0.707099 -0.707114 0.000000 +vn -0.707109 -0.707105 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.707106 -0.707107 0.000000 +vn 0.707106 -0.707107 0.000000 +vn 0.707106 -0.707107 0.000000 +vn 0.707111 -0.707102 0.000000 +vn 0.000001 1.000000 0.000000 +vn 0.000001 1.000000 0.000000 +vn 0.000001 1.000000 0.000000 +vn 0.000001 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.000001 1.000000 0.000000 +vn -0.000001 1.000000 0.000000 +vn -0.000001 1.000000 0.000000 +vn -0.000001 1.000000 0.000000 +vn -0.707099 -0.707114 0.000000 +vn -0.707099 -0.707114 0.000000 +vn -0.707099 -0.707114 0.000000 +vn -0.707109 -0.707105 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.707106 -0.707107 0.000000 +vn 0.707106 -0.707107 0.000000 +vn 0.707106 -0.707107 0.000000 +vn 0.707109 -0.707105 0.000000 +vn 0.000002 1.000000 0.000000 +vn 0.000002 1.000000 0.000000 +vn 0.000002 1.000000 0.000000 +vn 0.000002 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -0.707107 0.707106 0.000000 +vn -0.707107 0.707106 0.000000 +vn -0.707107 0.707106 0.000000 +vn -0.707105 0.707109 0.000000 +vn -1.000000 -0.000018 0.000000 +vn -1.000000 -0.000018 0.000000 +vn -1.000000 -0.000018 0.000000 +vn -1.000000 0.000009 0.000000 +vn -0.707107 -0.707107 0.000000 +vn -0.707107 -0.707107 0.000000 +vn -0.707107 -0.707107 0.000000 +vn -0.707107 -0.707107 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.707112 0.707102 0.000000 +vn 0.707112 0.707102 0.000000 +vn 0.707112 0.707102 0.000000 +vn 0.707104 0.707109 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.707107 0.707107 0.000000 +vn -0.707107 0.707107 0.000000 +vn -0.707107 0.707107 0.000000 +vn -0.707109 0.707104 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.707107 0.707107 0.000000 +vn 0.707107 0.707107 0.000000 +vn 0.707107 0.707107 0.000000 +vn 0.707104 0.707109 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.707107 0.707107 0.000000 +vn -0.707107 0.707107 0.000000 +vn -0.707107 0.707107 0.000000 +vn -0.707102 0.707112 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 1.000000 -0.000001 0.000000 +vn 1.000000 -0.000001 0.000000 +vn 1.000000 -0.000001 0.000000 +vn 1.000000 0.000019 0.000000 +vn 0.707114 0.707099 0.000000 +vn 0.707114 0.707099 0.000000 +vn 0.707114 0.707099 0.000000 +vn 0.707105 0.707109 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.000002 1.000000 0.000000 +vn -0.000002 1.000000 0.000000 +vn -0.000002 1.000000 0.000000 +vn -0.000002 1.000000 0.000000 +vn 0.000015 0.000000 1.000000 +vn 0.000015 0.000000 1.000000 +vn 0.000015 0.000000 1.000000 +vn 0.000000 -0.000031 1.000000 +vn 0.000000 0.000010 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000019 1.000000 +vn -0.000015 -0.000019 1.000000 +vn 0.000000 -0.000031 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -0.000008 1.000000 +vn 0.000000 -0.000008 1.000000 +vn 0.000000 0.000031 1.000000 +vn 0.000000 0.000031 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000010 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -0.000019 1.000000 +vn 0.000000 -0.000010 1.000000 +vn 0.000000 0.000031 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000010 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -0.000031 1.000000 +vn 0.000000 -0.000019 1.000000 +vn 0.000000 0.000019 1.000000 +vn 0.000000 0.000010 1.000000 +vn 0.000000 -0.000031 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -0.000019 1.000000 +vn 0.000000 -0.000010 1.000000 +vn 0.000000 0.000031 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000008 1.000000 +vn 0.000000 0.000008 1.000000 +vn 0.000010 0.000000 1.000000 +vn 0.000010 0.000000 1.000000 +vn 0.000000 -0.000031 1.000000 +vn -0.000010 0.000000 1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.000001 -1.000000 +vn 0.000000 0.000004 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.000002 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000001 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.000004 -1.000000 +vn 0.000000 -0.000002 -1.000000 +vn 0.000000 0.000002 -1.000000 +vn 0.000000 0.000001 -1.000000 +vn 0.000000 -0.000004 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000001 -1.000000 +vn 0.000000 0.000001 -1.000000 +vn 0.000000 0.000001 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.000004 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.000004 -1.000000 +vn 0.000000 -0.000002 -1.000000 +vn -0.000002 0.000002 -1.000000 +vn 0.000000 0.000001 -1.000000 +vn 0.000000 -0.000004 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000001 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.000002 -1.000000 +vn 0.000000 -0.000001 -1.000000 +vn 0.000000 0.000004 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.707107 -0.707107 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 1.000000 0.000001 0.000000 +vn 1.000000 0.000001 0.000000 +vn 1.000000 0.000001 0.000000 +vn 1.000000 -0.000009 0.000000 +vn 0.707102 0.707111 0.000000 +vn 0.707102 0.707111 0.000000 +vn 0.707102 0.707111 0.000000 +vn 0.707110 0.707104 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.000002 1.000000 0.000000 +vn -0.000002 1.000000 0.000000 +vn -0.000002 1.000000 0.000000 +vn -0.000002 1.000000 0.000000 +vn -0.707111 -0.707102 0.000000 +vn -0.707111 -0.707102 0.000000 +vn -0.707111 -0.707102 0.000000 +vn -0.707104 -0.707110 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 0.707101 -0.707112 0.000000 +vn 0.000001 1.000000 0.000000 +vn 0.000001 1.000000 0.000000 +vn 0.000001 1.000000 0.000000 +vn 0.000001 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.000001 1.000000 0.000000 +vn -0.000001 1.000000 0.000000 +vn -0.000001 1.000000 0.000000 +vn -0.000001 1.000000 0.000000 +vn -0.707114 -0.707100 0.000000 +vn -0.707114 -0.707100 0.000000 +vn -0.707114 -0.707100 0.000000 +vn -0.707104 -0.707110 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 0.707107 -0.707107 0.000000 +vn 0.707101 -0.707112 0.000000 +vn 0.000002 1.000000 0.000000 +vn 0.000002 1.000000 0.000000 +vn 0.000002 1.000000 0.000000 +vn 0.000002 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -0.707107 0.707107 0.000000 +vn -0.707107 0.707107 0.000000 +vn -0.707107 0.707107 0.000000 +vn -0.707112 0.707101 0.000000 +vn -1.000000 0.000027 0.000000 +vn -1.000000 0.000027 0.000000 +vn -1.000000 0.000027 0.000000 +vn -1.000000 -0.000009 0.000000 +vn -0.707107 -0.707107 0.000000 +vn -0.707107 -0.707107 0.000000 +vn -0.707107 -0.707107 0.000000 +vn -0.707107 -0.707107 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.707099 0.707114 0.000000 +vn 0.707100 0.707114 0.000000 +vn 0.707100 0.707114 0.000000 +vn 0.707109 0.707104 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.707107 0.707107 0.000000 +vn -0.707107 0.707107 0.000000 +vn -0.707107 0.707107 0.000000 +vn -0.707104 0.707109 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.707107 0.707107 0.000000 +vn 0.707107 0.707107 0.000000 +vn 0.707107 0.707107 0.000000 +vn 0.707109 0.707104 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.707107 0.707107 0.000000 +vn -0.707107 0.707107 0.000000 +vn -0.707107 0.707107 0.000000 +vn -0.707109 0.707104 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -0.000010 1.000000 +vn 0.000000 0.000031 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -0.000019 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000010 1.000000 +vn 0.000005 0.000000 1.000000 +vn 0.000000 -0.000031 1.000000 +vn 0.000000 -0.000008 1.000000 +vn 0.000000 -0.000008 1.000000 +vn 0.000000 -0.000008 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000008 1.000000 +vn 0.000000 0.000008 1.000000 +vn 0.000000 -0.000031 1.000000 +vn 0.000000 -0.000031 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000031 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000010 1.000000 +vn 0.000000 -0.000031 1.000000 +vn 0.000000 -0.000019 1.000000 +vn 0.000000 0.000019 1.000000 +vn 0.000000 0.000010 1.000000 +vn 0.000000 -0.000031 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -0.000019 1.000000 +vn 0.000000 -0.000010 1.000000 +vn 0.000000 0.000031 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -0.000019 1.000000 +vn -0.000015 0.000019 1.000000 +vn 0.000000 0.000010 1.000000 +vn 0.000000 -0.000031 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 1.000000 0.000000 0.000002 +vn 1.000000 0.000000 0.000002 +vn 1.000000 0.000000 0.000002 +vn 1.000000 0.000022 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000010 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000012 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -1.000000 -0.000001 0.000001 +vn -1.000000 -0.000001 0.000001 +vn -1.000000 -0.000001 0.000001 +vn -1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000002 +vn 1.000000 0.000000 0.000002 +vn 1.000000 0.000000 0.000002 +vn 1.000000 -0.000035 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000002 +vn -1.000000 0.000000 0.000002 +vn -1.000000 0.000000 0.000002 +vn -1.000000 0.000035 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000012 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000002 +vn -1.000000 0.000000 0.000002 +vn -1.000000 0.000000 0.000002 +vn -1.000000 -0.000022 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 -0.000010 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000001 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -0.707106 -0.707107 +vn 0.000000 -0.707107 -0.707107 +vn 0.000000 -0.707107 -0.707107 +vn 0.000000 -0.707107 -0.707106 +vn 0.000000 -0.944677 -0.328002 +vn 0.000000 -0.944677 -0.328002 +vn 0.000000 -0.993804 -0.111145 +vn 0.000000 -0.993803 -0.111158 +vn 0.000000 -0.707105 0.707109 +vn 0.000000 -0.707105 0.707109 +vn 0.000000 -0.707105 0.707109 +vn 0.000000 -0.707104 0.707110 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -0.000002 -1.000000 0.000001 +vn 0.000001 -1.000000 0.000000 +vn 0.000000 -1.000000 -0.000005 +vn 0.000000 -1.000000 0.000000 +vn 0.000001 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.707110 -0.707103 +vn 0.000000 0.707110 -0.707103 +vn 0.000000 0.707110 -0.707103 +vn 0.000000 0.707109 -0.707104 +vn 0.000000 0.111142 -0.993805 +vn 0.000000 0.111141 -0.993805 +vn 0.000000 -0.111142 -0.993805 +vn 0.000000 -0.111142 -0.993805 +vn 0.000000 -0.707109 -0.707104 +vn 0.000000 -0.707109 -0.707104 +vn 0.000000 -0.707109 -0.707104 +vn 0.000000 -0.707109 -0.707104 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.000002 -1.000000 +vn 0.000000 -0.000008 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 -0.000002 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 -0.000002 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.707105 0.707108 +vn 0.000000 0.707105 0.707108 +vn 0.000000 0.707105 0.707108 +vn 0.000000 0.707105 0.707109 +vn 0.000000 0.944681 0.327990 +vn 0.000000 0.944681 0.327990 +vn 0.000000 0.993804 0.111145 +vn 0.000000 0.993801 0.111171 +vn 0.000000 0.707107 -0.707106 +vn 0.000000 0.707107 -0.707106 +vn 0.000000 0.707107 -0.707106 +vn 0.000000 0.707108 -0.707105 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000031 -1.000000 +vn 0.000000 0.000031 -1.000000 +vn 0.000000 0.000031 -1.000000 +vn 0.000000 0.000031 -1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.707109 0.707104 +vn 0.000000 -0.707109 0.707104 +vn 0.000000 -0.707109 0.707104 +vn 0.000000 -0.707109 0.707104 +vn 0.000000 -0.328018 0.944672 +vn 0.000000 -0.328018 0.944672 +vn 0.000000 -0.111142 0.993805 +vn 0.000000 -0.111142 0.993805 +vn 0.000000 0.707109 0.707104 +vn 0.000000 0.707109 0.707104 +vn 0.000000 0.707109 0.707104 +vn 0.000000 0.707110 0.707103 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -0.000031 -1.000000 +vn 0.000000 -0.000031 -1.000000 +vn 0.000000 -0.000031 -1.000000 +vn 0.000000 -0.000031 -1.000000 +s 1 +f 169/202/337 170/203/338 171/204/339 +f 171/204/339 170/203/338 172/205/340 +f 172/205/340 170/203/338 173/206/341 +f 172/205/340 173/206/341 174/207/342 +f 175/208/343 173/206/341 170/203/338 +f 172/205/340 174/207/342 176/209/344 +s 2 +f 177/210/345 178/211/346 179/212/347 +f 179/212/347 178/211/346 180/213/348 +f 179/212/347 180/213/348 181/214/349 +f 181/214/349 180/213/348 182/215/350 +f 181/214/349 183/216/351 179/212/347 +f 179/212/347 183/216/351 184/217/352 +s 3 +f 185/218/353 186/219/354 187/220/355 +f 187/220/355 186/219/354 188/221/356 +f 187/220/355 188/221/356 189/222/357 +f 189/222/357 188/221/356 190/223/358 +f 189/222/357 191/224/359 187/220/355 +f 187/220/355 191/224/359 192/225/360 +s 4 +f 193/226/361 194/227/362 195/228/363 +f 195/228/363 194/227/362 196/229/364 +s 5 +f 197/230/365 198/231/366 199/232/367 +f 199/232/367 198/231/366 200/233/368 +f 199/232/367 200/233/368 201/234/369 +f 201/234/369 200/233/368 202/235/370 +f 201/234/369 203/236/371 199/232/367 +f 199/232/367 203/236/371 204/237/372 +s 6 +f 205/238/373 206/239/374 207/240/375 +f 207/240/375 206/239/374 208/241/376 +f 207/240/375 208/241/376 209/242/377 +f 209/242/377 208/241/376 210/243/378 +f 210/243/378 208/241/376 211/244/379 +f 207/240/375 209/242/377 212/245/380 +s 7 +f 213/246/381 214/247/382 215/248/383 +f 215/248/383 214/247/382 216/249/384 +f 215/248/383 216/249/384 217/250/385 +f 217/250/385 216/249/384 218/251/386 +f 218/251/386 216/249/384 219/252/387 +f 215/248/383 217/250/385 220/253/388 +s 8 +f 221/254/389 222/255/390 223/256/391 +f 223/256/391 222/255/390 224/257/392 +f 223/256/391 224/257/392 225/258/393 +f 225/258/393 224/257/392 226/259/394 +f 226/259/394 224/257/392 227/260/395 +f 223/256/391 225/258/393 228/261/396 +s 9 +f 229/262/397 230/263/398 231/264/399 +f 231/264/399 230/263/398 232/265/400 +f 232/265/400 230/263/398 233/266/401 +f 234/267/402 235/268/403 230/263/398 +f 230/263/398 235/268/403 233/266/401 +f 232/265/400 233/266/401 236/269/404 +s 10 +f 237/270/405 238/271/406 239/272/407 +f 239/272/407 238/271/406 240/273/408 +s 11 +f 216/249/409 172/205/410 219/252/411 +f 219/252/411 172/205/410 176/209/412 +s 12 +f 219/252/413 176/209/414 218/251/415 +f 218/251/415 176/209/414 174/207/416 +s 13 +f 173/206/417 217/250/418 174/207/419 +f 174/207/419 217/250/418 218/251/420 +s 14 +f 217/250/421 173/206/422 220/253/423 +f 220/253/423 173/206/422 175/208/424 +s 15 +f 220/253/425 175/208/426 215/248/427 +f 215/248/427 175/208/426 170/203/428 +s 16 +f 215/248/429 170/203/430 213/246/431 +f 213/246/431 170/203/430 169/202/432 +s 17 +f 238/271/433 169/202/434 193/226/435 +f 193/226/435 169/202/434 171/204/436 +f 193/226/435 171/204/436 194/227/437 +f 194/227/437 171/204/436 214/247/438 +f 194/227/437 214/247/438 237/270/439 +f 237/270/439 214/247/438 238/271/433 +f 238/271/433 214/247/438 213/246/440 +f 238/271/433 213/246/440 169/202/434 +s 18 +f 222/255/441 177/210/442 224/257/443 +f 224/257/443 177/210/442 179/212/444 +s 19 +f 224/257/445 179/212/446 227/260/447 +f 227/260/447 179/212/446 184/217/448 +s 20 +f 227/260/449 184/217/450 226/259/451 +f 226/259/451 184/217/450 183/216/452 +s 21 +f 181/214/453 225/258/454 183/216/455 +f 183/216/455 225/258/454 226/259/456 +s 22 +f 225/258/457 181/214/458 228/261/459 +f 228/261/459 181/214/458 182/215/460 +s 23 +f 228/261/461 182/215/462 223/256/463 +f 223/256/463 182/215/462 180/213/464 +s 24 +f 223/256/465 180/213/466 221/254/467 +f 221/254/467 180/213/466 178/211/468 +s 25 +f 240/273/469 178/211/470 195/228/471 +f 195/228/471 178/211/470 177/210/472 +f 195/228/471 177/210/472 193/226/473 +f 193/226/473 177/210/472 222/255/474 +f 193/226/473 222/255/474 238/271/475 +f 238/271/475 222/255/474 221/254/476 +f 238/271/475 221/254/476 240/273/469 +f 240/273/469 221/254/476 178/211/470 +s 26 +f 198/231/477 197/230/478 195/228/479 +f 195/228/479 197/230/478 229/262/480 +f 195/228/479 229/262/480 240/273/481 +f 240/273/481 229/262/480 231/264/482 +f 240/273/481 231/264/482 239/272/483 +f 239/272/483 231/264/482 198/231/477 +f 239/272/483 198/231/477 196/229/484 +f 196/229/484 198/231/477 195/228/479 +s 27 +f 229/262/485 197/230/486 230/263/487 +f 230/263/487 197/230/486 199/232/488 +s 28 +f 230/263/489 199/232/490 234/267/491 +f 234/267/491 199/232/490 204/237/492 +s 29 +f 234/267/493 204/237/494 235/268/495 +f 235/268/495 204/237/494 203/236/496 +s 30 +f 201/234/497 233/266/498 203/236/499 +f 203/236/499 233/266/498 235/268/500 +s 31 +f 233/266/501 201/234/502 236/269/503 +f 236/269/503 201/234/502 202/235/504 +s 32 +f 236/269/505 202/235/506 232/265/507 +f 232/265/507 202/235/506 200/233/508 +s 33 +f 232/265/509 200/233/510 231/264/511 +f 231/264/511 200/233/510 198/231/512 +s 34 +f 206/239/513 196/229/514 185/218/515 +f 185/218/515 196/229/514 194/227/516 +f 185/218/515 194/227/516 186/219/517 +f 186/219/517 194/227/516 237/270/518 +f 186/219/517 237/270/518 205/238/519 +f 205/238/519 237/270/518 239/272/520 +f 205/238/519 239/272/520 206/239/513 +f 206/239/513 239/272/520 196/229/514 +s 35 +f 206/239/521 185/218/522 208/241/523 +f 208/241/523 185/218/522 187/220/524 +s 36 +f 208/241/525 187/220/526 211/244/527 +f 211/244/527 187/220/526 192/225/528 +s 37 +f 211/244/529 192/225/530 210/243/531 +f 210/243/531 192/225/530 191/224/532 +s 38 +f 189/222/533 209/242/534 191/224/535 +f 191/224/535 209/242/534 210/243/536 +s 39 +f 209/242/537 189/222/538 212/245/539 +f 212/245/539 189/222/538 190/223/540 +s 40 +f 212/245/541 190/223/542 207/240/543 +f 207/240/543 190/223/542 188/221/544 +s 41 +f 207/240/545 188/221/546 205/238/547 +f 205/238/547 188/221/546 186/219/548 +s 42 +f 214/247/549 171/204/550 216/249/551 +f 216/249/551 171/204/550 172/205/552 +s 43 +f 241/274/553 242/275/554 243/276/555 +f 243/276/555 242/275/554 244/277/556 +f 244/277/556 242/275/554 245/278/557 +f 244/277/556 245/278/557 246/279/558 +f 246/279/558 245/278/557 247/280/559 +f 242/275/554 248/281/560 245/278/557 +f 245/278/557 248/281/560 249/282/561 +f 249/282/561 248/281/560 250/283/562 +f 249/282/561 250/283/562 251/284/563 +f 251/284/563 250/283/562 252/285/564 +f 251/284/563 252/285/564 253/286/565 +f 253/286/565 252/285/564 254/287/566 +f 253/286/565 254/287/566 255/288/567 +f 255/288/567 254/287/566 256/289/568 +f 255/288/567 256/289/568 257/290/569 +f 257/290/569 256/289/568 258/291/570 +f 257/290/569 258/291/570 259/292/571 +f 252/285/564 250/283/562 260/293/572 +f 260/293/572 250/283/562 261/294/573 +f 260/293/572 261/294/573 262/295/574 +f 262/295/574 261/294/573 263/296/575 +f 262/295/574 264/297/576 260/293/572 +f 260/293/572 264/297/576 265/298/577 +f 254/287/566 252/285/564 266/299/578 +f 266/299/578 252/285/564 267/300/579 +f 266/299/578 267/300/579 268/301/580 +f 268/301/580 267/300/579 269/302/581 +f 268/301/580 269/302/581 270/303/582 +f 270/303/582 269/302/581 271/304/583 +f 271/304/583 269/302/581 272/305/584 +f 270/303/582 273/306/585 268/301/580 +f 268/301/580 273/306/585 274/307/586 +f 275/308/587 276/309/588 256/289/568 +f 256/289/568 276/309/588 258/291/570 +f 259/292/571 277/310/589 257/290/569 +f 253/286/565 278/311/590 251/284/563 +f 251/284/563 278/311/590 279/312/591 +f 279/312/591 278/311/590 280/313/592 +f 279/312/591 280/313/592 281/314/593 +f 282/315/594 283/316/595 278/311/590 +f 278/311/590 283/316/595 280/313/592 +f 249/282/561 251/284/563 284/317/596 +f 284/317/596 251/284/563 285/318/597 +f 284/317/596 285/318/597 286/319/598 +f 286/319/598 285/318/597 287/320/599 +f 286/319/598 287/320/599 288/321/600 +f 288/321/600 287/320/599 289/322/601 +f 289/322/601 287/320/599 290/323/602 +f 288/321/600 291/324/603 286/319/598 +f 286/319/598 291/324/603 292/325/604 +s 44 +f 293/326/605 255/288/606 294/327/607 +f 294/327/607 255/288/606 257/290/608 +s 45 +f 295/328/609 253/286/610 293/326/611 +f 293/326/611 253/286/610 255/288/612 +s 46 +f 296/329/613 278/311/614 295/328/615 +f 295/328/615 278/311/614 253/286/616 +s 47 +f 297/330/617 282/315/618 296/329/619 +f 296/329/619 282/315/618 278/311/620 +s 48 +f 298/331/621 283/316/622 297/330/623 +f 297/330/623 283/316/622 282/315/624 +s 49 +f 299/332/625 280/313/626 298/331/627 +f 298/331/627 280/313/626 283/316/628 +s 50 +f 300/333/629 281/314/630 299/332/631 +f 299/332/631 281/314/630 280/313/632 +s 51 +f 301/334/633 279/312/634 300/333/635 +f 300/333/635 279/312/634 281/314/636 +s 52 +f 302/335/637 251/284/638 301/334/639 +f 301/334/639 251/284/638 279/312/640 +s 53 +f 303/336/641 285/318/642 302/335/643 +f 302/335/643 285/318/642 251/284/644 +s 54 +f 304/337/645 287/320/646 303/336/647 +f 303/336/647 287/320/646 285/318/648 +s 55 +f 305/338/649 290/323/650 304/337/651 +f 304/337/651 290/323/650 287/320/652 +s 56 +f 306/339/653 289/322/654 305/338/655 +f 305/338/655 289/322/654 290/323/656 +s 57 +f 307/340/657 288/321/658 306/339/659 +f 306/339/659 288/321/658 289/322/660 +s 58 +f 308/341/661 291/324/662 307/340/663 +f 307/340/663 291/324/662 288/321/664 +s 59 +f 171/204/665 292/325/666 308/341/667 +f 308/341/667 292/325/666 291/324/668 +s 60 +f 309/342/669 286/319/670 171/204/671 +f 171/204/671 286/319/670 292/325/672 +s 61 +f 310/343/673 284/317/674 309/342/675 +f 309/342/675 284/317/674 286/319/676 +s 62 +f 311/344/677 249/282/678 310/343/679 +f 310/343/679 249/282/678 284/317/680 +s 63 +f 312/345/681 245/278/682 311/344/683 +f 311/344/683 245/278/682 249/282/684 +s 64 +f 169/202/685 247/280/686 312/345/687 +f 312/345/687 247/280/686 245/278/688 +s 65 +f 313/346/689 246/279/690 169/202/691 +f 169/202/691 246/279/690 247/280/692 +s 66 +f 314/347/693 244/277/694 313/346/695 +f 313/346/695 244/277/694 246/279/696 +s 67 +f 315/348/697 243/276/698 314/347/699 +f 314/347/699 243/276/698 244/277/700 +s 68 +f 316/349/701 241/274/702 315/348/703 +f 315/348/703 241/274/702 243/276/704 +s 69 +f 317/350/705 242/275/706 316/349/707 +f 316/349/707 242/275/706 241/274/708 +s 70 +f 318/351/709 248/281/710 317/350/711 +f 317/350/711 248/281/710 242/275/712 +s 71 +f 319/352/713 250/283/714 318/351/715 +f 318/351/715 250/283/714 248/281/716 +s 72 +f 320/353/717 261/294/718 319/352/719 +f 319/352/719 261/294/718 250/283/720 +s 73 +f 321/354/721 263/296/722 320/353/723 +f 320/353/723 263/296/722 261/294/724 +s 74 +f 322/355/725 262/295/726 321/354/727 +f 321/354/727 262/295/726 263/296/728 +s 75 +f 323/356/729 264/297/730 322/355/731 +f 322/355/731 264/297/730 262/295/732 +s 76 +f 324/357/733 265/298/734 323/356/735 +f 323/356/735 265/298/734 264/297/736 +s 77 +f 325/358/737 260/293/738 324/357/739 +f 324/357/739 260/293/738 265/298/740 +s 78 +f 326/359/741 252/285/742 325/358/743 +f 325/358/743 252/285/742 260/293/744 +s 79 +f 327/360/745 267/300/746 326/359/747 +f 326/359/747 267/300/746 252/285/748 +s 80 +f 328/361/749 269/302/750 327/360/751 +f 327/360/751 269/302/750 267/300/752 +s 81 +f 329/362/753 272/305/754 328/361/755 +f 328/361/755 272/305/754 269/302/756 +s 82 +f 330/363/757 271/304/758 329/362/759 +f 329/362/759 271/304/758 272/305/760 +s 83 +f 331/364/761 270/303/762 330/363/763 +f 330/363/763 270/303/762 271/304/764 +s 84 +f 332/365/765 273/306/766 331/364/767 +f 331/364/767 273/306/766 270/303/768 +s 85 +f 333/366/769 274/307/770 332/365/771 +f 332/365/771 274/307/770 273/306/772 +s 86 +f 334/367/773 268/301/774 333/366/775 +f 333/366/775 268/301/774 274/307/776 +s 87 +f 335/368/777 266/299/778 334/367/779 +f 334/367/779 266/299/778 268/301/780 +s 88 +f 336/369/781 254/287/782 335/368/783 +f 335/368/783 254/287/782 266/299/784 +s 89 +f 337/370/785 256/289/786 336/369/787 +f 336/369/787 256/289/786 254/287/788 +s 90 +f 338/371/789 275/308/790 337/370/791 +f 337/370/791 275/308/790 256/289/792 +s 91 +f 339/372/793 276/309/794 338/371/795 +f 338/371/795 276/309/794 275/308/796 +s 92 +f 340/373/797 258/291/798 339/372/799 +f 339/372/799 258/291/798 276/309/800 +s 93 +f 341/374/801 259/292/802 340/373/803 +f 340/373/803 259/292/802 258/291/804 +s 94 +f 342/375/805 277/310/806 341/374/807 +f 341/374/807 277/310/806 259/292/808 +s 95 +f 294/327/809 257/290/810 342/375/811 +f 342/375/811 257/290/810 277/310/812 +s 96 +f 317/350/813 312/345/814 318/351/815 +f 318/351/815 312/345/814 311/344/816 +f 318/351/815 311/344/816 319/352/817 +f 319/352/817 311/344/816 310/343/818 +f 319/352/817 310/343/818 302/335/819 +f 302/335/819 310/343/818 303/336/820 +f 303/336/820 310/343/818 309/342/821 +f 303/336/820 309/342/821 304/337/822 +f 304/337/822 309/342/821 307/340/823 +f 304/337/822 307/340/823 306/339/824 +f 316/349/825 315/348/826 317/350/813 +f 317/350/813 315/348/826 314/347/827 +f 317/350/813 314/347/827 312/345/814 +f 312/345/814 314/347/827 313/346/828 +f 312/345/814 313/346/828 169/202/829 +f 171/204/830 308/341/831 309/342/821 +f 309/342/821 308/341/831 307/340/823 +f 306/339/824 305/338/832 304/337/822 +f 301/334/833 296/329/834 302/335/819 +f 302/335/819 296/329/834 295/328/835 +f 302/335/819 295/328/835 326/359/836 +f 326/359/836 295/328/835 335/368/837 +f 326/359/836 335/368/837 327/360/838 +f 327/360/838 335/368/837 334/367/839 +f 327/360/838 334/367/839 328/361/840 +f 328/361/840 334/367/839 331/364/841 +f 328/361/840 331/364/841 330/363/842 +f 300/333/843 299/332/844 301/334/833 +f 301/334/833 299/332/844 296/329/834 +f 299/332/844 298/331/845 296/329/834 +f 296/329/834 298/331/845 297/330/846 +f 335/368/837 295/328/835 336/369/847 +f 336/369/847 295/328/835 293/326/848 +f 336/369/847 293/326/848 337/370/849 +f 337/370/849 293/326/848 294/327/850 +f 337/370/849 294/327/850 340/373/851 +f 340/373/851 294/327/850 341/374/852 +f 341/374/852 294/327/850 342/375/853 +f 340/373/851 339/372/854 337/370/849 +f 337/370/849 339/372/854 338/371/855 +f 333/366/856 332/365/857 334/367/839 +f 334/367/839 332/365/857 331/364/841 +f 330/363/842 329/362/858 328/361/840 +f 302/335/819 326/359/836 319/352/817 +f 319/352/817 326/359/836 325/358/859 +f 319/352/817 325/358/859 320/353/860 +f 320/353/860 325/358/859 322/355/861 +f 320/353/860 322/355/861 321/354/862 +f 324/357/863 323/356/864 325/358/859 +f 325/358/859 323/356/864 322/355/861 +s 99 +f 343/376/865 344/377/866 345/378/867 +f 345/378/867 344/377/866 346/379/868 +f 346/379/868 344/377/866 347/380/869 +f 346/379/868 347/380/869 348/381/870 +f 348/381/870 347/380/869 349/382/871 +f 347/380/869 344/377/866 350/383/872 +f 350/383/872 344/377/866 351/384/873 +f 350/383/872 351/384/873 352/385/874 +f 352/385/874 351/384/873 353/386/875 +f 352/385/874 353/386/875 354/387/876 +f 354/387/876 353/386/875 355/388/877 +f 355/388/877 353/386/875 356/389/878 +f 355/388/877 356/389/878 357/390/879 +f 357/390/879 356/389/878 358/391/880 +f 357/390/879 358/391/880 359/392/881 +f 360/393/882 361/394/883 356/389/878 +f 356/389/878 361/394/883 358/391/880 +f 359/392/881 362/395/884 357/390/879 +f 363/396/885 364/397/886 354/387/876 +f 354/387/876 364/397/886 365/398/887 +f 354/387/876 365/398/887 352/385/874 +f 352/385/874 365/398/887 366/399/888 +f 352/385/874 366/399/888 367/400/889 +f 368/401/890 369/402/891 363/396/885 +f 363/396/885 369/402/891 364/397/886 +f 369/402/891 370/403/892 364/397/886 +f 364/397/886 370/403/892 371/404/893 +f 372/405/894 373/406/895 365/398/887 +f 365/398/887 373/406/895 374/407/896 +f 365/398/887 374/407/896 366/399/888 +f 366/399/888 374/407/896 375/408/897 +f 375/408/897 374/407/896 376/409/898 +f 375/408/897 376/409/898 377/410/899 +f 377/410/899 376/409/898 378/411/900 +f 377/410/899 378/411/900 379/412/901 +f 373/406/895 372/405/894 380/413/902 +f 380/413/902 372/405/894 381/414/903 +f 380/413/902 381/414/903 382/415/904 +f 382/415/904 381/414/903 383/416/905 +f 383/416/905 381/414/903 384/417/906 +f 382/415/904 385/418/907 380/413/902 +f 380/413/902 385/418/907 386/419/908 +f 387/420/909 388/421/910 376/409/898 +f 376/409/898 388/421/910 378/411/900 +f 379/412/901 389/422/911 377/410/899 +f 390/423/912 391/424/913 367/400/889 +f 367/400/889 391/424/913 392/425/914 +f 367/400/889 392/425/914 393/426/915 +f 393/426/915 392/425/914 394/427/916 +f 393/426/915 352/385/874 367/400/889 +s 103 +f 395/428/917 373/406/918 396/429/919 +f 396/429/919 373/406/918 380/413/920 +s 104 +f 397/430/921 374/407/922 395/428/923 +f 395/428/923 374/407/922 373/406/924 +s 105 +f 398/431/925 376/409/926 397/430/927 +f 397/430/927 376/409/926 374/407/928 +s 106 +f 214/247/929 387/420/930 398/431/931 +f 398/431/931 387/420/930 376/409/932 +s 107 +f 399/432/933 388/421/934 214/247/935 +f 214/247/935 388/421/934 387/420/936 +s 108 +f 400/433/937 378/411/938 399/432/939 +f 399/432/939 378/411/938 388/421/940 +s 109 +f 401/434/941 379/412/942 400/433/943 +f 400/433/943 379/412/942 378/411/944 +s 110 +f 402/435/945 389/422/946 401/434/947 +f 401/434/947 389/422/946 379/412/948 +s 111 +f 403/436/949 377/410/950 402/435/951 +f 402/435/951 377/410/950 389/422/952 +s 112 +f 404/437/953 375/408/954 403/436/955 +f 403/436/955 375/408/954 377/410/956 +s 113 +f 405/438/957 366/399/958 404/437/959 +f 404/437/959 366/399/958 375/408/960 +s 114 +f 406/439/961 367/400/962 405/438/963 +f 405/438/963 367/400/962 366/399/964 +s 115 +f 407/440/965 390/423/966 406/439/967 +f 406/439/967 390/423/966 367/400/968 +s 116 +f 408/441/969 391/424/970 407/440/971 +f 407/440/971 391/424/970 390/423/972 +s 117 +f 409/442/973 392/425/974 408/441/975 +f 408/441/975 392/425/974 391/424/976 +s 118 +f 410/443/977 394/427/978 409/442/979 +f 409/442/979 394/427/978 392/425/980 +s 119 +f 411/444/981 393/426/982 410/443/983 +f 410/443/983 393/426/982 394/427/984 +s 120 +f 412/445/985 352/385/986 411/444/987 +f 411/444/987 352/385/986 393/426/988 +s 121 +f 413/446/989 350/383/990 412/445/991 +f 412/445/991 350/383/990 352/385/992 +s 122 +f 414/447/993 347/380/994 413/446/995 +f 413/446/995 347/380/994 350/383/996 +s 123 +f 415/448/997 349/382/998 414/447/999 +f 414/447/999 349/382/998 347/380/1000 +s 124 +f 416/449/1001 348/381/1002 415/448/1003 +f 415/448/1003 348/381/1002 349/382/1004 +s 125 +f 417/450/1005 346/379/1006 416/449/1007 +f 416/449/1007 346/379/1006 348/381/1008 +s 126 +f 418/451/1009 345/378/1010 417/450/1011 +f 417/450/1011 345/378/1010 346/379/1012 +s 127 +f 419/452/1013 343/376/1014 418/451/1015 +f 418/451/1015 343/376/1014 345/378/1016 +s 128 +f 420/453/1017 344/377/1018 419/452/1019 +f 419/452/1019 344/377/1018 343/376/1020 +s 129 +f 421/454/1021 351/384/1022 420/453/1023 +f 420/453/1023 351/384/1022 344/377/1024 +s 130 +f 422/455/1025 353/386/1026 421/454/1027 +f 421/454/1027 353/386/1026 351/384/1028 +s 131 +f 423/456/1029 356/389/1030 422/455/1031 +f 422/455/1031 356/389/1030 353/386/1032 +s 132 +f 424/457/1033 360/393/1034 423/456/1035 +f 423/456/1035 360/393/1034 356/389/1036 +s 133 +f 425/458/1037 361/394/1038 424/457/1039 +f 424/457/1039 361/394/1038 360/393/1040 +s 134 +f 426/459/1041 358/391/1042 425/458/1043 +f 425/458/1043 358/391/1042 361/394/1044 +s 135 +f 427/460/1045 359/392/1046 426/459/1047 +f 426/459/1047 359/392/1046 358/391/1048 +s 136 +f 428/461/1049 362/395/1050 427/460/1051 +f 427/460/1051 362/395/1050 359/392/1052 +s 137 +f 429/462/1053 357/390/1054 428/461/1055 +f 428/461/1055 357/390/1054 362/395/1056 +s 138 +f 430/463/1057 355/388/1058 429/462/1059 +f 429/462/1059 355/388/1058 357/390/1060 +s 139 +f 431/464/1061 354/387/1062 430/463/1063 +f 430/463/1063 354/387/1062 355/388/1064 +s 140 +f 432/465/1065 363/396/1066 431/464/1067 +f 431/464/1067 363/396/1066 354/387/1068 +s 141 +f 433/466/1069 368/401/1070 432/465/1071 +f 432/465/1071 368/401/1070 363/396/1072 +s 142 +f 434/467/1073 369/402/1074 433/466/1075 +f 433/466/1075 369/402/1074 368/401/1076 +s 143 +f 435/468/1077 370/403/1078 434/467/1079 +f 434/467/1079 370/403/1078 369/402/1080 +s 144 +f 436/469/1081 371/404/1082 435/468/1083 +f 435/468/1083 371/404/1082 370/403/1084 +s 145 +f 437/470/1085 364/397/1086 436/469/1087 +f 436/469/1087 364/397/1086 371/404/1088 +s 146 +f 438/471/1089 365/398/1090 437/470/1091 +f 437/470/1091 365/398/1090 364/397/1092 +s 147 +f 439/472/1093 372/405/1094 438/471/1095 +f 438/471/1095 372/405/1094 365/398/1096 +s 148 +f 440/473/1097 381/414/1098 439/472/1099 +f 439/472/1099 381/414/1098 372/405/1100 +s 149 +f 441/474/1101 384/417/1102 440/473/1103 +f 440/473/1103 384/417/1102 381/414/1104 +s 150 +f 442/475/1105 383/416/1106 441/474/1107 +f 441/474/1107 383/416/1106 384/417/1108 +s 151 +f 443/476/1109 382/415/1110 442/475/1111 +f 442/475/1111 382/415/1110 383/416/1112 +s 152 +f 444/477/1113 385/418/1114 443/476/1115 +f 443/476/1115 385/418/1114 382/415/1116 +s 153 +f 213/246/1117 386/419/1118 444/477/1119 +f 444/477/1119 386/419/1118 385/418/1120 +s 154 +f 396/429/1121 380/413/1122 213/246/1123 +f 213/246/1123 380/413/1122 386/419/1124 +s 155 +f 420/453/1125 413/446/1126 421/454/1127 +f 421/454/1127 413/446/1126 412/445/1128 +f 421/454/1127 412/445/1128 431/464/1129 +f 431/464/1129 412/445/1128 438/471/1130 +f 431/464/1129 438/471/1130 437/470/1131 +f 419/452/1132 418/451/1133 420/453/1125 +f 420/453/1125 418/451/1133 417/450/1134 +f 420/453/1125 417/450/1134 414/447/1135 +f 414/447/1135 417/450/1134 416/449/1136 +f 414/447/1135 416/449/1136 415/448/1137 +f 414/447/1135 413/446/1126 420/453/1125 +f 411/444/1138 406/439/1139 412/445/1128 +f 412/445/1128 406/439/1139 405/438/1140 +f 412/445/1128 405/438/1140 438/471/1130 +f 438/471/1130 405/438/1140 395/428/1141 +f 438/471/1130 395/428/1141 439/472/1142 +f 439/472/1142 395/428/1141 396/429/1143 +f 439/472/1142 396/429/1143 440/473/1144 +f 440/473/1144 396/429/1143 443/476/1145 +f 440/473/1144 443/476/1145 442/475/1146 +f 410/443/1147 409/442/1148 411/444/1138 +f 411/444/1138 409/442/1148 406/439/1139 +f 409/442/1148 408/441/1149 406/439/1139 +f 406/439/1139 408/441/1149 407/440/1150 +f 395/428/1141 405/438/1140 397/430/1151 +f 397/430/1151 405/438/1140 404/437/1152 +f 397/430/1151 404/437/1152 398/431/1153 +f 398/431/1153 404/437/1152 403/436/1154 +f 398/431/1153 403/436/1154 400/433/1155 +f 400/433/1155 403/436/1154 401/434/1156 +f 401/434/1156 403/436/1154 402/435/1157 +f 400/433/1155 399/432/1158 398/431/1153 +f 398/431/1153 399/432/1158 214/247/1159 +f 213/246/1160 444/477/1161 396/429/1143 +f 396/429/1143 444/477/1161 443/476/1145 +f 442/475/1146 441/474/1162 440/473/1144 +f 436/469/1163 435/468/1164 437/470/1131 +f 437/470/1131 435/468/1164 434/467/1165 +f 437/470/1131 434/467/1165 432/465/1166 +f 432/465/1166 434/467/1165 433/466/1167 +f 432/465/1166 431/464/1129 437/470/1131 +f 421/454/1127 431/464/1129 422/455/1168 +f 422/455/1168 431/464/1129 430/463/1169 +f 422/455/1168 430/463/1169 423/456/1170 +f 423/456/1170 430/463/1169 429/462/1171 +f 423/456/1170 429/462/1171 426/459/1172 +f 426/459/1172 429/462/1171 427/460/1173 +f 427/460/1173 429/462/1171 428/461/1174 +f 426/459/1172 425/458/1175 423/456/1170 +f 423/456/1170 425/458/1175 424/457/1176 +s 159 +f 445/478/1177 346/379/1178 446/479/1179 +f 446/479/1179 346/379/1178 447/480/1180 +s 160 +f 258/291/1181 448/481/1182 450/482/1183 +f 450/482/1183 448/481/1182 449/483/1184 +s 161 +f 451/484/1185 452/485/1186 453/486/1187 +f 453/486/1187 452/485/1186 454/487/1188 +f 454/487/1188 452/485/1186 455/488/1189 +f 454/487/1188 455/488/1189 456/489/1190 +f 456/489/1190 455/488/1189 457/490/1191 +f 452/485/1186 458/491/1192 455/488/1189 +f 455/488/1189 458/491/1192 459/492/1193 +f 459/492/1193 458/491/1192 460/493/1194 +f 459/492/1193 460/493/1194 461/494/1195 +f 461/494/1195 460/493/1194 462/495/1196 +f 461/494/1195 462/495/1196 463/496/1197 +f 463/496/1197 462/495/1196 464/497/1198 +f 463/496/1197 464/497/1198 465/498/1199 +f 462/495/1196 460/493/1194 466/499/1200 +f 466/499/1200 460/493/1194 467/500/1201 +f 466/499/1200 467/500/1201 468/501/1202 +f 468/501/1202 467/500/1201 469/502/1203 +f 469/502/1203 467/500/1201 470/503/1204 +f 468/501/1202 471/504/1205 466/499/1200 +f 462/495/1196 472/505/1206 464/497/1198 +f 464/497/1198 472/505/1206 473/506/1207 +f 473/506/1207 472/505/1206 474/507/1208 +f 473/506/1207 474/507/1208 445/478/1209 +f 445/478/1209 474/507/1208 475/508/1210 +f 475/508/1210 474/507/1208 476/509/1211 +f 445/478/1209 477/510/1212 473/506/1207 +f 473/506/1207 477/510/1212 478/511/1213 +f 463/496/1197 465/498/1199 479/512/1214 +f 479/512/1214 465/498/1199 480/513/1215 +f 479/512/1214 480/513/1215 481/514/1216 +f 481/514/1216 480/513/1215 482/515/1217 +f 481/514/1216 482/515/1217 483/516/1218 +f 484/517/1219 485/518/1220 480/513/1215 +f 480/513/1215 485/518/1220 482/515/1217 +f 483/516/1218 486/519/1221 481/514/1216 +f 461/494/1195 463/496/1197 487/520/1222 +f 487/520/1222 463/496/1197 488/521/1223 +f 487/520/1222 488/521/1223 489/522/1224 +f 489/522/1224 488/521/1223 490/523/1225 +f 489/522/1224 491/524/1226 487/520/1222 +f 487/520/1222 491/524/1226 492/525/1227 +f 459/492/1193 461/494/1195 493/526/1228 +f 493/526/1228 461/494/1195 494/527/1229 +f 493/526/1228 494/527/1229 495/528/1230 +f 495/528/1230 494/527/1229 496/529/1231 +f 495/528/1230 496/529/1231 497/530/1232 +f 497/530/1232 496/529/1231 498/531/1233 +f 498/531/1233 496/529/1231 499/532/1234 +f 497/530/1232 500/533/1235 495/528/1230 +f 495/528/1230 500/533/1235 501/534/1236 +s 162 +f 452/485/1237 502/535/1238 458/491/1239 +f 458/491/1239 502/535/1238 503/536/1240 +s 163 +f 458/491/1241 503/536/1242 460/493/1243 +f 460/493/1243 503/536/1242 504/537/1244 +s 164 +f 460/493/1245 504/537/1246 467/500/1247 +f 467/500/1247 504/537/1246 505/538/1248 +s 165 +f 467/500/1249 505/538/1250 470/503/1251 +f 470/503/1251 505/538/1250 506/539/1252 +s 166 +f 470/503/1253 506/539/1254 469/502/1255 +f 469/502/1255 506/539/1254 507/540/1256 +s 167 +f 469/502/1257 507/540/1258 468/501/1259 +f 468/501/1259 507/540/1258 508/541/1260 +s 168 +f 468/501/1261 508/541/1262 471/504/1263 +f 471/504/1263 508/541/1262 509/542/1264 +s 169 +f 471/504/1265 509/542/1266 466/499/1267 +f 466/499/1267 509/542/1266 510/543/1268 +s 170 +f 466/499/1269 510/543/1270 462/495/1271 +f 462/495/1271 510/543/1270 511/544/1272 +s 171 +f 462/495/1273 511/544/1274 472/505/1275 +f 472/505/1275 511/544/1274 512/545/1276 +s 172 +f 472/505/1277 512/545/1278 474/507/1279 +f 474/507/1279 512/545/1278 513/546/1280 +s 173 +f 474/507/1281 513/546/1282 476/509/1283 +f 476/509/1283 513/546/1282 514/547/1284 +s 174 +f 476/509/1285 514/547/1286 475/508/1287 +f 475/508/1287 514/547/1286 515/548/1288 +s 175 +f 475/508/1289 515/548/1290 445/478/1291 +f 445/478/1291 515/548/1290 516/549/1292 +s 176 +f 445/478/1293 516/549/1294 477/510/1295 +f 477/510/1295 516/549/1294 517/550/1296 +s 177 +f 477/510/1297 517/550/1298 478/511/1299 +f 478/511/1299 517/550/1298 518/551/1300 +s 178 +f 478/511/1301 518/551/1302 473/506/1303 +f 473/506/1303 518/551/1302 519/552/1304 +s 179 +f 473/506/1305 519/552/1306 464/497/1307 +f 464/497/1307 519/552/1306 520/553/1308 +s 180 +f 464/497/1309 520/553/1310 465/498/1311 +f 465/498/1311 520/553/1310 521/554/1312 +s 181 +f 465/498/1313 521/554/1314 480/513/1315 +f 480/513/1315 521/554/1314 522/555/1316 +s 182 +f 480/513/1317 522/555/1318 484/517/1319 +f 484/517/1319 522/555/1318 523/556/1320 +s 183 +f 484/517/1321 523/556/1322 485/518/1323 +f 485/518/1323 523/556/1322 524/557/1324 +s 184 +f 485/518/1325 524/557/1326 482/515/1327 +f 482/515/1327 524/557/1326 525/558/1328 +s 185 +f 482/515/1329 525/558/1330 483/516/1331 +f 483/516/1331 525/558/1330 526/559/1332 +s 186 +f 483/516/1333 526/559/1334 486/519/1335 +f 486/519/1335 526/559/1334 527/560/1336 +s 187 +f 486/519/1337 527/560/1338 481/514/1339 +f 481/514/1339 527/560/1338 528/561/1340 +s 188 +f 481/514/1341 528/561/1342 479/512/1343 +f 479/512/1343 528/561/1342 529/562/1344 +s 189 +f 479/512/1345 529/562/1346 463/496/1347 +f 463/496/1347 529/562/1346 530/563/1348 +s 190 +f 463/496/1349 530/563/1350 488/521/1351 +f 488/521/1351 530/563/1350 531/564/1352 +s 191 +f 488/521/1353 531/564/1354 490/523/1355 +f 490/523/1355 531/564/1354 532/565/1356 +s 192 +f 490/523/1357 532/565/1358 489/522/1359 +f 489/522/1359 532/565/1358 533/566/1360 +s 193 +f 489/522/1361 533/566/1362 491/524/1363 +f 491/524/1363 533/566/1362 534/567/1364 +s 194 +f 491/524/1365 534/567/1366 492/525/1367 +f 492/525/1367 534/567/1366 535/568/1368 +s 195 +f 492/525/1369 535/568/1370 487/520/1371 +f 487/520/1371 535/568/1370 536/569/1372 +s 196 +f 487/520/1373 536/569/1374 461/494/1375 +f 461/494/1375 536/569/1374 537/570/1376 +s 197 +f 461/494/1377 537/570/1378 494/527/1379 +f 494/527/1379 537/570/1378 538/571/1380 +s 198 +f 494/527/1381 538/571/1382 496/529/1383 +f 496/529/1383 538/571/1382 539/572/1384 +s 199 +f 496/529/1385 539/572/1386 499/532/1387 +f 499/532/1387 539/572/1386 540/573/1388 +s 200 +f 499/532/1389 540/573/1390 498/531/1391 +f 498/531/1391 540/573/1390 541/574/1392 +s 201 +f 498/531/1393 541/574/1394 497/530/1395 +f 497/530/1395 541/574/1394 542/575/1396 +s 202 +f 497/530/1397 542/575/1398 500/533/1399 +f 500/533/1399 542/575/1398 543/576/1400 +s 203 +f 500/533/1401 543/576/1402 501/534/1403 +f 501/534/1403 543/576/1402 544/577/1404 +s 204 +f 501/534/1405 544/577/1406 495/528/1407 +f 495/528/1407 544/577/1406 545/578/1408 +s 205 +f 495/528/1409 545/578/1410 493/526/1411 +f 493/526/1411 545/578/1410 546/579/1412 +s 206 +f 493/526/1413 546/579/1414 459/492/1415 +f 459/492/1415 546/579/1414 547/580/1416 +s 207 +f 459/492/1417 547/580/1418 455/488/1419 +f 455/488/1419 547/580/1418 548/581/1420 +s 208 +f 455/488/1421 548/581/1422 457/490/1423 +f 457/490/1423 548/581/1422 549/582/1424 +s 209 +f 457/490/1425 549/582/1426 456/489/1427 +f 456/489/1427 549/582/1426 550/583/1428 +s 210 +f 456/489/1429 550/583/1430 454/487/1431 +f 454/487/1431 550/583/1430 551/584/1432 +s 211 +f 454/487/1433 551/584/1434 453/486/1435 +f 453/486/1435 551/584/1434 552/585/1436 +s 212 +f 453/486/1437 552/585/1438 451/484/1439 +f 451/484/1439 552/585/1438 553/586/1440 +s 213 +f 451/484/1441 553/586/1442 452/485/1443 +f 452/485/1443 553/586/1442 502/535/1444 +s 214 +f 553/586/1445 552/585/1446 502/535/1447 +f 502/535/1447 552/585/1446 551/584/1448 +f 502/535/1447 551/584/1448 548/581/1449 +f 548/581/1449 551/584/1448 550/583/1450 +f 548/581/1449 550/583/1450 549/582/1451 +f 502/535/1447 548/581/1449 503/536/1452 +f 503/536/1452 548/581/1449 547/580/1453 +f 503/536/1452 547/580/1453 504/537/1454 +f 504/537/1454 547/580/1453 537/570/1455 +f 504/537/1454 537/570/1455 530/563/1456 +f 530/563/1456 537/570/1455 531/564/1457 +f 531/564/1457 537/570/1455 536/569/1458 +f 531/564/1457 536/569/1458 533/566/1459 +f 533/566/1459 536/569/1458 534/567/1460 +f 534/567/1460 536/569/1458 535/568/1461 +f 547/580/1453 546/579/1462 537/570/1455 +f 537/570/1455 546/579/1462 538/571/1463 +f 538/571/1463 546/579/1462 545/578/1464 +f 538/571/1463 545/578/1464 539/572/1465 +f 539/572/1465 545/578/1464 542/575/1466 +f 539/572/1465 542/575/1466 541/574/1467 +f 544/577/1468 543/576/1469 545/578/1464 +f 545/578/1464 543/576/1469 542/575/1466 +f 541/574/1467 540/573/1470 539/572/1465 +f 533/566/1459 532/565/1471 531/564/1457 +f 529/562/1472 521/554/1473 530/563/1456 +f 530/563/1456 521/554/1473 520/553/1474 +f 530/563/1456 520/553/1474 511/544/1475 +f 511/544/1475 520/553/1474 512/545/1476 +f 512/545/1476 520/553/1474 519/552/1477 +f 512/545/1476 519/552/1477 513/546/1478 +f 513/546/1478 519/552/1477 516/549/1479 +f 513/546/1478 516/549/1479 515/548/1480 +f 521/554/1473 529/562/1472 522/555/1481 +f 522/555/1481 529/562/1472 528/561/1482 +f 522/555/1481 528/561/1482 525/558/1483 +f 525/558/1483 528/561/1482 526/559/1484 +f 526/559/1484 528/561/1482 527/560/1485 +f 525/558/1483 524/557/1486 522/555/1481 +f 522/555/1481 524/557/1486 523/556/1487 +f 518/551/1488 517/550/1489 519/552/1477 +f 519/552/1477 517/550/1489 516/549/1479 +f 515/548/1480 514/547/1490 513/546/1478 +f 510/543/1491 505/538/1492 511/544/1475 +f 511/544/1475 505/538/1492 504/537/1454 +f 511/544/1475 504/537/1454 530/563/1456 +f 509/542/1493 508/541/1494 510/543/1491 +f 510/543/1491 508/541/1494 507/540/1495 +f 510/543/1491 507/540/1495 505/538/1492 +f 505/538/1492 507/540/1495 506/539/1496 +s 218 +f 554/587/1497 555/588/1498 556/589/1499 +f 556/589/1499 555/588/1498 557/590/1500 +f 557/590/1500 555/588/1498 558/591/1501 +f 557/590/1500 558/591/1501 559/592/1502 +f 559/592/1502 558/591/1501 560/593/1503 +f 558/591/1501 555/588/1498 561/594/1504 +f 561/594/1504 555/588/1498 562/595/1505 +f 561/594/1504 562/595/1505 563/596/1506 +f 563/596/1506 562/595/1505 564/597/1507 +f 563/596/1506 564/597/1507 565/598/1508 +f 565/598/1508 564/597/1507 566/599/1509 +f 566/599/1509 564/597/1507 567/600/1510 +f 566/599/1509 567/600/1510 568/601/1511 +f 568/601/1511 567/600/1510 448/481/1512 +f 568/601/1511 448/481/1512 569/602/1513 +f 570/603/1514 571/604/1515 567/600/1510 +f 567/600/1510 571/604/1515 448/481/1512 +f 569/602/1513 572/605/1516 568/601/1511 +f 573/606/1517 574/607/1518 565/598/1508 +f 565/598/1508 574/607/1518 575/608/1519 +f 565/598/1508 575/608/1519 563/596/1506 +f 563/596/1506 575/608/1519 576/609/1520 +f 563/596/1506 576/609/1520 577/610/1521 +f 577/610/1521 576/609/1520 578/611/1522 +f 577/610/1521 578/611/1522 579/612/1523 +f 579/612/1523 578/611/1522 580/613/1524 +f 581/614/1525 582/615/1526 573/606/1517 +f 573/606/1517 582/615/1526 583/616/1527 +f 573/606/1517 583/616/1527 574/607/1518 +f 574/607/1518 583/616/1527 584/617/1528 +f 576/609/1520 575/608/1519 585/618/1529 +f 585/618/1529 575/608/1519 586/619/1530 +f 585/618/1529 586/619/1530 587/620/1531 +f 587/620/1531 586/619/1530 588/621/1532 +f 587/620/1531 588/621/1532 589/622/1533 +f 589/622/1533 588/621/1532 590/623/1534 +f 590/623/1534 588/621/1532 591/624/1535 +f 589/622/1533 592/625/1536 587/620/1531 +f 587/620/1531 592/625/1536 593/626/1537 +f 585/618/1529 594/627/1538 576/609/1520 +f 576/609/1520 594/627/1538 595/628/1539 +f 595/628/1539 594/627/1538 596/629/1540 +f 595/628/1539 596/629/1540 597/630/1541 +f 597/630/1541 596/629/1540 598/631/1542 +f 597/630/1541 598/631/1542 599/632/1543 +f 600/633/1544 601/634/1545 596/629/1540 +f 596/629/1540 601/634/1545 598/631/1542 +f 599/632/1543 602/635/1546 597/630/1541 +f 579/612/1523 603/636/1547 577/610/1521 +f 577/610/1521 603/636/1547 604/637/1548 +s 221 +f 555/588/1549 605/638/1550 562/595/1551 +f 562/595/1551 605/638/1550 606/639/1552 +s 222 +f 562/595/1553 606/639/1554 564/597/1555 +f 564/597/1555 606/639/1554 607/640/1556 +s 223 +f 564/597/1557 607/640/1558 567/600/1559 +f 567/600/1559 607/640/1558 608/641/1560 +s 224 +f 567/600/1561 608/641/1562 570/603/1563 +f 570/603/1563 608/641/1562 609/642/1564 +s 225 +f 570/603/1565 609/642/1566 571/604/1567 +f 571/604/1567 609/642/1566 610/643/1568 +s 226 +f 571/604/1569 610/643/1570 448/481/1571 +f 448/481/1571 610/643/1570 611/644/1572 +s 227 +f 448/481/1573 611/644/1574 569/602/1575 +f 569/602/1575 611/644/1574 612/645/1576 +s 228 +f 569/602/1577 612/645/1578 572/605/1579 +f 572/605/1579 612/645/1578 613/646/1580 +s 229 +f 572/605/1581 613/646/1582 568/601/1583 +f 568/601/1583 613/646/1582 614/647/1584 +s 230 +f 568/601/1585 614/647/1586 566/599/1587 +f 566/599/1587 614/647/1586 615/648/1588 +s 231 +f 566/599/1589 615/648/1590 565/598/1591 +f 565/598/1591 615/648/1590 616/649/1592 +s 232 +f 565/598/1593 616/649/1594 573/606/1595 +f 573/606/1595 616/649/1594 617/650/1596 +s 233 +f 573/606/1597 617/650/1598 581/614/1599 +f 581/614/1599 617/650/1598 618/651/1600 +s 234 +f 581/614/1601 618/651/1602 582/615/1603 +f 582/615/1603 618/651/1602 619/652/1604 +s 235 +f 582/615/1605 619/652/1606 583/616/1607 +f 583/616/1607 619/652/1606 620/653/1608 +s 236 +f 583/616/1609 620/653/1610 584/617/1611 +f 584/617/1611 620/653/1610 621/654/1612 +s 237 +f 584/617/1613 621/654/1614 574/607/1615 +f 574/607/1615 621/654/1614 622/655/1616 +s 238 +f 574/607/1617 622/655/1618 575/608/1619 +f 575/608/1619 622/655/1618 623/656/1620 +s 239 +f 575/608/1621 623/656/1622 586/619/1623 +f 586/619/1623 623/656/1622 624/657/1624 +s 240 +f 586/619/1625 624/657/1626 588/621/1627 +f 588/621/1627 624/657/1626 625/658/1628 +s 241 +f 588/621/1629 625/658/1630 591/624/1631 +f 591/624/1631 625/658/1630 626/659/1632 +s 242 +f 591/624/1633 626/659/1634 590/623/1635 +f 590/623/1635 626/659/1634 627/660/1636 +s 243 +f 590/623/1637 627/660/1638 589/622/1639 +f 589/622/1639 627/660/1638 628/661/1640 +s 244 +f 589/622/1641 628/661/1642 592/625/1643 +f 592/625/1643 628/661/1642 629/662/1644 +s 245 +f 592/625/1645 629/662/1646 593/626/1647 +f 593/626/1647 629/662/1646 630/663/1648 +s 246 +f 593/626/1649 630/663/1650 587/620/1651 +f 587/620/1651 630/663/1650 631/664/1652 +s 247 +f 587/620/1653 631/664/1654 585/618/1655 +f 585/618/1655 631/664/1654 632/665/1656 +s 248 +f 585/618/1657 632/665/1658 594/627/1659 +f 594/627/1659 632/665/1658 633/666/1660 +s 249 +f 594/627/1661 633/666/1662 596/629/1663 +f 596/629/1663 633/666/1662 634/667/1664 +s 250 +f 596/629/1665 634/667/1666 600/633/1667 +f 600/633/1667 634/667/1666 635/668/1668 +s 251 +f 600/633/1669 635/668/1670 601/634/1671 +f 601/634/1671 635/668/1670 636/669/1672 +s 252 +f 601/634/1673 636/669/1674 598/631/1675 +f 598/631/1675 636/669/1674 637/670/1676 +s 253 +f 598/631/1677 637/670/1678 599/632/1679 +f 599/632/1679 637/670/1678 638/671/1680 +s 254 +f 599/632/1681 638/671/1682 602/635/1683 +f 602/635/1683 638/671/1682 639/672/1684 +s 255 +f 602/635/1685 639/672/1686 597/630/1687 +f 597/630/1687 639/672/1686 640/673/1688 +s 256 +f 597/630/1689 640/673/1690 595/628/1691 +f 595/628/1691 640/673/1690 641/674/1692 +s 257 +f 595/628/1693 641/674/1694 576/609/1695 +f 576/609/1695 641/674/1694 642/675/1696 +s 258 +f 576/609/1697 642/675/1698 578/611/1699 +f 578/611/1699 642/675/1698 643/676/1700 +s 259 +f 578/611/1701 643/676/1702 580/613/1703 +f 580/613/1703 643/676/1702 644/677/1704 +s 260 +f 580/613/1705 644/677/1706 579/612/1707 +f 579/612/1707 644/677/1706 645/678/1708 +s 261 +f 579/612/1709 645/678/1710 603/636/1711 +f 603/636/1711 645/678/1710 646/679/1712 +s 262 +f 603/636/1713 646/679/1714 604/637/1715 +f 604/637/1715 646/679/1714 647/680/1716 +s 263 +f 604/637/1717 647/680/1718 577/610/1719 +f 577/610/1719 647/680/1718 648/681/1720 +s 264 +f 577/610/1721 648/681/1722 563/596/1723 +f 563/596/1723 648/681/1722 649/682/1724 +s 265 +f 563/596/1725 649/682/1726 561/594/1727 +f 561/594/1727 649/682/1726 650/683/1728 +s 266 +f 561/594/1729 650/683/1730 558/591/1731 +f 558/591/1731 650/683/1730 651/684/1732 +s 267 +f 558/591/1733 651/684/1734 560/593/1735 +f 560/593/1735 651/684/1734 652/685/1736 +s 268 +f 560/593/1737 652/685/1738 559/592/1739 +f 559/592/1739 652/685/1738 653/686/1740 +s 269 +f 559/592/1741 653/686/1742 557/590/1743 +f 557/590/1743 653/686/1742 654/687/1744 +s 270 +f 557/590/1745 654/687/1746 556/589/1747 +f 556/589/1747 654/687/1746 655/688/1748 +s 271 +f 556/589/1749 655/688/1750 554/587/1751 +f 554/587/1751 655/688/1750 656/689/1752 +s 272 +f 554/587/1753 656/689/1754 555/588/1755 +f 555/588/1755 656/689/1754 605/638/1756 +s 273 +f 656/689/1757 655/688/1758 605/638/1759 +f 605/638/1759 655/688/1758 654/687/1760 +f 605/638/1759 654/687/1760 651/684/1761 +f 651/684/1761 654/687/1760 653/686/1762 +f 651/684/1761 653/686/1762 652/685/1763 +f 651/684/1761 650/683/1764 605/638/1759 +f 605/638/1759 650/683/1764 606/639/1765 +f 606/639/1765 650/683/1764 649/682/1766 +f 606/639/1765 649/682/1766 607/640/1767 +f 607/640/1767 649/682/1766 616/649/1768 +f 607/640/1767 616/649/1768 615/648/1769 +f 648/681/1770 643/676/1771 649/682/1766 +f 649/682/1766 643/676/1771 642/675/1772 +f 649/682/1766 642/675/1772 616/649/1768 +f 616/649/1768 642/675/1772 623/656/1773 +f 616/649/1768 623/656/1773 617/650/1774 +f 617/650/1774 623/656/1773 622/655/1775 +f 617/650/1774 622/655/1775 619/652/1776 +f 619/652/1776 622/655/1775 620/653/1777 +f 620/653/1777 622/655/1775 621/654/1778 +f 647/680/1779 646/679/1780 648/681/1770 +f 648/681/1770 646/679/1780 645/678/1781 +f 648/681/1770 645/678/1781 643/676/1771 +f 643/676/1771 645/678/1781 644/677/1782 +f 641/674/1783 633/666/1784 642/675/1772 +f 642/675/1772 633/666/1784 632/665/1785 +f 642/675/1772 632/665/1785 623/656/1773 +f 623/656/1773 632/665/1785 624/657/1786 +f 624/657/1786 632/665/1785 631/664/1787 +f 624/657/1786 631/664/1787 625/658/1788 +f 625/658/1788 631/664/1787 628/661/1789 +f 625/658/1788 628/661/1789 627/660/1790 +f 633/666/1784 641/674/1783 634/667/1791 +f 634/667/1791 641/674/1783 640/673/1792 +f 634/667/1791 640/673/1792 637/670/1793 +f 637/670/1793 640/673/1792 638/671/1794 +f 638/671/1794 640/673/1792 639/672/1795 +f 637/670/1793 636/669/1796 634/667/1791 +f 634/667/1791 636/669/1796 635/668/1797 +f 630/663/1798 629/662/1799 631/664/1787 +f 631/664/1787 629/662/1799 628/661/1789 +f 627/660/1790 626/659/1800 625/658/1788 +f 619/652/1776 618/651/1801 617/650/1774 +f 607/640/1767 615/648/1769 608/641/1802 +f 608/641/1802 615/648/1769 614/647/1803 +f 608/641/1802 614/647/1803 611/644/1804 +f 611/644/1804 614/647/1803 612/645/1805 +f 612/645/1805 614/647/1803 613/646/1806 +f 611/644/1804 610/643/1807 608/641/1802 +f 608/641/1802 610/643/1807 609/642/1808 +s 277 +f 657/690/1809 658/691/1810 659/692/1811 +f 659/692/1811 658/691/1810 660/693/1812 +f 660/693/1812 658/691/1810 661/694/1813 +f 662/695/1814 663/696/1815 658/691/1810 +f 658/691/1810 663/696/1815 661/694/1813 +f 660/693/1812 661/694/1813 664/697/1816 +s 278 +f 630/663/1817 635/668/1818 665/698/1819 +f 665/698/1819 635/668/1818 666/699/1820 +f 665/698/1819 666/699/1820 667/700/1821 +f 667/700/1821 666/699/1820 668/701/1822 +f 667/700/1821 669/702/1823 665/698/1819 +f 665/698/1819 669/702/1823 670/703/1824 +s 279 +f 671/704/1825 672/705/1826 673/706/1827 +f 673/706/1827 672/705/1826 674/707/1828 +f 673/706/1827 674/707/1828 675/708/1829 +f 675/708/1829 674/707/1828 676/709/1830 +f 676/709/1830 674/707/1828 677/710/1831 +f 673/706/1827 675/708/1829 678/711/1832 +s 280 +f 679/712/1833 680/713/1834 681/714/1835 +f 681/714/1835 680/713/1834 682/715/1836 +s 281 +f 683/716/1837 684/717/1838 685/718/1839 +f 685/718/1839 684/717/1838 686/719/1840 +f 685/718/1839 686/719/1840 687/720/1841 +f 687/720/1841 686/719/1840 688/721/1842 +f 688/721/1842 686/719/1840 689/722/1843 +f 685/718/1839 687/720/1841 690/723/1844 +s 282 +f 691/724/1845 692/725/1846 693/726/1847 +f 693/726/1847 692/725/1846 694/727/1848 +f 693/726/1847 694/727/1848 695/728/1849 +f 695/728/1849 694/727/1848 696/729/1850 +f 695/728/1849 697/730/1851 693/726/1847 +f 693/726/1847 697/730/1851 698/731/1852 +s 283 +f 699/732/1853 700/733/1854 701/734/1855 +f 701/734/1855 700/733/1854 702/735/1856 +f 701/734/1855 702/735/1856 703/736/1857 +f 703/736/1857 702/735/1856 704/737/1858 +f 703/736/1857 705/738/1859 701/734/1855 +f 701/734/1855 705/738/1859 706/739/1860 +s 284 +f 544/577/1861 549/582/1862 707/740/1863 +f 707/740/1863 549/582/1862 708/741/1864 +f 707/740/1863 708/741/1864 709/742/1865 +f 709/742/1865 708/741/1864 710/743/1866 +f 710/743/1866 708/741/1864 711/744/1867 +f 707/740/1863 709/742/1865 712/745/1868 +s 285 +f 713/746/1869 714/747/1870 715/748/1871 +f 715/748/1871 714/747/1870 716/749/1872 +f 716/749/1872 714/747/1870 717/750/1873 +f 716/749/1872 717/750/1873 718/751/1874 +f 719/752/1875 717/750/1873 714/747/1870 +f 716/749/1872 718/751/1874 720/753/1876 +s 286 +f 721/754/1877 722/755/1878 723/756/1879 +f 723/756/1879 722/755/1878 724/757/1880 +s 287 +f 702/735/1881 660/693/1882 704/737/1883 +f 704/737/1883 660/693/1882 664/697/1884 +s 288 +f 704/737/1885 664/697/1886 703/736/1887 +f 703/736/1887 664/697/1886 661/694/1888 +s 289 +f 663/696/1889 705/738/1890 661/694/1891 +f 661/694/1891 705/738/1890 703/736/1892 +s 290 +f 705/738/1893 663/696/1894 706/739/1895 +f 706/739/1895 663/696/1894 662/695/1896 +s 291 +f 706/739/1897 662/695/1898 701/734/1899 +f 701/734/1899 662/695/1898 658/691/1900 +s 292 +f 701/734/1901 658/691/1902 699/732/1903 +f 699/732/1903 658/691/1902 657/690/1904 +s 293 +f 722/755/1905 657/690/1906 679/712/1907 +f 679/712/1907 657/690/1906 659/692/1908 +f 679/712/1907 659/692/1908 680/713/1909 +f 680/713/1909 659/692/1908 700/733/1910 +f 680/713/1909 700/733/1910 721/754/1911 +f 721/754/1911 700/733/1910 722/755/1905 +f 722/755/1905 700/733/1910 699/732/1912 +f 722/755/1905 699/732/1912 657/690/1906 +s 294 +f 549/582/1913 630/663/1914 708/741/1915 +f 708/741/1915 630/663/1914 665/698/1916 +s 295 +f 708/741/1917 665/698/1918 711/744/1919 +f 711/744/1919 665/698/1918 670/703/1920 +s 296 +f 711/744/1921 670/703/1922 710/743/1923 +f 710/743/1923 670/703/1922 669/702/1924 +s 297 +f 667/700/1925 709/742/1926 669/702/1927 +f 669/702/1927 709/742/1926 710/743/1928 +s 298 +f 709/742/1929 667/700/1930 712/745/1931 +f 712/745/1931 667/700/1930 668/701/1932 +s 299 +f 712/745/1933 668/701/1934 707/740/1935 +f 707/740/1935 668/701/1934 666/699/1936 +s 300 +f 707/740/1937 666/699/1938 544/577/1939 +f 544/577/1939 666/699/1938 635/668/1940 +s 301 +f 724/757/1941 635/668/1942 681/714/1943 +f 681/714/1943 635/668/1942 630/663/1944 +f 681/714/1943 630/663/1944 679/712/1945 +f 679/712/1945 630/663/1944 549/582/1946 +f 679/712/1945 549/582/1946 722/755/1947 +f 722/755/1947 549/582/1946 544/577/1948 +f 722/755/1947 544/577/1948 724/757/1941 +f 724/757/1941 544/577/1948 635/668/1942 +s 302 +f 684/717/1949 683/716/1950 681/714/1951 +f 681/714/1951 683/716/1950 713/746/1952 +f 681/714/1951 713/746/1952 724/757/1953 +f 724/757/1953 713/746/1952 715/748/1954 +f 724/757/1953 715/748/1954 723/756/1955 +f 723/756/1955 715/748/1954 684/717/1949 +f 723/756/1955 684/717/1949 682/715/1956 +f 682/715/1956 684/717/1949 681/714/1951 +s 303 +f 713/746/1957 683/716/1958 714/747/1959 +f 714/747/1959 683/716/1958 685/718/1960 +s 304 +f 714/747/1961 685/718/1962 719/752/1963 +f 719/752/1963 685/718/1962 690/723/1964 +s 305 +f 719/752/1965 690/723/1966 717/750/1967 +f 717/750/1967 690/723/1966 687/720/1968 +s 306 +f 688/721/1969 718/751/1970 687/720/1971 +f 687/720/1971 718/751/1970 717/750/1972 +s 307 +f 718/751/1973 688/721/1974 720/753/1975 +f 720/753/1975 688/721/1974 689/722/1976 +s 308 +f 720/753/1977 689/722/1978 716/749/1979 +f 716/749/1979 689/722/1978 686/719/1980 +s 309 +f 716/749/1981 686/719/1982 715/748/1983 +f 715/748/1983 686/719/1982 684/717/1984 +s 310 +f 692/725/1985 682/715/1986 671/704/1987 +f 671/704/1987 682/715/1986 680/713/1988 +f 671/704/1987 680/713/1988 672/705/1989 +f 672/705/1989 680/713/1988 721/754/1990 +f 672/705/1989 721/754/1990 691/724/1991 +f 691/724/1991 721/754/1990 723/756/1992 +f 691/724/1991 723/756/1992 692/725/1985 +f 692/725/1985 723/756/1992 682/715/1986 +s 311 +f 692/725/1993 671/704/1994 694/727/1995 +f 694/727/1995 671/704/1994 673/706/1996 +s 312 +f 694/727/1997 673/706/1998 696/729/1999 +f 696/729/1999 673/706/1998 678/711/2000 +s 313 +f 696/729/2001 678/711/2002 695/728/2003 +f 695/728/2003 678/711/2002 675/708/2004 +s 314 +f 676/709/2005 697/730/2006 675/708/2007 +f 675/708/2007 697/730/2006 695/728/2008 +s 315 +f 697/730/2009 676/709/2010 698/731/2011 +f 698/731/2011 676/709/2010 677/710/2012 +s 316 +f 698/731/2013 677/710/2014 693/726/2015 +f 693/726/2015 677/710/2014 674/707/2016 +s 317 +f 693/726/2017 674/707/2018 691/724/2019 +f 691/724/2019 674/707/2018 672/705/2020 +s 318 +f 700/733/2021 659/692/2022 702/735/2023 +f 702/735/2023 659/692/2022 660/693/2024 +v 205.000000 -185.000000 70.000000 +v 203.500000 -185.000000 70.000000 +v 204.948883 -185.000000 21.111763 +v 204.948883 -105.000000 21.111761 +v 205.000000 -185.000000 21.500000 +v 204.799057 -105.000015 20.750000 +v 204.560654 -105.000015 20.439337 +v 204.250000 -105.000000 20.200958 +v 203.888214 -105.000000 20.051111 +v 203.500000 -105.000000 20.000000 +v 205.000000 -105.000000 21.500000 +v 204.799057 -185.000000 20.750000 +v 204.560654 -185.000000 20.439339 +v 204.250000 -185.000000 20.200958 +v 203.888229 -185.000000 20.051102 +v 203.500000 -185.000000 20.000000 +v 203.500000 -185.000000 21.500000 +v 203.500000 -105.000000 21.500000 +v 203.500000 -105.000000 70.000000 +v 205.000000 -105.000000 70.000000 +vt 0.443412 0.034167 +vt 0.443412 0.034167 +vt 0.444154 0.033998 +vt 0.441237 0.034324 +vt 0.441237 0.034325 +vt 0.437776 0.034460 +vt 0.437776 0.034460 +vt 0.433266 0.034564 +vt 0.433266 0.034564 +vt 0.428014 0.034629 +vt 0.428014 0.034629 +vt 0.422378 0.034651 +vt 0.422378 0.034651 +vt 0.444154 0.033998 +vt 0.422378 0.033998 +vt 0.444154 0.012876 +vt 0.422378 0.012876 +vt 0.422378 0.033998 +vt 0.422378 0.012876 +vt 0.444154 0.012876 +vn 0.991443 0.000000 -0.130540 +vn 0.991443 0.000000 -0.130540 +vn 0.991443 0.000000 -0.130540 +vn 0.923901 0.000000 -0.382631 +vn 0.923896 0.000000 -0.382644 +vn 0.793330 0.000000 -0.608791 +vn 0.793316 0.000000 -0.608810 +vn 0.608786 0.000000 -0.793335 +vn 0.608761 0.000000 -0.793353 +vn 0.382664 0.000000 -0.923888 +vn 0.382730 0.000001 -0.923860 +vn 0.130464 0.000001 -0.991453 +vn 0.130464 0.000000 -0.991453 +vn 0.991444 0.000000 -0.130535 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +s 1 +f 727/758/2025 728/759/2026 729/760/2027 +f 728/759/2026 727/758/2025 730/761/2028 +f 730/761/2028 727/758/2025 736/762/2029 +f 730/761/2028 736/762/2029 731/763/2030 +f 731/763/2030 736/762/2029 737/764/2031 +f 731/763/2030 737/764/2031 732/765/2032 +f 732/765/2032 737/764/2031 738/766/2033 +f 732/765/2032 738/766/2033 733/767/2034 +f 733/767/2034 738/766/2033 739/768/2035 +f 733/767/2034 739/768/2035 740/769/2036 +f 734/770/2037 733/767/2034 740/769/2036 +f 729/760/2027 728/759/2026 735/771/2038 +s 2 +f 739/768/2039 738/766/2040 740/769/2041 +f 740/769/2041 738/766/2040 737/764/2042 +f 740/769/2041 737/764/2042 741/772/2043 +f 741/772/2043 737/764/2042 736/762/2044 +f 741/772/2043 736/762/2044 727/758/2045 +f 727/758/2045 729/760/2046 741/772/2043 +f 741/772/2043 729/760/2046 725/773/2047 +f 741/772/2043 725/773/2047 726/774/2048 +s 3 +f 741/772/2049 726/774/2050 742/775/2051 +f 742/775/2051 726/774/2050 743/776/2052 +s 4 +f 744/777/2053 735/771/2054 742/775/2055 +f 742/775/2055 735/771/2054 728/759/2056 +f 742/775/2055 728/759/2056 730/761/2057 +f 730/761/2057 731/763/2058 742/775/2055 +f 742/775/2055 731/763/2058 734/770/2059 +f 731/763/2058 732/765/2060 734/770/2059 +f 734/770/2059 732/765/2060 733/767/2061 +f 742/775/2055 743/776/2062 744/777/2053 +s 5 +f 725/773/2063 744/777/2064 726/774/2065 +f 726/774/2065 744/777/2064 743/776/2066 +s 1 +f 729/760/2027 735/771/2038 725/773/2067 +f 725/773/2067 735/771/2038 744/777/2068 +v -173.500000 -185.000000 70.000000 +v 173.500000 -185.000000 70.000000 +v 173.500000 50.000000 70.000000 +v 173.500000 50.000000 68.000000 +v 173.500000 -185.000000 68.000000 +v -173.500000 50.000000 70.000000 +v -173.500000 50.000000 68.000000 +v -173.500000 -185.000000 68.000000 +vt 0.457536 0.035096 +vt 0.481342 0.035096 +vt 0.457536 0.035096 +vt 0.481342 0.035096 +vt 0.481342 0.007071 +vt 0.457536 0.007071 +vt 0.481342 0.007071 +vt 0.457536 0.007071 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +s 1 +f 750/778/2069 747/779/2070 751/780/2071 +f 751/780/2071 747/779/2070 748/781/2072 +s 2 +f 746/782/2073 745/783/2074 749/784/2075 +f 749/784/2075 745/783/2074 752/785/2076 +s 3 +f 745/783/2077 746/782/2078 750/778/2079 +f 750/778/2079 746/782/2078 747/779/2080 +s 4 +f 749/784/2081 752/785/2082 748/781/2083 +f 748/781/2083 752/785/2082 751/780/2084 +v -164.542694 -262.342224 27.657822 +v -164.394684 -262.095947 27.904037 +v -164.394684 -257.385071 32.614937 +v -164.555527 -257.167664 32.832386 +v -174.957123 -252.909698 37.090294 +v -175.190567 -252.768723 37.231270 +v -175.290710 -252.674194 37.325829 +v -175.290680 -243.487915 46.512093 +v -175.006958 -243.252380 46.747654 +v -165.530350 -239.363037 50.636971 +v -165.311890 -239.248093 50.751900 +v -171.383041 -236.657104 53.342903 +v -171.526352 -236.603973 53.396049 +v -171.634460 -236.657104 53.342903 +v -181.489944 -240.685165 49.314842 +v -181.647446 -240.896942 49.103088 +v -181.647446 -255.265167 34.734848 +v -181.519684 -255.421539 34.578476 +v -181.407715 -255.500717 34.499306 +v -164.864227 -262.248779 27.751432 +v -164.864182 -252.767288 37.232746 +v -164.531052 -252.860321 37.139732 +v -164.197891 -252.772491 37.227524 +v -158.535095 -250.450653 39.549438 +v -158.328354 -250.318710 39.681297 +v -158.535034 -250.151398 39.848618 +v -158.651611 -250.083160 39.916832 +v -162.865479 -248.352997 41.646996 +v -163.228333 -248.214935 41.785065 +v -163.198593 -248.116180 41.883850 +v -163.107941 -247.963333 42.036743 +v -157.535706 -245.664230 44.335762 +v -157.455933 -245.607849 44.392197 +v -157.535706 -245.534210 44.465797 +v -157.756104 -245.372269 44.627739 +v -162.372345 -243.487839 46.512089 +v -162.532364 -243.411484 46.588524 +v -162.865479 -243.376495 46.623505 +v -163.198563 -243.431519 46.568501 +v -168.861465 -245.760422 44.239563 +v -168.998276 -245.843384 44.156647 +v -168.845917 -246.063995 43.936012 +v -164.212326 -247.993973 42.006023 +v -164.101929 -248.198807 41.801201 +v -164.197906 -248.249496 41.750511 +v -164.531021 -248.360504 41.639484 +v -169.860809 -250.554230 39.445747 +v -169.713043 -250.789795 39.210205 +v -169.527710 -250.872726 39.127281 +v -153.871490 -242.640366 47.359856 +v -153.538361 -242.679672 47.320335 +v -153.205307 -242.598816 47.401131 +v -147.542374 -240.263229 49.736755 +v -147.439194 -240.190292 49.809731 +v -147.542374 -240.058640 49.941353 +v -147.667297 -239.954742 50.045273 +v -147.875381 -239.867218 50.132748 +v -163.209702 -233.601120 56.398880 +v -163.531693 -233.492432 56.507572 +v -163.864807 -233.492432 56.507572 +v -164.175766 -233.595078 56.404999 +v -169.885406 -235.933075 54.066929 +v -169.860794 -236.025589 53.974434 +v -169.731430 -236.186020 53.813988 +v -162.853821 -262.342224 27.657822 +v -145.988846 -255.500778 34.499290 +v -145.876816 -255.421539 34.578476 +v -145.749084 -255.265167 34.734848 +v -145.749069 -241.132446 48.867546 +v -145.756287 -240.896927 49.103088 +v -145.876816 -240.797729 49.202271 +v -146.209946 -240.826645 49.173363 +v -146.347229 -240.896927 49.103088 +v -151.872803 -243.159225 46.840717 +v -152.045609 -243.252350 46.747643 +v -152.105835 -243.487885 46.512085 +v -152.105820 -252.674149 37.325844 +v -152.205917 -252.768723 37.231270 +v -152.439438 -252.909760 37.090321 +v -162.841034 -257.167664 32.832367 +v -163.001816 -257.385040 32.614937 +v -163.001831 -262.095947 27.904037 +v 155.000000 -229.822311 60.177666 +v 75.000000 -229.822281 60.177639 +v 155.000000 -229.115219 59.470562 +v 75.000000 -229.115219 59.470562 +v 75.000000 -265.177704 24.822289 +v 75.000000 -264.470551 24.115227 +v 155.000000 -265.177704 24.822327 +v 155.000000 -264.470551 24.115227 +v -205.000000 -221.413574 68.314697 +v -205.000000 -215.857895 70.000000 +v -205.000000 -222.928833 67.071053 +v -205.000000 -185.000000 70.000000 +v -205.000015 -185.000015 -0.000008 +v -205.000000 -219.684692 69.238792 +v -205.000000 -217.808762 69.807854 +v -205.000000 -275.000000 0.000000 +v -205.000000 -275.000000 10.857864 +v -205.000000 -272.071198 17.928940 +v -205.000000 -274.807861 12.808769 +v -205.000000 -274.238800 14.684700 +v -205.000000 -273.314697 16.413567 +v 205.000000 -215.857895 70.000000 +v 205.000000 -185.000000 70.000000 +v 205.000015 -185.000015 -0.000008 +v 205.000000 -275.000000 0.000000 +v 205.000000 -275.000000 10.857857 +v 205.000000 -274.807861 12.808762 +v 205.000000 -274.238800 14.684699 +v 205.000000 -273.314697 16.413559 +v 205.000015 -272.071075 17.928940 +v 205.000015 -222.928955 67.071060 +v 205.000000 -221.413574 68.314697 +v 205.000000 -219.684692 69.238792 +v 205.000000 -217.808746 69.807854 +v -175.154465 -252.790512 37.209469 +v -171.684708 -236.677643 53.322365 +v -168.896973 -245.781952 44.218052 +vt 0.405942 0.031859 +vt 0.405949 0.031848 +vt 0.405729 0.031242 +vt 0.405734 0.031225 +vt 0.406552 0.015366 +vt 0.406552 0.019482 +vt 0.406597 0.015366 +vt 0.406597 0.019482 +vt 0.404289 0.019482 +vt 0.244036 0.019298 +vt 0.263710 0.019295 +vt 0.244038 0.032118 +vt 0.263710 0.032117 +vt 0.404335 0.019482 +vt 0.404289 0.015366 +vt 0.404335 0.015366 +vt 0.407090 0.033890 +vt 0.407446 0.033890 +vt 0.406993 0.033890 +vt 0.409421 0.033890 +vt 0.409421 0.033890 +vt 0.407201 0.033890 +vt 0.407321 0.033890 +vt 0.403661 0.033890 +vt 0.403661 0.033890 +vt 0.403848 0.033890 +vt 0.403673 0.033890 +vt 0.403709 0.033890 +vt 0.403768 0.033890 +vt 0.407446 0.012793 +vt 0.409421 0.012793 +vt 0.409421 0.012793 +vt 0.403661 0.012793 +vt 0.403661 0.012793 +vt 0.403673 0.012793 +vt 0.403768 0.012793 +vt 0.403848 0.012793 +vt 0.403709 0.012793 +vt 0.404471 0.031721 +vt 0.404471 0.031808 +vt 0.404477 0.031825 +vt 0.404909 0.032676 +vt 0.404914 0.032682 +vt 0.404924 0.032688 +vt 0.405843 0.032688 +vt 0.406161 0.032083 +vt 0.406118 0.032167 +vt 0.406115 0.032160 +vt 0.406155 0.032082 +vt 0.406145 0.032075 +vt 0.405732 0.031259 +vt 0.405693 0.032346 +vt 0.405678 0.032361 +vt 0.405090 0.032361 +vt 0.405083 0.032356 +vt 0.405074 0.032344 +vt 0.404802 0.031809 +vt 0.404788 0.031800 +vt 0.404486 0.031800 +vt 0.404788 0.031729 +vt 0.404802 0.031721 +vt 0.405074 0.031185 +vt 0.405083 0.031173 +vt 0.405090 0.031168 +vt 0.405677 0.031168 +vt 0.405681 0.031739 +vt 0.405685 0.031722 +vt 0.405682 0.031705 +vt 0.405677 0.031696 +vt 0.405557 0.031459 +vt 0.405547 0.031447 +vt 0.405542 0.031443 +vt 0.405538 0.031447 +vt 0.405251 0.031499 +vt 0.405240 0.031488 +vt 0.405232 0.031499 +vt 0.405083 0.031790 +vt 0.405078 0.031807 +vt 0.405084 0.031825 +vt 0.405205 0.032065 +vt 0.405210 0.032074 +vt 0.405225 0.032082 +vt 0.405527 0.032037 +vt 0.405532 0.032030 +vt 0.404486 0.031729 +vt 0.406993 0.012793 +vt 0.406317 0.031756 +vt 0.406317 0.031773 +vt 0.405857 0.032680 +vt 0.406115 0.032173 +vt 0.406311 0.031789 +vt 0.405366 0.031807 +vt 0.405389 0.031791 +vt 0.405513 0.032029 +vt 0.405373 0.031790 +vt 0.405376 0.031785 +vt 0.405366 0.031722 +vt 0.405255 0.031505 +vt 0.405391 0.031734 +vt 0.405381 0.031739 +vt 0.405375 0.031740 +vt 0.406310 0.031739 +vt 0.405909 0.030950 +vt 0.405904 0.030940 +vt 0.405850 0.030848 +vt 0.405843 0.030841 +vt 0.405828 0.030841 +vt 0.404924 0.030841 +vt 0.405897 0.030933 +vt 0.405889 0.030928 +vt 0.405848 0.030865 +vt 0.405843 0.030872 +vt 0.405699 0.031156 +vt 0.405884 0.030933 +vt 0.405693 0.031165 +vt 0.404914 0.030848 +vt 0.404909 0.030853 +vt 0.407090 0.012793 +vt 0.407321 0.012793 +vt 0.407201 0.012793 +vt 0.930208 0.019495 +vt 0.929918 0.019633 +vt 0.929942 0.019731 +vt 0.930014 0.019883 +vt 0.934474 0.022173 +vt 0.934537 0.022229 +vt 0.934474 0.022302 +vt 0.934297 0.022463 +vt 0.930603 0.024340 +vt 0.930475 0.024416 +vt 0.930208 0.024451 +vt 0.929942 0.024396 +vt 0.925410 0.022077 +vt 0.925300 0.021994 +vt 0.925422 0.021775 +vt 0.929130 0.019853 +vt 0.929219 0.019649 +vt 0.929142 0.019598 +vt 0.928875 0.019488 +vt 0.924610 0.017303 +vt 0.924728 0.017069 +vt 0.924877 0.016986 +vt 0.928609 0.015100 +vt 0.928875 0.015007 +vt 0.929142 0.015094 +vt 0.933674 0.017406 +vt 0.933839 0.017538 +vt 0.933674 0.017704 +vt 0.933581 0.017772 +vt 0.059330 0.034185 +vt 0.059073 0.034293 +vt 0.058806 0.034293 +vt 0.058557 0.034191 +vt 0.053988 0.031863 +vt 0.054008 0.031771 +vt 0.054111 0.031611 +vt 0.066803 0.025184 +vt 0.067070 0.025145 +vt 0.067337 0.025225 +vt 0.071868 0.027551 +vt 0.071951 0.027624 +vt 0.071868 0.027755 +vt 0.071768 0.027858 +vt 0.071602 0.027945 +vt 0.938819 0.015192 +vt 0.938739 0.015098 +vt 0.938552 0.014958 +vt 0.930228 0.010718 +vt 0.930099 0.010501 +vt 0.930099 0.005810 +vt 0.930218 0.005565 +vt 0.943714 0.012378 +vt 0.943804 0.012456 +vt 0.943906 0.012612 +vt 0.943906 0.026685 +vt 0.943900 0.026920 +vt 0.943804 0.027019 +vt 0.943537 0.026990 +vt 0.943428 0.026920 +vt 0.939005 0.024667 +vt 0.938867 0.024574 +vt 0.938819 0.024340 +vt 0.052588 0.031142 +vt 0.044701 0.027131 +vt 0.044575 0.026920 +vt 0.044575 0.012612 +vt 0.044677 0.012456 +vt 0.044767 0.012378 +vt 0.058006 0.005658 +vt 0.058263 0.005565 +vt 0.058382 0.005810 +vt 0.058382 0.010501 +vt 0.058253 0.010718 +vt 0.049929 0.014958 +vt 0.049742 0.015098 +vt 0.049662 0.015192 +vt 0.049662 0.024340 +vt 0.049889 0.024574 +vt 0.057473 0.028447 +vt 0.057648 0.028562 +vt 0.052789 0.031142 +vt 0.052675 0.031195 +vt 0.049771 0.015076 +vt 0.405082 0.032354 +vt 0.406113 0.032176 +vt 0.052548 0.031122 +vt 0.925381 0.022055 +vt 0.405531 0.032032 +vn 0.000000 -0.707119 -0.707095 +vn 0.000000 -0.707119 -0.707095 +vn 0.000000 -0.707119 -0.707095 +vn 0.000000 -0.707105 -0.707108 +vn 1.000000 -0.000001 0.000000 +vn 1.000000 -0.000001 0.000000 +vn 1.000000 -0.000001 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.707049 0.707165 +vn 0.000000 0.707049 0.707165 +vn 0.000000 0.707049 0.707165 +vn 0.000000 0.707092 0.707121 +vn -1.000000 0.000004 0.000000 +vn -1.000000 0.000004 0.000000 +vn -1.000000 0.000004 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 -0.707107 0.707107 +vn 0.000000 -0.707107 0.707107 +vn 0.000000 -0.707107 0.707107 +vn 0.000000 -0.707106 0.707107 +vn -1.000000 0.000007 0.000000 +vn -1.000000 0.000007 0.000000 +vn -1.000000 0.000007 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000020 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 -0.000001 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 -0.000001 0.000000 +vn -1.000000 0.000007 0.000000 +vn -1.000000 0.000056 0.000000 +vn -1.000000 -0.000055 0.000000 +vn -1.000000 0.000081 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 1.000000 -0.000001 +vn 0.000000 1.000000 -0.000001 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -0.995185 0.098018 +vn 0.000000 -0.881927 0.471386 +vn 0.000000 -0.773040 0.634357 +vn 0.000000 -0.773039 0.634359 +vn 0.000000 -0.772993 0.634415 +vn 0.000000 -0.881927 0.471386 +vn 0.000000 -0.881908 0.471422 +vn 0.000000 -0.956938 0.290292 +vn 0.000000 -0.706911 0.707303 +vn -0.000232 -0.701061 0.713101 +vn 0.000019 -0.707136 0.707078 +vn 0.000000 -0.707137 0.707077 +vn -0.000046 -0.707107 0.707107 +vn 0.003200 -0.710295 0.703896 +vn 0.000004 -0.707107 0.707107 +vn -0.000002 -0.707105 0.707109 +vn -0.000589 -0.707065 0.707149 +vn -0.000015 -0.707097 0.707117 +vn 0.000000 -0.707197 0.707017 +vn -0.000150 -0.706930 0.707283 +vn 0.000028 -0.707213 0.707000 +vn 0.000000 -0.707063 0.707151 +vn 0.000006 -0.707183 0.707031 +vn -0.000004 -0.706952 0.707261 +vn -0.000002 -0.707012 0.707202 +vn 0.000140 -0.707130 0.707084 +vn 0.000007 -0.707114 0.707100 +vn 0.000000 -0.707115 0.707099 +vn 0.000000 -0.707201 0.707012 +vn 0.000000 -0.707172 0.707042 +vn 0.000798 -0.707884 0.706329 +vn 0.000010 -0.707109 0.707104 +vn 0.000006 -0.707101 0.707112 +vn 0.000087 -0.706933 0.707281 +vn -0.000043 -0.707129 0.707085 +vn -0.000355 -0.707033 0.707181 +vn 0.000798 -0.707884 0.706328 +vn -0.000146 -0.707034 0.707180 +vn -0.000039 -0.707301 0.706912 +vn 0.000007 -0.707038 0.707176 +vn 0.000000 -0.707123 0.707091 +vn 0.000025 -0.707082 0.707131 +vn 0.000108 -0.707090 0.707123 +vn -0.000011 -0.706985 0.707229 +vn 0.000002 -0.707059 0.707154 +vn 0.000003 -0.707102 0.707112 +vn -0.000003 -0.707061 0.707153 +vn -0.000017 -0.707051 0.707163 +vn 0.000097 -0.707094 0.707119 +vn 0.000003 -0.707130 0.707084 +vn -0.000002 -0.707111 0.707103 +vn 0.000005 -0.707109 0.707105 +vn 0.000019 -0.707101 0.707113 +vn -0.000045 -0.707096 0.707118 +vn 0.000000 -0.707126 0.707088 +vn 0.000101 -0.707107 0.707107 +vn 0.000182 -0.707107 0.707107 +vn -0.000013 -0.707132 0.707081 +vn -0.000024 -0.707059 0.707155 +vn -0.000002 -0.707101 0.707112 +vn 0.000000 -0.707101 0.707113 +vn 0.000000 -0.707104 0.707110 +vn 0.000000 -0.707107 0.707107 +vn 0.000000 -0.707107 0.707107 +vn -0.000001 -0.707106 0.707107 +vn -0.000001 -0.707105 0.707108 +vn 0.000000 -0.707102 0.707112 +vn 0.000000 -0.707139 0.707075 +vn 0.000001 -0.707079 0.707134 +vn -0.001521 -0.705584 0.708625 +vn 0.000159 -0.707027 0.707186 +vn -0.000001 -0.707105 0.707109 +vn -0.000040 -0.707161 0.707052 +vn -0.000036 -0.707179 0.707035 +vn -0.000010 -0.707116 0.707098 +vn 0.000165 -0.706942 0.707271 +vn 0.000000 -0.707107 0.707107 +vn 0.000086 -0.707150 0.707064 +vn -0.000106 -0.707177 0.707036 +vn -0.000017 -0.707087 0.707126 +vn 0.000037 -0.707070 0.707144 +vn 0.000000 -0.707085 0.707129 +vn 0.000001 -0.707125 0.707088 +vn -0.004156 -0.710499 0.703686 +vn 0.000000 -0.707031 0.707183 +vn 0.000001 -0.707119 0.707095 +vn -0.000004 -0.707039 0.707175 +vn 0.000003 -0.707208 0.707006 +vn 0.000000 -0.707105 0.707109 +vn -0.000201 -0.707374 0.706839 +vn 0.000113 -0.706843 0.707371 +vn 0.000029 -0.707142 0.707071 +vn 0.000008 -0.707134 0.707080 +vn 0.000000 -0.707132 0.707082 +vn 0.000113 -0.706843 0.707371 +vn -0.000253 -0.707149 0.707065 +vn -0.000061 -0.707114 0.707100 +vn -0.000061 -0.707114 0.707100 +vn -0.000253 -0.707149 0.707065 +vn 0.000024 -0.707119 0.707095 +vn -0.000105 -0.707002 0.707211 +vn 0.000001 -0.707080 0.707134 +vn 0.000000 -0.707145 0.707068 +vn 0.000000 -0.634419 0.772990 +vn 0.000000 -0.290283 0.956941 +vn 0.000000 -0.098018 0.995185 +vn 0.000000 -0.290283 0.956941 +vn 0.000000 -0.290288 0.956939 +vn 0.000000 -0.471391 0.881925 +vn 1.000000 0.000010 0.000000 +vn 1.000000 0.000010 0.000000 +vn 1.000000 0.000010 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000019 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000001 0.000000 +vn 1.000000 0.000000 0.000019 +vn 1.000000 0.000000 0.000019 +vn 1.000000 0.000000 0.000004 +vn 1.000000 0.000000 0.000001 +vn 1.000000 0.000000 0.000000 +vn -0.000002 -0.707109 0.707104 +vn -0.000002 -0.707109 0.707104 +vn 0.000128 -0.707107 0.707107 +vn 0.000009 -0.707100 0.707114 +vn 0.000009 -0.707100 0.707114 +vn 0.000009 -0.707100 0.707114 +vn 0.000009 -0.707100 0.707114 +vn 0.000009 -0.707100 0.707114 +vn 0.000009 -0.707100 0.707114 +vn 0.000009 -0.707100 0.707114 +vn 0.000009 -0.707100 0.707114 +vn 0.000009 -0.707100 0.707114 +vn 0.000009 -0.707100 0.707114 +vn 0.000009 -0.707100 0.707114 +vn 0.000009 -0.707100 0.707114 +vn 0.000009 -0.707100 0.707114 +vn 0.000009 -0.707100 0.707114 +vn 0.000009 -0.707100 0.707114 +vn -0.000003 -0.707106 0.707108 +vn -0.000003 -0.707106 0.707107 +vn -0.000003 -0.707105 0.707109 +vn -0.000003 -0.707105 0.707108 +vn -0.000003 -0.707105 0.707108 +vn -0.000003 -0.707105 0.707108 +vn -0.000003 -0.707105 0.707109 +vn -0.000003 -0.707105 0.707108 +vn -0.000003 -0.707105 0.707109 +vn -0.000003 -0.707105 0.707109 +vn 0.000001 -0.707107 0.707107 +vn 0.000001 -0.707107 0.707106 +vn 0.000001 -0.707108 0.707106 +vn 0.000001 -0.707107 0.707106 +vn 0.000008 -0.707097 0.707117 +vn 0.000007 -0.707096 0.707118 +vn 0.000008 -0.707097 0.707116 +vn 0.000008 -0.707097 0.707116 +vn 0.000008 -0.707097 0.707116 +vn 0.000008 -0.707097 0.707116 +vn 0.000008 -0.707097 0.707116 +vn 0.000013 -0.707108 0.707106 +vn 0.000008 -0.707090 0.707124 +vn 0.000029 -0.707158 0.707056 +vn 0.000019 -0.707113 0.707101 +vn 0.000000 -0.707106 0.707108 +vn 0.000001 -0.707106 0.707107 +vn 0.000019 -0.707113 0.707101 +vn 0.000019 -0.707113 0.707101 +vn 0.000019 -0.707113 0.707101 +vn -0.000000 -0.707106 0.707107 +vn -0.000000 -0.707107 0.707107 +vn -0.000001 -0.707102 0.707111 +vn -0.000003 -0.707105 0.707109 +vn -0.000004 -0.707106 0.707107 +vn -0.000004 -0.707106 0.707107 +vn -0.000004 -0.707106 0.707107 +vn -0.000004 -0.707106 0.707107 +vn 0.000055 -0.707062 0.707152 +vn 0.000068 -0.707041 0.707173 +vn -0.000004 -0.707103 0.707111 +vn -0.000003 -0.707103 0.707110 +vn -0.000007 -0.707100 0.707114 +vn -0.000007 -0.707100 0.707113 +vn 0.000004 -0.707146 0.707068 +vn 0.000005 -0.707155 0.707059 +vn -0.000026 -0.707133 0.707080 +vn -0.000019 -0.707148 0.707066 +vn 0.000002 -0.707100 0.707113 +vn 0.000001 -0.707110 0.707104 +vn -0.000000 -0.707104 0.707110 +vn -0.000002 -0.707093 0.707120 +vn -0.000002 -0.707094 0.707120 +vn -0.000173 -0.707245 0.706969 +vn -0.000173 -0.707245 0.706969 +vn 0.000002 -0.707110 0.707104 +vn 0.000001 -0.707099 0.707115 +vn 0.000016 -0.707075 0.707139 +vn 0.000016 -0.707075 0.707139 +vn -0.000002 -0.707109 0.707104 +vn -0.000002 -0.707101 0.707112 +vn -0.000002 -0.707101 0.707112 +vn 0.000000 -0.706999 0.707214 +vn -0.000001 -0.707103 0.707110 +vn 0.000028 -0.706972 0.707241 +vn 0.000101 -0.706988 0.707225 +vn 0.000101 -0.706988 0.707225 +s 1 +f 835/790/2085 836/791/2086 837/792/2087 +f 837/792/2087 836/791/2086 838/793/2088 +s 2 +f 836/791/2089 839/794/2090 838/793/2091 +f 838/793/2091 839/794/2090 840/799/2092 +s 3 +f 839/794/2093 841/800/2094 840/799/2095 +f 840/799/2095 841/800/2094 842/801/2096 +s 4 +f 841/800/2097 835/790/2098 842/801/2099 +f 842/801/2099 835/790/2098 837/792/2100 +s 5 +f 837/795/2101 838/796/2102 842/797/2103 +f 842/797/2103 838/796/2102 840/798/2104 +s 6 +f 843/802/2105 844/803/2106 845/804/2107 +f 845/804/2107 844/803/2106 846/805/2108 +f 845/804/2107 846/805/2108 847/806/2109 +f 843/802/2105 848/807/2110 844/803/2106 +f 844/803/2106 848/807/2110 849/808/2111 +s off +f 850/809/2112 851/810/2113 847/806/2114 +s 7 +f 847/806/2115 851/810/2116 852/811/2117 +s off +f 847/806/2118 852/811/2119 845/804/2120 +s 7 +f 851/810/2116 853/812/2121 852/811/2117 +f 852/811/2117 853/812/2121 854/813/2122 +f 852/811/2117 854/813/2122 855/814/2123 +s 8 +f 856/815/2124 857/816/2125 844/803/2126 +f 844/803/2126 857/816/2125 846/805/2127 +s 9 +f 857/816/2128 858/817/2129 846/805/2130 +s 10 +f 859/818/2131 850/809/2132 858/817/2133 +s 9 +f 846/805/2130 858/817/2129 847/806/2134 +s 10 +f 847/806/2135 858/817/2133 850/809/2132 +s 8 +f 850/809/2136 859/818/2137 851/810/2138 +f 851/810/2138 859/818/2137 860/819/2139 +f 860/819/2139 861/820/2140 851/810/2138 +f 863/821/2141 852/811/2142 855/814/2143 +f 863/821/2141 864/822/2144 852/811/2142 +f 863/821/2141 855/814/2143 862/823/2145 +f 862/823/2145 855/814/2143 854/813/2146 +f 862/823/2145 854/813/2146 861/820/2140 +f 861/820/2140 854/813/2146 853/812/2147 +f 861/820/2140 853/812/2147 851/810/2138 +f 817/824/2148 753/825/2149 852/811/2142 +f 753/825/2149 772/826/2150 852/811/2142 +f 769/829/2151 852/811/2142 770/828/2152 +f 770/828/2152 852/811/2142 771/827/2153 +f 852/811/2142 772/826/2150 771/827/2153 +f 769/829/2151 768/830/2154 852/811/2142 +f 852/811/2142 768/830/2154 845/804/2155 +f 814/831/2156 765/832/2157 764/833/2158 +f 814/831/2156 764/833/2158 815/834/2159 +f 815/834/2159 764/833/2158 816/835/2160 +f 816/835/2160 764/833/2158 802/836/2161 +f 802/836/2161 764/833/2158 763/787/2162 +f 802/836/2161 763/787/2162 762/786/2163 +f 802/836/2161 762/786/2163 761/837/2164 +f 754/844/2165 833/845/2166 755/843/2167 +f 755/843/2167 833/845/2166 756/842/2168 +f 833/845/2166 832/846/2169 756/842/2168 +f 828/850/2170 803/788/2171 829/849/2172 +f 803/788/2171 802/836/2161 829/849/2172 +f 787/855/2173 786/856/2174 802/836/2161 +f 786/856/2174 785/857/2175 802/836/2161 +f 802/836/2161 785/857/2175 829/849/2172 +f 785/857/2175 784/858/2176 829/849/2172 +f 784/858/2176 778/859/2177 829/849/2172 +f 778/859/2177 777/860/2178 829/849/2172 +f 829/849/2172 777/860/2178 830/848/2179 +f 830/848/2179 777/860/2178 831/847/2180 +f 831/847/2180 777/860/2178 832/846/2169 +f 777/860/2178 776/861/2181 832/846/2169 +f 776/861/2181 775/862/2182 832/846/2169 +f 832/846/2169 775/862/2182 756/842/2168 +f 775/862/2182 774/863/2183 756/842/2168 +f 756/842/2168 774/863/2183 757/841/2184 +f 774/863/2183 773/864/2185 757/841/2184 +f 773/864/2185 801/865/2186 757/841/2184 +f 801/865/2186 800/866/2187 757/841/2184 +f 800/866/2187 799/867/2188 757/841/2184 +f 757/841/2184 799/867/2188 758/840/2189 869/989/2190 +f 758/840/2189 799/867/2188 759/839/2191 +f 759/839/2191 799/867/2188 760/838/2192 +f 799/867/2188 793/868/2193 760/838/2192 +f 760/838/2192 793/868/2193 761/837/2164 +f 787/855/2173 802/836/2161 788/854/2194 +f 793/868/2193 871/993/2195 792/869/2196 761/837/2164 +f 792/869/2196 791/851/2197 761/837/2164 +f 788/854/2194 802/836/2161 789/853/2198 +f 791/851/2197 790/852/2199 761/837/2164 +f 761/837/2164 790/852/2199 802/836/2161 +f 790/852/2199 789/853/2198 802/836/2161 +f 833/845/2166 754/844/2165 834/870/2200 +f 834/870/2200 754/844/2165 753/825/2149 +f 834/870/2200 753/825/2149 817/824/2148 +f 839/794/2201 852/811/2142 864/822/2144 +f 839/794/2201 864/822/2144 841/800/2202 +f 841/800/2202 864/822/2144 865/871/2203 +f 841/800/2202 865/871/2203 835/790/2204 +f 835/790/2204 865/871/2203 836/791/2205 +f 836/791/2205 865/871/2203 845/804/2155 +f 836/791/2205 845/804/2155 811/872/2206 +f 811/872/2206 845/804/2155 812/873/2207 +f 812/873/2207 845/804/2155 813/876/2208 +f 813/876/2208 845/804/2155 814/831/2156 +f 814/831/2156 845/804/2155 765/832/2157 +f 765/832/2157 845/804/2155 766/875/2209 +f 768/830/2154 767/874/2210 845/804/2155 +f 845/804/2155 767/874/2210 870/990/2211 766/875/2209 +f 793/868/2193 799/867/2188 794/879/2212 +f 797/880/2213 795/878/2214 798/877/2215 +f 795/878/2214 794/879/2212 798/877/2215 +f 794/879/2212 799/867/2188 798/877/2215 +f 795/878/2214 797/880/2213 796/881/2216 +f 778/859/2177 784/858/2176 779/883/2217 +f 781/886/2218 780/882/2219 782/885/2220 +f 782/885/2220 780/882/2219 783/884/2221 +f 783/884/2221 780/882/2219 784/858/2176 +f 780/882/2219 779/883/2217 784/858/2176 +f 811/872/2206 810/887/2222 836/791/2205 +f 810/887/2222 809/888/2223 836/791/2205 +f 809/888/2223 808/889/2224 836/791/2205 +f 836/791/2205 808/889/2224 823/890/2225 +f 823/890/2225 822/891/2226 836/791/2205 +f 822/891/2226 821/892/2227 836/791/2205 +f 836/791/2205 821/892/2227 820/893/2228 +f 808/889/2224 807/894/2229 823/890/2225 +f 823/890/2225 807/894/2229 806/895/2230 +f 823/890/2225 806/895/2230 824/896/2231 +f 824/896/2231 806/895/2230 825/897/2232 +f 825/897/2232 806/895/2230 826/898/2233 +s off +f 806/895/2234 805/899/2235 826/898/2236 +s 8 +f 826/898/2237 805/899/2238 804/789/2239 +f 804/789/2239 828/850/2170 827/900/2240 +f 804/789/2239 803/788/2171 828/850/2170 +f 827/900/2240 826/898/2237 804/789/2239 +f 852/811/2142 839/794/2201 817/824/2148 +f 817/824/2148 839/794/2201 818/902/2241 +f 818/902/2241 839/794/2201 819/901/2242 +f 819/901/2242 839/794/2201 820/893/2228 +f 839/794/2201 836/791/2205 820/893/2228 +f 865/871/2203 866/903/2243 845/804/2155 +f 868/904/2244 844/803/2126 849/808/2245 +f 868/904/2244 856/815/2124 844/803/2126 +f 868/904/2244 849/808/2245 867/905/2246 +f 867/905/2246 849/808/2245 848/807/2247 +f 867/905/2246 848/807/2247 866/903/2243 +f 866/903/2243 848/807/2247 843/802/2248 +f 866/903/2243 843/802/2248 845/804/2155 +s 22 +f 868/904/2249 867/905/2250 856/815/2251 +f 856/815/2251 867/905/2250 866/903/2252 +f 856/815/2251 866/903/2252 865/871/2253 +f 864/822/2254 858/817/2255 865/871/2253 +f 865/871/2253 858/817/2255 857/816/2256 +f 865/871/2253 857/816/2256 856/815/2251 +f 863/821/2257 862/823/2258 864/822/2254 +f 864/822/2254 862/823/2258 861/820/2259 +f 864/822/2254 861/820/2259 860/819/2260 +f 859/818/2261 858/817/2255 860/819/2260 +f 860/819/2260 858/817/2255 864/822/2254 +s 25 +f 794/920/2262 871/992/2263 793/919/2264 +s off +f 810/935/2265 811/936/2266 812/937/2267 813/938/2268 814/939/2269 815/940/2270 816/941/2271 802/942/2272 803/943/2273 804/944/2274 805/945/2275 806/946/2276 807/947/2277 808/948/2278 809/949/2279 +s 26 +f 829/950/2280 820/959/2281 821/960/2282 822/961/2283 823/962/2284 824/963/2285 825/964/2286 826/965/2287 827/966/2288 828/967/2289 +s 27 +f 760/982/2290 768/970/2291 769/971/2292 759/981/2293 +f 757/979/2294 771/973/2295 772/974/2296 753/975/2297 754/976/2298 755/977/2299 756/978/2300 +f 759/981/2293 769/971/2292 770/972/2301 869/988/2302 758/980/2303 +f 869/988/2302 770/972/2301 771/973/2295 757/979/2294 +f 766/968/2304 870/991/2305 762/984/2306 763/985/2307 764/986/2308 765/987/2309 +f 761/983/2310 767/969/2311 768/970/2291 760/982/2290 +f 762/984/2306 870/991/2305 767/969/2311 761/983/2310 +s 26 +f 818/957/2312 831/952/2313 832/953/2314 833/954/2315 834/955/2316 817/956/2317 +f 819/958/2318 830/951/2319 831/952/2313 818/957/2312 +f 829/950/2280 830/951/2319 819/958/2318 820/959/2281 +s 25 +f 780/906/2320 775/930/2321 776/931/2322 779/934/2323 +f 797/923/2324 781/907/2325 782/908/2326 796/922/2327 +f 796/922/2327 782/908/2326 783/909/2328 795/921/2329 +f 780/906/2320 781/907/2325 797/923/2324 798/924/2330 +f 787/913/2331 784/910/2332 785/911/2333 786/912/2334 +f 791/917/2335 788/914/2336 789/915/2337 790/916/2338 +f 788/914/2336 783/909/2328 784/910/2332 787/913/2331 +f 795/921/2329 791/917/2335 792/918/2339 871/992/2263 794/920/2262 +f 801/927/2340 799/925/2341 800/926/2342 +f 775/930/2321 773/928/2343 774/929/2344 +f 780/906/2320 798/924/2330 773/928/2343 775/930/2321 +f 795/921/2329 783/909/2328 788/914/2336 791/917/2335 +f 779/934/2323 776/931/2322 777/932/2345 778/933/2346 +f 773/928/2343 798/924/2330 799/925/2341 801/927/2340 +v 157.712830 -253.831711 58.795704 +v 157.500000 -255.455841 57.171574 +v 158.500000 -256.162964 57.878681 +v 157.712830 -257.079987 55.547432 +v 158.707825 -257.701904 56.339741 +v 158.344116 -258.648804 53.978607 +v 159.323792 -259.185211 54.856415 +v 159.372299 -260.108887 52.518524 +v 160.325577 -260.559326 53.482330 +v 160.762390 -261.410522 51.216888 +v 161.677063 -261.774475 52.267143 +v 162.467072 -262.509399 50.118027 +v 163.329346 -262.786865 51.254761 +v 164.428284 -263.368042 49.259369 +v 165.222733 -263.559845 50.481796 +v 166.579224 -263.957275 48.670158 +v 167.288773 -264.065460 49.976166 +v 168.846664 -264.256989 48.370445 +v 169.452805 -264.285461 49.756165 +v 171.153351 -264.256989 48.370445 +v 171.636627 -264.211914 49.829720 +v 173.420807 -263.957275 48.670158 +v 173.761276 -263.847443 50.194183 +v 175.571747 -263.368042 49.259369 +v 175.750000 -263.205231 50.836395 +v 177.532944 -262.509399 50.118027 +v 177.530914 -262.308502 51.733124 +v 179.237610 -261.410522 51.216888 +v 179.039612 -261.189697 52.851982 +v 180.627716 -260.108887 52.518524 +v 180.221603 -259.889160 54.152496 +v 181.655914 -258.648804 53.978607 +v 181.034164 -258.453918 55.587708 +v 182.287170 -257.079987 55.547432 +v 181.447922 -256.935913 57.105705 +v 182.500000 -255.455841 57.171574 +v 181.447922 -255.389999 58.651646 +v 182.287170 -253.831711 58.795704 +v 181.034164 -253.871979 60.169651 +v 181.655914 -252.262909 60.364525 +v 180.221603 -252.436798 61.604851 +v 180.627716 -250.802780 61.824619 +v 179.039612 -251.136261 62.905384 +v 179.237610 -249.501190 63.126255 +v 177.530914 -250.017380 64.024231 +v 177.532944 -248.402313 64.225121 +v 175.750000 -249.120651 64.920959 +v 175.571747 -247.543671 65.083778 +v 173.761276 -248.478485 65.563164 +v 173.420807 -246.954437 65.672997 +v 171.636627 -248.113998 65.927635 +v 171.153351 -246.654709 65.972710 +v 169.452805 -248.040436 66.001198 +v 168.846664 -246.654709 65.972710 +v 167.288773 -248.260468 65.781181 +v 166.579224 -246.954437 65.672997 +v 165.222733 -248.766083 65.275558 +v 164.428284 -247.543671 65.083778 +v 163.329346 -249.539047 64.502586 +v 162.467072 -248.402313 64.225121 +v 161.677063 -250.551422 63.490211 +v 160.762390 -249.501190 63.126255 +v 160.325577 -251.766602 62.275024 +v 159.372299 -250.802780 61.824619 +v 159.323792 -253.140671 60.900932 +v 158.344116 -252.262909 60.364525 +v 158.707825 -254.624008 59.417610 +v 157.712830 -247.180466 45.647949 +v 157.500000 -245.556366 47.272079 +v 157.712830 -243.932236 48.896210 +v 158.344116 -242.363388 50.465027 +v 159.372299 -240.903305 51.925117 +v 160.762390 -239.601669 53.226753 +v 162.467072 -238.502808 54.325623 +v 164.428284 -237.644150 55.184273 +v 166.579224 -237.054932 55.773499 +v 168.846649 -236.755219 56.073208 +v 171.153351 -236.755234 56.073204 +v 173.420807 -237.054932 55.773499 +v 175.571747 -237.644150 55.184273 +v 177.532944 -238.502808 54.325623 +v 179.237610 -239.601669 53.226753 +v 180.627716 -240.903305 51.925117 +v 181.655914 -242.363388 50.465027 +v 182.287170 -243.932236 48.896210 +v 182.500000 -245.556366 47.272079 +v 182.287170 -247.180466 45.647949 +v 181.655914 -248.749298 44.079124 +v 180.627716 -250.209396 42.619026 +v 179.237610 -251.511032 41.317383 +v 177.532944 -252.609894 40.218536 +v 175.571747 -253.468552 39.359871 +v 173.420807 -254.057770 38.770660 +v 171.153351 -254.357483 38.470947 +v 168.846664 -254.357468 38.470947 +v 166.579224 -254.057770 38.770660 +v 164.428284 -253.468552 39.359871 +v 162.467072 -252.609894 40.218536 +v 160.762390 -251.511032 41.317383 +v 159.372299 -250.209396 42.619026 +v 158.344116 -248.749298 44.079124 +vt 0.556566 0.022582 +vt 0.555987 0.022635 +vt 0.555987 0.022384 +vt 0.555408 0.022582 +vt 0.555438 0.022332 +vt 0.554849 0.022423 +vt 0.554910 0.022177 +vt 0.554329 0.022165 +vt 0.554420 0.021926 +vt 0.553865 0.021816 +vt 0.553987 0.021587 +vt 0.553473 0.021389 +vt 0.553626 0.021172 +vt 0.553167 0.020897 +vt 0.553351 0.020697 +vt 0.552957 0.020357 +vt 0.553170 0.020179 +vt 0.552850 0.019788 +vt 0.553092 0.019636 +vt 0.552850 0.019209 +vt 0.553118 0.019088 +vt 0.552957 0.018640 +vt 0.553248 0.018555 +vt 0.553167 0.018100 +vt 0.553477 0.018056 +vt 0.553473 0.017608 +vt 0.553797 0.017609 +vt 0.553865 0.017181 +vt 0.554195 0.017230 +vt 0.554329 0.016832 +vt 0.554659 0.016934 +vt 0.554849 0.016574 +vt 0.555170 0.016730 +vt 0.555408 0.016415 +vt 0.555711 0.016626 +vt 0.555987 0.016362 +vt 0.556262 0.016626 +vt 0.556566 0.016415 +vt 0.556803 0.016730 +vt 0.557125 0.016574 +vt 0.557315 0.016934 +vt 0.557645 0.016832 +vt 0.557778 0.017230 +vt 0.558109 0.017181 +vt 0.558177 0.017609 +vt 0.558501 0.017608 +vt 0.558497 0.018056 +vt 0.558807 0.018100 +vt 0.558726 0.018555 +vt 0.559017 0.018640 +vt 0.558856 0.019088 +vt 0.559124 0.019209 +vt 0.558882 0.019636 +vt 0.559124 0.019788 +vt 0.558803 0.020179 +vt 0.559017 0.020357 +vt 0.558623 0.020697 +vt 0.558807 0.020897 +vt 0.558348 0.021172 +vt 0.558501 0.021389 +vt 0.557987 0.021587 +vt 0.558109 0.021816 +vt 0.557554 0.021926 +vt 0.557645 0.022165 +vt 0.557064 0.022177 +vt 0.557125 0.022423 +vt 0.556535 0.022332 +vt 0.555408 0.022581 +vt 0.555987 0.022635 +vt 0.556566 0.022581 +vt 0.557125 0.022423 +vt 0.557645 0.022165 +vt 0.558109 0.021816 +vt 0.558501 0.021388 +vt 0.558807 0.020896 +vt 0.559017 0.020356 +vt 0.559124 0.019787 +vt 0.559124 0.019209 +vt 0.559017 0.018640 +vt 0.558807 0.018100 +vt 0.558501 0.017608 +vt 0.558109 0.017180 +vt 0.557645 0.016831 +vt 0.557125 0.016573 +vt 0.556566 0.016415 +vt 0.555987 0.016362 +vt 0.555408 0.016415 +vt 0.554849 0.016573 +vt 0.554329 0.016831 +vt 0.553865 0.017180 +vt 0.553473 0.017608 +vt 0.553167 0.018100 +vt 0.552957 0.018640 +vt 0.552850 0.019209 +vt 0.552850 0.019787 +vt 0.552957 0.020356 +vt 0.553167 0.020896 +vt 0.553473 0.021388 +vt 0.553865 0.021816 +vt 0.554329 0.022165 +vt 0.554849 0.022423 +vn -0.705600 -0.452694 0.545158 +vn -0.705600 -0.452694 0.545158 +vn -0.705600 -0.452694 0.545158 +vn -0.705598 -0.545163 0.452690 +vn -0.703221 -0.547972 0.452997 +vn -0.683531 -0.635001 0.359945 +vn -0.675751 -0.642296 0.361686 +vn -0.637869 -0.720702 0.271499 +vn -0.624255 -0.730909 0.275824 +vn -0.570108 -0.799211 0.190365 +vn -0.550574 -0.810844 0.198497 +vn -0.482404 -0.867773 0.119401 +vn -0.457574 -0.879246 0.132488 +vn -0.377769 -0.923887 0.061028 +vn -0.348585 -0.933854 0.080030 +vn -0.259749 -0.965520 0.017370 +vn -0.227542 -0.972817 0.043041 +vn -0.132360 -0.991149 -0.010216 +vn -0.098821 -0.994845 0.022760 +vn 0.000000 -0.999788 -0.020580 +vn 0.032981 -0.999257 0.019935 +vn 0.132764 -0.991057 -0.013383 +vn 0.163206 -0.985985 0.034594 +vn 0.261340 -0.965182 0.011217 +vn 0.287212 -0.955579 0.066165 +vn 0.381247 -0.922996 0.052238 +vn 0.400597 -0.909187 0.113581 +vn 0.488353 -0.865896 0.108330 +vn 0.499394 -0.848503 0.175067 +vn 0.578903 -0.795828 0.177563 +vn 0.580103 -0.775711 0.248502 +vn 0.649711 -0.715188 0.257645 +vn 0.639854 -0.693448 0.331235 +vn 0.698332 -0.626755 0.345703 +vn 0.676547 -0.604675 0.420301 +vn 0.723084 -0.533511 0.438765 +vn 0.688942 -0.512533 0.512513 +vn 0.723094 -0.438753 0.533507 +vn 0.676555 -0.420280 0.604680 +vn 0.698331 -0.345741 0.626735 +vn 0.639843 -0.331216 0.693468 +vn 0.649692 -0.257672 0.715196 +vn 0.580086 -0.248495 0.775726 +vn 0.578893 -0.177602 0.795827 +vn 0.499395 -0.175090 0.848498 +vn 0.488348 -0.108320 0.865900 +vn 0.400601 -0.113593 0.909184 +vn 0.381258 -0.052192 0.922994 +vn 0.287202 -0.066185 0.955581 +vn 0.261339 -0.011175 0.965183 +vn 0.163202 -0.034593 0.985986 +vn 0.132761 0.013358 0.991058 +vn 0.032987 -0.019937 0.999257 +vn 0.000000 0.020557 0.999789 +vn -0.098828 -0.022777 0.994844 +vn -0.132358 0.010197 0.991150 +vn -0.227551 -0.043041 0.972815 +vn -0.259740 -0.017320 0.965523 +vn -0.348577 -0.080021 0.933858 +vn -0.377769 -0.061044 0.923885 +vn -0.457563 -0.132468 0.879254 +vn -0.482404 -0.119411 0.867771 +vn -0.550581 -0.198519 0.810834 +vn -0.570098 -0.190371 0.799216 +vn -0.624232 -0.275820 0.730929 +vn -0.637873 -0.271515 0.720692 +vn -0.675745 -0.361688 0.642301 +vn -0.995735 -0.065238 -0.065242 +vn -0.995735 -0.065238 -0.065242 +vn -0.995735 -0.065238 -0.065242 +vn -0.995734 -0.065243 -0.065241 +vn -0.995734 0.065247 0.065241 +vn -0.995735 0.065235 0.065242 +vn -0.961823 0.193514 0.193516 +vn -0.961822 0.193519 0.193516 +vn -0.895162 0.315190 0.315183 +vn -0.895167 0.315179 0.315180 +vn -0.798019 0.426127 0.426124 +vn -0.798016 0.426124 0.426132 +vn -0.673694 0.522561 0.522558 +vn -0.673701 0.522551 0.522559 +vn -0.526431 0.601197 0.601192 +vn -0.526428 0.601195 0.601197 +vn -0.361243 0.659357 0.659357 +vn -0.361245 0.659357 0.659357 +vn -0.183754 0.695064 0.695068 +vn -0.183755 0.695067 0.695065 +vn 0.000007 0.707106 0.707108 +vn 0.000000 0.707111 0.707103 +vn 0.183740 0.695070 0.695067 +vn 0.183757 0.695068 0.695064 +vn 0.361242 0.659356 0.659359 +vn 0.361245 0.659358 0.659355 +vn 0.526437 0.601187 0.601197 +vn 0.526430 0.601198 0.601192 +vn 0.673698 0.522559 0.522554 +vn 0.673702 0.522552 0.522556 +vn 0.798016 0.426130 0.426126 +vn 0.798011 0.426131 0.426135 +vn 0.895160 0.315193 0.315187 +vn 0.895166 0.315179 0.315184 +vn 0.961827 0.193505 0.193506 +vn 0.961827 0.193505 0.193508 +vn 0.995734 0.065244 0.065241 +vn 0.995734 0.065242 0.065242 +vn 0.995734 -0.065241 -0.065242 +vn 0.995734 -0.065242 -0.065241 +vn 0.961825 -0.193513 -0.193508 +vn 0.961827 -0.193506 -0.193508 +vn 0.895163 -0.315186 -0.315184 +vn 0.895159 -0.315191 -0.315189 +vn 0.798017 -0.426126 -0.426128 +vn 0.798019 -0.426125 -0.426127 +vn 0.673699 -0.522554 -0.522558 +vn 0.673700 -0.522558 -0.522554 +vn 0.526431 -0.601198 -0.601192 +vn 0.526435 -0.601192 -0.601194 +vn 0.361241 -0.659357 -0.659358 +vn 0.361241 -0.659356 -0.659360 +vn 0.183748 -0.695067 -0.695068 +vn 0.183751 -0.695067 -0.695067 +vn -0.000005 -0.707111 -0.707103 +vn 0.000000 -0.707105 -0.707109 +vn -0.183746 -0.695061 -0.695074 +vn -0.183751 -0.695072 -0.695061 +vn -0.361238 -0.659355 -0.659362 +vn -0.361243 -0.659361 -0.659353 +vn -0.526435 -0.601192 -0.601195 +vn -0.526428 -0.601196 -0.601196 +vn -0.673694 -0.522557 -0.522562 +vn -0.673696 -0.522563 -0.522553 +vn -0.798022 -0.426118 -0.426127 +vn -0.798020 -0.426126 -0.426124 +vn -0.895166 -0.315180 -0.315182 +vn -0.895163 -0.315185 -0.315185 +vn 0.000001 -0.707104 0.707109 +vn 0.000001 -0.707104 0.707109 +vn 0.000001 -0.707104 0.707109 +vn 0.000000 -0.707121 0.707092 +vn -0.000001 -0.707089 0.707124 +vn 0.000000 -0.707102 0.707112 +vn -0.000001 -0.707109 0.707105 +vn -0.000001 -0.707119 0.707095 +vn -0.000002 -0.707116 0.707098 +vn -0.000001 -0.707098 0.707116 +vn 0.000000 -0.707112 0.707101 +vn 0.000001 -0.707093 0.707121 +vn 0.000001 -0.707108 0.707106 +vn 0.000001 -0.707101 0.707113 +vn 0.000002 -0.707112 0.707102 +vn 0.000001 -0.707150 0.707064 +vn 0.000000 -0.707098 0.707116 +vn 0.000001 -0.707075 0.707139 +vn 0.000000 -0.707052 0.707162 +vn 0.000001 -0.707108 0.707106 +vn 0.000000 -0.707094 0.707120 +vn -0.000001 -0.707123 0.707090 +vn -0.000001 -0.707075 0.707138 +vn 0.000000 -0.707111 0.707103 +vn -0.000001 -0.707115 0.707099 +vn -0.000002 -0.707114 0.707100 +vn 0.000000 -0.707137 0.707076 +vn 0.000000 -0.707101 0.707112 +vn 0.000001 -0.707088 0.707126 +vn 0.000001 -0.707122 0.707092 +vn 0.000001 -0.707105 0.707109 +vn 0.000001 -0.707134 0.707080 +vn -0.000001 -0.706957 0.707256 +vn 0.000000 0.707113 -0.707100 +vn 0.000000 0.707113 -0.707100 +vn 0.000000 0.707113 -0.707100 +vn 0.000000 0.707104 -0.707109 +vn 0.000000 0.707114 -0.707099 +vn 0.000000 0.707114 -0.707100 +vn 0.000000 0.707103 -0.707111 +vn 0.000000 0.707106 -0.707108 +vn 0.000000 0.707107 -0.707106 +vn 0.000000 0.707105 -0.707108 +vn 0.000000 0.707113 -0.707101 +vn 0.000000 0.707111 -0.707102 +vn 0.000000 0.707113 -0.707101 +vn 0.000000 0.707095 -0.707118 +vn 0.000000 0.707113 -0.707101 +vn 0.000000 0.707093 -0.707120 +vn 0.000000 0.707136 -0.707077 +vn 0.000000 0.707075 -0.707139 +vn 0.000000 0.707123 -0.707091 +vn 0.000005 0.707076 -0.707138 +vn 0.000000 0.707093 -0.707121 +vn 0.000000 0.707104 -0.707109 +vn 0.000000 0.707113 -0.707100 +vn 0.000000 0.707103 -0.707111 +vn 0.000000 0.707115 -0.707099 +vn 0.000000 0.707095 -0.707119 +vn 0.000000 0.707121 -0.707092 +vn 0.000000 0.707102 -0.707112 +vn 0.000000 0.707103 -0.707110 +vn 0.000000 0.707089 -0.707125 +vn 0.000000 0.707135 -0.707079 +vn 0.000000 0.707107 -0.707107 +vn 0.000000 0.707136 -0.707078 +vn 0.000006 0.707017 -0.707197 +s 1 +f 872/994/2347 873/995/2348 874/996/2349 +f 874/996/2349 873/995/2348 875/997/2350 +f 874/996/2349 875/997/2350 876/998/2351 +f 876/998/2351 875/997/2350 877/999/2352 +f 876/998/2351 877/999/2352 878/1000/2353 +f 878/1000/2353 877/999/2352 879/1001/2354 +f 878/1000/2353 879/1001/2354 880/1002/2355 +f 880/1002/2355 879/1001/2354 881/1003/2356 +f 880/1002/2355 881/1003/2356 882/1004/2357 +f 882/1004/2357 881/1003/2356 883/1005/2358 +f 882/1004/2357 883/1005/2358 884/1006/2359 +f 884/1006/2359 883/1005/2358 885/1007/2360 +f 884/1006/2359 885/1007/2360 886/1008/2361 +f 886/1008/2361 885/1007/2360 887/1009/2362 +f 886/1008/2361 887/1009/2362 888/1010/2363 +f 888/1010/2363 887/1009/2362 889/1011/2364 +f 888/1010/2363 889/1011/2364 890/1012/2365 +f 890/1012/2365 889/1011/2364 891/1013/2366 +f 890/1012/2365 891/1013/2366 892/1014/2367 +f 892/1014/2367 891/1013/2366 893/1015/2368 +f 892/1014/2367 893/1015/2368 894/1016/2369 +f 894/1016/2369 893/1015/2368 895/1017/2370 +f 894/1016/2369 895/1017/2370 896/1018/2371 +f 896/1018/2371 895/1017/2370 897/1019/2372 +f 896/1018/2371 897/1019/2372 898/1020/2373 +f 898/1020/2373 897/1019/2372 899/1021/2374 +f 898/1020/2373 899/1021/2374 900/1022/2375 +f 900/1022/2375 899/1021/2374 901/1023/2376 +f 900/1022/2375 901/1023/2376 902/1024/2377 +f 902/1024/2377 901/1023/2376 903/1025/2378 +f 902/1024/2377 903/1025/2378 904/1026/2379 +f 904/1026/2379 903/1025/2378 905/1027/2380 +f 904/1026/2379 905/1027/2380 906/1028/2381 +f 906/1028/2381 905/1027/2380 907/1029/2382 +f 906/1028/2381 907/1029/2382 908/1030/2383 +f 908/1030/2383 907/1029/2382 909/1031/2384 +f 908/1030/2383 909/1031/2384 910/1032/2385 +f 910/1032/2385 909/1031/2384 911/1033/2386 +f 910/1032/2385 911/1033/2386 912/1034/2387 +f 912/1034/2387 911/1033/2386 913/1035/2388 +f 912/1034/2387 913/1035/2388 914/1036/2389 +f 914/1036/2389 913/1035/2388 915/1037/2390 +f 914/1036/2389 915/1037/2390 916/1038/2391 +f 916/1038/2391 915/1037/2390 917/1039/2392 +f 916/1038/2391 917/1039/2392 918/1040/2393 +f 918/1040/2393 917/1039/2392 919/1041/2394 +f 918/1040/2393 919/1041/2394 920/1042/2395 +f 920/1042/2395 919/1041/2394 921/1043/2396 +f 920/1042/2395 921/1043/2396 922/1044/2397 +f 922/1044/2397 921/1043/2396 923/1045/2398 +f 922/1044/2397 923/1045/2398 924/1046/2399 +f 924/1046/2399 923/1045/2398 925/1047/2400 +f 924/1046/2399 925/1047/2400 926/1048/2401 +f 926/1048/2401 925/1047/2400 927/1049/2402 +f 926/1048/2401 927/1049/2402 928/1050/2403 +f 928/1050/2403 927/1049/2402 929/1051/2404 +f 928/1050/2403 929/1051/2404 930/1052/2405 +f 930/1052/2405 929/1051/2404 931/1053/2406 +f 930/1052/2405 931/1053/2406 932/1054/2407 +f 932/1054/2407 931/1053/2406 933/1055/2408 +f 932/1054/2407 933/1055/2408 934/1056/2409 +f 934/1056/2409 933/1055/2408 935/1057/2410 +f 934/1056/2409 935/1057/2410 936/1058/2411 +f 936/1058/2411 935/1057/2410 937/1059/2412 +f 936/1058/2411 937/1059/2412 938/1060/2413 +f 938/1060/2413 937/1059/2412 872/994/2347 +f 938/1060/2413 872/994/2347 874/996/2349 +s 2 +f 939/1061/2414 875/997/2415 940/1062/2416 +f 940/1062/2416 875/997/2415 873/995/2417 +f 940/1062/2416 873/995/2417 941/1063/2418 +f 941/1063/2418 873/995/2417 872/994/2419 +f 941/1063/2418 872/994/2419 942/1064/2420 +f 942/1064/2420 872/994/2419 937/1059/2421 +f 942/1064/2420 937/1059/2421 943/1065/2422 +f 943/1065/2422 937/1059/2421 935/1057/2423 +f 943/1065/2422 935/1057/2423 944/1066/2424 +f 944/1066/2424 935/1057/2423 933/1055/2425 +f 944/1066/2424 933/1055/2425 945/1067/2426 +f 945/1067/2426 933/1055/2425 931/1053/2427 +f 945/1067/2426 931/1053/2427 946/1068/2428 +f 946/1068/2428 931/1053/2427 929/1051/2429 +f 946/1068/2428 929/1051/2429 947/1069/2430 +f 947/1069/2430 929/1051/2429 927/1049/2431 +f 947/1069/2430 927/1049/2431 948/1070/2432 +f 948/1070/2432 927/1049/2431 925/1047/2433 +f 948/1070/2432 925/1047/2433 949/1071/2434 +f 949/1071/2434 925/1047/2433 923/1045/2435 +f 949/1071/2434 923/1045/2435 950/1072/2436 +f 950/1072/2436 923/1045/2435 921/1043/2437 +f 950/1072/2436 921/1043/2437 951/1073/2438 +f 951/1073/2438 921/1043/2437 919/1041/2439 +f 951/1073/2438 919/1041/2439 952/1074/2440 +f 952/1074/2440 919/1041/2439 917/1039/2441 +f 952/1074/2440 917/1039/2441 953/1075/2442 +f 953/1075/2442 917/1039/2441 915/1037/2443 +f 953/1075/2442 915/1037/2443 954/1076/2444 +f 954/1076/2444 915/1037/2443 913/1035/2445 +f 954/1076/2444 913/1035/2445 955/1077/2446 +f 955/1077/2446 913/1035/2445 911/1033/2447 +f 955/1077/2446 911/1033/2447 956/1078/2448 +f 956/1078/2448 911/1033/2447 909/1031/2449 +f 956/1078/2448 909/1031/2449 957/1079/2450 +f 957/1079/2450 909/1031/2449 907/1029/2451 +f 957/1079/2450 907/1029/2451 958/1080/2452 +f 958/1080/2452 907/1029/2451 905/1027/2453 +f 958/1080/2452 905/1027/2453 959/1081/2454 +f 959/1081/2454 905/1027/2453 903/1025/2455 +f 959/1081/2454 903/1025/2455 960/1082/2456 +f 960/1082/2456 903/1025/2455 901/1023/2457 +f 960/1082/2456 901/1023/2457 961/1083/2458 +f 961/1083/2458 901/1023/2457 899/1021/2459 +f 961/1083/2458 899/1021/2459 962/1084/2460 +f 962/1084/2460 899/1021/2459 897/1019/2461 +f 962/1084/2460 897/1019/2461 963/1085/2462 +f 963/1085/2462 897/1019/2461 895/1017/2463 +f 963/1085/2462 895/1017/2463 964/1086/2464 +f 964/1086/2464 895/1017/2463 893/1015/2465 +f 964/1086/2464 893/1015/2465 965/1087/2466 +f 965/1087/2466 893/1015/2465 891/1013/2467 +f 965/1087/2466 891/1013/2467 966/1088/2468 +f 966/1088/2468 891/1013/2467 889/1011/2469 +f 966/1088/2468 889/1011/2469 967/1089/2470 +f 967/1089/2470 889/1011/2469 887/1009/2471 +f 967/1089/2470 887/1009/2471 968/1090/2472 +f 968/1090/2472 887/1009/2471 885/1007/2473 +f 968/1090/2472 885/1007/2473 969/1091/2474 +f 969/1091/2474 885/1007/2473 883/1005/2475 +f 969/1091/2474 883/1005/2475 970/1092/2476 +f 970/1092/2476 883/1005/2475 881/1003/2477 +f 970/1092/2476 881/1003/2477 971/1093/2478 +f 971/1093/2478 881/1003/2477 879/1001/2479 +f 971/1093/2478 879/1001/2479 972/1094/2480 +f 972/1094/2480 879/1001/2479 877/999/2481 +f 972/1094/2480 877/999/2481 939/1061/2414 +f 939/1061/2414 877/999/2481 875/997/2415 +s 3 +f 876/998/2482 906/1028/2483 874/996/2484 +f 874/996/2484 906/1028/2483 908/1030/2485 +f 874/996/2484 908/1030/2485 938/1060/2486 +f 938/1060/2486 908/1030/2485 910/1032/2487 +f 938/1060/2486 910/1032/2487 936/1058/2488 +f 936/1058/2488 910/1032/2487 912/1034/2489 +f 936/1058/2488 912/1034/2489 934/1056/2490 +f 934/1056/2490 912/1034/2489 914/1036/2491 +f 934/1056/2490 914/1036/2491 932/1054/2492 +f 932/1054/2492 914/1036/2491 916/1038/2493 +f 932/1054/2492 916/1038/2493 930/1052/2494 +f 930/1052/2494 916/1038/2493 918/1040/2495 +f 930/1052/2494 918/1040/2495 928/1050/2496 +f 928/1050/2496 918/1040/2495 920/1042/2497 +f 928/1050/2496 920/1042/2497 926/1048/2498 +f 926/1048/2498 920/1042/2497 922/1044/2499 +f 926/1048/2498 922/1044/2499 924/1046/2500 +f 906/1028/2483 876/998/2482 904/1026/2501 +f 904/1026/2501 876/998/2482 878/1000/2502 +f 904/1026/2501 878/1000/2502 902/1024/2503 +f 902/1024/2503 878/1000/2502 880/1002/2504 +f 902/1024/2503 880/1002/2504 900/1022/2505 +f 900/1022/2505 880/1002/2504 882/1004/2506 +f 900/1022/2505 882/1004/2506 898/1020/2507 +f 898/1020/2507 882/1004/2506 884/1006/2508 +f 898/1020/2507 884/1006/2508 896/1018/2509 +f 896/1018/2509 884/1006/2508 886/1008/2510 +f 896/1018/2509 886/1008/2510 894/1016/2511 +f 894/1016/2511 886/1008/2510 888/1010/2512 +f 894/1016/2511 888/1010/2512 892/1014/2513 +f 892/1014/2513 888/1010/2512 890/1012/2514 +s 4 +f 941/1063/2515 956/1078/2516 940/1062/2517 +f 940/1062/2517 956/1078/2516 957/1079/2518 +f 940/1062/2517 957/1079/2518 939/1061/2519 +f 939/1061/2519 957/1079/2518 958/1080/2520 +f 939/1061/2519 958/1080/2520 972/1094/2521 +f 972/1094/2521 958/1080/2520 959/1081/2522 +f 972/1094/2521 959/1081/2522 971/1093/2523 +f 971/1093/2523 959/1081/2522 960/1082/2524 +f 971/1093/2523 960/1082/2524 970/1092/2525 +f 970/1092/2525 960/1082/2524 961/1083/2526 +f 970/1092/2525 961/1083/2526 969/1091/2527 +f 969/1091/2527 961/1083/2526 962/1084/2528 +f 969/1091/2527 962/1084/2528 968/1090/2529 +f 968/1090/2529 962/1084/2528 963/1085/2530 +f 968/1090/2529 963/1085/2530 967/1089/2531 +f 967/1089/2531 963/1085/2530 964/1086/2532 +f 967/1089/2531 964/1086/2532 966/1088/2533 +f 966/1088/2533 964/1086/2532 965/1087/2534 +f 956/1078/2516 941/1063/2515 955/1077/2535 +f 955/1077/2535 941/1063/2515 942/1064/2536 +f 955/1077/2535 942/1064/2536 954/1076/2537 +f 954/1076/2537 942/1064/2536 943/1065/2538 +f 954/1076/2537 943/1065/2538 953/1075/2539 +f 953/1075/2539 943/1065/2538 944/1066/2540 +f 953/1075/2539 944/1066/2540 952/1074/2541 +f 952/1074/2541 944/1066/2540 945/1067/2542 +f 952/1074/2541 945/1067/2542 951/1073/2543 +f 951/1073/2543 945/1067/2542 946/1068/2544 +f 951/1073/2543 946/1068/2544 950/1072/2545 +f 950/1072/2545 946/1068/2544 947/1069/2546 +f 950/1072/2545 947/1069/2546 949/1071/2547 +f 949/1071/2547 947/1069/2546 948/1070/2548 +v -86.000000 -205.000000 85.000000 +v -79.000000 -205.000000 85.000000 +v -86.000000 -205.000000 84.000000 +v -79.000000 -205.000000 84.000000 +v -81.207115 -205.000000 80.207092 +v -77.414215 -205.000000 84.000000 +v -83.792885 -205.000000 80.207092 +v -87.585785 -205.000000 84.000000 +v -90.000000 -205.000000 73.992210 +v -90.000008 -205.000015 81.000000 +v -89.000000 -205.000000 73.992210 +v -89.000000 -205.000000 81.000000 +v -85.207115 -205.000000 78.792900 +v -89.000000 -205.000000 82.585785 +v -85.207115 -205.000000 76.207092 +v -89.000000 -205.000000 72.414215 +v -79.000000 -205.000000 70.000000 +v -86.000000 -205.000000 70.000000 +v -79.000000 -205.000000 71.000000 +v -86.000000 -205.000000 71.000000 +v -83.792885 -205.000000 74.792900 +v -87.585785 -205.000000 71.000000 +v -81.207115 -205.000000 74.792900 +v -77.414215 -205.000000 71.000000 +v -75.000000 -205.000000 73.992210 +v -76.000000 -205.000000 73.992210 +v -75.000000 -205.000015 81.000000 +v -76.000000 -205.000000 81.000000 +v -79.792885 -205.000000 76.207092 +v -76.000000 -205.000000 72.414215 +v -79.792885 -205.000000 78.792900 +v -76.000000 -205.000000 82.585785 +v -90.000000 -207.500000 85.000000 +v -90.000000 -207.500000 70.000000 +v -75.000000 -207.500000 85.000000 +v -75.000000 -207.500000 70.000000 +v -90.000000 235.000000 73.992210 +v -89.000000 235.000000 73.992210 +v -90.000008 235.000015 81.000000 +v -89.000000 235.000000 81.000000 +v -85.207115 235.000000 78.792900 +v -89.000000 235.000000 72.414215 +v -85.207115 235.000000 76.207092 +v -89.000000 235.000000 82.585785 +v -86.000000 235.000000 70.000000 +v -79.000000 235.000015 69.999992 +v -86.000000 235.000000 71.000000 +v -79.000000 235.000000 71.000000 +v -83.792885 235.000000 74.792900 +v -81.207115 235.000000 74.792900 +v -77.414215 235.000000 71.000000 +v -87.585785 235.000000 71.000000 +v -79.000000 235.000000 85.000000 +v -86.000000 235.000000 85.000000 +v -79.000000 235.000000 84.000000 +v -86.000000 235.000000 84.000000 +v -81.207115 235.000000 80.207092 +v -83.792885 235.000000 80.207092 +v -87.585785 235.000000 84.000000 +v -77.414215 235.000000 84.000000 +v -90.000008 237.500015 69.999992 +v -90.000000 237.500000 85.000000 +v -75.000000 237.500015 69.999992 +v -75.000000 237.500000 85.000000 +v -75.000000 235.000000 73.992210 +v -75.000000 235.000015 81.000000 +v -76.000000 235.000000 73.992210 +v -76.000000 235.000000 81.000000 +v -79.792885 235.000000 76.207092 +v -79.792885 235.000000 78.792900 +v -76.000000 235.000000 82.585785 +v -76.000000 235.000000 72.414215 +vt 0.544631 0.029392 +vt 0.544251 0.029392 +vt 0.544631 0.029392 +vt 0.544251 0.029392 +vt 0.544417 0.027604 +vt 0.544165 0.029392 +vt 0.544512 0.029392 +vt 0.544717 0.029392 +vt 0.544849 0.029392 +vt 0.544849 0.029392 +vt 0.544794 0.029392 +vt 0.544794 0.029392 +vt 0.544598 0.027604 +vt 0.544794 0.029392 +vt 0.544589 0.029392 +vt 0.544794 0.029392 +vt 0.544251 0.029392 +vt 0.544631 0.029392 +vt 0.544251 0.029392 +vt 0.544631 0.029392 +vt 0.544466 0.027604 +vt 0.544717 0.029392 +vt 0.544370 0.029392 +vt 0.544165 0.029392 +vt 0.544032 0.029392 +vt 0.544088 0.029392 +vt 0.544032 0.029392 +vt 0.544088 0.029392 +vt 0.544284 0.027604 +vt 0.544088 0.029392 +vt 0.544294 0.029392 +vt 0.544088 0.029392 +vt 0.544849 0.029503 +vt 0.544849 0.029503 +vt 0.544032 0.029503 +vt 0.544032 0.029503 +vt 0.544849 0.010269 +vt 0.544794 0.010269 +vt 0.544849 0.010269 +vt 0.544794 0.010269 +vt 0.544596 0.010269 +vt 0.544794 0.010269 +vt 0.544589 0.010269 +vt 0.544794 0.010269 +vt 0.544631 0.010269 +vt 0.544251 0.010269 +vt 0.544631 0.010269 +vt 0.544251 0.010269 +vt 0.544477 0.010269 +vt 0.544370 0.010269 +vt 0.544165 0.010269 +vt 0.544717 0.010269 +vt 0.544251 0.010269 +vt 0.544631 0.010269 +vt 0.544251 0.010269 +vt 0.544631 0.010269 +vt 0.544406 0.010269 +vt 0.544512 0.010269 +vt 0.544717 0.010269 +vt 0.544165 0.010269 +vt 0.544849 0.010157 +vt 0.544849 0.010157 +vt 0.544032 0.010157 +vt 0.544032 0.010157 +vt 0.544032 0.010269 +vt 0.544032 0.010269 +vt 0.544088 0.010269 +vt 0.544088 0.010269 +vt 0.544286 0.010269 +vt 0.544294 0.010269 +vt 0.544088 0.010269 +vt 0.544088 0.010269 +vt 0.544603 0.014812 +vt 0.544440 0.014812 +vt 0.544278 0.014812 +vt 0.544444 0.014812 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000020 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000010 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.000015 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 -0.000020 +vn 0.000000 1.000000 0.000021 +vn 0.000000 1.000000 -0.000010 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000015 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000002 +vn 0.000000 -1.000000 0.000002 +vn 0.000000 -1.000000 0.000002 +vn -0.000015 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000002 -1.000000 0.000000 +vn 0.000002 -1.000000 0.000000 +vn 0.000002 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 -0.000021 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000010 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000021 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 -0.000010 +vn 0.000000 1.000000 0.000002 +vn 0.000000 1.000000 0.000002 +vn 0.000000 1.000000 0.000002 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000015 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000016 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -0.707107 0.000000 -0.707106 +vn -0.707107 0.000000 -0.707106 +vn -0.707107 0.000000 -0.707106 +vn -0.707106 0.000000 -0.707107 +vn -0.993802 0.000000 -0.111165 +vn -0.993802 0.000000 -0.111164 +vn -0.944693 0.000000 -0.327955 +vn 0.000000 0.000000 0.000000 +vn -0.707107 0.000000 0.707106 +vn -0.707107 0.000000 0.707106 +vn -0.707107 0.000000 0.707106 +vn -0.707106 0.000000 0.707107 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.000009 0.000000 1.000000 +vn -1.000000 0.000000 -0.000001 +vn -1.000000 0.000000 -0.000001 +vn -1.000000 0.000000 -0.000001 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000002 +vn -1.000000 -0.000007 -0.000001 +vn -1.000000 0.000007 0.000001 +vn -1.000000 0.000000 0.000002 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707106 +vn 0.111167 0.000000 -0.993802 +vn 0.111154 0.000000 -0.993803 +vn 0.327997 0.000000 -0.944679 +vn 0.327952 0.000000 -0.944694 +vn -0.707107 0.000000 -0.707106 +vn -0.707107 0.000000 -0.707106 +vn -0.707107 0.000000 -0.707106 +vn -0.707107 0.000000 -0.707107 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 -0.000003 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000009 0.000000 1.000000 +vn 0.000009 0.000000 1.000000 +vn 0.000009 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.707106 0.000000 0.707107 +vn 0.707106 0.000000 0.707107 +vn 0.707106 0.000000 0.707107 +vn 0.707107 0.000000 0.707106 +vn 0.993801 0.000000 0.111177 +vn 0.993802 -0.000002 0.111165 +vn 0.944691 0.000000 0.327961 +vn 0.000000 0.000000 0.000000 +vn 0.707106 0.000000 -0.707107 +vn 0.707106 0.000000 -0.707107 +vn 0.707106 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707106 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000003 0.000000 -1.000000 +vn 0.000003 0.000000 -1.000000 +vn 0.000003 0.000000 -1.000000 +vn -0.000009 0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.707107 0.000000 0.707106 +vn -0.707107 0.000000 0.707106 +vn -0.707107 0.000000 0.707106 +vn -0.707107 0.000000 0.707107 +vn -0.111166 0.000000 0.993802 +vn -0.111154 0.000000 0.993803 +vn -0.328047 0.000000 0.944661 +vn -0.328140 0.000000 0.944629 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707106 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000006 0.000000 -1.000000 +vn 0.000006 0.000000 -1.000000 +vn 0.000006 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +s 1 +f 973/1095/2549 974/1096/2550 975/1097/2551 +f 975/1097/2551 974/1096/2550 976/1098/2552 +f 975/1097/2551 976/1098/2552 977/1099/2553 +f 977/1099/2553 976/1098/2552 978/1100/2554 +f 975/1097/2551 977/1099/2553 979/1101/2555 +f 975/1097/2551 979/1101/2555 980/1102/2556 +s 2 +f 981/1103/2557 982/1104/2558 983/1105/2559 +f 983/1105/2559 982/1104/2558 984/1106/2560 +f 983/1105/2559 984/1106/2560 985/1107/2561 +f 985/1107/2561 984/1106/2560 986/1108/2562 +f 983/1105/2559 985/1107/2561 987/1109/2563 +f 983/1105/2559 987/1109/2563 988/1110/2564 +s 3 +f 989/1111/2565 990/1112/2566 991/1113/2567 +f 991/1113/2567 990/1112/2566 992/1114/2568 +f 991/1113/2567 992/1114/2568 993/1115/2569 +f 993/1115/2569 992/1114/2568 994/1116/2570 +f 991/1113/2567 993/1115/2569 995/1117/2571 +f 991/1113/2567 995/1117/2571 996/1118/2572 +s 4 +f 997/1119/2573 998/1120/2574 999/1121/2575 +f 999/1121/2575 998/1120/2574 1000/1122/2576 +f 1000/1122/2576 998/1120/2574 1001/1123/2577 +f 1002/1124/2578 1001/1123/2577 998/1120/2574 +f 1001/1123/2577 1003/1125/2579 1000/1122/2576 +f 1000/1122/2576 1003/1125/2579 1004/1126/2580 +s 5 +f 1005/1127/2581 1006/1128/2582 1007/1129/2583 +f 1007/1129/2583 1006/1128/2582 1008/1130/2584 +s 6 +f 1009/1131/2585 1010/1132/2586 1011/1133/2587 +f 1011/1133/2587 1010/1132/2586 1012/1134/2588 +f 1012/1134/2588 1010/1132/2586 1013/1135/2589 +f 1014/1136/2590 1015/1137/2591 1010/1132/2586 +f 1010/1132/2586 1015/1137/2591 1013/1135/2589 +f 1012/1134/2588 1013/1135/2589 1016/1138/2592 +s 7 +f 1017/1139/2593 1018/1140/2594 1019/1141/2595 +f 1019/1141/2595 1018/1140/2594 1020/1142/2596 +f 1019/1141/2595 1020/1142/2596 1021/1143/2597 +f 1021/1143/2597 1020/1142/2596 1022/1144/2598 +f 1022/1144/2598 1020/1142/2596 1023/1145/2599 +f 1019/1141/2595 1021/1143/2597 1024/1146/2600 +s 8 +f 1025/1147/2601 1026/1148/2602 1027/1149/2603 +f 1027/1149/2603 1026/1148/2602 1028/1150/2604 +f 1027/1149/2603 1028/1150/2604 1029/1151/2605 +f 1029/1151/2605 1028/1150/2604 1030/1152/2606 +f 1030/1152/2606 1028/1150/2604 1031/1153/2607 +f 1027/1149/2603 1029/1151/2605 1032/1154/2608 +s 9 +f 1033/1155/2609 1034/1156/2610 1035/1157/2611 +f 1035/1157/2611 1034/1156/2610 1036/1158/2612 +s 10 +f 1037/1159/2613 1038/1160/2614 1039/1161/2615 +f 1039/1161/2615 1038/1160/2614 1040/1162/2616 +f 1039/1161/2615 1040/1162/2616 1041/1163/2617 +f 1041/1163/2617 1040/1162/2616 1042/1164/2618 +f 1042/1164/2618 1040/1162/2616 1043/1165/2619 +f 1039/1161/2615 1041/1163/2617 1044/1166/2620 +s 11 +f 984/1106/2621 1012/1134/2622 986/1108/2623 +f 986/1108/2623 1012/1134/2622 1016/1138/2624 +s 12 +f 986/1108/2625 1016/1138/2626 985/1107/2627 +f 985/1107/2627 1016/1138/2626 1013/1135/2628 +s 13 +f 985/1167/2629 1013/1135/2630 1015/1137/2631 +f 987/1109/2632 985/1167/2629 1015/1137/2631 +s 14 +f 987/1109/2633 1015/1137/2634 988/1110/2635 +f 988/1110/2635 1015/1137/2634 1014/1136/2636 +s 15 +f 988/1110/2637 1014/1136/2638 983/1105/2639 +f 983/1105/2639 1014/1136/2638 1010/1132/2640 +s 16 +f 983/1105/2641 1010/1132/2642 981/1103/2643 +f 981/1103/2643 1010/1132/2642 1009/1131/2644 +s 17 +f 982/1104/2645 981/1103/2646 1006/1128/2647 +f 1006/1128/2647 981/1103/2646 1009/1131/2648 +f 1006/1128/2647 1009/1131/2648 1033/1155/2649 +f 1033/1155/2649 1009/1131/2648 1011/1133/2650 +f 1033/1155/2649 1011/1133/2650 1034/1156/2651 +f 1034/1156/2651 1011/1133/2650 982/1104/2645 +f 1034/1156/2651 982/1104/2645 1005/1127/2652 +f 1005/1127/2652 982/1104/2645 1006/1128/2647 +s 18 +f 990/1112/2653 1017/1139/2654 992/1114/2655 +f 992/1114/2655 1017/1139/2654 1019/1141/2656 +s 19 +f 992/1114/2657 1019/1141/2658 994/1116/2659 +f 994/1116/2659 1019/1141/2658 1024/1146/2660 +s 20 +f 994/1116/2661 1024/1146/2662 993/1115/2663 +f 993/1115/2663 1024/1146/2662 1021/1143/2664 +s 21 +f 993/1168/2665 1021/1143/2666 1022/1144/2667 +f 995/1117/2668 993/1168/2665 1022/1144/2667 +s 22 +f 995/1117/2669 1022/1144/2670 996/1118/2671 +f 996/1118/2671 1022/1144/2670 1023/1145/2672 +s 23 +f 996/1118/2673 1023/1145/2674 991/1113/2675 +f 991/1113/2675 1023/1145/2674 1020/1142/2676 +s 24 +f 991/1113/2677 1020/1142/2678 989/1111/2679 +f 989/1111/2679 1020/1142/2678 1018/1140/2680 +s 25 +f 1018/1140/2681 1008/1130/2682 989/1111/2683 +f 989/1111/2683 1008/1130/2682 1006/1128/2684 +f 989/1111/2683 1006/1128/2684 990/1112/2685 +f 990/1112/2685 1006/1128/2684 1017/1139/2686 +f 1017/1139/2686 1006/1128/2684 1033/1155/2687 +f 1017/1139/2686 1033/1155/2687 1018/1140/2681 +f 1018/1140/2681 1033/1155/2687 1035/1157/2688 +f 1018/1140/2681 1035/1157/2688 1008/1130/2682 +s 26 +f 1035/1157/2689 1037/1159/2690 1008/1130/2691 +f 1008/1130/2691 1037/1159/2690 997/1119/2692 +f 1008/1130/2691 997/1119/2692 999/1121/2693 +f 1037/1159/2690 1035/1157/2689 1038/1160/2694 +f 1038/1160/2694 1035/1157/2689 1036/1158/2695 +f 1038/1160/2694 1036/1158/2695 1007/1129/2696 +f 1038/1160/2694 1007/1129/2696 999/1121/2693 +f 999/1121/2693 1007/1129/2696 1008/1130/2691 +s 27 +f 997/1119/2697 1037/1159/2698 998/1120/2699 +f 998/1120/2699 1037/1159/2698 1039/1161/2700 +s 28 +f 998/1120/2701 1039/1161/2702 1002/1124/2703 +f 1002/1124/2703 1039/1161/2702 1044/1166/2704 +s 29 +f 1002/1124/2705 1044/1166/2706 1001/1123/2707 +f 1001/1123/2707 1044/1166/2706 1041/1163/2708 +s 30 +f 1001/1169/2709 1041/1163/2710 1042/1164/2711 +f 1003/1125/2712 1001/1169/2709 1042/1164/2711 +s 31 +f 1003/1125/2713 1042/1164/2714 1004/1126/2715 +f 1004/1126/2715 1042/1164/2714 1043/1165/2716 +s 32 +f 1004/1126/2717 1043/1165/2718 1000/1122/2719 +f 1000/1122/2719 1043/1165/2718 1040/1162/2720 +s 33 +f 1000/1122/2721 1040/1162/2722 999/1121/2723 +f 999/1121/2723 1040/1162/2722 1038/1160/2724 +s 34 +f 1036/1158/2725 974/1096/2726 1007/1129/2727 +f 1007/1129/2727 974/1096/2726 973/1095/2728 +f 1007/1129/2727 973/1095/2728 1005/1127/2729 +f 1005/1127/2729 973/1095/2728 1026/1148/2730 +f 1005/1127/2729 1026/1148/2730 1034/1156/2731 +f 1034/1156/2731 1026/1148/2730 1025/1147/2732 +f 1034/1156/2731 1025/1147/2732 1036/1158/2725 +f 1036/1158/2725 1025/1147/2732 974/1096/2726 +s 35 +f 974/1096/2733 1025/1147/2734 976/1098/2735 +f 976/1098/2735 1025/1147/2734 1027/1149/2736 +s 36 +f 976/1098/2737 1027/1149/2738 978/1100/2739 +f 978/1100/2739 1027/1149/2738 1032/1154/2740 +s 37 +f 978/1100/2741 1032/1154/2742 977/1099/2743 +f 977/1099/2743 1032/1154/2742 1029/1151/2744 +s 38 +f 977/1170/2745 1029/1151/2746 1030/1152/2747 +f 979/1101/2748 977/1170/2745 1030/1152/2747 +s 39 +f 979/1101/2749 1030/1152/2750 980/1102/2751 +f 980/1102/2751 1030/1152/2750 1031/1153/2752 +s 40 +f 980/1102/2753 1031/1153/2754 975/1097/2755 +f 975/1097/2755 1031/1153/2754 1028/1150/2756 +s 41 +f 975/1097/2757 1028/1150/2758 973/1095/2759 +f 973/1095/2759 1028/1150/2758 1026/1148/2760 +s 42 +f 982/1104/2761 1011/1133/2762 984/1106/2763 +f 984/1106/2763 1011/1133/2762 1012/1134/2764 +v 79.000000 -205.000000 85.000000 +v 86.000000 -205.000000 85.000000 +v 79.000000 -205.000000 84.000000 +v 86.000000 -205.000000 84.000000 +v 83.792885 -205.000000 80.207092 +v 87.585785 -205.000000 84.000000 +v 81.207115 -205.000000 80.207092 +v 77.414215 -205.000000 84.000000 +v 75.000000 -205.000000 73.992210 +v 75.000000 -205.000015 81.000000 +v 76.000000 -205.000000 73.992210 +v 76.000000 -205.000000 81.000000 +v 79.792885 -205.000000 78.792900 +v 76.000000 -205.000000 82.585785 +v 79.792885 -205.000000 76.207092 +v 76.000000 -205.000000 72.414215 +v 86.000000 -205.000000 70.000000 +v 79.000000 -205.000000 70.000000 +v 86.000000 -205.000000 71.000000 +v 79.000000 -205.000000 71.000000 +v 83.792908 15.000000 74.792923 +v 81.207115 -205.000000 74.792900 +v 77.414215 -205.000000 71.000000 +v 87.585785 -205.000000 71.000000 +v 90.000000 -205.000000 73.992210 +v 89.000000 -205.000000 73.992210 +v 90.000008 -205.000015 81.000000 +v 89.000000 -205.000000 81.000000 +v 85.207085 15.000000 76.207062 +v 89.000000 -205.000000 72.414215 +v 85.207115 -205.000000 78.792900 +v 89.000000 -205.000000 82.585785 +v 75.000000 -207.500000 85.000000 +v 75.000000 -207.500000 70.000000 +v 90.000000 -207.500000 85.000000 +v 90.000000 -207.500000 70.000000 +v 75.000000 235.000000 73.992210 +v 76.000000 235.000000 73.992210 +v 75.000000 235.000015 81.000000 +v 76.000000 235.000000 81.000000 +v 79.792885 235.000000 78.792900 +v 76.000000 235.000000 72.414215 +v 79.792885 235.000000 76.207092 +v 76.000000 235.000000 82.585785 +v 79.000000 235.000000 70.000000 +v 86.000008 235.000015 69.999992 +v 79.000000 235.000000 71.000000 +v 86.000000 235.000000 71.000000 +v 87.585785 235.000000 71.000000 +v 81.207115 235.000000 74.792900 +v 77.414215 235.000000 71.000000 +v 86.000000 235.000000 85.000000 +v 79.000000 235.000000 85.000000 +v 86.000000 235.000000 84.000000 +v 79.000000 235.000000 84.000000 +v 83.792885 235.000000 80.207092 +v 81.207115 235.000000 80.207092 +v 77.414215 235.000000 84.000000 +v 87.585785 235.000000 84.000000 +v 75.000000 237.500015 69.999992 +v 75.000000 237.500000 85.000000 +v 90.000008 237.500015 69.999992 +v 90.000000 237.500000 85.000000 +v 90.000000 235.000000 73.992210 +v 90.000008 235.000015 81.000000 +v 89.000000 235.000000 73.992210 +v 89.000000 235.000000 81.000000 +v 85.207115 235.000000 78.792900 +v 89.000000 235.000000 82.585785 +v 89.000000 235.000000 72.414215 +vt 0.535666 0.029392 +vt 0.535286 0.029392 +vt 0.535666 0.029392 +vt 0.535286 0.029392 +vt 0.535452 0.027604 +vt 0.535200 0.029392 +vt 0.535546 0.029392 +vt 0.535752 0.029392 +vt 0.535885 0.029392 +vt 0.535885 0.029392 +vt 0.535829 0.029392 +vt 0.535829 0.029392 +vt 0.535633 0.026205 +vt 0.535829 0.029392 +vt 0.535623 0.029392 +vt 0.535829 0.029392 +vt 0.535286 0.029392 +vt 0.535666 0.029392 +vt 0.535286 0.029392 +vt 0.535666 0.029392 +vt 0.535468 0.016865 +vt 0.535546 0.029392 +vt 0.535752 0.029392 +vt 0.535200 0.029392 +vt 0.535067 0.029392 +vt 0.535123 0.029392 +vt 0.535067 0.029392 +vt 0.535123 0.029392 +vt 0.535316 0.016505 +vt 0.535123 0.029392 +vt 0.535329 0.029392 +vt 0.535123 0.029392 +vt 0.535885 0.029503 +vt 0.535885 0.029503 +vt 0.535067 0.029503 +vt 0.535067 0.029503 +vt 0.535885 0.010269 +vt 0.535829 0.010269 +vt 0.535885 0.010269 +vt 0.535829 0.010269 +vt 0.535631 0.010269 +vt 0.535829 0.010269 +vt 0.535623 0.010269 +vt 0.535829 0.010269 +vt 0.535666 0.010269 +vt 0.535286 0.010269 +vt 0.535666 0.010269 +vt 0.535286 0.010269 +vt 0.535200 0.010269 +vt 0.535546 0.010269 +vt 0.535752 0.010269 +vt 0.535286 0.010269 +vt 0.535666 0.010269 +vt 0.535286 0.010269 +vt 0.535666 0.010269 +vt 0.535440 0.010269 +vt 0.535546 0.010269 +vt 0.535752 0.010269 +vt 0.535200 0.010269 +vt 0.535885 0.010157 +vt 0.535885 0.010157 +vt 0.535067 0.010157 +vt 0.535067 0.010157 +vt 0.535067 0.010269 +vt 0.535067 0.010269 +vt 0.535123 0.010269 +vt 0.535123 0.010269 +vt 0.535329 0.010269 +vt 0.535123 0.010269 +vt 0.535123 0.010269 +vt 0.535638 0.011604 +vt 0.535636 0.017671 +vt 0.535485 0.020307 +vt 0.535478 0.014812 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000020 +vn 0.000000 1.000000 -0.000021 +vn 0.000000 1.000000 0.000010 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.000015 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 -0.000012 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000021 +vn 0.000000 1.000000 0.000021 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 -0.000020 +vn 0.000000 1.000000 -0.000010 +vn 0.000000 1.000000 -0.000002 +vn 0.000000 1.000000 -0.000002 +vn 0.000000 1.000000 -0.000002 +vn 0.000015 1.000000 0.000000 +vn 0.000015 1.000000 0.000000 +vn 0.000000 1.000000 -0.000002 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000015 1.000000 0.000000 +vn 0.000015 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -0.000015 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000002 -1.000000 0.000000 +vn 0.000002 -1.000000 0.000000 +vn 0.000002 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000002 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000002 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 -0.000042 +vn 0.000002 -1.000000 0.000000 +vn 0.000000 -1.000000 -0.000042 +vn 0.000000 -1.000000 0.000010 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000021 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 -0.000010 +vn 0.000000 1.000000 0.000002 +vn 0.000000 1.000000 0.000002 +vn 0.000000 1.000000 0.000002 +vn 0.000000 1.000000 -0.000001 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000015 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000015 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 -0.000012 +vn 0.000015 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000016 +vn 0.000000 -1.000000 0.000016 +vn 0.000015 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -0.707107 0.000000 -0.707106 +vn -0.707107 0.000000 -0.707106 +vn -0.707107 0.000000 -0.707106 +vn -0.707106 0.000000 -0.707107 +vn -0.993801 0.000000 -0.111177 +vn -0.993802 -0.000002 -0.111164 +vn -0.944697 0.000000 -0.327945 +vn 0.000000 0.000000 0.000000 +vn -0.707107 0.000000 0.707106 +vn -0.707107 0.000000 0.707106 +vn -0.707107 0.000000 0.707106 +vn -0.707106 0.000000 0.707107 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.000009 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707106 +vn -0.328008 0.000000 -0.944675 +vn -0.328008 0.000000 -0.944675 +vn -0.328008 0.000000 -0.944675 +vn -0.707107 0.000000 -0.707106 +vn -0.707107 0.000000 -0.707106 +vn -0.707107 0.000000 -0.707107 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 -0.000008 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000002 +vn 1.000000 0.000000 0.000002 +vn 1.000000 0.000000 0.000002 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 -0.000001 +vn 1.000000 -0.000007 -0.000001 +vn 1.000000 0.000003 0.000001 +vn 1.000000 0.000000 0.000002 +vn 0.000009 0.000000 1.000000 +vn 0.000009 0.000000 1.000000 +vn 0.000009 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.707106 0.000000 0.707107 +vn 0.707106 0.000000 0.707107 +vn 0.707106 0.000000 0.707107 +vn 0.000000 0.000000 0.000000 +vn 0.944690 0.000000 0.327965 +vn 0.944688 0.000000 0.327971 +vn 0.707106 0.000000 -0.707107 +vn 0.707106 0.000000 -0.707107 +vn 0.707106 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707106 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000003 0.000000 -1.000000 +vn 0.000003 0.000000 -1.000000 +vn 0.000003 0.000000 -1.000000 +vn -0.000009 0.000000 -1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.707107 0.000000 0.707106 +vn -0.707107 0.000000 0.707106 +vn -0.707107 0.000000 0.707106 +vn -0.707107 0.000000 0.707107 +vn -0.111167 0.000000 0.993802 +vn -0.111154 0.000000 0.993803 +vn -0.328043 0.000000 0.944663 +vn -0.328136 0.000000 0.944631 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707106 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000006 0.000000 -1.000000 +vn 0.000006 0.000000 -1.000000 +vn 0.000006 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +s 1 +f 1045/1171/2765 1046/1172/2766 1047/1173/2767 +f 1047/1173/2767 1046/1172/2766 1048/1174/2768 +f 1047/1173/2767 1048/1174/2768 1049/1175/2769 +f 1049/1175/2769 1048/1174/2768 1050/1176/2770 +f 1047/1173/2767 1049/1175/2769 1051/1177/2771 +f 1047/1173/2767 1051/1177/2771 1052/1178/2772 +s 2 +f 1053/1179/2773 1054/1180/2774 1055/1181/2775 +f 1055/1181/2775 1054/1180/2774 1056/1182/2776 +f 1055/1181/2775 1056/1182/2776 1057/1183/2777 +f 1057/1183/2777 1056/1182/2776 1058/1184/2778 +f 1055/1181/2775 1057/1183/2777 1059/1185/2779 +f 1055/1181/2775 1059/1185/2779 1060/1186/2780 +s 3 +f 1061/1187/2781 1062/1188/2782 1063/1189/2783 +f 1063/1189/2783 1062/1188/2782 1064/1190/2784 +s 4 +f 1063/1189/2785 1064/1190/2786 1065/1191/2787 +s off +f 1065/1191/2788 1064/1190/2789 1066/1192/2790 +f 1066/1192/2791 1064/1190/2792 1067/1193/2793 +s 4 +f 1063/1189/2785 1065/1191/2787 1068/1194/2794 +s 5 +f 1069/1195/2795 1070/1196/2796 1071/1197/2797 +f 1071/1197/2797 1070/1196/2796 1072/1198/2798 +s 6 +f 1072/1198/2799 1070/1196/2800 1073/1199/2801 +f 1074/1200/2802 1073/1199/2801 1070/1196/2800 +s off +f 1073/1199/2803 1075/1201/2804 1072/1198/2805 +f 1072/1198/2806 1075/1201/2807 1076/1202/2808 +s 7 +f 1077/1203/2809 1078/1204/2810 1079/1205/2811 +f 1079/1205/2811 1078/1204/2810 1080/1206/2812 +s 8 +f 1081/1207/2813 1082/1208/2814 1083/1209/2815 +f 1083/1209/2815 1082/1208/2814 1084/1210/2816 +f 1084/1210/2816 1082/1208/2814 1085/1211/2817 +f 1086/1212/2818 1087/1213/2819 1082/1208/2814 +f 1082/1208/2814 1087/1213/2819 1085/1211/2817 +f 1084/1210/2816 1085/1211/2817 1088/1214/2820 +s 9 +f 1089/1215/2821 1090/1216/2822 1091/1217/2823 +f 1091/1217/2823 1090/1216/2822 1092/1218/2824 +s 10 +f 1091/1217/2825 1092/1218/2826 1065/1191/2827 +f 1065/1191/2827 1092/1218/2826 1093/1219/2828 +s off +f 1091/1217/2829 1065/1191/2830 1094/1220/2831 +f 1091/1217/2832 1094/1220/2833 1095/1221/2834 +s 11 +f 1096/1222/2835 1097/1223/2836 1098/1224/2837 +f 1098/1224/2837 1097/1223/2836 1099/1225/2838 +f 1098/1224/2837 1099/1225/2838 1100/1226/2839 +f 1100/1226/2839 1099/1225/2838 1101/1227/2840 +f 1101/1227/2840 1099/1225/2838 1102/1228/2841 +f 1098/1224/2837 1100/1226/2839 1103/1229/2842 +s 12 +f 1104/1230/2843 1105/1231/2844 1106/1232/2845 +f 1106/1232/2845 1105/1231/2844 1107/1233/2846 +s 13 +f 1108/1234/2847 1109/1235/2848 1110/1236/2849 +f 1110/1236/2849 1109/1235/2848 1111/1237/2850 +s 14 +f 1110/1236/2851 1111/1237/2852 1073/1199/2853 +s off +f 1073/1199/2854 1111/1237/2855 1112/1238/2856 +f 1112/1238/2857 1111/1237/2858 1113/1239/2859 +s 14 +f 1110/1236/2851 1073/1199/2853 1114/1240/2860 +s 15 +f 1056/1182/2861 1084/1210/2862 1058/1184/2863 +f 1058/1184/2863 1084/1210/2862 1088/1214/2864 +s 16 +f 1058/1184/2865 1088/1214/2866 1057/1183/2867 +f 1057/1183/2867 1088/1214/2866 1085/1211/2868 +s 17 +f 1057/1241/2869 1085/1211/2870 1087/1213/2871 +f 1059/1185/2872 1057/1242/2869 1087/1213/2871 +s 18 +f 1059/1185/2873 1087/1213/2874 1060/1186/2875 +f 1060/1186/2875 1087/1213/2874 1086/1212/2876 +s 19 +f 1060/1186/2877 1086/1212/2878 1055/1181/2879 +f 1055/1181/2879 1086/1212/2878 1082/1208/2880 +s 20 +f 1055/1181/2881 1082/1208/2882 1053/1179/2883 +f 1053/1179/2883 1082/1208/2882 1081/1207/2884 +s 21 +f 1054/1180/2885 1053/1179/2886 1078/1204/2887 +f 1078/1204/2887 1053/1179/2886 1081/1207/2888 +f 1078/1204/2887 1081/1207/2888 1104/1230/2889 +f 1104/1230/2889 1081/1207/2888 1083/1209/2890 +f 1104/1230/2889 1083/1209/2890 1105/1231/2891 +f 1105/1231/2891 1083/1209/2890 1054/1180/2885 +f 1105/1231/2891 1054/1180/2885 1077/1203/2892 +f 1077/1203/2892 1054/1180/2885 1078/1204/2887 +s 22 +f 1062/1188/2893 1089/1215/2894 1064/1190/2895 +f 1064/1190/2895 1089/1215/2894 1091/1217/2896 +s 23 +f 1064/1190/2897 1091/1217/2898 1067/1193/2899 +f 1067/1193/2899 1091/1217/2898 1095/1221/2900 +s 24 +f 1067/1193/2901 1095/1221/2902 1066/1192/2903 +f 1066/1192/2903 1095/1221/2902 1094/1220/2904 +s off +f 1094/1220/2905 1065/1243/2906 1066/1192/2907 +f 1068/1194/2908 1065/1191/2909 1093/1219/2910 +s 25 +f 1068/1194/2911 1093/1219/2912 1063/1189/2913 +f 1063/1189/2913 1093/1219/2912 1092/1218/2914 +s 26 +f 1063/1189/2915 1092/1218/2916 1061/1187/2917 +f 1061/1187/2917 1092/1218/2916 1090/1216/2918 +s 27 +f 1090/1216/2919 1080/1206/2920 1061/1187/2921 +f 1061/1187/2921 1080/1206/2920 1078/1204/2922 +f 1061/1187/2921 1078/1204/2922 1062/1188/2923 +f 1062/1188/2923 1078/1204/2922 1089/1215/2924 +f 1089/1215/2924 1078/1204/2922 1104/1230/2925 +f 1089/1215/2924 1104/1230/2925 1090/1216/2919 +f 1090/1216/2919 1104/1230/2925 1106/1232/2926 +f 1090/1216/2919 1106/1232/2926 1080/1206/2920 +s 28 +f 1106/1232/2927 1108/1234/2928 1080/1206/2929 +f 1080/1206/2929 1108/1234/2928 1069/1195/2930 +f 1080/1206/2929 1069/1195/2930 1071/1197/2931 +f 1108/1234/2928 1106/1232/2927 1109/1235/2932 +f 1109/1235/2932 1106/1232/2927 1107/1233/2933 +f 1109/1235/2932 1107/1233/2933 1079/1205/2934 +f 1109/1235/2932 1079/1205/2934 1071/1197/2931 +f 1071/1197/2931 1079/1205/2934 1080/1206/2929 +s 29 +f 1069/1195/2935 1108/1234/2936 1070/1196/2937 +f 1070/1196/2937 1108/1234/2936 1110/1236/2938 +s 30 +f 1070/1196/2939 1110/1236/2940 1074/1200/2941 +f 1074/1200/2941 1110/1236/2940 1114/1240/2942 +s off +f 1074/1200/2943 1114/1240/2944 1073/1199/2945 +f 1075/1201/2946 1073/1199/2947 1112/1238/2948 +s 31 +f 1075/1201/2949 1112/1238/2950 1076/1202/2951 +f 1076/1202/2951 1112/1238/2950 1113/1239/2952 +s 32 +f 1076/1202/2953 1113/1239/2954 1072/1198/2955 +f 1072/1198/2955 1113/1239/2954 1111/1237/2956 +s 33 +f 1072/1198/2957 1111/1237/2958 1071/1197/2959 +f 1071/1197/2959 1111/1237/2958 1109/1235/2960 +s 34 +f 1107/1233/2961 1046/1172/2962 1079/1205/2963 +f 1079/1205/2963 1046/1172/2962 1045/1171/2964 +f 1079/1205/2963 1045/1171/2964 1077/1203/2965 +f 1077/1203/2965 1045/1171/2964 1097/1223/2966 +f 1077/1203/2965 1097/1223/2966 1105/1231/2967 +f 1105/1231/2967 1097/1223/2966 1096/1222/2968 +f 1105/1231/2967 1096/1222/2968 1107/1233/2961 +f 1107/1233/2961 1096/1222/2968 1046/1172/2962 +s 35 +f 1046/1172/2969 1096/1222/2970 1048/1174/2971 +f 1048/1174/2971 1096/1222/2970 1098/1224/2972 +s 36 +f 1048/1174/2973 1098/1224/2974 1050/1176/2975 +f 1050/1176/2975 1098/1224/2974 1103/1229/2976 +s 37 +f 1050/1176/2977 1103/1229/2978 1049/1175/2979 +f 1049/1175/2979 1103/1229/2978 1100/1226/2980 +s 38 +f 1049/1244/2981 1100/1226/2982 1101/1227/2983 +f 1051/1177/2984 1049/1244/2981 1101/1227/2983 +s 39 +f 1051/1177/2985 1101/1227/2986 1052/1178/2987 +f 1052/1178/2987 1101/1227/2986 1102/1228/2988 +s 40 +f 1052/1178/2989 1102/1228/2990 1047/1173/2991 +f 1047/1173/2991 1102/1228/2990 1099/1225/2992 +s 41 +f 1047/1173/2993 1099/1225/2994 1045/1171/2995 +f 1045/1171/2995 1099/1225/2994 1097/1223/2996 +s 42 +f 1054/1180/2997 1083/1209/2998 1056/1182/2999 +f 1056/1182/2999 1083/1209/2998 1084/1210/3000 +v -145.946974 91.573254 86.500000 +v -140.715160 97.288597 86.500000 +v -145.277283 88.911846 86.500000 +v -140.411060 93.606171 86.500000 +v -143.863266 86.631347 86.500000 +v -139.332594 91.452839 86.500000 +v -141.734829 84.861765 86.500000 +v -138.140039 90.223591 86.500000 +v -138.740927 83.798745 86.500000 +v -136.215507 88.821301 86.500000 +v -136.032269 83.898676 86.500000 +v -133.604313 88.104020 86.500000 +v -136.032269 83.898676 88.971863 +v -135.425342 84.949907 90.000000 +v -135.854505 84.206574 89.698868 +v -138.582271 84.833438 90.000000 +v -138.694457 84.101800 89.698868 +v -138.740927 83.798745 88.971863 +v -133.604313 88.104020 88.971863 +v -133.759933 87.834478 89.698868 +v -134.135633 87.183746 90.000000 +v -136.669073 87.879668 90.000000 +v -136.348353 88.545503 89.698868 +v -136.215507 88.821301 88.971863 +v -141.218302 85.769391 90.000000 +v -141.583542 85.127603 89.698868 +v -141.734829 84.861765 88.971863 +v -138.816666 89.444489 90.000000 +v -138.338219 89.995397 89.698868 +v -138.140039 90.223591 88.971863 +v -143.077503 87.315130 90.000000 +v -143.633123 86.831622 89.698868 +v -143.863266 86.631347 88.971863 +v -140.180899 90.850698 90.000000 +v -139.581055 91.276476 89.698868 +v -139.332594 91.452839 88.971863 +v -144.319237 89.317772 90.000000 +v -144.996677 89.030739 89.698868 +v -145.277283 88.911846 88.971863 +v -141.419355 93.323472 90.000000 +v -140.706385 93.523371 89.698868 +v -140.411060 93.606171 88.971863 +v -145.946974 91.573254 88.971863 +v -145.703407 91.839334 89.698868 +v -145.115377 92.481707 90.000000 +v -140.715160 97.288597 88.971863 +v -141.661432 96.254868 90.000000 +v -140.992317 96.985825 89.698868 +v -113.587315 83.708206 86.574837 +v -115.291790 87.053427 86.574837 +v -117.946573 89.708210 86.574837 +v -121.291794 91.412684 86.574837 +v -125.000000 92.000006 86.574837 +v -128.708206 91.412683 86.574837 +v -132.053426 89.708208 86.574837 +v -134.708207 87.053425 86.574837 +v -136.412682 83.708205 86.574837 +v -137.000003 80.000000 86.574837 +v -136.412682 76.291795 86.574837 +v -134.708206 72.946576 86.574837 +v -132.053424 70.291795 86.574837 +v -128.708205 68.587320 86.574837 +v -125.000000 67.999998 86.574837 +v -121.291796 68.587320 86.574837 +v -117.946577 70.291796 86.574837 +v -115.291796 72.946576 86.574837 +v -113.587321 76.291796 86.574837 +v -113.000000 80.000000 86.574837 +v -125.000000 80.000000 86.574837 +v -125.000000 80.000000 96.400772 +v -113.587315 83.708206 92.053146 +v -113.832438 83.628561 92.987488 +v -115.291790 87.053427 92.053146 +v -115.500304 86.901933 92.987488 +v -117.946573 89.708210 92.053146 +v -118.098067 89.499696 92.987488 +v -121.291794 91.412684 92.053146 +v -121.371439 91.167562 92.987488 +v -125.000000 92.000006 92.053146 +v -125.000000 91.742269 92.987488 +v -128.708206 91.412683 92.053146 +v -128.628561 91.167561 92.987488 +v -132.053426 89.708208 92.053146 +v -131.901932 89.499694 92.987488 +v -134.708207 87.053425 92.053146 +v -134.499693 86.901931 92.987488 +v -136.412682 83.708205 92.053146 +v -136.167559 83.628560 92.987488 +v -137.000003 80.000000 92.053146 +v -136.742266 80.000000 92.987488 +v -136.412682 76.291795 92.053146 +v -136.167559 76.371440 92.987488 +v -134.708206 72.946576 92.053146 +v -134.499692 73.098070 92.987488 +v -132.053424 70.291795 92.053146 +v -131.901930 70.500309 92.987488 +v -128.708205 68.587320 92.053146 +v -128.628560 68.832443 92.987488 +v -125.000000 67.999998 92.053146 +v -125.000000 68.257735 92.987488 +v -121.291796 68.587320 92.053146 +v -121.371441 68.832443 92.987488 +v -117.946577 70.291796 92.053146 +v -118.098071 70.500310 92.987488 +v -115.291796 72.946576 92.053146 +v -115.500310 73.098070 92.987488 +v -113.587321 76.291796 92.053146 +v -113.832444 76.371441 92.987488 +v -113.000000 80.000000 92.053146 +v -113.257737 80.000000 92.987488 +v -115.494551 83.088508 95.920097 +v -116.304054 82.825485 96.400772 +v -117.602787 85.374390 96.400772 +v -116.914183 85.874690 95.920097 +v -119.625611 87.397213 96.400772 +v -119.125310 88.085817 95.920097 +v -122.174516 88.695946 96.400772 +v -121.911493 89.505449 95.920097 +v -125.000000 89.143456 96.400772 +v -125.000000 89.994618 95.920097 +v -127.825484 88.695946 96.400772 +v -128.088507 89.505448 95.920097 +v -130.374389 87.397213 96.400772 +v -130.874689 88.085816 95.920097 +v -132.397211 85.374388 96.400772 +v -133.085815 85.874688 95.920097 +v -133.695944 82.825483 96.400772 +v -134.505446 83.088506 95.920097 +v -134.143455 80.000000 96.400772 +v -134.994617 80.000000 95.920097 +v -133.695944 77.174517 96.400772 +v -134.505446 76.911494 95.920097 +v -132.397211 74.625613 96.400772 +v -133.085814 74.125313 95.920097 +v -130.374388 72.602791 96.400772 +v -130.874688 71.914187 95.920097 +v -127.825483 71.304058 96.400772 +v -128.088507 70.494555 95.920097 +v -125.000001 70.856547 96.400772 +v -125.000001 70.005385 95.920097 +v -122.174518 71.304058 96.400772 +v -121.911494 70.494555 95.920097 +v -119.625614 72.602791 96.400772 +v -119.125314 71.914187 95.920097 +v -117.602792 74.625614 96.400772 +v -116.914187 74.125313 95.920097 +v -116.304059 77.174518 96.400772 +v -115.494556 76.911495 95.920097 +v -115.856548 80.000001 96.400772 +v -115.005386 80.000000 95.920097 +v -96.468287 89.270515 88.759880 +v -100.729473 97.633568 88.759880 +v -107.366432 104.270525 88.759880 +v -115.729486 108.531710 88.759880 +v -125.000000 110.000015 88.759880 +v -134.270514 108.531708 88.759880 +v -142.633564 104.270519 88.759880 +v -149.270517 97.633562 88.759880 +v -153.531704 89.270512 88.759880 +v -155.000008 80.000000 88.759880 +v -153.531704 70.729488 88.759880 +v -149.270515 62.366440 88.759880 +v -142.633560 55.729486 88.759880 +v -134.270512 51.468300 88.759880 +v -125.000001 49.999996 88.759880 +v -115.729491 51.468302 88.759880 +v -107.366444 55.729488 88.759880 +v -100.729490 62.366442 88.759880 +v -96.468304 70.729490 88.759880 +v -95.000000 80.000000 88.759880 +v -101.198009 87.733738 94.455727 +v -104.752811 94.710442 94.455727 +v -110.289559 100.247187 94.455727 +v -117.266265 103.801992 94.455727 +v -125.000001 105.026894 94.455727 +v -132.733737 103.801991 94.455727 +v -139.710438 100.247179 94.455727 +v -145.247177 94.710436 94.455727 +v -148.801987 87.733734 94.455727 +v -150.026886 80.000001 94.455727 +v -148.801987 72.266268 94.455727 +v -145.247177 65.289567 94.455727 +v -139.710434 59.752825 94.455727 +v -132.733734 56.198019 94.455727 +v -125.000001 54.973118 94.455727 +v -117.266270 56.198019 94.455727 +v -110.289570 59.752827 94.455727 +v -104.752831 65.289568 94.455727 +v -101.198021 72.266269 94.455727 +v -99.973122 80.000001 94.455727 +v -103.101017 87.115413 94.455727 +v -106.371609 93.534317 94.455727 +v -111.465685 98.628391 94.455727 +v -117.884591 101.898983 94.455727 +v -125.000001 103.025951 94.455727 +v -132.115412 101.898983 94.455727 +v -138.534313 98.628384 94.455727 +v -143.628384 93.534313 94.455727 +v -146.898977 87.115410 94.455727 +v -148.025946 80.000001 94.455727 +v -146.898977 72.884593 94.455727 +v -143.628382 66.465691 94.455727 +v -138.534311 61.371620 94.455727 +v -132.115409 58.101028 94.455727 +v -125.000002 56.974060 94.455727 +v -117.884595 58.101028 94.455727 +v -111.465694 61.371624 94.455727 +v -106.371624 66.465693 94.455727 +v -103.101028 72.884594 94.455727 +v -101.974060 80.000001 94.455727 +v -103.125687 87.107397 86.574837 +v -106.392597 93.519070 86.574837 +v -111.480932 98.607405 86.574837 +v -117.892607 101.874311 86.574837 +v -125.000001 103.000013 86.574837 +v -132.107395 101.874311 86.574837 +v -138.519067 98.607399 86.574837 +v -143.607397 93.519065 86.574837 +v -146.874306 87.107394 86.574837 +v -148.000006 80.000001 86.574837 +v -146.874306 72.892609 86.574837 +v -143.607395 66.480938 86.574837 +v -138.519064 61.392609 86.574837 +v -132.107393 58.125698 86.574837 +v -125.000002 57.000000 86.574837 +v -117.892611 58.125700 86.574837 +v -111.480942 61.392611 86.574837 +v -106.392611 66.480940 86.574837 +v -103.125700 72.892611 86.574837 +v -102.000000 80.000001 86.574837 +v -96.468287 89.270515 86.574837 +v -100.729473 97.633568 86.574837 +v -107.366432 104.270525 86.574837 +v -115.729486 108.531710 86.574837 +v -125.000000 110.000015 86.574837 +v -134.270514 108.531708 86.574837 +v -142.633564 104.270519 86.574837 +v -149.270517 97.633562 86.574837 +v -153.531704 89.270512 86.574837 +v -155.000008 80.000000 86.574837 +v -153.531704 70.729488 86.574837 +v -149.270515 62.366440 86.574837 +v -142.633560 55.729486 86.574837 +v -134.270512 51.468300 86.574837 +v -125.000001 49.999996 86.574837 +v -115.729491 51.468302 86.574837 +v -107.366444 55.729488 86.574837 +v -100.729490 62.366442 86.574837 +v -96.468304 70.729490 86.574837 +v -95.000000 80.000000 86.574837 +v -124.549244 56.072762 86.500000 +v -132.114784 57.745974 86.500000 +v -122.579243 57.983435 86.500000 +v -129.077759 59.850544 86.500000 +v -121.311281 60.348259 86.500000 +v -127.752152 61.861191 86.500000 +v -120.842998 63.076330 86.500000 +v -127.283869 63.508596 86.500000 +v -121.419347 66.200636 86.500000 +v -127.031717 65.876436 86.500000 +v -122.860218 68.496436 86.500000 +v -127.716131 68.496436 86.500000 +v -122.860218 68.496436 88.971863 +v -124.074075 68.496436 90.000000 +v -123.215748 68.496436 89.698868 +v -122.394744 65.820689 90.000000 +v -121.705034 66.089352 89.698868 +v -121.419347 66.200636 88.971863 +v -127.716131 68.496436 88.971863 +v -127.404891 68.496436 89.698868 +v -126.653490 68.496436 90.000000 +v -125.989456 65.954452 90.000000 +v -126.726446 65.899286 89.698868 +v -127.031717 65.876436 88.971863 +v -121.887288 63.069843 90.000000 +v -121.148863 63.074430 89.698868 +v -120.842998 63.076330 88.971863 +v -126.270833 63.312172 90.000000 +v -126.987158 63.451065 89.698868 +v -127.283869 63.508596 88.971863 +v -122.296337 60.686857 90.000000 +v -121.599797 60.447432 89.698868 +v -121.311281 60.348259 88.971863 +v -126.806531 61.427607 90.000000 +v -127.475186 61.734198 89.698868 +v -127.752152 61.861191 88.971863 +v -123.409809 58.610165 90.000000 +v -122.822510 58.167000 89.698868 +v -122.579243 57.983435 88.971863 +v -128.328787 59.118685 90.000000 +v -128.858391 59.636187 89.698868 +v -129.077759 59.850544 88.971863 +v -124.549244 56.072762 88.971863 +v -124.901461 56.150658 89.698868 +v -125.751786 56.338718 90.000000 +v -132.114784 57.745974 88.971863 +v -130.746412 57.443342 90.000000 +v -131.713997 57.657335 89.698868 +v -104.503782 92.353985 86.500000 +v -102.170055 84.965430 86.500000 +v -107.143475 93.104719 86.500000 +v -105.511181 86.543285 86.500000 +v -109.825452 93.020394 86.500000 +v -107.915255 86.685971 86.500000 +v -112.422174 92.061905 86.500000 +v -109.576092 86.267813 86.500000 +v -114.839727 90.000619 86.500000 +v -111.752776 85.302263 86.500000 +v -116.107512 87.604887 86.500000 +v -113.679556 83.399544 86.500000 +v -116.107512 87.604887 88.971863 +v -115.500585 86.553657 90.000000 +v -115.929748 87.296989 89.698868 +v -114.022985 89.345873 90.000000 +v -114.600509 89.808848 89.698868 +v -114.839727 90.000619 88.971863 +v -113.679556 83.399544 88.971863 +v -113.835176 83.669086 89.698868 +v -114.210876 84.319818 90.000000 +v -112.341471 86.165880 90.000000 +v -111.925200 85.555211 89.698868 +v -111.752776 85.302263 88.971863 +v -111.894411 91.160766 90.000000 +v -112.267595 91.797967 89.698868 +v -112.422174 92.061905 88.971863 +v -109.912500 87.243340 90.000000 +v -109.674623 86.553538 89.698868 +v -109.576092 86.267813 88.971863 +v -109.626160 91.998013 90.000000 +v -109.767080 92.720946 89.698868 +v -109.825452 93.020394 88.971863 +v -108.012571 87.721695 90.000000 +v -107.943758 86.989327 89.698868 +v -107.915255 86.685971 88.971863 +v -107.270954 92.072063 90.000000 +v -107.180813 92.802261 89.698868 +v -107.143475 93.104719 88.971863 +v -105.251856 87.557843 90.000000 +v -105.435225 86.840443 89.698868 +v -105.511181 86.543285 88.971863 +v -104.503782 92.353985 88.971863 +v -104.395134 92.010009 89.698868 +v -104.132837 91.179575 90.000000 +v -102.170055 84.965430 88.971863 +v -102.592157 86.301790 90.000000 +v -102.293686 85.356841 89.698868 +v -145.496218 67.646015 86.500000 +v -147.829945 75.034570 86.500000 +v -142.856525 66.895281 86.500000 +v -144.488819 73.456715 86.500000 +v -140.174548 66.979606 86.500000 +v -142.084745 73.314029 86.500000 +v -137.577826 67.938095 86.500000 +v -140.423908 73.732187 86.500000 +v -135.160273 69.999381 86.500000 +v -138.247224 74.697737 86.500000 +v -133.892488 72.395113 86.500000 +v -136.320444 76.600456 86.500000 +v -133.892488 72.395113 88.971863 +v -134.499415 73.446343 90.000000 +v -134.070252 72.703011 89.698868 +v -135.977015 70.654127 90.000000 +v -135.399491 70.191152 89.698868 +v -135.160273 69.999381 88.971863 +v -136.320444 76.600456 88.971863 +v -136.164824 76.330914 89.698868 +v -135.789124 75.680182 90.000000 +v -137.658529 73.834120 90.000000 +v -138.074800 74.444789 89.698868 +v -138.247224 74.697737 88.971863 +v -138.105589 68.839234 90.000000 +v -137.732405 68.202033 89.698868 +v -137.577826 67.938095 88.971863 +v -140.087500 72.756660 90.000000 +v -140.325377 73.446462 89.698868 +v -140.423908 73.732187 88.971863 +v -140.373840 68.001987 90.000000 +v -140.232920 67.279054 89.698868 +v -140.174548 66.979606 88.971863 +v -141.987429 72.278305 90.000000 +v -142.056242 73.010673 89.698868 +v -142.084745 73.314029 88.971863 +v -142.729046 67.927937 90.000000 +v -142.819187 67.197739 89.698868 +v -142.856525 66.895281 88.971863 +v -144.748144 72.442157 90.000000 +v -144.564775 73.159557 89.698868 +v -144.488819 73.456715 88.971863 +v -145.496218 67.646015 88.971863 +v -145.604866 67.989991 89.698868 +v -145.867163 68.820425 90.000000 +v -147.829945 75.034570 88.971863 +v -147.407843 73.698210 90.000000 +v -147.706314 74.643159 89.698868 +v -125.450756 103.927238 86.500000 +v -117.885216 102.254026 86.500000 +v -127.420757 102.016565 86.500000 +v -120.922241 100.149456 86.500000 +v -128.688719 99.651741 86.500000 +v -122.247848 98.138809 86.500000 +v -129.157002 96.923670 86.500000 +v -122.716131 96.491404 86.500000 +v -128.580653 93.799364 86.500000 +v -122.968283 94.123564 86.500000 +v -127.139782 91.503564 86.500000 +v -122.283869 91.503564 86.500000 +v -127.139782 91.503564 88.971863 +v -125.925925 91.503564 90.000000 +v -126.784252 91.503564 89.698868 +v -127.605256 94.179311 90.000000 +v -128.294966 93.910648 89.698868 +v -128.580653 93.799364 88.971863 +v -122.283869 91.503564 88.971863 +v -122.595109 91.503564 89.698868 +v -123.346510 91.503564 90.000000 +v -124.010544 94.045548 90.000000 +v -123.273554 94.100714 89.698868 +v -122.968283 94.123564 88.971863 +v -128.112712 96.930157 90.000000 +v -128.851137 96.925570 89.698868 +v -129.157002 96.923670 88.971863 +v -123.729167 96.687828 90.000000 +v -123.012842 96.548935 89.698868 +v -122.716131 96.491404 88.971863 +v -127.703663 99.313143 90.000000 +v -128.400203 99.552568 89.698868 +v -128.688719 99.651741 88.971863 +v -123.193469 98.572393 90.000000 +v -122.524814 98.265802 89.698868 +v -122.247848 98.138809 88.971863 +v -126.590191 101.389835 90.000000 +v -127.177490 101.833000 89.698868 +v -127.420757 102.016565 88.971863 +v -121.671213 100.881315 90.000000 +v -121.141609 100.363813 89.698868 +v -120.922241 100.149456 88.971863 +v -125.450756 103.927238 88.971863 +v -125.098539 103.849342 89.698868 +v -124.248214 103.661282 90.000000 +v -117.885216 102.254026 88.971863 +v -119.253588 102.556658 90.000000 +v -118.286003 102.342665 89.698868 +v -104.053026 68.426746 86.500000 +v -109.284840 62.711403 86.500000 +v -104.722717 71.088154 86.500000 +v -109.588940 66.393829 86.500000 +v -106.136734 73.368653 86.500000 +v -110.667406 68.547161 86.500000 +v -108.265171 75.138235 86.500000 +v -111.859961 69.776409 86.500000 +v -111.259073 76.201255 86.500000 +v -113.784493 71.178699 86.500000 +v -113.967731 76.101324 86.500000 +v -116.395687 71.895980 86.500000 +v -113.967731 76.101324 88.971863 +v -114.574658 75.050093 90.000000 +v -114.145495 75.793426 89.698868 +v -111.417729 75.166562 90.000000 +v -111.305543 75.898200 89.698868 +v -111.259073 76.201255 88.971863 +v -116.395687 71.895980 88.971863 +v -116.240067 72.165522 89.698868 +v -115.864367 72.816254 90.000000 +v -113.330927 72.120332 90.000000 +v -113.651647 71.454497 89.698868 +v -113.784493 71.178699 88.971863 +v -108.781698 74.230609 90.000000 +v -108.416458 74.872397 89.698868 +v -108.265171 75.138235 88.971863 +v -111.183334 70.555511 90.000000 +v -111.661781 70.004603 89.698868 +v -111.859961 69.776409 88.971863 +v -106.922497 72.684870 90.000000 +v -106.366877 73.168378 89.698868 +v -106.136734 73.368653 88.971863 +v -109.819101 69.149302 90.000000 +v -110.418945 68.723524 89.698868 +v -110.667406 68.547161 88.971863 +v -105.680763 70.682228 90.000000 +v -105.003323 70.969261 89.698868 +v -104.722717 71.088154 88.971863 +v -108.580645 66.676528 90.000000 +v -109.293615 66.476629 89.698868 +v -109.588940 66.393829 88.971863 +v -104.053026 68.426746 88.971863 +v -104.296593 68.160666 89.698868 +v -104.884623 67.518293 90.000000 +v -109.284840 62.711403 88.971863 +v -108.338568 63.745132 90.000000 +v -109.007683 63.014175 89.698868 +vt 0.016937 0.027515 +vt 0.019416 0.030224 +vt 0.019560 0.028478 +vt 0.017254 0.026254 +vt 0.020071 0.027458 +vt 0.017924 0.025173 +vt 0.020636 0.026875 +vt 0.018933 0.024334 +vt 0.021548 0.026211 +vt 0.020352 0.023831 +vt 0.022786 0.025871 +vt 0.021635 0.023878 +vt 0.022534 0.025435 +vt 0.022712 0.025743 +vt 0.021486 0.026080 +vt 0.021334 0.025765 +vt 0.022786 0.025871 +vt 0.021548 0.026211 +vt 0.017254 0.026254 +vt 0.017387 0.026310 +vt 0.017052 0.027641 +vt 0.016937 0.027515 +vt 0.017708 0.026446 +vt 0.017331 0.027945 +vt 0.020427 0.024321 +vt 0.021923 0.024376 +vt 0.020316 0.026506 +vt 0.019178 0.024764 +vt 0.019669 0.027173 +vt 0.018297 0.025497 +vt 0.019082 0.028344 +vt 0.018968 0.029734 +vt 0.020636 0.026875 +vt 0.020071 0.027458 +vt 0.019560 0.028478 +vt 0.019416 0.030224 +vt 0.021635 0.023878 +vt 0.020352 0.023831 +vt 0.018933 0.024334 +vt 0.017924 0.025173 +vt 0.021720 0.024024 +vt 0.020374 0.023974 +vt 0.020542 0.026767 +vt 0.019004 0.024460 +vt 0.019953 0.027374 +vt 0.018033 0.025268 +vt 0.019420 0.028439 +vt 0.019285 0.030080 +vt 0.031464 0.025373 +vt 0.032272 0.023788 +vt 0.026864 0.022030 +vt 0.030206 0.026631 +vt 0.028621 0.027439 +vt 0.026864 0.027717 +vt 0.025106 0.027439 +vt 0.023521 0.026631 +vt 0.022263 0.025373 +vt 0.021455 0.023788 +vt 0.021177 0.022030 +vt 0.021455 0.020273 +vt 0.022263 0.018688 +vt 0.023521 0.017430 +vt 0.025106 0.016622 +vt 0.026864 0.016344 +vt 0.028621 0.016622 +vt 0.030206 0.017430 +vt 0.031464 0.018688 +vt 0.032272 0.020273 +vt 0.032550 0.022030 +vt 0.032272 0.023788 +vt 0.032156 0.023750 +vt 0.032428 0.022030 +vt 0.032550 0.022030 +vt 0.031464 0.025373 +vt 0.031366 0.025301 +vt 0.030206 0.026631 +vt 0.030134 0.026532 +vt 0.028621 0.027439 +vt 0.028583 0.027323 +vt 0.026864 0.027717 +vt 0.026864 0.027595 +vt 0.025106 0.027439 +vt 0.025144 0.027323 +vt 0.023521 0.026631 +vt 0.023593 0.026532 +vt 0.022263 0.025373 +vt 0.022362 0.025301 +vt 0.021455 0.023788 +vt 0.021571 0.023750 +vt 0.021177 0.022030 +vt 0.021299 0.022030 +vt 0.021455 0.020273 +vt 0.021571 0.020311 +vt 0.022263 0.018688 +vt 0.022362 0.018760 +vt 0.023521 0.017430 +vt 0.023593 0.017528 +vt 0.025106 0.016622 +vt 0.025144 0.016738 +vt 0.026864 0.016344 +vt 0.026864 0.016466 +vt 0.028621 0.016622 +vt 0.028583 0.016738 +vt 0.030206 0.017430 +vt 0.030134 0.017528 +vt 0.031464 0.018688 +vt 0.031366 0.018760 +vt 0.032272 0.020273 +vt 0.032156 0.020311 +vt 0.031368 0.023494 +vt 0.030985 0.023369 +vt 0.031197 0.022030 +vt 0.031600 0.022030 +vt 0.030695 0.024814 +vt 0.030369 0.024577 +vt 0.029648 0.025862 +vt 0.029410 0.025536 +vt 0.028327 0.026535 +vt 0.028203 0.026151 +vt 0.026864 0.026767 +vt 0.026864 0.026363 +vt 0.025400 0.026535 +vt 0.025525 0.026151 +vt 0.024079 0.025862 +vt 0.024317 0.025536 +vt 0.023032 0.024814 +vt 0.023358 0.024577 +vt 0.022359 0.023494 +vt 0.022742 0.023369 +vt 0.022127 0.022030 +vt 0.022530 0.022030 +vt 0.022359 0.020567 +vt 0.022742 0.020691 +vt 0.023032 0.019246 +vt 0.023358 0.019483 +vt 0.024079 0.018198 +vt 0.024317 0.018525 +vt 0.025400 0.017526 +vt 0.025525 0.017909 +vt 0.026864 0.017294 +vt 0.026864 0.017697 +vt 0.028327 0.017526 +vt 0.028203 0.017909 +vt 0.029648 0.018198 +vt 0.029410 0.018525 +vt 0.030695 0.019246 +vt 0.030369 0.019483 +vt 0.031368 0.020567 +vt 0.030985 0.020691 +vt 0.026864 0.022030 +vt 0.040385 0.026424 +vt 0.038365 0.030387 +vt 0.036459 0.029002 +vt 0.038143 0.025696 +vt 0.035220 0.033532 +vt 0.033835 0.031626 +vt 0.031257 0.035552 +vt 0.030529 0.033310 +vt 0.026864 0.036247 +vt 0.026864 0.033891 +vt 0.022470 0.035552 +vt 0.023198 0.033310 +vt 0.018507 0.033532 +vt 0.019892 0.031626 +vt 0.015362 0.030387 +vt 0.017268 0.029002 +vt 0.013342 0.026424 +vt 0.015584 0.025696 +vt 0.012646 0.022030 +vt 0.015003 0.022030 +vt 0.013342 0.017637 +vt 0.015584 0.018365 +vt 0.015362 0.013674 +vt 0.017268 0.015059 +vt 0.018507 0.010529 +vt 0.019892 0.012435 +vt 0.022470 0.008509 +vt 0.023198 0.010751 +vt 0.026864 0.007813 +vt 0.026864 0.010170 +vt 0.031257 0.008509 +vt 0.030529 0.010751 +vt 0.035220 0.010529 +vt 0.033835 0.012435 +vt 0.038365 0.013674 +vt 0.036459 0.015059 +vt 0.040385 0.017637 +vt 0.038143 0.018365 +vt 0.041081 0.022030 +vt 0.038724 0.022030 +vt 0.035692 0.028444 +vt 0.037242 0.025402 +vt 0.033278 0.030859 +vt 0.030236 0.032408 +vt 0.026864 0.032942 +vt 0.023491 0.032408 +vt 0.020450 0.030859 +vt 0.018035 0.028444 +vt 0.016485 0.025402 +vt 0.015951 0.022030 +vt 0.016485 0.018658 +vt 0.018035 0.015616 +vt 0.020450 0.013202 +vt 0.023492 0.011652 +vt 0.026864 0.011118 +vt 0.030236 0.011652 +vt 0.033278 0.013202 +vt 0.035692 0.015616 +vt 0.037242 0.018658 +vt 0.037776 0.022030 +vt 0.038365 0.030387 +vt 0.040385 0.026424 +vt 0.037230 0.025399 +vt 0.035682 0.028437 +vt 0.035220 0.033532 +vt 0.033270 0.030849 +vt 0.031257 0.035552 +vt 0.030232 0.032397 +vt 0.026864 0.036247 +vt 0.026864 0.032930 +vt 0.022470 0.035552 +vt 0.023495 0.032397 +vt 0.018507 0.033532 +vt 0.020457 0.030849 +vt 0.015362 0.030387 +vt 0.018045 0.028437 +vt 0.013342 0.026424 +vt 0.016497 0.025399 +vt 0.012646 0.022030 +vt 0.015964 0.022030 +vt 0.013342 0.017637 +vt 0.016497 0.018662 +vt 0.015362 0.013674 +vt 0.018045 0.015624 +vt 0.018507 0.010529 +vt 0.020457 0.013212 +vt 0.022470 0.008509 +vt 0.023495 0.011664 +vt 0.026864 0.007813 +vt 0.026864 0.011131 +vt 0.031257 0.008509 +vt 0.030232 0.011664 +vt 0.035220 0.010529 +vt 0.033270 0.013212 +vt 0.038365 0.013674 +vt 0.035682 0.015624 +vt 0.040385 0.017637 +vt 0.037230 0.018662 +vt 0.041081 0.022030 +vt 0.037763 0.022030 +vt 0.027077 0.010691 +vt 0.023492 0.011484 +vt 0.024931 0.012481 +vt 0.028011 0.011597 +vt 0.025559 0.013434 +vt 0.028612 0.012717 +vt 0.025781 0.014215 +vt 0.028834 0.014010 +vt 0.025901 0.015337 +vt 0.028560 0.015491 +vt 0.025576 0.016579 +vt 0.027878 0.016579 +vt 0.026080 0.016579 +vt 0.025724 0.016579 +vt 0.026045 0.015348 +vt 0.026395 0.015374 +vt 0.025576 0.016579 +vt 0.025901 0.015337 +vt 0.028011 0.011597 +vt 0.027895 0.011684 +vt 0.026910 0.010728 +vt 0.027077 0.010691 +vt 0.027617 0.011894 +vt 0.026507 0.010817 +vt 0.028098 0.015311 +vt 0.027302 0.016579 +vt 0.026261 0.014122 +vt 0.028339 0.014007 +vt 0.026007 0.013229 +vt 0.028145 0.012878 +vt 0.025286 0.012135 +vt 0.024140 0.011341 +vt 0.025781 0.014215 +vt 0.025559 0.013434 +vt 0.024931 0.012481 +vt 0.023492 0.011484 +vt 0.027878 0.016579 +vt 0.028560 0.015491 +vt 0.028834 0.014010 +vt 0.028612 0.012717 +vt 0.027709 0.016579 +vt 0.028425 0.015438 +vt 0.025922 0.014188 +vt 0.028689 0.014009 +vt 0.025691 0.013374 +vt 0.028475 0.012764 +vt 0.025035 0.012380 +vt 0.023682 0.011442 +vt 0.036577 0.027885 +vt 0.037683 0.024383 +vt 0.036099 0.025131 +vt 0.035326 0.028241 +vt 0.034960 0.025199 +vt 0.034055 0.028201 +vt 0.034173 0.025001 +vt 0.032824 0.027746 +vt 0.033142 0.024543 +vt 0.031679 0.026770 +vt 0.032228 0.023641 +vt 0.031078 0.025634 +vt 0.031977 0.024078 +vt 0.032155 0.023769 +vt 0.033060 0.024663 +vt 0.032863 0.024952 +vt 0.032228 0.023641 +vt 0.033142 0.024543 +vt 0.035326 0.028241 +vt 0.035308 0.028097 +vt 0.036628 0.027722 +vt 0.036577 0.027885 +vt 0.035265 0.027751 +vt 0.036753 0.027329 +vt 0.032066 0.026459 +vt 0.031365 0.025136 +vt 0.034014 0.025463 +vt 0.033074 0.027320 +vt 0.034914 0.025690 +vt 0.034149 0.027716 +vt 0.036222 0.025612 +vt 0.037483 0.025017 +vt 0.034173 0.025001 +vt 0.034960 0.025199 +vt 0.036099 0.025131 +vt 0.037683 0.024383 +vt 0.031078 0.025634 +vt 0.031679 0.026770 +vt 0.032824 0.027746 +vt 0.034055 0.028201 +vt 0.031162 0.025489 +vt 0.031792 0.026679 +vt 0.034126 0.025136 +vt 0.032898 0.027622 +vt 0.034947 0.025343 +vt 0.034083 0.028059 +vt 0.036135 0.025272 +vt 0.037624 0.024569 +vt 0.017150 0.016176 +vt 0.016044 0.019677 +vt 0.017628 0.018930 +vt 0.018401 0.015820 +vt 0.018767 0.018862 +vt 0.019672 0.015860 +vt 0.019554 0.019060 +vt 0.020903 0.016314 +vt 0.020586 0.019518 +vt 0.022049 0.017291 +vt 0.021499 0.020419 +vt 0.022649 0.018426 +vt 0.021751 0.019983 +vt 0.021573 0.020292 +vt 0.020667 0.019398 +vt 0.020865 0.019108 +vt 0.021499 0.020419 +vt 0.020586 0.019518 +vt 0.018401 0.015820 +vt 0.018419 0.015963 +vt 0.017099 0.016339 +vt 0.017150 0.016176 +vt 0.018462 0.016309 +vt 0.016974 0.016732 +vt 0.021661 0.017601 +vt 0.022362 0.018925 +vt 0.019713 0.018598 +vt 0.020653 0.016741 +vt 0.018813 0.018371 +vt 0.019578 0.016345 +vt 0.017505 0.018449 +vt 0.016244 0.019044 +vt 0.019554 0.019060 +vt 0.018767 0.018862 +vt 0.017628 0.018930 +vt 0.016044 0.019677 +vt 0.022649 0.018426 +vt 0.022049 0.017291 +vt 0.020903 0.016314 +vt 0.019672 0.015860 +vt 0.022565 0.018572 +vt 0.021935 0.017382 +vt 0.019601 0.018925 +vt 0.020830 0.016439 +vt 0.018780 0.018718 +vt 0.019645 0.016002 +vt 0.017592 0.018789 +vt 0.016103 0.019492 +vt 0.026650 0.033370 +vt 0.030235 0.032577 +vt 0.028796 0.031579 +vt 0.025716 0.032464 +vt 0.028168 0.030626 +vt 0.025115 0.031343 +vt 0.027946 0.029846 +vt 0.024894 0.030051 +vt 0.027826 0.028724 +vt 0.025167 0.028570 +vt 0.028151 0.027482 +vt 0.025849 0.027482 +vt 0.027647 0.027482 +vt 0.028003 0.027482 +vt 0.027682 0.028713 +vt 0.027332 0.028687 +vt 0.028151 0.027482 +vt 0.027826 0.028724 +vt 0.025716 0.032464 +vt 0.025832 0.032377 +vt 0.026817 0.033333 +vt 0.026650 0.033370 +vt 0.026110 0.032167 +vt 0.027220 0.033243 +vt 0.025629 0.028750 +vt 0.026425 0.027482 +vt 0.027466 0.029939 +vt 0.025388 0.030054 +vt 0.027720 0.030832 +vt 0.025582 0.031183 +vt 0.028441 0.031926 +vt 0.029587 0.032720 +vt 0.027946 0.029846 +vt 0.028168 0.030626 +vt 0.028796 0.031579 +vt 0.030235 0.032577 +vt 0.025849 0.027482 +vt 0.025167 0.028570 +vt 0.024894 0.030051 +vt 0.025115 0.031343 +vt 0.026018 0.027482 +vt 0.025302 0.028623 +vt 0.027805 0.029873 +vt 0.025038 0.030051 +vt 0.028037 0.030687 +vt 0.025252 0.031296 +vt 0.028692 0.031681 +vt 0.030045 0.032619 +vt 0.036790 0.016546 +vt 0.034311 0.013837 +vt 0.034167 0.015582 +vt 0.036473 0.017807 +vt 0.033656 0.016603 +vt 0.035803 0.018888 +vt 0.033091 0.017185 +vt 0.034794 0.019726 +vt 0.032179 0.017850 +vt 0.033376 0.020230 +vt 0.030941 0.018190 +vt 0.032092 0.020183 +vt 0.031193 0.018626 +vt 0.031015 0.018318 +vt 0.032242 0.017981 +vt 0.032394 0.018296 +vt 0.030941 0.018190 +vt 0.032179 0.017850 +vt 0.036473 0.017807 +vt 0.036340 0.017751 +vt 0.036675 0.016420 +vt 0.036790 0.016546 +vt 0.036019 0.017615 +vt 0.036396 0.016115 +vt 0.033300 0.019740 +vt 0.031804 0.019685 +vt 0.033411 0.017555 +vt 0.034550 0.019296 +vt 0.034058 0.016888 +vt 0.035431 0.018564 +vt 0.034645 0.015716 +vt 0.034760 0.014327 +vt 0.033091 0.017185 +vt 0.033656 0.016603 +vt 0.034167 0.015582 +vt 0.034311 0.013837 +vt 0.032092 0.020183 +vt 0.033376 0.020230 +vt 0.034794 0.019726 +vt 0.035803 0.018888 +vt 0.032008 0.020037 +vt 0.033354 0.020087 +vt 0.033185 0.017294 +vt 0.034723 0.019600 +vt 0.033774 0.016686 +vt 0.035694 0.018793 +vt 0.034307 0.015622 +vt 0.034442 0.013981 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn 0.027246 0.099185 0.994696 +vn 0.101367 0.369011 0.923881 +vn 0.162606 0.340506 0.926075 +vn 0.024686 0.051696 0.998358 +vn 0.244718 0.890880 0.382682 +vn 0.263836 0.960472 0.088798 +vn 0.421697 0.901329 0.098884 +vn 0.391797 0.834209 0.388059 +vn -0.917798 -0.386139 0.092433 +vn -0.851056 -0.355317 0.386592 +vn -0.895950 -0.225449 0.382682 +vn -0.964230 -0.242630 0.106733 +vn -0.351280 -0.141841 0.925464 +vn -0.067114 -0.027100 0.997377 +vn -0.033461 -0.008419 0.999405 +vn -0.371111 -0.093383 0.923881 +vn -0.013205 -0.087412 0.996085 +vn 0.001804 -0.048902 0.998802 +vn 0.033181 0.039248 0.998679 +vn -0.038350 -0.069420 0.996850 +vn 0.038773 0.026020 0.998909 +vn -0.054266 -0.047440 0.997399 +vn 0.050026 0.013017 0.998663 +vn 0.145150 0.011987 0.989337 +vn 0.264882 0.964281 0.000000 +vn 0.423361 0.905961 0.000000 +vn 0.645085 0.764111 0.000000 +vn 0.642080 0.760489 0.096904 +vn 0.830237 0.557411 0.000000 +vn 0.826159 0.554659 0.099067 +vn 0.973065 0.230531 0.000000 +vn 0.968118 0.230508 0.098051 +vn 0.996608 0.082301 0.000000 +vn 0.993768 0.082066 0.075436 +vn 0.036868 -0.999320 0.000000 +vn 0.036661 -0.993693 0.105978 +vn -0.164969 -0.981991 0.092084 +vn -0.166529 -0.986037 0.000000 +vn -0.481914 -0.871511 0.090703 +vn -0.483926 -0.875109 0.000000 +vn -0.749605 -0.655636 0.090740 +vn -0.752703 -0.658361 0.000000 +vn -0.921442 -0.388517 0.000000 +vn -0.969769 -0.244024 0.000000 +vn 0.034062 -0.923251 0.382684 +vn -0.149845 -0.909156 0.388563 +vn 0.014109 -0.382420 0.923881 +vn -0.056284 -0.372613 0.926278 +vn 0.246316 0.291349 0.924361 +vn 0.595792 0.705475 0.383845 +vn -0.445985 -0.806676 0.387778 +vn -0.182604 -0.330547 0.925956 +vn 0.314673 0.211180 0.925410 +vn 0.765772 0.514075 0.386419 +vn -0.694100 -0.607036 0.386954 +vn -0.284919 -0.249074 0.925626 +vn 0.364635 0.094880 0.926304 +vn 0.895601 0.216729 0.388494 +vn 0.381386 0.031495 0.923879 +vn 0.920744 0.076037 0.382686 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.950337 0.308782 0.038887 +vn 0.847784 0.275461 0.453193 +vn 0.891413 -0.000001 0.453192 +vn 0.999244 -0.000001 0.038887 +vn 0.808405 0.587341 0.038887 +vn 0.721168 0.523959 0.453193 +vn 0.587341 0.808405 0.038887 +vn 0.523960 0.721168 0.453193 +vn 0.308783 0.950337 0.038887 +vn 0.275461 0.847784 0.453193 +vn 0.000000 0.999244 0.038887 +vn 0.000000 0.891413 0.453193 +vn -0.308783 0.950337 0.038887 +vn -0.275460 0.847784 0.453193 +vn -0.587340 0.808405 0.038887 +vn -0.523958 0.721168 0.453193 +vn -0.808405 0.587341 0.038887 +vn -0.721167 0.523960 0.453193 +vn -0.950337 0.308783 0.038887 +vn -0.847784 0.275462 0.453193 +vn -0.999244 0.000000 0.038887 +vn -0.891413 0.000000 0.453193 +vn -0.950337 -0.308784 0.038887 +vn -0.847783 -0.275462 0.453193 +vn -0.808405 -0.587341 0.038887 +vn -0.721167 -0.523960 0.453193 +vn -0.587341 -0.808405 0.038887 +vn -0.523959 -0.721168 0.453193 +vn -0.308784 -0.950337 0.038887 +vn -0.275462 -0.847784 0.453193 +vn 0.000000 -0.999244 0.038887 +vn -0.000000 -0.891412 0.453193 +vn 0.308783 -0.950337 0.038887 +vn 0.275460 -0.847784 0.453193 +vn 0.587340 -0.808405 0.038887 +vn 0.523958 -0.721168 0.453193 +vn 0.808405 -0.587341 0.038887 +vn 0.721167 -0.523960 0.453193 +vn 0.950337 -0.308783 0.038887 +vn 0.847784 -0.275462 0.453193 +vn 0.769325 0.249968 0.587925 +vn 0.101726 0.033053 0.994263 +vn 0.106960 -0.000000 0.994263 +vn 0.808916 -0.000001 0.587925 +vn 0.654426 0.475469 0.587925 +vn 0.086534 0.062871 0.994263 +vn 0.475468 0.654427 0.587925 +vn 0.062872 0.086534 0.994263 +vn 0.249968 0.769325 0.587925 +vn 0.033055 0.101727 0.994263 +vn -0.000000 0.808915 0.587925 +vn -0.000000 0.106962 0.994263 +vn -0.249968 0.769325 0.587925 +vn -0.033057 0.101727 0.994263 +vn -0.475468 0.654426 0.587925 +vn -0.062873 0.086534 0.994263 +vn -0.654426 0.475468 0.587925 +vn -0.086534 0.062871 0.994263 +vn -0.769324 0.249969 0.587925 +vn -0.101728 0.033053 0.994263 +vn -0.808915 0.000000 0.587925 +vn -0.106962 0.000000 0.994263 +vn -0.769324 -0.249969 0.587925 +vn -0.101729 -0.033053 0.994263 +vn -0.654426 -0.475469 0.587925 +vn -0.086535 -0.062871 0.994263 +vn -0.475468 -0.654427 0.587925 +vn -0.062870 -0.086534 0.994263 +vn -0.249968 -0.769324 0.587925 +vn -0.033053 -0.101727 0.994263 +vn -0.000001 -0.808915 0.587925 +vn 0.000000 -0.106962 0.994263 +vn 0.249968 -0.769325 0.587925 +vn 0.033053 -0.101727 0.994263 +vn 0.475468 -0.654427 0.587925 +vn 0.062871 -0.086534 0.994263 +vn 0.654426 -0.475469 0.587925 +vn 0.086534 -0.062871 0.994263 +vn 0.769324 -0.249969 0.587925 +vn 0.101727 -0.033053 0.994263 +vn 0.951057 0.309016 0.000000 +vn 0.809017 0.587786 0.000000 +vn 0.587785 0.809017 0.000000 +vn 0.309017 0.951057 0.000000 +vn -0.000000 1.000000 0.000000 +vn -0.309017 0.951057 0.000000 +vn -0.587785 0.809017 0.000000 +vn -0.809017 0.587785 0.000000 +vn -0.951057 0.309017 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.951057 -0.309017 0.000000 +vn -0.809017 -0.587785 0.000000 +vn -0.587785 -0.809017 0.000000 +vn -0.309017 -0.951057 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.309017 -0.951057 0.000000 +vn 0.587785 -0.809017 0.000000 +vn 0.809017 -0.587785 0.000000 +vn 0.951056 -0.309017 0.000000 +vn 1.000000 -0.000001 0.000000 +vn -0.000000 0.000000 1.000000 +vn 0.814402 0.264614 0.516458 +vn 0.692771 0.503328 0.516458 +vn 0.609417 0.442767 0.657699 +vn 0.716412 0.232776 0.657700 +vn 0.503328 0.692772 0.516458 +vn 0.442768 0.609417 0.657699 +vn 0.264615 0.814402 0.516458 +vn 0.232777 0.716412 0.657699 +vn 0.000000 0.856313 0.516458 +vn 0.000000 0.753281 0.657699 +vn -0.264615 0.814402 0.516458 +vn -0.232776 0.716412 0.657699 +vn -0.503328 0.692771 0.516458 +vn -0.442767 0.609417 0.657699 +vn -0.692771 0.503328 0.516458 +vn -0.609417 0.442767 0.657699 +vn -0.814402 0.264615 0.516458 +vn -0.716412 0.232777 0.657700 +vn -0.856312 -0.000000 0.516458 +vn -0.753280 0.000000 0.657700 +vn -0.814402 -0.264615 0.516458 +vn -0.716412 -0.232776 0.657699 +vn -0.692771 -0.503328 0.516458 +vn -0.609417 -0.442767 0.657699 +vn -0.503328 -0.692771 0.516458 +vn -0.442767 -0.609417 0.657699 +vn -0.264615 -0.814402 0.516458 +vn -0.232777 -0.716412 0.657699 +vn -0.000000 -0.856313 0.516458 +vn -0.000000 -0.753281 0.657699 +vn 0.264615 -0.814402 0.516458 +vn 0.232776 -0.716412 0.657699 +vn 0.503328 -0.692771 0.516458 +vn 0.442767 -0.609417 0.657699 +vn 0.692771 -0.503328 0.516458 +vn 0.609417 -0.442767 0.657699 +vn 0.814402 -0.264615 0.516458 +vn 0.716413 -0.232776 0.657699 +vn 0.856312 -0.000001 0.516458 +vn 0.753281 -0.000001 0.657699 +vn -0.000001 0.000000 1.000000 +vn -0.000003 0.000000 1.000000 +vn -0.000003 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.000000 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn -0.000000 0.000000 1.000000 +vn -0.000000 0.000000 1.000000 +vn -0.000002 0.000000 1.000000 +vn -0.000002 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn -0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.632967 -0.205663 -0.746361 +vn -0.538434 -0.391196 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn -0.391195 -0.538435 -0.746361 +vn -0.000001 0.000000 -1.000000 +vn -0.205664 -0.632968 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 -0.665542 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn 0.205664 -0.632968 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn 0.391196 -0.538434 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn 0.538435 -0.391196 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn 0.632968 -0.205664 -0.746361 +vn 0.000001 0.000000 -1.000000 +vn 0.665542 -0.000000 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn 0.632968 0.205664 -0.746361 +vn -0.000001 0.000000 -1.000000 +vn 0.538434 0.391196 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn 0.391195 0.538435 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn 0.205664 0.632968 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn -0.000000 0.665542 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn -0.205664 0.632968 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn -0.391196 0.538434 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn -0.538435 0.391196 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn -0.632968 0.205664 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn -0.665542 0.000001 -0.746360 +vn -0.951052 -0.309014 0.003292 +vn -0.809013 -0.587782 0.003292 +vn -0.587782 -0.809013 0.003292 +vn -0.309015 -0.951052 0.003292 +vn 0.000000 -0.999995 0.003291 +vn 0.309016 -0.951051 0.003291 +vn 0.587782 -0.809013 0.003292 +vn 0.809013 -0.587782 0.003292 +vn 0.951051 -0.309015 0.003292 +vn 0.999995 -0.000000 0.003292 +vn 0.951051 0.309015 0.003292 +vn 0.809013 0.587782 0.003292 +vn 0.587782 0.809013 0.003292 +vn 0.309015 0.951051 0.003291 +vn -0.000000 0.999995 0.003292 +vn -0.309015 0.951051 0.003292 +vn -0.587782 0.809012 0.003292 +vn -0.809013 0.587782 0.003292 +vn -0.951051 0.309015 0.003292 +vn -0.999995 0.000001 0.003292 +vn 0.951057 0.309016 0.000000 +vn 0.809017 0.587786 0.000000 +vn 0.587784 0.809018 0.000000 +vn 0.309016 0.951057 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.309017 0.951056 0.000000 +vn -0.587785 0.809017 0.000000 +vn -0.809017 0.587785 0.000000 +vn -0.951057 0.309017 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.951057 -0.309017 0.000000 +vn -0.809017 -0.587786 0.000000 +vn -0.587785 -0.809017 0.000000 +vn -0.309017 -0.951056 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.309017 -0.951056 0.000000 +vn 0.587785 -0.809017 0.000000 +vn 0.809017 -0.587785 0.000000 +vn 0.951056 -0.309017 0.000000 +vn 1.000000 -0.000001 0.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.099521 -0.025997 0.994696 +vn -0.370259 -0.096720 0.923880 +vn -0.376186 -0.029434 0.926077 +vn -0.057114 -0.004469 0.998358 +vn -0.893883 -0.233507 0.382685 +vn -0.963711 -0.251747 0.088798 +vn -0.991422 -0.085464 0.098885 +vn -0.918344 -0.077800 0.388060 +vn 0.793305 -0.601767 0.092433 +vn 0.733240 -0.559378 0.386593 +vn 0.643214 -0.663196 0.382683 +vn 0.692237 -0.713734 0.106733 +vn 0.298486 -0.233299 0.925461 +vn 0.057028 -0.044573 0.997377 +vn 0.024020 -0.024766 0.999405 +vn 0.266434 -0.274699 0.923879 +vn 0.082303 0.032271 0.996085 +vn 0.041448 0.026013 0.998802 +vn -0.050580 0.009112 0.998679 +vn 0.079294 0.001499 0.996850 +vn -0.041919 0.020567 0.998909 +vn 0.068219 -0.023277 0.997399 +vn -0.036287 0.036816 0.998663 +vn -0.082955 0.119711 0.989337 +vn -0.967533 -0.252745 0.000000 +vn -0.996266 -0.086339 0.000000 +vn -0.984282 0.176605 0.000000 +vn -0.979643 0.175812 0.096905 +vn -0.897851 0.440300 0.000000 +vn -0.893429 0.438145 0.099068 +vn -0.686179 0.727433 0.000000 +vn -0.683685 0.723161 0.098051 +vn -0.569579 0.821937 0.000000 +vn -0.567955 0.819595 0.075436 +vn 0.847003 0.531588 0.000000 +vn 0.842233 0.528595 0.105978 +vn 0.932913 0.348128 0.092084 +vn 0.937197 0.348799 0.000000 +vn 0.995708 0.018406 0.090703 +vn 0.999830 0.018462 0.000000 +vn 0.942600 -0.321360 0.090740 +vn 0.946508 -0.322679 0.000000 +vn 0.797187 -0.603733 0.000000 +vn 0.696216 -0.717833 0.000000 +vn 0.782527 0.491125 0.382684 +vn 0.862275 0.324810 0.388563 +vn 0.324132 0.203428 0.923881 +vn 0.350837 0.137560 0.926278 +vn -0.375467 0.067640 0.924365 +vn -0.908855 0.163229 0.383846 +vn 0.921594 0.017102 0.387778 +vn 0.377565 0.007135 0.925956 +vn -0.340222 0.166926 0.925410 +vn -0.828089 0.406138 0.386421 +vn 0.872758 -0.297591 0.386954 +vn 0.358168 -0.122210 0.925624 +vn -0.264482 0.268343 0.926305 +vn -0.635493 0.667249 0.388493 +vn -0.217962 0.314540 0.923882 +vn -0.526221 0.759372 0.382684 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.072275 -0.073188 0.994696 +vn 0.268894 -0.272290 0.923880 +vn 0.213586 -0.311072 0.926075 +vn 0.032428 -0.047228 0.998358 +vn 0.649165 -0.657372 0.382683 +vn 0.699875 -0.708724 0.088798 +vn 0.569726 -0.815864 0.098885 +vn 0.526550 -0.756409 0.388060 +vn 0.124493 0.987906 0.092433 +vn 0.117812 0.914694 0.386594 +vn 0.252729 0.888640 0.382684 +vn 0.271991 0.956362 0.106733 +vn 0.052801 0.375140 0.925463 +vn 0.010088 0.071673 0.997377 +vn 0.009439 0.033186 0.999405 +vn 0.104679 0.368083 0.923881 +vn -0.069099 0.055142 0.996085 +vn -0.043253 0.022889 0.998802 +vn 0.017399 -0.048360 0.998679 +vn -0.040945 0.067921 0.996850 +vn 0.003148 -0.046587 0.998909 +vn -0.013951 0.070716 0.997399 +vn -0.013739 -0.049834 0.998663 +vn -0.062194 -0.131697 0.989337 +vn 0.702650 -0.711535 0.000000 +vn 0.572905 -0.819622 0.000000 +vn 0.339197 -0.940715 0.000000 +vn 0.337564 -0.936301 0.096905 +vn 0.067613 -0.997712 0.000000 +vn 0.067269 -0.992804 0.099068 +vn -0.286886 -0.957965 0.000000 +vn -0.284433 -0.953669 0.098051 +vn -0.427028 -0.904238 0.000000 +vn -0.425812 -0.901661 0.075436 +vn -0.883871 0.467731 0.000000 +vn -0.878893 0.465097 0.105978 +vn -0.767945 0.633863 0.092084 +vn -0.770668 0.637236 0.000000 +vn -0.513793 0.853106 0.090703 +vn -0.515903 0.856647 0.000000 +vn -0.192995 0.976995 0.090740 +vn -0.193806 0.981040 0.000000 +vn 0.124255 0.992250 0.000000 +vn 0.273554 0.961857 0.000000 +vn -0.816590 0.432128 0.382684 +vn -0.712429 0.584348 0.388564 +vn -0.338240 0.178992 0.923881 +vn -0.294551 0.235052 0.926278 +vn 0.129157 -0.358989 0.924362 +vn 0.313068 -0.868706 0.383847 +vn -0.475607 0.789573 0.387778 +vn -0.194964 0.323412 0.925956 +vn 0.025550 -0.378106 0.925410 +vn 0.062318 -0.920215 0.386421 +vn -0.178658 0.904626 0.386954 +vn -0.073245 0.371284 0.925626 +vn -0.100149 -0.363223 0.926304 +vn -0.260110 -0.883977 0.388493 +vn -0.163416 -0.346034 0.923881 +vn -0.394526 -0.835406 0.382683 +vn 0.000002 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.072275 0.073188 0.994696 +vn -0.268894 0.272290 0.923880 +vn -0.213586 0.311072 0.926075 +vn -0.032428 0.047228 0.998358 +vn -0.649165 0.657372 0.382683 +vn -0.699875 0.708724 0.088798 +vn -0.569726 0.815864 0.098885 +vn -0.526550 0.756409 0.388060 +vn -0.124493 -0.987906 0.092433 +vn -0.117812 -0.914694 0.386594 +vn -0.252729 -0.888640 0.382684 +vn -0.271991 -0.956362 0.106733 +vn -0.052801 -0.375140 0.925463 +vn -0.010088 -0.071673 0.997377 +vn -0.009439 -0.033186 0.999405 +vn -0.104679 -0.368083 0.923881 +vn 0.069099 -0.055142 0.996085 +vn 0.043253 -0.022889 0.998802 +vn -0.017399 0.048360 0.998679 +vn 0.040945 -0.067921 0.996850 +vn -0.003148 0.046587 0.998909 +vn 0.013951 -0.070716 0.997399 +vn 0.013739 0.049834 0.998663 +vn 0.062194 0.131697 0.989337 +vn -0.702650 0.711535 0.000000 +vn -0.572905 0.819622 0.000000 +vn -0.339197 0.940715 0.000000 +vn -0.337564 0.936301 0.096905 +vn -0.067613 0.997712 0.000000 +vn -0.067269 0.992804 0.099068 +vn 0.286886 0.957965 0.000000 +vn 0.284433 0.953669 0.098051 +vn 0.427028 0.904238 0.000000 +vn 0.425812 0.901661 0.075436 +vn 0.883871 -0.467731 0.000000 +vn 0.878893 -0.465097 0.105978 +vn 0.767945 -0.633863 0.092084 +vn 0.770668 -0.637236 0.000000 +vn 0.513793 -0.853106 0.090703 +vn 0.515903 -0.856647 0.000000 +vn 0.192995 -0.976995 0.090740 +vn 0.193806 -0.981040 0.000000 +vn -0.124255 -0.992250 0.000000 +vn -0.273554 -0.961857 0.000000 +vn 0.816590 -0.432128 0.382684 +vn 0.712429 -0.584348 0.388564 +vn 0.338240 -0.178992 0.923881 +vn 0.294551 -0.235052 0.926278 +vn -0.129157 0.358989 0.924362 +vn -0.313068 0.868706 0.383847 +vn 0.475607 -0.789573 0.387778 +vn 0.194964 -0.323412 0.925956 +vn -0.025550 0.378106 0.925410 +vn -0.062318 0.920215 0.386421 +vn 0.178658 -0.904626 0.386954 +vn 0.073245 -0.371284 0.925626 +vn 0.100149 0.363223 0.926304 +vn 0.260110 0.883977 0.388493 +vn 0.163416 0.346034 0.923881 +vn 0.394526 0.835406 0.382683 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.099521 0.025997 0.994696 +vn 0.370259 0.096720 0.923880 +vn 0.376186 0.029434 0.926077 +vn 0.057114 0.004469 0.998358 +vn 0.893883 0.233507 0.382685 +vn 0.963711 0.251747 0.088798 +vn 0.991422 0.085464 0.098885 +vn 0.918344 0.077800 0.388060 +vn -0.793305 0.601767 0.092433 +vn -0.733240 0.559378 0.386593 +vn -0.643214 0.663196 0.382683 +vn -0.692237 0.713734 0.106733 +vn -0.298486 0.233299 0.925461 +vn -0.057028 0.044573 0.997377 +vn -0.024020 0.024766 0.999405 +vn -0.266434 0.274699 0.923879 +vn -0.082303 -0.032271 0.996085 +vn -0.041448 -0.026013 0.998802 +vn 0.050580 -0.009112 0.998679 +vn -0.079294 -0.001499 0.996850 +vn 0.041919 -0.020567 0.998909 +vn -0.068219 0.023277 0.997399 +vn 0.036287 -0.036816 0.998663 +vn 0.082955 -0.119711 0.989337 +vn 0.967533 0.252745 0.000000 +vn 0.996266 0.086339 0.000000 +vn 0.984282 -0.176605 0.000000 +vn 0.979643 -0.175812 0.096905 +vn 0.897851 -0.440300 0.000000 +vn 0.893429 -0.438145 0.099068 +vn 0.686179 -0.727433 0.000000 +vn 0.683685 -0.723161 0.098051 +vn 0.569579 -0.821937 0.000000 +vn 0.567955 -0.819595 0.075436 +vn -0.847003 -0.531588 0.000000 +vn -0.842233 -0.528595 0.105978 +vn -0.932913 -0.348128 0.092084 +vn -0.937197 -0.348799 0.000000 +vn -0.995708 -0.018406 0.090703 +vn -0.999830 -0.018462 0.000000 +vn -0.942600 0.321360 0.090740 +vn -0.946508 0.322679 0.000000 +vn -0.797187 0.603733 0.000000 +vn -0.696216 0.717833 0.000000 +vn -0.782527 -0.491125 0.382684 +vn -0.862275 -0.324810 0.388563 +vn -0.324132 -0.203428 0.923881 +vn -0.350837 -0.137560 0.926278 +vn 0.375467 -0.067640 0.924365 +vn 0.908855 -0.163229 0.383846 +vn -0.921594 -0.017102 0.387778 +vn -0.377565 -0.007135 0.925956 +vn 0.340222 -0.166926 0.925410 +vn 0.828089 -0.406138 0.386421 +vn -0.872758 0.297591 0.386954 +vn -0.358168 0.122210 0.925624 +vn 0.264482 -0.268343 0.926305 +vn 0.635493 -0.667249 0.388493 +vn 0.217962 -0.314540 0.923882 +vn 0.526221 -0.759372 0.382684 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn -0.027246 -0.099185 0.994696 +vn -0.101367 -0.369011 0.923881 +vn -0.162606 -0.340506 0.926075 +vn -0.024686 -0.051696 0.998358 +vn -0.244718 -0.890880 0.382682 +vn -0.263836 -0.960472 0.088798 +vn -0.421697 -0.901329 0.098884 +vn -0.391797 -0.834209 0.388059 +vn 0.917798 0.386139 0.092433 +vn 0.851056 0.355317 0.386592 +vn 0.895950 0.225449 0.382682 +vn 0.964230 0.242630 0.106733 +vn 0.351280 0.141841 0.925464 +vn 0.067114 0.027100 0.997377 +vn 0.033461 0.008419 0.999405 +vn 0.371111 0.093383 0.923881 +vn 0.013205 0.087412 0.996085 +vn -0.001804 0.048902 0.998802 +vn -0.033181 -0.039248 0.998679 +vn 0.038350 0.069420 0.996850 +vn -0.038773 -0.026020 0.998909 +vn 0.054266 0.047440 0.997399 +vn -0.050026 -0.013017 0.998663 +vn -0.145150 -0.011987 0.989337 +vn -0.264882 -0.964281 0.000000 +vn -0.423361 -0.905961 0.000000 +vn -0.645085 -0.764111 0.000000 +vn -0.642080 -0.760489 0.096904 +vn -0.830237 -0.557411 0.000000 +vn -0.826159 -0.554659 0.099067 +vn -0.973065 -0.230531 0.000000 +vn -0.968118 -0.230508 0.098051 +vn -0.996608 -0.082301 0.000000 +vn -0.993768 -0.082066 0.075436 +vn -0.036868 0.999320 0.000000 +vn -0.036661 0.993693 0.105978 +vn 0.164969 0.981991 0.092084 +vn 0.166529 0.986037 0.000000 +vn 0.481914 0.871511 0.090703 +vn 0.483926 0.875109 0.000000 +vn 0.749605 0.655636 0.090740 +vn 0.752703 0.658361 0.000000 +vn 0.921442 0.388517 0.000000 +vn 0.969769 0.244024 0.000000 +vn -0.034062 0.923251 0.382684 +vn 0.149845 0.909156 0.388563 +vn -0.014109 0.382420 0.923881 +vn 0.056284 0.372613 0.926278 +vn -0.246316 -0.291349 0.924361 +vn -0.595792 -0.705475 0.383845 +vn 0.445985 0.806676 0.387778 +vn 0.182604 0.330547 0.925956 +vn -0.314673 -0.211180 0.925410 +vn -0.765772 -0.514075 0.386419 +vn 0.694100 0.607036 0.386954 +vn 0.284919 0.249074 0.925626 +vn -0.364635 -0.094880 0.926304 +vn -0.895601 -0.216729 0.388494 +vn -0.381386 -0.031495 0.923879 +vn -0.920744 -0.076037 0.382686 +s 1 +f 1115/1245/3001 1116/1246/3002 1118/1247/3003 1117/1248/3004 +f 1117/1248/3004 1118/1247/3003 1120/1249/3005 1119/1250/3006 +f 1119/1250/3006 1120/1249/3005 1122/1251/3007 1121/1252/3008 +f 1121/1252/3008 1122/1251/3007 1124/1253/3009 1123/1254/3010 +f 1123/1254/3010 1124/1253/3009 1126/1255/3011 1125/1256/3012 +s 2 +f 1135/1257/3013 1134/1258/3014 1137/1259/3015 1136/1260/3016 +s 3 +f 1134/1258/3017 1133/1261/3018 1138/1262/3019 1137/1259/3020 +s 4 +f 1153/1263/3021 1152/1264/3022 1158/1265/3023 1157/1266/3024 +s 2 +f 1152/1264/3025 1151/1267/3026 1159/1268/3027 1158/1265/3028 +f 1130/1269/3029 1128/1270/3030 1135/1257/3013 1136/1260/3016 +f 1130/1269/3029 1136/1260/3016 1142/1271/3031 1139/1272/3032 +f 1139/1272/3032 1142/1271/3031 1148/1273/3033 1145/1274/3034 +f 1145/1274/3034 1148/1273/3033 1154/1275/3035 1151/1267/3026 +f 1151/1267/3026 1154/1275/3035 1161/1276/3036 1159/1268/3027 +s 3 +f 1138/1262/3019 1133/1261/3018 1126/1255/3037 1124/1253/3038 +f 1138/1262/3019 1124/1253/3038 1122/1251/3039 1144/1277/3040 +f 1144/1277/3040 1122/1251/3039 1120/1249/3041 1150/1278/3042 +f 1150/1278/3042 1120/1249/3041 1118/1247/3043 1156/1279/3044 +f 1156/1279/3044 1118/1247/3043 1116/1246/3045 1160/1280/3046 +s 4 +f 1125/1256/3047 1127/1281/3048 1132/1282/3049 1123/1254/3050 +f 1123/1254/3050 1132/1282/3049 1141/1283/3051 1121/1252/3052 +f 1121/1252/3052 1141/1283/3051 1147/1284/3053 1119/1250/3054 +f 1119/1250/3054 1147/1284/3053 1153/1263/3021 1117/1248/3055 +f 1117/1248/3055 1153/1263/3021 1157/1266/3024 1115/1245/3056 +f 1127/1281/3048 1129/1285/3057 1131/1286/3058 1132/1282/3049 +s 2 +f 1129/1285/3059 1128/1270/3030 1130/1269/3029 1131/1286/3060 +f 1136/1260/3016 1137/1259/3015 1143/1287/3061 1142/1271/3031 +s 3 +f 1137/1259/3020 1138/1262/3019 1144/1277/3040 1143/1287/3062 +s 4 +f 1132/1282/3049 1131/1286/3058 1140/1288/3063 1141/1283/3051 +s 2 +f 1131/1286/3060 1130/1269/3029 1139/1272/3032 1140/1288/3064 +f 1142/1271/3031 1143/1287/3061 1149/1289/3065 1148/1273/3033 +s 3 +f 1143/1287/3062 1144/1277/3040 1150/1278/3042 1149/1289/3066 +s 4 +f 1141/1283/3051 1140/1288/3063 1146/1290/3067 1147/1284/3053 +s 2 +f 1140/1288/3064 1139/1272/3032 1145/1274/3034 1146/1290/3068 +f 1148/1273/3033 1149/1289/3065 1155/1291/3069 1154/1275/3035 +s 3 +f 1149/1289/3066 1150/1278/3042 1156/1279/3044 1155/1291/3070 +s 4 +f 1147/1284/3053 1146/1290/3067 1152/1264/3022 1153/1263/3021 +s 2 +f 1146/1290/3068 1145/1274/3034 1151/1267/3026 1152/1264/3025 +f 1154/1275/3035 1155/1291/3069 1162/1292/3071 1161/1276/3036 +s 3 +f 1155/1291/3070 1156/1279/3044 1160/1280/3046 1162/1292/3072 +s 7 +f 1164/1293/3073 1163/1294/3074 1183/1295/3075 +f 1165/1296/3076 1164/1293/3073 1183/1295/3075 +f 1166/1297/3077 1165/1296/3076 1183/1295/3075 +f 1167/1298/3078 1166/1297/3077 1183/1295/3075 +f 1168/1299/3079 1167/1298/3078 1183/1295/3075 +f 1169/1300/3080 1168/1299/3079 1183/1295/3075 +f 1170/1301/3081 1169/1300/3080 1183/1295/3075 +f 1171/1302/3082 1170/1301/3081 1183/1295/3075 +f 1172/1303/3083 1171/1302/3082 1183/1295/3075 +f 1173/1304/3084 1172/1303/3083 1183/1295/3075 +f 1174/1305/3085 1173/1304/3084 1183/1295/3075 +f 1175/1306/3086 1174/1305/3085 1183/1295/3075 +f 1176/1307/3087 1175/1306/3086 1183/1295/3075 +f 1177/1308/3088 1176/1307/3087 1183/1295/3075 +f 1178/1309/3089 1177/1308/3088 1183/1295/3075 +f 1179/1310/3090 1178/1309/3089 1183/1295/3075 +f 1180/1311/3091 1179/1310/3090 1183/1295/3075 +f 1181/1312/3092 1180/1311/3091 1183/1295/3075 +f 1182/1313/3093 1181/1312/3092 1183/1295/3075 +f 1163/1294/3074 1182/1313/3093 1183/1295/3075 +s 8 +f 1185/1314/3094 1186/1315/3095 1224/1316/3096 1223/1317/3097 +f 1186/1315/3095 1185/1314/3094 1187/1318/3098 1188/1319/3099 +f 1188/1319/3099 1187/1318/3098 1189/1320/3100 1190/1321/3101 +f 1190/1321/3101 1189/1320/3100 1191/1322/3102 1192/1323/3103 +f 1192/1323/3103 1191/1322/3102 1193/1324/3104 1194/1325/3105 +f 1194/1325/3105 1193/1324/3104 1195/1326/3106 1196/1327/3107 +f 1196/1327/3107 1195/1326/3106 1197/1328/3108 1198/1329/3109 +f 1198/1329/3109 1197/1328/3108 1199/1330/3110 1200/1331/3111 +f 1200/1331/3111 1199/1330/3110 1201/1332/3112 1202/1333/3113 +f 1202/1333/3113 1201/1332/3112 1203/1334/3114 1204/1335/3115 +f 1204/1335/3115 1203/1334/3114 1205/1336/3116 1206/1337/3117 +f 1206/1337/3117 1205/1336/3116 1207/1338/3118 1208/1339/3119 +f 1208/1339/3119 1207/1338/3118 1209/1340/3120 1210/1341/3121 +f 1210/1341/3121 1209/1340/3120 1211/1342/3122 1212/1343/3123 +f 1212/1343/3123 1211/1342/3122 1213/1344/3124 1214/1345/3125 +f 1214/1345/3125 1213/1344/3124 1215/1346/3126 1216/1347/3127 +f 1216/1347/3127 1215/1346/3126 1217/1348/3128 1218/1349/3129 +f 1218/1349/3129 1217/1348/3128 1219/1350/3130 1220/1351/3131 +f 1220/1351/3131 1219/1350/3130 1221/1352/3132 1222/1353/3133 +f 1222/1353/3133 1221/1352/3132 1223/1317/3097 1224/1316/3096 +f 1225/1354/3134 1226/1355/3135 1263/1356/3136 1264/1357/3137 +f 1226/1355/3135 1225/1354/3134 1228/1358/3138 1227/1359/3139 +f 1227/1359/3139 1228/1358/3138 1230/1360/3140 1229/1361/3141 +f 1229/1361/3141 1230/1360/3140 1232/1362/3142 1231/1363/3143 +f 1231/1363/3143 1232/1362/3142 1234/1364/3144 1233/1365/3145 +f 1233/1365/3145 1234/1364/3144 1236/1366/3146 1235/1367/3147 +f 1235/1367/3147 1236/1366/3146 1238/1368/3148 1237/1369/3149 +f 1237/1369/3149 1238/1368/3148 1240/1370/3150 1239/1371/3151 +f 1239/1371/3151 1240/1370/3150 1242/1372/3152 1241/1373/3153 +f 1241/1373/3153 1242/1372/3152 1244/1374/3154 1243/1375/3155 +f 1243/1375/3155 1244/1374/3154 1246/1376/3156 1245/1377/3157 +f 1245/1377/3157 1246/1376/3156 1248/1378/3158 1247/1379/3159 +f 1247/1379/3159 1248/1378/3158 1250/1380/3160 1249/1381/3161 +f 1249/1381/3161 1250/1380/3160 1252/1382/3162 1251/1383/3163 +f 1251/1383/3163 1252/1382/3162 1254/1384/3164 1253/1385/3165 +f 1253/1385/3165 1254/1384/3164 1256/1386/3166 1255/1387/3167 +f 1255/1387/3167 1256/1386/3166 1258/1388/3168 1257/1389/3169 +f 1257/1389/3169 1258/1388/3168 1260/1390/3170 1259/1391/3171 +f 1259/1391/3171 1260/1390/3170 1262/1392/3172 1261/1393/3173 +f 1261/1393/3173 1262/1392/3172 1264/1357/3137 1263/1356/3136 +f 1163/1294/3174 1164/1293/3175 1187/1318/3098 1185/1314/3094 +f 1164/1293/3175 1165/1296/3176 1189/1320/3100 1187/1318/3098 +f 1165/1296/3176 1166/1297/3177 1191/1322/3102 1189/1320/3100 +f 1166/1297/3177 1167/1298/3178 1193/1324/3104 1191/1322/3102 +f 1167/1298/3178 1168/1299/3179 1195/1326/3106 1193/1324/3104 +f 1168/1299/3179 1169/1300/3180 1197/1328/3108 1195/1326/3106 +f 1169/1300/3180 1170/1301/3181 1199/1330/3110 1197/1328/3108 +f 1170/1301/3181 1171/1302/3182 1201/1332/3112 1199/1330/3110 +f 1171/1302/3182 1172/1303/3183 1203/1334/3114 1201/1332/3112 +f 1172/1303/3183 1173/1304/3184 1205/1336/3116 1203/1334/3114 +f 1173/1304/3184 1174/1305/3185 1207/1338/3118 1205/1336/3116 +f 1174/1305/3185 1175/1306/3186 1209/1340/3120 1207/1338/3118 +f 1175/1306/3186 1176/1307/3187 1211/1342/3122 1209/1340/3120 +f 1176/1307/3187 1177/1308/3188 1213/1344/3124 1211/1342/3122 +f 1177/1308/3188 1178/1309/3189 1215/1346/3126 1213/1344/3124 +f 1178/1309/3189 1179/1310/3190 1217/1348/3128 1215/1346/3126 +f 1179/1310/3190 1180/1311/3191 1219/1350/3130 1217/1348/3128 +f 1180/1311/3191 1181/1312/3192 1221/1352/3132 1219/1350/3130 +f 1181/1312/3192 1182/1313/3193 1223/1317/3097 1221/1352/3132 +f 1182/1313/3193 1163/1294/3174 1185/1314/3094 1223/1317/3097 +f 1226/1355/3135 1227/1359/3139 1184/1394/3194 +f 1227/1359/3139 1229/1361/3141 1184/1394/3194 +f 1229/1361/3141 1231/1363/3143 1184/1394/3194 +f 1231/1363/3143 1233/1365/3145 1184/1394/3194 +f 1233/1365/3145 1235/1367/3147 1184/1394/3194 +f 1235/1367/3147 1237/1369/3149 1184/1394/3194 +f 1237/1369/3149 1239/1371/3151 1184/1394/3194 +f 1239/1371/3151 1241/1373/3153 1184/1394/3194 +f 1241/1373/3153 1243/1375/3155 1184/1394/3194 +f 1243/1375/3155 1245/1377/3157 1184/1394/3194 +f 1245/1377/3157 1247/1379/3159 1184/1394/3194 +f 1247/1379/3159 1249/1381/3161 1184/1394/3194 +f 1249/1381/3161 1251/1383/3163 1184/1394/3194 +f 1251/1383/3163 1253/1385/3165 1184/1394/3194 +f 1253/1385/3165 1255/1387/3167 1184/1394/3194 +f 1255/1387/3167 1257/1389/3169 1184/1394/3194 +f 1257/1389/3169 1259/1391/3171 1184/1394/3194 +f 1259/1391/3171 1261/1393/3173 1184/1394/3194 +f 1261/1393/3173 1263/1356/3136 1184/1394/3194 +f 1263/1356/3136 1226/1355/3135 1184/1394/3194 +f 1186/1315/3095 1188/1319/3099 1228/1358/3138 1225/1354/3134 +f 1188/1319/3099 1190/1321/3101 1230/1360/3140 1228/1358/3138 +f 1190/1321/3101 1192/1323/3103 1232/1362/3142 1230/1360/3140 +f 1192/1323/3103 1194/1325/3105 1234/1364/3144 1232/1362/3142 +f 1194/1325/3105 1196/1327/3107 1236/1366/3146 1234/1364/3144 +f 1196/1327/3107 1198/1329/3109 1238/1368/3148 1236/1366/3146 +f 1198/1329/3109 1200/1331/3111 1240/1370/3150 1238/1368/3148 +f 1200/1331/3111 1202/1333/3113 1242/1372/3152 1240/1370/3150 +f 1202/1333/3113 1204/1335/3115 1244/1374/3154 1242/1372/3152 +f 1204/1335/3115 1206/1337/3117 1246/1376/3156 1244/1374/3154 +f 1206/1337/3117 1208/1339/3119 1248/1378/3158 1246/1376/3156 +f 1208/1339/3119 1210/1341/3121 1250/1380/3160 1248/1378/3158 +f 1210/1341/3121 1212/1343/3123 1252/1382/3162 1250/1380/3160 +f 1212/1343/3123 1214/1345/3125 1254/1384/3164 1252/1382/3162 +f 1214/1345/3125 1216/1347/3127 1256/1386/3166 1254/1384/3164 +f 1216/1347/3127 1218/1349/3129 1258/1388/3168 1256/1386/3166 +f 1218/1349/3129 1220/1351/3131 1260/1390/3170 1258/1388/3168 +f 1220/1351/3131 1222/1353/3133 1262/1392/3172 1260/1390/3170 +f 1222/1353/3133 1224/1316/3096 1264/1357/3137 1262/1392/3172 +f 1224/1316/3096 1186/1315/3095 1225/1354/3134 1264/1357/3137 +s 10 +f 1265/1395/3195 1266/1396/3196 1286/1397/3197 1285/1398/3198 +f 1266/1396/3196 1267/1399/3199 1287/1400/3200 1286/1397/3197 +f 1267/1399/3199 1268/1401/3201 1288/1402/3202 1287/1400/3200 +f 1268/1401/3201 1269/1403/3203 1289/1404/3204 1288/1402/3202 +f 1269/1403/3203 1270/1405/3205 1290/1406/3206 1289/1404/3204 +f 1270/1405/3205 1271/1407/3207 1291/1408/3208 1290/1406/3206 +f 1271/1407/3207 1272/1409/3209 1292/1410/3210 1291/1408/3208 +f 1272/1409/3209 1273/1411/3211 1293/1412/3212 1292/1410/3210 +f 1273/1411/3211 1274/1413/3213 1294/1414/3214 1293/1412/3212 +f 1274/1413/3213 1275/1415/3215 1295/1416/3216 1294/1414/3214 +f 1275/1415/3215 1276/1417/3217 1296/1418/3218 1295/1416/3216 +f 1276/1417/3217 1277/1419/3219 1297/1420/3220 1296/1418/3218 +f 1277/1419/3219 1278/1421/3221 1298/1422/3222 1297/1420/3220 +f 1278/1421/3221 1279/1423/3223 1299/1424/3224 1298/1422/3222 +f 1279/1423/3223 1280/1425/3225 1300/1426/3226 1299/1424/3224 +f 1280/1425/3225 1281/1427/3227 1301/1428/3228 1300/1426/3226 +f 1281/1427/3227 1282/1429/3229 1302/1430/3230 1301/1428/3228 +f 1282/1429/3229 1283/1431/3231 1303/1432/3232 1302/1430/3230 +f 1283/1431/3231 1284/1433/3233 1304/1434/3234 1303/1432/3232 +f 1284/1433/3233 1265/1395/3195 1285/1398/3198 1304/1434/3234 +s 11 +f 1285/1398/3235 1286/1397/3236 1306/1435/3237 1305/1436/3238 +f 1286/1397/3236 1287/1400/3239 1307/1437/3240 1306/1435/3237 +f 1287/1400/3239 1288/1402/3241 1308/1438/3242 1307/1437/3240 +f 1288/1402/3241 1289/1404/3243 1309/1439/3244 1308/1438/3242 +f 1289/1404/3243 1290/1406/3245 1310/1440/3246 1309/1439/3244 +f 1290/1406/3245 1291/1408/3247 1311/1441/3248 1310/1440/3246 +f 1291/1408/3247 1292/1410/3249 1312/1442/3250 1311/1441/3248 +f 1292/1410/3249 1293/1412/3251 1313/1443/3252 1312/1442/3250 +f 1293/1412/3251 1294/1414/3253 1314/1444/3254 1313/1443/3252 +f 1294/1414/3253 1295/1416/3255 1315/1445/3256 1314/1444/3254 +f 1295/1416/3255 1296/1418/3257 1316/1446/3258 1315/1445/3256 +f 1296/1418/3257 1297/1420/3259 1317/1447/3260 1316/1446/3258 +f 1297/1420/3259 1298/1422/3261 1318/1448/3262 1317/1447/3260 +f 1298/1422/3261 1299/1424/3263 1319/1449/3264 1318/1448/3262 +f 1299/1424/3263 1300/1426/3265 1320/1450/3266 1319/1449/3264 +f 1300/1426/3265 1301/1428/3267 1321/1451/3268 1320/1450/3266 +f 1301/1428/3267 1302/1430/3269 1322/1452/3270 1321/1451/3268 +f 1302/1430/3269 1303/1432/3271 1323/1453/3272 1322/1452/3270 +f 1303/1432/3271 1304/1434/3273 1324/1454/3274 1323/1453/3272 +f 1304/1434/3273 1285/1398/3235 1305/1436/3238 1324/1454/3274 +s 12 +f 1346/1455/3275 1345/1456/3276 1325/1457/3277 1326/1458/3278 +f 1347/1459/3279 1346/1455/3275 1326/1458/3278 1327/1460/3280 +f 1348/1461/3281 1347/1459/3279 1327/1460/3280 1328/1462/3282 +f 1349/1463/3283 1348/1461/3281 1328/1462/3282 1329/1464/3284 +f 1350/1465/3285 1349/1463/3283 1329/1464/3284 1330/1466/3286 +f 1351/1467/3287 1350/1465/3285 1330/1466/3286 1331/1468/3288 +f 1352/1469/3289 1351/1467/3287 1331/1468/3288 1332/1470/3290 +f 1353/1471/3291 1352/1469/3289 1332/1470/3290 1333/1472/3292 +f 1354/1473/3293 1353/1471/3291 1333/1472/3292 1334/1474/3294 +f 1355/1475/3295 1354/1473/3293 1334/1474/3294 1335/1476/3296 +f 1356/1477/3297 1355/1475/3295 1335/1476/3296 1336/1478/3298 +f 1357/1479/3299 1356/1477/3297 1336/1478/3298 1337/1480/3300 +f 1358/1481/3301 1357/1479/3299 1337/1480/3300 1338/1482/3302 +f 1359/1483/3303 1358/1481/3301 1338/1482/3302 1339/1484/3304 +f 1360/1485/3305 1359/1483/3303 1339/1484/3304 1340/1486/3306 +f 1361/1487/3307 1360/1485/3305 1340/1486/3306 1341/1488/3308 +f 1362/1489/3309 1361/1487/3307 1341/1488/3308 1342/1490/3310 +f 1363/1491/3311 1362/1489/3309 1342/1490/3310 1343/1492/3312 +f 1364/1493/3313 1363/1491/3311 1343/1492/3312 1344/1494/3314 +f 1345/1456/3276 1364/1493/3313 1344/1494/3314 1325/1457/3277 +f 1326/1458/3278 1325/1457/3277 1305/1436/3315 1306/1435/3316 +f 1327/1460/3280 1326/1458/3278 1306/1435/3316 1307/1437/3317 +f 1328/1462/3282 1327/1460/3280 1307/1437/3317 1308/1438/3318 +f 1329/1464/3284 1328/1462/3282 1308/1438/3318 1309/1439/3319 +f 1330/1466/3286 1329/1464/3284 1309/1439/3319 1310/1440/3320 +f 1331/1468/3288 1330/1466/3286 1310/1440/3320 1311/1441/3321 +f 1332/1470/3290 1331/1468/3288 1311/1441/3321 1312/1442/3322 +f 1333/1472/3292 1332/1470/3290 1312/1442/3322 1313/1443/3323 +f 1334/1474/3294 1333/1472/3292 1313/1443/3323 1314/1444/3324 +f 1335/1476/3296 1334/1474/3294 1314/1444/3324 1315/1445/3325 +f 1336/1478/3298 1335/1476/3296 1315/1445/3325 1316/1446/3326 +f 1337/1480/3300 1336/1478/3298 1316/1446/3326 1317/1447/3327 +f 1338/1482/3302 1337/1480/3300 1317/1447/3327 1318/1448/3328 +f 1339/1484/3304 1338/1482/3302 1318/1448/3328 1319/1449/3329 +f 1340/1486/3306 1339/1484/3304 1319/1449/3329 1320/1450/3330 +f 1341/1488/3308 1340/1486/3306 1320/1450/3330 1321/1451/3331 +f 1342/1490/3310 1341/1488/3308 1321/1451/3331 1322/1452/3332 +f 1343/1492/3312 1342/1490/3310 1322/1452/3332 1323/1453/3333 +f 1344/1494/3314 1343/1492/3312 1323/1453/3333 1324/1454/3334 +f 1325/1457/3277 1344/1494/3314 1324/1454/3334 1305/1436/3315 +s 10 +f 1266/1396/3196 1265/1395/3195 1345/1456/3335 1346/1455/3336 +f 1267/1399/3199 1266/1396/3196 1346/1455/3336 1347/1459/3337 +f 1268/1401/3201 1267/1399/3199 1347/1459/3337 1348/1461/3338 +f 1269/1403/3203 1268/1401/3201 1348/1461/3338 1349/1463/3339 +f 1270/1405/3205 1269/1403/3203 1349/1463/3339 1350/1465/3340 +f 1271/1407/3207 1270/1405/3205 1350/1465/3340 1351/1467/3341 +f 1272/1409/3209 1271/1407/3207 1351/1467/3341 1352/1469/3342 +f 1273/1411/3211 1272/1409/3209 1352/1469/3342 1353/1471/3343 +f 1274/1413/3213 1273/1411/3211 1353/1471/3343 1354/1473/3344 +f 1275/1415/3215 1274/1413/3213 1354/1473/3344 1355/1475/3345 +f 1276/1417/3217 1275/1415/3215 1355/1475/3345 1356/1477/3346 +f 1277/1419/3219 1276/1417/3217 1356/1477/3346 1357/1479/3347 +f 1278/1421/3221 1277/1419/3219 1357/1479/3347 1358/1481/3348 +f 1279/1423/3223 1278/1421/3221 1358/1481/3348 1359/1483/3349 +f 1280/1425/3225 1279/1423/3223 1359/1483/3349 1360/1485/3350 +f 1281/1427/3227 1280/1425/3225 1360/1485/3350 1361/1487/3351 +f 1282/1429/3229 1281/1427/3227 1361/1487/3351 1362/1489/3352 +f 1283/1431/3231 1282/1429/3229 1362/1489/3352 1363/1491/3353 +f 1284/1433/3233 1283/1431/3231 1363/1491/3353 1364/1493/3354 +f 1265/1395/3195 1284/1433/3233 1364/1493/3354 1345/1456/3335 +s 13 +f 1365/1495/3355 1366/1496/3356 1368/1497/3357 1367/1498/3358 +f 1367/1498/3358 1368/1497/3357 1370/1499/3359 1369/1500/3360 +f 1369/1500/3360 1370/1499/3359 1372/1501/3361 1371/1502/3362 +f 1371/1502/3362 1372/1501/3361 1374/1503/3363 1373/1504/3364 +f 1373/1504/3364 1374/1503/3363 1376/1505/3365 1375/1506/3366 +s 14 +f 1385/1507/3367 1384/1508/3368 1387/1509/3369 1386/1510/3370 +s 15 +f 1384/1508/3371 1383/1511/3372 1388/1512/3373 1387/1509/3374 +s 16 +f 1403/1513/3375 1402/1514/3376 1408/1515/3377 1407/1516/3378 +s 14 +f 1402/1514/3379 1401/1517/3380 1409/1518/3381 1408/1515/3382 +f 1380/1519/3383 1378/1520/3384 1385/1507/3367 1386/1510/3370 +f 1380/1519/3383 1386/1510/3370 1392/1521/3385 1389/1522/3386 +f 1389/1522/3386 1392/1521/3385 1398/1523/3387 1395/1524/3388 +f 1395/1524/3388 1398/1523/3387 1404/1525/3389 1401/1517/3380 +f 1401/1517/3380 1404/1525/3389 1411/1526/3390 1409/1518/3381 +s 15 +f 1388/1512/3373 1383/1511/3372 1376/1505/3391 1374/1503/3392 +f 1388/1512/3373 1374/1503/3392 1372/1501/3393 1394/1527/3394 +f 1394/1527/3394 1372/1501/3393 1370/1499/3395 1400/1528/3396 +f 1400/1528/3396 1370/1499/3395 1368/1497/3397 1406/1529/3398 +f 1406/1529/3398 1368/1497/3397 1366/1496/3399 1410/1530/3400 +s 16 +f 1375/1506/3401 1377/1531/3402 1382/1532/3403 1373/1504/3404 +f 1373/1504/3404 1382/1532/3403 1391/1533/3405 1371/1502/3406 +f 1371/1502/3406 1391/1533/3405 1397/1534/3407 1369/1500/3408 +f 1369/1500/3408 1397/1534/3407 1403/1513/3375 1367/1498/3409 +f 1367/1498/3409 1403/1513/3375 1407/1516/3378 1365/1495/3410 +f 1377/1531/3402 1379/1535/3411 1381/1536/3412 1382/1532/3403 +s 14 +f 1379/1535/3413 1378/1520/3384 1380/1519/3383 1381/1536/3414 +f 1386/1510/3370 1387/1509/3369 1393/1537/3415 1392/1521/3385 +s 15 +f 1387/1509/3374 1388/1512/3373 1394/1527/3394 1393/1537/3416 +s 16 +f 1382/1532/3403 1381/1536/3412 1390/1538/3417 1391/1533/3405 +s 14 +f 1381/1536/3414 1380/1519/3383 1389/1522/3386 1390/1538/3418 +f 1392/1521/3385 1393/1537/3415 1399/1539/3419 1398/1523/3387 +s 15 +f 1393/1537/3416 1394/1527/3394 1400/1528/3396 1399/1539/3420 +s 16 +f 1391/1533/3405 1390/1538/3417 1396/1540/3421 1397/1534/3407 +s 14 +f 1390/1538/3418 1389/1522/3386 1395/1524/3388 1396/1540/3422 +f 1398/1523/3387 1399/1539/3419 1405/1541/3423 1404/1525/3389 +s 15 +f 1399/1539/3420 1400/1528/3396 1406/1529/3398 1405/1541/3424 +s 16 +f 1397/1534/3407 1396/1540/3421 1402/1514/3376 1403/1513/3375 +s 14 +f 1396/1540/3422 1395/1524/3388 1401/1517/3380 1402/1514/3379 +f 1404/1525/3389 1405/1541/3423 1412/1542/3425 1411/1526/3390 +s 15 +f 1405/1541/3424 1406/1529/3398 1410/1530/3400 1412/1542/3426 +s 19 +f 1413/1543/3427 1414/1544/3428 1416/1545/3429 1415/1546/3430 +f 1415/1546/3430 1416/1545/3429 1418/1547/3431 1417/1548/3432 +f 1417/1548/3432 1418/1547/3431 1420/1549/3433 1419/1550/3434 +f 1419/1550/3434 1420/1549/3433 1422/1551/3435 1421/1552/3436 +f 1421/1552/3436 1422/1551/3435 1424/1553/3437 1423/1554/3438 +s 20 +f 1433/1555/3439 1432/1556/3440 1435/1557/3441 1434/1558/3442 +s 21 +f 1432/1556/3443 1431/1559/3444 1436/1560/3445 1435/1557/3446 +s 22 +f 1451/1561/3447 1450/1562/3448 1456/1563/3449 1455/1564/3450 +s 20 +f 1450/1562/3451 1449/1565/3452 1457/1566/3453 1456/1563/3454 +f 1428/1567/3455 1426/1568/3456 1433/1555/3439 1434/1558/3442 +f 1428/1567/3455 1434/1558/3442 1440/1569/3457 1437/1570/3458 +f 1437/1570/3458 1440/1569/3457 1446/1571/3459 1443/1572/3460 +f 1443/1572/3460 1446/1571/3459 1452/1573/3461 1449/1565/3452 +f 1449/1565/3452 1452/1573/3461 1459/1574/3462 1457/1566/3453 +s 21 +f 1436/1560/3445 1431/1559/3444 1424/1553/3463 1422/1551/3464 +f 1436/1560/3445 1422/1551/3464 1420/1549/3465 1442/1575/3466 +f 1442/1575/3466 1420/1549/3465 1418/1547/3467 1448/1576/3468 +f 1448/1576/3468 1418/1547/3467 1416/1545/3469 1454/1577/3470 +f 1454/1577/3470 1416/1545/3469 1414/1544/3471 1458/1578/3472 +s 22 +f 1423/1554/3473 1425/1579/3474 1430/1580/3475 1421/1552/3476 +f 1421/1552/3476 1430/1580/3475 1439/1581/3477 1419/1550/3478 +f 1419/1550/3478 1439/1581/3477 1445/1582/3479 1417/1548/3480 +f 1417/1548/3480 1445/1582/3479 1451/1561/3447 1415/1546/3481 +f 1415/1546/3481 1451/1561/3447 1455/1564/3450 1413/1543/3482 +f 1425/1579/3474 1427/1583/3483 1429/1584/3484 1430/1580/3475 +s 20 +f 1427/1583/3485 1426/1568/3456 1428/1567/3455 1429/1584/3486 +f 1434/1558/3442 1435/1557/3441 1441/1585/3487 1440/1569/3457 +s 21 +f 1435/1557/3446 1436/1560/3445 1442/1575/3466 1441/1585/3488 +s 22 +f 1430/1580/3475 1429/1584/3484 1438/1586/3489 1439/1581/3477 +s 20 +f 1429/1584/3486 1428/1567/3455 1437/1570/3458 1438/1586/3490 +f 1440/1569/3457 1441/1585/3487 1447/1587/3491 1446/1571/3459 +s 21 +f 1441/1585/3488 1442/1575/3466 1448/1576/3468 1447/1587/3492 +s 22 +f 1439/1581/3477 1438/1586/3489 1444/1588/3493 1445/1582/3479 +s 20 +f 1438/1586/3490 1437/1570/3458 1443/1572/3460 1444/1588/3494 +f 1446/1571/3459 1447/1587/3491 1453/1589/3495 1452/1573/3461 +s 21 +f 1447/1587/3492 1448/1576/3468 1454/1577/3470 1453/1589/3496 +s 22 +f 1445/1582/3479 1444/1588/3493 1450/1562/3448 1451/1561/3447 +s 20 +f 1444/1588/3494 1443/1572/3460 1449/1565/3452 1450/1562/3451 +f 1452/1573/3461 1453/1589/3495 1460/1590/3497 1459/1574/3462 +s 21 +f 1453/1589/3496 1454/1577/3470 1458/1578/3472 1460/1590/3498 +s 25 +f 1461/1591/3499 1462/1592/3500 1464/1593/3501 1463/1594/3502 +f 1463/1594/3502 1464/1593/3501 1466/1595/3503 1465/1596/3504 +f 1465/1596/3504 1466/1595/3503 1468/1597/3505 1467/1598/3506 +f 1467/1598/3506 1468/1597/3505 1470/1599/3507 1469/1600/3508 +f 1469/1600/3508 1470/1599/3507 1472/1601/3509 1471/1602/3510 +s 26 +f 1481/1603/3511 1480/1604/3512 1483/1605/3513 1482/1606/3514 +s 27 +f 1480/1604/3515 1479/1607/3516 1484/1608/3517 1483/1605/3518 +s 28 +f 1499/1609/3519 1498/1610/3520 1504/1611/3521 1503/1612/3522 +s 26 +f 1498/1610/3523 1497/1613/3524 1505/1614/3525 1504/1611/3526 +f 1476/1615/3527 1474/1616/3528 1481/1603/3511 1482/1606/3514 +f 1476/1615/3527 1482/1606/3514 1488/1617/3529 1485/1618/3530 +f 1485/1618/3530 1488/1617/3529 1494/1619/3531 1491/1620/3532 +f 1491/1620/3532 1494/1619/3531 1500/1621/3533 1497/1613/3524 +f 1497/1613/3524 1500/1621/3533 1507/1622/3534 1505/1614/3525 +s 27 +f 1484/1608/3517 1479/1607/3516 1472/1601/3535 1470/1599/3536 +f 1484/1608/3517 1470/1599/3536 1468/1597/3537 1490/1623/3538 +f 1490/1623/3538 1468/1597/3537 1466/1595/3539 1496/1624/3540 +f 1496/1624/3540 1466/1595/3539 1464/1593/3541 1502/1625/3542 +f 1502/1625/3542 1464/1593/3541 1462/1592/3543 1506/1626/3544 +s 28 +f 1471/1602/3545 1473/1627/3546 1478/1628/3547 1469/1600/3548 +f 1469/1600/3548 1478/1628/3547 1487/1629/3549 1467/1598/3550 +f 1467/1598/3550 1487/1629/3549 1493/1630/3551 1465/1596/3552 +f 1465/1596/3552 1493/1630/3551 1499/1609/3519 1463/1594/3553 +f 1463/1594/3553 1499/1609/3519 1503/1612/3522 1461/1591/3554 +f 1473/1627/3546 1475/1631/3555 1477/1632/3556 1478/1628/3547 +s 26 +f 1475/1631/3557 1474/1616/3528 1476/1615/3527 1477/1632/3558 +f 1482/1606/3514 1483/1605/3513 1489/1633/3559 1488/1617/3529 +s 27 +f 1483/1605/3518 1484/1608/3517 1490/1623/3538 1489/1633/3560 +s 28 +f 1478/1628/3547 1477/1632/3556 1486/1634/3561 1487/1629/3549 +s 26 +f 1477/1632/3558 1476/1615/3527 1485/1618/3530 1486/1634/3562 +f 1488/1617/3529 1489/1633/3559 1495/1635/3563 1494/1619/3531 +s 27 +f 1489/1633/3560 1490/1623/3538 1496/1624/3540 1495/1635/3564 +s 28 +f 1487/1629/3549 1486/1634/3561 1492/1636/3565 1493/1630/3551 +s 26 +f 1486/1634/3562 1485/1618/3530 1491/1620/3532 1492/1636/3566 +f 1494/1619/3531 1495/1635/3563 1501/1637/3567 1500/1621/3533 +s 27 +f 1495/1635/3564 1496/1624/3540 1502/1625/3542 1501/1637/3568 +s 28 +f 1493/1630/3551 1492/1636/3565 1498/1610/3520 1499/1609/3519 +s 26 +f 1492/1636/3566 1491/1620/3532 1497/1613/3524 1498/1610/3523 +f 1500/1621/3533 1501/1637/3567 1508/1638/3569 1507/1622/3534 +s 27 +f 1501/1637/3568 1502/1625/3542 1506/1626/3544 1508/1638/3570 +s 31 +f 1509/1639/3571 1510/1640/3572 1512/1641/3573 1511/1642/3574 +f 1511/1642/3574 1512/1641/3573 1514/1643/3575 1513/1644/3576 +f 1513/1644/3576 1514/1643/3575 1516/1645/3577 1515/1646/3578 +f 1515/1646/3578 1516/1645/3577 1518/1647/3579 1517/1648/3580 +f 1517/1648/3580 1518/1647/3579 1520/1649/3581 1519/1650/3582 +s 32 +f 1529/1651/3583 1528/1652/3584 1531/1653/3585 1530/1654/3586 +s 33 +f 1528/1652/3587 1527/1655/3588 1532/1656/3589 1531/1653/3590 +s 34 +f 1547/1657/3591 1546/1658/3592 1552/1659/3593 1551/1660/3594 +s 32 +f 1546/1658/3595 1545/1661/3596 1553/1662/3597 1552/1659/3598 +f 1524/1663/3599 1522/1664/3600 1529/1651/3583 1530/1654/3586 +f 1524/1663/3599 1530/1654/3586 1536/1665/3601 1533/1666/3602 +f 1533/1666/3602 1536/1665/3601 1542/1667/3603 1539/1668/3604 +f 1539/1668/3604 1542/1667/3603 1548/1669/3605 1545/1661/3596 +f 1545/1661/3596 1548/1669/3605 1555/1670/3606 1553/1662/3597 +s 33 +f 1532/1656/3589 1527/1655/3588 1520/1649/3607 1518/1647/3608 +f 1532/1656/3589 1518/1647/3608 1516/1645/3609 1538/1671/3610 +f 1538/1671/3610 1516/1645/3609 1514/1643/3611 1544/1672/3612 +f 1544/1672/3612 1514/1643/3611 1512/1641/3613 1550/1673/3614 +f 1550/1673/3614 1512/1641/3613 1510/1640/3615 1554/1674/3616 +s 34 +f 1519/1650/3617 1521/1675/3618 1526/1676/3619 1517/1648/3620 +f 1517/1648/3620 1526/1676/3619 1535/1677/3621 1515/1646/3622 +f 1515/1646/3622 1535/1677/3621 1541/1678/3623 1513/1644/3624 +f 1513/1644/3624 1541/1678/3623 1547/1657/3591 1511/1642/3625 +f 1511/1642/3625 1547/1657/3591 1551/1660/3594 1509/1639/3626 +f 1521/1675/3618 1523/1679/3627 1525/1680/3628 1526/1676/3619 +s 32 +f 1523/1679/3629 1522/1664/3600 1524/1663/3599 1525/1680/3630 +f 1530/1654/3586 1531/1653/3585 1537/1681/3631 1536/1665/3601 +s 33 +f 1531/1653/3590 1532/1656/3589 1538/1671/3610 1537/1681/3632 +s 34 +f 1526/1676/3619 1525/1680/3628 1534/1682/3633 1535/1677/3621 +s 32 +f 1525/1680/3630 1524/1663/3599 1533/1666/3602 1534/1682/3634 +f 1536/1665/3601 1537/1681/3631 1543/1683/3635 1542/1667/3603 +s 33 +f 1537/1681/3632 1538/1671/3610 1544/1672/3612 1543/1683/3636 +s 34 +f 1535/1677/3621 1534/1682/3633 1540/1684/3637 1541/1678/3623 +s 32 +f 1534/1682/3634 1533/1666/3602 1539/1668/3604 1540/1684/3638 +f 1542/1667/3603 1543/1683/3635 1549/1685/3639 1548/1669/3605 +s 33 +f 1543/1683/3636 1544/1672/3612 1550/1673/3614 1549/1685/3640 +s 34 +f 1541/1678/3623 1540/1684/3637 1546/1658/3592 1547/1657/3591 +s 32 +f 1540/1684/3638 1539/1668/3604 1545/1661/3596 1546/1658/3595 +f 1548/1669/3605 1549/1685/3639 1556/1686/3641 1555/1670/3606 +s 33 +f 1549/1685/3640 1550/1673/3614 1554/1674/3616 1556/1686/3642 +s 37 +f 1557/1687/3643 1558/1688/3644 1560/1689/3645 1559/1690/3646 +f 1559/1690/3646 1560/1689/3645 1562/1691/3647 1561/1692/3648 +f 1561/1692/3648 1562/1691/3647 1564/1693/3649 1563/1694/3650 +f 1563/1694/3650 1564/1693/3649 1566/1695/3651 1565/1696/3652 +f 1565/1696/3652 1566/1695/3651 1568/1697/3653 1567/1698/3654 +s 38 +f 1577/1699/3655 1576/1700/3656 1579/1701/3657 1578/1702/3658 +s 39 +f 1576/1700/3659 1575/1703/3660 1580/1704/3661 1579/1701/3662 +s 40 +f 1595/1705/3663 1594/1706/3664 1600/1707/3665 1599/1708/3666 +s 38 +f 1594/1706/3667 1593/1709/3668 1601/1710/3669 1600/1707/3670 +f 1572/1711/3671 1570/1712/3672 1577/1699/3655 1578/1702/3658 +f 1572/1711/3671 1578/1702/3658 1584/1713/3673 1581/1714/3674 +f 1581/1714/3674 1584/1713/3673 1590/1715/3675 1587/1716/3676 +f 1587/1716/3676 1590/1715/3675 1596/1717/3677 1593/1709/3668 +f 1593/1709/3668 1596/1717/3677 1603/1718/3678 1601/1710/3669 +s 39 +f 1580/1704/3661 1575/1703/3660 1568/1697/3679 1566/1695/3680 +f 1580/1704/3661 1566/1695/3680 1564/1693/3681 1586/1719/3682 +f 1586/1719/3682 1564/1693/3681 1562/1691/3683 1592/1720/3684 +f 1592/1720/3684 1562/1691/3683 1560/1689/3685 1598/1721/3686 +f 1598/1721/3686 1560/1689/3685 1558/1688/3687 1602/1722/3688 +s 40 +f 1567/1698/3689 1569/1723/3690 1574/1724/3691 1565/1696/3692 +f 1565/1696/3692 1574/1724/3691 1583/1725/3693 1563/1694/3694 +f 1563/1694/3694 1583/1725/3693 1589/1726/3695 1561/1692/3696 +f 1561/1692/3696 1589/1726/3695 1595/1705/3663 1559/1690/3697 +f 1559/1690/3697 1595/1705/3663 1599/1708/3666 1557/1687/3698 +f 1569/1723/3690 1571/1727/3699 1573/1728/3700 1574/1724/3691 +s 38 +f 1571/1727/3701 1570/1712/3672 1572/1711/3671 1573/1728/3702 +f 1578/1702/3658 1579/1701/3657 1585/1729/3703 1584/1713/3673 +s 39 +f 1579/1701/3662 1580/1704/3661 1586/1719/3682 1585/1729/3704 +s 40 +f 1574/1724/3691 1573/1728/3700 1582/1730/3705 1583/1725/3693 +s 38 +f 1573/1728/3702 1572/1711/3671 1581/1714/3674 1582/1730/3706 +f 1584/1713/3673 1585/1729/3703 1591/1731/3707 1590/1715/3675 +s 39 +f 1585/1729/3704 1586/1719/3682 1592/1720/3684 1591/1731/3708 +s 40 +f 1583/1725/3693 1582/1730/3705 1588/1732/3709 1589/1726/3695 +s 38 +f 1582/1730/3706 1581/1714/3674 1587/1716/3676 1588/1732/3710 +f 1590/1715/3675 1591/1731/3707 1597/1733/3711 1596/1717/3677 +s 39 +f 1591/1731/3708 1592/1720/3684 1598/1721/3686 1597/1733/3712 +s 40 +f 1589/1726/3695 1588/1732/3709 1594/1706/3664 1595/1705/3663 +s 38 +f 1588/1732/3710 1587/1716/3676 1593/1709/3668 1594/1706/3667 +f 1596/1717/3677 1597/1733/3711 1604/1734/3713 1603/1718/3678 +s 39 +f 1597/1733/3712 1598/1721/3686 1602/1722/3688 1604/1734/3714 +v 104.053026 91.573254 86.500000 +v 109.284840 97.288597 86.500000 +v 104.722717 88.911846 86.500000 +v 109.588940 93.606171 86.500000 +v 106.136734 86.631347 86.500000 +v 110.667406 91.452839 86.500000 +v 108.265171 84.861765 86.500000 +v 111.859961 90.223591 86.500000 +v 111.259073 83.798745 86.500000 +v 113.784493 88.821301 86.500000 +v 113.967731 83.898676 86.500000 +v 116.395687 88.104020 86.500000 +v 113.967731 83.898676 88.971863 +v 114.574658 84.949907 90.000000 +v 114.145495 84.206574 89.698868 +v 111.417729 84.833438 90.000000 +v 111.305543 84.101800 89.698868 +v 111.259073 83.798745 88.971863 +v 116.395687 88.104020 88.971863 +v 116.240067 87.834478 89.698868 +v 115.864367 87.183746 90.000000 +v 113.330927 87.879668 90.000000 +v 113.651647 88.545503 89.698868 +v 113.784493 88.821301 88.971863 +v 108.781698 85.769391 90.000000 +v 108.416458 85.127603 89.698868 +v 108.265171 84.861765 88.971863 +v 111.183334 89.444489 90.000000 +v 111.661781 89.995397 89.698868 +v 111.859961 90.223591 88.971863 +v 106.922497 87.315130 90.000000 +v 106.366877 86.831622 89.698868 +v 106.136734 86.631347 88.971863 +v 109.819101 90.850698 90.000000 +v 110.418945 91.276476 89.698868 +v 110.667406 91.452839 88.971863 +v 105.680763 89.317772 90.000000 +v 105.003323 89.030739 89.698868 +v 104.722717 88.911846 88.971863 +v 108.580645 93.323472 90.000000 +v 109.293615 93.523371 89.698868 +v 109.588940 93.606171 88.971863 +v 104.053026 91.573254 88.971863 +v 104.296593 91.839334 89.698868 +v 104.884623 92.481707 90.000000 +v 109.284840 97.288597 88.971863 +v 108.338568 96.254868 90.000000 +v 109.007683 96.985825 89.698868 +v 136.412685 83.708206 86.574837 +v 134.708210 87.053427 86.574837 +v 132.053427 89.708210 86.574837 +v 128.708206 91.412684 86.574837 +v 125.000000 92.000006 86.574837 +v 121.291794 91.412683 86.574837 +v 117.946574 89.708208 86.574837 +v 115.291793 87.053425 86.574837 +v 113.587318 83.708205 86.574837 +v 112.999997 80.000000 86.574837 +v 113.587318 76.291795 86.574837 +v 115.291794 72.946576 86.574837 +v 117.946576 70.291795 86.574837 +v 121.291795 68.587320 86.574837 +v 125.000000 67.999998 86.574837 +v 128.708204 68.587320 86.574837 +v 132.053423 70.291796 86.574837 +v 134.708204 72.946576 86.574837 +v 136.412679 76.291796 86.574837 +v 137.000000 80.000000 86.574837 +v 125.000000 80.000000 86.574837 +v 125.000000 80.000000 96.400772 +v 136.412685 83.708206 92.053146 +v 136.167562 83.628561 92.987488 +v 134.708210 87.053427 92.053146 +v 134.499696 86.901933 92.987488 +v 132.053427 89.708210 92.053146 +v 131.901933 89.499696 92.987488 +v 128.708206 91.412684 92.053146 +v 128.628561 91.167562 92.987488 +v 125.000000 92.000006 92.053146 +v 125.000000 91.742269 92.987488 +v 121.291794 91.412683 92.053146 +v 121.371439 91.167561 92.987488 +v 117.946574 89.708208 92.053146 +v 118.098068 89.499694 92.987488 +v 115.291793 87.053425 92.053146 +v 115.500307 86.901931 92.987488 +v 113.587318 83.708205 92.053146 +v 113.832441 83.628560 92.987488 +v 112.999997 80.000000 92.053146 +v 113.257734 80.000000 92.987488 +v 113.587318 76.291795 92.053146 +v 113.832441 76.371440 92.987488 +v 115.291794 72.946576 92.053146 +v 115.500308 73.098070 92.987488 +v 117.946576 70.291795 92.053146 +v 118.098070 70.500309 92.987488 +v 121.291795 68.587320 92.053146 +v 121.371440 68.832443 92.987488 +v 125.000000 67.999998 92.053146 +v 125.000000 68.257735 92.987488 +v 128.708204 68.587320 92.053146 +v 128.628559 68.832443 92.987488 +v 132.053423 70.291796 92.053146 +v 131.901929 70.500310 92.987488 +v 134.708204 72.946576 92.053146 +v 134.499690 73.098070 92.987488 +v 136.412679 76.291796 92.053146 +v 136.167556 76.371441 92.987488 +v 137.000000 80.000000 92.053146 +v 136.742263 80.000000 92.987488 +v 134.505449 83.088508 95.920097 +v 133.695946 82.825485 96.400772 +v 132.397213 85.374390 96.400772 +v 133.085817 85.874690 95.920097 +v 130.374389 87.397213 96.400772 +v 130.874690 88.085817 95.920097 +v 127.825484 88.695946 96.400772 +v 128.088507 89.505449 95.920097 +v 125.000000 89.143456 96.400772 +v 125.000000 89.994618 95.920097 +v 122.174516 88.695946 96.400772 +v 121.911493 89.505448 95.920097 +v 119.625611 87.397213 96.400772 +v 119.125311 88.085816 95.920097 +v 117.602789 85.374388 96.400772 +v 116.914185 85.874688 95.920097 +v 116.304056 82.825483 96.400772 +v 115.494554 83.088506 95.920097 +v 115.856545 80.000000 96.400772 +v 115.005383 80.000000 95.920097 +v 116.304056 77.174517 96.400772 +v 115.494554 76.911494 95.920097 +v 117.602789 74.625613 96.400772 +v 116.914186 74.125313 95.920097 +v 119.625612 72.602791 96.400772 +v 119.125312 71.914187 95.920097 +v 122.174517 71.304058 96.400772 +v 121.911493 70.494555 95.920097 +v 124.999999 70.856547 96.400772 +v 124.999999 70.005385 95.920097 +v 127.825482 71.304058 96.400772 +v 128.088506 70.494555 95.920097 +v 130.374386 72.602791 96.400772 +v 130.874686 71.914187 95.920097 +v 132.397208 74.625614 96.400772 +v 133.085813 74.125313 95.920097 +v 133.695941 77.174518 96.400772 +v 134.505444 76.911495 95.920097 +v 134.143452 80.000001 96.400772 +v 134.994614 80.000000 95.920097 +v 153.531713 89.270515 88.759880 +v 149.270527 97.633568 88.759880 +v 142.633568 104.270525 88.759880 +v 134.270514 108.531710 88.759880 +v 125.000000 110.000015 88.759880 +v 115.729486 108.531708 88.759880 +v 107.366436 104.270519 88.759880 +v 100.729483 97.633562 88.759880 +v 96.468296 89.270512 88.759880 +v 94.999992 80.000000 88.759880 +v 96.468296 70.729488 88.759880 +v 100.729485 62.366440 88.759880 +v 107.366440 55.729486 88.759880 +v 115.729488 51.468300 88.759880 +v 124.999999 49.999996 88.759880 +v 134.270509 51.468302 88.759880 +v 142.633556 55.729488 88.759880 +v 149.270510 62.366442 88.759880 +v 153.531696 70.729490 88.759880 +v 155.000000 80.000000 88.759880 +v 148.801991 87.733738 94.455727 +v 145.247189 94.710442 94.455727 +v 139.710441 100.247187 94.455727 +v 132.733735 103.801992 94.455727 +v 124.999999 105.026894 94.455727 +v 117.266263 103.801991 94.455727 +v 110.289562 100.247179 94.455727 +v 104.752823 94.710436 94.455727 +v 101.198013 87.733734 94.455727 +v 99.973114 80.000001 94.455727 +v 101.198013 72.266268 94.455727 +v 104.752823 65.289567 94.455727 +v 110.289566 59.752825 94.455727 +v 117.266266 56.198019 94.455727 +v 124.999999 54.973118 94.455727 +v 132.733730 56.198019 94.455727 +v 139.710430 59.752827 94.455727 +v 145.247169 65.289568 94.455727 +v 148.801979 72.266269 94.455727 +v 150.026878 80.000001 94.455727 +v 146.898983 87.115413 94.455727 +v 143.628391 93.534317 94.455727 +v 138.534315 98.628391 94.455727 +v 132.115409 101.898983 94.455727 +v 124.999999 103.025951 94.455727 +v 117.884588 101.898983 94.455727 +v 111.465687 98.628384 94.455727 +v 106.371616 93.534313 94.455727 +v 103.101023 87.115410 94.455727 +v 101.974054 80.000001 94.455727 +v 103.101023 72.884593 94.455727 +v 106.371618 66.465691 94.455727 +v 111.465689 61.371620 94.455727 +v 117.884591 58.101028 94.455727 +v 124.999998 56.974060 94.455727 +v 132.115405 58.101028 94.455727 +v 138.534306 61.371624 94.455727 +v 143.628376 66.465693 94.455727 +v 146.898972 72.884594 94.455727 +v 148.025940 80.000001 94.455727 +v 146.874313 87.107397 86.574837 +v 143.607403 93.519070 86.574837 +v 138.519068 98.607405 86.574837 +v 132.107393 101.874311 86.574837 +v 124.999999 103.000013 86.574837 +v 117.892605 101.874311 86.574837 +v 111.480933 98.607399 86.574837 +v 106.392603 93.519065 86.574837 +v 103.125694 87.107394 86.574837 +v 101.999994 80.000001 86.574837 +v 103.125694 72.892609 86.574837 +v 106.392605 66.480938 86.574837 +v 111.480936 61.392609 86.574837 +v 117.892607 58.125698 86.574837 +v 124.999998 57.000000 86.574837 +v 132.107389 58.125700 86.574837 +v 138.519058 61.392611 86.574837 +v 143.607389 66.480940 86.574837 +v 146.874300 72.892611 86.574837 +v 148.000000 80.000001 86.574837 +v 153.531713 89.270515 86.574837 +v 149.270527 97.633568 86.574837 +v 142.633568 104.270525 86.574837 +v 134.270514 108.531710 86.574837 +v 125.000000 110.000015 86.574837 +v 115.729486 108.531708 86.574837 +v 107.366436 104.270519 86.574837 +v 100.729483 97.633562 86.574837 +v 96.468296 89.270512 86.574837 +v 94.999992 80.000000 86.574837 +v 96.468296 70.729488 86.574837 +v 100.729485 62.366440 86.574837 +v 107.366440 55.729486 86.574837 +v 115.729488 51.468300 86.574837 +v 124.999999 49.999996 86.574837 +v 134.270509 51.468302 86.574837 +v 142.633556 55.729488 86.574837 +v 149.270510 62.366442 86.574837 +v 153.531696 70.729490 86.574837 +v 155.000000 80.000000 86.574837 +v 125.450756 56.072762 86.500000 +v 117.885216 57.745974 86.500000 +v 127.420757 57.983435 86.500000 +v 120.922241 59.850544 86.500000 +v 128.688719 60.348259 86.500000 +v 122.247848 61.861191 86.500000 +v 129.157002 63.076330 86.500000 +v 122.716131 63.508596 86.500000 +v 128.580653 66.200636 86.500000 +v 122.968283 65.876436 86.500000 +v 127.139782 68.496436 86.500000 +v 122.283869 68.496436 86.500000 +v 127.139782 68.496436 88.971863 +v 125.925925 68.496436 90.000000 +v 126.784252 68.496436 89.698868 +v 127.605256 65.820689 90.000000 +v 128.294966 66.089352 89.698868 +v 128.580653 66.200636 88.971863 +v 122.283869 68.496436 88.971863 +v 122.595109 68.496436 89.698868 +v 123.346510 68.496436 90.000000 +v 124.010544 65.954452 90.000000 +v 123.273554 65.899286 89.698868 +v 122.968283 65.876436 88.971863 +v 128.112712 63.069843 90.000000 +v 128.851137 63.074430 89.698868 +v 129.157002 63.076330 88.971863 +v 123.729167 63.312172 90.000000 +v 123.012842 63.451065 89.698868 +v 122.716131 63.508596 88.971863 +v 127.703663 60.686857 90.000000 +v 128.400203 60.447432 89.698868 +v 128.688719 60.348259 88.971863 +v 123.193469 61.427607 90.000000 +v 122.524814 61.734198 89.698868 +v 122.247848 61.861191 88.971863 +v 126.590191 58.610165 90.000000 +v 127.177490 58.167000 89.698868 +v 127.420757 57.983435 88.971863 +v 121.671213 59.118685 90.000000 +v 121.141609 59.636187 89.698868 +v 120.922241 59.850544 88.971863 +v 125.450756 56.072762 88.971863 +v 125.098539 56.150658 89.698868 +v 124.248214 56.338718 90.000000 +v 117.885216 57.745974 88.971863 +v 119.253588 57.443342 90.000000 +v 118.286003 57.657335 89.698868 +v 145.496218 92.353985 86.500000 +v 147.829945 84.965430 86.500000 +v 142.856525 93.104719 86.500000 +v 144.488819 86.543285 86.500000 +v 140.174548 93.020394 86.500000 +v 142.084745 86.685971 86.500000 +v 137.577826 92.061905 86.500000 +v 140.423908 86.267813 86.500000 +v 135.160273 90.000619 86.500000 +v 138.247224 85.302263 86.500000 +v 133.892488 87.604887 86.500000 +v 136.320444 83.399544 86.500000 +v 133.892488 87.604887 88.971863 +v 134.499415 86.553657 90.000000 +v 134.070252 87.296989 89.698868 +v 135.977015 89.345873 90.000000 +v 135.399491 89.808848 89.698868 +v 135.160273 90.000619 88.971863 +v 136.320444 83.399544 88.971863 +v 136.164824 83.669086 89.698868 +v 135.789124 84.319818 90.000000 +v 137.658529 86.165880 90.000000 +v 138.074800 85.555211 89.698868 +v 138.247224 85.302263 88.971863 +v 138.105589 91.160766 90.000000 +v 137.732405 91.797967 89.698868 +v 137.577826 92.061905 88.971863 +v 140.087500 87.243340 90.000000 +v 140.325377 86.553538 89.698868 +v 140.423908 86.267813 88.971863 +v 140.373840 91.998013 90.000000 +v 140.232920 92.720946 89.698868 +v 140.174548 93.020394 88.971863 +v 141.987429 87.721695 90.000000 +v 142.056242 86.989327 89.698868 +v 142.084745 86.685971 88.971863 +v 142.729046 92.072063 90.000000 +v 142.819187 92.802261 89.698868 +v 142.856525 93.104719 88.971863 +v 144.748144 87.557843 90.000000 +v 144.564775 86.840443 89.698868 +v 144.488819 86.543285 88.971863 +v 145.496218 92.353985 88.971863 +v 145.604866 92.010009 89.698868 +v 145.867163 91.179575 90.000000 +v 147.829945 84.965430 88.971863 +v 147.407843 86.301790 90.000000 +v 147.706314 85.356841 89.698868 +v 104.503782 67.646015 86.500000 +v 102.170055 75.034570 86.500000 +v 107.143475 66.895281 86.500000 +v 105.511181 73.456715 86.500000 +v 109.825452 66.979606 86.500000 +v 107.915255 73.314029 86.500000 +v 112.422174 67.938095 86.500000 +v 109.576092 73.732187 86.500000 +v 114.839727 69.999381 86.500000 +v 111.752776 74.697737 86.500000 +v 116.107512 72.395113 86.500000 +v 113.679556 76.600456 86.500000 +v 116.107512 72.395113 88.971863 +v 115.500585 73.446343 90.000000 +v 115.929748 72.703011 89.698868 +v 114.022985 70.654127 90.000000 +v 114.600509 70.191152 89.698868 +v 114.839727 69.999381 88.971863 +v 113.679556 76.600456 88.971863 +v 113.835176 76.330914 89.698868 +v 114.210876 75.680182 90.000000 +v 112.341471 73.834120 90.000000 +v 111.925200 74.444789 89.698868 +v 111.752776 74.697737 88.971863 +v 111.894411 68.839234 90.000000 +v 112.267595 68.202033 89.698868 +v 112.422174 67.938095 88.971863 +v 109.912500 72.756660 90.000000 +v 109.674623 73.446462 89.698868 +v 109.576092 73.732187 88.971863 +v 109.626160 68.001987 90.000000 +v 109.767080 67.279054 89.698868 +v 109.825452 66.979606 88.971863 +v 108.012571 72.278305 90.000000 +v 107.943758 73.010673 89.698868 +v 107.915255 73.314029 88.971863 +v 107.270954 67.927937 90.000000 +v 107.180813 67.197739 89.698868 +v 107.143475 66.895281 88.971863 +v 105.251856 72.442157 90.000000 +v 105.435225 73.159557 89.698868 +v 105.511181 73.456715 88.971863 +v 104.503782 67.646015 88.971863 +v 104.395134 67.989991 89.698868 +v 104.132837 68.820425 90.000000 +v 102.170055 75.034570 88.971863 +v 102.592157 73.698210 90.000000 +v 102.293686 74.643159 89.698868 +v 124.549244 103.927238 86.500000 +v 132.114784 102.254026 86.500000 +v 122.579243 102.016565 86.500000 +v 129.077759 100.149456 86.500000 +v 121.311281 99.651741 86.500000 +v 127.752152 98.138809 86.500000 +v 120.842998 96.923670 86.500000 +v 127.283869 96.491404 86.500000 +v 121.419347 93.799364 86.500000 +v 127.031717 94.123564 86.500000 +v 122.860218 91.503564 86.500000 +v 127.716131 91.503564 86.500000 +v 122.860218 91.503564 88.971863 +v 124.074075 91.503564 90.000000 +v 123.215748 91.503564 89.698868 +v 122.394744 94.179311 90.000000 +v 121.705034 93.910648 89.698868 +v 121.419347 93.799364 88.971863 +v 127.716131 91.503564 88.971863 +v 127.404891 91.503564 89.698868 +v 126.653490 91.503564 90.000000 +v 125.989456 94.045548 90.000000 +v 126.726446 94.100714 89.698868 +v 127.031717 94.123564 88.971863 +v 121.887288 96.930157 90.000000 +v 121.148863 96.925570 89.698868 +v 120.842998 96.923670 88.971863 +v 126.270833 96.687828 90.000000 +v 126.987158 96.548935 89.698868 +v 127.283869 96.491404 88.971863 +v 122.296337 99.313143 90.000000 +v 121.599797 99.552568 89.698868 +v 121.311281 99.651741 88.971863 +v 126.806531 98.572393 90.000000 +v 127.475186 98.265802 89.698868 +v 127.752152 98.138809 88.971863 +v 123.409809 101.389835 90.000000 +v 122.822510 101.833000 89.698868 +v 122.579243 102.016565 88.971863 +v 128.328787 100.881315 90.000000 +v 128.858391 100.363813 89.698868 +v 129.077759 100.149456 88.971863 +v 124.549244 103.927238 88.971863 +v 124.901461 103.849342 89.698868 +v 125.751786 103.661282 90.000000 +v 132.114784 102.254026 88.971863 +v 130.746412 102.556658 90.000000 +v 131.713997 102.342665 89.698868 +v 145.946974 68.426746 86.500000 +v 140.715160 62.711403 86.500000 +v 145.277283 71.088154 86.500000 +v 140.411060 66.393829 86.500000 +v 143.863266 73.368653 86.500000 +v 139.332594 68.547161 86.500000 +v 141.734829 75.138235 86.500000 +v 138.140039 69.776409 86.500000 +v 138.740927 76.201255 86.500000 +v 136.215507 71.178699 86.500000 +v 136.032269 76.101324 86.500000 +v 133.604313 71.895980 86.500000 +v 136.032269 76.101324 88.971863 +v 135.425342 75.050093 90.000000 +v 135.854505 75.793426 89.698868 +v 138.582271 75.166562 90.000000 +v 138.694457 75.898200 89.698868 +v 138.740927 76.201255 88.971863 +v 133.604313 71.895980 88.971863 +v 133.759933 72.165522 89.698868 +v 134.135633 72.816254 90.000000 +v 136.669073 72.120332 90.000000 +v 136.348353 71.454497 89.698868 +v 136.215507 71.178699 88.971863 +v 141.218302 74.230609 90.000000 +v 141.583542 74.872397 89.698868 +v 141.734829 75.138235 88.971863 +v 138.816666 70.555511 90.000000 +v 138.338219 70.004603 89.698868 +v 138.140039 69.776409 88.971863 +v 143.077503 72.684870 90.000000 +v 143.633123 73.168378 89.698868 +v 143.863266 73.368653 88.971863 +v 140.180899 69.149302 90.000000 +v 139.581055 68.723524 89.698868 +v 139.332594 68.547161 88.971863 +v 144.319237 70.682228 90.000000 +v 144.996677 70.969261 89.698868 +v 145.277283 71.088154 88.971863 +v 141.419355 66.676528 90.000000 +v 140.706385 66.476629 89.698868 +v 140.411060 66.393829 88.971863 +v 145.946974 68.426746 88.971863 +v 145.703407 68.160666 89.698868 +v 145.115377 67.518293 90.000000 +v 140.715160 62.711403 88.971863 +v 141.661432 63.745132 90.000000 +v 140.992317 63.014175 89.698868 +vt 0.016937 0.027515 +vt 0.019416 0.030224 +vt 0.019560 0.028478 +vt 0.017254 0.026254 +vt 0.020071 0.027458 +vt 0.017924 0.025173 +vt 0.020636 0.026875 +vt 0.018933 0.024334 +vt 0.021548 0.026211 +vt 0.020352 0.023831 +vt 0.022786 0.025871 +vt 0.021635 0.023878 +vt 0.022534 0.025435 +vt 0.022712 0.025743 +vt 0.021486 0.026080 +vt 0.021334 0.025765 +vt 0.022786 0.025871 +vt 0.021548 0.026211 +vt 0.017254 0.026254 +vt 0.017387 0.026310 +vt 0.017052 0.027641 +vt 0.016937 0.027515 +vt 0.017708 0.026446 +vt 0.017331 0.027945 +vt 0.020427 0.024321 +vt 0.021923 0.024376 +vt 0.020316 0.026506 +vt 0.019178 0.024764 +vt 0.019669 0.027173 +vt 0.018297 0.025497 +vt 0.019082 0.028344 +vt 0.018968 0.029734 +vt 0.020636 0.026875 +vt 0.020071 0.027458 +vt 0.019560 0.028478 +vt 0.019416 0.030224 +vt 0.021635 0.023878 +vt 0.020352 0.023831 +vt 0.018933 0.024334 +vt 0.017924 0.025173 +vt 0.021720 0.024024 +vt 0.020374 0.023974 +vt 0.020542 0.026767 +vt 0.019004 0.024460 +vt 0.019953 0.027374 +vt 0.018033 0.025268 +vt 0.019420 0.028439 +vt 0.019285 0.030080 +vt 0.031464 0.025373 +vt 0.032272 0.023788 +vt 0.026864 0.022030 +vt 0.030206 0.026631 +vt 0.028621 0.027439 +vt 0.026864 0.027717 +vt 0.025106 0.027439 +vt 0.023521 0.026631 +vt 0.022263 0.025373 +vt 0.021455 0.023788 +vt 0.021177 0.022030 +vt 0.021455 0.020273 +vt 0.022263 0.018688 +vt 0.023521 0.017430 +vt 0.025106 0.016622 +vt 0.026864 0.016344 +vt 0.028621 0.016622 +vt 0.030206 0.017430 +vt 0.031464 0.018688 +vt 0.032272 0.020273 +vt 0.032550 0.022030 +vt 0.032272 0.023788 +vt 0.032156 0.023750 +vt 0.032428 0.022030 +vt 0.032550 0.022030 +vt 0.031464 0.025373 +vt 0.031366 0.025301 +vt 0.030206 0.026631 +vt 0.030134 0.026532 +vt 0.028621 0.027439 +vt 0.028583 0.027323 +vt 0.026864 0.027717 +vt 0.026864 0.027595 +vt 0.025106 0.027439 +vt 0.025144 0.027323 +vt 0.023521 0.026631 +vt 0.023593 0.026532 +vt 0.022263 0.025373 +vt 0.022362 0.025301 +vt 0.021455 0.023788 +vt 0.021571 0.023750 +vt 0.021177 0.022030 +vt 0.021299 0.022030 +vt 0.021455 0.020273 +vt 0.021571 0.020311 +vt 0.022263 0.018688 +vt 0.022362 0.018760 +vt 0.023521 0.017430 +vt 0.023593 0.017528 +vt 0.025106 0.016622 +vt 0.025144 0.016738 +vt 0.026864 0.016344 +vt 0.026864 0.016466 +vt 0.028621 0.016622 +vt 0.028583 0.016738 +vt 0.030206 0.017430 +vt 0.030134 0.017528 +vt 0.031464 0.018688 +vt 0.031366 0.018760 +vt 0.032272 0.020273 +vt 0.032156 0.020311 +vt 0.031368 0.023494 +vt 0.030985 0.023369 +vt 0.031197 0.022030 +vt 0.031600 0.022030 +vt 0.030695 0.024814 +vt 0.030369 0.024577 +vt 0.029648 0.025862 +vt 0.029410 0.025536 +vt 0.028327 0.026535 +vt 0.028203 0.026151 +vt 0.026864 0.026767 +vt 0.026864 0.026363 +vt 0.025400 0.026535 +vt 0.025525 0.026151 +vt 0.024079 0.025862 +vt 0.024317 0.025536 +vt 0.023032 0.024814 +vt 0.023358 0.024577 +vt 0.022359 0.023494 +vt 0.022742 0.023369 +vt 0.022127 0.022030 +vt 0.022530 0.022030 +vt 0.022359 0.020567 +vt 0.022742 0.020691 +vt 0.023032 0.019246 +vt 0.023358 0.019483 +vt 0.024079 0.018198 +vt 0.024317 0.018525 +vt 0.025400 0.017526 +vt 0.025525 0.017909 +vt 0.026864 0.017294 +vt 0.026864 0.017697 +vt 0.028327 0.017526 +vt 0.028203 0.017909 +vt 0.029648 0.018198 +vt 0.029410 0.018525 +vt 0.030695 0.019246 +vt 0.030369 0.019483 +vt 0.031368 0.020567 +vt 0.030985 0.020691 +vt 0.026864 0.022030 +vt 0.040385 0.026424 +vt 0.038365 0.030387 +vt 0.036459 0.029002 +vt 0.038143 0.025696 +vt 0.035220 0.033532 +vt 0.033835 0.031626 +vt 0.031257 0.035552 +vt 0.030529 0.033310 +vt 0.026864 0.036247 +vt 0.026864 0.033891 +vt 0.022470 0.035552 +vt 0.023198 0.033310 +vt 0.018507 0.033532 +vt 0.019892 0.031626 +vt 0.015362 0.030387 +vt 0.017268 0.029002 +vt 0.013342 0.026424 +vt 0.015584 0.025696 +vt 0.012646 0.022030 +vt 0.015003 0.022030 +vt 0.013342 0.017637 +vt 0.015584 0.018365 +vt 0.015362 0.013674 +vt 0.017268 0.015059 +vt 0.018507 0.010529 +vt 0.019892 0.012435 +vt 0.022470 0.008509 +vt 0.023198 0.010751 +vt 0.026864 0.007813 +vt 0.026864 0.010170 +vt 0.031257 0.008509 +vt 0.030529 0.010751 +vt 0.035220 0.010529 +vt 0.033835 0.012435 +vt 0.038365 0.013674 +vt 0.036459 0.015059 +vt 0.040385 0.017637 +vt 0.038143 0.018365 +vt 0.041081 0.022030 +vt 0.038724 0.022030 +vt 0.035692 0.028444 +vt 0.037242 0.025402 +vt 0.033278 0.030859 +vt 0.030236 0.032408 +vt 0.026864 0.032942 +vt 0.023491 0.032408 +vt 0.020450 0.030859 +vt 0.018035 0.028444 +vt 0.016485 0.025402 +vt 0.015951 0.022030 +vt 0.016485 0.018658 +vt 0.018035 0.015616 +vt 0.020450 0.013202 +vt 0.023492 0.011652 +vt 0.026864 0.011118 +vt 0.030236 0.011652 +vt 0.033278 0.013202 +vt 0.035692 0.015616 +vt 0.037242 0.018658 +vt 0.037776 0.022030 +vt 0.038365 0.030387 +vt 0.040385 0.026424 +vt 0.037230 0.025399 +vt 0.035682 0.028437 +vt 0.035220 0.033532 +vt 0.033270 0.030849 +vt 0.031257 0.035552 +vt 0.030232 0.032397 +vt 0.026864 0.036247 +vt 0.026864 0.032930 +vt 0.022470 0.035552 +vt 0.023495 0.032397 +vt 0.018507 0.033532 +vt 0.020457 0.030849 +vt 0.015362 0.030387 +vt 0.018045 0.028437 +vt 0.013342 0.026424 +vt 0.016497 0.025399 +vt 0.012646 0.022030 +vt 0.015964 0.022030 +vt 0.013342 0.017637 +vt 0.016497 0.018662 +vt 0.015362 0.013674 +vt 0.018045 0.015624 +vt 0.018507 0.010529 +vt 0.020457 0.013212 +vt 0.022470 0.008509 +vt 0.023495 0.011664 +vt 0.026864 0.007813 +vt 0.026864 0.011131 +vt 0.031257 0.008509 +vt 0.030232 0.011664 +vt 0.035220 0.010529 +vt 0.033270 0.013212 +vt 0.038365 0.013674 +vt 0.035682 0.015624 +vt 0.040385 0.017637 +vt 0.037230 0.018662 +vt 0.041081 0.022030 +vt 0.037763 0.022030 +vt 0.027077 0.010691 +vt 0.023492 0.011484 +vt 0.024931 0.012481 +vt 0.028011 0.011597 +vt 0.025559 0.013434 +vt 0.028612 0.012717 +vt 0.025781 0.014215 +vt 0.028834 0.014010 +vt 0.025901 0.015337 +vt 0.028560 0.015491 +vt 0.025576 0.016579 +vt 0.027878 0.016579 +vt 0.026080 0.016579 +vt 0.025724 0.016579 +vt 0.026045 0.015348 +vt 0.026395 0.015374 +vt 0.025576 0.016579 +vt 0.025901 0.015337 +vt 0.028011 0.011597 +vt 0.027895 0.011684 +vt 0.026910 0.010728 +vt 0.027077 0.010691 +vt 0.027617 0.011894 +vt 0.026507 0.010817 +vt 0.028098 0.015311 +vt 0.027302 0.016579 +vt 0.026261 0.014122 +vt 0.028339 0.014007 +vt 0.026007 0.013229 +vt 0.028145 0.012878 +vt 0.025286 0.012135 +vt 0.024140 0.011341 +vt 0.025781 0.014215 +vt 0.025559 0.013434 +vt 0.024931 0.012481 +vt 0.023492 0.011484 +vt 0.027878 0.016579 +vt 0.028560 0.015491 +vt 0.028834 0.014010 +vt 0.028612 0.012717 +vt 0.027709 0.016579 +vt 0.028425 0.015438 +vt 0.025922 0.014188 +vt 0.028689 0.014009 +vt 0.025691 0.013374 +vt 0.028475 0.012764 +vt 0.025035 0.012380 +vt 0.023682 0.011442 +vt 0.036577 0.027885 +vt 0.037683 0.024383 +vt 0.036099 0.025131 +vt 0.035326 0.028241 +vt 0.034960 0.025199 +vt 0.034055 0.028201 +vt 0.034173 0.025001 +vt 0.032824 0.027746 +vt 0.033142 0.024543 +vt 0.031679 0.026770 +vt 0.032228 0.023641 +vt 0.031078 0.025634 +vt 0.031977 0.024078 +vt 0.032155 0.023769 +vt 0.033060 0.024663 +vt 0.032863 0.024952 +vt 0.032228 0.023641 +vt 0.033142 0.024543 +vt 0.035326 0.028241 +vt 0.035308 0.028097 +vt 0.036628 0.027722 +vt 0.036577 0.027885 +vt 0.035265 0.027751 +vt 0.036753 0.027329 +vt 0.032066 0.026459 +vt 0.031365 0.025136 +vt 0.034014 0.025463 +vt 0.033074 0.027320 +vt 0.034914 0.025690 +vt 0.034149 0.027716 +vt 0.036222 0.025612 +vt 0.037483 0.025017 +vt 0.034173 0.025001 +vt 0.034960 0.025199 +vt 0.036099 0.025131 +vt 0.037683 0.024383 +vt 0.031078 0.025634 +vt 0.031679 0.026770 +vt 0.032824 0.027746 +vt 0.034055 0.028201 +vt 0.031162 0.025489 +vt 0.031792 0.026679 +vt 0.034126 0.025136 +vt 0.032898 0.027622 +vt 0.034947 0.025343 +vt 0.034083 0.028059 +vt 0.036135 0.025272 +vt 0.037624 0.024569 +vt 0.017150 0.016176 +vt 0.016044 0.019677 +vt 0.017628 0.018930 +vt 0.018401 0.015820 +vt 0.018767 0.018862 +vt 0.019672 0.015860 +vt 0.019554 0.019060 +vt 0.020903 0.016314 +vt 0.020586 0.019518 +vt 0.022049 0.017291 +vt 0.021499 0.020419 +vt 0.022649 0.018426 +vt 0.021751 0.019983 +vt 0.021573 0.020292 +vt 0.020667 0.019398 +vt 0.020865 0.019108 +vt 0.021499 0.020419 +vt 0.020586 0.019518 +vt 0.018401 0.015820 +vt 0.018419 0.015963 +vt 0.017099 0.016339 +vt 0.017150 0.016176 +vt 0.018462 0.016309 +vt 0.016974 0.016732 +vt 0.021661 0.017601 +vt 0.022362 0.018925 +vt 0.019713 0.018598 +vt 0.020653 0.016741 +vt 0.018813 0.018371 +vt 0.019578 0.016345 +vt 0.017505 0.018449 +vt 0.016244 0.019044 +vt 0.019554 0.019060 +vt 0.018767 0.018862 +vt 0.017628 0.018930 +vt 0.016044 0.019677 +vt 0.022649 0.018426 +vt 0.022049 0.017291 +vt 0.020903 0.016314 +vt 0.019672 0.015860 +vt 0.022565 0.018572 +vt 0.021935 0.017382 +vt 0.019601 0.018925 +vt 0.020830 0.016439 +vt 0.018780 0.018718 +vt 0.019645 0.016002 +vt 0.017592 0.018789 +vt 0.016103 0.019492 +vt 0.026650 0.033370 +vt 0.030235 0.032577 +vt 0.028796 0.031579 +vt 0.025716 0.032464 +vt 0.028168 0.030626 +vt 0.025115 0.031343 +vt 0.027946 0.029846 +vt 0.024894 0.030051 +vt 0.027826 0.028724 +vt 0.025167 0.028570 +vt 0.028151 0.027482 +vt 0.025849 0.027482 +vt 0.027647 0.027482 +vt 0.028003 0.027482 +vt 0.027682 0.028713 +vt 0.027332 0.028687 +vt 0.028151 0.027482 +vt 0.027826 0.028724 +vt 0.025716 0.032464 +vt 0.025832 0.032377 +vt 0.026817 0.033333 +vt 0.026650 0.033370 +vt 0.026110 0.032167 +vt 0.027220 0.033243 +vt 0.025629 0.028750 +vt 0.026425 0.027482 +vt 0.027466 0.029939 +vt 0.025388 0.030054 +vt 0.027720 0.030832 +vt 0.025582 0.031183 +vt 0.028441 0.031926 +vt 0.029587 0.032720 +vt 0.027946 0.029846 +vt 0.028168 0.030626 +vt 0.028796 0.031579 +vt 0.030235 0.032577 +vt 0.025849 0.027482 +vt 0.025167 0.028570 +vt 0.024894 0.030051 +vt 0.025115 0.031343 +vt 0.026018 0.027482 +vt 0.025302 0.028623 +vt 0.027805 0.029873 +vt 0.025038 0.030051 +vt 0.028037 0.030687 +vt 0.025252 0.031296 +vt 0.028692 0.031681 +vt 0.030045 0.032619 +vt 0.036790 0.016546 +vt 0.034311 0.013837 +vt 0.034167 0.015582 +vt 0.036473 0.017807 +vt 0.033656 0.016603 +vt 0.035803 0.018888 +vt 0.033091 0.017185 +vt 0.034794 0.019726 +vt 0.032179 0.017850 +vt 0.033376 0.020230 +vt 0.030941 0.018190 +vt 0.032092 0.020183 +vt 0.031193 0.018626 +vt 0.031015 0.018318 +vt 0.032242 0.017981 +vt 0.032394 0.018296 +vt 0.030941 0.018190 +vt 0.032179 0.017850 +vt 0.036473 0.017807 +vt 0.036340 0.017751 +vt 0.036675 0.016420 +vt 0.036790 0.016546 +vt 0.036019 0.017615 +vt 0.036396 0.016115 +vt 0.033300 0.019740 +vt 0.031804 0.019685 +vt 0.033411 0.017555 +vt 0.034550 0.019296 +vt 0.034058 0.016888 +vt 0.035431 0.018564 +vt 0.034645 0.015716 +vt 0.034760 0.014327 +vt 0.033091 0.017185 +vt 0.033656 0.016603 +vt 0.034167 0.015582 +vt 0.034311 0.013837 +vt 0.032092 0.020183 +vt 0.033376 0.020230 +vt 0.034794 0.019726 +vt 0.035803 0.018888 +vt 0.032008 0.020037 +vt 0.033354 0.020087 +vt 0.033185 0.017294 +vt 0.034723 0.019600 +vt 0.033774 0.016686 +vt 0.035694 0.018793 +vt 0.034307 0.015622 +vt 0.034442 0.013981 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn 0.027246 0.099185 0.994696 +vn 0.101367 0.369011 0.923881 +vn 0.162606 0.340506 0.926075 +vn 0.024686 0.051696 0.998358 +vn 0.244718 0.890880 0.382682 +vn 0.263836 0.960472 0.088798 +vn 0.421697 0.901329 0.098884 +vn 0.391797 0.834209 0.388059 +vn -0.917798 -0.386139 0.092433 +vn -0.851056 -0.355317 0.386592 +vn -0.895950 -0.225449 0.382682 +vn -0.964230 -0.242630 0.106733 +vn -0.351280 -0.141841 0.925464 +vn -0.067114 -0.027100 0.997377 +vn -0.033461 -0.008419 0.999405 +vn -0.371111 -0.093383 0.923881 +vn -0.013205 -0.087412 0.996085 +vn 0.001804 -0.048902 0.998802 +vn 0.033181 0.039248 0.998679 +vn -0.038350 -0.069420 0.996850 +vn 0.038773 0.026020 0.998909 +vn -0.054266 -0.047440 0.997399 +vn 0.050026 0.013017 0.998663 +vn 0.145150 0.011987 0.989337 +vn 0.264882 0.964281 0.000000 +vn 0.423361 0.905961 0.000000 +vn 0.645085 0.764111 0.000000 +vn 0.642080 0.760489 0.096904 +vn 0.830237 0.557411 0.000000 +vn 0.826159 0.554659 0.099067 +vn 0.973065 0.230531 0.000000 +vn 0.968118 0.230508 0.098051 +vn 0.996608 0.082301 0.000000 +vn 0.993768 0.082066 0.075436 +vn 0.036868 -0.999320 0.000000 +vn 0.036661 -0.993693 0.105978 +vn -0.164969 -0.981991 0.092084 +vn -0.166529 -0.986037 0.000000 +vn -0.481914 -0.871511 0.090703 +vn -0.483926 -0.875109 0.000000 +vn -0.749605 -0.655636 0.090740 +vn -0.752703 -0.658361 0.000000 +vn -0.921442 -0.388517 0.000000 +vn -0.969769 -0.244024 0.000000 +vn 0.034062 -0.923251 0.382684 +vn -0.149845 -0.909156 0.388563 +vn 0.014109 -0.382420 0.923881 +vn -0.056284 -0.372613 0.926278 +vn 0.246316 0.291349 0.924361 +vn 0.595792 0.705475 0.383845 +vn -0.445985 -0.806676 0.387778 +vn -0.182604 -0.330547 0.925956 +vn 0.314673 0.211180 0.925410 +vn 0.765772 0.514075 0.386419 +vn -0.694100 -0.607036 0.386954 +vn -0.284919 -0.249074 0.925626 +vn 0.364635 0.094880 0.926304 +vn 0.895601 0.216729 0.388494 +vn 0.381386 0.031495 0.923879 +vn 0.920744 0.076037 0.382686 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.950337 0.308782 0.038887 +vn 0.847784 0.275461 0.453193 +vn 0.891413 -0.000001 0.453192 +vn 0.999244 -0.000001 0.038887 +vn 0.808405 0.587341 0.038887 +vn 0.721168 0.523959 0.453193 +vn 0.587341 0.808405 0.038887 +vn 0.523960 0.721168 0.453193 +vn 0.308783 0.950337 0.038887 +vn 0.275461 0.847784 0.453193 +vn 0.000000 0.999244 0.038887 +vn 0.000000 0.891413 0.453193 +vn -0.308783 0.950337 0.038887 +vn -0.275460 0.847784 0.453193 +vn -0.587340 0.808405 0.038887 +vn -0.523958 0.721168 0.453193 +vn -0.808405 0.587341 0.038887 +vn -0.721167 0.523960 0.453193 +vn -0.950337 0.308783 0.038887 +vn -0.847784 0.275462 0.453193 +vn -0.999244 0.000000 0.038887 +vn -0.891413 0.000000 0.453193 +vn -0.950337 -0.308784 0.038887 +vn -0.847783 -0.275462 0.453193 +vn -0.808405 -0.587341 0.038887 +vn -0.721167 -0.523960 0.453193 +vn -0.587341 -0.808405 0.038887 +vn -0.523959 -0.721168 0.453193 +vn -0.308784 -0.950337 0.038887 +vn -0.275462 -0.847784 0.453193 +vn 0.000000 -0.999244 0.038887 +vn -0.000000 -0.891412 0.453193 +vn 0.308783 -0.950337 0.038887 +vn 0.275460 -0.847784 0.453193 +vn 0.587340 -0.808405 0.038887 +vn 0.523958 -0.721168 0.453193 +vn 0.808405 -0.587341 0.038887 +vn 0.721167 -0.523960 0.453193 +vn 0.950337 -0.308783 0.038887 +vn 0.847784 -0.275462 0.453193 +vn 0.769325 0.249968 0.587925 +vn 0.101726 0.033053 0.994263 +vn 0.106960 -0.000000 0.994263 +vn 0.808916 -0.000001 0.587925 +vn 0.654426 0.475469 0.587925 +vn 0.086534 0.062871 0.994263 +vn 0.475468 0.654427 0.587925 +vn 0.062872 0.086534 0.994263 +vn 0.249968 0.769325 0.587925 +vn 0.033055 0.101727 0.994263 +vn -0.000000 0.808915 0.587925 +vn -0.000000 0.106962 0.994263 +vn -0.249968 0.769325 0.587925 +vn -0.033057 0.101727 0.994263 +vn -0.475468 0.654426 0.587925 +vn -0.062873 0.086534 0.994263 +vn -0.654426 0.475468 0.587925 +vn -0.086534 0.062871 0.994263 +vn -0.769324 0.249969 0.587925 +vn -0.101728 0.033053 0.994263 +vn -0.808915 0.000000 0.587925 +vn -0.106962 0.000000 0.994263 +vn -0.769324 -0.249969 0.587925 +vn -0.101729 -0.033053 0.994263 +vn -0.654426 -0.475469 0.587925 +vn -0.086535 -0.062871 0.994263 +vn -0.475468 -0.654427 0.587925 +vn -0.062870 -0.086534 0.994263 +vn -0.249968 -0.769324 0.587925 +vn -0.033053 -0.101727 0.994263 +vn -0.000001 -0.808915 0.587925 +vn 0.000000 -0.106962 0.994263 +vn 0.249968 -0.769325 0.587925 +vn 0.033053 -0.101727 0.994263 +vn 0.475468 -0.654427 0.587925 +vn 0.062871 -0.086534 0.994263 +vn 0.654426 -0.475469 0.587925 +vn 0.086534 -0.062871 0.994263 +vn 0.769324 -0.249969 0.587925 +vn 0.101727 -0.033053 0.994263 +vn 0.951057 0.309016 0.000000 +vn 0.809017 0.587786 0.000000 +vn 0.587785 0.809017 0.000000 +vn 0.309017 0.951057 0.000000 +vn -0.000000 1.000000 0.000000 +vn -0.309017 0.951057 0.000000 +vn -0.587785 0.809017 0.000000 +vn -0.809017 0.587785 0.000000 +vn -0.951057 0.309017 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.951057 -0.309017 0.000000 +vn -0.809017 -0.587785 0.000000 +vn -0.587785 -0.809017 0.000000 +vn -0.309017 -0.951057 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.309017 -0.951057 0.000000 +vn 0.587785 -0.809017 0.000000 +vn 0.809017 -0.587785 0.000000 +vn 0.951056 -0.309017 0.000000 +vn 1.000000 -0.000001 0.000000 +vn -0.000000 0.000000 1.000000 +vn 0.814402 0.264614 0.516458 +vn 0.692771 0.503328 0.516458 +vn 0.609417 0.442767 0.657699 +vn 0.716412 0.232776 0.657700 +vn 0.503328 0.692772 0.516458 +vn 0.442768 0.609417 0.657699 +vn 0.264615 0.814402 0.516458 +vn 0.232777 0.716412 0.657699 +vn 0.000000 0.856313 0.516458 +vn 0.000000 0.753281 0.657699 +vn -0.264615 0.814402 0.516458 +vn -0.232776 0.716412 0.657699 +vn -0.503328 0.692771 0.516458 +vn -0.442767 0.609417 0.657699 +vn -0.692771 0.503328 0.516458 +vn -0.609417 0.442767 0.657699 +vn -0.814402 0.264615 0.516458 +vn -0.716412 0.232777 0.657700 +vn -0.856312 -0.000000 0.516458 +vn -0.753280 0.000000 0.657700 +vn -0.814402 -0.264615 0.516458 +vn -0.716412 -0.232776 0.657699 +vn -0.692771 -0.503328 0.516458 +vn -0.609417 -0.442767 0.657699 +vn -0.503328 -0.692771 0.516458 +vn -0.442767 -0.609417 0.657699 +vn -0.264615 -0.814402 0.516458 +vn -0.232777 -0.716412 0.657699 +vn -0.000000 -0.856313 0.516458 +vn -0.000000 -0.753281 0.657699 +vn 0.264615 -0.814402 0.516458 +vn 0.232776 -0.716412 0.657699 +vn 0.503328 -0.692771 0.516458 +vn 0.442767 -0.609417 0.657699 +vn 0.692771 -0.503328 0.516458 +vn 0.609417 -0.442767 0.657699 +vn 0.814402 -0.264615 0.516458 +vn 0.716413 -0.232776 0.657699 +vn 0.856312 -0.000001 0.516458 +vn 0.753281 -0.000001 0.657699 +vn -0.000001 0.000000 1.000000 +vn -0.000003 0.000000 1.000000 +vn -0.000003 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.000000 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn -0.000000 0.000000 1.000000 +vn -0.000000 0.000000 1.000000 +vn -0.000002 0.000000 1.000000 +vn -0.000002 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn -0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.632967 -0.205663 -0.746361 +vn -0.538434 -0.391196 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn -0.391195 -0.538435 -0.746361 +vn -0.000001 0.000000 -1.000000 +vn -0.205664 -0.632968 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 -0.665542 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn 0.205664 -0.632968 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn 0.391196 -0.538434 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn 0.538435 -0.391196 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn 0.632968 -0.205664 -0.746361 +vn 0.000001 0.000000 -1.000000 +vn 0.665542 -0.000000 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn 0.632968 0.205664 -0.746361 +vn -0.000001 0.000000 -1.000000 +vn 0.538434 0.391196 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn 0.391195 0.538435 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn 0.205664 0.632968 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn -0.000000 0.665542 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn -0.205664 0.632968 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn -0.391196 0.538434 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn -0.538435 0.391196 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn -0.632968 0.205664 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn -0.665542 0.000001 -0.746360 +vn -0.951052 -0.309014 0.003292 +vn -0.809013 -0.587782 0.003292 +vn -0.587782 -0.809013 0.003292 +vn -0.309015 -0.951052 0.003292 +vn 0.000000 -0.999995 0.003291 +vn 0.309016 -0.951051 0.003291 +vn 0.587782 -0.809013 0.003292 +vn 0.809013 -0.587782 0.003292 +vn 0.951051 -0.309015 0.003292 +vn 0.999995 -0.000000 0.003292 +vn 0.951051 0.309015 0.003292 +vn 0.809013 0.587782 0.003292 +vn 0.587782 0.809013 0.003292 +vn 0.309015 0.951051 0.003291 +vn -0.000000 0.999995 0.003292 +vn -0.309015 0.951051 0.003292 +vn -0.587782 0.809012 0.003292 +vn -0.809013 0.587782 0.003292 +vn -0.951051 0.309015 0.003292 +vn -0.999995 0.000001 0.003292 +vn 0.951057 0.309016 0.000000 +vn 0.809017 0.587786 0.000000 +vn 0.587784 0.809018 0.000000 +vn 0.309016 0.951057 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.309017 0.951056 0.000000 +vn -0.587785 0.809017 0.000000 +vn -0.809017 0.587785 0.000000 +vn -0.951057 0.309017 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.951057 -0.309017 0.000000 +vn -0.809017 -0.587786 0.000000 +vn -0.587785 -0.809017 0.000000 +vn -0.309017 -0.951056 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.309017 -0.951056 0.000000 +vn 0.587785 -0.809017 0.000000 +vn 0.809017 -0.587785 0.000000 +vn 0.951056 -0.309017 0.000000 +vn 1.000000 -0.000001 0.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.099521 -0.025997 0.994696 +vn -0.370259 -0.096720 0.923880 +vn -0.376186 -0.029434 0.926077 +vn -0.057114 -0.004469 0.998358 +vn -0.893883 -0.233507 0.382685 +vn -0.963711 -0.251747 0.088798 +vn -0.991422 -0.085464 0.098885 +vn -0.918344 -0.077800 0.388060 +vn 0.793305 -0.601767 0.092433 +vn 0.733240 -0.559378 0.386593 +vn 0.643214 -0.663196 0.382683 +vn 0.692237 -0.713734 0.106733 +vn 0.298486 -0.233299 0.925461 +vn 0.057028 -0.044573 0.997377 +vn 0.024020 -0.024766 0.999405 +vn 0.266434 -0.274699 0.923879 +vn 0.082303 0.032271 0.996085 +vn 0.041448 0.026013 0.998802 +vn -0.050580 0.009112 0.998679 +vn 0.079294 0.001499 0.996850 +vn -0.041919 0.020567 0.998909 +vn 0.068219 -0.023277 0.997399 +vn -0.036287 0.036816 0.998663 +vn -0.082955 0.119711 0.989337 +vn -0.967533 -0.252745 0.000000 +vn -0.996266 -0.086339 0.000000 +vn -0.984282 0.176605 0.000000 +vn -0.979643 0.175812 0.096905 +vn -0.897851 0.440300 0.000000 +vn -0.893429 0.438145 0.099068 +vn -0.686179 0.727433 0.000000 +vn -0.683685 0.723161 0.098051 +vn -0.569579 0.821937 0.000000 +vn -0.567955 0.819595 0.075436 +vn 0.847003 0.531588 0.000000 +vn 0.842233 0.528595 0.105978 +vn 0.932913 0.348128 0.092084 +vn 0.937197 0.348799 0.000000 +vn 0.995708 0.018406 0.090703 +vn 0.999830 0.018462 0.000000 +vn 0.942600 -0.321360 0.090740 +vn 0.946508 -0.322679 0.000000 +vn 0.797187 -0.603733 0.000000 +vn 0.696216 -0.717833 0.000000 +vn 0.782527 0.491125 0.382684 +vn 0.862275 0.324810 0.388563 +vn 0.324132 0.203428 0.923881 +vn 0.350837 0.137560 0.926278 +vn -0.375467 0.067640 0.924365 +vn -0.908855 0.163229 0.383846 +vn 0.921594 0.017102 0.387778 +vn 0.377565 0.007135 0.925956 +vn -0.340222 0.166926 0.925410 +vn -0.828089 0.406138 0.386421 +vn 0.872758 -0.297591 0.386954 +vn 0.358168 -0.122210 0.925624 +vn -0.264482 0.268343 0.926305 +vn -0.635493 0.667249 0.388493 +vn -0.217962 0.314540 0.923882 +vn -0.526221 0.759372 0.382684 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.072275 -0.073188 0.994696 +vn 0.268894 -0.272290 0.923880 +vn 0.213586 -0.311072 0.926075 +vn 0.032428 -0.047228 0.998358 +vn 0.649165 -0.657372 0.382683 +vn 0.699875 -0.708724 0.088798 +vn 0.569726 -0.815864 0.098885 +vn 0.526550 -0.756409 0.388060 +vn 0.124493 0.987906 0.092433 +vn 0.117812 0.914694 0.386594 +vn 0.252729 0.888640 0.382684 +vn 0.271991 0.956362 0.106733 +vn 0.052801 0.375140 0.925463 +vn 0.010088 0.071673 0.997377 +vn 0.009439 0.033186 0.999405 +vn 0.104679 0.368083 0.923881 +vn -0.069099 0.055142 0.996085 +vn -0.043253 0.022889 0.998802 +vn 0.017399 -0.048360 0.998679 +vn -0.040945 0.067921 0.996850 +vn 0.003148 -0.046587 0.998909 +vn -0.013951 0.070716 0.997399 +vn -0.013739 -0.049834 0.998663 +vn -0.062194 -0.131697 0.989337 +vn 0.702650 -0.711535 0.000000 +vn 0.572905 -0.819622 0.000000 +vn 0.339197 -0.940715 0.000000 +vn 0.337564 -0.936301 0.096905 +vn 0.067613 -0.997712 0.000000 +vn 0.067269 -0.992804 0.099068 +vn -0.286886 -0.957965 0.000000 +vn -0.284433 -0.953669 0.098051 +vn -0.427028 -0.904238 0.000000 +vn -0.425812 -0.901661 0.075436 +vn -0.883871 0.467731 0.000000 +vn -0.878893 0.465097 0.105978 +vn -0.767945 0.633863 0.092084 +vn -0.770668 0.637236 0.000000 +vn -0.513793 0.853106 0.090703 +vn -0.515903 0.856647 0.000000 +vn -0.192995 0.976995 0.090740 +vn -0.193806 0.981040 0.000000 +vn 0.124255 0.992250 0.000000 +vn 0.273554 0.961857 0.000000 +vn -0.816590 0.432128 0.382684 +vn -0.712429 0.584348 0.388564 +vn -0.338240 0.178992 0.923881 +vn -0.294551 0.235052 0.926278 +vn 0.129157 -0.358989 0.924362 +vn 0.313068 -0.868706 0.383847 +vn -0.475607 0.789573 0.387778 +vn -0.194964 0.323412 0.925956 +vn 0.025550 -0.378106 0.925410 +vn 0.062318 -0.920215 0.386421 +vn -0.178658 0.904626 0.386954 +vn -0.073245 0.371284 0.925626 +vn -0.100149 -0.363223 0.926304 +vn -0.260110 -0.883977 0.388493 +vn -0.163416 -0.346034 0.923881 +vn -0.394526 -0.835406 0.382683 +vn 0.000002 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.072275 0.073188 0.994696 +vn -0.268894 0.272290 0.923880 +vn -0.213586 0.311072 0.926075 +vn -0.032428 0.047228 0.998358 +vn -0.649165 0.657372 0.382683 +vn -0.699875 0.708724 0.088798 +vn -0.569726 0.815864 0.098885 +vn -0.526550 0.756409 0.388060 +vn -0.124493 -0.987906 0.092433 +vn -0.117812 -0.914694 0.386594 +vn -0.252729 -0.888640 0.382684 +vn -0.271991 -0.956362 0.106733 +vn -0.052801 -0.375140 0.925463 +vn -0.010088 -0.071673 0.997377 +vn -0.009439 -0.033186 0.999405 +vn -0.104679 -0.368083 0.923881 +vn 0.069099 -0.055142 0.996085 +vn 0.043253 -0.022889 0.998802 +vn -0.017399 0.048360 0.998679 +vn 0.040945 -0.067921 0.996850 +vn -0.003148 0.046587 0.998909 +vn 0.013951 -0.070716 0.997399 +vn 0.013739 0.049834 0.998663 +vn 0.062194 0.131697 0.989337 +vn -0.702650 0.711535 0.000000 +vn -0.572905 0.819622 0.000000 +vn -0.339197 0.940715 0.000000 +vn -0.337564 0.936301 0.096905 +vn -0.067613 0.997712 0.000000 +vn -0.067269 0.992804 0.099068 +vn 0.286886 0.957965 0.000000 +vn 0.284433 0.953669 0.098051 +vn 0.427028 0.904238 0.000000 +vn 0.425812 0.901661 0.075436 +vn 0.883871 -0.467731 0.000000 +vn 0.878893 -0.465097 0.105978 +vn 0.767945 -0.633863 0.092084 +vn 0.770668 -0.637236 0.000000 +vn 0.513793 -0.853106 0.090703 +vn 0.515903 -0.856647 0.000000 +vn 0.192995 -0.976995 0.090740 +vn 0.193806 -0.981040 0.000000 +vn -0.124255 -0.992250 0.000000 +vn -0.273554 -0.961857 0.000000 +vn 0.816590 -0.432128 0.382684 +vn 0.712429 -0.584348 0.388564 +vn 0.338240 -0.178992 0.923881 +vn 0.294551 -0.235052 0.926278 +vn -0.129157 0.358989 0.924362 +vn -0.313068 0.868706 0.383847 +vn 0.475607 -0.789573 0.387778 +vn 0.194964 -0.323412 0.925956 +vn -0.025550 0.378106 0.925410 +vn -0.062318 0.920215 0.386421 +vn 0.178658 -0.904626 0.386954 +vn 0.073245 -0.371284 0.925626 +vn 0.100149 0.363223 0.926304 +vn 0.260110 0.883977 0.388493 +vn 0.163416 0.346034 0.923881 +vn 0.394526 0.835406 0.382683 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.099521 0.025997 0.994696 +vn 0.370259 0.096720 0.923880 +vn 0.376186 0.029434 0.926077 +vn 0.057114 0.004469 0.998358 +vn 0.893883 0.233507 0.382685 +vn 0.963711 0.251747 0.088798 +vn 0.991422 0.085464 0.098885 +vn 0.918344 0.077800 0.388060 +vn -0.793305 0.601767 0.092433 +vn -0.733240 0.559378 0.386593 +vn -0.643214 0.663196 0.382683 +vn -0.692237 0.713734 0.106733 +vn -0.298486 0.233299 0.925461 +vn -0.057028 0.044573 0.997377 +vn -0.024020 0.024766 0.999405 +vn -0.266434 0.274699 0.923879 +vn -0.082303 -0.032271 0.996085 +vn -0.041448 -0.026013 0.998802 +vn 0.050580 -0.009112 0.998679 +vn -0.079294 -0.001499 0.996850 +vn 0.041919 -0.020567 0.998909 +vn -0.068219 0.023277 0.997399 +vn 0.036287 -0.036816 0.998663 +vn 0.082955 -0.119711 0.989337 +vn 0.967533 0.252745 0.000000 +vn 0.996266 0.086339 0.000000 +vn 0.984282 -0.176605 0.000000 +vn 0.979643 -0.175812 0.096905 +vn 0.897851 -0.440300 0.000000 +vn 0.893429 -0.438145 0.099068 +vn 0.686179 -0.727433 0.000000 +vn 0.683685 -0.723161 0.098051 +vn 0.569579 -0.821937 0.000000 +vn 0.567955 -0.819595 0.075436 +vn -0.847003 -0.531588 0.000000 +vn -0.842233 -0.528595 0.105978 +vn -0.932913 -0.348128 0.092084 +vn -0.937197 -0.348799 0.000000 +vn -0.995708 -0.018406 0.090703 +vn -0.999830 -0.018462 0.000000 +vn -0.942600 0.321360 0.090740 +vn -0.946508 0.322679 0.000000 +vn -0.797187 0.603733 0.000000 +vn -0.696216 0.717833 0.000000 +vn -0.782527 -0.491125 0.382684 +vn -0.862275 -0.324810 0.388563 +vn -0.324132 -0.203428 0.923881 +vn -0.350837 -0.137560 0.926278 +vn 0.375467 -0.067640 0.924365 +vn 0.908855 -0.163229 0.383846 +vn -0.921594 -0.017102 0.387778 +vn -0.377565 -0.007135 0.925956 +vn 0.340222 -0.166926 0.925410 +vn 0.828089 -0.406138 0.386421 +vn -0.872758 0.297591 0.386954 +vn -0.358168 0.122210 0.925624 +vn 0.264482 -0.268343 0.926305 +vn 0.635493 -0.667249 0.388493 +vn 0.217962 -0.314540 0.923882 +vn 0.526221 -0.759372 0.382684 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn -0.027246 -0.099185 0.994696 +vn -0.101367 -0.369011 0.923881 +vn -0.162606 -0.340506 0.926075 +vn -0.024686 -0.051696 0.998358 +vn -0.244718 -0.890880 0.382682 +vn -0.263836 -0.960472 0.088798 +vn -0.421697 -0.901329 0.098884 +vn -0.391797 -0.834209 0.388059 +vn 0.917798 0.386139 0.092433 +vn 0.851056 0.355317 0.386592 +vn 0.895950 0.225449 0.382682 +vn 0.964230 0.242630 0.106733 +vn 0.351280 0.141841 0.925464 +vn 0.067114 0.027100 0.997377 +vn 0.033461 0.008419 0.999405 +vn 0.371111 0.093383 0.923881 +vn 0.013205 0.087412 0.996085 +vn -0.001804 0.048902 0.998802 +vn -0.033181 -0.039248 0.998679 +vn 0.038350 0.069420 0.996850 +vn -0.038773 -0.026020 0.998909 +vn 0.054266 0.047440 0.997399 +vn -0.050026 -0.013017 0.998663 +vn -0.145150 -0.011987 0.989337 +vn -0.264882 -0.964281 0.000000 +vn -0.423361 -0.905961 0.000000 +vn -0.645085 -0.764111 0.000000 +vn -0.642080 -0.760489 0.096904 +vn -0.830237 -0.557411 0.000000 +vn -0.826159 -0.554659 0.099067 +vn -0.973065 -0.230531 0.000000 +vn -0.968118 -0.230508 0.098051 +vn -0.996608 -0.082301 0.000000 +vn -0.993768 -0.082066 0.075436 +vn -0.036868 0.999320 0.000000 +vn -0.036661 0.993693 0.105978 +vn 0.164969 0.981991 0.092084 +vn 0.166529 0.986037 0.000000 +vn 0.481914 0.871511 0.090703 +vn 0.483926 0.875109 0.000000 +vn 0.749605 0.655636 0.090740 +vn 0.752703 0.658361 0.000000 +vn 0.921442 0.388517 0.000000 +vn 0.969769 0.244024 0.000000 +vn -0.034062 0.923251 0.382684 +vn 0.149845 0.909156 0.388563 +vn -0.014109 0.382420 0.923881 +vn 0.056284 0.372613 0.926278 +vn -0.246316 -0.291349 0.924361 +vn -0.595792 -0.705475 0.383845 +vn 0.445985 0.806676 0.387778 +vn 0.182604 0.330547 0.925956 +vn -0.314673 -0.211180 0.925410 +vn -0.765772 -0.514075 0.386419 +vn 0.694100 0.607036 0.386954 +vn 0.284919 0.249074 0.925626 +vn -0.364635 -0.094880 0.926304 +vn -0.895601 -0.216729 0.388494 +vn -0.381386 -0.031495 0.923879 +vn -0.920744 -0.076037 0.382686 +s 1 +f 1605/1735/3715 1606/1736/3716 1608/1737/3717 1607/1738/3718 +f 1607/1738/3718 1608/1737/3717 1610/1739/3719 1609/1740/3720 +f 1609/1740/3720 1610/1739/3719 1612/1741/3721 1611/1742/3722 +f 1611/1742/3722 1612/1741/3721 1614/1743/3723 1613/1744/3724 +f 1613/1744/3724 1614/1743/3723 1616/1745/3725 1615/1746/3726 +s 2 +f 1625/1747/3727 1624/1748/3728 1627/1749/3729 1626/1750/3730 +s 3 +f 1624/1748/3731 1623/1751/3732 1628/1752/3733 1627/1749/3734 +s 4 +f 1643/1753/3735 1642/1754/3736 1648/1755/3737 1647/1756/3738 +s 2 +f 1642/1754/3739 1641/1757/3740 1649/1758/3741 1648/1755/3742 +f 1620/1759/3743 1618/1760/3744 1625/1747/3727 1626/1750/3730 +f 1620/1759/3743 1626/1750/3730 1632/1761/3745 1629/1762/3746 +f 1629/1762/3746 1632/1761/3745 1638/1763/3747 1635/1764/3748 +f 1635/1764/3748 1638/1763/3747 1644/1765/3749 1641/1757/3740 +f 1641/1757/3740 1644/1765/3749 1651/1766/3750 1649/1758/3741 +s 3 +f 1628/1752/3733 1623/1751/3732 1616/1745/3751 1614/1743/3752 +f 1628/1752/3733 1614/1743/3752 1612/1741/3753 1634/1767/3754 +f 1634/1767/3754 1612/1741/3753 1610/1739/3755 1640/1768/3756 +f 1640/1768/3756 1610/1739/3755 1608/1737/3757 1646/1769/3758 +f 1646/1769/3758 1608/1737/3757 1606/1736/3759 1650/1770/3760 +s 4 +f 1615/1746/3761 1617/1771/3762 1622/1772/3763 1613/1744/3764 +f 1613/1744/3764 1622/1772/3763 1631/1773/3765 1611/1742/3766 +f 1611/1742/3766 1631/1773/3765 1637/1774/3767 1609/1740/3768 +f 1609/1740/3768 1637/1774/3767 1643/1753/3735 1607/1738/3769 +f 1607/1738/3769 1643/1753/3735 1647/1756/3738 1605/1735/3770 +f 1617/1771/3762 1619/1775/3771 1621/1776/3772 1622/1772/3763 +s 2 +f 1619/1775/3773 1618/1760/3744 1620/1759/3743 1621/1776/3774 +f 1626/1750/3730 1627/1749/3729 1633/1777/3775 1632/1761/3745 +s 3 +f 1627/1749/3734 1628/1752/3733 1634/1767/3754 1633/1777/3776 +s 4 +f 1622/1772/3763 1621/1776/3772 1630/1778/3777 1631/1773/3765 +s 2 +f 1621/1776/3774 1620/1759/3743 1629/1762/3746 1630/1778/3778 +f 1632/1761/3745 1633/1777/3775 1639/1779/3779 1638/1763/3747 +s 3 +f 1633/1777/3776 1634/1767/3754 1640/1768/3756 1639/1779/3780 +s 4 +f 1631/1773/3765 1630/1778/3777 1636/1780/3781 1637/1774/3767 +s 2 +f 1630/1778/3778 1629/1762/3746 1635/1764/3748 1636/1780/3782 +f 1638/1763/3747 1639/1779/3779 1645/1781/3783 1644/1765/3749 +s 3 +f 1639/1779/3780 1640/1768/3756 1646/1769/3758 1645/1781/3784 +s 4 +f 1637/1774/3767 1636/1780/3781 1642/1754/3736 1643/1753/3735 +s 2 +f 1636/1780/3782 1635/1764/3748 1641/1757/3740 1642/1754/3739 +f 1644/1765/3749 1645/1781/3783 1652/1782/3785 1651/1766/3750 +s 3 +f 1645/1781/3784 1646/1769/3758 1650/1770/3760 1652/1782/3786 +s 7 +f 1654/1783/3787 1653/1784/3788 1673/1785/3789 +f 1655/1786/3790 1654/1783/3787 1673/1785/3789 +f 1656/1787/3791 1655/1786/3790 1673/1785/3789 +f 1657/1788/3792 1656/1787/3791 1673/1785/3789 +f 1658/1789/3793 1657/1788/3792 1673/1785/3789 +f 1659/1790/3794 1658/1789/3793 1673/1785/3789 +f 1660/1791/3795 1659/1790/3794 1673/1785/3789 +f 1661/1792/3796 1660/1791/3795 1673/1785/3789 +f 1662/1793/3797 1661/1792/3796 1673/1785/3789 +f 1663/1794/3798 1662/1793/3797 1673/1785/3789 +f 1664/1795/3799 1663/1794/3798 1673/1785/3789 +f 1665/1796/3800 1664/1795/3799 1673/1785/3789 +f 1666/1797/3801 1665/1796/3800 1673/1785/3789 +f 1667/1798/3802 1666/1797/3801 1673/1785/3789 +f 1668/1799/3803 1667/1798/3802 1673/1785/3789 +f 1669/1800/3804 1668/1799/3803 1673/1785/3789 +f 1670/1801/3805 1669/1800/3804 1673/1785/3789 +f 1671/1802/3806 1670/1801/3805 1673/1785/3789 +f 1672/1803/3807 1671/1802/3806 1673/1785/3789 +f 1653/1784/3788 1672/1803/3807 1673/1785/3789 +s 8 +f 1675/1804/3808 1676/1805/3809 1714/1806/3810 1713/1807/3811 +f 1676/1805/3809 1675/1804/3808 1677/1808/3812 1678/1809/3813 +f 1678/1809/3813 1677/1808/3812 1679/1810/3814 1680/1811/3815 +f 1680/1811/3815 1679/1810/3814 1681/1812/3816 1682/1813/3817 +f 1682/1813/3817 1681/1812/3816 1683/1814/3818 1684/1815/3819 +f 1684/1815/3819 1683/1814/3818 1685/1816/3820 1686/1817/3821 +f 1686/1817/3821 1685/1816/3820 1687/1818/3822 1688/1819/3823 +f 1688/1819/3823 1687/1818/3822 1689/1820/3824 1690/1821/3825 +f 1690/1821/3825 1689/1820/3824 1691/1822/3826 1692/1823/3827 +f 1692/1823/3827 1691/1822/3826 1693/1824/3828 1694/1825/3829 +f 1694/1825/3829 1693/1824/3828 1695/1826/3830 1696/1827/3831 +f 1696/1827/3831 1695/1826/3830 1697/1828/3832 1698/1829/3833 +f 1698/1829/3833 1697/1828/3832 1699/1830/3834 1700/1831/3835 +f 1700/1831/3835 1699/1830/3834 1701/1832/3836 1702/1833/3837 +f 1702/1833/3837 1701/1832/3836 1703/1834/3838 1704/1835/3839 +f 1704/1835/3839 1703/1834/3838 1705/1836/3840 1706/1837/3841 +f 1706/1837/3841 1705/1836/3840 1707/1838/3842 1708/1839/3843 +f 1708/1839/3843 1707/1838/3842 1709/1840/3844 1710/1841/3845 +f 1710/1841/3845 1709/1840/3844 1711/1842/3846 1712/1843/3847 +f 1712/1843/3847 1711/1842/3846 1713/1807/3811 1714/1806/3810 +f 1715/1844/3848 1716/1845/3849 1753/1846/3850 1754/1847/3851 +f 1716/1845/3849 1715/1844/3848 1718/1848/3852 1717/1849/3853 +f 1717/1849/3853 1718/1848/3852 1720/1850/3854 1719/1851/3855 +f 1719/1851/3855 1720/1850/3854 1722/1852/3856 1721/1853/3857 +f 1721/1853/3857 1722/1852/3856 1724/1854/3858 1723/1855/3859 +f 1723/1855/3859 1724/1854/3858 1726/1856/3860 1725/1857/3861 +f 1725/1857/3861 1726/1856/3860 1728/1858/3862 1727/1859/3863 +f 1727/1859/3863 1728/1858/3862 1730/1860/3864 1729/1861/3865 +f 1729/1861/3865 1730/1860/3864 1732/1862/3866 1731/1863/3867 +f 1731/1863/3867 1732/1862/3866 1734/1864/3868 1733/1865/3869 +f 1733/1865/3869 1734/1864/3868 1736/1866/3870 1735/1867/3871 +f 1735/1867/3871 1736/1866/3870 1738/1868/3872 1737/1869/3873 +f 1737/1869/3873 1738/1868/3872 1740/1870/3874 1739/1871/3875 +f 1739/1871/3875 1740/1870/3874 1742/1872/3876 1741/1873/3877 +f 1741/1873/3877 1742/1872/3876 1744/1874/3878 1743/1875/3879 +f 1743/1875/3879 1744/1874/3878 1746/1876/3880 1745/1877/3881 +f 1745/1877/3881 1746/1876/3880 1748/1878/3882 1747/1879/3883 +f 1747/1879/3883 1748/1878/3882 1750/1880/3884 1749/1881/3885 +f 1749/1881/3885 1750/1880/3884 1752/1882/3886 1751/1883/3887 +f 1751/1883/3887 1752/1882/3886 1754/1847/3851 1753/1846/3850 +f 1653/1784/3888 1654/1783/3889 1677/1808/3812 1675/1804/3808 +f 1654/1783/3889 1655/1786/3890 1679/1810/3814 1677/1808/3812 +f 1655/1786/3890 1656/1787/3891 1681/1812/3816 1679/1810/3814 +f 1656/1787/3891 1657/1788/3892 1683/1814/3818 1681/1812/3816 +f 1657/1788/3892 1658/1789/3893 1685/1816/3820 1683/1814/3818 +f 1658/1789/3893 1659/1790/3894 1687/1818/3822 1685/1816/3820 +f 1659/1790/3894 1660/1791/3895 1689/1820/3824 1687/1818/3822 +f 1660/1791/3895 1661/1792/3896 1691/1822/3826 1689/1820/3824 +f 1661/1792/3896 1662/1793/3897 1693/1824/3828 1691/1822/3826 +f 1662/1793/3897 1663/1794/3898 1695/1826/3830 1693/1824/3828 +f 1663/1794/3898 1664/1795/3899 1697/1828/3832 1695/1826/3830 +f 1664/1795/3899 1665/1796/3900 1699/1830/3834 1697/1828/3832 +f 1665/1796/3900 1666/1797/3901 1701/1832/3836 1699/1830/3834 +f 1666/1797/3901 1667/1798/3902 1703/1834/3838 1701/1832/3836 +f 1667/1798/3902 1668/1799/3903 1705/1836/3840 1703/1834/3838 +f 1668/1799/3903 1669/1800/3904 1707/1838/3842 1705/1836/3840 +f 1669/1800/3904 1670/1801/3905 1709/1840/3844 1707/1838/3842 +f 1670/1801/3905 1671/1802/3906 1711/1842/3846 1709/1840/3844 +f 1671/1802/3906 1672/1803/3907 1713/1807/3811 1711/1842/3846 +f 1672/1803/3907 1653/1784/3888 1675/1804/3808 1713/1807/3811 +f 1716/1845/3849 1717/1849/3853 1674/1884/3908 +f 1717/1849/3853 1719/1851/3855 1674/1884/3908 +f 1719/1851/3855 1721/1853/3857 1674/1884/3908 +f 1721/1853/3857 1723/1855/3859 1674/1884/3908 +f 1723/1855/3859 1725/1857/3861 1674/1884/3908 +f 1725/1857/3861 1727/1859/3863 1674/1884/3908 +f 1727/1859/3863 1729/1861/3865 1674/1884/3908 +f 1729/1861/3865 1731/1863/3867 1674/1884/3908 +f 1731/1863/3867 1733/1865/3869 1674/1884/3908 +f 1733/1865/3869 1735/1867/3871 1674/1884/3908 +f 1735/1867/3871 1737/1869/3873 1674/1884/3908 +f 1737/1869/3873 1739/1871/3875 1674/1884/3908 +f 1739/1871/3875 1741/1873/3877 1674/1884/3908 +f 1741/1873/3877 1743/1875/3879 1674/1884/3908 +f 1743/1875/3879 1745/1877/3881 1674/1884/3908 +f 1745/1877/3881 1747/1879/3883 1674/1884/3908 +f 1747/1879/3883 1749/1881/3885 1674/1884/3908 +f 1749/1881/3885 1751/1883/3887 1674/1884/3908 +f 1751/1883/3887 1753/1846/3850 1674/1884/3908 +f 1753/1846/3850 1716/1845/3849 1674/1884/3908 +f 1676/1805/3809 1678/1809/3813 1718/1848/3852 1715/1844/3848 +f 1678/1809/3813 1680/1811/3815 1720/1850/3854 1718/1848/3852 +f 1680/1811/3815 1682/1813/3817 1722/1852/3856 1720/1850/3854 +f 1682/1813/3817 1684/1815/3819 1724/1854/3858 1722/1852/3856 +f 1684/1815/3819 1686/1817/3821 1726/1856/3860 1724/1854/3858 +f 1686/1817/3821 1688/1819/3823 1728/1858/3862 1726/1856/3860 +f 1688/1819/3823 1690/1821/3825 1730/1860/3864 1728/1858/3862 +f 1690/1821/3825 1692/1823/3827 1732/1862/3866 1730/1860/3864 +f 1692/1823/3827 1694/1825/3829 1734/1864/3868 1732/1862/3866 +f 1694/1825/3829 1696/1827/3831 1736/1866/3870 1734/1864/3868 +f 1696/1827/3831 1698/1829/3833 1738/1868/3872 1736/1866/3870 +f 1698/1829/3833 1700/1831/3835 1740/1870/3874 1738/1868/3872 +f 1700/1831/3835 1702/1833/3837 1742/1872/3876 1740/1870/3874 +f 1702/1833/3837 1704/1835/3839 1744/1874/3878 1742/1872/3876 +f 1704/1835/3839 1706/1837/3841 1746/1876/3880 1744/1874/3878 +f 1706/1837/3841 1708/1839/3843 1748/1878/3882 1746/1876/3880 +f 1708/1839/3843 1710/1841/3845 1750/1880/3884 1748/1878/3882 +f 1710/1841/3845 1712/1843/3847 1752/1882/3886 1750/1880/3884 +f 1712/1843/3847 1714/1806/3810 1754/1847/3851 1752/1882/3886 +f 1714/1806/3810 1676/1805/3809 1715/1844/3848 1754/1847/3851 +s 10 +f 1755/1885/3909 1756/1886/3910 1776/1887/3911 1775/1888/3912 +f 1756/1886/3910 1757/1889/3913 1777/1890/3914 1776/1887/3911 +f 1757/1889/3913 1758/1891/3915 1778/1892/3916 1777/1890/3914 +f 1758/1891/3915 1759/1893/3917 1779/1894/3918 1778/1892/3916 +f 1759/1893/3917 1760/1895/3919 1780/1896/3920 1779/1894/3918 +f 1760/1895/3919 1761/1897/3921 1781/1898/3922 1780/1896/3920 +f 1761/1897/3921 1762/1899/3923 1782/1900/3924 1781/1898/3922 +f 1762/1899/3923 1763/1901/3925 1783/1902/3926 1782/1900/3924 +f 1763/1901/3925 1764/1903/3927 1784/1904/3928 1783/1902/3926 +f 1764/1903/3927 1765/1905/3929 1785/1906/3930 1784/1904/3928 +f 1765/1905/3929 1766/1907/3931 1786/1908/3932 1785/1906/3930 +f 1766/1907/3931 1767/1909/3933 1787/1910/3934 1786/1908/3932 +f 1767/1909/3933 1768/1911/3935 1788/1912/3936 1787/1910/3934 +f 1768/1911/3935 1769/1913/3937 1789/1914/3938 1788/1912/3936 +f 1769/1913/3937 1770/1915/3939 1790/1916/3940 1789/1914/3938 +f 1770/1915/3939 1771/1917/3941 1791/1918/3942 1790/1916/3940 +f 1771/1917/3941 1772/1919/3943 1792/1920/3944 1791/1918/3942 +f 1772/1919/3943 1773/1921/3945 1793/1922/3946 1792/1920/3944 +f 1773/1921/3945 1774/1923/3947 1794/1924/3948 1793/1922/3946 +f 1774/1923/3947 1755/1885/3909 1775/1888/3912 1794/1924/3948 +s 11 +f 1775/1888/3949 1776/1887/3950 1796/1925/3951 1795/1926/3952 +f 1776/1887/3950 1777/1890/3953 1797/1927/3954 1796/1925/3951 +f 1777/1890/3953 1778/1892/3955 1798/1928/3956 1797/1927/3954 +f 1778/1892/3955 1779/1894/3957 1799/1929/3958 1798/1928/3956 +f 1779/1894/3957 1780/1896/3959 1800/1930/3960 1799/1929/3958 +f 1780/1896/3959 1781/1898/3961 1801/1931/3962 1800/1930/3960 +f 1781/1898/3961 1782/1900/3963 1802/1932/3964 1801/1931/3962 +f 1782/1900/3963 1783/1902/3965 1803/1933/3966 1802/1932/3964 +f 1783/1902/3965 1784/1904/3967 1804/1934/3968 1803/1933/3966 +f 1784/1904/3967 1785/1906/3969 1805/1935/3970 1804/1934/3968 +f 1785/1906/3969 1786/1908/3971 1806/1936/3972 1805/1935/3970 +f 1786/1908/3971 1787/1910/3973 1807/1937/3974 1806/1936/3972 +f 1787/1910/3973 1788/1912/3975 1808/1938/3976 1807/1937/3974 +f 1788/1912/3975 1789/1914/3977 1809/1939/3978 1808/1938/3976 +f 1789/1914/3977 1790/1916/3979 1810/1940/3980 1809/1939/3978 +f 1790/1916/3979 1791/1918/3981 1811/1941/3982 1810/1940/3980 +f 1791/1918/3981 1792/1920/3983 1812/1942/3984 1811/1941/3982 +f 1792/1920/3983 1793/1922/3985 1813/1943/3986 1812/1942/3984 +f 1793/1922/3985 1794/1924/3987 1814/1944/3988 1813/1943/3986 +f 1794/1924/3987 1775/1888/3949 1795/1926/3952 1814/1944/3988 +s 12 +f 1836/1945/3989 1835/1946/3990 1815/1947/3991 1816/1948/3992 +f 1837/1949/3993 1836/1945/3989 1816/1948/3992 1817/1950/3994 +f 1838/1951/3995 1837/1949/3993 1817/1950/3994 1818/1952/3996 +f 1839/1953/3997 1838/1951/3995 1818/1952/3996 1819/1954/3998 +f 1840/1955/3999 1839/1953/3997 1819/1954/3998 1820/1956/4000 +f 1841/1957/4001 1840/1955/3999 1820/1956/4000 1821/1958/4002 +f 1842/1959/4003 1841/1957/4001 1821/1958/4002 1822/1960/4004 +f 1843/1961/4005 1842/1959/4003 1822/1960/4004 1823/1962/4006 +f 1844/1963/4007 1843/1961/4005 1823/1962/4006 1824/1964/4008 +f 1845/1965/4009 1844/1963/4007 1824/1964/4008 1825/1966/4010 +f 1846/1967/4011 1845/1965/4009 1825/1966/4010 1826/1968/4012 +f 1847/1969/4013 1846/1967/4011 1826/1968/4012 1827/1970/4014 +f 1848/1971/4015 1847/1969/4013 1827/1970/4014 1828/1972/4016 +f 1849/1973/4017 1848/1971/4015 1828/1972/4016 1829/1974/4018 +f 1850/1975/4019 1849/1973/4017 1829/1974/4018 1830/1976/4020 +f 1851/1977/4021 1850/1975/4019 1830/1976/4020 1831/1978/4022 +f 1852/1979/4023 1851/1977/4021 1831/1978/4022 1832/1980/4024 +f 1853/1981/4025 1852/1979/4023 1832/1980/4024 1833/1982/4026 +f 1854/1983/4027 1853/1981/4025 1833/1982/4026 1834/1984/4028 +f 1835/1946/3990 1854/1983/4027 1834/1984/4028 1815/1947/3991 +f 1816/1948/3992 1815/1947/3991 1795/1926/4029 1796/1925/4030 +f 1817/1950/3994 1816/1948/3992 1796/1925/4030 1797/1927/4031 +f 1818/1952/3996 1817/1950/3994 1797/1927/4031 1798/1928/4032 +f 1819/1954/3998 1818/1952/3996 1798/1928/4032 1799/1929/4033 +f 1820/1956/4000 1819/1954/3998 1799/1929/4033 1800/1930/4034 +f 1821/1958/4002 1820/1956/4000 1800/1930/4034 1801/1931/4035 +f 1822/1960/4004 1821/1958/4002 1801/1931/4035 1802/1932/4036 +f 1823/1962/4006 1822/1960/4004 1802/1932/4036 1803/1933/4037 +f 1824/1964/4008 1823/1962/4006 1803/1933/4037 1804/1934/4038 +f 1825/1966/4010 1824/1964/4008 1804/1934/4038 1805/1935/4039 +f 1826/1968/4012 1825/1966/4010 1805/1935/4039 1806/1936/4040 +f 1827/1970/4014 1826/1968/4012 1806/1936/4040 1807/1937/4041 +f 1828/1972/4016 1827/1970/4014 1807/1937/4041 1808/1938/4042 +f 1829/1974/4018 1828/1972/4016 1808/1938/4042 1809/1939/4043 +f 1830/1976/4020 1829/1974/4018 1809/1939/4043 1810/1940/4044 +f 1831/1978/4022 1830/1976/4020 1810/1940/4044 1811/1941/4045 +f 1832/1980/4024 1831/1978/4022 1811/1941/4045 1812/1942/4046 +f 1833/1982/4026 1832/1980/4024 1812/1942/4046 1813/1943/4047 +f 1834/1984/4028 1833/1982/4026 1813/1943/4047 1814/1944/4048 +f 1815/1947/3991 1834/1984/4028 1814/1944/4048 1795/1926/4029 +s 10 +f 1756/1886/3910 1755/1885/3909 1835/1946/4049 1836/1945/4050 +f 1757/1889/3913 1756/1886/3910 1836/1945/4050 1837/1949/4051 +f 1758/1891/3915 1757/1889/3913 1837/1949/4051 1838/1951/4052 +f 1759/1893/3917 1758/1891/3915 1838/1951/4052 1839/1953/4053 +f 1760/1895/3919 1759/1893/3917 1839/1953/4053 1840/1955/4054 +f 1761/1897/3921 1760/1895/3919 1840/1955/4054 1841/1957/4055 +f 1762/1899/3923 1761/1897/3921 1841/1957/4055 1842/1959/4056 +f 1763/1901/3925 1762/1899/3923 1842/1959/4056 1843/1961/4057 +f 1764/1903/3927 1763/1901/3925 1843/1961/4057 1844/1963/4058 +f 1765/1905/3929 1764/1903/3927 1844/1963/4058 1845/1965/4059 +f 1766/1907/3931 1765/1905/3929 1845/1965/4059 1846/1967/4060 +f 1767/1909/3933 1766/1907/3931 1846/1967/4060 1847/1969/4061 +f 1768/1911/3935 1767/1909/3933 1847/1969/4061 1848/1971/4062 +f 1769/1913/3937 1768/1911/3935 1848/1971/4062 1849/1973/4063 +f 1770/1915/3939 1769/1913/3937 1849/1973/4063 1850/1975/4064 +f 1771/1917/3941 1770/1915/3939 1850/1975/4064 1851/1977/4065 +f 1772/1919/3943 1771/1917/3941 1851/1977/4065 1852/1979/4066 +f 1773/1921/3945 1772/1919/3943 1852/1979/4066 1853/1981/4067 +f 1774/1923/3947 1773/1921/3945 1853/1981/4067 1854/1983/4068 +f 1755/1885/3909 1774/1923/3947 1854/1983/4068 1835/1946/4049 +s 13 +f 1855/1985/4069 1856/1986/4070 1858/1987/4071 1857/1988/4072 +f 1857/1988/4072 1858/1987/4071 1860/1989/4073 1859/1990/4074 +f 1859/1990/4074 1860/1989/4073 1862/1991/4075 1861/1992/4076 +f 1861/1992/4076 1862/1991/4075 1864/1993/4077 1863/1994/4078 +f 1863/1994/4078 1864/1993/4077 1866/1995/4079 1865/1996/4080 +s 14 +f 1875/1997/4081 1874/1998/4082 1877/1999/4083 1876/2000/4084 +s 15 +f 1874/1998/4085 1873/2001/4086 1878/2002/4087 1877/1999/4088 +s 16 +f 1893/2003/4089 1892/2004/4090 1898/2005/4091 1897/2006/4092 +s 14 +f 1892/2004/4093 1891/2007/4094 1899/2008/4095 1898/2005/4096 +f 1870/2009/4097 1868/2010/4098 1875/1997/4081 1876/2000/4084 +f 1870/2009/4097 1876/2000/4084 1882/2011/4099 1879/2012/4100 +f 1879/2012/4100 1882/2011/4099 1888/2013/4101 1885/2014/4102 +f 1885/2014/4102 1888/2013/4101 1894/2015/4103 1891/2007/4094 +f 1891/2007/4094 1894/2015/4103 1901/2016/4104 1899/2008/4095 +s 15 +f 1878/2002/4087 1873/2001/4086 1866/1995/4105 1864/1993/4106 +f 1878/2002/4087 1864/1993/4106 1862/1991/4107 1884/2017/4108 +f 1884/2017/4108 1862/1991/4107 1860/1989/4109 1890/2018/4110 +f 1890/2018/4110 1860/1989/4109 1858/1987/4111 1896/2019/4112 +f 1896/2019/4112 1858/1987/4111 1856/1986/4113 1900/2020/4114 +s 16 +f 1865/1996/4115 1867/2021/4116 1872/2022/4117 1863/1994/4118 +f 1863/1994/4118 1872/2022/4117 1881/2023/4119 1861/1992/4120 +f 1861/1992/4120 1881/2023/4119 1887/2024/4121 1859/1990/4122 +f 1859/1990/4122 1887/2024/4121 1893/2003/4089 1857/1988/4123 +f 1857/1988/4123 1893/2003/4089 1897/2006/4092 1855/1985/4124 +f 1867/2021/4116 1869/2025/4125 1871/2026/4126 1872/2022/4117 +s 14 +f 1869/2025/4127 1868/2010/4098 1870/2009/4097 1871/2026/4128 +f 1876/2000/4084 1877/1999/4083 1883/2027/4129 1882/2011/4099 +s 15 +f 1877/1999/4088 1878/2002/4087 1884/2017/4108 1883/2027/4130 +s 16 +f 1872/2022/4117 1871/2026/4126 1880/2028/4131 1881/2023/4119 +s 14 +f 1871/2026/4128 1870/2009/4097 1879/2012/4100 1880/2028/4132 +f 1882/2011/4099 1883/2027/4129 1889/2029/4133 1888/2013/4101 +s 15 +f 1883/2027/4130 1884/2017/4108 1890/2018/4110 1889/2029/4134 +s 16 +f 1881/2023/4119 1880/2028/4131 1886/2030/4135 1887/2024/4121 +s 14 +f 1880/2028/4132 1879/2012/4100 1885/2014/4102 1886/2030/4136 +f 1888/2013/4101 1889/2029/4133 1895/2031/4137 1894/2015/4103 +s 15 +f 1889/2029/4134 1890/2018/4110 1896/2019/4112 1895/2031/4138 +s 16 +f 1887/2024/4121 1886/2030/4135 1892/2004/4090 1893/2003/4089 +s 14 +f 1886/2030/4136 1885/2014/4102 1891/2007/4094 1892/2004/4093 +f 1894/2015/4103 1895/2031/4137 1902/2032/4139 1901/2016/4104 +s 15 +f 1895/2031/4138 1896/2019/4112 1900/2020/4114 1902/2032/4140 +s 19 +f 1903/2033/4141 1904/2034/4142 1906/2035/4143 1905/2036/4144 +f 1905/2036/4144 1906/2035/4143 1908/2037/4145 1907/2038/4146 +f 1907/2038/4146 1908/2037/4145 1910/2039/4147 1909/2040/4148 +f 1909/2040/4148 1910/2039/4147 1912/2041/4149 1911/2042/4150 +f 1911/2042/4150 1912/2041/4149 1914/2043/4151 1913/2044/4152 +s 20 +f 1923/2045/4153 1922/2046/4154 1925/2047/4155 1924/2048/4156 +s 21 +f 1922/2046/4157 1921/2049/4158 1926/2050/4159 1925/2047/4160 +s 22 +f 1941/2051/4161 1940/2052/4162 1946/2053/4163 1945/2054/4164 +s 20 +f 1940/2052/4165 1939/2055/4166 1947/2056/4167 1946/2053/4168 +f 1918/2057/4169 1916/2058/4170 1923/2045/4153 1924/2048/4156 +f 1918/2057/4169 1924/2048/4156 1930/2059/4171 1927/2060/4172 +f 1927/2060/4172 1930/2059/4171 1936/2061/4173 1933/2062/4174 +f 1933/2062/4174 1936/2061/4173 1942/2063/4175 1939/2055/4166 +f 1939/2055/4166 1942/2063/4175 1949/2064/4176 1947/2056/4167 +s 21 +f 1926/2050/4159 1921/2049/4158 1914/2043/4177 1912/2041/4178 +f 1926/2050/4159 1912/2041/4178 1910/2039/4179 1932/2065/4180 +f 1932/2065/4180 1910/2039/4179 1908/2037/4181 1938/2066/4182 +f 1938/2066/4182 1908/2037/4181 1906/2035/4183 1944/2067/4184 +f 1944/2067/4184 1906/2035/4183 1904/2034/4185 1948/2068/4186 +s 22 +f 1913/2044/4187 1915/2069/4188 1920/2070/4189 1911/2042/4190 +f 1911/2042/4190 1920/2070/4189 1929/2071/4191 1909/2040/4192 +f 1909/2040/4192 1929/2071/4191 1935/2072/4193 1907/2038/4194 +f 1907/2038/4194 1935/2072/4193 1941/2051/4161 1905/2036/4195 +f 1905/2036/4195 1941/2051/4161 1945/2054/4164 1903/2033/4196 +f 1915/2069/4188 1917/2073/4197 1919/2074/4198 1920/2070/4189 +s 20 +f 1917/2073/4199 1916/2058/4170 1918/2057/4169 1919/2074/4200 +f 1924/2048/4156 1925/2047/4155 1931/2075/4201 1930/2059/4171 +s 21 +f 1925/2047/4160 1926/2050/4159 1932/2065/4180 1931/2075/4202 +s 22 +f 1920/2070/4189 1919/2074/4198 1928/2076/4203 1929/2071/4191 +s 20 +f 1919/2074/4200 1918/2057/4169 1927/2060/4172 1928/2076/4204 +f 1930/2059/4171 1931/2075/4201 1937/2077/4205 1936/2061/4173 +s 21 +f 1931/2075/4202 1932/2065/4180 1938/2066/4182 1937/2077/4206 +s 22 +f 1929/2071/4191 1928/2076/4203 1934/2078/4207 1935/2072/4193 +s 20 +f 1928/2076/4204 1927/2060/4172 1933/2062/4174 1934/2078/4208 +f 1936/2061/4173 1937/2077/4205 1943/2079/4209 1942/2063/4175 +s 21 +f 1937/2077/4206 1938/2066/4182 1944/2067/4184 1943/2079/4210 +s 22 +f 1935/2072/4193 1934/2078/4207 1940/2052/4162 1941/2051/4161 +s 20 +f 1934/2078/4208 1933/2062/4174 1939/2055/4166 1940/2052/4165 +f 1942/2063/4175 1943/2079/4209 1950/2080/4211 1949/2064/4176 +s 21 +f 1943/2079/4210 1944/2067/4184 1948/2068/4186 1950/2080/4212 +s 25 +f 1951/2081/4213 1952/2082/4214 1954/2083/4215 1953/2084/4216 +f 1953/2084/4216 1954/2083/4215 1956/2085/4217 1955/2086/4218 +f 1955/2086/4218 1956/2085/4217 1958/2087/4219 1957/2088/4220 +f 1957/2088/4220 1958/2087/4219 1960/2089/4221 1959/2090/4222 +f 1959/2090/4222 1960/2089/4221 1962/2091/4223 1961/2092/4224 +s 26 +f 1971/2093/4225 1970/2094/4226 1973/2095/4227 1972/2096/4228 +s 27 +f 1970/2094/4229 1969/2097/4230 1974/2098/4231 1973/2095/4232 +s 28 +f 1989/2099/4233 1988/2100/4234 1994/2101/4235 1993/2102/4236 +s 26 +f 1988/2100/4237 1987/2103/4238 1995/2104/4239 1994/2101/4240 +f 1966/2105/4241 1964/2106/4242 1971/2093/4225 1972/2096/4228 +f 1966/2105/4241 1972/2096/4228 1978/2107/4243 1975/2108/4244 +f 1975/2108/4244 1978/2107/4243 1984/2109/4245 1981/2110/4246 +f 1981/2110/4246 1984/2109/4245 1990/2111/4247 1987/2103/4238 +f 1987/2103/4238 1990/2111/4247 1997/2112/4248 1995/2104/4239 +s 27 +f 1974/2098/4231 1969/2097/4230 1962/2091/4249 1960/2089/4250 +f 1974/2098/4231 1960/2089/4250 1958/2087/4251 1980/2113/4252 +f 1980/2113/4252 1958/2087/4251 1956/2085/4253 1986/2114/4254 +f 1986/2114/4254 1956/2085/4253 1954/2083/4255 1992/2115/4256 +f 1992/2115/4256 1954/2083/4255 1952/2082/4257 1996/2116/4258 +s 28 +f 1961/2092/4259 1963/2117/4260 1968/2118/4261 1959/2090/4262 +f 1959/2090/4262 1968/2118/4261 1977/2119/4263 1957/2088/4264 +f 1957/2088/4264 1977/2119/4263 1983/2120/4265 1955/2086/4266 +f 1955/2086/4266 1983/2120/4265 1989/2099/4233 1953/2084/4267 +f 1953/2084/4267 1989/2099/4233 1993/2102/4236 1951/2081/4268 +f 1963/2117/4260 1965/2121/4269 1967/2122/4270 1968/2118/4261 +s 26 +f 1965/2121/4271 1964/2106/4242 1966/2105/4241 1967/2122/4272 +f 1972/2096/4228 1973/2095/4227 1979/2123/4273 1978/2107/4243 +s 27 +f 1973/2095/4232 1974/2098/4231 1980/2113/4252 1979/2123/4274 +s 28 +f 1968/2118/4261 1967/2122/4270 1976/2124/4275 1977/2119/4263 +s 26 +f 1967/2122/4272 1966/2105/4241 1975/2108/4244 1976/2124/4276 +f 1978/2107/4243 1979/2123/4273 1985/2125/4277 1984/2109/4245 +s 27 +f 1979/2123/4274 1980/2113/4252 1986/2114/4254 1985/2125/4278 +s 28 +f 1977/2119/4263 1976/2124/4275 1982/2126/4279 1983/2120/4265 +s 26 +f 1976/2124/4276 1975/2108/4244 1981/2110/4246 1982/2126/4280 +f 1984/2109/4245 1985/2125/4277 1991/2127/4281 1990/2111/4247 +s 27 +f 1985/2125/4278 1986/2114/4254 1992/2115/4256 1991/2127/4282 +s 28 +f 1983/2120/4265 1982/2126/4279 1988/2100/4234 1989/2099/4233 +s 26 +f 1982/2126/4280 1981/2110/4246 1987/2103/4238 1988/2100/4237 +f 1990/2111/4247 1991/2127/4281 1998/2128/4283 1997/2112/4248 +s 27 +f 1991/2127/4282 1992/2115/4256 1996/2116/4258 1998/2128/4284 +s 31 +f 1999/2129/4285 2000/2130/4286 2002/2131/4287 2001/2132/4288 +f 2001/2132/4288 2002/2131/4287 2004/2133/4289 2003/2134/4290 +f 2003/2134/4290 2004/2133/4289 2006/2135/4291 2005/2136/4292 +f 2005/2136/4292 2006/2135/4291 2008/2137/4293 2007/2138/4294 +f 2007/2138/4294 2008/2137/4293 2010/2139/4295 2009/2140/4296 +s 32 +f 2019/2141/4297 2018/2142/4298 2021/2143/4299 2020/2144/4300 +s 33 +f 2018/2142/4301 2017/2145/4302 2022/2146/4303 2021/2143/4304 +s 34 +f 2037/2147/4305 2036/2148/4306 2042/2149/4307 2041/2150/4308 +s 32 +f 2036/2148/4309 2035/2151/4310 2043/2152/4311 2042/2149/4312 +f 2014/2153/4313 2012/2154/4314 2019/2141/4297 2020/2144/4300 +f 2014/2153/4313 2020/2144/4300 2026/2155/4315 2023/2156/4316 +f 2023/2156/4316 2026/2155/4315 2032/2157/4317 2029/2158/4318 +f 2029/2158/4318 2032/2157/4317 2038/2159/4319 2035/2151/4310 +f 2035/2151/4310 2038/2159/4319 2045/2160/4320 2043/2152/4311 +s 33 +f 2022/2146/4303 2017/2145/4302 2010/2139/4321 2008/2137/4322 +f 2022/2146/4303 2008/2137/4322 2006/2135/4323 2028/2161/4324 +f 2028/2161/4324 2006/2135/4323 2004/2133/4325 2034/2162/4326 +f 2034/2162/4326 2004/2133/4325 2002/2131/4327 2040/2163/4328 +f 2040/2163/4328 2002/2131/4327 2000/2130/4329 2044/2164/4330 +s 34 +f 2009/2140/4331 2011/2165/4332 2016/2166/4333 2007/2138/4334 +f 2007/2138/4334 2016/2166/4333 2025/2167/4335 2005/2136/4336 +f 2005/2136/4336 2025/2167/4335 2031/2168/4337 2003/2134/4338 +f 2003/2134/4338 2031/2168/4337 2037/2147/4305 2001/2132/4339 +f 2001/2132/4339 2037/2147/4305 2041/2150/4308 1999/2129/4340 +f 2011/2165/4332 2013/2169/4341 2015/2170/4342 2016/2166/4333 +s 32 +f 2013/2169/4343 2012/2154/4314 2014/2153/4313 2015/2170/4344 +f 2020/2144/4300 2021/2143/4299 2027/2171/4345 2026/2155/4315 +s 33 +f 2021/2143/4304 2022/2146/4303 2028/2161/4324 2027/2171/4346 +s 34 +f 2016/2166/4333 2015/2170/4342 2024/2172/4347 2025/2167/4335 +s 32 +f 2015/2170/4344 2014/2153/4313 2023/2156/4316 2024/2172/4348 +f 2026/2155/4315 2027/2171/4345 2033/2173/4349 2032/2157/4317 +s 33 +f 2027/2171/4346 2028/2161/4324 2034/2162/4326 2033/2173/4350 +s 34 +f 2025/2167/4335 2024/2172/4347 2030/2174/4351 2031/2168/4337 +s 32 +f 2024/2172/4348 2023/2156/4316 2029/2158/4318 2030/2174/4352 +f 2032/2157/4317 2033/2173/4349 2039/2175/4353 2038/2159/4319 +s 33 +f 2033/2173/4350 2034/2162/4326 2040/2163/4328 2039/2175/4354 +s 34 +f 2031/2168/4337 2030/2174/4351 2036/2148/4306 2037/2147/4305 +s 32 +f 2030/2174/4352 2029/2158/4318 2035/2151/4310 2036/2148/4309 +f 2038/2159/4319 2039/2175/4353 2046/2176/4355 2045/2160/4320 +s 33 +f 2039/2175/4354 2040/2163/4328 2044/2164/4330 2046/2176/4356 +s 37 +f 2047/2177/4357 2048/2178/4358 2050/2179/4359 2049/2180/4360 +f 2049/2180/4360 2050/2179/4359 2052/2181/4361 2051/2182/4362 +f 2051/2182/4362 2052/2181/4361 2054/2183/4363 2053/2184/4364 +f 2053/2184/4364 2054/2183/4363 2056/2185/4365 2055/2186/4366 +f 2055/2186/4366 2056/2185/4365 2058/2187/4367 2057/2188/4368 +s 38 +f 2067/2189/4369 2066/2190/4370 2069/2191/4371 2068/2192/4372 +s 39 +f 2066/2190/4373 2065/2193/4374 2070/2194/4375 2069/2191/4376 +s 40 +f 2085/2195/4377 2084/2196/4378 2090/2197/4379 2089/2198/4380 +s 38 +f 2084/2196/4381 2083/2199/4382 2091/2200/4383 2090/2197/4384 +f 2062/2201/4385 2060/2202/4386 2067/2189/4369 2068/2192/4372 +f 2062/2201/4385 2068/2192/4372 2074/2203/4387 2071/2204/4388 +f 2071/2204/4388 2074/2203/4387 2080/2205/4389 2077/2206/4390 +f 2077/2206/4390 2080/2205/4389 2086/2207/4391 2083/2199/4382 +f 2083/2199/4382 2086/2207/4391 2093/2208/4392 2091/2200/4383 +s 39 +f 2070/2194/4375 2065/2193/4374 2058/2187/4393 2056/2185/4394 +f 2070/2194/4375 2056/2185/4394 2054/2183/4395 2076/2209/4396 +f 2076/2209/4396 2054/2183/4395 2052/2181/4397 2082/2210/4398 +f 2082/2210/4398 2052/2181/4397 2050/2179/4399 2088/2211/4400 +f 2088/2211/4400 2050/2179/4399 2048/2178/4401 2092/2212/4402 +s 40 +f 2057/2188/4403 2059/2213/4404 2064/2214/4405 2055/2186/4406 +f 2055/2186/4406 2064/2214/4405 2073/2215/4407 2053/2184/4408 +f 2053/2184/4408 2073/2215/4407 2079/2216/4409 2051/2182/4410 +f 2051/2182/4410 2079/2216/4409 2085/2195/4377 2049/2180/4411 +f 2049/2180/4411 2085/2195/4377 2089/2198/4380 2047/2177/4412 +f 2059/2213/4404 2061/2217/4413 2063/2218/4414 2064/2214/4405 +s 38 +f 2061/2217/4415 2060/2202/4386 2062/2201/4385 2063/2218/4416 +f 2068/2192/4372 2069/2191/4371 2075/2219/4417 2074/2203/4387 +s 39 +f 2069/2191/4376 2070/2194/4375 2076/2209/4396 2075/2219/4418 +s 40 +f 2064/2214/4405 2063/2218/4414 2072/2220/4419 2073/2215/4407 +s 38 +f 2063/2218/4416 2062/2201/4385 2071/2204/4388 2072/2220/4420 +f 2074/2203/4387 2075/2219/4417 2081/2221/4421 2080/2205/4389 +s 39 +f 2075/2219/4418 2076/2209/4396 2082/2210/4398 2081/2221/4422 +s 40 +f 2073/2215/4407 2072/2220/4419 2078/2222/4423 2079/2216/4409 +s 38 +f 2072/2220/4420 2071/2204/4388 2077/2206/4390 2078/2222/4424 +f 2080/2205/4389 2081/2221/4421 2087/2223/4425 2086/2207/4391 +s 39 +f 2081/2221/4422 2082/2210/4398 2088/2211/4400 2087/2223/4426 +s 40 +f 2079/2216/4409 2078/2222/4423 2084/2196/4378 2085/2195/4377 +s 38 +f 2078/2222/4424 2077/2206/4390 2083/2199/4382 2084/2196/4381 +f 2086/2207/4391 2087/2223/4425 2094/2224/4427 2093/2208/4392 +s 39 +f 2087/2223/4426 2088/2211/4400 2092/2212/4402 2094/2224/4428 +v -145.946974 -68.426746 86.500000 +v -140.715160 -62.711403 86.500000 +v -145.277283 -71.088154 86.500000 +v -140.411060 -66.393829 86.500000 +v -143.863266 -73.368653 86.500000 +v -139.332594 -68.547161 86.500000 +v -141.734829 -75.138235 86.500000 +v -138.140039 -69.776409 86.500000 +v -138.740927 -76.201255 86.500000 +v -136.215507 -71.178699 86.500000 +v -136.032269 -76.101324 86.500000 +v -133.604313 -71.895980 86.500000 +v -136.032269 -76.101324 88.971863 +v -135.425342 -75.050093 90.000000 +v -135.854505 -75.793426 89.698868 +v -138.582271 -75.166562 90.000000 +v -138.694457 -75.898200 89.698868 +v -138.740927 -76.201255 88.971863 +v -133.604313 -71.895980 88.971863 +v -133.759933 -72.165522 89.698868 +v -134.135633 -72.816254 90.000000 +v -136.669073 -72.120332 90.000000 +v -136.348353 -71.454497 89.698868 +v -136.215507 -71.178699 88.971863 +v -141.218302 -74.230609 90.000000 +v -141.583542 -74.872397 89.698868 +v -141.734829 -75.138235 88.971863 +v -138.816666 -70.555511 90.000000 +v -138.338219 -70.004603 89.698868 +v -138.140039 -69.776409 88.971863 +v -143.077503 -72.684870 90.000000 +v -143.633123 -73.168378 89.698868 +v -143.863266 -73.368653 88.971863 +v -140.180899 -69.149302 90.000000 +v -139.581055 -68.723524 89.698868 +v -139.332594 -68.547161 88.971863 +v -144.319237 -70.682228 90.000000 +v -144.996677 -70.969261 89.698868 +v -145.277283 -71.088154 88.971863 +v -141.419355 -66.676528 90.000000 +v -140.706385 -66.476629 89.698868 +v -140.411060 -66.393829 88.971863 +v -145.946974 -68.426746 88.971863 +v -145.703407 -68.160666 89.698868 +v -145.115377 -67.518293 90.000000 +v -140.715160 -62.711403 88.971863 +v -141.661432 -63.745132 90.000000 +v -140.992317 -63.014175 89.698868 +v -113.587315 -76.291794 86.574837 +v -115.291790 -72.946573 86.574837 +v -117.946573 -70.291790 86.574837 +v -121.291794 -68.587316 86.574837 +v -125.000000 -67.999994 86.574837 +v -128.708206 -68.587317 86.574837 +v -132.053426 -70.291792 86.574837 +v -134.708207 -72.946575 86.574837 +v -136.412682 -76.291795 86.574837 +v -137.000003 -80.000000 86.574837 +v -136.412682 -83.708205 86.574837 +v -134.708206 -87.053424 86.574837 +v -132.053424 -89.708205 86.574837 +v -128.708205 -91.412680 86.574837 +v -125.000000 -92.000002 86.574837 +v -121.291796 -91.412680 86.574837 +v -117.946577 -89.708204 86.574837 +v -115.291796 -87.053424 86.574837 +v -113.587321 -83.708204 86.574837 +v -113.000000 -80.000000 86.574837 +v -125.000000 -80.000000 86.574837 +v -125.000000 -80.000000 96.400772 +v -113.587315 -76.291794 92.053146 +v -113.832438 -76.371439 92.987488 +v -115.291790 -72.946573 92.053146 +v -115.500304 -73.098067 92.987488 +v -117.946573 -70.291790 92.053146 +v -118.098067 -70.500304 92.987488 +v -121.291794 -68.587316 92.053146 +v -121.371439 -68.832438 92.987488 +v -125.000000 -67.999994 92.053146 +v -125.000000 -68.257731 92.987488 +v -128.708206 -68.587317 92.053146 +v -128.628561 -68.832439 92.987488 +v -132.053426 -70.291792 92.053146 +v -131.901932 -70.500306 92.987488 +v -134.708207 -72.946575 92.053146 +v -134.499693 -73.098069 92.987488 +v -136.412682 -76.291795 92.053146 +v -136.167559 -76.371440 92.987488 +v -137.000003 -80.000000 92.053146 +v -136.742266 -80.000000 92.987488 +v -136.412682 -83.708205 92.053146 +v -136.167559 -83.628560 92.987488 +v -134.708206 -87.053424 92.053146 +v -134.499692 -86.901930 92.987488 +v -132.053424 -89.708205 92.053146 +v -131.901930 -89.499691 92.987488 +v -128.708205 -91.412680 92.053146 +v -128.628560 -91.167557 92.987488 +v -125.000000 -92.000002 92.053146 +v -125.000000 -91.742265 92.987488 +v -121.291796 -91.412680 92.053146 +v -121.371441 -91.167557 92.987488 +v -117.946577 -89.708204 92.053146 +v -118.098071 -89.499690 92.987488 +v -115.291796 -87.053424 92.053146 +v -115.500310 -86.901930 92.987488 +v -113.587321 -83.708204 92.053146 +v -113.832444 -83.628559 92.987488 +v -113.000000 -80.000000 92.053146 +v -113.257737 -80.000000 92.987488 +v -115.494551 -76.911492 95.920097 +v -116.304054 -77.174515 96.400772 +v -117.602787 -74.625610 96.400772 +v -116.914183 -74.125310 95.920097 +v -119.625611 -72.602787 96.400772 +v -119.125310 -71.914183 95.920097 +v -122.174516 -71.304054 96.400772 +v -121.911493 -70.494551 95.920097 +v -125.000000 -70.856544 96.400772 +v -125.000000 -70.005382 95.920097 +v -127.825484 -71.304054 96.400772 +v -128.088507 -70.494552 95.920097 +v -130.374389 -72.602787 96.400772 +v -130.874689 -71.914184 95.920097 +v -132.397211 -74.625612 96.400772 +v -133.085815 -74.125312 95.920097 +v -133.695944 -77.174517 96.400772 +v -134.505446 -76.911494 95.920097 +v -134.143455 -80.000000 96.400772 +v -134.994617 -80.000000 95.920097 +v -133.695944 -82.825483 96.400772 +v -134.505446 -83.088506 95.920097 +v -132.397211 -85.374387 96.400772 +v -133.085814 -85.874687 95.920097 +v -130.374388 -87.397209 96.400772 +v -130.874688 -88.085813 95.920097 +v -127.825483 -88.695942 96.400772 +v -128.088507 -89.505445 95.920097 +v -125.000001 -89.143453 96.400772 +v -125.000001 -89.994615 95.920097 +v -122.174518 -88.695942 96.400772 +v -121.911494 -89.505445 95.920097 +v -119.625614 -87.397209 96.400772 +v -119.125314 -88.085813 95.920097 +v -117.602792 -85.374386 96.400772 +v -116.914187 -85.874687 95.920097 +v -116.304059 -82.825482 96.400772 +v -115.494556 -83.088505 95.920097 +v -115.856548 -79.999999 96.400772 +v -115.005386 -80.000000 95.920097 +v -96.468287 -70.729485 88.759880 +v -100.729473 -62.366432 88.759880 +v -107.366432 -55.729475 88.759880 +v -115.729486 -51.468290 88.759880 +v -125.000000 -49.999985 88.759880 +v -134.270514 -51.468292 88.759880 +v -142.633564 -55.729481 88.759880 +v -149.270517 -62.366438 88.759880 +v -153.531704 -70.729488 88.759880 +v -155.000008 -80.000000 88.759880 +v -153.531704 -89.270512 88.759880 +v -149.270515 -97.633560 88.759880 +v -142.633560 -104.270514 88.759880 +v -134.270512 -108.531700 88.759880 +v -125.000001 -110.000004 88.759880 +v -115.729491 -108.531698 88.759880 +v -107.366444 -104.270512 88.759880 +v -100.729490 -97.633558 88.759880 +v -96.468304 -89.270510 88.759880 +v -95.000000 -80.000000 88.759880 +v -101.198009 -72.266262 94.455727 +v -104.752811 -65.289558 94.455727 +v -110.289559 -59.752813 94.455727 +v -117.266265 -56.198008 94.455727 +v -125.000001 -54.973106 94.455727 +v -132.733737 -56.198009 94.455727 +v -139.710438 -59.752821 94.455727 +v -145.247177 -65.289564 94.455727 +v -148.801987 -72.266266 94.455727 +v -150.026886 -79.999999 94.455727 +v -148.801987 -87.733732 94.455727 +v -145.247177 -94.710433 94.455727 +v -139.710434 -100.247175 94.455727 +v -132.733734 -103.801981 94.455727 +v -125.000001 -105.026882 94.455727 +v -117.266270 -103.801981 94.455727 +v -110.289570 -100.247173 94.455727 +v -104.752831 -94.710432 94.455727 +v -101.198021 -87.733731 94.455727 +v -99.973122 -79.999999 94.455727 +v -103.101017 -72.884587 94.455727 +v -106.371609 -66.465683 94.455727 +v -111.465685 -61.371609 94.455727 +v -117.884591 -58.101017 94.455727 +v -125.000001 -56.974049 94.455727 +v -132.115412 -58.101017 94.455727 +v -138.534313 -61.371616 94.455727 +v -143.628384 -66.465687 94.455727 +v -146.898977 -72.884590 94.455727 +v -148.025946 -79.999999 94.455727 +v -146.898977 -87.115407 94.455727 +v -143.628382 -93.534309 94.455727 +v -138.534311 -98.628380 94.455727 +v -132.115409 -101.898972 94.455727 +v -125.000002 -103.025940 94.455727 +v -117.884595 -101.898972 94.455727 +v -111.465694 -98.628376 94.455727 +v -106.371624 -93.534307 94.455727 +v -103.101028 -87.115406 94.455727 +v -101.974060 -79.999999 94.455727 +v -103.125687 -72.892603 86.574837 +v -106.392597 -66.480930 86.574837 +v -111.480932 -61.392595 86.574837 +v -117.892607 -58.125689 86.574837 +v -125.000001 -56.999987 86.574837 +v -132.107395 -58.125689 86.574837 +v -138.519067 -61.392601 86.574837 +v -143.607397 -66.480935 86.574837 +v -146.874306 -72.892606 86.574837 +v -148.000006 -79.999999 86.574837 +v -146.874306 -87.107391 86.574837 +v -143.607395 -93.519062 86.574837 +v -138.519064 -98.607391 86.574837 +v -132.107393 -101.874302 86.574837 +v -125.000002 -103.000000 86.574837 +v -117.892611 -101.874300 86.574837 +v -111.480942 -98.607389 86.574837 +v -106.392611 -93.519060 86.574837 +v -103.125700 -87.107389 86.574837 +v -102.000000 -79.999999 86.574837 +v -96.468287 -70.729485 86.574837 +v -100.729473 -62.366432 86.574837 +v -107.366432 -55.729475 86.574837 +v -115.729486 -51.468290 86.574837 +v -125.000000 -49.999985 86.574837 +v -134.270514 -51.468292 86.574837 +v -142.633564 -55.729481 86.574837 +v -149.270517 -62.366438 86.574837 +v -153.531704 -70.729488 86.574837 +v -155.000008 -80.000000 86.574837 +v -153.531704 -89.270512 86.574837 +v -149.270515 -97.633560 86.574837 +v -142.633560 -104.270514 86.574837 +v -134.270512 -108.531700 86.574837 +v -125.000001 -110.000004 86.574837 +v -115.729491 -108.531698 86.574837 +v -107.366444 -104.270512 86.574837 +v -100.729490 -97.633558 86.574837 +v -96.468304 -89.270510 86.574837 +v -95.000000 -80.000000 86.574837 +v -124.549244 -103.927238 86.500000 +v -132.114784 -102.254026 86.500000 +v -122.579243 -102.016565 86.500000 +v -129.077759 -100.149456 86.500000 +v -121.311281 -99.651741 86.500000 +v -127.752152 -98.138809 86.500000 +v -120.842998 -96.923670 86.500000 +v -127.283869 -96.491404 86.500000 +v -121.419347 -93.799364 86.500000 +v -127.031717 -94.123564 86.500000 +v -122.860218 -91.503564 86.500000 +v -127.716131 -91.503564 86.500000 +v -122.860218 -91.503564 88.971863 +v -124.074075 -91.503564 90.000000 +v -123.215748 -91.503564 89.698868 +v -122.394744 -94.179311 90.000000 +v -121.705034 -93.910648 89.698868 +v -121.419347 -93.799364 88.971863 +v -127.716131 -91.503564 88.971863 +v -127.404891 -91.503564 89.698868 +v -126.653490 -91.503564 90.000000 +v -125.989456 -94.045548 90.000000 +v -126.726446 -94.100714 89.698868 +v -127.031717 -94.123564 88.971863 +v -121.887288 -96.930157 90.000000 +v -121.148863 -96.925570 89.698868 +v -120.842998 -96.923670 88.971863 +v -126.270833 -96.687828 90.000000 +v -126.987158 -96.548935 89.698868 +v -127.283869 -96.491404 88.971863 +v -122.296337 -99.313143 90.000000 +v -121.599797 -99.552568 89.698868 +v -121.311281 -99.651741 88.971863 +v -126.806531 -98.572393 90.000000 +v -127.475186 -98.265802 89.698868 +v -127.752152 -98.138809 88.971863 +v -123.409809 -101.389835 90.000000 +v -122.822510 -101.833000 89.698868 +v -122.579243 -102.016565 88.971863 +v -128.328787 -100.881315 90.000000 +v -128.858391 -100.363813 89.698868 +v -129.077759 -100.149456 88.971863 +v -124.549244 -103.927238 88.971863 +v -124.901461 -103.849342 89.698868 +v -125.751786 -103.661282 90.000000 +v -132.114784 -102.254026 88.971863 +v -130.746412 -102.556658 90.000000 +v -131.713997 -102.342665 89.698868 +v -104.503782 -67.646015 86.500000 +v -102.170055 -75.034570 86.500000 +v -107.143475 -66.895281 86.500000 +v -105.511181 -73.456715 86.500000 +v -109.825452 -66.979606 86.500000 +v -107.915255 -73.314029 86.500000 +v -112.422174 -67.938095 86.500000 +v -109.576092 -73.732187 86.500000 +v -114.839727 -69.999381 86.500000 +v -111.752776 -74.697737 86.500000 +v -116.107512 -72.395113 86.500000 +v -113.679556 -76.600456 86.500000 +v -116.107512 -72.395113 88.971863 +v -115.500585 -73.446343 90.000000 +v -115.929748 -72.703011 89.698868 +v -114.022985 -70.654127 90.000000 +v -114.600509 -70.191152 89.698868 +v -114.839727 -69.999381 88.971863 +v -113.679556 -76.600456 88.971863 +v -113.835176 -76.330914 89.698868 +v -114.210876 -75.680182 90.000000 +v -112.341471 -73.834120 90.000000 +v -111.925200 -74.444789 89.698868 +v -111.752776 -74.697737 88.971863 +v -111.894411 -68.839234 90.000000 +v -112.267595 -68.202033 89.698868 +v -112.422174 -67.938095 88.971863 +v -109.912500 -72.756660 90.000000 +v -109.674623 -73.446462 89.698868 +v -109.576092 -73.732187 88.971863 +v -109.626160 -68.001987 90.000000 +v -109.767080 -67.279054 89.698868 +v -109.825452 -66.979606 88.971863 +v -108.012571 -72.278305 90.000000 +v -107.943758 -73.010673 89.698868 +v -107.915255 -73.314029 88.971863 +v -107.270954 -67.927937 90.000000 +v -107.180813 -67.197739 89.698868 +v -107.143475 -66.895281 88.971863 +v -105.251856 -72.442157 90.000000 +v -105.435225 -73.159557 89.698868 +v -105.511181 -73.456715 88.971863 +v -104.503782 -67.646015 88.971863 +v -104.395134 -67.989991 89.698868 +v -104.132837 -68.820425 90.000000 +v -102.170055 -75.034570 88.971863 +v -102.592157 -73.698210 90.000000 +v -102.293686 -74.643159 89.698868 +v -145.496218 -92.353985 86.500000 +v -147.829945 -84.965430 86.500000 +v -142.856525 -93.104719 86.500000 +v -144.488819 -86.543285 86.500000 +v -140.174548 -93.020394 86.500000 +v -142.084745 -86.685971 86.500000 +v -137.577826 -92.061905 86.500000 +v -140.423908 -86.267813 86.500000 +v -135.160273 -90.000619 86.500000 +v -138.247224 -85.302263 86.500000 +v -133.892488 -87.604887 86.500000 +v -136.320444 -83.399544 86.500000 +v -133.892488 -87.604887 88.971863 +v -134.499415 -86.553657 90.000000 +v -134.070252 -87.296989 89.698868 +v -135.977015 -89.345873 90.000000 +v -135.399491 -89.808848 89.698868 +v -135.160273 -90.000619 88.971863 +v -136.320444 -83.399544 88.971863 +v -136.164824 -83.669086 89.698868 +v -135.789124 -84.319818 90.000000 +v -137.658529 -86.165880 90.000000 +v -138.074800 -85.555211 89.698868 +v -138.247224 -85.302263 88.971863 +v -138.105589 -91.160766 90.000000 +v -137.732405 -91.797967 89.698868 +v -137.577826 -92.061905 88.971863 +v -140.087500 -87.243340 90.000000 +v -140.325377 -86.553538 89.698868 +v -140.423908 -86.267813 88.971863 +v -140.373840 -91.998013 90.000000 +v -140.232920 -92.720946 89.698868 +v -140.174548 -93.020394 88.971863 +v -141.987429 -87.721695 90.000000 +v -142.056242 -86.989327 89.698868 +v -142.084745 -86.685971 88.971863 +v -142.729046 -92.072063 90.000000 +v -142.819187 -92.802261 89.698868 +v -142.856525 -93.104719 88.971863 +v -144.748144 -87.557843 90.000000 +v -144.564775 -86.840443 89.698868 +v -144.488819 -86.543285 88.971863 +v -145.496218 -92.353985 88.971863 +v -145.604866 -92.010009 89.698868 +v -145.867163 -91.179575 90.000000 +v -147.829945 -84.965430 88.971863 +v -147.407843 -86.301790 90.000000 +v -147.706314 -85.356841 89.698868 +v -125.450756 -56.072762 86.500000 +v -117.885216 -57.745974 86.500000 +v -127.420757 -57.983435 86.500000 +v -120.922241 -59.850544 86.500000 +v -128.688719 -60.348259 86.500000 +v -122.247848 -61.861191 86.500000 +v -129.157002 -63.076330 86.500000 +v -122.716131 -63.508596 86.500000 +v -128.580653 -66.200636 86.500000 +v -122.968283 -65.876436 86.500000 +v -127.139782 -68.496436 86.500000 +v -122.283869 -68.496436 86.500000 +v -127.139782 -68.496436 88.971863 +v -125.925925 -68.496436 90.000000 +v -126.784252 -68.496436 89.698868 +v -127.605256 -65.820689 90.000000 +v -128.294966 -66.089352 89.698868 +v -128.580653 -66.200636 88.971863 +v -122.283869 -68.496436 88.971863 +v -122.595109 -68.496436 89.698868 +v -123.346510 -68.496436 90.000000 +v -124.010544 -65.954452 90.000000 +v -123.273554 -65.899286 89.698868 +v -122.968283 -65.876436 88.971863 +v -128.112712 -63.069843 90.000000 +v -128.851137 -63.074430 89.698868 +v -129.157002 -63.076330 88.971863 +v -123.729167 -63.312172 90.000000 +v -123.012842 -63.451065 89.698868 +v -122.716131 -63.508596 88.971863 +v -127.703663 -60.686857 90.000000 +v -128.400203 -60.447432 89.698868 +v -128.688719 -60.348259 88.971863 +v -123.193469 -61.427607 90.000000 +v -122.524814 -61.734198 89.698868 +v -122.247848 -61.861191 88.971863 +v -126.590191 -58.610165 90.000000 +v -127.177490 -58.167000 89.698868 +v -127.420757 -57.983435 88.971863 +v -121.671213 -59.118685 90.000000 +v -121.141609 -59.636187 89.698868 +v -120.922241 -59.850544 88.971863 +v -125.450756 -56.072762 88.971863 +v -125.098539 -56.150658 89.698868 +v -124.248214 -56.338718 90.000000 +v -117.885216 -57.745974 88.971863 +v -119.253588 -57.443342 90.000000 +v -118.286003 -57.657335 89.698868 +v -104.053026 -91.573254 86.500000 +v -109.284840 -97.288597 86.500000 +v -104.722717 -88.911846 86.500000 +v -109.588940 -93.606171 86.500000 +v -106.136734 -86.631347 86.500000 +v -110.667406 -91.452839 86.500000 +v -108.265171 -84.861765 86.500000 +v -111.859961 -90.223591 86.500000 +v -111.259073 -83.798745 86.500000 +v -113.784493 -88.821301 86.500000 +v -113.967731 -83.898676 86.500000 +v -116.395687 -88.104020 86.500000 +v -113.967731 -83.898676 88.971863 +v -114.574658 -84.949907 90.000000 +v -114.145495 -84.206574 89.698868 +v -111.417729 -84.833438 90.000000 +v -111.305543 -84.101800 89.698868 +v -111.259073 -83.798745 88.971863 +v -116.395687 -88.104020 88.971863 +v -116.240067 -87.834478 89.698868 +v -115.864367 -87.183746 90.000000 +v -113.330927 -87.879668 90.000000 +v -113.651647 -88.545503 89.698868 +v -113.784493 -88.821301 88.971863 +v -108.781698 -85.769391 90.000000 +v -108.416458 -85.127603 89.698868 +v -108.265171 -84.861765 88.971863 +v -111.183334 -89.444489 90.000000 +v -111.661781 -89.995397 89.698868 +v -111.859961 -90.223591 88.971863 +v -106.922497 -87.315130 90.000000 +v -106.366877 -86.831622 89.698868 +v -106.136734 -86.631347 88.971863 +v -109.819101 -90.850698 90.000000 +v -110.418945 -91.276476 89.698868 +v -110.667406 -91.452839 88.971863 +v -105.680763 -89.317772 90.000000 +v -105.003323 -89.030739 89.698868 +v -104.722717 -88.911846 88.971863 +v -108.580645 -93.323472 90.000000 +v -109.293615 -93.523371 89.698868 +v -109.588940 -93.606171 88.971863 +v -104.053026 -91.573254 88.971863 +v -104.296593 -91.839334 89.698868 +v -104.884623 -92.481707 90.000000 +v -109.284840 -97.288597 88.971863 +v -108.338568 -96.254868 90.000000 +v -109.007683 -96.985825 89.698868 +vt 0.016937 0.027515 +vt 0.019416 0.030224 +vt 0.019560 0.028478 +vt 0.017254 0.026254 +vt 0.020071 0.027458 +vt 0.017924 0.025173 +vt 0.020636 0.026875 +vt 0.018933 0.024334 +vt 0.021548 0.026211 +vt 0.020352 0.023831 +vt 0.022786 0.025871 +vt 0.021635 0.023878 +vt 0.022534 0.025435 +vt 0.022712 0.025743 +vt 0.021486 0.026080 +vt 0.021334 0.025765 +vt 0.022786 0.025871 +vt 0.021548 0.026211 +vt 0.017254 0.026254 +vt 0.017387 0.026310 +vt 0.017052 0.027641 +vt 0.016937 0.027515 +vt 0.017708 0.026446 +vt 0.017331 0.027945 +vt 0.020427 0.024321 +vt 0.021923 0.024376 +vt 0.020316 0.026506 +vt 0.019178 0.024764 +vt 0.019669 0.027173 +vt 0.018297 0.025497 +vt 0.019082 0.028344 +vt 0.018968 0.029734 +vt 0.020636 0.026875 +vt 0.020071 0.027458 +vt 0.019560 0.028478 +vt 0.019416 0.030224 +vt 0.021635 0.023878 +vt 0.020352 0.023831 +vt 0.018933 0.024334 +vt 0.017924 0.025173 +vt 0.021720 0.024024 +vt 0.020374 0.023974 +vt 0.020542 0.026767 +vt 0.019004 0.024460 +vt 0.019953 0.027374 +vt 0.018033 0.025268 +vt 0.019420 0.028439 +vt 0.019285 0.030080 +vt 0.031464 0.025373 +vt 0.032272 0.023788 +vt 0.026864 0.022030 +vt 0.030206 0.026631 +vt 0.028621 0.027439 +vt 0.026864 0.027717 +vt 0.025106 0.027439 +vt 0.023521 0.026631 +vt 0.022263 0.025373 +vt 0.021455 0.023788 +vt 0.021177 0.022030 +vt 0.021455 0.020273 +vt 0.022263 0.018688 +vt 0.023521 0.017430 +vt 0.025106 0.016622 +vt 0.026864 0.016344 +vt 0.028621 0.016622 +vt 0.030206 0.017430 +vt 0.031464 0.018688 +vt 0.032272 0.020273 +vt 0.032550 0.022030 +vt 0.032272 0.023788 +vt 0.032156 0.023750 +vt 0.032428 0.022030 +vt 0.032550 0.022030 +vt 0.031464 0.025373 +vt 0.031366 0.025301 +vt 0.030206 0.026631 +vt 0.030134 0.026532 +vt 0.028621 0.027439 +vt 0.028583 0.027323 +vt 0.026864 0.027717 +vt 0.026864 0.027595 +vt 0.025106 0.027439 +vt 0.025144 0.027323 +vt 0.023521 0.026631 +vt 0.023593 0.026532 +vt 0.022263 0.025373 +vt 0.022362 0.025301 +vt 0.021455 0.023788 +vt 0.021571 0.023750 +vt 0.021177 0.022030 +vt 0.021299 0.022030 +vt 0.021455 0.020273 +vt 0.021571 0.020311 +vt 0.022263 0.018688 +vt 0.022362 0.018760 +vt 0.023521 0.017430 +vt 0.023593 0.017528 +vt 0.025106 0.016622 +vt 0.025144 0.016738 +vt 0.026864 0.016344 +vt 0.026864 0.016466 +vt 0.028621 0.016622 +vt 0.028583 0.016738 +vt 0.030206 0.017430 +vt 0.030134 0.017528 +vt 0.031464 0.018688 +vt 0.031366 0.018760 +vt 0.032272 0.020273 +vt 0.032156 0.020311 +vt 0.031368 0.023494 +vt 0.030985 0.023369 +vt 0.031197 0.022030 +vt 0.031600 0.022030 +vt 0.030695 0.024814 +vt 0.030369 0.024577 +vt 0.029648 0.025862 +vt 0.029410 0.025536 +vt 0.028327 0.026535 +vt 0.028203 0.026151 +vt 0.026864 0.026767 +vt 0.026864 0.026363 +vt 0.025400 0.026535 +vt 0.025525 0.026151 +vt 0.024079 0.025862 +vt 0.024317 0.025536 +vt 0.023032 0.024814 +vt 0.023358 0.024577 +vt 0.022359 0.023494 +vt 0.022742 0.023369 +vt 0.022127 0.022030 +vt 0.022530 0.022030 +vt 0.022359 0.020567 +vt 0.022742 0.020691 +vt 0.023032 0.019246 +vt 0.023358 0.019483 +vt 0.024079 0.018198 +vt 0.024317 0.018525 +vt 0.025400 0.017526 +vt 0.025525 0.017909 +vt 0.026864 0.017294 +vt 0.026864 0.017697 +vt 0.028327 0.017526 +vt 0.028203 0.017909 +vt 0.029648 0.018198 +vt 0.029410 0.018525 +vt 0.030695 0.019246 +vt 0.030369 0.019483 +vt 0.031368 0.020567 +vt 0.030985 0.020691 +vt 0.026864 0.022030 +vt 0.040385 0.026424 +vt 0.038365 0.030387 +vt 0.036459 0.029002 +vt 0.038143 0.025696 +vt 0.035220 0.033532 +vt 0.033835 0.031626 +vt 0.031257 0.035552 +vt 0.030529 0.033310 +vt 0.026864 0.036247 +vt 0.026864 0.033891 +vt 0.022470 0.035552 +vt 0.023198 0.033310 +vt 0.018507 0.033532 +vt 0.019892 0.031626 +vt 0.015362 0.030387 +vt 0.017268 0.029002 +vt 0.013342 0.026424 +vt 0.015584 0.025696 +vt 0.012646 0.022030 +vt 0.015003 0.022030 +vt 0.013342 0.017637 +vt 0.015584 0.018365 +vt 0.015362 0.013674 +vt 0.017268 0.015059 +vt 0.018507 0.010529 +vt 0.019892 0.012435 +vt 0.022470 0.008509 +vt 0.023198 0.010751 +vt 0.026864 0.007813 +vt 0.026864 0.010170 +vt 0.031257 0.008509 +vt 0.030529 0.010751 +vt 0.035220 0.010529 +vt 0.033835 0.012435 +vt 0.038365 0.013674 +vt 0.036459 0.015059 +vt 0.040385 0.017637 +vt 0.038143 0.018365 +vt 0.041081 0.022030 +vt 0.038724 0.022030 +vt 0.035692 0.028444 +vt 0.037242 0.025402 +vt 0.033278 0.030859 +vt 0.030236 0.032408 +vt 0.026864 0.032942 +vt 0.023491 0.032408 +vt 0.020450 0.030859 +vt 0.018035 0.028444 +vt 0.016485 0.025402 +vt 0.015951 0.022030 +vt 0.016485 0.018658 +vt 0.018035 0.015616 +vt 0.020450 0.013202 +vt 0.023492 0.011652 +vt 0.026864 0.011118 +vt 0.030236 0.011652 +vt 0.033278 0.013202 +vt 0.035692 0.015616 +vt 0.037242 0.018658 +vt 0.037776 0.022030 +vt 0.038365 0.030387 +vt 0.040385 0.026424 +vt 0.037230 0.025399 +vt 0.035682 0.028437 +vt 0.035220 0.033532 +vt 0.033270 0.030849 +vt 0.031257 0.035552 +vt 0.030232 0.032397 +vt 0.026864 0.036247 +vt 0.026864 0.032930 +vt 0.022470 0.035552 +vt 0.023495 0.032397 +vt 0.018507 0.033532 +vt 0.020457 0.030849 +vt 0.015362 0.030387 +vt 0.018045 0.028437 +vt 0.013342 0.026424 +vt 0.016497 0.025399 +vt 0.012646 0.022030 +vt 0.015964 0.022030 +vt 0.013342 0.017637 +vt 0.016497 0.018662 +vt 0.015362 0.013674 +vt 0.018045 0.015624 +vt 0.018507 0.010529 +vt 0.020457 0.013212 +vt 0.022470 0.008509 +vt 0.023495 0.011664 +vt 0.026864 0.007813 +vt 0.026864 0.011131 +vt 0.031257 0.008509 +vt 0.030232 0.011664 +vt 0.035220 0.010529 +vt 0.033270 0.013212 +vt 0.038365 0.013674 +vt 0.035682 0.015624 +vt 0.040385 0.017637 +vt 0.037230 0.018662 +vt 0.041081 0.022030 +vt 0.037763 0.022030 +vt 0.027077 0.010691 +vt 0.023492 0.011484 +vt 0.024931 0.012481 +vt 0.028011 0.011597 +vt 0.025559 0.013434 +vt 0.028612 0.012717 +vt 0.025781 0.014215 +vt 0.028834 0.014010 +vt 0.025901 0.015337 +vt 0.028560 0.015491 +vt 0.025576 0.016579 +vt 0.027878 0.016579 +vt 0.026080 0.016579 +vt 0.025724 0.016579 +vt 0.026045 0.015348 +vt 0.026395 0.015374 +vt 0.025576 0.016579 +vt 0.025901 0.015337 +vt 0.028011 0.011597 +vt 0.027895 0.011684 +vt 0.026910 0.010728 +vt 0.027077 0.010691 +vt 0.027617 0.011894 +vt 0.026507 0.010817 +vt 0.028098 0.015311 +vt 0.027302 0.016579 +vt 0.026261 0.014122 +vt 0.028339 0.014007 +vt 0.026007 0.013229 +vt 0.028145 0.012878 +vt 0.025286 0.012135 +vt 0.024140 0.011341 +vt 0.025781 0.014215 +vt 0.025559 0.013434 +vt 0.024931 0.012481 +vt 0.023492 0.011484 +vt 0.027878 0.016579 +vt 0.028560 0.015491 +vt 0.028834 0.014010 +vt 0.028612 0.012717 +vt 0.027709 0.016579 +vt 0.028425 0.015438 +vt 0.025922 0.014188 +vt 0.028689 0.014009 +vt 0.025691 0.013374 +vt 0.028475 0.012764 +vt 0.025035 0.012380 +vt 0.023682 0.011442 +vt 0.036577 0.027885 +vt 0.037683 0.024383 +vt 0.036099 0.025131 +vt 0.035326 0.028241 +vt 0.034960 0.025199 +vt 0.034055 0.028201 +vt 0.034173 0.025001 +vt 0.032824 0.027746 +vt 0.033142 0.024543 +vt 0.031679 0.026770 +vt 0.032228 0.023641 +vt 0.031078 0.025634 +vt 0.031977 0.024078 +vt 0.032155 0.023769 +vt 0.033060 0.024663 +vt 0.032863 0.024952 +vt 0.032228 0.023641 +vt 0.033142 0.024543 +vt 0.035326 0.028241 +vt 0.035308 0.028097 +vt 0.036628 0.027722 +vt 0.036577 0.027885 +vt 0.035265 0.027751 +vt 0.036753 0.027329 +vt 0.032066 0.026459 +vt 0.031365 0.025136 +vt 0.034014 0.025463 +vt 0.033074 0.027320 +vt 0.034914 0.025690 +vt 0.034149 0.027716 +vt 0.036222 0.025612 +vt 0.037483 0.025017 +vt 0.034173 0.025001 +vt 0.034960 0.025199 +vt 0.036099 0.025131 +vt 0.037683 0.024383 +vt 0.031078 0.025634 +vt 0.031679 0.026770 +vt 0.032824 0.027746 +vt 0.034055 0.028201 +vt 0.031162 0.025489 +vt 0.031792 0.026679 +vt 0.034126 0.025136 +vt 0.032898 0.027622 +vt 0.034947 0.025343 +vt 0.034083 0.028059 +vt 0.036135 0.025272 +vt 0.037624 0.024569 +vt 0.017150 0.016176 +vt 0.016044 0.019677 +vt 0.017628 0.018930 +vt 0.018401 0.015820 +vt 0.018767 0.018862 +vt 0.019672 0.015860 +vt 0.019554 0.019060 +vt 0.020903 0.016314 +vt 0.020586 0.019518 +vt 0.022049 0.017291 +vt 0.021499 0.020419 +vt 0.022649 0.018426 +vt 0.021751 0.019983 +vt 0.021573 0.020292 +vt 0.020667 0.019398 +vt 0.020865 0.019108 +vt 0.021499 0.020419 +vt 0.020586 0.019518 +vt 0.018401 0.015820 +vt 0.018419 0.015963 +vt 0.017099 0.016339 +vt 0.017150 0.016176 +vt 0.018462 0.016309 +vt 0.016974 0.016732 +vt 0.021661 0.017601 +vt 0.022362 0.018925 +vt 0.019713 0.018598 +vt 0.020653 0.016741 +vt 0.018813 0.018371 +vt 0.019578 0.016345 +vt 0.017505 0.018449 +vt 0.016244 0.019044 +vt 0.019554 0.019060 +vt 0.018767 0.018862 +vt 0.017628 0.018930 +vt 0.016044 0.019677 +vt 0.022649 0.018426 +vt 0.022049 0.017291 +vt 0.020903 0.016314 +vt 0.019672 0.015860 +vt 0.022565 0.018572 +vt 0.021935 0.017382 +vt 0.019601 0.018925 +vt 0.020830 0.016439 +vt 0.018780 0.018718 +vt 0.019645 0.016002 +vt 0.017592 0.018789 +vt 0.016103 0.019492 +vt 0.026650 0.033370 +vt 0.030235 0.032577 +vt 0.028796 0.031579 +vt 0.025716 0.032464 +vt 0.028168 0.030626 +vt 0.025115 0.031343 +vt 0.027946 0.029846 +vt 0.024894 0.030051 +vt 0.027826 0.028724 +vt 0.025167 0.028570 +vt 0.028151 0.027482 +vt 0.025849 0.027482 +vt 0.027647 0.027482 +vt 0.028003 0.027482 +vt 0.027682 0.028713 +vt 0.027332 0.028687 +vt 0.028151 0.027482 +vt 0.027826 0.028724 +vt 0.025716 0.032464 +vt 0.025832 0.032377 +vt 0.026817 0.033333 +vt 0.026650 0.033370 +vt 0.026110 0.032167 +vt 0.027220 0.033243 +vt 0.025629 0.028750 +vt 0.026425 0.027482 +vt 0.027466 0.029939 +vt 0.025388 0.030054 +vt 0.027720 0.030832 +vt 0.025582 0.031183 +vt 0.028441 0.031926 +vt 0.029587 0.032720 +vt 0.027946 0.029846 +vt 0.028168 0.030626 +vt 0.028796 0.031579 +vt 0.030235 0.032577 +vt 0.025849 0.027482 +vt 0.025167 0.028570 +vt 0.024894 0.030051 +vt 0.025115 0.031343 +vt 0.026018 0.027482 +vt 0.025302 0.028623 +vt 0.027805 0.029873 +vt 0.025038 0.030051 +vt 0.028037 0.030687 +vt 0.025252 0.031296 +vt 0.028692 0.031681 +vt 0.030045 0.032619 +vt 0.036790 0.016546 +vt 0.034311 0.013837 +vt 0.034167 0.015582 +vt 0.036473 0.017807 +vt 0.033656 0.016603 +vt 0.035803 0.018888 +vt 0.033091 0.017185 +vt 0.034794 0.019726 +vt 0.032179 0.017850 +vt 0.033376 0.020230 +vt 0.030941 0.018190 +vt 0.032092 0.020183 +vt 0.031193 0.018626 +vt 0.031015 0.018318 +vt 0.032242 0.017981 +vt 0.032394 0.018296 +vt 0.030941 0.018190 +vt 0.032179 0.017850 +vt 0.036473 0.017807 +vt 0.036340 0.017751 +vt 0.036675 0.016420 +vt 0.036790 0.016546 +vt 0.036019 0.017615 +vt 0.036396 0.016115 +vt 0.033300 0.019740 +vt 0.031804 0.019685 +vt 0.033411 0.017555 +vt 0.034550 0.019296 +vt 0.034058 0.016888 +vt 0.035431 0.018564 +vt 0.034645 0.015716 +vt 0.034760 0.014327 +vt 0.033091 0.017185 +vt 0.033656 0.016603 +vt 0.034167 0.015582 +vt 0.034311 0.013837 +vt 0.032092 0.020183 +vt 0.033376 0.020230 +vt 0.034794 0.019726 +vt 0.035803 0.018888 +vt 0.032008 0.020037 +vt 0.033354 0.020087 +vt 0.033185 0.017294 +vt 0.034723 0.019600 +vt 0.033774 0.016686 +vt 0.035694 0.018793 +vt 0.034307 0.015622 +vt 0.034442 0.013981 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn 0.027246 0.099185 0.994696 +vn 0.101367 0.369011 0.923881 +vn 0.162606 0.340506 0.926075 +vn 0.024686 0.051696 0.998358 +vn 0.244718 0.890880 0.382682 +vn 0.263836 0.960472 0.088798 +vn 0.421697 0.901329 0.098884 +vn 0.391797 0.834209 0.388059 +vn -0.917798 -0.386139 0.092433 +vn -0.851056 -0.355317 0.386592 +vn -0.895950 -0.225449 0.382682 +vn -0.964230 -0.242630 0.106733 +vn -0.351280 -0.141841 0.925464 +vn -0.067114 -0.027100 0.997377 +vn -0.033461 -0.008419 0.999405 +vn -0.371111 -0.093383 0.923881 +vn -0.013205 -0.087412 0.996085 +vn 0.001804 -0.048902 0.998802 +vn 0.033181 0.039248 0.998679 +vn -0.038350 -0.069420 0.996850 +vn 0.038773 0.026020 0.998909 +vn -0.054266 -0.047440 0.997399 +vn 0.050026 0.013017 0.998663 +vn 0.145150 0.011987 0.989337 +vn 0.264882 0.964281 0.000000 +vn 0.423361 0.905961 0.000000 +vn 0.645085 0.764111 0.000000 +vn 0.642080 0.760489 0.096904 +vn 0.830237 0.557411 0.000000 +vn 0.826159 0.554659 0.099067 +vn 0.973065 0.230531 0.000000 +vn 0.968118 0.230508 0.098051 +vn 0.996608 0.082301 0.000000 +vn 0.993768 0.082066 0.075436 +vn 0.036868 -0.999320 0.000000 +vn 0.036661 -0.993693 0.105978 +vn -0.164969 -0.981991 0.092084 +vn -0.166529 -0.986037 0.000000 +vn -0.481914 -0.871511 0.090703 +vn -0.483926 -0.875109 0.000000 +vn -0.749605 -0.655636 0.090740 +vn -0.752703 -0.658361 0.000000 +vn -0.921442 -0.388517 0.000000 +vn -0.969769 -0.244024 0.000000 +vn 0.034062 -0.923251 0.382684 +vn -0.149845 -0.909156 0.388563 +vn 0.014109 -0.382420 0.923881 +vn -0.056284 -0.372613 0.926278 +vn 0.246316 0.291349 0.924361 +vn 0.595792 0.705475 0.383845 +vn -0.445985 -0.806676 0.387778 +vn -0.182604 -0.330547 0.925956 +vn 0.314673 0.211180 0.925410 +vn 0.765772 0.514075 0.386419 +vn -0.694100 -0.607036 0.386954 +vn -0.284919 -0.249074 0.925626 +vn 0.364635 0.094880 0.926304 +vn 0.895601 0.216729 0.388494 +vn 0.381386 0.031495 0.923879 +vn 0.920744 0.076037 0.382686 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.950337 0.308782 0.038887 +vn 0.847784 0.275461 0.453193 +vn 0.891413 -0.000001 0.453192 +vn 0.999244 -0.000001 0.038887 +vn 0.808405 0.587341 0.038887 +vn 0.721168 0.523959 0.453193 +vn 0.587341 0.808405 0.038887 +vn 0.523960 0.721168 0.453193 +vn 0.308783 0.950337 0.038887 +vn 0.275461 0.847784 0.453193 +vn 0.000000 0.999244 0.038887 +vn 0.000000 0.891413 0.453193 +vn -0.308783 0.950337 0.038887 +vn -0.275460 0.847784 0.453193 +vn -0.587340 0.808405 0.038887 +vn -0.523958 0.721168 0.453193 +vn -0.808405 0.587341 0.038887 +vn -0.721167 0.523960 0.453193 +vn -0.950337 0.308783 0.038887 +vn -0.847784 0.275462 0.453193 +vn -0.999244 0.000000 0.038887 +vn -0.891413 0.000000 0.453193 +vn -0.950337 -0.308784 0.038887 +vn -0.847783 -0.275462 0.453193 +vn -0.808405 -0.587341 0.038887 +vn -0.721167 -0.523960 0.453193 +vn -0.587341 -0.808405 0.038887 +vn -0.523959 -0.721168 0.453193 +vn -0.308784 -0.950337 0.038887 +vn -0.275462 -0.847784 0.453193 +vn 0.000000 -0.999244 0.038887 +vn -0.000000 -0.891412 0.453193 +vn 0.308783 -0.950337 0.038887 +vn 0.275460 -0.847784 0.453193 +vn 0.587340 -0.808405 0.038887 +vn 0.523958 -0.721168 0.453193 +vn 0.808405 -0.587341 0.038887 +vn 0.721167 -0.523960 0.453193 +vn 0.950337 -0.308783 0.038887 +vn 0.847784 -0.275462 0.453193 +vn 0.769325 0.249968 0.587925 +vn 0.101726 0.033053 0.994263 +vn 0.106960 -0.000000 0.994263 +vn 0.808916 -0.000001 0.587925 +vn 0.654426 0.475469 0.587925 +vn 0.086534 0.062871 0.994263 +vn 0.475468 0.654427 0.587925 +vn 0.062872 0.086534 0.994263 +vn 0.249968 0.769325 0.587925 +vn 0.033055 0.101727 0.994263 +vn -0.000000 0.808915 0.587925 +vn -0.000000 0.106962 0.994263 +vn -0.249968 0.769325 0.587925 +vn -0.033057 0.101727 0.994263 +vn -0.475468 0.654426 0.587925 +vn -0.062873 0.086534 0.994263 +vn -0.654426 0.475468 0.587925 +vn -0.086534 0.062871 0.994263 +vn -0.769324 0.249969 0.587925 +vn -0.101728 0.033053 0.994263 +vn -0.808915 0.000000 0.587925 +vn -0.106962 0.000000 0.994263 +vn -0.769324 -0.249969 0.587925 +vn -0.101729 -0.033053 0.994263 +vn -0.654426 -0.475469 0.587925 +vn -0.086535 -0.062871 0.994263 +vn -0.475468 -0.654427 0.587925 +vn -0.062870 -0.086534 0.994263 +vn -0.249968 -0.769324 0.587925 +vn -0.033053 -0.101727 0.994263 +vn -0.000001 -0.808915 0.587925 +vn 0.000000 -0.106962 0.994263 +vn 0.249968 -0.769325 0.587925 +vn 0.033053 -0.101727 0.994263 +vn 0.475468 -0.654427 0.587925 +vn 0.062871 -0.086534 0.994263 +vn 0.654426 -0.475469 0.587925 +vn 0.086534 -0.062871 0.994263 +vn 0.769324 -0.249969 0.587925 +vn 0.101727 -0.033053 0.994263 +vn 0.951057 0.309016 0.000000 +vn 0.809017 0.587786 0.000000 +vn 0.587785 0.809017 0.000000 +vn 0.309017 0.951057 0.000000 +vn -0.000000 1.000000 0.000000 +vn -0.309017 0.951057 0.000000 +vn -0.587785 0.809017 0.000000 +vn -0.809017 0.587785 0.000000 +vn -0.951057 0.309017 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.951057 -0.309017 0.000000 +vn -0.809017 -0.587785 0.000000 +vn -0.587785 -0.809017 0.000000 +vn -0.309017 -0.951057 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.309017 -0.951057 0.000000 +vn 0.587785 -0.809017 0.000000 +vn 0.809017 -0.587785 0.000000 +vn 0.951056 -0.309017 0.000000 +vn 1.000000 -0.000001 0.000000 +vn -0.000000 0.000000 1.000000 +vn 0.814402 0.264614 0.516458 +vn 0.692771 0.503328 0.516458 +vn 0.609417 0.442767 0.657699 +vn 0.716412 0.232776 0.657700 +vn 0.503328 0.692772 0.516458 +vn 0.442768 0.609417 0.657699 +vn 0.264615 0.814402 0.516458 +vn 0.232777 0.716412 0.657699 +vn 0.000000 0.856313 0.516458 +vn 0.000000 0.753281 0.657699 +vn -0.264615 0.814402 0.516458 +vn -0.232776 0.716412 0.657699 +vn -0.503328 0.692771 0.516458 +vn -0.442767 0.609417 0.657699 +vn -0.692771 0.503328 0.516458 +vn -0.609417 0.442767 0.657699 +vn -0.814402 0.264615 0.516458 +vn -0.716412 0.232777 0.657700 +vn -0.856312 -0.000000 0.516458 +vn -0.753280 0.000000 0.657700 +vn -0.814402 -0.264615 0.516458 +vn -0.716412 -0.232776 0.657699 +vn -0.692771 -0.503328 0.516458 +vn -0.609417 -0.442767 0.657699 +vn -0.503328 -0.692771 0.516458 +vn -0.442767 -0.609417 0.657699 +vn -0.264615 -0.814402 0.516458 +vn -0.232777 -0.716412 0.657699 +vn -0.000000 -0.856313 0.516458 +vn -0.000000 -0.753281 0.657699 +vn 0.264615 -0.814402 0.516458 +vn 0.232776 -0.716412 0.657699 +vn 0.503328 -0.692771 0.516458 +vn 0.442767 -0.609417 0.657699 +vn 0.692771 -0.503328 0.516458 +vn 0.609417 -0.442767 0.657699 +vn 0.814402 -0.264615 0.516458 +vn 0.716413 -0.232776 0.657699 +vn 0.856312 -0.000001 0.516458 +vn 0.753281 -0.000001 0.657699 +vn -0.000001 0.000000 1.000000 +vn -0.000003 0.000000 1.000000 +vn -0.000003 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.000000 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn -0.000000 0.000000 1.000000 +vn -0.000000 0.000000 1.000000 +vn -0.000002 0.000000 1.000000 +vn -0.000002 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn -0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.632967 -0.205663 -0.746361 +vn -0.538434 -0.391196 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn -0.391195 -0.538435 -0.746361 +vn -0.000001 0.000000 -1.000000 +vn -0.205664 -0.632968 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 -0.665542 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn 0.205664 -0.632968 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn 0.391196 -0.538434 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn 0.538435 -0.391196 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn 0.632968 -0.205664 -0.746361 +vn 0.000001 0.000000 -1.000000 +vn 0.665542 -0.000000 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn 0.632968 0.205664 -0.746361 +vn -0.000001 0.000000 -1.000000 +vn 0.538434 0.391196 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn 0.391195 0.538435 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn 0.205664 0.632968 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn -0.000000 0.665542 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn -0.205664 0.632968 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn -0.391196 0.538434 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn -0.538435 0.391196 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn -0.632968 0.205664 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn -0.665542 0.000001 -0.746360 +vn -0.951052 -0.309014 0.003292 +vn -0.809013 -0.587782 0.003292 +vn -0.587782 -0.809013 0.003292 +vn -0.309015 -0.951052 0.003292 +vn 0.000000 -0.999995 0.003291 +vn 0.309016 -0.951051 0.003291 +vn 0.587782 -0.809013 0.003292 +vn 0.809013 -0.587782 0.003292 +vn 0.951051 -0.309015 0.003292 +vn 0.999995 -0.000000 0.003292 +vn 0.951051 0.309015 0.003292 +vn 0.809013 0.587782 0.003292 +vn 0.587782 0.809013 0.003292 +vn 0.309015 0.951051 0.003291 +vn -0.000000 0.999995 0.003292 +vn -0.309015 0.951051 0.003292 +vn -0.587782 0.809012 0.003292 +vn -0.809013 0.587782 0.003292 +vn -0.951051 0.309015 0.003292 +vn -0.999995 0.000001 0.003292 +vn 0.951057 0.309016 0.000000 +vn 0.809017 0.587786 0.000000 +vn 0.587784 0.809018 0.000000 +vn 0.309016 0.951057 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.309017 0.951056 0.000000 +vn -0.587785 0.809017 0.000000 +vn -0.809017 0.587785 0.000000 +vn -0.951057 0.309017 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.951057 -0.309017 0.000000 +vn -0.809017 -0.587786 0.000000 +vn -0.587785 -0.809017 0.000000 +vn -0.309017 -0.951056 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.309017 -0.951056 0.000000 +vn 0.587785 -0.809017 0.000000 +vn 0.809017 -0.587785 0.000000 +vn 0.951056 -0.309017 0.000000 +vn 1.000000 -0.000001 0.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.099521 -0.025997 0.994696 +vn -0.370259 -0.096720 0.923880 +vn -0.376186 -0.029434 0.926077 +vn -0.057114 -0.004469 0.998358 +vn -0.893883 -0.233507 0.382685 +vn -0.963711 -0.251747 0.088798 +vn -0.991422 -0.085464 0.098885 +vn -0.918344 -0.077800 0.388060 +vn 0.793305 -0.601767 0.092433 +vn 0.733240 -0.559378 0.386593 +vn 0.643214 -0.663196 0.382683 +vn 0.692237 -0.713734 0.106733 +vn 0.298486 -0.233299 0.925461 +vn 0.057028 -0.044573 0.997377 +vn 0.024020 -0.024766 0.999405 +vn 0.266434 -0.274699 0.923879 +vn 0.082303 0.032271 0.996085 +vn 0.041448 0.026013 0.998802 +vn -0.050580 0.009112 0.998679 +vn 0.079294 0.001499 0.996850 +vn -0.041919 0.020567 0.998909 +vn 0.068219 -0.023277 0.997399 +vn -0.036287 0.036816 0.998663 +vn -0.082955 0.119711 0.989337 +vn -0.967533 -0.252745 0.000000 +vn -0.996266 -0.086339 0.000000 +vn -0.984282 0.176605 0.000000 +vn -0.979643 0.175812 0.096905 +vn -0.897851 0.440300 0.000000 +vn -0.893429 0.438145 0.099068 +vn -0.686179 0.727433 0.000000 +vn -0.683685 0.723161 0.098051 +vn -0.569579 0.821937 0.000000 +vn -0.567955 0.819595 0.075436 +vn 0.847003 0.531588 0.000000 +vn 0.842233 0.528595 0.105978 +vn 0.932913 0.348128 0.092084 +vn 0.937197 0.348799 0.000000 +vn 0.995708 0.018406 0.090703 +vn 0.999830 0.018462 0.000000 +vn 0.942600 -0.321360 0.090740 +vn 0.946508 -0.322679 0.000000 +vn 0.797187 -0.603733 0.000000 +vn 0.696216 -0.717833 0.000000 +vn 0.782527 0.491125 0.382684 +vn 0.862275 0.324810 0.388563 +vn 0.324132 0.203428 0.923881 +vn 0.350837 0.137560 0.926278 +vn -0.375467 0.067640 0.924365 +vn -0.908855 0.163229 0.383846 +vn 0.921594 0.017102 0.387778 +vn 0.377565 0.007135 0.925956 +vn -0.340222 0.166926 0.925410 +vn -0.828089 0.406138 0.386421 +vn 0.872758 -0.297591 0.386954 +vn 0.358168 -0.122210 0.925624 +vn -0.264482 0.268343 0.926305 +vn -0.635493 0.667249 0.388493 +vn -0.217962 0.314540 0.923882 +vn -0.526221 0.759372 0.382684 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.072275 -0.073188 0.994696 +vn 0.268894 -0.272290 0.923880 +vn 0.213586 -0.311072 0.926075 +vn 0.032428 -0.047228 0.998358 +vn 0.649165 -0.657372 0.382683 +vn 0.699875 -0.708724 0.088798 +vn 0.569726 -0.815864 0.098885 +vn 0.526550 -0.756409 0.388060 +vn 0.124493 0.987906 0.092433 +vn 0.117812 0.914694 0.386594 +vn 0.252729 0.888640 0.382684 +vn 0.271991 0.956362 0.106733 +vn 0.052801 0.375140 0.925463 +vn 0.010088 0.071673 0.997377 +vn 0.009439 0.033186 0.999405 +vn 0.104679 0.368083 0.923881 +vn -0.069099 0.055142 0.996085 +vn -0.043253 0.022889 0.998802 +vn 0.017399 -0.048360 0.998679 +vn -0.040945 0.067921 0.996850 +vn 0.003148 -0.046587 0.998909 +vn -0.013951 0.070716 0.997399 +vn -0.013739 -0.049834 0.998663 +vn -0.062194 -0.131697 0.989337 +vn 0.702650 -0.711535 0.000000 +vn 0.572905 -0.819622 0.000000 +vn 0.339197 -0.940715 0.000000 +vn 0.337564 -0.936301 0.096905 +vn 0.067613 -0.997712 0.000000 +vn 0.067269 -0.992804 0.099068 +vn -0.286886 -0.957965 0.000000 +vn -0.284433 -0.953669 0.098051 +vn -0.427028 -0.904238 0.000000 +vn -0.425812 -0.901661 0.075436 +vn -0.883871 0.467731 0.000000 +vn -0.878893 0.465097 0.105978 +vn -0.767945 0.633863 0.092084 +vn -0.770668 0.637236 0.000000 +vn -0.513793 0.853106 0.090703 +vn -0.515903 0.856647 0.000000 +vn -0.192995 0.976995 0.090740 +vn -0.193806 0.981040 0.000000 +vn 0.124255 0.992250 0.000000 +vn 0.273554 0.961857 0.000000 +vn -0.816590 0.432128 0.382684 +vn -0.712429 0.584348 0.388564 +vn -0.338240 0.178992 0.923881 +vn -0.294551 0.235052 0.926278 +vn 0.129157 -0.358989 0.924362 +vn 0.313068 -0.868706 0.383847 +vn -0.475607 0.789573 0.387778 +vn -0.194964 0.323412 0.925956 +vn 0.025550 -0.378106 0.925410 +vn 0.062318 -0.920215 0.386421 +vn -0.178658 0.904626 0.386954 +vn -0.073245 0.371284 0.925626 +vn -0.100149 -0.363223 0.926304 +vn -0.260110 -0.883977 0.388493 +vn -0.163416 -0.346034 0.923881 +vn -0.394526 -0.835406 0.382683 +vn 0.000002 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.072275 0.073188 0.994696 +vn -0.268894 0.272290 0.923880 +vn -0.213586 0.311072 0.926075 +vn -0.032428 0.047228 0.998358 +vn -0.649165 0.657372 0.382683 +vn -0.699875 0.708724 0.088798 +vn -0.569726 0.815864 0.098885 +vn -0.526550 0.756409 0.388060 +vn -0.124493 -0.987906 0.092433 +vn -0.117812 -0.914694 0.386594 +vn -0.252729 -0.888640 0.382684 +vn -0.271991 -0.956362 0.106733 +vn -0.052801 -0.375140 0.925463 +vn -0.010088 -0.071673 0.997377 +vn -0.009439 -0.033186 0.999405 +vn -0.104679 -0.368083 0.923881 +vn 0.069099 -0.055142 0.996085 +vn 0.043253 -0.022889 0.998802 +vn -0.017399 0.048360 0.998679 +vn 0.040945 -0.067921 0.996850 +vn -0.003148 0.046587 0.998909 +vn 0.013951 -0.070716 0.997399 +vn 0.013739 0.049834 0.998663 +vn 0.062194 0.131697 0.989337 +vn -0.702650 0.711535 0.000000 +vn -0.572905 0.819622 0.000000 +vn -0.339197 0.940715 0.000000 +vn -0.337564 0.936301 0.096905 +vn -0.067613 0.997712 0.000000 +vn -0.067269 0.992804 0.099068 +vn 0.286886 0.957965 0.000000 +vn 0.284433 0.953669 0.098051 +vn 0.427028 0.904238 0.000000 +vn 0.425812 0.901661 0.075436 +vn 0.883871 -0.467731 0.000000 +vn 0.878893 -0.465097 0.105978 +vn 0.767945 -0.633863 0.092084 +vn 0.770668 -0.637236 0.000000 +vn 0.513793 -0.853106 0.090703 +vn 0.515903 -0.856647 0.000000 +vn 0.192995 -0.976995 0.090740 +vn 0.193806 -0.981040 0.000000 +vn -0.124255 -0.992250 0.000000 +vn -0.273554 -0.961857 0.000000 +vn 0.816590 -0.432128 0.382684 +vn 0.712429 -0.584348 0.388564 +vn 0.338240 -0.178992 0.923881 +vn 0.294551 -0.235052 0.926278 +vn -0.129157 0.358989 0.924362 +vn -0.313068 0.868706 0.383847 +vn 0.475607 -0.789573 0.387778 +vn 0.194964 -0.323412 0.925956 +vn -0.025550 0.378106 0.925410 +vn -0.062318 0.920215 0.386421 +vn 0.178658 -0.904626 0.386954 +vn 0.073245 -0.371284 0.925626 +vn 0.100149 0.363223 0.926304 +vn 0.260110 0.883977 0.388493 +vn 0.163416 0.346034 0.923881 +vn 0.394526 0.835406 0.382683 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.099521 0.025997 0.994696 +vn 0.370259 0.096720 0.923880 +vn 0.376186 0.029434 0.926077 +vn 0.057114 0.004469 0.998358 +vn 0.893883 0.233507 0.382685 +vn 0.963711 0.251747 0.088798 +vn 0.991422 0.085464 0.098885 +vn 0.918344 0.077800 0.388060 +vn -0.793305 0.601767 0.092433 +vn -0.733240 0.559378 0.386593 +vn -0.643214 0.663196 0.382683 +vn -0.692237 0.713734 0.106733 +vn -0.298486 0.233299 0.925461 +vn -0.057028 0.044573 0.997377 +vn -0.024020 0.024766 0.999405 +vn -0.266434 0.274699 0.923879 +vn -0.082303 -0.032271 0.996085 +vn -0.041448 -0.026013 0.998802 +vn 0.050580 -0.009112 0.998679 +vn -0.079294 -0.001499 0.996850 +vn 0.041919 -0.020567 0.998909 +vn -0.068219 0.023277 0.997399 +vn 0.036287 -0.036816 0.998663 +vn 0.082955 -0.119711 0.989337 +vn 0.967533 0.252745 0.000000 +vn 0.996266 0.086339 0.000000 +vn 0.984282 -0.176605 0.000000 +vn 0.979643 -0.175812 0.096905 +vn 0.897851 -0.440300 0.000000 +vn 0.893429 -0.438145 0.099068 +vn 0.686179 -0.727433 0.000000 +vn 0.683685 -0.723161 0.098051 +vn 0.569579 -0.821937 0.000000 +vn 0.567955 -0.819595 0.075436 +vn -0.847003 -0.531588 0.000000 +vn -0.842233 -0.528595 0.105978 +vn -0.932913 -0.348128 0.092084 +vn -0.937197 -0.348799 0.000000 +vn -0.995708 -0.018406 0.090703 +vn -0.999830 -0.018462 0.000000 +vn -0.942600 0.321360 0.090740 +vn -0.946508 0.322679 0.000000 +vn -0.797187 0.603733 0.000000 +vn -0.696216 0.717833 0.000000 +vn -0.782527 -0.491125 0.382684 +vn -0.862275 -0.324810 0.388563 +vn -0.324132 -0.203428 0.923881 +vn -0.350837 -0.137560 0.926278 +vn 0.375467 -0.067640 0.924365 +vn 0.908855 -0.163229 0.383846 +vn -0.921594 -0.017102 0.387778 +vn -0.377565 -0.007135 0.925956 +vn 0.340222 -0.166926 0.925410 +vn 0.828089 -0.406138 0.386421 +vn -0.872758 0.297591 0.386954 +vn -0.358168 0.122210 0.925624 +vn 0.264482 -0.268343 0.926305 +vn 0.635493 -0.667249 0.388493 +vn 0.217962 -0.314540 0.923882 +vn 0.526221 -0.759372 0.382684 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn -0.027246 -0.099185 0.994696 +vn -0.101367 -0.369011 0.923881 +vn -0.162606 -0.340506 0.926075 +vn -0.024686 -0.051696 0.998358 +vn -0.244718 -0.890880 0.382682 +vn -0.263836 -0.960472 0.088798 +vn -0.421697 -0.901329 0.098884 +vn -0.391797 -0.834209 0.388059 +vn 0.917798 0.386139 0.092433 +vn 0.851056 0.355317 0.386592 +vn 0.895950 0.225449 0.382682 +vn 0.964230 0.242630 0.106733 +vn 0.351280 0.141841 0.925464 +vn 0.067114 0.027100 0.997377 +vn 0.033461 0.008419 0.999405 +vn 0.371111 0.093383 0.923881 +vn 0.013205 0.087412 0.996085 +vn -0.001804 0.048902 0.998802 +vn -0.033181 -0.039248 0.998679 +vn 0.038350 0.069420 0.996850 +vn -0.038773 -0.026020 0.998909 +vn 0.054266 0.047440 0.997399 +vn -0.050026 -0.013017 0.998663 +vn -0.145150 -0.011987 0.989337 +vn -0.264882 -0.964281 0.000000 +vn -0.423361 -0.905961 0.000000 +vn -0.645085 -0.764111 0.000000 +vn -0.642080 -0.760489 0.096904 +vn -0.830237 -0.557411 0.000000 +vn -0.826159 -0.554659 0.099067 +vn -0.973065 -0.230531 0.000000 +vn -0.968118 -0.230508 0.098051 +vn -0.996608 -0.082301 0.000000 +vn -0.993768 -0.082066 0.075436 +vn -0.036868 0.999320 0.000000 +vn -0.036661 0.993693 0.105978 +vn 0.164969 0.981991 0.092084 +vn 0.166529 0.986037 0.000000 +vn 0.481914 0.871511 0.090703 +vn 0.483926 0.875109 0.000000 +vn 0.749605 0.655636 0.090740 +vn 0.752703 0.658361 0.000000 +vn 0.921442 0.388517 0.000000 +vn 0.969769 0.244024 0.000000 +vn -0.034062 0.923251 0.382684 +vn 0.149845 0.909156 0.388563 +vn -0.014109 0.382420 0.923881 +vn 0.056284 0.372613 0.926278 +vn -0.246316 -0.291349 0.924361 +vn -0.595792 -0.705475 0.383845 +vn 0.445985 0.806676 0.387778 +vn 0.182604 0.330547 0.925956 +vn -0.314673 -0.211180 0.925410 +vn -0.765772 -0.514075 0.386419 +vn 0.694100 0.607036 0.386954 +vn 0.284919 0.249074 0.925626 +vn -0.364635 -0.094880 0.926304 +vn -0.895601 -0.216729 0.388494 +vn -0.381386 -0.031495 0.923879 +vn -0.920744 -0.076037 0.382686 +s 1 +f 2095/2225/4429 2096/2226/4430 2098/2227/4431 2097/2228/4432 +f 2097/2228/4432 2098/2227/4431 2100/2229/4433 2099/2230/4434 +f 2099/2230/4434 2100/2229/4433 2102/2231/4435 2101/2232/4436 +f 2101/2232/4436 2102/2231/4435 2104/2233/4437 2103/2234/4438 +f 2103/2234/4438 2104/2233/4437 2106/2235/4439 2105/2236/4440 +s 2 +f 2115/2237/4441 2114/2238/4442 2117/2239/4443 2116/2240/4444 +s 3 +f 2114/2238/4445 2113/2241/4446 2118/2242/4447 2117/2239/4448 +s 4 +f 2133/2243/4449 2132/2244/4450 2138/2245/4451 2137/2246/4452 +s 2 +f 2132/2244/4453 2131/2247/4454 2139/2248/4455 2138/2245/4456 +f 2110/2249/4457 2108/2250/4458 2115/2237/4441 2116/2240/4444 +f 2110/2249/4457 2116/2240/4444 2122/2251/4459 2119/2252/4460 +f 2119/2252/4460 2122/2251/4459 2128/2253/4461 2125/2254/4462 +f 2125/2254/4462 2128/2253/4461 2134/2255/4463 2131/2247/4454 +f 2131/2247/4454 2134/2255/4463 2141/2256/4464 2139/2248/4455 +s 3 +f 2118/2242/4447 2113/2241/4446 2106/2235/4465 2104/2233/4466 +f 2118/2242/4447 2104/2233/4466 2102/2231/4467 2124/2257/4468 +f 2124/2257/4468 2102/2231/4467 2100/2229/4469 2130/2258/4470 +f 2130/2258/4470 2100/2229/4469 2098/2227/4471 2136/2259/4472 +f 2136/2259/4472 2098/2227/4471 2096/2226/4473 2140/2260/4474 +s 4 +f 2105/2236/4475 2107/2261/4476 2112/2262/4477 2103/2234/4478 +f 2103/2234/4478 2112/2262/4477 2121/2263/4479 2101/2232/4480 +f 2101/2232/4480 2121/2263/4479 2127/2264/4481 2099/2230/4482 +f 2099/2230/4482 2127/2264/4481 2133/2243/4449 2097/2228/4483 +f 2097/2228/4483 2133/2243/4449 2137/2246/4452 2095/2225/4484 +f 2107/2261/4476 2109/2265/4485 2111/2266/4486 2112/2262/4477 +s 2 +f 2109/2265/4487 2108/2250/4458 2110/2249/4457 2111/2266/4488 +f 2116/2240/4444 2117/2239/4443 2123/2267/4489 2122/2251/4459 +s 3 +f 2117/2239/4448 2118/2242/4447 2124/2257/4468 2123/2267/4490 +s 4 +f 2112/2262/4477 2111/2266/4486 2120/2268/4491 2121/2263/4479 +s 2 +f 2111/2266/4488 2110/2249/4457 2119/2252/4460 2120/2268/4492 +f 2122/2251/4459 2123/2267/4489 2129/2269/4493 2128/2253/4461 +s 3 +f 2123/2267/4490 2124/2257/4468 2130/2258/4470 2129/2269/4494 +s 4 +f 2121/2263/4479 2120/2268/4491 2126/2270/4495 2127/2264/4481 +s 2 +f 2120/2268/4492 2119/2252/4460 2125/2254/4462 2126/2270/4496 +f 2128/2253/4461 2129/2269/4493 2135/2271/4497 2134/2255/4463 +s 3 +f 2129/2269/4494 2130/2258/4470 2136/2259/4472 2135/2271/4498 +s 4 +f 2127/2264/4481 2126/2270/4495 2132/2244/4450 2133/2243/4449 +s 2 +f 2126/2270/4496 2125/2254/4462 2131/2247/4454 2132/2244/4453 +f 2134/2255/4463 2135/2271/4497 2142/2272/4499 2141/2256/4464 +s 3 +f 2135/2271/4498 2136/2259/4472 2140/2260/4474 2142/2272/4500 +s 7 +f 2144/2273/4501 2143/2274/4502 2163/2275/4503 +f 2145/2276/4504 2144/2273/4501 2163/2275/4503 +f 2146/2277/4505 2145/2276/4504 2163/2275/4503 +f 2147/2278/4506 2146/2277/4505 2163/2275/4503 +f 2148/2279/4507 2147/2278/4506 2163/2275/4503 +f 2149/2280/4508 2148/2279/4507 2163/2275/4503 +f 2150/2281/4509 2149/2280/4508 2163/2275/4503 +f 2151/2282/4510 2150/2281/4509 2163/2275/4503 +f 2152/2283/4511 2151/2282/4510 2163/2275/4503 +f 2153/2284/4512 2152/2283/4511 2163/2275/4503 +f 2154/2285/4513 2153/2284/4512 2163/2275/4503 +f 2155/2286/4514 2154/2285/4513 2163/2275/4503 +f 2156/2287/4515 2155/2286/4514 2163/2275/4503 +f 2157/2288/4516 2156/2287/4515 2163/2275/4503 +f 2158/2289/4517 2157/2288/4516 2163/2275/4503 +f 2159/2290/4518 2158/2289/4517 2163/2275/4503 +f 2160/2291/4519 2159/2290/4518 2163/2275/4503 +f 2161/2292/4520 2160/2291/4519 2163/2275/4503 +f 2162/2293/4521 2161/2292/4520 2163/2275/4503 +f 2143/2274/4502 2162/2293/4521 2163/2275/4503 +s 8 +f 2165/2294/4522 2166/2295/4523 2204/2296/4524 2203/2297/4525 +f 2166/2295/4523 2165/2294/4522 2167/2298/4526 2168/2299/4527 +f 2168/2299/4527 2167/2298/4526 2169/2300/4528 2170/2301/4529 +f 2170/2301/4529 2169/2300/4528 2171/2302/4530 2172/2303/4531 +f 2172/2303/4531 2171/2302/4530 2173/2304/4532 2174/2305/4533 +f 2174/2305/4533 2173/2304/4532 2175/2306/4534 2176/2307/4535 +f 2176/2307/4535 2175/2306/4534 2177/2308/4536 2178/2309/4537 +f 2178/2309/4537 2177/2308/4536 2179/2310/4538 2180/2311/4539 +f 2180/2311/4539 2179/2310/4538 2181/2312/4540 2182/2313/4541 +f 2182/2313/4541 2181/2312/4540 2183/2314/4542 2184/2315/4543 +f 2184/2315/4543 2183/2314/4542 2185/2316/4544 2186/2317/4545 +f 2186/2317/4545 2185/2316/4544 2187/2318/4546 2188/2319/4547 +f 2188/2319/4547 2187/2318/4546 2189/2320/4548 2190/2321/4549 +f 2190/2321/4549 2189/2320/4548 2191/2322/4550 2192/2323/4551 +f 2192/2323/4551 2191/2322/4550 2193/2324/4552 2194/2325/4553 +f 2194/2325/4553 2193/2324/4552 2195/2326/4554 2196/2327/4555 +f 2196/2327/4555 2195/2326/4554 2197/2328/4556 2198/2329/4557 +f 2198/2329/4557 2197/2328/4556 2199/2330/4558 2200/2331/4559 +f 2200/2331/4559 2199/2330/4558 2201/2332/4560 2202/2333/4561 +f 2202/2333/4561 2201/2332/4560 2203/2297/4525 2204/2296/4524 +f 2205/2334/4562 2206/2335/4563 2243/2336/4564 2244/2337/4565 +f 2206/2335/4563 2205/2334/4562 2208/2338/4566 2207/2339/4567 +f 2207/2339/4567 2208/2338/4566 2210/2340/4568 2209/2341/4569 +f 2209/2341/4569 2210/2340/4568 2212/2342/4570 2211/2343/4571 +f 2211/2343/4571 2212/2342/4570 2214/2344/4572 2213/2345/4573 +f 2213/2345/4573 2214/2344/4572 2216/2346/4574 2215/2347/4575 +f 2215/2347/4575 2216/2346/4574 2218/2348/4576 2217/2349/4577 +f 2217/2349/4577 2218/2348/4576 2220/2350/4578 2219/2351/4579 +f 2219/2351/4579 2220/2350/4578 2222/2352/4580 2221/2353/4581 +f 2221/2353/4581 2222/2352/4580 2224/2354/4582 2223/2355/4583 +f 2223/2355/4583 2224/2354/4582 2226/2356/4584 2225/2357/4585 +f 2225/2357/4585 2226/2356/4584 2228/2358/4586 2227/2359/4587 +f 2227/2359/4587 2228/2358/4586 2230/2360/4588 2229/2361/4589 +f 2229/2361/4589 2230/2360/4588 2232/2362/4590 2231/2363/4591 +f 2231/2363/4591 2232/2362/4590 2234/2364/4592 2233/2365/4593 +f 2233/2365/4593 2234/2364/4592 2236/2366/4594 2235/2367/4595 +f 2235/2367/4595 2236/2366/4594 2238/2368/4596 2237/2369/4597 +f 2237/2369/4597 2238/2368/4596 2240/2370/4598 2239/2371/4599 +f 2239/2371/4599 2240/2370/4598 2242/2372/4600 2241/2373/4601 +f 2241/2373/4601 2242/2372/4600 2244/2337/4565 2243/2336/4564 +f 2143/2274/4602 2144/2273/4603 2167/2298/4526 2165/2294/4522 +f 2144/2273/4603 2145/2276/4604 2169/2300/4528 2167/2298/4526 +f 2145/2276/4604 2146/2277/4605 2171/2302/4530 2169/2300/4528 +f 2146/2277/4605 2147/2278/4606 2173/2304/4532 2171/2302/4530 +f 2147/2278/4606 2148/2279/4607 2175/2306/4534 2173/2304/4532 +f 2148/2279/4607 2149/2280/4608 2177/2308/4536 2175/2306/4534 +f 2149/2280/4608 2150/2281/4609 2179/2310/4538 2177/2308/4536 +f 2150/2281/4609 2151/2282/4610 2181/2312/4540 2179/2310/4538 +f 2151/2282/4610 2152/2283/4611 2183/2314/4542 2181/2312/4540 +f 2152/2283/4611 2153/2284/4612 2185/2316/4544 2183/2314/4542 +f 2153/2284/4612 2154/2285/4613 2187/2318/4546 2185/2316/4544 +f 2154/2285/4613 2155/2286/4614 2189/2320/4548 2187/2318/4546 +f 2155/2286/4614 2156/2287/4615 2191/2322/4550 2189/2320/4548 +f 2156/2287/4615 2157/2288/4616 2193/2324/4552 2191/2322/4550 +f 2157/2288/4616 2158/2289/4617 2195/2326/4554 2193/2324/4552 +f 2158/2289/4617 2159/2290/4618 2197/2328/4556 2195/2326/4554 +f 2159/2290/4618 2160/2291/4619 2199/2330/4558 2197/2328/4556 +f 2160/2291/4619 2161/2292/4620 2201/2332/4560 2199/2330/4558 +f 2161/2292/4620 2162/2293/4621 2203/2297/4525 2201/2332/4560 +f 2162/2293/4621 2143/2274/4602 2165/2294/4522 2203/2297/4525 +f 2206/2335/4563 2207/2339/4567 2164/2374/4622 +f 2207/2339/4567 2209/2341/4569 2164/2374/4622 +f 2209/2341/4569 2211/2343/4571 2164/2374/4622 +f 2211/2343/4571 2213/2345/4573 2164/2374/4622 +f 2213/2345/4573 2215/2347/4575 2164/2374/4622 +f 2215/2347/4575 2217/2349/4577 2164/2374/4622 +f 2217/2349/4577 2219/2351/4579 2164/2374/4622 +f 2219/2351/4579 2221/2353/4581 2164/2374/4622 +f 2221/2353/4581 2223/2355/4583 2164/2374/4622 +f 2223/2355/4583 2225/2357/4585 2164/2374/4622 +f 2225/2357/4585 2227/2359/4587 2164/2374/4622 +f 2227/2359/4587 2229/2361/4589 2164/2374/4622 +f 2229/2361/4589 2231/2363/4591 2164/2374/4622 +f 2231/2363/4591 2233/2365/4593 2164/2374/4622 +f 2233/2365/4593 2235/2367/4595 2164/2374/4622 +f 2235/2367/4595 2237/2369/4597 2164/2374/4622 +f 2237/2369/4597 2239/2371/4599 2164/2374/4622 +f 2239/2371/4599 2241/2373/4601 2164/2374/4622 +f 2241/2373/4601 2243/2336/4564 2164/2374/4622 +f 2243/2336/4564 2206/2335/4563 2164/2374/4622 +f 2166/2295/4523 2168/2299/4527 2208/2338/4566 2205/2334/4562 +f 2168/2299/4527 2170/2301/4529 2210/2340/4568 2208/2338/4566 +f 2170/2301/4529 2172/2303/4531 2212/2342/4570 2210/2340/4568 +f 2172/2303/4531 2174/2305/4533 2214/2344/4572 2212/2342/4570 +f 2174/2305/4533 2176/2307/4535 2216/2346/4574 2214/2344/4572 +f 2176/2307/4535 2178/2309/4537 2218/2348/4576 2216/2346/4574 +f 2178/2309/4537 2180/2311/4539 2220/2350/4578 2218/2348/4576 +f 2180/2311/4539 2182/2313/4541 2222/2352/4580 2220/2350/4578 +f 2182/2313/4541 2184/2315/4543 2224/2354/4582 2222/2352/4580 +f 2184/2315/4543 2186/2317/4545 2226/2356/4584 2224/2354/4582 +f 2186/2317/4545 2188/2319/4547 2228/2358/4586 2226/2356/4584 +f 2188/2319/4547 2190/2321/4549 2230/2360/4588 2228/2358/4586 +f 2190/2321/4549 2192/2323/4551 2232/2362/4590 2230/2360/4588 +f 2192/2323/4551 2194/2325/4553 2234/2364/4592 2232/2362/4590 +f 2194/2325/4553 2196/2327/4555 2236/2366/4594 2234/2364/4592 +f 2196/2327/4555 2198/2329/4557 2238/2368/4596 2236/2366/4594 +f 2198/2329/4557 2200/2331/4559 2240/2370/4598 2238/2368/4596 +f 2200/2331/4559 2202/2333/4561 2242/2372/4600 2240/2370/4598 +f 2202/2333/4561 2204/2296/4524 2244/2337/4565 2242/2372/4600 +f 2204/2296/4524 2166/2295/4523 2205/2334/4562 2244/2337/4565 +s 10 +f 2245/2375/4623 2246/2376/4624 2266/2377/4625 2265/2378/4626 +f 2246/2376/4624 2247/2379/4627 2267/2380/4628 2266/2377/4625 +f 2247/2379/4627 2248/2381/4629 2268/2382/4630 2267/2380/4628 +f 2248/2381/4629 2249/2383/4631 2269/2384/4632 2268/2382/4630 +f 2249/2383/4631 2250/2385/4633 2270/2386/4634 2269/2384/4632 +f 2250/2385/4633 2251/2387/4635 2271/2388/4636 2270/2386/4634 +f 2251/2387/4635 2252/2389/4637 2272/2390/4638 2271/2388/4636 +f 2252/2389/4637 2253/2391/4639 2273/2392/4640 2272/2390/4638 +f 2253/2391/4639 2254/2393/4641 2274/2394/4642 2273/2392/4640 +f 2254/2393/4641 2255/2395/4643 2275/2396/4644 2274/2394/4642 +f 2255/2395/4643 2256/2397/4645 2276/2398/4646 2275/2396/4644 +f 2256/2397/4645 2257/2399/4647 2277/2400/4648 2276/2398/4646 +f 2257/2399/4647 2258/2401/4649 2278/2402/4650 2277/2400/4648 +f 2258/2401/4649 2259/2403/4651 2279/2404/4652 2278/2402/4650 +f 2259/2403/4651 2260/2405/4653 2280/2406/4654 2279/2404/4652 +f 2260/2405/4653 2261/2407/4655 2281/2408/4656 2280/2406/4654 +f 2261/2407/4655 2262/2409/4657 2282/2410/4658 2281/2408/4656 +f 2262/2409/4657 2263/2411/4659 2283/2412/4660 2282/2410/4658 +f 2263/2411/4659 2264/2413/4661 2284/2414/4662 2283/2412/4660 +f 2264/2413/4661 2245/2375/4623 2265/2378/4626 2284/2414/4662 +s 11 +f 2265/2378/4663 2266/2377/4664 2286/2415/4665 2285/2416/4666 +f 2266/2377/4664 2267/2380/4667 2287/2417/4668 2286/2415/4665 +f 2267/2380/4667 2268/2382/4669 2288/2418/4670 2287/2417/4668 +f 2268/2382/4669 2269/2384/4671 2289/2419/4672 2288/2418/4670 +f 2269/2384/4671 2270/2386/4673 2290/2420/4674 2289/2419/4672 +f 2270/2386/4673 2271/2388/4675 2291/2421/4676 2290/2420/4674 +f 2271/2388/4675 2272/2390/4677 2292/2422/4678 2291/2421/4676 +f 2272/2390/4677 2273/2392/4679 2293/2423/4680 2292/2422/4678 +f 2273/2392/4679 2274/2394/4681 2294/2424/4682 2293/2423/4680 +f 2274/2394/4681 2275/2396/4683 2295/2425/4684 2294/2424/4682 +f 2275/2396/4683 2276/2398/4685 2296/2426/4686 2295/2425/4684 +f 2276/2398/4685 2277/2400/4687 2297/2427/4688 2296/2426/4686 +f 2277/2400/4687 2278/2402/4689 2298/2428/4690 2297/2427/4688 +f 2278/2402/4689 2279/2404/4691 2299/2429/4692 2298/2428/4690 +f 2279/2404/4691 2280/2406/4693 2300/2430/4694 2299/2429/4692 +f 2280/2406/4693 2281/2408/4695 2301/2431/4696 2300/2430/4694 +f 2281/2408/4695 2282/2410/4697 2302/2432/4698 2301/2431/4696 +f 2282/2410/4697 2283/2412/4699 2303/2433/4700 2302/2432/4698 +f 2283/2412/4699 2284/2414/4701 2304/2434/4702 2303/2433/4700 +f 2284/2414/4701 2265/2378/4663 2285/2416/4666 2304/2434/4702 +s 12 +f 2326/2435/4703 2325/2436/4704 2305/2437/4705 2306/2438/4706 +f 2327/2439/4707 2326/2435/4703 2306/2438/4706 2307/2440/4708 +f 2328/2441/4709 2327/2439/4707 2307/2440/4708 2308/2442/4710 +f 2329/2443/4711 2328/2441/4709 2308/2442/4710 2309/2444/4712 +f 2330/2445/4713 2329/2443/4711 2309/2444/4712 2310/2446/4714 +f 2331/2447/4715 2330/2445/4713 2310/2446/4714 2311/2448/4716 +f 2332/2449/4717 2331/2447/4715 2311/2448/4716 2312/2450/4718 +f 2333/2451/4719 2332/2449/4717 2312/2450/4718 2313/2452/4720 +f 2334/2453/4721 2333/2451/4719 2313/2452/4720 2314/2454/4722 +f 2335/2455/4723 2334/2453/4721 2314/2454/4722 2315/2456/4724 +f 2336/2457/4725 2335/2455/4723 2315/2456/4724 2316/2458/4726 +f 2337/2459/4727 2336/2457/4725 2316/2458/4726 2317/2460/4728 +f 2338/2461/4729 2337/2459/4727 2317/2460/4728 2318/2462/4730 +f 2339/2463/4731 2338/2461/4729 2318/2462/4730 2319/2464/4732 +f 2340/2465/4733 2339/2463/4731 2319/2464/4732 2320/2466/4734 +f 2341/2467/4735 2340/2465/4733 2320/2466/4734 2321/2468/4736 +f 2342/2469/4737 2341/2467/4735 2321/2468/4736 2322/2470/4738 +f 2343/2471/4739 2342/2469/4737 2322/2470/4738 2323/2472/4740 +f 2344/2473/4741 2343/2471/4739 2323/2472/4740 2324/2474/4742 +f 2325/2436/4704 2344/2473/4741 2324/2474/4742 2305/2437/4705 +f 2306/2438/4706 2305/2437/4705 2285/2416/4743 2286/2415/4744 +f 2307/2440/4708 2306/2438/4706 2286/2415/4744 2287/2417/4745 +f 2308/2442/4710 2307/2440/4708 2287/2417/4745 2288/2418/4746 +f 2309/2444/4712 2308/2442/4710 2288/2418/4746 2289/2419/4747 +f 2310/2446/4714 2309/2444/4712 2289/2419/4747 2290/2420/4748 +f 2311/2448/4716 2310/2446/4714 2290/2420/4748 2291/2421/4749 +f 2312/2450/4718 2311/2448/4716 2291/2421/4749 2292/2422/4750 +f 2313/2452/4720 2312/2450/4718 2292/2422/4750 2293/2423/4751 +f 2314/2454/4722 2313/2452/4720 2293/2423/4751 2294/2424/4752 +f 2315/2456/4724 2314/2454/4722 2294/2424/4752 2295/2425/4753 +f 2316/2458/4726 2315/2456/4724 2295/2425/4753 2296/2426/4754 +f 2317/2460/4728 2316/2458/4726 2296/2426/4754 2297/2427/4755 +f 2318/2462/4730 2317/2460/4728 2297/2427/4755 2298/2428/4756 +f 2319/2464/4732 2318/2462/4730 2298/2428/4756 2299/2429/4757 +f 2320/2466/4734 2319/2464/4732 2299/2429/4757 2300/2430/4758 +f 2321/2468/4736 2320/2466/4734 2300/2430/4758 2301/2431/4759 +f 2322/2470/4738 2321/2468/4736 2301/2431/4759 2302/2432/4760 +f 2323/2472/4740 2322/2470/4738 2302/2432/4760 2303/2433/4761 +f 2324/2474/4742 2323/2472/4740 2303/2433/4761 2304/2434/4762 +f 2305/2437/4705 2324/2474/4742 2304/2434/4762 2285/2416/4743 +s 10 +f 2246/2376/4624 2245/2375/4623 2325/2436/4763 2326/2435/4764 +f 2247/2379/4627 2246/2376/4624 2326/2435/4764 2327/2439/4765 +f 2248/2381/4629 2247/2379/4627 2327/2439/4765 2328/2441/4766 +f 2249/2383/4631 2248/2381/4629 2328/2441/4766 2329/2443/4767 +f 2250/2385/4633 2249/2383/4631 2329/2443/4767 2330/2445/4768 +f 2251/2387/4635 2250/2385/4633 2330/2445/4768 2331/2447/4769 +f 2252/2389/4637 2251/2387/4635 2331/2447/4769 2332/2449/4770 +f 2253/2391/4639 2252/2389/4637 2332/2449/4770 2333/2451/4771 +f 2254/2393/4641 2253/2391/4639 2333/2451/4771 2334/2453/4772 +f 2255/2395/4643 2254/2393/4641 2334/2453/4772 2335/2455/4773 +f 2256/2397/4645 2255/2395/4643 2335/2455/4773 2336/2457/4774 +f 2257/2399/4647 2256/2397/4645 2336/2457/4774 2337/2459/4775 +f 2258/2401/4649 2257/2399/4647 2337/2459/4775 2338/2461/4776 +f 2259/2403/4651 2258/2401/4649 2338/2461/4776 2339/2463/4777 +f 2260/2405/4653 2259/2403/4651 2339/2463/4777 2340/2465/4778 +f 2261/2407/4655 2260/2405/4653 2340/2465/4778 2341/2467/4779 +f 2262/2409/4657 2261/2407/4655 2341/2467/4779 2342/2469/4780 +f 2263/2411/4659 2262/2409/4657 2342/2469/4780 2343/2471/4781 +f 2264/2413/4661 2263/2411/4659 2343/2471/4781 2344/2473/4782 +f 2245/2375/4623 2264/2413/4661 2344/2473/4782 2325/2436/4763 +s 13 +f 2345/2475/4783 2346/2476/4784 2348/2477/4785 2347/2478/4786 +f 2347/2478/4786 2348/2477/4785 2350/2479/4787 2349/2480/4788 +f 2349/2480/4788 2350/2479/4787 2352/2481/4789 2351/2482/4790 +f 2351/2482/4790 2352/2481/4789 2354/2483/4791 2353/2484/4792 +f 2353/2484/4792 2354/2483/4791 2356/2485/4793 2355/2486/4794 +s 14 +f 2365/2487/4795 2364/2488/4796 2367/2489/4797 2366/2490/4798 +s 15 +f 2364/2488/4799 2363/2491/4800 2368/2492/4801 2367/2489/4802 +s 16 +f 2383/2493/4803 2382/2494/4804 2388/2495/4805 2387/2496/4806 +s 14 +f 2382/2494/4807 2381/2497/4808 2389/2498/4809 2388/2495/4810 +f 2360/2499/4811 2358/2500/4812 2365/2487/4795 2366/2490/4798 +f 2360/2499/4811 2366/2490/4798 2372/2501/4813 2369/2502/4814 +f 2369/2502/4814 2372/2501/4813 2378/2503/4815 2375/2504/4816 +f 2375/2504/4816 2378/2503/4815 2384/2505/4817 2381/2497/4808 +f 2381/2497/4808 2384/2505/4817 2391/2506/4818 2389/2498/4809 +s 15 +f 2368/2492/4801 2363/2491/4800 2356/2485/4819 2354/2483/4820 +f 2368/2492/4801 2354/2483/4820 2352/2481/4821 2374/2507/4822 +f 2374/2507/4822 2352/2481/4821 2350/2479/4823 2380/2508/4824 +f 2380/2508/4824 2350/2479/4823 2348/2477/4825 2386/2509/4826 +f 2386/2509/4826 2348/2477/4825 2346/2476/4827 2390/2510/4828 +s 16 +f 2355/2486/4829 2357/2511/4830 2362/2512/4831 2353/2484/4832 +f 2353/2484/4832 2362/2512/4831 2371/2513/4833 2351/2482/4834 +f 2351/2482/4834 2371/2513/4833 2377/2514/4835 2349/2480/4836 +f 2349/2480/4836 2377/2514/4835 2383/2493/4803 2347/2478/4837 +f 2347/2478/4837 2383/2493/4803 2387/2496/4806 2345/2475/4838 +f 2357/2511/4830 2359/2515/4839 2361/2516/4840 2362/2512/4831 +s 14 +f 2359/2515/4841 2358/2500/4812 2360/2499/4811 2361/2516/4842 +f 2366/2490/4798 2367/2489/4797 2373/2517/4843 2372/2501/4813 +s 15 +f 2367/2489/4802 2368/2492/4801 2374/2507/4822 2373/2517/4844 +s 16 +f 2362/2512/4831 2361/2516/4840 2370/2518/4845 2371/2513/4833 +s 14 +f 2361/2516/4842 2360/2499/4811 2369/2502/4814 2370/2518/4846 +f 2372/2501/4813 2373/2517/4843 2379/2519/4847 2378/2503/4815 +s 15 +f 2373/2517/4844 2374/2507/4822 2380/2508/4824 2379/2519/4848 +s 16 +f 2371/2513/4833 2370/2518/4845 2376/2520/4849 2377/2514/4835 +s 14 +f 2370/2518/4846 2369/2502/4814 2375/2504/4816 2376/2520/4850 +f 2378/2503/4815 2379/2519/4847 2385/2521/4851 2384/2505/4817 +s 15 +f 2379/2519/4848 2380/2508/4824 2386/2509/4826 2385/2521/4852 +s 16 +f 2377/2514/4835 2376/2520/4849 2382/2494/4804 2383/2493/4803 +s 14 +f 2376/2520/4850 2375/2504/4816 2381/2497/4808 2382/2494/4807 +f 2384/2505/4817 2385/2521/4851 2392/2522/4853 2391/2506/4818 +s 15 +f 2385/2521/4852 2386/2509/4826 2390/2510/4828 2392/2522/4854 +s 19 +f 2393/2523/4855 2394/2524/4856 2396/2525/4857 2395/2526/4858 +f 2395/2526/4858 2396/2525/4857 2398/2527/4859 2397/2528/4860 +f 2397/2528/4860 2398/2527/4859 2400/2529/4861 2399/2530/4862 +f 2399/2530/4862 2400/2529/4861 2402/2531/4863 2401/2532/4864 +f 2401/2532/4864 2402/2531/4863 2404/2533/4865 2403/2534/4866 +s 20 +f 2413/2535/4867 2412/2536/4868 2415/2537/4869 2414/2538/4870 +s 21 +f 2412/2536/4871 2411/2539/4872 2416/2540/4873 2415/2537/4874 +s 22 +f 2431/2541/4875 2430/2542/4876 2436/2543/4877 2435/2544/4878 +s 20 +f 2430/2542/4879 2429/2545/4880 2437/2546/4881 2436/2543/4882 +f 2408/2547/4883 2406/2548/4884 2413/2535/4867 2414/2538/4870 +f 2408/2547/4883 2414/2538/4870 2420/2549/4885 2417/2550/4886 +f 2417/2550/4886 2420/2549/4885 2426/2551/4887 2423/2552/4888 +f 2423/2552/4888 2426/2551/4887 2432/2553/4889 2429/2545/4880 +f 2429/2545/4880 2432/2553/4889 2439/2554/4890 2437/2546/4881 +s 21 +f 2416/2540/4873 2411/2539/4872 2404/2533/4891 2402/2531/4892 +f 2416/2540/4873 2402/2531/4892 2400/2529/4893 2422/2555/4894 +f 2422/2555/4894 2400/2529/4893 2398/2527/4895 2428/2556/4896 +f 2428/2556/4896 2398/2527/4895 2396/2525/4897 2434/2557/4898 +f 2434/2557/4898 2396/2525/4897 2394/2524/4899 2438/2558/4900 +s 22 +f 2403/2534/4901 2405/2559/4902 2410/2560/4903 2401/2532/4904 +f 2401/2532/4904 2410/2560/4903 2419/2561/4905 2399/2530/4906 +f 2399/2530/4906 2419/2561/4905 2425/2562/4907 2397/2528/4908 +f 2397/2528/4908 2425/2562/4907 2431/2541/4875 2395/2526/4909 +f 2395/2526/4909 2431/2541/4875 2435/2544/4878 2393/2523/4910 +f 2405/2559/4902 2407/2563/4911 2409/2564/4912 2410/2560/4903 +s 20 +f 2407/2563/4913 2406/2548/4884 2408/2547/4883 2409/2564/4914 +f 2414/2538/4870 2415/2537/4869 2421/2565/4915 2420/2549/4885 +s 21 +f 2415/2537/4874 2416/2540/4873 2422/2555/4894 2421/2565/4916 +s 22 +f 2410/2560/4903 2409/2564/4912 2418/2566/4917 2419/2561/4905 +s 20 +f 2409/2564/4914 2408/2547/4883 2417/2550/4886 2418/2566/4918 +f 2420/2549/4885 2421/2565/4915 2427/2567/4919 2426/2551/4887 +s 21 +f 2421/2565/4916 2422/2555/4894 2428/2556/4896 2427/2567/4920 +s 22 +f 2419/2561/4905 2418/2566/4917 2424/2568/4921 2425/2562/4907 +s 20 +f 2418/2566/4918 2417/2550/4886 2423/2552/4888 2424/2568/4922 +f 2426/2551/4887 2427/2567/4919 2433/2569/4923 2432/2553/4889 +s 21 +f 2427/2567/4920 2428/2556/4896 2434/2557/4898 2433/2569/4924 +s 22 +f 2425/2562/4907 2424/2568/4921 2430/2542/4876 2431/2541/4875 +s 20 +f 2424/2568/4922 2423/2552/4888 2429/2545/4880 2430/2542/4879 +f 2432/2553/4889 2433/2569/4923 2440/2570/4925 2439/2554/4890 +s 21 +f 2433/2569/4924 2434/2557/4898 2438/2558/4900 2440/2570/4926 +s 25 +f 2441/2571/4927 2442/2572/4928 2444/2573/4929 2443/2574/4930 +f 2443/2574/4930 2444/2573/4929 2446/2575/4931 2445/2576/4932 +f 2445/2576/4932 2446/2575/4931 2448/2577/4933 2447/2578/4934 +f 2447/2578/4934 2448/2577/4933 2450/2579/4935 2449/2580/4936 +f 2449/2580/4936 2450/2579/4935 2452/2581/4937 2451/2582/4938 +s 26 +f 2461/2583/4939 2460/2584/4940 2463/2585/4941 2462/2586/4942 +s 27 +f 2460/2584/4943 2459/2587/4944 2464/2588/4945 2463/2585/4946 +s 28 +f 2479/2589/4947 2478/2590/4948 2484/2591/4949 2483/2592/4950 +s 26 +f 2478/2590/4951 2477/2593/4952 2485/2594/4953 2484/2591/4954 +f 2456/2595/4955 2454/2596/4956 2461/2583/4939 2462/2586/4942 +f 2456/2595/4955 2462/2586/4942 2468/2597/4957 2465/2598/4958 +f 2465/2598/4958 2468/2597/4957 2474/2599/4959 2471/2600/4960 +f 2471/2600/4960 2474/2599/4959 2480/2601/4961 2477/2593/4952 +f 2477/2593/4952 2480/2601/4961 2487/2602/4962 2485/2594/4953 +s 27 +f 2464/2588/4945 2459/2587/4944 2452/2581/4963 2450/2579/4964 +f 2464/2588/4945 2450/2579/4964 2448/2577/4965 2470/2603/4966 +f 2470/2603/4966 2448/2577/4965 2446/2575/4967 2476/2604/4968 +f 2476/2604/4968 2446/2575/4967 2444/2573/4969 2482/2605/4970 +f 2482/2605/4970 2444/2573/4969 2442/2572/4971 2486/2606/4972 +s 28 +f 2451/2582/4973 2453/2607/4974 2458/2608/4975 2449/2580/4976 +f 2449/2580/4976 2458/2608/4975 2467/2609/4977 2447/2578/4978 +f 2447/2578/4978 2467/2609/4977 2473/2610/4979 2445/2576/4980 +f 2445/2576/4980 2473/2610/4979 2479/2589/4947 2443/2574/4981 +f 2443/2574/4981 2479/2589/4947 2483/2592/4950 2441/2571/4982 +f 2453/2607/4974 2455/2611/4983 2457/2612/4984 2458/2608/4975 +s 26 +f 2455/2611/4985 2454/2596/4956 2456/2595/4955 2457/2612/4986 +f 2462/2586/4942 2463/2585/4941 2469/2613/4987 2468/2597/4957 +s 27 +f 2463/2585/4946 2464/2588/4945 2470/2603/4966 2469/2613/4988 +s 28 +f 2458/2608/4975 2457/2612/4984 2466/2614/4989 2467/2609/4977 +s 26 +f 2457/2612/4986 2456/2595/4955 2465/2598/4958 2466/2614/4990 +f 2468/2597/4957 2469/2613/4987 2475/2615/4991 2474/2599/4959 +s 27 +f 2469/2613/4988 2470/2603/4966 2476/2604/4968 2475/2615/4992 +s 28 +f 2467/2609/4977 2466/2614/4989 2472/2616/4993 2473/2610/4979 +s 26 +f 2466/2614/4990 2465/2598/4958 2471/2600/4960 2472/2616/4994 +f 2474/2599/4959 2475/2615/4991 2481/2617/4995 2480/2601/4961 +s 27 +f 2475/2615/4992 2476/2604/4968 2482/2605/4970 2481/2617/4996 +s 28 +f 2473/2610/4979 2472/2616/4993 2478/2590/4948 2479/2589/4947 +s 26 +f 2472/2616/4994 2471/2600/4960 2477/2593/4952 2478/2590/4951 +f 2480/2601/4961 2481/2617/4995 2488/2618/4997 2487/2602/4962 +s 27 +f 2481/2617/4996 2482/2605/4970 2486/2606/4972 2488/2618/4998 +s 31 +f 2489/2619/4999 2490/2620/5000 2492/2621/5001 2491/2622/5002 +f 2491/2622/5002 2492/2621/5001 2494/2623/5003 2493/2624/5004 +f 2493/2624/5004 2494/2623/5003 2496/2625/5005 2495/2626/5006 +f 2495/2626/5006 2496/2625/5005 2498/2627/5007 2497/2628/5008 +f 2497/2628/5008 2498/2627/5007 2500/2629/5009 2499/2630/5010 +s 32 +f 2509/2631/5011 2508/2632/5012 2511/2633/5013 2510/2634/5014 +s 33 +f 2508/2632/5015 2507/2635/5016 2512/2636/5017 2511/2633/5018 +s 34 +f 2527/2637/5019 2526/2638/5020 2532/2639/5021 2531/2640/5022 +s 32 +f 2526/2638/5023 2525/2641/5024 2533/2642/5025 2532/2639/5026 +f 2504/2643/5027 2502/2644/5028 2509/2631/5011 2510/2634/5014 +f 2504/2643/5027 2510/2634/5014 2516/2645/5029 2513/2646/5030 +f 2513/2646/5030 2516/2645/5029 2522/2647/5031 2519/2648/5032 +f 2519/2648/5032 2522/2647/5031 2528/2649/5033 2525/2641/5024 +f 2525/2641/5024 2528/2649/5033 2535/2650/5034 2533/2642/5025 +s 33 +f 2512/2636/5017 2507/2635/5016 2500/2629/5035 2498/2627/5036 +f 2512/2636/5017 2498/2627/5036 2496/2625/5037 2518/2651/5038 +f 2518/2651/5038 2496/2625/5037 2494/2623/5039 2524/2652/5040 +f 2524/2652/5040 2494/2623/5039 2492/2621/5041 2530/2653/5042 +f 2530/2653/5042 2492/2621/5041 2490/2620/5043 2534/2654/5044 +s 34 +f 2499/2630/5045 2501/2655/5046 2506/2656/5047 2497/2628/5048 +f 2497/2628/5048 2506/2656/5047 2515/2657/5049 2495/2626/5050 +f 2495/2626/5050 2515/2657/5049 2521/2658/5051 2493/2624/5052 +f 2493/2624/5052 2521/2658/5051 2527/2637/5019 2491/2622/5053 +f 2491/2622/5053 2527/2637/5019 2531/2640/5022 2489/2619/5054 +f 2501/2655/5046 2503/2659/5055 2505/2660/5056 2506/2656/5047 +s 32 +f 2503/2659/5057 2502/2644/5028 2504/2643/5027 2505/2660/5058 +f 2510/2634/5014 2511/2633/5013 2517/2661/5059 2516/2645/5029 +s 33 +f 2511/2633/5018 2512/2636/5017 2518/2651/5038 2517/2661/5060 +s 34 +f 2506/2656/5047 2505/2660/5056 2514/2662/5061 2515/2657/5049 +s 32 +f 2505/2660/5058 2504/2643/5027 2513/2646/5030 2514/2662/5062 +f 2516/2645/5029 2517/2661/5059 2523/2663/5063 2522/2647/5031 +s 33 +f 2517/2661/5060 2518/2651/5038 2524/2652/5040 2523/2663/5064 +s 34 +f 2515/2657/5049 2514/2662/5061 2520/2664/5065 2521/2658/5051 +s 32 +f 2514/2662/5062 2513/2646/5030 2519/2648/5032 2520/2664/5066 +f 2522/2647/5031 2523/2663/5063 2529/2665/5067 2528/2649/5033 +s 33 +f 2523/2663/5064 2524/2652/5040 2530/2653/5042 2529/2665/5068 +s 34 +f 2521/2658/5051 2520/2664/5065 2526/2638/5020 2527/2637/5019 +s 32 +f 2520/2664/5066 2519/2648/5032 2525/2641/5024 2526/2638/5023 +f 2528/2649/5033 2529/2665/5067 2536/2666/5069 2535/2650/5034 +s 33 +f 2529/2665/5068 2530/2653/5042 2534/2654/5044 2536/2666/5070 +s 37 +f 2537/2667/5071 2538/2668/5072 2540/2669/5073 2539/2670/5074 +f 2539/2670/5074 2540/2669/5073 2542/2671/5075 2541/2672/5076 +f 2541/2672/5076 2542/2671/5075 2544/2673/5077 2543/2674/5078 +f 2543/2674/5078 2544/2673/5077 2546/2675/5079 2545/2676/5080 +f 2545/2676/5080 2546/2675/5079 2548/2677/5081 2547/2678/5082 +s 38 +f 2557/2679/5083 2556/2680/5084 2559/2681/5085 2558/2682/5086 +s 39 +f 2556/2680/5087 2555/2683/5088 2560/2684/5089 2559/2681/5090 +s 40 +f 2575/2685/5091 2574/2686/5092 2580/2687/5093 2579/2688/5094 +s 38 +f 2574/2686/5095 2573/2689/5096 2581/2690/5097 2580/2687/5098 +f 2552/2691/5099 2550/2692/5100 2557/2679/5083 2558/2682/5086 +f 2552/2691/5099 2558/2682/5086 2564/2693/5101 2561/2694/5102 +f 2561/2694/5102 2564/2693/5101 2570/2695/5103 2567/2696/5104 +f 2567/2696/5104 2570/2695/5103 2576/2697/5105 2573/2689/5096 +f 2573/2689/5096 2576/2697/5105 2583/2698/5106 2581/2690/5097 +s 39 +f 2560/2684/5089 2555/2683/5088 2548/2677/5107 2546/2675/5108 +f 2560/2684/5089 2546/2675/5108 2544/2673/5109 2566/2699/5110 +f 2566/2699/5110 2544/2673/5109 2542/2671/5111 2572/2700/5112 +f 2572/2700/5112 2542/2671/5111 2540/2669/5113 2578/2701/5114 +f 2578/2701/5114 2540/2669/5113 2538/2668/5115 2582/2702/5116 +s 40 +f 2547/2678/5117 2549/2703/5118 2554/2704/5119 2545/2676/5120 +f 2545/2676/5120 2554/2704/5119 2563/2705/5121 2543/2674/5122 +f 2543/2674/5122 2563/2705/5121 2569/2706/5123 2541/2672/5124 +f 2541/2672/5124 2569/2706/5123 2575/2685/5091 2539/2670/5125 +f 2539/2670/5125 2575/2685/5091 2579/2688/5094 2537/2667/5126 +f 2549/2703/5118 2551/2707/5127 2553/2708/5128 2554/2704/5119 +s 38 +f 2551/2707/5129 2550/2692/5100 2552/2691/5099 2553/2708/5130 +f 2558/2682/5086 2559/2681/5085 2565/2709/5131 2564/2693/5101 +s 39 +f 2559/2681/5090 2560/2684/5089 2566/2699/5110 2565/2709/5132 +s 40 +f 2554/2704/5119 2553/2708/5128 2562/2710/5133 2563/2705/5121 +s 38 +f 2553/2708/5130 2552/2691/5099 2561/2694/5102 2562/2710/5134 +f 2564/2693/5101 2565/2709/5131 2571/2711/5135 2570/2695/5103 +s 39 +f 2565/2709/5132 2566/2699/5110 2572/2700/5112 2571/2711/5136 +s 40 +f 2563/2705/5121 2562/2710/5133 2568/2712/5137 2569/2706/5123 +s 38 +f 2562/2710/5134 2561/2694/5102 2567/2696/5104 2568/2712/5138 +f 2570/2695/5103 2571/2711/5135 2577/2713/5139 2576/2697/5105 +s 39 +f 2571/2711/5136 2572/2700/5112 2578/2701/5114 2577/2713/5140 +s 40 +f 2569/2706/5123 2568/2712/5137 2574/2686/5092 2575/2685/5091 +s 38 +f 2568/2712/5138 2567/2696/5104 2573/2689/5096 2574/2686/5095 +f 2576/2697/5105 2577/2713/5139 2584/2714/5141 2583/2698/5106 +s 39 +f 2577/2713/5140 2578/2701/5114 2582/2702/5116 2584/2714/5142 +v 104.053026 -68.426746 86.500000 +v 109.284840 -62.711403 86.500000 +v 104.722717 -71.088154 86.500000 +v 109.588940 -66.393829 86.500000 +v 106.136734 -73.368653 86.500000 +v 110.667406 -68.547161 86.500000 +v 108.265171 -75.138235 86.500000 +v 111.859961 -69.776409 86.500000 +v 111.259073 -76.201255 86.500000 +v 113.784493 -71.178699 86.500000 +v 113.967731 -76.101324 86.500000 +v 116.395687 -71.895980 86.500000 +v 113.967731 -76.101324 88.971863 +v 114.574658 -75.050093 90.000000 +v 114.145495 -75.793426 89.698868 +v 111.417729 -75.166562 90.000000 +v 111.305543 -75.898200 89.698868 +v 111.259073 -76.201255 88.971863 +v 116.395687 -71.895980 88.971863 +v 116.240067 -72.165522 89.698868 +v 115.864367 -72.816254 90.000000 +v 113.330927 -72.120332 90.000000 +v 113.651647 -71.454497 89.698868 +v 113.784493 -71.178699 88.971863 +v 108.781698 -74.230609 90.000000 +v 108.416458 -74.872397 89.698868 +v 108.265171 -75.138235 88.971863 +v 111.183334 -70.555511 90.000000 +v 111.661781 -70.004603 89.698868 +v 111.859961 -69.776409 88.971863 +v 106.922497 -72.684870 90.000000 +v 106.366877 -73.168378 89.698868 +v 106.136734 -73.368653 88.971863 +v 109.819101 -69.149302 90.000000 +v 110.418945 -68.723524 89.698868 +v 110.667406 -68.547161 88.971863 +v 105.680763 -70.682228 90.000000 +v 105.003323 -70.969261 89.698868 +v 104.722717 -71.088154 88.971863 +v 108.580645 -66.676528 90.000000 +v 109.293615 -66.476629 89.698868 +v 109.588940 -66.393829 88.971863 +v 104.053026 -68.426746 88.971863 +v 104.296593 -68.160666 89.698868 +v 104.884623 -67.518293 90.000000 +v 109.284840 -62.711403 88.971863 +v 108.338568 -63.745132 90.000000 +v 109.007683 -63.014175 89.698868 +v 136.412685 -76.291794 86.574837 +v 134.708210 -72.946573 86.574837 +v 132.053427 -70.291790 86.574837 +v 128.708206 -68.587316 86.574837 +v 125.000000 -67.999994 86.574837 +v 121.291794 -68.587317 86.574837 +v 117.946574 -70.291792 86.574837 +v 115.291793 -72.946575 86.574837 +v 113.587318 -76.291795 86.574837 +v 112.999997 -80.000000 86.574837 +v 113.587318 -83.708205 86.574837 +v 115.291794 -87.053424 86.574837 +v 117.946576 -89.708205 86.574837 +v 121.291795 -91.412680 86.574837 +v 125.000000 -92.000002 86.574837 +v 128.708204 -91.412680 86.574837 +v 132.053423 -89.708204 86.574837 +v 134.708204 -87.053424 86.574837 +v 136.412679 -83.708204 86.574837 +v 137.000000 -80.000000 86.574837 +v 125.000000 -80.000000 86.574837 +v 125.000000 -80.000000 96.400772 +v 136.412685 -76.291794 92.053146 +v 136.167562 -76.371439 92.987488 +v 134.708210 -72.946573 92.053146 +v 134.499696 -73.098067 92.987488 +v 132.053427 -70.291790 92.053146 +v 131.901933 -70.500304 92.987488 +v 128.708206 -68.587316 92.053146 +v 128.628561 -68.832438 92.987488 +v 125.000000 -67.999994 92.053146 +v 125.000000 -68.257731 92.987488 +v 121.291794 -68.587317 92.053146 +v 121.371439 -68.832439 92.987488 +v 117.946574 -70.291792 92.053146 +v 118.098068 -70.500306 92.987488 +v 115.291793 -72.946575 92.053146 +v 115.500307 -73.098069 92.987488 +v 113.587318 -76.291795 92.053146 +v 113.832441 -76.371440 92.987488 +v 112.999997 -80.000000 92.053146 +v 113.257734 -80.000000 92.987488 +v 113.587318 -83.708205 92.053146 +v 113.832441 -83.628560 92.987488 +v 115.291794 -87.053424 92.053146 +v 115.500308 -86.901930 92.987488 +v 117.946576 -89.708205 92.053146 +v 118.098070 -89.499691 92.987488 +v 121.291795 -91.412680 92.053146 +v 121.371440 -91.167557 92.987488 +v 125.000000 -92.000002 92.053146 +v 125.000000 -91.742265 92.987488 +v 128.708204 -91.412680 92.053146 +v 128.628559 -91.167557 92.987488 +v 132.053423 -89.708204 92.053146 +v 131.901929 -89.499690 92.987488 +v 134.708204 -87.053424 92.053146 +v 134.499690 -86.901930 92.987488 +v 136.412679 -83.708204 92.053146 +v 136.167556 -83.628559 92.987488 +v 137.000000 -80.000000 92.053146 +v 136.742263 -80.000000 92.987488 +v 134.505449 -76.911492 95.920097 +v 133.695946 -77.174515 96.400772 +v 132.397213 -74.625610 96.400772 +v 133.085817 -74.125310 95.920097 +v 130.374389 -72.602787 96.400772 +v 130.874690 -71.914183 95.920097 +v 127.825484 -71.304054 96.400772 +v 128.088507 -70.494551 95.920097 +v 125.000000 -70.856544 96.400772 +v 125.000000 -70.005382 95.920097 +v 122.174516 -71.304054 96.400772 +v 121.911493 -70.494552 95.920097 +v 119.625611 -72.602787 96.400772 +v 119.125311 -71.914184 95.920097 +v 117.602789 -74.625612 96.400772 +v 116.914185 -74.125312 95.920097 +v 116.304056 -77.174517 96.400772 +v 115.494554 -76.911494 95.920097 +v 115.856545 -80.000000 96.400772 +v 115.005383 -80.000000 95.920097 +v 116.304056 -82.825483 96.400772 +v 115.494554 -83.088506 95.920097 +v 117.602789 -85.374387 96.400772 +v 116.914186 -85.874687 95.920097 +v 119.625612 -87.397209 96.400772 +v 119.125312 -88.085813 95.920097 +v 122.174517 -88.695942 96.400772 +v 121.911493 -89.505445 95.920097 +v 124.999999 -89.143453 96.400772 +v 124.999999 -89.994615 95.920097 +v 127.825482 -88.695942 96.400772 +v 128.088506 -89.505445 95.920097 +v 130.374386 -87.397209 96.400772 +v 130.874686 -88.085813 95.920097 +v 132.397208 -85.374386 96.400772 +v 133.085813 -85.874687 95.920097 +v 133.695941 -82.825482 96.400772 +v 134.505444 -83.088505 95.920097 +v 134.143452 -79.999999 96.400772 +v 134.994614 -80.000000 95.920097 +v 153.531713 -70.729485 88.759880 +v 149.270527 -62.366432 88.759880 +v 142.633568 -55.729475 88.759880 +v 134.270514 -51.468290 88.759880 +v 125.000000 -49.999985 88.759880 +v 115.729486 -51.468292 88.759880 +v 107.366436 -55.729481 88.759880 +v 100.729483 -62.366438 88.759880 +v 96.468296 -70.729488 88.759880 +v 94.999992 -80.000000 88.759880 +v 96.468296 -89.270512 88.759880 +v 100.729485 -97.633560 88.759880 +v 107.366440 -104.270514 88.759880 +v 115.729488 -108.531700 88.759880 +v 124.999999 -110.000004 88.759880 +v 134.270509 -108.531698 88.759880 +v 142.633556 -104.270512 88.759880 +v 149.270510 -97.633558 88.759880 +v 153.531696 -89.270510 88.759880 +v 155.000000 -80.000000 88.759880 +v 148.801991 -72.266262 94.455727 +v 145.247189 -65.289558 94.455727 +v 139.710441 -59.752813 94.455727 +v 132.733735 -56.198008 94.455727 +v 124.999999 -54.973106 94.455727 +v 117.266263 -56.198009 94.455727 +v 110.289562 -59.752821 94.455727 +v 104.752823 -65.289564 94.455727 +v 101.198013 -72.266266 94.455727 +v 99.973114 -79.999999 94.455727 +v 101.198013 -87.733732 94.455727 +v 104.752823 -94.710433 94.455727 +v 110.289566 -100.247175 94.455727 +v 117.266266 -103.801981 94.455727 +v 124.999999 -105.026882 94.455727 +v 132.733730 -103.801981 94.455727 +v 139.710430 -100.247173 94.455727 +v 145.247169 -94.710432 94.455727 +v 148.801979 -87.733731 94.455727 +v 150.026878 -79.999999 94.455727 +v 146.898983 -72.884587 94.455727 +v 143.628391 -66.465683 94.455727 +v 138.534315 -61.371609 94.455727 +v 132.115409 -58.101017 94.455727 +v 124.999999 -56.974049 94.455727 +v 117.884588 -58.101017 94.455727 +v 111.465687 -61.371616 94.455727 +v 106.371616 -66.465687 94.455727 +v 103.101023 -72.884590 94.455727 +v 101.974054 -79.999999 94.455727 +v 103.101023 -87.115407 94.455727 +v 106.371618 -93.534309 94.455727 +v 111.465689 -98.628380 94.455727 +v 117.884591 -101.898972 94.455727 +v 124.999998 -103.025940 94.455727 +v 132.115405 -101.898972 94.455727 +v 138.534306 -98.628376 94.455727 +v 143.628376 -93.534307 94.455727 +v 146.898972 -87.115406 94.455727 +v 148.025940 -79.999999 94.455727 +v 146.874313 -72.892603 86.574837 +v 143.607403 -66.480930 86.574837 +v 138.519068 -61.392595 86.574837 +v 132.107393 -58.125689 86.574837 +v 124.999999 -56.999987 86.574837 +v 117.892605 -58.125689 86.574837 +v 111.480933 -61.392601 86.574837 +v 106.392603 -66.480935 86.574837 +v 103.125694 -72.892606 86.574837 +v 101.999994 -79.999999 86.574837 +v 103.125694 -87.107391 86.574837 +v 106.392605 -93.519062 86.574837 +v 111.480936 -98.607391 86.574837 +v 117.892607 -101.874302 86.574837 +v 124.999998 -103.000000 86.574837 +v 132.107389 -101.874300 86.574837 +v 138.519058 -98.607389 86.574837 +v 143.607389 -93.519060 86.574837 +v 146.874300 -87.107389 86.574837 +v 148.000000 -79.999999 86.574837 +v 153.531713 -70.729485 86.574837 +v 149.270527 -62.366432 86.574837 +v 142.633568 -55.729475 86.574837 +v 134.270514 -51.468290 86.574837 +v 125.000000 -49.999985 86.574837 +v 115.729486 -51.468292 86.574837 +v 107.366436 -55.729481 86.574837 +v 100.729483 -62.366438 86.574837 +v 96.468296 -70.729488 86.574837 +v 94.999992 -80.000000 86.574837 +v 96.468296 -89.270512 86.574837 +v 100.729485 -97.633560 86.574837 +v 107.366440 -104.270514 86.574837 +v 115.729488 -108.531700 86.574837 +v 124.999999 -110.000004 86.574837 +v 134.270509 -108.531698 86.574837 +v 142.633556 -104.270512 86.574837 +v 149.270510 -97.633558 86.574837 +v 153.531696 -89.270510 86.574837 +v 155.000000 -80.000000 86.574837 +v 125.450756 -103.927238 86.500000 +v 117.885216 -102.254026 86.500000 +v 127.420757 -102.016565 86.500000 +v 120.922241 -100.149456 86.500000 +v 128.688719 -99.651741 86.500000 +v 122.247848 -98.138809 86.500000 +v 129.157002 -96.923670 86.500000 +v 122.716131 -96.491404 86.500000 +v 128.580653 -93.799364 86.500000 +v 122.968283 -94.123564 86.500000 +v 127.139782 -91.503564 86.500000 +v 122.283869 -91.503564 86.500000 +v 127.139782 -91.503564 88.971863 +v 125.925925 -91.503564 90.000000 +v 126.784252 -91.503564 89.698868 +v 127.605256 -94.179311 90.000000 +v 128.294966 -93.910648 89.698868 +v 128.580653 -93.799364 88.971863 +v 122.283869 -91.503564 88.971863 +v 122.595109 -91.503564 89.698868 +v 123.346510 -91.503564 90.000000 +v 124.010544 -94.045548 90.000000 +v 123.273554 -94.100714 89.698868 +v 122.968283 -94.123564 88.971863 +v 128.112712 -96.930157 90.000000 +v 128.851137 -96.925570 89.698868 +v 129.157002 -96.923670 88.971863 +v 123.729167 -96.687828 90.000000 +v 123.012842 -96.548935 89.698868 +v 122.716131 -96.491404 88.971863 +v 127.703663 -99.313143 90.000000 +v 128.400203 -99.552568 89.698868 +v 128.688719 -99.651741 88.971863 +v 123.193469 -98.572393 90.000000 +v 122.524814 -98.265802 89.698868 +v 122.247848 -98.138809 88.971863 +v 126.590191 -101.389835 90.000000 +v 127.177490 -101.833000 89.698868 +v 127.420757 -102.016565 88.971863 +v 121.671213 -100.881315 90.000000 +v 121.141609 -100.363813 89.698868 +v 120.922241 -100.149456 88.971863 +v 125.450756 -103.927238 88.971863 +v 125.098539 -103.849342 89.698868 +v 124.248214 -103.661282 90.000000 +v 117.885216 -102.254026 88.971863 +v 119.253588 -102.556658 90.000000 +v 118.286003 -102.342665 89.698868 +v 145.496218 -67.646015 86.500000 +v 147.829945 -75.034570 86.500000 +v 142.856525 -66.895281 86.500000 +v 144.488819 -73.456715 86.500000 +v 140.174548 -66.979606 86.500000 +v 142.084745 -73.314029 86.500000 +v 137.577826 -67.938095 86.500000 +v 140.423908 -73.732187 86.500000 +v 135.160273 -69.999381 86.500000 +v 138.247224 -74.697737 86.500000 +v 133.892488 -72.395113 86.500000 +v 136.320444 -76.600456 86.500000 +v 133.892488 -72.395113 88.971863 +v 134.499415 -73.446343 90.000000 +v 134.070252 -72.703011 89.698868 +v 135.977015 -70.654127 90.000000 +v 135.399491 -70.191152 89.698868 +v 135.160273 -69.999381 88.971863 +v 136.320444 -76.600456 88.971863 +v 136.164824 -76.330914 89.698868 +v 135.789124 -75.680182 90.000000 +v 137.658529 -73.834120 90.000000 +v 138.074800 -74.444789 89.698868 +v 138.247224 -74.697737 88.971863 +v 138.105589 -68.839234 90.000000 +v 137.732405 -68.202033 89.698868 +v 137.577826 -67.938095 88.971863 +v 140.087500 -72.756660 90.000000 +v 140.325377 -73.446462 89.698868 +v 140.423908 -73.732187 88.971863 +v 140.373840 -68.001987 90.000000 +v 140.232920 -67.279054 89.698868 +v 140.174548 -66.979606 88.971863 +v 141.987429 -72.278305 90.000000 +v 142.056242 -73.010673 89.698868 +v 142.084745 -73.314029 88.971863 +v 142.729046 -67.927937 90.000000 +v 142.819187 -67.197739 89.698868 +v 142.856525 -66.895281 88.971863 +v 144.748144 -72.442157 90.000000 +v 144.564775 -73.159557 89.698868 +v 144.488819 -73.456715 88.971863 +v 145.496218 -67.646015 88.971863 +v 145.604866 -67.989991 89.698868 +v 145.867163 -68.820425 90.000000 +v 147.829945 -75.034570 88.971863 +v 147.407843 -73.698210 90.000000 +v 147.706314 -74.643159 89.698868 +v 104.503782 -92.353985 86.500000 +v 102.170055 -84.965430 86.500000 +v 107.143475 -93.104719 86.500000 +v 105.511181 -86.543285 86.500000 +v 109.825452 -93.020394 86.500000 +v 107.915255 -86.685971 86.500000 +v 112.422174 -92.061905 86.500000 +v 109.576092 -86.267813 86.500000 +v 114.839727 -90.000619 86.500000 +v 111.752776 -85.302263 86.500000 +v 116.107512 -87.604887 86.500000 +v 113.679556 -83.399544 86.500000 +v 116.107512 -87.604887 88.971863 +v 115.500585 -86.553657 90.000000 +v 115.929748 -87.296989 89.698868 +v 114.022985 -89.345873 90.000000 +v 114.600509 -89.808848 89.698868 +v 114.839727 -90.000619 88.971863 +v 113.679556 -83.399544 88.971863 +v 113.835176 -83.669086 89.698868 +v 114.210876 -84.319818 90.000000 +v 112.341471 -86.165880 90.000000 +v 111.925200 -85.555211 89.698868 +v 111.752776 -85.302263 88.971863 +v 111.894411 -91.160766 90.000000 +v 112.267595 -91.797967 89.698868 +v 112.422174 -92.061905 88.971863 +v 109.912500 -87.243340 90.000000 +v 109.674623 -86.553538 89.698868 +v 109.576092 -86.267813 88.971863 +v 109.626160 -91.998013 90.000000 +v 109.767080 -92.720946 89.698868 +v 109.825452 -93.020394 88.971863 +v 108.012571 -87.721695 90.000000 +v 107.943758 -86.989327 89.698868 +v 107.915255 -86.685971 88.971863 +v 107.270954 -92.072063 90.000000 +v 107.180813 -92.802261 89.698868 +v 107.143475 -93.104719 88.971863 +v 105.251856 -87.557843 90.000000 +v 105.435225 -86.840443 89.698868 +v 105.511181 -86.543285 88.971863 +v 104.503782 -92.353985 88.971863 +v 104.395134 -92.010009 89.698868 +v 104.132837 -91.179575 90.000000 +v 102.170055 -84.965430 88.971863 +v 102.592157 -86.301790 90.000000 +v 102.293686 -85.356841 89.698868 +v 124.549244 -56.072762 86.500000 +v 132.114784 -57.745974 86.500000 +v 122.579243 -57.983435 86.500000 +v 129.077759 -59.850544 86.500000 +v 121.311281 -60.348259 86.500000 +v 127.752152 -61.861191 86.500000 +v 120.842998 -63.076330 86.500000 +v 127.283869 -63.508596 86.500000 +v 121.419347 -66.200636 86.500000 +v 127.031717 -65.876436 86.500000 +v 122.860218 -68.496436 86.500000 +v 127.716131 -68.496436 86.500000 +v 122.860218 -68.496436 88.971863 +v 124.074075 -68.496436 90.000000 +v 123.215748 -68.496436 89.698868 +v 122.394744 -65.820689 90.000000 +v 121.705034 -66.089352 89.698868 +v 121.419347 -66.200636 88.971863 +v 127.716131 -68.496436 88.971863 +v 127.404891 -68.496436 89.698868 +v 126.653490 -68.496436 90.000000 +v 125.989456 -65.954452 90.000000 +v 126.726446 -65.899286 89.698868 +v 127.031717 -65.876436 88.971863 +v 121.887288 -63.069843 90.000000 +v 121.148863 -63.074430 89.698868 +v 120.842998 -63.076330 88.971863 +v 126.270833 -63.312172 90.000000 +v 126.987158 -63.451065 89.698868 +v 127.283869 -63.508596 88.971863 +v 122.296337 -60.686857 90.000000 +v 121.599797 -60.447432 89.698868 +v 121.311281 -60.348259 88.971863 +v 126.806531 -61.427607 90.000000 +v 127.475186 -61.734198 89.698868 +v 127.752152 -61.861191 88.971863 +v 123.409809 -58.610165 90.000000 +v 122.822510 -58.167000 89.698868 +v 122.579243 -57.983435 88.971863 +v 128.328787 -59.118685 90.000000 +v 128.858391 -59.636187 89.698868 +v 129.077759 -59.850544 88.971863 +v 124.549244 -56.072762 88.971863 +v 124.901461 -56.150658 89.698868 +v 125.751786 -56.338718 90.000000 +v 132.114784 -57.745974 88.971863 +v 130.746412 -57.443342 90.000000 +v 131.713997 -57.657335 89.698868 +v 145.946974 -91.573254 86.500000 +v 140.715160 -97.288597 86.500000 +v 145.277283 -88.911846 86.500000 +v 140.411060 -93.606171 86.500000 +v 143.863266 -86.631347 86.500000 +v 139.332594 -91.452839 86.500000 +v 141.734829 -84.861765 86.500000 +v 138.140039 -90.223591 86.500000 +v 138.740927 -83.798745 86.500000 +v 136.215507 -88.821301 86.500000 +v 136.032269 -83.898676 86.500000 +v 133.604313 -88.104020 86.500000 +v 136.032269 -83.898676 88.971863 +v 135.425342 -84.949907 90.000000 +v 135.854505 -84.206574 89.698868 +v 138.582271 -84.833438 90.000000 +v 138.694457 -84.101800 89.698868 +v 138.740927 -83.798745 88.971863 +v 133.604313 -88.104020 88.971863 +v 133.759933 -87.834478 89.698868 +v 134.135633 -87.183746 90.000000 +v 136.669073 -87.879668 90.000000 +v 136.348353 -88.545503 89.698868 +v 136.215507 -88.821301 88.971863 +v 141.218302 -85.769391 90.000000 +v 141.583542 -85.127603 89.698868 +v 141.734829 -84.861765 88.971863 +v 138.816666 -89.444489 90.000000 +v 138.338219 -89.995397 89.698868 +v 138.140039 -90.223591 88.971863 +v 143.077503 -87.315130 90.000000 +v 143.633123 -86.831622 89.698868 +v 143.863266 -86.631347 88.971863 +v 140.180899 -90.850698 90.000000 +v 139.581055 -91.276476 89.698868 +v 139.332594 -91.452839 88.971863 +v 144.319237 -89.317772 90.000000 +v 144.996677 -89.030739 89.698868 +v 145.277283 -88.911846 88.971863 +v 141.419355 -93.323472 90.000000 +v 140.706385 -93.523371 89.698868 +v 140.411060 -93.606171 88.971863 +v 145.946974 -91.573254 88.971863 +v 145.703407 -91.839334 89.698868 +v 145.115377 -92.481707 90.000000 +v 140.715160 -97.288597 88.971863 +v 141.661432 -96.254868 90.000000 +v 140.992317 -96.985825 89.698868 +vt 0.016937 0.027515 +vt 0.019416 0.030224 +vt 0.019560 0.028478 +vt 0.017254 0.026254 +vt 0.020071 0.027458 +vt 0.017924 0.025173 +vt 0.020636 0.026875 +vt 0.018933 0.024334 +vt 0.021548 0.026211 +vt 0.020352 0.023831 +vt 0.022786 0.025871 +vt 0.021635 0.023878 +vt 0.022534 0.025435 +vt 0.022712 0.025743 +vt 0.021486 0.026080 +vt 0.021334 0.025765 +vt 0.022786 0.025871 +vt 0.021548 0.026211 +vt 0.017254 0.026254 +vt 0.017387 0.026310 +vt 0.017052 0.027641 +vt 0.016937 0.027515 +vt 0.017708 0.026446 +vt 0.017331 0.027945 +vt 0.020427 0.024321 +vt 0.021923 0.024376 +vt 0.020316 0.026506 +vt 0.019178 0.024764 +vt 0.019669 0.027173 +vt 0.018297 0.025497 +vt 0.019082 0.028344 +vt 0.018968 0.029734 +vt 0.020636 0.026875 +vt 0.020071 0.027458 +vt 0.019560 0.028478 +vt 0.019416 0.030224 +vt 0.021635 0.023878 +vt 0.020352 0.023831 +vt 0.018933 0.024334 +vt 0.017924 0.025173 +vt 0.021720 0.024024 +vt 0.020374 0.023974 +vt 0.020542 0.026767 +vt 0.019004 0.024460 +vt 0.019953 0.027374 +vt 0.018033 0.025268 +vt 0.019420 0.028439 +vt 0.019285 0.030080 +vt 0.031464 0.025373 +vt 0.032272 0.023788 +vt 0.026864 0.022030 +vt 0.030206 0.026631 +vt 0.028621 0.027439 +vt 0.026864 0.027717 +vt 0.025106 0.027439 +vt 0.023521 0.026631 +vt 0.022263 0.025373 +vt 0.021455 0.023788 +vt 0.021177 0.022030 +vt 0.021455 0.020273 +vt 0.022263 0.018688 +vt 0.023521 0.017430 +vt 0.025106 0.016622 +vt 0.026864 0.016344 +vt 0.028621 0.016622 +vt 0.030206 0.017430 +vt 0.031464 0.018688 +vt 0.032272 0.020273 +vt 0.032550 0.022030 +vt 0.032272 0.023788 +vt 0.032156 0.023750 +vt 0.032428 0.022030 +vt 0.032550 0.022030 +vt 0.031464 0.025373 +vt 0.031366 0.025301 +vt 0.030206 0.026631 +vt 0.030134 0.026532 +vt 0.028621 0.027439 +vt 0.028583 0.027323 +vt 0.026864 0.027717 +vt 0.026864 0.027595 +vt 0.025106 0.027439 +vt 0.025144 0.027323 +vt 0.023521 0.026631 +vt 0.023593 0.026532 +vt 0.022263 0.025373 +vt 0.022362 0.025301 +vt 0.021455 0.023788 +vt 0.021571 0.023750 +vt 0.021177 0.022030 +vt 0.021299 0.022030 +vt 0.021455 0.020273 +vt 0.021571 0.020311 +vt 0.022263 0.018688 +vt 0.022362 0.018760 +vt 0.023521 0.017430 +vt 0.023593 0.017528 +vt 0.025106 0.016622 +vt 0.025144 0.016738 +vt 0.026864 0.016344 +vt 0.026864 0.016466 +vt 0.028621 0.016622 +vt 0.028583 0.016738 +vt 0.030206 0.017430 +vt 0.030134 0.017528 +vt 0.031464 0.018688 +vt 0.031366 0.018760 +vt 0.032272 0.020273 +vt 0.032156 0.020311 +vt 0.031368 0.023494 +vt 0.030985 0.023369 +vt 0.031197 0.022030 +vt 0.031600 0.022030 +vt 0.030695 0.024814 +vt 0.030369 0.024577 +vt 0.029648 0.025862 +vt 0.029410 0.025536 +vt 0.028327 0.026535 +vt 0.028203 0.026151 +vt 0.026864 0.026767 +vt 0.026864 0.026363 +vt 0.025400 0.026535 +vt 0.025525 0.026151 +vt 0.024079 0.025862 +vt 0.024317 0.025536 +vt 0.023032 0.024814 +vt 0.023358 0.024577 +vt 0.022359 0.023494 +vt 0.022742 0.023369 +vt 0.022127 0.022030 +vt 0.022530 0.022030 +vt 0.022359 0.020567 +vt 0.022742 0.020691 +vt 0.023032 0.019246 +vt 0.023358 0.019483 +vt 0.024079 0.018198 +vt 0.024317 0.018525 +vt 0.025400 0.017526 +vt 0.025525 0.017909 +vt 0.026864 0.017294 +vt 0.026864 0.017697 +vt 0.028327 0.017526 +vt 0.028203 0.017909 +vt 0.029648 0.018198 +vt 0.029410 0.018525 +vt 0.030695 0.019246 +vt 0.030369 0.019483 +vt 0.031368 0.020567 +vt 0.030985 0.020691 +vt 0.026864 0.022030 +vt 0.040385 0.026424 +vt 0.038365 0.030387 +vt 0.036459 0.029002 +vt 0.038143 0.025696 +vt 0.035220 0.033532 +vt 0.033835 0.031626 +vt 0.031257 0.035552 +vt 0.030529 0.033310 +vt 0.026864 0.036247 +vt 0.026864 0.033891 +vt 0.022470 0.035552 +vt 0.023198 0.033310 +vt 0.018507 0.033532 +vt 0.019892 0.031626 +vt 0.015362 0.030387 +vt 0.017268 0.029002 +vt 0.013342 0.026424 +vt 0.015584 0.025696 +vt 0.012646 0.022030 +vt 0.015003 0.022030 +vt 0.013342 0.017637 +vt 0.015584 0.018365 +vt 0.015362 0.013674 +vt 0.017268 0.015059 +vt 0.018507 0.010529 +vt 0.019892 0.012435 +vt 0.022470 0.008509 +vt 0.023198 0.010751 +vt 0.026864 0.007813 +vt 0.026864 0.010170 +vt 0.031257 0.008509 +vt 0.030529 0.010751 +vt 0.035220 0.010529 +vt 0.033835 0.012435 +vt 0.038365 0.013674 +vt 0.036459 0.015059 +vt 0.040385 0.017637 +vt 0.038143 0.018365 +vt 0.041081 0.022030 +vt 0.038724 0.022030 +vt 0.035692 0.028444 +vt 0.037242 0.025402 +vt 0.033278 0.030859 +vt 0.030236 0.032408 +vt 0.026864 0.032942 +vt 0.023491 0.032408 +vt 0.020450 0.030859 +vt 0.018035 0.028444 +vt 0.016485 0.025402 +vt 0.015951 0.022030 +vt 0.016485 0.018658 +vt 0.018035 0.015616 +vt 0.020450 0.013202 +vt 0.023492 0.011652 +vt 0.026864 0.011118 +vt 0.030236 0.011652 +vt 0.033278 0.013202 +vt 0.035692 0.015616 +vt 0.037242 0.018658 +vt 0.037776 0.022030 +vt 0.038365 0.030387 +vt 0.040385 0.026424 +vt 0.037230 0.025399 +vt 0.035682 0.028437 +vt 0.035220 0.033532 +vt 0.033270 0.030849 +vt 0.031257 0.035552 +vt 0.030232 0.032397 +vt 0.026864 0.036247 +vt 0.026864 0.032930 +vt 0.022470 0.035552 +vt 0.023495 0.032397 +vt 0.018507 0.033532 +vt 0.020457 0.030849 +vt 0.015362 0.030387 +vt 0.018045 0.028437 +vt 0.013342 0.026424 +vt 0.016497 0.025399 +vt 0.012646 0.022030 +vt 0.015964 0.022030 +vt 0.013342 0.017637 +vt 0.016497 0.018662 +vt 0.015362 0.013674 +vt 0.018045 0.015624 +vt 0.018507 0.010529 +vt 0.020457 0.013212 +vt 0.022470 0.008509 +vt 0.023495 0.011664 +vt 0.026864 0.007813 +vt 0.026864 0.011131 +vt 0.031257 0.008509 +vt 0.030232 0.011664 +vt 0.035220 0.010529 +vt 0.033270 0.013212 +vt 0.038365 0.013674 +vt 0.035682 0.015624 +vt 0.040385 0.017637 +vt 0.037230 0.018662 +vt 0.041081 0.022030 +vt 0.037763 0.022030 +vt 0.027077 0.010691 +vt 0.023492 0.011484 +vt 0.024931 0.012481 +vt 0.028011 0.011597 +vt 0.025559 0.013434 +vt 0.028612 0.012717 +vt 0.025781 0.014215 +vt 0.028834 0.014010 +vt 0.025901 0.015337 +vt 0.028560 0.015491 +vt 0.025576 0.016579 +vt 0.027878 0.016579 +vt 0.026080 0.016579 +vt 0.025724 0.016579 +vt 0.026045 0.015348 +vt 0.026395 0.015374 +vt 0.025576 0.016579 +vt 0.025901 0.015337 +vt 0.028011 0.011597 +vt 0.027895 0.011684 +vt 0.026910 0.010728 +vt 0.027077 0.010691 +vt 0.027617 0.011894 +vt 0.026507 0.010817 +vt 0.028098 0.015311 +vt 0.027302 0.016579 +vt 0.026261 0.014122 +vt 0.028339 0.014007 +vt 0.026007 0.013229 +vt 0.028145 0.012878 +vt 0.025286 0.012135 +vt 0.024140 0.011341 +vt 0.025781 0.014215 +vt 0.025559 0.013434 +vt 0.024931 0.012481 +vt 0.023492 0.011484 +vt 0.027878 0.016579 +vt 0.028560 0.015491 +vt 0.028834 0.014010 +vt 0.028612 0.012717 +vt 0.027709 0.016579 +vt 0.028425 0.015438 +vt 0.025922 0.014188 +vt 0.028689 0.014009 +vt 0.025691 0.013374 +vt 0.028475 0.012764 +vt 0.025035 0.012380 +vt 0.023682 0.011442 +vt 0.036577 0.027885 +vt 0.037683 0.024383 +vt 0.036099 0.025131 +vt 0.035326 0.028241 +vt 0.034960 0.025199 +vt 0.034055 0.028201 +vt 0.034173 0.025001 +vt 0.032824 0.027746 +vt 0.033142 0.024543 +vt 0.031679 0.026770 +vt 0.032228 0.023641 +vt 0.031078 0.025634 +vt 0.031977 0.024078 +vt 0.032155 0.023769 +vt 0.033060 0.024663 +vt 0.032863 0.024952 +vt 0.032228 0.023641 +vt 0.033142 0.024543 +vt 0.035326 0.028241 +vt 0.035308 0.028097 +vt 0.036628 0.027722 +vt 0.036577 0.027885 +vt 0.035265 0.027751 +vt 0.036753 0.027329 +vt 0.032066 0.026459 +vt 0.031365 0.025136 +vt 0.034014 0.025463 +vt 0.033074 0.027320 +vt 0.034914 0.025690 +vt 0.034149 0.027716 +vt 0.036222 0.025612 +vt 0.037483 0.025017 +vt 0.034173 0.025001 +vt 0.034960 0.025199 +vt 0.036099 0.025131 +vt 0.037683 0.024383 +vt 0.031078 0.025634 +vt 0.031679 0.026770 +vt 0.032824 0.027746 +vt 0.034055 0.028201 +vt 0.031162 0.025489 +vt 0.031792 0.026679 +vt 0.034126 0.025136 +vt 0.032898 0.027622 +vt 0.034947 0.025343 +vt 0.034083 0.028059 +vt 0.036135 0.025272 +vt 0.037624 0.024569 +vt 0.017150 0.016176 +vt 0.016044 0.019677 +vt 0.017628 0.018930 +vt 0.018401 0.015820 +vt 0.018767 0.018862 +vt 0.019672 0.015860 +vt 0.019554 0.019060 +vt 0.020903 0.016314 +vt 0.020586 0.019518 +vt 0.022049 0.017291 +vt 0.021499 0.020419 +vt 0.022649 0.018426 +vt 0.021751 0.019983 +vt 0.021573 0.020292 +vt 0.020667 0.019398 +vt 0.020865 0.019108 +vt 0.021499 0.020419 +vt 0.020586 0.019518 +vt 0.018401 0.015820 +vt 0.018419 0.015963 +vt 0.017099 0.016339 +vt 0.017150 0.016176 +vt 0.018462 0.016309 +vt 0.016974 0.016732 +vt 0.021661 0.017601 +vt 0.022362 0.018925 +vt 0.019713 0.018598 +vt 0.020653 0.016741 +vt 0.018813 0.018371 +vt 0.019578 0.016345 +vt 0.017505 0.018449 +vt 0.016244 0.019044 +vt 0.019554 0.019060 +vt 0.018767 0.018862 +vt 0.017628 0.018930 +vt 0.016044 0.019677 +vt 0.022649 0.018426 +vt 0.022049 0.017291 +vt 0.020903 0.016314 +vt 0.019672 0.015860 +vt 0.022565 0.018572 +vt 0.021935 0.017382 +vt 0.019601 0.018925 +vt 0.020830 0.016439 +vt 0.018780 0.018718 +vt 0.019645 0.016002 +vt 0.017592 0.018789 +vt 0.016103 0.019492 +vt 0.026650 0.033370 +vt 0.030235 0.032577 +vt 0.028796 0.031579 +vt 0.025716 0.032464 +vt 0.028168 0.030626 +vt 0.025115 0.031343 +vt 0.027946 0.029846 +vt 0.024894 0.030051 +vt 0.027826 0.028724 +vt 0.025167 0.028570 +vt 0.028151 0.027482 +vt 0.025849 0.027482 +vt 0.027647 0.027482 +vt 0.028003 0.027482 +vt 0.027682 0.028713 +vt 0.027332 0.028687 +vt 0.028151 0.027482 +vt 0.027826 0.028724 +vt 0.025716 0.032464 +vt 0.025832 0.032377 +vt 0.026817 0.033333 +vt 0.026650 0.033370 +vt 0.026110 0.032167 +vt 0.027220 0.033243 +vt 0.025629 0.028750 +vt 0.026425 0.027482 +vt 0.027466 0.029939 +vt 0.025388 0.030054 +vt 0.027720 0.030832 +vt 0.025582 0.031183 +vt 0.028441 0.031926 +vt 0.029587 0.032720 +vt 0.027946 0.029846 +vt 0.028168 0.030626 +vt 0.028796 0.031579 +vt 0.030235 0.032577 +vt 0.025849 0.027482 +vt 0.025167 0.028570 +vt 0.024894 0.030051 +vt 0.025115 0.031343 +vt 0.026018 0.027482 +vt 0.025302 0.028623 +vt 0.027805 0.029873 +vt 0.025038 0.030051 +vt 0.028037 0.030687 +vt 0.025252 0.031296 +vt 0.028692 0.031681 +vt 0.030045 0.032619 +vt 0.036790 0.016546 +vt 0.034311 0.013837 +vt 0.034167 0.015582 +vt 0.036473 0.017807 +vt 0.033656 0.016603 +vt 0.035803 0.018888 +vt 0.033091 0.017185 +vt 0.034794 0.019726 +vt 0.032179 0.017850 +vt 0.033376 0.020230 +vt 0.030941 0.018190 +vt 0.032092 0.020183 +vt 0.031193 0.018626 +vt 0.031015 0.018318 +vt 0.032242 0.017981 +vt 0.032394 0.018296 +vt 0.030941 0.018190 +vt 0.032179 0.017850 +vt 0.036473 0.017807 +vt 0.036340 0.017751 +vt 0.036675 0.016420 +vt 0.036790 0.016546 +vt 0.036019 0.017615 +vt 0.036396 0.016115 +vt 0.033300 0.019740 +vt 0.031804 0.019685 +vt 0.033411 0.017555 +vt 0.034550 0.019296 +vt 0.034058 0.016888 +vt 0.035431 0.018564 +vt 0.034645 0.015716 +vt 0.034760 0.014327 +vt 0.033091 0.017185 +vt 0.033656 0.016603 +vt 0.034167 0.015582 +vt 0.034311 0.013837 +vt 0.032092 0.020183 +vt 0.033376 0.020230 +vt 0.034794 0.019726 +vt 0.035803 0.018888 +vt 0.032008 0.020037 +vt 0.033354 0.020087 +vt 0.033185 0.017294 +vt 0.034723 0.019600 +vt 0.033774 0.016686 +vt 0.035694 0.018793 +vt 0.034307 0.015622 +vt 0.034442 0.013981 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn 0.027246 0.099185 0.994696 +vn 0.101367 0.369011 0.923881 +vn 0.162606 0.340506 0.926075 +vn 0.024686 0.051696 0.998358 +vn 0.244718 0.890880 0.382682 +vn 0.263836 0.960472 0.088798 +vn 0.421697 0.901329 0.098884 +vn 0.391797 0.834209 0.388059 +vn -0.917798 -0.386139 0.092433 +vn -0.851056 -0.355317 0.386592 +vn -0.895950 -0.225449 0.382682 +vn -0.964230 -0.242630 0.106733 +vn -0.351280 -0.141841 0.925464 +vn -0.067114 -0.027100 0.997377 +vn -0.033461 -0.008419 0.999405 +vn -0.371111 -0.093383 0.923881 +vn -0.013205 -0.087412 0.996085 +vn 0.001804 -0.048902 0.998802 +vn 0.033181 0.039248 0.998679 +vn -0.038350 -0.069420 0.996850 +vn 0.038773 0.026020 0.998909 +vn -0.054266 -0.047440 0.997399 +vn 0.050026 0.013017 0.998663 +vn 0.145150 0.011987 0.989337 +vn 0.264882 0.964281 0.000000 +vn 0.423361 0.905961 0.000000 +vn 0.645085 0.764111 0.000000 +vn 0.642080 0.760489 0.096904 +vn 0.830237 0.557411 0.000000 +vn 0.826159 0.554659 0.099067 +vn 0.973065 0.230531 0.000000 +vn 0.968118 0.230508 0.098051 +vn 0.996608 0.082301 0.000000 +vn 0.993768 0.082066 0.075436 +vn 0.036868 -0.999320 0.000000 +vn 0.036661 -0.993693 0.105978 +vn -0.164969 -0.981991 0.092084 +vn -0.166529 -0.986037 0.000000 +vn -0.481914 -0.871511 0.090703 +vn -0.483926 -0.875109 0.000000 +vn -0.749605 -0.655636 0.090740 +vn -0.752703 -0.658361 0.000000 +vn -0.921442 -0.388517 0.000000 +vn -0.969769 -0.244024 0.000000 +vn 0.034062 -0.923251 0.382684 +vn -0.149845 -0.909156 0.388563 +vn 0.014109 -0.382420 0.923881 +vn -0.056284 -0.372613 0.926278 +vn 0.246316 0.291349 0.924361 +vn 0.595792 0.705475 0.383845 +vn -0.445985 -0.806676 0.387778 +vn -0.182604 -0.330547 0.925956 +vn 0.314673 0.211180 0.925410 +vn 0.765772 0.514075 0.386419 +vn -0.694100 -0.607036 0.386954 +vn -0.284919 -0.249074 0.925626 +vn 0.364635 0.094880 0.926304 +vn 0.895601 0.216729 0.388494 +vn 0.381386 0.031495 0.923879 +vn 0.920744 0.076037 0.382686 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.950337 0.308782 0.038887 +vn 0.847784 0.275461 0.453193 +vn 0.891413 -0.000001 0.453192 +vn 0.999244 -0.000001 0.038887 +vn 0.808405 0.587341 0.038887 +vn 0.721168 0.523959 0.453193 +vn 0.587341 0.808405 0.038887 +vn 0.523960 0.721168 0.453193 +vn 0.308783 0.950337 0.038887 +vn 0.275461 0.847784 0.453193 +vn 0.000000 0.999244 0.038887 +vn 0.000000 0.891413 0.453193 +vn -0.308783 0.950337 0.038887 +vn -0.275460 0.847784 0.453193 +vn -0.587340 0.808405 0.038887 +vn -0.523958 0.721168 0.453193 +vn -0.808405 0.587341 0.038887 +vn -0.721167 0.523960 0.453193 +vn -0.950337 0.308783 0.038887 +vn -0.847784 0.275462 0.453193 +vn -0.999244 0.000000 0.038887 +vn -0.891413 0.000000 0.453193 +vn -0.950337 -0.308784 0.038887 +vn -0.847783 -0.275462 0.453193 +vn -0.808405 -0.587341 0.038887 +vn -0.721167 -0.523960 0.453193 +vn -0.587341 -0.808405 0.038887 +vn -0.523959 -0.721168 0.453193 +vn -0.308784 -0.950337 0.038887 +vn -0.275462 -0.847784 0.453193 +vn 0.000000 -0.999244 0.038887 +vn -0.000000 -0.891412 0.453193 +vn 0.308783 -0.950337 0.038887 +vn 0.275460 -0.847784 0.453193 +vn 0.587340 -0.808405 0.038887 +vn 0.523958 -0.721168 0.453193 +vn 0.808405 -0.587341 0.038887 +vn 0.721167 -0.523960 0.453193 +vn 0.950337 -0.308783 0.038887 +vn 0.847784 -0.275462 0.453193 +vn 0.769325 0.249968 0.587925 +vn 0.101726 0.033053 0.994263 +vn 0.106960 -0.000000 0.994263 +vn 0.808916 -0.000001 0.587925 +vn 0.654426 0.475469 0.587925 +vn 0.086534 0.062871 0.994263 +vn 0.475468 0.654427 0.587925 +vn 0.062872 0.086534 0.994263 +vn 0.249968 0.769325 0.587925 +vn 0.033055 0.101727 0.994263 +vn -0.000000 0.808915 0.587925 +vn -0.000000 0.106962 0.994263 +vn -0.249968 0.769325 0.587925 +vn -0.033057 0.101727 0.994263 +vn -0.475468 0.654426 0.587925 +vn -0.062873 0.086534 0.994263 +vn -0.654426 0.475468 0.587925 +vn -0.086534 0.062871 0.994263 +vn -0.769324 0.249969 0.587925 +vn -0.101728 0.033053 0.994263 +vn -0.808915 0.000000 0.587925 +vn -0.106962 0.000000 0.994263 +vn -0.769324 -0.249969 0.587925 +vn -0.101729 -0.033053 0.994263 +vn -0.654426 -0.475469 0.587925 +vn -0.086535 -0.062871 0.994263 +vn -0.475468 -0.654427 0.587925 +vn -0.062870 -0.086534 0.994263 +vn -0.249968 -0.769324 0.587925 +vn -0.033053 -0.101727 0.994263 +vn -0.000001 -0.808915 0.587925 +vn 0.000000 -0.106962 0.994263 +vn 0.249968 -0.769325 0.587925 +vn 0.033053 -0.101727 0.994263 +vn 0.475468 -0.654427 0.587925 +vn 0.062871 -0.086534 0.994263 +vn 0.654426 -0.475469 0.587925 +vn 0.086534 -0.062871 0.994263 +vn 0.769324 -0.249969 0.587925 +vn 0.101727 -0.033053 0.994263 +vn 0.951057 0.309016 0.000000 +vn 0.809017 0.587786 0.000000 +vn 0.587785 0.809017 0.000000 +vn 0.309017 0.951057 0.000000 +vn -0.000000 1.000000 0.000000 +vn -0.309017 0.951057 0.000000 +vn -0.587785 0.809017 0.000000 +vn -0.809017 0.587785 0.000000 +vn -0.951057 0.309017 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.951057 -0.309017 0.000000 +vn -0.809017 -0.587785 0.000000 +vn -0.587785 -0.809017 0.000000 +vn -0.309017 -0.951057 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.309017 -0.951057 0.000000 +vn 0.587785 -0.809017 0.000000 +vn 0.809017 -0.587785 0.000000 +vn 0.951056 -0.309017 0.000000 +vn 1.000000 -0.000001 0.000000 +vn -0.000000 0.000000 1.000000 +vn 0.814402 0.264614 0.516458 +vn 0.692771 0.503328 0.516458 +vn 0.609417 0.442767 0.657699 +vn 0.716412 0.232776 0.657700 +vn 0.503328 0.692772 0.516458 +vn 0.442768 0.609417 0.657699 +vn 0.264615 0.814402 0.516458 +vn 0.232777 0.716412 0.657699 +vn 0.000000 0.856313 0.516458 +vn 0.000000 0.753281 0.657699 +vn -0.264615 0.814402 0.516458 +vn -0.232776 0.716412 0.657699 +vn -0.503328 0.692771 0.516458 +vn -0.442767 0.609417 0.657699 +vn -0.692771 0.503328 0.516458 +vn -0.609417 0.442767 0.657699 +vn -0.814402 0.264615 0.516458 +vn -0.716412 0.232777 0.657700 +vn -0.856312 -0.000000 0.516458 +vn -0.753280 0.000000 0.657700 +vn -0.814402 -0.264615 0.516458 +vn -0.716412 -0.232776 0.657699 +vn -0.692771 -0.503328 0.516458 +vn -0.609417 -0.442767 0.657699 +vn -0.503328 -0.692771 0.516458 +vn -0.442767 -0.609417 0.657699 +vn -0.264615 -0.814402 0.516458 +vn -0.232777 -0.716412 0.657699 +vn -0.000000 -0.856313 0.516458 +vn -0.000000 -0.753281 0.657699 +vn 0.264615 -0.814402 0.516458 +vn 0.232776 -0.716412 0.657699 +vn 0.503328 -0.692771 0.516458 +vn 0.442767 -0.609417 0.657699 +vn 0.692771 -0.503328 0.516458 +vn 0.609417 -0.442767 0.657699 +vn 0.814402 -0.264615 0.516458 +vn 0.716413 -0.232776 0.657699 +vn 0.856312 -0.000001 0.516458 +vn 0.753281 -0.000001 0.657699 +vn -0.000001 0.000000 1.000000 +vn -0.000003 0.000000 1.000000 +vn -0.000003 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.000000 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn -0.000000 0.000000 1.000000 +vn -0.000000 0.000000 1.000000 +vn -0.000002 0.000000 1.000000 +vn -0.000002 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn -0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.632967 -0.205663 -0.746361 +vn -0.538434 -0.391196 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn -0.391195 -0.538435 -0.746361 +vn -0.000001 0.000000 -1.000000 +vn -0.205664 -0.632968 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 -0.665542 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn 0.205664 -0.632968 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn 0.391196 -0.538434 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn 0.538435 -0.391196 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn 0.632968 -0.205664 -0.746361 +vn 0.000001 0.000000 -1.000000 +vn 0.665542 -0.000000 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn 0.632968 0.205664 -0.746361 +vn -0.000001 0.000000 -1.000000 +vn 0.538434 0.391196 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn 0.391195 0.538435 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn 0.205664 0.632968 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn -0.000000 0.665542 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn -0.205664 0.632968 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn -0.391196 0.538434 -0.746361 +vn 0.000000 0.000000 -1.000000 +vn -0.538435 0.391196 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn -0.632968 0.205664 -0.746361 +vn -0.000000 0.000000 -1.000000 +vn -0.665542 0.000001 -0.746360 +vn -0.951052 -0.309014 0.003292 +vn -0.809013 -0.587782 0.003292 +vn -0.587782 -0.809013 0.003292 +vn -0.309015 -0.951052 0.003292 +vn 0.000000 -0.999995 0.003291 +vn 0.309016 -0.951051 0.003291 +vn 0.587782 -0.809013 0.003292 +vn 0.809013 -0.587782 0.003292 +vn 0.951051 -0.309015 0.003292 +vn 0.999995 -0.000000 0.003292 +vn 0.951051 0.309015 0.003292 +vn 0.809013 0.587782 0.003292 +vn 0.587782 0.809013 0.003292 +vn 0.309015 0.951051 0.003291 +vn -0.000000 0.999995 0.003292 +vn -0.309015 0.951051 0.003292 +vn -0.587782 0.809012 0.003292 +vn -0.809013 0.587782 0.003292 +vn -0.951051 0.309015 0.003292 +vn -0.999995 0.000001 0.003292 +vn 0.951057 0.309016 0.000000 +vn 0.809017 0.587786 0.000000 +vn 0.587784 0.809018 0.000000 +vn 0.309016 0.951057 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.309017 0.951056 0.000000 +vn -0.587785 0.809017 0.000000 +vn -0.809017 0.587785 0.000000 +vn -0.951057 0.309017 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.951057 -0.309017 0.000000 +vn -0.809017 -0.587786 0.000000 +vn -0.587785 -0.809017 0.000000 +vn -0.309017 -0.951056 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.309017 -0.951056 0.000000 +vn 0.587785 -0.809017 0.000000 +vn 0.809017 -0.587785 0.000000 +vn 0.951056 -0.309017 0.000000 +vn 1.000000 -0.000001 0.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.099521 -0.025997 0.994696 +vn -0.370259 -0.096720 0.923880 +vn -0.376186 -0.029434 0.926077 +vn -0.057114 -0.004469 0.998358 +vn -0.893883 -0.233507 0.382685 +vn -0.963711 -0.251747 0.088798 +vn -0.991422 -0.085464 0.098885 +vn -0.918344 -0.077800 0.388060 +vn 0.793305 -0.601767 0.092433 +vn 0.733240 -0.559378 0.386593 +vn 0.643214 -0.663196 0.382683 +vn 0.692237 -0.713734 0.106733 +vn 0.298486 -0.233299 0.925461 +vn 0.057028 -0.044573 0.997377 +vn 0.024020 -0.024766 0.999405 +vn 0.266434 -0.274699 0.923879 +vn 0.082303 0.032271 0.996085 +vn 0.041448 0.026013 0.998802 +vn -0.050580 0.009112 0.998679 +vn 0.079294 0.001499 0.996850 +vn -0.041919 0.020567 0.998909 +vn 0.068219 -0.023277 0.997399 +vn -0.036287 0.036816 0.998663 +vn -0.082955 0.119711 0.989337 +vn -0.967533 -0.252745 0.000000 +vn -0.996266 -0.086339 0.000000 +vn -0.984282 0.176605 0.000000 +vn -0.979643 0.175812 0.096905 +vn -0.897851 0.440300 0.000000 +vn -0.893429 0.438145 0.099068 +vn -0.686179 0.727433 0.000000 +vn -0.683685 0.723161 0.098051 +vn -0.569579 0.821937 0.000000 +vn -0.567955 0.819595 0.075436 +vn 0.847003 0.531588 0.000000 +vn 0.842233 0.528595 0.105978 +vn 0.932913 0.348128 0.092084 +vn 0.937197 0.348799 0.000000 +vn 0.995708 0.018406 0.090703 +vn 0.999830 0.018462 0.000000 +vn 0.942600 -0.321360 0.090740 +vn 0.946508 -0.322679 0.000000 +vn 0.797187 -0.603733 0.000000 +vn 0.696216 -0.717833 0.000000 +vn 0.782527 0.491125 0.382684 +vn 0.862275 0.324810 0.388563 +vn 0.324132 0.203428 0.923881 +vn 0.350837 0.137560 0.926278 +vn -0.375467 0.067640 0.924365 +vn -0.908855 0.163229 0.383846 +vn 0.921594 0.017102 0.387778 +vn 0.377565 0.007135 0.925956 +vn -0.340222 0.166926 0.925410 +vn -0.828089 0.406138 0.386421 +vn 0.872758 -0.297591 0.386954 +vn 0.358168 -0.122210 0.925624 +vn -0.264482 0.268343 0.926305 +vn -0.635493 0.667249 0.388493 +vn -0.217962 0.314540 0.923882 +vn -0.526221 0.759372 0.382684 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.072275 -0.073188 0.994696 +vn 0.268894 -0.272290 0.923880 +vn 0.213586 -0.311072 0.926075 +vn 0.032428 -0.047228 0.998358 +vn 0.649165 -0.657372 0.382683 +vn 0.699875 -0.708724 0.088798 +vn 0.569726 -0.815864 0.098885 +vn 0.526550 -0.756409 0.388060 +vn 0.124493 0.987906 0.092433 +vn 0.117812 0.914694 0.386594 +vn 0.252729 0.888640 0.382684 +vn 0.271991 0.956362 0.106733 +vn 0.052801 0.375140 0.925463 +vn 0.010088 0.071673 0.997377 +vn 0.009439 0.033186 0.999405 +vn 0.104679 0.368083 0.923881 +vn -0.069099 0.055142 0.996085 +vn -0.043253 0.022889 0.998802 +vn 0.017399 -0.048360 0.998679 +vn -0.040945 0.067921 0.996850 +vn 0.003148 -0.046587 0.998909 +vn -0.013951 0.070716 0.997399 +vn -0.013739 -0.049834 0.998663 +vn -0.062194 -0.131697 0.989337 +vn 0.702650 -0.711535 0.000000 +vn 0.572905 -0.819622 0.000000 +vn 0.339197 -0.940715 0.000000 +vn 0.337564 -0.936301 0.096905 +vn 0.067613 -0.997712 0.000000 +vn 0.067269 -0.992804 0.099068 +vn -0.286886 -0.957965 0.000000 +vn -0.284433 -0.953669 0.098051 +vn -0.427028 -0.904238 0.000000 +vn -0.425812 -0.901661 0.075436 +vn -0.883871 0.467731 0.000000 +vn -0.878893 0.465097 0.105978 +vn -0.767945 0.633863 0.092084 +vn -0.770668 0.637236 0.000000 +vn -0.513793 0.853106 0.090703 +vn -0.515903 0.856647 0.000000 +vn -0.192995 0.976995 0.090740 +vn -0.193806 0.981040 0.000000 +vn 0.124255 0.992250 0.000000 +vn 0.273554 0.961857 0.000000 +vn -0.816590 0.432128 0.382684 +vn -0.712429 0.584348 0.388564 +vn -0.338240 0.178992 0.923881 +vn -0.294551 0.235052 0.926278 +vn 0.129157 -0.358989 0.924362 +vn 0.313068 -0.868706 0.383847 +vn -0.475607 0.789573 0.387778 +vn -0.194964 0.323412 0.925956 +vn 0.025550 -0.378106 0.925410 +vn 0.062318 -0.920215 0.386421 +vn -0.178658 0.904626 0.386954 +vn -0.073245 0.371284 0.925626 +vn -0.100149 -0.363223 0.926304 +vn -0.260110 -0.883977 0.388493 +vn -0.163416 -0.346034 0.923881 +vn -0.394526 -0.835406 0.382683 +vn 0.000002 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.072275 0.073188 0.994696 +vn -0.268894 0.272290 0.923880 +vn -0.213586 0.311072 0.926075 +vn -0.032428 0.047228 0.998358 +vn -0.649165 0.657372 0.382683 +vn -0.699875 0.708724 0.088798 +vn -0.569726 0.815864 0.098885 +vn -0.526550 0.756409 0.388060 +vn -0.124493 -0.987906 0.092433 +vn -0.117812 -0.914694 0.386594 +vn -0.252729 -0.888640 0.382684 +vn -0.271991 -0.956362 0.106733 +vn -0.052801 -0.375140 0.925463 +vn -0.010088 -0.071673 0.997377 +vn -0.009439 -0.033186 0.999405 +vn -0.104679 -0.368083 0.923881 +vn 0.069099 -0.055142 0.996085 +vn 0.043253 -0.022889 0.998802 +vn -0.017399 0.048360 0.998679 +vn 0.040945 -0.067921 0.996850 +vn -0.003148 0.046587 0.998909 +vn 0.013951 -0.070716 0.997399 +vn 0.013739 0.049834 0.998663 +vn 0.062194 0.131697 0.989337 +vn -0.702650 0.711535 0.000000 +vn -0.572905 0.819622 0.000000 +vn -0.339197 0.940715 0.000000 +vn -0.337564 0.936301 0.096905 +vn -0.067613 0.997712 0.000000 +vn -0.067269 0.992804 0.099068 +vn 0.286886 0.957965 0.000000 +vn 0.284433 0.953669 0.098051 +vn 0.427028 0.904238 0.000000 +vn 0.425812 0.901661 0.075436 +vn 0.883871 -0.467731 0.000000 +vn 0.878893 -0.465097 0.105978 +vn 0.767945 -0.633863 0.092084 +vn 0.770668 -0.637236 0.000000 +vn 0.513793 -0.853106 0.090703 +vn 0.515903 -0.856647 0.000000 +vn 0.192995 -0.976995 0.090740 +vn 0.193806 -0.981040 0.000000 +vn -0.124255 -0.992250 0.000000 +vn -0.273554 -0.961857 0.000000 +vn 0.816590 -0.432128 0.382684 +vn 0.712429 -0.584348 0.388564 +vn 0.338240 -0.178992 0.923881 +vn 0.294551 -0.235052 0.926278 +vn -0.129157 0.358989 0.924362 +vn -0.313068 0.868706 0.383847 +vn 0.475607 -0.789573 0.387778 +vn 0.194964 -0.323412 0.925956 +vn -0.025550 0.378106 0.925410 +vn -0.062318 0.920215 0.386421 +vn 0.178658 -0.904626 0.386954 +vn 0.073245 -0.371284 0.925626 +vn 0.100149 0.363223 0.926304 +vn 0.260110 0.883977 0.388493 +vn 0.163416 0.346034 0.923881 +vn 0.394526 0.835406 0.382683 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.099521 0.025997 0.994696 +vn 0.370259 0.096720 0.923880 +vn 0.376186 0.029434 0.926077 +vn 0.057114 0.004469 0.998358 +vn 0.893883 0.233507 0.382685 +vn 0.963711 0.251747 0.088798 +vn 0.991422 0.085464 0.098885 +vn 0.918344 0.077800 0.388060 +vn -0.793305 0.601767 0.092433 +vn -0.733240 0.559378 0.386593 +vn -0.643214 0.663196 0.382683 +vn -0.692237 0.713734 0.106733 +vn -0.298486 0.233299 0.925461 +vn -0.057028 0.044573 0.997377 +vn -0.024020 0.024766 0.999405 +vn -0.266434 0.274699 0.923879 +vn -0.082303 -0.032271 0.996085 +vn -0.041448 -0.026013 0.998802 +vn 0.050580 -0.009112 0.998679 +vn -0.079294 -0.001499 0.996850 +vn 0.041919 -0.020567 0.998909 +vn -0.068219 0.023277 0.997399 +vn 0.036287 -0.036816 0.998663 +vn 0.082955 -0.119711 0.989337 +vn 0.967533 0.252745 0.000000 +vn 0.996266 0.086339 0.000000 +vn 0.984282 -0.176605 0.000000 +vn 0.979643 -0.175812 0.096905 +vn 0.897851 -0.440300 0.000000 +vn 0.893429 -0.438145 0.099068 +vn 0.686179 -0.727433 0.000000 +vn 0.683685 -0.723161 0.098051 +vn 0.569579 -0.821937 0.000000 +vn 0.567955 -0.819595 0.075436 +vn -0.847003 -0.531588 0.000000 +vn -0.842233 -0.528595 0.105978 +vn -0.932913 -0.348128 0.092084 +vn -0.937197 -0.348799 0.000000 +vn -0.995708 -0.018406 0.090703 +vn -0.999830 -0.018462 0.000000 +vn -0.942600 0.321360 0.090740 +vn -0.946508 0.322679 0.000000 +vn -0.797187 0.603733 0.000000 +vn -0.696216 0.717833 0.000000 +vn -0.782527 -0.491125 0.382684 +vn -0.862275 -0.324810 0.388563 +vn -0.324132 -0.203428 0.923881 +vn -0.350837 -0.137560 0.926278 +vn 0.375467 -0.067640 0.924365 +vn 0.908855 -0.163229 0.383846 +vn -0.921594 -0.017102 0.387778 +vn -0.377565 -0.007135 0.925956 +vn 0.340222 -0.166926 0.925410 +vn 0.828089 -0.406138 0.386421 +vn -0.872758 0.297591 0.386954 +vn -0.358168 0.122210 0.925624 +vn 0.264482 -0.268343 0.926305 +vn 0.635493 -0.667249 0.388493 +vn 0.217962 -0.314540 0.923882 +vn 0.526221 -0.759372 0.382684 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn -0.027246 -0.099185 0.994696 +vn -0.101367 -0.369011 0.923881 +vn -0.162606 -0.340506 0.926075 +vn -0.024686 -0.051696 0.998358 +vn -0.244718 -0.890880 0.382682 +vn -0.263836 -0.960472 0.088798 +vn -0.421697 -0.901329 0.098884 +vn -0.391797 -0.834209 0.388059 +vn 0.917798 0.386139 0.092433 +vn 0.851056 0.355317 0.386592 +vn 0.895950 0.225449 0.382682 +vn 0.964230 0.242630 0.106733 +vn 0.351280 0.141841 0.925464 +vn 0.067114 0.027100 0.997377 +vn 0.033461 0.008419 0.999405 +vn 0.371111 0.093383 0.923881 +vn 0.013205 0.087412 0.996085 +vn -0.001804 0.048902 0.998802 +vn -0.033181 -0.039248 0.998679 +vn 0.038350 0.069420 0.996850 +vn -0.038773 -0.026020 0.998909 +vn 0.054266 0.047440 0.997399 +vn -0.050026 -0.013017 0.998663 +vn -0.145150 -0.011987 0.989337 +vn -0.264882 -0.964281 0.000000 +vn -0.423361 -0.905961 0.000000 +vn -0.645085 -0.764111 0.000000 +vn -0.642080 -0.760489 0.096904 +vn -0.830237 -0.557411 0.000000 +vn -0.826159 -0.554659 0.099067 +vn -0.973065 -0.230531 0.000000 +vn -0.968118 -0.230508 0.098051 +vn -0.996608 -0.082301 0.000000 +vn -0.993768 -0.082066 0.075436 +vn -0.036868 0.999320 0.000000 +vn -0.036661 0.993693 0.105978 +vn 0.164969 0.981991 0.092084 +vn 0.166529 0.986037 0.000000 +vn 0.481914 0.871511 0.090703 +vn 0.483926 0.875109 0.000000 +vn 0.749605 0.655636 0.090740 +vn 0.752703 0.658361 0.000000 +vn 0.921442 0.388517 0.000000 +vn 0.969769 0.244024 0.000000 +vn -0.034062 0.923251 0.382684 +vn 0.149845 0.909156 0.388563 +vn -0.014109 0.382420 0.923881 +vn 0.056284 0.372613 0.926278 +vn -0.246316 -0.291349 0.924361 +vn -0.595792 -0.705475 0.383845 +vn 0.445985 0.806676 0.387778 +vn 0.182604 0.330547 0.925956 +vn -0.314673 -0.211180 0.925410 +vn -0.765772 -0.514075 0.386419 +vn 0.694100 0.607036 0.386954 +vn 0.284919 0.249074 0.925626 +vn -0.364635 -0.094880 0.926304 +vn -0.895601 -0.216729 0.388494 +vn -0.381386 -0.031495 0.923879 +vn -0.920744 -0.076037 0.382686 +s 1 +f 2585/2715/5143 2586/2716/5144 2588/2717/5145 2587/2718/5146 +f 2587/2718/5146 2588/2717/5145 2590/2719/5147 2589/2720/5148 +f 2589/2720/5148 2590/2719/5147 2592/2721/5149 2591/2722/5150 +f 2591/2722/5150 2592/2721/5149 2594/2723/5151 2593/2724/5152 +f 2593/2724/5152 2594/2723/5151 2596/2725/5153 2595/2726/5154 +s 2 +f 2605/2727/5155 2604/2728/5156 2607/2729/5157 2606/2730/5158 +s 3 +f 2604/2728/5159 2603/2731/5160 2608/2732/5161 2607/2729/5162 +s 4 +f 2623/2733/5163 2622/2734/5164 2628/2735/5165 2627/2736/5166 +s 2 +f 2622/2734/5167 2621/2737/5168 2629/2738/5169 2628/2735/5170 +f 2600/2739/5171 2598/2740/5172 2605/2727/5155 2606/2730/5158 +f 2600/2739/5171 2606/2730/5158 2612/2741/5173 2609/2742/5174 +f 2609/2742/5174 2612/2741/5173 2618/2743/5175 2615/2744/5176 +f 2615/2744/5176 2618/2743/5175 2624/2745/5177 2621/2737/5168 +f 2621/2737/5168 2624/2745/5177 2631/2746/5178 2629/2738/5169 +s 3 +f 2608/2732/5161 2603/2731/5160 2596/2725/5179 2594/2723/5180 +f 2608/2732/5161 2594/2723/5180 2592/2721/5181 2614/2747/5182 +f 2614/2747/5182 2592/2721/5181 2590/2719/5183 2620/2748/5184 +f 2620/2748/5184 2590/2719/5183 2588/2717/5185 2626/2749/5186 +f 2626/2749/5186 2588/2717/5185 2586/2716/5187 2630/2750/5188 +s 4 +f 2595/2726/5189 2597/2751/5190 2602/2752/5191 2593/2724/5192 +f 2593/2724/5192 2602/2752/5191 2611/2753/5193 2591/2722/5194 +f 2591/2722/5194 2611/2753/5193 2617/2754/5195 2589/2720/5196 +f 2589/2720/5196 2617/2754/5195 2623/2733/5163 2587/2718/5197 +f 2587/2718/5197 2623/2733/5163 2627/2736/5166 2585/2715/5198 +f 2597/2751/5190 2599/2755/5199 2601/2756/5200 2602/2752/5191 +s 2 +f 2599/2755/5201 2598/2740/5172 2600/2739/5171 2601/2756/5202 +f 2606/2730/5158 2607/2729/5157 2613/2757/5203 2612/2741/5173 +s 3 +f 2607/2729/5162 2608/2732/5161 2614/2747/5182 2613/2757/5204 +s 4 +f 2602/2752/5191 2601/2756/5200 2610/2758/5205 2611/2753/5193 +s 2 +f 2601/2756/5202 2600/2739/5171 2609/2742/5174 2610/2758/5206 +f 2612/2741/5173 2613/2757/5203 2619/2759/5207 2618/2743/5175 +s 3 +f 2613/2757/5204 2614/2747/5182 2620/2748/5184 2619/2759/5208 +s 4 +f 2611/2753/5193 2610/2758/5205 2616/2760/5209 2617/2754/5195 +s 2 +f 2610/2758/5206 2609/2742/5174 2615/2744/5176 2616/2760/5210 +f 2618/2743/5175 2619/2759/5207 2625/2761/5211 2624/2745/5177 +s 3 +f 2619/2759/5208 2620/2748/5184 2626/2749/5186 2625/2761/5212 +s 4 +f 2617/2754/5195 2616/2760/5209 2622/2734/5164 2623/2733/5163 +s 2 +f 2616/2760/5210 2615/2744/5176 2621/2737/5168 2622/2734/5167 +f 2624/2745/5177 2625/2761/5211 2632/2762/5213 2631/2746/5178 +s 3 +f 2625/2761/5212 2626/2749/5186 2630/2750/5188 2632/2762/5214 +s 7 +f 2634/2763/5215 2633/2764/5216 2653/2765/5217 +f 2635/2766/5218 2634/2763/5215 2653/2765/5217 +f 2636/2767/5219 2635/2766/5218 2653/2765/5217 +f 2637/2768/5220 2636/2767/5219 2653/2765/5217 +f 2638/2769/5221 2637/2768/5220 2653/2765/5217 +f 2639/2770/5222 2638/2769/5221 2653/2765/5217 +f 2640/2771/5223 2639/2770/5222 2653/2765/5217 +f 2641/2772/5224 2640/2771/5223 2653/2765/5217 +f 2642/2773/5225 2641/2772/5224 2653/2765/5217 +f 2643/2774/5226 2642/2773/5225 2653/2765/5217 +f 2644/2775/5227 2643/2774/5226 2653/2765/5217 +f 2645/2776/5228 2644/2775/5227 2653/2765/5217 +f 2646/2777/5229 2645/2776/5228 2653/2765/5217 +f 2647/2778/5230 2646/2777/5229 2653/2765/5217 +f 2648/2779/5231 2647/2778/5230 2653/2765/5217 +f 2649/2780/5232 2648/2779/5231 2653/2765/5217 +f 2650/2781/5233 2649/2780/5232 2653/2765/5217 +f 2651/2782/5234 2650/2781/5233 2653/2765/5217 +f 2652/2783/5235 2651/2782/5234 2653/2765/5217 +f 2633/2764/5216 2652/2783/5235 2653/2765/5217 +s 8 +f 2655/2784/5236 2656/2785/5237 2694/2786/5238 2693/2787/5239 +f 2656/2785/5237 2655/2784/5236 2657/2788/5240 2658/2789/5241 +f 2658/2789/5241 2657/2788/5240 2659/2790/5242 2660/2791/5243 +f 2660/2791/5243 2659/2790/5242 2661/2792/5244 2662/2793/5245 +f 2662/2793/5245 2661/2792/5244 2663/2794/5246 2664/2795/5247 +f 2664/2795/5247 2663/2794/5246 2665/2796/5248 2666/2797/5249 +f 2666/2797/5249 2665/2796/5248 2667/2798/5250 2668/2799/5251 +f 2668/2799/5251 2667/2798/5250 2669/2800/5252 2670/2801/5253 +f 2670/2801/5253 2669/2800/5252 2671/2802/5254 2672/2803/5255 +f 2672/2803/5255 2671/2802/5254 2673/2804/5256 2674/2805/5257 +f 2674/2805/5257 2673/2804/5256 2675/2806/5258 2676/2807/5259 +f 2676/2807/5259 2675/2806/5258 2677/2808/5260 2678/2809/5261 +f 2678/2809/5261 2677/2808/5260 2679/2810/5262 2680/2811/5263 +f 2680/2811/5263 2679/2810/5262 2681/2812/5264 2682/2813/5265 +f 2682/2813/5265 2681/2812/5264 2683/2814/5266 2684/2815/5267 +f 2684/2815/5267 2683/2814/5266 2685/2816/5268 2686/2817/5269 +f 2686/2817/5269 2685/2816/5268 2687/2818/5270 2688/2819/5271 +f 2688/2819/5271 2687/2818/5270 2689/2820/5272 2690/2821/5273 +f 2690/2821/5273 2689/2820/5272 2691/2822/5274 2692/2823/5275 +f 2692/2823/5275 2691/2822/5274 2693/2787/5239 2694/2786/5238 +f 2695/2824/5276 2696/2825/5277 2733/2826/5278 2734/2827/5279 +f 2696/2825/5277 2695/2824/5276 2698/2828/5280 2697/2829/5281 +f 2697/2829/5281 2698/2828/5280 2700/2830/5282 2699/2831/5283 +f 2699/2831/5283 2700/2830/5282 2702/2832/5284 2701/2833/5285 +f 2701/2833/5285 2702/2832/5284 2704/2834/5286 2703/2835/5287 +f 2703/2835/5287 2704/2834/5286 2706/2836/5288 2705/2837/5289 +f 2705/2837/5289 2706/2836/5288 2708/2838/5290 2707/2839/5291 +f 2707/2839/5291 2708/2838/5290 2710/2840/5292 2709/2841/5293 +f 2709/2841/5293 2710/2840/5292 2712/2842/5294 2711/2843/5295 +f 2711/2843/5295 2712/2842/5294 2714/2844/5296 2713/2845/5297 +f 2713/2845/5297 2714/2844/5296 2716/2846/5298 2715/2847/5299 +f 2715/2847/5299 2716/2846/5298 2718/2848/5300 2717/2849/5301 +f 2717/2849/5301 2718/2848/5300 2720/2850/5302 2719/2851/5303 +f 2719/2851/5303 2720/2850/5302 2722/2852/5304 2721/2853/5305 +f 2721/2853/5305 2722/2852/5304 2724/2854/5306 2723/2855/5307 +f 2723/2855/5307 2724/2854/5306 2726/2856/5308 2725/2857/5309 +f 2725/2857/5309 2726/2856/5308 2728/2858/5310 2727/2859/5311 +f 2727/2859/5311 2728/2858/5310 2730/2860/5312 2729/2861/5313 +f 2729/2861/5313 2730/2860/5312 2732/2862/5314 2731/2863/5315 +f 2731/2863/5315 2732/2862/5314 2734/2827/5279 2733/2826/5278 +f 2633/2764/5316 2634/2763/5317 2657/2788/5240 2655/2784/5236 +f 2634/2763/5317 2635/2766/5318 2659/2790/5242 2657/2788/5240 +f 2635/2766/5318 2636/2767/5319 2661/2792/5244 2659/2790/5242 +f 2636/2767/5319 2637/2768/5320 2663/2794/5246 2661/2792/5244 +f 2637/2768/5320 2638/2769/5321 2665/2796/5248 2663/2794/5246 +f 2638/2769/5321 2639/2770/5322 2667/2798/5250 2665/2796/5248 +f 2639/2770/5322 2640/2771/5323 2669/2800/5252 2667/2798/5250 +f 2640/2771/5323 2641/2772/5324 2671/2802/5254 2669/2800/5252 +f 2641/2772/5324 2642/2773/5325 2673/2804/5256 2671/2802/5254 +f 2642/2773/5325 2643/2774/5326 2675/2806/5258 2673/2804/5256 +f 2643/2774/5326 2644/2775/5327 2677/2808/5260 2675/2806/5258 +f 2644/2775/5327 2645/2776/5328 2679/2810/5262 2677/2808/5260 +f 2645/2776/5328 2646/2777/5329 2681/2812/5264 2679/2810/5262 +f 2646/2777/5329 2647/2778/5330 2683/2814/5266 2681/2812/5264 +f 2647/2778/5330 2648/2779/5331 2685/2816/5268 2683/2814/5266 +f 2648/2779/5331 2649/2780/5332 2687/2818/5270 2685/2816/5268 +f 2649/2780/5332 2650/2781/5333 2689/2820/5272 2687/2818/5270 +f 2650/2781/5333 2651/2782/5334 2691/2822/5274 2689/2820/5272 +f 2651/2782/5334 2652/2783/5335 2693/2787/5239 2691/2822/5274 +f 2652/2783/5335 2633/2764/5316 2655/2784/5236 2693/2787/5239 +f 2696/2825/5277 2697/2829/5281 2654/2864/5336 +f 2697/2829/5281 2699/2831/5283 2654/2864/5336 +f 2699/2831/5283 2701/2833/5285 2654/2864/5336 +f 2701/2833/5285 2703/2835/5287 2654/2864/5336 +f 2703/2835/5287 2705/2837/5289 2654/2864/5336 +f 2705/2837/5289 2707/2839/5291 2654/2864/5336 +f 2707/2839/5291 2709/2841/5293 2654/2864/5336 +f 2709/2841/5293 2711/2843/5295 2654/2864/5336 +f 2711/2843/5295 2713/2845/5297 2654/2864/5336 +f 2713/2845/5297 2715/2847/5299 2654/2864/5336 +f 2715/2847/5299 2717/2849/5301 2654/2864/5336 +f 2717/2849/5301 2719/2851/5303 2654/2864/5336 +f 2719/2851/5303 2721/2853/5305 2654/2864/5336 +f 2721/2853/5305 2723/2855/5307 2654/2864/5336 +f 2723/2855/5307 2725/2857/5309 2654/2864/5336 +f 2725/2857/5309 2727/2859/5311 2654/2864/5336 +f 2727/2859/5311 2729/2861/5313 2654/2864/5336 +f 2729/2861/5313 2731/2863/5315 2654/2864/5336 +f 2731/2863/5315 2733/2826/5278 2654/2864/5336 +f 2733/2826/5278 2696/2825/5277 2654/2864/5336 +f 2656/2785/5237 2658/2789/5241 2698/2828/5280 2695/2824/5276 +f 2658/2789/5241 2660/2791/5243 2700/2830/5282 2698/2828/5280 +f 2660/2791/5243 2662/2793/5245 2702/2832/5284 2700/2830/5282 +f 2662/2793/5245 2664/2795/5247 2704/2834/5286 2702/2832/5284 +f 2664/2795/5247 2666/2797/5249 2706/2836/5288 2704/2834/5286 +f 2666/2797/5249 2668/2799/5251 2708/2838/5290 2706/2836/5288 +f 2668/2799/5251 2670/2801/5253 2710/2840/5292 2708/2838/5290 +f 2670/2801/5253 2672/2803/5255 2712/2842/5294 2710/2840/5292 +f 2672/2803/5255 2674/2805/5257 2714/2844/5296 2712/2842/5294 +f 2674/2805/5257 2676/2807/5259 2716/2846/5298 2714/2844/5296 +f 2676/2807/5259 2678/2809/5261 2718/2848/5300 2716/2846/5298 +f 2678/2809/5261 2680/2811/5263 2720/2850/5302 2718/2848/5300 +f 2680/2811/5263 2682/2813/5265 2722/2852/5304 2720/2850/5302 +f 2682/2813/5265 2684/2815/5267 2724/2854/5306 2722/2852/5304 +f 2684/2815/5267 2686/2817/5269 2726/2856/5308 2724/2854/5306 +f 2686/2817/5269 2688/2819/5271 2728/2858/5310 2726/2856/5308 +f 2688/2819/5271 2690/2821/5273 2730/2860/5312 2728/2858/5310 +f 2690/2821/5273 2692/2823/5275 2732/2862/5314 2730/2860/5312 +f 2692/2823/5275 2694/2786/5238 2734/2827/5279 2732/2862/5314 +f 2694/2786/5238 2656/2785/5237 2695/2824/5276 2734/2827/5279 +s 10 +f 2735/2865/5337 2736/2866/5338 2756/2867/5339 2755/2868/5340 +f 2736/2866/5338 2737/2869/5341 2757/2870/5342 2756/2867/5339 +f 2737/2869/5341 2738/2871/5343 2758/2872/5344 2757/2870/5342 +f 2738/2871/5343 2739/2873/5345 2759/2874/5346 2758/2872/5344 +f 2739/2873/5345 2740/2875/5347 2760/2876/5348 2759/2874/5346 +f 2740/2875/5347 2741/2877/5349 2761/2878/5350 2760/2876/5348 +f 2741/2877/5349 2742/2879/5351 2762/2880/5352 2761/2878/5350 +f 2742/2879/5351 2743/2881/5353 2763/2882/5354 2762/2880/5352 +f 2743/2881/5353 2744/2883/5355 2764/2884/5356 2763/2882/5354 +f 2744/2883/5355 2745/2885/5357 2765/2886/5358 2764/2884/5356 +f 2745/2885/5357 2746/2887/5359 2766/2888/5360 2765/2886/5358 +f 2746/2887/5359 2747/2889/5361 2767/2890/5362 2766/2888/5360 +f 2747/2889/5361 2748/2891/5363 2768/2892/5364 2767/2890/5362 +f 2748/2891/5363 2749/2893/5365 2769/2894/5366 2768/2892/5364 +f 2749/2893/5365 2750/2895/5367 2770/2896/5368 2769/2894/5366 +f 2750/2895/5367 2751/2897/5369 2771/2898/5370 2770/2896/5368 +f 2751/2897/5369 2752/2899/5371 2772/2900/5372 2771/2898/5370 +f 2752/2899/5371 2753/2901/5373 2773/2902/5374 2772/2900/5372 +f 2753/2901/5373 2754/2903/5375 2774/2904/5376 2773/2902/5374 +f 2754/2903/5375 2735/2865/5337 2755/2868/5340 2774/2904/5376 +s 11 +f 2755/2868/5377 2756/2867/5378 2776/2905/5379 2775/2906/5380 +f 2756/2867/5378 2757/2870/5381 2777/2907/5382 2776/2905/5379 +f 2757/2870/5381 2758/2872/5383 2778/2908/5384 2777/2907/5382 +f 2758/2872/5383 2759/2874/5385 2779/2909/5386 2778/2908/5384 +f 2759/2874/5385 2760/2876/5387 2780/2910/5388 2779/2909/5386 +f 2760/2876/5387 2761/2878/5389 2781/2911/5390 2780/2910/5388 +f 2761/2878/5389 2762/2880/5391 2782/2912/5392 2781/2911/5390 +f 2762/2880/5391 2763/2882/5393 2783/2913/5394 2782/2912/5392 +f 2763/2882/5393 2764/2884/5395 2784/2914/5396 2783/2913/5394 +f 2764/2884/5395 2765/2886/5397 2785/2915/5398 2784/2914/5396 +f 2765/2886/5397 2766/2888/5399 2786/2916/5400 2785/2915/5398 +f 2766/2888/5399 2767/2890/5401 2787/2917/5402 2786/2916/5400 +f 2767/2890/5401 2768/2892/5403 2788/2918/5404 2787/2917/5402 +f 2768/2892/5403 2769/2894/5405 2789/2919/5406 2788/2918/5404 +f 2769/2894/5405 2770/2896/5407 2790/2920/5408 2789/2919/5406 +f 2770/2896/5407 2771/2898/5409 2791/2921/5410 2790/2920/5408 +f 2771/2898/5409 2772/2900/5411 2792/2922/5412 2791/2921/5410 +f 2772/2900/5411 2773/2902/5413 2793/2923/5414 2792/2922/5412 +f 2773/2902/5413 2774/2904/5415 2794/2924/5416 2793/2923/5414 +f 2774/2904/5415 2755/2868/5377 2775/2906/5380 2794/2924/5416 +s 12 +f 2816/2925/5417 2815/2926/5418 2795/2927/5419 2796/2928/5420 +f 2817/2929/5421 2816/2925/5417 2796/2928/5420 2797/2930/5422 +f 2818/2931/5423 2817/2929/5421 2797/2930/5422 2798/2932/5424 +f 2819/2933/5425 2818/2931/5423 2798/2932/5424 2799/2934/5426 +f 2820/2935/5427 2819/2933/5425 2799/2934/5426 2800/2936/5428 +f 2821/2937/5429 2820/2935/5427 2800/2936/5428 2801/2938/5430 +f 2822/2939/5431 2821/2937/5429 2801/2938/5430 2802/2940/5432 +f 2823/2941/5433 2822/2939/5431 2802/2940/5432 2803/2942/5434 +f 2824/2943/5435 2823/2941/5433 2803/2942/5434 2804/2944/5436 +f 2825/2945/5437 2824/2943/5435 2804/2944/5436 2805/2946/5438 +f 2826/2947/5439 2825/2945/5437 2805/2946/5438 2806/2948/5440 +f 2827/2949/5441 2826/2947/5439 2806/2948/5440 2807/2950/5442 +f 2828/2951/5443 2827/2949/5441 2807/2950/5442 2808/2952/5444 +f 2829/2953/5445 2828/2951/5443 2808/2952/5444 2809/2954/5446 +f 2830/2955/5447 2829/2953/5445 2809/2954/5446 2810/2956/5448 +f 2831/2957/5449 2830/2955/5447 2810/2956/5448 2811/2958/5450 +f 2832/2959/5451 2831/2957/5449 2811/2958/5450 2812/2960/5452 +f 2833/2961/5453 2832/2959/5451 2812/2960/5452 2813/2962/5454 +f 2834/2963/5455 2833/2961/5453 2813/2962/5454 2814/2964/5456 +f 2815/2926/5418 2834/2963/5455 2814/2964/5456 2795/2927/5419 +f 2796/2928/5420 2795/2927/5419 2775/2906/5457 2776/2905/5458 +f 2797/2930/5422 2796/2928/5420 2776/2905/5458 2777/2907/5459 +f 2798/2932/5424 2797/2930/5422 2777/2907/5459 2778/2908/5460 +f 2799/2934/5426 2798/2932/5424 2778/2908/5460 2779/2909/5461 +f 2800/2936/5428 2799/2934/5426 2779/2909/5461 2780/2910/5462 +f 2801/2938/5430 2800/2936/5428 2780/2910/5462 2781/2911/5463 +f 2802/2940/5432 2801/2938/5430 2781/2911/5463 2782/2912/5464 +f 2803/2942/5434 2802/2940/5432 2782/2912/5464 2783/2913/5465 +f 2804/2944/5436 2803/2942/5434 2783/2913/5465 2784/2914/5466 +f 2805/2946/5438 2804/2944/5436 2784/2914/5466 2785/2915/5467 +f 2806/2948/5440 2805/2946/5438 2785/2915/5467 2786/2916/5468 +f 2807/2950/5442 2806/2948/5440 2786/2916/5468 2787/2917/5469 +f 2808/2952/5444 2807/2950/5442 2787/2917/5469 2788/2918/5470 +f 2809/2954/5446 2808/2952/5444 2788/2918/5470 2789/2919/5471 +f 2810/2956/5448 2809/2954/5446 2789/2919/5471 2790/2920/5472 +f 2811/2958/5450 2810/2956/5448 2790/2920/5472 2791/2921/5473 +f 2812/2960/5452 2811/2958/5450 2791/2921/5473 2792/2922/5474 +f 2813/2962/5454 2812/2960/5452 2792/2922/5474 2793/2923/5475 +f 2814/2964/5456 2813/2962/5454 2793/2923/5475 2794/2924/5476 +f 2795/2927/5419 2814/2964/5456 2794/2924/5476 2775/2906/5457 +s 10 +f 2736/2866/5338 2735/2865/5337 2815/2926/5477 2816/2925/5478 +f 2737/2869/5341 2736/2866/5338 2816/2925/5478 2817/2929/5479 +f 2738/2871/5343 2737/2869/5341 2817/2929/5479 2818/2931/5480 +f 2739/2873/5345 2738/2871/5343 2818/2931/5480 2819/2933/5481 +f 2740/2875/5347 2739/2873/5345 2819/2933/5481 2820/2935/5482 +f 2741/2877/5349 2740/2875/5347 2820/2935/5482 2821/2937/5483 +f 2742/2879/5351 2741/2877/5349 2821/2937/5483 2822/2939/5484 +f 2743/2881/5353 2742/2879/5351 2822/2939/5484 2823/2941/5485 +f 2744/2883/5355 2743/2881/5353 2823/2941/5485 2824/2943/5486 +f 2745/2885/5357 2744/2883/5355 2824/2943/5486 2825/2945/5487 +f 2746/2887/5359 2745/2885/5357 2825/2945/5487 2826/2947/5488 +f 2747/2889/5361 2746/2887/5359 2826/2947/5488 2827/2949/5489 +f 2748/2891/5363 2747/2889/5361 2827/2949/5489 2828/2951/5490 +f 2749/2893/5365 2748/2891/5363 2828/2951/5490 2829/2953/5491 +f 2750/2895/5367 2749/2893/5365 2829/2953/5491 2830/2955/5492 +f 2751/2897/5369 2750/2895/5367 2830/2955/5492 2831/2957/5493 +f 2752/2899/5371 2751/2897/5369 2831/2957/5493 2832/2959/5494 +f 2753/2901/5373 2752/2899/5371 2832/2959/5494 2833/2961/5495 +f 2754/2903/5375 2753/2901/5373 2833/2961/5495 2834/2963/5496 +f 2735/2865/5337 2754/2903/5375 2834/2963/5496 2815/2926/5477 +s 13 +f 2835/2965/5497 2836/2966/5498 2838/2967/5499 2837/2968/5500 +f 2837/2968/5500 2838/2967/5499 2840/2969/5501 2839/2970/5502 +f 2839/2970/5502 2840/2969/5501 2842/2971/5503 2841/2972/5504 +f 2841/2972/5504 2842/2971/5503 2844/2973/5505 2843/2974/5506 +f 2843/2974/5506 2844/2973/5505 2846/2975/5507 2845/2976/5508 +s 14 +f 2855/2977/5509 2854/2978/5510 2857/2979/5511 2856/2980/5512 +s 15 +f 2854/2978/5513 2853/2981/5514 2858/2982/5515 2857/2979/5516 +s 16 +f 2873/2983/5517 2872/2984/5518 2878/2985/5519 2877/2986/5520 +s 14 +f 2872/2984/5521 2871/2987/5522 2879/2988/5523 2878/2985/5524 +f 2850/2989/5525 2848/2990/5526 2855/2977/5509 2856/2980/5512 +f 2850/2989/5525 2856/2980/5512 2862/2991/5527 2859/2992/5528 +f 2859/2992/5528 2862/2991/5527 2868/2993/5529 2865/2994/5530 +f 2865/2994/5530 2868/2993/5529 2874/2995/5531 2871/2987/5522 +f 2871/2987/5522 2874/2995/5531 2881/2996/5532 2879/2988/5523 +s 15 +f 2858/2982/5515 2853/2981/5514 2846/2975/5533 2844/2973/5534 +f 2858/2982/5515 2844/2973/5534 2842/2971/5535 2864/2997/5536 +f 2864/2997/5536 2842/2971/5535 2840/2969/5537 2870/2998/5538 +f 2870/2998/5538 2840/2969/5537 2838/2967/5539 2876/2999/5540 +f 2876/2999/5540 2838/2967/5539 2836/2966/5541 2880/3000/5542 +s 16 +f 2845/2976/5543 2847/3001/5544 2852/3002/5545 2843/2974/5546 +f 2843/2974/5546 2852/3002/5545 2861/3003/5547 2841/2972/5548 +f 2841/2972/5548 2861/3003/5547 2867/3004/5549 2839/2970/5550 +f 2839/2970/5550 2867/3004/5549 2873/2983/5517 2837/2968/5551 +f 2837/2968/5551 2873/2983/5517 2877/2986/5520 2835/2965/5552 +f 2847/3001/5544 2849/3005/5553 2851/3006/5554 2852/3002/5545 +s 14 +f 2849/3005/5555 2848/2990/5526 2850/2989/5525 2851/3006/5556 +f 2856/2980/5512 2857/2979/5511 2863/3007/5557 2862/2991/5527 +s 15 +f 2857/2979/5516 2858/2982/5515 2864/2997/5536 2863/3007/5558 +s 16 +f 2852/3002/5545 2851/3006/5554 2860/3008/5559 2861/3003/5547 +s 14 +f 2851/3006/5556 2850/2989/5525 2859/2992/5528 2860/3008/5560 +f 2862/2991/5527 2863/3007/5557 2869/3009/5561 2868/2993/5529 +s 15 +f 2863/3007/5558 2864/2997/5536 2870/2998/5538 2869/3009/5562 +s 16 +f 2861/3003/5547 2860/3008/5559 2866/3010/5563 2867/3004/5549 +s 14 +f 2860/3008/5560 2859/2992/5528 2865/2994/5530 2866/3010/5564 +f 2868/2993/5529 2869/3009/5561 2875/3011/5565 2874/2995/5531 +s 15 +f 2869/3009/5562 2870/2998/5538 2876/2999/5540 2875/3011/5566 +s 16 +f 2867/3004/5549 2866/3010/5563 2872/2984/5518 2873/2983/5517 +s 14 +f 2866/3010/5564 2865/2994/5530 2871/2987/5522 2872/2984/5521 +f 2874/2995/5531 2875/3011/5565 2882/3012/5567 2881/2996/5532 +s 15 +f 2875/3011/5566 2876/2999/5540 2880/3000/5542 2882/3012/5568 +s 19 +f 2883/3013/5569 2884/3014/5570 2886/3015/5571 2885/3016/5572 +f 2885/3016/5572 2886/3015/5571 2888/3017/5573 2887/3018/5574 +f 2887/3018/5574 2888/3017/5573 2890/3019/5575 2889/3020/5576 +f 2889/3020/5576 2890/3019/5575 2892/3021/5577 2891/3022/5578 +f 2891/3022/5578 2892/3021/5577 2894/3023/5579 2893/3024/5580 +s 20 +f 2903/3025/5581 2902/3026/5582 2905/3027/5583 2904/3028/5584 +s 21 +f 2902/3026/5585 2901/3029/5586 2906/3030/5587 2905/3027/5588 +s 22 +f 2921/3031/5589 2920/3032/5590 2926/3033/5591 2925/3034/5592 +s 20 +f 2920/3032/5593 2919/3035/5594 2927/3036/5595 2926/3033/5596 +f 2898/3037/5597 2896/3038/5598 2903/3025/5581 2904/3028/5584 +f 2898/3037/5597 2904/3028/5584 2910/3039/5599 2907/3040/5600 +f 2907/3040/5600 2910/3039/5599 2916/3041/5601 2913/3042/5602 +f 2913/3042/5602 2916/3041/5601 2922/3043/5603 2919/3035/5594 +f 2919/3035/5594 2922/3043/5603 2929/3044/5604 2927/3036/5595 +s 21 +f 2906/3030/5587 2901/3029/5586 2894/3023/5605 2892/3021/5606 +f 2906/3030/5587 2892/3021/5606 2890/3019/5607 2912/3045/5608 +f 2912/3045/5608 2890/3019/5607 2888/3017/5609 2918/3046/5610 +f 2918/3046/5610 2888/3017/5609 2886/3015/5611 2924/3047/5612 +f 2924/3047/5612 2886/3015/5611 2884/3014/5613 2928/3048/5614 +s 22 +f 2893/3024/5615 2895/3049/5616 2900/3050/5617 2891/3022/5618 +f 2891/3022/5618 2900/3050/5617 2909/3051/5619 2889/3020/5620 +f 2889/3020/5620 2909/3051/5619 2915/3052/5621 2887/3018/5622 +f 2887/3018/5622 2915/3052/5621 2921/3031/5589 2885/3016/5623 +f 2885/3016/5623 2921/3031/5589 2925/3034/5592 2883/3013/5624 +f 2895/3049/5616 2897/3053/5625 2899/3054/5626 2900/3050/5617 +s 20 +f 2897/3053/5627 2896/3038/5598 2898/3037/5597 2899/3054/5628 +f 2904/3028/5584 2905/3027/5583 2911/3055/5629 2910/3039/5599 +s 21 +f 2905/3027/5588 2906/3030/5587 2912/3045/5608 2911/3055/5630 +s 22 +f 2900/3050/5617 2899/3054/5626 2908/3056/5631 2909/3051/5619 +s 20 +f 2899/3054/5628 2898/3037/5597 2907/3040/5600 2908/3056/5632 +f 2910/3039/5599 2911/3055/5629 2917/3057/5633 2916/3041/5601 +s 21 +f 2911/3055/5630 2912/3045/5608 2918/3046/5610 2917/3057/5634 +s 22 +f 2909/3051/5619 2908/3056/5631 2914/3058/5635 2915/3052/5621 +s 20 +f 2908/3056/5632 2907/3040/5600 2913/3042/5602 2914/3058/5636 +f 2916/3041/5601 2917/3057/5633 2923/3059/5637 2922/3043/5603 +s 21 +f 2917/3057/5634 2918/3046/5610 2924/3047/5612 2923/3059/5638 +s 22 +f 2915/3052/5621 2914/3058/5635 2920/3032/5590 2921/3031/5589 +s 20 +f 2914/3058/5636 2913/3042/5602 2919/3035/5594 2920/3032/5593 +f 2922/3043/5603 2923/3059/5637 2930/3060/5639 2929/3044/5604 +s 21 +f 2923/3059/5638 2924/3047/5612 2928/3048/5614 2930/3060/5640 +s 25 +f 2931/3061/5641 2932/3062/5642 2934/3063/5643 2933/3064/5644 +f 2933/3064/5644 2934/3063/5643 2936/3065/5645 2935/3066/5646 +f 2935/3066/5646 2936/3065/5645 2938/3067/5647 2937/3068/5648 +f 2937/3068/5648 2938/3067/5647 2940/3069/5649 2939/3070/5650 +f 2939/3070/5650 2940/3069/5649 2942/3071/5651 2941/3072/5652 +s 26 +f 2951/3073/5653 2950/3074/5654 2953/3075/5655 2952/3076/5656 +s 27 +f 2950/3074/5657 2949/3077/5658 2954/3078/5659 2953/3075/5660 +s 28 +f 2969/3079/5661 2968/3080/5662 2974/3081/5663 2973/3082/5664 +s 26 +f 2968/3080/5665 2967/3083/5666 2975/3084/5667 2974/3081/5668 +f 2946/3085/5669 2944/3086/5670 2951/3073/5653 2952/3076/5656 +f 2946/3085/5669 2952/3076/5656 2958/3087/5671 2955/3088/5672 +f 2955/3088/5672 2958/3087/5671 2964/3089/5673 2961/3090/5674 +f 2961/3090/5674 2964/3089/5673 2970/3091/5675 2967/3083/5666 +f 2967/3083/5666 2970/3091/5675 2977/3092/5676 2975/3084/5667 +s 27 +f 2954/3078/5659 2949/3077/5658 2942/3071/5677 2940/3069/5678 +f 2954/3078/5659 2940/3069/5678 2938/3067/5679 2960/3093/5680 +f 2960/3093/5680 2938/3067/5679 2936/3065/5681 2966/3094/5682 +f 2966/3094/5682 2936/3065/5681 2934/3063/5683 2972/3095/5684 +f 2972/3095/5684 2934/3063/5683 2932/3062/5685 2976/3096/5686 +s 28 +f 2941/3072/5687 2943/3097/5688 2948/3098/5689 2939/3070/5690 +f 2939/3070/5690 2948/3098/5689 2957/3099/5691 2937/3068/5692 +f 2937/3068/5692 2957/3099/5691 2963/3100/5693 2935/3066/5694 +f 2935/3066/5694 2963/3100/5693 2969/3079/5661 2933/3064/5695 +f 2933/3064/5695 2969/3079/5661 2973/3082/5664 2931/3061/5696 +f 2943/3097/5688 2945/3101/5697 2947/3102/5698 2948/3098/5689 +s 26 +f 2945/3101/5699 2944/3086/5670 2946/3085/5669 2947/3102/5700 +f 2952/3076/5656 2953/3075/5655 2959/3103/5701 2958/3087/5671 +s 27 +f 2953/3075/5660 2954/3078/5659 2960/3093/5680 2959/3103/5702 +s 28 +f 2948/3098/5689 2947/3102/5698 2956/3104/5703 2957/3099/5691 +s 26 +f 2947/3102/5700 2946/3085/5669 2955/3088/5672 2956/3104/5704 +f 2958/3087/5671 2959/3103/5701 2965/3105/5705 2964/3089/5673 +s 27 +f 2959/3103/5702 2960/3093/5680 2966/3094/5682 2965/3105/5706 +s 28 +f 2957/3099/5691 2956/3104/5703 2962/3106/5707 2963/3100/5693 +s 26 +f 2956/3104/5704 2955/3088/5672 2961/3090/5674 2962/3106/5708 +f 2964/3089/5673 2965/3105/5705 2971/3107/5709 2970/3091/5675 +s 27 +f 2965/3105/5706 2966/3094/5682 2972/3095/5684 2971/3107/5710 +s 28 +f 2963/3100/5693 2962/3106/5707 2968/3080/5662 2969/3079/5661 +s 26 +f 2962/3106/5708 2961/3090/5674 2967/3083/5666 2968/3080/5665 +f 2970/3091/5675 2971/3107/5709 2978/3108/5711 2977/3092/5676 +s 27 +f 2971/3107/5710 2972/3095/5684 2976/3096/5686 2978/3108/5712 +s 31 +f 2979/3109/5713 2980/3110/5714 2982/3111/5715 2981/3112/5716 +f 2981/3112/5716 2982/3111/5715 2984/3113/5717 2983/3114/5718 +f 2983/3114/5718 2984/3113/5717 2986/3115/5719 2985/3116/5720 +f 2985/3116/5720 2986/3115/5719 2988/3117/5721 2987/3118/5722 +f 2987/3118/5722 2988/3117/5721 2990/3119/5723 2989/3120/5724 +s 32 +f 2999/3121/5725 2998/3122/5726 3001/3123/5727 3000/3124/5728 +s 33 +f 2998/3122/5729 2997/3125/5730 3002/3126/5731 3001/3123/5732 +s 34 +f 3017/3127/5733 3016/3128/5734 3022/3129/5735 3021/3130/5736 +s 32 +f 3016/3128/5737 3015/3131/5738 3023/3132/5739 3022/3129/5740 +f 2994/3133/5741 2992/3134/5742 2999/3121/5725 3000/3124/5728 +f 2994/3133/5741 3000/3124/5728 3006/3135/5743 3003/3136/5744 +f 3003/3136/5744 3006/3135/5743 3012/3137/5745 3009/3138/5746 +f 3009/3138/5746 3012/3137/5745 3018/3139/5747 3015/3131/5738 +f 3015/3131/5738 3018/3139/5747 3025/3140/5748 3023/3132/5739 +s 33 +f 3002/3126/5731 2997/3125/5730 2990/3119/5749 2988/3117/5750 +f 3002/3126/5731 2988/3117/5750 2986/3115/5751 3008/3141/5752 +f 3008/3141/5752 2986/3115/5751 2984/3113/5753 3014/3142/5754 +f 3014/3142/5754 2984/3113/5753 2982/3111/5755 3020/3143/5756 +f 3020/3143/5756 2982/3111/5755 2980/3110/5757 3024/3144/5758 +s 34 +f 2989/3120/5759 2991/3145/5760 2996/3146/5761 2987/3118/5762 +f 2987/3118/5762 2996/3146/5761 3005/3147/5763 2985/3116/5764 +f 2985/3116/5764 3005/3147/5763 3011/3148/5765 2983/3114/5766 +f 2983/3114/5766 3011/3148/5765 3017/3127/5733 2981/3112/5767 +f 2981/3112/5767 3017/3127/5733 3021/3130/5736 2979/3109/5768 +f 2991/3145/5760 2993/3149/5769 2995/3150/5770 2996/3146/5761 +s 32 +f 2993/3149/5771 2992/3134/5742 2994/3133/5741 2995/3150/5772 +f 3000/3124/5728 3001/3123/5727 3007/3151/5773 3006/3135/5743 +s 33 +f 3001/3123/5732 3002/3126/5731 3008/3141/5752 3007/3151/5774 +s 34 +f 2996/3146/5761 2995/3150/5770 3004/3152/5775 3005/3147/5763 +s 32 +f 2995/3150/5772 2994/3133/5741 3003/3136/5744 3004/3152/5776 +f 3006/3135/5743 3007/3151/5773 3013/3153/5777 3012/3137/5745 +s 33 +f 3007/3151/5774 3008/3141/5752 3014/3142/5754 3013/3153/5778 +s 34 +f 3005/3147/5763 3004/3152/5775 3010/3154/5779 3011/3148/5765 +s 32 +f 3004/3152/5776 3003/3136/5744 3009/3138/5746 3010/3154/5780 +f 3012/3137/5745 3013/3153/5777 3019/3155/5781 3018/3139/5747 +s 33 +f 3013/3153/5778 3014/3142/5754 3020/3143/5756 3019/3155/5782 +s 34 +f 3011/3148/5765 3010/3154/5779 3016/3128/5734 3017/3127/5733 +s 32 +f 3010/3154/5780 3009/3138/5746 3015/3131/5738 3016/3128/5737 +f 3018/3139/5747 3019/3155/5781 3026/3156/5783 3025/3140/5748 +s 33 +f 3019/3155/5782 3020/3143/5756 3024/3144/5758 3026/3156/5784 +s 37 +f 3027/3157/5785 3028/3158/5786 3030/3159/5787 3029/3160/5788 +f 3029/3160/5788 3030/3159/5787 3032/3161/5789 3031/3162/5790 +f 3031/3162/5790 3032/3161/5789 3034/3163/5791 3033/3164/5792 +f 3033/3164/5792 3034/3163/5791 3036/3165/5793 3035/3166/5794 +f 3035/3166/5794 3036/3165/5793 3038/3167/5795 3037/3168/5796 +s 38 +f 3047/3169/5797 3046/3170/5798 3049/3171/5799 3048/3172/5800 +s 39 +f 3046/3170/5801 3045/3173/5802 3050/3174/5803 3049/3171/5804 +s 40 +f 3065/3175/5805 3064/3176/5806 3070/3177/5807 3069/3178/5808 +s 38 +f 3064/3176/5809 3063/3179/5810 3071/3180/5811 3070/3177/5812 +f 3042/3181/5813 3040/3182/5814 3047/3169/5797 3048/3172/5800 +f 3042/3181/5813 3048/3172/5800 3054/3183/5815 3051/3184/5816 +f 3051/3184/5816 3054/3183/5815 3060/3185/5817 3057/3186/5818 +f 3057/3186/5818 3060/3185/5817 3066/3187/5819 3063/3179/5810 +f 3063/3179/5810 3066/3187/5819 3073/3188/5820 3071/3180/5811 +s 39 +f 3050/3174/5803 3045/3173/5802 3038/3167/5821 3036/3165/5822 +f 3050/3174/5803 3036/3165/5822 3034/3163/5823 3056/3189/5824 +f 3056/3189/5824 3034/3163/5823 3032/3161/5825 3062/3190/5826 +f 3062/3190/5826 3032/3161/5825 3030/3159/5827 3068/3191/5828 +f 3068/3191/5828 3030/3159/5827 3028/3158/5829 3072/3192/5830 +s 40 +f 3037/3168/5831 3039/3193/5832 3044/3194/5833 3035/3166/5834 +f 3035/3166/5834 3044/3194/5833 3053/3195/5835 3033/3164/5836 +f 3033/3164/5836 3053/3195/5835 3059/3196/5837 3031/3162/5838 +f 3031/3162/5838 3059/3196/5837 3065/3175/5805 3029/3160/5839 +f 3029/3160/5839 3065/3175/5805 3069/3178/5808 3027/3157/5840 +f 3039/3193/5832 3041/3197/5841 3043/3198/5842 3044/3194/5833 +s 38 +f 3041/3197/5843 3040/3182/5814 3042/3181/5813 3043/3198/5844 +f 3048/3172/5800 3049/3171/5799 3055/3199/5845 3054/3183/5815 +s 39 +f 3049/3171/5804 3050/3174/5803 3056/3189/5824 3055/3199/5846 +s 40 +f 3044/3194/5833 3043/3198/5842 3052/3200/5847 3053/3195/5835 +s 38 +f 3043/3198/5844 3042/3181/5813 3051/3184/5816 3052/3200/5848 +f 3054/3183/5815 3055/3199/5845 3061/3201/5849 3060/3185/5817 +s 39 +f 3055/3199/5846 3056/3189/5824 3062/3190/5826 3061/3201/5850 +s 40 +f 3053/3195/5835 3052/3200/5847 3058/3202/5851 3059/3196/5837 +s 38 +f 3052/3200/5848 3051/3184/5816 3057/3186/5818 3058/3202/5852 +f 3060/3185/5817 3061/3201/5849 3067/3203/5853 3066/3187/5819 +s 39 +f 3061/3201/5850 3062/3190/5826 3068/3191/5828 3067/3203/5854 +s 40 +f 3059/3196/5837 3058/3202/5851 3064/3176/5806 3065/3175/5805 +s 38 +f 3058/3202/5852 3057/3186/5818 3063/3179/5810 3064/3176/5809 +f 3066/3187/5819 3067/3203/5853 3074/3204/5855 3073/3188/5820 +s 39 +f 3067/3203/5854 3068/3191/5828 3072/3192/5830 3074/3204/5856 +v 113.535530 -88.535530 100.000000 +v 113.535538 -88.535530 96.500000 +v 114.571068 -89.330132 100.000000 +v 114.571068 -89.330132 96.500000 +v 115.776970 -89.829628 100.000000 +v 115.776970 -89.829628 96.500000 +v 117.071060 -90.000000 100.000000 +v 117.071068 -90.000000 96.500000 +v 51.464470 -26.464464 100.000000 +v 51.464470 -26.464466 96.500000 +v 135.000000 -85.000000 100.000000 +v 135.000000 -72.071068 100.000000 +v 130.000000 -90.000000 100.000000 +v 134.829636 -86.294098 100.000000 +v 134.330124 -87.500000 100.000000 +v 133.535538 -88.535538 100.000000 +v 132.500000 -89.330132 100.000000 +v 131.294098 -89.829628 100.000000 +v 133.535538 -68.535530 100.000000 +v 134.829636 -70.776970 100.000000 +v 134.330124 -69.571068 100.000000 +v 116.464462 -51.464466 100.000000 +v 115.669876 -50.428932 100.000000 +v 115.170372 -49.223026 100.000000 +v 115.000008 -47.928932 100.000000 +v 51.464470 26.464464 100.000000 +v 115.000000 47.928932 100.000000 +v 115.170372 49.223026 100.000000 +v 115.669876 50.428932 100.000000 +v 113.535538 88.535530 100.000000 +v 116.464470 51.464470 100.000000 +v 133.535538 68.535538 100.000000 +v 134.330124 69.571068 100.000000 +v 134.829636 70.776970 100.000000 +v 135.000000 72.071075 100.000000 +v 135.000000 85.000000 100.000000 +v 117.071068 90.000000 100.000000 +v 130.000000 90.000000 100.000000 +v 134.829636 86.294098 100.000000 +v 134.330124 87.500000 100.000000 +v 133.535538 88.535538 100.000000 +v 132.500000 89.330132 100.000000 +v 131.294098 89.829628 100.000000 +v 115.776970 89.829628 100.000000 +v 114.571068 89.330132 100.000000 +v 50.428932 -25.669874 100.000000 +v 50.428932 25.669874 100.000000 +v 49.223030 -25.170370 100.000000 +v 49.223026 25.170370 100.000000 +v 47.928932 25.000002 100.000000 +v 47.928932 -25.000000 100.000000 +v -47.928932 25.000000 100.000000 +v -47.928932 -25.000000 100.000000 +v -49.223030 -25.170370 100.000000 +v -49.223026 25.170370 100.000000 +v -50.428932 25.669874 100.000000 +v -50.428932 -25.669874 100.000000 +v -51.464474 26.464468 100.000000 +v -51.464470 -26.464466 100.000000 +v -115.000000 -47.928932 100.000000 +v -115.170372 -49.223026 100.000000 +v -113.535530 88.535530 100.000000 +v -115.669876 50.428932 100.000000 +v -115.170372 49.223026 100.000000 +v -115.000000 47.928932 100.000000 +v -114.571068 89.330132 100.000000 +v -117.071060 90.000000 100.000000 +v -135.000000 85.000000 100.000000 +v -135.000000 72.071068 100.000000 +v -115.776970 89.829628 100.000000 +v -130.000000 90.000000 100.000000 +v -134.829636 86.294098 100.000000 +v -134.330124 87.500000 100.000000 +v -133.535538 88.535538 100.000000 +v -132.500000 89.330132 100.000000 +v -131.294098 89.829628 100.000000 +v -133.535538 68.535530 100.000000 +v -134.829636 70.776970 100.000000 +v -134.330124 69.571068 100.000000 +v -116.464462 51.464466 100.000000 +v -115.669876 -50.428932 100.000000 +v -113.535538 -88.535530 100.000000 +v -116.464470 -51.464470 100.000000 +v -133.535538 -68.535538 100.000000 +v -134.330124 -69.571068 100.000000 +v -134.829636 -70.776970 100.000000 +v -135.000000 -72.071075 100.000000 +v -135.000000 -85.000000 100.000000 +v -117.071068 -90.000000 100.000000 +v -130.000000 -90.000000 100.000000 +v -134.829636 -86.294098 100.000000 +v -134.330124 -87.500000 100.000000 +v -133.535538 -88.535538 100.000000 +v -132.500000 -89.330132 100.000000 +v -131.294098 -89.829628 100.000000 +v -115.776970 -89.829628 100.000000 +v -114.571068 -89.330132 100.000000 +v 50.428932 -25.669874 96.500000 +v 49.223030 -25.170370 96.500000 +v 47.928932 -25.000000 96.500000 +v -47.928932 -25.000000 96.500000 +v 130.000000 -90.000000 96.500000 +v 131.294098 -89.829628 96.500000 +v 132.500000 -89.330132 96.500000 +v 133.535538 -88.535538 96.500000 +v 134.330124 -87.500000 96.500000 +v 134.829636 -86.294098 96.500000 +v 135.000000 -85.000000 96.500000 +v 135.000000 -72.071075 96.500000 +v 133.535538 -68.535538 96.500000 +v 134.829636 -70.776970 96.500000 +v 134.330124 -69.571068 96.500000 +v 115.669876 -50.428932 96.500000 +v 116.464470 -51.464470 96.500000 +v 51.464474 26.464468 96.500000 +v 115.000000 -47.928932 96.500000 +v 115.170372 -49.223026 96.500000 +v 50.428932 25.669874 96.500000 +v 49.223026 25.170370 96.500000 +v 47.928932 25.000000 96.500000 +v -47.928932 25.000002 96.500000 +v -49.223030 -25.170370 96.500000 +v -49.223026 25.170370 96.500000 +v -50.428932 25.669874 96.500000 +v -50.428932 -25.669874 96.500000 +v -51.464470 26.464464 96.500000 +v -51.464470 -26.464464 96.500000 +v -115.000008 -47.928932 96.500000 +v -115.170372 -49.223026 96.500000 +v -115.669876 -50.428932 96.500000 +v -113.535530 -88.535530 96.500000 +v -116.464462 -51.464466 96.500000 +v -133.535538 -68.535530 96.500000 +v -135.000000 -72.071068 96.500000 +v -134.829636 -70.776970 96.500000 +v -114.571068 -89.330132 96.500000 +v -117.071060 -90.000000 96.500000 +v -135.000000 -85.000000 96.500000 +v -115.776970 -89.829628 96.500000 +v -130.000000 -90.000000 96.500000 +v -134.829636 -86.294098 96.500000 +v -134.330124 -87.500000 96.500000 +v -133.535538 -88.535538 96.500000 +v -132.500000 -89.330132 96.500000 +v -131.294098 -89.829628 96.500000 +v -134.330124 -69.571068 96.500000 +v -115.000000 47.928932 96.500000 +v -115.170372 49.223026 96.500000 +v -115.669876 50.428932 96.500000 +v -113.535538 88.535530 96.500000 +v -116.464470 51.464470 96.500000 +v -133.535538 68.535538 96.500000 +v -134.330124 69.571068 96.500000 +v -134.829636 70.776970 96.500000 +v -135.000000 72.071075 96.500000 +v -135.000000 85.000000 96.500000 +v -117.071068 90.000000 96.500000 +v -130.000000 90.000000 96.500000 +v -134.829636 86.294098 96.500000 +v -134.330124 87.500000 96.500000 +v -133.535538 88.535538 96.500000 +v -132.500000 89.330132 96.500000 +v -131.294098 89.829628 96.500000 +v -115.776970 89.829628 96.500000 +v -114.571068 89.330132 96.500000 +v 113.535530 88.535530 96.500000 +v 115.669876 50.428932 96.500000 +v 115.170372 49.223026 96.500000 +v 115.000000 47.928932 96.500000 +v 114.571068 89.330132 96.500000 +v 117.071060 90.000000 96.500000 +v 135.000000 85.000000 96.500000 +v 135.000000 72.071068 96.500000 +v 115.776970 89.829628 96.500000 +v 130.000000 90.000000 96.500000 +v 134.829636 86.294098 96.500000 +v 134.330124 87.500000 96.500000 +v 133.535538 88.535538 96.500000 +v 132.500000 89.330132 96.500000 +v 131.294098 89.829628 96.500000 +v 133.535538 68.535530 96.500000 +v 134.829636 70.776970 96.500000 +v 134.330124 69.571068 96.500000 +v 116.464462 51.464466 96.500000 +vt 0.745198 0.011702 +vt 0.745198 0.011702 +vt 0.745266 0.011623 +vt 0.745266 0.011623 +vt 0.745347 0.011574 +vt 0.745347 0.011574 +vt 0.745431 0.011558 +vt 0.745431 0.011558 +vt 0.741094 0.017776 +vt 0.741094 0.017776 +vt 0.746618 0.012048 +vt 0.746618 0.013313 +vt 0.746287 0.011558 +vt 0.746606 0.011920 +vt 0.746572 0.011802 +vt 0.746520 0.011702 +vt 0.746452 0.011623 +vt 0.746373 0.011574 +vt 0.746520 0.013659 +vt 0.746606 0.013439 +vt 0.746572 0.013558 +vt 0.745392 0.015329 +vt 0.745339 0.015430 +vt 0.745305 0.015549 +vt 0.745294 0.015675 +vt 0.741094 0.022956 +vt 0.745294 0.025056 +vt 0.745305 0.025183 +vt 0.745339 0.025300 +vt 0.745198 0.029030 +vt 0.745392 0.025402 +vt 0.746520 0.027073 +vt 0.746572 0.027174 +vt 0.746606 0.027293 +vt 0.746618 0.027419 +vt 0.746618 0.028684 +vt 0.745431 0.029173 +vt 0.746287 0.029173 +vt 0.746606 0.028810 +vt 0.746572 0.028928 +vt 0.746520 0.029030 +vt 0.746452 0.029107 +vt 0.746373 0.029156 +vt 0.745347 0.029156 +vt 0.745266 0.029107 +vt 0.741025 0.017854 +vt 0.741025 0.022879 +vt 0.740946 0.017902 +vt 0.740946 0.022830 +vt 0.740859 0.022813 +vt 0.740859 0.017919 +vt 0.734522 0.022813 +vt 0.734522 0.017919 +vt 0.734435 0.017902 +vt 0.734435 0.022830 +vt 0.734357 0.022879 +vt 0.734357 0.017854 +vt 0.734287 0.022956 +vt 0.734287 0.017776 +vt 0.730087 0.015675 +vt 0.730076 0.015549 +vt 0.730183 0.029030 +vt 0.730042 0.025300 +vt 0.730076 0.025183 +vt 0.730087 0.025056 +vt 0.730115 0.029107 +vt 0.729950 0.029173 +vt 0.728764 0.028684 +vt 0.728764 0.027419 +vt 0.730035 0.029156 +vt 0.729095 0.029173 +vt 0.728775 0.028810 +vt 0.728809 0.028928 +vt 0.728861 0.029030 +vt 0.728929 0.029107 +vt 0.729010 0.029156 +vt 0.728861 0.027073 +vt 0.728775 0.027293 +vt 0.728809 0.027174 +vt 0.729989 0.025402 +vt 0.730042 0.015430 +vt 0.730183 0.011702 +vt 0.729989 0.015329 +vt 0.728861 0.013659 +vt 0.728809 0.013558 +vt 0.728775 0.013439 +vt 0.728764 0.013313 +vt 0.728764 0.012048 +vt 0.729950 0.011558 +vt 0.729095 0.011558 +vt 0.728775 0.011920 +vt 0.728809 0.011802 +vt 0.728861 0.011702 +vt 0.728929 0.011623 +vt 0.729010 0.011574 +vt 0.730035 0.011574 +vt 0.730115 0.011623 +vt 0.741025 0.017854 +vt 0.740946 0.017902 +vt 0.740859 0.017919 +vt 0.734522 0.017919 +vt 0.746287 0.011558 +vt 0.746373 0.011574 +vt 0.746452 0.011623 +vt 0.746520 0.011702 +vt 0.746572 0.011802 +vt 0.746606 0.011920 +vt 0.746618 0.012048 +vt 0.746618 0.013313 +vt 0.746520 0.013659 +vt 0.746606 0.013439 +vt 0.746572 0.013558 +vt 0.745339 0.015430 +vt 0.745392 0.015329 +vt 0.741094 0.022956 +vt 0.745294 0.015675 +vt 0.745305 0.015549 +vt 0.741025 0.022879 +vt 0.740946 0.022830 +vt 0.740859 0.022813 +vt 0.734522 0.022813 +vt 0.734435 0.017902 +vt 0.734435 0.022830 +vt 0.734357 0.022879 +vt 0.734357 0.017854 +vt 0.734287 0.022956 +vt 0.734287 0.017776 +vt 0.730087 0.015675 +vt 0.730076 0.015549 +vt 0.730042 0.015430 +vt 0.730183 0.011702 +vt 0.729989 0.015329 +vt 0.728861 0.013659 +vt 0.728764 0.013313 +vt 0.728775 0.013439 +vt 0.730115 0.011623 +vt 0.729950 0.011558 +vt 0.728764 0.012048 +vt 0.730035 0.011574 +vt 0.729095 0.011558 +vt 0.728775 0.011920 +vt 0.728809 0.011802 +vt 0.728861 0.011702 +vt 0.728929 0.011623 +vt 0.729010 0.011574 +vt 0.728809 0.013558 +vt 0.730087 0.025056 +vt 0.730076 0.025183 +vt 0.730042 0.025300 +vt 0.730183 0.029030 +vt 0.729989 0.025402 +vt 0.728861 0.027073 +vt 0.728809 0.027174 +vt 0.728775 0.027293 +vt 0.728764 0.027419 +vt 0.728764 0.028684 +vt 0.729950 0.029173 +vt 0.729095 0.029173 +vt 0.728775 0.028810 +vt 0.728809 0.028928 +vt 0.728861 0.029030 +vt 0.728929 0.029107 +vt 0.729010 0.029156 +vt 0.730035 0.029156 +vt 0.730115 0.029107 +vt 0.745198 0.029030 +vt 0.745339 0.025300 +vt 0.745305 0.025183 +vt 0.745294 0.025056 +vt 0.745266 0.029107 +vt 0.745431 0.029173 +vt 0.746618 0.028684 +vt 0.746618 0.027419 +vt 0.745347 0.029156 +vt 0.746287 0.029173 +vt 0.746606 0.028810 +vt 0.746572 0.028928 +vt 0.746520 0.029030 +vt 0.746452 0.029107 +vt 0.746373 0.029156 +vt 0.746520 0.027073 +vt 0.746606 0.027293 +vt 0.746572 0.027174 +vt 0.745392 0.025402 +vn -0.608770 -0.793347 0.000000 +vn -0.608770 -0.793347 0.000000 +vn -0.608770 -0.793347 0.000000 +vn -0.608763 -0.793352 0.000000 +vn -0.382682 -0.923880 0.000000 +vn -0.382682 -0.923880 0.000000 +vn -0.130528 -0.991445 0.000000 +vn -0.130526 -0.991445 0.000000 +vn -0.707107 -0.707107 -0.000001 +vn -0.707106 -0.707107 0.000002 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000002 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000002 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.000002 0.000000 1.000000 +vn 0.000002 0.000000 1.000000 +vn 0.000002 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn -0.000005 0.000000 1.000000 +vn 0.000004 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.000001 0.000000 1.000000 +vn 0.000001 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -0.608756 -0.793358 0.000000 +vn -0.608761 -0.793353 0.000000 +vn -0.382684 -0.923879 0.000000 +vn -0.382687 -0.923878 0.000000 +vn -0.130525 -0.991445 0.000000 +vn -0.130526 -0.991445 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.130526 -0.991445 0.000000 +vn 0.130526 -0.991445 0.000000 +vn 0.130526 -0.991445 0.000000 +vn 0.130526 -0.991445 0.000000 +vn 0.382682 -0.923880 0.000000 +vn 0.382682 -0.923880 0.000000 +vn 0.608766 -0.793350 0.000000 +vn 0.608753 -0.793360 0.000000 +vn 0.793362 -0.608750 0.000000 +vn 0.793355 -0.608759 0.000000 +vn 0.923877 -0.382690 0.000000 +vn 0.923877 -0.382690 0.000000 +vn 0.991443 -0.130542 0.000000 +vn 0.991448 -0.130503 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000002 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000004 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn -0.000004 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000004 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.000002 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000002 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000002 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.000002 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.991448 0.130503 0.000000 +vn 0.991443 0.130542 0.000000 +vn 0.923877 0.382690 0.000000 +vn 0.923877 0.382690 0.000000 +vn 0.793355 0.608759 0.000000 +vn 0.793360 0.608753 0.000000 +vn 0.707107 0.707107 -0.000003 +vn 0.707107 0.707107 0.000003 +vn 0.991444 0.130530 -0.000003 +vn 0.991444 0.130530 -0.000003 +vn 0.991444 0.130530 -0.000003 +vn 0.991444 0.130530 0.000000 +vn 0.923882 0.382678 0.000000 +vn 0.923877 0.382689 0.000000 +vn 0.793361 -0.608752 -0.000002 +vn 0.793361 -0.608752 -0.000002 +vn 0.793361 -0.608752 -0.000002 +vn 0.793355 -0.608759 0.000000 +vn 0.923877 -0.382690 0.000000 +vn 0.923882 -0.382678 0.000000 +vn 0.991444 -0.130530 0.000000 +vn 0.991444 -0.130530 0.000000 +vn 0.793360 -0.608753 0.000000 +vn 0.793360 -0.608753 0.000000 +vn 0.793360 -0.608753 0.000000 +vn 0.793355 -0.608759 0.000000 +vn 0.923877 -0.382690 0.000000 +vn 0.923877 -0.382690 0.000000 +vn 0.991443 -0.130542 0.000000 +vn 0.991448 -0.130503 0.000000 +vn 0.991448 0.130503 0.000000 +vn 0.991448 0.130503 0.000000 +vn 0.991448 0.130503 0.000000 +vn 0.991443 0.130542 0.000000 +vn 0.923877 0.382690 0.000000 +vn 0.923877 0.382690 0.000000 +vn 0.793355 0.608759 0.000000 +vn 0.793362 0.608750 0.000000 +vn 0.608753 0.793360 0.000000 +vn 0.608766 0.793350 0.000000 +vn 0.382682 0.923880 0.000000 +vn 0.382682 0.923880 0.000000 +vn 0.130526 0.991445 0.000000 +vn 0.130526 0.991445 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.130526 0.991445 0.000000 +vn -0.130528 0.991445 0.000000 +vn -0.382682 0.923880 0.000000 +vn -0.382682 0.923880 0.000000 +vn -0.608763 0.793352 0.000000 +vn -0.608770 0.793347 0.000002 +vn -0.707107 0.707107 0.000001 +vn -0.707106 0.707107 0.000000 +vn -0.130526 0.991445 0.000000 +vn -0.130526 0.991445 0.000000 +vn -0.130526 0.991445 0.000000 +vn -0.130524 0.991445 0.000000 +vn -0.382684 0.923879 0.000000 +vn -0.382684 0.923879 0.000000 +vn 0.608757 0.793356 -0.000001 +vn 0.608757 0.793356 -0.000001 +vn 0.608757 0.793356 -0.000001 +vn 0.608763 0.793352 0.000000 +vn 0.382684 0.923879 0.000000 +vn 0.382684 0.923879 0.000000 +vn 0.130524 0.991445 0.000000 +vn 0.130526 0.991445 0.000000 +vn 0.608770 0.793347 0.000000 +vn 0.608770 0.793347 0.000000 +vn 0.608770 0.793347 0.000000 +vn 0.608763 0.793352 0.000000 +vn 0.382682 0.923880 0.000000 +vn 0.382682 0.923880 0.000000 +vn 0.130528 0.991445 0.000000 +vn 0.130526 0.991445 0.000000 +vn -0.130526 0.991445 0.000000 +vn -0.130526 0.991445 0.000000 +vn -0.130526 0.991445 0.000000 +vn -0.130526 0.991445 0.000000 +vn -0.382682 0.923880 0.000000 +vn -0.382682 0.923880 0.000000 +vn -0.608766 0.793350 0.000000 +vn -0.608753 0.793360 0.000000 +vn -0.793362 0.608750 0.000000 +vn -0.793355 0.608759 0.000000 +vn -0.923877 0.382690 0.000000 +vn -0.923877 0.382690 0.000000 +vn -0.991443 0.130542 0.000000 +vn -0.991448 0.130503 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.991448 -0.130503 0.000000 +vn -0.991443 -0.130542 0.000000 +vn -0.923877 -0.382690 0.000000 +vn -0.923877 -0.382690 0.000000 +vn -0.793355 -0.608759 0.000000 +vn -0.793360 -0.608753 0.000000 +vn -0.707107 -0.707107 -0.000003 +vn -0.707107 -0.707107 0.000003 +vn -0.991444 -0.130530 0.000000 +vn -0.991444 -0.130530 0.000000 +vn -0.991444 -0.130530 0.000000 +vn -0.991444 -0.130530 0.000000 +vn -0.923882 -0.382678 0.000000 +vn -0.923877 -0.382689 0.000000 +vn -0.793361 0.608752 -0.000002 +vn -0.793361 0.608752 -0.000002 +vn -0.793361 0.608752 -0.000002 +vn -0.793355 0.608759 0.000000 +vn -0.923877 0.382690 0.000000 +vn -0.923882 0.382678 0.000000 +vn -0.991444 0.130532 0.000000 +vn -0.991444 0.130530 0.000002 +vn -0.793360 0.608753 0.000000 +vn -0.793360 0.608753 0.000000 +vn -0.793360 0.608753 0.000000 +vn -0.793355 0.608759 0.000000 +vn -0.923877 0.382690 0.000000 +vn -0.923877 0.382690 0.000000 +vn -0.991443 0.130542 0.000000 +vn -0.991448 0.130503 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.991448 -0.130503 0.000000 +vn -0.991443 -0.130542 0.000000 +vn -0.923877 -0.382690 0.000000 +vn -0.923877 -0.382690 0.000000 +vn -0.793355 -0.608759 0.000000 +vn -0.793362 -0.608750 0.000000 +vn -0.608753 -0.793360 0.000000 +vn -0.608766 -0.793350 0.000000 +vn -0.382682 -0.923880 0.000000 +vn -0.382682 -0.923880 0.000000 +vn -0.130526 -0.991445 0.000000 +vn -0.130526 -0.991445 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.130526 -0.991445 0.000000 +vn 0.130528 -0.991445 0.000000 +vn 0.382682 -0.923880 0.000000 +vn 0.382682 -0.923880 0.000000 +vn 0.608763 -0.793352 0.000000 +vn 0.608770 -0.793347 0.000002 +vn 0.130526 -0.991445 0.000000 +vn 0.130525 -0.991445 0.000000 +vn 0.382686 -0.923878 0.000000 +vn 0.382684 -0.923879 0.000000 +vn 0.608761 -0.793354 0.000000 +vn 0.608759 -0.793355 0.000000 +s 1 +f 3075/3205/5857 3076/3206/5858 3077/3207/5859 +f 3077/3207/5859 3076/3206/5858 3078/3208/5860 +f 3077/3207/5859 3078/3208/5860 3079/3209/5861 +f 3079/3209/5861 3078/3208/5860 3080/3210/5862 +f 3079/3209/5861 3080/3210/5862 3081/3211/5863 +f 3081/3211/5863 3080/3210/5862 3082/3212/5864 +f 3075/3205/5857 3083/3213/5865 3076/3206/5858 +f 3076/3206/5858 3083/3213/5865 3084/3214/5866 +s 2 +f 3077/3207/5867 3081/3211/5868 3075/3205/5869 +f 3075/3205/5869 3081/3211/5868 3085/3215/5870 +f 3075/3205/5869 3085/3215/5870 3086/3216/5871 +f 3077/3207/5867 3079/3209/5872 3081/3211/5868 +f 3081/3211/5868 3087/3217/5873 3085/3215/5870 +f 3085/3215/5870 3087/3217/5873 3088/3218/5874 +f 3088/3218/5874 3087/3217/5873 3089/3219/5875 +f 3089/3219/5875 3087/3217/5873 3090/3220/5876 +f 3090/3220/5876 3087/3217/5873 3091/3221/5877 +f 3091/3221/5877 3087/3217/5873 3092/3222/5878 +f 3075/3205/5869 3086/3216/5871 3093/3223/5879 +f 3093/3223/5879 3086/3216/5871 3094/3224/5880 +f 3093/3223/5879 3094/3224/5880 3095/3225/5881 +f 3093/3223/5879 3096/3226/5882 3075/3205/5869 +f 3075/3205/5869 3096/3226/5882 3097/3227/5883 +f 3075/3205/5869 3097/3227/5883 3083/3213/5884 +f 3083/3213/5884 3097/3227/5883 3098/3228/5885 +f 3083/3213/5884 3098/3228/5885 3099/3229/5886 +f 3083/3213/5884 3099/3229/5886 3100/3230/5887 +f 3100/3230/5887 3099/3229/5886 3101/3231/5888 +f 3100/3230/5887 3101/3231/5888 3102/3232/5889 +f 3102/3232/5889 3103/3233/5890 3100/3230/5887 +f 3100/3230/5887 3103/3233/5890 3104/3234/5891 +f 3104/3234/5891 3103/3233/5890 3105/3235/5892 +f 3104/3234/5891 3105/3235/5892 3106/3236/5893 +f 3107/3237/5894 3108/3238/5895 3106/3236/5893 +f 3106/3236/5893 3108/3238/5895 3109/3239/5896 +f 3106/3236/5893 3109/3239/5896 3104/3234/5891 +f 3104/3234/5891 3109/3239/5896 3110/3240/5897 +f 3104/3234/5891 3110/3240/5897 3111/3241/5898 +f 3111/3241/5898 3110/3240/5897 3112/3242/5899 +f 3112/3242/5899 3110/3240/5897 3113/3243/5900 +f 3112/3242/5899 3113/3243/5900 3114/3244/5901 +f 3114/3244/5901 3115/3245/5902 3112/3242/5899 +f 3112/3242/5899 3115/3245/5902 3116/3246/5903 +f 3112/3242/5899 3116/3246/5903 3117/3247/5904 +f 3118/3248/5905 3119/3249/5906 3111/3241/5898 +f 3111/3241/5898 3119/3249/5906 3104/3234/5891 +f 3083/3213/5884 3100/3230/5887 3120/3250/5907 +f 3120/3250/5907 3100/3230/5887 3121/3251/5908 +f 3120/3250/5907 3121/3251/5908 3122/3252/5909 +f 3122/3252/5909 3121/3251/5908 3123/3253/5910 +f 3122/3252/5909 3123/3253/5910 3124/3254/5911 +f 3122/3252/5909 3124/3254/5911 3125/3255/5912 +f 3125/3255/5912 3124/3254/5911 3126/3256/5913 +f 3125/3255/5912 3126/3256/5913 3127/3257/5914 +f 3127/3257/5914 3126/3256/5913 3128/3258/5915 +f 3128/3258/5915 3126/3256/5913 3129/3259/5916 +f 3128/3258/5915 3129/3259/5916 3130/3260/5917 +f 3128/3258/5915 3130/3260/5917 3131/3261/5918 +f 3131/3261/5918 3130/3260/5917 3132/3262/5919 +f 3131/3261/5918 3132/3262/5919 3133/3263/5920 +f 3133/3263/5920 3132/3262/5919 3134/3264/5921 +f 3133/3263/5920 3134/3264/5921 3135/3265/5922 +f 3136/3266/5923 3137/3267/5924 3132/3262/5919 +f 3132/3262/5919 3137/3267/5924 3138/3268/5925 +f 3132/3262/5919 3138/3268/5925 3139/3269/5926 +f 3140/3270/5927 3141/3271/5928 3136/3266/5923 +f 3136/3266/5923 3141/3271/5928 3142/3272/5929 +f 3136/3266/5923 3142/3272/5929 3143/3273/5930 +f 3140/3270/5927 3144/3274/5931 3141/3271/5928 +f 3141/3271/5928 3145/3275/5932 3142/3272/5929 +f 3142/3272/5929 3145/3275/5932 3146/3276/5933 +f 3146/3276/5933 3145/3275/5932 3147/3277/5934 +f 3147/3277/5934 3145/3275/5932 3148/3278/5935 +f 3148/3278/5935 3145/3275/5932 3149/3279/5936 +f 3149/3279/5936 3145/3275/5932 3150/3280/5937 +f 3136/3266/5923 3143/3273/5930 3151/3281/5938 +f 3151/3281/5938 3143/3273/5930 3152/3282/5939 +f 3151/3281/5938 3152/3282/5939 3153/3283/5940 +f 3151/3281/5938 3154/3284/5941 3136/3266/5923 +f 3136/3266/5923 3154/3284/5941 3137/3267/5924 +f 3139/3269/5926 3134/3264/5921 3132/3262/5919 +f 3135/3265/5922 3155/3285/5942 3133/3263/5920 +f 3133/3263/5920 3155/3285/5942 3156/3286/5943 +f 3156/3286/5943 3155/3285/5942 3157/3287/5944 +f 3156/3286/5943 3157/3287/5944 3158/3288/5945 +f 3159/3289/5946 3160/3290/5947 3158/3288/5945 +f 3158/3288/5945 3160/3290/5947 3161/3291/5948 +f 3158/3288/5945 3161/3291/5948 3156/3286/5943 +f 3156/3286/5943 3161/3291/5948 3162/3292/5949 +f 3156/3286/5943 3162/3292/5949 3163/3293/5950 +f 3163/3293/5950 3162/3292/5949 3164/3294/5951 +f 3164/3294/5951 3162/3292/5949 3165/3295/5952 +f 3164/3294/5951 3165/3295/5952 3166/3296/5953 +f 3166/3296/5953 3167/3297/5954 3164/3294/5951 +f 3164/3294/5951 3167/3297/5954 3168/3298/5955 +f 3164/3294/5951 3168/3298/5955 3169/3299/5956 +f 3170/3300/5957 3171/3301/5958 3163/3293/5950 +f 3163/3293/5950 3171/3301/5958 3156/3286/5943 +s 1 +f 3084/3214/5866 3083/3213/5865 3172/3302/5959 +f 3172/3302/5959 3083/3213/5865 3120/3250/5960 +f 3172/3302/5959 3120/3250/5960 3173/3303/5961 +f 3173/3303/5961 3120/3250/5960 3122/3252/5962 +f 3173/3303/5961 3122/3252/5962 3174/3304/5963 +f 3174/3304/5963 3122/3252/5962 3125/3255/5964 +f 3125/3255/5964 3127/3257/5965 3174/3304/5963 +f 3174/3304/5963 3127/3257/5965 3175/3305/5966 +f 3087/3217/5967 3176/3306/5968 3092/3222/5969 +f 3092/3222/5969 3176/3306/5968 3177/3307/5970 +f 3092/3222/5969 3177/3307/5970 3091/3221/5971 +f 3091/3221/5971 3177/3307/5970 3178/3308/5972 +f 3091/3221/5971 3178/3308/5972 3090/3220/5973 +f 3090/3220/5973 3178/3308/5972 3179/3309/5974 +f 3090/3220/5973 3179/3309/5974 3089/3219/5975 +f 3089/3219/5975 3179/3309/5974 3180/3310/5976 +f 3089/3219/5975 3180/3310/5976 3088/3218/5977 +f 3088/3218/5977 3180/3310/5976 3181/3311/5978 +f 3088/3218/5977 3181/3311/5978 3085/3215/5979 +f 3085/3215/5979 3181/3311/5978 3182/3312/5980 +f 3182/3312/5980 3183/3313/5981 3085/3215/5979 +f 3085/3215/5979 3183/3313/5981 3086/3216/5982 +s 8 +f 3080/3210/5983 3078/3208/5984 3082/3212/5985 +f 3082/3212/5985 3078/3208/5984 3076/3206/5986 +f 3082/3212/5985 3076/3206/5986 3182/3312/5987 +f 3182/3312/5987 3076/3206/5986 3183/3313/5988 +f 3183/3313/5988 3076/3206/5986 3184/3314/5989 +f 3183/3313/5988 3184/3314/5989 3185/3315/5990 +f 3185/3315/5990 3184/3314/5989 3186/3316/5991 +f 3084/3214/5992 3187/3317/5993 3076/3206/5986 +f 3076/3206/5986 3187/3317/5993 3188/3318/5994 +f 3076/3206/5986 3188/3318/5994 3184/3314/5989 +f 3172/3302/5995 3189/3319/5996 3084/3214/5992 +f 3084/3214/5992 3189/3319/5996 3190/3320/5997 +f 3084/3214/5992 3190/3320/5997 3191/3321/5998 +f 3189/3319/5996 3172/3302/5995 3192/3322/5999 +f 3192/3322/5999 3172/3302/5995 3173/3303/6000 +f 3192/3322/5999 3173/3303/6000 3193/3323/6001 +f 3193/3323/6001 3173/3303/6000 3194/3324/6002 +f 3194/3324/6002 3173/3303/6000 3174/3304/6003 +f 3194/3324/6002 3174/3304/6003 3175/3305/6004 +f 3194/3324/6002 3175/3305/6004 3195/3325/6005 +f 3195/3325/6005 3175/3305/6004 3196/3326/6006 +f 3195/3325/6005 3196/3326/6006 3197/3327/6007 +f 3197/3327/6007 3196/3326/6006 3198/3328/6008 +f 3198/3328/6008 3196/3326/6006 3199/3329/6009 +f 3198/3328/6008 3199/3329/6009 3200/3330/6010 +f 3200/3330/6010 3199/3329/6009 3201/3331/6011 +f 3200/3330/6010 3201/3331/6011 3202/3332/6012 +f 3202/3332/6012 3201/3331/6011 3203/3333/6013 +f 3203/3333/6013 3201/3331/6011 3204/3334/6014 +f 3204/3334/6014 3201/3331/6011 3205/3335/6015 +f 3204/3334/6014 3205/3335/6015 3206/3336/6016 +f 3206/3336/6016 3205/3335/6015 3207/3337/6017 +f 3207/3337/6017 3205/3335/6015 3208/3338/6018 +f 3207/3337/6017 3208/3338/6018 3209/3339/6019 +f 3210/3340/6020 3211/3341/6021 3205/3335/6015 +f 3205/3335/6015 3211/3341/6021 3212/3342/6022 +f 3205/3335/6015 3212/3342/6022 3208/3338/6018 +f 3210/3340/6020 3213/3343/6023 3211/3341/6021 +f 3211/3341/6021 3214/3344/6024 3212/3342/6022 +f 3212/3342/6022 3214/3344/6024 3215/3345/6025 +f 3215/3345/6025 3214/3344/6024 3216/3346/6026 +f 3216/3346/6026 3214/3344/6024 3217/3347/6027 +f 3217/3347/6027 3214/3344/6024 3218/3348/6028 +f 3218/3348/6028 3214/3344/6024 3219/3349/6029 +f 3209/3339/6019 3220/3350/6030 3207/3337/6017 +f 3202/3332/6012 3221/3351/6031 3200/3330/6010 +f 3200/3330/6010 3221/3351/6031 3222/3352/6032 +f 3200/3330/6010 3222/3352/6032 3223/3353/6033 +f 3200/3330/6010 3223/3353/6033 3224/3354/6034 +f 3224/3354/6034 3223/3353/6033 3225/3355/6035 +f 3224/3354/6034 3225/3355/6035 3226/3356/6036 +f 3227/3357/6037 3228/3358/6038 3226/3356/6036 +f 3226/3356/6036 3228/3358/6038 3229/3359/6039 +f 3226/3356/6036 3229/3359/6039 3224/3354/6034 +f 3224/3354/6034 3229/3359/6039 3230/3360/6040 +f 3224/3354/6034 3230/3360/6040 3231/3361/6041 +f 3231/3361/6041 3230/3360/6040 3232/3362/6042 +f 3232/3362/6042 3230/3360/6040 3233/3363/6043 +f 3232/3362/6042 3233/3363/6043 3234/3364/6044 +f 3234/3364/6044 3235/3365/6045 3232/3362/6042 +f 3232/3362/6042 3235/3365/6045 3236/3366/6046 +f 3232/3362/6042 3236/3366/6046 3237/3367/6047 +f 3238/3368/6048 3239/3369/6049 3231/3361/6041 +f 3231/3361/6041 3239/3369/6049 3224/3354/6034 +f 3240/3370/6050 3241/3371/6051 3189/3319/5996 +f 3189/3319/5996 3241/3371/6051 3242/3372/6052 +f 3189/3319/5996 3242/3372/6052 3243/3373/6053 +f 3244/3374/6054 3245/3375/6055 3240/3370/6050 +f 3240/3370/6050 3245/3375/6055 3246/3376/6056 +f 3240/3370/6050 3246/3376/6056 3247/3377/6057 +f 3244/3374/6054 3248/3378/6058 3245/3375/6055 +f 3245/3375/6055 3249/3379/6059 3246/3376/6056 +f 3246/3376/6056 3249/3379/6059 3250/3380/6060 +f 3250/3380/6060 3249/3379/6059 3251/3381/6061 +f 3251/3381/6061 3249/3379/6059 3252/3382/6062 +f 3252/3382/6062 3249/3379/6059 3253/3383/6063 +f 3253/3383/6063 3249/3379/6059 3254/3384/6064 +f 3240/3370/6050 3247/3377/6057 3255/3385/6065 +f 3255/3385/6065 3247/3377/6057 3256/3386/6066 +f 3255/3385/6065 3256/3386/6066 3257/3387/6067 +f 3255/3385/6065 3258/3388/6068 3240/3370/6050 +f 3240/3370/6050 3258/3388/6068 3241/3371/6051 +f 3243/3373/6053 3190/3320/5997 3189/3319/5996 +f 3191/3321/5998 3187/3317/5993 3084/3214/5992 +f 3082/3212/5985 3182/3312/5987 3176/3306/6069 +f 3176/3306/6069 3182/3312/5987 3181/3311/6070 +f 3176/3306/6069 3181/3311/6070 3180/3310/6071 +f 3180/3310/6071 3179/3309/6072 3176/3306/6069 +f 3176/3306/6069 3179/3309/6072 3178/3308/6073 +f 3176/3306/6069 3178/3308/6073 3177/3307/6074 +s 1 +f 3086/3216/5982 3183/3313/5981 3094/3224/6075 +f 3094/3224/6075 3183/3313/5981 3185/3315/6076 +f 3094/3224/6075 3185/3315/6076 3095/3225/6077 +f 3095/3225/6077 3185/3315/6076 3186/3316/6078 +f 3095/3225/6077 3186/3316/6078 3093/3223/6079 +f 3093/3223/6079 3186/3316/6078 3184/3314/6080 +f 3184/3314/6080 3188/3318/6081 3093/3223/6079 +f 3093/3223/6079 3188/3318/6081 3096/3226/6082 +f 3190/3320/6083 3099/3229/6084 3191/3321/6085 +f 3191/3321/6085 3099/3229/6084 3098/3228/6086 +f 3191/3321/6085 3098/3228/6086 3187/3317/6087 +f 3187/3317/6087 3098/3228/6086 3097/3227/6088 +f 3187/3317/6087 3097/3227/6088 3188/3318/6081 +f 3188/3318/6081 3097/3227/6088 3096/3226/6082 +f 3258/3388/6089 3105/3235/6090 3241/3371/6091 +f 3241/3371/6091 3105/3235/6090 3103/3233/6092 +f 3241/3371/6091 3103/3233/6092 3242/3372/6093 +f 3242/3372/6093 3103/3233/6092 3102/3232/6094 +f 3242/3372/6093 3102/3232/6094 3243/3373/6095 +f 3243/3373/6095 3102/3232/6094 3101/3231/6096 +f 3190/3320/6083 3243/3373/6095 3099/3229/6084 +f 3099/3229/6084 3243/3373/6095 3101/3231/6096 +f 3106/3236/6097 3255/3385/6098 3107/3237/6099 +f 3107/3237/6099 3255/3385/6098 3257/3387/6100 +f 3107/3237/6099 3257/3387/6100 3108/3238/6101 +f 3108/3238/6101 3257/3387/6100 3256/3386/6102 +f 3108/3238/6101 3256/3386/6102 3109/3239/6103 +f 3109/3239/6103 3256/3386/6102 3247/3377/6104 +f 3258/3388/6089 3255/3385/6098 3105/3235/6090 +f 3105/3235/6090 3255/3385/6098 3106/3236/6097 +f 3110/3240/6105 3246/3376/6106 3113/3243/6107 +f 3113/3243/6107 3246/3376/6106 3250/3380/6108 +f 3113/3243/6107 3250/3380/6108 3114/3244/6109 +f 3114/3244/6109 3250/3380/6108 3251/3381/6110 +f 3114/3244/6109 3251/3381/6110 3115/3245/6111 +f 3115/3245/6111 3251/3381/6110 3252/3382/6112 +f 3115/3245/6111 3252/3382/6112 3116/3246/6113 +f 3116/3246/6113 3252/3382/6112 3253/3383/6114 +f 3116/3246/6113 3253/3383/6114 3117/3247/6115 +f 3117/3247/6115 3253/3383/6114 3254/3384/6116 +f 3117/3247/6115 3254/3384/6116 3112/3242/6117 +f 3112/3242/6117 3254/3384/6116 3249/3379/6118 +f 3249/3379/6118 3245/3375/6119 3112/3242/6117 +f 3112/3242/6117 3245/3375/6119 3111/3241/6120 +f 3111/3241/6120 3245/3375/6119 3118/3248/6121 +f 3118/3248/6121 3245/3375/6119 3248/3378/6122 +f 3118/3248/6121 3248/3378/6122 3119/3249/6123 +f 3119/3249/6123 3248/3378/6122 3244/3374/6124 +f 3119/3249/6123 3244/3374/6124 3104/3234/6125 +f 3104/3234/6125 3244/3374/6124 3240/3370/6126 +f 3240/3370/6126 3189/3319/6127 3104/3234/6125 +f 3104/3234/6125 3189/3319/6127 3100/3230/6128 +f 3194/3324/6129 3124/3254/6130 3193/3323/6131 +f 3193/3323/6131 3124/3254/6130 3123/3253/6132 +f 3193/3323/6131 3123/3253/6132 3192/3322/6133 +f 3192/3322/6133 3123/3253/6132 3121/3251/6134 +f 3192/3322/6133 3121/3251/6134 3189/3319/6127 +f 3189/3319/6127 3121/3251/6134 3100/3230/6128 +f 3200/3330/6135 3132/3262/6136 3198/3328/6137 +f 3198/3328/6137 3132/3262/6136 3130/3260/6138 +f 3198/3328/6137 3130/3260/6138 3197/3327/6139 +f 3197/3327/6139 3130/3260/6138 3129/3259/6140 +f 3197/3327/6139 3129/3259/6140 3195/3325/6141 +f 3195/3325/6141 3129/3259/6140 3126/3256/6142 +f 3194/3324/6129 3195/3325/6141 3124/3254/6130 +f 3124/3254/6130 3195/3325/6141 3126/3256/6142 +f 3136/3266/6143 3224/3354/6144 3140/3270/6145 +f 3140/3270/6145 3224/3354/6144 3239/3369/6146 +f 3140/3270/6145 3239/3369/6146 3144/3274/6147 +f 3144/3274/6147 3239/3369/6146 3238/3368/6148 +f 3144/3274/6147 3238/3368/6148 3141/3271/6149 +f 3141/3271/6149 3238/3368/6148 3231/3361/6150 +f 3200/3330/6135 3224/3354/6144 3132/3262/6136 +f 3132/3262/6136 3224/3354/6144 3136/3266/6143 +f 3145/3275/6151 3232/3362/6152 3150/3280/6153 +f 3150/3280/6153 3232/3362/6152 3237/3367/6154 +f 3150/3280/6153 3237/3367/6154 3149/3279/6155 +f 3149/3279/6155 3237/3367/6154 3236/3366/6156 +f 3149/3279/6155 3236/3366/6156 3148/3278/6157 +f 3148/3278/6157 3236/3366/6156 3235/3365/6158 +f 3148/3278/6157 3235/3365/6158 3147/3277/6159 +f 3147/3277/6159 3235/3365/6158 3234/3364/6160 +f 3147/3277/6159 3234/3364/6160 3146/3276/6161 +f 3146/3276/6161 3234/3364/6160 3233/3363/6162 +f 3146/3276/6161 3233/3363/6162 3142/3272/6163 +f 3142/3272/6163 3233/3363/6162 3230/3360/6164 +f 3230/3360/6164 3229/3359/6165 3142/3272/6163 +f 3142/3272/6163 3229/3359/6165 3143/3273/6166 +f 3143/3273/6166 3229/3359/6165 3152/3282/6167 +f 3152/3282/6167 3229/3359/6165 3228/3358/6168 +f 3152/3282/6167 3228/3358/6168 3153/3283/6169 +f 3153/3283/6169 3228/3358/6168 3227/3357/6170 +f 3153/3283/6169 3227/3357/6170 3151/3281/6171 +f 3151/3281/6171 3227/3357/6170 3226/3356/6172 +f 3226/3356/6172 3225/3355/6173 3151/3281/6171 +f 3151/3281/6171 3225/3355/6173 3154/3284/6174 +f 3221/3351/6175 3139/3269/6176 3222/3352/6177 +f 3222/3352/6177 3139/3269/6176 3138/3268/6178 +f 3222/3352/6177 3138/3268/6178 3223/3353/6179 +f 3223/3353/6179 3138/3268/6178 3137/3267/6180 +f 3223/3353/6179 3137/3267/6180 3225/3355/6173 +f 3225/3355/6173 3137/3267/6180 3154/3284/6174 +f 3206/3336/6181 3157/3287/6182 3204/3334/6183 +f 3204/3334/6183 3157/3287/6182 3155/3285/6184 +f 3204/3334/6183 3155/3285/6184 3203/3333/6185 +f 3203/3333/6185 3155/3285/6184 3135/3265/6186 +f 3203/3333/6185 3135/3265/6186 3202/3332/6187 +f 3202/3332/6187 3135/3265/6186 3134/3264/6188 +f 3221/3351/6175 3202/3332/6187 3139/3269/6176 +f 3139/3269/6176 3202/3332/6187 3134/3264/6188 +f 3158/3288/6189 3207/3337/6190 3159/3289/6191 +f 3159/3289/6191 3207/3337/6190 3220/3350/6192 +f 3159/3289/6191 3220/3350/6192 3160/3290/6193 +f 3160/3290/6193 3220/3350/6192 3209/3339/6194 +f 3160/3290/6193 3209/3339/6194 3161/3291/6195 +f 3161/3291/6195 3209/3339/6194 3208/3338/6196 +f 3208/3338/6196 3212/3342/6197 3161/3291/6195 +f 3161/3291/6195 3212/3342/6197 3162/3292/6198 +f 3162/3292/6198 3212/3342/6197 3165/3295/6199 +f 3165/3295/6199 3212/3342/6197 3215/3345/6200 +f 3165/3295/6199 3215/3345/6200 3166/3296/6201 +f 3166/3296/6201 3215/3345/6200 3216/3346/6202 +f 3166/3296/6201 3216/3346/6202 3167/3297/6203 +f 3167/3297/6203 3216/3346/6202 3217/3347/6204 +f 3167/3297/6203 3217/3347/6204 3168/3298/6205 +f 3168/3298/6205 3217/3347/6204 3218/3348/6206 +f 3168/3298/6205 3218/3348/6206 3169/3299/6207 +f 3169/3299/6207 3218/3348/6206 3219/3349/6208 +f 3169/3299/6207 3219/3349/6208 3164/3294/6209 +f 3164/3294/6209 3219/3349/6208 3214/3344/6210 +f 3214/3344/6210 3211/3341/6211 3164/3294/6209 +f 3164/3294/6209 3211/3341/6211 3163/3293/6212 +f 3163/3293/6212 3211/3341/6211 3170/3300/6213 +f 3170/3300/6213 3211/3341/6211 3213/3343/6214 +f 3170/3300/6213 3213/3343/6214 3171/3301/6215 +f 3171/3301/6215 3213/3343/6214 3210/3340/6216 +f 3171/3301/6215 3210/3340/6216 3156/3286/6217 +f 3156/3286/6217 3210/3340/6216 3205/3335/6218 +f 3175/3305/5966 3127/3257/5965 3196/3326/6219 +f 3196/3326/6219 3127/3257/5965 3128/3258/6220 +f 3196/3326/6219 3128/3258/6220 3199/3329/6221 +f 3199/3329/6221 3128/3258/6220 3131/3261/6222 +f 3199/3329/6221 3131/3261/6222 3201/3331/6223 +f 3201/3331/6223 3131/3261/6222 3133/3263/6224 +f 3205/3335/6218 3201/3331/6223 3156/3286/6217 +f 3156/3286/6217 3201/3331/6223 3133/3263/6224 +f 3247/3377/6104 3246/3376/6106 3109/3239/6103 +f 3109/3239/6103 3246/3376/6106 3110/3240/6105 +f 3231/3361/6150 3232/3362/6152 3141/3271/6149 +f 3141/3271/6149 3232/3362/6152 3145/3275/6151 +f 3206/3336/6181 3207/3337/6190 3157/3287/6182 +f 3157/3287/6182 3207/3337/6190 3158/3288/6189 +f 3082/3212/5864 3176/3306/5968 3081/3211/5863 +f 3081/3211/5863 3176/3306/5968 3087/3217/5967 +v 137.500000 48.707093 103.792892 +v 137.500000 47.292905 105.207108 +v 137.500000 43.499997 101.414215 +v 137.500000 44.914212 100.000000 +v 137.500000 42.499997 99.000000 +v 137.500000 46.499997 99.000000 +v 137.500000 47.292901 107.792892 +v 137.500000 48.707093 109.207108 +v 137.500000 51.292897 109.207108 +v 137.500000 52.707097 107.792892 +v 137.500000 52.707093 105.207108 +v 137.500000 51.292897 103.792892 +v 137.500000 55.085782 100.000000 +v 137.500000 56.499997 101.414215 +v 137.500000 43.499997 110.000000 +v 137.500000 43.499997 111.585785 +v 137.500000 42.499997 110.000000 +v 137.500000 42.499997 114.000000 +v 137.500000 44.914209 113.000000 +v 137.500000 46.499997 114.000000 +v 137.500000 46.499997 113.000000 +v 137.500000 43.499997 102.992210 +v 137.500000 42.499997 102.992210 +v 137.500000 46.499997 100.000000 +v 137.500000 53.499997 100.000000 +v 137.500000 53.499997 99.000000 +v 137.500000 57.499997 99.000000 +v 137.500000 57.499997 102.992210 +v 137.500000 56.499997 102.992210 +v 137.500000 56.499997 111.585785 +v 137.500000 55.085778 113.000000 +v 137.500000 57.499997 114.000000 +v 137.500000 53.499997 114.000000 +v 137.500000 56.499997 110.000000 +v 137.500000 57.499997 110.000000 +v 137.500000 53.499997 113.000000 +v -137.500000 43.499997 110.000000 +v -137.500000 43.499997 111.585785 +v -137.500000 47.292901 107.792892 +v -137.500000 47.292897 105.207108 +v -137.500000 43.499997 101.414215 +v -137.500000 43.499997 102.992210 +v -137.500000 42.499997 102.992210 +v -137.500000 42.499997 99.000000 +v -137.500000 46.499997 99.000000 +v -137.500000 46.499997 100.000000 +v -137.500000 44.914212 100.000000 +v -137.500000 48.707093 103.792892 +v -137.500000 51.292897 103.792892 +v -137.500000 55.085782 100.000000 +v -137.500000 53.499997 100.000000 +v -137.500000 53.499997 99.000000 +v -137.500000 57.499997 99.000000 +v -137.500000 57.499997 102.992210 +v -137.500000 56.499997 102.992210 +v -137.500000 56.499997 101.414215 +v -137.500000 52.707097 105.207108 +v -137.500000 52.707097 107.792892 +v -137.500000 56.499997 111.585785 +v -137.500000 56.499997 110.000000 +v -137.500000 57.499997 110.000000 +v -137.500000 57.499997 114.000000 +v -137.500000 53.499997 114.000000 +v -137.500000 53.499997 113.000000 +v -137.500000 55.085778 113.000000 +v -137.500000 51.292897 109.207108 +v -137.500000 48.707093 109.207108 +v -137.500000 44.914209 113.000000 +v -137.500000 46.499997 113.000000 +v -137.500000 46.499997 114.000000 +v -137.500000 42.499997 114.000000 +v -137.500000 42.499997 110.000000 +vt 0.915074 0.016061 +vt 0.915074 0.015981 +vt 0.915074 0.015790 +vt 0.915074 0.015864 +vt 0.915074 0.015738 +vt 0.915074 0.015946 +vt 0.915074 0.015988 +vt 0.915074 0.016095 +vt 0.915074 0.016196 +vt 0.915074 0.016276 +vt 0.915074 0.016269 +vt 0.915074 0.016162 +vt 0.915074 0.016393 +vt 0.915074 0.016467 +vt 0.915074 0.015790 +vt 0.915074 0.015790 +vt 0.915074 0.015738 +vt 0.915074 0.015738 +vt 0.915074 0.015864 +vt 0.915074 0.015946 +vt 0.915074 0.015946 +vt 0.915074 0.015790 +vt 0.915074 0.015738 +vt 0.915074 0.015946 +vt 0.915074 0.016311 +vt 0.915074 0.016311 +vt 0.915074 0.016519 +vt 0.915074 0.016519 +vt 0.915074 0.016467 +vt 0.915074 0.016467 +vt 0.915074 0.016393 +vt 0.915074 0.016519 +vt 0.915074 0.016311 +vt 0.915074 0.016467 +vt 0.915074 0.016519 +vt 0.915074 0.016311 +vt 0.905401 0.015790 +vt 0.905401 0.015790 +vt 0.905401 0.015988 +vt 0.905401 0.015981 +vt 0.905401 0.015790 +vt 0.905401 0.015790 +vt 0.905401 0.015738 +vt 0.905401 0.015738 +vt 0.905401 0.015946 +vt 0.905401 0.015946 +vt 0.905401 0.015864 +vt 0.905401 0.016061 +vt 0.905401 0.016162 +vt 0.905401 0.016393 +vt 0.905401 0.016311 +vt 0.905401 0.016311 +vt 0.905401 0.016519 +vt 0.905401 0.016519 +vt 0.905401 0.016467 +vt 0.905401 0.016467 +vt 0.905401 0.016269 +vt 0.905401 0.016276 +vt 0.905401 0.016467 +vt 0.905401 0.016467 +vt 0.905401 0.016519 +vt 0.905401 0.016519 +vt 0.905401 0.016311 +vt 0.905401 0.016311 +vt 0.905401 0.016393 +vt 0.905401 0.016196 +vt 0.905401 0.016095 +vt 0.905401 0.015864 +vt 0.905401 0.015946 +vt 0.905401 0.015946 +vt 0.905401 0.015738 +vt 0.905401 0.015738 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000015 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000019 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 -0.000011 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000008 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -0.707106 -0.707108 +vn 0.000000 -0.707106 -0.707108 +vn 0.000000 -0.707106 -0.707108 +vn 0.000000 -0.707106 -0.707108 +vn 0.000000 -0.944674 0.328010 +vn 0.000000 -0.944674 0.328010 +vn 0.000000 -0.944668 -0.328028 +vn 0.000000 -0.993803 0.111159 +vn 0.000000 -0.707106 0.707108 +vn 0.000000 -0.707106 0.707108 +vn 0.000000 -0.707106 0.707108 +vn 0.000000 -0.707106 0.707107 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.707108 -0.707105 +vn 0.000000 0.707108 -0.707105 +vn 0.000000 0.707108 -0.707105 +vn 0.000000 0.707108 -0.707106 +vn 0.000000 0.328000 -0.944678 +vn 0.000000 -0.111159 -0.993803 +vn 0.000000 -0.327983 -0.944684 +vn 0.000000 -0.327983 -0.944684 +vn 0.000000 -0.707108 -0.707106 +vn 0.000000 -0.707108 -0.707106 +vn 0.000000 -0.707108 -0.707106 +vn 0.000000 -0.707108 -0.707106 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.707106 0.707108 +vn 0.000000 0.707106 0.707108 +vn 0.000000 0.707106 0.707108 +vn 0.000000 0.707106 0.707107 +vn 0.000000 0.944668 0.328029 +vn 0.000000 0.993803 -0.111159 +vn 0.000000 0.944681 -0.327990 +vn 0.000000 0.944681 -0.327990 +vn 0.000000 0.707106 -0.707108 +vn 0.000000 0.707106 -0.707108 +vn 0.000000 0.707106 -0.707108 +vn 0.000000 0.707106 -0.707107 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.707108 0.707106 +vn 0.000000 -0.707108 0.707106 +vn 0.000000 -0.707108 0.707106 +vn 0.000000 -0.707108 0.707105 +vn 0.000000 -0.327981 0.944684 +vn 0.000000 0.111160 0.993803 +vn 0.000000 0.327981 0.944684 +vn 0.000000 0.327981 0.944684 +vn 0.000000 0.707108 0.707106 +vn 0.000000 0.707108 0.707106 +vn 0.000000 0.707108 0.707106 +vn 0.000000 0.707108 0.707106 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -1.000000 0.000011 0.000000 +vn -1.000000 0.000011 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000019 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000015 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 -0.000015 0.000000 +vn -1.000000 -0.000006 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 -0.000006 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 -0.000008 0.000000 +vn -1.000000 0.000000 0.000000 +s 1 +f 3259/3389/6225 3260/3390/6226 3262/3392/6227 +f 3260/3390/6226 3261/3391/6228 3262/3392/6227 +f 3262/3392/6227 3261/3391/6228 3263/3393/6229 +f 3262/3392/6227 3263/3393/6229 3264/3394/6230 +f 3259/3389/6225 3270/3400/6231 3269/3399/6232 3268/3398/6233 3267/3397/6234 3266/3396/6235 3265/3395/6236 3260/3390/6226 +f 3269/3399/6232 3270/3400/6231 3272/3402/6237 +f 3270/3400/6231 3271/3401/6238 3272/3402/6237 +f 3273/3403/6239 3274/3404/6240 3275/3405/6241 +f 3275/3405/6241 3274/3404/6240 3276/3406/6242 +f 3276/3406/6242 3274/3404/6240 3277/3407/6243 +f 3276/3406/6242 3277/3407/6243 3278/3408/6244 +f 3278/3408/6244 3277/3407/6243 3279/3409/6245 +f 3277/3407/6243 3274/3404/6240 3266/3396/6235 +f 3266/3396/6235 3274/3404/6240 3265/3395/6236 +f 3280/3410/6246 3281/3411/6247 3261/3391/6228 +f 3261/3391/6228 3281/3411/6247 3263/3393/6229 +f 3264/3394/6230 3282/3412/6248 3262/3392/6227 +f 3283/3413/6249 3284/3414/6250 3271/3401/6238 +f 3271/3401/6238 3284/3414/6250 3285/3415/6251 +f 3271/3401/6238 3285/3415/6251 3272/3402/6237 +f 3272/3402/6237 3285/3415/6251 3286/3416/6252 +f 3272/3402/6237 3286/3416/6252 3287/3417/6253 +f 3268/3398/6233 3288/3418/6254 3267/3397/6234 +f 3267/3397/6234 3288/3418/6254 3289/3419/6255 +f 3289/3419/6255 3288/3418/6254 3290/3420/6256 +f 3289/3419/6255 3290/3420/6256 3291/3421/6257 +f 3292/3422/6258 3293/3423/6259 3288/3418/6254 +f 3288/3418/6254 3293/3423/6259 3290/3420/6256 +f 3291/3421/6257 3294/3424/6260 3289/3419/6255 +s 4 +f 3273/3403/6261 3295/3425/6262 3274/3404/6263 +f 3274/3404/6263 3295/3425/6262 3296/3426/6264 +s 5 +f 3274/3404/6265 3296/3426/6266 3265/3395/6267 +f 3265/3395/6267 3296/3426/6266 3297/3427/6268 +s off +f 3265/3395/6269 3297/3427/6270 3298/3428/6271 3260/3390/6272 +s 6 +f 3260/3390/6273 3298/3428/6274 3261/3391/6275 +f 3261/3391/6275 3298/3428/6274 3299/3429/6276 +s 7 +f 3261/3391/6277 3299/3429/6278 3280/3410/6279 +f 3280/3410/6279 3299/3429/6278 3300/3430/6280 +s 8 +f 3280/3410/6281 3300/3430/6282 3281/3411/6283 +f 3281/3411/6283 3300/3430/6282 3301/3431/6284 +s 9 +f 3281/3411/6285 3301/3431/6286 3263/3393/6287 +f 3263/3393/6287 3301/3431/6286 3302/3432/6288 +s 10 +f 3263/3393/6289 3302/3432/6290 3264/3394/6291 +f 3264/3394/6291 3302/3432/6290 3303/3433/6292 +s 11 +f 3264/3394/6293 3303/3433/6294 3282/3412/6295 +f 3282/3412/6295 3303/3433/6294 3304/3434/6296 +s 12 +f 3282/3412/6297 3304/3434/6298 3262/3392/6299 +f 3262/3392/6299 3304/3434/6298 3305/3435/6300 +s 13 +f 3262/3392/6301 3305/3435/6302 3259/3389/6303 +f 3259/3389/6303 3305/3435/6302 3306/3436/6304 +s off +f 3307/3437/6305 3270/3400/6306 3259/3389/6307 3306/3436/6308 +s 14 +f 3270/3400/6309 3307/3437/6310 3271/3401/6311 +f 3271/3401/6311 3307/3437/6310 3308/3438/6312 +s 15 +f 3271/3401/6313 3308/3438/6314 3283/3413/6315 +f 3283/3413/6315 3308/3438/6314 3309/3439/6316 +s 16 +f 3283/3413/6317 3309/3439/6318 3284/3414/6319 +f 3284/3414/6319 3309/3439/6318 3310/3440/6320 +s 17 +f 3284/3414/6321 3310/3440/6322 3285/3415/6323 +f 3285/3415/6323 3310/3440/6322 3311/3441/6324 +s 18 +f 3285/3415/6325 3311/3441/6326 3286/3416/6327 +f 3286/3416/6327 3311/3441/6326 3312/3442/6328 +s 19 +f 3286/3416/6329 3312/3442/6330 3287/3417/6331 +f 3287/3417/6331 3312/3442/6330 3313/3443/6332 +s 20 +f 3287/3417/6333 3313/3443/6334 3272/3402/6335 +f 3272/3402/6335 3313/3443/6334 3314/3444/6336 +s 21 +f 3272/3402/6337 3314/3444/6338 3269/3399/6339 +f 3269/3399/6339 3314/3444/6338 3315/3445/6340 +s off +f 3316/3446/6341 3268/3398/6342 3269/3399/6343 3315/3445/6344 +s 22 +f 3268/3398/6345 3316/3446/6346 3288/3418/6347 +f 3288/3418/6347 3316/3446/6346 3317/3447/6348 +s 23 +f 3288/3418/6349 3317/3447/6350 3292/3422/6351 +f 3292/3422/6351 3317/3447/6350 3318/3448/6352 +s 24 +f 3292/3422/6353 3318/3448/6354 3293/3423/6355 +f 3293/3423/6355 3318/3448/6354 3319/3449/6356 +s 25 +f 3293/3423/6357 3319/3449/6358 3290/3420/6359 +f 3290/3420/6359 3319/3449/6358 3320/3450/6360 +s 26 +f 3290/3420/6361 3320/3450/6362 3291/3421/6363 +f 3291/3421/6363 3320/3450/6362 3321/3451/6364 +s 27 +f 3291/3421/6365 3321/3451/6366 3294/3424/6367 +f 3294/3424/6367 3321/3451/6366 3322/3452/6368 +s 28 +f 3294/3424/6369 3322/3452/6370 3289/3419/6371 +f 3289/3419/6371 3322/3452/6370 3323/3453/6372 +s 29 +f 3289/3419/6373 3323/3453/6374 3267/3397/6375 +f 3267/3397/6375 3323/3453/6374 3324/3454/6376 +s off +f 3325/3455/6377 3266/3396/6378 3267/3397/6379 3324/3454/6380 +s 30 +f 3266/3396/6381 3325/3455/6382 3277/3407/6383 +f 3277/3407/6383 3325/3455/6382 3326/3456/6384 +s 31 +f 3277/3407/6385 3326/3456/6386 3279/3409/6387 +f 3279/3409/6387 3326/3456/6386 3327/3457/6388 +s 32 +f 3279/3409/6389 3327/3457/6390 3278/3408/6391 +f 3278/3408/6391 3327/3457/6390 3328/3458/6392 +s 33 +f 3278/3408/6393 3328/3458/6394 3276/3406/6395 +f 3276/3406/6395 3328/3458/6394 3329/3459/6396 +s 34 +f 3276/3406/6397 3329/3459/6398 3275/3405/6399 +f 3275/3405/6399 3329/3459/6398 3330/3460/6400 +s 35 +f 3275/3405/6401 3330/3460/6402 3273/3403/6403 +f 3273/3403/6403 3330/3460/6402 3295/3425/6404 +s 36 +f 3306/3436/6405 3305/3435/6406 3298/3428/6407 +f 3305/3435/6406 3299/3429/6408 3298/3428/6407 +f 3297/3427/6409 3325/3455/6410 3324/3454/6411 3316/3446/6412 3315/3445/6413 3307/3437/6414 3306/3436/6405 3298/3428/6407 +f 3315/3445/6413 3314/3444/6415 3307/3437/6414 +f 3314/3444/6415 3308/3438/6416 3307/3437/6414 +f 3308/3438/6416 3314/3444/6415 3311/3441/6417 +f 3308/3438/6416 3311/3441/6417 3310/3440/6418 +f 3295/3425/6419 3330/3460/6420 3296/3426/6421 +f 3296/3426/6421 3330/3460/6420 3329/3459/6422 +f 3296/3426/6421 3329/3459/6422 3326/3456/6423 +f 3326/3456/6423 3329/3459/6422 3328/3458/6424 +f 3326/3456/6423 3328/3458/6424 3327/3457/6425 +f 3326/3456/6423 3325/3455/6410 3296/3426/6421 +f 3296/3426/6421 3325/3455/6410 3297/3427/6409 +f 3316/3446/6412 3324/3454/6411 3317/3447/6426 +f 3317/3447/6426 3324/3454/6411 3323/3453/6427 +f 3317/3447/6426 3323/3453/6427 3320/3450/6428 +f 3320/3450/6428 3323/3453/6427 3321/3451/6429 +f 3321/3451/6429 3323/3453/6427 3322/3452/6430 +f 3320/3450/6428 3319/3449/6431 3317/3447/6426 +f 3317/3447/6426 3319/3449/6431 3318/3448/6432 +f 3313/3443/6433 3312/3442/6434 3314/3444/6415 +f 3314/3444/6415 3312/3442/6434 3311/3441/6417 +f 3310/3440/6418 3309/3439/6435 3308/3438/6416 +f 3304/3434/6436 3303/3433/6437 3305/3435/6406 +f 3305/3435/6406 3303/3433/6437 3302/3432/6438 +f 3305/3435/6406 3302/3432/6438 3299/3429/6408 +f 3299/3429/6408 3302/3432/6438 3301/3431/6439 +f 3299/3429/6408 3301/3431/6439 3300/3430/6440 +v 137.500000 -51.292904 103.792892 +v 137.500000 -52.707092 105.207108 +v 137.500000 -56.500000 101.414215 +v 137.500000 -55.085785 100.000000 +v 137.500000 -57.500000 99.000000 +v 137.500000 -53.500000 99.000000 +v 137.500000 -52.707096 107.792892 +v 137.500000 -51.292904 109.207108 +v 137.500000 -48.707100 109.207108 +v 137.500000 -47.292900 107.792892 +v 137.500000 -47.292904 105.207108 +v 137.500000 -48.707100 103.792892 +v 137.500000 -44.914215 100.000000 +v 137.500000 -43.500000 101.414215 +v 137.500000 -56.500000 110.000000 +v 137.500000 -56.500000 111.585785 +v 137.500000 -57.500000 110.000000 +v 137.500000 -57.500000 114.000000 +v 137.500000 -55.085789 113.000000 +v 137.500000 -53.500000 114.000000 +v 137.500000 -53.500000 113.000000 +v 137.500000 -56.500000 102.992210 +v 137.500000 -57.500000 102.992210 +v 137.500000 -53.500000 100.000000 +v 137.500000 -46.500000 100.000000 +v 137.500000 -46.500000 99.000000 +v 137.500000 -42.500000 99.000000 +v 137.500000 -42.500000 102.992210 +v 137.500000 -43.500000 102.992210 +v 137.500000 -43.500000 111.585785 +v 137.500000 -44.914219 113.000000 +v 137.500000 -42.500000 114.000000 +v 137.500000 -46.500000 114.000000 +v 137.500000 -43.500000 110.000000 +v 137.500000 -42.500000 110.000000 +v 137.500000 -46.500000 113.000000 +v -137.500000 -56.500000 110.000000 +v -137.500000 -56.500000 111.585785 +v -137.500000 -52.707096 107.792892 +v -137.500000 -52.707100 105.207108 +v -137.500000 -56.500000 101.414215 +v -137.500000 -56.500000 102.992210 +v -137.500000 -57.500000 102.992210 +v -137.500000 -57.500000 99.000000 +v -137.500000 -53.500000 99.000000 +v -137.500000 -53.500000 100.000000 +v -137.500000 -55.085785 100.000000 +v -137.500000 -51.292904 103.792892 +v -137.500000 -48.707100 103.792892 +v -137.500000 -44.914215 100.000000 +v -137.500000 -46.500000 100.000000 +v -137.500000 -46.500000 99.000000 +v -137.500000 -42.500000 99.000000 +v -137.500000 -42.500000 102.992210 +v -137.500000 -43.500000 102.992210 +v -137.500000 -43.500000 101.414215 +v -137.500000 -47.292900 105.207108 +v -137.500000 -47.292900 107.792892 +v -137.500000 -43.500000 111.585785 +v -137.500000 -43.500000 110.000000 +v -137.500000 -42.500000 110.000000 +v -137.500000 -42.500000 114.000000 +v -137.500000 -46.500000 114.000000 +v -137.500000 -46.500000 113.000000 +v -137.500000 -44.914219 113.000000 +v -137.500000 -48.707100 109.207108 +v -137.500000 -51.292904 109.207108 +v -137.500000 -55.085789 113.000000 +v -137.500000 -53.500000 113.000000 +v -137.500000 -53.500000 114.000000 +v -137.500000 -57.500000 114.000000 +v -137.500000 -57.500000 110.000000 +vt 0.915074 0.016061 +vt 0.915074 0.015981 +vt 0.915074 0.015790 +vt 0.915074 0.015864 +vt 0.915074 0.015738 +vt 0.915074 0.015946 +vt 0.915074 0.015988 +vt 0.915074 0.016095 +vt 0.915074 0.016196 +vt 0.915074 0.016276 +vt 0.915074 0.016269 +vt 0.915074 0.016162 +vt 0.915074 0.016393 +vt 0.915074 0.016467 +vt 0.915074 0.015790 +vt 0.915074 0.015790 +vt 0.915074 0.015738 +vt 0.915074 0.015738 +vt 0.915074 0.015864 +vt 0.915074 0.015946 +vt 0.915074 0.015946 +vt 0.915074 0.015790 +vt 0.915074 0.015738 +vt 0.915074 0.015946 +vt 0.915074 0.016311 +vt 0.915074 0.016311 +vt 0.915074 0.016519 +vt 0.915074 0.016519 +vt 0.915074 0.016467 +vt 0.915074 0.016467 +vt 0.915074 0.016393 +vt 0.915074 0.016519 +vt 0.915074 0.016311 +vt 0.915074 0.016467 +vt 0.915074 0.016519 +vt 0.915074 0.016311 +vt 0.905401 0.015790 +vt 0.905401 0.015790 +vt 0.905401 0.015988 +vt 0.905401 0.015981 +vt 0.905401 0.015790 +vt 0.905401 0.015790 +vt 0.905401 0.015738 +vt 0.905401 0.015738 +vt 0.905401 0.015946 +vt 0.905401 0.015946 +vt 0.905401 0.015864 +vt 0.905401 0.016061 +vt 0.905401 0.016162 +vt 0.905401 0.016393 +vt 0.905401 0.016311 +vt 0.905401 0.016311 +vt 0.905401 0.016519 +vt 0.905401 0.016519 +vt 0.905401 0.016467 +vt 0.905401 0.016467 +vt 0.905401 0.016269 +vt 0.905401 0.016276 +vt 0.905401 0.016467 +vt 0.905401 0.016467 +vt 0.905401 0.016519 +vt 0.905401 0.016519 +vt 0.905401 0.016311 +vt 0.905401 0.016311 +vt 0.905401 0.016393 +vt 0.905401 0.016196 +vt 0.905401 0.016095 +vt 0.905401 0.015864 +vt 0.905401 0.015946 +vt 0.905401 0.015946 +vt 0.905401 0.015738 +vt 0.905401 0.015738 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000015 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000019 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 -0.000011 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000008 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -0.707106 -0.707108 +vn 0.000000 -0.707106 -0.707108 +vn 0.000000 -0.707106 -0.707108 +vn 0.000000 -0.707106 -0.707108 +vn 0.000000 -0.944674 0.328010 +vn 0.000000 -0.944674 0.328010 +vn 0.000000 -0.944668 -0.328028 +vn 0.000000 -0.993803 0.111159 +vn 0.000000 -0.707106 0.707108 +vn 0.000000 -0.707106 0.707108 +vn 0.000000 -0.707106 0.707108 +vn 0.000000 -0.707106 0.707107 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.707108 -0.707105 +vn 0.000000 0.707108 -0.707105 +vn 0.000000 0.707108 -0.707105 +vn 0.000000 0.707108 -0.707106 +vn 0.000000 0.328000 -0.944678 +vn 0.000000 -0.111159 -0.993803 +vn 0.000000 -0.327983 -0.944684 +vn 0.000000 -0.327983 -0.944684 +vn 0.000000 -0.707108 -0.707106 +vn 0.000000 -0.707108 -0.707106 +vn 0.000000 -0.707108 -0.707106 +vn 0.000000 -0.707108 -0.707106 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.707106 0.707108 +vn 0.000000 0.707106 0.707108 +vn 0.000000 0.707106 0.707108 +vn 0.000000 0.707106 0.707107 +vn 0.000000 0.944668 0.328029 +vn 0.000000 0.993803 -0.111159 +vn 0.000000 0.944681 -0.327990 +vn 0.000000 0.944681 -0.327990 +vn 0.000000 0.707106 -0.707108 +vn 0.000000 0.707106 -0.707108 +vn 0.000000 0.707106 -0.707108 +vn 0.000000 0.707106 -0.707107 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -0.707108 0.707106 +vn 0.000000 -0.707108 0.707106 +vn 0.000000 -0.707108 0.707106 +vn 0.000000 -0.707108 0.707105 +vn 0.000000 -0.327981 0.944684 +vn 0.000000 0.111160 0.993803 +vn 0.000000 0.327981 0.944684 +vn 0.000000 0.327981 0.944684 +vn 0.000000 0.707108 0.707106 +vn 0.000000 0.707108 0.707106 +vn 0.000000 0.707108 0.707106 +vn 0.000000 0.707108 0.707106 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -1.000000 0.000011 0.000000 +vn -1.000000 0.000011 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000019 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000015 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 -0.000015 0.000000 +vn -1.000000 -0.000006 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 -0.000006 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 -0.000008 0.000000 +vn -1.000000 0.000000 0.000000 +s 1 +f 3331/3461/6441 3332/3462/6442 3334/3464/6443 +f 3332/3462/6442 3333/3463/6444 3334/3464/6443 +f 3334/3464/6443 3333/3463/6444 3335/3465/6445 +f 3334/3464/6443 3335/3465/6445 3336/3466/6446 +f 3331/3461/6441 3342/3472/6447 3341/3471/6448 3340/3470/6449 3339/3469/6450 3338/3468/6451 3337/3467/6452 3332/3462/6442 +f 3341/3471/6448 3342/3472/6447 3344/3474/6453 +f 3342/3472/6447 3343/3473/6454 3344/3474/6453 +f 3345/3475/6455 3346/3476/6456 3347/3477/6457 +f 3347/3477/6457 3346/3476/6456 3348/3478/6458 +f 3348/3478/6458 3346/3476/6456 3349/3479/6459 +f 3348/3478/6458 3349/3479/6459 3350/3480/6460 +f 3350/3480/6460 3349/3479/6459 3351/3481/6461 +f 3349/3479/6459 3346/3476/6456 3338/3468/6451 +f 3338/3468/6451 3346/3476/6456 3337/3467/6452 +f 3352/3482/6462 3353/3483/6463 3333/3463/6444 +f 3333/3463/6444 3353/3483/6463 3335/3465/6445 +f 3336/3466/6446 3354/3484/6464 3334/3464/6443 +f 3355/3485/6465 3356/3486/6466 3343/3473/6454 +f 3343/3473/6454 3356/3486/6466 3357/3487/6467 +f 3343/3473/6454 3357/3487/6467 3344/3474/6453 +f 3344/3474/6453 3357/3487/6467 3358/3488/6468 +f 3344/3474/6453 3358/3488/6468 3359/3489/6469 +f 3340/3470/6449 3360/3490/6470 3339/3469/6450 +f 3339/3469/6450 3360/3490/6470 3361/3491/6471 +f 3361/3491/6471 3360/3490/6470 3362/3492/6472 +f 3361/3491/6471 3362/3492/6472 3363/3493/6473 +f 3364/3494/6474 3365/3495/6475 3360/3490/6470 +f 3360/3490/6470 3365/3495/6475 3362/3492/6472 +f 3363/3493/6473 3366/3496/6476 3361/3491/6471 +s 4 +f 3345/3475/6477 3367/3497/6478 3346/3476/6479 +f 3346/3476/6479 3367/3497/6478 3368/3498/6480 +s 5 +f 3346/3476/6481 3368/3498/6482 3337/3467/6483 +f 3337/3467/6483 3368/3498/6482 3369/3499/6484 +s off +f 3337/3467/6485 3369/3499/6486 3370/3500/6487 3332/3462/6488 +s 6 +f 3332/3462/6489 3370/3500/6490 3333/3463/6491 +f 3333/3463/6491 3370/3500/6490 3371/3501/6492 +s 7 +f 3333/3463/6493 3371/3501/6494 3352/3482/6495 +f 3352/3482/6495 3371/3501/6494 3372/3502/6496 +s 8 +f 3352/3482/6497 3372/3502/6498 3353/3483/6499 +f 3353/3483/6499 3372/3502/6498 3373/3503/6500 +s 9 +f 3353/3483/6501 3373/3503/6502 3335/3465/6503 +f 3335/3465/6503 3373/3503/6502 3374/3504/6504 +s 10 +f 3335/3465/6505 3374/3504/6506 3336/3466/6507 +f 3336/3466/6507 3374/3504/6506 3375/3505/6508 +s 11 +f 3336/3466/6509 3375/3505/6510 3354/3484/6511 +f 3354/3484/6511 3375/3505/6510 3376/3506/6512 +s 12 +f 3354/3484/6513 3376/3506/6514 3334/3464/6515 +f 3334/3464/6515 3376/3506/6514 3377/3507/6516 +s 13 +f 3334/3464/6517 3377/3507/6518 3331/3461/6519 +f 3331/3461/6519 3377/3507/6518 3378/3508/6520 +s off +f 3379/3509/6521 3342/3472/6522 3331/3461/6523 3378/3508/6524 +s 14 +f 3342/3472/6525 3379/3509/6526 3343/3473/6527 +f 3343/3473/6527 3379/3509/6526 3380/3510/6528 +s 15 +f 3343/3473/6529 3380/3510/6530 3355/3485/6531 +f 3355/3485/6531 3380/3510/6530 3381/3511/6532 +s 16 +f 3355/3485/6533 3381/3511/6534 3356/3486/6535 +f 3356/3486/6535 3381/3511/6534 3382/3512/6536 +s 17 +f 3356/3486/6537 3382/3512/6538 3357/3487/6539 +f 3357/3487/6539 3382/3512/6538 3383/3513/6540 +s 18 +f 3357/3487/6541 3383/3513/6542 3358/3488/6543 +f 3358/3488/6543 3383/3513/6542 3384/3514/6544 +s 19 +f 3358/3488/6545 3384/3514/6546 3359/3489/6547 +f 3359/3489/6547 3384/3514/6546 3385/3515/6548 +s 20 +f 3359/3489/6549 3385/3515/6550 3344/3474/6551 +f 3344/3474/6551 3385/3515/6550 3386/3516/6552 +s 21 +f 3344/3474/6553 3386/3516/6554 3341/3471/6555 +f 3341/3471/6555 3386/3516/6554 3387/3517/6556 +s off +f 3388/3518/6557 3340/3470/6558 3341/3471/6559 3387/3517/6560 +s 22 +f 3340/3470/6561 3388/3518/6562 3360/3490/6563 +f 3360/3490/6563 3388/3518/6562 3389/3519/6564 +s 23 +f 3360/3490/6565 3389/3519/6566 3364/3494/6567 +f 3364/3494/6567 3389/3519/6566 3390/3520/6568 +s 24 +f 3364/3494/6569 3390/3520/6570 3365/3495/6571 +f 3365/3495/6571 3390/3520/6570 3391/3521/6572 +s 25 +f 3365/3495/6573 3391/3521/6574 3362/3492/6575 +f 3362/3492/6575 3391/3521/6574 3392/3522/6576 +s 26 +f 3362/3492/6577 3392/3522/6578 3363/3493/6579 +f 3363/3493/6579 3392/3522/6578 3393/3523/6580 +s 27 +f 3363/3493/6581 3393/3523/6582 3366/3496/6583 +f 3366/3496/6583 3393/3523/6582 3394/3524/6584 +s 28 +f 3366/3496/6585 3394/3524/6586 3361/3491/6587 +f 3361/3491/6587 3394/3524/6586 3395/3525/6588 +s 29 +f 3361/3491/6589 3395/3525/6590 3339/3469/6591 +f 3339/3469/6591 3395/3525/6590 3396/3526/6592 +s off +f 3397/3527/6593 3338/3468/6594 3339/3469/6595 3396/3526/6596 +s 30 +f 3338/3468/6597 3397/3527/6598 3349/3479/6599 +f 3349/3479/6599 3397/3527/6598 3398/3528/6600 +s 31 +f 3349/3479/6601 3398/3528/6602 3351/3481/6603 +f 3351/3481/6603 3398/3528/6602 3399/3529/6604 +s 32 +f 3351/3481/6605 3399/3529/6606 3350/3480/6607 +f 3350/3480/6607 3399/3529/6606 3400/3530/6608 +s 33 +f 3350/3480/6609 3400/3530/6610 3348/3478/6611 +f 3348/3478/6611 3400/3530/6610 3401/3531/6612 +s 34 +f 3348/3478/6613 3401/3531/6614 3347/3477/6615 +f 3347/3477/6615 3401/3531/6614 3402/3532/6616 +s 35 +f 3347/3477/6617 3402/3532/6618 3345/3475/6619 +f 3345/3475/6619 3402/3532/6618 3367/3497/6620 +s 36 +f 3378/3508/6621 3377/3507/6622 3370/3500/6623 +f 3377/3507/6622 3371/3501/6624 3370/3500/6623 +f 3369/3499/6625 3397/3527/6626 3396/3526/6627 3388/3518/6628 3387/3517/6629 3379/3509/6630 3378/3508/6621 3370/3500/6623 +f 3387/3517/6629 3386/3516/6631 3379/3509/6630 +f 3386/3516/6631 3380/3510/6632 3379/3509/6630 +f 3380/3510/6632 3386/3516/6631 3383/3513/6633 +f 3380/3510/6632 3383/3513/6633 3382/3512/6634 +f 3367/3497/6635 3402/3532/6636 3368/3498/6637 +f 3368/3498/6637 3402/3532/6636 3401/3531/6638 +f 3368/3498/6637 3401/3531/6638 3398/3528/6639 +f 3398/3528/6639 3401/3531/6638 3400/3530/6640 +f 3398/3528/6639 3400/3530/6640 3399/3529/6641 +f 3398/3528/6639 3397/3527/6626 3368/3498/6637 +f 3368/3498/6637 3397/3527/6626 3369/3499/6625 +f 3388/3518/6628 3396/3526/6627 3389/3519/6642 +f 3389/3519/6642 3396/3526/6627 3395/3525/6643 +f 3389/3519/6642 3395/3525/6643 3392/3522/6644 +f 3392/3522/6644 3395/3525/6643 3393/3523/6645 +f 3393/3523/6645 3395/3525/6643 3394/3524/6646 +f 3392/3522/6644 3391/3521/6647 3389/3519/6642 +f 3389/3519/6642 3391/3521/6647 3390/3520/6648 +f 3385/3515/6649 3384/3514/6650 3386/3516/6631 +f 3386/3516/6631 3384/3514/6650 3383/3513/6633 +f 3382/3512/6634 3381/3511/6651 3380/3510/6632 +f 3376/3506/6652 3375/3505/6653 3377/3507/6622 +f 3377/3507/6622 3375/3505/6653 3374/3504/6654 +f 3377/3507/6622 3374/3504/6654 3371/3501/6624 +f 3371/3501/6624 3374/3504/6654 3373/3503/6655 +f 3371/3501/6624 3373/3503/6655 3372/3502/6656 +v -148.792908 -137.500000 103.792892 +v -150.207092 -137.500000 105.207108 +v -154.000000 -137.500000 101.414215 +v -152.585800 -137.500000 100.000000 +v -155.000000 -137.500000 99.000000 +v -151.000000 -137.500000 99.000000 +v -150.207108 -137.500000 107.792892 +v -148.792908 -137.500000 109.207108 +v -146.207108 -137.500000 109.207108 +v -144.792877 -137.500000 107.792892 +v -144.792892 -137.500000 105.207108 +v -146.207108 -137.500000 103.792892 +v -142.414200 -137.500000 100.000000 +v -141.000000 -137.500000 101.414215 +v -154.000000 -137.500000 110.000000 +v -154.000000 -137.500000 111.585785 +v -155.000000 -137.500000 110.000000 +v -155.000000 -137.500000 114.000000 +v -152.585800 -137.500000 113.000000 +v -151.000000 -137.500000 114.000000 +v -151.000000 -137.500000 113.000000 +v -154.000000 -137.500000 102.992210 +v -155.000000 -137.500000 102.992210 +v -151.000000 -137.500000 100.000000 +v -144.000000 -137.500000 100.000000 +v -144.000000 -137.500000 99.000000 +v -140.000000 -137.500000 99.000000 +v -140.000000 -137.500000 102.992210 +v -141.000000 -137.500000 102.992210 +v -141.000000 -137.500000 111.585785 +v -142.414215 -137.500000 113.000000 +v -140.000000 -137.500000 114.000000 +v -144.000000 -137.500000 114.000000 +v -141.000000 -137.500000 110.000000 +v -140.000000 -137.500000 110.000000 +v -144.000000 -137.500000 113.000000 +v -154.000000 137.500000 110.000000 +v -154.000000 137.500000 111.585785 +v -150.207108 137.500000 107.792892 +v -150.207092 137.500000 105.207108 +v -154.000000 137.500000 101.414215 +v -154.000000 137.500000 102.992210 +v -155.000000 137.500000 102.992210 +v -155.000000 137.500000 99.000000 +v -151.000000 137.500000 99.000000 +v -151.000000 137.500000 100.000000 +v -152.585800 137.500000 100.000000 +v -148.792908 137.500000 103.792892 +v -146.207108 137.500000 103.792892 +v -142.414200 137.500000 100.000000 +v -144.000000 137.500000 100.000000 +v -144.000000 137.500000 99.000000 +v -140.000000 137.500000 99.000000 +v -140.000000 137.500000 102.992210 +v -141.000000 137.500000 102.992210 +v -141.000000 137.500000 101.414215 +v -144.792892 137.500000 105.207108 +v -144.792892 137.500000 107.792892 +v -141.000000 137.500000 111.585785 +v -141.000000 137.500000 110.000000 +v -140.000000 137.500000 110.000000 +v -140.000000 137.500000 114.000000 +v -144.000000 137.500000 114.000000 +v -144.000000 137.500000 113.000000 +v -142.414215 137.500000 113.000000 +v -146.207108 137.500000 109.207108 +v -148.792908 137.500000 109.207108 +v -152.585800 137.500000 113.000000 +v -151.000000 137.500000 113.000000 +v -151.000000 137.500000 114.000000 +v -155.000000 137.500000 114.000000 +v -155.000000 137.500000 110.000000 +vt 0.905027 0.011574 +vt 0.904950 0.011574 +vt 0.904821 0.011574 +vt 0.904871 0.011574 +vt 0.904786 0.011574 +vt 0.904926 0.011574 +vt 0.904954 0.011574 +vt 0.905004 0.011574 +vt 0.905072 0.011574 +vt 0.905145 0.011574 +vt 0.905149 0.011574 +vt 0.905095 0.011574 +vt 0.905228 0.011574 +vt 0.905278 0.011574 +vt 0.904821 0.011574 +vt 0.904821 0.011574 +vt 0.904786 0.011574 +vt 0.904786 0.011574 +vt 0.904871 0.011574 +vt 0.904926 0.011574 +vt 0.904926 0.011574 +vt 0.904821 0.011574 +vt 0.904786 0.011574 +vt 0.904926 0.011574 +vt 0.905173 0.011574 +vt 0.905173 0.011574 +vt 0.905313 0.011574 +vt 0.905313 0.011574 +vt 0.905278 0.011574 +vt 0.905278 0.011574 +vt 0.905228 0.011574 +vt 0.905313 0.011574 +vt 0.905173 0.011574 +vt 0.905278 0.011574 +vt 0.905313 0.011574 +vt 0.905173 0.011574 +vt 0.904821 0.025889 +vt 0.904821 0.025889 +vt 0.904954 0.025889 +vt 0.904950 0.025889 +vt 0.904821 0.025889 +vt 0.904821 0.025889 +vt 0.904786 0.025889 +vt 0.904786 0.025889 +vt 0.904926 0.025889 +vt 0.904926 0.025889 +vt 0.904871 0.025889 +vt 0.905027 0.025889 +vt 0.905095 0.025889 +vt 0.905228 0.025889 +vt 0.905173 0.025889 +vt 0.905173 0.025889 +vt 0.905313 0.025889 +vt 0.905313 0.025889 +vt 0.905278 0.025889 +vt 0.905278 0.025889 +vt 0.905149 0.025889 +vt 0.905145 0.025889 +vt 0.905278 0.025889 +vt 0.905278 0.025889 +vt 0.905313 0.025889 +vt 0.905313 0.025889 +vt 0.905173 0.025889 +vt 0.905173 0.025889 +vt 0.905228 0.025889 +vt 0.905072 0.025889 +vt 0.905004 0.025889 +vt 0.904871 0.025889 +vt 0.904926 0.025889 +vt 0.904926 0.025889 +vt 0.904786 0.025889 +vt 0.904786 0.025889 +vn 0.000000 -1.000000 0.000004 +vn 0.000000 -1.000000 0.000004 +vn 0.000000 -1.000000 0.000011 +vn 0.000000 -1.000000 0.000005 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 -0.000031 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 -0.000017 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000008 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -0.707107 0.000000 -0.707107 +vn -0.707107 0.000000 -0.707107 +vn -0.707107 0.000000 -0.707107 +vn -0.707107 0.000000 -0.707107 +vn -0.944684 0.000000 0.327981 +vn -0.944684 0.000000 0.327981 +vn -0.944678 0.000000 -0.328000 +vn -0.993802 0.000000 0.111164 +vn -0.707105 0.000000 0.707108 +vn -0.707105 0.000000 0.707108 +vn -0.707105 0.000000 0.707108 +vn -0.707105 0.000000 0.707108 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.328005 0.000000 -0.944676 +vn 0.328005 0.000000 -0.944676 +vn -0.327986 0.000000 -0.944683 +vn 0.111159 0.000000 -0.993803 +vn -0.707106 0.000000 -0.707108 +vn -0.707106 0.000000 -0.707108 +vn -0.707106 0.000000 -0.707108 +vn -0.707106 0.000000 -0.707108 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.944683 0.000000 0.327984 +vn 0.944691 0.000000 0.327963 +vn 0.944692 0.000000 -0.327960 +vn 0.993802 0.000000 0.111164 +vn 0.707108 0.000000 -0.707105 +vn 0.707108 0.000000 -0.707105 +vn 0.707108 0.000000 -0.707105 +vn 0.707107 0.000000 -0.707107 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.327986 0.000000 0.944683 +vn -0.327974 0.000000 0.944687 +vn 0.327986 0.000000 0.944683 +vn -0.111163 0.000000 0.993802 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 1.000000 -0.000006 +vn 0.000000 1.000000 -0.000006 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000009 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000005 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000003 +vn 0.000000 1.000000 -0.000006 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +s 1 +f 3403/3533/6657 3404/3534/6658 3405/3535/6659 +f 3403/3533/6657 3405/3535/6659 3406/3536/6660 +f 3406/3536/6660 3405/3535/6659 3407/3537/6661 +f 3406/3536/6660 3407/3537/6661 3408/3538/6662 +f 3403/3533/6657 3414/3544/6663 3413/3543/6664 3412/3542/6665 3411/3541/6666 3410/3540/6667 3409/3539/6668 3404/3534/6658 +f 3413/3543/6664 3414/3544/6663 3416/3546/6669 +f 3414/3544/6663 3415/3545/6670 3416/3546/6669 +f 3417/3547/6671 3418/3548/6672 3419/3549/6673 +f 3419/3549/6673 3418/3548/6672 3420/3550/6674 +f 3420/3550/6674 3418/3548/6672 3421/3551/6675 +f 3420/3550/6674 3421/3551/6675 3422/3552/6676 +f 3422/3552/6676 3421/3551/6675 3423/3553/6677 +f 3421/3551/6675 3418/3548/6672 3410/3540/6667 +f 3410/3540/6667 3418/3548/6672 3409/3539/6668 +f 3424/3554/6678 3425/3555/6679 3405/3535/6659 +f 3405/3535/6659 3425/3555/6679 3407/3537/6661 +f 3408/3538/6662 3426/3556/6680 3406/3536/6660 +f 3427/3557/6681 3428/3558/6682 3415/3545/6670 +f 3415/3545/6670 3428/3558/6682 3429/3559/6683 +f 3415/3545/6670 3429/3559/6683 3416/3546/6669 +f 3416/3546/6669 3429/3559/6683 3430/3560/6684 +f 3416/3546/6669 3430/3560/6684 3431/3561/6685 +f 3412/3542/6665 3432/3562/6686 3411/3541/6666 +f 3411/3541/6666 3432/3562/6686 3433/3563/6687 +f 3433/3563/6687 3432/3562/6686 3434/3564/6688 +f 3433/3563/6687 3434/3564/6688 3435/3565/6689 +f 3436/3566/6690 3437/3567/6691 3432/3562/6686 +f 3432/3562/6686 3437/3567/6691 3434/3564/6688 +f 3435/3565/6689 3438/3568/6692 3433/3563/6687 +s 4 +f 3417/3547/6693 3439/3569/6694 3418/3548/6695 +f 3418/3548/6695 3439/3569/6694 3440/3570/6696 +s 5 +f 3418/3548/6697 3440/3570/6698 3409/3539/6699 +f 3409/3539/6699 3440/3570/6698 3441/3571/6700 +s off +f 3409/3539/6701 3441/3571/6702 3442/3572/6703 3404/3534/6704 +s 6 +f 3404/3534/6705 3442/3572/6706 3405/3535/6707 +f 3405/3535/6707 3442/3572/6706 3443/3573/6708 +s 7 +f 3405/3535/6709 3443/3573/6710 3424/3554/6711 +f 3424/3554/6711 3443/3573/6710 3444/3574/6712 +s 8 +f 3424/3554/6713 3444/3574/6714 3425/3555/6715 +f 3425/3555/6715 3444/3574/6714 3445/3575/6716 +s 9 +f 3425/3555/6717 3445/3575/6718 3407/3537/6719 +f 3407/3537/6719 3445/3575/6718 3446/3576/6720 +s 10 +f 3407/3537/6721 3446/3576/6722 3408/3538/6723 +f 3408/3538/6723 3446/3576/6722 3447/3577/6724 +s 11 +f 3408/3538/6725 3447/3577/6726 3426/3556/6727 +f 3426/3556/6727 3447/3577/6726 3448/3578/6728 +s 12 +f 3426/3556/6729 3448/3578/6730 3406/3536/6731 +f 3406/3536/6731 3448/3578/6730 3449/3579/6732 +s 13 +f 3406/3536/6733 3449/3579/6734 3403/3533/6735 +f 3403/3533/6735 3449/3579/6734 3450/3580/6736 +s off +f 3451/3581/6737 3414/3544/6738 3403/3533/6739 3450/3580/6740 +s 14 +f 3414/3544/6741 3451/3581/6742 3415/3545/6743 +f 3415/3545/6743 3451/3581/6742 3452/3582/6744 +s 15 +f 3415/3545/6745 3452/3582/6746 3427/3557/6747 +f 3427/3557/6747 3452/3582/6746 3453/3583/6748 +s 16 +f 3427/3557/6749 3453/3583/6750 3428/3558/6751 +f 3428/3558/6751 3453/3583/6750 3454/3584/6752 +s 17 +f 3428/3558/6753 3454/3584/6754 3429/3559/6755 +f 3429/3559/6755 3454/3584/6754 3455/3585/6756 +s 18 +f 3429/3559/6757 3455/3585/6758 3430/3560/6759 +f 3430/3560/6759 3455/3585/6758 3456/3586/6760 +s 19 +f 3430/3560/6761 3456/3586/6762 3431/3561/6763 +f 3431/3561/6763 3456/3586/6762 3457/3587/6764 +s 20 +f 3431/3561/6765 3457/3587/6766 3416/3546/6767 +f 3416/3546/6767 3457/3587/6766 3458/3588/6768 +s 21 +f 3416/3546/6769 3458/3588/6770 3413/3543/6771 +f 3413/3543/6771 3458/3588/6770 3459/3589/6772 +s off +f 3460/3590/6773 3412/3542/6774 3413/3543/6775 3459/3589/6776 +s 22 +f 3412/3542/6777 3460/3590/6778 3432/3562/6779 +f 3432/3562/6779 3460/3590/6778 3461/3591/6780 +s 23 +f 3432/3562/6781 3461/3591/6782 3436/3566/6783 +f 3436/3566/6783 3461/3591/6782 3462/3592/6784 +s 24 +f 3436/3566/6785 3462/3592/6786 3437/3567/6787 +f 3437/3567/6787 3462/3592/6786 3463/3593/6788 +s 25 +f 3437/3567/6789 3463/3593/6790 3434/3564/6791 +f 3434/3564/6791 3463/3593/6790 3464/3594/6792 +s 26 +f 3434/3564/6793 3464/3594/6794 3435/3565/6795 +f 3435/3565/6795 3464/3594/6794 3465/3595/6796 +s 27 +f 3435/3565/6797 3465/3595/6798 3438/3568/6799 +f 3438/3568/6799 3465/3595/6798 3466/3596/6800 +s 28 +f 3438/3568/6801 3466/3596/6802 3433/3563/6803 +f 3433/3563/6803 3466/3596/6802 3467/3597/6804 +s 29 +f 3433/3563/6805 3467/3597/6806 3411/3541/6807 +f 3411/3541/6807 3467/3597/6806 3468/3598/6808 +s off +f 3469/3599/6809 3410/3540/6810 3411/3541/6811 3468/3598/6812 +s 30 +f 3410/3540/6813 3469/3599/6814 3421/3551/6815 +f 3421/3551/6815 3469/3599/6814 3470/3600/6816 +s 31 +f 3421/3551/6817 3470/3600/6818 3423/3553/6819 +f 3423/3553/6819 3470/3600/6818 3471/3601/6820 +s 32 +f 3423/3553/6821 3471/3601/6822 3422/3552/6823 +f 3422/3552/6823 3471/3601/6822 3472/3602/6824 +s 33 +f 3422/3552/6825 3472/3602/6826 3420/3550/6827 +f 3420/3550/6827 3472/3602/6826 3473/3603/6828 +s 34 +f 3420/3550/6829 3473/3603/6830 3419/3549/6831 +f 3419/3549/6831 3473/3603/6830 3474/3604/6832 +s 35 +f 3419/3549/6833 3474/3604/6834 3417/3547/6835 +f 3417/3547/6835 3474/3604/6834 3439/3569/6836 +s 36 +f 3450/3580/6837 3449/3579/6838 3443/3573/6839 +f 3450/3580/6837 3443/3573/6839 3442/3572/6840 +f 3441/3571/6841 3469/3599/6842 3468/3598/6843 3460/3590/6844 3459/3589/6845 3451/3581/6846 3450/3580/6837 3442/3572/6840 +f 3459/3589/6845 3458/3588/6847 3451/3581/6846 +f 3458/3588/6847 3452/3582/6848 3451/3581/6846 +f 3452/3582/6848 3458/3588/6847 3455/3585/6849 +f 3452/3582/6848 3455/3585/6849 3454/3584/6850 +f 3439/3569/6851 3474/3604/6852 3440/3570/6853 +f 3440/3570/6853 3474/3604/6852 3473/3603/6854 +f 3440/3570/6853 3473/3603/6854 3470/3600/6855 +f 3470/3600/6855 3473/3603/6854 3472/3602/6856 +f 3470/3600/6855 3472/3602/6856 3471/3601/6857 +f 3470/3600/6855 3469/3599/6842 3440/3570/6853 +f 3440/3570/6853 3469/3599/6842 3441/3571/6841 +f 3460/3590/6844 3468/3598/6843 3461/3591/6858 +f 3461/3591/6858 3468/3598/6843 3467/3597/6859 +f 3461/3591/6858 3467/3597/6859 3464/3594/6860 +f 3464/3594/6860 3467/3597/6859 3465/3595/6861 +f 3465/3595/6861 3467/3597/6859 3466/3596/6862 +f 3464/3594/6860 3463/3593/6863 3461/3591/6858 +f 3461/3591/6858 3463/3593/6863 3462/3592/6864 +f 3457/3587/6865 3456/3586/6866 3458/3588/6847 +f 3458/3588/6847 3456/3586/6866 3455/3585/6849 +f 3454/3584/6850 3453/3583/6867 3452/3582/6848 +f 3448/3578/6868 3447/3577/6869 3449/3579/6838 +f 3449/3579/6838 3447/3577/6869 3446/3576/6870 +f 3449/3579/6838 3446/3576/6870 3443/3573/6839 +f 3443/3573/6839 3446/3576/6870 3445/3575/6871 +f 3443/3573/6839 3445/3575/6871 3444/3574/6872 +v 146.207108 -137.500000 103.792892 +v 144.792877 -137.500000 105.207108 +v 141.000000 -137.500000 101.414215 +v 142.414200 -137.500000 100.000000 +v 140.000000 -137.500000 99.000000 +v 144.000000 -137.500000 99.000000 +v 144.792892 -137.500000 107.792892 +v 146.207108 -137.500000 109.207108 +v 148.792908 -137.500000 109.207108 +v 150.207108 -137.500000 107.792892 +v 150.207092 -137.500000 105.207108 +v 148.792908 -137.500000 103.792892 +v 152.585800 -137.500000 100.000000 +v 154.000000 -137.500000 101.414215 +v 141.000000 -137.500000 110.000000 +v 141.000000 -137.500000 111.585785 +v 140.000000 -137.500000 110.000000 +v 140.000000 -137.500000 114.000000 +v 142.414215 -137.500000 113.000000 +v 144.000000 -137.500000 114.000000 +v 144.000000 -137.500000 113.000000 +v 141.000000 -137.500000 102.992210 +v 140.000000 -137.500000 102.992210 +v 144.000000 -137.500000 100.000000 +v 151.000000 -137.500000 100.000000 +v 151.000000 -137.500000 99.000000 +v 155.000000 -137.500000 99.000000 +v 155.000000 -137.500000 102.992210 +v 154.000000 -137.500000 102.992210 +v 154.000000 -137.500000 111.585785 +v 152.585800 -137.500000 113.000000 +v 155.000000 -137.500000 114.000000 +v 151.000000 -137.500000 114.000000 +v 154.000000 -137.500000 110.000000 +v 155.000000 -137.500000 110.000000 +v 151.000000 -137.500000 113.000000 +v 141.000000 137.500000 110.000000 +v 141.000000 137.500000 111.585785 +v 144.792877 137.500000 107.792892 +v 144.792877 137.500000 105.207108 +v 141.000000 137.500000 101.414215 +v 141.000000 137.500000 102.992210 +v 140.000000 137.500000 102.992210 +v 140.000000 137.500000 99.000000 +v 144.000000 137.500000 99.000000 +v 144.000000 137.500000 100.000000 +v 142.414200 137.500000 100.000000 +v 146.207108 137.500000 103.792892 +v 148.792908 137.500000 103.792892 +v 152.585800 137.500000 100.000000 +v 151.000000 137.500000 100.000000 +v 151.000000 137.500000 99.000000 +v 155.000000 137.500000 99.000000 +v 155.000000 137.500000 102.992210 +v 154.000000 137.500000 102.992210 +v 154.000000 137.500000 101.414215 +v 150.207092 137.500000 105.207108 +v 150.207108 137.500000 107.792892 +v 154.000000 137.500000 111.585785 +v 154.000000 137.500000 110.000000 +v 155.000000 137.500000 110.000000 +v 155.000000 137.500000 114.000000 +v 151.000000 137.500000 114.000000 +v 151.000000 137.500000 113.000000 +v 152.585800 137.500000 113.000000 +v 148.792908 137.500000 109.207108 +v 146.207108 137.500000 109.207108 +v 142.414215 137.500000 113.000000 +v 144.000000 137.500000 113.000000 +v 144.000000 137.500000 114.000000 +v 140.000000 137.500000 114.000000 +v 140.000000 137.500000 110.000000 +vt 0.915380 0.011574 +vt 0.915326 0.011574 +vt 0.915197 0.011574 +vt 0.915247 0.011574 +vt 0.915162 0.011574 +vt 0.915302 0.011574 +vt 0.915330 0.011574 +vt 0.915403 0.011574 +vt 0.915471 0.011574 +vt 0.915525 0.011574 +vt 0.915521 0.011574 +vt 0.915448 0.011574 +vt 0.915604 0.011574 +vt 0.915654 0.011574 +vt 0.915197 0.011574 +vt 0.915197 0.011574 +vt 0.915162 0.011574 +vt 0.915162 0.011574 +vt 0.915247 0.011574 +vt 0.915302 0.011574 +vt 0.915302 0.011574 +vt 0.915197 0.011574 +vt 0.915162 0.011574 +vt 0.915302 0.011574 +vt 0.915549 0.011574 +vt 0.915549 0.011574 +vt 0.915689 0.011574 +vt 0.915689 0.011574 +vt 0.915654 0.011574 +vt 0.915654 0.011574 +vt 0.915604 0.011574 +vt 0.915689 0.011574 +vt 0.915549 0.011574 +vt 0.915654 0.011574 +vt 0.915689 0.011574 +vt 0.915549 0.011574 +vt 0.915197 0.025889 +vt 0.915197 0.025889 +vt 0.915330 0.025889 +vt 0.915326 0.025889 +vt 0.915197 0.025889 +vt 0.915197 0.025889 +vt 0.915162 0.025889 +vt 0.915162 0.025889 +vt 0.915302 0.025889 +vt 0.915302 0.025889 +vt 0.915247 0.025889 +vt 0.915380 0.025889 +vt 0.915448 0.025889 +vt 0.915604 0.025889 +vt 0.915549 0.025889 +vt 0.915549 0.025889 +vt 0.915689 0.025889 +vt 0.915689 0.025889 +vt 0.915654 0.025889 +vt 0.915654 0.025889 +vt 0.915521 0.025889 +vt 0.915525 0.025889 +vt 0.915654 0.025889 +vt 0.915654 0.025889 +vt 0.915689 0.025889 +vt 0.915689 0.025889 +vt 0.915549 0.025889 +vt 0.915549 0.025889 +vt 0.915604 0.025889 +vt 0.915471 0.025889 +vt 0.915403 0.025889 +vt 0.915247 0.025889 +vt 0.915302 0.025889 +vt 0.915302 0.025889 +vt 0.915162 0.025889 +vt 0.915162 0.025889 +vn 0.000000 -1.000000 0.000007 +vn 0.000000 -1.000000 0.000007 +vn 0.000000 -1.000000 0.000005 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000015 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 -0.000006 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 -0.000006 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -0.707107 0.000000 -0.707107 +vn -0.707107 0.000000 -0.707107 +vn -0.707107 0.000000 -0.707107 +vn -0.707108 0.000000 -0.707105 +vn -0.944695 0.000000 0.327951 +vn -0.944695 0.000000 0.327951 +vn -0.944685 0.000000 -0.327980 +vn -0.993802 0.000000 0.111164 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.707106 0.000000 -0.707108 +vn 0.707106 0.000000 -0.707108 +vn 0.707106 0.000000 -0.707108 +vn 0.707106 0.000000 -0.707108 +vn 0.327998 0.000000 -0.944678 +vn -0.111159 0.000000 -0.993803 +vn -0.327986 0.000000 -0.944683 +vn -0.327986 0.000000 -0.944683 +vn -0.707107 0.000000 -0.707107 +vn -0.707107 0.000000 -0.707107 +vn -0.707107 0.000000 -0.707107 +vn -0.707107 0.000000 -0.707107 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.707105 0.000000 0.707108 +vn 0.707105 0.000000 0.707108 +vn 0.707105 0.000000 0.707108 +vn 0.707105 0.000000 0.707108 +vn 0.944683 0.000000 0.327984 +vn 0.993802 0.000000 -0.111164 +vn 0.944677 0.000000 -0.328001 +vn 0.944677 0.000000 -0.328001 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn 0.707107 0.000000 -0.707107 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn -0.000001 0.000000 -1.000000 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.707107 0.000000 0.707107 +vn -0.327993 0.000000 0.944680 +vn 0.111163 0.000000 0.993802 +vn 0.327986 0.000000 0.944683 +vn 0.327986 0.000000 0.944683 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.707107 0.000000 0.707107 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000001 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 1.000000 -0.000017 +vn 0.000000 1.000000 -0.000017 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000015 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000011 +vn 0.000000 1.000000 0.000005 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 -0.000006 +vn 0.000000 1.000000 0.000008 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000006 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +s 1 +f 3475/3605/6873 3476/3606/6874 3478/3608/6875 +f 3476/3606/6874 3477/3607/6876 3478/3608/6875 +f 3478/3608/6875 3477/3607/6876 3479/3609/6877 +f 3478/3608/6875 3479/3609/6877 3480/3610/6878 +f 3475/3605/6873 3486/3616/6879 3485/3615/6880 3484/3614/6881 3483/3613/6882 3482/3612/6883 3481/3611/6884 3476/3606/6874 +f 3485/3615/6880 3486/3616/6879 3487/3617/6885 +f 3485/3615/6880 3487/3617/6885 3488/3618/6886 +f 3489/3619/6887 3490/3620/6888 3491/3621/6889 +f 3491/3621/6889 3490/3620/6888 3492/3622/6890 +f 3492/3622/6890 3490/3620/6888 3493/3623/6891 +f 3492/3622/6890 3493/3623/6891 3494/3624/6892 +f 3494/3624/6892 3493/3623/6891 3495/3625/6893 +f 3493/3623/6891 3490/3620/6888 3482/3612/6883 +f 3482/3612/6883 3490/3620/6888 3481/3611/6884 +f 3496/3626/6894 3497/3627/6895 3477/3607/6876 +f 3477/3607/6876 3497/3627/6895 3479/3609/6877 +f 3480/3610/6878 3498/3628/6896 3478/3608/6875 +f 3499/3629/6897 3500/3630/6898 3487/3617/6885 +f 3487/3617/6885 3500/3630/6898 3501/3631/6899 +f 3487/3617/6885 3501/3631/6899 3488/3618/6886 +f 3488/3618/6886 3501/3631/6899 3502/3632/6900 +f 3488/3618/6886 3502/3632/6900 3503/3633/6901 +f 3484/3614/6881 3504/3634/6902 3483/3613/6882 +f 3483/3613/6882 3504/3634/6902 3505/3635/6903 +f 3505/3635/6903 3504/3634/6902 3506/3636/6904 +f 3505/3635/6903 3506/3636/6904 3507/3637/6905 +f 3508/3638/6906 3509/3639/6907 3504/3634/6902 +f 3504/3634/6902 3509/3639/6907 3506/3636/6904 +f 3507/3637/6905 3510/3640/6908 3505/3635/6903 +s 4 +f 3489/3619/6909 3511/3641/6910 3490/3620/6911 +f 3490/3620/6911 3511/3641/6910 3512/3642/6912 +s 5 +f 3490/3620/6913 3512/3642/6914 3481/3611/6915 +f 3481/3611/6915 3512/3642/6914 3513/3643/6916 +s off +f 3481/3611/6917 3513/3643/6918 3514/3644/6919 3476/3606/6920 +s 6 +f 3476/3606/6921 3514/3644/6922 3477/3607/6923 +f 3477/3607/6923 3514/3644/6922 3515/3645/6924 +s 7 +f 3477/3607/6925 3515/3645/6926 3496/3626/6927 +f 3496/3626/6927 3515/3645/6926 3516/3646/6928 +s 8 +f 3496/3626/6929 3516/3646/6930 3497/3627/6931 +f 3497/3627/6931 3516/3646/6930 3517/3647/6932 +s 9 +f 3497/3627/6933 3517/3647/6934 3479/3609/6935 +f 3479/3609/6935 3517/3647/6934 3518/3648/6936 +s 10 +f 3479/3609/6937 3518/3648/6938 3480/3610/6939 +f 3480/3610/6939 3518/3648/6938 3519/3649/6940 +s 11 +f 3480/3610/6941 3519/3649/6942 3498/3628/6943 +f 3498/3628/6943 3519/3649/6942 3520/3650/6944 +s 12 +f 3498/3628/6945 3520/3650/6946 3478/3608/6947 +f 3478/3608/6947 3520/3650/6946 3521/3651/6948 +s 13 +f 3478/3608/6949 3521/3651/6950 3475/3605/6951 +f 3475/3605/6951 3521/3651/6950 3522/3652/6952 +s off +f 3523/3653/6953 3486/3616/6954 3475/3605/6955 3522/3652/6956 +s 14 +f 3486/3616/6957 3523/3653/6958 3487/3617/6959 +f 3487/3617/6959 3523/3653/6958 3524/3654/6960 +s 15 +f 3487/3617/6961 3524/3654/6962 3499/3629/6963 +f 3499/3629/6963 3524/3654/6962 3525/3655/6964 +s 16 +f 3499/3629/6965 3525/3655/6966 3500/3630/6967 +f 3500/3630/6967 3525/3655/6966 3526/3656/6968 +s 17 +f 3500/3630/6969 3526/3656/6970 3501/3631/6971 +f 3501/3631/6971 3526/3656/6970 3527/3657/6972 +s 18 +f 3501/3631/6973 3527/3657/6974 3502/3632/6975 +f 3502/3632/6975 3527/3657/6974 3528/3658/6976 +s 19 +f 3502/3632/6977 3528/3658/6978 3503/3633/6979 +f 3503/3633/6979 3528/3658/6978 3529/3659/6980 +s 20 +f 3503/3633/6981 3529/3659/6982 3488/3618/6983 +f 3488/3618/6983 3529/3659/6982 3530/3660/6984 +s 21 +f 3488/3618/6985 3530/3660/6986 3485/3615/6987 +f 3485/3615/6987 3530/3660/6986 3531/3661/6988 +s off +f 3532/3662/6989 3484/3614/6990 3485/3615/6991 3531/3661/6992 +s 22 +f 3484/3614/6993 3532/3662/6994 3504/3634/6995 +f 3504/3634/6995 3532/3662/6994 3533/3663/6996 +s 23 +f 3504/3634/6997 3533/3663/6998 3508/3638/6999 +f 3508/3638/6999 3533/3663/6998 3534/3664/7000 +s 24 +f 3508/3638/7001 3534/3664/7002 3509/3639/7003 +f 3509/3639/7003 3534/3664/7002 3535/3665/7004 +s 25 +f 3509/3639/7005 3535/3665/7006 3506/3636/7007 +f 3506/3636/7007 3535/3665/7006 3536/3666/7008 +s 26 +f 3506/3636/7009 3536/3666/7010 3507/3637/7011 +f 3507/3637/7011 3536/3666/7010 3537/3667/7012 +s 27 +f 3507/3637/7013 3537/3667/7014 3510/3640/7015 +f 3510/3640/7015 3537/3667/7014 3538/3668/7016 +s 28 +f 3510/3640/7017 3538/3668/7018 3505/3635/7019 +f 3505/3635/7019 3538/3668/7018 3539/3669/7020 +s 29 +f 3505/3635/7021 3539/3669/7022 3483/3613/7023 +f 3483/3613/7023 3539/3669/7022 3540/3670/7024 +s off +f 3541/3671/7025 3482/3612/7026 3483/3613/7027 3540/3670/7028 +s 30 +f 3482/3612/7029 3541/3671/7030 3493/3623/7031 +f 3493/3623/7031 3541/3671/7030 3542/3672/7032 +s 31 +f 3493/3623/7033 3542/3672/7034 3495/3625/7035 +f 3495/3625/7035 3542/3672/7034 3543/3673/7036 +s 32 +f 3495/3625/7037 3543/3673/7038 3494/3624/7039 +f 3494/3624/7039 3543/3673/7038 3544/3674/7040 +s 33 +f 3494/3624/7041 3544/3674/7042 3492/3622/7043 +f 3492/3622/7043 3544/3674/7042 3545/3675/7044 +s 34 +f 3492/3622/7045 3545/3675/7046 3491/3621/7047 +f 3491/3621/7047 3545/3675/7046 3546/3676/7048 +s 35 +f 3491/3621/7049 3546/3676/7050 3489/3619/7051 +f 3489/3619/7051 3546/3676/7050 3511/3641/7052 +s 36 +f 3522/3652/7053 3521/3651/7054 3514/3644/7055 +f 3521/3651/7054 3515/3645/7056 3514/3644/7055 +f 3513/3643/7057 3541/3671/7058 3540/3670/7059 3532/3662/7060 3531/3661/7061 3523/3653/7062 3522/3652/7053 3514/3644/7055 +f 3531/3661/7061 3530/3660/7063 3524/3654/7064 +f 3524/3654/7064 3530/3660/7063 3527/3657/7065 +f 3524/3654/7064 3527/3657/7065 3526/3656/7066 +f 3523/3653/7062 3531/3661/7061 3524/3654/7064 +f 3511/3641/7067 3546/3676/7068 3512/3642/7069 +f 3512/3642/7069 3546/3676/7068 3545/3675/7070 +f 3512/3642/7069 3545/3675/7070 3542/3672/7071 +f 3542/3672/7071 3545/3675/7070 3544/3674/7072 +f 3542/3672/7071 3544/3674/7072 3543/3673/7073 +f 3542/3672/7071 3541/3671/7058 3512/3642/7069 +f 3512/3642/7069 3541/3671/7058 3513/3643/7057 +f 3532/3662/7060 3540/3670/7059 3533/3663/7074 +f 3533/3663/7074 3540/3670/7059 3539/3669/7075 +f 3533/3663/7074 3539/3669/7075 3536/3666/7076 +f 3536/3666/7076 3539/3669/7075 3537/3667/7077 +f 3537/3667/7077 3539/3669/7075 3538/3668/7078 +f 3536/3666/7076 3535/3665/7079 3533/3663/7074 +f 3533/3663/7074 3535/3665/7079 3534/3664/7080 +f 3529/3659/7081 3528/3658/7082 3530/3660/7063 +f 3530/3660/7063 3528/3658/7082 3527/3657/7065 +f 3526/3656/7066 3525/3655/7083 3524/3654/7064 +f 3520/3650/7084 3519/3649/7085 3521/3651/7054 +f 3521/3651/7054 3519/3649/7085 3518/3648/7086 +f 3521/3651/7054 3518/3648/7086 3515/3645/7056 +f 3515/3645/7056 3518/3648/7086 3517/3647/7087 +f 3515/3645/7056 3517/3647/7087 3516/3646/7088 +v 150.000000 -155.000000 120.000000 +v -150.000000 -155.000000 120.000000 +v 150.000000 -155.000000 114.000000 +v -150.000000 -155.000000 114.000000 +v 155.000000 -150.000000 114.000000 +v 155.000000 -150.000000 120.000000 +v 154.829636 -151.294098 114.000000 +v 154.829636 -151.294098 120.000000 +v 154.330124 -152.500000 114.000000 +v 154.330124 -152.500000 120.000000 +v 153.535538 -153.535538 114.000000 +v 153.535538 -153.535538 120.000000 +v 152.500000 -154.330124 114.000000 +v 152.500000 -154.330124 120.000000 +v 151.294098 -154.829636 114.000000 +v 151.294098 -154.829636 120.000000 +v 155.000000 150.000000 120.000000 +v 155.000000 150.000000 114.000000 +v 150.000000 155.000000 114.000000 +v 150.000000 155.000000 120.000000 +v 151.294098 154.829636 114.000000 +v 151.294098 154.829636 120.000000 +v 152.500000 154.330124 114.000000 +v 152.500000 154.330124 120.000000 +v 153.535538 153.535538 114.000000 +v 153.535538 153.535538 120.000000 +v 154.330124 152.500000 114.000000 +v 154.330124 152.500000 120.000000 +v 154.829636 151.294098 114.000000 +v 154.829636 151.294098 120.000000 +v -150.000000 155.000000 120.000000 +v -150.000000 155.000000 114.000000 +v -155.000000 150.000000 114.000000 +v -155.000000 150.000000 120.000000 +v -154.829636 151.294098 114.000000 +v -154.829636 151.294098 120.000000 +v -154.330124 152.500000 114.000000 +v -154.330124 152.500000 120.000000 +v -153.535538 153.535538 114.000000 +v -153.535538 153.535538 120.000000 +v -152.500000 154.330124 114.000000 +v -152.500000 154.330124 120.000000 +v -151.294098 154.829636 114.000000 +v -151.294098 154.829636 120.000000 +v -155.000000 -150.000000 120.000000 +v -155.000000 -150.000000 114.000000 +v -151.294098 -154.829636 114.000000 +v -151.294098 -154.829636 120.000000 +v -152.500000 -154.330124 114.000000 +v -152.500000 -154.330124 120.000000 +v -153.535538 -153.535538 114.000000 +v -153.535538 -153.535538 120.000000 +v -154.330124 -152.500000 114.000000 +v -154.330124 -152.500000 120.000000 +v -154.829636 -151.294098 114.000000 +v -154.829636 -151.294098 120.000000 +v 150.000000 -155.000000 117.000000 +v -150.000000 -155.000000 117.000000 +v -151.294098 -154.829636 117.000000 +v -152.500000 -154.330124 117.000000 +v -153.535538 -153.535538 117.000000 +v -154.330124 -152.500000 117.000000 +v -154.829636 -151.294098 117.000000 +v -155.000000 -150.000000 117.000000 +v -155.000000 150.000000 117.000000 +v -154.829636 151.294098 117.000000 +v -154.330124 152.500000 117.000000 +v -153.535538 153.535538 117.000000 +v -152.500000 154.330124 117.000000 +v -151.294098 154.829636 117.000000 +v -150.000000 155.000000 117.000000 +v 150.000000 155.000000 117.000000 +v 151.294098 154.829636 117.000000 +v 152.500000 154.330124 117.000000 +v 153.535538 153.535538 117.000000 +v 154.330124 152.500000 117.000000 +v 154.829636 151.294098 117.000000 +v 155.000000 150.000000 117.000000 +v 155.000000 -150.000000 117.000000 +v 154.829636 -151.294098 117.000000 +v 154.330124 -152.500000 117.000000 +v 153.535538 -153.535538 117.000000 +v 152.500000 -154.330124 117.000000 +v 151.294098 -154.829636 117.000000 +vt 0.947110 0.065200 +vt 0.052890 0.065200 +vt 0.768973 0.011074 +vt 0.768973 0.011074 +vt 0.749459 0.011074 +vt 0.962013 0.080104 +vt 0.749459 0.011074 +vt 0.961506 0.076246 +vt 0.769287 0.011315 +vt 0.960017 0.072652 +vt 0.769298 0.011399 +vt 0.957648 0.069565 +vt 0.769298 0.011399 +vt 0.954561 0.067197 +vt 0.769287 0.011315 +vt 0.950967 0.065708 +vt 0.962013 0.974323 +vt 0.769254 0.011236 +vt 0.769254 0.011236 +vt 0.947110 0.989227 +vt 0.769203 0.011169 +vt 0.950967 0.988719 +vt 0.769203 0.011169 +vt 0.954561 0.987230 +vt 0.769135 0.011117 +vt 0.957648 0.984862 +vt 0.769135 0.011117 +vt 0.960017 0.981775 +vt 0.769057 0.011085 +vt 0.961506 0.978180 +vt 0.052890 0.989227 +vt 0.769057 0.011085 +vt 0.769298 0.030913 +vt 0.037987 0.974323 +vt 0.769298 0.030913 +vt 0.038494 0.978180 +vt 0.769057 0.031227 +vt 0.039983 0.981775 +vt 0.768973 0.031238 +vt 0.042352 0.984862 +vt 0.768973 0.031238 +vt 0.045439 0.987230 +vt 0.769057 0.031227 +vt 0.049033 0.988719 +vt 0.037987 0.080104 +vt 0.769135 0.031194 +vt 0.769135 0.031194 +vt 0.049033 0.065708 +vt 0.769203 0.031143 +vt 0.045439 0.067197 +vt 0.769203 0.031143 +vt 0.042352 0.069565 +vt 0.769254 0.031075 +vt 0.039983 0.072652 +vt 0.769254 0.031075 +vt 0.038494 0.076246 +vt 0.947110 0.065200 +vt 0.052890 0.065200 +vt 0.049033 0.065708 +vt 0.045439 0.067197 +vt 0.042352 0.069565 +vt 0.039983 0.072652 +vt 0.038494 0.076246 +vt 0.037987 0.080104 +vt 0.037987 0.974323 +vt 0.038494 0.978180 +vt 0.039983 0.981775 +vt 0.042352 0.984862 +vt 0.045439 0.987230 +vt 0.049033 0.988719 +vt 0.052890 0.989227 +vt 0.947110 0.989227 +vt 0.950967 0.988719 +vt 0.954561 0.987230 +vt 0.957648 0.984862 +vt 0.960017 0.981775 +vt 0.961506 0.978180 +vt 0.962013 0.974323 +vt 0.962013 0.080104 +vt 0.961506 0.076246 +vt 0.960017 0.072652 +vt 0.957648 0.069565 +vt 0.954561 0.067197 +vt 0.950967 0.065708 +vt 0.769287 0.030997 +vt 0.769287 0.030997 +vt 0.749459 0.031238 +vt 0.749459 0.031238 +vt 0.749145 0.030997 +vt 0.749134 0.030913 +vt 0.749134 0.030913 +vt 0.749145 0.030997 +vt 0.749177 0.031075 +vt 0.749177 0.031075 +vt 0.749229 0.031143 +vt 0.749229 0.031143 +vt 0.749296 0.031194 +vt 0.749296 0.031194 +vt 0.749375 0.031227 +vt 0.749375 0.031227 +vt 0.749134 0.011399 +vt 0.749134 0.011399 +vt 0.749375 0.011085 +vt 0.749375 0.011085 +vt 0.749296 0.011117 +vt 0.749296 0.011117 +vt 0.749229 0.011169 +vt 0.749229 0.011169 +vt 0.749177 0.011236 +vt 0.749177 0.011236 +vt 0.749145 0.011315 +vt 0.749145 0.011315 +vn 0.000000 -1.000000 0.000000 +vn 0.000565 -1.000000 0.000000 +vn -0.000565 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.991447 -0.130510 0.000000 +vn 0.991447 -0.130510 0.000000 +vn 1.000000 -0.000565 0.000000 +vn 0.965925 -0.258822 0.000000 +vn 0.923877 -0.382690 0.000000 +vn 0.866027 -0.499998 0.000000 +vn 0.793361 -0.608752 0.000000 +vn 0.707108 -0.707106 0.000000 +vn 0.608747 -0.793364 0.000000 +vn 0.500000 -0.866026 0.000000 +vn 0.382693 -0.923876 0.000000 +vn 0.258820 -0.965926 0.000000 +vn 1.000000 0.000000 0.000000 +vn 1.000000 0.000565 0.000000 +vn 0.130520 0.991446 0.000000 +vn 0.130520 0.991446 0.000000 +vn 0.000565 1.000000 0.000000 +vn 0.258820 0.965926 0.000000 +vn 0.382688 0.923878 0.000000 +vn 0.500000 0.866026 0.000000 +vn 0.608762 0.793353 0.000000 +vn 0.707108 0.707106 0.000000 +vn 0.793361 0.608752 0.000000 +vn 0.866027 0.499998 0.000000 +vn 0.923877 0.382690 0.000000 +vn 0.965925 0.258822 0.000000 +vn 0.000000 1.000000 0.000000 +vn -0.000565 1.000000 0.000000 +vn -0.991447 0.130510 0.000000 +vn -0.991447 0.130510 0.000000 +vn -1.000000 0.000565 0.000000 +vn -0.965925 0.258822 0.000000 +vn -0.923877 0.382690 0.000000 +vn -0.866027 0.499998 0.000000 +vn -0.793361 0.608752 0.000000 +vn -0.707108 0.707106 0.000000 +vn -0.608747 0.793364 0.000000 +vn -0.500000 0.866026 0.000000 +vn -0.382693 0.923876 0.000000 +vn -0.258820 0.965926 0.000000 +vn -1.000000 0.000000 0.000000 +vn -1.000000 -0.000565 0.000000 +vn -0.130520 -0.991446 0.000000 +vn -0.258820 -0.965926 0.000000 +vn -0.382688 -0.923878 0.000000 +vn -0.500000 -0.866026 0.000000 +vn -0.608762 -0.793353 0.000000 +vn -0.707108 -0.707106 0.000000 +vn -0.793361 -0.608752 0.000000 +vn -0.866027 -0.499998 0.000000 +vn -0.923877 -0.382690 0.000000 +vn -0.965925 -0.258822 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -0.130522 -0.991445 0.000000 +vn -0.382693 -0.923876 0.000000 +vn -0.608747 -0.793364 0.000000 +vn -0.793361 -0.608752 0.000000 +vn -0.923877 -0.382690 0.000000 +vn -1.000000 0.000000 0.000000 +vn -0.991447 0.130510 0.000000 +vn -0.991443 0.130540 0.000000 +vn -0.923877 0.382690 0.000000 +vn -0.793361 0.608752 0.000000 +vn -0.608762 0.793353 0.000000 +vn -0.382688 0.923878 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.130520 0.991446 0.000000 +vn 0.130522 0.991445 0.000000 +vn 0.382693 0.923876 0.000000 +vn 0.608747 0.793364 0.000000 +vn 0.793361 0.608752 0.000000 +vn 0.923877 0.382690 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.991447 -0.130510 0.000000 +vn 0.991443 -0.130540 0.000000 +vn 0.923877 -0.382690 0.000000 +vn 0.793361 -0.608752 0.000000 +vn 0.608762 -0.793353 0.000000 +vn 0.382688 -0.923878 0.000000 +s 1 +f 3549/3679/7089 3603/3680/7090 3604/3681/7091 3550/3683/7092 +f 3553/3685/7093 3551/3687/7094 3625/3689/7095 3626/3691/7096 +f 3555/3694/7097 3553/3685/7093 3626/3691/7096 3627/3695/7098 +f 3557/3697/7099 3555/3694/7097 3627/3695/7098 3628/3699/7100 +f 3559/3701/7101 3557/3697/7099 3628/3699/7100 3629/3703/7102 +f 3561/3705/7103 3559/3701/7101 3629/3703/7102 3630/3708/7104 +f 3549/3679/7089 3561/3705/7103 3630/3708/7104 3603/3680/7090 +f 3564/3709/7105 3624/3711/7106 3625/3689/7095 3551/3687/7094 +f 3567/3713/7107 3565/3715/7108 3618/3717/7109 3619/3719/7110 +f 3569/3722/7111 3567/3713/7107 3619/3719/7110 3620/3723/7112 +f 3571/3725/7113 3569/3722/7111 3620/3723/7112 3621/3727/7114 +f 3573/3729/7115 3571/3725/7113 3621/3727/7114 3622/3731/7116 +f 3575/3761/7117 3573/3729/7115 3622/3731/7116 3623/3762/7118 +f 3564/3709/7105 3575/3761/7117 3623/3762/7118 3624/3711/7106 +f 3578/3763/7119 3617/3764/7120 3618/3717/7109 3565/3715/7108 +f 3581/3765/7121 3579/3766/7122 3611/3767/7123 3612/3768/7124 +f 3583/3769/7125 3581/3765/7121 3612/3768/7124 3613/3770/7126 +f 3585/3771/7127 3583/3769/7125 3613/3770/7126 3614/3772/7128 +f 3587/3773/7129 3585/3771/7127 3614/3772/7128 3615/3774/7130 +f 3589/3775/7131 3587/3773/7129 3615/3774/7130 3616/3776/7132 +f 3578/3763/7119 3589/3775/7131 3616/3776/7132 3617/3764/7120 +f 3592/3777/7133 3610/3778/7134 3611/3767/7123 3579/3766/7122 +f 3593/3779/7135 3550/3683/7092 3604/3681/7091 3605/3780/7136 +f 3595/3781/7137 3593/3779/7135 3605/3780/7136 3606/3782/7138 +f 3597/3783/7139 3595/3781/7137 3606/3782/7138 3607/3784/7140 +f 3599/3785/7141 3597/3783/7139 3607/3784/7140 3608/3786/7142 +f 3601/3787/7143 3599/3785/7141 3608/3786/7142 3609/3788/7144 +f 3592/3777/7133 3601/3787/7143 3609/3788/7144 3610/3778/7134 +s 5 +f 3602/3732/7145 3600/3730/7146 3591/3721/7147 +f 3591/3721/7147 3600/3730/7146 3598/3728/7148 3596/3726/7149 +f 3591/3721/7147 3596/3726/7149 3594/3724/7150 3548/3678/7151 +f 3591/3721/7147 3548/3678/7151 3547/3677/7152 3580/3710/7153 +f 3552/3682/7154 3547/3677/7152 3562/3692/7155 3560/3690/7156 +f 3580/3710/7153 3547/3677/7152 3552/3682/7154 3577/3707/7157 +f 3552/3682/7154 3560/3690/7156 3558/3688/7158 3556/3686/7159 +f 3556/3686/7159 3554/3684/7160 3552/3682/7154 +f 3577/3707/7157 3552/3682/7154 3563/3693/7161 3566/3696/7162 +f 3566/3696/7162 3563/3693/7161 3576/3706/7163 3574/3704/7164 +f 3566/3696/7162 3574/3704/7164 3572/3702/7165 3570/3700/7166 +f 3566/3696/7162 3570/3700/7166 3568/3698/7167 +f 3590/3720/7168 3588/3718/7169 3577/3707/7157 +f 3577/3707/7157 3588/3718/7169 3586/3716/7170 3584/3714/7171 +f 3577/3707/7157 3584/3714/7171 3582/3712/7172 3580/3710/7153 +s 7 +f 3592/3777/7173 3550/3683/7174 3593/3779/7175 3595/3781/7176 +f 3564/3709/7177 3550/3683/7174 3592/3777/7173 3565/3715/7178 +f 3550/3683/7174 3564/3709/7177 3551/3687/7179 3549/3679/7180 +f 3592/3777/7173 3595/3781/7176 3597/3783/7181 3599/3785/7182 +f 3599/3785/7182 3601/3787/7183 3592/3777/7173 +f 3565/3715/7178 3592/3777/7173 3579/3766/7184 3578/3763/7185 +f 3578/3763/7185 3579/3766/7184 3581/3765/7186 3583/3769/7187 +f 3578/3763/7185 3583/3769/7187 3585/3771/7188 3587/3773/7189 +f 3578/3763/7185 3587/3773/7189 3589/3775/7190 +f 3567/3713/7191 3569/3722/7192 3565/3715/7178 +f 3565/3715/7178 3569/3722/7192 3571/3725/7193 3573/3729/7194 +f 3565/3715/7178 3573/3729/7194 3575/3761/7195 3564/3709/7177 +f 3553/3685/7196 3555/3694/7197 3551/3687/7179 +f 3551/3687/7179 3555/3694/7197 3557/3697/7198 3559/3701/7199 +f 3551/3687/7179 3559/3701/7199 3561/3705/7200 3549/3679/7180 +s 1 +f 3603/3733/7090 3547/3677/7201 3548/3678/7202 3604/3734/7091 +f 3605/3735/7136 3604/3734/7091 3548/3678/7202 3594/3724/7203 +f 3606/3736/7138 3605/3735/7136 3594/3724/7203 3596/3726/7204 +f 3607/3737/7140 3606/3736/7138 3596/3726/7204 3598/3728/7205 +f 3608/3738/7142 3607/3737/7140 3598/3728/7205 3600/3730/7206 +f 3609/3739/7144 3608/3738/7142 3600/3730/7206 3602/3732/7207 +f 3610/3740/7134 3609/3739/7144 3602/3732/7207 3591/3721/7208 +f 3611/3741/7123 3610/3740/7134 3591/3721/7208 3580/3710/7209 +f 3612/3742/7124 3611/3741/7123 3580/3710/7209 3582/3712/7210 +f 3613/3743/7126 3612/3742/7124 3582/3712/7210 3584/3714/7211 +f 3614/3744/7128 3613/3743/7126 3584/3714/7211 3586/3716/7212 +f 3615/3745/7130 3614/3744/7128 3586/3716/7212 3588/3718/7213 +f 3616/3746/7132 3615/3745/7130 3588/3718/7213 3590/3720/7214 +f 3617/3747/7120 3616/3746/7132 3590/3720/7214 3577/3707/7215 +f 3618/3748/7109 3617/3747/7120 3577/3707/7215 3566/3696/7216 +f 3619/3749/7110 3618/3748/7109 3566/3696/7216 3568/3698/7217 +f 3620/3750/7112 3619/3749/7110 3568/3698/7217 3570/3700/7218 +f 3621/3751/7114 3620/3750/7112 3570/3700/7218 3572/3702/7219 +f 3622/3752/7116 3621/3751/7114 3572/3702/7219 3574/3704/7220 +f 3623/3753/7118 3622/3752/7116 3574/3704/7220 3576/3706/7221 +f 3624/3754/7106 3623/3753/7118 3576/3706/7221 3563/3693/7222 +f 3625/3755/7095 3624/3754/7106 3563/3693/7222 3552/3682/7223 +f 3626/3756/7096 3625/3755/7095 3552/3682/7223 3554/3684/7224 +f 3627/3757/7098 3626/3756/7096 3554/3684/7224 3556/3686/7225 +f 3628/3758/7100 3627/3757/7098 3556/3686/7225 3558/3688/7226 +f 3629/3759/7102 3628/3758/7100 3558/3688/7226 3560/3690/7227 +f 3630/3760/7104 3629/3759/7102 3560/3690/7227 3562/3692/7228 +f 3603/3733/7090 3630/3760/7104 3562/3692/7228 3547/3677/7201 diff --git a/resources/meshes/farm2_platform.obj b/resources/meshes/farm2_platform.obj new file mode 100644 index 0000000000..b64db8f190 --- /dev/null +++ b/resources/meshes/farm2_platform.obj @@ -0,0 +1,29979 @@ +# Blender v2.93.0 OBJ File: 'untitled.blend' +# www.blender.org +o farm2_platform +v 84.322533 -123.239716 -0.499995 +v 86.592384 -125.229553 -0.999995 +v 86.083542 -125.354225 -0.499994 +v 85.696167 -125.675476 -0.999995 +v 84.225471 -123.059845 -0.999994 +v 85.880188 -123.476624 -0.499994 +v 85.371544 -123.597237 -0.999994 +v 86.419235 -121.130920 -0.999994 +v 86.712494 -122.241203 -0.999994 +v 87.646790 -125.580269 -0.499994 +v 86.419235 -121.130920 -0.499995 +v 90.087433 -123.882545 -0.499994 +v 86.716171 -122.323380 -0.499995 +v 92.173950 -121.130920 -0.499995 +v 86.268997 -123.159058 -0.999994 +v 93.256493 -134.835449 -0.999997 +v 93.528748 -135.646454 -0.999995 +v 96.539856 -133.490112 -0.999995 +v 94.262260 -136.226761 -0.999994 +v 94.247139 -136.240692 -0.499994 +v 93.218307 -135.066040 -0.499996 +v 90.394165 -135.853745 -0.499994 +v 93.357262 -126.368309 -0.500005 +v 90.438034 -135.782593 -0.999995 +v 93.369995 -126.295845 -1.000031 +v 89.283264 -130.322998 -0.999995 +v 87.745384 -125.759872 -0.999995 +v 90.384117 -126.528801 -0.999995 +v 85.258430 -126.599442 -0.999995 +v 89.603836 -125.024750 -0.499994 +v 93.076355 -125.013885 -0.499994 +v 89.283264 -130.322998 -0.499994 +v 89.628082 -125.108978 -0.999995 +v 90.376450 -126.467896 -0.499994 +v 93.076355 -125.013885 -0.999995 +v 90.029655 -123.936211 -0.999995 +v 91.305618 -123.417404 -0.999994 +v 91.309578 -123.416344 -0.499994 +v 92.173950 -121.130920 -0.999994 +v 94.781654 -118.445549 -0.999994 +v 98.262589 -118.849319 -0.999996 +v 99.412445 -124.297821 -0.999995 +v 98.268234 -118.805687 -0.499996 +v 93.679077 -124.314873 -0.499994 +v 93.680496 -124.313141 -0.999995 +v 95.046196 -118.706879 -0.499995 +v 98.858551 -111.095978 -0.499994 +v 95.358345 -119.600517 -0.999994 +v 95.355499 -119.721680 -0.499995 +v 96.539856 -133.490128 -0.499994 +v 101.582520 -131.022415 -0.499994 +v 99.412453 -124.297813 -0.499994 +v 100.486572 -118.789436 -0.999994 +v 100.534027 -118.847565 -0.499995 +v 101.631081 -131.096680 -0.999995 +v 102.745941 -131.669800 -0.499994 +v 102.875618 -131.656448 -0.999995 +v 103.576408 -133.481323 -0.999995 +v 104.162292 -130.265884 -0.999995 +v 103.611649 -133.489029 -0.499994 +v 107.259346 -123.190475 -0.499995 +v 103.901642 -136.184006 -0.999995 +v 104.098572 -129.946777 -0.499994 +v 104.479271 -133.893860 -0.999995 +v 103.855034 -136.188751 -0.499994 +v 103.770996 -131.178162 -0.999995 +v 103.946785 -130.998764 -0.499994 +v 104.557518 -133.983612 -0.499994 +v 110.339058 -131.009476 -0.499994 +v 106.324501 -138.011932 -0.499994 +v 99.609756 -136.729309 -0.499994 +v 104.817612 -135.206314 -0.999995 +v 104.787445 -135.332855 -0.499994 +v 95.838478 -140.097778 -0.999994 +v 97.467957 -141.081055 -0.999994 +v 96.097649 -138.874451 -0.999994 +v 102.782669 -138.953522 -0.499994 +v 99.609756 -136.729309 -0.999994 +v 99.497467 -139.951416 -0.999994 +v 102.728157 -138.891083 -0.999994 +v 99.497467 -139.951416 -0.499994 +v 102.525627 -140.762543 -0.999994 +v 102.950562 -139.875793 -0.999994 +v 102.846268 -140.353592 -0.499994 +v 105.295776 -139.806335 -0.999994 +v 106.469940 -140.479492 -0.999994 +v 105.295776 -139.806335 -0.499994 +v 101.483009 -141.139236 -0.499994 +v 101.292984 -141.059219 -0.999994 +v 104.103851 -141.728607 -0.499994 +v 103.959595 -141.864655 -0.999994 +v 100.329346 -142.554626 -0.499994 +v 102.612953 -142.523300 -0.999994 +v 102.717865 -142.499619 -0.499994 +v 105.746918 -114.795593 -0.999994 +v 105.746925 -114.795593 -0.499994 +v 110.597778 -123.197449 -0.999994 +v 106.912964 -114.122375 -0.999994 +v 111.763763 -122.524261 -0.499995 +v 110.597786 -123.197449 -0.499995 +v 99.560249 -118.278450 -0.499994 +v 86.169304 -113.984360 -0.999994 +v 85.848534 -114.393486 -0.499995 +v 85.744186 -114.871185 -0.999994 +v 82.135544 -113.050621 -0.499995 +v 91.305511 -113.643509 -0.499995 +v 87.211700 -113.607796 -0.499995 +v 92.224243 -113.884125 -0.499995 +v 92.539017 -115.942894 -0.499995 +v 94.236610 -118.376816 -0.499995 +v 89.084976 -118.017708 -0.499994 +v 84.023537 -118.412315 -0.499995 +v 92.224243 -113.884125 -0.999994 +v 85.966568 -115.855911 -0.999994 +v 91.226784 -113.665955 -0.999994 +v 92.856270 -114.649170 -0.999994 +v 92.597092 -115.872543 -0.999994 +v 89.084976 -118.017708 -0.999994 +v 87.401718 -113.687798 -0.999994 +v 89.197235 -114.795593 -0.999994 +v 89.197235 -114.795593 -0.499995 +v 78.117828 -132.213470 -0.999995 +v 79.283813 -131.540314 -0.999995 +v 78.117828 -132.213486 -0.499994 +v 81.854218 -138.685150 -0.999994 +v 81.854202 -138.685120 -0.499994 +v 76.936005 -127.234528 -0.999995 +v 76.974785 -127.402824 -0.499994 +v 77.008705 -126.007973 -0.499994 +v 77.035255 -125.922935 -0.999995 +v 89.277054 -136.351700 -0.999994 +v 88.218506 -135.816666 -0.999995 +v 78.235062 -129.723785 -0.999995 +v 89.148186 -136.343369 -0.499994 +v 77.069077 -130.397018 -0.499994 +v 75.463509 -127.536713 -0.999995 +v 75.427994 -127.418533 -0.499994 +v 77.069077 -130.397003 -0.999995 +v 78.235062 -129.723801 -0.499994 +v 78.005157 -124.167358 -0.499994 +v 88.169518 -135.753250 -0.499994 +v 88.896271 -142.519943 -0.499994 +v 83.020248 -138.011932 -0.999994 +v 79.283813 -131.540314 -0.499994 +v 83.020248 -138.011932 -0.499994 +v 83.838776 -139.429626 -0.499994 +v 83.921410 -118.440865 -0.999994 +v 85.912041 -115.793427 -0.499995 +v 82.352676 -113.862816 -0.499995 +v 83.526894 -114.536026 -0.499994 +v 83.142265 -119.691231 -0.999994 +v 85.254128 -126.516815 -0.499994 +v 83.138550 -119.608513 -0.499995 +v 82.352676 -113.862823 -0.999994 +v 83.526917 -114.536011 -0.999994 +v 77.573174 -122.199615 -0.499994 +v 78.747360 -122.872780 -0.499994 +v 77.573166 -122.199615 -0.999994 +v 78.747345 -122.872772 -0.999994 +v -103.000511 -144.474564 -0.499993 +v -102.531593 -146.224579 -0.499994 +v 81.629333 -140.117126 -0.499994 +v 84.469864 -143.115234 -0.499994 +v 82.672729 -140.102859 -0.499994 +v 96.155731 -138.804092 -0.499994 +v 84.520027 -143.186096 -0.999994 +v 96.470581 -140.862915 -0.999994 +v 85.730583 -143.812790 -0.499994 +v 85.817352 -143.832352 -0.999994 +v 82.672729 -140.102844 -0.999994 +v 96.470573 -140.862915 -0.499994 +v 97.389221 -141.103500 -0.499994 +v 98.615936 -143.902893 -0.999994 +v 90.330566 -143.877747 -0.499994 +v 98.615936 -143.902893 -0.499994 +v 88.896271 -143.873383 -0.499994 +v 88.896271 -142.519928 -0.999994 +v 88.896271 -143.873383 -0.999994 +v 95.800629 -139.974091 -0.499994 +v 86.255524 -142.393585 -0.999994 +v 83.838776 -139.429626 -0.999994 +v 98.615936 -142.549438 -0.499994 +v 86.430405 -142.445618 -0.499994 +v 85.180420 -141.678833 -0.999994 +v 100.329346 -143.908112 -0.499994 +v 98.615936 -142.549438 -0.999994 +v 90.330566 -143.877747 -0.999994 +v 113.499512 -147.974579 -0.499994 +v 90.330566 -142.524292 -0.999994 +v 85.257881 -141.761627 -0.499994 +v 90.330566 -142.524292 -0.499994 +v 92.894119 -114.772926 -0.499995 +v 99.431938 -118.270821 -0.999994 +v 112.300674 -126.385971 -0.999995 +v 112.227257 -127.614235 -0.499994 +v 112.200928 -127.698479 -0.999995 +v 112.262016 -126.218063 -0.499994 +v 113.850128 -127.367523 -0.999995 +v 113.773170 -126.084190 -0.999995 +v 111.513214 -124.783051 -0.999995 +v 111.076141 -129.723785 -0.499994 +v 111.076141 -129.723785 -0.999995 +v 112.250305 -130.396973 -0.999995 +v 112.679230 -124.109863 -0.999995 +v 89.836151 -111.068596 -0.499995 +v 110.339050 -131.009460 -0.999995 +v 106.324493 -138.011932 -0.999994 +v 111.513214 -131.682617 -0.999995 +v 107.498688 -138.685120 -0.999994 +v 111.513214 -131.682617 -0.499994 +v 112.250305 -130.396973 -0.499994 +v 113.806183 -127.549019 -0.499994 +v 112.679230 -124.109863 -0.499994 +v 111.513214 -124.783051 -0.499994 +v 104.926544 -113.374695 -0.499995 +v 102.981194 -111.226837 -0.999994 +v 103.979019 -111.859192 -0.499995 +v 104.056244 -111.941750 -0.999994 +v 102.806526 -111.174850 -0.499995 +v 100.329346 -142.554626 -0.999994 +v 103.768814 -143.781204 -0.999994 +v 86.623199 -111.097206 -0.999994 +v 86.016525 -111.226074 -0.499995 +v 84.314529 -113.073151 -0.499995 +v 98.858551 -111.095978 -0.999994 +v 89.836151 -111.068604 -0.999994 +v 85.277084 -111.755608 -0.999994 +v 105.031281 -142.918762 -0.999994 +v 107.498688 -138.685120 -0.499994 +v 106.469940 -140.479492 -0.499994 +v 113.808784 -126.202774 -0.499994 +v 116.999481 -130.550095 -0.499994 +v 104.603783 -110.359886 -0.999995 +v 103.419411 -109.788139 -0.999995 +v 101.027588 -111.102570 -0.999994 +v 98.858551 -109.742508 -0.499995 +v 100.329346 -143.908112 -0.999994 +v 98.858551 -109.742493 -0.999995 +v 88.365356 -111.064148 -0.499995 +v 85.467796 -109.839149 -0.999995 +v 103.582382 -143.838089 -0.499994 +v 116.999481 -123.345825 -0.499995 +v 111.763763 -122.524261 -0.999994 +v 106.912964 -114.122375 -0.499995 +v 107.490799 -112.866013 -0.499995 +v 101.027588 -109.749115 -0.999995 +v 103.506607 -109.807800 -0.499995 +v 101.027588 -111.102570 -0.499995 +v 89.836151 -109.715027 -0.999995 +v 88.365356 -111.064148 -0.999994 +v 88.365356 -109.710571 -0.999995 +v 84.205544 -110.701294 -0.999995 +v 84.344910 -113.109222 -0.999994 +v 104.967705 -142.988235 -0.499994 +v 116.999481 -144.474609 -0.499994 +v 104.926544 -113.374695 -0.999994 +v 106.092590 -112.701477 -0.999994 +v 104.729622 -110.477348 -0.499995 +v 101.027588 -109.749115 -0.499995 +v 85.654449 -109.782227 -0.499995 +v 88.365356 -109.710571 -0.499995 +v 83.170670 -112.436005 -0.999994 +v 116.999481 -144.474579 -5.499994 +v 106.092590 -112.701477 -0.499995 +v 113.499512 102.025421 -0.500002 +v 84.269379 -110.631554 -0.499995 +v 89.836151 -109.715042 -0.499995 +v 83.170670 -112.436005 -0.499995 +v 116.999481 -120.597519 -0.499994 +v 113.499481 102.025421 -5.500003 +v 116.999481 98.525436 -0.500008 +v 78.005157 -124.167358 -0.999995 +v 76.830963 -123.494202 -0.999994 +v 75.386429 -126.252769 -0.999995 +v 113.499481 -147.974579 -5.499994 +v 76.830963 -123.494202 -0.499994 +v 75.430313 -126.071434 -0.499994 +v 116.530579 -146.224579 -0.499994 +v -99.500542 102.025421 -0.500002 +v 115.249512 -147.505676 -0.499994 +v 116.530579 -146.224579 -5.499994 +v 115.249512 101.556511 -0.500002 +v 115.249512 -147.505676 -5.499994 +v 116.530579 100.275421 -0.500002 +v 115.249512 101.556511 -5.500003 +v -103.000504 98.525421 -5.500003 +v 116.530579 100.275421 -5.500003 +v 116.999481 98.525421 -5.500003 +v -99.500534 -147.974579 -0.499994 +v -102.758125 99.871460 -0.500002 +v -101.250504 101.556511 -0.500002 +v -102.531593 100.275421 -5.500003 +v -99.500504 102.025421 -5.500003 +v -101.250504 101.556511 -5.500003 +v -103.000504 -144.474579 -5.499994 +v -99.500504 -147.974579 -5.499994 +v -101.250504 -147.505676 -0.499994 +v -101.250504 -147.505676 -5.499994 +v -102.531593 -146.224579 -5.499994 +v -94.690544 99.458176 -20.237797 +v -95.297699 100.102203 -20.379286 +v -96.612526 100.483940 -19.829359 +v -96.347183 100.564529 -20.240351 +v -97.953949 100.573990 -19.786028 +v -98.828407 100.501877 -19.933493 +v -99.296890 100.162926 -19.483313 +v -100.090225 99.659241 -19.479837 +v -100.693680 99.242348 -19.656645 +v -101.303978 98.289871 -19.519878 +v -101.380630 97.712234 -19.068766 +v -101.638954 97.200089 -19.379839 +v -101.642174 95.821945 -19.206913 +v -101.267723 94.664024 -19.064463 +v -100.625351 93.715874 -18.926044 +v -99.763580 92.984444 -18.787832 +v -98.722557 92.504585 -18.649117 +v -97.607422 92.324249 -18.511208 +v -96.278786 92.654854 -17.961216 +v -96.467667 92.451859 -18.372206 +v -95.073776 93.250954 -17.917957 +v -94.353912 93.752739 -18.065348 +v -94.119202 94.281128 -17.615229 +v -93.686325 95.115265 -17.611729 +v -93.374077 95.778778 -17.788538 +v -93.347404 97.155594 -17.615665 +v -93.548912 97.447014 -17.200649 +v -93.702538 98.321190 -17.472973 +v -94.328011 99.278999 -17.334826 +v -95.178078 100.025749 -17.196350 +v -96.209991 100.522812 -17.057909 +v -97.322502 100.722191 -16.919752 +v -98.656311 100.414207 -16.369991 +v -98.463821 100.613983 -16.780977 +v -99.659302 99.965599 -16.363775 +v -100.501076 99.256241 -16.093100 +v -100.599564 99.349197 -16.474121 +v -101.243462 98.135277 -16.049805 +v -101.613716 97.339882 -16.197248 +v -101.506279 95.826233 -15.743592 +v -101.442894 95.095810 -15.920406 +v -100.774109 93.891884 -15.747555 +v -99.881615 93.062729 -15.604895 +v -98.859344 92.548737 -15.466705 +v -97.749352 92.330254 -15.328274 +v -96.607246 92.418976 -15.189781 +v -95.545303 92.805534 -15.051653 +v -94.546768 93.742035 -14.501853 +v -94.612808 93.472580 -14.912848 +v -93.904976 94.633873 -14.495681 +v -93.533592 95.670135 -14.224979 +v -93.401741 95.639229 -14.605995 +v -93.454941 97.012291 -14.181734 +v -93.534485 97.886055 -14.329116 +v -94.042404 98.896065 -14.192335 +v -94.500626 99.256989 -13.741264 +v -94.809761 99.740509 -14.052279 +v -95.992996 100.445419 -13.879437 +v -97.181015 100.713806 -13.736813 +v -98.323357 100.644547 -13.598556 +v -99.392624 100.275810 -13.460190 +v -100.335670 99.625122 -13.321639 +v -101.059532 98.757423 -13.183551 +v -101.452354 97.445938 -12.633718 +v -101.530640 97.712135 -13.044744 +v -101.559135 96.352455 -12.627597 +v -101.359558 95.269875 -12.356849 +v -101.489098 95.230354 -12.737868 +v -100.753197 94.069908 -12.313636 +v -100.245415 93.354439 -12.460985 +v -99.298607 92.736290 -12.324209 +v -98.721260 92.654549 -11.873130 +v -98.211128 92.391830 -12.184173 +v -96.833588 92.376907 -12.011282 +v -95.671844 92.741707 -11.868703 +v -94.718796 93.375679 -11.730425 +v -93.979736 94.231567 -11.592106 +v -93.491241 95.268105 -11.453523 +v -93.301384 96.381882 -11.315488 +v -93.620689 97.713234 -10.765607 +v -93.419281 97.522499 -11.176602 +v -94.077843 98.712440 -10.759482 +v -94.794266 99.548073 -10.488725 +v -94.702148 99.647354 -10.869746 +v -95.921539 100.280968 -10.445528 +v -96.719963 100.644394 -10.592884 +v -97.849365 100.703117 -10.456114 +v -98.389511 100.483704 -10.005013 +v -98.962425 100.454582 -10.316075 +v -100.304642 99.452217 -9.608648 +v -100.161118 99.775253 -10.143159 +v -100.988022 98.591217 -9.469936 +v -100.982109 98.876335 -10.000643 +v -101.416283 97.574638 -9.334713 +v -101.487701 97.849136 -9.862313 +v -101.553871 96.471970 -9.187070 +v -101.710480 96.438255 -9.683003 +v -101.341423 95.163368 -9.268613 +v -101.537849 95.531952 -8.841544 +v -102.611404 95.868050 -8.870892 +v -98.836212 92.695602 -8.517930 +v -97.834953 92.477394 -8.504375 +v -102.773659 96.259254 -8.500069 +v -102.309502 94.582710 -8.809745 +v -101.038071 94.408417 -8.761159 +v -101.447495 95.309105 -8.499442 +v -98.914642 91.625099 -9.089128 +v -97.279251 91.740585 -9.091741 +v -97.263023 91.384918 -8.895562 +v -98.082664 91.291229 -8.508509 +v -102.283775 94.304756 -8.500054 +v -99.229752 91.540588 -8.542609 +v -101.461884 93.090141 -8.754463 +v -100.447731 93.712921 -9.048652 +v -100.161583 93.430862 -8.512682 +v -100.493561 92.203720 -8.867818 +v -101.110199 92.670311 -8.499871 +v -99.426620 92.945473 -8.892779 +v -101.560860 93.169571 -9.010440 +v -93.736969 98.624985 -11.115993 +v -101.809906 96.599167 -12.984068 +v -93.812119 94.294563 -14.852162 +v -97.005051 100.937439 -20.308163 +v -101.879364 96.219772 -16.212467 +v -101.295914 98.757301 -16.521328 +v -99.569107 100.305618 -16.720255 +v -95.367958 92.778946 -18.311697 +v -93.561569 94.587509 -18.080566 +v -92.510841 96.492142 -9.021578 +v -92.531670 95.180367 -8.865145 +v -93.246986 93.882851 -9.023647 +v -92.733963 94.209000 -8.519009 +v -92.238274 96.058411 -8.522837 +v -93.435730 96.037148 -8.499868 +v -93.411827 93.183891 -8.500069 +v -93.965050 94.532074 -8.499987 +v -93.711189 94.814751 -8.835394 +v -93.555481 94.600845 -9.019993 +v -92.755844 98.060074 -9.022667 +v -94.527222 93.582123 -8.840380 +v -92.302109 97.465157 -8.522840 +v -93.344437 96.429688 -8.835398 +v -93.986168 92.725304 -8.848393 +v -95.024948 93.263840 -8.499867 +v -95.359108 92.101913 -9.083291 +v -94.754234 92.011520 -8.522840 +v -92.959114 99.044556 -8.824667 +v -93.754837 98.176643 -8.499868 +v -93.467072 97.531059 -8.835399 +v -92.913681 99.139290 -8.500069 +v -95.479263 92.665787 -9.002976 +v -96.200050 92.688210 -8.525105 +v -96.189926 91.397514 -8.514657 +v -94.167061 100.391144 -8.953530 +v -93.673988 98.352013 -8.949007 +v -97.150887 92.390648 -8.812154 +v -94.018349 100.467606 -8.500021 +v -95.329414 100.026779 -8.499712 +v -94.255112 99.278221 -8.966016 +v -95.980118 101.084938 -9.100322 +v -97.465347 92.176743 -9.030462 +v -96.236259 101.531326 -8.865294 +v -95.348198 101.363106 -8.514133 +v -99.281387 92.170494 -9.305720 +v -95.338943 100.161972 -8.942634 +v -98.336784 92.413269 -9.001404 +v -98.531242 101.254822 -9.097563 +v -97.820976 101.682899 -8.840694 +v -99.816353 92.788887 -9.325634 +v -101.059082 94.273277 -9.406212 +v -96.675644 100.592766 -8.839014 +v -97.955704 101.811745 -8.500175 +v -97.696121 100.613625 -8.499868 +v -101.493965 94.120453 -9.631043 +v -100.441635 92.407280 -9.280571 +v -99.041283 101.435829 -8.865139 +v -98.010826 100.652916 -8.833627 +v -101.440750 93.350143 -9.420442 +v -102.147415 94.522575 -9.557438 +v -101.279175 99.600693 -9.069156 +v -100.287750 100.529640 -9.209256 +v -100.261330 100.686165 -9.013083 +v -102.541252 96.542526 -9.800156 +v -99.939201 101.210686 -8.522840 +v -102.657326 95.416710 -9.314965 +v -99.516945 100.063248 -8.499950 +v -99.467102 100.184967 -8.798824 +v -102.328033 94.392052 -9.086590 +v -102.765266 96.484505 -9.365342 +v -101.700035 99.549690 -8.847471 +v -101.090660 100.399879 -8.522840 +v -102.641403 97.597260 -9.185829 +v -102.052269 98.572006 -9.012873 +v -102.018517 99.182152 -9.367968 +v -100.195992 99.930603 -9.014115 +v -100.606911 99.104546 -8.522830 +v -102.524895 97.345543 -8.939302 +v -102.365044 98.636147 -8.505109 +v -101.345055 97.838493 -8.520080 +v -101.384056 98.495880 -9.017324 +v -101.707878 96.999771 -8.927022 +v -102.161690 96.532616 -9.907837 +v -101.779953 98.589523 -10.148612 +v -102.523788 97.898750 -9.709044 +v -101.972977 99.192421 -9.846818 +v -100.702217 99.913811 -10.321616 +v -100.894653 100.183998 -10.247717 +v -101.089592 100.298096 -9.985929 +v -99.948990 101.120735 -10.123486 +v -97.999832 101.208130 -10.648711 +v -98.844902 101.306595 -10.487046 +v -98.621399 101.610252 -10.262826 +v -97.200890 101.575279 -10.595043 +v -95.314095 100.482254 -10.969475 +v -95.827736 101.398888 -10.663192 +v -94.631050 100.691826 -10.871850 +v -93.678459 99.231331 -11.191508 +v -93.614456 99.764832 -11.011775 +v -92.888840 98.606171 -11.148689 +v -92.839867 96.596191 -11.499165 +v -92.498840 97.289207 -11.288555 +v -92.552063 95.408905 -11.495768 +v -93.474655 94.175156 -11.775957 +v -92.983353 93.932808 -11.438268 +v -94.045471 92.922295 -11.839115 +v -93.847832 92.812271 -11.577176 +v -95.799515 92.108406 -12.119889 +v -94.974152 91.970444 -11.714910 +v -96.404556 91.654968 -12.115820 +v -96.293449 91.458351 -11.854071 +v -97.693047 91.320190 -11.991589 +v -99.422112 92.223999 -12.516814 +v -98.741051 91.714287 -12.355191 +v -99.086754 91.563988 -12.130933 +v -100.297554 92.308075 -12.463144 +v -101.379555 94.201080 -12.837571 +v -101.395973 93.150406 -12.531312 +v -102.075508 94.363319 -12.739977 +v -102.165176 96.104935 -13.059668 +v -102.488541 95.675209 -12.879886 +v -102.533730 97.041924 -13.016824 +v -101.566093 98.804314 -13.367284 +v -102.209297 98.376144 -13.156640 +v -101.218483 99.975266 -13.363874 +v -99.800644 100.578583 -13.644092 +v -100.103920 101.034790 -13.306355 +v -98.678055 101.374802 -13.707210 +v -98.793442 101.569267 -13.445295 +v -97.372437 101.183868 -13.920843 +v -97.396736 101.731194 -13.582994 +v -96.001663 101.285339 -13.983906 +v -95.998665 101.511063 -13.722196 +v -95.105911 100.503326 -14.179937 +v -94.719063 100.927238 -13.859683 +v -94.011063 100.059990 -14.223321 +v -93.467407 98.863815 -14.438441 +v -93.636665 100.016251 -13.999050 +v -92.963585 98.764359 -14.331264 +v -92.979279 96.584061 -14.705682 +v -92.437210 97.484367 -14.399435 +v -92.459099 96.093971 -14.608089 +v -93.256813 94.543045 -14.927801 +v -92.761116 94.752472 -14.747994 +v -93.408890 93.547905 -14.884945 +v -95.131081 92.510361 -15.235408 +v -94.359566 92.557556 -15.024750 +v -96.019859 91.672691 -15.232005 +v -95.614052 100.981270 -20.492222 +v -94.484032 100.583580 -20.493452 +v -97.548851 91.863480 -15.512193 +v -93.658066 100.051247 -20.410223 +v -97.515800 91.316650 -15.174428 +v -98.919403 91.739075 -15.575314 +v -96.056267 101.538605 -20.120770 +v -97.966881 101.197952 -20.255772 +v -98.917419 91.512985 -15.313435 +v -97.026428 101.561913 -20.212461 +v -99.952324 92.560127 -15.788935 +v -100.206497 92.074837 -15.451094 +v -98.391876 101.505096 -20.075548 +v -101.188354 93.161026 -15.852004 +v -99.856987 100.383377 -20.033262 +v -101.304489 92.967461 -15.590290 +v -99.701141 101.080551 -19.935614 +v -101.569954 94.287186 -16.048002 +v -101.459068 98.952477 -19.784187 +v -102.117584 94.115311 -15.727788 +v -100.907425 100.391144 -19.726952 +v -102.261452 95.481041 -16.176689 +v -102.595680 95.446754 -15.867179 +v -101.740791 99.285034 -19.658821 +v -102.158707 96.692184 -19.525154 +v -102.548607 96.867630 -16.199377 +v -102.321091 97.723801 -19.550770 +v -102.474228 98.068512 -19.326576 +v -101.792244 98.432632 -16.519512 +v -102.269188 98.215965 -16.339319 +v -102.706207 96.672562 -19.187279 +v -102.360603 95.387711 -19.311525 +v -101.574188 94.259079 -19.248415 +v -101.642914 99.429863 -16.476210 +v -102.556152 95.274345 -19.049658 +v -99.938805 100.497055 -16.826696 +v -100.707954 100.437714 -16.616119 +v -102.032829 93.959419 -18.910633 +v -101.073341 93.039101 -19.034788 +v -99.815140 92.478554 -18.971617 +v -99.542343 101.153908 -16.753065 +v -101.181541 92.840378 -18.772781 +v -97.532227 101.185501 -17.103508 +v -98.826019 101.510910 -16.775537 +v -97.573509 101.731712 -16.765911 +v -100.053696 91.985420 -18.633987 +v -98.859932 91.547081 -18.643663 +v -97.388535 91.864548 -18.694805 +v -96.162506 101.332985 -17.166677 +v -96.168915 101.559196 -16.904671 +v -98.061378 91.495842 -18.621180 +v -95.116859 100.530045 -17.380287 +v -94.870628 101.019409 -17.042545 +v -96.693428 91.529411 -18.484219 +v -94.760277 92.726097 -18.387091 +v -93.869415 99.949036 -17.443422 +v -93.757431 100.145409 -17.181578 +v -95.379005 91.930916 -18.344326 +v -93.388702 98.719910 -17.657059 +v -92.925209 99.011948 -17.319199 +v -94.227325 92.665939 -18.207430 +v -92.622093 97.579788 -17.720085 +v -92.859810 95.034668 -18.044767 +v -92.424362 97.688431 -17.458445 +v -93.308441 93.691109 -18.067490 +v -92.857948 96.414024 -17.916100 +v -92.298111 96.287430 -17.595894 +v -92.553711 94.896141 -17.735312 +v -93.439537 96.478386 -20.649935 +v -93.296822 97.136147 -20.863438 +v -93.412178 95.660339 -20.956373 +v -93.774368 94.869125 -21.485785 +v -94.390671 93.916229 -21.473915 +v -94.063858 94.277626 -21.035427 +v -93.526215 93.703880 -20.230043 +v -94.714073 92.946190 -20.396318 +v -95.579552 92.033997 -20.512135 +v -94.675728 93.471901 -20.568020 +v -93.855850 94.494499 -20.403839 +v -93.265541 95.324966 -20.105608 +v -92.640373 96.164436 -19.953417 +v -93.664825 95.174736 -20.578779 +v -93.126549 97.610077 -19.808470 +v -93.339546 96.732178 -20.124363 +v -93.430328 99.043640 -19.623722 +v -93.545876 97.834656 -19.986158 +v -94.108032 99.247215 -19.627525 +v -94.012711 98.590744 -20.125219 +v -94.981544 100.722321 -19.400158 +v -95.316101 100.464935 -19.390600 +v -94.793518 99.691124 -19.709253 +v -97.410545 101.174561 -19.100086 +v -95.629326 100.131615 -19.731632 +v -96.910217 100.650093 -19.425270 +v -99.370041 101.024925 -18.915077 +v -98.270813 100.611458 -19.253641 +v -100.227493 100.148079 -18.804739 +v -99.343956 100.252510 -19.113729 +v -101.694969 99.097931 -18.604883 +v -100.273026 99.624489 -18.976778 +v -100.929008 98.705162 -18.961132 +v -101.783447 97.926582 -18.493660 +v -102.353882 96.966316 -18.361963 +v -101.476601 97.744301 -18.699869 +v -101.857506 95.889069 -18.292908 +v -101.553123 96.627892 -18.810404 +v -101.268402 93.754616 -17.971256 +v -101.427986 95.480927 -18.554832 +v -101.002525 94.463127 -18.416832 +v -99.753761 92.301186 -17.755619 +v -100.322433 93.600258 -18.277895 +v -99.065773 92.465805 -17.759434 +v -99.477844 92.985420 -18.257137 +v -97.569298 91.629250 -17.532076 +v -97.409348 92.019875 -17.522509 +v -98.403725 92.562340 -18.001049 +v -95.706245 91.993431 -17.323509 +v -97.306030 92.465454 -17.863565 +v -95.093956 92.715446 -17.245903 +v -95.937805 92.660805 -17.557138 +v -93.320816 94.448242 -16.928581 +v -94.781006 93.377754 -17.385513 +v -94.033386 94.227470 -17.245626 +v -92.580887 96.406754 -16.736801 +v -93.545731 95.237198 -17.108652 +v -93.092850 97.463730 -16.625580 +v -93.440491 96.361588 -17.093033 +v -93.082169 98.580833 -16.493870 +v -93.449837 97.467506 -16.831747 +v -94.052513 99.262733 -16.424835 +v -93.944565 98.471130 -16.942316 +v -95.174965 100.708282 -16.164312 +v -94.629120 99.400017 -16.686707 +v -95.867393 100.556213 -16.168015 +v -95.463402 100.029366 -16.665672 +v -97.656898 101.170822 -15.871793 +v -96.529884 100.470543 -16.409807 +v -97.626350 100.586105 -16.272102 +v -99.900726 100.791321 -15.663970 +v -99.842667 100.373276 -15.654408 +v -98.996666 100.414314 -15.965876 +v -101.328308 99.540619 -15.455429 +v -100.166222 99.716766 -15.794248 +v -101.494987 98.608658 -15.377818 +v -100.927605 98.880684 -15.654276 +v -102.157478 96.219688 -15.060513 +v -101.432816 97.878700 -15.517417 +v -101.557167 96.756233 -15.501598 +v -101.813194 94.154366 -14.868709 +v -101.566605 95.650322 -15.240525 +v -100.993591 93.843842 -14.833323 +v -101.088974 94.638336 -15.350862 +v -100.287506 92.526543 -14.625781 +v -100.420433 93.698120 -15.095482 +v -98.795570 92.207825 -14.480857 +v -99.552452 93.016914 -14.957273 +v -97.408943 91.738579 -14.296205 +v -98.538208 92.595413 -14.818572 +v -96.886917 92.217926 -14.299923 +v -97.500755 92.470490 -14.797573 +v -95.030617 92.585747 -14.003675 +v -96.356995 92.624901 -14.541686 +v -95.350952 93.075867 -14.404002 +v -93.281372 94.041191 -13.795879 +v -93.541649 94.373421 -13.786318 +v -94.252357 93.913071 -14.097754 +v -92.675529 95.839668 -13.587349 +v -93.591713 95.103714 -13.926126 +v -92.999611 96.729248 -13.509743 +v -93.353508 96.209282 -13.786161 +v -93.015747 98.431435 -13.310842 +v -93.420151 97.329361 -13.649262 +v -93.899445 99.281250 -13.200519 +v -93.876602 98.362259 -13.633482 +v -95.383980 100.911446 -12.945593 +v -94.424110 99.323181 -13.372407 +v -95.826996 100.597084 -12.965239 +v -95.345528 99.958160 -13.482755 +v -97.099480 101.381355 -12.757696 +v -96.396042 100.435196 -13.227345 +v -98.549416 100.907356 -12.612768 +v -97.488739 100.588043 -13.089176 +v -99.984413 100.616257 -12.428097 +v -98.577446 100.442863 -12.950451 +v -100.194778 99.939606 -12.431815 +v -99.537170 100.029617 -12.929499 +v -101.615021 98.688774 -12.135570 +v -100.448578 99.321342 -12.673545 +v -101.091728 98.426064 -12.535911 +v -102.396103 96.551590 -11.927798 +v -102.004143 96.395157 -11.918232 +v -101.620979 97.150070 -12.229623 +v -102.016380 94.692429 -11.719274 +v -101.593925 95.788841 -12.058000 +v -101.289223 94.086037 -11.641662 +v -101.244316 94.713120 -11.918064 +v -100.420067 92.622360 -11.442772 +v -100.624023 93.778358 -11.781151 +v -99.229286 92.331673 -11.332464 +v -99.710289 93.114578 -11.765412 +v -97.126106 91.667931 -11.077486 +v -98.754105 92.558861 -11.504271 +v -96.901421 92.162285 -11.097163 +v -97.638428 92.472832 -11.614669 +v -95.406960 92.123550 -10.889606 +v -96.490448 92.588219 -11.359220 +v -94.391518 93.261848 -10.744666 +v -95.468948 93.005066 -11.221090 +v -93.296814 94.234924 -10.559973 +v -94.600548 93.677635 -11.082318 +v -93.455162 94.925171 -10.563729 +v -93.978401 94.517136 -11.061390 +v -92.855598 96.720421 -10.267482 +v -93.546242 95.587524 -10.805400 +v -93.440025 96.684654 -10.667816 +v -93.254158 98.960777 -10.059699 +v -93.671494 98.898911 -10.050146 +v -93.623627 98.053970 -10.361487 +v -94.516312 100.377220 -9.851206 +v -94.330925 99.217155 -10.189882 +v -95.449753 100.536232 -9.773587 +v -95.173820 99.971664 -10.049953 +v -96.936661 101.365082 -9.574684 +v -96.179680 100.468109 -9.913037 +v -98.112198 101.018173 -9.464383 +v -97.303192 100.582916 -9.897305 +v -98.409126 100.582962 -9.636141 +v -99.430153 100.100273 -9.620668 +v -100.623734 99.426186 -9.245359 +v -100.724907 99.789749 -9.103679 +v -95.411568 93.023811 -21.113430 +v -93.575279 97.571274 -20.516470 +v -93.510574 98.155861 -20.799816 +v -94.207756 99.607635 -20.705450 +v -94.327812 99.219757 -20.943396 +v -93.237740 93.434486 -20.639942 +v -94.547943 92.384125 -20.545465 +v -94.498924 92.203941 -20.898026 +v -92.670380 94.658569 -20.327650 +v -92.279045 95.772110 -20.482323 +v -92.412048 96.731323 -20.035603 +v -92.265785 97.193565 -20.434198 +v -92.657021 98.097916 -19.895395 +v -92.521332 98.236397 -20.329390 +v -92.959785 99.213539 -20.226133 +v -93.252495 99.333267 -19.758833 +v -93.879951 100.316238 -19.890657 +v -95.007027 101.179680 -19.852247 +v -96.352257 101.654778 -19.706633 +v -96.431259 101.496063 -19.367971 +v -97.768005 101.794907 -19.672838 +v -97.797890 101.600967 -19.230968 +v -99.103180 101.545799 -19.414190 +v -100.226807 101.056450 -19.435802 +v -100.381165 100.715088 -18.954187 +v -101.400352 100.009224 -19.045614 +v -101.945999 99.368217 -19.187954 +v -102.460114 98.219955 -18.836941 +v -102.756012 96.657097 -18.807537 +v -102.591751 96.404419 -18.444208 +v -102.598511 95.240173 -18.669140 +v -102.369820 95.032753 -18.304070 +v -102.067619 93.920692 -18.530897 +v -101.795998 93.788734 -18.167484 +v -101.200066 92.789146 -18.392252 +v -100.897705 92.730438 -18.027298 +v -100.063423 91.934296 -18.254221 +v -99.761978 91.961426 -17.890717 +v -98.725677 91.426857 -18.022528 +v -97.315590 91.285065 -17.884825 +v -96.823074 91.270660 -18.070627 +v -95.784470 91.584351 -17.704666 +v -94.851723 91.946663 -17.844286 +v -94.692551 92.284721 -17.362848 +v -93.719902 92.825523 -17.706026 +v -93.653381 93.198738 -17.223001 +v -92.866196 93.975868 -17.567732 +v -92.904175 94.348770 -17.086069 +v -92.272057 95.905998 -17.180473 +v -92.360512 97.550507 -16.968792 +v -92.889870 99.050278 -16.939459 +v -93.158920 99.186317 -16.576097 +v -93.738037 100.196312 -16.801006 +v -94.039871 100.260643 -16.435953 +v -94.860001 101.070366 -16.662788 +v -95.161232 101.048027 -16.299387 +v -96.178619 101.612808 -16.524134 +v -96.469360 101.511612 -16.159193 +v -97.590881 101.780823 -16.386171 +v -97.838097 101.605881 -16.022583 +v -99.002556 101.547379 -16.154381 +v -100.292931 100.961479 -16.016743 +v -100.725967 100.726501 -16.202517 +v -101.466316 99.933479 -15.836578 +v -102.090767 99.151482 -15.976182 +v -102.058609 98.779015 -15.494710 +v -102.627747 97.822975 -15.837884 +v -102.497719 97.466896 -15.354867 +v -102.787880 96.399422 -15.699647 +v -102.567650 96.095840 -15.217929 +v -102.331810 94.432137 -15.312357 +v -101.428970 93.054619 -15.100652 +v -100.217796 92.023949 -15.071354 +v -99.916710 92.041443 -14.708010 +v -98.908623 91.459236 -14.932876 +v -98.615471 91.555298 -14.567850 +v -97.499435 91.267250 -14.794712 +v -97.250023 91.437920 -14.431280 +v -96.085037 91.440407 -14.759981 +v -95.886345 91.694336 -14.291091 +v -94.772919 92.006706 -14.621852 +v -94.655296 92.300682 -14.154476 +v -93.653267 92.906578 -14.385743 +v -92.856743 94.091217 -14.148643 +v -92.600433 94.511871 -14.334398 +v -92.358780 95.569496 -13.968447 +v -92.211777 96.559464 -14.108130 +v -92.426704 96.865440 -13.626637 +v -92.514420 98.102921 -13.718118 +v -92.787788 98.899269 -13.860322 +v -93.334862 99.441147 -13.349835 +v -93.615463 100.066345 -13.618526 +v -94.273567 100.454712 -13.209954 +v -94.707321 100.978195 -13.479885 +v -95.847321 101.498306 -13.232564 +v -97.412354 101.780861 -13.203264 +v -97.663933 101.614464 -12.839905 +v -98.828056 101.611328 -13.064765 +v -99.033119 101.381012 -12.699746 +v -100.142899 101.069275 -12.926615 +v -100.272850 100.796326 -12.563147 +v -101.278786 100.208900 -12.891871 +v -101.322914 99.889610 -12.422987 +v -102.128723 99.059998 -12.753765 +v -102.082764 98.746605 -12.286361 +v -102.644638 97.719406 -12.517637 +v -102.738098 96.294891 -12.280534 +v -102.748360 95.802452 -12.466289 +v -102.425880 94.766609 -12.100328 +v -102.055550 93.836761 -12.240028 +v -101.715843 93.680000 -11.758518 +v -101.018333 92.654335 -11.849980 +v -100.381897 92.103203 -11.992219 +v -99.636429 91.909492 -11.481706 +v -99.079903 91.510010 -11.750400 +v -98.315857 91.504906 -11.341846 +v -97.677742 91.270241 -11.611790 +v -96.430656 91.393356 -11.364423 +v -94.935669 91.935364 -11.335166 +v -94.801613 92.205734 -10.971791 +v -93.796783 92.793282 -11.196637 +v -93.735260 93.095413 -10.831613 +v -92.932320 93.922607 -11.058491 +v -92.957031 94.223984 -10.695045 +v -92.382523 95.237206 -11.023735 +v -92.504837 95.535225 -10.554887 +v -92.224922 96.657639 -10.885663 +v -92.422127 96.905624 -10.418241 +v -92.963486 95.623741 -9.103356 +v -92.452454 98.075935 -10.649502 +v -93.087410 99.354553 -10.412442 +v -93.299370 98.914642 -9.102670 +v -93.325928 99.785423 -10.598166 +v -94.125168 100.518967 -10.232205 +v -94.912598 101.136871 -10.371961 +v -95.285294 101.101799 -9.890377 +v -96.403503 101.638062 -9.981860 +v -97.230690 101.794792 -10.124110 +v -97.972809 101.587708 -9.613598 +v -96.676971 100.912636 -9.052279 +v -98.654472 101.653481 -9.882278 +v -99.317589 101.273994 -9.473717 +v -99.987183 101.156311 -9.743720 +v -98.731071 100.794243 -9.053113 +v -101.003677 100.423180 -9.496295 +v -93.812416 98.234383 -21.159111 +v -93.581306 97.822479 -21.499897 +v -94.377831 99.126442 -21.480513 +v -95.195251 100.210144 -20.781464 +v -95.379761 100.006798 -21.158541 +v -97.003548 101.077248 -20.704496 +v -96.354263 100.530022 -20.951960 +v -97.845711 100.599953 -21.174831 +v -98.380356 100.780785 -20.801331 +v -99.876549 100.456406 -20.701241 +v -99.598640 100.044579 -21.054396 +v -101.009407 99.069702 -20.792158 +v -100.604004 99.150101 -21.159130 +v -101.759987 97.416031 -20.789890 +v -101.187454 98.236839 -21.159109 +v -101.627586 96.799995 -21.026550 +v -101.534126 94.908417 -20.793171 +v -101.455292 95.583366 -21.159109 +v -101.112877 93.715485 -20.699121 +v -100.963936 94.372871 -21.158548 +v -100.247688 93.478073 -21.046949 +v -99.355263 92.587654 -20.789886 +v -99.088753 92.782310 -21.159105 +v -97.824219 92.369202 -20.953028 +v -97.322617 92.031403 -20.718805 +v -96.662231 92.448242 -20.841486 +v -96.605713 92.563660 -21.204218 +v -100.233482 92.034630 -21.480698 +v -99.997017 93.236176 -21.499897 +v -101.803772 93.478424 -21.500132 +v -101.324249 94.967453 -21.499897 +v -102.627815 95.367653 -21.480698 +v -97.303978 91.628052 -20.705212 +v -101.561844 96.689270 -21.480515 +v -102.751259 96.763374 -21.480698 +v -98.950851 91.847237 -20.711901 +v -101.357826 97.936043 -21.499960 +v -102.460098 98.297302 -21.493608 +v -98.880928 91.453781 -21.158115 +v -100.500679 99.329895 -21.499960 +v -101.209129 100.233795 -21.500051 +v -100.107895 92.073112 -20.946280 +v -101.048225 93.014626 -20.786276 +v -98.679092 100.509430 -21.499777 +v -101.895866 94.186058 -20.773022 +v -101.272278 92.865089 -21.158108 +v -99.532356 101.392891 -21.471888 +v -102.384338 96.925499 -20.709457 +v -97.578667 101.812706 -21.492168 +v -102.220665 94.201050 -21.129421 +v -102.598694 95.769524 -20.922262 +v -96.662437 100.501762 -21.480511 +v -101.950378 98.523254 -20.708738 +v -95.537651 101.410187 -21.488607 +v -95.466972 100.093239 -21.499960 +v -102.596619 97.842766 -21.121353 +v -101.262360 99.785652 -20.773022 +v -93.949120 100.358650 -21.500013 +v -101.934517 99.345154 -21.158113 +v -92.858910 98.967537 -21.500051 +v -99.321121 101.161217 -20.774050 +v -101.031738 100.416389 -21.158112 +v -93.492325 97.203926 -21.156906 +v -93.459259 96.088646 -21.480511 +v -100.081696 100.998421 -20.938433 +v -92.228844 96.600243 -21.500132 +v -97.388519 101.612251 -20.830894 +v -95.709793 100.971977 -20.700432 +v -98.182495 101.746483 -21.154104 +v -92.510544 95.124580 -20.973387 +v -95.832031 101.405899 -20.946272 +v -92.392288 96.888329 -20.873079 +v -94.757607 100.700066 -20.787556 +v -93.804131 99.670364 -20.720341 +v -92.813210 98.324867 -20.812792 +v -94.239136 100.669609 -21.157335 +v -93.287415 99.501175 -20.925058 +v -92.912666 99.141060 -21.192125 +v -92.365166 97.672897 -21.136549 +v -92.256340 96.114975 -21.176783 +v -92.618683 94.576286 -21.480696 +v -93.040298 93.833397 -21.035915 +v -94.784660 93.467255 -21.152517 +v -93.399460 93.222641 -21.489319 +v -93.959938 92.665321 -21.123581 +v -95.593307 92.828537 -20.705091 +v -95.586571 92.890076 -21.499960 +v -94.979851 91.917419 -21.470976 +v -96.038452 91.474632 -20.950508 +v -97.165009 92.431099 -21.499964 +v -96.500549 91.378082 -21.500313 +v -97.153481 91.256363 -21.198841 +v -98.058731 92.474983 -21.451639 +v -98.522850 91.369812 -21.501112 +v 114.309517 99.458130 -20.237804 +v 113.702347 100.102188 -20.379303 +v 112.387489 100.483932 -19.829365 +v 112.652847 100.564529 -20.240355 +v 111.046059 100.573990 -19.786026 +v 110.171577 100.501877 -19.933493 +v 109.703110 100.162918 -19.483311 +v 108.909729 99.659180 -19.479807 +v 108.306305 99.242325 -19.656641 +v 107.696014 98.289833 -19.519873 +v 107.619385 97.712265 -19.068787 +v 107.361069 97.200073 -19.379818 +v 107.357834 95.822014 -19.206919 +v 107.732330 94.663933 -19.064438 +v 108.374649 93.715912 -18.926041 +v 109.236458 92.984406 -18.787838 +v 110.277420 92.504585 -18.649126 +v 111.392570 92.324249 -18.511209 +v 112.721252 92.654861 -17.961214 +v 112.532349 92.451859 -18.372202 +v 113.926239 93.250969 -17.917950 +v 114.646072 93.752708 -18.065351 +v 114.880852 94.281197 -17.615213 +v 115.313675 95.115242 -17.611759 +v 115.625946 95.778824 -17.788538 +v 115.652618 97.155594 -17.615669 +v 115.451088 97.447044 -17.200626 +v 115.297493 98.321144 -17.472986 +v 114.671974 99.279030 -17.334818 +v 113.821869 100.025764 -17.196323 +v 112.790001 100.522812 -17.057909 +v 111.677513 100.722191 -16.919750 +v 110.343719 100.414215 -16.369993 +v 110.536171 100.613983 -16.780975 +v 109.340630 99.965576 -16.363781 +v 108.498871 99.256172 -16.093056 +v 108.400475 99.349197 -16.474108 +v 107.756599 98.135414 -16.049831 +v 107.386299 97.339905 -16.197247 +v 107.448860 96.765121 -15.747159 +v 107.493690 95.826416 -15.743636 +v 107.557175 95.095711 -15.920374 +v 108.225876 93.891907 -15.747561 +v 109.118362 93.062744 -15.604899 +v 110.140648 92.548744 -15.466710 +v 111.250656 92.330254 -15.328270 +v 112.392761 92.418983 -15.189780 +v 113.454735 92.805557 -15.051646 +v 114.453239 93.742043 -14.501863 +v 114.387177 93.472565 -14.912860 +v 115.095024 94.633835 -14.495711 +v 115.466431 95.670242 -14.224939 +v 115.598236 95.639145 -14.606002 +v 115.545059 97.012306 -14.181729 +v 115.465508 97.886108 -14.329104 +v 114.957565 98.896088 -14.192320 +v 114.499367 99.256996 -13.741299 +v 114.190292 99.740471 -14.052282 +v 113.007057 100.445396 -13.879441 +v 111.818985 100.713806 -13.736814 +v 110.676628 100.644547 -13.598556 +v 109.607307 100.275772 -13.460178 +v 108.664352 99.625122 -13.321635 +v 107.940491 98.757477 -13.183575 +v 107.547676 97.446014 -12.633701 +v 107.469376 97.712151 -13.044731 +v 107.440849 96.352409 -12.627602 +v 107.640450 95.269852 -12.356840 +v 107.510895 95.230392 -12.737881 +v 108.246819 94.069885 -12.313628 +v 108.754631 93.354408 -12.460968 +v 109.701454 92.736275 -12.324195 +v 110.278732 92.654549 -11.873126 +v 110.788879 92.391830 -12.184174 +v 112.166420 92.376907 -12.011285 +v 113.328156 92.741722 -11.868691 +v 114.281166 93.375648 -11.730429 +v 115.020287 94.231567 -11.592109 +v 115.508781 95.268120 -11.453532 +v 115.698624 96.381790 -11.315509 +v 115.379311 97.713264 -10.765568 +v 115.580704 97.522537 -11.176581 +v 114.922180 98.712433 -10.759479 +v 114.205734 99.548080 -10.488717 +v 114.297859 99.647354 -10.869744 +v 113.078445 100.280968 -10.445525 +v 112.280083 100.644394 -10.592895 +v 111.150620 100.703117 -10.456112 +v 110.610504 100.483704 -10.005024 +v 110.037605 100.454597 -10.316078 +v 108.695320 99.452187 -9.608621 +v 108.838890 99.775269 -10.143166 +v 108.011963 98.591194 -9.469954 +v 108.017822 98.876213 -10.000617 +v 107.583656 97.574471 -9.334686 +v 107.512268 97.849007 -9.862283 +v 107.446136 96.471916 -9.187073 +v 107.289528 96.438271 -9.683011 +v 107.658577 95.163376 -9.268657 +v 107.462143 95.532013 -8.841550 +v 106.388603 95.868065 -8.870884 +v 110.163803 92.695595 -8.517930 +v 111.165054 92.477394 -8.504378 +v 106.409264 94.945335 -8.500296 +v 106.690514 94.582664 -8.809739 +v 107.961975 94.408363 -8.761152 +v 107.499802 95.651337 -8.499868 +v 110.085381 91.625099 -9.089129 +v 111.909561 91.748833 -9.087402 +v 111.873009 91.484520 -8.964394 +v 110.917343 91.291229 -8.508510 +v 109.770241 91.540588 -8.542619 +v 107.538094 93.090164 -8.754499 +v 108.552299 93.712898 -9.048684 +v 108.617210 93.615768 -8.508266 +v 108.506485 92.203697 -8.867814 +v 107.889893 92.670235 -8.499873 +v 109.573380 92.945480 -8.892775 +v 107.439186 93.169533 -9.010497 +v 115.263008 98.625023 -11.115984 +v 107.190102 96.599091 -12.984056 +v 115.187904 94.294594 -14.852153 +v 111.994957 100.937439 -20.308161 +v 107.120636 96.219666 -16.212458 +v 107.704063 98.757248 -16.521318 +v 109.430870 100.305595 -16.720247 +v 113.632057 92.778946 -18.311697 +v 116.554787 96.225166 -8.981325 +v 116.244858 94.530052 -8.865142 +v 116.004089 94.856026 -9.093470 +v 116.708412 95.550613 -8.519001 +v 116.325470 94.382828 -8.500069 +v 115.270912 94.989868 -8.511950 +v 115.572449 93.446938 -8.945388 +v 115.539062 95.265068 -8.942633 +v 116.599976 97.359581 -8.840700 +v 115.966911 97.993217 -9.112563 +v 115.106514 92.668785 -8.500068 +v 115.558319 96.863945 -8.499950 +v 115.648201 96.665207 -8.838979 +v 114.484879 93.640121 -8.839000 +v 114.461510 92.258080 -8.824663 +v 113.975082 93.263847 -8.499867 +v 116.060989 98.993370 -8.841802 +v 116.614166 97.834602 -8.500070 +v 114.820778 93.045479 -9.097350 +v 115.134262 99.727669 -9.093508 +v 115.402657 97.967239 -8.837633 +v 113.398781 92.835342 -8.802898 +v 113.398125 91.900131 -9.008876 +v 115.103699 98.421562 -8.499950 +v 112.970100 92.453644 -9.007792 +v 113.148788 91.488457 -8.519008 +v 114.791916 100.556427 -8.811871 +v 115.696899 99.727264 -8.500070 +v 111.929146 91.257538 -8.519731 +v 114.375610 100.613052 -9.008875 +v 114.820923 99.032120 -8.835514 +v 112.525169 92.597977 -8.499987 +v 111.849129 92.390648 -8.812151 +v 114.033241 99.684784 -8.525110 +v 112.244591 101.323776 -9.098330 +v 111.534637 92.176743 -9.030462 +v 113.218292 101.398674 -8.840691 +v 114.113396 101.111794 -8.500069 +v 109.718597 92.170502 -9.305722 +v 113.152412 100.246948 -8.499950 +v 113.817139 100.198326 -9.005427 +v 110.663193 92.413277 -9.001400 +v 111.526405 101.711166 -8.841786 +v 112.266258 100.519249 -8.515989 +v 111.753090 101.825233 -8.500175 +v 109.183594 92.788925 -9.325644 +v 107.940910 94.273293 -9.406217 +v 112.009727 100.650139 -8.835385 +v 107.506073 94.120399 -9.631036 +v 109.858765 101.014603 -9.099592 +v 108.558365 92.407280 -9.280571 +v 109.540787 101.338753 -8.819230 +v 110.489670 100.470245 -8.499949 +v 110.901657 100.638359 -8.835393 +v 107.559212 93.350197 -9.420446 +v 106.852562 94.522575 -9.557420 +v 107.720856 99.600723 -9.069158 +v 108.712257 100.529633 -9.209255 +v 108.738647 100.686150 -9.013079 +v 106.458748 96.542465 -9.800152 +v 109.356888 101.349945 -8.500069 +v 106.342659 95.416756 -9.314965 +v 109.853188 100.422348 -8.942640 +v 106.672050 94.391876 -9.086527 +v 106.234726 96.484421 -9.365284 +v 107.299904 99.549637 -8.847450 +v 107.909409 100.399918 -8.522840 +v 108.811676 99.612381 -8.499867 +v 106.358597 97.597244 -9.185804 +v 106.947693 98.571953 -9.012872 +v 106.981506 99.182159 -9.367957 +v 108.495331 99.409912 -8.837356 +v 106.488670 97.318390 -8.941387 +v 107.032059 99.302216 -8.500021 +v 106.329704 97.707176 -8.523496 +v 107.654930 97.838440 -8.520075 +v 107.596001 98.439728 -9.015879 +v 107.292122 96.999680 -8.927021 +v 106.838310 96.532570 -9.907833 +v 107.220108 98.589607 -10.148623 +v 106.476234 97.898773 -9.709086 +v 107.027069 99.192482 -9.846833 +v 108.297791 99.913818 -10.321616 +v 108.105324 100.183975 -10.247715 +v 107.910362 100.298058 -9.985910 +v 109.051041 101.120743 -10.123503 +v 111.000191 101.208130 -10.648713 +v 110.155121 101.306595 -10.487047 +v 110.378593 101.610252 -10.262820 +v 111.799095 101.575287 -10.595042 +v 113.685883 100.482277 -10.969472 +v 113.172272 101.398888 -10.663191 +v 114.369003 100.691788 -10.871860 +v 115.321548 99.231308 -11.191510 +v 115.385574 99.764809 -11.011775 +v 116.111153 98.606224 -11.148676 +v 116.160141 96.596161 -11.499168 +v 116.501137 97.289215 -11.288567 +v 116.447952 95.408920 -11.495768 +v 115.525368 94.175201 -11.775953 +v 116.016655 93.932831 -11.438285 +v 114.954559 92.922295 -11.839108 +v 115.152245 92.812340 -11.577174 +v 113.200493 92.108406 -12.119888 +v 114.025848 91.970428 -11.714904 +v 112.595428 91.654968 -12.115825 +v 112.706497 91.458344 -11.854083 +v 111.306969 91.320190 -11.991591 +v 109.577873 92.223999 -12.516817 +v 110.258949 91.714287 -12.355191 +v 109.913223 91.563995 -12.130931 +v 108.702484 92.308052 -12.463142 +v 107.620430 94.201088 -12.837573 +v 107.604057 93.150391 -12.531311 +v 106.924561 94.363167 -12.739948 +v 106.834839 96.104897 -13.059663 +v 106.511459 95.675186 -12.879876 +v 106.466278 97.041924 -13.016823 +v 107.433884 98.804253 -13.367278 +v 106.790749 98.376221 -13.156662 +v 107.781471 99.975220 -13.363860 +v 109.199356 100.578575 -13.644091 +v 108.896057 101.034775 -13.306353 +v 110.321892 101.374794 -13.707201 +v 110.206558 101.569267 -13.445308 +v 111.627586 101.183868 -13.920845 +v 111.603249 101.731194 -13.582995 +v 112.998360 101.285332 -13.983909 +v 113.001320 101.511063 -13.722201 +v 113.894081 100.503326 -14.179936 +v 114.280907 100.927254 -13.859684 +v 114.988976 100.059952 -14.223328 +v 115.532608 98.863792 -14.438445 +v 115.363335 100.016243 -13.999079 +v 116.036385 98.764420 -14.331250 +v 116.020729 96.584053 -14.705682 +v 116.562790 97.484375 -14.399447 +v 116.540894 96.093987 -14.608087 +v 115.743156 94.542976 -14.927809 +v 116.238907 94.752510 -14.747991 +v 115.591072 93.547882 -14.884969 +v 113.868881 92.510338 -15.235413 +v 114.640381 92.557518 -15.024757 +v 112.980171 91.672691 -15.231997 +v 113.385941 100.981270 -20.492220 +v 114.515930 100.583603 -20.493454 +v 111.451157 91.863480 -15.512192 +v 115.341957 100.051231 -20.410219 +v 111.484207 91.316643 -15.174426 +v 110.080589 91.739075 -15.575314 +v 112.943748 101.538605 -20.120770 +v 111.033119 101.197952 -20.255770 +v 110.082588 91.512978 -15.313421 +v 111.973564 101.561913 -20.212460 +v 109.047668 92.560127 -15.788936 +v 108.793549 92.074814 -15.451086 +v 110.608177 101.505096 -20.075558 +v 107.811646 93.161034 -15.852006 +v 109.143013 100.383392 -20.033266 +v 107.695503 92.967453 -15.590258 +v 109.298828 101.080551 -19.935596 +v 107.430008 94.287231 -16.048008 +v 107.540932 98.952477 -19.784187 +v 106.882462 94.115250 -15.727768 +v 108.092545 100.391113 -19.726944 +v 106.738541 95.481071 -16.176693 +v 106.404335 95.446678 -15.867164 +v 107.259155 99.284973 -19.658810 +v 106.841301 96.692184 -19.525152 +v 106.451416 96.867722 -16.199390 +v 106.678909 97.723747 -19.550762 +v 106.525795 98.068565 -19.326569 +v 107.207771 98.432640 -16.519516 +v 106.730865 98.215996 -16.339350 +v 106.293823 96.672722 -19.187351 +v 106.639397 95.387749 -19.311531 +v 107.425850 94.259010 -19.248407 +v 107.357094 99.429893 -16.476200 +v 106.443878 95.274246 -19.049656 +v 109.061211 100.497055 -16.826696 +v 108.291992 100.437691 -16.616100 +v 106.967224 93.959381 -18.910669 +v 107.926689 93.039078 -19.034784 +v 109.184860 92.478554 -18.971617 +v 109.457642 101.153900 -16.753061 +v 107.818413 92.840439 -18.772812 +v 111.467781 101.185501 -17.103510 +v 110.174004 101.510910 -16.775545 +v 111.426514 101.731712 -16.765913 +v 108.946312 91.985420 -18.633980 +v 110.140060 91.547081 -18.643660 +v 111.611473 91.864548 -18.694805 +v 112.837509 101.332985 -17.166679 +v 112.831078 101.559204 -16.904663 +v 110.938622 91.495842 -18.621180 +v 113.883118 100.530052 -17.380285 +v 114.129410 101.019394 -17.042542 +v 112.306595 91.529419 -18.484221 +v 114.239761 92.726120 -18.387087 +v 115.130539 99.949081 -17.443411 +v 115.242599 100.145393 -17.181566 +v 113.621033 91.930931 -18.344326 +v 115.611313 98.719910 -17.657059 +v 116.074837 99.011848 -17.319220 +v 114.772636 92.665909 -18.207436 +v 116.270012 97.909622 -17.682634 +v 115.475929 94.372086 -18.165155 +v 116.575661 97.688316 -17.458469 +v 115.691498 93.691040 -18.067511 +v 116.142059 96.414055 -17.916096 +v 116.552757 96.268257 -17.790705 +v 116.388031 94.893150 -17.858797 +v 115.560471 96.478310 -20.649940 +v 115.703186 97.136154 -20.863438 +v 115.587807 95.660301 -20.956379 +v 115.078644 94.607887 -21.476809 +v 114.936119 94.277603 -21.035421 +v 115.473785 93.703888 -20.230043 +v 114.285934 92.946190 -20.396318 +v 113.420464 92.033997 -20.512135 +v 114.324303 93.471916 -20.568012 +v 115.144135 94.494461 -20.403839 +v 115.734428 95.324890 -20.105621 +v 116.359627 96.164436 -19.953415 +v 115.335205 95.174820 -20.578785 +v 115.873466 97.610039 -19.808475 +v 115.660461 96.732185 -20.124359 +v 115.569649 99.043686 -19.623718 +v 115.454163 97.834549 -19.986170 +v 114.892021 99.247147 -19.627537 +v 114.987282 98.590775 -20.125191 +v 114.018387 100.722359 -19.400146 +v 113.683929 100.464912 -19.390606 +v 114.206474 99.691132 -19.709251 +v 111.589447 101.174561 -19.100086 +v 113.370720 100.131592 -19.731647 +v 112.089783 100.650093 -19.425272 +v 109.629951 101.024933 -18.915077 +v 110.729210 100.611465 -19.253635 +v 108.772514 100.148087 -18.804737 +v 109.656052 100.252525 -19.113729 +v 107.305046 99.097946 -18.604885 +v 108.726921 99.624443 -18.976772 +v 108.070923 98.705086 -18.961096 +v 107.216522 97.926537 -18.493652 +v 106.646111 96.966331 -18.361967 +v 107.523422 97.744293 -18.699888 +v 107.142517 95.888977 -18.292898 +v 107.446877 96.628052 -18.810440 +v 107.731575 93.754646 -17.971260 +v 107.572037 95.480835 -18.554804 +v 107.997368 94.463364 -18.416908 +v 109.246330 92.301147 -17.755610 +v 108.677536 93.600296 -18.277914 +v 109.934258 92.465797 -17.759430 +v 109.522125 92.985435 -18.257143 +v 111.430725 91.629250 -17.532072 +v 111.590691 92.019875 -17.522507 +v 110.596306 92.562340 -18.001047 +v 113.758125 92.458649 -17.232004 +v 111.693977 92.465454 -17.863564 +v 113.062172 92.660805 -17.557144 +v 115.377075 93.572472 -17.046988 +v 114.218956 93.377731 -17.385529 +v 115.677834 94.761200 -16.936668 +v 114.966599 94.227455 -17.245626 +v 116.419106 96.406731 -16.736801 +v 115.454269 95.237114 -17.108641 +v 115.907158 97.463745 -16.625578 +v 115.559540 96.361511 -17.093029 +v 115.917870 98.580795 -16.493877 +v 115.550217 97.467308 -16.831766 +v 114.947495 99.262741 -16.424833 +v 115.055450 98.471092 -16.942339 +v 113.825027 100.708290 -16.164310 +v 114.370834 99.400078 -16.686686 +v 113.132591 100.556221 -16.168011 +v 113.536644 100.029335 -16.665672 +v 111.343102 101.170822 -15.871792 +v 112.470123 100.470543 -16.409805 +v 111.373650 100.586105 -16.272102 +v 109.099274 100.791328 -15.663971 +v 109.157372 100.373291 -15.654411 +v 110.003326 100.414307 -15.965876 +v 107.671684 99.540611 -15.455428 +v 108.833763 99.716743 -15.794239 +v 107.504990 98.608604 -15.377810 +v 108.072433 98.880722 -15.654278 +v 106.842529 96.219734 -15.060518 +v 107.567200 97.878685 -15.517436 +v 107.347664 96.768196 -15.377495 +v 107.186798 94.154381 -14.868711 +v 107.433365 95.650345 -15.240512 +v 108.006439 93.843811 -14.833319 +v 107.910973 94.638443 -15.350883 +v 108.712486 92.526550 -14.625783 +v 108.579628 93.698044 -15.095454 +v 110.204437 92.207825 -14.480857 +v 109.447502 93.016945 -14.957291 +v 111.591072 91.738579 -14.296205 +v 110.461800 92.595413 -14.818569 +v 112.113060 92.217918 -14.299928 +v 111.499245 92.470490 -14.797573 +v 113.969391 92.585754 -14.003674 +v 112.643021 92.624901 -14.541686 +v 113.649124 93.075912 -14.403985 +v 115.718658 94.041229 -13.795876 +v 115.458359 94.373428 -13.786316 +v 114.747650 93.913094 -14.097756 +v 116.324486 95.839630 -13.587354 +v 115.408249 95.103615 -13.926145 +v 116.000389 96.729210 -13.509748 +v 115.646515 96.209404 -13.786145 +v 115.984268 98.431412 -13.310845 +v 115.579819 97.329475 -13.649267 +v 115.100571 99.281258 -13.200516 +v 115.123444 98.362289 -13.633415 +v 113.615990 100.911469 -12.945589 +v 114.575920 99.323158 -13.372402 +v 113.173012 100.597092 -12.965237 +v 113.654503 99.958138 -13.482769 +v 111.900551 101.381355 -12.757698 +v 112.603996 100.435188 -13.227356 +v 110.450600 100.907356 -12.612769 +v 111.511261 100.588036 -13.089181 +v 109.015594 100.616257 -12.428097 +v 110.422630 100.442871 -12.950476 +v 108.805214 99.939598 -12.431816 +v 109.462799 100.029594 -12.929485 +v 107.384995 98.688766 -12.135569 +v 108.551468 99.321396 -12.673562 +v 107.908333 98.426071 -12.535996 +v 106.603897 96.551765 -11.927819 +v 106.995865 96.395233 -11.918241 +v 107.379021 97.150108 -12.229618 +v 106.983620 94.692490 -11.719278 +v 107.406067 95.788857 -12.057986 +v 107.710754 94.086060 -11.641664 +v 107.755699 94.713112 -11.918065 +v 108.579887 92.622406 -11.442780 +v 108.376053 93.778297 -11.781153 +v 109.770729 92.331673 -11.332462 +v 109.289711 93.114594 -11.765417 +v 111.873924 91.667931 -11.077483 +v 110.245888 92.558861 -11.504272 +v 112.098572 92.162285 -11.097161 +v 111.361580 92.472832 -11.614672 +v 113.593040 92.123543 -10.889608 +v 112.509552 92.588219 -11.359224 +v 114.608498 93.261856 -10.744663 +v 113.530968 93.005035 -11.221125 +v 115.703194 94.234924 -10.559972 +v 114.399544 93.677711 -11.082290 +v 115.544800 94.925079 -10.563743 +v 115.021622 94.517189 -11.061430 +v 116.144409 96.720444 -10.267480 +v 115.453796 95.587524 -10.805362 +v 115.559959 96.684517 -10.667859 +v 115.745857 98.960754 -10.059700 +v 115.328514 98.898895 -10.050149 +v 115.376373 98.053993 -10.361479 +v 114.483589 100.377289 -9.851191 +v 114.669144 99.217125 -10.189867 +v 113.550270 100.536224 -9.773589 +v 113.826172 99.971672 -10.049952 +v 112.063316 101.365074 -9.574682 +v 112.820305 100.468109 -9.913040 +v 110.887840 101.018181 -9.464386 +v 111.696800 100.582916 -9.897305 +v 110.590874 100.582954 -9.636148 +v 109.569824 100.100250 -9.620660 +v 108.376312 99.426216 -9.245365 +v 108.288277 99.786163 -9.103354 +v 113.588432 93.023811 -21.113409 +v 115.424751 97.571182 -20.516464 +v 115.489334 98.156052 -20.799803 +v 114.792191 99.607681 -20.705446 +v 114.672195 99.219772 -20.943392 +v 115.762268 93.434486 -20.639948 +v 114.452049 92.384102 -20.545477 +v 114.275703 92.042137 -21.007389 +v 116.329605 94.658539 -20.327654 +v 116.720963 95.772034 -20.482361 +v 116.587959 96.731361 -20.035601 +v 116.734215 97.193649 -20.434172 +v 116.342957 98.097961 -19.895380 +v 116.478714 98.236313 -20.329428 +v 116.040207 99.213562 -20.226151 +v 115.747559 99.333244 -19.758846 +v 115.120049 100.316231 -19.890646 +v 113.992966 101.179680 -19.852242 +v 112.647766 101.654770 -19.706631 +v 112.568733 101.496056 -19.367962 +v 111.232002 101.794907 -19.672836 +v 111.202118 101.600967 -19.230968 +v 109.896782 101.545792 -19.414190 +v 108.773247 101.056480 -19.435818 +v 108.618851 100.715080 -18.954184 +v 107.599655 100.009232 -19.045610 +v 107.053993 99.368195 -19.187937 +v 106.539894 98.219963 -18.836950 +v 106.243988 96.657082 -18.807516 +v 106.408279 96.404427 -18.444187 +v 106.401497 95.240150 -18.669167 +v 106.630127 95.032829 -18.304102 +v 106.932358 93.920723 -18.530947 +v 107.203972 93.788788 -18.167498 +v 107.799988 92.789116 -18.392189 +v 108.102310 92.730453 -18.027287 +v 108.936569 91.934303 -18.254223 +v 109.238113 91.961380 -17.890709 +v 110.274338 91.426849 -18.022524 +v 111.682671 91.246613 -17.984150 +v 113.086876 91.491447 -17.942448 +v 113.072945 91.688637 -17.499857 +v 114.378983 92.101959 -17.804728 +v 114.307396 92.284691 -17.362856 +v 115.408150 92.988167 -17.546070 +v 116.133820 93.975891 -17.567698 +v 116.095840 94.348763 -17.086079 +v 116.622284 95.470970 -17.177471 +v 116.771965 96.299316 -17.319868 +v 116.639511 97.550476 -16.968821 +v 116.110153 99.050232 -16.939470 +v 115.841141 99.186218 -16.576101 +v 115.262062 100.196228 -16.801039 +v 114.960182 100.260612 -16.435970 +v 114.140053 101.070343 -16.662832 +v 113.838791 101.048035 -16.299400 +v 112.821373 101.612808 -16.524115 +v 112.530602 101.511604 -16.159182 +v 111.409126 101.780823 -16.386169 +v 111.161903 101.605873 -16.022581 +v 109.997467 101.547386 -16.154392 +v 108.707108 100.961510 -16.016745 +v 108.274063 100.726517 -16.202501 +v 107.533722 99.933502 -15.836572 +v 106.909225 99.151459 -15.976214 +v 106.941414 98.779060 -15.494721 +v 106.372276 97.823059 -15.837868 +v 106.502304 97.466812 -15.354831 +v 106.212120 96.399338 -15.699607 +v 106.432365 96.095695 -15.217911 +v 106.668190 94.432190 -15.312363 +v 107.570984 93.054657 -15.100685 +v 108.782257 92.023918 -15.071332 +v 109.083229 92.041481 -14.708015 +v 110.091446 91.459229 -14.932839 +v 110.384552 91.555290 -14.567847 +v 111.500580 91.267250 -14.794714 +v 111.749977 91.437920 -14.431283 +v 112.914963 91.440414 -14.759974 +v 113.113640 91.694328 -14.291092 +v 114.227097 92.006729 -14.621840 +v 114.344704 92.300674 -14.154478 +v 115.346741 92.906578 -14.385757 +v 116.143242 94.091187 -14.148641 +v 116.399620 94.511971 -14.334385 +v 116.641205 95.569382 -13.968472 +v 116.788239 96.559464 -14.108070 +v 116.573265 96.865570 -13.626596 +v 116.485542 98.103027 -13.718107 +v 116.212242 98.899239 -13.860338 +v 115.665131 99.441147 -13.349830 +v 115.384552 100.066338 -13.618516 +v 114.726479 100.454666 -13.209950 +v 114.292625 100.978226 -13.479847 +v 113.152702 101.498299 -13.232574 +v 111.587646 101.780861 -13.203261 +v 111.336067 101.614456 -12.839904 +v 110.171951 101.611328 -13.064752 +v 109.966888 101.381012 -12.699742 +v 108.857109 101.069275 -12.926638 +v 108.727165 100.796349 -12.563154 +v 107.721130 100.208817 -12.891870 +v 107.677101 99.889626 -12.422992 +v 106.871269 99.059952 -12.753741 +v 106.917221 98.746597 -12.286368 +v 106.355354 97.719360 -12.517657 +v 106.261909 96.294800 -12.280533 +v 106.251648 95.802460 -12.466291 +v 106.574127 94.766602 -12.100317 +v 106.944412 93.836838 -12.240033 +v 107.284225 93.679863 -11.758523 +v 107.981720 92.654312 -11.849945 +v 108.618080 92.103226 -11.992224 +v 109.363579 91.909485 -11.481717 +v 109.920090 91.510010 -11.750406 +v 110.684135 91.504913 -11.341849 +v 111.322250 91.270241 -11.611787 +v 112.569366 91.393356 -11.364421 +v 114.064377 91.935387 -11.335148 +v 114.198380 92.205742 -10.971786 +v 115.203262 92.793327 -11.196623 +v 115.264717 93.095367 -10.831623 +v 114.590096 93.285568 -9.044120 +v 116.067703 93.922600 -11.058551 +v 116.042999 94.223991 -10.695057 +v 116.617493 95.237228 -11.023767 +v 116.495193 95.535255 -10.554896 +v 116.775070 96.657730 -10.885655 +v 116.577835 96.905693 -10.418208 +v 116.547531 98.076012 -10.649483 +v 115.959084 96.740616 -9.052280 +v 115.912621 99.354546 -10.412475 +v 115.674088 99.785408 -10.598170 +v 114.874825 100.518967 -10.232192 +v 114.087433 101.136864 -10.371968 +v 113.714676 101.101822 -9.890371 +v 112.596481 101.638062 -9.981856 +v 111.769318 101.794792 -10.124113 +v 111.027184 101.587708 -9.613597 +v 110.345505 101.653473 -9.882271 +v 111.730789 100.983253 -9.052279 +v 109.682381 101.273987 -9.473711 +v 109.012733 101.156258 -9.743687 +v 107.996353 100.423203 -9.496295 +v 114.941086 98.687080 -21.480507 +v 115.478500 97.543823 -21.499960 +v 114.247444 99.519485 -21.480507 +v 113.698914 100.210266 -20.807238 +v 113.137207 100.258377 -21.158535 +v 112.607445 100.630341 -20.840260 +v 111.206474 100.843086 -20.787340 +v 111.226768 100.647690 -21.100615 +v 109.652702 100.489761 -20.779732 +v 109.667221 100.153297 -21.159103 +v 108.636604 99.571182 -20.959917 +v 107.929703 99.387283 -20.699121 +v 107.726456 98.278168 -20.947985 +v 106.938591 97.154198 -20.697880 +v 107.565033 97.591713 -21.055584 +v 107.341225 96.666046 -20.948019 +v 107.343941 95.289886 -20.792786 +v 107.601288 95.320015 -21.159847 +v 108.072456 94.028748 -20.840803 +v 108.918922 93.260681 -20.948015 +v 109.822708 92.630646 -20.840796 +v 111.175774 92.369209 -20.953030 +v 111.677368 92.031403 -20.718805 +v 112.337761 92.448235 -20.841480 +v 112.394302 92.563660 -21.204210 +v 108.766518 92.034622 -21.480694 +v 108.957764 93.352486 -21.480513 +v 107.196274 93.478386 -21.500130 +v 108.099312 94.274330 -21.485786 +v 107.461243 95.773262 -21.499960 +v 106.271561 95.909248 -21.482119 +v 111.696007 91.628052 -20.705214 +v 106.290077 97.137016 -21.500051 +v 107.451530 96.972710 -21.483896 +v 110.200424 91.877251 -20.704781 +v 107.937363 98.511841 -21.483507 +v 106.785263 98.780441 -21.500013 +v 110.160774 91.542412 -20.946274 +v 107.476883 93.820221 -20.704481 +v 108.057831 92.908318 -20.779797 +v 107.790909 100.233826 -21.500051 +v 108.892189 92.073074 -20.946270 +v 108.920410 99.682343 -21.485788 +v 107.727699 92.865120 -21.158119 +v 108.726730 101.006004 -21.484932 +v 110.694717 100.551346 -21.486210 +v 106.831650 94.792870 -20.773022 +v 106.719139 94.295692 -21.157320 +v 111.421326 101.812706 -21.492168 +v 106.527863 97.306137 -20.784731 +v 106.360863 95.934296 -20.968920 +v 112.779243 100.449646 -21.499897 +v 113.628204 101.318367 -21.500051 +v 106.316139 97.390305 -21.158129 +v 107.262810 99.161766 -20.786280 +v 106.869568 99.050865 -21.157352 +v 115.589722 99.851021 -21.500132 +v 108.333374 100.421936 -20.796289 +v 109.780174 101.094185 -20.710144 +v 107.907883 100.347580 -21.132191 +v 115.552788 96.948357 -21.142899 +v 116.379822 98.513184 -21.484930 +v 115.306938 97.971313 -21.161709 +v 109.530090 101.402802 -21.126535 +v 111.643585 101.607788 -20.829920 +v 112.998123 101.173912 -20.706583 +v 116.489464 95.124611 -20.973385 +v 111.140221 101.767319 -21.158119 +v 114.153870 100.741020 -20.774895 +v 113.215477 101.491554 -21.158113 +v 116.607689 96.888435 -20.873070 +v 115.195824 99.670403 -20.720339 +v 116.186829 98.324791 -20.812798 +v 114.760811 100.669647 -21.157328 +v 115.704102 99.598373 -20.986471 +v 116.634827 97.672966 -21.136532 +v 116.743675 96.114990 -21.176788 +v 116.724541 96.637100 -21.500015 +v 115.516487 95.815552 -21.483513 +v 116.442978 94.715622 -21.482132 +v 115.959709 93.833412 -21.035921 +v 114.223351 93.476135 -21.160378 +v 115.817589 93.517746 -21.483734 +v 114.305550 93.524803 -21.499960 +v 115.039993 92.665260 -21.123634 +v 114.687569 92.325333 -21.500132 +v 113.406700 92.828545 -20.705095 +v 112.860176 92.643486 -21.500101 +v 112.961517 91.474617 -20.950521 +v 109.886017 92.793701 -21.480515 +v 112.499443 91.378075 -21.500313 +v 111.846519 91.256355 -21.198851 +v 111.206390 92.451004 -21.472107 +v 110.302803 91.394363 -21.488894 +v 6.589372 -9.246131 -8.500000 +v 6.097188 -8.958410 -6.992528 +v 5.873657 -8.625581 -8.499999 +v 5.697188 -7.685568 -6.992529 +v 6.999496 -7.975571 -6.218886 +v 5.728940 -7.565459 -8.499997 +v -45.100502 -117.975586 -8.499995 +v -45.100502 44.124420 -8.499999 +v 6.599478 -6.702753 -6.992528 +v 6.349487 -6.849747 -8.499997 +v 7.409609 -6.705029 -8.499998 +v 7.901781 -6.992743 -6.992529 +v 8.304889 -7.695487 -8.499997 +v 8.301808 -8.265554 -6.992528 +v 116.999481 44.124420 -8.499999 +v -99.077774 96.070511 -7.517523 +v -100.500504 96.524422 -6.100008 +v -99.064262 97.029190 -8.500002 +v -103.000511 98.524399 -8.500002 +v -102.531593 100.274422 -8.500002 +v -100.098579 95.024422 -6.100008 +v -98.886147 97.324425 -7.500002 +v -100.098579 98.024422 -6.100009 +v -100.500504 96.524422 -5.500002 +v -100.098579 98.024422 -5.500003 +v -97.845276 98.131058 -8.500002 +v -97.500511 -114.075592 -7.499994 +v -97.155807 -114.082230 -8.499995 +v -98.639526 -113.657280 -7.517511 +v -98.886147 95.724419 -8.500002 +v -102.531593 100.274422 -5.500003 +v -98.719536 -113.577431 -8.499995 +v -100.098579 -113.975586 -6.100000 +v -99.000504 -115.073639 -6.100000 +v -97.896057 94.931519 -7.517514 +v -103.000504 98.524422 -5.500003 +v -100.846535 101.782051 -8.500002 +v -101.250504 101.555511 -5.500003 +v -97.954430 98.101685 -7.517523 +v -98.005264 94.960663 -8.500002 +v -102.758125 -115.821632 -8.499995 +v -101.250504 -117.506653 -8.499995 +v -100.098579 -113.975586 -5.499994 +v -99.000504 93.926346 -6.100008 +v -100.098579 95.024422 -5.500002 +v -96.700500 97.910065 -8.500002 +v -45.100502 102.024422 -8.500002 +v -99.500504 102.024422 -5.500003 +v -99.000504 99.122498 -6.100009 +v -99.000504 99.122498 -5.500003 +v -95.893875 96.869186 -8.500002 +v -96.318764 -113.614548 -7.517517 +v -97.500511 -115.475586 -6.100000 +v -99.000504 -115.073639 -5.499994 +v -102.531593 -116.225586 -5.499994 +v -103.000504 -114.475586 -5.499994 +v -99.500504 -117.975586 -8.499995 +v -99.064262 -111.970810 -8.499995 +v -99.093414 -112.080025 -7.517514 +v -100.500504 -112.475586 -6.100000 +v -100.500504 -112.475586 -5.499994 +v -96.398628 95.305405 -8.500002 +v 112.681236 -113.614555 -7.517515 +v 112.601395 -113.694565 -8.499995 +v 110.317780 97.663429 -7.517523 +v 109.935745 97.029182 -8.500002 +v -96.700500 95.138779 -7.500002 +v -95.907600 96.128876 -7.517519 +v -96.361504 97.706161 -7.517523 +v -97.500511 99.524422 -6.100009 +v 113.076759 -112.021660 -7.517518 +v 113.106125 -112.130821 -8.499995 +v 112.999481 -115.073639 -6.100000 +v 114.097565 -113.975586 -6.100000 +v -95.936745 -112.980339 -8.499995 +v -101.250504 -117.506653 -5.499994 +v -97.500511 93.524422 -6.100008 +v -99.000504 93.926346 -5.500002 +v -100.098579 -110.975586 -5.499994 +v 113.499481 102.024422 -5.500003 +v 7.399504 -9.248405 -6.992529 +v 114.845474 -117.733208 -8.499995 +v 116.530579 -116.225586 -8.499995 +v 109.922241 96.070518 -7.517524 +v 109.999481 99.122498 -6.100009 +v 108.901428 98.024422 -6.100009 +v -97.500511 99.524422 -5.500003 +v -96.000504 99.122498 -6.100009 +v 116.999481 -114.475586 -8.499995 +v 112.999481 -115.073639 -5.499994 +v 113.499481 -117.975586 -5.499994 +v 115.249481 -117.506653 -5.499994 +v 111.499512 -114.075592 -8.499995 +v 111.499512 -114.075592 -7.499994 +v 111.499512 -115.475586 -6.100000 +v 111.499512 -115.475586 -5.499994 +v -96.000504 -115.073639 -6.100000 +v -97.500511 -115.475586 -5.499994 +v -99.500504 -117.975586 -5.499994 +v -100.098579 -110.975586 -6.100000 +v 110.699493 97.910065 -8.500002 +v 113.499481 102.024422 -8.500002 +v 109.999481 99.122498 -5.500003 +v 7.894761 -8.966028 -8.500000 +v 110.113861 95.724419 -8.500002 +v 108.901428 98.024422 -5.500003 +v -96.000504 93.926346 -6.100008 +v -94.902428 95.024422 -6.100008 +v -94.500504 96.524422 -6.100008 +v -94.902428 98.024422 -6.100009 +v -96.000504 99.122498 -5.500003 +v 112.004265 -110.911827 -8.499995 +v 114.499512 -112.475586 -6.100000 +v 114.097565 -113.975586 -5.499994 +v 109.999481 -115.073639 -5.499994 +v -96.281487 -111.373703 -8.499995 +v -95.900505 -112.475586 -7.499994 +v -97.500511 93.524422 -5.500002 +v -99.000504 -109.877502 -5.499995 +v 111.499512 98.124420 -7.500003 +v 111.499512 99.524422 -6.100009 +v 111.499512 99.524422 -5.500003 +v 115.249481 101.555511 -5.500003 +v 116.530579 -116.225586 -5.499994 +v 108.499481 96.524422 -6.100008 +v -94.902428 98.024422 -5.500003 +v 108.499481 96.524422 -5.500002 +v 110.280487 -113.577438 -8.499995 +v 110.360497 -113.657288 -7.517511 +v 109.999481 -115.073639 -6.100000 +v -94.902428 -113.975586 -6.100000 +v -96.000504 -115.073639 -5.499994 +v -97.845268 -110.868950 -8.499996 +v -97.954422 -110.898315 -7.517516 +v -99.000504 -109.877502 -6.100001 +v 112.004272 98.088181 -8.500002 +v 115.249481 101.555511 -8.500002 +v 110.994743 94.960663 -8.500002 +v -96.000504 93.926346 -5.500002 +v -94.902428 95.024422 -5.500002 +v -94.500504 96.524422 -5.500002 +v 111.895058 -110.882683 -7.517516 +v 114.097565 -110.975586 -6.100000 +v 114.499512 -112.475586 -5.499994 +v 108.901428 -113.975586 -5.499994 +v -96.361504 -111.293854 -7.517517 +v -94.500504 -112.475586 -6.100000 +v -97.500511 -109.475586 -5.499995 +v 112.638496 97.706161 -7.517521 +v 112.999481 99.122498 -6.100009 +v 112.999481 99.122498 -5.500003 +v 116.530579 100.274422 -5.500003 +v 116.999481 -114.475586 -5.499994 +v 110.699493 95.138779 -7.500002 +v 108.901428 95.024422 -6.100008 +v 110.397621 -111.256569 -8.499995 +v 108.901428 -113.975586 -6.100000 +v -94.902428 -113.975586 -5.499994 +v -97.500511 -109.475586 -6.100001 +v 113.106125 96.869186 -8.500002 +v 116.757103 99.870483 -8.500002 +v 116.999481 98.524422 -5.500003 +v -96.000504 -109.877502 -5.499995 +v 112.601379 95.305405 -8.500002 +v 112.999481 -109.877502 -6.100001 +v 114.097565 -110.975586 -5.499994 +v 109.899506 -112.475586 -8.499995 +v -94.902428 -110.975586 -6.100000 +v -94.500504 -112.475586 -5.499994 +v -96.000504 -109.877502 -6.100001 +v 114.097565 98.024422 -6.100009 +v 114.097565 98.024422 -5.500003 +v 111.953423 94.947159 -7.517514 +v 109.999481 93.926346 -6.100008 +v 108.901428 95.024422 -5.500002 +v 110.317772 -111.336578 -7.517517 +v 109.899506 -112.475586 -7.499994 +v 108.499481 -112.475586 -6.100000 +v 108.499481 -112.475586 -5.499994 +v 113.092400 96.128876 -7.517520 +v 111.499512 -109.475586 -6.100001 +v 112.999481 -109.877502 -5.499995 +v -94.902428 -110.975586 -5.499994 +v 114.499512 96.524422 -6.100008 +v 114.499512 96.524422 -5.500002 +v 111.499512 93.524422 -6.100008 +v 109.999481 93.926346 -5.500002 +v 109.999481 -109.877502 -6.100001 +v 108.901428 -110.975586 -6.100000 +v 108.901428 -110.975586 -5.499994 +v 114.097565 95.024422 -6.100008 +v 111.499512 93.524422 -5.500002 +v 112.999481 93.926346 -6.100008 +v 111.499512 -109.475586 -5.499995 +v 114.097565 95.024422 -5.500002 +v 109.999481 -109.877502 -5.499995 +v 112.999481 93.926346 -5.500002 +v -94.690620 -109.541763 -20.237766 +v -95.297684 -108.897804 -20.379288 +v -96.612556 -108.516060 -19.829323 +v -96.347229 -108.435448 -20.240341 +v -97.953918 -108.426010 -19.786041 +v -98.828499 -108.498161 -19.933460 +v -99.296936 -108.837097 -19.483278 +v -100.090233 -109.340767 -19.479826 +v -100.693642 -109.757622 -19.656639 +v -101.303970 -110.710098 -19.519880 +v -101.380638 -111.287788 -19.068756 +v -101.638954 -111.799919 -19.379829 +v -101.642174 -113.178062 -19.206911 +v -101.267693 -114.336006 -19.064444 +v -100.625336 -115.284126 -18.926023 +v -99.763557 -116.015549 -18.787806 +v -98.722534 -116.495438 -18.649120 +v -97.363045 -116.535500 -18.231833 +v -96.278847 -116.345184 -17.961283 +v -96.240280 -116.474998 -18.342234 +v -95.073715 -115.748978 -17.917919 +v -94.353874 -115.247238 -18.065348 +v -94.119247 -114.718948 -17.615246 +v -93.686310 -113.884712 -17.611723 +v -93.374077 -113.221214 -17.788534 +v -93.347397 -111.844421 -17.615660 +v -93.548912 -111.553001 -17.200630 +v -93.702560 -110.678757 -17.472963 +v -94.328003 -109.721016 -17.334816 +v -95.178116 -108.974236 -17.196337 +v -96.209877 -108.477219 -17.057930 +v -97.322433 -108.277817 -16.919752 +v -98.656235 -108.585777 -16.369986 +v -98.463768 -108.385994 -16.780981 +v -99.659218 -109.034355 -16.363800 +v -100.501099 -109.743797 -16.093092 +v -100.599586 -109.650818 -16.474129 +v -101.243454 -110.864708 -16.049826 +v -101.613716 -111.660149 -16.197237 +v -101.506287 -113.173775 -15.743586 +v -101.442894 -113.904175 -15.920403 +v -100.774109 -115.108124 -15.747547 +v -99.881523 -115.937309 -15.604866 +v -98.859360 -116.451256 -15.466697 +v -97.749321 -116.669739 -15.328254 +v -96.607300 -116.581032 -15.189780 +v -95.545387 -116.194511 -15.051662 +v -94.546837 -115.258041 -14.501854 +v -94.612816 -115.527435 -14.912848 +v -93.904976 -114.366158 -14.495692 +v -93.533592 -113.329857 -14.224965 +v -93.401733 -113.360771 -14.605993 +v -93.454941 -111.987747 -14.181731 +v -93.534485 -111.113960 -14.329101 +v -94.042412 -110.103920 -14.192327 +v -94.500580 -109.743065 -13.741278 +v -94.809776 -109.259499 -14.052267 +v -95.993095 -108.554558 -13.879398 +v -97.181114 -108.286209 -13.736776 +v -98.323433 -108.355492 -13.598527 +v -99.392685 -108.724220 -13.460187 +v -100.335609 -109.374809 -13.321655 +v -101.059532 -110.242569 -13.183540 +v -101.452354 -111.554077 -12.633696 +v -101.530647 -111.287872 -13.044743 +v -101.559135 -112.647552 -12.627584 +v -101.359558 -113.730148 -12.356834 +v -101.489090 -113.769669 -12.737860 +v -100.753181 -114.930115 -12.313628 +v -100.245369 -115.645622 -12.460982 +v -99.298515 -116.263756 -12.324191 +v -98.721199 -116.345490 -11.873183 +v -98.211052 -116.608200 -12.184168 +v -96.833565 -116.623093 -12.011275 +v -95.671822 -116.258270 -11.868690 +v -94.718819 -115.624321 -11.730405 +v -93.979744 -114.768433 -11.592095 +v -93.491241 -113.731895 -11.453513 +v -93.301384 -112.618118 -11.315480 +v -93.620682 -111.286781 -10.765604 +v -93.419281 -111.477516 -11.176592 +v -94.077858 -110.287529 -10.759480 +v -94.794235 -109.451973 -10.488721 +v -94.702164 -109.352615 -10.869746 +v -95.921509 -108.719048 -10.445537 +v -96.720016 -108.355614 -10.592853 +v -97.849426 -108.296898 -10.456087 +v -98.389473 -108.516296 -10.004976 +v -98.962372 -108.545395 -10.316078 +v -100.304565 -109.547707 -9.608670 +v -100.161095 -109.224716 -10.143168 +v -100.988029 -110.408783 -9.469913 +v -100.982094 -110.123657 -10.000640 +v -101.416290 -111.425362 -9.334702 +v -101.487701 -111.150894 -9.862299 +v -101.553871 -112.528008 -9.187064 +v -101.710480 -112.561729 -9.682998 +v -101.341423 -113.836639 -9.268619 +v -101.537849 -113.468040 -8.841538 +v -102.611404 -113.131973 -8.870886 +v -98.836189 -116.304420 -8.517921 +v -98.016022 -116.495735 -8.511127 +v -102.773659 -112.740761 -8.500063 +v -102.309509 -114.417259 -8.809746 +v -101.038078 -114.591583 -8.761157 +v -101.500198 -113.348679 -8.499863 +v -98.914627 -117.374908 -9.089118 +v -97.696571 -117.146027 -9.110865 +v -97.478058 -117.505630 -8.982414 +v -98.083061 -117.708717 -8.508499 +v -102.283775 -114.695259 -8.500049 +v -99.229698 -117.459435 -8.542605 +v -101.461815 -115.909950 -8.754442 +v -100.447678 -115.287140 -9.048658 +v -100.382782 -115.384254 -8.508252 +v -100.493484 -116.796341 -8.867830 +v -101.110207 -116.329681 -8.499865 +v -99.426620 -116.054535 -8.892773 +v -101.560829 -115.830482 -9.010406 +v -93.736984 -110.375000 -11.115979 +v -101.809906 -112.400848 -12.984059 +v -93.812134 -114.705475 -14.852167 +v -97.005119 -108.062553 -20.308146 +v -101.879356 -112.780212 -16.212461 +v -101.295944 -110.242714 -16.521322 +v -99.569107 -108.694382 -16.720245 +v -97.611740 -116.784187 -18.588331 +v -95.340782 -116.313126 -18.389410 +v -93.561592 -114.412575 -18.080576 +v -92.510841 -112.507866 -9.021572 +v -92.531685 -113.819664 -8.865147 +v -92.990868 -114.082809 -9.097201 +v -93.142311 -115.143929 -8.949155 +v -92.238274 -112.941612 -8.522830 +v -92.798904 -114.936844 -8.500168 +v -93.451874 -113.242851 -8.499705 +v -93.711174 -114.185219 -8.835388 +v -93.504913 -114.150192 -9.006345 +v -92.755836 -110.939949 -9.022658 +v -94.228722 -114.842468 -8.522817 +v -92.302109 -111.534836 -8.522832 +v -93.344437 -112.570297 -8.835388 +v -93.986183 -116.274719 -8.848393 +v -94.555206 -116.256424 -9.098296 +v -95.105232 -115.879005 -8.835547 +v -94.579369 -116.896904 -8.518998 +v -95.481606 -116.037025 -8.499863 +v -93.472107 -109.330650 -8.944907 +v -92.812599 -110.012093 -8.514122 +v -93.754829 -110.823402 -8.499862 +v -93.475670 -111.413200 -8.840587 +v -95.987747 -117.244911 -9.024079 +v -96.146065 -116.478256 -8.938032 +v -95.851257 -117.511566 -8.519001 +v -97.070686 -117.742470 -8.519704 +v -94.815033 -108.492874 -9.100313 +v -94.179016 -109.967949 -8.835523 +v -94.834145 -108.026596 -8.841785 +v -93.701553 -110.303978 -9.012043 +v -97.248627 -116.516594 -8.518390 +v -94.298424 -108.277588 -8.500062 +v -94.966736 -109.315247 -8.525105 +v -97.465408 -116.823265 -9.030457 +v -96.448723 -107.588585 -9.008864 +v -95.939919 -108.736092 -8.518488 +v -95.266647 -108.770676 -9.002679 +v -98.336906 -116.586700 -9.001407 +v -96.191307 -107.360657 -8.500062 +v -97.881149 -107.683403 -9.100313 +v -96.822952 -107.320297 -8.822469 +v -100.401123 -116.490334 -9.386720 +v -99.816368 -116.211105 -9.325632 +v -101.059082 -114.726738 -9.406210 +v -98.505630 -107.405853 -8.840695 +v -97.432045 -108.403145 -8.499943 +v -96.660179 -108.303078 -8.966006 +v -101.493973 -114.879532 -9.631042 +v -98.292099 -107.255455 -8.500063 +v -99.566841 -108.174408 -9.100272 +v -100.120552 -107.999168 -8.841790 +v -97.884911 -108.246201 -8.964425 +v -101.440720 -115.649887 -9.420436 +v -102.147377 -114.477554 -9.557414 +v -101.844406 -110.022575 -9.027379 +v -100.788834 -109.088364 -9.106326 +v -100.287735 -108.470360 -9.209248 +v -102.541252 -112.457497 -9.800149 +v -99.027420 -108.699623 -8.499944 +v -102.657326 -113.583282 -9.314967 +v -98.864105 -108.554802 -8.839019 +v -100.586693 -108.158356 -8.500167 +v -102.328026 -114.607964 -9.086567 +v -102.765266 -112.515518 -9.365331 +v -101.315697 -109.017532 -8.861224 +v -99.851547 -109.054420 -8.838995 +v -102.641403 -111.402748 -9.185822 +v -102.018532 -109.817894 -9.367954 +v -100.380287 -109.595261 -8.499944 +v -101.986977 -109.686333 -8.522829 +v -102.524887 -111.654442 -8.939298 +v -100.666092 -109.787071 -8.843534 +v -102.508896 -110.808060 -8.511586 +v -101.345047 -111.161499 -8.520071 +v -101.403992 -110.560249 -9.015871 +v -101.707878 -112.000252 -8.927015 +v -102.161690 -112.467392 -9.907830 +v -101.779968 -110.410515 -10.148599 +v -102.523796 -111.101265 -9.709033 +v -101.972984 -109.807625 -9.846816 +v -100.702202 -109.086166 -10.321609 +v -100.894608 -108.815948 -10.247717 +v -101.089600 -108.701927 -9.985930 +v -99.948967 -107.879234 -10.123466 +v -97.999809 -107.791862 -10.648704 +v -98.844856 -107.693398 -10.487042 +v -98.621399 -107.389763 -10.262845 +v -97.200912 -107.424744 -10.595044 +v -95.314194 -108.517685 -10.969454 +v -95.827751 -107.601097 -10.663189 +v -94.631012 -108.308228 -10.871861 +v -93.678467 -109.768661 -11.191499 +v -93.614525 -109.235062 -11.011744 +v -92.888840 -110.393837 -11.148676 +v -92.839874 -112.403801 -11.499155 +v -92.498848 -111.710739 -11.288542 +v -92.552055 -113.591080 -11.495762 +v -93.474632 -114.824799 -11.775949 +v -92.983345 -115.067177 -11.438274 +v -94.045517 -116.077751 -11.839119 +v -93.847786 -116.187675 -11.577178 +v -95.799492 -116.891594 -12.119883 +v -94.974014 -117.029480 -11.714908 +v -96.404602 -117.345047 -12.115822 +v -96.293434 -117.541664 -11.854063 +v -97.693230 -117.679794 -11.991612 +v -99.422157 -116.775978 -12.516816 +v -98.741096 -117.285713 -12.355193 +v -99.086693 -117.436043 -12.130918 +v -100.297592 -116.691917 -12.463138 +v -101.379601 -114.798866 -12.837576 +v -101.395973 -115.849617 -12.531301 +v -102.075531 -114.636635 -12.739975 +v -102.165176 -112.895065 -13.059663 +v -102.488541 -113.324776 -12.879881 +v -102.533730 -111.958061 -13.016816 +v -101.566086 -110.195694 -13.367276 +v -102.209320 -110.623924 -13.156624 +v -101.218498 -109.024757 -13.363863 +v -99.800583 -108.421394 -13.644090 +v -100.103882 -107.965195 -13.306365 +v -98.678024 -107.625206 -13.707208 +v -98.793411 -107.430725 -13.445279 +v -97.372505 -107.816132 -13.920827 +v -97.396736 -107.268814 -13.582992 +v -96.001633 -107.714684 -13.983901 +v -95.998703 -107.488937 -13.722193 +v -95.105965 -108.496643 -14.179920 +v -94.719093 -108.072746 -13.859664 +v -94.010986 -108.940102 -14.223324 +v -93.467415 -110.136177 -14.438432 +v -93.636635 -108.983780 -13.999048 +v -92.963585 -110.235680 -14.331271 +v -92.979279 -112.415947 -14.705674 +v -92.437210 -111.515633 -14.399427 +v -92.459106 -112.906059 -14.608087 +v -93.256836 -114.457008 -14.927803 +v -92.761108 -114.247513 -14.747987 +v -93.408859 -115.452065 -14.884933 +v -95.131088 -116.489655 -15.235406 +v -94.359489 -116.442398 -15.024728 +v -96.019814 -117.327278 -15.232009 +v -95.614090 -108.018738 -20.492210 +v -94.484032 -108.416420 -20.493450 +v -97.548828 -117.136528 -15.512186 +v -93.658066 -108.948784 -20.410238 +v -97.515839 -117.683380 -15.174430 +v -98.919479 -117.260887 -15.575330 +v -96.056221 -107.461418 -20.120790 +v -97.966866 -107.802055 -20.255766 +v -98.917336 -117.487053 -15.313389 +v -97.026413 -107.438095 -20.212460 +v -99.952339 -116.439873 -15.788933 +v -100.206459 -116.925186 -15.451083 +v -98.391960 -107.494934 -20.075537 +v -101.188370 -115.838959 -15.852001 +v -99.856949 -108.616608 -20.033258 +v -101.304428 -116.032578 -15.590312 +v -99.701057 -107.919411 -19.935619 +v -101.569946 -114.712837 -16.047995 +v -101.459053 -110.047508 -19.784182 +v -102.117554 -114.884758 -15.727776 +v -100.907425 -108.608856 -19.726938 +v -102.261444 -113.518959 -16.176687 +v -102.595673 -113.553291 -15.867172 +v -101.740799 -109.714973 -19.658808 +v -102.158714 -112.307808 -19.525148 +v -102.548607 -112.132385 -16.199369 +v -102.321083 -111.276176 -19.550764 +v -102.474228 -110.931496 -19.326569 +v -101.792236 -110.567360 -16.519508 +v -102.269196 -110.784065 -16.339308 +v -102.706207 -112.327454 -19.187271 +v -102.360611 -113.612259 -19.311529 +v -101.574188 -114.740921 -19.248409 +v -101.642906 -109.570129 -16.476210 +v -102.556145 -113.725685 -19.049648 +v -99.938759 -108.502922 -16.826693 +v -100.707954 -108.562286 -16.616108 +v -102.032845 -115.040543 -18.910650 +v -101.073326 -115.960915 -19.034782 +v -99.815163 -116.521446 -18.971613 +v -99.542366 -107.846123 -16.753067 +v -101.181572 -116.159576 -18.772795 +v -97.532150 -107.814499 -17.103508 +v -98.825958 -107.489090 -16.775545 +v -97.573494 -107.268295 -16.765911 +v -100.053848 -117.014473 -18.634024 +v -98.859863 -117.452965 -18.643637 +v -97.388580 -117.135445 -18.694803 +v -96.162521 -107.667023 -17.166672 +v -96.168945 -107.440788 -16.904634 +v -98.061531 -117.504128 -18.621208 +v -95.116898 -108.469940 -17.380274 +v -94.870659 -107.980576 -17.042543 +v -96.693489 -117.470619 -18.484219 +v -93.869362 -109.051025 -17.443420 +v -94.748886 -116.281914 -18.387638 +v -93.757408 -108.854622 -17.181576 +v -95.379021 -117.069092 -18.344320 +v -93.388710 -110.280083 -17.657049 +v -92.925247 -109.987968 -17.319168 +v -94.227325 -116.334084 -18.207420 +v -92.622086 -111.420219 -17.720076 +v -92.859810 -113.965324 -18.044760 +v -92.424362 -111.311577 -17.458441 +v -93.308464 -115.308929 -18.067488 +v -92.857948 -112.585968 -17.916092 +v -92.298111 -112.712578 -17.595890 +v -92.553719 -114.103874 -17.735315 +v -93.439537 -112.521652 -20.649933 +v -93.296822 -111.863846 -20.863430 +v -93.412170 -113.339615 -20.956367 +v -93.774368 -114.130882 -21.485785 +v -94.390732 -115.083855 -21.473921 +v -94.063858 -114.722359 -21.035429 +v -93.526230 -115.296158 -20.230043 +v -94.714066 -116.053802 -20.396311 +v -95.579529 -116.965981 -20.512123 +v -94.675758 -115.528107 -20.568043 +v -93.855850 -114.505524 -20.403830 +v -93.265541 -113.675018 -20.105602 +v -92.640373 -112.835594 -19.953415 +v -93.664848 -113.825340 -20.578781 +v -93.126556 -111.389893 -19.808456 +v -93.339539 -112.267830 -20.124348 +v -93.430336 -109.956352 -19.623714 +v -93.545868 -111.165382 -19.986147 +v -94.108032 -109.752792 -19.627522 +v -94.012711 -110.409241 -20.125195 +v -94.981522 -108.277702 -19.400152 +v -95.316139 -108.535057 -19.390589 +v -94.793556 -109.308830 -19.709209 +v -97.410606 -107.825447 -19.100073 +v -95.629166 -108.868492 -19.731697 +v -96.910248 -108.349907 -19.425245 +v -99.370026 -107.975060 -18.915071 +v -98.270676 -108.388527 -19.253645 +v -100.227448 -108.851891 -18.804739 +v -99.343987 -108.747490 -19.113712 +v -101.694992 -109.902107 -18.604872 +v -100.273094 -109.375603 -18.976780 +v -100.929031 -110.294876 -18.961111 +v -101.783432 -111.073380 -18.493656 +v -102.353882 -112.033691 -18.361956 +v -101.476608 -111.255730 -18.699856 +v -101.857506 -113.110939 -18.292908 +v -101.553123 -112.372108 -18.810400 +v -101.268417 -115.245377 -17.971254 +v -101.427979 -113.519089 -18.554829 +v -101.002548 -114.536850 -18.416828 +v -99.753738 -116.698837 -17.755610 +v -100.322487 -115.399673 -18.277931 +v -99.065918 -116.534142 -17.759449 +v -99.477715 -116.014656 -18.257069 +v -97.569237 -117.370758 -17.532064 +v -97.409325 -116.980125 -17.522499 +v -98.403618 -116.437737 -18.000973 +v -95.706268 -117.006584 -17.323507 +v -97.117729 -116.624077 -17.703064 +v -95.093971 -116.284569 -17.245899 +v -95.937859 -116.339218 -17.557137 +v -93.320816 -114.551781 -16.928576 +v -94.781013 -115.622253 -17.385504 +v -94.033409 -114.772598 -17.245615 +v -92.580887 -112.593246 -16.736794 +v -93.545731 -113.762810 -17.108644 +v -93.092857 -111.536240 -16.625568 +v -93.440491 -112.638405 -17.093025 +v -93.082161 -110.419189 -16.493862 +v -93.449837 -111.532501 -16.831753 +v -94.052505 -109.737274 -16.424829 +v -93.944603 -110.528793 -16.942293 +v -95.174919 -108.291748 -16.164310 +v -94.629150 -109.599922 -16.686661 +v -95.867378 -108.443779 -16.168001 +v -95.463364 -108.970665 -16.665655 +v -97.656868 -107.829193 -15.871787 +v -96.529907 -108.529419 -16.409742 +v -97.626396 -108.413895 -16.272087 +v -99.900711 -108.208687 -15.663962 +v -99.842690 -108.626747 -15.654394 +v -98.996681 -108.585678 -15.965842 +v -101.328293 -109.459373 -15.455420 +v -100.166199 -109.283203 -15.794221 +v -101.494987 -110.391357 -15.377809 +v -100.927612 -110.119347 -15.654269 +v -102.157471 -112.780327 -15.060504 +v -101.432816 -111.121277 -15.517406 +v -101.557167 -112.243736 -15.501592 +v -101.813179 -114.845657 -14.868702 +v -101.566605 -113.349670 -15.240528 +v -100.993576 -115.156204 -14.833306 +v -101.088989 -114.361641 -15.350833 +v -100.287544 -116.473450 -14.625784 +v -100.420410 -115.301895 -15.095474 +v -98.795616 -116.792160 -14.480860 +v -99.552437 -115.983078 -14.957301 +v -97.408913 -117.261429 -14.296198 +v -98.538086 -116.404617 -14.818546 +v -96.886856 -116.782089 -14.299905 +v -97.500748 -116.529533 -14.797498 +v -95.030609 -116.414253 -14.003670 +v -96.357117 -116.375130 -14.541715 +v -95.351028 -115.924156 -14.404045 +v -93.281387 -114.958809 -13.795875 +v -93.541656 -114.626595 -13.786316 +v -94.252388 -115.086952 -14.097769 +v -92.675529 -113.160294 -13.587337 +v -93.591721 -113.896278 -13.926129 +v -92.999603 -112.270775 -13.509737 +v -93.353508 -112.790733 -13.786156 +v -93.015762 -110.568542 -13.310829 +v -93.420143 -111.670677 -13.649258 +v -93.899460 -109.718742 -13.200512 +v -93.876633 -110.637665 -13.633457 +v -95.383995 -108.088547 -12.945583 +v -94.424110 -109.676819 -13.372387 +v -95.826973 -108.402946 -12.965240 +v -95.345535 -109.041855 -13.482781 +v -97.099403 -107.618652 -12.757696 +v -96.396149 -108.564774 -13.227321 +v -98.549393 -108.092659 -12.612762 +v -97.488708 -108.411964 -13.089177 +v -99.984535 -108.383827 -12.428073 +v -98.577507 -108.557121 -12.950383 +v -100.194717 -109.060356 -12.431817 +v -99.537209 -108.970406 -12.929473 +v -101.615013 -110.311218 -12.135564 +v -100.448578 -109.678635 -12.673522 +v -101.091667 -110.573837 -12.535928 +v -102.396103 -112.448433 -11.927789 +v -102.004143 -112.604881 -11.918221 +v -101.620979 -111.849937 -12.229615 +v -102.016373 -114.307594 -11.719268 +v -101.593925 -113.211174 -12.057985 +v -101.289246 -114.913956 -11.641661 +v -101.244339 -114.286835 -11.918065 +v -100.420044 -116.377663 -11.442766 +v -100.624046 -115.221634 -11.781131 +v -99.229271 -116.668335 -11.332458 +v -99.710251 -115.885468 -11.765388 +v -97.126038 -117.332069 -11.077475 +v -98.754044 -116.441177 -11.504266 +v -96.901360 -116.837715 -11.097150 +v -97.638435 -116.527191 -11.614669 +v -95.406990 -116.876480 -10.889606 +v -96.490479 -116.411842 -11.359165 +v -94.391495 -115.738136 -10.744658 +v -95.469101 -115.994995 -11.221135 +v -93.296814 -114.765083 -10.559969 +v -94.600517 -115.322319 -11.082303 +v -93.455147 -114.074814 -10.563721 +v -93.978394 -114.482857 -11.061379 +v -92.855598 -112.279587 -10.267475 +v -93.546249 -113.412491 -10.805403 +v -93.440025 -112.315338 -10.667806 +v -93.254143 -110.039246 -10.059694 +v -93.671494 -110.101097 -10.050137 +v -93.623642 -110.945976 -10.361465 +v -94.516273 -108.622803 -9.851203 +v -94.330978 -109.782806 -10.189886 +v -95.702957 -108.311935 -9.740858 +v -95.173943 -109.028267 -10.049937 +v -96.936623 -107.634941 -9.574678 +v -96.179573 -108.531929 -9.913034 +v -98.403450 -108.060387 -9.429803 +v -97.303162 -108.417099 -9.897301 +v -98.409004 -108.417023 -9.636161 +v -99.430305 -108.899834 -9.620649 +v -100.530083 -109.309113 -9.176455 +v -95.411507 -115.976158 -21.113451 +v -93.575279 -111.428726 -20.516472 +v -93.510536 -110.844223 -20.799822 +v -94.207779 -109.392342 -20.705442 +v -94.327820 -109.780243 -20.943386 +v -93.237747 -115.565544 -20.639969 +v -94.547928 -116.615845 -20.545441 +v -94.498985 -116.796104 -20.898001 +v -92.670403 -114.341507 -20.327663 +v -92.279045 -113.227898 -20.482315 +v -92.412048 -112.268669 -20.035593 +v -92.265793 -111.806435 -20.434191 +v -92.657021 -110.902100 -19.895391 +v -92.521332 -110.763634 -20.329390 +v -92.959778 -109.786476 -20.226109 +v -93.252502 -109.666710 -19.758829 +v -93.880005 -108.683708 -19.890625 +v -95.007019 -107.820328 -19.852255 +v -96.352325 -107.345222 -19.706583 +v -96.431190 -107.503929 -19.367989 +v -97.768005 -107.205093 -19.672853 +v -97.797874 -107.399017 -19.230978 +v -99.103111 -107.454178 -19.414204 +v -100.226776 -107.943542 -19.435806 +v -100.381104 -108.284889 -18.954170 +v -101.400352 -108.990753 -19.045635 +v -101.945992 -109.631783 -19.187952 +v -102.460121 -110.780067 -18.836931 +v -102.756012 -112.342918 -18.807533 +v -102.591751 -112.595581 -18.444204 +v -102.598511 -113.759827 -18.669136 +v -102.369820 -113.967262 -18.304066 +v -102.067627 -115.079292 -18.530903 +v -101.795998 -115.211273 -18.167486 +v -101.200119 -116.210800 -18.392275 +v -100.897751 -116.269554 -18.027313 +v -100.063499 -117.065666 -18.254255 +v -99.761963 -117.038612 -17.890720 +v -98.725731 -117.573151 -18.022564 +v -97.315674 -117.714951 -17.884840 +v -96.823036 -117.729340 -18.070629 +v -95.784531 -117.415695 -17.704712 +v -94.851700 -117.053314 -17.844282 +v -94.692543 -116.715302 -17.362852 +v -93.719910 -116.174492 -17.706018 +v -93.653358 -115.801201 -17.222977 +v -92.866203 -115.024147 -17.567717 +v -92.904167 -114.651199 -17.086044 +v -92.272057 -113.094017 -17.180479 +v -92.360512 -111.449516 -16.968781 +v -92.889854 -109.949783 -16.939430 +v -93.158913 -109.813690 -16.576094 +v -93.737991 -108.803749 -16.801001 +v -94.039879 -108.739380 -16.435938 +v -94.859917 -107.929688 -16.662783 +v -95.161316 -107.951965 -16.299351 +v -96.178619 -107.387207 -16.524061 +v -96.469414 -107.488403 -16.159174 +v -97.590942 -107.219185 -16.386141 +v -97.838112 -107.394127 -16.022572 +v -99.002625 -107.452644 -16.154373 +v -100.292908 -108.038521 -16.016716 +v -100.725975 -108.273499 -16.202507 +v -101.466347 -109.066566 -15.836557 +v -102.090775 -109.848534 -15.976172 +v -102.058624 -110.221039 -15.494689 +v -102.627747 -111.177017 -15.837872 +v -102.497719 -111.533127 -15.354855 +v -102.787880 -112.600563 -15.699640 +v -102.567650 -112.904167 -15.217919 +v -102.331818 -114.567856 -15.312375 +v -101.428993 -115.945374 -15.100665 +v -100.217812 -116.976044 -15.071334 +v -99.916740 -116.958519 -14.707994 +v -98.908836 -117.540718 -14.932939 +v -98.615387 -117.444710 -14.567831 +v -97.499435 -117.732750 -14.794691 +v -97.250000 -117.562103 -14.431293 +v -96.084892 -117.559555 -14.759970 +v -95.886406 -117.305672 -14.291080 +v -94.772873 -116.993271 -14.621806 +v -94.655296 -116.699295 -14.154451 +v -93.653290 -116.093445 -14.385751 +v -92.856720 -114.908752 -14.148648 +v -92.600433 -114.488152 -14.334395 +v -92.358788 -113.430527 -13.968443 +v -92.211777 -112.440529 -14.108124 +v -92.426704 -112.134567 -13.626630 +v -92.514427 -110.897041 -13.718113 +v -92.787773 -110.100746 -13.860298 +v -93.334877 -109.558830 -13.349829 +v -93.615501 -108.933601 -13.618526 +v -94.273575 -108.545273 -13.209954 +v -94.707382 -108.021774 -13.479888 +v -95.847229 -107.501724 -13.232587 +v -97.412277 -107.219147 -13.203261 +v -97.663879 -107.385551 -12.839896 +v -98.828102 -107.388695 -13.064663 +v -99.033211 -107.619041 -12.699708 +v -100.143005 -107.930794 -12.926556 +v -100.272850 -108.203705 -12.563119 +v -101.278816 -108.791145 -12.891853 +v -101.322914 -109.110405 -12.422971 +v -102.128731 -109.940025 -12.753762 +v -102.082756 -110.253349 -12.286363 +v -102.644638 -111.280624 -12.517625 +v -102.738098 -112.705086 -12.280532 +v -102.748360 -113.197556 -12.466280 +v -102.425888 -114.233391 -12.100327 +v -102.055550 -115.163246 -12.240013 +v -101.715836 -115.319984 -11.758500 +v -101.018265 -116.345726 -11.849969 +v -100.381935 -116.896774 -11.992229 +v -99.636543 -117.090446 -11.481712 +v -99.079926 -117.489990 -11.750420 +v -98.315895 -117.495079 -11.341828 +v -97.677696 -117.729782 -11.611830 +v -96.430649 -117.606659 -11.364435 +v -94.935600 -117.064606 -11.335146 +v -94.801636 -116.794319 -10.971807 +v -93.796745 -116.206673 -11.196626 +v -93.735283 -115.904663 -10.831638 +v -94.700333 -115.903725 -9.037688 +v -92.932304 -115.077370 -11.058491 +v -92.957024 -114.776009 -10.695045 +v -92.382523 -113.762802 -11.023731 +v -92.504852 -113.464828 -10.554888 +v -92.224922 -112.342377 -10.885656 +v -92.422127 -112.094391 -10.418233 +v -92.452454 -110.924065 -10.649492 +v -92.933701 -111.706276 -9.095866 +v -93.087418 -109.645447 -10.412432 +v -93.325943 -109.214554 -10.598134 +v -94.125145 -108.481079 -10.232199 +v -94.912598 -107.863136 -10.371970 +v -95.285217 -107.898254 -9.890366 +v -96.403519 -107.361931 -9.981870 +v -97.230621 -107.205215 -10.124138 +v -97.972824 -107.412285 -9.613605 +v -98.654388 -107.346512 -9.882262 +v -99.317474 -107.725952 -9.473730 +v -99.987175 -107.843689 -9.743738 +v -101.003647 -108.576782 -9.496290 +v -100.128723 -108.877357 -9.045337 +v -93.812424 -110.765617 -21.159103 +v -93.581306 -111.177498 -21.499889 +v -94.377846 -109.873550 -21.480511 +v -95.209801 -108.514900 -20.703127 +v -95.498543 -108.804886 -20.958454 +v -97.326508 -107.749290 -20.680912 +v -96.406807 -108.552094 -21.161741 +v -97.675194 -108.132759 -20.791216 +v -97.796005 -108.417038 -21.144363 +v -98.862846 -108.544235 -20.947992 +v -99.615601 -108.452087 -20.700998 +v -100.212265 -109.093666 -20.792145 +v -99.987930 -109.244904 -21.158503 +v -101.223038 -109.783218 -20.701233 +v -100.826492 -109.966301 -20.951946 +v -101.102974 -110.568687 -21.162071 +v -101.628952 -111.528503 -20.853527 +v -101.785950 -113.352844 -20.779724 +v -101.553757 -113.300087 -21.026566 +v -100.598457 -115.717384 -20.752748 +v -101.066177 -114.428001 -21.159092 +v -100.432922 -115.323380 -21.041597 +v -99.623055 -116.054153 -20.948000 +v -98.640404 -116.651405 -20.787325 +v -98.575882 -116.395981 -21.159094 +v -97.322617 -116.968597 -20.718800 +v -97.203362 -116.648651 -20.929430 +v -96.919296 -116.516052 -21.254314 +v -100.273232 -116.959801 -21.500126 +v -99.752533 -115.874481 -21.485779 +v -101.082649 -114.528236 -21.499893 +v -101.975082 -115.270081 -21.480648 +v -102.627831 -113.632286 -21.480696 +v -101.523071 -113.112755 -21.483896 +v -97.291145 -117.366608 -20.709332 +v -102.751259 -112.236656 -21.480690 +v -101.443665 -111.347244 -21.489382 +v -99.038940 -117.135948 -20.715811 +v -102.460106 -110.702728 -21.493601 +v -99.221741 -117.461197 -21.157316 +v -100.327652 -109.466858 -21.499889 +v -101.094818 -108.633476 -21.487129 +v -102.133385 -113.816841 -20.698853 +v -100.381592 -116.569565 -20.772694 +v -100.750954 -116.604958 -21.158146 +v -102.192108 -114.457283 -20.837444 +v -99.511917 -107.598572 -21.480642 +v -101.638786 -115.555717 -20.946264 +v -98.642052 -108.561378 -21.485775 +v -102.216621 -111.758545 -20.700058 +v -97.046539 -107.222984 -21.492895 +v -96.772530 -108.439285 -21.489382 +v -102.630783 -113.016899 -20.946278 +v -102.591499 -111.642296 -20.946257 +v -101.853752 -110.019073 -20.771967 +v -95.537315 -107.584915 -21.484919 +v -95.176277 -109.140968 -21.480507 +v -102.130424 -109.949127 -21.157351 +v -93.672241 -108.845795 -21.480648 +v -99.898186 -107.987946 -20.824587 +v -100.979477 -108.666458 -20.946272 +v -92.706314 -110.320793 -21.480684 +v -93.492325 -111.796082 -21.156904 +v -93.459259 -112.911331 -21.480509 +v -92.228844 -112.399796 -21.500128 +v -98.863091 -107.646019 -20.794146 +v -98.455956 -107.318123 -21.129206 +v -92.510544 -113.875435 -20.973383 +v -97.180840 -107.326736 -20.946270 +v -94.846123 -108.258995 -20.774887 +v -95.831848 -107.594154 -20.946301 +v -92.392288 -112.111671 -20.873070 +v -93.804245 -109.329521 -20.720322 +v -92.813225 -110.675110 -20.812782 +v -94.614098 -108.095528 -21.132177 +v -93.350868 -109.373138 -20.952450 +v -92.365166 -111.327087 -21.136547 +v -92.256340 -112.885063 -21.176781 +v -92.618713 -114.423798 -21.480692 +v -93.040276 -115.166565 -21.035913 +v -94.784531 -115.532639 -21.152525 +v -93.399483 -115.777382 -21.489313 +v -93.959953 -116.334709 -21.123560 +v -95.593285 -116.171455 -20.705086 +v -95.586525 -116.109909 -21.499956 +v -94.979820 -117.082573 -21.470955 +v -96.038506 -117.525391 -20.950520 +v -96.500534 -117.621941 -21.500309 +v -97.153465 -117.743637 -21.198849 +v -97.701645 -116.614693 -21.500092 +v -98.184959 -117.661919 -21.500601 +v 114.309441 -109.541809 -20.237776 +v 113.702362 -108.897820 -20.379305 +v 112.387459 -108.516068 -19.829329 +v 112.652802 -108.435455 -20.240345 +v 111.046089 -108.426010 -19.786039 +v 110.171494 -108.498161 -19.933462 +v 109.703064 -108.837097 -19.483276 +v 108.909714 -109.340828 -19.479795 +v 108.306335 -109.757645 -19.656633 +v 107.696030 -110.710129 -19.519875 +v 107.619377 -111.287750 -19.068777 +v 107.361069 -111.799927 -19.379810 +v 107.357826 -113.177986 -19.206917 +v 107.732353 -114.336098 -19.064417 +v 108.374664 -115.284088 -18.926020 +v 109.236481 -116.015587 -18.787811 +v 110.277451 -116.495438 -18.649132 +v 111.636963 -116.535500 -18.231833 +v 112.721191 -116.345177 -17.961279 +v 112.759727 -116.474998 -18.342230 +v 113.926300 -115.748962 -17.917912 +v 114.646103 -115.247276 -18.065353 +v 114.880806 -114.718880 -17.615231 +v 115.313683 -113.884735 -17.611753 +v 115.625946 -113.221161 -17.788534 +v 115.652618 -111.844421 -17.615664 +v 115.451088 -111.552971 -17.200607 +v 115.297478 -110.678802 -17.472977 +v 114.671982 -109.720985 -17.334808 +v 113.821831 -108.974220 -17.196308 +v 112.790115 -108.477226 -17.057930 +v 111.677582 -108.277817 -16.919752 +v 110.343796 -108.585770 -16.369989 +v 110.536217 -108.385994 -16.780979 +v 109.340714 -109.034378 -16.363808 +v 108.498840 -109.743874 -16.093048 +v 108.400452 -109.650818 -16.474113 +v 107.756607 -110.864571 -16.049852 +v 107.386299 -111.660133 -16.197235 +v 107.448860 -112.234879 -15.747148 +v 107.493690 -113.173584 -15.743630 +v 107.557167 -113.904274 -15.920370 +v 108.225883 -115.108093 -15.747553 +v 109.118446 -115.937294 -15.604872 +v 110.140625 -116.451248 -15.466702 +v 111.250679 -116.669739 -15.328251 +v 112.392708 -116.581032 -15.189778 +v 113.454659 -116.194496 -15.051656 +v 114.453178 -115.258034 -14.501864 +v 114.387161 -115.527451 -14.912859 +v 115.095016 -114.366188 -14.495723 +v 115.466431 -113.329742 -14.224925 +v 115.598236 -113.360863 -14.605999 +v 115.545059 -111.987732 -14.181726 +v 115.465500 -111.113914 -14.329089 +v 114.957558 -110.103897 -14.192312 +v 114.499405 -109.743057 -13.741312 +v 114.190277 -109.259537 -14.052271 +v 113.006958 -108.554581 -13.879402 +v 111.818893 -108.286209 -13.736777 +v 110.676552 -108.355492 -13.598527 +v 109.607254 -108.724251 -13.460176 +v 108.664413 -109.374809 -13.321652 +v 107.940491 -110.242508 -13.183564 +v 107.547668 -111.554001 -12.633679 +v 107.469368 -111.287857 -13.044730 +v 107.440849 -112.647598 -12.627589 +v 107.640457 -113.730164 -12.356826 +v 107.510902 -113.769630 -12.737872 +v 108.246834 -114.930138 -12.313620 +v 108.754677 -115.645653 -12.460964 +v 109.701553 -116.263771 -12.324177 +v 110.278793 -116.345482 -11.873179 +v 110.788948 -116.608192 -12.184169 +v 112.166443 -116.623093 -12.011278 +v 113.328178 -116.258255 -11.868679 +v 114.281143 -115.624352 -11.730409 +v 115.020279 -114.768425 -11.592099 +v 115.508781 -113.731873 -11.453523 +v 115.698624 -112.618210 -11.315501 +v 115.379318 -111.286751 -10.765565 +v 115.580704 -111.477478 -11.176571 +v 114.922165 -110.287537 -10.759477 +v 114.205765 -109.451965 -10.488712 +v 114.297836 -109.352615 -10.869744 +v 113.078484 -108.719040 -10.445535 +v 112.280029 -108.355614 -10.592863 +v 111.150566 -108.296898 -10.456085 +v 110.610542 -108.516289 -10.004986 +v 110.037659 -108.545387 -10.316082 +v 108.695396 -109.547737 -9.608643 +v 108.838921 -109.224701 -10.143175 +v 108.011963 -110.408806 -9.469930 +v 108.017830 -110.123772 -10.000613 +v 107.583656 -111.425529 -9.334675 +v 107.512268 -111.151024 -9.862268 +v 107.446136 -112.528061 -9.187067 +v 107.289528 -112.561714 -9.683005 +v 107.658569 -113.836632 -9.268661 +v 107.462143 -113.467979 -8.841544 +v 106.388603 -113.131958 -8.870878 +v 110.163818 -116.304420 -8.517922 +v 111.329086 -116.543152 -8.499538 +v 106.226349 -112.740593 -8.500064 +v 106.690506 -114.417297 -8.809740 +v 107.961967 -114.591637 -8.761150 +v 107.939690 -114.533173 -8.499620 +v 107.411255 -112.260826 -8.499863 +v 110.085396 -117.374908 -9.089119 +v 111.303421 -117.146027 -9.110865 +v 111.521919 -117.505630 -8.982414 +v 110.916939 -117.708717 -8.508500 +v 106.716194 -114.695198 -8.500050 +v 109.770294 -117.459435 -8.542616 +v 107.538162 -115.909935 -8.754478 +v 108.552345 -115.287155 -9.048691 +v 108.873940 -115.601227 -8.517680 +v 108.506569 -116.796356 -8.867826 +v 107.889893 -116.329765 -8.499866 +v 109.573380 -116.054527 -8.892768 +v 107.439224 -115.830528 -9.010463 +v 115.262993 -110.374962 -11.115970 +v 107.190102 -112.400925 -12.984047 +v 115.187889 -114.705444 -14.852158 +v 111.994888 -108.062553 -20.308144 +v 107.120636 -112.780312 -16.212454 +v 107.704033 -110.242767 -16.521315 +v 109.430870 -108.694405 -16.720238 +v 111.388260 -116.784187 -18.588331 +v 113.659248 -116.313110 -18.389406 +v 115.904396 -114.534622 -9.097161 +v 116.597260 -112.395546 -8.961739 +v 116.244881 -114.469917 -8.865134 +v 116.708412 -113.449394 -8.518992 +v 116.201118 -114.936821 -8.500169 +v 115.368759 -113.747620 -8.499944 +v 115.645622 -115.561340 -8.840723 +v 115.520126 -113.843010 -8.950981 +v 115.027061 -114.675125 -8.835365 +v 115.945786 -110.911301 -9.118077 +v 114.387489 -115.377205 -8.499862 +v 116.697853 -111.534691 -8.522828 +v 115.548576 -111.871658 -8.499861 +v 115.648201 -112.334801 -8.838974 +v 114.256714 -115.590508 -8.833647 +v 114.552338 -116.434006 -9.008871 +v 114.822922 -116.582062 -8.522826 +v 116.060989 -110.006660 -8.841800 +v 114.574051 -108.721207 -9.099352 +v 115.402641 -111.032738 -8.837627 +v 113.175468 -117.384155 -8.841771 +v 113.610725 -117.293983 -8.500014 +v 116.244705 -110.204651 -8.500013 +v 112.970139 -116.546341 -9.007777 +v 113.108261 -116.179436 -8.522823 +v 114.735161 -108.421776 -8.841793 +v 114.675568 -109.892471 -8.499861 +v 111.929337 -117.742470 -8.519704 +v 114.820930 -109.967896 -8.835509 +v 114.983696 -108.472672 -8.500168 +v 111.849022 -116.609360 -8.812144 +v 111.534576 -116.823265 -9.030457 +v 112.956718 -107.478226 -8.811865 +v 112.551254 -107.588577 -9.008864 +v 113.847160 -109.052094 -8.838989 +v 113.152542 -108.753120 -8.499943 +v 110.663071 -116.586685 -9.001403 +v 112.808685 -107.360649 -8.500062 +v 111.118858 -107.683411 -9.100313 +v 112.617729 -108.399307 -8.937285 +v 110.834999 -107.331520 -8.841790 +v 108.598885 -116.490341 -9.386719 +v 109.183571 -116.211075 -9.325643 +v 107.940910 -114.726715 -9.406215 +v 111.567963 -108.403145 -8.499943 +v 107.506065 -114.879593 -9.631035 +v 111.450821 -108.314079 -8.835513 +v 110.343506 -107.296135 -8.500167 +v 109.433128 -108.174423 -9.100272 +v 109.318001 -107.813293 -8.865136 +v 107.559235 -115.649834 -9.420441 +v 106.852600 -114.477547 -9.557396 +v 108.712273 -108.470360 -9.209247 +v 106.458748 -112.457558 -9.800145 +v 107.777847 -109.323837 -9.078185 +v 109.972580 -108.699623 -8.499945 +v 106.342659 -113.583237 -9.314968 +v 110.135857 -108.554810 -8.839026 +v 107.722275 -108.950958 -8.861144 +v 108.457909 -108.156204 -8.522826 +v 106.672058 -114.608139 -9.086504 +v 106.234726 -112.515602 -9.365272 +v 108.956406 -109.183548 -8.833600 +v 106.358597 -111.402763 -9.185797 +v 106.947701 -110.428032 -9.012867 +v 106.981491 -109.817879 -9.367943 +v 108.232094 -109.964767 -8.499706 +v 107.442284 -109.126968 -8.500014 +v 106.475052 -111.654610 -8.939281 +v 106.591652 -110.486061 -8.514128 +v 108.140228 -110.013023 -8.851172 +v 107.526108 -110.869232 -9.002437 +v 108.123894 -109.431015 -9.082887 +v 107.292122 -112.000343 -8.927014 +v 106.838310 -112.467438 -9.907826 +v 107.220085 -110.410431 -10.148609 +v 106.476227 -111.101250 -9.709075 +v 107.027061 -109.807564 -9.846831 +v 108.297813 -109.086159 -10.321609 +v 108.105370 -108.815971 -10.247715 +v 107.910355 -108.701965 -9.985911 +v 109.051064 -107.879227 -10.123483 +v 111.000214 -107.791862 -10.648705 +v 110.155167 -107.693398 -10.487043 +v 110.378586 -107.389771 -10.262840 +v 111.799080 -107.424736 -10.595042 +v 113.685783 -108.517670 -10.969451 +v 113.172256 -107.601097 -10.663188 +v 114.369041 -108.308273 -10.871870 +v 115.321541 -109.768677 -11.191501 +v 115.385506 -109.235085 -11.011744 +v 116.111153 -110.393776 -11.148663 +v 116.160133 -112.403831 -11.499159 +v 116.501129 -111.710732 -11.288554 +v 116.447952 -113.591057 -11.495761 +v 115.525391 -114.824753 -11.775944 +v 116.016655 -115.067154 -11.438293 +v 114.954514 -116.077751 -11.839112 +v 115.152290 -116.187607 -11.577176 +v 113.200508 -116.891594 -12.119882 +v 114.025978 -117.029488 -11.714902 +v 112.595375 -117.345047 -12.115827 +v 112.706512 -117.541672 -11.854075 +v 111.306786 -117.679794 -11.991615 +v 109.577827 -116.775978 -12.516819 +v 110.258911 -117.285713 -12.355193 +v 109.913292 -117.436035 -12.130916 +v 108.702446 -116.691940 -12.463136 +v 107.620392 -114.798851 -12.837578 +v 107.604065 -115.849632 -12.531300 +v 106.924538 -114.636787 -12.739946 +v 106.834839 -112.895103 -13.059658 +v 106.511459 -113.324806 -12.879871 +v 106.466278 -111.958061 -13.016815 +v 107.433891 -110.195755 -13.367270 +v 106.790726 -110.623856 -13.156645 +v 107.781448 -109.024796 -13.363849 +v 109.199417 -108.421394 -13.644089 +v 108.896095 -107.965210 -13.306362 +v 110.321922 -107.625206 -13.707199 +v 110.206589 -107.430725 -13.445292 +v 111.627518 -107.816132 -13.920829 +v 111.603249 -107.268814 -13.582994 +v 112.998390 -107.714684 -13.983904 +v 113.001289 -107.488937 -13.722198 +v 113.894028 -108.496643 -14.179919 +v 114.280884 -108.072723 -13.859665 +v 114.989052 -108.940140 -14.223330 +v 115.532600 -110.136200 -14.438435 +v 115.363365 -108.983788 -13.999078 +v 116.036392 -110.235619 -14.331256 +v 116.020737 -112.415955 -14.705673 +v 116.562782 -111.515617 -14.399439 +v 116.540894 -112.906052 -14.608084 +v 115.743134 -114.457077 -14.927812 +v 116.238914 -114.247467 -14.747983 +v 115.591103 -115.452080 -14.884957 +v 113.868881 -116.489670 -15.235411 +v 114.640457 -116.442436 -15.024734 +v 112.980209 -117.327278 -15.232001 +v 113.385902 -108.018730 -20.492210 +v 114.515930 -108.416397 -20.493452 +v 111.451180 -117.136528 -15.512186 +v 115.341965 -108.948799 -20.410234 +v 111.484177 -117.683380 -15.174428 +v 110.080513 -117.260887 -15.575330 +v 112.943794 -107.461426 -20.120792 +v 111.033142 -107.802055 -20.255764 +v 110.082672 -117.487061 -15.313375 +v 111.973587 -107.438095 -20.212458 +v 109.047653 -116.439873 -15.788935 +v 108.793587 -116.925209 -15.451076 +v 110.608093 -107.494926 -20.075548 +v 107.811630 -115.838951 -15.852003 +v 109.143051 -108.616600 -20.033260 +v 107.695564 -116.032585 -15.590279 +v 109.298904 -107.919411 -19.935602 +v 107.430016 -114.712791 -16.048000 +v 107.540947 -110.047508 -19.784182 +v 106.882492 -114.884819 -15.727756 +v 108.092537 -108.608887 -19.726933 +v 106.738548 -113.518929 -16.176691 +v 106.404343 -113.553360 -15.867157 +v 107.259148 -109.715042 -19.658794 +v 106.841293 -112.307808 -19.525148 +v 106.451416 -112.132286 -16.199383 +v 106.678909 -111.276230 -19.550756 +v 106.525795 -110.931435 -19.326561 +v 107.207779 -110.567352 -16.519510 +v 106.730858 -110.784027 -16.339338 +v 106.293823 -112.327293 -19.187344 +v 106.639389 -113.612221 -19.311533 +v 107.425850 -114.740990 -19.248402 +v 107.357109 -109.570099 -16.476198 +v 106.443886 -113.725777 -19.049646 +v 109.061256 -108.502922 -16.826694 +v 108.291992 -108.562317 -16.616089 +v 106.967209 -115.040581 -18.910686 +v 107.926704 -115.960938 -19.034777 +v 109.184837 -116.521446 -18.971615 +v 109.457619 -107.846130 -16.753061 +v 107.818382 -116.159515 -18.772823 +v 111.467857 -107.814507 -17.103510 +v 110.174065 -107.489090 -16.775553 +v 111.426529 -107.268295 -16.765913 +v 108.946159 -117.014481 -18.634016 +v 110.140129 -117.452965 -18.643633 +v 111.611435 -117.135445 -18.694803 +v 112.837494 -107.667023 -17.166672 +v 112.831055 -107.440781 -16.904625 +v 110.938469 -117.504128 -18.621208 +v 113.883087 -108.469933 -17.380272 +v 114.129379 -107.980591 -17.042540 +v 112.306534 -117.470612 -18.484219 +v 115.130592 -109.050980 -17.443411 +v 114.251167 -116.281883 -18.387632 +v 115.242630 -108.854637 -17.181564 +v 113.621017 -117.069084 -18.344320 +v 115.611305 -110.280083 -17.657049 +v 116.074799 -109.988068 -17.319189 +v 114.772636 -116.334106 -18.207426 +v 116.270020 -111.090424 -17.682631 +v 115.475914 -114.627968 -18.165155 +v 116.575661 -111.311684 -17.458466 +v 115.691475 -115.308998 -18.067509 +v 116.142059 -112.585938 -17.916088 +v 116.552757 -112.731758 -17.790699 +v 116.388023 -114.106865 -17.858795 +v 115.725952 -112.329544 -20.906563 +v 115.474808 -113.668549 -20.970581 +v 115.088531 -114.451744 -21.490377 +v 114.970818 -114.672310 -21.070074 +v 115.473770 -115.296150 -20.230043 +v 114.285950 -116.053802 -20.396311 +v 113.420486 -116.965988 -20.512125 +v 114.324272 -115.528091 -20.568033 +v 115.144135 -114.505554 -20.403831 +v 115.734428 -113.675095 -20.105616 +v 116.359627 -112.835594 -19.953413 +v 115.335182 -113.825256 -20.578787 +v 115.873459 -111.389931 -19.808462 +v 115.563065 -112.452965 -20.284920 +v 115.569641 -109.956306 -19.623709 +v 115.454178 -111.165489 -19.986156 +v 114.892021 -109.752861 -19.627531 +v 114.987282 -110.409210 -20.125166 +v 114.018410 -108.277657 -19.400143 +v 113.683891 -108.535072 -19.390593 +v 114.206444 -109.308823 -19.709208 +v 111.589386 -107.825447 -19.100071 +v 113.370872 -108.868523 -19.731712 +v 112.089752 -108.349907 -19.425245 +v 109.629974 -107.975052 -18.915073 +v 110.729347 -108.388519 -19.253639 +v 108.772552 -108.851891 -18.804737 +v 109.656021 -108.747482 -19.113712 +v 107.305023 -109.902092 -18.604874 +v 108.726852 -109.375648 -18.976774 +v 108.070892 -110.294952 -18.961075 +v 107.216530 -111.073433 -18.493649 +v 106.646111 -112.033676 -18.361958 +v 107.523407 -111.255737 -18.699873 +v 107.142525 -113.111023 -18.292898 +v 107.446877 -112.371948 -18.810436 +v 107.731560 -115.245354 -17.971258 +v 107.572044 -113.519180 -18.554800 +v 107.997345 -114.536613 -18.416904 +v 109.246353 -116.698875 -17.755600 +v 108.677475 -115.399635 -18.277950 +v 109.934113 -116.534149 -17.759447 +v 109.522263 -116.014641 -18.257074 +v 111.430786 -117.370758 -17.532063 +v 111.590714 -116.980125 -17.522497 +v 110.596413 -116.437744 -18.000971 +v 113.293739 -117.006584 -17.323505 +v 111.882286 -116.624077 -17.703064 +v 113.906067 -116.284538 -17.245895 +v 113.062126 -116.339226 -17.557144 +v 115.679169 -114.551842 -16.928583 +v 114.218948 -115.622276 -17.385519 +v 114.966568 -114.772606 -17.245613 +v 116.419106 -112.593269 -16.736795 +v 115.454269 -113.762901 -17.108633 +v 115.907150 -111.536224 -16.625566 +v 115.559540 -112.638481 -17.093021 +v 115.917877 -110.419228 -16.493870 +v 115.550209 -111.532700 -16.831772 +v 114.947495 -109.737267 -16.424828 +v 115.055412 -110.528831 -16.942316 +v 113.825073 -108.291740 -16.164309 +v 114.370796 -109.599861 -16.686640 +v 113.132599 -108.443771 -16.167999 +v 113.536690 -108.970688 -16.665657 +v 111.343132 -107.829193 -15.871787 +v 112.470100 -108.529419 -16.409740 +v 111.373596 -108.413895 -16.272087 +v 109.099289 -108.208679 -15.663963 +v 109.157349 -108.626732 -15.654398 +v 110.003319 -108.585686 -15.965841 +v 107.671692 -109.459381 -15.455419 +v 108.833778 -109.283218 -15.794212 +v 107.504982 -110.391403 -15.377801 +v 108.072418 -110.119308 -15.654271 +v 106.842529 -112.780281 -15.060510 +v 107.567200 -111.121284 -15.517426 +v 107.347664 -112.231781 -15.377487 +v 107.186813 -114.845642 -14.868705 +v 107.433365 -113.349655 -15.240516 +v 108.006454 -115.156235 -14.833302 +v 107.910957 -114.361534 -15.350855 +v 108.712440 -116.473442 -14.625786 +v 108.579643 -115.301971 -15.095448 +v 110.204384 -116.792168 -14.480859 +v 109.447525 -115.983047 -14.957320 +v 111.591103 -117.261429 -14.296197 +v 110.461922 -116.404617 -14.818542 +v 112.113129 -116.782089 -14.299910 +v 111.499252 -116.529533 -14.797497 +v 113.969398 -116.414253 -14.003669 +v 112.642899 -116.375130 -14.541715 +v 113.649048 -115.924118 -14.404028 +v 115.718643 -114.958778 -13.795870 +v 115.458351 -114.626587 -13.786315 +v 114.747620 -115.086929 -14.097771 +v 116.324486 -113.160332 -13.587342 +v 115.408249 -113.896378 -13.926148 +v 116.000389 -112.270821 -13.509742 +v 115.646515 -112.790611 -13.786139 +v 115.984253 -110.568558 -13.310833 +v 115.579826 -111.670570 -13.649262 +v 115.100555 -109.718735 -13.200509 +v 115.123413 -110.637634 -13.633390 +v 113.615974 -108.088524 -12.945580 +v 114.575912 -109.676842 -13.372383 +v 113.173027 -108.402939 -12.965238 +v 113.654495 -109.041870 -13.482796 +v 111.900620 -107.618652 -12.757699 +v 112.603889 -108.564781 -13.227331 +v 110.450615 -108.092659 -12.612763 +v 111.511292 -108.411964 -13.089182 +v 109.015472 -108.383827 -12.428072 +v 110.422577 -108.557114 -12.950408 +v 108.805275 -109.060364 -12.431817 +v 109.462761 -108.970428 -12.929460 +v 107.385002 -110.311226 -12.135563 +v 108.551468 -109.678581 -12.673539 +v 107.908386 -110.573830 -12.536015 +v 106.603897 -112.448257 -11.927810 +v 106.995865 -112.604805 -11.918230 +v 107.379021 -111.849899 -12.229610 +v 106.983627 -114.307533 -11.719273 +v 107.406059 -113.211159 -12.057972 +v 107.710732 -114.913933 -11.641663 +v 107.755676 -114.286842 -11.918066 +v 108.579903 -116.377617 -11.442773 +v 108.376022 -115.221695 -11.781132 +v 109.770744 -116.668335 -11.332456 +v 109.289749 -115.885452 -11.765392 +v 111.873993 -117.332069 -11.077472 +v 110.245956 -116.441170 -11.504268 +v 112.098633 -116.837715 -11.097149 +v 111.361565 -116.527191 -11.614671 +v 113.593010 -116.876488 -10.889608 +v 112.509514 -116.411842 -11.359170 +v 114.608521 -115.738129 -10.744657 +v 113.530815 -115.995033 -11.221169 +v 115.703194 -114.765083 -10.559968 +v 114.399582 -115.322243 -11.082273 +v 115.544807 -114.074905 -10.563735 +v 115.021629 -114.482803 -11.061419 +v 116.144409 -112.279564 -10.267473 +v 115.453789 -113.412491 -10.805366 +v 115.559959 -112.315468 -10.667850 +v 115.745872 -110.039268 -10.059695 +v 115.328522 -110.101120 -10.050140 +v 115.376358 -110.945953 -10.361457 +v 114.483627 -108.622734 -9.851189 +v 114.669090 -109.782845 -10.189871 +v 113.297058 -108.311943 -9.740860 +v 113.826050 -109.028259 -10.049935 +v 112.063354 -107.634941 -9.574677 +v 112.820412 -108.531929 -9.913037 +v 110.596596 -108.060379 -9.429806 +v 111.696831 -108.417099 -9.897301 +v 110.591003 -108.417030 -9.636169 +v 108.259155 -109.138184 -9.102411 +v 109.569672 -108.899849 -9.620641 +v 108.376312 -109.573799 -9.245356 +v 113.588493 -115.976158 -21.113430 +v 114.647026 -115.036156 -20.865160 +v 115.424751 -111.428810 -20.516466 +v 115.493309 -110.857086 -20.798784 +v 114.792175 -109.392288 -20.705437 +v 115.762253 -115.565552 -20.639977 +v 114.452065 -116.615868 -20.545454 +v 114.473961 -116.814720 -20.955944 +v 116.329582 -114.341545 -20.327667 +v 116.720963 -113.227966 -20.482353 +v 116.587959 -112.268631 -20.035591 +v 116.734215 -111.806343 -20.434164 +v 116.342964 -110.902054 -19.895376 +v 116.478722 -110.763718 -20.329428 +v 116.040207 -109.786461 -20.226124 +v 115.747551 -109.666740 -19.758844 +v 115.119987 -108.683716 -19.890614 +v 113.992973 -107.820328 -19.852249 +v 112.647697 -107.345230 -19.706581 +v 112.568802 -107.503937 -19.367979 +v 111.232002 -107.205093 -19.672853 +v 111.202133 -107.399017 -19.230978 +v 109.896851 -107.454193 -19.414204 +v 108.773277 -107.943512 -19.435823 +v 108.618912 -108.284889 -18.954168 +v 107.599655 -108.990746 -19.045631 +v 107.053993 -109.631805 -19.187935 +v 106.539886 -110.780052 -18.836941 +v 106.243988 -112.342934 -18.807512 +v 106.408287 -112.595566 -18.444183 +v 106.401497 -113.759850 -18.669161 +v 106.630127 -113.967178 -18.304096 +v 106.932343 -115.079262 -18.530954 +v 107.203972 -115.211220 -18.167498 +v 107.799934 -116.210831 -18.392210 +v 108.102264 -116.269547 -18.027300 +v 108.936493 -117.065651 -18.254257 +v 109.238136 -117.038658 -17.890713 +v 110.274277 -117.573151 -18.022562 +v 111.684349 -117.714951 -17.884838 +v 112.176964 -117.729340 -18.070627 +v 113.215492 -117.415688 -17.704710 +v 114.148338 -117.053307 -17.844263 +v 114.307411 -116.715332 -17.362860 +v 115.280060 -116.174530 -17.706038 +v 115.346588 -115.801262 -17.222988 +v 116.133812 -115.024124 -17.567680 +v 116.095840 -114.651207 -17.086056 +v 116.622276 -113.529060 -17.177475 +v 116.771965 -112.700684 -17.319862 +v 116.639511 -111.449547 -16.968809 +v 116.110168 -109.949821 -16.939442 +v 115.841156 -109.813789 -16.576097 +v 115.262100 -108.803833 -16.801031 +v 114.960182 -108.739410 -16.435955 +v 114.140137 -107.929710 -16.662825 +v 113.838715 -107.951958 -16.299362 +v 112.821373 -107.387207 -16.524044 +v 112.530556 -107.488403 -16.159161 +v 111.409065 -107.219185 -16.386139 +v 111.161888 -107.394135 -16.022570 +v 109.997398 -107.452637 -16.154387 +v 108.707138 -108.038498 -16.016718 +v 108.274055 -108.273491 -16.202492 +v 107.533691 -109.066544 -15.836551 +v 106.909218 -109.848557 -15.976205 +v 106.941399 -110.220985 -15.494700 +v 106.372276 -111.176933 -15.837855 +v 106.502304 -111.533218 -15.354819 +v 106.212120 -112.600655 -15.699600 +v 106.432365 -112.904312 -15.217901 +v 106.668175 -114.567802 -15.312380 +v 107.570961 -115.945335 -15.100698 +v 108.782242 -116.976074 -15.071311 +v 109.083199 -116.958481 -14.707999 +v 110.091232 -117.540726 -14.932902 +v 110.384636 -117.444717 -14.567828 +v 111.500587 -117.732750 -14.794693 +v 111.750000 -117.562111 -14.431296 +v 112.915108 -117.559547 -14.759963 +v 113.113586 -117.305679 -14.291081 +v 114.227150 -116.993248 -14.621795 +v 114.344696 -116.699310 -14.154453 +v 115.346710 -116.093452 -14.385765 +v 116.143265 -114.908775 -14.148646 +v 116.399612 -114.488052 -14.334381 +v 116.641197 -113.430641 -13.968468 +v 116.788231 -112.440521 -14.108065 +v 116.573265 -112.134438 -13.626589 +v 116.485535 -110.896935 -13.718102 +v 116.212250 -110.100784 -13.860314 +v 115.665123 -109.558830 -13.349823 +v 115.384514 -108.933609 -13.618516 +v 114.726463 -108.545319 -13.209950 +v 114.292564 -108.021744 -13.479850 +v 113.152794 -107.501732 -13.232598 +v 111.587723 -107.219139 -13.203259 +v 111.336113 -107.385551 -12.839895 +v 110.171913 -107.388695 -13.064650 +v 109.966797 -107.619049 -12.699704 +v 108.857002 -107.930794 -12.926578 +v 108.727173 -108.203682 -12.563128 +v 107.721100 -108.791229 -12.891853 +v 107.677094 -109.110397 -12.422976 +v 106.871262 -109.940079 -12.753739 +v 106.917236 -110.253349 -12.286370 +v 106.355354 -111.280663 -12.517645 +v 106.261909 -112.705185 -12.280530 +v 106.251648 -113.197540 -12.466283 +v 106.574120 -114.233398 -12.100315 +v 106.944412 -115.163170 -12.240019 +v 107.284241 -115.320114 -11.758505 +v 107.981789 -116.345757 -11.849934 +v 108.618042 -116.896751 -11.992234 +v 109.363464 -117.090462 -11.481725 +v 109.920067 -117.489990 -11.750425 +v 110.684097 -117.495071 -11.341832 +v 111.322296 -117.729782 -11.611827 +v 112.569374 -117.606659 -11.364434 +v 114.064453 -117.064575 -11.335128 +v 114.198357 -116.794312 -10.971802 +v 113.016739 -117.077133 -9.091525 +v 115.203308 -116.206627 -11.196611 +v 115.264694 -115.904709 -10.831649 +v 114.318855 -115.937645 -9.052276 +v 116.067719 -115.077377 -11.058551 +v 116.043007 -114.776009 -10.695058 +v 116.617493 -113.762787 -11.023764 +v 116.495186 -113.464798 -10.554896 +v 116.775070 -112.342285 -10.885650 +v 116.577843 -112.094322 -10.418200 +v 116.547531 -110.923988 -10.649473 +v 115.959084 -112.259384 -9.052274 +v 115.912613 -109.645454 -10.412464 +v 115.674072 -109.214569 -10.598138 +v 114.874847 -108.481079 -10.232186 +v 114.087433 -107.863144 -10.371978 +v 113.714752 -107.898232 -9.890360 +v 113.970764 -108.757050 -9.052271 +v 112.596466 -107.361923 -9.981866 +v 111.769386 -107.205215 -10.124141 +v 111.027168 -107.412285 -9.613605 +v 110.345589 -107.346519 -9.882255 +v 109.682495 -107.725967 -9.473725 +v 109.012741 -107.843742 -9.743705 +v 110.544594 -108.114059 -9.052272 +v 107.996384 -108.576759 -9.496290 +v 114.941086 -110.312920 -21.480501 +v 115.449608 -111.465256 -21.485781 +v 114.527023 -109.613281 -20.951960 +v 113.656738 -108.709908 -20.787067 +v 113.833572 -109.120102 -21.164036 +v 112.357941 -108.232956 -20.787333 +v 112.286781 -108.483185 -21.144381 +v 110.409187 -107.988251 -20.696730 +v 111.218040 -108.397629 -21.041601 +v 109.439659 -108.650063 -20.803457 +v 109.854034 -108.746452 -21.162064 +v 108.507057 -109.563942 -20.949226 +v 107.683357 -110.590622 -20.828674 +v 107.015549 -112.502357 -20.752748 +v 107.617195 -111.269882 -21.159117 +v 107.393623 -112.591667 -21.031971 +v 107.780998 -114.207634 -21.046932 +v 107.969604 -115.010551 -20.788931 +v 108.576317 -115.300652 -21.159082 +v 109.174759 -116.384613 -20.698538 +v 109.423584 -115.996880 -21.041607 +v 110.359627 -116.651413 -20.787323 +v 110.424103 -116.395973 -21.159092 +v 111.677368 -116.968597 -20.718800 +v 111.796638 -116.648659 -20.929424 +v 111.477669 -116.566238 -21.465494 +v 107.777863 -116.198380 -21.482121 +v 109.463455 -116.067192 -21.499893 +v 108.075005 -114.743736 -21.499956 +v 107.031380 -115.223129 -21.500048 +v 107.490685 -113.219604 -21.485783 +v 106.401642 -113.626862 -21.500011 +v 111.708839 -117.366608 -20.709332 +v 106.290077 -111.862999 -21.500044 +v 107.533714 -111.327621 -21.499889 +v 110.235542 -117.303368 -20.786278 +v 106.942635 -109.877846 -21.500044 +v 108.909348 -116.727463 -20.773024 +v 110.209587 -117.560074 -21.132145 +v 108.245010 -110.027054 -21.483891 +v 108.748703 -116.941635 -21.129255 +v 108.318375 -108.305000 -21.500044 +v 109.187401 -109.093185 -21.490372 +v 106.943504 -113.980614 -20.700232 +v 107.753738 -115.928741 -20.838268 +v 109.835419 -107.489784 -21.480688 +v 111.145302 -108.362228 -21.499889 +v 106.622406 -112.372520 -20.708733 +v 106.894989 -115.008469 -21.158092 +v 106.460976 -113.877434 -21.011395 +v 111.587692 -107.231003 -21.500044 +v 112.860153 -108.645416 -21.480499 +v 106.716576 -111.051247 -20.786266 +v 106.250656 -111.957108 -21.157354 +v 113.628212 -107.681656 -21.500044 +v 107.319656 -109.942902 -20.712717 +v 113.990517 -109.209610 -21.499952 +v 106.604111 -110.596466 -21.158522 +v 115.589706 -109.148979 -21.500124 +v 108.450722 -108.514519 -20.771961 +v 107.247658 -109.354515 -21.157377 +v 115.560722 -113.090492 -21.499958 +v 116.379845 -110.486862 -21.484921 +v 108.518593 -108.147629 -21.158112 +v 115.169281 -110.482506 -20.932516 +v 110.960037 -107.512680 -20.779791 +v 109.783546 -107.610588 -20.946278 +v 114.077774 -108.324127 -20.710032 +v 112.628983 -107.604042 -20.772659 +v 116.489464 -113.875412 -20.973381 +v 111.490051 -107.201195 -21.157328 +v 113.215530 -107.508469 -21.158112 +v 116.607689 -112.111557 -20.873062 +v 115.195709 -109.329483 -20.720320 +v 116.186806 -110.675179 -20.812788 +v 114.760780 -108.330330 -21.157324 +v 115.704086 -109.401619 -20.986460 +v 116.529892 -110.986229 -21.137770 +v 116.749519 -112.240700 -21.152040 +v 115.588173 -112.461891 -21.177380 +v 116.716431 -113.295502 -21.489870 +v 115.959732 -115.166557 -21.035921 +v 115.933334 -115.331360 -21.482885 +v 114.215477 -115.532631 -21.152533 +v 115.039978 -116.334770 -21.123613 +v 113.387238 -116.188042 -21.499998 +v 113.406723 -116.171455 -20.705090 +v 114.043892 -117.082619 -21.496819 +v 112.550980 -116.392181 -21.223221 +v 112.961464 -117.525406 -20.950531 +v 109.389267 -117.289558 -21.480692 +v 111.846527 -117.743637 -21.198858 +v 111.392769 -117.739128 -21.498943 +v -92.646782 91.659424 -23.151680 +v -92.651573 91.653580 -26.360189 +v -93.128906 91.407585 -23.022127 +v -92.902580 91.277428 -23.308262 +v -93.030724 91.303001 -26.345812 +v -93.915878 90.659904 -23.154186 +v -94.373505 90.404892 -26.348314 +v -93.921600 90.657333 -26.360430 +v -94.366470 90.407654 -23.139803 +v -96.433342 89.735611 -23.151686 +v -96.440643 89.733696 -26.360186 +v -96.947319 89.674210 -23.139576 +v -96.953461 89.672928 -26.345814 +v -98.047562 89.672935 -23.154184 +v -97.494972 89.788887 -23.029144 +v -98.567680 89.735603 -26.348310 +v -98.053711 89.674217 -26.360426 +v -98.560364 89.733688 -23.139814 +v -100.627510 90.404892 -23.151680 +v -100.634552 90.407654 -26.360197 +v -101.079414 90.657326 -23.139574 +v -101.085136 90.659904 -26.345818 +v -101.970291 91.303001 -23.154184 +v -101.454735 91.073479 -23.026501 +v -102.354225 91.659424 -26.348324 +v -101.974495 91.307648 -26.360428 +v -102.349442 91.653580 -23.139811 +v -93.030724 101.745850 -23.154190 +v -93.538910 101.984207 -23.038378 +v -92.646782 101.389427 -26.348318 +v -93.026505 101.741196 -26.360430 +v -92.651573 101.395271 -23.139812 +v -91.373741 99.637215 -23.151674 +v -91.369659 99.630844 -26.360197 +v -91.156532 99.167389 -23.139566 +v -91.153404 99.161934 -26.345814 +v -90.829803 98.119003 -23.129112 +v -90.714180 97.607346 -26.348305 +v -90.814629 98.115135 -26.360432 +v -90.714638 97.614883 -23.139803 +v -91.153397 93.886925 -23.154190 +v -91.087486 94.445580 -23.035069 +v -91.373741 93.411629 -26.348326 +v -91.156532 93.881470 -26.360437 +v -91.369659 93.417976 -23.139812 +v -90.714180 95.441498 -23.151690 +v -90.714638 95.433968 -26.360199 +v -90.814621 94.933708 -23.139576 +v -90.829803 94.929855 -26.370886 +v -103.627281 93.411629 -23.151688 +v -103.631355 93.417976 -26.360189 +v -103.844498 93.881477 -23.139570 +v -103.847618 93.886917 -26.345812 +v -104.171211 94.929855 -23.129112 +v -104.286835 95.441505 -26.348310 +v -104.186394 94.933716 -26.360426 +v -104.286385 95.433968 -23.139807 +v -101.685921 90.925522 -23.379536 +v -101.463394 91.078102 -26.472338 +v -101.229515 90.616501 -26.134476 +v -101.528061 90.834335 -23.300472 +v -101.229500 90.614754 -23.370762 +v -101.532021 90.813698 -26.120457 +v -99.584824 90.127563 -23.034325 +v -100.589096 90.254822 -26.126917 +v -100.142929 90.161942 -26.337328 +v -100.162689 90.159912 -23.175285 +v -100.588715 90.257744 -23.361168 +v -97.595634 89.534683 -23.379543 +v -97.505699 89.785767 -26.468184 +v -97.044754 89.552948 -26.134478 +v -97.414314 89.553711 -23.300467 +v -97.043709 89.551559 -23.370758 +v -97.405388 89.534683 -26.120462 +v -95.880219 89.843277 -23.136013 +v -96.314049 89.636780 -26.126930 +v -95.898499 89.823883 -26.337322 +v -96.315460 89.639381 -23.361145 +v -95.961235 89.705666 -23.379292 +v -91.760696 100.047775 -23.027309 +v -91.316605 99.781219 -26.126911 +v -91.622971 100.118622 -26.337317 +v -91.318634 99.779060 -23.361160 +v -91.491142 100.095467 -23.379293 +v -93.441856 90.949600 -23.171066 +v -93.548233 91.070381 -26.477594 +v -93.034065 91.152275 -26.134489 +v -93.032402 91.151756 -23.370758 +v -93.315086 90.925522 -26.120461 +v -90.944351 98.661720 -23.171057 +v -91.076431 98.608208 -26.453390 +v -91.011086 99.112175 -26.134499 +v -91.010071 99.113594 -23.370750 +v -90.882263 98.774841 -26.120449 +v -92.492188 91.649582 -26.126926 +v -92.265961 92.045212 -26.337313 +v -92.270149 92.025795 -23.175289 +v -92.494850 91.650856 -23.361156 +v -90.882263 94.274010 -23.379555 +v -90.729408 94.803574 -26.134485 +v -90.944351 94.387131 -26.328947 +v -90.844330 94.452332 -23.300482 +v -90.727760 94.804131 -23.370760 +v -90.778511 96.518417 -23.030336 +v -90.583336 95.524414 -26.126928 +v -90.632858 95.977455 -26.337320 +v -90.624832 95.959282 -23.175287 +v -90.586227 95.523865 -23.361172 +v -93.915878 102.388947 -26.345812 +v -94.366478 102.641212 -26.360193 +v -93.315079 102.123337 -23.379557 +v -93.921600 102.391525 -23.139572 +v -93.535614 101.974220 -26.469585 +v -93.771500 102.432350 -26.134487 +v -93.472961 102.214523 -23.300491 +v -93.771515 102.434090 -23.370758 +v -93.468994 102.235161 -26.120447 +v -94.373497 102.643959 -23.151686 +v -104.286835 97.607338 -23.151690 +v -104.286385 97.614883 -26.360193 +v -104.186386 98.115135 -23.139570 +v -104.171211 98.118996 -26.370892 +v -91.622971 92.930229 -23.162680 +v -91.605789 92.940216 -26.324713 +v -92.056152 92.576408 -26.468578 +v -91.951378 92.470886 -23.131170 +v -91.817101 92.498215 -26.220978 +v -91.598839 92.803909 -26.191730 +v -91.804749 92.495766 -23.308239 +v -91.908943 92.352341 -26.191734 +v -92.138374 92.061302 -23.308281 +v -93.472961 90.834320 -26.199507 +v -93.771515 90.614754 -26.129246 +v -93.771500 90.616501 -23.365526 +v -94.858101 90.161934 -23.162678 +v -94.838326 90.159912 -26.324711 +v -95.360138 89.994286 -26.368835 +v -95.393784 89.983360 -23.131165 +v -94.912811 90.045555 -26.191730 +v -95.260521 89.917290 -23.308231 +v -94.412300 90.257744 -26.138842 +v -94.411919 90.254822 -23.373089 +v -97.586700 89.553711 -26.199535 +v -97.957314 89.551559 -26.129248 +v -97.956261 89.552956 -23.365509 +v -95.429123 89.862495 -26.191732 +v -99.084473 89.925659 -26.419897 +v -99.102531 89.823883 -23.162678 +v -98.685547 89.639381 -26.138865 +v -98.686966 89.636780 -23.373072 +v -99.039772 89.705666 -26.120716 +v -99.607231 89.983360 -26.368839 +v -99.215210 89.761909 -26.191721 +v -99.571884 89.862495 -23.308266 +v -99.740501 89.917290 -26.191763 +v -99.731934 89.926521 -23.279026 +v -100.088188 90.045547 -23.308268 +v -101.667519 90.935654 -26.199503 +v -101.968605 91.151749 -26.129253 +v -101.966949 91.152275 -23.365519 +v -102.735054 92.045219 -23.162682 +v -102.730865 92.025795 -26.324717 +v -102.946693 92.561470 -26.460566 +v -103.070419 92.499504 -23.131166 +v -103.085938 92.363350 -26.220972 +v -102.862648 92.061302 -26.191704 +v -103.092072 92.352341 -23.308256 +v -102.506157 91.650856 -26.138840 +v -102.508827 91.649582 -23.373087 +v -103.919914 94.442657 -26.458929 +v -104.156677 94.452324 -26.199558 +v -104.273254 94.804131 -26.129253 +v -104.271599 94.803574 -23.365519 +v -104.056671 94.387108 -23.171055 +v -104.368149 95.977455 -23.162678 +v -104.376175 95.959282 -26.324711 +v -104.218575 96.517746 -26.473091 +v -104.214897 96.531441 -23.024599 +v -104.465027 96.441071 -26.220982 +v -104.461914 96.065460 -26.191742 +v -104.476463 96.435791 -23.308241 +v -103.844498 99.167374 -26.360434 +v -103.990944 99.113594 -26.129257 +v -103.989929 99.112183 -23.365505 +v -103.834488 99.155334 -23.129112 +v -104.060837 98.648933 -23.171068 +v -103.627274 99.637215 -26.348320 +v -103.631355 99.630852 -23.139803 +v -103.378052 100.118622 -23.162683 +v -103.245514 100.050217 -26.468260 +v -103.070419 100.549347 -26.368832 +v -102.925171 100.472008 -23.023544 +v -103.402168 100.244934 -26.191750 +v -103.196274 100.553085 -23.308252 +v -102.354225 101.389420 -23.151672 +v -102.349442 101.395264 -26.360189 +v -101.974495 101.741196 -23.139568 +v -101.970291 101.745850 -26.345812 +v -101.456696 101.977448 -26.471067 +v -101.079414 102.391525 -26.360428 +v -101.528061 102.214523 -26.199524 +v -101.229500 102.434097 -26.129240 +v -101.229515 102.432350 -23.365522 +v -101.085136 102.388947 -23.154186 +v -101.532021 102.235161 -23.379564 +v -101.462730 101.969551 -23.026499 +v -100.627510 102.643959 -26.348316 +v -100.634544 102.641220 -23.139814 +v -100.142929 102.886909 -23.162674 +v -100.162689 102.888939 -26.324713 +v -99.585625 102.924721 -26.463297 +v -99.607231 103.065491 -23.131166 +v -99.731934 103.122330 -26.220964 +v -100.088188 103.003304 -26.191725 +v -99.740494 103.131561 -23.308231 +v -93.333488 102.113190 -26.199512 +v -93.032402 101.897095 -26.129246 +v -93.034065 101.896576 -23.365524 +v -92.069412 100.478600 -26.473093 +v -92.265961 101.003639 -23.162691 +v -91.930595 100.549347 -23.131170 +v -92.494850 101.397995 -26.138847 +v -92.270149 101.023056 -26.324711 +v -92.492180 101.399261 -23.373087 +v -91.915085 100.685501 -26.220985 +v -92.138374 100.987541 -26.191717 +v -91.908943 100.696510 -23.308252 +v -91.318634 93.269783 -26.138851 +v -91.316605 93.267632 -23.373089 +v -90.844330 98.596519 -26.199520 +v -90.727760 98.244720 -26.129246 +v -90.729408 98.245270 -23.365520 +v -91.804741 100.553085 -26.191746 +v -91.598839 100.244934 -23.308254 +v -90.641968 97.084496 -26.359957 +v -90.632866 97.071396 -23.162676 +v -90.586227 97.524979 -26.138832 +v -90.583328 97.524437 -23.373077 +v -91.010071 93.935257 -26.129251 +v -91.011078 93.936668 -23.365524 +v -90.791542 96.529564 -26.476458 +v -90.535988 96.607780 -26.220968 +v -90.539085 96.983376 -26.191700 +v -90.524544 96.613068 -23.308268 +v -90.524544 96.435783 -26.191725 +v -90.535988 96.441071 -23.279018 +v -90.539085 96.065468 -23.308296 +v -103.378052 92.930229 -26.337320 +v -103.243805 92.999397 -23.030066 +v -103.196274 92.495766 -26.191750 +v -103.402168 92.803917 -23.308252 +v -103.684418 93.267647 -26.126932 +v -103.682381 93.269783 -23.361145 +v -103.509880 92.953384 -23.379292 +v -103.989929 93.936668 -26.134493 +v -103.990936 93.935257 -23.370745 +v -104.118752 94.274010 -26.120461 +v -104.414780 95.523865 -26.138842 +v -104.417686 95.524414 -23.373087 +v -104.368156 97.071396 -26.337320 +v -104.376175 97.089569 -23.175289 +v -104.476463 96.613068 -26.191751 +v -104.465019 96.607780 -23.279005 +v -104.461914 96.983383 -23.308254 +v -96.315460 103.409477 -26.138842 +v -96.433342 103.313240 -26.348307 +v -96.440643 103.315155 -23.139814 +v -95.898499 103.224968 -23.162680 +v -96.314049 103.412079 -23.373098 +v -95.916542 103.123184 -26.419901 +v -95.961235 103.343185 -26.120707 +v -95.393784 103.065491 -26.368834 +v -95.418594 102.909737 -23.025702 +v -95.785812 103.286942 -26.191750 +v -95.429115 103.186348 -23.308237 +v -94.411919 102.794037 -26.126926 +v -94.858101 102.886909 -26.337328 +v -94.838326 102.888947 -23.175289 +v -94.412300 102.791107 -23.361166 +v -104.417686 97.524437 -26.126917 +v -104.414780 97.524986 -23.361168 +v -99.437866 94.148460 -22.731062 +v -98.472397 93.657066 -14.000015 +v -100.487953 94.663338 -22.988441 +v -98.270813 93.597282 -22.638987 +v -98.225029 93.289688 -22.963236 +v -96.961472 93.523094 -22.642405 +v -96.906403 93.562561 -14.000026 +v -95.770462 94.073509 -13.999999 +v -96.367836 93.433205 -22.959068 +v -95.513550 94.191025 -22.728085 +v -95.175613 98.540955 -13.999983 +v -96.940964 99.521980 -22.643024 +v -96.955894 99.503197 -14.000029 +v -95.609749 99.214699 -22.967909 +v -95.756821 98.997551 -22.638632 +v -97.136993 99.810524 -22.956882 +v -94.878975 95.008896 -14.000027 +v -94.732010 95.250084 -22.732994 +v -94.579964 98.235474 -22.982929 +v -95.017342 98.288124 -22.731020 +v -95.180023 94.063255 -22.985666 +v -94.454697 96.505615 -22.634708 +v -94.472939 96.571175 -13.999967 +v -94.661858 97.594391 -22.729029 +v -94.222275 96.755516 -22.967581 +v -94.362854 95.375809 -22.973310 +v -95.260529 103.131569 -26.191753 +v -95.269081 103.122322 -23.279011 +v -94.912811 103.003296 -23.308262 +v -104.271599 98.245270 -26.134497 +v -104.056664 98.661736 -26.328943 +v -104.273254 98.244713 -23.370749 +v -96.500702 95.736542 -26.500000 +v -96.272118 96.057541 -14.000000 +v -96.500694 97.312302 -14.000000 +v -97.564949 95.211884 -14.000000 +v -97.710365 95.227165 -26.500000 +v -96.272118 96.991310 -26.500000 +v -97.710373 97.821686 -14.000000 +v -97.564957 97.836967 -26.500000 +v -97.495316 103.263084 -26.468184 +v -99.810036 94.566162 -14.000024 +v -98.642273 95.961624 -14.000000 +v -98.682732 96.052498 -26.500000 +v -100.583038 96.443710 -13.999996 +v -98.566948 99.358284 -14.000022 +v -99.873215 98.404739 -14.000011 +v -98.642281 97.087219 -26.500000 +v -98.682732 96.996353 -14.000000 +v -103.682381 99.779060 -26.138859 +v -103.684410 99.781212 -23.373077 +v -103.509880 100.095467 -26.120708 +v -102.735046 101.003632 -26.337318 +v -102.719986 101.008881 -23.140041 +v -103.092072 100.696510 -26.191736 +v -103.085930 100.685493 -23.279007 +v -102.862640 100.987541 -23.308283 +v -102.508827 101.399261 -26.126913 +v -102.506157 101.397995 -23.361153 +v -101.966949 101.896584 -26.134480 +v -101.667534 102.113197 -23.300507 +v -101.968605 101.897095 -23.370752 +v -101.685928 102.123337 -26.120455 +v -100.588715 102.791107 -26.138842 +v -100.589096 102.794037 -23.373083 +v -96.955681 103.361397 -23.129114 +v -96.947319 103.374634 -26.360424 +v -98.560371 103.315155 -26.360186 +v -99.102531 103.224960 -26.337318 +v -99.078049 103.074242 -23.028559 +v -99.571884 103.186348 -26.191750 +v -99.215195 103.286942 -23.308239 +v -98.567680 103.313240 -23.151688 +v -98.053711 103.374634 -23.139572 +v -98.047562 103.375916 -26.345812 +v -98.686966 103.412071 -26.126911 +v -98.685547 103.409477 -23.361164 +v -99.039772 103.343193 -23.379297 +v -100.280800 94.858879 -22.918493 +v -100.262497 95.271507 -22.647211 +v -100.740532 96.544975 -22.918791 +v -100.519157 96.295715 -22.645988 +v -100.963745 97.360291 -22.999687 +v -98.520988 99.413780 -22.728228 +v -100.420670 97.318359 -22.638945 +v -100.429001 97.884354 -22.922848 +v -99.826637 98.493050 -22.638136 +v -99.512741 99.158691 -22.963236 +v -97.507225 103.420174 -23.171061 +v -97.043709 103.497292 -26.129251 +v -97.414314 103.495132 -26.199547 +v -97.044746 103.495895 -23.365515 +v -97.956261 103.495895 -26.134485 +v -97.957306 103.497292 -23.370766 +v -97.595634 103.514168 -26.120455 +v -92.646774 -117.340569 -23.151682 +v -92.651581 -117.346428 -26.360184 +v -93.026489 -117.692337 -23.139566 +v -93.030724 -117.697021 -26.345795 +v -93.915894 -118.340103 -23.154167 +v -93.538277 -117.920708 -23.026495 +v -94.373497 -118.595123 -26.348295 +v -93.921600 -118.342690 -26.360416 +v -94.366447 -118.592323 -23.139786 +v -96.433342 -119.264397 -23.151682 +v -96.440636 -119.266312 -26.360180 +v -96.947311 -119.325798 -23.139572 +v -96.953453 -119.327080 -26.345810 +v -98.047569 -119.327080 -23.154175 +v -97.494972 -119.211136 -23.029142 +v -98.567680 -119.264397 -26.348301 +v -98.053719 -119.325798 -26.360416 +v -98.560371 -119.266312 -23.139807 +v -100.627518 -118.595116 -23.151686 +v -100.634575 -118.592323 -26.360201 +v -101.015556 -118.213829 -23.021544 +v -101.069862 -118.469887 -23.308262 +v -101.085121 -118.340103 -26.345821 +v -101.970291 -117.697014 -23.154186 +v -102.354240 -117.340561 -26.348309 +v -101.974503 -117.692337 -26.360424 +v -102.349434 -117.346428 -23.139803 +v -93.030716 -107.254173 -23.154175 +v -93.545929 -107.023178 -23.029137 +v -92.646790 -107.610573 -26.348307 +v -93.026497 -107.258827 -26.360430 +v -92.651558 -107.604752 -23.139807 +v -91.373734 -109.362770 -23.151678 +v -91.369659 -109.369118 -26.360170 +v -91.156532 -109.832634 -23.139553 +v -91.153397 -109.838081 -26.345797 +v -90.829796 -110.881012 -23.129114 +v -90.714188 -111.392654 -26.348307 +v -90.814621 -110.884872 -26.360420 +v -90.714645 -111.385117 -23.139786 +v -91.153404 -115.113091 -23.154186 +v -91.087486 -114.554428 -23.035065 +v -91.373749 -115.588356 -26.348320 +v -91.156525 -115.118515 -26.360418 +v -91.369667 -115.581978 -23.139784 +v -90.714188 -113.558510 -23.151688 +v -90.714630 -113.566002 -26.360186 +v -90.814629 -114.066292 -23.139565 +v -90.815315 -114.072533 -26.345825 +v -103.627274 -115.588364 -23.151676 +v -103.631348 -115.581978 -26.360205 +v -103.844513 -115.118507 -23.139574 +v -103.847610 -115.113098 -26.345802 +v -104.171204 -114.070160 -23.129093 +v -104.286835 -113.558502 -26.348303 +v -104.186378 -114.066292 -26.360424 +v -104.286392 -113.566002 -23.139809 +v -101.548286 -118.058304 -23.171045 +v -101.463394 -117.921913 -26.472330 +v -101.229530 -118.383514 -26.134426 +v -101.229515 -118.385246 -23.370798 +v -101.532021 -118.186317 -26.120443 +v -100.589096 -118.745178 -26.126942 +v -100.142952 -118.838028 -26.337353 +v -100.162689 -118.840088 -23.175272 +v -100.588715 -118.742241 -23.361118 +v -97.595634 -119.465309 -23.379551 +v -97.507103 -119.213348 -26.475380 +v -97.044754 -119.447060 -26.134422 +v -97.414322 -119.446281 -23.300425 +v -97.043716 -119.448456 -23.370775 +v -97.405396 -119.465309 -26.120441 +v -95.880226 -119.156715 -23.136003 +v -96.314049 -119.363228 -26.126915 +v -95.898506 -119.176117 -26.337315 +v -96.315460 -119.360641 -23.361160 +v -95.961235 -119.294350 -23.379265 +v -92.060028 -108.530876 -23.028097 +v -91.316605 -109.218788 -26.126909 +v -91.622986 -108.881348 -26.337305 +v -91.605789 -108.891373 -23.175278 +v -91.318626 -109.220947 -23.361162 +v -93.468994 -118.186317 -23.379549 +v -93.546249 -117.929565 -26.476252 +v -93.034065 -117.847725 -26.134499 +v -93.333504 -118.064346 -23.300447 +v -93.032402 -117.848244 -23.370760 +v -93.315086 -118.074486 -26.120447 +v -90.944344 -110.338310 -23.171059 +v -90.793190 -112.480911 -23.022451 +v -91.011086 -109.887825 -26.134470 +v -91.010071 -109.886398 -23.370758 +v -90.882263 -110.225174 -26.120440 +v -92.057816 -116.436432 -23.036692 +v -92.492188 -117.350410 -26.126940 +v -92.265953 -116.954781 -26.337307 +v -92.270142 -116.974220 -23.175306 +v -92.494873 -117.349174 -23.361135 +v -90.882263 -114.726006 -23.379551 +v -91.093262 -114.562889 -26.468172 +v -90.729408 -114.196411 -26.134468 +v -90.844315 -114.547653 -23.300503 +v -90.727760 -114.195885 -23.370754 +v -90.823471 -114.545067 -26.120432 +v -90.641968 -113.035652 -23.140038 +v -90.583328 -113.475586 -26.126919 +v -90.632858 -113.022514 -26.337303 +v -90.586227 -113.476120 -23.361170 +v -93.915863 -106.611053 -26.345800 +v -94.366493 -106.358780 -26.360184 +v -93.315086 -106.876663 -23.379528 +v -93.921608 -106.608505 -23.139555 +v -93.535614 -107.025803 -26.469576 +v -93.771507 -106.567657 -26.134512 +v -93.472961 -106.785477 -23.300470 +v -93.771515 -106.565918 -23.370731 +v -93.468994 -106.764854 -26.120449 +v -94.373505 -106.356041 -23.151665 +v -104.286827 -111.392654 -23.151672 +v -104.286369 -111.385117 -26.360195 +v -104.186394 -110.884872 -23.139566 +v -104.185722 -110.878639 -26.345793 +v -91.622955 -116.069740 -23.162678 +v -91.714188 -116.021149 -26.419893 +v -91.930603 -116.500488 -26.368828 +v -91.598854 -116.196098 -26.191774 +v -91.804733 -116.504234 -23.308264 +v -91.908936 -116.647667 -26.191690 +v -91.915085 -116.636650 -23.279015 +v -92.138390 -116.938721 -23.308260 +v -93.472954 -118.165703 -26.199444 +v -93.771507 -118.385246 -26.129200 +v -93.771484 -118.383514 -23.365561 +v -94.858070 -118.838036 -23.162640 +v -94.838333 -118.840088 -26.324711 +v -95.360146 -119.005714 -26.368824 +v -95.393784 -119.016655 -23.131165 +v -94.912811 -118.954468 -26.191685 +v -95.260490 -119.082718 -23.308325 +v -94.412300 -118.742241 -26.138878 +v -94.411919 -118.745178 -23.373051 +v -97.586685 -119.446281 -26.199564 +v -97.957306 -119.448456 -26.129211 +v -97.956253 -119.447060 -23.365561 +v -95.429123 -119.137505 -26.191721 +v -99.102531 -119.176117 -23.162672 +v -99.640869 -119.005714 -23.131166 +v -98.685539 -119.360634 -26.138836 +v -99.087723 -119.189377 -26.324692 +v -98.686966 -119.363228 -23.373074 +v -99.607231 -119.016647 -26.368826 +v -99.215218 -119.238091 -26.191700 +v -99.571877 -119.137512 -23.308264 +v -99.740540 -119.082710 -26.191654 +v -100.088188 -118.954468 -23.308302 +v -101.667519 -118.064354 -26.199518 +v -101.968613 -117.848244 -26.129234 +v -101.966949 -117.847733 -23.365498 +v -102.735054 -116.954781 -23.162674 +v -102.730873 -116.974220 -26.324682 +v -102.946693 -116.438530 -26.460562 +v -103.070412 -116.500496 -23.131161 +v -103.085938 -116.636658 -26.220951 +v -102.862625 -116.938728 -26.191711 +v -103.092079 -116.647667 -23.308287 +v -102.506142 -117.349174 -26.138844 +v -102.508827 -117.350410 -23.373060 +v -103.910957 -114.553001 -26.468174 +v -104.156693 -114.547653 -26.199524 +v -104.273254 -114.195885 -26.129246 +v -104.271606 -114.196419 -23.365520 +v -104.056679 -114.612885 -23.171057 +v -104.368156 -113.022514 -23.162685 +v -104.265770 -113.008270 -26.419895 +v -104.372444 -112.493263 -26.368830 +v -104.214905 -112.468575 -23.024593 +v -104.461914 -112.934547 -26.191734 +v -104.476463 -112.564224 -23.308241 +v -103.905357 -110.387474 -26.476248 +v -103.844490 -109.832642 -26.360434 +v -104.103409 -110.239555 -26.199581 +v -103.990944 -109.886398 -26.129234 +v -103.989929 -109.887825 -23.365519 +v -103.834496 -109.844681 -23.129108 +v -104.060822 -110.351067 -23.171045 +v -103.627289 -109.362770 -26.348303 +v -103.631355 -109.369118 -23.139814 +v -103.378036 -108.881348 -23.162680 +v -103.395226 -108.891373 -26.324705 +v -103.050583 -108.458527 -26.402092 +v -102.925186 -108.527969 -23.023544 +v -103.402176 -108.755074 -26.191730 +v -103.196289 -108.446938 -23.308258 +v -102.354225 -107.610573 -23.151669 +v -102.349457 -107.604752 -26.360182 +v -101.974503 -107.258820 -23.139553 +v -101.970291 -107.254173 -26.345812 +v -101.460831 -107.017235 -26.462978 +v -101.079407 -106.608505 -26.360428 +v -101.528061 -106.785484 -26.199530 +v -101.229500 -106.565918 -26.129251 +v -101.229507 -106.567657 -23.365482 +v -101.085152 -106.611053 -23.154182 +v -101.532021 -106.764854 -23.379547 +v -101.465866 -107.026016 -23.033310 +v -100.627510 -106.356049 -26.348320 +v -100.634529 -106.358772 -23.139809 +v -100.142921 -106.113083 -23.162689 +v -100.152580 -106.125793 -26.359945 +v -99.570946 -106.082397 -23.028093 +v -99.731941 -105.877670 -26.220951 +v -100.088188 -105.996704 -26.191740 +v -99.740494 -105.868439 -23.308226 +v -93.333481 -106.886818 -26.199488 +v -93.032402 -107.102921 -26.129274 +v -93.034065 -107.103455 -23.365461 +v -92.069412 -108.521385 -26.473080 +v -92.265968 -107.996361 -23.162685 +v -92.494850 -107.602013 -26.138824 +v -92.270157 -107.976952 -26.324722 +v -92.492180 -107.600739 -23.373091 +v -91.915092 -108.314522 -26.220978 +v -92.138351 -108.012482 -26.191679 +v -91.908943 -108.303505 -23.308254 +v -91.318642 -115.730232 -26.138849 +v -91.316605 -115.732376 -23.373072 +v -91.491135 -116.046623 -26.120682 +v -90.844315 -110.403488 -26.199497 +v -90.727753 -110.755287 -26.129242 +v -90.729416 -110.754730 -23.365499 +v -91.804726 -108.446938 -26.191725 +v -91.817108 -108.449371 -23.278997 +v -91.598839 -108.755074 -23.308260 +v -91.089134 -110.400909 -26.475292 +v -90.632858 -111.928650 -23.162678 +v -90.586227 -111.475029 -26.138823 +v -90.624817 -111.910446 -26.324690 +v -90.583328 -111.475571 -23.373070 +v -90.897591 -114.711617 -26.199469 +v -91.010071 -115.064751 -26.129242 +v -91.011086 -115.063332 -23.365503 +v -90.628571 -112.457893 -26.368834 +v -90.539085 -112.016609 -26.191692 +v -90.524544 -112.386932 -23.308260 +v -90.524544 -112.564232 -26.191717 +v -90.535988 -112.558914 -23.279015 +v -90.539085 -112.934540 -23.308292 +v -103.378067 -116.069740 -26.337307 +v -103.243805 -116.000610 -23.030062 +v -103.196289 -116.504234 -26.191710 +v -103.402153 -116.196091 -23.308193 +v -103.684410 -115.732361 -26.126936 +v -103.682373 -115.730232 -23.361134 +v -103.509880 -116.046623 -23.379311 +v -103.989929 -115.063339 -26.134502 +v -103.990944 -115.064751 -23.370739 +v -104.118759 -114.726006 -26.120449 +v -104.414780 -113.476120 -26.138834 +v -104.417686 -113.475586 -23.373087 +v -104.461189 -113.118759 -26.120712 +v -104.368156 -111.928642 -26.337303 +v -104.376190 -111.910446 -23.175295 +v -104.476463 -112.386940 -26.191746 +v -104.465019 -112.392227 -23.278997 +v -104.461914 -112.016602 -23.308247 +v -96.315460 -105.590546 -26.138859 +v -96.433350 -105.686775 -26.348324 +v -96.440643 -105.684860 -23.139799 +v -95.898499 -105.775040 -23.162664 +v -96.314049 -105.587944 -23.373075 +v -95.913292 -105.761780 -26.324696 +v -95.427345 -106.076302 -26.468277 +v -95.360123 -105.945419 -23.131172 +v -95.427620 -105.826187 -26.221004 +v -95.785797 -105.713051 -26.191710 +v -95.429115 -105.813652 -23.308207 +v -94.884270 -106.117996 -23.136032 +v -94.411919 -106.205971 -26.126905 +v -94.858109 -106.113083 -26.337299 +v -94.412300 -106.208893 -23.361206 +v -94.737831 -106.054321 -23.379293 +v -104.417686 -111.475571 -26.126909 +v -104.414780 -111.475021 -23.361162 +v -99.445038 -114.835533 -22.691360 +v -98.472282 -115.342987 -14.000011 +v -100.504829 -113.812935 -22.969158 +v -99.269249 -115.256386 -22.949453 +v -97.975410 -115.487816 -22.645283 +v -97.942184 -115.741669 -22.969030 +v -96.906433 -115.437454 -14.000022 +v -96.693748 -115.412361 -22.730951 +v -95.770462 -114.926483 -13.999995 +v -95.766426 -114.959656 -22.643278 +v -95.175613 -110.459038 -13.999974 +v -96.956146 -109.496803 -14.000020 +v -96.297813 -115.645218 -22.984068 +v -94.897873 -110.465347 -22.966024 +v -95.756783 -110.002480 -22.638634 +v -96.089348 -109.408363 -22.969389 +v -95.377426 -114.924377 -22.918489 +v -94.873825 -114.023895 -22.642336 +v -94.878975 -113.991112 -14.000022 +v -96.606880 -109.563843 -22.719698 +v -94.856766 -110.960808 -22.637163 +v -94.454697 -112.494385 -22.634699 +v -94.472939 -112.428818 -13.999959 +v -94.531929 -114.445633 -22.999706 +v -94.572021 -113.835487 -22.922836 +v -93.960243 -112.076546 -22.999680 +v -94.243332 -112.156654 -22.919384 +v -95.260529 -105.868431 -26.191744 +v -104.271591 -110.754730 -26.134501 +v -104.273254 -110.755295 -23.370735 +v -104.177536 -110.406097 -26.120468 +v -96.500702 -113.263458 -26.499992 +v -97.025513 -113.700859 -13.999995 +v -96.676910 -111.451569 -13.999991 +v -97.710373 -113.772827 -26.499990 +v -96.272110 -112.008728 -26.499992 +v -97.564911 -111.163025 -26.499992 +v -98.045341 -105.638618 -26.370886 +v -99.578949 -106.094727 -26.475250 +v -98.519035 -113.305954 -13.999996 +v -97.940887 -111.281242 -13.999991 +v -99.809990 -114.433899 -14.000020 +v -98.682739 -112.947487 -26.499992 +v -100.583038 -112.556297 -13.999989 +v -98.567024 -109.641762 -14.000013 +v -99.873215 -110.595291 -14.000003 +v -98.642281 -111.912781 -26.499992 +v -98.682732 -112.003654 -13.999991 +v -103.682388 -109.220947 -26.138840 +v -103.684410 -109.218796 -23.373064 +v -102.735039 -107.996361 -26.337307 +v -102.719978 -107.991119 -23.140028 +v -103.092079 -108.303505 -26.191719 +v -103.085930 -108.314522 -23.278997 +v -102.862663 -108.012474 -23.308308 +v -102.508835 -107.600739 -26.126888 +v -102.506165 -107.602013 -23.361168 +v -101.966949 -107.103455 -26.134527 +v -101.667534 -106.886803 -23.300516 +v -101.968605 -107.102913 -23.370708 +v -101.685928 -106.876671 -26.120468 +v -100.588715 -106.208893 -26.138788 +v -100.589096 -106.205971 -23.373091 +v -96.953461 -105.624092 -23.154179 +v -96.947327 -105.625366 -26.360422 +v -97.505096 -105.737900 -23.028812 +v -98.560364 -105.684860 -26.360186 +v -99.102531 -105.775047 -26.337318 +v -99.087723 -105.761780 -23.175287 +v -99.571884 -105.813644 -26.191767 +v -99.573395 -105.826195 -23.278959 +v -99.215210 -105.713058 -23.308264 +v -98.567673 -105.686775 -23.151653 +v -98.053703 -105.625374 -23.139561 +v -98.686966 -105.587944 -26.126917 +v -98.685547 -105.590546 -23.361132 +v -96.245995 -112.691399 -13.999993 +v -100.262497 -113.728516 -22.647221 +v -100.739616 -112.611320 -22.923624 +v -100.519157 -112.704300 -22.645977 +v -100.963760 -111.639771 -22.999680 +v -97.741547 -109.451981 -22.648092 +v -100.569359 -111.452545 -22.920275 +v -100.420670 -111.681656 -22.638933 +v -97.813972 -109.207077 -22.966055 +v -99.059853 -109.855202 -22.643892 +v -100.007004 -110.744606 -22.731369 +v -99.334328 -109.724632 -22.956877 +v -97.043709 -105.502716 -26.129246 +v -97.044739 -105.504112 -23.365479 +v -97.405396 -105.485840 -23.379538 +v -97.956276 -105.504112 -26.134506 +v -97.493782 -105.579849 -26.328947 +v -97.586700 -105.504860 -23.300480 +v -97.957314 -105.502716 -23.370747 +v 116.353226 -117.340561 -23.151669 +v 116.348434 -117.346405 -26.360184 +v 115.973495 -117.692337 -23.139565 +v 115.969299 -117.697014 -26.345789 +v 115.084122 -118.340111 -23.154175 +v 115.461731 -117.920715 -23.026493 +v 114.626511 -118.595131 -26.348280 +v 115.078438 -118.342674 -26.360403 +v 114.633606 -118.592323 -23.139797 +v 112.566673 -119.264397 -23.151686 +v 112.559410 -119.266296 -26.360184 +v 112.052681 -119.325798 -23.139574 +v 112.046555 -119.327072 -26.345818 +v 110.954659 -119.312553 -23.129103 +v 110.432320 -119.264404 -26.348291 +v 110.946312 -119.325806 -26.360409 +v 110.439575 -119.266296 -23.139807 +v 108.372490 -118.595123 -23.151699 +v 108.365448 -118.592331 -26.360203 +v 107.920639 -118.342712 -23.139568 +v 107.921623 -118.327042 -26.370895 +v 107.040031 -117.686569 -23.129124 +v 106.645775 -117.340561 -26.348316 +v 107.025490 -117.692337 -26.360426 +v 106.650551 -117.346420 -23.139812 +v 115.969307 -107.254181 -23.154182 +v 115.454079 -107.023170 -23.029140 +v 116.353210 -107.610580 -26.348322 +v 115.973488 -107.258820 -26.360432 +v 116.348457 -107.604767 -23.139807 +v 117.626274 -109.362778 -23.151672 +v 117.630363 -109.369118 -26.360155 +v 117.843475 -109.832642 -23.139547 +v 117.833496 -109.844666 -26.370865 +v 118.184700 -110.878639 -23.154171 +v 118.285812 -111.392647 -26.348314 +v 118.185387 -110.884872 -26.360416 +v 118.285355 -111.385109 -23.139780 +v 117.833488 -115.106506 -23.129124 +v 117.626259 -115.588348 -26.348326 +v 117.843491 -115.118507 -26.360422 +v 117.630356 -115.581985 -23.139799 +v 118.285820 -113.558510 -23.151680 +v 118.285370 -113.566002 -26.360193 +v 118.185379 -114.066284 -23.139566 +v 118.184685 -114.072533 -26.345844 +v 105.372749 -115.588364 -23.151659 +v 105.368645 -115.581985 -26.360191 +v 105.155533 -115.118553 -23.139549 +v 105.165504 -115.106499 -26.370871 +v 104.814316 -114.072533 -23.154144 +v 105.089340 -114.563248 -23.035065 +v 104.713173 -113.558510 -26.348301 +v 104.813614 -114.066284 -26.360422 +v 104.713623 -113.566010 -23.139793 +v 107.451691 -118.058273 -23.171051 +v 109.417953 -118.859177 -23.024595 +v 107.770477 -118.383514 -26.134418 +v 107.440895 -118.050430 -26.328926 +v 107.770493 -118.385246 -23.370806 +v 108.410896 -118.745178 -26.126932 +v 108.857071 -118.838036 -26.337351 +v 108.837334 -118.840088 -23.175274 +v 108.411301 -118.742249 -23.361126 +v 111.506210 -119.371346 -23.171072 +v 111.496124 -119.229172 -26.453379 +v 113.077232 -119.027084 -23.030064 +v 111.955246 -119.447060 -26.134428 +v 111.956284 -119.448456 -23.370775 +v 111.594612 -119.465309 -26.120441 +v 112.685959 -119.363228 -26.126921 +v 113.101509 -119.176125 -26.337315 +v 112.684532 -119.360634 -23.361153 +v 113.038765 -119.294350 -23.379259 +v 117.901802 -110.386497 -23.021645 +v 117.683403 -109.218788 -26.126881 +v 117.377037 -108.881348 -26.337303 +v 117.394218 -108.891373 -23.175282 +v 117.681366 -109.220932 -23.361177 +v 115.531006 -118.186317 -23.379545 +v 115.464066 -117.938713 -26.456648 +v 115.965927 -117.847740 -26.134472 +v 115.666512 -118.064354 -23.300491 +v 115.967598 -117.848251 -23.370785 +v 115.684921 -118.074486 -26.120459 +v 118.176521 -110.406097 -23.379564 +v 117.988937 -109.887825 -26.134426 +v 118.059807 -110.351074 -26.328955 +v 118.102402 -110.239532 -23.300447 +v 117.989944 -109.886398 -23.370794 +v 116.718979 -116.960037 -23.140047 +v 116.924171 -116.423157 -23.023540 +v 116.507812 -117.350410 -26.126940 +v 116.734032 -116.954773 -26.337334 +v 116.505127 -117.349174 -23.361128 +v 118.059814 -114.600082 -23.171062 +v 117.916550 -114.564636 -26.458916 +v 118.217438 -112.482269 -23.026693 +v 118.270599 -114.196426 -26.134453 +v 118.272255 -114.195885 -23.370766 +v 118.176529 -114.545067 -26.120405 +v 118.416672 -113.475586 -26.126902 +v 118.367126 -113.022507 -26.337320 +v 118.375175 -113.040718 -23.175278 +v 118.413765 -113.476120 -23.361189 +v 115.084152 -106.611046 -26.345793 +v 114.633560 -106.358788 -26.360174 +v 115.684921 -106.876671 -23.379517 +v 115.078438 -106.608513 -23.139566 +v 115.466896 -107.022377 -26.462978 +v 115.228500 -106.567657 -26.134499 +v 115.527077 -106.785522 -23.300386 +v 115.228493 -106.565918 -23.370747 +v 115.530998 -106.764862 -26.120453 +v 114.626503 -106.356033 -23.151680 +v 104.713173 -111.392647 -23.151672 +v 104.713646 -111.385109 -26.360209 +v 104.813606 -110.884880 -23.139568 +v 104.814293 -110.878639 -26.345808 +v 117.377068 -116.069748 -23.162680 +v 117.394218 -116.059784 -26.324694 +v 116.938469 -116.418945 -26.473082 +v 117.182907 -116.501778 -26.220968 +v 117.401146 -116.196060 -26.191851 +v 117.195267 -116.504234 -23.308252 +v 117.091072 -116.647682 -26.191643 +v 117.084930 -116.636650 -23.279024 +v 116.861626 -116.938721 -23.308273 +v 115.527084 -118.165657 -26.199528 +v 115.228508 -118.385246 -26.129185 +v 115.228523 -118.383514 -23.365576 +v 114.141930 -118.838036 -23.162643 +v 114.161667 -118.840088 -26.324711 +v 113.583008 -118.869293 -26.467953 +v 113.606216 -119.016647 -23.131163 +v 113.730911 -119.073479 -26.220980 +v 114.087189 -118.954468 -26.191696 +v 113.739525 -119.082710 -23.308306 +v 114.587700 -118.742249 -26.138866 +v 114.588097 -118.745178 -23.373060 +v 111.413315 -119.446281 -26.199566 +v 111.042702 -119.448456 -26.129208 +v 111.043747 -119.447060 -23.365562 +v 113.570869 -119.137512 -26.191704 +v 113.214218 -119.238083 -23.308268 +v 109.912766 -119.171501 -26.359953 +v 109.897469 -119.176109 -23.162664 +v 110.314461 -119.360634 -26.138842 +v 110.313042 -119.363228 -23.373072 +v 109.430412 -118.859467 -26.475245 +v 109.426613 -119.124992 -26.220955 +v 109.784775 -119.238091 -26.191708 +v 109.428131 -119.137512 -23.308273 +v 109.259491 -119.082718 -26.191641 +v 109.268089 -119.073471 -23.278990 +v 108.911812 -118.954460 -23.308283 +v 107.031387 -117.848244 -26.129229 +v 107.033066 -117.847740 -23.365519 +v 106.264908 -116.954750 -23.162685 +v 106.269127 -116.974213 -26.324682 +v 106.068375 -116.429749 -26.473082 +v 106.070045 -116.413712 -23.022449 +v 105.914062 -116.636650 -26.220940 +v 106.137367 -116.938736 -26.191647 +v 105.907921 -116.647659 -23.308285 +v 106.493874 -117.349174 -26.138857 +v 106.491188 -117.350410 -23.373053 +v 104.726746 -114.195892 -26.129223 +v 104.728394 -114.196426 -23.365549 +v 104.822464 -114.545067 -23.379536 +v 104.631859 -113.022507 -23.162680 +v 104.779274 -112.999985 -26.468248 +v 104.648239 -112.487961 -26.402102 +v 104.653290 -112.464432 -23.090458 +v 104.538063 -112.934525 -26.191616 +v 104.523544 -112.564232 -23.308273 +v 105.087181 -110.387497 -26.462976 +v 105.155556 -109.832596 -26.360458 +v 104.896599 -110.239540 -26.199535 +v 105.009056 -109.886398 -26.129196 +v 105.010063 -109.887825 -23.365553 +v 105.152374 -109.838074 -23.154184 +v 104.881248 -110.225174 -23.379551 +v 105.092392 -110.401062 -23.022177 +v 105.372734 -109.362762 -26.348320 +v 105.368629 -109.369118 -23.139828 +v 105.621956 -108.881348 -23.162685 +v 105.604774 -108.891373 -26.324699 +v 106.050583 -108.523209 -26.463280 +v 105.950386 -108.422050 -23.131132 +v 105.816109 -108.449364 -26.220978 +v 105.597809 -108.755089 -26.191740 +v 105.803734 -108.446938 -23.308239 +v 106.645790 -107.610580 -23.151661 +v 106.650536 -107.604759 -26.360172 +v 107.025490 -107.258820 -23.139551 +v 107.029694 -107.254181 -26.345798 +v 107.542816 -107.020851 -26.468172 +v 107.920639 -106.608482 -26.360435 +v 107.471954 -106.785492 -26.199545 +v 107.770508 -106.565918 -26.129246 +v 107.770500 -106.567657 -23.365490 +v 107.914856 -106.611061 -23.154173 +v 107.467987 -106.764854 -23.379564 +v 107.535973 -107.029678 -23.029137 +v 108.372490 -106.356041 -26.348307 +v 108.365494 -106.358772 -23.139805 +v 108.857109 -106.113083 -23.162691 +v 108.902298 -106.206047 -26.419893 +v 109.359123 -105.945427 -26.368818 +v 109.392776 -105.934532 -23.131147 +v 108.911804 -105.996712 -26.191757 +v 109.259537 -105.868431 -23.308239 +v 115.666527 -106.886803 -26.199444 +v 115.967598 -107.102913 -26.129251 +v 115.965927 -107.103439 -23.365488 +v 116.718964 -107.991127 -26.359959 +v 116.734016 -107.996368 -23.162659 +v 117.069412 -108.450661 -23.131161 +v 116.505150 -107.602013 -26.138832 +v 116.507820 -107.600739 -23.373091 +v 116.925797 -108.527061 -26.475241 +v 117.084930 -108.314522 -26.220968 +v 116.861664 -108.012482 -26.191666 +v 117.091072 -108.303497 -23.308302 +v 117.681351 -115.730247 -26.138834 +v 117.683403 -115.732368 -23.373100 +v 118.272255 -110.755287 -26.129230 +v 118.270592 -110.754723 -23.365515 +v 117.195274 -108.446938 -26.191736 +v 117.401161 -108.755104 -23.308182 +v 118.222008 -112.469284 -26.470312 +v 118.367126 -111.928650 -23.162661 +v 118.413765 -111.475029 -26.138807 +v 118.375191 -111.910446 -26.324699 +v 118.416672 -111.475571 -23.373085 +v 118.102425 -114.711609 -26.199480 +v 117.989944 -115.064751 -26.129210 +v 117.988930 -115.063332 -23.365538 +v 118.464027 -112.392227 -26.220961 +v 118.460907 -112.016602 -26.191721 +v 118.475456 -112.386932 -23.308270 +v 118.475456 -112.564232 -26.191708 +v 118.464027 -112.558914 -23.279016 +v 118.460915 -112.934547 -23.308266 +v 105.621933 -116.069748 -26.337301 +v 105.621620 -116.053810 -23.140041 +v 105.803734 -116.504234 -26.191729 +v 105.816101 -116.501778 -23.279003 +v 105.597832 -116.196075 -23.308184 +v 105.315598 -115.732368 -26.126888 +v 105.317612 -115.730225 -23.361181 +v 105.010071 -115.063332 -26.134466 +v 104.939186 -114.600082 -26.328922 +v 104.896576 -114.711609 -23.300507 +v 105.009056 -115.064751 -23.370779 +v 104.585213 -113.476120 -26.138838 +v 104.582321 -113.475586 -23.373047 +v 104.538811 -113.118759 -26.120737 +v 104.631859 -111.928658 -26.337307 +v 104.623802 -111.910446 -23.175293 +v 104.523537 -112.386932 -26.191711 +v 104.538063 -112.016624 -23.308363 +v 112.684540 -105.590546 -26.138868 +v 112.566666 -105.686768 -26.348320 +v 112.559410 -105.684875 -23.139795 +v 113.101509 -105.775032 -23.162666 +v 112.685959 -105.587944 -23.373070 +v 113.086708 -105.761787 -26.324703 +v 113.576218 -106.068275 -26.460552 +v 113.639877 -105.945427 -23.131168 +v 113.572388 -105.826195 -26.221016 +v 113.214218 -105.713058 -26.191727 +v 113.570877 -105.813644 -23.308224 +v 114.115753 -106.118004 -23.136036 +v 114.588097 -106.205971 -26.126894 +v 114.141891 -106.113083 -26.337296 +v 114.587700 -106.208885 -23.361217 +v 114.262169 -106.054321 -23.379293 +v 104.582321 -111.475571 -26.126947 +v 104.585213 -111.475029 -23.361158 +v 110.116745 -115.189987 -22.720028 +v 109.362907 -114.621101 -22.640556 +v 110.527718 -115.342987 -14.000011 +v 108.738953 -114.296837 -22.958443 +v 110.393433 -115.690857 -22.982565 +v 111.249481 -115.515762 -22.735580 +v 112.093559 -115.437454 -14.000022 +v 112.306252 -115.412361 -22.730947 +v 113.229523 -114.926483 -13.999995 +v 112.819786 -115.664566 -22.979780 +v 113.253281 -114.970840 -22.735765 +v 113.824379 -110.459023 -13.999974 +v 112.043846 -109.496803 -14.000020 +v 112.899452 -109.394516 -22.975170 +v 113.014458 -109.814232 -22.724606 +v 114.126198 -114.023849 -22.642332 +v 114.121040 -113.991074 -14.000022 +v 114.223000 -110.636360 -22.967575 +v 114.143257 -110.960869 -22.637157 +v 114.286278 -114.089554 -22.898474 +v 114.560959 -112.502213 -22.724180 +v 114.527061 -112.428810 -13.999959 +v 114.617004 -111.635010 -22.922840 +v 114.836731 -113.229530 -22.981779 +v 113.739487 -105.868439 -26.191763 +v 104.728401 -110.754715 -26.134468 +v 104.843300 -110.403496 -23.300518 +v 104.726738 -110.755287 -23.370760 +v 104.822464 -110.406097 -26.120476 +v 112.733315 -112.788704 -26.499992 +v 111.974503 -113.700851 -13.999995 +v 112.092400 -113.602013 -26.499992 +v 112.323097 -111.451569 -13.999991 +v 112.557777 -111.768211 -26.499992 +v 111.059090 -113.669907 -26.499992 +v 111.681984 -111.215782 -26.499992 +v 111.504257 -105.740097 -26.472328 +v 110.480980 -113.305969 -13.999996 +v 111.059082 -111.281250 -13.999991 +v 110.480980 -111.645172 -26.499992 +v 109.190048 -114.433922 -14.000020 +v 110.317276 -112.947502 -26.499992 +v 108.416954 -112.556297 -13.999989 +v 110.432953 -109.641777 -14.000013 +v 109.126831 -110.595253 -14.000003 +v 110.317284 -112.003639 -13.999991 +v 105.317604 -109.220955 -26.138792 +v 105.315598 -109.218788 -23.373110 +v 106.264923 -107.996399 -26.337296 +v 106.261597 -108.022781 -23.135994 +v 105.907928 -108.303513 -26.191719 +v 106.491180 -107.600739 -26.126894 +v 106.493843 -107.602013 -23.361155 +v 106.246231 -107.863846 -23.379305 +v 107.033066 -107.103439 -26.134506 +v 107.332466 -106.886803 -23.300541 +v 107.031387 -107.102913 -23.370714 +v 107.314072 -106.876663 -26.120464 +v 108.411301 -106.208885 -26.138779 +v 108.410896 -106.205971 -23.373100 +v 108.736832 -106.054321 -26.120699 +v 112.046547 -105.624100 -23.154173 +v 112.052666 -105.625366 -26.360420 +v 110.970406 -105.766418 -23.022121 +v 110.439575 -105.684875 -26.360188 +v 109.897469 -105.775047 -26.337324 +v 109.912292 -105.761795 -23.175274 +v 109.428123 -105.813644 -26.191757 +v 109.784782 -105.713058 -23.308256 +v 110.432327 -105.686768 -23.151665 +v 110.952446 -105.624100 -26.345806 +v 110.863823 -105.528076 -23.308264 +v 110.313042 -105.587944 -26.126917 +v 110.314461 -105.590546 -23.361126 +v 112.753990 -112.691406 -13.999993 +v 108.737495 -113.728485 -22.647236 +v 108.201324 -112.486908 -22.963263 +v 111.762169 -109.458458 -22.641386 +v 108.480827 -112.704201 -22.645998 +v 110.477173 -109.603683 -22.640781 +v 108.579346 -111.681595 -22.638948 +v 108.624344 -110.836899 -22.968580 +v 111.212921 -109.259460 -22.922848 +v 109.167183 -110.489693 -22.726385 +v 110.491707 -109.058411 -22.999680 +v 109.942734 -109.634979 -22.921080 +v 111.492706 -105.579842 -23.171036 +v 111.956284 -105.502716 -26.129246 +v 111.585686 -105.504860 -26.199509 +v 111.955269 -105.504112 -23.365473 +v 111.043724 -105.504112 -26.134504 +v 111.042694 -105.502716 -23.370752 +v 111.404388 -105.485840 -26.120455 +v 116.353210 91.659431 -23.151667 +v 116.348442 91.653603 -26.360189 +v 115.973488 91.307648 -23.139576 +v 115.969299 91.303009 -26.345804 +v 115.084137 90.659897 -23.154192 +v 115.461723 91.079292 -23.026499 +v 114.626503 90.404877 -26.348301 +v 115.078445 90.657341 -26.360418 +v 114.633583 90.407654 -23.139812 +v 112.566673 89.735603 -23.151690 +v 112.559410 89.733704 -26.360189 +v 112.052673 89.674210 -23.139578 +v 112.046547 89.672935 -26.345821 +v 110.952446 89.672935 -23.154182 +v 111.505020 89.788887 -23.029142 +v 110.432320 89.735603 -26.348301 +v 110.946320 89.674202 -26.360420 +v 110.439575 89.733704 -23.139814 +v 108.372490 90.404884 -23.151693 +v 108.365479 90.407646 -26.360201 +v 107.920639 90.657303 -23.139568 +v 107.914871 90.659912 -26.345827 +v 107.029694 91.303001 -23.154198 +v 107.545273 91.073479 -23.026501 +v 106.645782 91.659431 -26.348331 +v 107.025497 91.307648 -26.360430 +v 106.650543 91.653580 -23.139820 +v 115.958969 101.735405 -23.129118 +v 116.353210 101.389412 -26.348333 +v 115.973488 101.741203 -26.360432 +v 116.348450 101.395248 -23.139814 +v 117.626266 99.637207 -23.151670 +v 117.630363 99.630852 -26.360182 +v 117.843483 99.167374 -23.139563 +v 117.846611 99.161942 -26.345797 +v 118.184692 98.121376 -23.154163 +v 117.909668 98.612091 -23.035072 +v 118.285820 97.607346 -26.348314 +v 118.185379 98.115135 -26.360428 +v 118.285362 97.614891 -23.139797 +v 117.833488 93.893509 -23.129128 +v 117.626266 93.411644 -26.348330 +v 117.843475 93.881477 -26.360441 +v 117.630363 93.417976 -23.139828 +v 118.285820 95.441498 -23.151682 +v 118.285362 95.433960 -26.360205 +v 118.185387 94.933716 -23.139578 +v 118.184692 94.927483 -26.345829 +v 105.372742 93.411629 -23.151669 +v 105.368637 93.417976 -26.360176 +v 105.155548 93.881439 -23.139545 +v 105.152374 93.886917 -26.345810 +v 104.814301 94.927483 -23.154173 +v 105.092995 94.438004 -23.028816 +v 104.713165 95.441498 -26.348310 +v 104.813606 94.933723 -26.360426 +v 104.713631 95.433960 -23.139791 +v 107.314072 90.925522 -23.379538 +v 107.536613 91.078094 -26.472338 +v 107.770493 90.616493 -26.134468 +v 107.471954 90.834335 -23.300461 +v 107.770500 90.614754 -23.370768 +v 107.467987 90.813690 -26.120434 +v 109.415169 90.127556 -23.034327 +v 108.410896 90.254822 -26.126907 +v 108.857101 90.161942 -26.337326 +v 108.837326 90.159912 -23.175287 +v 108.411301 90.257744 -23.361177 +v 111.404388 89.534683 -23.379543 +v 111.494286 89.785774 -26.468185 +v 111.955254 89.552948 -26.134481 +v 111.585686 89.553711 -23.300467 +v 111.956284 89.551559 -23.370758 +v 111.594612 89.534683 -26.120462 +v 113.119774 89.843292 -23.136005 +v 112.685959 89.636780 -26.126934 +v 113.101509 89.823875 -26.337320 +v 112.684532 89.639381 -23.361135 +v 113.038765 89.705666 -23.379284 +v 117.377373 100.102661 -23.140045 +v 117.683403 99.781212 -26.126883 +v 117.377052 100.118622 -26.337315 +v 117.681358 99.779076 -23.361174 +v 115.530998 90.813698 -23.379555 +v 115.451775 91.070381 -26.477591 +v 115.965927 91.152260 -26.134464 +v 115.666519 90.935654 -23.300524 +v 115.967598 91.151741 -23.370783 +v 115.684921 90.925522 -26.120472 +v 118.176529 98.593910 -23.379580 +v 117.988930 99.112175 -26.134455 +v 118.102409 98.760468 -23.300461 +v 117.989944 99.113594 -23.370787 +v 118.117752 98.774841 -26.120443 +v 116.718971 92.039970 -23.140041 +v 116.924179 92.576836 -23.023548 +v 116.507812 91.649590 -26.126926 +v 116.734024 92.045227 -26.337339 +v 116.505150 91.650856 -23.361149 +v 118.059814 94.399925 -23.171045 +v 117.911819 94.436340 -26.462986 +v 118.217430 96.517746 -23.026695 +v 118.270599 94.803566 -26.134468 +v 118.272255 94.804131 -23.370771 +v 118.176521 94.454941 -26.120430 +v 118.416672 95.524414 -26.126909 +v 118.367126 95.977455 -26.337337 +v 118.375175 95.959282 -23.175280 +v 118.413765 95.523872 -23.361191 +v 115.084137 102.388954 -26.345806 +v 114.633575 102.641205 -26.360184 +v 115.547295 102.107155 -23.171055 +v 115.078445 102.391510 -23.139584 +v 115.464394 101.974220 -26.469585 +v 116.928970 100.462585 -23.022461 +v 115.228508 102.432350 -26.134474 +v 115.228500 102.434090 -23.370773 +v 115.531006 102.235153 -26.120451 +v 114.626511 102.643974 -23.151699 +v 104.713165 97.607346 -23.151690 +v 104.713631 97.614891 -26.360207 +v 104.813606 98.115128 -23.139572 +v 104.814301 98.121376 -26.345831 +v 117.377052 92.930229 -23.162682 +v 117.394218 92.940216 -26.324709 +v 116.951477 92.569412 -26.460562 +v 117.182907 92.498215 -26.220984 +v 117.401161 92.803947 -26.191807 +v 117.195251 92.495766 -23.308226 +v 117.091064 92.352333 -26.191687 +v 117.084930 92.363358 -23.279018 +v 116.861641 92.061302 -23.308294 +v 115.527077 90.834366 -26.199593 +v 115.228500 90.614754 -26.129230 +v 115.228508 90.616493 -23.365540 +v 114.141899 90.161934 -23.162682 +v 114.161674 90.159912 -26.324711 +v 113.639862 89.994293 -26.368839 +v 113.606216 89.983360 -23.131161 +v 114.087189 90.045555 -26.191742 +v 113.739487 89.917297 -23.308212 +v 114.587700 90.257744 -26.138830 +v 114.588097 90.254822 -23.373100 +v 111.413307 89.553711 -26.199537 +v 111.042694 89.551559 -26.129244 +v 111.043739 89.552956 -23.365511 +v 113.570869 89.862488 -26.191715 +v 109.915527 89.925667 -26.419905 +v 109.897469 89.823891 -23.162672 +v 110.314461 89.639381 -26.138870 +v 110.313042 89.636780 -23.373070 +v 109.960236 89.705666 -26.120722 +v 109.392776 89.983368 -26.368843 +v 109.784782 89.761909 -26.191729 +v 109.428131 89.862495 -23.308275 +v 109.259529 89.917282 -26.191748 +v 109.268082 89.926529 -23.279005 +v 108.911804 90.045563 -23.308250 +v 107.332481 90.935654 -26.199478 +v 107.031387 91.151749 -26.129246 +v 107.033066 91.152260 -23.365541 +v 106.264915 92.045250 -23.162693 +v 106.269142 92.025803 -26.324717 +v 106.053291 92.561470 -26.460562 +v 106.054054 92.575249 -23.031723 +v 105.914070 92.363358 -26.220961 +v 106.137352 92.061295 -26.191637 +v 105.907928 92.352348 -23.308256 +v 106.493851 91.650856 -26.138853 +v 106.491180 91.649590 -23.373079 +v 105.090111 94.450569 -26.476782 +v 104.843315 94.452332 -26.199493 +v 104.726738 94.804123 -26.129232 +v 104.728394 94.803566 -23.365547 +v 104.822464 94.454941 -23.379522 +v 104.631859 95.977463 -23.162672 +v 104.623817 95.959282 -26.324713 +v 104.627563 96.506744 -26.368847 +v 104.627563 96.542107 -23.131157 +v 104.538063 96.065483 -26.191624 +v 104.523544 96.435783 -23.308275 +v 105.087189 98.612518 -26.462988 +v 105.155548 99.167419 -26.360458 +v 104.896591 98.760468 -26.199539 +v 105.009056 99.113594 -26.129219 +v 105.010071 99.112175 -23.365540 +v 105.165504 99.155334 -23.129116 +v 104.939178 98.648926 -23.171055 +v 105.372742 99.637222 -26.348339 +v 105.368629 99.630852 -23.139816 +v 105.621941 100.118622 -23.162689 +v 105.621620 100.102661 -26.359953 +v 106.068802 100.463707 -26.476456 +v 106.071548 100.476707 -23.024601 +v 105.816109 100.550636 -26.220984 +v 105.597816 100.244919 -26.191759 +v 105.803741 100.553085 -23.308233 +v 106.645782 101.389412 -23.151665 +v 106.650551 101.395264 -26.360182 +v 107.025497 101.741196 -23.139568 +v 107.040031 101.735405 -26.370880 +v 107.920639 102.391541 -26.360434 +v 107.770500 102.434090 -26.129234 +v 107.770493 102.432350 -23.365530 +v 107.914871 102.388939 -23.154177 +v 107.467987 102.235161 -23.379580 +v 107.535469 101.972633 -23.028818 +v 108.372490 102.643967 -26.348303 +v 108.365486 102.641220 -23.139811 +v 108.857094 102.886917 -23.162676 +v 108.837326 102.888939 -26.324711 +v 109.416122 102.915932 -26.470329 +v 109.392776 103.065483 -23.131163 +v 109.268074 103.122322 -26.220985 +v 108.911804 103.003288 -26.191744 +v 109.259537 103.131569 -23.308245 +v 115.666527 102.113197 -26.199469 +v 115.967598 101.897102 -26.129223 +v 115.965927 101.896591 -23.365549 +v 116.934402 100.480896 -26.470327 +v 116.734024 101.003624 -23.162663 +v 116.505150 101.397995 -26.138855 +v 116.729858 101.023048 -26.324717 +v 116.507820 101.399261 -23.373087 +v 117.084930 100.685493 -26.220976 +v 116.861649 100.987541 -26.191704 +v 117.091064 100.696518 -23.308300 +v 117.681358 93.269768 -26.138836 +v 117.683411 93.267639 -23.373117 +v 118.155685 98.596519 -26.199495 +v 118.272255 98.244720 -26.129234 +v 118.270599 98.245277 -23.365536 +v 117.195259 100.553085 -26.191759 +v 117.182899 100.550636 -23.279001 +v 117.401161 100.244904 -23.308178 +v 117.908890 98.598282 -26.476782 +v 118.367126 97.071388 -23.162659 +v 118.413765 97.524979 -26.138817 +v 118.375175 97.089561 -26.324720 +v 118.416672 97.524437 -23.373093 +v 118.102409 94.288391 -26.199526 +v 117.989944 93.935257 -26.129219 +v 117.988930 93.936668 -23.365561 +v 118.371445 96.542107 -26.368834 +v 118.460915 96.983383 -26.191727 +v 118.475456 96.613068 -23.308277 +v 118.475456 96.435783 -26.191715 +v 118.464027 96.441071 -23.279020 +v 118.460915 96.065460 -23.308268 +v 105.621948 92.930229 -26.337315 +v 105.604774 92.940216 -23.175295 +v 105.803749 92.495766 -26.191769 +v 105.816109 92.498215 -23.279001 +v 105.597816 92.803932 -23.308243 +v 105.315590 93.267639 -26.126884 +v 105.317604 93.269791 -23.361191 +v 105.010071 93.936668 -26.134459 +v 104.896591 94.288391 -23.300474 +v 105.009056 93.935257 -23.370785 +v 104.881248 94.274010 -26.120451 +v 104.585213 95.523865 -26.138845 +v 104.582321 95.524414 -23.373049 +v 104.631859 97.071388 -26.337326 +v 104.781113 97.048439 -23.030069 +v 104.523537 96.613075 -26.191719 +v 104.538063 96.983353 -23.308372 +v 112.684540 103.409477 -26.138849 +v 112.566673 103.313248 -26.348303 +v 112.559410 103.315147 -23.139811 +v 113.101517 103.224976 -23.162680 +v 112.685959 103.412071 -23.373093 +v 113.083473 103.123184 -26.419905 +v 113.038765 103.343185 -26.120712 +v 113.606216 103.065491 -26.368835 +v 113.582321 102.913582 -23.028103 +v 113.214203 103.286934 -26.191767 +v 113.570869 103.186356 -23.308254 +v 114.588097 102.794037 -26.126915 +v 114.141899 102.886909 -26.337324 +v 114.161674 102.888947 -23.175289 +v 114.587700 102.791115 -23.361177 +v 104.582321 97.524437 -26.126957 +v 104.585213 97.524986 -23.361164 +v 104.538811 97.167603 -23.379261 +v 110.428726 93.654037 -22.727043 +v 109.356094 94.358231 -22.732672 +v 110.527596 93.657066 -14.000015 +v 108.586906 94.789528 -22.984072 +v 109.844536 93.565674 -22.984072 +v 112.038528 93.523094 -22.642401 +v 112.093590 93.562561 -14.000026 +v 111.818459 93.267242 -22.919392 +v 111.898560 92.984055 -22.999710 +v 113.229523 94.073509 -13.999999 +v 113.253296 94.029190 -22.735762 +v 113.824379 98.540970 -13.999983 +v 112.067749 99.536438 -22.729780 +v 112.044106 99.503197 -14.000029 +v 113.429665 99.184258 -22.967585 +v 113.243195 98.997536 -22.638626 +v 111.687531 99.844383 -22.960106 +v 114.126205 94.976166 -22.642334 +v 114.121040 95.008926 -14.000027 +v 113.649094 93.960403 -22.975403 +v 114.553719 98.000977 -22.978775 +v 114.161835 98.038757 -22.725740 +v 114.545311 96.505623 -22.634708 +v 114.527061 96.571182 -13.999967 +v 114.427986 95.164528 -22.922844 +v 114.739517 96.503891 -22.918791 +v 114.962738 95.688583 -22.999687 +v 113.739487 103.131561 -26.191772 +v 113.730919 103.122314 -23.279001 +v 114.087189 103.003288 -23.308250 +v 104.728401 98.245277 -26.134462 +v 104.726738 98.244720 -23.370773 +v 104.822464 98.593910 -26.120478 +v 112.668404 95.923950 -26.500000 +v 112.557770 95.817017 -14.000000 +v 112.668404 97.124893 -14.000000 +v 111.681931 95.264626 -14.000000 +v 111.583008 95.254227 -26.500000 +v 112.557770 97.231827 -26.500000 +v 111.582985 97.794624 -14.000000 +v 111.681908 97.784225 -26.500000 +v 111.504677 103.263084 -26.468184 +v 110.685341 95.545876 -14.000000 +v 110.611420 95.612442 -26.500000 +v 110.685333 97.502968 -26.500000 +v 109.190002 94.566139 -14.000024 +v 108.416954 96.443710 -13.999996 +v 110.611420 97.436409 -14.000000 +v 110.433022 99.358269 -14.000022 +v 109.126839 98.404778 -14.000011 +v 110.227547 96.474693 -14.000000 +v 110.227547 96.574158 -26.500000 +v 105.317604 99.779053 -26.138813 +v 105.315598 99.781212 -23.373125 +v 106.264915 101.003593 -26.337307 +v 106.269135 101.023048 -23.175283 +v 105.907936 100.696503 -26.191736 +v 105.914070 100.685493 -23.279016 +v 106.137352 100.987549 -23.308350 +v 106.491180 101.399261 -26.126919 +v 106.493851 101.397995 -23.361139 +v 107.033066 101.896591 -26.134459 +v 107.451691 102.107124 -26.328938 +v 107.332474 102.113197 -23.300531 +v 107.031387 101.897095 -23.370758 +v 108.411301 102.791107 -26.138834 +v 108.410896 102.794037 -23.373093 +v 112.046547 103.375916 -23.154181 +v 112.052673 103.374641 -26.360424 +v 111.493950 103.259956 -23.029140 +v 110.439575 103.315140 -26.360188 +v 109.897461 103.224960 -26.337326 +v 109.879211 103.205559 -23.136005 +v 109.428131 103.186356 -26.191740 +v 110.432320 103.313248 -23.151697 +v 110.946320 103.374641 -23.139578 +v 110.952446 103.375916 -26.345816 +v 110.313042 103.412071 -26.126911 +v 110.314461 103.409477 -23.361160 +v 109.960236 103.343185 -23.379293 +v 108.728760 95.249306 -22.734821 +v 108.208153 96.508377 -22.958279 +v 108.480827 96.295815 -22.646009 +v 108.512215 97.887276 -22.966059 +v 110.477188 99.396339 -22.640799 +v 108.579353 97.318413 -22.638962 +v 109.167160 98.510300 -22.726402 +v 109.942780 99.365051 -22.921089 +v 109.729996 99.707039 -22.997484 +v 111.956284 103.497292 -26.129250 +v 111.585686 103.495132 -26.199549 +v 111.955254 103.495895 -23.365511 +v 111.594612 103.514168 -23.379551 +v 111.043739 103.495895 -26.134483 +v 111.413307 103.495132 -23.300457 +v 111.042702 103.497292 -23.370770 +v 111.404388 103.514168 -26.120455 +v -102.892654 142.525314 -21.401598 +v -102.923523 145.525314 -21.369383 +v -96.504074 142.525314 40.485481 +v -96.485199 145.525314 40.510227 +v 110.343636 142.525314 40.545589 +v 110.370224 145.525314 40.529388 +v 116.810493 145.525314 -21.390959 +v 116.839272 142.525314 -21.356922 +v 121.531898 -115.487671 -19.115379 +v 121.500000 153.974579 -19.999990 +v 119.886345 -115.474854 -20.579473 +v 120.000000 -115.474854 -18.999994 +v 119.929924 153.974579 -20.567774 +v 119.999893 153.974579 -22.598137 +v 118.499969 -24.595718 -22.999998 +v 118.500015 49.599144 -23.000000 +v 118.500000 85.337204 -23.000000 +v 120.000000 -103.474854 -6.999995 +v 121.500000 -103.474854 -6.999995 +v 121.500000 153.974579 -7.000003 +v 120.000000 153.974579 -7.000003 +v 121.098083 -115.474854 -21.499994 +v 121.098091 153.974579 -21.499998 +v 119.250000 -115.474854 -21.299036 +v 120.000000 -115.474854 -22.598063 +v 118.628860 153.974579 -21.488199 +v 118.500000 65.030304 -21.500002 +v 118.500046 153.974579 -23.000004 +v 106.551086 153.240143 -21.500004 +v 106.551086 153.240143 -23.000004 +v 94.215530 153.240143 -23.000004 +v 92.101448 153.240143 -21.500004 +v -105.999992 153.974579 -22.598064 +v -107.247108 -115.474854 -21.289272 +v -107.098083 153.974579 -21.500002 +v -105.999985 -115.474854 -22.598063 +v -105.876991 -115.474854 -20.627016 +v -105.913940 153.974579 -20.509134 +v -105.249992 153.974579 -21.299053 +v -105.250000 -115.474854 -21.299036 +v -104.500008 124.117516 -23.000002 +v -104.499992 153.974579 -23.000004 +v -93.000595 153.240143 -23.000004 +v -104.500015 153.974579 -21.500004 +v -104.500008 124.117516 -21.500002 +v -84.643646 144.874222 -23.000004 +v -86.089821 153.240143 -21.500004 +v -77.065254 153.974579 -23.000004 +v 26.131580 145.536591 -23.000004 +v -11.668530 148.656021 -21.500004 +v 14.693684 153.974579 -21.500004 +v -74.010185 151.917892 -23.000004 +v -107.500000 153.974579 -7.000003 +v -107.500000 -103.474854 -6.999995 +v -105.999985 -103.474854 -6.999995 +v -105.999985 153.974579 -7.000003 +v -107.500000 153.974579 -19.999994 +v -107.500000 -115.474854 -18.999994 +v -105.999985 -115.474854 -18.999994 +v -12.576094 153.974579 -23.000004 +v 59.044201 -77.482895 -22.999994 +v 62.987305 -69.584831 -22.999994 +v 63.280949 -70.343262 -22.999994 +v 67.979622 -73.009056 -22.999994 +v 68.774742 -72.798950 -22.999994 +v 67.966629 -73.022049 -21.499994 +v 63.154724 -70.209641 -21.499994 +v 92.169235 -31.101868 -22.999998 +v 92.381653 -31.933653 -21.499998 +v 92.164482 -31.119617 -21.499998 +v 92.363007 -31.974918 -22.999998 +v 68.805916 -72.761490 -21.499994 +v 35.946056 -50.398724 -21.499996 +v 36.006046 -50.335636 -22.999996 +v 33.031967 -52.161163 -22.999996 +v 33.031967 -52.161163 -21.499996 +v 29.756058 -52.367950 -21.499996 +v 28.124456 -89.049477 -22.999992 +v 27.665493 -88.591911 -21.499992 +v 27.488846 -88.539619 -22.999992 +v 39.102341 -89.093773 -22.999992 +v 56.186348 -64.664413 -22.999994 +v 39.664360 -88.542961 -22.999992 +v 58.280346 -77.678070 -22.999994 +v 45.040451 -88.457642 -22.999992 +v 39.669083 -88.525261 -21.499992 +v 58.298096 -77.682823 -21.499994 +v 55.443451 -82.488647 -21.499994 +v 55.443451 -82.488647 -22.999994 +v 50.083725 -87.243439 -22.999994 +v 45.040451 -88.457642 -21.499992 +v 53.477097 -84.937378 -22.999994 +v 53.477097 -84.937378 -21.499994 +v 50.083725 -87.243439 -21.499994 +v 114.500000 -120.974854 -22.598063 +v 83.572388 -113.760231 -22.999994 +v 51.856598 -94.787323 -21.499992 +v 51.324245 -94.976303 -22.999992 +v 48.908463 -95.213165 -21.499992 +v 55.802094 -92.935150 -21.499992 +v 108.684906 -110.850601 -21.499992 +v -16.365599 -95.330292 -21.499992 +v 55.802094 -92.935150 -22.999992 +v 59.318954 -89.240662 -22.999992 +v 59.318954 -89.240662 -21.499992 +v 64.008461 -80.979645 -22.999994 +v 64.021454 -80.992638 -21.499994 +v 63.813320 -80.215836 -22.999994 +v 63.808563 -80.233582 -21.499994 +v 59.057194 -77.469902 -21.499994 +v -85.858551 -117.600220 -22.999994 +v 114.500000 -119.474854 -22.999996 +v 39.768185 -95.212303 -22.999992 +v -32.144661 -117.600220 -22.999994 +v 27.592680 -95.209030 -22.999992 +v 27.587959 -95.226730 -21.499992 +v 39.591537 -95.160011 -21.499992 +v 28.154650 -94.658272 -22.999992 +v -16.188904 -95.382599 -22.999992 +v -20.361893 -109.110764 -21.499994 +v 39.132542 -94.702408 -22.999992 +v 28.136967 -94.663040 -21.499992 +v -21.553925 -100.621307 -22.999992 +v 39.079716 -94.525925 -21.499992 +v -16.824560 -94.872749 -22.999992 +v -16.877390 -94.696251 -21.499992 +v 28.177273 -89.225937 -21.499992 +v -1.771698 -68.272858 -22.999994 +v 29.756058 -52.367954 -22.999996 +v -2.384178 -71.780380 -22.999994 +v -16.854765 -89.263596 -22.999992 +v 39.120026 -89.089005 -21.499992 +v -16.837078 -89.258820 -21.499992 +v -4.967880 -74.569519 -22.999994 +v -16.292730 -88.712845 -22.999992 +v -11.379465 -75.049316 -22.999994 +v -19.150482 -70.645973 -22.999994 +v -8.113785 -75.591003 -22.999994 +v -2.462420 -71.935783 -21.499994 +v -16.288010 -88.695152 -21.499992 +v -11.425268 -75.034050 -21.499994 +v -4.967880 -74.569519 -21.499994 +v -8.113785 -75.591003 -21.499994 +v 118.500008 -115.474854 -22.999992 +v 114.314056 -114.100586 -22.999994 +v 114.314056 -114.100586 -21.499994 +v 114.749512 -112.475586 -22.999992 +v 113.124512 -115.290161 -21.499994 +v 118.500000 -115.474854 -21.499994 +v 113.124512 -115.290161 -22.999994 +v 117.964111 -117.474854 -21.499994 +v 117.964119 -117.474846 -22.999996 +v 116.500000 -118.938965 -21.499994 +v 116.500000 -118.938965 -22.999994 +v 111.499481 -115.725586 -21.499996 +v 114.500000 -120.224854 -21.299036 +v -100.499992 -119.474854 -21.499996 +v 109.874481 -115.290161 -21.499996 +v 114.500000 -119.474854 -21.499996 +v 92.112549 -20.406118 -22.999998 +v 91.986305 -20.272478 -21.499998 +v 87.400414 -28.369089 -22.999998 +v 96.883385 -23.099819 -22.999998 +v 96.704559 -23.057318 -21.499998 +v 75.304001 -24.778494 -21.499998 +v 102.495590 -24.943933 -21.499998 +v 97.641800 -22.806217 -22.999998 +v 102.995667 -12.586763 -21.499996 +v 102.995667 -12.586763 -22.999996 +v 101.831451 -15.606646 -22.999994 +v 97.508224 -22.932409 -21.499998 +v 101.831451 -15.606646 -21.499994 +v -35.102562 -63.686157 -22.999994 +v -35.113178 -63.705959 -21.499994 +v -21.574772 -54.573730 -22.999996 +v -21.006617 -70.707413 -21.499994 +v -20.860058 -70.659332 -22.999994 +v -26.655060 -74.434662 -22.999994 +v -26.655058 -74.434662 -21.499994 +v -29.742905 -75.576447 -22.999994 +v -22.932800 -76.574158 -22.999994 +v -36.979889 -66.421509 -22.999994 +v -36.979889 -66.421509 -21.499994 +v -44.968147 -78.822853 -22.999994 +v -49.665165 -81.562599 -22.999994 +v -49.669868 -81.544838 -21.499994 +v -49.880432 -82.321014 -22.999994 +v -37.366257 -69.630463 -22.999994 +v -33.040085 -75.153137 -22.999994 +v -38.728302 -85.848206 -21.499994 +v -32.861332 -88.509171 -22.999992 +v -32.593433 -88.568596 -21.499992 +v -37.366257 -69.630463 -21.499994 +v -35.953056 -73.081406 -22.999994 +v -38.728302 -85.848206 -22.999994 +v -42.432549 -81.808655 -22.999994 +v -44.164913 -78.950188 -22.999994 +v -36.050007 -72.957703 -21.499994 +v -54.594658 -74.133286 -22.999994 +v -42.432549 -81.808655 -21.499994 +v -44.031662 -79.076843 -21.499994 +v -33.040085 -75.153137 -21.499994 +v -44.789165 -78.780884 -21.499994 +v -29.742907 -75.576447 -21.499994 +v -53.896648 -74.336372 -21.499994 +v -24.873383 -95.368729 -22.999992 +v -19.299879 -70.607697 -21.499994 +v -24.878099 -95.386421 -21.499992 +v -24.311352 -94.817993 -22.999992 +v -24.329035 -94.822769 -21.499992 +v -24.341549 -89.208786 -22.999992 +v -24.288733 -89.385231 -21.499992 +v -24.977167 -88.698891 -22.999992 +v -24.800547 -88.751175 -21.499992 +v 95.362137 7.488527 -22.999996 +v 94.558876 7.615868 -22.999996 +v 95.492889 -10.733858 -21.499996 +v 95.492889 -10.733858 -22.999996 +v 94.999542 -5.763963 -22.999996 +v 89.801476 4.827792 -22.999996 +v 94.044464 -15.630648 -22.999994 +v 94.044464 -15.630648 -21.499994 +v 94.888298 -5.410875 -21.499996 +v 89.928116 4.961040 -21.499996 +v 94.780441 9.527388 -21.499996 +v 94.737877 7.657838 -21.499996 +v 89.422455 9.527388 -22.999996 +v 37.670979 -47.233124 -22.999996 +v 91.861420 -19.468855 -21.499994 +v 91.818901 -19.647726 -22.999994 +v 89.674141 4.024535 -22.999996 +v 37.670971 -47.233135 -21.499996 +v 89.632179 4.203504 -21.499996 +v 86.107956 11.424822 -21.499996 +v 54.404964 5.674918 -22.999998 +v 87.413414 -28.356098 -21.499998 +v 86.636581 -28.564266 -22.999998 +v 63.029812 -69.406006 -21.499994 +v 86.654327 -28.569023 -21.499998 +v 118.500000 -18.960323 -21.499996 +v 113.124512 93.709831 -21.500004 +v 113.124512 93.709831 -23.000000 +v 114.314056 94.899422 -23.000000 +v 114.749512 96.524422 -23.000000 +v 114.314056 94.899422 -21.500000 +v 114.314056 98.149422 -23.000000 +v 114.749512 96.524422 -21.500000 +v 113.124512 99.338997 -23.000000 +v 108.684906 98.149422 -23.000000 +v 109.874481 99.338997 -23.000000 +v 111.499481 99.774429 -23.000000 +v 114.314056 98.149422 -21.500000 +v 109.874481 99.338997 -21.500000 +v 113.124512 99.338997 -21.500000 +v 111.499481 99.774429 -21.500000 +v 95.495415 7.361856 -21.499996 +v 101.785950 -3.553148 -22.999996 +v 103.276428 -8.568377 -21.499996 +v 103.276428 -8.568377 -22.999996 +v 101.785950 -3.553148 -21.499996 +v 111.499481 -115.725586 -22.999994 +v 109.874481 -115.290161 -22.999996 +v 108.684906 -114.100586 -21.499994 +v 108.684906 -114.100586 -22.999994 +v 108.249481 -112.475586 -21.499992 +v 108.249481 -112.475586 -22.999992 +v 108.684906 -110.850586 -22.999992 +v 114.314056 -110.850586 -22.999992 +v 114.749512 -112.475586 -21.499992 +v 114.314056 -110.850586 -21.499992 +v 109.874481 -109.660980 -21.499992 +v 113.124512 -109.660980 -22.999992 +v 111.499481 -109.225586 -22.999992 +v 109.874481 -109.660980 -22.999992 +v 113.124512 -109.660980 -21.499992 +v 111.499481 -109.225586 -21.499992 +v -21.662851 -54.618553 -21.499996 +v -19.615841 -54.550850 -22.999996 +v -19.706747 -54.511936 -21.499996 +v 4.152949 -52.126160 -22.999996 +v -1.771698 -68.272858 -21.499994 +v -2.795288 -65.200836 -21.499994 +v -2.795288 -65.200836 -22.999994 +v -5.146057 -62.941162 -21.499996 +v -5.146057 -62.941162 -22.999996 +v 4.152952 -52.126160 -21.499996 +v 7.549850 -51.453491 -21.499996 +v 26.740967 -51.022919 -22.999996 +v 7.549850 -51.453491 -22.999996 +v 9.452103 -49.918076 -21.499996 +v 26.740967 -51.022919 -21.499996 +v 9.452103 -49.918076 -22.999996 +v -0.489434 -18.908272 -21.499994 +v -0.491133 -18.891014 -22.999994 +v 24.632462 -48.360500 -22.999998 +v 10.535110 -47.087463 -21.499996 +v 10.535110 -47.087463 -22.999996 +v 24.626549 -48.338749 -21.499998 +v 9.756439 -41.849655 -21.499996 +v 9.756439 -41.849655 -22.999996 +v 2.402745 -22.612518 -22.999998 +v 2.402709 -22.612474 -21.499998 +v 52.738159 65.971909 -21.500002 +v 52.738155 65.971916 -23.000002 +v 46.870678 68.633858 -23.000002 +v 46.602879 68.693275 -21.500002 +v 56.441956 61.932850 -21.500000 +v 32.874672 40.331425 -23.000000 +v 32.962749 40.376247 -21.500000 +v 47.350609 58.715069 -21.500000 +v 44.340179 60.910797 -21.500000 +v 58.867382 42.415630 -21.500000 +v 60.145943 55.611332 -23.000000 +v 56.441956 61.932846 -23.000000 +v 60.128178 55.606632 -21.500000 +v 46.402096 49.443550 -23.000000 +v 51.110447 37.166351 -22.999998 +v 48.666351 55.387928 -21.500000 +v 60.904350 55.396122 -23.000000 +v 60.891396 55.409153 -21.500000 +v 46.412708 49.463333 -21.500000 +v 60.867290 53.674698 -23.000000 +v 48.279633 52.178680 -21.500000 +v 48.279633 52.178684 -23.000000 +v 59.505035 38.926605 -23.000000 +v 54.298721 36.386475 -22.999998 +v 64.954056 51.298721 -23.000000 +v 54.298721 36.386475 -21.499998 +v 56.775238 34.203232 -22.999998 +v 51.110443 37.166351 -21.499998 +v 54.400173 5.667500 -21.499996 +v 56.775238 34.203232 -21.499998 +v 58.033733 30.819920 -22.999998 +v 58.045082 30.651733 -21.499998 +v 62.754181 13.202290 -22.999998 +v 57.220093 26.983610 -22.999998 +v 54.290237 9.151854 -21.499996 +v 54.290237 9.151854 -22.999996 +v 55.177658 24.718260 -22.999998 +v 57.220093 26.983610 -21.499998 +v 52.768463 11.901747 -22.999996 +v 52.768463 11.901747 -21.499996 +v 55.177658 24.718260 -21.499998 +v 51.897430 23.433353 -22.999998 +v 49.616386 13.875246 -21.499998 +v 49.453835 13.920207 -22.999998 +v 51.932732 23.454184 -21.499998 +v 31.031855 -20.202789 -21.500000 +v 30.932533 -20.202496 -23.000000 +v 30.216211 -19.837399 -21.499994 +v 16.948973 22.676838 -21.499998 +v 16.965330 22.532146 -22.999998 +v 17.461878 23.372612 -22.999998 +v 31.750355 -19.841938 -22.999996 +v 45.842606 13.849195 -21.499998 +v 45.842606 13.849195 -22.999998 +v 30.171665 -19.781557 -22.999994 +v 31.795221 -19.786369 -21.499994 +v 42.964600 12.232100 -22.999996 +v 42.964600 12.232100 -21.499996 +v 17.661930 23.433796 -21.499998 +v 41.175949 9.479353 -22.999996 +v 41.175949 9.479353 -21.499996 +v -34.457027 -17.463114 -21.499994 +v -34.293259 -17.503298 -22.999994 +v -14.320551 -11.976999 -21.499996 +v -14.342632 -12.067060 -22.999996 +v -18.919525 4.900913 -21.499996 +v -18.875217 4.844482 -22.999996 +v -14.434052 -9.690157 -22.999996 +v -14.434052 -9.690157 -21.499996 +v -17.577286 -17.631277 -22.999994 +v -19.636629 5.271645 -22.999996 +v -19.736456 5.272325 -21.499996 +v -30.684357 -17.322069 -21.499994 +v -17.537441 -17.501934 -21.499994 +v -20.458586 4.911345 -22.999996 +v -41.660179 -26.538301 -21.500000 +v -21.094299 -24.613054 -22.999998 +v -30.684357 -17.322069 -22.999994 +v -27.858658 -15.618227 -22.999994 +v -20.503668 4.855506 -21.499996 +v -26.156052 -12.813158 -22.999994 +v -27.858658 -15.618227 -21.499994 +v -21.094299 -24.613054 -21.499998 +v -33.644695 -37.410954 -21.499998 +v -33.660484 -37.555168 -22.999998 +v -26.156052 -12.813158 -21.499994 +v -32.792427 -34.341576 -21.499998 +v -32.787731 -34.289791 -22.999998 +v -39.481323 -24.613054 -22.999998 +v -32.975849 -38.293396 -22.999996 +v -6.390838 -38.323280 -22.999996 +v -17.540848 -21.366899 -21.499998 +v -17.540848 -21.366899 -22.999998 +v -5.617740 -37.513924 -21.499998 +v -5.634076 -37.614498 -22.999998 +v -33.181717 -38.218391 -21.499996 +v -34.740097 -28.195059 -21.499998 +v -16.344757 -23.694508 -22.999998 +v -14.965867 -24.968065 -22.999998 +v -16.344757 -23.694506 -21.499998 +v -6.354491 -38.322720 -21.499996 +v -9.201382 -27.583124 -22.999998 +v -14.965866 -24.968067 -21.499998 +v -9.831474 -26.792418 -22.999998 +v -9.871948 -26.784071 -21.499998 +v -9.209949 -27.570393 -21.499998 +v -48.818481 -70.809151 -21.499994 +v -44.691662 -52.097244 -21.499996 +v -44.824299 -52.015224 -22.999996 +v -48.805450 -70.796211 -22.999994 +v -48.154305 -50.137756 -21.499996 +v -48.154305 -50.137756 -22.999996 +v -49.879173 -47.322830 -22.999996 +v -49.879173 -47.322830 -21.499996 +v -72.019394 -30.259047 -21.499998 +v -104.500008 -24.577547 -22.999996 +v -81.986923 -85.613586 -22.999994 +v -49.020653 -71.554672 -22.999994 +v -49.015953 -71.572441 -21.499994 +v -72.776932 -29.963072 -21.500000 +v -82.112762 -27.260088 -21.499998 +v -77.657349 -32.726868 -21.499998 +v -53.717651 -74.294403 -22.999994 +v -77.853775 -33.599819 -21.499998 +v 102.500000 -122.474854 -6.999994 +v -88.500000 -120.974854 -6.999994 +v -88.500000 -122.474854 -6.999994 +v 102.500000 -120.974854 -6.999994 +v -75.611954 -74.789536 -21.499994 +v 114.516464 -122.551666 -19.098789 +v -100.499992 -120.974854 -18.999994 +v 114.500000 -120.974854 -18.999994 +v -100.750511 -112.475586 -22.999992 +v -100.750511 -112.475586 -21.499992 +v -100.315102 -114.100586 -22.999994 +v -77.873543 -33.573338 -22.999998 +v -100.512093 -122.520012 -19.108892 +v -100.315102 -114.100586 -21.499994 +v -104.500008 -115.474854 -22.999994 +v -34.389557 -95.466644 -22.999992 +v -100.499992 -120.974854 -22.598063 +v -100.499992 -120.904816 -20.516533 +v -95.875511 -115.290161 -22.999994 +v -97.500511 -115.725586 -21.499994 +v -95.875511 -115.290161 -21.499994 +v -97.500511 -115.725586 -22.999994 +v -99.125511 -115.290161 -21.499994 +v -99.125511 -115.290161 -22.999994 +v -103.964096 -117.474854 -22.999994 +v -54.692650 -74.014313 -21.499994 +v -100.499992 -119.474861 -22.999996 +v -100.499992 -122.072937 -21.499994 +v 114.500000 -122.072937 -21.499994 +v 114.500000 -120.863251 -20.619791 +v -104.500008 -115.474854 -21.499994 +v -39.726273 -94.283936 -22.999992 +v -102.500000 -118.938965 -22.999994 +v -103.964096 -117.474854 -21.499994 +v -45.018452 -90.509079 -22.999992 +v -34.389557 -95.466644 -21.499992 +v -100.499992 -120.224854 -21.299036 +v -49.867401 -82.308060 -21.499994 +v -39.726269 -94.283943 -21.499992 +v -102.500000 -118.938965 -21.499994 +v -45.217987 -90.291542 -21.499992 +v -94.685921 -114.100586 -22.999994 +v -100.315102 -110.850586 -21.499992 +v -94.685921 -114.100586 -21.499994 +v -94.250511 -112.475586 -22.999992 +v -100.315102 -110.850586 -22.999992 +v -94.250511 -112.475586 -21.499992 +v -99.125511 -109.660980 -21.499992 +v -97.500511 -109.225586 -21.499992 +v -76.922493 -102.240273 -21.499992 +v -95.875511 -109.660980 -21.499992 +v -94.685921 -110.850586 -21.499992 +v -94.685921 -110.850586 -22.999992 +v -99.125511 -109.660980 -22.999992 +v -97.500511 -109.225586 -22.999992 +v -95.875511 -109.660980 -22.999992 +v -81.326126 -26.137403 -22.999998 +v -81.505119 -26.179373 -21.499998 +v -82.129379 -26.010065 -22.999998 +v -82.262665 -25.883394 -21.499998 +v -90.378532 -25.274813 -22.999998 +v -83.162300 9.527388 -22.999996 +v -87.822563 -4.268648 -22.999996 +v -88.051224 46.919445 -23.000000 +v -88.985420 -7.284334 -22.999996 +v -88.985420 -7.284334 -21.499996 +v -87.822563 -4.268648 -21.499996 +v -87.777054 -16.322161 -22.999994 +v -91.951767 -25.936571 -21.499998 +v -87.777046 -16.322193 -21.499996 +v -89.267113 -11.308397 -22.999996 +v -89.267113 -11.308397 -21.499996 +v 108.249481 96.524422 -23.000002 +v 71.670326 48.873207 -21.500000 +v 111.499481 93.274422 -21.500000 +v 111.499481 93.274422 -23.000000 +v 109.874481 93.709831 -23.000000 +v 108.684906 94.899429 -23.000002 +v 109.874481 93.709831 -21.500000 +v 81.073257 109.466034 -21.500000 +v 108.684906 94.899422 -21.500000 +v 108.249481 96.524422 -21.500000 +v 108.684906 98.149422 -21.500000 +v 111.612549 149.661682 -21.500004 +v 85.362480 11.626999 -22.999996 +v 65.915886 45.465244 -23.000000 +v 85.344719 11.622298 -21.499996 +v 65.873917 45.644211 -21.500000 +v 86.120903 11.411791 -22.999996 +v 65.912560 58.955807 -23.000000 +v 65.895844 59.001583 -21.500000 +v 65.694542 58.162827 -23.000000 +v 66.043228 46.268459 -23.000000 +v 65.699242 58.145065 -21.500000 +v 90.910965 14.178403 -22.999998 +v 66.169907 46.401741 -21.500000 +v 90.915665 14.160642 -21.499998 +v 70.894165 49.083721 -23.000000 +v 70.907112 49.070694 -21.500000 +v 91.126190 14.936848 -22.999998 +v 71.652565 48.868507 -23.000000 +v 91.113159 14.923896 -21.499998 +v 109.170685 151.444687 -21.500004 +v 108.847481 150.884888 -23.000004 +v 109.990295 151.917892 -23.000004 +v 105.666939 126.074722 -23.000002 +v 109.014465 149.661682 -23.000004 +v 109.840294 148.945663 -23.000004 +v 108.847481 149.938477 -21.500004 +v 109.563507 149.112640 -21.500004 +v 110.786720 148.945663 -21.500004 +v 111.063507 149.112640 -23.000004 +v 111.456329 151.444687 -23.000004 +v 111.779533 149.938477 -23.000004 +v 111.779533 150.884888 -21.500004 +v 110.636719 151.917892 -21.500004 +v 48.666351 55.387924 -23.000000 +v 27.599411 65.030304 -23.000002 +v 32.159908 56.417011 -23.000000 +v 47.253708 58.838715 -23.000000 +v 32.306454 56.465084 -21.500000 +v 37.954941 60.192352 -23.000000 +v 41.042801 61.334152 -23.000000 +v 37.954941 60.192352 -21.500000 +v 44.340179 60.910797 -23.000000 +v 27.599411 65.030304 -21.500002 +v 41.042801 61.334152 -21.500000 +v 26.911383 74.985123 -22.999998 +v 26.964199 74.808662 -21.499998 +v 27.599411 105.644096 -23.000000 +v -46.627533 53.722298 -23.000000 +v 30.599770 56.365387 -21.500000 +v 26.941574 69.376411 -23.000002 +v 0.579620 -13.475161 -21.499994 +v 0.579620 -13.475161 -22.999994 +v -0.432053 -8.150652 -22.999996 +v 0.769955 27.793381 -22.999998 +v -13.291582 33.557671 -22.999998 +v -36.076149 67.367310 -23.000002 +v 30.450369 56.403667 -23.000000 +v 0.769953 27.793402 -21.499998 +v -0.372377 -8.496178 -21.499996 +v 0.395920 31.132154 -22.999998 +v -14.352561 69.173492 -23.000002 +v -18.328886 37.490513 -22.999998 +v -21.605560 37.297852 -22.999998 +v 0.395920 31.132154 -21.499998 +v 1.556839 34.243607 -22.999998 +v -13.716983 68.663605 -23.000002 +v 7.241967 37.336853 -22.999998 +v 1.556839 34.243607 -21.499998 +v 4.190109 36.611115 -22.999998 +v 22.679483 60.806957 -23.000000 +v 22.725277 60.791695 -21.500000 +v 26.379549 68.825630 -23.000002 +v 26.923891 69.371635 -21.500002 +v 30.915754 40.308540 -23.000000 +v 31.006659 40.269623 -21.500000 +v 7.241970 37.336857 -21.499998 +v 4.190109 36.611115 -21.499998 +v 26.374830 68.807930 -21.500002 +v -15.320008 36.132618 -22.999998 +v -21.605560 37.297852 -21.499998 +v -0.929535 38.926605 -21.500000 +v -13.243958 33.480625 -21.499998 +v 19.413971 61.348694 -23.000000 +v 19.413971 61.348694 -21.500000 +v -18.328890 37.490513 -21.499998 +v -24.584061 35.450851 -21.499998 +v 16.268417 60.327362 -23.000000 +v -15.320007 36.132614 -21.499998 +v 14.095245 50.958496 -23.000000 +v 16.445953 48.698853 -23.000000 +v 13.684281 57.537670 -23.000000 +v 16.268417 60.327362 -21.500000 +v 16.445953 48.698853 -21.500000 +v 13.762575 57.693172 -21.500000 +v 13.071732 54.030258 -23.000000 +v 13.071732 54.030258 -21.500000 +v 14.095245 50.958496 -21.500000 +v -13.893559 68.715874 -21.500002 +v -21.687056 74.837479 -22.999998 +v -21.634237 74.661018 -21.499998 +v -22.146049 75.295105 -21.499998 +v -14.382756 74.782158 -23.000000 +v -39.465935 65.064461 -23.000002 +v -41.435036 62.612854 -23.000000 +v -39.465942 65.064453 -21.500002 +v -21.656858 69.228813 -23.000002 +v -36.076141 67.367310 -21.500002 +v -22.218859 68.678078 -23.000002 +v -21.674540 69.224037 -21.500002 +v -31.031555 68.582352 -23.000002 +v -41.435051 62.612835 -21.500000 +v -22.223577 68.660378 -21.500002 +v -31.031555 68.582352 -21.500002 +v -81.074081 7.363023 -22.999996 +v -45.310532 69.364853 -23.000002 +v -81.483940 -9.144381 -21.499996 +v -81.483940 -9.144381 -22.999996 +v -80.992416 -14.106083 -22.999994 +v -89.103004 19.493959 -21.499998 +v -52.383690 56.951336 -23.000000 +v -52.341167 57.130234 -21.500000 +v -80.035545 -4.244646 -22.999996 +v -80.035545 -4.244646 -21.499996 +v -80.880531 -14.461328 -21.499994 +v -80.315651 7.656676 -22.999996 +v -80.940453 7.489258 -21.499996 +v -45.310532 69.364853 -21.500002 +v -75.251099 4.204513 -22.999996 +v -76.414230 -22.639452 -22.999998 +v -75.544731 4.962946 -22.999996 +v -75.293594 4.025749 -21.499996 +v -74.934875 16.813305 -22.999998 +v -80.136833 7.614172 -21.499996 +v -76.629463 -23.397852 -22.999998 +v -72.955925 -30.005043 -23.000000 +v -75.129997 17.577160 -22.999998 +v -57.081257 48.874252 -23.000000 +v -52.216305 56.326576 -21.500000 +v -52.090073 56.192955 -23.000000 +v -33.019409 -31.001360 -21.499998 +v -75.418533 4.829360 -21.499996 +v -75.142998 17.590143 -21.499998 +v -33.019409 -31.001360 -22.999998 +v -76.427261 -22.652411 -21.499998 +v -75.195801 9.527388 -21.499996 +v -57.063507 48.869495 -21.500000 +v -77.652649 -32.744629 -22.999998 +v -76.624763 -23.415611 -21.499998 +v -47.391380 53.527142 -23.000000 +v -72.152672 -30.132380 -22.999998 +v -50.110706 -43.989124 -22.999996 +v -74.930122 16.831057 -21.499998 +v -70.166061 14.080530 -22.999998 +v -56.317413 49.069405 -23.000000 +v -56.304420 49.082397 -21.500000 +v -47.404373 53.514149 -21.500000 +v -34.740097 -28.195055 -22.999998 +v -46.143539 -31.069658 -22.999998 +v -70.179054 14.067537 -21.499998 +v -37.896973 -26.369587 -21.499998 +v -38.060703 -26.330706 -22.999998 +v -44.466118 -28.258867 -22.999998 +v -50.107056 -44.009922 -21.499996 +v -39.518990 -9.450438 -22.999998 +v -51.325127 45.645256 -23.000000 +v -51.618809 46.403660 -23.000000 +v -39.522102 46.857178 -21.500000 +v -41.660179 -26.538301 -22.999998 +v -46.143539 -31.069658 -21.499998 +v -37.607712 -15.609636 -22.999994 +v -69.402237 14.275664 -22.999998 +v -18.040304 107.164749 -21.500000 +v -51.492527 46.269985 -21.500000 +v -44.466118 -28.258867 -21.499998 +v -39.311508 -12.783754 -22.999994 +v -69.419983 14.280417 -21.499998 +v -46.645279 53.727055 -21.500000 +v -37.607712 -15.609636 -21.499994 +v -51.367649 45.466339 -21.500000 +v -39.311508 -12.783754 -21.499994 +v -26.223038 32.551849 -22.999998 +v -39.515495 -9.471226 -21.499998 +v -24.584061 35.450851 -22.999998 +v -26.223038 32.551849 -21.499998 +v -104.500008 1.782431 -21.499998 +v -97.457184 149.378662 -23.000004 +v -100.315102 94.899422 -23.000000 +v -99.125511 93.709831 -23.000000 +v -100.750511 96.524422 -23.000000 +v -100.750511 96.524422 -21.500000 +v -100.315102 94.899422 -21.500000 +v -77.152176 124.701859 -21.500002 +v -90.902946 117.809364 -23.000002 +v -99.125511 93.709831 -21.500000 +v -97.500511 93.274422 -23.000000 +v -100.315102 98.149422 -23.000000 +v -100.315102 98.149422 -21.500000 +v -90.902946 105.644096 -23.000000 +v -97.500511 93.274422 -21.500000 +v -95.875511 93.709831 -23.000000 +v -84.607162 105.644096 -21.500000 +v -99.125511 99.338997 -23.000000 +v -99.125511 99.338997 -21.500000 +v -94.685921 94.899422 -23.000000 +v -86.095039 64.460884 -21.500002 +v -97.500511 99.774429 -23.000000 +v -95.875511 93.709831 -21.500000 +v -94.250511 96.524422 -23.000000 +v -90.902946 105.644096 -21.500000 +v -85.978218 111.714745 -21.500000 +v -97.500511 99.774429 -21.500000 +v -95.875511 99.338997 -23.000000 +v -94.685921 94.899422 -21.500000 +v -95.875511 99.338997 -21.500000 +v -94.685921 98.149422 -23.000000 +v -94.250511 96.524422 -21.500000 +v -94.685921 98.149422 -21.500000 +v -97.780388 150.884888 -23.000004 +v -60.572174 110.452530 -23.000000 +v -87.201408 111.547760 -23.000000 +v -85.978218 111.714745 -23.000000 +v -87.051414 111.507568 -21.500000 +v -85.262192 112.540565 -23.000000 +v -97.457191 151.444687 -21.500004 +v -96.637558 151.917892 -23.000004 +v -97.780388 149.938461 -21.500004 +v -88.234421 112.690567 -23.000000 +v -88.194229 112.540565 -21.500000 +v -95.991165 148.905472 -23.000004 +v -85.585373 114.046783 -23.000002 +v -85.221992 112.690567 -21.500000 +v -95.991165 151.917892 -21.500004 +v -95.171547 151.444672 -23.000004 +v -94.848351 149.938477 -23.000004 +v -97.064354 149.112640 -21.500004 +v -95.841171 148.945663 -21.500004 +v -88.027245 113.763786 -23.000002 +v -82.959305 121.138916 -23.000002 +v -81.453094 121.462105 -23.000002 +v -82.809311 121.098724 -21.500002 +v -85.695183 114.156586 -21.500002 +v -87.051384 114.520012 -23.000002 +v -88.027245 113.763786 -21.500002 +v -94.848351 150.884888 -21.500004 +v -95.015335 149.661682 -21.500004 +v -84.607162 117.809364 -21.500002 +v -81.736099 121.305885 -21.500002 +v -87.201378 114.479820 -21.500002 +v -80.986092 122.604919 -23.000002 +v -83.992302 122.281715 -23.000002 +v -83.952110 122.131721 -21.500002 +v -81.343262 123.637932 -23.000002 +v -80.979881 122.281715 -21.500002 +v -83.785126 123.354935 -23.000002 +v -81.453072 123.747734 -21.500002 +v -82.809280 124.111137 -23.000002 +v -83.785126 123.354935 -21.500002 +v -82.959282 124.070946 -21.500002 +v 60.391964 68.649330 -23.000002 +v 86.387085 149.661682 -23.000004 +v 87.212914 148.945663 -23.000004 +v 60.391960 68.649330 -21.500002 +v 86.220100 150.884888 -23.000004 +v 86.653114 149.268860 -21.500004 +v 86.179909 150.734894 -21.500004 +v 88.159340 148.945663 -21.500004 +v 88.436127 149.112640 -23.000004 +v 87.362915 151.917892 -23.000004 +v 86.936127 151.710709 -21.500004 +v 89.152153 149.938477 -23.000004 +v 88.009338 151.917892 -21.500004 +v 88.828949 151.444687 -23.000004 +v 89.192345 150.088470 -21.500004 +v 88.985168 151.161667 -21.500004 +v 53.734665 74.408722 -22.999998 +v 58.722733 70.894135 -23.000002 +v 58.722733 70.894135 -21.500002 +v 36.277100 68.815376 -23.000002 +v 36.100410 68.867676 -21.500002 +v 35.641449 69.325218 -23.000002 +v 35.588627 69.501701 -21.500002 +v -41.795021 73.058868 -22.999998 +v -37.313156 75.101532 -22.999998 +v 35.611252 74.933975 -23.000000 +v -41.795013 73.058876 -21.500000 +v 35.628937 74.938751 -21.499998 +v -14.405374 69.349930 -21.500002 +v -22.322634 75.347382 -22.999998 +v -36.933468 75.186371 -21.499998 +v 48.399445 75.590851 -22.999998 +v 53.734665 74.408722 -21.499998 +v 36.173294 75.484741 -22.999998 +v 39.865395 105.644096 -21.500000 +v 26.275761 75.494980 -22.999998 +v 48.399445 75.590851 -21.499998 +v 36.178009 75.502441 -21.499998 +v 26.452412 75.442688 -21.499998 +v -13.820724 75.332901 -22.999998 +v -14.365073 74.786934 -21.499998 +v -13.816008 75.350601 -21.499998 +v -74.010185 148.905472 -21.500004 +v -74.160187 148.945663 -23.000004 +v -72.936958 151.710709 -23.000004 +v -72.653976 151.554504 -21.500004 +v -75.153000 150.884888 -23.000004 +v -75.153000 149.938477 -21.500004 +v -73.686966 151.911667 -21.500004 +v -74.986015 149.661682 -23.000004 +v -74.829796 151.444687 -21.500004 +v -72.653969 149.268845 -23.000004 +v -72.936958 149.112640 -21.500004 +v -72.180763 150.734879 -23.000004 +v -72.180763 150.088486 -21.500004 +v 110.928291 145.652878 40.600002 +v 110.919907 145.631241 37.600002 +v 111.000000 153.974579 37.600002 +v -96.999893 153.974579 40.600002 +v -96.872299 145.596985 40.600002 +v -96.914886 145.624802 37.600002 +v 111.000000 153.974579 40.600002 +v -96.999893 153.974579 37.600002 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.024736 0.990537 +vt -0.002335 0.006815 +vt 0.973007 0.997682 +vt 0.000000 0.000000 +vt 1.002361 0.006816 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vn 0.4341 -0.8725 0.2242 +vn 0.0000 0.0000 1.0000 +vn 0.4125 0.8797 0.2364 +vn 0.1400 0.9206 -0.3645 +vn -0.1332 -0.9213 -0.3653 +vn -0.9668 -0.2554 0.0000 +vn -0.9699 -0.2415 -0.0326 +vn 0.0000 1.0000 0.0000 +vn -0.4276 0.8758 0.2238 +vn -0.8977 0.4337 0.0779 +vn -0.7842 0.5685 -0.2488 +vn 0.6199 0.7836 0.0406 +vn 0.9260 0.3109 0.2141 +vn 0.7210 0.6315 -0.2854 +vn -0.9537 0.2979 -0.0413 +vn -0.9552 0.2952 0.0185 +vn -0.4060 -0.8826 0.2370 +vn -0.9777 -0.2028 -0.0543 +vn 0.9604 -0.2787 0.0000 +vn -0.9452 -0.3185 -0.0719 +vn 0.9610 -0.2725 0.0479 +vn -0.9453 -0.3262 0.0000 +vn 0.8818 0.4696 -0.0437 +vn 0.8810 0.4717 -0.0367 +vn 0.9190 -0.3891 -0.0644 +vn 0.9413 -0.3223 0.0999 +vn 0.3761 -0.9249 0.0558 +vn 0.3564 -0.9343 -0.0008 +vn -0.9748 -0.2233 0.0000 +vn 0.9531 -0.2960 -0.0637 +vn 0.9353 -0.3538 0.0000 +vn -0.7573 0.6530 0.0000 +vn 0.9542 -0.2988 0.0153 +vn -0.3631 -0.8907 -0.2734 +vn 0.9348 -0.3550 -0.0067 +vn -0.7574 0.6530 0.0001 +vn -0.8700 -0.4344 0.2333 +vn -0.9538 -0.2907 -0.0759 +vn -0.9394 0.3344 0.0757 +vn -0.9394 0.3429 -0.0015 +vn -0.9545 0.2983 0.0000 +vn 0.4846 0.8709 -0.0823 +vn 0.9517 0.3071 -0.0000 +vn 0.4067 0.9043 0.1296 +vn 0.0012 -1.0000 0.0000 +vn 0.9496 0.3099 0.0462 +vn 0.0002 -0.9999 -0.0155 +vn -0.9509 -0.3046 0.0548 +vn -0.9495 -0.3049 0.0736 +vn -0.4155 -0.9094 0.0153 +vn -0.4852 0.8683 -0.1026 +vn -0.4616 -0.8829 -0.0863 +vn -0.4659 0.8722 -0.1491 +vn -0.9042 0.3878 0.1788 +vn -0.9672 0.1395 -0.2123 +vn -0.6752 0.7355 -0.0559 +vn -0.7238 0.6781 0.1279 +vn -0.9629 -0.2482 0.1061 +vn -0.9807 -0.1671 -0.1015 +vn -0.5736 -0.8182 -0.0396 +vn -0.4792 0.8769 -0.0361 +vn -0.5697 -0.8218 0.0000 +vn -0.4863 0.8738 0.0000 +vn -0.8798 0.4216 0.2194 +vn -0.4974 -0.8675 0.0000 +vn 0.5134 0.8582 0.0000 +vn 0.8499 -0.5270 0.0000 +vn 0.5240 0.8493 -0.0632 +vn 0.8351 -0.5421 -0.0934 +vn -0.2273 0.9444 0.2375 +vn -0.4654 0.8076 -0.3621 +vn 0.4388 -0.8972 -0.0496 +vn 0.4838 -0.8698 0.0971 +vn 0.8660 0.5000 -0.0000 +vn -0.5000 0.8660 0.0000 +vn 0.8798 -0.4218 0.2193 +vn -0.2534 -0.9674 0.0000 +vn 0.4655 -0.8076 -0.3622 +vn -0.2130 -0.9740 0.0773 +vn -0.5149 0.8572 0.0000 +vn 0.5736 0.8182 -0.0397 +vn 0.2273 -0.9444 0.2374 +vn -0.5203 0.8519 0.0594 +vn 0.5697 0.8218 0.0000 +vn 0.4863 -0.8738 0.0000 +vn -0.5240 -0.8493 -0.0632 +vn 0.4792 -0.8770 -0.0361 +vn -0.5134 -0.8582 0.0000 +vn 0.5000 -0.8660 0.0000 +vn -0.9963 0.0754 -0.0401 +vn -0.9961 0.0242 0.0854 +vn -0.8832 -0.4609 -0.0866 +vn 0.4488 0.8879 0.1009 +vn 0.8747 0.4819 -0.0518 +vn -0.8788 -0.4772 0.0000 +vn -0.8789 0.4758 0.0342 +vn 0.9507 0.3053 0.0544 +vn 0.5155 0.8549 -0.0580 +vn 0.8720 0.4895 0.0000 +vn -0.8660 -0.5000 0.0000 +vn 0.0034 -0.9902 0.1399 +vn -0.0004 -0.9984 0.0571 +vn 0.9724 0.2196 0.0786 +vn 0.9687 0.0439 -0.2442 +vn 0.7883 -0.5624 -0.2494 +vn 0.9009 -0.4268 0.0783 +vn 0.7972 -0.5898 -0.1292 +vn 0.8450 -0.5265 0.0934 +vn 0.9528 0.3007 -0.0415 +vn 0.9493 0.3053 -0.0745 +vn 0.9498 0.3097 -0.0442 +vn -0.8675 0.4974 0.0000 +vn 0.8675 -0.4974 -0.0000 +vn 0.4974 0.8675 -0.0000 +vn -0.0054 0.9999 0.0090 +vn -0.0044 0.9996 0.0277 +vn -0.3636 0.9252 -0.1091 +vn -0.4384 0.8944 0.0888 +vn 0.5149 -0.8572 0.0000 +vn 0.5203 -0.8519 0.0595 +vn 0.4828 0.8725 -0.0752 +vn 0.8587 0.5123 0.0136 +vn 0.7709 0.6369 0.0000 +vn 0.7955 0.5996 -0.0881 +vn 0.2130 0.9740 0.0773 +vn 0.0030 1.0000 0.0000 +vn 0.0191 0.9992 -0.0359 +vn 0.9707 -0.2056 0.1244 +vn 0.4455 0.8943 0.0424 +vn 0.8578 0.5140 0.0000 +vn 0.2534 0.9674 0.0001 +vn -1.0000 0.0000 0.0000 +vn 0.0133 0.9999 0.0000 +vn 0.9545 -0.2897 -0.0701 +vn -0.0476 -0.9951 -0.0869 +vn -0.0301 -0.9995 -0.0000 +vn -0.8588 -0.5123 0.0000 +vn -0.5020 -0.8606 0.0860 +vn -0.5529 -0.8316 -0.0521 +vn -0.8534 -0.5193 0.0462 +vn -0.0030 -1.0000 0.0000 +vn 1.0000 0.0000 0.0000 +vn -0.7709 -0.6369 0.0000 +vn -0.9707 0.2057 0.1244 +vn -0.7955 -0.5995 -0.0882 +vn -0.9545 0.2897 -0.0701 +vn 0.4422 -0.8939 0.0730 +vn 0.3755 -0.9202 -0.1104 +vn -0.4391 -0.8930 0.0990 +vn -0.5039 -0.8622 -0.0524 +vn -0.9724 -0.2196 0.0786 +vn 0.9963 -0.0757 -0.0397 +vn 0.9960 -0.0248 0.0853 +vn -0.9687 -0.0440 -0.2441 +vn 0.8773 -0.4787 0.0345 +vn 0.8948 0.4396 -0.0784 +vn 0.0230 -0.9988 0.0425 +vn 0.8742 -0.4855 0.0000 +vn -0.8806 0.4650 0.0914 +vn -0.8747 -0.4847 0.0000 +vn 0.8866 0.4626 0.0000 +vn 0.5530 0.8316 -0.0519 +vn 0.5022 0.8605 0.0860 +vn 0.0137 -0.9999 0.0000 +vn -0.9966 -0.0598 0.0568 +vn -0.8776 0.4794 0.0000 +vn -0.8789 -0.4744 -0.0499 +vn 0.0633 0.9947 -0.0813 +vn -0.4207 0.8600 -0.2887 +vn -0.0678 0.9829 0.1711 +vn -0.6897 0.6355 0.3469 +vn -0.8613 0.5080 0.0000 +vn -0.9962 0.0019 -0.0869 +vn 0.8471 0.5296 0.0434 +vn -0.4344 -0.8998 0.0404 +vn 0.0406 0.9992 0.0000 +vn -0.0367 0.9944 0.0995 +vn -0.0190 0.9998 0.0000 +vn -0.8202 0.5648 -0.0906 +vn -0.5204 0.8483 -0.0975 +vn -0.5636 0.8250 0.0430 +vn -0.8573 0.5134 -0.0377 +vn 0.8547 0.5191 0.0000 +vn -0.4785 -0.8740 -0.0849 +vn -0.0163 -0.9999 0.0000 +vn -0.0215 0.9998 0.0000 +vn -0.0030 -1.0000 -0.0001 +vn 0.0441 -0.9943 0.0967 +vn -0.8407 -0.5346 0.0860 +vn -0.0237 -0.9991 -0.0352 +vn 0.5635 -0.8250 0.0431 +vn 0.5202 -0.8484 -0.0977 +vn 0.0264 -0.9997 0.0000 +vn 0.8588 -0.5123 0.0000 +vn 0.4971 0.8671 -0.0323 +vn -0.8526 -0.5225 0.0000 +vn 0.8536 -0.5197 -0.0365 +vn 0.4866 0.8736 0.0000 +vn -0.8753 0.4836 0.0000 +vn 0.8823 -0.4620 0.0901 +vn 0.8786 -0.4775 0.0000 +vn 0.9966 0.0598 0.0566 +vn 0.7071 -0.7071 0.0000 +vn 0.9659 -0.2588 -0.0000 +vn 0.9962 -0.0017 -0.0868 +vn 0.2588 -0.9659 0.0000 +vn 0.2588 0.9659 -0.0000 +vn 0.7071 0.7071 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.9659 0.2588 0.0000 +vn -0.9988 0.0010 0.0482 +vn 0.0000 -1.0000 0.0000 +vn -0.7451 0.6666 0.0201 +vn -0.2588 0.9659 0.0000 +vn -0.7071 0.7071 0.0000 +vn -0.9657 0.2588 -0.0228 +vn -0.2588 -0.9659 0.0000 +vn -0.7071 -0.7071 0.0000 +vn -0.9659 -0.2588 0.0000 +vn -0.6583 -0.6878 -0.3059 +vn -0.3239 -0.9380 -0.1233 +vn -0.4115 -0.8068 -0.4239 +vn -0.0727 -0.9688 -0.2369 +vn 0.1531 -0.8595 -0.4877 +vn 0.5341 -0.8418 -0.0780 +vn 0.5996 -0.7186 -0.3521 +vn 0.8235 -0.5485 -0.1450 +vn 0.8757 -0.3639 -0.3172 +vn 0.9173 -0.3135 -0.2456 +vn 0.9008 -0.2309 -0.3678 +vn 0.9847 -0.0239 -0.1725 +vn 0.9552 0.0388 -0.2934 +vn 0.9223 0.3708 -0.1091 +vn 0.9191 0.2609 -0.2954 +vn 0.7886 0.5995 -0.1370 +vn 0.8117 0.5077 -0.2888 +vn 0.5856 0.8000 -0.1310 +vn 0.6389 0.6875 -0.3452 +vn 0.4022 0.8891 -0.2182 +vn 0.4323 0.8543 -0.2888 +vn 0.1043 0.9848 -0.1391 +vn 0.1878 0.9379 -0.2919 +vn -0.1913 0.9738 -0.1233 +vn -0.0496 0.9044 -0.4239 +vn -0.4239 0.8742 -0.2369 +vn -0.5642 0.6661 -0.4878 +vn -0.8848 0.4595 -0.0780 +vn -0.8795 0.3200 -0.3522 +vn -0.9917 0.0348 -0.1238 +vn -0.9245 -0.1279 -0.3590 +vn -0.9243 -0.2964 -0.2407 +vn -0.9078 -0.2340 -0.3479 +vn -0.8133 -0.5392 -0.2186 +vn -0.8201 -0.4939 -0.2888 +vn -0.5991 -0.7899 -0.1309 +vn -0.6505 -0.6765 -0.3452 +vn -0.4173 -0.8821 -0.2184 +vn -0.4467 -0.8468 -0.2887 +vn -0.1210 -0.9829 -0.1390 +vn -0.2037 -0.9345 -0.2919 +vn 0.1747 -0.9769 -0.1233 +vn 0.0343 -0.9051 -0.4239 +vn 0.3945 -0.8854 -0.2456 +vn 0.5444 -0.7716 -0.3290 +vn 0.7808 -0.5299 -0.3311 +vn 0.8708 -0.3395 -0.3556 +vn 0.9976 0.0621 -0.0290 +vn 0.8934 0.1774 -0.4127 +vn 0.8714 0.4593 -0.1726 +vn 0.8149 0.4997 -0.2935 +vn 0.6244 0.7735 -0.1088 +vn 0.6752 0.6759 -0.2954 +vn 0.3961 0.9079 -0.1371 +vn 0.4609 0.8391 -0.2888 +vn 0.1211 0.9840 -0.1309 +vn 0.2225 0.9118 -0.3451 +vn -0.0824 0.9724 -0.2183 +vn -0.0393 0.9566 -0.2888 +vn -0.3892 0.9106 -0.1391 +vn -0.2934 0.9103 -0.2919 +vn -0.6419 0.7568 -0.1233 +vn -0.4843 0.7653 -0.4239 +vn -0.7860 0.5673 -0.2457 +vn -0.8584 0.3936 -0.3290 +vn -0.9413 0.0658 -0.3311 +vn -0.9235 -0.1441 -0.3556 +vn -0.8917 -0.4288 -0.1450 +vn -0.7595 -0.5679 -0.3171 +vn -0.7373 -0.6293 -0.2455 +vn -0.6579 -0.6572 -0.3677 +vn -0.5226 -0.8349 -0.1726 +vn -0.4535 -0.8415 -0.2935 +vn -0.1512 -0.9825 -0.1089 +vn -0.2441 -0.9237 -0.2954 +vn 0.1138 -0.9840 -0.1371 +vn 0.0231 -0.9571 -0.2888 +vn 0.3897 -0.9116 -0.1309 +vn 0.2657 -0.9001 -0.3452 +vn 0.5598 -0.7993 -0.2184 +vn 0.5146 -0.8073 -0.2888 +vn 0.7940 -0.5918 -0.1390 +vn 0.7111 -0.6397 -0.2919 +vn 0.9353 -0.3318 -0.1233 +vn 0.8033 -0.4183 -0.4239 +vn 0.9646 -0.0956 -0.2456 +vn 0.9399 0.0910 -0.3290 +vn 0.8469 0.4160 -0.3311 +vn 0.7261 0.5885 -0.3556 +vn 0.5555 0.8188 -0.1450 +vn 0.3713 0.8726 -0.3172 +vn 0.3213 0.9146 -0.2456 +vn 0.2386 0.8988 -0.3678 +vn 0.0323 0.9845 -0.1725 +vn -0.0307 0.9555 -0.2935 +vn -0.3629 0.9254 -0.1089 +vn -0.2530 0.9213 -0.2954 +vn -0.5928 0.7936 -0.1371 +vn -0.5009 0.8159 -0.2887 +vn -0.7949 0.5924 -0.1309 +vn -0.6820 0.6447 -0.3452 +vn -0.8857 0.4098 -0.2183 +vn -0.8506 0.4395 -0.2888 +vn -0.9839 0.1127 -0.1390 +vn -0.9362 0.1958 -0.2919 +vn -0.9754 -0.1830 -0.1232 +vn -0.9047 -0.0419 -0.4239 +vn -0.8820 -0.4020 -0.2457 +vn -0.7669 -0.5509 -0.3290 +vn -0.5232 -0.7853 -0.3311 +vn -0.3320 -0.8737 -0.3556 +vn -0.0689 -0.9870 -0.1450 +vn 0.1174 -0.9411 -0.3172 +vn 0.1817 -0.9522 -0.2455 +vn 0.2209 -0.9211 -0.3207 +vn 0.4757 -0.8709 -0.1238 +vn 0.5630 -0.7655 -0.3115 +vn 0.7568 -0.6292 -0.1771 +vn 0.6641 -0.6617 -0.3481 +vn 0.8915 -0.4031 -0.2066 +vn 0.8224 -0.4514 -0.3462 +vn 0.9668 -0.1485 -0.2081 +vn 0.9407 -0.1847 -0.2845 +vn 0.9361 0.1711 -0.3073 +vn 0.0326 -0.4816 -0.8758 +vn -0.1977 -0.9451 -0.2602 +vn -0.9570 -0.2330 -0.1729 +vn -0.9609 -0.2409 -0.1363 +vn -0.0006 -0.0001 1.0000 +vn 0.9128 0.4078 0.0246 +vn -0.0292 0.0026 0.9996 +vn -0.8155 -0.4497 0.3643 +vn 0.7502 0.6590 -0.0537 +vn -0.3652 -0.8649 -0.3443 +vn -0.0169 -0.0156 0.9997 +vn -0.8069 -0.4714 -0.3561 +vn 0.6844 0.4725 -0.5553 +vn -0.8021 -0.5759 0.1583 +vn 0.0042 -0.0041 1.0000 +vn -0.4977 -0.8370 0.2274 +vn 0.0082 -0.0242 0.9997 +vn 0.0085 0.0062 0.9999 +vn 0.0079 0.0070 0.9999 +vn -0.6713 -0.7036 -0.2329 +vn -0.6729 -0.7391 0.0309 +vn -0.2454 -0.7751 -0.5822 +vn -0.4930 -0.4502 -0.7445 +vn -0.6791 -0.5151 -0.5229 +vn -0.7327 -0.1750 -0.6577 +vn 0.6016 0.5469 -0.5823 +vn 0.6524 0.1416 -0.7445 +vn 0.8459 0.1042 -0.5230 +vn 0.7215 -0.2169 -0.6576 +vn -0.7949 -0.1706 -0.5823 +vn -0.6352 0.2054 -0.7445 +vn -0.7838 0.3349 -0.5230 +vn -0.5148 0.5500 -0.6576 +vn -0.2300 -0.5515 -0.8018 +vn 0.1397 -0.9136 -0.3820 +vn 0.1466 -0.6300 -0.7626 +vn 0.5782 -0.6048 -0.5476 +vn 0.8407 0.1952 -0.5051 +vn 0.7040 -0.1576 -0.6925 +vn 0.8255 -0.2951 -0.4811 +vn 0.4778 -0.5047 -0.7190 +vn 0.5094 -0.6834 -0.5230 +vn 0.1687 -0.7342 -0.6576 +vn -0.1668 0.6908 -0.7035 +vn -0.5760 0.7046 -0.4144 +vn -0.5295 0.4900 -0.6925 +vn -0.8250 0.2537 -0.5050 +vn 0.4083 -0.1145 -0.9056 +vn 0.7605 -0.3527 -0.5452 +vn 0.8455 -0.0765 -0.5285 +vn 0.9533 -0.2558 -0.1608 +vn 0.0141 -0.0050 0.9999 +vn -0.8653 0.3043 -0.3984 +vn 0.0173 0.0070 0.9998 +vn 0.0192 -0.0031 0.9998 +vn -0.8224 0.5451 -0.1630 +vn 0.7405 -0.5345 -0.4074 +vn -0.4955 0.3320 -0.8027 +vn 0.8912 0.0405 -0.4519 +vn 0.7013 -0.4736 -0.5328 +vn 0.8042 0.1253 -0.5810 +vn 0.0001 -0.0000 1.0000 +vn -0.9847 0.1258 -0.1207 +vn -0.6802 0.5684 -0.4629 +vn 0.3022 -0.3285 -0.8948 +vn 0.0192 0.0009 0.9998 +vn 0.6557 -0.7490 -0.0951 +vn 0.8501 0.2668 -0.4541 +vn 0.0171 0.0025 0.9999 +vn -0.0008 -0.0185 0.9998 +vn -0.9047 -0.1349 -0.4040 +vn 0.5444 0.2720 -0.7935 +vn -0.8373 -0.0932 -0.5387 +vn 0.9139 0.3369 -0.2263 +vn 0.4191 -0.7094 -0.5667 +vn 0.0111 -0.0095 0.9999 +vn -0.4354 0.8807 0.1866 +vn 0.3392 -0.7998 -0.4951 +vn 0.4981 0.3718 -0.7834 +vn 0.2257 -0.7591 -0.6106 +vn -0.0855 -0.9117 -0.4017 +vn -0.4385 0.5777 -0.6884 +vn 0.0124 -0.0157 0.9998 +vn -0.0253 0.0079 0.9996 +vn -0.9236 -0.2704 -0.2718 +vn 0.7271 0.6250 -0.2841 +vn -0.1899 0.9248 -0.3298 +vn 0.7234 0.6016 -0.3387 +vn 0.0002 0.0001 1.0000 +vn 0.0552 -0.9909 -0.1228 +vn -0.7095 -0.6038 -0.3634 +vn 0.4769 0.8609 -0.1773 +vn 0.0116 0.0082 0.9999 +vn 0.0035 -0.0042 1.0000 +vn -0.5764 -0.3750 -0.7260 +vn 0.2801 0.5681 -0.7738 +vn -0.1169 0.8573 -0.5014 +vn 0.3696 0.7166 -0.5915 +vn 0.5337 0.7877 -0.3078 +vn 0.1462 0.1985 -0.9691 +vn 0.5865 0.8025 0.1092 +vn -0.0034 0.0107 0.9999 +vn 0.1371 0.6016 -0.7869 +vn -0.6197 -0.7543 -0.2169 +vn 0.0465 0.9837 -0.1738 +vn 0.1229 0.5539 -0.8234 +vn 0.2055 0.9226 -0.3265 +vn 0.0310 0.4795 -0.8770 +vn 0.4310 0.8988 -0.0797 +vn 0.0318 0.4750 -0.8794 +vn 0.3171 0.7640 -0.5619 +vn 0.5130 0.5485 -0.6603 +vn -0.3142 -0.9099 -0.2710 +vn 0.7350 0.5980 -0.3196 +vn 0.1696 0.9846 0.0427 +vn 0.0026 0.0108 0.9999 +vn 0.2562 0.1911 -0.9476 +vn -0.2004 -0.8085 -0.5534 +vn 0.3694 0.2609 -0.8919 +vn 0.0851 0.9426 -0.3229 +vn 0.0056 0.0015 1.0000 +vn -0.1068 -0.4282 -0.8973 +vn -0.1154 0.6449 -0.7555 +vn -0.0452 -0.9962 -0.0747 +vn 0.4207 0.3368 -0.8424 +vn -0.0958 -0.2687 -0.9585 +vn -0.2056 0.5005 -0.8410 +vn -0.1733 0.8965 -0.4078 +vn -0.0646 -0.2131 -0.9749 +vn -0.2709 -0.2712 -0.9236 +vn -0.2049 -0.1560 -0.9663 +vn -0.7043 -0.2185 -0.6754 +vn -0.3924 0.7451 -0.5393 +vn -0.2864 0.9497 -0.1265 +vn -0.0001 0.0002 1.0000 +vn 0.2700 -0.8932 -0.3597 +vn -0.7513 -0.5028 -0.4276 +vn -0.8774 -0.1107 -0.4668 +vn -0.0157 0.0142 0.9998 +vn -0.7488 -0.4972 -0.4383 +vn 0.2828 -0.9039 -0.3210 +vn -0.8328 -0.3611 -0.4196 +vn -0.4558 0.4666 -0.7580 +vn -0.5157 0.7323 -0.4447 +vn -0.5484 0.6110 -0.5709 +vn -0.5406 0.4453 0.7138 +vn -0.9772 -0.0897 0.1922 +vn -0.0112 0.0158 0.9998 +vn -0.9537 -0.2140 0.2112 +vn -0.9354 0.0476 0.3504 +vn -0.7561 0.3599 0.5466 +vn -0.4722 0.3097 -0.8253 +vn -0.0158 -0.0059 0.9999 +vn -0.9198 -0.2237 0.3225 +vn 0.6506 -0.7351 -0.1909 +vn 0.4126 -0.6084 -0.6779 +vn -0.6992 0.3081 0.6451 +vn -0.8106 0.5855 -0.0120 +vn 0.0092 0.0034 1.0000 +vn -0.8706 0.0735 0.4865 +vn -0.7710 0.3659 -0.5212 +vn 0.0112 -0.0044 0.9999 +vn 0.7088 -0.5861 -0.3926 +vn -0.8020 0.2773 -0.5290 +vn 0.9390 0.1327 0.3174 +vn 0.6955 -0.4068 -0.5923 +vn 0.7553 -0.2369 0.6110 +vn -0.9024 0.0330 -0.4296 +vn 0.8992 -0.1703 0.4030 +vn 0.9762 0.1019 -0.1914 +vn -0.9761 0.1675 -0.1386 +vn 0.9449 0.1270 0.3018 +vn 0.0144 -0.0004 0.9999 +vn 0.8324 -0.0298 0.5534 +vn 0.0052 0.0079 1.0000 +vn 0.9073 -0.2181 -0.3595 +vn 0.7823 -0.0367 -0.6218 +vn -0.2739 -0.0615 -0.9598 +vn -0.5505 0.0630 -0.8325 +vn -0.6206 0.1830 -0.7625 +vn -0.2551 0.0818 -0.9634 +vn -0.5249 0.2407 -0.8165 +vn -0.6299 0.4211 -0.6526 +vn -0.5022 0.5908 -0.6315 +vn -0.1866 0.1333 -0.9733 +vn -0.1737 0.1154 -0.9780 +vn -0.3466 0.4585 -0.8183 +vn -0.3261 0.7050 -0.6298 +vn -0.1258 0.4061 -0.9051 +vn -0.1560 0.6585 -0.7363 +vn -0.0236 0.1948 -0.9806 +vn -0.0327 0.3002 -0.9533 +vn 0.0325 0.3331 -0.9423 +vn 0.0703 0.2238 -0.9721 +vn 0.1056 0.3061 -0.9461 +vn 0.2702 0.2781 -0.9218 +vn 0.1756 0.1553 -0.9721 +vn 0.2213 0.1823 -0.9580 +vn 0.3838 0.0904 -0.9190 +vn 0.2259 0.0520 -0.9728 +vn 0.5081 -0.1892 -0.8402 +vn 0.4900 -0.1764 -0.8537 +vn 0.6368 -0.4103 -0.6528 +vn 0.1707 -0.0281 -0.9849 +vn 0.5124 -0.5823 -0.6312 +vn 0.3489 -0.4729 -0.8091 +vn 0.3305 -0.4319 -0.8392 +vn 0.3330 -0.6806 -0.6526 +vn 0.1374 -0.7631 -0.6315 +vn 0.0974 -0.1389 -0.9855 +vn 0.1017 -0.1746 -0.9794 +vn 0.0693 -0.5706 -0.8183 +vn -0.0723 -0.7734 -0.6298 +vn -0.0953 -0.4143 -0.9051 +vn -0.1960 -0.6477 -0.7363 +vn -0.0774 -0.1803 -0.9806 +vn -0.1225 -0.2760 -0.9533 +vn -0.1955 -0.2716 -0.9423 +vn -0.1732 -0.1582 -0.9721 +vn -0.2450 -0.2115 -0.9462 +vn -0.3733 -0.1047 -0.9218 +vn -0.2299 -0.0460 -0.9721 +vn -0.2829 -0.0464 -0.9580 +vn -0.3773 0.1147 -0.9190 +vn -0.2214 0.0686 -0.9728 +vn -0.3443 0.4188 -0.8403 +vn -0.3351 0.3988 -0.8536 +vn -0.3444 0.6748 -0.6527 +vn -0.1427 0.1233 -0.9821 +vn -0.1504 0.7609 -0.6312 +vn -0.0752 0.4697 -0.8796 +vn -0.0687 0.5395 -0.8392 +vn 0.0540 0.7559 -0.6525 +vn -0.0584 0.1792 -0.9821 +vn 0.2646 0.7288 -0.6316 +vn 0.1072 0.3555 -0.9285 +vn 0.2267 0.5282 -0.8183 +vn 0.4511 0.6324 -0.6298 +vn 0.0399 0.1944 -0.9801 +vn 0.2525 0.2812 -0.9258 +vn 0.4949 0.4615 -0.7362 +vn 0.2335 0.1472 -0.9611 +vn 0.2598 0.1671 -0.9511 +vn 0.3055 0.1366 -0.9423 +vn 0.2293 0.0498 -0.9721 +vn 0.3180 0.0597 -0.9462 +vn 0.3754 -0.0971 -0.9218 +vn 0.2219 -0.0758 -0.9721 +vn 0.2678 -0.1020 -0.9581 +vn 0.2686 -0.2887 -0.9190 +vn -0.1317 0.0190 -0.9911 +vn 0.1570 -0.1705 -0.9728 +vn 0.0873 -0.5350 -0.8404 +vn 0.2315 0.6600 -0.7147 +vn -0.1194 -0.2475 -0.9615 +vn 0.0893 -0.5133 -0.8536 +vn -0.0412 -0.7564 -0.6528 +vn -0.0690 0.2918 -0.9540 +vn 0.0895 0.6006 -0.7946 +vn 0.0614 -0.1783 -0.9821 +vn -0.2522 -0.7334 -0.6313 +vn -0.1079 0.3878 -0.9154 +vn -0.1709 -0.4439 -0.8796 +vn -0.2117 -0.5011 -0.8391 +vn -0.2189 0.2504 -0.9431 +vn -0.4265 -0.6264 -0.6525 +vn -0.1596 0.1718 -0.9721 +vn -0.0395 -0.1843 -0.9821 +vn -0.5949 -0.4971 -0.6316 +vn -0.2734 0.1931 -0.9423 +vn -0.2573 -0.2497 -0.9335 +vn -0.4423 -0.3218 -0.8371 +vn -0.2761 0.1437 -0.9503 +vn -0.6310 -0.3014 -0.7148 +vn -0.2617 0.1384 -0.9552 +vn 0.0539 -0.0761 -0.9956 +vn -0.6635 -0.1494 -0.7331 +vn -0.3431 0.0627 -0.9372 +vn -0.1885 -0.0540 -0.9806 +vn -0.6493 0.1904 -0.7363 +vn 0.1838 -0.1422 -0.9726 +vn -0.2061 -0.0587 -0.9768 +vn -0.3301 -0.0570 -0.9422 +vn -0.7740 0.0658 -0.6298 +vn -0.4051 -0.0864 -0.9102 +vn -0.5699 -0.0742 -0.8183 +vn -0.3905 0.0982 -0.9154 +vn -0.1244 -0.1416 -0.9821 +vn -0.7620 -0.1439 -0.6314 +vn 0.2093 -0.3252 -0.9222 +vn -0.2274 0.0762 -0.9708 +vn -0.2699 0.0998 -0.9577 +vn -0.6777 -0.3387 -0.6527 +vn -0.3662 -0.3043 -0.8794 +vn -0.4290 -0.3340 -0.8393 +vn -0.2736 0.2687 -0.9236 +vn -0.0334 -0.1857 -0.9820 +vn -0.5779 -0.5174 -0.6311 +vn -0.1217 0.1828 -0.9756 +vn -0.1798 0.2454 -0.9526 +vn -0.4050 -0.6402 -0.6528 +vn -0.1693 -0.4772 -0.8623 +vn -0.1927 -0.5062 -0.8406 +vn -0.0934 0.4978 -0.8622 +vn -0.0877 0.5344 -0.8407 +vn 0.0321 -0.3024 -0.9526 +vn 0.0285 0.7570 -0.6528 +vn 0.0134 -0.2193 -0.9756 +vn -0.0644 0.1774 -0.9820 +vn 0.2397 0.7377 -0.6311 +vn 0.1015 -0.3697 -0.9236 +vn 0.1638 0.4473 -0.8793 +vn 0.2030 0.5043 -0.8393 +vn 0.1842 -0.2199 -0.9580 +vn 0.4157 0.6333 -0.6528 +vn 0.1567 -0.1742 -0.9722 +vn 0.0364 0.1849 -0.9821 +vn 0.5866 0.5073 -0.6313 +vn 0.2805 -0.2678 -0.9217 +vn 0.3707 0.2979 -0.8797 +vn 0.4348 0.3269 -0.8391 +vn 0.3061 -0.1118 -0.9454 +vn -0.0889 0.2173 -0.9720 +vn 0.6835 0.3273 -0.6525 +vn 0.2077 -0.0528 -0.9768 +vn 0.1267 0.1395 -0.9821 +vn -0.0084 0.0929 -0.9956 +vn 0.7641 0.1308 -0.6317 +vn 0.3478 0.0866 -0.9336 +vn 0.6487 -0.2042 -0.7331 +vn 0.5442 0.0560 -0.8371 +vn 0.6971 -0.0564 -0.7148 +vn -0.9372 0.0944 -0.3357 +vn -0.8936 0.1310 -0.4294 +vn -0.8260 0.5364 0.1735 +vn -0.9021 0.4282 -0.0529 +vn -0.9039 0.4272 -0.0200 +vn -0.1478 0.0146 0.9889 +vn -0.5305 0.2979 0.7936 +vn -0.1007 -0.0600 0.9931 +vn -0.8180 0.4551 0.3518 +vn -0.1760 -0.0472 0.9833 +vn -0.7673 0.3531 0.5353 +vn -0.0742 -0.1242 0.9895 +vn -0.7590 -0.0313 0.6504 +vn -0.7838 -0.0330 0.6201 +vn -0.2208 -0.1706 0.9603 +vn -0.4697 -0.1958 0.8609 +vn -0.0468 -0.1374 0.9894 +vn -0.5310 -0.4009 0.7465 +vn -0.8092 -0.4250 0.4056 +vn -0.0619 -0.1877 0.9803 +vn 0.1001 -0.0934 0.9906 +vn -0.4555 -0.5789 0.6763 +vn -0.4587 -0.5851 0.6688 +vn 0.1040 -0.0984 0.9897 +vn -0.3003 -0.5295 0.7934 +vn -0.1179 -0.6539 0.7474 +vn -0.0162 -0.5380 0.8428 +vn 0.1249 -0.4341 0.8922 +vn 0.0912 0.0360 0.9952 +vn 0.3130 -0.6635 0.6795 +vn 0.3131 -0.6762 0.6668 +vn 0.1519 -0.0242 0.9881 +vn 0.3462 -0.3199 0.8819 +vn 0.4587 -0.3131 0.8316 +vn 0.0717 0.0889 0.9935 +vn 0.6934 -0.4019 0.5980 +vn 0.0808 0.0882 0.9928 +vn 0.5273 -0.0703 0.8468 +vn 0.5807 0.0589 0.8120 +vn 0.0688 0.0953 0.9931 +vn 0.9141 -0.1015 0.3927 +vn 0.4113 0.2458 0.8777 +vn 0.6573 0.2315 0.7172 +vn 0.6837 0.2896 0.6698 +vn 0.5006 0.3184 0.8050 +vn 0.3411 0.4054 0.8481 +vn -0.0238 0.1224 0.9922 +vn 0.3260 0.6672 0.6698 +vn 0.5471 0.7632 0.3438 +vn -0.0408 0.1934 0.9803 +vn -0.1335 0.0304 0.9906 +vn 0.1334 0.7387 0.6607 +vn 0.1172 0.7691 0.6283 +vn -0.1157 0.0230 0.9930 +vn -0.0446 0.6137 0.7883 +vn -0.1162 -0.0082 0.9932 +vn -0.2748 0.6238 0.7317 +vn -0.2259 0.8577 0.4619 +vn -0.3856 0.2310 0.8933 +vn -0.3443 0.3466 0.8726 +vn -0.5312 0.4076 0.7427 +vn -0.4592 0.2645 0.8480 +vn -0.4267 0.0839 0.9005 +vn 0.0084 -0.1006 0.9949 +vn -0.5383 0.0387 0.8419 +vn -0.8035 0.0009 0.5954 +vn -0.0255 -0.1168 0.9928 +vn -0.4912 -0.2042 0.8468 +vn -0.0116 -0.1170 0.9931 +vn -0.4725 -0.3427 0.8120 +vn -0.8413 -0.3714 0.3927 +vn -0.1170 -0.2634 0.9576 +vn -0.4520 -0.5305 0.7171 +vn 0.0289 -0.1555 0.9874 +vn -0.4248 -0.7080 0.5641 +vn -0.5600 -0.7539 0.3435 +vn 0.0586 -0.2899 0.9553 +vn -0.1460 -0.7362 0.6608 +vn -0.1447 -0.7387 0.6583 +vn 0.0444 -0.5628 0.8254 +vn 0.0863 0.0348 0.9957 +vn 0.2742 -0.5335 0.8001 +vn 0.2107 -0.8634 0.4585 +vn 0.1116 0.0382 0.9930 +vn 0.3383 -0.3526 0.8725 +vn 0.0963 0.0655 0.9932 +vn 0.5775 -0.4321 0.6927 +vn 0.5442 -0.3694 0.7533 +vn 0.4495 -0.0060 0.8933 +vn 0.4823 -0.1247 0.8671 +vn 0.6641 -0.0855 0.7428 +vn 0.6244 -0.0582 0.7790 +vn 0.4573 0.2006 0.8664 +vn -0.0085 0.0911 0.9958 +vn 0.5633 0.3476 0.7495 +vn 0.8476 0.3573 0.3923 +vn 0.0204 0.1663 0.9859 +vn 0.4609 0.5226 0.7173 +vn -0.0710 0.1180 0.9905 +vn 0.4353 0.7053 0.5595 +vn 0.5077 0.7373 0.4456 +vn -0.0341 0.2772 0.9602 +vn 0.1396 0.5962 0.7906 +vn -0.0944 0.1105 0.9894 +vn -0.0726 0.6822 0.7276 +vn 0.1054 0.9332 0.3436 +vn -0.1963 0.2212 0.9553 +vn -0.2437 0.7099 0.6608 +vn -0.2460 0.7114 0.6583 +vn -0.3211 0.4643 0.8254 +vn -0.0572 -0.0734 0.9957 +vn -0.5051 0.3234 0.8002 +vn -0.6158 0.6402 0.4592 +vn -0.0773 -0.0891 0.9930 +vn -0.4697 0.1348 0.8725 +vn -0.0504 -0.1050 0.9932 +vn -0.7164 0.0835 0.6927 +vn -0.6560 0.0460 0.7534 +vn -0.0826 -0.1164 0.9898 +vn -0.4796 -0.1345 0.8671 +vn 0.0125 -0.1159 0.9932 +vn -0.6754 -0.3187 0.6650 +vn -0.6993 -0.3188 0.6398 +vn -0.1908 -0.3189 0.9284 +vn -0.3133 -0.4111 0.8561 +vn 0.0402 -0.1186 0.9921 +vn -0.2964 -0.5711 0.7655 +vn -0.5533 -0.7348 0.3923 +vn 0.0657 -0.1542 0.9858 +vn -0.1360 -0.6834 0.7172 +vn 0.1207 -0.0663 0.9905 +vn -0.0220 -0.8286 0.5595 +vn -0.0685 -0.8925 0.4458 +vn 0.1687 -0.2224 0.9602 +vn 0.1788 -0.5856 0.7906 +vn 0.1371 -0.0481 0.9894 +vn 0.4055 -0.5534 0.7275 +vn 0.3777 -0.8598 0.3436 +vn 0.2808 -0.0925 0.9553 +vn 0.5674 -0.4913 0.6609 +vn 0.5701 -0.4914 0.6583 +vn 0.5109 -0.2401 0.8254 +vn 0.0125 0.0922 0.9957 +vn 0.5992 -0.0258 0.8002 +vn 0.8540 -0.2439 0.4595 +vn 0.0220 0.1159 0.9930 +vn 0.4738 0.1194 0.8725 +vn -0.0092 0.1161 0.9932 +vn 0.6613 0.2877 0.6928 +vn 0.5902 0.2898 0.7534 +vn 0.0129 0.1422 0.9898 +vn 0.3471 0.3573 0.8671 +vn -0.0691 0.0939 0.9932 +vn 0.4239 0.6149 0.6650 +vn 0.4444 0.6269 0.6400 +vn 0.0047 0.3714 0.9285 +vn 0.0643 0.5129 0.8560 +vn -0.0943 0.0823 0.9921 +vn -0.0306 0.6428 0.7654 +vn 0.1093 0.9133 0.3924 +vn -0.1343 0.1003 0.9859 +vn -0.2259 0.6592 0.7172 +vn -0.1376 -0.0033 0.9905 +vn -0.3973 0.7275 0.5594 +vn -0.3892 0.8061 0.4458 +vn -0.2575 0.1075 0.9603 +vn -0.4488 0.4164 0.7907 +vn -0.1426 -0.0273 0.9894 +vn -0.6287 0.2748 0.7275 +vn -0.7586 0.5536 0.3436 +vn -0.2891 -0.0611 0.9554 +vn -0.7374 0.1397 0.6608 +vn -0.7399 0.1385 0.6583 +vn -0.5624 -0.0491 0.8254 +vn 0.0355 -0.0860 0.9957 +vn -0.5311 -0.2787 0.8002 +vn -0.8605 -0.2184 0.4602 +vn 0.0392 -0.1112 0.9930 +vn -0.3496 -0.3413 0.8725 +vn 0.0663 -0.0958 0.9932 +vn -0.4272 -0.5810 0.6928 +vn -0.3646 -0.5470 0.7535 +vn 0.0603 -0.1294 0.9898 +vn -0.1205 -0.4834 0.8671 +vn 0.1069 -0.0465 0.9932 +vn -0.0576 -0.7446 0.6650 +vn -0.0692 -0.7653 0.6400 +vn 0.1792 -0.3102 0.9336 +vn 0.2021 -0.4757 0.8560 +vn 0.0974 0.0839 0.9917 +vn 0.2476 -0.4971 0.8316 +vn 0.4058 -0.6856 0.6045 +vn 0.7155 -0.4548 0.5303 +vn 0.6858 -0.4525 0.5700 +vn 0.5428 -0.7245 0.4248 +vn 0.4918 -0.1939 0.8488 +vn 0.4082 -0.1805 -0.8949 +vn 0.4183 -0.1792 -0.8905 +vn 0.1987 -0.2843 -0.9379 +vn 0.5716 -0.3793 -0.7276 +vn 0.2145 -0.3410 -0.9152 +vn 0.4162 -0.8722 0.2568 +vn 0.1457 -0.5173 -0.8433 +vn 0.2703 -0.6563 -0.7045 +vn 0.0619 -0.9630 0.2624 +vn -0.0355 -0.3653 -0.9302 +vn -0.0933 -0.9526 0.2896 +vn -0.1307 -0.3870 -0.9128 +vn -0.4282 -0.8972 0.1078 +vn -0.5052 -0.7966 0.3320 +vn -0.2636 -0.6674 -0.6965 +vn -0.6421 -0.7482 0.1669 +vn -0.6747 -0.6751 0.2985 +vn -0.4198 -0.4047 -0.8124 +vn -0.8448 -0.5272 0.0918 +vn -0.8587 -0.3949 0.3267 +vn -0.3301 -0.0852 -0.9401 +vn -0.9789 -0.1598 0.1276 +vn -0.5020 -0.0590 -0.8628 +vn -0.6490 -0.1460 -0.7466 +vn -0.3969 0.0704 -0.9152 +vn -0.4461 0.2162 -0.8685 +vn -0.6637 0.2024 -0.7201 +vn -0.3035 0.2654 -0.9151 +vn -0.2635 0.4394 -0.8588 +vn -0.7513 0.6577 -0.0553 +vn -0.1253 0.3875 -0.9133 +vn -0.0018 0.3690 -0.9294 +vn 0.0996 0.9609 0.2582 +vn 0.1011 0.6823 -0.7241 +vn 0.0960 0.7033 -0.7044 +vn 0.4303 0.8637 0.2624 +vn 0.2142 0.2981 -0.9302 +vn 0.5593 0.7767 0.2896 +vn 0.3075 0.2690 -0.9127 +vn 0.8210 0.5606 0.1078 +vn 0.8370 0.4349 0.3320 +vn 0.5632 0.4445 -0.6966 +vn 0.9311 0.3243 0.1670 +vn 0.9225 0.2447 0.2985 +vn 0.5664 0.1390 -0.8123 +vn 0.9953 0.0314 0.0918 +vn 0.9408 -0.0900 0.3267 +vn 0.3283 -0.0922 -0.9401 +vn 0.9266 -0.3537 0.1277 +vn 0.4635 -0.2012 -0.8629 +vn 0.6345 -0.1999 -0.7467 +vn 0.3078 -0.2603 -0.9151 +vn 0.2770 -0.4111 -0.8685 +vn 0.4721 -0.5084 -0.7201 +vn 0.1291 -0.3819 -0.9151 +vn 0.0243 -0.4948 -0.8687 +vn 0.1409 -0.6790 -0.7205 +vn -0.0869 -0.3937 -0.9151 +vn -0.2300 -0.4346 -0.8708 +vn -0.2257 -0.5851 -0.7790 +vn -0.5690 -0.7808 0.2581 +vn -0.2934 -0.2675 -0.9178 +vn -0.8060 -0.5305 0.2624 +vn -0.4459 -0.3134 -0.8384 +vn -0.3946 -0.2103 -0.8945 +vn -0.8738 -0.3906 0.2897 +vn -0.3959 -0.0752 -0.9152 +vn -0.9916 -0.0722 0.1078 +vn -0.9422 0.0445 0.3320 +vn -0.6289 -0.0437 -0.7763 +vn -0.9680 0.1874 0.1670 +vn -0.9206 0.2519 0.2985 +vn -0.5595 0.1645 -0.8123 +vn -0.8763 0.4730 0.0918 +vn -0.7682 0.5506 0.3267 +vn -0.2375 0.2446 -0.9401 +vn -0.6234 0.7714 0.1277 +vn -0.2996 0.4068 -0.8630 +vn -0.4482 0.4917 -0.7466 +vn -0.1354 0.3797 -0.9152 +vn -0.0329 0.4945 -0.8685 +vn -0.1527 0.6768 -0.7202 +vn 0.0803 0.3951 -0.9151 +vn 0.2276 0.4400 -0.8687 +vn 0.2193 0.6577 -0.7207 +vn 0.2729 0.2967 -0.9151 +vn 0.4172 0.2602 -0.8708 +vn 0.4890 0.3923 -0.7791 +vn 0.8871 0.3921 0.2435 +vn 0.3881 0.0838 -0.9178 +vn 0.9917 0.0214 0.1264 +vn 0.6077 0.0298 -0.7936 +vn 0.9517 -0.1014 0.2897 +vn 0.6048 -0.1328 -0.7852 +vn 0.8936 -0.4358 0.1078 +vn 0.7923 -0.5119 0.3320 +vn 0.1630 -0.2545 -0.9532 +vn 0.7427 -0.6484 0.1670 +vn 0.6693 -0.6804 0.2985 +vn 0.4704 -0.4951 -0.7305 +vn 0.5200 -0.8492 0.0917 +vn 0.3876 -0.8620 0.3267 +vn 0.0929 -0.3408 -0.9355 +vn 0.1514 -0.9802 0.1279 +vn 0.0254 -0.4480 -0.8937 +vn 0.1404 -0.6502 -0.7467 +vn -0.0737 -0.3963 -0.9151 +vn -0.2200 -0.4441 -0.8686 +vn -0.2081 -0.6618 -0.7203 +vn -0.2679 -0.3013 -0.9151 +vn -0.4179 -0.2661 -0.8687 +vn -0.5201 -0.4584 -0.7207 +vn -0.8775 -0.4041 0.2581 +vn -0.3850 -0.1194 -0.9151 +vn -0.9624 -0.0701 0.2624 +vn -0.4914 -0.0153 -0.8708 +vn -0.6199 -0.0935 -0.7791 +vn -0.9647 0.0868 0.2486 +vn -0.3777 0.1226 -0.9178 +vn -0.8797 0.4559 0.1353 +vn -0.8825 0.3907 0.2616 +vn -0.5403 0.2796 -0.7937 +vn -0.7451 0.6134 0.2620 +vn -0.7453 0.6123 0.2640 +vn -0.4648 0.4271 -0.7756 +vn -0.5345 0.8399 0.0939 +vn -0.4258 0.8356 0.3470 +vn -0.0880 0.3294 -0.9401 +vn -0.1681 0.9775 0.1274 +vn -0.0634 0.5016 -0.8628 +vn -0.1516 0.6478 -0.7466 +vn 0.0671 0.3975 -0.9152 +vn 0.2124 0.4480 -0.8684 +vn 0.1967 0.6655 -0.7200 +vn 0.2628 0.3057 -0.9151 +vn 0.4134 0.2734 -0.8685 +vn 0.5125 0.4677 -0.7202 +vn 0.3830 0.1259 -0.9151 +vn 0.4949 0.0201 -0.8687 +vn 0.6631 0.1236 -0.7383 +vn 0.9618 -0.0915 0.2582 +vn 0.3713 -0.1165 -0.9212 +vn 0.8673 -0.4229 0.2624 +vn 0.4747 -0.2439 -0.8457 +vn 0.4332 -0.2446 -0.8675 +vn -0.6549 0.6839 0.3217 +vn 0.7905 -0.5598 0.2486 +vn -0.7829 0.6205 0.0448 +vn 0.2670 -0.3025 -0.9150 +vn 0.5315 -0.8362 0.1354 +vn -0.9290 0.3120 0.1988 +vn 0.5667 -0.7813 0.2616 +vn 0.3238 -0.5021 -0.8019 +vn 0.3360 -0.9047 0.2621 +vn 0.3367 -0.9038 0.2640 +vn -0.9793 0.1748 0.1019 +vn 0.1435 -0.5565 -0.8184 +vn 0.0401 -0.9948 0.0939 +vn -0.9367 -0.2104 0.2798 +vn -0.0517 -0.9364 0.3470 +vn -0.9830 -0.1371 0.1226 +vn -0.1281 -0.2817 -0.9509 +vn -0.8393 -0.4670 0.2785 +vn -0.3458 -0.9296 0.1275 +vn -0.7945 -0.0246 -0.6068 +vn -0.8535 -0.1477 -0.4997 +vn -0.4530 -0.8450 0.2842 +vn -0.8384 -0.1598 -0.5211 +vn -0.7900 -0.6028 0.1118 +vn -0.4437 -0.8397 -0.3133 +vn -0.7657 -0.6204 -0.1700 +vn -0.3940 -0.9162 0.0726 +vn -0.6308 -0.2553 -0.7328 +vn -0.4643 -0.5840 -0.6659 +vn 0.5827 -0.6880 0.4326 +vn 0.1433 -0.3337 0.9317 +vn 0.9458 -0.0198 0.3241 +vn 0.3614 -0.2317 0.9032 +vn 0.8839 0.1119 0.4541 +vn 0.9181 0.1901 0.3477 +vn 0.8587 0.3453 0.3786 +vn 0.8309 0.3530 0.4300 +vn 0.7697 0.5375 0.3444 +vn 0.3913 -0.0242 0.9199 +vn 0.3029 -0.0260 0.9527 +vn 0.4621 0.1257 0.8778 +vn 0.3554 0.2070 0.9115 +vn 0.3393 0.8189 0.4629 +vn 0.0988 0.8920 0.4411 +vn 0.1103 0.9073 0.4057 +vn 0.1683 0.2759 0.9463 +vn -0.0940 0.9139 0.3948 +vn 0.1215 0.3905 0.9126 +vn -0.3622 0.8113 0.4589 +vn 0.0622 0.3441 0.9369 +vn -0.5534 0.7529 0.3563 +vn -0.6986 0.4761 0.5341 +vn -0.1315 0.3102 0.9415 +vn -0.8482 0.1700 0.5017 +vn -0.9257 -0.0665 0.3722 +vn -0.8662 -0.0899 0.4915 +vn -0.8747 -0.3131 0.3700 +vn -0.8109 -0.3203 0.4898 +vn -0.7581 -0.5356 0.3721 +vn -0.3908 0.0308 0.9200 +vn -0.6950 -0.5248 0.4914 +vn -0.2559 0.0310 0.9662 +vn -0.5867 -0.7203 0.3702 +vn -0.3514 -0.0595 0.9343 +vn -0.5284 -0.6934 0.4899 +vn -0.3849 -0.8403 0.3819 +vn -0.3531 -0.1781 0.9185 +vn -0.2827 -0.1541 0.9468 +vn -0.3364 -0.3409 0.8778 +vn -0.2032 -0.3575 0.9115 +vn 0.1283 -0.9030 0.4101 +vn 0.3814 -0.8111 0.4435 +vn 0.5467 -0.7595 0.3526 +vn 0.5499 -0.6959 0.4619 +vn 0.7312 -0.5848 0.3512 +vn 0.7175 -0.5223 0.4609 +vn 0.1172 -0.2790 0.9531 +vn 0.1019 -0.2538 0.9619 +vn 0.8812 -0.3376 0.3309 +vn 0.2772 -0.2896 0.9161 +vn 0.3027 -0.2055 0.9307 +vn 0.8187 0.2792 0.5017 +vn 0.7670 0.5227 0.3722 +vn 0.7038 0.5130 0.4915 +vn 0.5989 0.7102 0.3700 +vn 0.5402 0.6843 0.4898 +vn 0.3863 0.8440 0.3721 +vn 0.3533 0.1697 0.9200 +vn 0.3372 0.8030 0.4913 +vn 0.2774 0.1253 0.9526 +vn 0.1453 0.9175 0.3702 +vn 0.3422 0.3352 0.8778 +vn 0.1085 0.8650 0.4899 +vn -0.0894 0.9199 0.3818 +vn 0.2223 0.3524 0.9091 +vn 0.1592 0.2505 0.9549 +vn 0.1174 0.3685 0.9222 +vn 0.0299 0.3384 0.9405 +vn -0.5646 0.7163 0.4101 +vn -0.7373 0.5096 0.4435 +vn -0.8543 0.3820 0.3526 +vn -0.8251 0.3253 0.4620 +vn -0.9260 0.1383 0.3512 +vn -0.8827 0.0911 0.4610 +vn -0.2415 0.1824 0.9531 +vn -0.2156 0.1682 0.9619 +vn -0.9316 -0.1508 0.3308 +vn -0.3852 0.1111 0.9161 +vn -0.3649 0.0256 0.9307 +vn -0.5676 -0.6527 0.5018 +vn -0.4005 -0.8373 0.3722 +vn -0.3507 -0.7971 0.4915 +vn -0.1609 -0.9150 0.3700 +vn -0.1232 -0.8630 0.4899 +vn 0.1044 -0.9259 0.3631 +vn -0.2202 -0.3243 0.9200 +vn 0.1237 -0.8936 0.4315 +vn -0.1769 -0.2476 0.9526 +vn 0.3446 -0.8789 0.3299 +vn -0.1275 -0.4618 0.8778 +vn 0.3600 -0.8279 0.4301 +vn 0.5427 -0.7658 0.3451 +vn -0.0152 -0.4164 0.9091 +vn -0.0118 -0.2966 0.9549 +vn 0.0837 -0.3777 0.9222 +vn 0.1442 -0.3076 0.9405 +vn 0.8481 -0.3357 0.4100 +vn 0.8936 -0.0701 0.4434 +vn 0.9298 0.0923 0.3564 +vn 0.8018 0.3604 0.4767 +vn 0.8014 0.5005 0.3276 +vn 0.3611 -0.0519 0.9311 +vn 0.6505 0.5270 0.5469 +vn 0.6269 0.6980 0.3462 +vn 0.4362 0.6707 0.5999 +vn 0.2759 0.1240 0.9531 +vn 0.2784 0.1256 0.9522 +vn 0.1628 0.8495 0.5018 +vn -0.0744 0.9252 0.3721 +vn -0.0973 0.8655 0.4914 +vn -0.3206 0.8719 0.3701 +vn -0.3271 0.8081 0.4899 +vn -0.5555 0.7480 0.3632 +vn 0.0275 0.3910 0.9200 +vn -0.5559 0.7105 0.4315 +vn 0.0285 0.3029 0.9526 +vn -0.7395 0.5867 0.3299 +vn -0.1218 0.4633 0.8778 +vn -0.7272 0.5349 0.4301 +vn -0.8540 0.3894 0.3451 +vn -0.1961 0.3676 0.9091 +vn -0.1388 0.2623 0.9550 +vn -0.2621 0.2845 0.9222 +vn -0.2793 0.1935 0.9405 +vn -0.9019 -0.1359 0.4101 +vn -0.8078 -0.3883 0.4435 +vn -0.7575 -0.5469 0.3564 +vn -0.5121 -0.7144 0.4767 +vn -0.4414 -0.8353 0.3276 +vn -0.3383 -0.1365 0.9311 +vn -0.8401 -0.5170 0.1644 +vn -0.2977 -0.7825 0.5469 +vn -0.5723 -0.6754 -0.4651 +vn -0.1913 -0.9184 0.3463 +vn -0.5781 -0.7006 -0.4182 +vn -0.0401 -0.7991 0.5998 +vn -0.3623 -0.8171 -0.4485 +vn -0.1763 -0.2458 0.9532 +vn -0.1776 -0.2484 0.9523 +vn 0.0236 -0.3553 -0.9345 +vn 0.2861 -0.8163 0.5018 +vn -0.1963 0.8267 -0.5273 +vn 0.5292 -0.7625 0.3722 +vn -0.0186 0.1313 -0.9912 +vn 0.5189 -0.6994 0.4914 +vn 0.0937 -0.4776 -0.8736 +vn 0.7153 -0.5928 0.3701 +vn 0.6889 -0.5343 0.4899 +vn -0.0213 0.1365 -0.9904 +vn 0.8562 -0.3677 0.3631 +vn 0.1727 -0.3519 0.9200 +vn 0.8376 -0.3350 0.4315 +vn 0.1275 -0.2761 0.9526 +vn -0.6984 0.6958 0.1680 +vn -0.1235 0.1141 -0.9858 +vn -0.4959 0.3316 -0.8026 +vn 0.9342 -0.1357 0.3300 +vn 0.3380 -0.3393 0.8778 +vn 0.8975 -0.0971 0.4302 +vn 0.0771 -0.0581 -0.9953 +vn -0.5534 0.3807 0.7408 +vn 0.9340 0.0924 0.3450 +vn 0.3543 -0.2194 0.9090 +vn -0.3630 0.1349 -0.9220 +vn 0.2518 -0.1571 0.9550 +vn 0.3695 -0.1143 0.9222 +vn 0.3619 -0.1014 -0.9267 +vn -0.6752 -0.0752 -0.7338 +vn 0.1490 0.0154 -0.9887 +vn -0.9675 -0.2496 -0.0416 +vn 0.9100 0.4095 0.0652 +vn 0.3386 -0.0270 0.9405 +vn -0.3351 -0.0340 -0.9416 +vn 0.7115 0.5706 0.4101 +vn 0.1901 0.0290 -0.9813 +vn 0.7833 0.5315 0.3225 +vn -0.1914 -0.1379 -0.9718 +vn 0.5033 0.7416 0.4435 +vn 0.6785 0.3176 -0.6624 +vn 0.3802 0.8535 0.3564 +vn 0.9542 0.2942 0.0552 +vn 0.4527 0.0230 -0.8914 +vn 0.4494 0.0210 -0.8931 +vn -0.2727 -0.1839 -0.9444 +vn -0.2334 -0.2614 -0.9366 +vn -0.2840 -0.3498 -0.8927 +vn 0.1498 0.1861 -0.9710 +vn 0.0838 0.8750 0.4768 +vn -0.0380 0.9440 0.3276 +vn 0.2239 0.2880 0.9311 +vn -0.0224 -0.1835 -0.9828 +vn -0.2365 -0.5396 -0.8080 +vn -0.8904 0.0419 -0.4532 +vn -0.9807 0.1324 -0.1441 +vn -0.1358 0.8261 0.5469 +vn -0.2961 0.8902 0.3463 +vn -0.0283 -0.5546 -0.8316 +vn -0.9306 0.3660 0.0017 +vn -0.0151 -0.2113 -0.9773 +vn -0.9202 0.3833 -0.0793 +vn -0.3668 0.7111 0.5998 +vn 0.0445 -0.7672 -0.6399 +vn 0.0289 0.3011 0.9531 +vn 0.0061 -0.0987 -0.9951 +vn 0.1503 -0.5300 -0.8346 +vn 0.0289 0.3010 0.9532 +vn -0.5567 0.5220 0.6462 +vn -0.3830 0.5235 0.7611 +vn 0.2085 -0.1705 -0.9631 +vn 0.4152 -0.7288 -0.5445 +vn 0.0404 -0.1133 -0.9927 +vn 0.4080 -0.2307 0.8833 +vn 0.0169 0.1314 0.9912 +vn -0.1152 0.1587 -0.9806 +vn 0.2502 -0.3709 -0.8943 +vn -0.0973 0.1497 -0.9839 +vn -0.8519 -0.5211 0.0522 +vn -0.8588 -0.4852 0.1643 +vn -0.6128 -0.7670 0.1903 +vn -0.5581 -0.5850 0.5885 +vn -0.3357 -0.7506 0.5691 +vn -0.0741 -0.4826 0.8727 +vn 0.0198 -0.3924 0.9196 +vn -0.0925 -0.9417 0.3235 +vn 0.2599 -0.6693 0.6960 +vn 0.1771 -0.5691 0.8030 +vn 0.4290 -0.4035 0.8082 +vn 0.5596 -0.6838 0.4684 +vn 0.6539 -0.4177 0.6308 +vn 0.8164 -0.3699 0.4435 +vn 0.6683 -0.1372 0.7311 +vn 0.9473 0.0849 0.3089 +vn 0.9256 0.0911 0.3674 +vn 0.6907 0.2807 0.6665 +vn 0.4147 0.2161 0.8839 +vn 0.7423 0.6245 0.2431 +vn 0.4329 0.6222 0.6522 +vn 0.4380 0.6254 0.6458 +vn 0.1752 0.8131 0.5552 +vn 0.1744 0.7227 0.6688 +vn -0.0925 0.9529 0.2888 +vn -0.1016 0.9624 0.2520 +vn -0.7758 0.6281 -0.0603 +vn -0.7824 0.6224 -0.0217 +vn -0.5978 0.7956 -0.0984 +vn -0.5903 0.7960 -0.1339 +vn -0.3581 0.9256 -0.1227 +vn -0.3553 0.9248 -0.1359 +vn -0.1186 0.9854 -0.1222 +vn -0.0772 0.9018 -0.4252 +vn 0.2104 0.9643 -0.1608 +vn 0.0956 0.9045 -0.4156 +vn 0.2983 0.9510 -0.0818 +vn 0.3800 0.7868 -0.4864 +vn 0.6268 0.7626 -0.1597 +vn 0.5841 0.7412 -0.3309 +vn 0.5735 0.6945 -0.4346 +vn 0.8865 0.4554 -0.0819 +vn 0.6992 0.4984 -0.5126 +vn 0.8530 0.4441 -0.2740 +vn 0.8528 0.2981 -0.4289 +vn 0.9275 0.2013 -0.3151 +vn 0.8503 0.0338 -0.5251 +vn 0.9308 -0.0684 -0.3592 +vn 0.9156 -0.3794 -0.1332 +vn 0.8706 -0.2704 -0.4110 +vn 0.7953 -0.5937 -0.1228 +vn 0.7925 -0.5945 -0.1360 +vn 0.6066 -0.7858 -0.1206 +vn 0.6037 -0.7859 -0.1338 +vn 0.3404 -0.9325 -0.1206 +vn 0.3638 -0.9312 -0.0217 +vn 0.1171 -0.9882 -0.0984 +vn 0.1104 -0.9848 -0.1339 +vn -0.1555 -0.9802 -0.1227 +vn -0.1575 -0.9781 -0.1359 +vn -0.3926 -0.9115 -0.1222 +vn -0.3863 -0.8185 -0.4253 +vn -0.6664 -0.7281 -0.1607 +vn -0.5371 -0.7340 -0.4156 +vn -0.7357 -0.6723 -0.0817 +vn -0.7239 -0.4892 -0.4864 +vn -0.9251 -0.3444 -0.1598 +vn -0.8775 -0.3473 -0.3308 +vn -0.8447 -0.3123 -0.4346 +vn -0.9953 0.0517 -0.0820 +vn -0.8549 -0.0796 -0.5126 +vn -0.9607 0.0446 -0.2740 +vn -0.8871 0.1708 -0.4289 +vn -0.9030 0.2920 -0.3151 +vn -0.7522 0.3980 -0.5252 +vn -0.7704 0.5268 -0.3592 +vn -0.6010 0.7881 -0.1333 +vn -0.6169 0.6712 -0.4111 +vn -0.3893 0.9129 -0.1228 +vn -0.3865 0.9122 -0.1360 +vn -0.1297 0.9842 -0.1205 +vn -0.1271 0.9828 -0.1338 +vn 0.1742 0.9773 -0.1207 +vn 0.1534 0.9879 -0.0217 +vn 0.3953 0.9133 -0.0984 +vn 0.3994 0.9069 -0.1340 +vn 0.6269 0.7694 -0.1226 +vn 0.6277 0.7665 -0.1359 +vn 0.7975 0.5909 -0.1222 +vn 0.7452 0.5135 -0.4253 +vn 0.9420 0.2947 -0.1608 +vn 0.8332 0.3648 -0.4155 +vn 0.9739 0.2116 -0.0818 +vn 0.8717 0.0593 -0.4864 +vn 0.9729 -0.1670 -0.1598 +vn 0.9332 -0.1406 -0.3307 +vn 0.8873 -0.1544 -0.4346 +vn 0.8346 -0.5447 -0.0820 +vn 0.7792 -0.3608 -0.5126 +vn 0.8082 -0.5213 -0.2741 +vn 0.6812 -0.5934 -0.4288 +vn 0.6340 -0.7062 -0.3151 +vn 0.4504 -0.7221 -0.5251 +vn 0.4014 -0.8425 -0.3592 +vn 0.1237 -0.9833 -0.1332 +vn 0.1961 -0.8903 -0.4111 +vn -0.1221 -0.9849 -0.1228 +vn -0.1242 -0.9829 -0.1359 +vn -0.3824 -0.9161 -0.1205 +vn -0.3839 -0.9136 -0.1339 +vn -0.6417 -0.7575 -0.1206 +vn -0.6290 -0.7771 -0.0216 +vn -0.8234 -0.5566 -0.1103 +vn -0.8169 -0.5765 0.0184 +vn -0.9142 -0.3497 -0.2047 +vn -0.9744 -0.2104 0.0786 +vn -0.8642 -0.0872 -0.4955 +vn -0.9229 0.0670 -0.3791 +vn -0.8504 0.1231 -0.5116 +vn -0.8714 0.3129 -0.3779 +vn -0.7863 0.3481 -0.5105 +vn -0.7573 0.6332 -0.1598 +vn -0.7362 0.5904 -0.3307 +vn -0.6896 0.5794 -0.4346 +vn -0.4219 0.8945 -0.1479 +vn -0.4924 0.7034 -0.5126 +vn -0.4197 0.8913 -0.1716 +vn -0.4361 0.8579 -0.2716 +vn -0.1795 0.9778 -0.1084 +vn -0.1710 0.9761 -0.1341 +vn 0.1054 0.9868 -0.1228 +vn 0.1075 0.9849 -0.1360 +vn 0.3668 0.9225 -0.1206 +vn 0.3683 0.9200 -0.1337 +vn 0.6004 0.7902 -0.1228 +vn 0.6012 0.7874 -0.1360 +vn 0.7909 0.5999 -0.1206 +vn 0.7910 0.5970 -0.1339 +vn 0.9354 0.3325 -0.1206 +vn 0.9343 0.3558 -0.0216 +vn 0.9916 0.0675 -0.1103 +vn 0.9960 0.0880 0.0183 +vn 0.9661 -0.1570 -0.2047 +vn 0.9482 -0.3077 0.0786 +vn 0.7910 -0.3588 -0.4955 +vn -0.0020 -0.0156 -0.9999 +vn 0.7643 -0.5216 -0.3791 +vn 0.6734 -0.5337 -0.5116 +vn 0.0001 0.0001 -1.0000 +vn 0.5962 -0.7083 -0.3779 +vn 0.5049 -0.6960 -0.5105 +vn 0.3366 -0.9280 -0.1597 +vn -0.0134 0.0045 -0.9999 +vn -0.1155 0.4444 0.8883 +vn 0.3399 -0.8804 -0.3307 +vn 0.3051 -0.8474 -0.4345 +vn -0.0118 0.0096 -0.9999 +vn 0.0002 0.0000 -1.0000 +vn -0.0261 0.0325 0.9991 +vn 0.0107 0.1105 0.9938 +vn -0.0846 -0.9854 -0.1480 +vn -0.0849 -0.9815 -0.1716 +vn 0.0723 -0.8556 -0.5126 +vn -0.0008 -0.0155 -0.9999 +vn -0.0540 -0.9609 -0.2715 +vn -0.0080 -0.0069 -0.9999 +vn -0.3361 -0.9356 -0.1085 +vn -0.3425 -0.9299 -0.1339 +vn -0.1101 -0.8099 0.5762 +vn -0.0707 -0.7536 0.6535 +vn 0.1770 0.1982 0.9641 +vn -0.0048 0.0029 -1.0000 +vn -0.5870 -0.8003 -0.1228 +vn -0.0023 -0.0019 -1.0000 +vn -0.5878 -0.7975 -0.1360 +vn -0.2692 -0.7429 0.6129 +vn -0.1087 -0.1325 0.9852 +vn -0.7806 -0.6133 -0.1206 +vn -0.7807 -0.6104 -0.1338 +vn 0.0001 -0.0000 -1.0000 +vn -0.1746 -0.1374 0.9750 +vn -0.5301 -0.6265 0.5714 +vn -0.0030 0.0286 -0.9996 +vn 0.8217 0.3269 0.4669 +vn -0.9162 -0.3815 -0.1228 +vn -0.1203 -0.0445 0.9917 +vn -0.9155 -0.3787 -0.1359 +vn -0.6531 -0.4792 0.5863 +vn -0.6584 -0.4799 0.5799 +vn -0.0142 0.0178 -0.9997 +vn 0.1204 0.0095 0.9927 +vn -0.9853 -0.1213 -0.1206 +vn -0.9839 -0.1188 -0.1339 +vn -0.7194 -0.2585 0.6447 +vn 0.0095 -0.0022 -1.0000 +vn 0.1619 -0.0444 0.9858 +vn -0.9758 0.1825 -0.1205 +vn -0.9866 0.1618 -0.0216 +vn -0.0000 -0.0089 -1.0000 +vn 0.1183 -0.0523 0.9916 +vn -0.0136 0.0079 -0.9999 +vn -0.9190 0.3833 -0.0921 +vn -0.8340 0.0536 0.5491 +vn 0.2271 -0.2473 0.9419 +vn -0.8218 0.3793 -0.4252 +vn -0.6557 0.1778 0.7338 +vn -0.0015 0.0085 -1.0000 +vn -0.7337 0.6602 -0.1607 +vn 0.0029 -0.0168 -0.9999 +vn -0.6786 0.7300 -0.0817 +vn -0.7385 0.5308 -0.4157 +vn -0.7326 0.3373 0.5911 +vn -0.1027 0.1063 0.9890 +vn -0.6346 0.3801 0.6729 +vn -0.0140 -0.0110 -0.9998 +vn -0.0121 0.0075 -0.9999 +vn -0.1583 0.2241 0.9616 +vn -0.6564 0.5532 0.5129 +vn -0.9887 -0.0681 0.1337 +vn -0.4955 0.7197 -0.4864 +vn -0.5024 0.5769 0.6441 +vn -0.0002 -0.0000 -1.0000 +vn 0.2112 -0.9774 -0.0106 +vn -0.9175 -0.2856 -0.2770 +vn -0.8356 -0.2069 0.5089 +vn -0.3689 0.8625 -0.3465 +vn -0.7687 -0.2375 0.5939 +vn -0.0253 0.1225 0.9922 +vn -0.3212 0.8592 -0.3983 +vn -0.5421 -0.3111 0.7806 +vn -0.0215 0.2152 0.9763 +vn -0.2315 0.9235 -0.3059 +vn -0.7189 -0.4850 0.4980 +vn -0.2798 0.8428 0.4598 +vn 0.0166 0.2412 0.9703 +vn 0.0914 0.9739 -0.2079 +vn -0.0853 0.8667 -0.4915 +vn -0.1499 0.7269 0.6702 +vn 0.0540 0.9416 -0.3323 +vn -0.0124 -0.1140 0.9934 +vn -0.3220 -0.4207 0.8482 +vn 0.3301 0.9435 -0.0287 +vn 0.9431 -0.3323 -0.0064 +vn -0.2269 -0.2533 0.9404 +vn 0.5985 0.7877 -0.1462 +vn 0.3892 0.8111 -0.4366 +vn 0.9608 0.0004 -0.2772 +vn 0.5385 0.7894 -0.2947 +vn 0.1295 0.1390 0.9818 +vn -0.0523 0.1007 -0.9935 +vn 0.7680 0.6405 0.0013 +vn 0.8589 0.2699 -0.4353 +vn 0.4143 0.7474 0.5193 +vn 0.0233 0.0866 0.9960 +vn 0.1103 0.3162 -0.9423 +vn 0.8478 0.2545 -0.4653 +vn 0.3919 0.4859 -0.7813 +vn 0.8125 0.4085 -0.4158 +vn 0.5075 0.5459 0.6667 +vn 0.4538 0.4697 0.7573 +vn 0.7033 0.4688 -0.5344 +vn 0.5024 0.4219 -0.7547 +vn 0.7451 0.6425 0.1792 +vn 0.4272 0.2550 0.8675 +vn -0.3558 0.6883 0.6321 +vn 0.1327 0.7341 0.6659 +vn 0.2415 0.6296 0.7384 +vn 0.4766 0.5431 0.6913 +vn 0.5634 0.3953 0.7255 +vn 0.5724 0.3992 0.7162 +vn 0.7374 0.2499 0.6275 +vn 0.6919 0.1572 0.7047 +vn 0.1885 -0.7073 0.6813 +vn 0.0784 -0.6184 0.7819 +vn -0.0376 -0.7660 0.6418 +vn -0.4836 -0.5680 0.6659 +vn -0.5252 -0.4230 0.7384 +vn -0.6850 -0.2301 0.6913 +vn -0.6857 -0.0587 0.7255 +vn -0.6955 -0.0576 0.7162 +vn -0.7632 0.1545 0.6275 +vn -0.6772 0.2118 0.7046 +vn 0.1924 0.7063 0.6813 +vn 0.2429 0.5741 0.7819 +vn 0.4174 0.6434 0.6418 +vn 0.7036 0.2481 0.6659 +vn 0.6666 0.1018 0.7384 +vn 0.7078 -0.1452 0.6913 +vn 0.6223 -0.2938 0.7255 +vn 0.6303 -0.2996 0.7162 +vn 0.5822 -0.5170 0.6275 +vn 0.4791 -0.5234 0.7047 +vn -0.5212 -0.5139 0.6814 +vn -0.4911 -0.3407 0.8017 +vn -0.7104 -0.3739 0.5963 +vn -0.6854 -0.1377 0.7150 +vn -0.5391 0.4813 0.6912 +vn -0.3905 0.5667 0.7255 +vn -0.3944 0.5757 0.7162 +vn -0.2605 0.7239 0.6388 +vn -0.1183 0.6355 0.7630 +vn 0.7088 0.1824 0.6814 +vn 0.5958 0.0478 0.8017 +vn 0.8021 -0.0336 0.5963 +vn 0.6618 -0.2253 0.7150 +vn 0.2242 -0.6869 0.6913 +vn 0.0529 -0.6861 0.7255 +vn 0.0518 -0.6959 0.7162 +vn -0.1385 -0.7568 0.6388 +vn -0.2170 -0.6089 0.7630 +vn -0.7045 0.1985 0.6814 +vn -0.5392 0.2580 0.8017 +vn -0.7077 0.4797 0.5187 +vn 0.2256 0.5276 0.8190 +vn -0.4153 0.5014 0.7590 +vn 0.1312 0.5164 0.8462 +vn -0.6635 -0.7479 -0.0199 +vn -0.2492 0.7336 0.6323 +vn -0.4063 -0.8687 0.2834 +vn -0.1263 0.7193 0.6831 +vn -0.3217 -0.9342 -0.1543 +vn -0.0598 -0.9943 0.0880 +vn -0.0064 -0.9590 0.2834 +vn 0.0496 0.9597 0.2767 +vn -0.2731 0.3860 0.8811 +vn 0.1454 0.9577 0.2485 +vn 0.1921 0.9750 0.1120 +vn 0.3687 0.6638 0.6507 +vn 0.2517 -0.8812 -0.4001 +vn 0.4333 0.8681 0.2421 +vn -0.2083 0.9606 -0.1839 +vn -0.3119 0.8887 0.3360 +vn 0.4982 0.6234 0.6026 +vn 0.4936 0.4174 0.7630 +vn 0.5278 -0.8151 0.2389 +vn 0.5285 0.8014 -0.2800 +vn -0.5333 0.8427 0.0739 +vn 0.6642 -0.7253 -0.1813 +vn -0.5610 0.8151 -0.1442 +vn 0.7550 0.6542 0.0454 +vn 0.7702 0.6037 -0.2057 +vn 0.8424 -0.5382 -0.0286 +vn 0.7258 0.2942 0.6218 +vn 0.8357 0.3752 0.4010 +vn -0.7636 0.6435 0.0525 +vn 0.8513 -0.5235 0.0365 +vn 0.7417 0.1903 0.6432 +vn -0.7870 0.5072 -0.3513 +vn -0.4028 -0.0929 0.9106 +vn 0.9320 -0.3037 -0.1978 +vn 0.9369 0.3481 -0.0326 +vn -0.9019 0.4014 0.1593 +vn -0.8287 0.0296 0.5589 +vn 0.8983 0.2391 -0.3686 +vn 0.9590 0.0598 0.2769 +vn 0.9714 -0.1562 0.1788 +vn 0.9232 -0.0402 -0.3823 +vn -0.9976 -0.0449 0.0529 +vn -0.0110 -0.0120 -0.9999 +vn 0.8073 -0.0873 0.5837 +vn -0.9740 0.1837 -0.1328 +vn 0.9855 0.1274 0.1116 +vn 0.9817 0.0640 0.1794 +vn 0.7330 -0.2010 0.6499 +vn 0.7482 -0.1740 0.6402 +vn -0.9301 0.2391 0.2789 +vn -0.9487 0.0312 0.3147 +vn 0.9817 0.1339 0.1354 +vn -0.0199 0.0095 -0.9998 +vn 0.9698 -0.2384 0.0510 +vn -0.9896 -0.0875 0.1146 +vn 0.0019 -0.0100 -0.9999 +vn 0.9619 -0.1872 -0.1991 +vn 0.8991 -0.3794 0.2185 +vn 0.9117 -0.4055 -0.0670 +vn -0.2569 -0.4056 0.8772 +vn 0.8817 0.3578 -0.3075 +vn 0.9213 -0.3816 0.0749 +vn -0.9377 -0.2569 0.2338 +vn 0.5712 -0.4413 0.6921 +vn -0.7479 0.6637 0.0104 +vn 0.8662 -0.4995 -0.0133 +vn -0.3638 0.4420 -0.8199 +vn 0.0053 0.0033 -1.0000 +vn -0.8887 -0.3851 -0.2488 +vn -0.0167 -0.0017 -0.9999 +vn 0.7571 -0.6130 0.2261 +vn 0.4812 -0.5379 0.6922 +vn 0.7755 -0.5946 -0.2123 +vn -0.3517 0.3137 0.8820 +vn -0.3243 0.7008 0.6354 +vn 0.7748 0.5939 0.2168 +vn 0.6769 -0.7229 0.1388 +vn -0.1177 -0.0144 0.9929 +vn -0.5821 0.8035 0.1251 +vn -0.3239 0.6714 0.6665 +vn 0.7719 0.6292 0.0911 +vn -0.6342 0.7329 0.2463 +vn -0.7942 -0.5684 0.2149 +vn -0.1177 0.0280 0.9926 +vn 0.0012 0.0239 -0.9997 +vn 0.6142 -0.7791 -0.1259 +vn 0.0086 -0.0244 -0.9997 +vn 0.6227 -0.7568 -0.1989 +vn 0.2651 -0.7201 0.6413 +vn -0.3642 0.8929 0.2649 +vn -0.3522 0.9063 0.2335 +vn -0.5782 0.8156 -0.0204 +vn -0.6510 -0.7116 -0.2644 +vn 0.3664 -0.8069 0.4634 +vn 0.4932 0.8508 -0.1814 +vn 0.4235 -0.9009 0.0950 +vn -0.5756 -0.7948 0.1925 +vn -0.3438 0.9246 -0.1642 +vn 0.0681 -0.6494 0.7574 +vn -0.2779 0.9557 0.0972 +vn 0.0244 -0.0145 -0.9996 +vn 0.3011 0.9517 0.0603 +vn 0.3456 0.8975 0.2741 +vn -0.0168 -0.0127 -0.9998 +vn -0.0001 0.0003 -1.0000 +vn 0.3340 -0.9354 -0.1164 +vn -0.4219 -0.8918 0.1634 +vn 0.0209 -0.7956 0.6054 +vn 0.0364 0.0294 -0.9989 +vn 0.1892 -0.9818 0.0134 +vn -0.3597 -0.9209 -0.1501 +vn 0.0202 0.8975 -0.4405 +vn -0.0506 0.0659 -0.9965 +vn -0.1097 -0.9858 0.1269 +vn 0.0004 0.0006 -1.0000 +vn 0.0039 -0.9302 -0.3670 +vn -0.3239 -0.9380 -0.1232 +vn 0.1531 -0.8594 -0.4878 +vn 0.5996 -0.7186 -0.3522 +vn 0.8235 -0.5485 -0.1449 +vn 0.8758 -0.3639 -0.3172 +vn 0.9008 -0.2310 -0.3678 +vn 0.9847 -0.0240 -0.1725 +vn 0.9223 0.3708 -0.1090 +vn 0.7886 0.5994 -0.1371 +vn 0.8117 0.5078 -0.2887 +vn 0.5856 0.8000 -0.1309 +vn 0.4022 0.8891 -0.2183 +vn 0.4322 0.8542 -0.2888 +vn 0.1878 0.9378 -0.2919 +vn -0.0496 0.9043 -0.4239 +vn -0.8795 0.3201 -0.3521 +vn -0.9245 -0.1280 -0.3591 +vn -0.9243 -0.2964 -0.2406 +vn -0.9078 -0.2340 -0.3480 +vn -0.6505 -0.6766 -0.3451 +vn -0.4467 -0.8468 -0.2888 +vn 0.1748 -0.9769 -0.1233 +vn 0.3945 -0.8854 -0.2457 +vn 0.5445 -0.7716 -0.3290 +vn 0.7808 -0.5299 -0.3310 +vn 0.8225 -0.2925 -0.4878 +vn 0.9958 0.0473 -0.0781 +vn 0.8935 0.1774 -0.4126 +vn 0.6752 0.6759 -0.2953 +vn 0.2225 0.9118 -0.3452 +vn -0.0824 0.9724 -0.2184 +vn -0.3892 0.9106 -0.1390 +vn -0.6419 0.7568 -0.1232 +vn -0.4844 0.7653 -0.4239 +vn -0.7860 0.5673 -0.2456 +vn -0.9413 0.0658 -0.3310 +vn -0.9235 -0.1440 -0.3555 +vn -0.8917 -0.4288 -0.1449 +vn -0.7595 -0.5680 -0.3170 +vn -0.7374 -0.6293 -0.2455 +vn -0.6579 -0.6572 -0.3678 +vn -0.1512 -0.9825 -0.1088 +vn 0.3897 -0.9116 -0.1310 +vn 0.5146 -0.8073 -0.2887 +vn 0.7941 -0.5917 -0.1390 +vn 0.7110 -0.6397 -0.2920 +vn 0.9352 -0.3319 -0.1234 +vn 0.9646 -0.0956 -0.2457 +vn 0.8469 0.4161 -0.3310 +vn 0.7260 0.5885 -0.3556 +vn 0.3714 0.8726 -0.3172 +vn 0.3213 0.9146 -0.2455 +vn -0.5927 0.7936 -0.1371 +vn -0.5008 0.8159 -0.2888 +vn -0.7950 0.5924 -0.1309 +vn -0.6820 0.6447 -0.3453 +vn -0.8856 0.4099 -0.2183 +vn -0.8506 0.4394 -0.2887 +vn -0.9839 0.1126 -0.1390 +vn -0.9362 0.1958 -0.2920 +vn -0.9754 -0.1830 -0.1233 +vn -0.8820 -0.4021 -0.2456 +vn -0.7670 -0.5510 -0.3290 +vn -0.3321 -0.8737 -0.3556 +vn 0.1817 -0.9522 -0.2456 +vn 0.7568 -0.6292 -0.1770 +vn 0.9668 -0.1484 -0.2081 +vn 0.9361 0.1711 -0.3072 +vn 0.0297 -0.4251 -0.9047 +vn -0.8364 -0.2203 -0.5020 +vn 0.8948 0.3815 -0.2318 +vn -0.8155 -0.4496 0.3643 +vn 0.6995 0.3865 -0.6012 +vn 0.7669 0.6414 0.0232 +vn -0.8492 -0.4896 -0.1980 +vn 0.0017 -0.0032 1.0000 +vn -0.8115 -0.5281 0.2503 +vn -0.4977 -0.8370 0.2273 +vn 0.0061 0.0042 1.0000 +vn 0.0079 0.0028 1.0000 +vn -0.6713 -0.7036 -0.2328 +vn -0.6729 -0.7391 0.0308 +vn -0.2454 -0.7751 -0.5823 +vn -0.4929 -0.4502 -0.7445 +vn -0.6791 -0.5152 -0.5229 +vn -0.7328 -0.1750 -0.6576 +vn 0.6016 0.5469 -0.5822 +vn 0.6524 0.1415 -0.7445 +vn 0.8460 0.1042 -0.5230 +vn -0.7949 -0.1706 -0.5822 +vn -0.6352 0.2055 -0.7446 +vn 0.5783 -0.6048 -0.5476 +vn 0.8406 0.1952 -0.5052 +vn 0.7041 -0.1576 -0.6924 +vn 0.8255 -0.2951 -0.4812 +vn 0.4778 -0.5048 -0.7190 +vn 0.5094 -0.6834 -0.5229 +vn -0.4433 0.4711 -0.7626 +vn -0.8038 0.2323 -0.5477 +vn 0.5585 -0.1579 -0.8144 +vn 0.8178 -0.1868 -0.5443 +vn 0.8989 -0.3000 -0.3194 +vn 0.4810 -0.2361 -0.8443 +vn 0.8022 -0.4708 -0.3670 +vn 0.4680 0.0903 -0.8791 +vn -0.0016 0.0167 0.9999 +vn -0.8642 0.4279 -0.2647 +vn 0.8047 -0.5723 -0.1580 +vn 0.0079 -0.0076 0.9999 +vn -0.0080 0.0057 1.0000 +vn -0.8779 0.1376 -0.4587 +vn 0.9495 0.0011 -0.3139 +vn -0.3276 0.3984 -0.8567 +vn 0.0028 0.0049 1.0000 +vn -0.9466 0.0966 -0.3076 +vn 0.5309 0.1746 -0.8293 +vn 0.9941 0.0418 -0.0998 +vn -0.7048 0.5258 -0.4761 +vn 0.4049 -0.4587 -0.7910 +vn 0.6297 -0.6340 -0.4490 +vn 0.4035 0.2035 -0.8920 +vn 0.0074 -0.0080 0.9999 +vn 0.8575 0.2826 -0.4298 +vn -0.5954 0.8034 -0.0036 +vn 0.2925 -0.4294 -0.8544 +vn 0.5150 -0.8552 0.0586 +vn -0.9715 -0.1831 -0.1503 +vn -0.0044 -0.0087 1.0000 +vn -0.8678 -0.2533 -0.4275 +vn 0.3532 -0.7970 -0.4900 +vn 0.5551 0.4639 -0.6904 +vn 0.8997 0.4360 0.0222 +vn 0.2009 -0.7979 -0.5683 +vn -0.0346 -0.8870 -0.4604 +vn 0.4318 0.4450 -0.7846 +vn 0.1650 -0.8699 -0.4649 +vn 0.0062 -0.0137 0.9999 +vn -0.8701 -0.4751 -0.1312 +vn -0.3745 0.8156 -0.4410 +vn 0.0024 -0.0158 0.9999 +vn 0.6770 0.5589 -0.4789 +vn -0.1696 0.6072 -0.7762 +vn -0.2754 0.9604 -0.0416 +vn -0.0152 0.0070 0.9999 +vn -0.6639 -0.5722 -0.4816 +vn 0.4972 0.8381 -0.2245 +vn -0.0020 -0.0138 0.9999 +vn 0.0109 -0.0058 0.9999 +vn 0.1923 0.4679 -0.8626 +vn 0.6555 0.7497 0.0911 +vn -0.0784 0.9003 -0.4281 +vn 0.3828 0.6944 -0.6094 +vn -0.0146 -0.0167 0.9998 +vn 0.1441 0.2535 -0.9565 +vn 0.5920 0.8026 0.0732 +vn 0.0168 -0.0185 0.9997 +vn -0.6746 -0.6354 -0.3758 +vn 0.4252 0.7786 -0.4615 +vn 0.1305 0.7042 -0.6979 +vn 0.0465 0.9837 -0.1739 +vn 0.1229 0.5540 -0.8234 +vn -0.3407 -0.7147 -0.6109 +vn -0.0607 -0.1394 0.9884 +vn 0.2890 0.9562 0.0458 +vn 0.5130 0.5484 -0.6603 +vn 0.1659 0.8970 -0.4096 +vn -0.0000 0.0001 1.0000 +vn -0.0248 -0.0218 0.9995 +vn -0.2547 -0.9493 -0.1845 +vn -0.0605 0.4707 -0.8802 +vn -0.1181 0.5808 -0.8054 +vn 0.4206 0.3368 -0.8424 +vn 0.0093 -0.0085 0.9999 +vn 0.0218 -0.9188 -0.3940 +vn -0.0959 -0.2687 -0.9585 +vn -0.2140 0.5104 -0.8329 +vn -0.1828 0.9626 -0.2001 +vn 0.0096 -0.8986 -0.4386 +vn -0.2710 -0.2712 -0.9236 +vn -0.2049 -0.1561 -0.9663 +vn -0.1925 0.9705 -0.1449 +vn 0.0000 0.0002 1.0000 +vn 0.2179 -0.9531 -0.2101 +vn -0.8328 -0.3612 -0.4195 +vn -0.5086 0.7505 -0.4221 +vn 0.3975 -0.7775 -0.4873 +vn -0.5154 0.7930 -0.3247 +vn -0.9772 -0.0897 0.1923 +vn -0.0199 0.0064 0.9998 +vn -0.9538 -0.2140 0.2111 +vn 0.5924 -0.8022 -0.0741 +vn -0.9354 0.0476 0.3505 +vn -0.7561 0.3600 0.5466 +vn -0.9197 -0.2237 0.3225 +vn -0.6723 0.2852 0.6831 +vn -0.7729 0.6145 -0.1583 +vn -0.0043 0.0242 0.9997 +vn -0.8367 0.0840 0.5412 +vn -0.8369 0.3698 -0.4035 +vn 0.0021 -0.0128 0.9999 +vn 0.7626 -0.4925 -0.4194 +vn -0.7966 0.2606 -0.5455 +vn -0.8437 0.3772 -0.3819 +vn -0.9193 0.0444 -0.3910 +vn 0.7545 -0.2364 0.6123 +vn 0.6225 -0.4607 -0.6327 +vn -0.0012 -0.0142 0.9999 +vn 0.8971 -0.1640 0.4103 +vn 0.9838 0.1055 -0.1453 +vn -0.9994 -0.0289 -0.0163 +vn -0.0057 0.0082 0.9999 +vn 0.8324 -0.0297 0.5534 +vn -0.0035 0.0095 0.9999 +vn 0.9054 -0.2137 -0.3668 +vn 0.8056 -0.0626 -0.5892 +vn -0.5504 0.0630 -0.8325 +vn -0.6205 0.1830 -0.7625 +vn -0.5248 0.2407 -0.8165 +vn -0.6299 0.4212 -0.6526 +vn -0.3466 0.4584 -0.8183 +vn -0.1560 0.6584 -0.7363 +vn 0.1757 0.1553 -0.9721 +vn 0.5081 -0.1891 -0.8403 +vn -0.1960 -0.6477 -0.7362 +vn -0.0687 0.5395 -0.8391 +vn 0.0540 0.7558 -0.6526 +vn 0.2646 0.7287 -0.6316 +vn 0.4949 0.4615 -0.7363 +vn 0.2336 0.1473 -0.9611 +vn 0.0873 -0.5349 -0.8404 +vn -0.0412 -0.7565 -0.6527 +vn -0.2523 -0.7334 -0.6312 +vn -0.1596 0.1719 -0.9721 +vn -0.4424 -0.3218 -0.8371 +vn -0.6636 -0.1494 -0.7331 +vn -0.3431 0.0626 -0.9372 +vn -0.5699 -0.0742 -0.8184 +vn -0.3904 0.0982 -0.9154 +vn -0.7620 -0.1439 -0.6313 +vn -0.6776 -0.3387 -0.6527 +vn -0.4289 -0.3340 -0.8393 +vn -0.5779 -0.5174 -0.6312 +vn -0.1927 -0.5063 -0.8406 +vn -0.0934 0.4978 -0.8623 +vn -0.0878 0.5345 -0.8406 +vn 0.0285 0.7569 -0.6529 +vn 0.2397 0.7378 -0.6310 +vn 0.1638 0.4472 -0.8793 +vn 0.2031 0.5043 -0.8393 +vn 0.1842 -0.2198 -0.9580 +vn 0.4157 0.6333 -0.6527 +vn 0.0364 0.1850 -0.9821 +vn 0.5865 0.5073 -0.6314 +vn 0.3070 0.2783 -0.9101 +vn 0.4555 0.3505 -0.8184 +vn 0.3073 -0.1032 -0.9460 +vn 0.7023 0.3320 -0.6298 +vn 0.2243 -0.0684 -0.9721 +vn 0.1359 0.1414 -0.9806 +vn 0.3281 0.1182 -0.9372 +vn 0.6571 0.1617 -0.7363 +vn 0.3334 -0.0296 -0.9423 +vn 0.3109 0.0145 -0.9503 +vn 0.2958 0.0119 -0.9552 +vn -0.9373 0.0944 -0.3356 +vn -0.9021 0.4282 -0.0530 +vn -0.9048 0.4250 0.0258 +vn -0.7673 0.3531 0.5354 +vn -0.7590 -0.0312 0.6503 +vn -0.7838 -0.0329 0.6201 +vn -0.2209 -0.1706 0.9603 +vn -0.5310 -0.4008 0.7466 +vn -0.8092 -0.4250 0.4057 +vn -0.0619 -0.1878 0.9803 +vn 0.3131 -0.6763 0.6668 +vn 0.9141 -0.1016 0.3925 +vn 0.6837 0.2896 0.6699 +vn 0.5007 0.3184 0.8050 +vn 0.5471 0.7632 0.3437 +vn -0.1393 0.0328 0.9897 +vn -0.2266 0.6246 0.7474 +vn -0.2563 0.4732 0.8428 +vn -0.3260 0.3125 0.8922 +vn -0.0608 -0.0770 0.9952 +vn -0.6039 0.4163 0.6796 +vn -0.6104 0.4272 0.6670 +vn -0.1434 -0.0554 0.9881 +vn -0.4601 0.1026 0.8819 +vn -0.0173 -0.1129 0.9935 +vn -0.5539 0.0403 0.8316 +vn -0.8015 -0.0008 0.5980 +vn -0.4725 -0.3426 0.8120 +vn -0.4520 -0.5305 0.7172 +vn -0.1460 -0.7362 0.6609 +vn 0.2107 -0.8633 0.4587 +vn 0.5775 -0.4322 0.6927 +vn 0.4823 -0.1248 0.8671 +vn 0.6640 -0.0855 0.7428 +vn 0.5299 0.0021 0.8481 +vn 0.4110 0.1419 0.9005 +vn 0.5634 0.3476 0.7495 +vn 0.8476 0.3573 0.3922 +vn 0.4609 0.5225 0.7173 +vn 0.5077 0.7374 0.4455 +vn -0.0341 0.2773 0.9602 +vn 0.1396 0.5961 0.7906 +vn -0.5051 0.3234 0.8001 +vn -0.6159 0.6401 0.4593 +vn -0.7163 0.0835 0.6927 +vn -0.4797 -0.1345 0.8671 +vn -0.6755 -0.3187 0.6649 +vn -0.1908 -0.3190 0.9284 +vn -0.5533 -0.7348 0.3924 +vn -0.1360 -0.6834 0.7173 +vn -0.0220 -0.8285 0.5595 +vn -0.0685 -0.8925 0.4457 +vn 0.4055 -0.5534 0.7276 +vn 0.5674 -0.4913 0.6608 +vn 0.5702 -0.4915 0.6583 +vn 0.5109 -0.2402 0.8254 +vn 0.5993 -0.0259 0.8001 +vn 0.5902 0.2898 0.7535 +vn 0.4444 0.6269 0.6399 +vn 0.0047 0.3717 0.9283 +vn 0.0643 0.5129 0.8561 +vn -0.2575 0.1074 0.9603 +vn -0.4489 0.4164 0.7907 +vn -0.7585 0.5536 0.3437 +vn -0.2890 -0.0611 0.9554 +vn -0.7375 0.1397 0.6608 +vn -0.5624 -0.0490 0.8254 +vn -0.5310 -0.2787 0.8002 +vn -0.8606 -0.2183 0.4602 +vn -0.3646 -0.5471 0.7535 +vn -0.0692 -0.7652 0.6400 +vn 0.1791 -0.3101 0.9337 +vn 0.0970 0.0859 0.9916 +vn 0.4099 -0.6901 0.5965 +vn 0.7269 -0.4554 0.5140 +vn 0.6858 -0.4525 0.5699 +vn 0.5428 -0.7245 0.4249 +vn 0.5069 -0.2062 0.8370 +vn 0.4184 -0.1792 -0.8904 +vn 0.1987 -0.2842 -0.9379 +vn 0.5717 -0.3793 -0.7275 +vn 0.2703 -0.6562 -0.7045 +vn -0.0933 -0.9526 0.2895 +vn -0.4282 -0.8973 0.1078 +vn -0.2636 -0.6673 -0.6966 +vn -0.6421 -0.7483 0.1670 +vn -0.6746 -0.6751 0.2985 +vn -0.4198 -0.4048 -0.8123 +vn -0.8448 -0.5272 0.0919 +vn -0.6491 -0.1460 -0.7466 +vn -0.4461 0.2163 -0.8685 +vn -0.6636 0.2024 -0.7202 +vn -0.7513 0.6577 -0.0555 +vn 0.4303 0.8637 0.2623 +vn 0.5593 0.7768 0.2896 +vn 0.8210 0.5606 0.1077 +vn 0.5631 0.4445 -0.6966 +vn 0.5664 0.1389 -0.8123 +vn 0.9408 -0.0901 0.3267 +vn 0.3283 -0.0921 -0.9401 +vn 0.6345 -0.1999 -0.7466 +vn 0.1410 -0.6790 -0.7204 +vn -0.8060 -0.5306 0.2624 +vn -0.9916 -0.0722 0.1077 +vn -0.6289 -0.0436 -0.7763 +vn -0.5596 0.1645 -0.8123 +vn -0.7682 0.5506 0.3266 +vn -0.6235 0.7714 0.1277 +vn -0.4481 0.4917 -0.7466 +vn -0.1354 0.3797 -0.9151 +vn -0.1527 0.6767 -0.7202 +vn 0.2193 0.6576 -0.7208 +vn 0.8871 0.3921 0.2436 +vn 0.9896 0.0478 0.1354 +vn 0.9593 0.1056 0.2617 +vn 0.6076 0.0297 -0.7937 +vn 0.9524 -0.1560 0.2620 +vn 0.9520 -0.1549 0.2640 +vn 0.8936 -0.4358 0.1077 +vn 0.6694 -0.6803 0.2985 +vn 0.1514 -0.9802 0.1278 +vn 0.0253 -0.4479 -0.8937 +vn 0.1404 -0.6503 -0.7466 +vn -0.2200 -0.4441 -0.8685 +vn -0.2080 -0.6617 -0.7204 +vn -0.5201 -0.4584 -0.7206 +vn -0.8776 -0.4041 0.2580 +vn -0.9624 -0.0701 0.2625 +vn -0.9647 0.0869 0.2485 +vn -0.8797 0.4559 0.1354 +vn -0.8825 0.3908 0.2616 +vn -0.5323 0.2714 -0.8019 +vn -0.7451 0.6134 0.2621 +vn -0.4084 0.4162 -0.8124 +vn -0.5345 0.8400 0.0938 +vn -0.1681 0.9775 0.1275 +vn 0.5123 0.4675 -0.7204 +vn 0.9618 -0.0915 0.2581 +vn 0.3713 -0.1164 -0.9212 +vn 0.8674 -0.4229 0.2623 +vn 0.4748 -0.2439 -0.8457 +vn -0.9829 -0.1371 0.1226 +vn -0.8393 -0.4669 0.2785 +vn -0.3458 -0.9296 0.1274 +vn -0.8535 -0.1478 -0.4996 +vn -0.8385 -0.1598 -0.5210 +vn -0.7900 -0.6028 0.1117 +vn -0.4436 -0.8396 -0.3134 +vn -0.6308 -0.2553 -0.7327 +vn 0.6084 -0.7311 0.3090 +vn 0.1434 -0.3337 0.9317 +vn 0.8310 0.3530 0.4300 +vn 0.7697 0.5375 0.3443 +vn 0.4621 0.1257 0.8779 +vn 0.1215 0.3904 0.9126 +vn -0.3622 0.8113 0.4590 +vn -0.6986 0.4761 0.5342 +vn -0.8481 0.1700 0.5017 +vn -0.9257 -0.0666 0.3723 +vn -0.8663 -0.0899 0.4915 +vn -0.8747 -0.3132 0.3699 +vn -0.3907 0.0308 0.9200 +vn -0.2560 0.0310 0.9662 +vn -0.5866 -0.7203 0.3702 +vn -0.3532 -0.1781 0.9185 +vn -0.3364 -0.3409 0.8779 +vn -0.2033 -0.3575 0.9115 +vn 0.1452 -0.9021 0.4064 +vn 0.3593 -0.8482 0.3892 +vn 0.3605 -0.8399 0.4057 +vn -0.0069 -0.3231 0.9463 +vn 0.5405 -0.7429 0.3948 +vn 0.0912 -0.3986 0.9126 +vn 0.7207 -0.5195 0.4590 +vn 0.1191 -0.3287 0.9369 +vn 0.8568 -0.3729 0.3563 +vn 0.8433 -0.0606 0.5341 +vn 0.2695 -0.2021 0.9415 +vn 0.8188 0.2792 0.5017 +vn 0.7670 0.5226 0.3722 +vn 0.3863 0.8440 0.3720 +vn 0.3372 0.8030 0.4914 +vn 0.1085 0.8650 0.4900 +vn 0.2223 0.3524 0.9090 +vn 0.1174 0.3686 0.9222 +vn -0.5646 0.7163 0.4100 +vn -0.7373 0.5096 0.4434 +vn -0.8250 0.3253 0.4620 +vn -0.9260 0.1383 0.3513 +vn -0.2155 0.1682 0.9619 +vn -0.9315 -0.1508 0.3308 +vn -0.5676 -0.6527 0.5017 +vn -0.3508 -0.7971 0.4915 +vn -0.1609 -0.9149 0.3701 +vn -0.1232 -0.8631 0.4898 +vn -0.2203 -0.3243 0.9200 +vn -0.1768 -0.2476 0.9526 +vn -0.0152 -0.4164 0.9090 +vn -0.0118 -0.2965 0.9549 +vn 0.0837 -0.3776 0.9222 +vn 0.8480 -0.3356 0.4101 +vn 0.8935 -0.0702 0.4435 +vn 0.9297 0.0923 0.3565 +vn 0.6269 0.6979 0.3463 +vn 0.4361 0.6707 0.6000 +vn 0.2783 0.1255 0.9522 +vn -0.0744 0.9252 0.3722 +vn -0.0972 0.8654 0.4915 +vn -0.3271 0.8081 0.4898 +vn -0.5555 0.7481 0.3631 +vn -0.7395 0.5867 0.3300 +vn -0.9019 -0.1359 0.4100 +vn -0.8078 -0.3884 0.4435 +vn -0.7575 -0.5470 0.3563 +vn -0.5121 -0.7145 0.4767 +vn -0.8401 -0.5170 0.1643 +vn -0.5722 -0.6754 -0.4652 +vn -0.0401 -0.7991 0.5999 +vn -0.3623 -0.8170 -0.4485 +vn -0.1776 -0.2483 0.9523 +vn 0.0249 -0.3544 -0.9347 +vn -0.0387 -0.8920 -0.4504 +vn -0.1459 0.8035 -0.5771 +vn -0.0084 0.1247 -0.9922 +vn 0.0911 -0.4305 -0.8980 +vn -0.2850 0.5198 -0.8053 +vn -0.3901 0.7355 -0.5539 +vn -0.3246 0.3996 -0.8573 +vn 0.0683 -0.1609 -0.9846 +vn -0.0706 0.1508 -0.9860 +vn 0.8562 -0.3677 0.3630 +vn 0.8376 -0.3350 0.4314 +vn 0.9342 -0.1357 0.3299 +vn 0.8975 -0.0970 0.4302 +vn -0.1169 0.1066 -0.9874 +vn 0.9340 0.0924 0.3451 +vn 0.2898 -0.1874 -0.9385 +vn -0.1988 0.1320 -0.9711 +vn -0.2975 0.0138 -0.9546 +vn -0.5798 0.1050 -0.8080 +vn -0.5458 -0.1021 -0.8316 +vn 0.2079 -0.0035 -0.9782 +vn -0.9184 -0.0133 -0.3954 +vn 0.9100 0.4094 0.0651 +vn -0.4361 -0.0405 -0.8990 +vn -0.4182 -0.2267 -0.8796 +vn -0.6680 -0.6322 -0.3926 +vn -0.0757 -0.0254 -0.9968 +vn 0.9542 0.2941 0.0552 +vn 0.4527 0.0231 -0.8913 +vn -0.0381 0.9440 0.3276 +vn -0.8905 0.0419 -0.4531 +vn -0.2322 -0.6598 -0.7147 +vn -0.9807 0.1324 -0.1442 +vn 0.1012 0.1802 -0.9784 +vn -0.3416 -0.9195 -0.1944 +vn -0.0397 -0.0749 -0.9964 +vn 0.0058 -0.5422 -0.8402 +vn -0.9306 0.3659 0.0017 +vn -0.9202 0.3834 -0.0793 +vn 0.2237 -0.8442 -0.4871 +vn 0.0221 -0.1667 -0.9858 +vn -0.5567 0.5221 0.6462 +vn 0.0201 -0.2563 -0.9664 +vn 0.4917 -0.3058 -0.8153 +vn 0.2000 -0.2527 -0.9466 +vn 0.2710 -0.4518 -0.8500 +vn 0.4139 -0.2447 0.8768 +vn 0.0167 0.1317 0.9912 +vn -0.1093 0.1532 -0.9821 +vn -0.1224 0.1595 -0.9796 +vn -0.7453 -0.6210 0.2428 +vn -0.6937 -0.7031 0.1562 +vn -0.3366 -0.8413 0.4230 +vn -0.1089 -0.8466 0.5210 +vn 0.1907 -0.8273 0.5284 +vn 0.2063 -0.7281 0.6537 +vn 0.4800 -0.6471 0.5923 +vn 0.4101 -0.5900 0.6955 +vn 0.3942 -0.2694 0.8786 +vn 0.6276 -0.2782 0.7271 +vn 0.6096 -0.2607 0.7487 +vn 0.5076 -0.0227 0.8613 +vn 0.6025 0.0906 0.7929 +vn 0.8144 0.0666 0.5765 +vn 0.7335 0.4029 0.5473 +vn 0.5186 0.6492 -0.5565 +vn 0.1962 0.7386 0.6450 +vn -0.1262 0.9810 0.1472 +vn -0.5903 0.7960 -0.1340 +vn -0.3581 0.9256 -0.1226 +vn -0.3553 0.9248 -0.1360 +vn -0.1186 0.9854 -0.1223 +vn -0.0773 0.9018 -0.4252 +vn 0.3800 0.7867 -0.4864 +vn 0.5841 0.7412 -0.3308 +vn 0.5734 0.6945 -0.4346 +vn 0.8865 0.4554 -0.0820 +vn 0.6992 0.4984 -0.5125 +vn 0.9308 -0.0683 -0.3592 +vn 0.9156 -0.3794 -0.1333 +vn 0.8706 -0.2704 -0.4111 +vn 0.7952 -0.5937 -0.1229 +vn 0.7925 -0.5945 -0.1359 +vn 0.3637 -0.9312 -0.0217 +vn 0.1171 -0.9882 -0.0983 +vn 0.1104 -0.9848 -0.1340 +vn -0.3863 -0.8185 -0.4252 +vn -0.6664 -0.7280 -0.1607 +vn -0.5371 -0.7340 -0.4155 +vn -0.7239 -0.4893 -0.4864 +vn -0.9251 -0.3444 -0.1597 +vn -0.8774 -0.3473 -0.3308 +vn -0.8448 -0.3123 -0.4346 +vn -0.9953 0.0517 -0.0819 +vn -0.7522 0.3980 -0.5251 +vn -0.7704 0.5267 -0.3592 +vn -0.1297 0.9842 -0.1206 +vn 0.6276 0.7665 -0.1359 +vn 0.9420 0.2946 -0.1607 +vn 0.8332 0.3648 -0.4156 +vn 0.9739 0.2116 -0.0817 +vn 0.9729 -0.1670 -0.1597 +vn 0.9332 -0.1406 -0.3308 +vn 0.8346 -0.5447 -0.0821 +vn 0.7792 -0.3607 -0.5126 +vn 0.6812 -0.5934 -0.4289 +vn 0.4015 -0.8425 -0.3591 +vn 0.1961 -0.8903 -0.4110 +vn -0.1221 -0.9849 -0.1229 +vn -0.6416 -0.7575 -0.1206 +vn -0.8714 0.3128 -0.3779 +vn -0.7573 0.6333 -0.1597 +vn -0.7362 0.5905 -0.3307 +vn -0.6896 0.5794 -0.4345 +vn -0.4361 0.8580 -0.2715 +vn 0.3683 0.9200 -0.1338 +vn 0.6005 0.7902 -0.1229 +vn 0.6012 0.7874 -0.1359 +vn 0.9343 0.3558 -0.0217 +vn 0.9872 0.1303 -0.0920 +vn 0.9011 0.0849 -0.4251 +vn 0.9661 -0.2022 -0.1607 +vn 0.9535 -0.2902 -0.0817 +vn 0.9053 -0.0879 -0.4157 +vn 0.7900 -0.3733 -0.4864 +vn 0.0110 -0.0015 -0.9999 +vn 0.0115 0.0050 -0.9999 +vn 0.7523 -0.5603 -0.3465 +vn 0.7094 -0.5815 -0.3983 +vn 0.6642 -0.6821 -0.3059 +vn 0.5093 -0.7065 -0.4915 +vn 0.0176 -0.0020 -0.9998 +vn 0.4311 -0.8355 -0.3407 +vn -0.0148 0.0018 -0.9999 +vn 0.3018 -0.8167 -0.4919 +vn 0.1721 -0.9339 -0.3134 +vn -0.0166 -0.0144 -0.9998 +vn -0.0556 0.0311 0.9980 +vn 0.0158 0.0135 -0.9998 +vn 0.0325 0.1933 0.9806 +vn -0.1209 -0.9791 -0.1634 +vn 0.0650 -0.9012 -0.4285 +vn -0.0522 -0.9492 -0.3104 +vn 0.0133 -0.0040 -0.9999 +vn 0.0134 -0.0040 -0.9999 +vn -0.3425 -0.9299 -0.1340 +vn -0.0480 -0.8049 0.5914 +vn 0.2244 0.2810 0.9331 +vn 0.1485 0.2080 0.9668 +vn -0.5870 -0.8002 -0.1228 +vn 0.0123 -0.0086 -0.9999 +vn -0.1060 -0.1487 0.9832 +vn 0.0083 -0.0089 -0.9999 +vn -0.7806 -0.6133 -0.1205 +vn -0.5376 -0.6452 0.5428 +vn 0.0139 0.0027 -0.9999 +vn 0.1969 0.0765 0.9774 +vn -0.0005 0.0006 -1.0000 +vn -0.9162 -0.3815 -0.1230 +vn -0.6424 -0.4599 0.6131 +vn 0.6546 0.1042 0.7488 +vn -0.6499 -0.4586 0.6061 +vn -0.0015 -0.0038 -1.0000 +vn -0.1428 -0.0250 0.9894 +vn -0.6376 -0.3756 0.6726 +vn -0.9838 -0.1188 -0.1340 +vn -0.2144 -0.0214 0.9765 +vn -0.8045 -0.2384 0.5440 +vn -0.0066 -0.0009 -1.0000 +vn -0.0030 0.0027 -1.0000 +vn -0.8655 0.0383 0.4994 +vn -0.1780 0.0795 0.9808 +vn -0.1493 0.0599 0.9870 +vn -0.8218 0.3793 -0.4251 +vn 0.0081 -0.0081 -0.9999 +vn -0.8103 0.2698 0.5202 +vn -0.0110 -0.0146 -0.9998 +vn -0.6996 0.2776 0.6584 +vn -0.1815 0.1619 0.9700 +vn -0.7385 0.5309 -0.4156 +vn -0.0121 -0.0101 -0.9999 +vn 0.1365 -0.1417 0.9805 +vn -0.1238 0.1406 0.9823 +vn -0.6484 0.5549 0.5212 +vn -0.5971 0.4655 0.6533 +vn -0.9850 -0.0200 0.1715 +vn -0.0330 0.0015 -0.9995 +vn -0.9539 -0.2327 -0.1897 +vn 0.0177 -0.0009 -0.9998 +vn 0.0324 -0.1211 0.9921 +vn -0.7989 -0.2028 0.5662 +vn -0.4875 0.7470 0.4521 +vn -0.8340 -0.1909 0.5178 +vn -0.3407 0.6458 0.6833 +vn -0.9016 -0.4252 0.0801 +vn -0.5422 -0.3111 0.7806 +vn -0.0536 -0.5592 0.8273 +vn -0.8911 -0.4537 0.0039 +vn -0.6849 -0.4486 0.5742 +vn 0.0049 -0.2421 0.9702 +vn -0.0073 0.2522 0.9676 +vn -0.1631 0.7432 0.6488 +vn -0.1615 0.7672 0.6207 +vn -0.0959 -0.1722 0.9804 +vn -0.3130 -0.4244 0.8497 +vn 0.9431 -0.3324 -0.0064 +vn 0.1864 0.7591 0.6237 +vn -0.2349 -0.2684 0.9342 +vn 0.9608 0.0004 -0.2773 +vn 0.1027 0.1184 0.9876 +vn 0.3020 0.7052 0.6415 +vn 0.7680 0.6405 0.0014 +vn 0.4060 0.7638 0.5017 +vn 0.0251 0.0752 0.9969 +vn 0.1102 0.3162 -0.9423 +vn 0.8125 0.4085 -0.4159 +vn 0.4926 0.5423 0.6806 +vn 0.4587 0.4844 0.7450 +vn 0.5024 0.4218 -0.7548 +vn 0.4758 0.2934 0.8292 +vn -0.3558 0.6883 0.6322 +vn 0.1327 0.7341 0.6660 +vn 0.5634 0.3952 0.7255 +vn -0.4836 -0.5680 0.6660 +vn -0.6849 -0.2301 0.6913 +vn -0.6954 -0.0576 0.7163 +vn -0.7632 0.1545 0.6274 +vn -0.6773 0.2118 0.7046 +vn 0.1924 0.7062 0.6813 +vn 0.6666 0.1019 0.7384 +vn 0.7079 -0.1452 0.6912 +vn 0.6224 -0.2938 0.7255 +vn -0.6854 -0.1378 0.7150 +vn 0.5959 0.0478 0.8017 +vn 0.8529 -0.0591 0.5188 +vn 0.6110 -0.2248 0.7591 +vn 0.5841 -0.5090 0.6323 +vn 0.4706 -0.5585 0.6831 +vn 0.0147 -0.7592 0.6507 +vn -0.1174 -0.7893 0.6026 +vn -0.5392 0.2580 0.8016 +vn -0.3770 -0.7824 0.4956 +vn -0.2493 0.7336 0.6322 +vn -0.5339 -0.8409 0.0887 +vn -0.1323 -0.7465 0.6521 +vn -0.1988 -0.9290 -0.3121 +vn -0.0445 -0.9530 0.2996 +vn 0.1413 0.9581 0.2491 +vn 0.1242 0.9589 0.2550 +vn 0.2122 0.9509 -0.2255 +vn 0.3033 -0.9348 -0.1849 +vn -0.2215 0.9737 -0.0540 +vn -0.2658 0.8845 -0.3834 +vn 0.4662 0.8767 0.1188 +vn 0.4226 -0.8627 0.2776 +vn 0.5029 -0.8597 0.0897 +vn 0.5434 0.7264 -0.4208 +vn -0.5235 0.8033 0.2841 +vn 0.7381 -0.6194 0.2674 +vn 0.8160 -0.5737 0.0710 +vn 0.7268 0.6665 0.1660 +vn -0.6357 0.7711 -0.0363 +vn 0.8593 0.5081 0.0586 +vn 0.8638 0.3929 0.3154 +vn 0.8346 0.3718 0.4064 +vn -0.7799 0.6234 0.0552 +vn 0.9319 -0.2590 0.2540 +vn -0.7984 0.5524 -0.2396 +vn -0.4961 -0.0559 0.8664 +vn 0.9381 -0.2962 0.1794 +vn 0.9714 -0.2267 0.0702 +vn -0.8911 0.0412 0.4519 +vn 0.9590 0.0598 0.2770 +vn -0.9574 0.2885 0.0079 +vn 0.0067 0.0093 -0.9999 +vn 0.9232 -0.0401 -0.3823 +vn -0.9365 0.3122 -0.1599 +vn -0.0071 -0.0097 -0.9999 +vn 0.9471 0.1762 -0.2683 +vn 0.8072 -0.0873 0.5838 +vn 0.9509 0.1403 0.2760 +vn -0.9912 -0.0079 0.1318 +vn 0.9963 0.0683 0.0513 +vn 0.9303 0.0124 -0.3665 +vn -0.0081 -0.0081 -0.9999 +vn -0.9851 -0.0079 0.1718 +vn -0.9978 0.0160 0.0642 +vn 0.9481 -0.1416 -0.2848 +vn 0.9687 -0.2290 0.0956 +vn -0.9162 0.3334 0.2222 +vn 0.8981 -0.3793 0.2228 +vn -0.0036 -0.0043 -1.0000 +vn -0.9569 -0.2297 0.1777 +vn -0.0042 0.0035 -1.0000 +vn 0.9101 0.3888 0.1433 +vn 0.9086 0.3763 0.1811 +vn -0.7449 0.6268 0.2285 +vn 0.8855 -0.4624 0.0449 +vn -0.8495 -0.3201 -0.4193 +vn -0.2240 -0.4008 0.8884 +vn -0.3966 0.4752 -0.7854 +vn -0.2305 -0.5511 0.8020 +vn -0.8076 0.5789 -0.1125 +vn 0.0108 0.0137 -0.9998 +vn 0.7641 -0.6160 0.1917 +vn 0.6629 0.6901 0.2903 +vn 0.0107 0.0036 -0.9999 +vn 0.7209 0.6723 0.1685 +vn 0.6361 -0.7383 0.2244 +vn -0.5820 0.8035 0.1252 +vn 0.7250 -0.6862 -0.0591 +vn -0.7953 -0.5608 0.2301 +vn -0.0955 -0.5748 0.8127 +vn 0.5479 0.8168 0.1808 +vn -0.5206 0.8538 -0.0037 +vn 0.6376 -0.7647 0.0935 +vn 0.2651 -0.7201 0.6412 +vn 0.4980 0.8272 0.2601 +vn -0.5493 0.7971 0.2506 +vn 0.0000 0.0001 -1.0000 +vn 0.3691 -0.8088 0.4579 +vn -0.5756 -0.7947 0.1925 +vn -0.3279 0.9046 -0.2722 +vn 0.2040 0.9436 0.2607 +vn 0.0000 0.0002 -1.0000 +vn 0.3811 -0.9026 -0.2002 +vn 0.2468 0.9549 0.1650 +vn -0.0032 0.0050 -1.0000 +vn 0.3915 -0.9043 -0.1702 +vn -0.3793 -0.9122 0.1548 +vn -0.1137 0.9896 0.0879 +vn -0.3816 -0.9122 0.1490 +vn -0.0175 0.0052 -0.9998 +vn 0.0086 0.0085 -0.9999 +vn -0.1293 -0.9647 0.2293 +vn -0.0050 0.0202 -0.9998 +vn -0.0089 -0.9205 -0.3908 +vn 0.6535 0.7537 0.0695 +vn 0.9513 0.2990 -0.0751 +vn 0.9903 0.1352 0.0316 +vn 0.5308 0.1668 -0.8309 +vn 0.7361 -0.6758 -0.0383 +vn 0.4098 -0.3763 -0.8309 +vn 0.7541 -0.6539 -0.0613 +vn 0.1349 -0.9881 0.0740 +vn -0.1209 -0.5431 -0.8309 +vn -0.2159 -0.9697 -0.1146 +vn -0.9477 -0.2979 -0.1146 +vn -0.7371 -0.6662 0.1135 +vn 0.7228 0.1937 0.6634 +vn 0.9803 -0.1480 -0.1309 +vn 0.6654 -0.1783 0.7249 +vn 0.3411 0.9334 0.1114 +vn 0.9805 0.1338 0.1441 +vn -0.9659 0.2588 0.0000 +vn 0.5291 0.5291 0.6634 +vn 0.4831 0.5013 0.7178 +vn 0.7201 -0.1196 0.6835 +vn 0.6697 -0.7408 0.0523 +vn 0.6378 -0.7621 0.1114 +vn 0.2307 0.6583 0.7165 +vn 0.3068 0.9503 0.0523 +vn 0.6929 0.7189 -0.0557 +vn 0.6489 0.7484 -0.1371 +vn 0.4871 0.4871 0.7249 +vn -0.6664 0.7448 -0.0335 +vn 0.5086 -0.5086 0.6947 +vn 0.4547 -0.5290 0.7165 +vn -0.3620 0.9229 -0.1309 +vn 0.1862 0.6947 0.6947 +vn -0.7448 -0.6664 -0.0335 +vn -0.9652 -0.2586 0.0381 +vn 0.9595 0.2761 -0.0557 +vn 0.6654 0.1783 0.7249 +vn -0.2095 0.9764 0.0523 +vn -0.0043 0.9969 -0.0786 +vn -0.5308 -0.1668 -0.8309 +vn -0.2586 0.9652 0.0381 +vn -0.9298 0.3001 0.2132 +vn -0.7822 -0.6062 0.1441 +vn -0.1878 -0.9726 -0.1371 +vn -0.2406 -0.9690 -0.0557 +vn 0.1937 -0.7228 0.6634 +vn -0.9690 0.2406 -0.0557 +vn -0.5291 0.5291 0.6634 +vn -0.6551 0.7248 0.2131 +vn -0.2565 0.6834 0.6834 +vn 0.9764 0.2095 0.0523 +vn 0.6690 0.1925 0.7179 +vn -0.1713 0.9789 0.1114 +vn 0.1937 0.7228 0.6634 +vn -0.4098 0.3763 -0.8309 +vn -0.9504 0.3068 0.0523 +vn 0.9475 -0.2353 -0.2165 +vn 0.5291 -0.5291 0.6634 +vn -0.7750 0.6183 -0.1309 +vn -0.9382 -0.2700 -0.2165 +vn -0.1678 -0.6757 0.7178 +vn -0.1783 -0.6654 0.7249 +vn 0.1209 0.5431 -0.8309 +vn -0.6757 0.1678 0.7179 +vn 0.2586 -0.9652 0.0381 +vn -0.3637 0.9304 -0.0462 +vn -0.1783 0.6654 0.7249 +vn -0.9968 -0.0011 -0.0800 +vn 0.7228 -0.1937 0.6634 +vn -0.1293 0.6855 0.7165 +vn 0.7493 -0.6497 0.1280 +vn -0.7318 0.6718 -0.1146 +vn 0.6664 -0.7448 -0.0335 +vn 0.9805 0.1339 0.1441 +vn 0.6757 -0.1678 0.7179 +vn -0.5639 0.4636 0.6835 +vn -0.6690 -0.1925 0.7179 +vn -0.5291 -0.5291 0.6634 +vn -0.2084 0.9714 0.1135 +vn 0.2159 0.9697 -0.1146 +vn -0.6654 0.1783 0.7249 +vn -0.3268 0.9451 0.0000 +vn -0.9288 0.3432 -0.1396 +vn -0.1862 0.6947 0.6947 +vn 0.3631 -0.9272 -0.0917 +vn 0.1783 -0.6654 0.7249 +vn -0.9455 0.3052 0.1135 +vn -0.4871 0.4871 0.7249 +vn -0.7228 0.1937 0.6634 +vn -0.6654 -0.1783 0.7249 +vn -0.7408 -0.6696 0.0523 +vn 0.0015 -0.9968 -0.0798 +vn 0.3447 0.9387 0.0000 +vn -0.9681 -0.2077 0.1399 +vn -0.6583 0.2307 0.7165 +vn 0.7189 -0.6929 -0.0557 +vn 0.4871 -0.4871 0.7249 +vn 0.1345 -0.9855 0.1036 +vn 0.2565 -0.6835 0.6835 +vn -0.6929 -0.7189 -0.0557 +vn -0.7228 -0.1937 0.6634 +vn 0.3779 0.9248 0.0444 +vn -0.9304 -0.3636 -0.0462 +vn -0.6947 0.1862 0.6947 +vn -0.3068 -0.9504 0.0523 +vn 0.6696 -0.7408 0.0523 +vn 0.5013 -0.4831 0.7178 +vn -0.3432 -0.9288 -0.1396 +vn -0.1862 -0.6947 0.6947 +vn 0.7621 0.6378 0.1114 +vn -0.4831 -0.5013 0.7178 +vn -0.6835 -0.2565 0.6835 +vn -0.2307 -0.6583 0.7165 +vn 0.7448 0.6664 -0.0335 +vn 0.9969 0.0043 -0.0786 +vn 0.5290 0.4547 0.7165 +vn -0.4871 -0.4871 0.7249 +vn -0.7248 -0.6552 0.2132 +vn 0.9652 0.2586 0.0381 +vn 0.1480 0.9803 -0.1309 +vn 0.5086 0.5086 0.6947 +vn 0.2095 -0.9764 0.0522 +vn 0.9248 -0.3779 0.0444 +vn 0.9451 0.3268 0.0000 +vn 0.9304 0.3636 -0.0462 +vn -0.2050 0.9553 0.2131 +vn 0.1196 0.7201 0.6834 +vn 0.2761 -0.9595 -0.0557 +vn -0.1937 -0.7228 0.6634 +vn 0.9387 -0.3447 0.0000 +vn 0.6835 0.2565 0.6835 +vn 0.1783 0.6654 0.7249 +vn -0.7029 0.6775 -0.2165 +vn 0.1925 -0.6690 0.7179 +vn 0.6583 -0.2307 0.7165 +vn 0.6947 -0.1862 0.6948 +vn -0.5013 0.4831 0.7178 +vn -0.1937 0.7228 0.6634 +vn -0.6583 -0.6878 -0.3058 +vn -0.3239 -0.9380 -0.1234 +vn -0.4116 -0.8068 -0.4239 +vn -0.0727 -0.9688 -0.2370 +vn 0.7886 0.5995 -0.1369 +vn 0.8117 0.5078 -0.2888 +vn 0.5856 0.7999 -0.1310 +vn 0.4023 0.8892 -0.2181 +vn 0.0663 0.9905 -0.1208 +vn -0.0830 0.9407 -0.3289 +vn -0.4088 0.8504 -0.3312 +vn -0.8848 0.4595 -0.0781 +vn -0.5991 -0.7899 -0.1308 +vn -0.6505 -0.6765 -0.3451 +vn -0.1210 -0.9829 -0.1389 +vn 0.1748 -0.9769 -0.1232 +vn 0.0342 -0.9051 -0.4239 +vn 0.8708 -0.3394 -0.3556 +vn 0.8934 0.1774 -0.4126 +vn 0.6752 0.6760 -0.2954 +vn 0.4609 0.8391 -0.2889 +vn -0.0825 0.9724 -0.2182 +vn -0.3891 0.9106 -0.1391 +vn -0.2934 0.9103 -0.2920 +vn -0.9235 -0.1440 -0.3556 +vn -0.7595 -0.5680 -0.3171 +vn -0.2441 -0.9237 -0.2953 +vn 0.1137 -0.9840 -0.1371 +vn 0.0231 -0.9571 -0.2887 +vn 0.3897 -0.9116 -0.1308 +vn 0.5598 -0.7993 -0.2183 +vn 0.9352 -0.3318 -0.1233 +vn -0.0307 0.9555 -0.2934 +vn -0.3630 0.9254 -0.1088 +vn -0.2531 0.9213 -0.2954 +vn -0.5927 0.7937 -0.1371 +vn -0.5009 0.8159 -0.2888 +vn -0.8857 0.4098 -0.2182 +vn -0.8821 -0.4020 -0.2457 +vn -0.7669 -0.5510 -0.3290 +vn -0.5232 -0.7852 -0.3312 +vn 0.2210 -0.9210 -0.3208 +vn 0.8916 -0.4031 -0.2066 +vn 0.0420 -0.3134 -0.9487 +vn -0.9609 -0.2408 -0.1364 +vn -0.0002 -0.0000 1.0000 +vn 0.8948 0.3815 -0.2319 +vn -0.0289 0.0038 0.9996 +vn 0.6995 0.3864 -0.6011 +vn -0.0123 -0.0172 0.9998 +vn -0.8068 -0.4714 -0.3561 +vn 0.0035 -0.0022 1.0000 +vn 0.0059 0.0043 1.0000 +vn -0.6714 -0.7036 -0.2328 +vn -0.2453 -0.7751 -0.5823 +vn -0.4930 -0.4503 -0.7445 +vn 0.1398 -0.9135 -0.3820 +vn 0.8407 0.1952 -0.5050 +vn 0.4777 -0.5047 -0.7190 +vn 0.2230 0.7196 -0.6576 +vn -0.0971 0.8468 -0.5230 +vn -0.1594 0.6764 -0.7191 +vn -0.5655 0.6699 -0.4812 +vn -0.8250 0.2536 -0.5050 +vn 0.4980 -0.1105 -0.8601 +vn 0.5277 -0.1908 -0.8278 +vn 0.8154 -0.3465 -0.4638 +vn 0.9546 -0.2697 -0.1265 +vn 0.0174 0.0065 0.9998 +vn -0.7847 0.3881 -0.4833 +vn -0.0163 -0.0065 0.9998 +vn -0.6225 0.4090 -0.6673 +vn 0.8912 0.0404 -0.4519 +vn 0.7505 -0.5871 -0.3032 +vn -0.8141 0.5028 -0.2907 +vn 0.7385 -0.6714 0.0617 +vn -0.9893 0.1107 -0.0948 +vn 0.3671 -0.3507 -0.8615 +vn -0.0155 0.0045 0.9999 +vn 0.0188 0.0009 0.9998 +vn -0.3524 0.5306 -0.7709 +vn 0.0198 -0.0015 0.9998 +vn 0.8545 0.2889 -0.4318 +vn 0.0169 0.0022 0.9999 +vn -0.6356 0.6589 -0.4024 +vn -0.8633 -0.1081 -0.4930 +vn 0.7407 0.3572 -0.5690 +vn 0.3262 -0.5315 -0.7817 +vn -0.8465 -0.0984 -0.5233 +vn 0.3890 -0.6925 -0.6076 +vn 0.0071 -0.0148 0.9999 +vn 0.0156 -0.0005 0.9999 +vn 0.3743 -0.7745 -0.5100 +vn -0.0347 -0.8871 -0.4603 +vn 0.1620 -0.8539 -0.4946 +vn -0.4842 0.8643 -0.1360 +vn -0.8990 -0.4376 0.0209 +vn 0.3800 0.4604 -0.8023 +vn -0.4748 -0.2281 -0.8500 +vn 0.0020 -0.0135 0.9999 +vn -0.0098 -0.0025 0.9999 +vn 0.7524 0.6456 -0.1307 +vn 0.0004 0.0171 0.9999 +vn 0.0095 0.0016 1.0000 +vn -0.2212 0.8344 -0.5048 +vn -0.6539 -0.5344 -0.5356 +vn 0.5985 0.6609 -0.4528 +vn -0.0107 -0.0173 0.9998 +vn 0.0111 0.0005 0.9999 +vn -0.1981 0.8756 -0.4405 +vn 0.2182 0.4801 -0.8497 +vn 0.5920 0.8026 0.0731 +vn -0.0055 -0.0206 0.9998 +vn -0.6760 -0.6599 -0.3280 +vn 0.1987 0.8014 -0.5641 +vn 0.2693 0.7739 -0.5732 +vn 0.4358 0.8997 -0.0224 +vn 0.0248 0.9799 -0.1980 +vn 0.0280 0.2227 -0.9745 +vn 0.2181 0.9240 -0.3142 +vn 0.2918 0.8345 -0.4673 +vn -0.0071 -0.0147 0.9999 +vn -0.4307 -0.7174 -0.5476 +vn 0.0133 0.5829 -0.8124 +vn -0.0250 0.6524 -0.7575 +vn 0.0098 -0.0116 0.9999 +vn -0.3052 -0.8811 -0.3614 +vn 0.3054 0.5073 -0.8058 +vn -0.1942 -0.8424 -0.5026 +vn 0.0500 0.9984 0.0270 +vn 0.1023 0.0034 -0.9947 +vn -0.1419 0.4870 -0.8618 +vn -0.0428 0.9236 -0.3809 +vn 0.1322 -0.0604 -0.9894 +vn -0.2025 0.5526 -0.8085 +vn -0.1885 -0.2711 -0.9439 +vn -0.2340 0.3414 0.9103 +vn -0.0449 -0.9589 -0.2802 +vn 0.1627 -0.8757 -0.4546 +vn -0.7043 -0.2185 -0.6755 +vn -0.2861 0.3883 -0.8760 +vn -0.3381 0.9208 -0.1946 +vn 0.2574 -0.9272 -0.2721 +vn -0.3654 0.9285 -0.0659 +vn -0.7513 -0.5028 -0.4275 +vn -0.0001 0.0001 1.0000 +vn -0.3380 0.4128 -0.8458 +vn -0.3604 0.3336 -0.8711 +vn 0.4455 -0.8806 -0.1615 +vn 0.4997 -0.7549 -0.4248 +vn -0.5707 0.6786 -0.4625 +vn -0.7293 0.3539 0.5856 +vn -0.7216 0.4645 -0.5134 +vn -0.7308 0.6715 -0.1224 +vn 0.6626 -0.7357 -0.1404 +vn -0.6863 0.3214 0.6525 +vn -0.0141 -0.0019 0.9999 +vn -0.8013 0.3681 -0.4717 +vn -0.0140 -0.0042 0.9999 +vn 0.7873 -0.4800 -0.3869 +vn -0.7785 0.2947 -0.5541 +vn 0.9390 0.1326 0.3174 +vn 0.7544 -0.2364 0.6123 +vn 0.6271 -0.4581 -0.6300 +vn -0.9024 0.0329 -0.4296 +vn 0.0091 0.0058 0.9999 +vn 0.8971 -0.1640 0.4104 +vn -0.9660 0.1310 -0.2231 +vn 0.0087 0.0048 1.0000 +vn 0.0041 0.0089 1.0000 +vn 0.8055 -0.0626 -0.5892 +vn -0.2552 0.0818 -0.9634 +vn -0.5022 0.5908 -0.6314 +vn -0.1866 0.1333 -0.9734 +vn 0.5082 -0.1892 -0.8402 +vn 0.6367 -0.4103 -0.6529 +vn 0.3489 -0.4728 -0.8091 +vn 0.3304 -0.4319 -0.8392 +vn 0.0974 -0.1388 -0.9855 +vn 0.0540 0.7558 -0.6525 +vn 0.4511 0.6323 -0.6298 +vn 0.0872 -0.5349 -0.8404 +vn -0.1194 -0.2476 -0.9615 +vn 0.0895 0.6005 -0.7946 +vn 0.0614 -0.1782 -0.9821 +vn -0.2523 -0.7335 -0.6312 +vn -0.4423 -0.3217 -0.8371 +vn 0.1839 -0.1422 -0.9726 +vn 0.2093 -0.3251 -0.9222 +vn -0.2736 0.2686 -0.9236 +vn -0.1693 -0.4773 -0.8623 +vn 0.0134 -0.2191 -0.9756 +vn -0.0176 0.3864 -0.9222 +vn 0.1832 -0.2218 -0.9577 +vn 0.1584 -0.1802 -0.9708 +vn 0.5865 0.5073 -0.6313 +vn 0.2882 -0.2811 -0.9154 +vn 0.4349 0.3269 -0.8391 +vn 0.3139 -0.1165 -0.9423 +vn -0.0877 0.2154 -0.9726 +vn 0.6835 0.3273 -0.6524 +vn 0.5441 0.0560 -0.8371 +vn -0.8935 0.1310 -0.4294 +vn -0.8180 0.4551 0.3517 +vn -0.7673 0.3532 0.5353 +vn -0.2208 -0.1705 0.9603 +vn -0.4696 -0.1958 0.8609 +vn -0.5310 -0.4009 0.7466 +vn -0.4586 -0.5851 0.6688 +vn 0.1039 -0.0984 0.9897 +vn -0.3004 -0.5295 0.7933 +vn 0.3130 -0.6635 0.6796 +vn 0.5471 0.7631 0.3440 +vn -0.1192 0.5250 0.8427 +vn -0.2707 0.6025 0.7509 +vn -0.2590 0.7836 0.5647 +vn -0.5312 0.4076 0.7428 +vn -0.4266 0.0839 0.9005 +vn -0.4726 -0.3427 0.8119 +vn -0.1460 -0.7361 0.6609 +vn 0.0443 -0.5628 0.8254 +vn 0.2107 -0.8634 0.4584 +vn 0.5774 -0.4321 0.6927 +vn 0.5441 -0.3694 0.7533 +vn 0.4352 0.7053 0.5596 +vn -0.0944 0.1104 0.9894 +vn -0.1963 0.2211 0.9553 +vn -0.2437 0.7099 0.6609 +vn -0.3211 0.4644 0.8254 +vn -0.6159 0.6402 0.4591 +vn -0.6559 0.0459 0.7534 +vn -0.1908 -0.3190 0.9283 +vn 0.0401 -0.1186 0.9921 +vn -0.1359 -0.6834 0.7173 +vn -0.0220 -0.8286 0.5594 +vn 0.1687 -0.2225 0.9602 +vn 0.1789 -0.5855 0.7907 +vn 0.3777 -0.8598 0.3437 +vn 0.2807 -0.0925 0.9553 +vn 0.8541 -0.2440 0.4594 +vn 0.4238 0.6149 0.6650 +vn 0.0047 0.3715 0.9284 +vn -0.0306 0.6429 0.7653 +vn 0.1092 0.9133 0.3924 +vn -0.3973 0.7275 0.5595 +vn -0.3892 0.8061 0.4457 +vn -0.2576 0.1075 0.9603 +vn -0.6286 0.2747 0.7275 +vn 0.0356 -0.0860 0.9957 +vn -0.8605 -0.2184 0.4603 +vn 0.0674 -0.0951 0.9932 +vn -0.4343 -0.6080 0.6646 +vn -0.4328 -0.6072 0.6663 +vn 0.0542 -0.1437 0.9881 +vn -0.1066 -0.4593 0.8819 +vn 0.1104 -0.0425 0.9930 +vn -0.0449 -0.5535 0.8316 +vn -0.0058 -0.8015 0.5980 +vn 0.1645 -0.2413 0.9564 +vn 0.1999 -0.4930 0.8467 +vn 0.1151 0.0056 0.9933 +vn 0.2437 -0.4886 0.8378 +vn 0.4754 -0.7021 0.5301 +vn 0.7298 -0.4429 0.5208 +vn 0.6739 -0.4392 0.5941 +vn 0.4805 -0.6373 0.6025 +vn 0.5715 -0.3793 -0.7277 +vn 0.2145 -0.3410 -0.9153 +vn 0.1457 -0.5172 -0.8433 +vn 0.2702 -0.6562 -0.7045 +vn 0.0619 -0.9629 0.2625 +vn -0.0354 -0.3653 -0.9302 +vn -0.2635 -0.6673 -0.6966 +vn -0.6421 -0.7483 0.1669 +vn -0.6746 -0.6751 0.2984 +vn -0.4198 -0.4048 -0.8124 +vn -0.8447 -0.5272 0.0918 +vn -0.6636 0.2024 -0.7201 +vn -0.1252 0.3875 -0.9133 +vn 0.0996 0.9610 0.2581 +vn 0.0960 0.7033 -0.7043 +vn 0.3282 -0.0922 -0.9401 +vn 0.3079 -0.2603 -0.9151 +vn 0.4721 -0.5085 -0.7201 +vn -0.2257 -0.5851 -0.7789 +vn -0.5690 -0.7808 0.2582 +vn -0.9206 0.2520 0.2984 +vn -0.8763 0.4730 0.0917 +vn -0.6234 0.7714 0.1276 +vn -0.1526 0.6767 -0.7202 +vn 0.4172 0.2601 -0.8708 +vn 0.9918 0.0214 0.1264 +vn 0.6077 0.0297 -0.7936 +vn 0.9517 -0.1014 0.2896 +vn 0.4704 -0.4952 -0.7305 +vn 0.5200 -0.8492 0.0918 +vn 0.0253 -0.4480 -0.8937 +vn -0.0737 -0.3963 -0.9152 +vn -0.2080 -0.6616 -0.7204 +vn -0.9647 0.0868 0.2485 +vn -0.8825 0.3907 0.2617 +vn -0.7450 0.6134 0.2620 +vn -0.4562 0.4187 -0.7852 +vn -0.4259 0.8356 0.3470 +vn -0.0131 0.3019 -0.9532 +vn -0.2099 0.9641 0.1629 +vn -0.2576 0.9264 0.2747 +vn -0.1579 0.6644 -0.7305 +vn 0.1173 0.9869 0.1109 +vn 0.0909 0.3413 -0.9355 +vn 0.2032 0.4000 -0.8937 +vn 0.2053 0.6327 -0.7467 +vn -0.6549 0.6839 0.3216 +vn 0.5315 -0.8362 0.1353 +vn 0.3360 -0.9046 0.2622 +vn 0.3367 -0.9039 0.2639 +vn 0.1435 -0.5565 -0.8183 +vn -0.8393 -0.4670 0.2784 +vn -0.4436 -0.8397 -0.3133 +vn -0.7657 -0.6204 -0.1699 +vn -0.3940 -0.9162 0.0725 +vn 0.9181 0.1900 0.3477 +vn 0.8309 0.3530 0.4301 +vn 0.3913 -0.0242 0.9200 +vn 0.4622 0.1257 0.8778 +vn 0.1103 0.9073 0.4056 +vn -0.0940 0.9140 0.3947 +vn -0.3621 0.8113 0.4590 +vn -0.1315 0.3102 0.9416 +vn -0.9257 -0.0665 0.3723 +vn -0.8747 -0.3132 0.3700 +vn -0.6950 -0.5249 0.4913 +vn -0.5867 -0.7203 0.3701 +vn -0.3849 -0.8403 0.3818 +vn -0.2827 -0.1541 0.9467 +vn 0.1283 -0.9030 0.4100 +vn 0.3814 -0.8111 0.4434 +vn 0.5467 -0.7595 0.3525 +vn 0.5499 -0.6958 0.4620 +vn 0.2771 -0.2896 0.9161 +vn 0.5989 0.7102 0.3701 +vn 0.5401 0.6843 0.4899 +vn 0.3863 0.8439 0.3722 +vn 0.1453 0.9175 0.3703 +vn -0.8827 0.0911 0.4609 +vn -0.3851 0.1112 0.9161 +vn -0.4005 -0.8373 0.3723 +vn -0.1610 -0.9150 0.3699 +vn 0.1045 -0.9259 0.3631 +vn 0.3446 -0.8788 0.3300 +vn 0.3600 -0.8279 0.4302 +vn -0.0152 -0.4165 0.9090 +vn 0.8480 -0.3357 0.4101 +vn 0.9298 0.0922 0.3564 +vn 0.8018 0.3604 0.4768 +vn 0.6268 0.6980 0.3462 +vn 0.4362 0.6708 0.5998 +vn 0.1628 0.8496 0.5017 +vn -0.0972 0.8654 0.4916 +vn -0.7273 0.5349 0.4301 +vn -0.1961 0.3676 0.9090 +vn -0.4414 -0.8353 0.3277 +vn -0.8401 -0.5169 0.1645 +vn -0.5469 -0.6952 -0.4664 +vn -0.5454 -0.6759 -0.4957 +vn -0.3571 -0.7754 -0.5208 +vn -0.1763 -0.2458 0.9531 +vn 0.0332 -0.2681 -0.9628 +vn -0.0514 -0.9066 -0.4188 +vn 0.0296 -0.3202 -0.9469 +vn 0.5292 -0.7626 0.3721 +vn 0.0059 0.2378 -0.9713 +vn 0.5190 -0.6994 0.4914 +vn 0.1303 -0.8313 -0.5403 +vn 0.0424 -0.1358 -0.9898 +vn -0.1614 0.5811 -0.7976 +vn -0.1163 0.1216 -0.9858 +vn -0.3067 0.6514 -0.6940 +vn 0.8561 -0.3677 0.3631 +vn 0.1275 -0.2762 0.9526 +vn -0.6177 0.4328 -0.6566 +vn -0.1386 0.1121 -0.9840 +vn 0.2325 -0.1669 -0.9582 +vn -0.1898 0.1371 -0.9722 +vn -0.7308 0.1464 -0.6668 +vn -0.1747 0.0048 -0.9846 +vn -0.4497 -0.0550 -0.8915 +vn 0.1667 -0.0035 -0.9860 +vn -0.5145 -0.2324 -0.8254 +vn 0.2403 0.0369 -0.9700 +vn 0.7832 0.5315 0.3225 +vn 0.1174 0.0674 -0.9908 +vn -0.7612 -0.4450 0.4718 +vn 0.1961 0.1342 -0.9713 +vn -0.6170 -0.6269 -0.4756 +vn -0.2727 -0.1838 -0.9444 +vn -0.1328 -0.1295 -0.9826 +vn 0.0838 0.8750 0.4767 +vn -0.0380 0.9441 0.3276 +vn -0.0911 -0.1950 -0.9765 +vn -0.1080 -0.4092 -0.9060 +vn -0.2961 0.8902 0.3462 +vn 0.0501 0.1896 -0.9806 +vn -0.0121 -0.2346 -0.9720 +vn 0.0289 0.3012 0.9531 +vn -0.5769 0.5355 0.6168 +vn -0.3870 0.4803 0.7871 +vn 0.0683 -0.2346 -0.9697 +vn 0.2721 -0.9424 -0.1944 +vn 0.1274 -0.1138 -0.9853 +vn 0.6645 -0.5131 -0.5433 +vn 0.2318 -0.0371 0.9721 +vn 0.0740 -0.1363 -0.9879 +vn 0.2659 -0.5255 -0.8081 +vn 0.3669 -0.4028 -0.8385 +vn 0.2371 -0.0305 0.9710 +vn 0.1527 -0.1977 -0.9683 +vn -0.8519 -0.5212 0.0522 +vn -0.8589 -0.4852 0.1643 +vn -0.3459 -0.4020 0.8478 +vn -0.6299 -0.7532 0.1895 +vn -0.1861 -0.5384 0.8219 +vn -0.0090 -0.2688 0.9631 +vn -0.2869 -0.9531 0.0965 +vn -0.0665 -0.7660 0.6394 +vn 0.2001 -0.7955 0.5719 +vn 0.1468 -0.6928 0.7060 +vn 0.2506 -0.3607 0.8984 +vn 0.3703 -0.7565 0.5390 +vn 0.6049 -0.5339 0.5908 +vn 0.3499 -0.4013 0.8465 +vn 0.4634 -0.1834 0.8669 +vn 0.8863 -0.4479 0.1177 +vn 0.7317 -0.0354 0.6807 +vn 0.6498 0.3341 0.6827 +vn 0.9141 0.3779 0.1469 +vn 0.4297 0.4095 0.8048 +vn 0.3256 0.4662 0.8226 +vn 0.3691 0.7536 0.5440 +vn 0.3565 0.7400 0.5703 +vn 0.0827 0.5263 0.8463 +vn 0.0550 0.8185 0.5719 +vn -0.3580 0.9256 -0.1226 +vn -0.3552 0.9248 -0.1359 +vn -0.0772 0.9018 -0.4253 +vn 0.2104 0.9643 -0.1607 +vn 0.0955 0.9045 -0.4156 +vn 0.2983 0.9510 -0.0817 +vn 0.3801 0.7868 -0.4864 +vn 0.5734 0.6945 -0.4345 +vn 0.7952 -0.5937 -0.1228 +vn 0.6066 -0.7858 -0.1205 +vn 0.6038 -0.7859 -0.1338 +vn 0.3404 -0.9325 -0.1207 +vn 0.1104 -0.9848 -0.1341 +vn -0.1555 -0.9802 -0.1226 +vn -0.3926 -0.9115 -0.1223 +vn -0.9251 -0.3445 -0.1598 +vn -0.8871 0.1708 -0.4288 +vn -0.6010 0.7880 -0.1333 +vn -0.6169 0.6712 -0.4110 +vn 0.7453 0.5135 -0.4253 +vn 0.9420 0.2946 -0.1608 +vn 0.8346 -0.5448 -0.0820 +vn 0.4015 -0.8425 -0.3592 +vn -0.1242 -0.9829 -0.1358 +vn -0.3824 -0.9161 -0.1206 +vn -0.7863 0.3481 -0.5104 +vn -0.6895 0.5794 -0.4346 +vn -0.4219 0.8945 -0.1478 +vn -0.4197 0.8913 -0.1717 +vn 0.1075 0.9849 -0.1359 +vn 0.7910 0.5970 -0.1338 +vn 0.0161 0.0055 -0.9999 +vn -0.0169 -0.0055 -0.9998 +vn 0.5962 -0.7084 -0.3779 +vn 0.3366 -0.9280 -0.1598 +vn -0.0162 -0.0065 -0.9998 +vn -0.0072 0.0091 -0.9999 +vn 0.3399 -0.8804 -0.3306 +vn 0.3051 -0.8474 -0.4346 +vn -0.0028 -0.0002 -1.0000 +vn -0.0471 0.0200 0.9987 +vn -0.0047 -0.0029 -1.0000 +vn -0.0846 -0.9853 -0.1481 +vn 0.0141 0.1346 0.9908 +vn -0.0539 -0.9609 -0.2717 +vn -0.0011 -0.0082 -1.0000 +vn 0.0628 0.0949 0.9935 +vn -0.3426 -0.9299 -0.1341 +vn -0.1080 -0.8021 0.5874 +vn -0.0945 -0.7824 0.6155 +vn 0.0004 -0.0058 -1.0000 +vn -0.5870 -0.8003 -0.1227 +vn -0.0077 0.0082 -0.9999 +vn -0.3203 -0.6945 0.6443 +vn 0.1805 0.1733 -0.9682 +vn -0.0730 -0.0731 0.9946 +vn -0.4286 -0.7649 0.4809 +vn 0.1287 0.0759 0.9888 +vn -0.2477 -0.1832 0.9514 +vn -0.0037 0.0119 -0.9999 +vn -0.5559 -0.5888 0.5867 +vn 0.0037 0.0087 -1.0000 +vn 0.2149 0.0093 0.9766 +vn -0.0051 0.0007 -1.0000 +vn 0.2460 0.0180 0.9691 +vn -0.0017 -0.0033 -1.0000 +vn 0.3054 -0.1530 0.9399 +vn 0.0049 -0.0018 -1.0000 +vn -0.1368 0.0694 0.9882 +vn 0.0048 -0.0017 -1.0000 +vn -0.7552 0.2796 0.5929 +vn 0.0004 -0.0027 -1.0000 +vn -0.0001 -0.0001 -1.0000 +vn -0.6786 0.7300 -0.0818 +vn 0.3989 -0.4818 0.7803 +vn -0.1832 0.2013 0.9622 +vn -0.1430 0.1725 0.9746 +vn -0.6588 0.4985 0.5635 +vn -0.0116 0.0078 -0.9999 +vn 0.0134 0.0088 -0.9999 +vn 0.1023 -0.3598 0.9274 +vn 0.0104 0.0117 -0.9999 +vn -0.0743 0.2141 0.9740 +vn -0.9174 -0.2856 -0.2770 +vn -0.0657 0.1105 0.9917 +vn -0.3690 0.8625 -0.3464 +vn -0.2316 0.9235 -0.3059 +vn -0.7189 -0.4850 0.4979 +vn -0.2899 0.8360 0.4660 +vn 0.0914 0.9739 -0.2078 +vn -0.0854 0.8667 -0.4915 +vn -0.0868 0.7627 0.6409 +vn -0.3543 -0.4069 0.8420 +vn 0.0726 0.1723 0.9824 +vn 0.1090 0.1218 0.9866 +vn 0.3844 0.7192 0.5787 +vn 0.0250 0.0752 0.9969 +vn 0.3919 0.4858 -0.7813 +vn 0.5185 0.5986 0.6106 +vn 0.4384 0.4658 0.7687 +vn 0.5023 0.4218 -0.7548 +vn 0.4587 0.2799 0.8433 +vn 0.0785 -0.6184 0.7819 +vn -0.7631 0.1545 0.6275 +vn -0.6772 0.2118 0.7047 +vn 0.4791 -0.5234 0.7046 +vn -0.4912 -0.3407 0.8017 +vn -0.5391 0.4812 0.6912 +vn -0.2605 0.7239 0.6389 +vn 0.8021 -0.0336 0.5962 +vn 0.6619 -0.2253 0.7150 +vn 0.2242 -0.6870 0.6912 +vn 0.0529 -0.6862 0.7255 +vn 0.0518 -0.6960 0.7162 +vn 0.1183 0.4087 0.9050 +vn 0.1000 0.5042 0.8578 +vn -0.6750 -0.7356 0.0569 +vn -0.0259 0.5380 0.8425 +vn -0.3243 -0.8738 0.3623 +vn -0.3994 -0.9070 0.1336 +vn -0.0971 -0.9694 -0.2254 +vn 0.1893 0.9551 0.2278 +vn 0.0636 -0.9659 0.2509 +vn 0.1336 -0.9873 0.0863 +vn 0.2301 0.9627 0.1424 +vn -0.0194 0.9831 0.1818 +vn -0.2945 0.3069 0.9050 +vn -0.1445 0.9382 -0.3146 +vn 0.4842 -0.8453 0.2257 +vn 0.4005 0.8859 0.2342 +vn -0.3418 0.8827 0.3226 +vn 0.4981 0.6235 0.6026 +vn 0.4701 -0.8767 0.1022 +vn 0.5414 0.7999 -0.2590 +vn 0.6596 0.6931 0.2907 +vn -0.5396 0.8243 0.1715 +vn -0.5123 0.1419 0.8470 +vn -0.5375 0.8270 0.1650 +vn 0.5831 -0.4929 0.6458 +vn 0.7239 -0.6089 -0.3245 +vn -0.5455 0.0156 0.8380 +vn 0.8360 0.5474 0.0379 +vn -0.7455 0.6364 0.1978 +vn -0.4689 -0.0184 0.8830 +vn 0.8564 0.4014 0.3248 +vn 0.8394 0.3875 0.3812 +vn 0.8210 -0.4856 0.3004 +vn 0.7417 0.1903 0.6431 +vn -0.7694 0.5089 -0.3861 +vn -0.5890 -0.1190 0.7994 +vn 0.8866 -0.4434 0.1319 +vn 0.9321 0.2168 -0.2901 +vn 0.9590 0.0130 0.2832 +vn -0.9210 0.2840 0.2665 +vn -0.0110 -0.0119 -0.9999 +vn -0.9788 0.1865 0.0852 +vn 0.9817 0.0639 0.1794 +vn 0.9978 -0.0447 0.0486 +vn -0.3330 -0.2576 0.9071 +vn -0.9657 0.0276 0.2580 +vn 0.9698 -0.2385 0.0510 +vn -0.9916 -0.0877 0.0955 +vn 0.9060 0.3669 0.2111 +vn 0.9460 0.2958 -0.1327 +vn -0.9208 -0.2583 0.2924 +vn 0.5712 -0.4414 0.6920 +vn -0.9181 -0.3659 0.1526 +vn -0.3638 0.4421 -0.8199 +vn 0.7571 -0.6130 0.2260 +vn 0.8121 0.5480 -0.2005 +vn 0.7755 -0.5946 -0.2124 +vn -0.8434 -0.4534 0.2884 +vn -0.3020 0.6002 0.7407 +vn 0.6769 -0.7229 0.1389 +vn -0.3047 0.7557 0.5798 +vn -0.1178 0.0143 0.9929 +vn 0.6944 0.6883 0.2097 +vn 0.6615 0.7446 0.0895 +vn -0.7459 -0.6553 0.1192 +vn 0.0086 -0.0245 -0.9997 +vn -0.6847 -0.6868 -0.2438 +vn -0.3468 0.8969 0.2745 +vn -0.2980 0.9463 0.1257 +vn 0.3664 -0.8068 0.4634 +vn 0.3428 0.9127 0.2224 +vn -0.3168 0.9315 -0.1788 +vn 0.0641 -0.6476 0.7593 +vn -0.2192 0.9185 0.3291 +vn 0.0245 -0.0145 -0.9996 +vn -0.4770 -0.8516 0.2174 +vn 0.3292 0.9071 0.2623 +vn 0.0180 -0.7897 0.6133 +vn -0.0019 0.0141 -0.9999 +vn 0.0901 0.8921 0.4428 +vn -0.0001 0.0005 -1.0000 +vn -0.2951 -0.8774 -0.3782 +vn 0.0368 0.8814 -0.4709 +vn -0.1296 -0.9753 0.1789 +vn 0.0002 0.0004 -1.0000 +vn 0.0224 -0.9430 -0.3320 +vn 0.8758 -0.3639 -0.3171 +vn 0.9552 0.0388 -0.2935 +vn 0.9223 0.3707 -0.1090 +vn 0.9191 0.2609 -0.2953 +vn 0.6389 0.6875 -0.3453 +vn 0.4023 0.8891 -0.2182 +vn 0.4323 0.8543 -0.2887 +vn -0.0830 0.9407 -0.3290 +vn -0.4088 0.8504 -0.3311 +vn -0.9245 -0.1280 -0.3590 +vn -0.2038 -0.9345 -0.2920 +vn 0.6243 0.7735 -0.1087 +vn -0.0825 0.9724 -0.2183 +vn 0.2658 -0.9001 -0.3452 +vn 0.8469 0.4161 -0.3311 +vn 0.7260 0.5886 -0.3556 +vn -0.2531 0.9213 -0.2953 +vn -0.5927 0.7937 -0.1372 +vn -0.7950 0.5924 -0.1308 +vn -0.8506 0.4395 -0.2887 +vn -0.9048 -0.0419 -0.4239 +vn -0.8821 -0.4021 -0.2456 +vn -0.5232 -0.7852 -0.3311 +vn 0.2210 -0.9210 -0.3207 +vn 0.8225 -0.4514 -0.3461 +vn 0.9668 -0.1484 -0.2080 +vn 0.8148 0.1894 -0.5479 +vn 0.0419 -0.3134 -0.9487 +vn -0.9570 -0.2330 -0.1728 +vn -0.0002 0.0001 1.0000 +vn -0.0003 -0.0001 1.0000 +vn 0.9139 0.4056 -0.0128 +vn -0.8155 -0.4496 0.3644 +vn 0.7481 0.6607 -0.0623 +vn -0.3652 -0.8649 -0.3444 +vn -0.0188 -0.0150 0.9997 +vn 0.7494 0.6569 -0.0830 +vn -0.8020 -0.5759 0.1584 +vn 0.0078 0.0139 0.9999 +vn 0.0186 -0.0007 0.9998 +vn -0.7327 -0.1750 -0.6576 +vn -0.6351 0.2055 -0.7446 +vn -0.7837 0.3349 -0.5230 +vn 0.8254 -0.2951 -0.4812 +vn 0.2231 0.7196 -0.6576 +vn -0.1595 0.6764 -0.7190 +vn -0.5654 0.6699 -0.4812 +vn 0.5754 -0.1353 -0.8066 +vn 0.7943 -0.1622 -0.5855 +vn 0.9044 -0.3121 -0.2909 +vn 0.5735 -0.3316 -0.7491 +vn -0.8215 0.4357 -0.3678 +vn 0.7724 -0.4345 -0.4632 +vn 0.0123 0.0084 0.9999 +vn 0.0002 -0.0001 1.0000 +vn 0.0145 -0.0014 0.9999 +vn -0.7495 0.4513 -0.4844 +vn -0.9383 0.0900 -0.3339 +vn 0.9726 0.0049 -0.2325 +vn -0.7605 0.6398 -0.1108 +vn 0.3839 -0.3137 -0.8684 +vn 0.7649 -0.6398 -0.0745 +vn -0.9046 0.1075 -0.4125 +vn 0.5786 0.1699 -0.7977 +vn 0.5816 -0.6293 -0.5155 +vn 0.0044 -0.0175 0.9998 +vn 0.7857 0.2057 -0.5835 +vn 0.0194 0.0021 0.9998 +vn 0.3566 0.2311 -0.9053 +vn 0.4572 -0.7473 -0.4822 +vn -0.9821 -0.1852 -0.0356 +vn 0.9004 0.3120 -0.3033 +vn 0.2628 -0.5234 -0.8105 +vn 0.4634 -0.8011 -0.3788 +vn 0.0247 -0.0101 0.9996 +vn 0.0227 -0.0094 0.9997 +vn -0.4994 0.8055 -0.3190 +vn -0.0240 0.0096 0.9997 +vn 0.4849 0.4056 -0.7749 +vn -0.5014 0.7527 -0.4266 +vn -0.7821 -0.3450 -0.5189 +vn 0.2578 -0.9633 -0.0742 +vn -0.8469 -0.4622 -0.2629 +vn 0.8049 0.5860 -0.0932 +vn -0.0153 0.0136 0.9998 +vn 0.6962 0.5824 -0.4197 +vn 0.0001 0.0002 1.0000 +vn -0.1450 0.8085 -0.5704 +vn 0.0150 -0.0093 0.9998 +vn -0.1814 0.8565 -0.4832 +vn 0.4720 0.8658 -0.1662 +vn 0.0107 -0.0115 0.9999 +vn 0.2725 0.5389 -0.7970 +vn 0.2546 0.5199 -0.8154 +vn -0.6789 -0.7223 -0.1317 +vn 0.5846 0.8023 0.1205 +vn -0.5312 -0.7101 -0.4621 +vn 0.4563 0.8664 -0.2028 +vn 0.1371 0.6017 -0.7869 +vn 0.4520 0.8841 -0.1188 +vn 0.0414 0.9892 -0.1407 +vn 0.1940 0.9211 -0.3374 +vn 0.0001 0.0001 1.0000 +vn -0.4535 -0.8776 -0.1554 +vn 0.0116 0.5981 -0.8013 +vn 0.0642 0.8085 -0.5850 +vn -0.1909 -0.8641 -0.4657 +vn 0.0698 0.9439 -0.3228 +vn -0.0905 -0.9699 -0.2259 +vn 0.0261 0.9975 -0.0658 +vn -0.1473 0.5057 -0.8501 +vn -0.1477 0.5061 -0.8497 +vn -0.0152 0.1680 0.9857 +vn 0.1738 -0.9351 -0.3088 +vn -0.3192 0.4435 -0.8375 +vn -0.2616 0.8463 -0.4640 +vn 0.1717 -0.9331 -0.3159 +vn -0.3168 0.4414 -0.8395 +vn -0.4884 0.6832 -0.5429 +vn -0.4104 0.9031 -0.1265 +vn -0.0137 0.0038 0.9999 +vn 0.4646 -0.8729 -0.1491 +vn -0.5373 0.4463 0.7157 +vn -0.0101 0.0140 0.9999 +vn 0.5003 -0.6883 -0.5253 +vn -0.5407 0.3616 -0.7596 +vn -0.6814 0.7086 -0.1830 +vn 0.0116 0.0113 0.9999 +vn -0.7527 0.4446 -0.4856 +vn -0.7865 0.4960 -0.3680 +vn 0.7109 -0.6976 -0.0900 +vn -0.8707 0.0735 0.4864 +vn -0.7973 0.2750 -0.5372 +vn -0.0069 -0.0061 1.0000 +vn 0.9390 0.1326 0.3173 +vn 0.5852 -0.2857 -0.7589 +vn 0.7851 -0.2557 0.5641 +vn 0.8947 -0.1572 0.4182 +vn 0.9725 0.1004 -0.2100 +vn 0.8163 -0.5614 -0.1363 +vn -0.9739 0.1568 -0.1638 +vn -0.0099 0.0035 0.9999 +vn 0.7653 -0.2736 -0.5826 +vn -0.0029 0.0067 1.0000 +vn 0.9004 -0.2116 -0.3802 +vn -0.5023 0.5908 -0.6314 +vn -0.3260 0.7050 -0.6298 +vn 0.2212 0.1823 -0.9580 +vn 0.1374 -0.7630 -0.6316 +vn -0.3444 0.6748 -0.6528 +vn -0.0585 0.1792 -0.9821 +vn 0.2678 -0.1020 -0.9580 +vn 0.0873 -0.5350 -0.8403 +vn 0.0893 -0.5132 -0.8536 +vn -0.6310 -0.3015 -0.7148 +vn -0.2618 0.1384 -0.9552 +vn -0.7621 -0.1439 -0.6313 +vn -0.3662 -0.3043 -0.8793 +vn -0.1218 0.1828 -0.9756 +vn -0.0877 0.5344 -0.8406 +vn 0.0321 -0.3025 -0.9526 +vn -0.0176 0.3863 -0.9222 +vn 0.3069 0.2783 -0.9101 +vn 0.4555 0.3505 -0.8183 +vn 0.3152 -0.1066 -0.9430 +vn 0.7022 0.3320 -0.6298 +vn -0.9583 0.1900 -0.2134 +vn -0.9444 0.2108 -0.2522 +vn -0.8806 0.4552 -0.1318 +vn -0.8930 0.4498 -0.0141 +vn -0.1477 0.0146 0.9889 +vn -0.7624 -0.0120 0.6470 +vn -0.8087 -0.0272 0.5875 +vn -0.4837 -0.2365 0.8427 +vn -0.4587 -0.5852 0.6687 +vn -0.3004 -0.5296 0.7933 +vn 0.1249 -0.4340 0.8922 +vn 0.3131 -0.6763 0.6667 +vn 0.1518 -0.0242 0.9881 +vn 0.4588 -0.3132 0.8315 +vn 0.5471 0.7632 0.3439 +vn -0.3855 0.2310 0.8933 +vn -0.3443 0.3466 0.8725 +vn -0.5312 0.4075 0.7428 +vn -0.4592 0.2644 0.8481 +vn -0.5382 0.0387 0.8419 +vn -0.8035 0.0009 0.5953 +vn -0.0115 -0.1170 0.9931 +vn 0.2107 -0.8633 0.4586 +vn 0.4495 -0.0060 0.8932 +vn 0.5634 0.3477 0.7495 +vn 0.4352 0.7053 0.5595 +vn 0.5077 0.7373 0.4457 +vn -0.0340 0.2773 0.9602 +vn -0.2436 0.7098 0.6609 +vn -0.6159 0.6402 0.4592 +vn -0.4697 0.1349 0.8725 +vn -0.5534 -0.7348 0.3923 +vn 0.1789 -0.5856 0.7906 +vn 0.5992 -0.0259 0.8002 +vn -0.0306 0.6429 0.7654 +vn -0.3892 0.8062 0.4457 +vn -0.7586 0.5536 0.3437 +vn -0.4343 -0.6080 0.6647 +vn -0.4329 -0.6072 0.6663 +vn 0.1644 -0.2413 0.9564 +vn 0.1999 -0.4931 0.8467 +vn 0.0956 0.0936 0.9910 +vn 0.3829 -0.6234 0.6817 +vn 0.8026 -0.4542 0.3868 +vn 0.4744 -0.1486 0.8677 +vn 0.5428 -0.7246 0.4247 +vn -0.6420 -0.7483 0.1670 +vn -0.2636 0.4394 -0.8588 +vn -0.7512 0.6577 -0.0557 +vn 0.1011 0.6823 -0.7240 +vn 0.9953 0.0313 0.0918 +vn 0.1410 -0.6790 -0.7205 +vn -0.8738 -0.3905 0.2897 +vn -0.0329 0.4946 -0.8685 +vn 0.2193 0.6576 -0.7207 +vn 0.4889 0.3923 -0.7791 +vn 0.7427 -0.6484 0.1671 +vn 0.3875 -0.8620 0.3267 +vn -0.2081 -0.6616 -0.7205 +vn -0.4037 0.4090 -0.8184 +vn -0.2099 0.9641 0.1628 +vn -0.1579 0.6645 -0.7304 +vn 0.2053 0.6326 -0.7467 +vn 0.5124 0.4676 -0.7203 +vn 0.8674 -0.4229 0.2624 +vn -0.6652 0.6540 0.3602 +vn -0.7830 0.6039 0.1492 +vn -0.8099 0.3487 0.4716 +vn -0.7901 0.5242 -0.3177 +vn 0.0401 -0.9948 0.0938 +vn -0.9881 -0.1088 0.1089 +vn -0.9395 -0.1911 -0.2841 +vn -0.8926 -0.1090 -0.4375 +vn -0.4529 -0.8450 0.2842 +vn -0.8371 -0.1582 -0.5237 +vn -0.7669 -0.6206 -0.1635 +vn -0.3941 -0.9162 0.0723 +vn -0.6308 -0.2552 -0.7328 +vn -0.4642 -0.5840 -0.6659 +vn 0.5960 -0.7097 0.3756 +vn 0.7697 0.5376 0.3443 +vn -0.0940 0.9140 0.3948 +vn -0.8663 -0.0899 0.4914 +vn -0.8109 -0.3203 0.4897 +vn -0.3849 -0.8403 0.3817 +vn 0.7311 -0.5849 0.3512 +vn 0.7174 -0.5223 0.4610 +vn 0.1172 -0.2791 0.9531 +vn 0.8567 -0.3729 0.3563 +vn 0.3372 0.8030 0.4915 +vn 0.3423 0.3352 0.8778 +vn -0.0894 0.9199 0.3819 +vn -0.8542 0.3820 0.3526 +vn -0.4005 -0.8372 0.3723 +vn 0.1237 -0.8936 0.4314 +vn 0.3446 -0.8789 0.3300 +vn -0.1275 -0.4617 0.8778 +vn 0.8935 -0.0701 0.4435 +vn 0.9297 0.0923 0.3564 +vn 0.6268 0.6980 0.3463 +vn -0.1218 0.4632 0.8778 +vn -0.8540 0.3894 0.3450 +vn -0.7575 -0.5470 0.3564 +vn -0.5469 -0.6952 -0.4665 +vn -0.1763 -0.2459 0.9531 +vn -0.1775 -0.2483 0.9523 +vn 0.0237 -0.3235 -0.9459 +vn -0.1459 0.8035 -0.5772 +vn -0.0361 0.2658 -0.9633 +vn 0.5190 -0.6995 0.4914 +vn 0.1067 -0.8438 -0.5259 +vn 0.1114 -0.5918 -0.7983 +vn 0.0049 0.1563 -0.9877 +vn -0.0986 0.1466 -0.9843 +vn -0.2464 0.4845 -0.8394 +vn 0.6889 -0.5343 0.4898 +vn -0.4815 0.4037 -0.7779 +vn 0.8377 -0.3350 0.4314 +vn 0.1031 -0.1193 -0.9875 +vn -0.6556 0.7448 0.1243 +vn -0.8623 0.4988 -0.0877 +vn 0.3381 -0.3393 0.8778 +vn -0.1417 0.1287 -0.9815 +vn -0.3138 0.0263 -0.9491 +vn -0.5802 0.1092 -0.8071 +vn -0.5458 -0.1021 -0.8317 +vn 0.2159 -0.0081 -0.9764 +vn -0.8963 0.0128 0.4433 +vn -0.4498 -0.0480 -0.8919 +vn -0.4080 -0.2211 -0.8858 +vn 0.6784 0.3176 -0.6625 +vn -0.5941 -0.5260 -0.6086 +vn -0.0755 -0.0387 -0.9964 +vn -0.3954 -0.4235 -0.8150 +vn 0.4527 0.0230 -0.8913 +vn -0.2068 -0.5148 -0.8320 +vn 0.0838 0.8751 0.4767 +vn -0.0790 0.0214 -0.9966 +vn -0.1358 0.8261 0.5468 +vn -0.1547 -0.5157 -0.8427 +vn 0.0515 0.1706 -0.9840 +vn -0.1020 -0.9063 -0.4100 +vn 0.0335 -0.1548 -0.9874 +vn 0.0944 -0.5031 -0.8590 +vn -0.5588 0.5234 0.6433 +vn -0.3818 0.5339 0.7544 +vn 0.0522 -0.1791 -0.9824 +vn 0.3416 -0.6468 -0.6819 +vn 0.3877 -0.6987 -0.6012 +vn 0.4692 -0.1588 0.8687 +vn 0.0464 -0.0622 -0.9970 +vn 0.3605 -0.3363 -0.8700 +vn 0.3907 -0.1904 0.9006 +vn 0.0902 -0.1077 -0.9901 +vn -0.0954 0.1184 -0.9884 +vn -0.6080 -0.6753 0.4176 +vn -0.6061 -0.6639 0.4381 +vn -0.2615 -0.7118 0.6519 +vn -0.3019 -0.7514 0.5868 +vn -0.0557 -0.7054 0.7066 +vn -0.0102 -0.8179 0.5752 +vn 0.1776 -0.4048 0.8970 +vn 0.4557 -0.5736 0.6807 +vn 0.6426 -0.5750 -0.5063 +vn 0.8644 -0.2855 0.4138 +vn 0.5905 -0.0223 0.8067 +vn 0.6093 0.1388 0.7807 +vn 0.8679 0.3247 0.3760 +vn 0.6062 0.3688 0.7046 +vn 0.6090 0.5704 0.5512 +vn 0.3090 0.5113 0.8020 +vn 0.1899 0.5795 0.7926 +vn 0.3613 0.7381 0.5698 +vn -0.0773 0.9018 -0.4253 +vn 0.6268 0.7626 -0.1596 +vn 0.5841 0.7411 -0.3309 +vn 0.5735 0.6945 -0.4345 +vn 0.3405 -0.9325 -0.1207 +vn -0.5371 -0.7341 -0.4155 +vn -0.8550 -0.0796 -0.5126 +vn -0.3865 0.9122 -0.1359 +vn -0.1271 0.9828 -0.1337 +vn 0.3953 0.9133 -0.0985 +vn 0.6276 0.7665 -0.1360 +vn 0.9739 0.2117 -0.0818 +vn 0.6812 -0.5933 -0.4289 +vn 0.6340 -0.7062 -0.3150 +vn -0.1222 -0.9849 -0.1227 +vn -0.3839 -0.9136 -0.1338 +vn -0.8234 -0.5566 -0.1104 +vn -0.8169 -0.5765 0.0185 +vn -0.9142 -0.3497 -0.2048 +vn -0.8714 0.3128 -0.3780 +vn -0.4361 0.8580 -0.2716 +vn -0.1795 0.9778 -0.1085 +vn 0.3668 0.9225 -0.1205 +vn 0.6005 0.7901 -0.1229 +vn 0.6013 0.7874 -0.1359 +vn 0.7910 0.5999 -0.1205 +vn -0.0097 -0.0103 -0.9999 +vn 0.0063 -0.0135 -0.9999 +vn -0.0036 0.0079 -1.0000 +vn 0.0114 0.0045 -0.9999 +vn 0.0128 0.0008 -0.9999 +vn 0.0034 -0.0075 -1.0000 +vn 0.1566 0.3942 0.9056 +vn -0.0539 -0.9608 -0.2718 +vn -0.0584 -0.1615 0.9851 +vn -0.3361 -0.9356 -0.1084 +vn -0.3426 -0.9299 -0.1340 +vn -0.0655 -0.7994 0.5972 +vn -0.0621 -0.1657 0.9842 +vn -0.0652 -0.7989 0.5979 +vn 0.0130 0.0052 -0.9999 +vn -0.3196 -0.7493 0.5801 +vn -0.3140 -0.7445 0.5892 +vn 0.0113 -0.0099 -0.9999 +vn 0.0025 -0.0095 -1.0000 +vn 0.6352 0.5899 0.4985 +vn -0.1326 -0.1114 0.9849 +vn -0.1372 -0.1267 0.9824 +vn -0.4772 -0.6413 0.6008 +vn 0.1156 0.0296 0.9929 +vn 0.0122 0.0011 -0.9999 +vn -0.0084 0.0094 -0.9999 +vn 0.1208 0.0294 0.9922 +vn -0.6190 -0.3300 0.7127 +vn -0.0117 0.0044 -0.9999 +vn 0.1114 0.0005 0.9938 +vn 0.0106 -0.0043 -0.9999 +vn -0.7870 -0.0394 0.6157 +vn -0.0038 -0.0172 -0.9998 +vn 0.2079 -0.0581 0.9764 +vn -0.2549 0.0747 0.9641 +vn -0.7234 0.0917 0.6843 +vn -0.0195 -0.0047 -0.9998 +vn 0.1118 -0.1140 0.9872 +vn -0.8298 0.2160 0.5146 +vn -0.7010 0.3398 0.6270 +vn -0.7386 0.5308 -0.4156 +vn -0.7099 0.3673 0.6009 +vn 0.0005 -0.0172 -0.9999 +vn 0.4946 -0.7848 0.3735 +vn -0.0626 0.0908 0.9939 +vn -0.5462 0.4615 0.6991 +vn -0.9739 -0.0685 0.2163 +vn -0.0215 -0.0049 -0.9998 +vn -0.5986 0.6306 0.4940 +vn 0.0079 -0.0067 -0.9999 +vn -0.9692 -0.1850 -0.1624 +vn -0.8421 -0.1705 0.5117 +vn -0.1173 0.3011 0.9464 +vn -0.3689 0.8625 -0.3464 +vn -0.5781 -0.2196 0.7858 +vn -0.3965 0.6993 0.5948 +vn -0.6849 -0.3679 0.6289 +vn -0.8860 -0.3921 0.2476 +vn -0.7967 -0.5853 0.1506 +vn -0.0693 -0.7814 0.6201 +vn 0.0049 0.1665 0.9860 +vn 0.0141 0.1148 0.9933 +vn 0.0915 0.9739 -0.2078 +vn -0.1422 0.8522 0.5035 +vn -0.4770 -0.3343 0.8128 +vn -0.0519 -0.1408 0.9887 +vn -0.3471 -0.4813 0.8049 +vn 0.0379 0.7440 0.6671 +vn 0.1563 0.8765 0.4552 +vn -0.1148 -0.0725 0.9907 +vn 0.5385 0.7894 -0.2946 +vn 0.3152 0.6907 0.6509 +vn 0.7680 0.6404 0.0014 +vn 0.3837 0.7219 0.5758 +vn 0.0328 0.0262 0.9991 +vn 0.8477 0.2545 -0.4654 +vn 0.3918 0.4859 -0.7813 +vn 0.4692 0.5263 0.7092 +vn 0.4563 0.4999 0.7362 +vn 0.4757 0.2934 0.8292 +vn 0.5724 0.3992 0.7163 +vn -0.0376 -0.7660 0.6417 +vn 0.2429 0.5742 0.7819 +vn 0.4174 0.6434 0.6417 +vn -0.5212 -0.5139 0.6813 +vn -0.7104 -0.3739 0.5962 +vn -0.7442 -0.6443 -0.1760 +vn -0.2492 0.7336 0.6322 +vn -0.4460 -0.8945 0.0300 +vn -0.3750 -0.9045 -0.2032 +vn -0.1612 0.4107 0.8974 +vn -0.1620 -0.9681 0.1909 +vn -0.0857 -0.9943 -0.0632 +vn 0.1842 -0.8749 0.4479 +vn 0.2556 -0.9599 -0.1147 +vn 0.1752 0.9839 -0.0357 +vn 0.2100 0.9507 -0.2281 +vn -0.1463 0.9811 -0.1270 +vn -0.2056 0.9586 0.1967 +vn 0.3383 -0.9026 0.2664 +vn 0.4662 0.8767 0.1187 +vn 0.5022 -0.8572 -0.1144 +vn -0.4086 0.8980 0.1633 +vn -0.4682 0.8743 -0.1282 +vn 0.6806 -0.6850 0.2598 +vn 0.7800 -0.6088 0.1450 +vn 0.7268 0.6665 0.1659 +vn -0.6869 0.7234 0.0693 +vn -0.7136 0.6242 -0.3180 +vn 0.8366 -0.3034 0.4562 +vn 0.8696 0.4300 0.2427 +vn 0.7931 0.3669 0.4861 +vn 0.7626 0.1976 0.6159 +vn -0.5548 -0.1064 0.8251 +vn 0.8703 -0.4743 -0.1328 +vn 0.9078 0.1545 0.3900 +vn -0.8845 0.4582 0.0875 +vn -0.9137 0.3004 -0.2737 +vn 0.9617 -0.1824 -0.2047 +vn 0.9700 0.1718 -0.1722 +vn -0.0008 0.0017 -1.0000 +vn -0.9670 0.2512 -0.0423 +vn -0.5617 -0.2886 0.7754 +vn -0.9090 0.1519 0.3882 +vn 0.0104 0.0094 -0.9999 +vn 0.8981 0.1084 -0.4263 +vn 0.8715 -0.0859 0.4828 +vn 0.9716 -0.0203 0.2359 +vn 0.9516 -0.1205 0.2829 +vn 0.9657 0.2326 -0.1153 +vn -0.8910 0.1567 0.4260 +vn -0.8284 0.2840 -0.4828 +vn -0.9894 -0.0626 -0.1310 +vn 0.9253 -0.3787 -0.0186 +vn -0.9923 -0.1036 0.0674 +vn 0.0070 -0.0095 -0.9999 +vn 0.9307 -0.3577 0.0769 +vn -0.7507 0.6605 -0.0136 +vn 0.0038 -0.0049 -1.0000 +vn 0.5712 -0.4413 0.6920 +vn 0.9188 0.3506 0.1814 +vn -0.9276 -0.3659 -0.0750 +vn -0.5371 0.7206 -0.4384 +vn -0.9284 -0.3355 -0.1597 +vn 0.7659 -0.6167 0.1821 +vn 0.7846 0.5903 -0.1894 +vn -0.7050 0.6899 0.1646 +vn -0.6432 0.5099 0.5712 +vn 0.0072 -0.0016 -1.0000 +vn 0.6658 -0.7280 0.1636 +vn -0.3047 0.7557 0.5797 +vn 0.0063 0.0011 -1.0000 +vn -0.7501 -0.6195 0.2314 +vn -0.7930 -0.6058 0.0640 +vn 0.6804 0.7139 0.1656 +vn 0.6427 -0.6908 -0.3312 +vn 0.6388 0.7669 -0.0621 +vn 0.6231 -0.7740 -0.1121 +vn -0.3830 0.8881 0.2542 +vn -0.2933 0.9528 0.0786 +vn -0.5776 0.8042 -0.1401 +vn -0.6455 -0.7128 0.2743 +vn 0.3874 -0.8214 0.4186 +vn -0.2134 0.9385 0.2713 +vn 0.4230 -0.8995 0.1092 +vn -0.0094 -0.0151 -0.9998 +vn -0.3233 0.8906 -0.3199 +vn -0.5495 -0.8117 -0.1979 +vn 0.3569 0.9275 -0.1112 +vn -0.1898 0.9713 0.1430 +vn 0.0014 -0.0025 -1.0000 +vn 0.2430 -0.9308 -0.2730 +vn -0.3818 -0.9028 0.1979 +vn 0.1730 0.9837 0.0483 +vn 0.2278 0.9377 0.2624 +vn -0.0125 -0.0149 -0.9998 +vn -0.0240 0.0302 -0.9993 +vn 0.2251 -0.9078 -0.3540 +vn 0.0237 0.0268 -0.9994 +vn -0.2151 -0.9490 -0.2304 +vn -0.1045 -0.9842 0.1432 +vn 0.4819 -0.5887 0.6490 +vn -0.4859 -0.8739 0.0131 +vn 0.8309 -0.5564 -0.0002 +vn 0.6778 -0.7344 -0.0348 +vn 0.2727 -0.4383 0.8565 +vn 0.4885 -0.8726 -0.0002 +vn 0.4877 -0.8730 -0.0003 +vn 0.1186 -0.9929 0.0003 +vn 0.1177 -0.9931 0.0002 +vn -0.0503 -0.6115 0.7896 +vn -0.1177 -0.9931 -0.0002 +vn -0.1186 -0.9929 -0.0003 +vn -0.4877 -0.8730 0.0003 +vn -0.4885 -0.8726 0.0002 +vn -0.4032 -0.4683 0.7862 +vn -0.6789 -0.7342 -0.0002 +vn -0.6796 -0.7336 -0.0003 +vn 0.3975 0.4625 0.7925 +vn 0.6789 0.7342 -0.0002 +vn 0.6796 0.7336 -0.0003 +vn 0.9077 0.4196 0.0003 +vn 0.9081 0.4188 0.0002 +vn 0.9749 0.2226 0.0043 +vn 0.9810 0.1940 -0.0003 +vn 0.5630 -0.2354 0.7922 +vn 0.9081 -0.4187 -0.0002 +vn 0.9077 -0.4197 -0.0003 +vn 0.9810 -0.1940 0.0003 +vn 0.9749 -0.2226 -0.0043 +vn -0.9077 -0.4197 0.0003 +vn -0.9081 -0.4188 0.0002 +vn -0.9749 -0.2226 0.0043 +vn -0.9810 -0.1940 -0.0003 +vn -0.4470 -0.6822 0.5787 +vn -0.3207 -0.5280 -0.7864 +vn 0.5417 -0.8406 -0.0025 +vn -0.4618 -0.7693 0.4415 +vn 0.2747 -0.9615 -0.0013 +vn -0.4932 -0.7220 -0.4852 +vn -0.5105 -0.6366 -0.5780 +vn 0.2871 -0.9579 -0.0006 +vn -0.4691 -0.5993 0.6487 +vn -0.9670 0.2547 0.0028 +vn -0.9558 0.2940 -0.0008 +vn -0.5461 -0.8377 -0.0005 +vn -0.5914 -0.8063 0.0067 +vn -0.2147 -0.4317 0.8761 +vn -0.2112 -0.4203 0.8825 +vn -0.2301 -0.5161 0.8250 +vn -0.3815 -0.8055 -0.4534 +vn -0.3899 -0.7860 0.4799 +vn -0.2047 -0.9788 -0.0019 +vn -0.9593 -0.2824 0.0019 +vn -0.2242 -0.9745 0.0011 +vn -0.9668 -0.2556 0.0004 +vn 0.0398 -0.8142 0.5792 +vn 0.0502 -0.6109 -0.7901 +vn 0.9309 -0.3651 -0.0026 +vn 0.0785 -0.8938 0.4415 +vn 0.7875 -0.6164 -0.0013 +vn 0.0254 -0.8740 -0.4853 +vn -0.0386 -0.8154 -0.5777 +vn 0.7952 -0.6064 -0.0006 +vn -0.0280 -0.7594 0.6500 +vn -0.9302 -0.3671 0.0032 +vn -0.9462 -0.3236 -0.0008 +vn 0.0506 -0.9987 -0.0005 +vn -0.0045 -1.0000 0.0067 +vn 0.0740 -0.4854 0.8711 +vn 0.0869 -0.5661 0.8197 +vn 0.1648 -0.8759 -0.4534 +vn 0.8632 -0.5048 -0.0019 +vn 0.1589 -0.8811 0.4455 +vn 0.1843 -0.8496 0.4941 +vn 0.3985 -0.9167 -0.0282 +vn -0.6100 -0.7924 0.0019 +vn 0.1840 -0.9829 0.0010 +vn -0.6319 -0.7750 0.0004 +vn 0.5436 0.2718 0.7941 +vn 0.7821 0.4275 -0.4534 +vn -0.1556 0.9877 0.0147 +vn 0.6738 0.4599 0.5783 +vn 0.7511 0.4378 0.4941 +vn 0.7487 0.6623 -0.0282 +vn 0.9421 -0.3353 0.0019 +vn 0.8780 0.4787 0.0010 +vn 0.9323 -0.3616 0.0004 +vn 0.3261 -0.4864 0.8106 +vn 0.4123 -0.4777 -0.7758 +vn 0.5701 -0.5791 0.5828 +vn 0.9431 0.3321 0.0174 +vn 0.5343 -0.6922 -0.4852 +vn 0.4530 -0.6832 -0.5728 +vn 0.9997 -0.0230 -0.0006 +vn -0.5111 -0.8594 -0.0149 +vn 0.6279 -0.7783 -0.0005 +vn 0.4530 -0.8911 0.0267 +vn 0.5568 0.2323 -0.7975 +vn 0.3422 0.1160 0.9324 +vn 0.5473 0.1787 0.8177 +vn 0.8320 0.3209 0.4524 +vn 0.3430 0.9393 -0.0013 +vn 0.8234 0.2942 -0.4853 +vn 0.7903 0.2209 -0.5715 +vn 0.3308 0.9437 -0.0006 +vn 0.6655 -0.7463 -0.0146 +vn 0.9342 0.3567 -0.0005 +vn 0.9875 0.1554 0.0268 +vn 0.4191 -0.3777 0.8256 +vn 0.6482 -0.6118 -0.4534 +vn 0.6270 -0.6136 0.4799 +vn 0.8677 -0.4972 -0.0019 +vn -0.0278 -0.9996 0.0019 +vn 0.8575 -0.5144 0.0011 +vn -0.0557 -0.9984 0.0004 +vn 0.7878 -0.2159 0.5769 +vn 0.6562 0.7545 0.0151 +vn 0.8744 -0.2015 0.4415 +vn 0.8268 0.5624 -0.0046 +vn 0.8516 -0.2167 -0.4774 +vn 0.7834 0.6216 -0.0006 +vn 0.7151 -0.2609 0.6485 +vn 0.0494 -0.9986 0.0199 +vn 0.8887 -0.4585 -0.0004 +vn 0.9475 -0.3188 -0.0244 +vn 0.4656 -0.0714 0.8821 +vn 0.4672 -0.0714 0.8812 +vn 0.5621 -0.0594 0.8250 +vn 0.8840 -0.1139 -0.4534 +vn 0.8680 -0.1279 0.4799 +vn 0.9942 0.1078 -0.0019 +vn 0.5650 -0.8251 0.0019 +vn 0.9961 0.0879 0.0011 +vn 0.5417 -0.8405 0.0004 +vn 0.4512 0.6829 0.5745 +vn 0.3212 0.5289 -0.7855 +vn -0.5312 0.8473 -0.0030 +vn 0.2121 0.4187 0.8830 +vn 0.4618 0.7693 0.4415 +vn -0.2746 0.9615 -0.0013 +vn 0.4932 0.7221 -0.4852 +vn 0.5101 0.6394 -0.5753 +vn -0.2871 0.9579 -0.0006 +vn 0.4692 0.6015 0.6466 +vn 0.9684 -0.2495 0.0017 +vn 0.9612 -0.2760 -0.0007 +vn 0.5461 0.8377 -0.0005 +vn 0.5914 0.8063 0.0067 +vn 0.4877 0.8730 0.0003 +vn 0.4885 0.8726 0.0002 +vn -0.9810 0.1940 0.0003 +vn -0.9749 0.2226 -0.0043 +vn 0.5741 -0.4370 -0.6924 +vn 0.7204 -0.4651 -0.5144 +vn -0.2910 -0.9565 -0.0211 +vn 0.7104 -0.4721 0.5220 +vn 0.9984 0.0564 0.0056 +vn 0.1655 -0.9862 -0.0015 +vn 0.9194 -0.3926 0.0237 +vn 0.8140 -0.5808 -0.0039 +vn 0.3197 -0.3114 -0.8949 +vn 0.4270 -0.3723 -0.8241 +vn 0.4230 -0.3843 0.8206 +vn 0.6243 -0.4108 -0.6644 +vn 0.6687 -0.5306 0.5209 +vn 0.8410 0.5410 -0.0093 +vn 0.2549 -0.9669 -0.0056 +vn 0.9045 -0.4255 0.0290 +vn 0.6575 -0.7531 -0.0237 +vn 0.4694 -0.6064 -0.6418 +vn 0.4618 -0.7693 -0.4415 +vn 0.4712 -0.7434 0.4746 +vn 0.9593 0.2816 -0.0206 +vn 0.5960 -0.8026 0.0244 +vn -0.2747 -0.9615 0.0013 +vn 0.7107 -0.7035 0.0004 +vn -0.2871 -0.9579 0.0006 +vn 0.2167 -0.4524 -0.8651 +vn 0.2979 -0.7999 -0.5210 +vn 0.2972 -0.7995 0.5220 +vn 0.8409 -0.5411 0.0056 +vn -0.4524 -0.8918 -0.0077 +vn 0.5130 -0.8580 0.0237 +vn 0.1252 -0.9917 -0.0290 +vn 0.2292 -0.4518 -0.8622 +vn 0.1121 -0.2519 0.9612 +vn 0.1380 -0.3511 -0.9261 +vn 0.2222 -0.5213 0.8239 +vn 0.3815 -0.8055 0.4534 +vn 0.9593 -0.2825 -0.0019 +vn 0.3899 -0.7859 -0.4799 +vn 0.9668 -0.2554 -0.0004 +vn 0.2242 -0.9745 -0.0011 +vn 0.2047 -0.9788 0.0019 +vn 0.0273 -0.7605 -0.6487 +vn -0.0785 -0.8938 -0.4415 +vn -0.0254 -0.8740 0.4852 +vn 0.9444 -0.3287 0.0008 +vn 0.0045 -1.0000 -0.0067 +vn -0.7874 -0.6164 0.0013 +vn -0.0506 -0.9987 0.0005 +vn -0.7953 -0.6063 0.0006 +vn 0.0843 -0.2668 -0.9601 +vn 0.0641 -0.1771 0.9821 +vn 0.0273 -0.1458 -0.9889 +vn 0.0729 -0.2861 0.9554 +vn 0.1267 -0.5525 -0.8238 +vn 0.2295 -0.8215 -0.5220 +vn 0.8902 -0.4555 0.0077 +vn 0.2762 -0.9605 0.0347 +vn 0.0803 -0.9968 0.0056 +vn -0.0702 -0.4929 -0.8672 +vn -0.0847 -0.5446 -0.8344 +vn -0.0715 -0.4273 0.9013 +vn -0.1262 -0.5496 0.8259 +vn -0.1648 -0.8760 0.4534 +vn 0.6100 -0.7924 -0.0019 +vn -0.2177 -0.8016 -0.5569 +vn -0.1843 -0.8497 -0.4941 +vn 0.6319 -0.7750 -0.0004 +vn -0.9766 -0.2149 -0.0121 +vn -0.1840 -0.9829 -0.0010 +vn -0.3985 -0.9167 0.0282 +vn 0.0746 0.9485 -0.3079 +vn -0.1457 -0.7623 -0.6306 +vn -0.2636 -0.6994 0.6643 +vn 0.7707 -0.6370 -0.0156 +vn -0.9983 -0.0583 0.0092 +vn -0.0893 -0.9957 0.0237 +vn -0.4817 -0.8759 -0.0290 +vn -0.1472 -0.3375 -0.9297 +vn -0.2222 -0.5214 -0.8239 +vn -0.2076 -0.6909 0.6925 +vn 0.7945 -0.6069 0.0209 +vn -0.2972 -0.7995 -0.5220 +vn -0.3094 -0.7998 0.5144 +vn 0.4458 -0.8951 0.0015 +vn -0.8409 -0.5412 -0.0056 +vn -0.3172 -0.9484 0.0039 +vn -0.5130 -0.8580 -0.0237 +vn -0.4256 -0.6316 -0.6481 +vn -0.5889 -0.6770 -0.4415 +vn -0.5343 -0.6922 0.4852 +vn 0.5730 -0.8196 0.0008 +vn -0.5841 -0.8116 -0.0067 +vn -0.9994 -0.0359 0.0013 +vn -0.6279 -0.7783 0.0005 +vn -0.9997 -0.0230 0.0006 +vn -0.5951 -0.4144 -0.6885 +vn -0.6650 -0.5415 -0.5143 +vn -0.8294 0.5582 -0.0204 +vn -0.6685 -0.5297 0.5220 +vn -0.2549 -0.9670 0.0056 +vn -0.9891 0.1473 -0.0015 +vn -0.6575 -0.7531 0.0237 +vn -0.8039 -0.5947 -0.0039 +vn -0.3430 -0.3360 -0.8772 +vn -0.3323 -0.3283 -0.8842 +vn -0.2767 -0.2454 0.9291 +vn -0.4197 -0.3784 -0.8250 +vn -0.4272 -0.3725 0.8238 +vn -0.6482 -0.6118 0.4534 +vn 0.0278 -0.9996 -0.0019 +vn -0.6270 -0.6137 -0.4798 +vn 0.0557 -0.9984 -0.0004 +vn -0.8575 -0.5145 -0.0011 +vn -0.8677 -0.4972 0.0019 +vn -0.7180 -0.2601 -0.6457 +vn -0.8743 -0.2015 -0.4415 +vn -0.8516 -0.2166 0.4773 +vn -0.0620 -0.9979 -0.0194 +vn -0.9475 -0.3189 0.0244 +vn -0.8269 0.5623 0.0046 +vn -0.8887 -0.4584 0.0004 +vn -0.7833 0.6217 0.0006 +vn -0.7176 0.0176 -0.6962 +vn -0.8562 -0.0471 -0.5144 +vn -0.7409 0.0378 0.6705 +vn -0.7745 -0.6325 0.0056 +vn -0.3438 0.9391 0.0004 +vn -0.9746 -0.2228 0.0237 +vn -1.0000 -0.0086 -0.0039 +vn -0.2456 0.0690 -0.9669 +vn -0.3366 0.1142 -0.9347 +vn -0.5472 0.1787 -0.8177 +vn -0.8321 0.3209 -0.4524 +vn -0.8163 0.3253 0.4774 +vn -0.9895 0.1442 -0.0007 +vn -0.3383 0.9410 0.0046 +vn -0.9885 0.1515 0.0004 +vn -0.2683 0.9633 0.0006 +vn -0.9196 0.3929 0.0043 +vn -0.9077 0.4197 -0.0003 +vn -0.6763 0.3647 -0.6400 +vn -0.5710 0.4655 0.6762 +vn -0.7921 -0.6101 -0.0191 +vn 0.2767 0.9609 0.0102 +vn -0.9194 0.3926 0.0237 +vn -0.6842 0.7287 -0.0290 +vn -0.6796 0.7336 0.0003 +vn -0.6789 0.7342 0.0002 +vn -0.4692 0.6005 -0.6476 +vn -0.4618 0.7693 -0.4415 +vn -0.4932 0.7221 0.4852 +vn -0.9573 -0.2892 0.0008 +vn -0.5914 0.8063 -0.0067 +vn 0.2747 0.9615 0.0013 +vn -0.5461 0.8377 0.0005 +vn 0.2871 0.9579 0.0006 +vn -0.3208 0.5282 0.7862 +vn -0.4885 0.8726 -0.0002 +vn -0.4877 0.8730 -0.0003 +vn -0.2088 0.6924 -0.6906 +vn -0.3094 0.7997 -0.5145 +vn -0.2972 0.7995 0.5220 +vn -0.8408 0.5413 0.0056 +vn 0.4458 0.8951 -0.0015 +vn -0.5131 0.8580 0.0237 +vn -0.3172 0.9484 -0.0039 +vn 0.4279 0.6325 -0.6457 +vn 0.5889 0.6770 -0.4415 +vn 0.5343 0.6922 0.4852 +vn -0.5672 0.8236 0.0007 +vn 0.5841 0.8116 -0.0067 +vn 0.9994 0.0359 0.0013 +vn 0.6280 0.7782 0.0005 +vn 0.9997 0.0230 0.0006 +vn 0.3383 0.3349 -0.8794 +vn 0.2794 0.2618 0.9238 +vn 0.3414 0.3001 0.8907 +vn 0.4210 0.3797 -0.8237 +vn 0.4273 0.3726 0.8238 +vn 0.6482 0.6118 0.4534 +vn -0.0278 0.9996 -0.0019 +vn 0.6270 0.6137 -0.4799 +vn -0.0557 0.9984 -0.0004 +vn 0.8575 0.5144 -0.0011 +vn 0.8676 0.4972 0.0019 +vn 0.5909 0.4076 -0.6962 +vn 0.6651 0.5415 -0.5143 +vn 0.8137 -0.5808 -0.0215 +vn 0.6685 0.5297 0.5220 +vn 0.2549 0.9669 0.0056 +vn 0.9891 -0.1472 -0.0015 +vn 0.6575 0.7531 0.0237 +vn 0.8040 0.5947 -0.0039 +vn 0.4213 -0.2175 -0.8805 +vn 0.2545 -0.1670 0.9525 +vn 0.1851 -0.1048 0.9771 +vn 0.4919 -0.2834 -0.8233 +vn 0.4864 -0.2912 0.8238 +vn 0.7821 -0.4275 0.4534 +vn 0.9421 0.3354 -0.0019 +vn 0.7774 -0.4067 -0.4799 +vn 0.9323 0.3616 -0.0004 +vn 0.7543 -0.6566 -0.0011 +vn 0.7409 -0.6716 0.0019 +vn 0.7186 0.2600 -0.6450 +vn 0.8743 0.2015 -0.4415 +vn 0.8516 0.2166 0.4773 +vn 0.0711 0.9973 -0.0191 +vn 0.9475 0.3188 0.0244 +vn 0.8268 -0.5625 0.0046 +vn 0.8887 0.4585 0.0004 +vn 0.7833 -0.6216 0.0006 +vn 0.3773 0.1908 -0.9062 +vn 0.4852 0.2906 -0.8247 +vn 0.5794 0.4664 -0.6685 +vn 0.6751 0.3618 0.6429 +vn -0.2614 0.9652 -0.0096 +vn 0.7862 -0.6177 0.0195 +vn 0.6842 0.7288 0.0290 +vn 0.9194 0.3926 -0.0237 +vn 0.2457 0.0675 0.9670 +vn 0.3880 0.0691 0.9191 +vn 0.4582 0.0764 -0.8855 +vn 0.6088 0.1016 -0.7868 +vn 0.5616 0.0497 0.8259 +vn 0.8840 0.1139 0.4534 +vn 0.5650 0.8251 -0.0019 +vn 0.8681 0.1306 -0.4789 +vn 0.5418 0.8405 -0.0004 +vn 0.9922 -0.1250 -0.0011 +vn 0.9939 -0.1102 -0.0033 +vn 0.1907 -0.0692 -0.9792 +vn 0.5472 -0.1787 -0.8177 +vn 0.8320 -0.3209 -0.4524 +vn 0.8234 -0.2942 0.4853 +vn 0.9875 -0.1554 -0.0267 +vn 0.3430 -0.9394 0.0013 +vn 0.9342 -0.3567 0.0005 +vn 0.3307 -0.9437 0.0006 +vn 0.7132 -0.0454 -0.6995 +vn 0.8644 0.0462 -0.5008 +vn 0.2965 -0.9550 -0.0042 +vn 0.7438 -0.0362 0.6674 +vn 0.7002 0.7140 0.0009 +vn 0.3495 -0.9369 0.0003 +vn 0.9746 0.2228 0.0237 +vn 1.0000 0.0085 -0.0039 +vn 0.3912 -0.0699 -0.9177 +vn 0.5569 -0.0489 -0.8291 +vn 0.7185 0.0172 0.6953 +vn 0.3056 0.9521 0.0019 +vn 0.7355 0.0410 -0.6762 +vn 0.8563 -0.0471 0.5144 +vn 0.3318 0.9434 -0.0004 +vn 0.7745 -0.6325 -0.0056 +vn 1.0000 -0.0085 0.0039 +vn 0.9746 -0.2228 -0.0237 +vn -0.3742 -0.1928 -0.9071 +vn -0.3164 -0.2923 0.9025 +vn -0.4838 -0.2900 -0.8257 +vn -0.5881 -0.4672 -0.6602 +vn -0.6760 -0.3640 0.6407 +vn 0.2456 -0.9693 -0.0089 +vn -0.7901 0.6127 0.0193 +vn -0.6842 -0.7287 0.0290 +vn -0.9194 -0.3926 -0.0237 +vn -0.5441 -0.2720 0.7937 +vn -0.7821 -0.4274 -0.4534 +vn 0.1519 -0.9883 0.0145 +vn -0.6764 -0.4593 0.5758 +vn -0.7511 -0.4379 0.4941 +vn -0.7487 -0.6623 -0.0282 +vn -0.9420 0.3355 0.0019 +vn -0.8780 -0.4787 0.0010 +vn -0.9324 0.3615 0.0004 +vn -0.5614 -0.2346 -0.7936 +vn -0.3390 -0.1150 0.9337 +vn -0.5471 -0.1787 0.8178 +vn -0.8321 -0.3210 0.4524 +vn -0.3429 -0.9394 -0.0013 +vn -0.8234 -0.2942 -0.4852 +vn -0.7895 -0.2194 -0.5732 +vn -0.3308 -0.9437 -0.0006 +vn -0.6614 0.7499 -0.0148 +vn -0.9342 -0.3567 -0.0005 +vn -0.9875 -0.1555 0.0267 +vn -0.4603 -0.0723 -0.8848 +vn -0.2485 -0.0698 0.9661 +vn -0.3939 -0.0705 0.9164 +vn -0.4706 -0.0721 -0.8794 +vn -0.5639 -0.0598 -0.8237 +vn -0.5628 -0.0500 0.8251 +vn -0.8840 -0.1139 0.4534 +vn -0.5650 -0.8251 -0.0019 +vn -0.8680 -0.1279 -0.4799 +vn -0.5418 -0.8405 -0.0004 +vn -0.9961 0.0878 -0.0011 +vn -0.9942 0.1078 0.0019 +vn -0.3922 0.0701 -0.9172 +vn -0.3003 0.9538 -0.0035 +vn -0.5633 0.0500 -0.8247 +vn -0.7157 -0.0183 0.6982 +vn -0.2957 -0.9553 0.0041 +vn -0.7428 -0.0368 -0.6685 +vn -0.8562 0.0471 0.5144 +vn -0.3470 -0.9379 -0.0003 +vn -0.7745 0.6326 -0.0056 +vn -1.0000 0.0085 0.0039 +vn -0.9746 0.2228 -0.0237 +vn 0.1648 0.8760 0.4534 +vn -0.6100 0.7924 -0.0019 +vn 0.2176 0.8016 -0.5569 +vn 0.1843 0.8497 -0.4940 +vn -0.6320 0.7749 -0.0004 +vn 0.9766 0.2149 -0.0121 +vn 0.1840 0.9829 -0.0010 +vn 0.3985 0.9167 0.0282 +vn -0.0747 -0.9487 -0.3074 +vn 0.1457 0.7623 -0.6306 +vn 0.2647 0.6940 0.6696 +vn -0.7707 0.6370 -0.0156 +vn 0.9988 0.0479 0.0096 +vn 0.0893 0.9957 0.0237 +vn 0.4817 0.8759 -0.0290 +vn 0.2143 0.4257 0.8791 +vn 0.2309 0.5176 0.8239 +vn 0.3815 0.8055 -0.4534 +vn 0.3899 0.7859 0.4799 +vn 0.2046 0.9788 -0.0019 +vn 0.9593 0.2825 0.0019 +vn 0.2243 0.9745 0.0011 +vn 0.9668 0.2554 0.0004 +vn -0.4715 0.0723 0.8789 +vn -0.5634 0.0596 0.8240 +vn -0.8840 0.1139 -0.4534 +vn -0.8680 0.1279 0.4799 +vn -0.9942 -0.1078 -0.0019 +vn -0.5650 0.8251 0.0019 +vn -0.9961 -0.0879 0.0011 +vn -0.5417 0.8405 0.0004 +vn -0.4268 -0.9043 -0.0037 +vn -0.0151 -0.0065 0.9999 +vn -0.0566 -0.9984 0.0056 +vn -0.0602 -0.9982 0.0049 +vn -0.0059 -0.0199 0.9998 +vn -0.0394 -0.7277 0.6848 +vn 0.4102 -0.9120 0.0016 +vn -0.0057 -0.0200 0.9998 +vn 0.0700 -0.9174 0.3917 +vn 0.4189 -0.9080 0.0001 +vn 0.4755 0.8797 0.0027 +vn 0.0141 0.0149 0.9998 +vn 0.4048 0.9142 0.0211 +vn -0.0008 -0.0190 0.9998 +vn 0.3127 -0.5814 0.7511 +vn 0.7238 -0.6899 0.0120 +vn 0.0062 -0.0212 0.9998 +vn 0.8046 -0.5938 -0.0029 +vn 0.0118 0.0166 0.9998 +vn 0.5860 0.5311 0.6120 +vn 0.6917 0.7221 -0.0084 +vn 0.0210 0.0025 0.9998 +vn 0.0153 0.0007 0.9999 +vn 0.4783 0.4918 0.7276 +vn 0.3336 -0.5981 0.7287 +vn 0.9678 -0.2515 0.0040 +vn 0.9417 0.3359 0.0190 +vn 0.8900 0.4560 0.0029 +vn 0.9762 -0.2164 0.0105 +vn 0.9824 0.1870 0.0007 +vn 0.4834 -0.3530 0.8011 +vn 0.5052 0.2612 0.8225 +vn 0.5921 -0.3753 0.7132 +vn 0.0079 0.0123 0.9999 +vn 0.7105 0.1788 0.6806 +vn 0.7291 0.1955 0.6559 +vn 0.0185 0.0043 0.9998 +vn 0.5803 -0.1902 0.7919 +vn 0.8466 -0.0884 0.5248 +vn 0.0031 -0.0113 0.9999 +vn 0.0168 -0.0071 0.9998 +vn 0.0179 -0.0049 0.9998 +vn 0.0172 -0.0059 0.9998 +vn 0.1460 0.3346 -0.9310 +vn 0.2223 0.5214 -0.8238 +vn 0.2044 0.6871 0.6972 +vn -0.8055 0.5922 0.0216 +vn 0.2972 0.7994 -0.5221 +vn 0.3094 0.7998 0.5145 +vn -0.4458 0.8951 0.0015 +vn 0.8409 0.5412 -0.0056 +vn 0.3172 0.9484 0.0039 +vn 0.5131 0.8580 -0.0237 +vn -0.2287 0.0746 0.9706 +vn -0.1949 0.0561 0.9792 +vn -0.5477 0.1771 0.8177 +vn -0.8618 0.2294 0.4524 +vn -0.8269 -0.5624 -0.0046 +vn -0.8516 0.2166 -0.4774 +vn -0.7833 -0.6217 -0.0006 +vn -0.8887 0.4584 -0.0004 +vn -0.8853 0.4649 0.0007 +vn 0.0066 -0.0006 -1.0000 +vn -0.5474 0.8368 -0.0115 +vn 0.0016 -0.0038 -1.0000 +vn -0.3881 0.9216 0.0056 +vn -0.0005 -0.0059 -1.0000 +vn -0.5474 -0.8368 0.0115 +vn -0.0653 -0.2030 -0.9770 +vn -0.3881 -0.9216 -0.0056 +vn -0.0009 -0.0059 -1.0000 +vn -0.0033 0.0059 -1.0000 +vn 0.0004 0.0074 -1.0000 +vn -0.0087 -0.0007 -1.0000 +vn 0.5712 0.8208 -0.0056 +vn -0.0032 -0.0038 -1.0000 +vn -0.0070 -0.0027 -1.0000 +vn -0.0029 0.0042 -1.0000 +vn 0.6471 0.7624 0.0034 +vn 0.5712 -0.8208 0.0056 +vn -0.3142 0.2903 -0.9039 +vn 0.6471 -0.7624 -0.0034 +vn -0.0055 -0.0076 -1.0000 +vn -0.0049 0.0031 -1.0000 +vn 0.9992 0.0391 -0.0030 +vn 0.9992 -0.0391 0.0029 +vn -0.0048 0.0002 -1.0000 +vn -0.0051 0.0028 -1.0000 +vn -0.3576 0.1734 0.9176 +vn -0.5435 0.2718 -0.7942 +vn -0.4793 0.2878 0.8291 +vn -0.7821 0.4274 0.4534 +vn -0.9421 -0.3353 -0.0019 +vn -0.6773 0.4590 -0.5749 +vn -0.7511 0.4379 -0.4941 +vn -0.9323 -0.3616 -0.0004 +vn 0.1502 0.9885 -0.0144 +vn -0.8780 0.4787 -0.0010 +vn -0.7487 0.6623 0.0282 +vn -0.2741 0.2431 -0.9305 +vn -0.4271 0.3725 -0.8239 +vn -0.6036 0.3825 0.6995 +vn -0.8110 -0.5847 0.0217 +vn -0.6686 0.5298 -0.5219 +vn -0.6721 0.5454 0.5008 +vn -0.9891 -0.1475 0.0015 +vn -0.1469 0.9892 -0.0009 +vn -0.8039 0.5947 0.0039 +vn -0.6575 0.7531 -0.0237 +vn -0.3227 0.3169 0.8919 +vn -0.3502 0.3560 0.8664 +vn -0.4323 0.4396 0.7873 +vn -0.6482 0.6118 -0.4534 +vn -0.6256 0.6159 0.4789 +vn -0.8689 0.4950 0.0033 +vn 0.0278 0.9996 0.0019 +vn -0.8761 0.4821 0.0011 +vn 0.0558 0.9984 0.0004 +vn -0.5107 0.6359 0.5787 +vn -0.4028 0.4679 -0.7866 +vn -0.9669 -0.2552 -0.0023 +vn -0.5889 0.6769 0.4415 +vn -0.9994 0.0359 -0.0013 +vn -0.5343 0.6922 -0.4852 +vn -0.4485 0.6824 -0.5772 +vn -0.9997 0.0231 -0.0006 +vn -0.4250 0.6313 0.6487 +vn 0.5401 0.8416 0.0029 +vn 0.5749 0.8182 -0.0008 +vn -0.6280 0.7782 -0.0005 +vn -0.5841 0.8116 0.0067 +vn -0.2136 0.4291 -0.8776 +vn -0.2104 0.4191 -0.8832 +vn -0.1478 0.3390 0.9291 +vn -0.2301 0.5161 -0.8250 +vn -0.2223 0.5214 0.8238 +vn -0.3815 0.8056 0.4533 +vn -0.9593 0.2825 -0.0019 +vn -0.3898 0.7860 -0.4799 +vn -0.9668 0.2556 -0.0004 +vn -0.2243 0.9745 -0.0011 +vn -0.2047 0.9788 0.0019 +vn 0.0702 0.4929 -0.8673 +vn 0.0847 0.5447 -0.8343 +vn 0.0895 0.9960 0.0043 +vn 0.1186 0.9929 -0.0003 +vn 0.7912 0.6112 -0.0207 +vn -0.0708 0.4243 -0.9027 +vn -0.1813 0.3930 0.9015 +vn -0.1263 0.5496 -0.8258 +vn -0.2632 0.7014 -0.6625 +vn -0.1368 0.7550 0.6413 +vn -0.9980 0.0619 -0.0091 +vn 0.8285 0.5596 0.0194 +vn -0.4817 0.8759 0.0290 +vn -0.0893 0.9957 -0.0237 +vn -0.1186 0.9929 0.0003 +vn -0.1177 0.9931 0.0002 +vn -0.0906 0.6022 0.7932 +vn -0.1649 0.8759 -0.4534 +vn -0.9871 0.1594 0.0146 +vn -0.2282 0.7845 0.5766 +vn -0.1843 0.8497 0.4941 +vn -0.3985 0.9167 -0.0282 +vn 0.6101 0.7923 0.0019 +vn -0.1840 0.9829 0.0010 +vn 0.6320 0.7749 0.0004 +vn 0.0651 0.2011 -0.9774 +vn 0.0015 0.0058 -1.0000 +vn 0.0029 0.0045 -1.0000 +vn 0.3426 0.3379 -0.8766 +vn 0.0025 0.0048 -1.0000 +vn 0.2233 -0.0734 -0.9720 +vn 0.0046 -0.0035 -1.0000 +vn -0.9837 0.1792 0.0134 +vn 0.0105 -0.0050 -0.9999 +vn 0.0042 -0.0008 -1.0000 +vn -0.9837 -0.1792 -0.0134 +vn 0.4382 0.0700 -0.8961 +vn 0.0053 0.0118 -0.9999 +vn -0.3776 -0.6978 0.6087 +vn -0.5620 -0.8270 0.0156 +vn -0.4807 -0.7847 0.3914 +vn -0.2662 -0.0621 0.9619 +vn -0.0104 -0.0078 0.9999 +vn -0.8062 -0.5916 -0.0061 +vn -0.5360 -0.4471 0.7161 +vn -0.9246 -0.3806 0.0173 +vn -0.0122 -0.0049 0.9999 +vn -0.8748 -0.2384 0.4217 +vn 0.3168 0.7206 0.6167 +vn -0.0083 0.0027 1.0000 +vn -0.2588 -0.0704 0.9634 +vn -0.8446 -0.2122 0.4915 +vn -0.9700 -0.2431 -0.0030 +vn 0.3114 0.7885 0.5304 +vn -0.6936 -0.1194 0.7104 +vn -0.0684 0.9977 0.0021 +vn -0.0896 0.9960 0.0059 +vn -0.9953 0.0959 -0.0090 +vn 0.1264 0.5509 0.8249 +vn -0.7439 0.0671 0.6649 +vn -0.9402 0.3403 0.0168 +vn -0.0083 0.0024 1.0000 +vn -0.8768 0.2052 0.4349 +vn -0.0863 0.7060 0.7029 +vn -0.5896 0.8077 0.0051 +vn -0.8924 0.4513 -0.0002 +vn 0.0546 0.3957 0.9168 +vn 0.0131 0.0150 0.9998 +vn -0.1864 0.0463 0.9814 +vn -0.5762 0.8173 0.0022 +vn 0.0108 0.2581 0.9661 +vn 0.0002 0.0221 0.9998 +vn -0.6553 0.3309 0.6790 +vn -0.0194 -0.0046 0.9998 +vn -0.4739 0.3661 0.8009 +vn -0.7381 0.5434 0.3999 +vn -0.3225 0.5339 0.7816 +vn -0.2641 0.9619 0.0704 +vn -0.0123 0.0140 0.9998 +vn -0.0075 0.0175 0.9998 +vn -0.0072 0.0175 0.9998 +vn -0.0272 0.7606 -0.6487 +vn 0.0785 0.8938 -0.4415 +vn 0.0571 0.8768 0.4774 +vn -0.9365 0.3501 -0.0201 +vn -0.0105 0.9996 0.0244 +vn 0.7904 0.6125 0.0046 +vn -0.1614 0.9869 0.0004 +vn 0.8333 0.5528 0.0006 +vn -0.0502 0.6110 -0.7901 +vn -0.0045 0.3602 0.9329 +vn -0.0008 0.5756 0.8177 +vn -0.0481 0.8905 0.4524 +vn -0.7874 0.6165 -0.0013 +vn 0.0386 0.8154 -0.5776 +vn -0.0254 0.8740 -0.4853 +vn -0.7953 0.6062 -0.0006 +vn 0.9211 0.3891 -0.0152 +vn -0.0506 0.9987 -0.0005 +vn 0.1573 0.9872 0.0267 +vn 0.6796 -0.7336 0.0003 +vn 0.6789 -0.7342 0.0002 +vn 0.3208 -0.5282 0.7862 +vn -0.0503 -0.6116 0.7896 +vn -0.4110 -0.6399 0.6493 +vn -0.9811 0.1933 0.0132 +vn -0.2723 -0.9622 -0.0002 +vn -0.4890 -0.8716 -0.0348 +vn -0.3328 -0.3950 0.8563 +vn 0.4002 0.4652 0.7896 +vn 0.9081 -0.4188 -0.0002 +vn 0.9808 -0.1950 0.0002 +vn -0.9749 -0.2227 0.0043 +vn -0.3619 -0.4606 0.8105 +vn -0.3206 -0.5279 -0.7864 +vn -0.3742 -0.7211 0.5832 +vn 0.6077 -0.7940 0.0174 +vn -0.4932 -0.7221 -0.4851 +vn -0.5106 -0.6366 -0.5779 +vn -0.9726 0.2319 -0.0154 +vn -0.7075 -0.7062 0.0268 +vn -0.2299 -0.5157 0.8254 +vn -0.3815 -0.8055 -0.4535 +vn -0.2046 -0.9788 -0.0019 +vn -0.2243 -0.9745 0.0011 +vn 0.0527 -0.6280 -0.7764 +vn 0.9312 -0.3645 -0.0030 +vn 0.0786 -0.8939 0.4414 +vn 0.7874 -0.6165 -0.0013 +vn 0.0254 -0.8741 -0.4851 +vn -0.0345 -0.8196 -0.5719 +vn 0.7953 -0.6063 -0.0006 +vn -0.0279 -0.7594 0.6500 +vn -0.9290 -0.3701 0.0035 +vn -0.9462 -0.3235 -0.0008 +vn 0.0505 -0.9987 -0.0005 +vn -0.0046 -1.0000 0.0067 +vn 0.0740 -0.4855 0.8711 +vn 0.0869 -0.5657 0.8201 +vn 0.1589 -0.8810 0.4456 +vn 0.1843 -0.8497 0.4941 +vn -0.6321 -0.7749 0.0004 +vn 0.4228 0.2182 0.8796 +vn 0.4916 0.2832 0.8235 +vn 0.7774 0.4067 0.4799 +vn 0.7409 0.6716 -0.0019 +vn 0.9421 -0.3354 0.0019 +vn 0.7542 0.6566 0.0011 +vn 0.5106 -0.6359 0.5787 +vn 0.4117 -0.4771 -0.7765 +vn 0.9667 0.2560 -0.0029 +vn 0.5890 -0.6769 0.4415 +vn 0.9994 -0.0359 -0.0013 +vn 0.4531 -0.6832 -0.5727 +vn 0.4250 -0.6313 0.6487 +vn -0.5349 -0.8449 0.0034 +vn -0.5750 -0.8182 -0.0008 +vn 0.6280 -0.7782 -0.0005 +vn 0.5841 -0.8116 0.0067 +vn 0.5825 0.2449 -0.7751 +vn 0.2264 0.0740 0.9712 +vn 0.1922 0.0697 0.9789 +vn 0.8320 0.3209 0.4525 +vn 0.3429 0.9394 -0.0013 +vn 0.8234 0.2942 -0.4852 +vn 0.7907 0.2216 -0.5707 +vn 0.3307 0.9437 -0.0006 +vn 0.6620 -0.7494 -0.0148 +vn 0.9875 0.1555 0.0267 +vn 0.3441 -0.3371 0.8763 +vn 0.3335 -0.3296 0.8832 +vn 0.4198 -0.3784 0.8250 +vn 0.8677 -0.4971 -0.0019 +vn -0.0277 -0.9996 0.0019 +vn 0.8575 -0.5145 0.0011 +vn -0.0560 -0.9984 0.0004 +vn 0.7878 -0.2160 0.5769 +vn 0.5965 -0.1410 -0.7901 +vn 0.6385 0.7696 -0.0030 +vn 0.8743 -0.2015 0.4415 +vn 0.8296 0.5584 -0.0013 +vn 0.8391 -0.2459 -0.4852 +vn 0.7636 -0.2887 -0.5776 +vn 0.8222 0.5691 -0.0006 +vn 0.0629 -0.9980 0.0024 +vn 0.0271 -0.9996 -0.0007 +vn 0.9655 -0.2605 -0.0005 +vn 0.9496 -0.3133 0.0067 +vn 0.4438 -0.0684 0.8935 +vn 0.4775 -0.0796 0.8750 +vn 0.6085 -0.1016 0.7870 +vn 0.8681 -0.1306 0.4789 +vn 0.9939 0.1101 0.0033 +vn 0.5649 -0.8251 0.0018 +vn 0.9921 0.1251 0.0011 +vn 0.5418 -0.8405 0.0004 +vn 0.4464 0.6821 0.5793 +vn 0.3211 0.5289 -0.7856 +vn -0.5383 0.8427 -0.0023 +vn -0.2748 0.9615 -0.0013 +vn 0.4932 0.7220 -0.4852 +vn 0.5102 0.6394 -0.5752 +vn 0.4690 0.5980 0.6500 +vn 0.9679 -0.2512 0.0031 +vn 0.9557 -0.2943 -0.0008 +vn -0.9808 0.1949 0.0002 +vn -0.8791 0.3641 -0.3076 +vn 0.6799 -0.3741 -0.6307 +vn 0.5857 -0.4670 0.6625 +vn 0.8440 0.5360 -0.0156 +vn -0.2497 -0.9683 0.0091 +vn 0.6842 -0.7288 -0.0290 +vn 0.2839 -0.2515 -0.9253 +vn 0.4272 -0.3726 -0.8238 +vn 0.5940 -0.4125 0.6907 +vn 0.8258 0.5636 0.0207 +vn 0.6686 -0.5297 -0.5220 +vn 0.6650 -0.5414 0.5144 +vn 0.9891 0.1473 0.0015 +vn 0.2548 -0.9670 -0.0056 +vn 0.8040 -0.5947 0.0039 +vn 0.4695 -0.6065 -0.6417 +vn 0.4619 -0.7693 -0.4414 +vn 0.4932 -0.7221 0.4851 +vn 0.9548 0.2974 0.0008 +vn 0.5914 -0.8064 -0.0067 +vn -0.2746 -0.9616 0.0013 +vn 0.5461 -0.8377 0.0005 +vn -0.2870 -0.9579 0.0006 +vn 0.2164 -0.4512 -0.8658 +vn 0.2973 -0.7996 0.5218 +vn 0.8410 -0.5410 0.0056 +vn -0.4522 -0.8919 -0.0077 +vn 0.5131 -0.8580 0.0237 +vn 0.1251 -0.9917 -0.0290 +vn 0.2277 -0.4492 -0.8639 +vn 0.1478 -0.3390 0.9291 +vn 0.1360 -0.3474 -0.9278 +vn 0.2222 -0.5212 0.8240 +vn 0.3815 -0.8055 0.4535 +vn 0.3898 -0.7859 -0.4799 +vn 0.9668 -0.2555 -0.0004 +vn 0.2243 -0.9745 -0.0011 +vn 0.2046 -0.9788 0.0019 +vn 0.0230 -0.7671 -0.6412 +vn -0.0786 -0.8938 -0.4415 +vn -0.0254 -0.8741 0.4852 +vn 0.9466 -0.3225 0.0008 +vn 0.0046 -1.0000 -0.0067 +vn -0.7874 -0.6165 0.0013 +vn -0.0505 -0.9987 0.0005 +vn 0.0690 -0.2136 -0.9745 +vn 0.0665 -0.2057 0.9763 +vn 0.0817 -0.3693 -0.9257 +vn -0.0797 -0.4965 -0.8644 +vn -0.0831 -0.3007 0.9501 +vn -0.0427 -0.2093 0.9769 +vn -0.0940 -0.3592 -0.9285 +vn -0.1267 -0.5525 0.8238 +vn -0.1649 -0.8759 0.4534 +vn 0.6101 -0.7924 -0.0019 +vn -0.1466 -0.8650 -0.4799 +vn 0.6320 -0.7749 -0.0004 +vn -0.3914 -0.9202 -0.0011 +vn -0.4098 -0.9122 0.0019 +vn -0.0900 -0.4920 -0.8659 +vn -0.2292 -0.8223 -0.5209 +vn -0.2295 -0.8215 0.5220 +vn 0.3620 -0.9322 0.0056 +vn -0.8901 -0.4557 -0.0077 +vn -0.1472 -0.3375 -0.9298 +vn -0.2222 -0.5212 -0.8240 +vn -0.2347 -0.5211 0.8206 +vn -0.2973 -0.7996 -0.5218 +vn -0.2979 -0.7999 0.5209 +vn 0.4523 -0.8918 0.0077 +vn -0.8409 -0.5411 -0.0056 +vn -0.1251 -0.9917 0.0290 +vn -0.5131 -0.8580 -0.0237 +vn -0.4256 -0.6315 -0.6481 +vn -0.5890 -0.6769 -0.4415 +vn -0.5614 -0.6779 0.4747 +vn 0.5539 -0.8323 -0.0201 +vn -0.5791 -0.8149 0.0244 +vn -0.4495 -0.8933 0.0004 +vn -0.5952 -0.4144 -0.6885 +vn -0.6650 -0.5414 -0.5145 +vn -0.8295 0.5582 -0.0204 +vn -0.6686 -0.5297 0.5219 +vn -0.2548 -0.9670 0.0056 +vn -0.9891 0.1475 -0.0015 +vn -0.3324 -0.3283 -0.8841 +vn -0.2055 -0.1849 0.9610 +vn -0.4198 -0.3784 -0.8250 +vn -0.4271 -0.3725 0.8239 +vn 0.0277 -0.9996 -0.0019 +vn -0.6270 -0.6137 -0.4799 +vn 0.0561 -0.9984 -0.0004 +vn -0.8677 -0.4971 0.0019 +vn -0.7149 -0.2609 -0.6487 +vn -0.0437 -0.9988 -0.0201 +vn -0.9475 -0.3188 0.0244 +vn -0.8268 0.5624 0.0046 +vn -0.7832 0.6217 0.0006 +vn 0.9253 0.2221 -0.3075 +vn -0.7700 -0.0969 -0.6306 +vn -0.7410 0.0378 0.6705 +vn -0.3677 -0.9298 -0.0156 +vn -0.3527 0.9357 0.0097 +vn -0.9818 0.1874 -0.0290 +vn -0.7362 0.2147 -0.6418 +vn -0.8258 0.3509 -0.4416 +vn -0.8163 0.3253 0.4773 +vn -0.6163 -0.7872 -0.0203 +vn -0.9539 0.2990 0.0244 +vn -0.3382 0.9411 0.0046 +vn -0.9885 0.1514 0.0004 +vn -0.9077 0.4196 -0.0003 +vn -0.5065 0.2561 -0.8233 +vn -0.7105 0.4725 -0.5215 +vn -0.9984 -0.0564 0.0056 +vn 0.2772 0.9608 0.0095 +vn -0.6561 0.7539 -0.0337 +vn -0.4691 0.6003 -0.6477 +vn -0.4932 0.7220 0.4852 +vn -0.9602 -0.2793 0.0007 +vn -0.5914 0.8064 -0.0067 +vn -0.3174 0.5218 0.7918 +vn -0.2014 0.3990 -0.8946 +vn -0.1780 0.6930 -0.6986 +vn -0.3110 0.8077 -0.5009 +vn -0.1956 0.7187 0.6673 +vn -0.8954 0.4453 0.0009 +vn 0.7835 0.6214 0.0003 +vn -0.3172 0.9483 -0.0039 +vn 0.4279 0.6324 -0.6457 +vn 0.5343 0.6922 0.4853 +vn 0.9997 0.0232 0.0006 +vn 0.3384 0.3350 -0.8794 +vn 0.3110 0.3071 0.8994 +vn 0.4210 0.3797 -0.8238 +vn 0.4267 0.3720 0.8244 +vn -0.0279 0.9996 -0.0019 +vn 0.6270 0.6136 -0.4799 +vn 0.8677 0.4971 0.0019 +vn 0.6650 0.5415 -0.5143 +vn 0.8038 -0.5949 -0.0038 +vn 0.6231 0.4081 0.6672 +vn 0.2550 0.9669 0.0056 +vn 0.8331 -0.5532 0.0003 +vn 0.8040 0.5946 -0.0039 +vn 0.4471 -0.2191 -0.8672 +vn 0.4918 -0.2489 -0.8344 +vn 0.3792 -0.1963 0.9043 +vn 0.4837 -0.2900 0.8258 +vn 0.7821 -0.4274 0.4534 +vn 0.9422 0.3352 -0.0019 +vn 0.6951 -0.4547 -0.5569 +vn 0.7511 -0.4378 -0.4942 +vn 0.9324 0.3615 -0.0004 +vn -0.0974 -0.9952 -0.0121 +vn 0.8780 -0.4787 -0.0010 +vn 0.7487 -0.6623 0.0282 +vn 0.7236 0.2586 -0.6399 +vn 0.8516 0.2167 0.4773 +vn 0.0335 0.9992 -0.0204 +vn 0.9475 0.3189 0.0244 +vn 0.8269 -0.5623 0.0046 +vn 0.8887 0.4584 0.0004 +vn 0.7834 -0.6216 0.0006 +vn 0.3956 0.2074 -0.8947 +vn 0.5715 0.4363 0.6950 +vn -0.3149 0.9491 0.0035 +vn 0.5793 0.4664 -0.6685 +vn 0.7204 0.4652 0.5144 +vn -0.2704 0.9627 -0.0003 +vn 0.9984 -0.0563 -0.0056 +vn 0.8140 0.5809 0.0039 +vn 0.3920 0.0701 0.9173 +vn 0.4988 0.0781 -0.8632 +vn 0.3722 0.0219 -0.9279 +vn 0.5568 0.0489 0.8292 +vn 0.8680 0.1279 -0.4799 +vn 0.5417 0.8406 -0.0004 +vn 0.9961 -0.0878 -0.0011 +vn 0.9942 -0.1078 0.0019 +vn 0.7318 -0.2091 -0.6487 +vn 0.8258 -0.3509 -0.4416 +vn 0.6044 0.7967 0.0008 +vn 0.9524 -0.3047 -0.0067 +vn 0.3429 -0.9394 0.0013 +vn 0.3308 -0.9437 0.0006 +vn 0.4966 0.0664 -0.8655 +vn 0.8529 0.0361 -0.5209 +vn 0.7348 -0.0414 0.6770 +vn 0.7745 0.6325 0.0056 +vn 0.3399 -0.9404 0.0103 +vn 0.9818 -0.1875 -0.0290 +vn 0.2789 -0.0019 -0.9603 +vn 0.1442 -0.0189 -0.9894 +vn 0.5647 -0.0503 -0.8238 +vn 0.7124 0.0458 0.7003 +vn 0.3100 0.9505 0.0218 +vn 0.8522 -0.0356 -0.5219 +vn 0.8644 -0.0462 0.5008 +vn 0.7136 0.7006 0.0015 +vn 0.7002 -0.7140 -0.0009 +vn -0.3803 -0.1981 -0.9034 +vn -0.2858 -0.2842 0.9152 +vn -0.4839 -0.2900 -0.8257 +vn -0.5881 -0.4673 -0.6602 +vn -0.6760 -0.3641 0.6407 +vn -0.7902 0.6126 0.0193 +vn -0.5442 -0.2720 0.7937 +vn -0.9421 0.3353 0.0019 +vn -0.8779 -0.4788 0.0010 +vn -0.9323 0.3617 0.0004 +vn -0.5655 -0.2366 -0.7901 +vn -0.3391 -0.1150 0.9337 +vn -0.5472 -0.1787 0.8177 +vn -0.8320 -0.3210 0.4524 +vn -0.3428 -0.9394 -0.0013 +vn -0.8234 -0.2942 -0.4853 +vn -0.7874 -0.2153 -0.5776 +vn -0.6546 0.7558 -0.0152 +vn -0.9342 -0.3568 -0.0005 +vn -0.4905 -0.0856 -0.8673 +vn -0.3940 -0.0705 0.9164 +vn -0.5442 -0.0877 -0.8344 +vn -0.5629 -0.0500 0.8250 +vn -0.5649 -0.8251 -0.0018 +vn -0.8296 -0.0407 -0.5569 +vn -0.8651 -0.0873 -0.4940 +vn -0.5419 -0.8404 -0.0004 +vn -0.5061 0.8624 -0.0121 +vn -0.9917 -0.1288 -0.0010 +vn -0.9950 0.0957 0.0282 +vn -0.2173 -0.0016 -0.9761 +vn -0.3775 0.0365 -0.9253 +vn -0.5648 0.0503 -0.8237 +vn -0.3120 -0.9498 0.0217 +vn -0.8522 0.0356 -0.5220 +vn -0.8562 0.0472 0.5144 +vn -0.7135 -0.7006 0.0015 +vn -0.7746 0.6324 -0.0056 +vn -0.6101 0.7924 -0.0019 +vn 0.1466 0.8650 -0.4799 +vn -0.6319 0.7750 -0.0004 +vn 0.3913 0.9203 -0.0011 +vn 0.4097 0.9122 0.0019 +vn 0.2380 0.6830 -0.6906 +vn 0.2198 0.8289 -0.5144 +vn 0.9995 0.0218 -0.0210 +vn 0.2294 0.8215 0.5221 +vn -0.3620 0.9321 0.0056 +vn 0.8867 0.4623 -0.0015 +vn 0.3009 0.9536 -0.0040 +vn 0.2255 0.4362 0.8711 +vn 0.2620 0.5084 0.8203 +vn 0.3815 0.8056 -0.4533 +vn -0.4014 0.9159 -0.0019 +vn 0.3894 0.8062 0.4454 +vn 0.3504 0.7958 0.4939 +vn 0.2165 0.9759 -0.0282 +vn 0.9593 0.2824 0.0019 +vn 0.4289 0.9034 0.0010 +vn 0.9669 0.2553 0.0004 +vn -0.4714 0.0723 0.8789 +vn -0.5635 0.0597 0.8240 +vn -0.9961 -0.0878 0.0011 +vn -0.0263 -0.0088 0.9996 +vn -0.4055 -0.9141 -0.0080 +vn 0.0048 -0.0272 0.9996 +vn -0.0602 -0.9981 0.0133 +vn 0.0587 -0.9983 -0.0014 +vn 0.0874 -0.7796 0.6202 +vn 0.4102 -0.9120 0.0074 +vn -0.0029 -0.0177 0.9998 +vn 0.4384 -0.8988 0.0037 +vn 0.4754 0.8797 0.0123 +vn 0.0474 -0.6970 0.7155 +vn 0.4573 0.8892 0.0162 +vn 0.0101 -0.0160 0.9998 +vn 0.3677 -0.8332 0.4130 +vn 0.7236 -0.6902 0.0030 +vn 0.7239 -0.6899 0.0030 +vn 0.2151 0.5642 0.7971 +vn 0.2848 -0.4410 0.8511 +vn 0.0039 -0.0139 0.9999 +vn 0.0128 0.0133 0.9998 +vn 0.5481 0.6196 0.5619 +vn 0.7289 0.6845 -0.0129 +vn 0.5286 -0.5049 0.6824 +vn 0.5302 0.4990 0.6855 +vn 0.9418 0.3359 0.0152 +vn 0.0118 -0.0043 0.9999 +vn 0.3887 -0.5627 0.7296 +vn 0.7292 -0.5376 0.4234 +vn 0.9644 -0.2643 0.0016 +vn 0.9673 0.2536 0.0001 +vn 0.0258 -0.0058 0.9996 +vn 0.8486 0.3396 0.4056 +vn 0.0077 0.0039 1.0000 +vn 0.2396 0.1193 0.9635 +vn 0.0114 -0.0045 0.9999 +vn 0.1583 -0.1132 0.9809 +vn 0.7317 -0.2038 0.6504 +vn 0.6767 0.1786 0.7143 +vn 0.8778 -0.1728 0.4468 +vn 0.0101 -0.0061 0.9999 +vn 0.4267 -0.0854 0.9004 +vn 0.2905 -0.0701 0.9543 +vn 0.0063 -0.0070 1.0000 +vn 0.0102 -0.0025 0.9999 +vn 0.0664 0.2042 0.9767 +vn 0.1958 0.3914 -0.8991 +vn 0.1093 0.2744 0.9554 +vn 0.2231 0.5230 -0.8226 +vn 0.1991 0.7218 -0.6628 +vn -0.7738 0.6334 -0.0092 +vn 0.3411 0.9394 0.0347 +vn 0.5209 0.8536 0.0056 +vn -0.6135 0.1440 -0.7764 +vn -0.5477 0.1771 0.8178 +vn -0.8296 -0.5584 -0.0013 +vn -0.8391 0.2459 -0.4852 +vn -0.7682 0.2864 -0.5727 +vn -0.8224 -0.5688 -0.0006 +vn -0.0879 0.9960 -0.0151 +vn -0.9655 0.2605 -0.0005 +vn -0.8903 0.4546 0.0267 +vn 0.1767 -0.1264 -0.9761 +vn 0.0055 -0.0016 -1.0000 +vn 0.0017 -0.0040 -1.0000 +vn 0.0012 -0.0045 -1.0000 +vn -0.3880 0.9215 0.0160 +vn -0.5473 -0.8367 0.0196 +vn -0.0691 -0.2094 -0.9754 +vn -0.0023 -0.0046 -1.0000 +vn 0.2556 0.9666 -0.0196 +vn -0.1335 -0.9910 -0.0134 +vn -0.0075 0.0019 -1.0000 +vn -0.0042 -0.0062 -1.0000 +vn -0.0038 0.0054 -1.0000 +vn 0.6471 0.7623 0.0134 +vn 0.5712 -0.8208 0.0094 +vn -0.0297 -0.0095 -0.9995 +vn 0.6977 -0.7164 -0.0030 +vn 0.0059 0.0358 -0.9993 +vn 0.9921 0.1247 -0.0094 +vn -0.0055 -0.0019 -1.0000 +vn -0.0045 0.0002 -1.0000 +vn -0.3577 0.1734 0.9176 +vn -0.4483 0.2295 -0.8639 +vn -0.3141 0.2011 -0.9278 +vn -0.4793 0.2878 0.8292 +vn -0.9421 -0.3354 -0.0019 +vn -0.7774 0.4067 -0.4799 +vn -0.9324 -0.3615 -0.0004 +vn -0.7542 0.6566 -0.0011 +vn -0.7410 0.6715 0.0019 +vn -0.2953 0.2872 -0.9112 +vn -0.4930 0.4417 -0.7496 +vn -0.6037 0.3825 0.6995 +vn -0.8089 -0.5877 0.0179 +vn -0.6685 0.5296 -0.5222 +vn -0.6722 0.5454 0.5007 +vn -0.9656 -0.2599 0.0011 +vn -0.1469 0.9891 -0.0009 +vn -0.8040 0.5947 0.0039 +vn -0.3191 0.3158 0.8935 +vn -0.3412 0.3468 0.8737 +vn -0.6482 0.6118 -0.4533 +vn 0.0279 0.9996 0.0019 +vn 0.0557 0.9984 0.0004 +vn -0.5106 0.6367 0.5778 +vn -0.3973 0.4622 -0.7928 +vn -0.9687 -0.2481 -0.0021 +vn -0.5889 0.6770 0.4415 +vn -0.5343 0.6921 -0.4853 +vn -0.4499 0.6826 -0.5758 +vn -0.9997 0.0232 -0.0006 +vn -0.4245 0.6311 0.6492 +vn 0.5329 0.8462 0.0029 +vn 0.5688 0.8225 -0.0008 +vn -0.2219 0.4270 -0.8766 +vn -0.2844 0.5467 -0.7876 +vn -0.1952 0.3871 0.9011 +vn -0.2219 0.5209 0.8243 +vn -0.3815 0.8056 0.4534 +vn -0.9593 0.2824 -0.0019 +vn -0.3925 0.7853 -0.4789 +vn -0.9668 0.2554 -0.0004 +vn -0.1877 0.9822 -0.0011 +vn -0.2023 0.9793 -0.0033 +vn 0.1177 0.5571 -0.8221 +vn 0.0768 0.4692 -0.8798 +vn 0.0511 0.6172 0.7852 +vn 0.1177 0.9931 -0.0002 +vn -0.0544 0.3928 -0.9180 +vn 0.8152 0.5792 -0.0040 +vn -0.1256 0.5449 -0.8290 +vn -0.2383 0.6783 0.6950 +vn -1.0000 -0.0072 0.0023 +vn -0.2660 0.6878 -0.6754 +vn -0.2197 0.8289 0.5144 +vn -0.9997 0.0255 -0.0004 +vn 0.3621 0.9321 -0.0056 +vn -0.3009 0.9536 0.0040 +vn -0.0892 0.9957 -0.0237 +vn -0.0895 0.9960 -0.0043 +vn -0.0768 0.4694 0.8797 +vn -0.1175 0.5551 0.8234 +vn -0.1648 0.8760 -0.4534 +vn -0.1466 0.8650 0.4799 +vn -0.4098 0.9122 -0.0019 +vn 0.6101 0.7924 0.0019 +vn -0.3913 0.9203 0.0011 +vn 0.6319 0.7750 0.0004 +vn 0.0069 0.2009 -0.9796 +vn 0.0006 0.2345 -0.9721 +vn 0.0017 0.0055 -1.0000 +vn 0.0020 0.0054 -1.0000 +vn -0.7914 0.6112 -0.0118 +vn -0.9837 0.1792 0.0118 +vn 0.0038 0.0032 -1.0000 +vn 0.0056 -0.0010 -1.0000 +vn -0.9445 -0.3283 -0.0160 +vn 0.0053 -0.0017 -1.0000 +vn -0.2732 -0.7704 0.5760 +vn -0.2833 -0.5846 0.7603 +vn -0.5620 -0.8270 0.0146 +vn -0.0140 -0.0103 0.9998 +vn -0.6734 -0.5700 0.4708 +vn -0.8046 -0.5938 -0.0063 +vn -0.6302 -0.4894 0.6027 +vn -0.9246 -0.3807 0.0173 +vn -0.0172 -0.0063 0.9998 +vn -0.7646 -0.1729 0.6209 +vn -0.0107 0.0118 0.9999 +vn -0.7988 -0.2009 0.5670 +vn 0.0979 0.9952 -0.0037 +vn -0.9386 -0.1942 0.2852 +vn -0.0896 0.9959 0.0133 +vn -0.7602 0.1098 0.6404 +vn 0.1266 0.5524 0.8239 +vn 0.0100 0.0144 0.9998 +vn -0.8535 0.0786 0.5151 +vn 0.1160 0.7995 0.5894 +vn -0.2925 0.9562 -0.0069 +vn 0.0791 0.3588 0.9301 +vn 0.0061 0.0185 0.9998 +vn 0.0891 0.7522 0.6529 +vn -0.5896 0.8076 0.0137 +vn -0.9145 0.4044 0.0071 +vn -0.2101 0.0280 0.9773 +vn -0.6844 0.7291 -0.0020 +vn -0.6711 0.3602 0.6480 +vn -0.2262 0.7461 0.6262 +vn -0.2641 0.7857 0.5594 +vn 0.0040 0.0177 0.9998 +vn -0.0203 -0.0051 0.9998 +vn -0.2965 0.2315 0.9266 +vn -0.7917 0.5705 0.2187 +vn -0.5349 0.5029 0.6789 +vn -0.0027 0.0183 0.9998 +vn -0.0124 0.0185 0.9998 +vn -0.0099 0.0143 0.9998 +vn -0.0028 0.0261 0.9997 +vn 0.0481 0.8905 -0.4524 +vn -0.9223 0.3861 0.0153 +vn -0.0375 0.8165 0.5762 +vn 0.0254 0.8740 0.4852 +vn -0.1573 0.9872 -0.0268 +vn 0.7874 0.6164 0.0013 +vn 0.0506 0.9987 0.0005 +vn 0.7953 0.6062 0.0006 +vn -0.0791 0.4762 0.8758 +vn 0.0008 0.5757 -0.8177 +vn -0.0785 0.8938 0.4415 +vn -0.7904 0.6125 -0.0046 +vn -0.0571 0.8768 -0.4774 +vn -0.8333 0.5528 -0.0006 +vn 0.0259 0.7626 0.6463 +vn 0.9361 0.3512 0.0200 +vn 0.1614 0.9869 -0.0004 +vn 0.0104 0.9996 -0.0244 +vn 0.6790 -0.7342 0.0002 +vn 0.3208 -0.5281 0.7863 +vn -0.0895 -0.9960 0.0043 +vn -0.5130 -0.8584 -0.0043 +vn -0.6579 -0.7531 0.0043 +vn 0.4002 0.4652 0.7895 +vn 0.9196 0.3929 -0.0043 +vn 0.6142 0.1441 0.7759 +vn 0.9808 0.1949 -0.0002 +vn 0.9196 -0.3929 0.0043 +vn 0.9808 -0.1949 0.0002 +vn -0.9196 -0.3929 -0.0043 +vn -0.5937 -0.1405 0.7923 +vn -0.9808 -0.1949 -0.0002 +vn -0.1418 -0.1949 0.9705 +vn -0.1146 -0.1693 0.9789 +vn -0.3377 -0.4662 0.8177 +vn -0.4845 -0.7487 0.4524 +vn 0.2791 -0.9603 -0.0046 +vn -0.4692 -0.7430 -0.4773 +vn 0.3492 -0.9370 -0.0006 +vn -0.7107 -0.7035 -0.0004 +vn -0.7158 -0.6983 0.0007 +vn -0.2145 -0.4262 0.8789 +vn -0.2309 -0.5174 0.8240 +vn 0.0489 -0.6013 -0.7975 +vn 0.0046 -0.3580 0.9337 +vn 0.0009 -0.5757 0.8177 +vn 0.0481 -0.8905 0.4524 +vn -0.0342 -0.8199 -0.5715 +vn -0.9153 -0.4024 -0.0146 +vn -0.1573 -0.9872 0.0267 +vn 0.0906 -0.6016 0.7936 +vn 0.9869 -0.1610 0.0145 +vn 0.2278 -0.7852 0.5759 +vn 0.1842 -0.8497 0.4941 +vn -0.6102 -0.7922 0.0018 +vn -0.6320 -0.7749 0.0004 +vn 0.4517 0.2310 0.8618 +vn 0.3192 0.2035 0.9256 +vn 0.7822 0.4275 -0.4533 +vn 0.7774 0.4067 0.4798 +vn 0.7410 0.6715 -0.0019 +vn 0.7543 0.6566 0.0011 +vn 0.5107 -0.6360 0.5786 +vn 0.3943 -0.4591 -0.7961 +vn 0.9674 0.2532 -0.0007 +vn 0.5889 -0.6770 0.4415 +vn 0.5343 -0.6922 -0.4851 +vn 0.4526 -0.6831 -0.5732 +vn 0.9997 -0.0233 -0.0006 +vn -0.5282 -0.8491 0.0041 +vn 0.6280 -0.7783 -0.0005 +vn 0.7675 0.2868 0.5734 +vn 0.0906 0.9958 0.0150 +vn 0.8258 0.3509 0.4415 +vn 0.3382 0.9411 -0.0045 +vn 0.8163 0.3253 -0.4773 +vn 0.2684 0.9633 -0.0006 +vn 0.7358 0.2143 0.6424 +vn 0.6094 -0.7926 0.0206 +vn 0.9885 0.1514 -0.0004 +vn 0.9540 0.2989 -0.0244 +vn 0.3227 -0.3169 0.8919 +vn 0.3503 -0.3561 0.8663 +vn 0.4324 -0.4395 0.7874 +vn 0.6255 -0.6159 0.4789 +vn 0.8689 -0.4950 0.0033 +vn 0.8761 -0.4821 0.0011 +vn -0.0561 -0.9984 0.0004 +vn 0.5919 -0.1401 -0.7937 +vn 0.2272 -0.0738 0.9710 +vn 0.1949 -0.0561 0.9792 +vn 0.5478 -0.1771 0.8177 +vn 0.8618 -0.2294 0.4524 +vn 0.8391 -0.2460 -0.4852 +vn 0.7678 -0.2866 -0.5731 +vn 0.8223 0.5691 -0.0006 +vn 0.0943 -0.9954 -0.0148 +vn 0.8902 -0.4547 0.0267 +vn 0.4709 -0.0722 0.8792 +vn 0.5640 -0.0598 0.8236 +vn 0.8680 -0.1279 0.4798 +vn 0.4464 0.6821 0.5792 +vn 0.3168 0.5206 -0.7928 +vn -0.5378 0.8431 -0.0018 +vn -0.2748 0.9615 -0.0012 +vn 0.5103 0.6389 -0.5758 +vn 0.4689 0.5979 0.6500 +vn 0.9693 -0.2460 0.0036 +vn 0.9557 -0.2945 -0.0008 +vn 0.5915 0.8063 0.0067 +vn 0.5703 -0.4360 -0.6962 +vn 0.7202 -0.4651 -0.5147 +vn -0.3187 -0.9479 -0.0025 +vn 0.5710 -0.4655 0.6762 +vn 0.9984 0.0562 0.0056 +vn -0.2861 -0.9582 0.0004 +vn 0.8141 -0.5807 -0.0039 +vn 0.3005 -0.3014 -0.9049 +vn 0.4263 -0.3716 -0.8248 +vn 0.6037 -0.3825 0.6995 +vn 0.8012 0.5984 0.0041 +vn 0.6227 -0.4069 -0.6683 +vn 0.6721 -0.5453 0.5009 +vn 0.8321 0.5547 -0.0003 +vn 0.1467 -0.9892 -0.0009 +vn 0.6574 -0.7531 -0.0237 +vn 0.4692 -0.6019 -0.6462 +vn 0.4618 -0.7693 -0.4414 +vn 0.9634 0.2682 0.0006 +vn 0.5914 -0.8063 -0.0067 +vn 0.2066 -0.6898 -0.6939 +vn 0.3094 -0.7998 -0.5144 +vn -0.7974 -0.6031 -0.0211 +vn 0.2972 -0.7996 0.5219 +vn 0.8411 -0.5409 0.0056 +vn -0.4457 -0.8952 -0.0015 +vn 0.3171 -0.9484 -0.0039 +vn 0.2084 -0.4104 -0.8878 +vn 0.2119 -0.4218 -0.8816 +vn 0.2302 -0.5162 -0.8249 +vn 0.2223 -0.5214 0.8238 +vn 0.9592 -0.2828 -0.0019 +vn 0.3898 -0.7860 -0.4799 +vn 0.9668 -0.2556 -0.0004 +vn 0.0251 -0.7637 -0.6451 +vn -0.0786 -0.8939 -0.4414 +vn -0.0572 -0.8769 0.4772 +vn 0.9265 -0.3757 -0.0191 +vn 0.0105 -0.9996 0.0244 +vn -0.7904 -0.6126 0.0046 +vn 0.1614 -0.9869 0.0004 +vn -0.8332 -0.5530 0.0006 +vn 0.0651 -0.4143 -0.9078 +vn 0.1802 -0.3913 0.9024 +vn 0.1263 -0.5497 -0.8257 +vn 0.2640 -0.6978 -0.6659 +vn 0.1373 -0.7555 0.6406 +vn 0.9985 -0.0548 -0.0094 +vn -0.8268 -0.5622 0.0193 +vn 0.4817 -0.8759 0.0290 +vn 0.0893 -0.9957 -0.0237 +vn -0.0104 -0.2579 0.9661 +vn -0.0690 -0.4594 -0.8855 +vn -0.0546 -0.3965 0.9164 +vn -0.0914 -0.6105 -0.7868 +vn -0.1264 -0.5507 0.8251 +vn 0.6103 -0.7922 -0.0018 +vn -0.1441 -0.8660 -0.4789 +vn 0.6320 -0.7750 -0.0004 +vn -0.4255 -0.9050 -0.0011 +vn -0.4120 -0.9112 -0.0033 +vn -0.2634 -0.6653 -0.6986 +vn -0.2232 -0.8363 -0.5008 +vn -0.9999 0.0108 -0.0036 +vn -0.2650 -0.6930 0.6705 +vn 0.4625 -0.8866 0.0009 +vn -0.9993 -0.0369 0.0004 +vn -0.0892 -0.9957 0.0237 +vn -0.3008 -0.9537 -0.0039 +vn -0.1869 -0.3496 -0.9181 +vn -0.2186 -0.5146 -0.8291 +vn -0.2037 -0.6863 0.6982 +vn 0.8178 -0.5755 0.0030 +vn -0.1890 -0.7130 -0.6752 +vn -0.3095 -0.7998 0.5144 +vn 0.7938 -0.6082 -0.0004 +vn -0.3171 -0.9484 0.0039 +vn -0.1237 -0.1584 -0.9796 +vn -0.3391 -0.4653 -0.8176 +vn -0.5624 -0.6921 -0.4525 +vn -0.5616 -0.6758 0.4773 +vn -0.4430 -0.8965 -0.0007 +vn -0.9995 -0.0311 0.0046 +vn -0.9991 0.0423 0.0006 +vn -0.5909 -0.4076 -0.6961 +vn -0.6651 -0.5415 -0.5143 +vn -0.8030 0.5960 -0.0024 +vn -0.6188 -0.3984 0.6770 +vn -0.2547 -0.9670 0.0056 +vn -0.8222 0.5692 0.0004 +vn -0.8040 -0.5946 -0.0039 +vn -0.1399 -0.1927 -0.9712 +vn -0.2760 -0.2872 0.9172 +vn -0.3384 -0.3350 -0.8793 +vn -0.4210 -0.3797 -0.8237 +vn -0.4217 -0.3668 0.8292 +vn -0.6482 -0.6118 0.4533 +vn -0.8676 -0.4972 0.0019 +vn -0.2393 -0.0886 -0.9669 +vn -0.3395 -0.1054 -0.9347 +vn -0.5479 -0.1771 -0.8176 +vn -0.8618 -0.2294 -0.4524 +vn -0.8391 -0.2459 0.4852 +vn -0.8902 -0.4547 -0.0268 +vn -0.8296 0.5583 0.0013 +vn -0.9655 -0.2605 0.0005 +vn -0.8222 0.5692 0.0006 +vn -0.7620 -0.1126 -0.6378 +vn -0.8515 -0.0350 0.5232 +vn -0.2822 -0.9592 -0.0191 +vn -0.6047 0.7965 -0.0047 +vn -0.9739 0.2244 -0.0337 +vn -0.7324 0.2099 -0.6477 +vn -0.8258 0.3509 -0.4415 +vn -0.8234 0.2943 0.4851 +vn -0.6126 -0.7904 0.0007 +vn -0.9524 0.3047 -0.0067 +vn -0.3430 0.9393 0.0013 +vn -0.9342 0.3567 0.0005 +vn -0.3308 0.9437 0.0006 +vn -0.5807 0.2440 0.7767 +vn -0.9081 0.4188 -0.0002 +vn -0.5759 0.4374 -0.6906 +vn -0.7203 0.4652 -0.5145 +vn 0.2808 0.9595 -0.0207 +vn -0.7104 0.4721 0.5219 +vn -0.9984 -0.0565 0.0056 +vn -0.1655 0.9862 -0.0015 +vn -0.9194 0.3927 0.0237 +vn -0.8140 0.5808 -0.0039 +vn -0.4691 0.5993 -0.6488 +vn -0.9573 -0.2891 0.0008 +vn 0.2746 0.9616 0.0013 +vn 0.2872 0.9579 0.0006 +vn -0.3187 0.5243 0.7896 +vn 0.4973 -0.8115 -0.3068 +vn -0.3302 0.7023 -0.6307 +vn -0.9979 0.0624 -0.0156 +vn 0.4526 0.8917 -0.0077 +vn -0.1252 0.9917 -0.0290 +vn 0.4260 0.6317 -0.6477 +vn 0.5888 0.6770 -0.4416 +vn 0.5343 0.6921 0.4853 +vn -0.5625 0.8268 0.0007 +vn 0.9994 0.0358 0.0013 +vn 0.9997 0.0233 0.0006 +vn 0.3375 0.3430 -0.8766 +vn 0.4325 0.4400 -0.7869 +vn 0.2279 0.1680 0.9591 +vn 0.1085 0.1026 0.9888 +vn 0.4272 0.3725 0.8238 +vn -0.0280 0.9996 -0.0019 +vn 0.6256 0.6159 -0.4789 +vn 0.8762 0.4820 -0.0011 +vn 0.8689 0.4950 -0.0033 +vn 0.6041 0.3834 -0.6986 +vn 0.6721 0.5454 -0.5008 +vn 0.8126 -0.5825 -0.0216 +vn 0.6686 0.5298 0.5219 +vn 0.1469 0.9891 0.0009 +vn 0.9891 -0.1475 -0.0015 +vn 0.8039 0.5947 -0.0039 +vn 0.3576 -0.1734 0.9177 +vn 0.4231 -0.2182 -0.8794 +vn 0.4913 -0.2831 -0.8237 +vn 0.4793 -0.2878 0.8291 +vn 0.7822 -0.4274 0.4534 +vn 0.9324 0.3613 -0.0004 +vn 0.5476 0.1770 -0.8178 +vn 0.8618 0.2294 -0.4524 +vn 0.8391 0.2460 0.4852 +vn 0.8903 0.4547 -0.0267 +vn 0.8296 -0.5583 0.0013 +vn 0.9655 0.2605 0.0005 +vn 0.8224 -0.5689 0.0006 +vn 0.3568 0.1731 -0.9180 +vn 0.4794 0.2878 -0.8291 +vn 0.4414 0.2387 0.8650 +vn 0.5720 0.4656 -0.6753 +vn 0.7111 0.4719 0.5211 +vn -0.2752 0.9613 -0.0101 +vn 0.6842 0.7287 0.0290 +vn 0.4695 0.0719 -0.8800 +vn 0.5643 0.0599 -0.8234 +vn 0.5637 0.0501 0.8245 +vn 0.5651 0.8250 -0.0019 +vn 0.8680 0.1279 -0.4798 +vn 0.7338 -0.2116 -0.6456 +vn 0.8258 -0.3509 -0.4415 +vn 0.8163 -0.3253 0.4773 +vn 0.6367 0.7709 -0.0194 +vn 0.9539 -0.2990 0.0244 +vn 0.3382 -0.9411 0.0045 +vn 0.9885 -0.1514 0.0004 +vn 0.2684 -0.9633 0.0006 +vn 0.7200 -0.0166 -0.6937 +vn 0.8563 0.0472 -0.5143 +vn 0.3064 -0.9519 -0.0032 +vn 0.7429 -0.0367 0.6683 +vn 0.7746 0.6324 0.0056 +vn 0.3469 -0.9379 0.0003 +vn 0.9746 0.2229 0.0237 +vn 1.0000 0.0086 -0.0039 +vn 0.4219 -0.0664 -0.9042 +vn 0.5641 -0.0502 -0.8242 +vn 0.7177 0.0175 0.6961 +vn 0.3006 0.9538 0.0040 +vn 0.7452 0.0355 -0.6659 +vn 0.3511 0.9363 -0.0003 +vn 0.7746 -0.6324 -0.0056 +vn 1.0000 -0.0086 0.0039 +vn 0.9746 -0.2229 -0.0237 +vn -0.3585 -0.1737 -0.9172 +vn -0.4852 -0.2906 -0.8247 +vn -0.5494 -0.4558 0.7003 +vn 0.3238 -0.9461 0.0042 +vn -0.5794 -0.4664 -0.6684 +vn -0.7263 -0.4707 0.5010 +vn 0.2706 -0.9627 -0.0003 +vn -0.9861 0.1660 -0.0009 +vn -0.8140 -0.5808 0.0039 +vn -0.3992 -0.2055 0.8935 +vn -0.4330 -0.2163 0.8750 +vn -0.5520 -0.2755 0.7870 +vn -0.7822 -0.4274 -0.4533 +vn -0.7790 -0.4046 0.4789 +vn -0.7393 -0.6733 0.0033 +vn -0.7292 -0.6843 0.0011 +vn -0.7643 -0.2883 0.5769 +vn -0.0874 -0.9961 0.0151 +vn -0.8258 -0.3508 0.4415 +vn -0.3384 -0.9410 -0.0046 +vn -0.8163 -0.3253 -0.4773 +vn -0.2685 -0.9633 -0.0006 +vn -0.7319 -0.2093 0.6485 +vn -0.6268 0.7789 0.0199 +vn -0.9885 -0.1515 -0.0004 +vn -0.9539 -0.2990 -0.0244 +vn -0.5994 -0.0996 -0.7942 +vn -0.4210 -0.0636 0.9048 +vn -0.6707 -0.0698 0.7384 +vn -0.5650 -0.8251 -0.0018 +vn -0.8177 -0.0267 -0.5750 +vn -0.8650 -0.0873 -0.4941 +vn -0.4595 0.8881 -0.0144 +vn -0.4077 0.0588 -0.9112 +vn -0.6586 0.0675 -0.7495 +vn -0.5709 0.0945 0.8156 +vn -0.8521 0.0355 -0.5221 +vn -0.8524 0.0345 0.5217 +vn -0.6228 -0.7824 0.0065 +vn -0.7746 0.6325 -0.0056 +vn -0.9718 -0.2331 0.0348 +vn 0.1648 0.8759 0.4534 +vn -0.6102 0.7922 -0.0018 +vn 0.3913 0.9202 -0.0011 +vn 0.2378 0.6851 -0.6886 +vn 0.2198 0.8288 -0.5145 +vn 0.9991 0.0361 -0.0204 +vn 0.2295 0.8215 0.5220 +vn 0.8868 0.4622 -0.0015 +vn 0.3009 0.9536 -0.0039 +vn 0.2255 0.4363 0.8711 +vn 0.2619 0.5084 0.8203 +vn 0.3815 0.8056 -0.4534 +vn -0.4015 0.9159 -0.0019 +vn 0.2164 0.9759 -0.0282 +vn 0.9592 0.2826 0.0019 +vn -0.4990 0.0781 0.8631 +vn -0.3752 0.0225 0.9267 +vn -0.8840 0.1139 -0.4535 +vn -0.5651 0.8250 0.0019 +vn -0.5418 0.8405 0.0004 +vn -0.0053 -0.0236 0.9997 +vn -0.2764 -0.9610 -0.0038 +vn -0.0602 -0.9981 0.0148 +vn -0.0074 -0.0110 0.9999 +vn 0.0974 -0.9952 -0.0005 +vn 0.0083 -0.8292 0.5589 +vn 0.0009 -0.0135 0.9999 +vn 0.0590 -0.6376 0.7681 +vn 0.4226 -0.9063 0.0058 +vn 0.4753 0.8796 0.0209 +vn -0.0010 -0.0150 0.9999 +vn 0.7350 -0.6780 0.0054 +vn 0.2086 -0.4380 0.8744 +vn 0.0053 -0.0146 0.9999 +vn 0.0078 0.0144 0.9999 +vn 0.0139 0.0123 0.9998 +vn 0.5032 0.5404 0.6743 +vn 0.7131 0.7009 -0.0144 +vn 0.5076 0.5503 0.6630 +vn 0.5977 -0.6031 0.5282 +vn 0.5765 -0.5672 0.5882 +vn 0.9678 -0.2515 0.0059 +vn 0.9615 -0.2746 0.0016 +vn 0.9652 0.2615 0.0016 +vn 0.7875 0.3339 0.5180 +vn 0.0087 -0.0105 0.9999 +vn 0.0148 -0.0020 0.9999 +vn 0.3026 0.0768 -0.9500 +vn 0.4252 -0.3529 -0.8335 +vn 0.8068 -0.2006 0.5557 +vn 0.6424 0.1315 0.7550 +vn 0.4437 0.0647 0.8939 +vn 0.0094 -0.0069 0.9999 +vn 0.0134 -0.0004 0.9999 +vn 0.3989 -0.1680 0.9015 +vn 0.7928 0.0870 0.6032 +vn 0.0141 -0.0038 0.9999 +vn 0.1901 0.3790 -0.9056 +vn 0.0523 0.1809 0.9821 +vn 0.2210 0.5191 -0.8256 +vn 0.2012 0.7236 -0.6602 +vn -0.7685 0.6398 -0.0089 +vn 0.3410 0.9394 0.0347 +vn 0.5210 0.8536 0.0056 +vn -0.7892 0.2187 0.5739 +vn -0.5931 0.1404 -0.7928 +vn -0.6380 -0.7701 -0.0021 +vn -0.8743 0.2016 0.4415 +vn -0.8391 0.2458 -0.4852 +vn -0.7652 0.2878 -0.5758 +vn -0.8223 -0.5690 -0.0006 +vn -0.7208 0.2594 0.6428 +vn -0.0649 0.9979 0.0040 +vn -0.0088 1.0000 -0.0009 +vn -0.9496 0.3133 0.0067 +vn 0.0038 -0.0030 -1.0000 +vn -0.0005 -0.0104 -0.9999 +vn -0.7854 0.6190 -0.0025 +vn 0.0079 -0.0038 -1.0000 +vn -0.0055 -0.0088 -0.9999 +vn -0.0688 -0.4377 -0.8965 +vn -0.5335 -0.8457 0.0114 +vn 0.0004 -0.0060 -1.0000 +vn 0.0092 -0.0077 -0.9999 +vn -0.0665 0.2026 -0.9770 +vn -0.0656 0.9978 0.0073 +vn -0.0027 0.0052 -1.0000 +vn 0.2556 0.9667 -0.0163 +vn -0.1335 -0.9910 -0.0118 +vn -0.0018 0.0050 -1.0000 +vn -0.0033 -0.0037 -1.0000 +vn 0.3366 -0.9416 0.0118 +vn -0.0034 -0.0035 -1.0000 +vn 0.6976 0.7164 0.0114 +vn -0.0057 -0.0007 -1.0000 +vn -0.0062 0.0029 -1.0000 +vn 0.6976 -0.7164 -0.0114 +vn -0.0069 0.1264 -0.9920 +vn -0.0062 0.0030 -1.0000 +vn 0.9921 -0.1247 0.0094 +vn -0.0193 -0.0249 -0.9995 +vn -0.0067 0.0008 -1.0000 +vn -0.4154 0.2145 -0.8840 +vn -0.4165 0.2153 -0.8833 +vn -0.3286 0.1933 0.9245 +vn -0.4896 0.2824 -0.8249 +vn -0.4864 0.2912 0.8238 +vn -0.7822 0.4275 0.4532 +vn -0.7774 0.4067 -0.4798 +vn -0.9322 -0.3618 -0.0004 +vn -0.3067 0.3017 -0.9027 +vn -0.1775 0.1306 0.9754 +vn -0.2271 0.1887 0.9554 +vn -0.4253 0.3705 -0.8257 +vn -0.6252 0.4128 -0.6624 +vn -0.8437 -0.5367 -0.0091 +vn -0.7880 0.6147 0.0347 +vn -0.6508 0.7592 0.0056 +vn -0.3452 0.3492 0.8712 +vn -0.4029 0.4066 0.8199 +vn -0.9951 -0.0991 -0.0018 +vn -0.6464 0.6194 0.4455 +vn -0.6485 0.5790 0.4941 +vn -0.8612 0.5075 -0.0282 +vn -0.7266 0.6870 0.0010 +vn -0.5108 0.6353 0.5792 +vn -0.3997 0.4647 -0.7901 +vn -0.9678 -0.2518 -0.0026 +vn -0.5888 0.6770 0.4416 +vn -0.9993 0.0360 -0.0013 +vn -0.4480 0.6823 -0.5777 +vn -0.4238 0.6309 0.6499 +vn 0.5368 0.8437 0.0032 +vn 0.5753 0.8179 -0.0008 +vn -0.2329 0.4400 -0.8673 +vn -0.2516 0.4903 -0.8344 +vn -0.1093 0.2919 0.9502 +vn -0.0882 0.1935 0.9771 +vn -0.2224 0.5218 0.8236 +vn -0.2950 0.7764 -0.5569 +vn -0.3504 0.7958 -0.4940 +vn 0.6638 0.7478 -0.0121 +vn -0.4289 0.9034 -0.0010 +vn -0.2165 0.9759 0.0282 +vn 0.1172 0.5529 -0.8250 +vn 0.0800 0.4734 -0.8772 +vn 0.0759 0.4609 -0.8842 +vn 0.0370 0.5149 0.8565 +vn -0.0793 0.3596 -0.9297 +vn -0.1266 0.5523 -0.8240 +vn -0.1163 0.5594 0.8207 +vn -0.2295 0.8215 -0.5220 +vn -0.2291 0.8222 0.5210 +vn -0.8901 0.4556 0.0077 +vn -0.0438 0.7595 0.6490 +vn 0.9068 0.4213 0.0131 +vn -0.3452 0.9385 -0.0002 +vn -0.1166 0.9926 -0.0348 +vn -0.1171 0.5519 0.8257 +vn -0.1648 0.8759 -0.4534 +vn -0.1466 0.8650 0.4798 +vn -0.4097 0.9122 -0.0019 +vn 0.6103 0.7922 0.0018 +vn -0.3914 0.9202 0.0011 +vn 0.6320 0.7750 0.0004 +vn 0.0065 0.0053 -1.0000 +vn 0.0022 0.0069 -1.0000 +vn 0.0035 0.0056 -1.0000 +vn 0.3172 0.3148 -0.8946 +vn -0.0002 0.0079 -1.0000 +vn 0.4149 -0.2121 -0.8848 +vn -0.7915 0.6112 -0.0034 +vn 0.1932 0.0555 -0.9796 +vn 0.0089 0.0029 -1.0000 +vn 0.2245 0.0726 -0.9718 +vn -0.9445 -0.3283 -0.0094 +vn 0.0053 0.0005 -1.0000 +vn -0.9855 -0.1695 0.0029 +vn 0.0058 -0.0063 -1.0000 +vn 0.0054 0.0009 -1.0000 +vn -0.1375 -0.5184 0.8440 +vn -0.5620 -0.8270 0.0120 +vn -0.4983 -0.6022 0.6237 +vn -0.6020 -0.7985 0.0053 +vn -0.5551 -0.7770 0.2969 +vn -0.0207 -0.0041 0.9998 +vn -0.8190 -0.5738 -0.0040 +vn -0.5717 -0.3952 0.7190 +vn -0.9245 -0.3807 0.0173 +vn -0.0207 -0.0035 0.9998 +vn 0.2730 0.9620 -0.0046 +vn -0.0357 0.0190 0.9992 +vn -0.8532 -0.2522 0.4566 +vn -0.7992 -0.2010 0.5665 +vn -0.0360 -0.0254 0.9990 +vn 0.2083 0.5428 0.8136 +vn -0.1123 0.9936 0.0081 +vn -0.0896 0.9960 0.0039 +vn -0.9953 0.0960 -0.0090 +vn -0.0143 0.0069 0.9999 +vn -0.7262 0.0652 0.6844 +vn 0.0851 0.8843 0.4592 +vn 0.0573 0.2696 0.9613 +vn 0.0061 0.0162 0.9999 +vn -0.8632 0.2228 0.4530 +vn -0.0823 0.7310 0.6774 +vn -0.5896 0.8077 0.0070 +vn -0.8968 0.4424 0.0012 +vn -0.5603 0.8283 0.0008 +vn -0.5520 0.3285 0.7664 +vn 0.0709 0.5677 0.8201 +vn -0.2597 0.8804 0.3969 +vn -0.0090 0.0081 0.9999 +vn -0.4148 0.5427 0.7303 +vn -0.0137 0.0120 0.9998 +vn -0.6149 0.6572 0.4359 +vn -0.0532 0.1844 0.9814 +vn -0.5964 0.6348 0.4911 +vn 0.0012 0.0162 0.9999 +vn -0.0048 0.0075 1.0000 +vn 0.0221 0.5852 0.8106 +vn -0.0269 0.7610 -0.6482 +vn 0.0785 0.8938 -0.4414 +vn 0.0557 0.8784 0.4747 +vn -0.9373 0.3479 -0.0202 +vn -0.0104 0.9996 0.0244 +vn 0.7954 0.6061 0.0006 +vn -0.0509 0.6156 -0.7864 +vn -0.1209 0.8036 0.5828 +vn -0.9582 0.2857 0.0174 +vn 0.0388 0.8151 -0.5780 +vn -0.7954 0.6061 -0.0006 +vn 0.9232 0.3839 -0.0154 +vn 0.1573 0.9872 0.0268 +vn -0.0503 -0.6116 0.7895 +vn 0.6579 0.7531 0.0043 +vn 0.9077 0.4197 0.0003 +vn 0.5938 0.1405 0.7923 +vn -0.9077 -0.4196 0.0003 +vn -0.6027 -0.1421 0.7852 +vn -0.9810 -0.1941 -0.0003 +vn 0.5417 -0.8405 -0.0025 +vn -0.4619 -0.7693 0.4415 +vn 0.2745 -0.9616 -0.0013 +vn -0.4932 -0.7220 -0.4853 +vn 0.2872 -0.9579 -0.0006 +vn -0.9670 0.2546 0.0028 +vn -0.2147 -0.4316 0.8761 +vn -0.2112 -0.4204 0.8824 +vn -0.2302 -0.5162 0.8250 +vn -0.3899 -0.7860 0.4798 +vn -0.9593 -0.2822 0.0019 +vn 0.0503 -0.6109 -0.7901 +vn 0.9310 -0.3649 -0.0026 +vn 0.7874 -0.6164 -0.0013 +vn 0.0254 -0.8740 -0.4852 +vn 0.7953 -0.6062 -0.0006 +vn -0.9301 -0.3672 0.0032 +vn 0.0869 -0.5658 0.8200 +vn -0.6320 -0.7750 0.0004 +vn 0.3993 0.2055 0.8935 +vn 0.4331 0.2163 0.8750 +vn 0.5520 0.2755 0.7870 +vn 0.7791 0.4046 0.4789 +vn 0.7393 0.6733 0.0033 +vn 0.9421 -0.3352 0.0019 +vn 0.7292 0.6843 0.0011 +vn 0.9324 -0.3615 0.0004 +vn 0.5107 -0.6359 0.5786 +vn 0.9665 0.2566 -0.0034 +vn 0.5343 -0.6921 -0.4852 +vn 0.9997 -0.0231 -0.0006 +vn 0.4250 -0.6314 0.6486 +vn -0.5319 -0.8468 0.0037 +vn 0.5841 -0.8117 0.0067 +vn 0.7643 0.2884 0.5768 +vn 0.5819 0.2445 -0.7757 +vn 0.0628 0.9980 -0.0040 +vn 0.3430 0.9394 -0.0013 +vn 0.7900 0.2203 -0.5722 +vn 0.3309 0.9437 -0.0006 +vn 0.7319 0.2093 0.6485 +vn 0.6426 -0.7662 0.0029 +vn 0.6094 -0.7929 -0.0007 +vn 0.9524 0.3047 0.0067 +vn 0.4322 -0.4394 0.7875 +vn 0.8689 -0.4951 0.0033 +vn -0.0279 -0.9996 0.0019 +vn 0.8762 -0.4820 0.0011 +vn -0.0558 -0.9984 0.0004 +vn 0.5931 -0.1404 -0.7928 +vn 0.1950 -0.0561 0.9792 +vn 0.5475 -0.1770 0.8179 +vn 0.8296 0.5583 -0.0013 +vn 0.7653 -0.2878 -0.5757 +vn 0.8223 0.5690 -0.0006 +vn 0.0894 -0.9959 -0.0150 +vn 0.8903 -0.4547 0.0267 +vn 0.5641 -0.0598 0.8236 +vn 0.5417 -0.8406 0.0004 +vn 0.1397 0.1930 0.9712 +vn 0.1145 0.1693 0.9789 +vn 0.3376 0.4661 0.8177 +vn 0.4845 0.7487 0.4524 +vn 0.9735 -0.2280 -0.0153 +vn 0.7075 0.7062 0.0267 +vn -0.9810 0.1941 0.0003 +vn 0.5780 -0.4379 -0.6885 +vn 0.7203 -0.4651 -0.5146 +vn -0.2938 -0.9559 -0.0003 +vn 0.5710 -0.4655 0.6763 +vn 0.9984 0.0563 0.0056 +vn 0.8141 -0.5808 -0.0039 +vn 0.3173 -0.3073 -0.8972 +vn 0.4253 -0.3705 -0.8257 +vn 0.6036 -0.3825 0.6995 +vn 0.8017 0.5977 0.0051 +vn 0.6262 -0.4149 -0.6601 +vn 0.6722 -0.5454 0.5008 +vn 0.8413 0.5406 -0.0003 +vn 0.1468 -0.9892 -0.0009 +vn 0.8039 -0.5947 0.0039 +vn 0.4693 -0.6063 -0.6419 +vn 0.4932 -0.7220 0.4852 +vn 0.9524 0.3050 0.0009 +vn 0.5915 -0.8063 -0.0067 +vn -0.2748 -0.9615 0.0013 +vn 0.8409 -0.5412 0.0056 +vn 0.2293 -0.4518 -0.8621 +vn 0.2223 -0.5215 0.8238 +vn 0.3815 -0.8056 0.4533 +vn 0.9592 -0.2827 -0.0019 +vn 0.3899 -0.7860 -0.4798 +vn 0.0273 -0.7605 -0.6488 +vn -0.0785 -0.8939 -0.4414 +vn -0.7954 -0.6061 0.0006 +vn 0.0843 -0.2667 -0.9601 +vn 0.0664 -0.2057 0.9763 +vn 0.1267 -0.5526 -0.8238 +vn 0.2295 -0.8215 -0.5219 +vn 0.8902 -0.4556 0.0077 +vn -0.1263 -0.5496 0.8259 +vn -0.1648 -0.8759 0.4534 +vn -0.2176 -0.8016 -0.5569 +vn -0.9765 -0.2150 -0.0121 +vn 0.0746 0.9486 -0.3074 +vn 0.7706 -0.6371 -0.0156 +vn -0.9983 -0.0584 0.0092 +vn -0.2222 -0.5213 -0.8239 +vn 0.7946 -0.6068 0.0209 +vn -0.2972 -0.7995 -0.5219 +vn 0.4460 -0.8950 0.0015 +vn -0.5343 -0.6922 0.4851 +vn -0.5841 -0.8117 -0.0067 +vn -0.6280 -0.7783 0.0005 +vn -0.9997 -0.0233 0.0006 +vn -0.6651 -0.5415 -0.5142 +vn -0.8194 0.5732 -0.0021 +vn -0.6250 -0.4124 0.6627 +vn -0.8365 0.5480 0.0003 +vn -0.3324 -0.3283 -0.8842 +vn -0.3136 -0.3083 0.8981 +vn -0.4284 -0.3737 0.8227 +vn -0.6483 -0.6118 0.4533 +vn -0.6270 -0.6136 -0.4799 +vn 0.0558 -0.9984 -0.0004 +vn -0.7223 -0.2590 -0.6412 +vn -0.0062 -1.0000 0.0009 +vn -0.9496 -0.3133 -0.0067 +vn -0.8223 0.5690 0.0006 +vn -0.4969 -0.0664 -0.8653 +vn -0.8529 -0.0362 -0.5208 +vn -0.8523 -0.0356 0.5219 +vn -0.7083 0.7058 -0.0077 +vn -0.9818 0.1875 -0.0290 +vn -0.8258 0.3509 -0.4414 +vn -0.6299 -0.7764 -0.0197 +vn -0.3386 0.9409 0.0046 +vn -0.2684 0.9633 0.0006 +vn -0.5503 0.4559 -0.6995 +vn -0.7263 0.4707 -0.5009 +vn 0.3219 0.9468 -0.0038 +vn -0.5772 0.4661 0.6705 +vn -0.9861 -0.1660 0.0009 +vn 0.2739 0.9618 0.0004 +vn -0.6579 0.7531 -0.0043 +vn -0.1136 0.1681 -0.9792 +vn -0.3378 0.4664 -0.8175 +vn -0.4845 0.7487 -0.4525 +vn -0.7075 0.7062 -0.0267 +vn 0.2745 0.9616 0.0013 +vn -0.3214 0.5294 0.7852 +vn -0.2067 0.6899 -0.6938 +vn -0.2972 0.7994 0.5221 +vn -0.8410 0.5410 0.0056 +vn 0.4460 0.8950 -0.0015 +vn -0.5130 0.8580 0.0237 +vn 0.4279 0.6325 -0.6456 +vn 0.5617 0.6758 0.4773 +vn -0.5482 0.8361 -0.0199 +vn 0.5792 0.8148 0.0244 +vn 0.9995 0.0309 0.0045 +vn 0.4495 0.8933 0.0004 +vn 0.9991 -0.0423 0.0006 +vn 0.2760 0.2873 0.9172 +vn 0.3376 0.3341 -0.8800 +vn 0.4214 0.3801 -0.8234 +vn 0.4217 0.3668 0.8292 +vn 0.6482 0.6117 0.4534 +vn -0.0558 0.9984 -0.0004 +vn 0.5922 0.4098 -0.6938 +vn 0.8066 -0.5911 -0.0019 +vn 0.6188 0.3984 0.6770 +vn 0.2548 0.9670 0.0056 +vn 0.8222 -0.5692 0.0004 +vn 0.6574 0.7531 0.0237 +vn 0.4148 -0.2145 -0.8843 +vn 0.3577 -0.1734 0.9176 +vn 0.4149 -0.2146 -0.8842 +vn 0.4896 -0.2823 -0.8250 +vn 0.7822 -0.4275 0.4533 +vn 0.7223 0.2589 -0.6412 +vn 0.0062 1.0000 0.0009 +vn 0.9496 0.3133 -0.0067 +vn 0.8296 -0.5584 0.0013 +vn 0.8223 -0.5691 0.0006 +vn 0.3953 0.2077 -0.8948 +vn 0.4858 0.2909 -0.8243 +vn 0.5494 0.4557 0.7003 +vn -0.3235 0.9462 0.0045 +vn 0.5820 0.4666 -0.6660 +vn 0.7263 0.4707 0.5009 +vn -0.2664 0.9639 -0.0003 +vn 0.9861 -0.1661 -0.0009 +vn 0.8140 0.5808 0.0039 +vn 0.4998 0.0783 -0.8626 +vn 0.3749 0.0225 -0.9268 +vn 0.5636 0.0501 0.8245 +vn 0.5417 0.8405 -0.0004 +vn 0.7324 -0.2099 -0.6477 +vn 0.6299 0.7764 -0.0197 +vn 0.3383 -0.9410 0.0045 +vn 0.2683 -0.9633 0.0006 +vn 0.4968 0.0663 -0.8653 +vn 0.8528 0.0362 -0.5209 +vn 0.7747 0.6324 0.0056 +vn 0.3557 -0.9346 0.0096 +vn 0.9818 -0.1874 -0.0290 +vn 0.2727 -0.0030 -0.9621 +vn 0.1461 -0.0191 -0.9891 +vn 0.5646 -0.0503 -0.8238 +vn 0.3168 0.9482 0.0215 +vn 0.8523 -0.0356 -0.5219 +vn 0.7135 0.7006 0.0015 +vn 0.7747 -0.6324 -0.0056 +vn -0.3899 -0.2065 -0.8974 +vn -0.5760 -0.4374 0.6906 +vn 0.3045 -0.9525 0.0038 +vn -0.7203 -0.4652 0.5145 +vn 0.2544 -0.9671 -0.0003 +vn -0.9984 0.0565 -0.0056 +vn -0.8140 -0.5809 0.0039 +vn -0.9194 -0.3927 -0.0237 +vn -0.4225 -0.2180 0.8797 +vn -0.4935 -0.2841 0.8221 +vn -0.7822 -0.4275 -0.4533 +vn -0.7774 -0.4067 0.4799 +vn -0.7410 -0.6715 -0.0019 +vn -0.7542 -0.6566 0.0011 +vn -0.9322 0.3619 0.0004 +vn -0.7649 -0.2880 0.5761 +vn -0.5817 -0.2445 -0.7758 +vn -0.0578 -0.9983 -0.0036 +vn -0.4284 -0.2224 0.8758 +vn -0.8258 -0.3509 0.4415 +vn -0.3431 -0.9393 -0.0013 +vn -0.8234 -0.2943 -0.4851 +vn -0.7900 -0.2202 -0.5722 +vn -0.7333 -0.2110 0.6464 +vn -0.6423 0.7665 0.0033 +vn -0.6053 0.7960 -0.0008 +vn -0.9524 -0.3047 0.0067 +vn -0.4998 -0.0783 -0.8626 +vn -0.3657 -0.0356 0.9301 +vn -0.3749 -0.0225 -0.9268 +vn -0.5647 -0.0503 0.8238 +vn -0.5651 -0.8250 -0.0019 +vn -0.8679 -0.1279 -0.4799 +vn -0.2727 0.0030 -0.9621 +vn -0.4273 -0.0506 0.9027 +vn -0.1461 0.0191 -0.9891 +vn -0.5647 0.0503 -0.8237 +vn -0.8523 0.0356 -0.5219 +vn -0.7610 0.1029 0.6405 +vn -0.7084 -0.7058 0.0077 +vn -0.2792 0.9600 0.0193 +vn -0.9818 -0.1875 0.0290 +vn -0.6102 0.7922 -0.0019 +vn 0.3985 0.9168 0.0282 +vn -0.0747 -0.9488 -0.3069 +vn 0.2642 0.6964 0.6673 +vn 0.9986 0.0516 0.0095 +vn 0.4816 0.8759 -0.0290 +vn 0.2138 0.4250 0.8796 +vn 0.2312 0.5181 0.8235 +vn 0.3899 0.7860 0.4798 +vn 0.2242 0.9745 0.0011 +vn 0.9668 0.2556 0.0004 +vn -0.6001 0.0998 0.7937 +vn -0.4580 -0.8888 0.0145 +vn -0.8171 0.0260 0.5759 +vn -0.8650 0.0872 0.4941 +vn -0.9950 -0.0957 -0.0282 +vn -0.9917 0.1288 0.0010 +vn -0.0087 -0.0090 0.9999 +vn -0.0811 -0.9967 0.0013 +vn -0.0030 -0.0142 0.9999 +vn -0.0940 -0.6930 0.7148 +vn 0.0034 -0.0150 0.9999 +vn -0.0039 -0.0087 1.0000 +vn -0.0754 -0.2918 0.9535 +vn 0.3849 -0.9229 0.0057 +vn 0.4755 0.8797 0.0046 +vn 0.0099 0.0158 0.9998 +vn 0.4154 0.9094 0.0201 +vn 0.3724 -0.8103 0.4526 +vn 0.7350 -0.6781 0.0054 +vn 0.0024 -0.0095 1.0000 +vn 0.2822 -0.6917 0.6647 +vn 0.5686 0.5342 0.6256 +vn 0.7215 0.6924 -0.0119 +vn 0.1201 -0.2393 0.9635 +vn -0.0030 -0.0196 0.9998 +vn 0.0142 0.0040 0.9999 +vn 0.5187 0.4298 0.7391 +vn 0.4037 -0.4507 0.7962 +vn 0.9417 0.3359 0.0171 +vn 0.0164 0.0019 0.9999 +vn 0.7367 -0.4966 0.4591 +vn 0.9701 0.2427 0.0002 +vn 0.8034 0.2335 0.5478 +vn 0.4277 0.0665 0.9015 +vn 0.5465 0.1011 0.8313 +vn 0.4307 -0.3155 0.8456 +vn 0.8099 -0.1901 0.5549 +vn 0.0156 0.0022 0.9999 +vn 0.0156 0.0063 0.9999 +vn 0.0101 -0.0072 0.9999 +vn 0.6769 0.1131 0.7274 +vn 0.1864 -0.0463 0.9814 +vn 0.0088 -0.0021 1.0000 +vn 0.2223 0.5216 -0.8237 +vn 0.2059 0.6889 0.6950 +vn -0.8021 0.5967 0.0214 +vn 0.3094 0.7997 0.5145 +vn 0.3171 0.9484 0.0039 +vn -0.3419 0.1063 0.9337 +vn -0.8296 -0.5583 -0.0013 +vn -0.8392 0.2459 -0.4851 +vn -0.8223 -0.5691 -0.0006 +vn -0.0895 0.9959 -0.0150 +vn -0.9655 0.2604 -0.0005 +vn -0.8902 0.4547 0.0267 +vn 0.0058 -0.0043 -1.0000 +vn 0.0102 0.0012 -0.9999 +vn -0.5335 0.8458 0.0025 +vn 0.0021 -0.0034 -1.0000 +vn -0.5251 0.8510 0.0034 +vn -0.0005 -0.0058 -1.0000 +vn -0.5335 -0.8458 -0.0025 +vn -0.5251 -0.8510 -0.0034 +vn -0.0008 -0.0058 -1.0000 +vn 0.0001 0.0058 -1.0000 +vn 0.2716 0.9624 -0.0029 +vn -0.0018 -0.0049 -1.0000 +vn -0.0014 0.0051 -1.0000 +vn 0.3459 0.9383 0.0030 +vn -0.0084 -0.0004 -1.0000 +vn 0.2716 -0.9624 0.0029 +vn -0.0019 0.0050 -1.0000 +vn -0.0022 -0.0097 -1.0000 +vn 0.3459 -0.9383 -0.0029 +vn 0.8970 0.4421 -0.0030 +vn -0.0039 -0.0015 -1.0000 +vn 0.9287 0.3707 0.0030 +vn 0.8970 -0.4421 0.0030 +vn -0.3982 0.2046 -0.8942 +vn -0.0039 0.0019 -1.0000 +vn 0.9287 -0.3707 -0.0029 +vn -0.0083 -0.0029 -1.0000 +vn -0.0059 0.0033 -1.0000 +vn -0.2421 0.0896 0.9661 +vn -0.4305 0.2150 -0.8766 +vn -0.3602 0.1745 0.9164 +vn -0.5519 0.2754 -0.7871 +vn -0.4847 0.2904 0.8251 +vn -0.7822 0.4274 0.4533 +vn -0.9422 -0.3351 -0.0019 +vn -0.7791 0.4046 -0.4789 +vn -0.9323 -0.3618 -0.0004 +vn -0.7292 0.6843 -0.0011 +vn -0.7394 0.6733 -0.0033 +vn -0.2754 0.2865 -0.9176 +vn -0.4219 0.3669 -0.8291 +vn -0.5898 0.4058 0.6981 +vn -0.8001 -0.5999 0.0029 +vn -0.6192 0.3992 -0.6762 +vn -0.6651 0.5416 0.5141 +vn -0.8229 -0.5682 -0.0004 +vn -0.2548 0.9670 -0.0056 +vn -0.3389 0.3356 0.8790 +vn -0.4208 0.3794 0.8240 +vn -0.6482 0.6117 -0.4534 +vn -0.6270 0.6137 0.4799 +vn -0.8677 0.4971 -0.0019 +vn -0.8575 0.5145 0.0011 +vn 0.0559 0.9984 0.0004 +vn -0.5103 0.6385 0.5761 +vn -0.9732 -0.2296 0.0153 +vn -0.3441 0.3392 0.8755 +vn -0.9995 0.0310 -0.0046 +vn -0.5616 0.6758 -0.4773 +vn -0.9991 -0.0422 -0.0006 +vn -0.4273 0.6322 0.6463 +vn 0.5509 0.8343 0.0200 +vn -0.4495 0.8933 -0.0004 +vn -0.5792 0.8148 -0.0244 +vn -0.1386 0.1916 -0.9716 +vn -0.2135 0.4244 -0.8800 +vn -0.1469 0.3368 0.9300 +vn -0.2313 0.5183 -0.8233 +vn -0.2222 0.5214 0.8239 +vn -0.3815 0.8055 0.4534 +vn -0.9593 0.2823 -0.0019 +vn 0.0847 0.5448 -0.8343 +vn 0.0503 0.6115 0.7896 +vn 0.8000 0.5996 -0.0213 +vn -0.0704 0.4289 -0.9006 +vn -0.0663 0.2042 0.9767 +vn -0.0729 0.2861 0.9554 +vn -0.1266 0.5519 -0.8242 +vn -0.2640 0.6978 -0.6659 +vn -0.9985 0.0540 -0.0094 +vn -0.2762 0.9605 0.0347 +vn -0.0803 0.9968 0.0056 +vn -0.0740 0.4855 0.8711 +vn -0.0869 0.5660 0.8198 +vn -0.8632 0.5049 -0.0019 +vn -0.1589 0.8811 0.4455 +vn -0.1843 0.8497 0.4940 +vn 0.6103 0.7922 0.0019 +vn 0.0016 0.0059 -1.0000 +vn 0.0029 0.0046 -1.0000 +vn 0.3425 0.3376 -0.8768 +vn 0.0037 0.0041 -1.0000 +vn 0.0031 0.0050 -1.0000 +vn -0.9964 0.0843 -0.0081 +vn -0.9964 -0.0843 0.0081 +vn 0.0061 -0.0033 -1.0000 +vn 0.0042 0.0004 -1.0000 +vn -0.1395 -0.7949 0.5904 +vn -0.5621 -0.8270 0.0067 +vn -0.5488 -0.8359 0.0095 +vn -0.3011 -0.4519 0.8397 +vn -0.5173 -0.5315 0.6707 +vn -0.0117 -0.0081 0.9999 +vn -0.8177 -0.5757 -0.0018 +vn -0.4496 -0.3145 0.8360 +vn -0.0120 -0.0078 0.9999 +vn -0.9245 -0.3806 0.0190 +vn -0.0110 -0.0174 0.9998 +vn -0.6964 -0.1639 0.6987 +vn 0.2971 0.7483 0.5931 +vn -0.8060 -0.2370 0.5424 +vn -0.9731 -0.2303 -0.0033 +vn -0.0213 -0.0021 0.9998 +vn -0.0194 0.0099 0.9998 +vn 0.2978 0.7797 0.5508 +vn -0.0875 0.9962 0.0036 +vn 0.1265 0.5517 0.8244 +vn 0.0103 0.0158 0.9998 +vn -0.7291 0.0656 0.6813 +vn -0.8441 0.1890 0.5019 +vn -0.0072 0.5932 0.8050 +vn 0.0711 0.4313 0.8994 +vn -0.0183 0.0053 0.9998 +vn 0.0029 0.0204 0.9998 +vn -0.5951 0.3467 0.7251 +vn -0.2400 0.9028 0.3569 +vn -0.0204 0.0190 0.9996 +vn -0.0033 0.0195 0.9998 +vn -0.4148 0.5428 0.7303 +vn -0.6491 0.4450 0.6170 +vn 0.0028 0.2197 0.9756 +vn -0.0326 0.1985 0.9796 +vn -0.0057 0.0084 0.9999 +vn -0.0034 0.0106 0.9999 +vn -0.0273 0.7605 -0.6487 +vn -0.9310 0.3651 -0.0026 +vn -0.0398 0.8142 0.5793 +vn 0.0254 0.8740 0.4853 +vn -0.9444 0.3288 0.0008 +vn -0.0045 1.0000 -0.0067 +vn 0.7953 0.6063 0.0006 +vn -0.0503 0.6109 -0.7901 +vn -0.0785 0.8938 0.4414 +vn -0.7874 0.6164 -0.0013 +vn -0.7953 0.6063 -0.0006 +vn 0.0280 0.7595 0.6499 +vn 0.9302 0.3670 0.0032 +vn 0.9462 0.3235 -0.0008 +vn 0.0045 1.0000 0.0067 +vn -0.9946 0.0054 0.1035 +vn -0.9947 -0.0113 0.1027 +vn -0.0003 -0.0082 1.0000 +vn -0.0001 0.0054 1.0000 +vn 0.9945 -0.0083 0.1044 +vn -0.0001 0.0107 -0.9999 +vn 0.9946 0.0107 0.1034 +vn 0.0002 -0.0113 -0.9999 +vn -0.9974 0.0002 0.0718 +vn 0.2588 0.0000 -0.9659 +vn 1.0000 0.0000 0.0026 +vn 1.0000 0.0001 0.0000 +vn -1.0000 -0.0002 0.0052 +vn 0.9839 -0.0005 -0.1790 +vn 0.9659 -0.0000 -0.2588 +vn -0.7491 0.0001 0.6625 +vn 0.7071 0.0000 -0.7071 +vn -0.5775 -0.0008 0.8164 +vn -0.2448 0.0001 0.9696 +vn -0.0913 0.0000 0.9958 +vn -0.7071 -0.0002 -0.7071 +vn -0.7240 -0.0000 -0.6898 +vn 0.7655 -0.0002 0.6434 +vn 0.7312 0.0000 0.6822 +vn 0.2588 0.0000 0.9659 +vn -0.2588 0.0000 -0.9659 +vn 0.0000 -0.0161 0.9999 +vn -0.0001 -0.0120 0.9999 +vn -0.9940 -0.0004 -0.1098 +vn -0.9659 0.0003 -0.2588 +vn 1.0000 -0.0003 0.0064 +vn 0.9972 0.0001 0.0754 +vn 0.5043 0.8628 -0.0344 +vn 0.4934 0.8697 0.0118 +vn -0.9662 -0.2578 -0.0061 +vn -0.9761 -0.2167 0.0181 +vn -0.2555 0.9668 0.0062 +vn -0.2964 0.9549 -0.0177 +vn -0.8658 0.5003 0.0055 +vn -0.8660 0.5001 -0.0030 +vn -0.5231 0.8522 0.0149 +vn -0.6250 -0.7792 0.0464 +vn 0.8597 -0.5107 -0.0118 +vn 0.0159 -0.9998 0.0117 +vn 0.8614 -0.5080 0.0000 +vn 0.0126 -0.9999 0.0000 +vn 0.7797 -0.6261 0.0000 +vn 0.2341 -0.9722 0.0000 +vn 0.5621 -0.8271 0.0000 +vn -0.1426 0.9870 -0.0738 +vn -0.4247 0.9046 0.0367 +vn -0.4148 0.9099 0.0000 +vn -0.7243 0.6895 0.0000 +vn -0.8696 0.4936 0.0118 +vn -0.8687 0.4953 0.0000 +vn -0.9689 -0.2475 0.0063 +vn -0.9628 -0.2700 -0.0063 +vn -0.4972 -0.8676 0.0118 +vn 0.2701 -0.9628 -0.0062 +vn -0.5028 -0.8643 -0.0118 +vn 0.2476 -0.9689 0.0062 +vn -0.0203 0.9921 0.1240 +vn 0.0057 0.9994 -0.0342 +vn -0.0040 0.9999 0.0118 +vn 0.6250 0.7792 0.0464 +vn -0.6999 0.7142 0.0062 +vn -0.0024 0.9994 -0.0351 +vn 0.7773 0.6274 -0.0464 +vn -0.7164 0.6977 -0.0062 +vn 0.6250 0.7792 0.0465 +vn -0.9999 0.0074 -0.0118 +vn -0.9994 -0.0054 0.0346 +vn 0.9994 0.0054 0.0346 +vn 0.9999 -0.0074 -0.0118 +vn 0.6999 -0.7142 0.0062 +vn -0.7773 -0.6274 -0.0464 +vn -0.7332 0.6792 0.0321 +vn 0.7163 -0.6978 -0.0062 +vn 0.7164 -0.6977 -0.0062 +vn 0.4930 0.8700 0.0062 +vn -0.7245 0.6892 0.0000 +vn 0.1636 0.9865 0.0000 +vn -0.3088 0.9511 0.0000 +vn 0.0040 -0.9999 0.0118 +vn 0.1659 0.9861 -0.0050 +vn 0.0023 -0.9994 -0.0351 +vn 0.0470 -0.7093 0.7034 +vn -0.0083 -1.0000 0.0006 +vn -0.0036 -1.0000 -0.0047 +vn 0.0000 0.2588 0.9659 +vn 0.5080 0.8607 -0.0339 +vn -0.9331 0.3597 0.0000 +vn -0.3606 0.9316 0.0463 +vn -0.1534 0.9871 -0.0463 +vn -0.8643 0.5030 0.0000 +vn -0.8607 0.5079 -0.0339 +vn 0.5598 -0.8286 -0.0070 +vn 0.5587 -0.8294 0.0080 +vn -0.5457 0.8376 -0.0265 +vn -0.3468 0.9379 0.0000 +vn 0.8241 -0.5665 -0.0016 +vn 0.9620 -0.2730 0.0063 +vn 0.8245 -0.5659 0.0000 +vn -0.4051 -0.9136 0.0362 +vn 0.9928 -0.1195 0.0000 +vn -0.4131 -0.9107 0.0000 +vn 0.9250 0.3788 0.0285 +vn 0.9299 0.3679 0.0000 +vn 0.5038 -0.8637 0.0118 +vn -0.7370 -0.6759 0.0000 +vn -0.8548 -0.5180 0.0322 +vn 0.5796 0.8149 0.0000 +vn 0.4925 -0.8696 -0.0344 +vn -0.8630 -0.5052 0.0000 +vn 0.5891 0.8076 -0.0285 +vn -0.1564 -0.9866 0.0463 +vn -0.3635 -0.9304 -0.0463 +vn -0.0078 0.9996 -0.0263 +vn 0.4898 0.8714 0.0266 +vn -0.5508 0.8347 -0.0000 +vn -0.0583 0.9980 0.0263 +vn 0.1273 0.9919 -0.0000 +vn -0.7163 0.6978 -0.0062 +vn -0.0240 -0.9991 -0.0353 +vn -0.0234 -0.9992 -0.0321 +vn -0.6251 -0.7792 0.0464 +vn 0.4914 0.8703 0.0339 +vn 0.9951 0.0988 0.0000 +vn 0.9589 -0.2836 0.0000 +vn 0.9925 0.1127 0.0471 +vn 0.5053 -0.8623 0.0339 +vn 0.4888 -0.8717 -0.0339 +vn 0.8743 -0.4844 0.0330 +vn 0.8692 -0.4944 0.0000 +vn 0.9315 0.3607 0.0463 +vn 0.8774 0.4774 -0.0473 +vn -0.8780 0.4784 -0.0150 +vn 0.9871 0.1534 -0.0463 +vn 0.8770 0.4794 -0.0327 +vn 0.9305 -0.3635 -0.0463 +vn 0.9866 -0.1564 0.0463 +vn 0.8658 -0.4992 0.0350 +vn 0.8655 -0.5007 -0.0118 +vn -0.0011 -0.0001 1.0000 +vn -0.0006 -0.0002 1.0000 +vn -0.0002 -0.0002 1.0000 +vn -0.0001 -0.0002 1.0000 +vn -0.8639 -0.5026 0.0343 +vn -0.9976 0.0697 0.0000 +vn -0.9586 -0.2849 0.0000 +vn -0.8664 -0.4993 -0.0000 +vn 0.0000 -0.7071 0.7071 +vn 0.0001 0.0006 -1.0000 +vn -0.2588 0.0000 0.9659 +vn 0.0117 -0.9996 0.0266 +vn 0.0544 -0.9982 -0.0266 +vn -0.9851 0.1720 0.0000 +vn -0.9487 -0.3161 0.0000 +vn -0.6930 -0.7209 0.0000 +vn -0.5010 -0.8654 -0.0079 +vn -0.8811 0.4729 0.0000 +vn -0.5016 -0.8651 0.0000 +vn -0.9822 0.1852 -0.0320 +vn 0.0006 1.0000 -0.0000 +vn -0.5175 0.8557 0.0000 +vn -0.0630 0.9980 0.0000 +vn -0.1943 0.9810 0.0000 +vn 0.4074 0.9132 0.0000 +vn -0.6281 0.7781 0.0000 +vn 0.7839 0.6208 0.0000 +vn -0.9340 0.3573 0.0000 +vn 0.7855 0.6188 -0.0059 +vn -0.9891 -0.1470 0.0000 +vn -0.7894 -0.6138 -0.0062 +vn -0.9341 -0.3571 0.0000 +vn -0.7882 -0.6154 0.0000 +vn 0.4131 0.9107 -0.0000 +vn 0.4052 0.9135 0.0362 +vn 0.7370 0.6759 0.0000 +vn 0.8627 0.5055 0.0118 +vn -0.5587 0.8294 0.0080 +vn 0.8640 0.5035 -0.0000 +vn 0.2505 0.9681 -0.0062 +vn -0.5598 0.8286 -0.0070 +vn 0.2730 0.9620 0.0062 +vn -0.8244 0.5659 0.0000 +vn -0.8240 0.5666 -0.0016 +vn -0.9534 0.3016 -0.0000 +vn -0.6613 -0.7501 0.0000 +vn -0.9535 0.3015 -0.0016 +vn -0.9373 -0.3486 0.0000 +vn -0.9412 -0.3365 -0.0306 +vn -0.9778 0.2074 0.0306 +vn -0.9995 -0.0315 -0.0033 +vn -0.9995 -0.0330 0.0000 +vn -0.9756 0.2194 0.0000 +vn -0.8750 -0.4842 0.0000 +vn -0.7427 0.6696 0.0000 +vn -0.5307 -0.8476 0.0000 +vn -0.5199 -0.8537 0.0307 +vn -0.3647 0.9311 0.0000 +vn -0.3630 0.9318 -0.0044 +vn -0.4087 -0.9123 0.0269 +vn 0.4033 -0.9147 -0.0269 +vn 0.0069 -0.9995 -0.0307 +vn 0.0197 -0.9998 0.0000 +vn -0.8595 0.5078 -0.0584 +vn -0.4840 -0.8749 -0.0182 +vn 0.4788 -0.8777 0.0182 +vn 0.4899 -0.8718 0.0000 +vn -0.7262 0.6840 0.0690 +vn -0.9544 -0.2979 0.0183 +vn -0.0006 0.9999 -0.0139 +vn -0.0018 0.9992 -0.0405 +vn -0.9545 -0.2979 0.0173 +vn 0.8385 -0.5449 0.0000 +vn 0.9519 -0.3060 -0.0171 +vn 0.9523 -0.3052 0.0000 +vn 0.9991 0.0384 -0.0170 +vn 0.9564 0.2922 0.0000 +vn 0.4892 0.8720 -0.0184 +vn 0.4137 0.9100 0.0271 +vn -0.0373 0.9988 -0.0308 +vn 0.8641 -0.5031 0.0175 +vn 0.9557 0.2938 0.0172 +vn 0.9988 0.0496 0.0000 +vn -0.4013 0.9155 -0.0271 +vn -0.0502 0.9987 0.0000 +vn 0.8644 -0.5025 0.0204 +vn -0.4773 0.8785 0.0184 +vn -0.5164 0.8564 0.0000 +vn -0.8549 0.5189 0.0000 +vn -0.9519 0.3060 -0.0172 +vn -0.9524 0.3047 0.0000 +vn -0.9661 0.2582 0.0059 +vn 0.9996 -0.0009 -0.0265 +vn 1.0000 0.0098 0.0000 +vn -0.0039 -0.9988 0.0494 +vn 0.8894 0.4571 0.0000 +vn 0.7388 -0.6730 0.0371 +vn 0.6835 -0.7298 -0.0163 +vn -0.0011 -1.0000 0.0004 +vn 0.6785 0.7346 0.0000 +vn 0.9417 0.3349 -0.0327 +vn 0.3348 0.9423 0.0038 +vn 0.7649 0.6439 0.0171 +vn 0.9405 0.3398 0.0025 +vn 0.3358 0.9419 -0.0000 +vn 0.7821 0.6232 -0.0008 +vn 0.0023 0.9985 0.0544 +vn 0.8527 0.5225 0.0000 +vn 0.4911 0.8711 0.0042 +vn 0.4925 0.8703 0.0000 +vn -0.8679 -0.4966 -0.0118 +vn -0.9620 0.2730 0.0062 +vn -0.9681 0.2505 -0.0062 +vn -0.5038 0.8637 0.0118 +vn 0.0000 -1.0000 0.0063 +vn 0.7095 0.0000 0.7047 +vn -0.7071 0.0000 0.7071 +vn -0.4925 0.8696 -0.0344 +vn -0.0001 -1.0000 0.0039 +vn -0.7092 -0.0440 0.7037 +vn 0.7066 -0.0369 0.7066 +vn -1.0000 0.0078 0.0004 +vn 0.0000 0.9989 0.0461 +vn 0.8672 0.4977 0.0172 +vn 0.1805 0.9824 0.0490 +vn 0.0000 -0.2588 -0.9659 +vn -0.0001 -0.9830 -0.1838 +vn 1.0000 0.0043 -0.0060 +vn 0.9999 0.0104 0.0007 +vn -0.0002 0.9976 0.0687 +vn 0.3746 0.9259 -0.0490 +vn -0.0103 0.9999 0.0118 +vn 0.0000 -0.9807 -0.1955 +vn 0.0000 -0.7071 -0.7071 +vn -1.0000 0.0037 -0.0044 +vn 0.2164 0.9763 0.0000 +vn -0.0084 1.0000 0.0000 +vn 0.0000 0.7287 0.6849 +vn 0.9681 -0.2506 -0.0062 +vn 0.5807 0.8141 0.0000 +vn 0.0002 0.7548 0.6559 +vn 0.8591 0.5101 0.0403 +vn 0.5876 0.8082 -0.0391 +vn 0.8641 0.5032 -0.0118 +vn 0.1564 0.9866 0.0463 +vn 0.3635 0.9304 -0.0463 +vn 0.9330 -0.3598 0.0000 +vn 0.8634 0.5033 0.0342 +vn 0.9976 -0.0698 0.0000 +vn 0.8663 0.4996 0.0000 +vn 0.9586 0.2849 0.0000 +vn -0.0001 -0.0000 -1.0000 +vn -0.0032 0.0024 1.0000 +vn 0.8670 0.4982 0.0118 +vn 0.8674 0.4964 -0.0350 +vn -0.5001 0.8659 0.0118 +vn -0.9745 0.2237 -0.0177 +vn -0.4945 0.8691 -0.0118 +vn -0.9642 0.2651 0.0062 +vn 0.9304 -0.3635 -0.0463 +vn 0.5017 -0.8644 0.0344 +vn 0.4908 -0.8712 -0.0118 +vn -0.2730 -0.9620 0.0062 +vn -0.2505 -0.9681 -0.0062 +vn -0.8673 -0.4977 0.0118 +vn -0.8677 -0.4969 -0.0118 +vn 0.6648 -0.7354 0.1312 +vn 0.6536 0.7539 -0.0664 +vn 0.7539 0.6536 0.0664 +vn 0.1348 0.9872 -0.0850 +vn -0.1348 0.9872 0.0850 +vn -0.7539 0.6536 -0.0664 +vn -0.6536 0.7539 0.0664 +vn -0.0011 -0.0013 1.0000 +vn -0.0018 0.0003 1.0000 +vn -0.9928 0.1196 0.0000 +vn -0.9299 -0.3677 0.0000 +vn -0.9251 -0.3787 0.0285 +vn 0.5457 -0.8376 -0.0265 +vn 0.5508 -0.8347 0.0000 +vn 0.3468 -0.9379 0.0000 +vn -0.5890 -0.8076 -0.0285 +vn -0.5796 -0.8149 0.0000 +vn -0.1273 -0.9919 0.0000 +vn 0.0583 -0.9980 0.0263 +vn -0.9812 0.1931 0.0033 +vn -0.9810 0.1940 0.0000 +vn 0.0078 -0.9996 -0.0263 +vn 0.9543 0.2990 -0.0000 +vn 0.9542 0.2990 -0.0006 +vn -0.9822 -0.1878 0.0000 +vn -0.2376 -0.9714 0.0000 +vn 0.9369 -0.3496 0.0000 +vn 0.9938 0.1113 -0.0000 +vn -0.9824 -0.1867 -0.0039 +vn 0.6686 -0.7436 0.0000 +vn -0.4930 -0.8700 0.0062 +vn -0.4898 -0.8714 0.0265 +vn -0.9552 -0.2945 -0.0298 +vn -0.0117 0.9996 0.0266 +vn -0.0544 0.9982 -0.0266 +vn -0.0039 -1.0000 0.0000 +vn 0.2314 -0.9729 0.0000 +vn -0.7163 0.6977 -0.0062 +vn 0.0587 -0.9983 0.0000 +vn -0.9560 -0.2931 0.0153 +vn -0.1659 -0.9861 -0.0050 +vn -0.1637 -0.9865 0.0000 +vn -0.4113 -0.9115 0.0000 +vn -0.7855 -0.6188 -0.0000 +vn 0.3088 -0.9511 0.0000 +vn -0.0023 0.9994 -0.0351 +vn -0.7874 -0.6164 -0.0067 +vn 0.5016 0.8651 0.0000 +vn 0.5010 0.8654 -0.0079 +vn 0.7332 -0.6792 0.0321 +vn 0.7245 -0.6892 0.0000 +vn 0.6930 0.7209 0.0000 +vn 0.9851 -0.1720 0.0000 +vn 0.9487 0.3161 0.0000 +vn 0.9822 -0.1852 -0.0321 +vn -0.7797 0.6262 -0.0000 +vn -0.5619 0.8272 -0.0000 +vn -0.2342 0.9722 0.0000 +vn -0.0109 0.9999 0.0118 +vn -0.0089 1.0000 0.0000 +vn 0.8676 0.4972 -0.0027 +vn -0.7316 -0.6785 -0.0665 +vn -0.8661 -0.4966 0.0569 +vn -0.9951 -0.0986 0.0000 +vn 0.8650 -0.5018 0.0000 +vn 0.8683 -0.4948 0.0344 +vn -0.9590 0.2835 0.0000 +vn -0.9925 -0.1126 0.0474 +vn 0.8625 -0.5049 -0.0344 +vn 0.8670 -0.4982 0.0000 +vn -0.9634 0.2675 -0.0156 +vn 0.3607 -0.9315 0.0463 +vn -0.8697 0.4925 0.0341 +vn -0.4914 -0.8703 0.0339 +vn 0.1534 -0.9871 -0.0463 +vn -0.9977 -0.0678 -0.0055 +vn -0.8802 -0.4723 -0.0462 +vn -0.5080 -0.8607 -0.0339 +vn 0.8662 -0.4995 0.0118 +vn -0.9975 -0.0703 0.0000 +vn -0.8785 -0.4776 -0.0118 +vn 0.8657 -0.5004 -0.0118 +vn 0.9755 -0.2195 -0.0167 +vn 0.9689 0.2475 0.0063 +vn -0.8525 -0.5227 0.0000 +vn -0.9316 -0.3606 0.0463 +vn 0.9662 -0.2575 0.0061 +vn 0.9628 0.2700 -0.0062 +vn 0.2700 -0.9628 -0.0063 +vn -0.9871 -0.1535 -0.0463 +vn 0.9976 0.0693 0.0000 +vn -0.8667 -0.4976 0.0350 +vn 0.4972 0.8676 0.0118 +vn 0.2475 -0.9689 0.0062 +vn -0.5006 -0.8657 0.0000 +vn 0.9976 0.0686 -0.0015 +vn 0.5028 0.8643 -0.0118 +vn -0.4934 -0.8697 0.0118 +vn -0.4893 -0.8716 0.0308 +vn 0.8587 -0.5125 0.0000 +vn 0.9559 -0.2935 0.0000 +vn -0.2475 0.9689 0.0062 +vn -0.5043 -0.8628 -0.0344 +vn -0.8635 0.5043 -0.0000 +vn 0.4958 0.8679 0.0309 +vn 0.0576 -0.9983 0.0000 +vn 0.5227 -0.8525 0.0000 +vn 0.9561 -0.2929 -0.0064 +vn -0.2700 0.9628 -0.0062 +vn -0.9315 -0.3607 0.0463 +vn -0.8626 0.5058 -0.0118 +vn 0.8564 0.5163 0.0000 +vn 0.5070 0.8619 0.0000 +vn 0.0448 -0.9985 -0.0308 +vn -0.9871 -0.1534 -0.0463 +vn 0.9981 0.0621 0.0000 +vn -0.8659 0.4990 0.0350 +vn 0.9981 0.0615 -0.0015 +vn 0.5270 -0.8499 0.0000 +vn -0.8654 0.5009 -0.0118 +vn 0.8705 -0.4922 0.0000 +vn 0.9534 -0.3018 0.0000 +vn 0.9534 -0.3016 -0.0064 +vn -0.1352 0.9900 0.0400 +vn -0.1895 0.9819 0.0000 +vn 0.9693 0.2080 0.1312 +vn 0.9693 -0.2080 -0.1312 +vn -0.7555 0.6551 0.0000 +vn 0.7410 0.6698 0.0471 +vn 0.6698 0.7410 -0.0471 +vn -0.7898 0.6121 -0.0400 +vn 0.3045 -0.9434 -0.1312 +vn 0.7530 0.6529 -0.0814 +vn 0.3060 0.9480 0.0880 +vn -0.9767 -0.2096 0.0471 +vn -0.3045 -0.9434 0.1312 +vn -0.6698 0.7410 0.0471 +vn 0.1351 0.9900 -0.0400 +vn -0.2096 0.9767 0.0471 +vn -0.9506 -0.3068 -0.0471 +vn 0.9819 -0.1895 0.0000 +vn 0.9900 -0.1352 -0.0400 +vn -0.6648 -0.7354 -0.1312 +vn -0.9693 -0.2080 0.1312 +vn -0.1891 0.9797 0.0663 +vn -0.3069 -0.9506 0.0471 +vn 0.6551 -0.7556 0.0000 +vn 0.6121 -0.7898 0.0400 +vn -0.9872 0.1348 -0.0850 +vn -0.2096 -0.9767 -0.0471 +vn -0.9223 0.3769 0.0850 +vn -0.7876 0.6103 -0.0850 +vn -0.9430 -0.3261 -0.0664 +vn 0.9900 -0.1351 -0.0400 +vn -0.3068 -0.9506 0.0471 +vn 0.6120 -0.7898 0.0400 +vn -0.0008 -0.0025 1.0000 +vn 0.9872 0.1348 0.0850 +vn -0.8689 -0.4949 0.0054 +vn 0.6529 0.7530 0.0814 +vn 0.9900 0.1351 0.0400 +vn 0.9480 0.3060 -0.0880 +vn 0.2080 0.9693 -0.1312 +vn 0.7898 -0.6121 -0.0400 +vn 0.6680 -0.7390 0.0880 +vn 0.1889 -0.9786 -0.0814 +vn -0.7410 0.6698 -0.0471 +vn -0.6103 -0.7876 -0.0850 +vn -0.9797 -0.1891 0.0663 +vn -0.8686 -0.4955 -0.0000 +vn 0.0171 0.9992 -0.0365 +vn 0.0166 0.9993 -0.0329 +vn 0.7244 -0.6894 0.0000 +vn -0.8025 -0.5967 -0.0000 +vn 0.6251 0.7792 0.0464 +vn 0.4147 -0.9099 -0.0000 +vn 0.4004 -0.9150 -0.0496 +vn -0.5760 -0.8175 0.0000 +vn -0.2163 -0.9763 0.0000 +vn 0.0087 -0.9999 0.0118 +vn 0.7163 -0.6977 -0.0062 +vn 0.0164 -0.9985 0.0523 +vn 0.0072 -1.0000 0.0000 +vn 0.0073 -0.9993 -0.0357 +vn -0.1891 -0.9797 -0.0663 +vn -0.3261 -0.9430 0.0663 +vn 0.3769 -0.9223 -0.0850 +vn -0.1891 0.9797 0.0664 +vn -0.9434 0.3045 0.1312 +vn -0.7876 -0.6103 0.0850 +vn -0.9434 -0.3045 -0.1312 +vn 1.0000 -0.0086 -0.0027 +vn 1.0000 -0.0096 0.0000 +vn -0.9999 -0.0102 0.0000 +vn -0.9998 -0.0152 0.0141 +vn 0.0003 -1.0000 0.0072 +vn 0.0000 -1.0000 -0.0093 +s off +f 2/1/1 3/2/1 4/3/1 +f 1/4/2 3/2/2 6/5/2 +f 5/6/3 1/4/3 7/7/3 +f 7/7/4 1/4/4 6/5/4 +f 8/8/2 151/9/2 9/10/2 +f 9/10/2 151/9/2 5/6/2 +f 9/10/2 5/6/2 7/7/2 +f 2/1/5 10/11/5 3/2/5 +f 8/8/6 9/10/6 11/12/6 +f 12/13/2 3/2/2 10/11/2 +f 11/12/7 9/10/7 13/14/7 +f 14/15/8 8/8/8 11/12/8 +f 12/13/2 6/5/2 3/2/2 +f 14/15/2 11/12/2 13/14/2 +f 15/16/2 9/10/2 7/7/2 +f 7/7/9 6/5/9 15/16/9 +f 15/16/10 13/14/10 9/10/10 +f 15/16/11 6/5/11 13/14/11 +f 14/15/2 13/14/2 12/13/2 +f 13/14/2 6/5/2 12/13/2 +f 16/17/2 17/18/2 18/19/2 +f 17/18/2 19/20/2 18/19/2 +f 17/18/12 20/21/12 19/20/12 +f 16/17/13 21/22/13 17/18/13 +f 17/18/14 21/22/14 20/21/14 +f 20/21/2 21/22/2 142/23/2 +f 142/23/2 23/24/2 22/25/2 +f 23/24/2 142/23/2 21/22/2 +f 23/24/15 24/26/15 22/25/15 +f 43/27/2 23/24/2 21/22/2 +f 25/28/16 24/26/16 23/24/16 +f 27/29/17 10/11/17 2/1/17 +f 25/28/2 26/30/2 24/26/2 +f 25/28/2 28/31/2 26/30/2 +f 29/32/2 26/30/2 27/29/2 +f 12/13/2 10/11/2 30/33/2 +f 25/28/18 23/24/18 31/34/18 +f 26/30/19 28/31/19 32/35/19 +f 27/29/20 26/30/20 10/11/20 +f 32/35/21 28/31/21 34/36/21 +f 10/11/22 26/30/22 32/35/22 +f 35/37/2 28/31/2 25/28/2 +f 10/11/2 32/35/2 34/36/2 +f 35/37/2 33/38/2 28/31/2 +f 30/33/2 10/11/2 34/36/2 +f 33/38/23 34/36/23 28/31/23 +f 33/38/24 30/33/24 34/36/24 +f 36/39/25 12/13/25 30/33/25 +f 36/39/26 30/33/26 33/38/26 +f 37/40/27 12/13/27 36/39/27 +f 33/38/2 35/37/2 36/39/2 +f 37/40/28 38/41/28 12/13/28 +f 36/39/2 35/37/2 37/40/2 +f 14/15/8 39/42/8 8/8/8 +f 14/15/2 12/13/2 38/41/2 +f 8/8/2 39/42/2 40/43/2 +f 25/28/29 31/34/29 35/37/29 +f 16/17/30 43/27/30 21/22/30 +f 16/17/2 18/19/2 41/44/2 +f 38/41/31 39/42/31 14/15/31 +f 35/37/32 31/34/32 44/45/32 +f 45/46/2 37/40/2 35/37/2 +f 41/44/33 43/27/33 16/17/33 +f 31/34/2 23/24/2 44/45/2 +f 40/43/34 46/47/34 110/48/34 +f 37/40/35 39/42/35 38/41/35 +f 35/37/36 44/45/36 45/46/36 +f 44/45/2 23/24/2 43/27/2 +f 47/49/2 110/48/2 46/47/2 +f 45/46/2 39/42/2 37/40/2 +f 48/50/2 40/43/2 39/42/2 +f 48/50/37 46/47/37 40/43/37 +f 48/50/2 39/42/2 45/46/2 +f 48/50/38 49/51/38 46/47/38 +f 44/45/2 43/27/2 49/51/2 +f 46/47/2 49/51/2 47/49/2 +f 47/49/2 49/51/2 43/27/2 +f 48/50/39 45/46/39 49/51/39 +f 49/51/40 45/46/40 44/45/40 +f 41/44/2 18/19/2 42/52/2 +f 50/53/41 42/52/41 18/19/41 +f 52/54/41 42/52/41 50/53/41 +f 52/54/2 50/53/2 51/55/2 +f 55/56/42 51/55/42 56/57/42 +f 50/53/2 56/57/2 51/55/2 +f 42/52/43 52/54/43 51/55/43 +f 55/56/44 56/57/44 57/58/44 +f 58/59/45 50/53/45 18/19/45 +f 42/52/46 51/55/46 55/56/46 +f 53/60/2 42/52/2 59/61/2 +f 50/53/2 60/62/2 56/57/2 +f 18/19/2 19/20/2 58/59/2 +f 60/62/47 50/53/47 58/59/47 +f 59/61/2 42/52/2 55/56/2 +f 53/60/48 59/61/48 54/63/48 +f 61/64/2 96/65/2 54/63/2 +f 58/59/2 19/20/2 62/66/2 +f 54/63/49 59/61/49 63/67/49 +f 64/68/50 60/62/50 58/59/50 +f 61/64/2 54/63/2 63/67/2 +f 57/58/2 66/69/2 55/56/2 +f 55/56/2 66/69/2 59/61/2 +f 57/58/51 56/57/51 67/70/51 +f 68/71/2 56/57/2 60/62/2 +f 64/68/52 68/71/52 60/62/52 +f 62/66/2 64/68/2 58/59/2 +f 69/72/2 61/64/2 63/67/2 +f 70/73/2 65/74/2 71/75/2 +f 57/58/53 67/70/53 66/69/53 +f 66/69/54 67/70/54 59/61/54 +f 68/71/2 67/70/2 56/57/2 +f 59/61/55 67/70/55 63/67/55 +f 62/66/56 65/74/56 73/76/56 +f 62/66/57 73/76/57 72/77/57 +f 72/77/2 64/68/2 62/66/2 +f 63/67/2 67/70/2 69/72/2 +f 73/76/2 65/74/2 70/73/2 +f 72/77/58 68/71/58 64/68/58 +f 69/72/2 67/70/2 68/71/2 +f 72/77/59 73/76/59 68/71/59 +f 73/76/2 69/72/2 68/71/2 +f 73/76/2 70/73/2 69/72/2 +f 75/78/2 76/79/2 74/80/2 +f 77/81/2 87/82/2 70/73/2 +f 77/81/2 70/73/2 71/75/2 +f 75/78/2 78/83/2 76/79/2 +f 71/75/60 80/84/60 77/81/60 +f 81/85/61 75/78/61 172/86/61 +f 79/87/2 78/83/2 75/78/2 +f 78/83/62 80/84/62 71/75/62 +f 82/88/2 83/89/2 80/84/2 +f 79/87/63 75/78/63 81/85/63 +f 80/84/2 78/83/2 79/87/2 +f 82/88/64 84/90/64 83/89/64 +f 85/91/65 86/92/65 87/82/65 +f 88/93/66 79/87/66 81/85/66 +f 79/87/2 89/94/2 80/84/2 +f 87/82/2 84/90/2 90/95/2 +f 90/95/67 85/91/67 87/82/67 +f 89/94/68 79/87/68 88/93/68 +f 80/84/2 89/94/2 82/88/2 +f 91/96/69 85/91/69 90/95/69 +f 89/94/70 88/93/70 82/88/70 +f 82/88/71 88/93/71 84/90/71 +f 91/96/72 94/97/72 93/98/72 +f 90/95/2 84/90/2 88/93/2 +f 91/96/73 90/95/73 94/97/73 +f 90/95/2 88/93/2 92/99/2 +f 94/97/2 90/95/2 92/99/2 +f 97/100/2 98/101/2 95/102/2 +f 95/102/74 96/65/74 97/100/74 +f 99/103/75 97/100/75 100/104/75 +f 97/100/74 96/65/74 100/104/74 +f 61/64/2 100/104/2 96/65/2 +f 102/105/76 103/106/76 104/107/76 +f 47/49/2 106/108/2 108/109/2 +f 110/48/2 111/110/2 112/111/2 +f 224/112/2 103/106/2 107/113/2 +f 113/114/77 108/109/77 106/108/77 +f 111/110/2 110/48/2 109/115/2 +f 112/111/2 111/110/2 148/116/2 +f 102/105/78 107/113/78 103/106/78 +f 113/114/79 106/108/79 115/117/79 +f 113/114/2 115/117/2 116/118/2 +f 109/115/80 118/119/80 111/110/80 +f 111/110/81 114/120/81 148/116/81 +f 119/121/82 107/113/82 102/105/82 +f 117/122/83 118/119/83 109/115/83 +f 114/120/2 119/121/2 102/105/2 +f 118/119/84 114/120/84 111/110/84 +f 115/117/2 118/119/2 117/122/2 +f 114/120/2 118/119/2 120/123/2 +f 120/123/2 118/119/2 115/117/2 +f 120/123/2 119/121/2 114/120/2 +f 120/123/85 115/117/85 121/124/85 +f 119/121/86 120/123/86 107/113/86 +f 121/124/87 115/117/87 106/108/87 +f 107/113/88 120/123/88 121/124/88 +f 121/124/2 106/108/2 205/125/2 +f 121/124/2 205/125/2 107/113/2 +f 122/126/89 123/127/89 124/128/89 +f 122/126/2 125/129/2 123/127/2 +f 122/126/74 124/128/74 126/130/74 +f 122/126/74 126/130/74 125/129/74 +f 124/128/2 162/131/2 126/130/2 +f 127/132/90 129/133/90 130/134/90 +f 127/132/91 128/135/91 129/133/91 +f 26/30/2 132/136/2 131/137/2 +f 127/132/92 133/138/92 128/135/92 +f 132/136/2 26/30/2 29/32/2 +f 132/136/93 134/139/93 131/137/93 +f 135/140/94 136/141/94 137/142/94 +f 133/138/2 136/141/2 138/143/2 +f 128/135/95 133/138/95 139/144/95 +f 140/145/96 130/134/96 129/133/96 +f 139/144/2 129/133/2 128/135/2 +f 132/136/97 29/32/97 141/146/97 +f 132/136/98 141/146/98 134/139/98 +f 138/143/99 136/141/99 135/140/99 +f 133/138/75 138/143/75 139/144/75 +f 139/144/2 140/145/2 129/133/2 +f 134/139/2 141/146/2 142/23/2 +f 139/144/75 138/143/75 135/140/75 +f 157/147/2 140/145/2 139/144/2 +f 135/140/2 160/148/2 124/128/2 +f 142/23/2 141/146/2 157/147/2 +f 123/127/2 125/129/2 143/149/2 +f 124/128/89 123/127/89 144/150/89 +f 135/140/2 124/128/2 144/150/2 +f 143/149/75 125/129/75 145/151/75 +f 123/127/100 143/149/100 144/150/100 +f 139/144/2 135/140/2 144/150/2 +f 157/147/2 139/144/2 142/23/2 +f 145/151/75 125/129/75 126/130/75 +f 144/150/100 143/149/100 145/151/100 +f 139/144/2 144/150/2 142/23/2 +f 146/152/2 145/151/2 126/130/2 +f 142/23/2 144/150/2 145/151/2 +f 142/23/2 145/151/2 146/152/2 +f 40/43/101 110/48/101 112/111/101 +f 102/105/2 104/107/2 114/120/2 +f 40/43/102 112/111/102 147/153/102 +f 104/107/103 148/116/103 114/120/103 +f 147/153/2 8/8/2 40/43/2 +f 104/107/104 103/106/104 148/116/104 +f 29/32/2 27/29/2 2/1/2 +f 224/112/2 148/116/2 103/106/2 +f 112/111/2 148/116/2 224/112/2 +f 105/154/2 150/155/2 224/112/2 +f 4/3/2 29/32/2 2/1/2 +f 8/8/2 147/153/2 151/9/2 +f 224/112/2 150/155/2 112/111/2 +f 4/3/105 3/2/105 152/156/105 +f 4/3/106 152/156/106 29/32/106 +f 147/153/107 112/111/107 153/157/107 +f 147/153/108 153/157/108 151/9/108 +f 149/158/2 150/155/2 105/154/2 +f 141/146/109 29/32/109 152/156/109 +f 152/156/2 3/2/2 1/4/2 +f 153/157/2 112/111/2 150/155/2 +f 154/159/65 150/155/65 149/158/65 +f 141/146/2 152/156/2 157/147/2 +f 5/6/110 151/9/110 1/4/110 +f 1/4/111 151/9/111 153/157/111 +f 155/160/65 150/155/65 154/159/65 +f 157/147/2 152/156/2 1/4/2 +f 153/157/2 150/155/2 157/147/2 +f 157/147/2 1/4/2 153/157/2 +f 155/160/112 157/147/112 150/155/112 +f 154/159/113 156/161/113 158/162/113 +f 158/162/2 155/160/2 154/159/2 +f 159/163/112 157/147/112 155/160/112 +f 159/163/2 155/160/2 158/162/2 +f 156/161/2 105/154/2 160/148/2 +f 159/163/114 158/162/114 157/147/114 +f 157/147/114 158/162/114 156/161/114 +f 160/148/2 157/147/2 156/161/2 +f 62/66/115 20/21/115 65/74/115 +f 19/20/116 20/21/116 62/66/116 +f 71/75/2 65/74/2 20/21/2 +f 131/137/2 24/26/2 26/30/2 +f 71/75/2 20/21/2 142/23/2 +f 163/164/2 162/131/2 161/165/2 +f 81/85/2 92/99/2 88/93/2 +f 131/137/117 134/139/117 22/25/117 +f 131/137/118 22/25/118 24/26/118 +f 165/166/119 78/83/119 71/75/119 +f 162/131/2 163/164/2 164/167/2 +f 167/168/2 75/78/2 74/80/2 +f 161/165/2 168/169/2 163/164/2 +f 142/23/2 22/25/2 134/139/2 +f 76/79/120 78/83/120 165/166/120 +f 71/75/2 142/23/2 165/166/2 +f 166/170/121 163/164/121 168/169/121 +f 166/170/122 164/167/122 163/164/122 +f 146/152/2 126/130/2 162/131/2 +f 74/80/123 171/171/123 167/168/123 +f 74/80/124 179/172/124 171/171/124 +f 167/168/125 172/86/125 75/78/125 +f 172/86/2 92/99/2 81/85/2 +f 173/173/126 174/174/126 175/175/126 +f 176/176/127 169/177/127 168/169/127 +f 177/178/2 169/177/2 178/179/2 +f 76/79/128 179/172/128 74/80/128 +f 180/180/2 169/177/2 177/178/2 +f 166/170/129 168/169/129 169/177/129 +f 170/181/130 164/167/130 166/170/130 +f 170/181/89 181/182/89 164/167/89 +f 164/167/2 146/152/2 162/131/2 +f 167/168/131 171/171/131 172/86/131 +f 182/183/132 173/173/132 175/175/132 +f 168/169/2 161/165/2 176/176/2 +f 178/179/133 169/177/133 176/176/133 +f 177/178/132 178/179/132 142/23/132 +f 76/79/134 165/166/134 179/172/134 +f 180/180/135 177/178/135 183/184/135 +f 180/180/2 166/170/2 169/177/2 +f 184/185/2 170/181/2 166/170/2 +f 181/182/2 170/181/2 184/185/2 +f 164/167/89 181/182/89 146/152/89 +f 182/183/132 186/186/132 173/173/132 +f 187/187/126 174/174/126 173/173/126 +f 176/176/2 161/165/2 174/174/2 +f 142/23/132 178/179/132 176/176/132 +f 183/184/136 177/178/136 142/23/136 +f 142/23/2 179/172/2 165/166/2 +f 184/185/2 166/170/2 180/180/2 +f 181/182/137 184/185/137 146/152/137 +f 92/99/2 172/86/2 171/171/2 +f 185/188/2 92/99/2 182/183/2 +f 189/189/2 173/173/2 186/186/2 +f 187/187/2 173/173/2 189/189/2 +f 176/176/2 174/174/2 142/23/2 +f 171/171/2 179/172/2 142/23/2 +f 180/180/138 183/184/138 190/190/138 +f 180/180/139 190/190/139 184/185/139 +f 146/152/140 184/185/140 190/190/140 +f 182/183/2 92/99/2 171/171/2 +f 191/191/141 186/186/141 182/183/141 +f 189/189/141 186/186/141 191/191/141 +f 187/187/142 189/189/142 174/174/142 +f 142/23/2 190/190/2 183/184/2 +f 182/183/2 171/171/2 191/191/2 +f 174/174/142 189/189/142 191/191/142 +f 190/190/2 142/23/2 146/152/2 +f 142/23/2 174/174/2 191/191/2 +f 142/23/2 191/191/2 171/171/2 +f 115/117/2 117/122/2 116/118/2 +f 116/118/143 108/109/143 113/114/143 +f 117/122/144 192/192/144 116/118/144 +f 116/118/145 192/192/145 108/109/145 +f 117/122/146 109/115/146 192/192/146 +f 42/52/2 193/193/2 41/44/2 +f 108/109/2 192/192/2 47/49/2 +f 110/48/2 192/192/2 109/115/2 +f 193/193/147 43/27/147 41/44/147 +f 53/60/2 193/193/2 42/52/2 +f 110/48/2 47/49/2 192/192/2 +f 193/193/148 101/194/148 43/27/148 +f 101/194/2 47/49/2 43/27/2 +f 53/60/149 101/194/149 193/193/149 +f 53/60/150 54/63/150 101/194/150 +f 54/63/2 96/65/2 101/194/2 +f 83/89/151 77/81/151 80/84/151 +f 194/195/152 195/196/152 196/197/152 +f 194/195/153 197/198/153 195/196/153 +f 83/89/154 84/90/154 77/81/154 +f 196/197/2 198/199/2 194/195/2 +f 194/195/2 199/200/2 200/201/2 +f 201/202/155 196/197/155 195/196/155 +f 202/203/2 203/204/2 196/197/2 +f 196/197/2 203/204/2 198/199/2 +f 200/201/2 199/200/2 204/205/2 +f 194/195/156 200/201/156 197/198/156 +f 92/99/157 93/98/157 94/97/157 +f 87/82/2 77/81/2 84/90/2 +f 70/73/113 206/206/113 69/72/113 +f 207/207/2 208/208/2 206/206/2 +f 209/209/2 208/208/2 207/207/2 +f 208/208/112 209/209/112 210/210/112 +f 206/206/65 208/208/65 69/72/65 +f 194/195/2 198/199/2 199/200/2 +f 195/196/2 61/64/2 201/202/2 +f 202/203/158 196/197/158 201/202/158 +f 203/204/114 202/203/114 211/211/114 +f 198/199/159 203/204/159 212/212/159 +f 204/205/160 199/200/160 213/213/160 +f 200/201/89 204/205/89 214/214/89 +f 197/198/161 200/201/161 214/214/161 +f 195/196/2 197/198/2 61/64/2 +f 96/65/2 215/215/2 101/194/2 +f 216/216/162 217/217/162 218/218/162 +f 216/216/163 219/219/163 217/217/163 +f 220/220/164 93/98/164 92/99/164 +f 226/221/126 205/125/126 47/49/126 +f 93/98/2 221/222/2 91/96/2 +f 91/96/2 228/223/2 85/91/2 +f 207/207/113 206/206/113 70/73/113 +f 209/209/114 207/207/114 229/224/114 +f 210/210/112 209/209/112 229/224/112 +f 69/72/65 208/208/65 210/210/65 +f 85/91/2 228/223/2 86/92/2 +f 87/82/65 86/92/65 230/225/65 +f 198/199/165 231/226/165 199/200/165 +f 69/72/2 201/202/2 61/64/2 +f 211/211/114 202/203/114 201/202/114 +f 212/212/166 203/204/166 211/211/166 +f 213/213/167 199/200/167 231/226/167 +f 214/214/89 204/205/89 213/213/89 +f 197/198/2 214/214/2 61/64/2 +f 95/102/89 98/101/89 96/65/89 +f 218/218/2 233/227/2 216/216/2 +f 216/216/2 234/228/2 235/229/2 +f 216/216/2 233/227/2 234/228/2 +f 216/216/168 235/229/168 219/219/168 +f 217/217/2 101/194/2 215/215/2 +f 236/230/132 225/231/132 47/49/132 +f 220/220/2 237/232/2 93/98/2 +f 185/188/142 220/220/142 92/99/142 +f 93/98/2 237/232/2 221/222/2 +f 205/125/2 106/108/2 47/49/2 +f 227/233/169 223/234/169 222/235/169 +f 238/236/132 225/231/132 236/230/132 +f 239/237/2 223/234/2 224/112/2 +f 239/237/170 222/235/170 223/234/170 +f 226/221/126 47/49/126 225/231/126 +f 227/233/171 224/112/171 223/234/171 +f 91/96/2 221/222/2 228/223/2 +f 229/224/114 207/207/114 70/73/114 +f 232/238/2 69/72/2 210/210/2 +f 86/92/172 228/223/172 230/225/172 +f 198/199/173 212/212/173 231/226/173 +f 211/211/2 201/202/2 69/72/2 +f 212/212/2 211/211/2 232/238/2 +f 213/213/2 231/226/2 242/239/2 +f 214/214/2 213/213/2 61/64/2 +f 243/240/2 98/101/2 97/100/2 +f 96/65/89 98/101/89 244/241/89 +f 96/65/2 245/242/2 215/215/2 +f 215/215/174 218/218/174 217/217/174 +f 235/229/2 234/228/2 246/243/2 +f 233/227/175 247/244/175 234/228/175 +f 235/229/142 246/243/142 248/245/142 +f 219/219/2 101/194/2 217/217/2 +f 219/219/176 235/229/176 248/245/176 +f 236/230/2 47/49/2 101/194/2 +f 185/188/142 237/232/142 220/220/142 +f 221/222/177 237/232/177 241/246/177 +f 222/235/2 240/247/2 227/233/2 +f 249/248/2 225/231/2 238/236/2 +f 224/112/2 205/125/2 239/237/2 +f 250/249/178 222/235/178 239/237/178 +f 250/249/2 251/250/2 222/235/2 +f 222/235/2 251/250/2 240/247/2 +f 226/221/2 225/231/2 249/248/2 +f 227/233/2 252/251/2 253/252/2 +f 227/233/179 253/252/179 224/112/179 +f 221/222/180 241/246/180 254/253/180 +f 221/222/181 254/253/181 228/223/181 +f 70/73/2 87/82/2 229/224/2 +f 229/224/2 255/254/2 210/210/2 +f 232/238/2 210/210/2 255/254/2 +f 230/225/182 228/223/182 254/253/182 +f 232/238/2 231/226/2 212/212/2 +f 69/72/2 232/238/2 211/211/2 +f 61/64/2 213/213/2 242/239/2 +f 243/240/75 97/100/75 99/103/75 +f 98/101/100 243/240/100 244/241/100 +f 244/241/2 245/242/2 96/65/2 +f 256/255/183 218/218/183 215/215/183 +f 256/255/2 257/256/2 218/218/2 +f 218/218/2 257/256/2 233/227/2 +f 233/227/184 258/257/184 247/244/184 +f 246/243/185 234/228/185 259/258/185 +f 248/245/142 246/243/142 259/258/142 +f 248/245/2 101/194/2 219/219/2 +f 265/259/2 236/230/2 101/194/2 +f 241/246/186 237/232/186 185/188/186 +f 107/113/2 205/125/2 224/112/2 +f 227/233/2 240/247/2 252/251/2 +f 238/236/187 236/230/187 249/248/187 +f 261/260/132 250/249/132 239/237/132 +f 251/250/132 250/249/132 261/260/132 +f 240/247/188 251/250/188 260/261/188 +f 226/221/142 249/248/142 205/125/142 +f 253/252/2 252/251/2 262/262/2 +f 255/254/2 254/253/2 241/246/2 +f 230/225/2 255/254/2 87/82/2 +f 87/82/2 255/254/2 229/224/2 +f 232/238/142 255/254/142 263/263/142 +f 254/253/2 255/254/2 230/225/2 +f 242/239/2 231/226/2 232/238/2 +f 61/64/2 242/239/2 100/104/2 +f 244/241/100 243/240/100 99/103/100 +f 264/264/75 256/255/75 215/215/75 +f 257/256/75 256/255/75 264/264/75 +f 233/227/189 257/256/189 258/257/189 +f 247/244/2 258/257/2 265/259/2 +f 259/258/190 234/228/190 247/244/190 +f 248/245/2 259/258/2 101/194/2 +f 240/247/191 266/265/191 252/251/191 +f 240/247/192 260/261/192 266/265/192 +f 249/248/141 236/230/141 267/266/141 +f 239/237/2 205/125/2 261/260/2 +f 260/261/193 251/250/193 261/260/193 +f 205/125/142 249/248/142 267/266/142 +f 262/262/194 252/251/194 268/267/194 +f 253/252/195 262/262/195 224/112/195 +f 255/254/2 241/246/2 185/188/2 +f 100/104/2 269/268/2 99/103/2 +f 263/263/142 242/239/142 232/238/142 +f 100/104/2 242/239/2 269/268/2 +f 99/103/2 245/242/2 244/241/2 +f 258/257/196 257/256/196 264/264/196 +f 265/259/2 259/258/2 247/244/2 +f 265/259/2 101/194/2 259/258/2 +f 149/158/113 156/161/113 154/159/113 +f 265/259/2 266/265/2 260/261/2 +f 265/259/2 267/266/2 236/230/2 +f 267/266/2 261/260/2 205/125/2 +f 265/259/2 260/261/2 261/260/2 +f 268/267/197 252/251/197 266/265/197 +f 224/112/198 262/262/198 268/267/198 +f 269/268/142 242/239/142 263/263/142 +f 271/269/2 245/242/2 99/103/2 +f 264/264/2 215/215/2 245/242/2 +f 258/257/2 264/264/2 245/242/2 +f 245/242/2 265/259/2 258/257/2 +f 185/188/2 182/183/2 175/175/2 +f 175/175/2 174/174/2 188/270/2 +f 149/158/2 105/154/2 156/161/2 +f 265/259/2 261/260/2 267/266/2 +f 105/154/2 268/267/2 266/265/2 +f 105/154/2 224/112/2 268/267/2 +f 188/270/2 255/254/2 185/188/2 +f 99/103/2 269/268/2 271/269/2 +f 188/270/2 185/188/2 175/175/2 +f 272/271/2 273/272/2 130/134/2 +f 130/134/2 273/272/2 274/273/2 +f 130/134/2 274/273/2 127/132/2 +f 127/132/2 136/141/2 133/138/2 +f 105/154/2 266/265/2 265/259/2 +f 263/263/142 271/269/142 269/268/142 +f 272/271/199 130/134/199 140/145/199 +f 273/272/65 272/271/65 276/274/65 +f 274/273/200 273/272/200 277/275/200 +f 127/132/2 274/273/2 136/141/2 +f 278/276/2 255/254/2 188/270/2 +f 276/274/65 272/271/65 140/145/65 +f 277/275/201 273/272/201 276/274/201 +f 274/273/202 137/142/202 136/141/202 +f 105/154/2 265/259/2 279/277/2 +f 278/276/2 188/270/2 280/278/2 +f 280/278/203 281/279/203 278/276/203 +f 278/276/204 263/263/204 255/254/204 +f 271/269/2 265/259/2 245/242/2 +f 271/269/2 282/280/2 265/259/2 +f 157/147/2 276/274/2 140/145/2 +f 160/148/2 277/275/2 276/274/2 +f 274/273/205 277/275/205 137/142/205 +f 137/142/2 160/148/2 135/140/2 +f 270/281/8 279/277/8 265/259/8 +f 188/270/206 283/282/206 280/278/206 +f 280/278/203 283/282/203 281/279/203 +f 278/276/204 281/279/204 263/263/204 +f 282/280/207 270/281/207 265/259/207 +f 284/283/208 285/284/208 282/280/208 +f 284/283/2 282/280/2 271/269/2 +f 188/270/2 174/174/2 161/165/2 +f 160/148/2 276/274/2 157/147/2 +f 277/275/2 160/148/2 137/142/2 +f 105/154/2 279/277/2 160/148/2 +f 188/270/206 275/285/206 283/282/206 +f 281/279/209 283/282/209 263/263/209 +f 282/280/207 285/284/207 270/281/207 +f 284/283/208 287/286/208 285/284/208 +f 271/269/210 287/286/210 284/283/210 +f 188/270/2 161/165/2 289/287/2 +f 279/277/2 290/288/2 160/148/2 +f 286/289/211 160/148/211 290/288/211 +f 263/263/209 283/282/209 275/285/209 +f 263/263/142 288/290/142 271/269/142 +f 287/286/209 270/281/209 285/284/209 +f 271/269/210 288/290/210 287/286/210 +f 275/285/212 188/270/212 289/287/212 +f 291/291/2 290/288/2 279/277/2 +f 291/291/213 292/292/213 290/288/213 +f 263/263/209 275/285/209 288/290/209 +f 288/290/209 270/281/209 287/286/209 +f 279/277/214 294/293/214 291/291/214 +f 291/291/215 294/293/215 292/292/215 +f 290/288/216 292/292/216 286/289/216 +f 293/294/8 279/277/8 270/281/8 +f 288/290/209 275/285/209 270/281/209 +f 279/277/214 293/294/214 294/293/214 +f 292/292/209 294/293/209 286/289/209 +f 162/131/2 124/128/2 161/165/2 +f 297/295/217 296/296/217 289/287/217 +f 275/285/209 293/294/209 270/281/209 +f 275/285/212 289/287/212 296/296/212 +f 286/289/209 294/293/209 293/294/209 +f 295/297/132 160/148/132 286/289/132 +f 161/165/2 297/295/2 289/287/2 +f 161/165/2 124/128/2 160/148/2 +f 297/295/217 298/298/217 296/296/217 +f 296/296/209 293/294/209 275/285/209 +f 286/289/209 293/294/209 295/297/209 +f 161/165/218 298/298/218 297/295/218 +f 299/299/209 296/296/209 298/298/209 +f 295/297/209 293/294/209 296/296/209 +f 161/165/218 299/299/218 298/298/218 +f 295/297/209 296/296/209 299/299/209 +f 160/148/219 299/299/219 161/165/219 +f 160/148/219 295/297/219 299/299/219 +f 659/300/220 301/301/220 300/302/220 +f 302/303/221 301/301/221 659/300/221 +f 302/303/222 303/304/222 301/301/222 +f 304/305/223 303/304/223 302/303/223 +f 306/306/224 305/307/224 304/305/224 +f 306/306/225 307/308/225 305/307/225 +f 667/309/226 308/310/226 307/308/226 +f 667/309/227 309/311/227 308/310/227 +f 310/312/228 309/311/228 667/309/228 +f 310/312/229 311/313/229 309/311/229 +f 672/314/230 311/313/230 310/312/230 +f 672/314/231 312/315/231 311/313/231 +f 674/316/232 312/315/232 672/314/232 +f 675/317/233 312/315/233 674/316/233 +f 675/317/234 313/318/234 312/315/234 +f 677/319/235 313/318/235 675/317/235 +f 677/319/236 314/320/236 313/318/236 +f 679/321/237 314/320/237 677/319/237 +f 679/321/238 315/322/238 314/320/238 +f 682/323/239 315/322/239 679/321/239 +f 682/323/240 316/324/240 315/322/240 +f 684/325/241 316/324/241 682/323/241 +f 684/325/242 317/326/242 316/324/242 +f 318/327/243 317/326/243 684/325/243 +f 318/327/244 319/328/244 317/326/244 +f 320/329/245 319/328/245 318/327/245 +f 322/330/246 321/331/246 320/329/246 +f 322/330/247 323/332/247 321/331/247 +f 693/333/248 324/334/248 323/332/248 +f 324/334/249 693/333/249 325/335/249 +f 325/335/250 693/333/250 326/336/250 +f 325/335/251 326/336/251 697/337/251 +f 325/335/252 697/337/252 327/338/252 +f 327/338/253 697/337/253 699/339/253 +f 327/338/254 699/339/254 328/340/254 +f 328/340/255 699/339/255 701/341/255 +f 328/340/256 701/341/256 329/342/256 +f 329/342/257 701/341/257 703/343/257 +f 329/342/258 703/343/258 330/344/258 +f 330/344/259 703/343/259 704/345/259 +f 330/344/260 704/345/260 331/346/260 +f 331/346/261 704/345/261 332/347/261 +f 331/346/262 332/347/262 333/348/262 +f 333/348/263 332/347/263 334/349/263 +f 334/349/264 335/350/264 336/351/264 +f 336/351/265 335/350/265 337/352/265 +f 338/353/266 337/352/266 714/354/266 +f 338/353/267 714/354/267 339/355/267 +f 340/356/268 339/355/268 718/357/268 +f 340/356/269 718/357/269 341/358/269 +f 341/358/270 718/357/270 720/359/270 +f 341/358/271 720/359/271 722/360/271 +f 341/358/272 722/360/272 342/361/272 +f 342/361/273 722/360/273 724/362/273 +f 342/361/274 724/362/274 343/363/274 +f 343/363/275 724/362/275 726/364/275 +f 343/363/276 726/364/276 344/365/276 +f 344/365/277 726/364/277 728/366/277 +f 344/365/278 728/366/278 345/367/278 +f 345/367/279 728/366/279 729/368/279 +f 345/367/280 729/368/280 346/369/280 +f 346/369/281 729/368/281 347/370/281 +f 346/369/282 347/370/282 348/371/282 +f 348/371/283 347/370/283 349/372/283 +f 349/372/284 350/373/284 351/374/284 +f 351/374/285 350/373/285 352/375/285 +f 353/376/286 352/375/286 740/377/286 +f 353/376/287 740/377/287 354/378/287 +f 354/378/288 740/377/288 355/379/288 +f 354/378/289 355/379/289 356/380/289 +f 356/380/290 355/379/290 744/381/290 +f 356/380/291 744/381/291 357/382/291 +f 357/382/292 744/381/292 746/383/292 +f 357/382/293 746/383/293 748/384/293 +f 357/382/294 748/384/294 358/385/294 +f 358/385/295 748/384/295 750/386/295 +f 358/385/296 750/386/296 359/387/296 +f 359/387/297 750/386/297 752/388/297 +f 359/387/298 752/388/298 360/389/298 +f 360/389/299 752/388/299 754/390/299 +f 360/389/300 754/390/300 361/391/300 +f 361/391/301 754/390/301 755/392/301 +f 361/391/302 755/392/302 362/393/302 +f 362/393/303 755/392/303 363/394/303 +f 362/393/304 363/394/304 364/395/304 +f 364/395/305 363/394/305 365/396/305 +f 365/396/306 366/397/306 367/398/306 +f 367/398/307 366/397/307 368/399/307 +f 369/400/308 368/399/308 766/401/308 +f 369/400/309 766/401/309 370/402/309 +f 370/402/310 766/401/310 371/403/310 +f 370/402/311 371/403/311 372/404/311 +f 372/404/312 371/403/312 770/405/312 +f 372/404/313 770/405/313 373/406/313 +f 373/406/314 770/405/314 772/407/314 +f 373/406/315 772/407/315 774/408/315 +f 373/406/316 774/408/316 374/409/316 +f 374/409/317 774/408/317 776/410/317 +f 374/409/318 776/410/318 375/411/318 +f 375/411/319 776/410/319 778/412/319 +f 375/411/320 778/412/320 376/413/320 +f 376/413/321 778/412/321 780/414/321 +f 376/413/322 780/414/322 377/415/322 +f 377/415/323 780/414/323 781/416/323 +f 377/415/324 781/416/324 378/417/324 +f 378/417/325 781/416/325 379/418/325 +f 378/417/326 379/418/326 380/419/326 +f 380/419/327 379/418/327 381/420/327 +f 381/420/328 382/421/328 383/422/328 +f 383/422/329 382/421/329 384/423/329 +f 385/424/330 384/423/330 792/425/330 +f 385/424/331 792/425/331 386/426/331 +f 386/426/332 792/425/332 387/427/332 +f 386/426/333 387/427/333 388/428/333 +f 388/428/334 387/427/334 794/429/334 +f 388/428/335 794/429/335 390/430/335 +f 390/430/336 794/429/336 389/431/336 +f 390/430/337 389/431/337 391/432/337 +f 390/430/338 391/432/338 392/433/338 +f 392/433/339 391/432/339 393/434/339 +f 392/433/340 393/434/340 394/435/340 +f 394/435/341 393/434/341 395/436/341 +f 394/435/342 395/436/342 396/437/342 +f 396/437/343 395/436/343 397/438/343 +f 406/439/344 407/440/344 408/441/344 +f 411/442/345 406/439/345 409/443/345 +f 403/444/346 402/445/346 399/446/346 +f 403/444/347 410/447/347 402/445/347 +f 405/448/348 402/445/348 410/447/348 +f 405/448/349 404/449/349 398/450/349 +f 401/451/350 411/442/350 409/443/350 +f 487/452/351 412/453/351 403/444/351 +f 413/454/352 404/449/352 414/455/352 +f 415/456/353 406/439/353 411/442/353 +f 400/457/354 411/442/354 401/451/354 +f 412/453/355 410/447/355 403/444/355 +f 405/448/356 414/455/356 404/449/356 +f 416/458/357 410/447/357 412/453/357 +f 405/448/358 410/447/358 414/455/358 +f 416/458/359 415/456/359 411/442/359 +f 400/457/360 416/458/360 411/442/360 +f 414/455/361 410/447/361 416/458/361 +f 414/455/362 416/458/362 400/457/362 +f 416/458/363 412/453/363 415/456/363 +f 412/453/364 418/459/364 415/456/364 +f 513/460/365 384/423/365 385/424/365 +f 383/422/366 384/423/366 513/460/366 +f 419/461/367 381/420/367 383/422/367 +f 419/461/368 380/419/368 381/420/368 +f 535/462/369 368/399/369 369/400/369 +f 367/398/370 368/399/370 535/462/370 +f 420/463/371 365/396/371 367/398/371 +f 420/463/372 364/395/372 365/396/372 +f 558/464/373 352/375/373 353/376/373 +f 351/374/374 352/375/374 558/464/374 +f 421/465/375 349/372/375 351/374/375 +f 421/465/376 348/371/376 349/372/376 +f 304/305/377 422/466/377 303/304/377 +f 305/307/378 422/466/378 304/305/378 +f 307/308/379 581/467/379 305/307/379 +f 308/310/380 581/467/380 307/308/380 +f 423/468/381 339/355/381 340/356/381 +f 338/353/382 339/355/382 423/468/382 +f 424/469/383 337/352/383 338/353/383 +f 336/351/384 337/352/384 424/469/384 +f 425/470/385 334/349/385 336/351/385 +f 425/470/386 333/348/386 334/349/386 +f 320/329/387 426/471/387 319/328/387 +f 321/331/388 426/471/388 320/329/388 +f 323/332/389 427/472/389 321/331/389 +f 324/334/390 427/472/390 323/332/390 +f 428/473/391 429/474/391 430/475/391 +f 429/474/392 431/476/392 430/475/392 +f 428/473/393 432/477/393 429/474/393 +f 432/477/394 431/476/394 429/474/394 +f 435/478/395 431/476/395 433/479/395 +f 433/479/396 436/480/396 435/478/396 +f 435/478/397 434/481/397 431/476/397 +f 433/479/398 431/476/398 432/477/398 +f 435/478/399 436/480/399 439/482/399 +f 430/475/400 431/476/400 442/483/400 +f 433/479/401 437/484/401 436/480/401 +f 428/473/402 440/485/402 432/477/402 +f 431/476/403 434/481/403 442/483/403 +f 438/486/404 440/485/404 428/473/404 +f 443/487/405 434/481/405 435/478/405 +f 433/479/406 441/488/406 437/484/406 +f 435/478/407 439/482/407 443/487/407 +f 430/475/408 442/483/408 444/489/408 +f 433/479/409 432/477/409 440/485/409 +f 442/483/410 434/481/410 445/490/410 +f 438/486/411 446/491/411 440/485/411 +f 433/479/412 440/485/412 447/492/412 +f 443/487/413 445/490/413 434/481/413 +f 447/492/414 441/488/414 433/479/414 +f 928/493/415 446/491/415 438/486/415 +f 447/492/416 448/494/416 441/488/416 +f 446/491/417 449/495/417 440/485/417 +f 442/483/418 445/490/418 444/489/418 +f 447/492/419 440/485/419 449/495/419 +f 443/487/420 439/482/420 451/496/420 +f 444/489/421 445/490/421 452/497/421 +f 928/493/422 453/498/422 446/491/422 +f 444/489/423 452/497/423 408/441/423 +f 409/443/424 406/439/424 408/441/424 +f 439/482/425 450/499/425 451/496/425 +f 443/487/426 452/497/426 445/490/426 +f 451/496/427 452/497/427 443/487/427 +f 447/492/428 454/500/428 448/494/428 +f 453/498/429 449/495/429 446/491/429 +f 451/496/430 450/499/430 455/501/430 +f 453/498/431 456/502/431 449/495/431 +f 447/492/432 449/495/432 457/503/432 +f 452/497/433 409/443/433 408/441/433 +f 457/503/434 454/500/434 447/492/434 +f 400/457/435 417/504/435 414/455/435 +f 457/503/432 449/495/432 456/502/432 +f 401/451/436 452/497/436 451/496/436 +f 401/451/437 409/443/437 452/497/437 +f 457/503/438 458/505/438 454/500/438 +f 459/506/439 461/507/439 453/498/439 +f 451/496/440 455/501/440 401/451/440 +f 461/507/441 462/508/441 453/498/441 +f 462/508/442 456/502/442 453/498/442 +f 463/509/443 460/510/443 407/440/443 +f 413/454/444 414/455/444 417/504/444 +f 457/503/445 456/502/445 462/508/445 +f 465/511/446 455/501/446 460/510/446 +f 457/503/447 464/512/447 458/505/447 +f 465/511/448 401/451/448 455/501/448 +f 463/509/449 465/511/449 460/510/449 +f 465/511/450 400/457/450 401/451/450 +f 466/513/451 461/507/451 459/506/451 +f 417/504/452 400/457/452 465/511/452 +f 466/513/453 467/514/453 461/507/453 +f 468/515/454 417/504/454 465/511/454 +f 468/515/455 413/454/455 417/504/455 +f 457/503/456 470/516/456 464/512/456 +f 469/517/457 413/454/457 468/515/457 +f 461/507/458 471/518/458 462/508/458 +f 457/503/459 462/508/459 472/519/459 +f 463/509/460 468/515/460 465/511/460 +f 472/519/461 470/516/461 457/503/461 +f 473/520/462 469/517/462 468/515/462 +f 467/514/463 471/518/463 461/507/463 +f 472/519/464 462/508/464 471/518/464 +f 474/521/465 463/509/465 406/439/465 +f 466/513/466 475/522/466 467/514/466 +f 472/519/467 476/523/467 470/516/467 +f 473/520/468 468/515/468 463/509/468 +f 477/524/469 473/520/469 463/509/469 +f 481/525/470 475/522/470 466/513/470 +f 475/522/471 471/518/471 467/514/471 +f 477/524/472 463/509/472 474/521/472 +f 478/526/473 473/520/473 477/524/473 +f 482/527/474 473/520/474 478/526/474 +f 484/528/475 482/527/475 478/526/475 +f 481/525/476 483/529/476 475/522/476 +f 483/529/477 471/518/477 475/522/477 +f 472/519/478 471/518/478 485/530/478 +f 485/530/479 476/523/479 472/519/479 +f 487/452/480 478/526/480 477/524/480 +f 488/531/481 482/527/481 484/528/481 +f 485/530/482 471/518/482 483/529/482 +f 487/452/483 477/524/483 418/459/483 +f 485/530/484 486/532/484 476/523/484 +f 484/528/485 478/526/485 487/452/485 +f 479/533/486 489/534/486 481/525/486 +f 481/525/487 490/535/487 483/529/487 +f 489/534/488 490/535/488 481/525/488 +f 492/536/489 479/533/489 493/537/489 +f 399/446/490 488/531/490 484/528/490 +f 485/530/491 483/529/491 490/535/491 +f 487/452/492 403/444/492 399/446/492 +f 491/538/493 488/531/493 399/446/493 +f 492/536/494 493/537/494 491/538/494 +f 479/533/495 492/536/495 489/534/495 +f 485/530/496 490/535/496 495/539/496 +f 399/446/497 484/528/497 487/452/497 +f 495/539/498 486/532/498 485/530/498 +f 495/539/499 494/540/499 486/532/499 +f 491/538/500 496/541/500 492/536/500 +f 489/534/501 497/542/501 490/535/501 +f 495/539/502 490/535/502 497/542/502 +f 496/541/503 491/538/503 399/446/503 +f 492/536/504 497/542/504 489/534/504 +f 495/539/505 497/542/505 498/543/505 +f 495/539/506 499/544/506 494/540/506 +f 496/541/507 497/542/507 492/536/507 +f 395/436/508 398/450/508 397/438/508 +f 498/543/509 499/544/509 495/539/509 +f 499/544/510 393/434/510 391/432/510 +f 399/446/511 402/445/511 496/541/511 +f 500/545/512 393/434/512 499/544/512 +f 405/448/513 398/450/513 500/545/513 +f 496/541/514 402/445/514 497/542/514 +f 500/545/515 398/450/515 395/436/515 +f 498/543/516 497/542/516 402/445/516 +f 395/436/517 393/434/517 500/545/517 +f 498/543/518 402/445/518 405/448/518 +f 498/543/519 500/545/519 499/544/519 +f 405/448/520 500/545/520 498/543/520 +f 502/546/521 501/547/521 482/527/521 +f 503/548/522 502/546/522 482/527/522 +f 504/549/523 502/546/523 503/548/523 +f 506/550/524 505/551/524 502/546/524 +f 504/549/525 506/550/525 502/546/525 +f 507/552/526 506/550/526 504/549/526 +f 508/553/527 506/550/527 507/552/527 +f 510/554/528 505/551/528 506/550/528 +f 510/554/529 509/555/529 505/551/529 +f 508/553/530 510/554/530 506/550/530 +f 511/556/531 510/554/531 508/553/531 +f 512/557/532 509/555/532 510/554/532 +f 512/557/533 510/554/533 511/556/533 +f 514/558/534 509/555/534 512/557/534 +f 514/558/535 513/460/535 509/555/535 +f 515/559/536 513/460/536 514/558/536 +f 517/560/537 513/460/537 515/559/537 +f 517/560/538 516/561/538 513/460/538 +f 518/562/539 516/561/539 517/560/539 +f 520/563/540 516/561/540 518/562/540 +f 520/563/541 519/564/541 516/561/541 +f 521/565/542 519/564/542 520/563/542 +f 521/565/543 522/566/543 519/564/543 +f 524/567/544 522/566/544 521/565/544 +f 523/568/545 524/567/545 521/565/545 +f 525/569/546 524/567/546 523/568/546 +f 524/567/547 526/570/547 522/566/547 +f 527/571/548 524/567/548 525/569/548 +f 528/572/549 526/570/549 524/567/549 +f 527/571/550 528/572/550 524/567/550 +f 529/573/551 528/572/551 527/571/551 +f 530/574/552 528/572/552 529/573/552 +f 532/575/553 526/570/553 528/572/553 +f 532/575/554 531/576/554 526/570/554 +f 530/574/555 532/575/555 528/572/555 +f 533/577/556 532/575/556 530/574/556 +f 534/578/557 531/576/557 532/575/557 +f 534/578/558 532/575/558 533/577/558 +f 536/579/559 531/576/559 534/578/559 +f 536/579/560 535/462/560 531/576/560 +f 537/580/561 535/462/561 536/579/561 +f 539/581/562 535/462/562 537/580/562 +f 539/581/563 538/582/563 535/462/563 +f 540/583/564 538/582/564 539/581/564 +f 542/584/565 538/582/565 540/583/565 +f 542/584/566 541/585/566 538/582/566 +f 543/586/567 541/585/567 542/584/567 +f 543/586/568 544/587/568 541/585/568 +f 546/588/569 544/587/569 543/586/569 +f 545/589/570 546/588/570 543/586/570 +f 547/590/571 546/588/571 545/589/571 +f 546/588/572 548/591/572 544/587/572 +f 549/592/573 546/588/573 547/590/573 +f 550/593/574 548/591/574 546/588/574 +f 549/592/575 550/593/575 546/588/575 +f 551/594/576 550/593/576 549/592/576 +f 550/593/577 552/595/577 548/591/577 +f 553/596/578 550/593/578 551/594/578 +f 554/597/579 552/595/579 550/593/579 +f 553/596/580 554/597/580 550/593/580 +f 556/598/581 554/597/581 553/596/581 +f 554/597/582 555/599/582 552/595/582 +f 557/600/583 555/599/583 554/597/583 +f 557/600/584 554/597/584 556/598/584 +f 559/601/585 555/599/585 557/600/585 +f 559/601/586 558/464/586 555/599/586 +f 560/602/587 558/464/587 559/601/587 +f 562/603/588 558/464/588 560/602/588 +f 562/603/589 561/604/589 558/464/589 +f 563/605/590 561/604/590 562/603/590 +f 565/606/591 561/604/591 563/605/591 +f 565/606/592 564/607/592 561/604/592 +f 566/608/593 564/607/593 565/606/593 +f 422/466/594 567/609/594 800/610/594 +f 566/608/595 569/611/595 564/607/595 +f 572/612/596 569/611/596 566/608/596 +f 567/609/597 573/613/597 568/614/597 +f 422/466/598 574/615/598 567/609/598 +f 571/616/599 572/612/599 566/608/599 +f 575/617/600 572/612/600 571/616/600 +f 574/615/601 576/618/601 567/609/601 +f 576/618/602 573/613/602 567/609/602 +f 572/612/603 577/619/603 569/611/603 +f 578/620/604 572/612/604 575/617/604 +f 574/615/605 579/621/605 576/618/605 +f 580/622/606 577/619/606 572/612/606 +f 578/620/607 580/622/607 572/612/607 +f 581/467/608 579/621/608 574/615/608 +f 582/623/609 580/622/609 578/620/609 +f 581/467/610 583/624/610 579/621/610 +f 580/622/611 584/625/611 577/619/611 +f 586/626/612 580/622/612 582/623/612 +f 581/467/613 587/627/613 583/624/613 +f 588/628/614 584/625/614 580/622/614 +f 586/626/615 588/628/615 580/622/615 +f 585/629/616 587/627/616 581/467/616 +f 589/630/617 588/628/617 586/626/617 +f 585/629/618 590/631/618 587/627/618 +f 588/628/619 423/468/619 584/625/619 +f 592/632/620 588/628/620 589/630/620 +f 585/629/621 593/633/621 590/631/621 +f 591/634/622 593/633/622 585/629/622 +f 593/633/623 594/635/623 590/631/623 +f 588/628/624 595/636/624 423/468/624 +f 596/637/625 588/628/625 592/632/625 +f 596/637/626 595/636/626 588/628/626 +f 593/633/627 597/638/627 594/635/627 +f 591/634/628 598/639/628 593/633/628 +f 598/639/629 597/638/629 593/633/629 +f 600/640/630 595/636/630 596/637/630 +f 599/641/631 598/639/631 591/634/631 +f 598/639/632 601/642/632 597/638/632 +f 602/643/633 424/469/633 595/636/633 +f 603/644/634 595/636/634 600/640/634 +f 603/644/635 602/643/635 595/636/635 +f 598/639/636 604/645/636 601/642/636 +f 599/641/637 605/646/637 598/639/637 +f 605/646/638 604/645/638 598/639/638 +f 607/647/639 602/643/639 603/644/639 +f 606/648/640 605/646/640 599/641/640 +f 605/646/641 608/649/641 604/645/641 +f 610/650/642 602/643/642 607/647/642 +f 610/650/643 609/651/643 602/643/643 +f 605/646/644 612/652/644 608/649/644 +f 606/648/645 613/653/645 605/646/645 +f 613/653/646 612/652/646 605/646/646 +f 615/654/647 609/651/647 610/650/647 +f 611/655/648 615/654/648 610/650/648 +f 614/656/649 613/653/649 606/648/649 +f 616/657/650 615/654/650 611/655/650 +f 614/656/651 617/658/651 613/653/651 +f 615/654/652 618/659/652 609/651/652 +f 619/660/653 615/654/653 616/657/653 +f 614/656/654 620/661/654 617/658/654 +f 622/662/655 618/659/655 615/654/655 +f 619/660/656 622/662/656 615/654/656 +f 621/663/657 620/661/657 614/656/657 +f 623/664/658 622/662/658 619/660/658 +f 621/663/659 624/665/659 620/661/659 +f 622/662/660 625/666/660 618/659/660 +f 626/667/661 622/662/661 623/664/661 +f 621/663/662 627/668/662 624/665/662 +f 628/669/663 625/666/663 622/662/663 +f 626/667/664 628/669/664 622/662/664 +f 629/670/665 627/668/665 621/663/665 +f 427/472/666 629/670/666 621/663/666 +f 630/671/667 628/669/667 626/667/667 +f 629/670/668 631/672/668 627/668/668 +f 628/669/669 632/673/669 625/666/669 +f 632/673/670 629/670/670 427/472/670 +f 633/674/671 628/669/671 630/671/671 +f 629/670/672 632/673/672 628/669/672 +f 629/670/673 634/675/673 631/672/673 +f 633/674/674 629/670/674 628/669/674 +f 634/675/675 629/670/675 633/674/675 +f 635/676/676 636/677/676 637/678/676 +f 635/676/677 637/678/677 648/679/677 +f 640/680/678 638/681/678 639/682/678 +f 648/679/679 637/678/679 640/680/679 +f 637/678/680 638/681/680 640/680/680 +f 641/683/681 642/684/681 643/685/681 +f 642/684/682 645/686/682 644/687/682 +f 641/683/683 646/688/683 642/684/683 +f 646/688/684 645/686/684 642/684/684 +f 647/689/685 646/688/685 641/683/685 +f 646/688/686 648/679/686 645/686/686 +f 647/689/687 649/690/687 646/688/687 +f 646/688/688 650/691/688 648/679/688 +f 649/690/689 650/691/689 646/688/689 +f 651/692/690 649/690/690 647/689/690 +f 649/690/691 652/693/691 650/691/691 +f 651/692/692 653/694/692 649/690/692 +f 653/694/693 652/693/693 649/690/693 +f 653/694/694 654/695/694 652/693/694 +f 655/696/695 653/694/695 651/692/695 +f 655/696/696 656/697/696 653/694/696 +f 653/694/697 657/698/697 654/695/697 +f 656/697/698 657/698/698 653/694/698 +f 658/699/699 656/697/699 655/696/699 +f 656/697/700 659/300/700 657/698/700 +f 658/699/701 659/300/701 656/697/701 +f 658/699/702 660/700/702 659/300/702 +f 658/699/703 662/701/703 660/700/703 +f 661/702/704 663/703/704 658/699/704 +f 663/703/705 662/701/705 658/699/705 +f 663/703/706 664/704/706 662/701/706 +f 665/705/707 663/703/707 661/702/707 +f 663/703/708 666/706/708 664/704/708 +f 663/703/709 667/309/709 666/706/709 +f 665/705/710 668/707/710 663/703/710 +f 668/707/711 667/309/711 663/703/711 +f 669/708/712 668/707/712 665/705/712 +f 668/707/713 670/709/713 667/309/713 +f 668/707/714 671/710/714 670/709/714 +f 669/708/715 671/710/715 668/707/715 +f 671/710/716 672/314/716 670/709/716 +f 673/711/717 671/710/717 669/708/717 +f 671/710/718 674/316/718 672/314/718 +f 673/711/719 674/316/719 671/710/719 +f 673/711/720 675/317/720 674/316/720 +f 675/317/721 673/711/721 677/319/721 +f 673/711/722 676/712/722 678/713/722 +f 677/319/723 673/711/723 678/713/723 +f 678/713/724 679/321/724 677/319/724 +f 678/713/725 676/712/725 680/714/725 +f 678/713/726 680/714/726 681/715/726 +f 678/713/727 682/323/727 679/321/727 +f 678/713/728 681/715/728 682/323/728 +f 681/715/729 680/714/729 683/716/729 +f 682/323/730 681/715/730 684/325/730 +f 681/715/731 683/716/731 685/717/731 +f 684/325/732 681/715/732 685/717/732 +f 684/325/733 685/717/733 686/718/733 +f 685/717/734 683/716/734 687/719/734 +f 686/718/735 685/717/735 688/720/735 +f 688/720/736 685/717/736 687/719/736 +f 688/720/737 687/719/737 689/721/737 +f 689/721/738 687/719/738 691/722/738 +f 687/719/739 690/723/739 692/724/739 +f 691/722/740 687/719/740 693/333/740 +f 693/333/741 687/719/741 692/724/741 +f 692/724/742 690/723/742 694/725/742 +f 693/333/743 692/724/743 695/726/743 +f 692/724/744 694/725/744 696/727/744 +f 695/726/745 692/724/745 696/727/745 +f 696/727/746 697/337/746 695/726/746 +f 696/727/747 694/725/747 698/728/747 +f 696/727/748 699/339/748 697/337/748 +f 696/727/749 698/728/749 700/729/749 +f 699/339/750 696/727/750 700/729/750 +f 700/729/751 701/341/751 699/339/751 +f 700/729/752 698/728/752 702/730/752 +f 700/729/753 703/343/753 701/341/753 +f 700/729/754 702/730/754 703/343/754 +f 703/343/755 702/730/755 704/345/755 +f 702/730/756 705/731/756 706/732/756 +f 704/345/757 702/730/757 706/732/757 +f 704/345/758 706/732/758 707/733/758 +f 706/732/759 705/731/759 708/734/759 +f 707/733/760 706/732/760 709/735/760 +f 706/732/761 708/734/761 710/736/761 +f 709/735/762 706/732/762 710/736/762 +f 709/735/763 710/736/763 711/737/763 +f 710/736/764 708/734/764 712/738/764 +f 711/737/765 710/736/765 713/739/765 +f 713/739/766 710/736/766 712/738/766 +f 713/739/767 712/738/767 714/354/767 +f 714/354/768 712/738/768 716/740/768 +f 712/738/769 715/741/769 717/742/769 +f 716/740/770 712/738/770 717/742/770 +f 717/742/771 718/357/771 716/740/771 +f 717/742/772 715/741/772 719/743/772 +f 717/742/773 720/359/773 718/357/773 +f 717/742/774 719/743/774 721/744/774 +f 720/359/775 717/742/775 721/744/775 +f 720/359/776 721/744/776 722/360/776 +f 721/744/777 719/743/777 723/745/777 +f 722/360/778 721/744/778 724/362/778 +f 721/744/779 723/745/779 725/746/779 +f 724/362/780 721/744/780 725/746/780 +f 725/746/781 726/364/781 724/362/781 +f 725/746/782 723/745/782 727/747/782 +f 725/746/783 728/366/783 726/364/783 +f 725/746/784 727/747/784 728/366/784 +f 728/366/785 727/747/785 729/368/785 +f 727/747/786 730/748/786 731/749/786 +f 729/368/787 727/747/787 731/749/787 +f 729/368/788 731/749/788 732/750/788 +f 731/749/789 730/748/789 733/751/789 +f 732/750/790 731/749/790 734/752/790 +f 731/749/791 733/751/791 735/753/791 +f 734/752/792 731/749/792 735/753/792 +f 734/752/793 735/753/793 736/754/793 +f 735/753/794 733/751/794 737/755/794 +f 736/754/795 735/753/795 738/756/795 +f 735/753/796 737/755/796 739/757/796 +f 738/756/797 735/753/797 739/757/797 +f 738/756/798 739/757/798 740/377/798 +f 739/757/799 737/755/799 741/758/799 +f 740/377/800 739/757/800 742/759/800 +f 739/757/801 741/758/801 743/760/801 +f 742/759/802 739/757/802 743/760/802 +f 743/760/803 744/381/803 742/759/803 +f 743/760/804 741/758/804 745/761/804 +f 743/760/805 746/383/805 744/381/805 +f 743/760/806 745/761/806 747/762/806 +f 746/383/807 743/760/807 747/762/807 +f 746/383/808 747/762/808 748/384/808 +f 747/762/809 745/761/809 749/763/809 +f 748/384/810 747/762/810 750/386/810 +f 747/762/811 749/763/811 751/764/811 +f 750/386/812 747/762/812 751/764/812 +f 751/764/813 752/388/813 750/386/813 +f 751/764/814 749/763/814 753/765/814 +f 751/764/815 754/390/815 752/388/815 +f 751/764/816 753/765/816 754/390/816 +f 754/390/817 753/765/817 755/392/817 +f 753/765/818 756/766/818 757/767/818 +f 755/392/819 753/765/819 757/767/819 +f 755/392/820 757/767/820 758/768/820 +f 757/767/821 756/766/821 759/769/821 +f 758/768/822 757/767/822 760/770/822 +f 757/767/823 759/769/823 761/771/823 +f 760/770/824 757/767/824 761/771/824 +f 760/770/825 761/771/825 762/772/825 +f 761/771/826 759/769/826 763/773/826 +f 762/772/827 761/771/827 764/774/827 +f 761/771/828 763/773/828 765/775/828 +f 764/774/829 761/771/829 765/775/829 +f 764/774/830 765/775/830 766/401/830 +f 765/775/831 763/773/831 767/776/831 +f 766/401/832 765/775/832 768/777/832 +f 765/775/833 767/776/833 769/778/833 +f 768/777/834 765/775/834 769/778/834 +f 769/778/835 770/405/835 768/777/835 +f 769/778/836 767/776/836 771/779/836 +f 769/778/837 772/407/837 770/405/837 +f 769/778/838 771/779/838 773/780/838 +f 772/407/839 769/778/839 773/780/839 +f 772/407/840 773/780/840 774/408/840 +f 773/780/841 771/779/841 775/781/841 +f 774/408/842 773/780/842 776/410/842 +f 773/780/843 775/781/843 777/782/843 +f 776/410/844 773/780/844 777/782/844 +f 777/782/845 778/412/845 776/410/845 +f 777/782/846 775/781/846 779/783/846 +f 777/782/847 780/414/847 778/412/847 +f 777/782/848 779/783/848 780/414/848 +f 780/414/849 779/783/849 781/416/849 +f 779/783/850 782/784/850 783/785/850 +f 781/416/851 779/783/851 783/785/851 +f 781/416/852 783/785/852 784/786/852 +f 783/785/853 782/784/853 785/787/853 +f 784/786/854 783/785/854 786/788/854 +f 783/785/855 785/787/855 787/789/855 +f 786/788/856 783/785/856 787/789/856 +f 786/788/857 787/789/857 788/790/857 +f 787/789/858 785/787/858 789/791/858 +f 788/790/859 787/789/859 790/792/859 +f 787/789/860 789/791/860 791/793/860 +f 790/792/861 787/789/861 791/793/861 +f 790/792/862 791/793/862 792/425/862 +f 791/793/863 789/791/863 480/794/863 +f 792/425/864 791/793/864 793/795/864 +f 791/793/865 480/794/865 796/796/865 +f 793/795/866 791/793/866 794/429/866 +f 794/429/867 791/793/867 796/796/867 +f 499/544/868 391/432/868 795/797/868 +f 795/797/869 391/432/869 389/431/869 +f 795/797/870 389/431/870 794/429/870 +f 795/797/871 796/796/871 499/544/871 +f 502/546/872 396/437/872 501/547/872 +f 502/546/873 394/435/873 396/437/873 +f 505/551/874 394/435/874 502/546/874 +f 505/551/875 392/433/875 394/435/875 +f 505/551/876 390/430/876 392/433/876 +f 387/427/877 793/795/877 794/429/877 +f 509/555/878 390/430/878 505/551/878 +f 509/555/879 388/428/879 390/430/879 +f 792/425/880 793/795/880 387/427/880 +f 509/555/881 386/426/881 388/428/881 +f 384/423/882 790/792/882 792/425/882 +f 509/555/883 385/424/883 386/426/883 +f 384/423/884 788/790/884 790/792/884 +f 382/421/885 788/790/885 384/423/885 +f 513/460/886 385/424/886 509/555/886 +f 382/421/887 786/788/887 788/790/887 +f 381/420/888 786/788/888 382/421/888 +f 516/561/889 383/422/889 513/460/889 +f 381/420/890 784/786/890 786/788/890 +f 379/418/891 784/786/891 381/420/891 +f 516/561/892 419/461/892 383/422/892 +f 781/416/893 784/786/893 379/418/893 +f 519/564/894 419/461/894 516/561/894 +f 519/564/895 380/419/895 419/461/895 +f 519/564/896 378/417/896 380/419/896 +f 522/566/897 378/417/897 519/564/897 +f 522/566/898 377/415/898 378/417/898 +f 522/566/899 376/413/899 377/415/899 +f 526/570/900 376/413/900 522/566/900 +f 526/570/901 375/411/901 376/413/901 +f 526/570/902 374/409/902 375/411/902 +f 526/570/903 373/406/903 374/409/903 +f 371/403/904 768/777/904 770/405/904 +f 531/576/905 373/406/905 526/570/905 +f 531/576/906 372/404/906 373/406/906 +f 766/401/907 768/777/907 371/403/907 +f 531/576/908 370/402/908 372/404/908 +f 368/399/909 764/774/909 766/401/909 +f 531/576/910 369/400/910 370/402/910 +f 368/399/911 762/772/911 764/774/911 +f 366/397/912 762/772/912 368/399/912 +f 535/462/913 369/400/913 531/576/913 +f 366/397/914 760/770/914 762/772/914 +f 365/396/915 760/770/915 366/397/915 +f 538/582/916 367/398/916 535/462/916 +f 365/396/917 758/768/917 760/770/917 +f 363/394/918 758/768/918 365/396/918 +f 538/582/919 420/463/919 367/398/919 +f 755/392/920 758/768/920 363/394/920 +f 541/585/921 420/463/921 538/582/921 +f 541/585/922 364/395/922 420/463/922 +f 541/585/923 362/393/923 364/395/923 +f 544/587/924 362/393/924 541/585/924 +f 544/587/925 361/391/925 362/393/925 +f 544/587/926 360/389/926 361/391/926 +f 548/591/927 360/389/927 544/587/927 +f 548/591/928 359/387/928 360/389/928 +f 548/591/929 358/385/929 359/387/929 +f 552/595/930 358/385/930 548/591/930 +f 552/595/931 357/382/931 358/385/931 +f 355/379/932 742/759/932 744/381/932 +f 552/595/933 356/380/933 357/382/933 +f 740/377/934 742/759/934 355/379/934 +f 555/599/935 356/380/935 552/595/935 +f 555/599/936 354/378/936 356/380/936 +f 352/375/937 738/756/937 740/377/937 +f 555/599/938 353/376/938 354/378/938 +f 352/375/939 736/754/939 738/756/939 +f 350/373/940 736/754/940 352/375/940 +f 558/464/941 353/376/941 555/599/941 +f 350/373/942 734/752/942 736/754/942 +f 349/372/943 734/752/943 350/373/943 +f 561/604/944 351/374/944 558/464/944 +f 349/372/945 732/750/945 734/752/945 +f 347/370/946 732/750/946 349/372/946 +f 561/604/947 421/465/947 351/374/947 +f 729/368/948 732/750/948 347/370/948 +f 564/607/949 421/465/949 561/604/949 +f 564/607/950 348/371/950 421/465/950 +f 564/607/951 346/369/951 348/371/951 +f 569/611/952 346/369/952 564/607/952 +f 569/611/953 345/367/953 346/369/953 +f 569/611/954 344/365/954 345/367/954 +f 577/619/955 344/365/955 569/611/955 +f 577/619/956 343/363/956 344/365/956 +f 577/619/957 342/361/957 343/363/957 +f 584/625/958 342/361/958 577/619/958 +f 584/625/959 341/358/959 342/361/959 +f 339/355/960 716/740/960 718/357/960 +f 584/625/961 340/356/961 341/358/961 +f 714/354/962 716/740/962 339/355/962 +f 423/468/963 340/356/963 584/625/963 +f 337/352/964 713/739/964 714/354/964 +f 595/636/965 338/353/965 423/468/965 +f 337/352/966 711/737/966 713/739/966 +f 335/350/967 711/737/967 337/352/967 +f 595/636/968 424/469/968 338/353/968 +f 335/350/969 709/735/969 711/737/969 +f 334/349/970 709/735/970 335/350/970 +f 602/643/971 336/351/971 424/469/971 +f 334/349/972 707/733/972 709/735/972 +f 332/347/973 707/733/973 334/349/973 +f 602/643/974 425/470/974 336/351/974 +f 704/345/975 707/733/975 332/347/975 +f 609/651/976 425/470/976 602/643/976 +f 609/651/977 333/348/977 425/470/977 +f 609/651/978 331/346/978 333/348/978 +f 618/659/979 331/346/979 609/651/979 +f 618/659/980 330/344/980 331/346/980 +f 618/659/981 329/342/981 330/344/981 +f 625/666/982 329/342/982 618/659/982 +f 625/666/983 328/340/983 329/342/983 +f 326/336/984 695/726/984 697/337/984 +f 625/666/985 327/338/985 328/340/985 +f 693/333/986 695/726/986 326/336/986 +f 632/673/987 327/338/987 625/666/987 +f 632/673/988 325/335/988 327/338/988 +f 323/332/989 691/722/989 693/333/989 +f 632/673/990 324/334/990 325/335/990 +f 322/330/991 691/722/991 323/332/991 +f 322/330/992 689/721/992 691/722/992 +f 324/334/993 632/673/993 427/472/993 +f 320/329/994 689/721/994 322/330/994 +f 320/329/995 688/720/995 689/721/995 +f 427/472/996 621/663/996 321/331/996 +f 320/329/997 686/718/997 688/720/997 +f 318/327/998 686/718/998 320/329/998 +f 321/331/999 621/663/999 426/471/999 +f 684/325/1000 686/718/1000 318/327/1000 +f 426/471/1001 621/663/1001 614/656/1001 +f 426/471/1002 614/656/1002 319/328/1002 +f 319/328/1003 614/656/1003 317/326/1003 +f 317/326/1004 614/656/1004 606/648/1004 +f 317/326/1005 606/648/1005 316/324/1005 +f 316/324/1006 606/648/1006 315/322/1006 +f 315/322/1007 606/648/1007 599/641/1007 +f 315/322/1008 599/641/1008 314/320/1008 +f 314/320/1009 599/641/1009 313/318/1009 +f 313/318/1010 599/641/1010 591/634/1010 +f 313/318/1011 591/634/1011 312/315/1011 +f 672/314/1012 310/312/1012 670/709/1012 +f 312/315/1013 591/634/1013 311/313/1013 +f 670/709/1014 310/312/1014 667/309/1014 +f 311/313/1015 591/634/1015 585/629/1015 +f 311/313/1016 585/629/1016 309/311/1016 +f 644/687/1017 640/680/1017 797/798/1017 +f 667/309/1018 307/308/1018 666/706/1018 +f 645/686/1019 640/680/1019 644/687/1019 +f 309/311/1020 585/629/1020 308/310/1020 +f 666/706/1021 307/308/1021 306/306/1021 +f 645/686/1022 648/679/1022 640/680/1022 +f 666/706/1023 306/306/1023 664/704/1023 +f 308/310/1024 585/629/1024 581/467/1024 +f 664/704/1025 306/306/1025 304/305/1025 +f 664/704/1026 304/305/1026 662/701/1026 +f 650/691/1027 635/676/1027 648/679/1027 +f 581/467/1028 574/615/1028 305/307/1028 +f 662/701/1029 304/305/1029 660/700/1029 +f 652/693/1030 635/676/1030 650/691/1030 +f 660/700/1031 304/305/1031 302/303/1031 +f 652/693/1032 798/799/1032 635/676/1032 +f 305/307/1033 574/615/1033 422/466/1033 +f 654/695/1034 798/799/1034 652/693/1034 +f 660/700/1035 302/303/1035 659/300/1035 +f 798/799/1036 636/677/1036 635/676/1036 +f 798/799/1037 799/800/1037 636/677/1037 +f 659/300/1038 300/302/1038 657/698/1038 +f 654/695/1039 799/800/1039 798/799/1039 +f 657/698/1040 300/302/1040 654/695/1040 +f 303/304/1041 422/466/1041 800/610/1041 +f 300/302/1042 799/800/1042 654/695/1042 +f 303/304/1043 800/610/1043 301/301/1043 +f 300/302/1044 800/610/1044 799/800/1044 +f 300/302/1045 301/301/1045 800/610/1045 +f 802/801/1046 803/802/1046 804/803/1046 +f 641/683/1047 643/685/1047 803/802/1047 +f 808/804/1048 807/805/1048 806/806/1048 +f 647/689/1049 641/683/1049 805/807/1049 +f 808/804/1050 809/808/1050 807/805/1050 +f 810/809/1051 809/808/1051 808/804/1051 +f 811/810/1052 809/808/1052 810/809/1052 +f 811/810/1053 812/811/1053 809/808/1053 +f 813/812/1054 812/811/1054 811/810/1054 +f 809/808/1055 647/689/1055 807/805/1055 +f 809/808/1056 651/692/1056 647/689/1056 +f 812/811/1057 651/692/1057 809/808/1057 +f 655/696/1058 651/692/1058 812/811/1058 +f 815/813/1059 816/814/1059 814/815/1059 +f 817/816/1060 816/814/1060 815/813/1060 +f 817/816/1061 818/817/1061 816/814/1061 +f 816/814/1062 658/699/1062 655/696/1062 +f 819/818/1063 818/817/1063 817/816/1063 +f 818/817/1064 658/699/1064 816/814/1064 +f 820/819/1065 821/820/1065 819/818/1065 +f 661/702/1066 658/699/1066 818/817/1066 +f 822/821/1067 821/820/1067 820/819/1067 +f 823/822/1068 824/823/1068 822/821/1068 +f 665/705/1069 661/702/1069 821/820/1069 +f 825/824/1070 826/825/1070 824/823/1070 +f 827/826/1071 826/825/1071 825/824/1071 +f 827/826/1072 828/827/1072 826/825/1072 +f 829/828/1073 828/827/1073 827/826/1073 +f 829/828/1074 830/829/1074 828/827/1074 +f 831/830/1075 830/829/1075 829/828/1075 +f 828/827/1076 669/708/1076 826/825/1076 +f 831/830/1077 832/831/1077 830/829/1077 +f 828/827/1078 673/711/1078 669/708/1078 +f 833/832/1079 832/831/1079 831/830/1079 +f 830/829/1080 673/711/1080 828/827/1080 +f 833/832/1081 834/833/1081 832/831/1081 +f 835/834/1082 834/833/1082 833/832/1082 +f 673/711/1083 830/829/1083 832/831/1083 +f 673/711/1084 832/831/1084 676/712/1084 +f 676/712/1085 832/831/1085 834/833/1085 +f 676/712/1086 834/833/1086 680/714/1086 +f 836/835/1087 837/836/1087 838/837/1087 +f 838/837/1088 839/838/1088 840/839/1088 +f 840/839/1089 839/838/1089 841/840/1089 +f 840/839/1090 841/840/1090 842/841/1090 +f 842/841/1091 841/840/1091 843/842/1091 +f 842/841/1092 843/842/1092 844/843/1092 +f 683/716/1093 840/839/1093 842/841/1093 +f 683/716/1094 842/841/1094 687/719/1094 +f 844/843/1095 843/842/1095 845/844/1095 +f 687/719/1096 842/841/1096 844/843/1096 +f 687/719/1097 844/843/1097 690/723/1097 +f 846/845/1098 847/846/1098 848/847/1098 +f 848/847/1099 847/846/1099 849/848/1099 +f 848/847/1100 849/848/1100 850/849/1100 +f 850/849/1101 849/848/1101 851/850/1101 +f 850/849/1102 851/850/1102 852/851/1102 +f 852/851/1103 851/850/1103 853/852/1103 +f 694/725/1104 848/847/1104 850/849/1104 +f 852/851/1105 853/852/1105 854/853/1105 +f 694/725/1106 850/849/1106 698/728/1106 +f 854/853/1107 853/852/1107 855/854/1107 +f 698/728/1108 850/849/1108 852/851/1108 +f 854/853/1109 855/854/1109 856/855/1109 +f 856/855/1110 855/854/1110 857/856/1110 +f 698/728/1111 852/851/1111 854/853/1111 +f 698/728/1112 854/853/1112 702/730/1112 +f 702/730/1113 854/853/1113 856/855/1113 +f 702/730/1114 856/855/1114 705/731/1114 +f 858/857/1115 859/858/1115 860/859/1115 +f 860/859/1116 861/860/1116 862/861/1116 +f 862/861/1117 861/860/1117 863/862/1117 +f 862/861/1118 863/862/1118 864/863/1118 +f 864/863/1119 863/862/1119 865/864/1119 +f 864/863/1120 865/864/1120 866/865/1120 +f 708/734/1121 862/861/1121 864/863/1121 +f 708/734/1122 864/863/1122 712/738/1122 +f 866/865/1123 865/864/1123 867/866/1123 +f 712/738/1124 864/863/1124 866/865/1124 +f 712/738/1125 866/865/1125 715/741/1125 +f 868/867/1126 869/868/1126 870/869/1126 +f 870/869/1127 869/868/1127 871/870/1127 +f 870/869/1128 871/870/1128 872/871/1128 +f 872/871/1129 871/870/1129 873/872/1129 +f 872/871/1130 873/872/1130 874/873/1130 +f 874/873/1131 873/872/1131 875/874/1131 +f 719/743/1132 870/869/1132 872/871/1132 +f 874/873/1133 875/874/1133 876/875/1133 +f 719/743/1134 872/871/1134 723/745/1134 +f 876/875/1135 875/874/1135 877/876/1135 +f 723/745/1136 872/871/1136 874/873/1136 +f 876/875/1137 877/876/1137 878/877/1137 +f 878/877/1138 877/876/1138 879/878/1138 +f 723/745/1139 874/873/1139 876/875/1139 +f 723/745/1140 876/875/1140 727/747/1140 +f 727/747/1141 876/875/1141 878/877/1141 +f 727/747/1142 878/877/1142 730/748/1142 +f 880/879/1143 881/880/1143 882/881/1143 +f 882/881/1144 883/882/1144 884/883/1144 +f 884/883/1145 883/882/1145 885/884/1145 +f 885/884/1146 886/885/1146 887/886/1146 +f 887/886/1147 886/885/1147 888/887/1147 +f 733/751/1148 884/883/1148 737/755/1148 +f 887/886/1149 888/887/1149 889/888/1149 +f 889/888/1150 888/887/1150 890/889/1150 +f 889/888/1151 890/889/1151 891/890/1151 +f 737/755/1152 887/886/1152 889/888/1152 +f 737/755/1153 889/888/1153 741/758/1153 +f 891/890/1154 892/891/1154 893/892/1154 +f 893/892/1155 892/891/1155 894/893/1155 +f 893/892/1156 894/893/1156 895/894/1156 +f 895/894/1157 894/893/1157 896/895/1157 +f 895/894/1158 896/895/1158 897/896/1158 +f 897/896/1159 896/895/1159 898/897/1159 +f 745/761/1160 893/892/1160 895/894/1160 +f 897/896/1161 898/897/1161 899/898/1161 +f 745/761/1162 895/894/1162 749/763/1162 +f 899/898/1163 898/897/1163 900/899/1163 +f 749/763/1164 895/894/1164 897/896/1164 +f 899/898/1165 900/899/1165 901/900/1165 +f 901/900/1166 900/899/1166 902/901/1166 +f 749/763/1167 897/896/1167 899/898/1167 +f 749/763/1168 899/898/1168 753/765/1168 +f 753/765/1169 899/898/1169 901/900/1169 +f 753/765/1170 901/900/1170 756/766/1170 +f 903/902/1171 904/903/1171 905/904/1171 +f 905/904/1172 906/905/1172 907/906/1172 +f 907/906/1173 906/905/1173 908/907/1173 +f 908/907/1174 909/908/1174 910/909/1174 +f 910/909/1175 909/908/1175 911/910/1175 +f 759/769/1176 907/906/1176 763/773/1176 +f 487/452/1177 418/459/1177 412/453/1177 +f 910/909/1178 911/910/1178 912/911/1178 +f 418/459/1179 477/524/1179 474/521/1179 +f 912/911/1180 911/910/1180 913/912/1180 +f 418/459/1181 474/521/1181 415/456/1181 +f 912/911/1182 913/912/1182 914/913/1182 +f 415/456/1183 474/521/1183 406/439/1183 +f 763/773/1184 910/909/1184 912/911/1184 +f 763/773/1185 912/911/1185 767/776/1185 +f 406/439/1186 463/509/1186 407/440/1186 +f 914/913/1187 915/914/1187 916/915/1187 +f 455/501/1188 450/499/1188 460/510/1188 +f 916/915/1189 915/914/1189 917/916/1189 +f 450/499/1190 407/440/1190 460/510/1190 +f 916/915/1191 917/916/1191 918/917/1191 +f 444/489/1192 408/441/1192 407/440/1192 +f 918/917/1193 917/916/1193 919/918/1193 +f 918/917/1194 919/918/1194 920/919/1194 +f 450/499/1195 444/489/1195 407/440/1195 +f 920/919/1196 919/918/1196 921/920/1196 +f 771/779/1197 916/915/1197 918/917/1197 +f 920/919/1198 921/920/1198 922/921/1198 +f 771/779/1199 918/917/1199 775/781/1199 +f 439/482/1200 437/484/1200 450/499/1200 +f 437/484/1201 444/489/1201 450/499/1201 +f 436/480/1202 437/484/1202 439/482/1202 +f 922/921/1203 921/920/1203 923/922/1203 +f 775/781/1204 918/917/1204 920/919/1204 +f 922/921/1205 923/922/1205 924/923/1205 +f 925/924/1206 430/475/1206 444/489/1206 +f 437/484/1207 925/924/1207 444/489/1207 +f 924/923/1208 923/922/1208 926/925/1208 +f 775/781/1209 920/919/1209 922/921/1209 +f 441/488/1210 925/924/1210 437/484/1210 +f 775/781/1211 922/921/1211 779/783/1211 +f 779/783/1212 922/921/1212 924/923/1212 +f 925/924/1213 428/473/1213 430/475/1213 +f 448/494/1214 925/924/1214 441/488/1214 +f 928/493/1215 428/473/1215 925/924/1215 +f 448/494/1216 454/500/1216 925/924/1216 +f 397/438/1217 398/450/1217 404/449/1217 +f 779/783/1218 924/923/1218 782/784/1218 +f 454/500/1219 928/493/1219 925/924/1219 +f 927/926/1220 929/927/1220 930/928/1220 +f 928/493/1221 438/486/1221 428/473/1221 +f 397/438/1222 404/449/1222 413/454/1222 +f 458/505/1223 928/493/1223 454/500/1223 +f 930/928/1224 931/929/1224 932/930/1224 +f 469/517/1225 397/438/1225 413/454/1225 +f 932/930/1226 931/929/1226 933/931/1226 +f 396/437/1227 397/438/1227 469/517/1227 +f 501/547/1228 469/517/1228 473/520/1228 +f 501/547/1229 396/437/1229 469/517/1229 +f 482/527/1230 501/547/1230 473/520/1230 +f 464/512/1231 928/493/1231 458/505/1231 +f 464/512/1232 459/506/1232 928/493/1232 +f 459/506/1233 453/498/1233 928/493/1233 +f 933/931/1234 934/932/1234 935/933/1234 +f 935/933/1235 934/932/1235 937/934/1235 +f 785/787/1236 932/930/1236 789/791/1236 +f 936/935/1237 459/506/1237 464/512/1237 +f 470/516/1238 936/935/1238 464/512/1238 +f 503/548/1239 482/527/1239 488/531/1239 +f 491/538/1240 503/548/1240 488/531/1240 +f 935/933/1241 937/934/1241 938/936/1241 +f 938/936/1242 937/934/1242 939/937/1242 +f 476/523/1243 936/935/1243 470/516/1243 +f 493/537/1244 503/548/1244 491/538/1244 +f 936/935/1245 466/513/1245 459/506/1245 +f 493/537/1246 504/549/1246 503/548/1246 +f 938/936/1247 939/937/1247 941/938/1247 +f 476/523/1248 940/939/1248 936/935/1248 +f 789/791/1249 935/933/1249 938/936/1249 +f 940/939/1250 466/513/1250 936/935/1250 +f 486/532/1251 940/939/1251 476/523/1251 +f 789/791/1252 938/936/1252 480/794/1252 +f 479/533/1253 941/938/1253 493/537/1253 +f 480/794/1254 941/938/1254 479/533/1254 +f 499/544/1255 796/796/1255 494/540/1255 +f 494/540/1256 940/939/1256 486/532/1256 +f 494/540/1257 466/513/1257 940/939/1257 +f 794/429/1258 796/796/1258 795/797/1258 +f 796/796/1259 480/794/1259 479/533/1259 +f 481/525/1260 796/796/1260 479/533/1260 +f 796/796/1261 466/513/1261 494/540/1261 +f 796/796/1262 481/525/1262 466/513/1262 +f 944/940/1263 943/941/1263 942/942/1263 +f 801/943/1264 944/940/1264 942/942/1264 +f 946/944/1265 944/940/1265 801/943/1265 +f 945/945/1266 946/944/1266 801/943/1266 +f 947/946/1267 946/944/1267 945/945/1267 +f 947/946/1268 948/947/1268 946/944/1268 +f 947/946/1269 950/948/1269 948/947/1269 +f 950/948/1270 949/949/1270 948/947/1270 +f 950/948/1271 952/950/1271 949/949/1271 +f 951/951/1272 952/950/1272 950/948/1272 +f 951/951/1273 953/952/1273 952/950/1273 +f 953/952/1274 954/953/1274 952/950/1274 +f 953/952/1275 956/954/1275 954/953/1275 +f 955/955/1276 956/954/1276 953/952/1276 +f 955/955/1277 957/956/1277 956/954/1277 +f 958/957/1278 957/956/1278 955/955/1278 +f 958/957/1279 959/958/1279 957/956/1279 +f 958/957/1280 961/959/1280 959/958/1280 +f 960/960/1281 962/961/1281 958/957/1281 +f 962/961/1282 961/959/1282 958/957/1282 +f 963/962/1283 962/961/1283 960/960/1283 +f 963/962/1284 964/963/1284 962/961/1284 +f 965/964/1285 964/963/1285 963/962/1285 +f 966/965/1286 965/964/1286 963/962/1286 +f 968/966/1287 965/964/1287 967/967/1287 +f 968/966/1288 1034/968/1288 965/964/1288 +f 941/938/1289 504/549/1289 493/537/1289 +f 941/938/1290 507/552/1290 504/549/1290 +f 939/937/1291 507/552/1291 941/938/1291 +f 939/937/1292 508/553/1292 507/552/1292 +f 937/934/1293 508/553/1293 939/937/1293 +f 937/934/1294 511/556/1294 508/553/1294 +f 934/932/1295 511/556/1295 937/934/1295 +f 934/932/1296 512/557/1296 511/556/1296 +f 933/931/1297 514/558/1297 934/932/1297 +f 514/558/1298 512/557/1298 934/932/1298 +f 931/929/1299 514/558/1299 933/931/1299 +f 931/929/1300 515/559/1300 514/558/1300 +f 929/927/1301 931/929/1301 930/928/1301 +f 929/927/1302 515/559/1302 931/929/1302 +f 929/927/1303 517/560/1303 515/559/1303 +f 926/925/1304 929/927/1304 927/926/1304 +f 929/927/1305 518/562/1305 517/560/1305 +f 926/925/1306 518/562/1306 929/927/1306 +f 926/925/1307 520/563/1307 518/562/1307 +f 923/922/1308 520/563/1308 926/925/1308 +f 923/922/1309 521/565/1309 520/563/1309 +f 921/920/1310 521/565/1310 923/922/1310 +f 919/918/1311 523/568/1311 921/920/1311 +f 523/568/1312 521/565/1312 921/920/1312 +f 917/916/1313 523/568/1313 919/918/1313 +f 917/916/1314 525/569/1314 523/568/1314 +f 915/914/1315 525/569/1315 917/916/1315 +f 915/914/1316 527/571/1316 525/569/1316 +f 914/913/1317 527/571/1317 915/914/1317 +f 914/913/1318 529/573/1318 527/571/1318 +f 913/912/1319 529/573/1319 914/913/1319 +f 913/912/1320 530/574/1320 529/573/1320 +f 911/910/1321 530/574/1321 913/912/1321 +f 911/910/1322 533/577/1322 530/574/1322 +f 909/908/1323 533/577/1323 911/910/1323 +f 909/908/1324 534/578/1324 533/577/1324 +f 908/907/1325 536/579/1325 909/908/1325 +f 536/579/1326 534/578/1326 909/908/1326 +f 906/905/1327 536/579/1327 908/907/1327 +f 906/905/1328 537/580/1328 536/579/1328 +f 904/903/1329 906/905/1329 905/904/1329 +f 904/903/1330 537/580/1330 906/905/1330 +f 904/903/1331 539/581/1331 537/580/1331 +f 902/901/1332 904/903/1332 903/902/1332 +f 904/903/1333 540/583/1333 539/581/1333 +f 902/901/1334 540/583/1334 904/903/1334 +f 902/901/1335 542/584/1335 540/583/1335 +f 900/899/1336 542/584/1336 902/901/1336 +f 900/899/1337 543/586/1337 542/584/1337 +f 898/897/1338 543/586/1338 900/899/1338 +f 896/895/1339 545/589/1339 898/897/1339 +f 545/589/1340 543/586/1340 898/897/1340 +f 894/893/1341 545/589/1341 896/895/1341 +f 894/893/1342 547/590/1342 545/589/1342 +f 892/891/1343 547/590/1343 894/893/1343 +f 892/891/1344 549/592/1344 547/590/1344 +f 891/890/1345 549/592/1345 892/891/1345 +f 891/890/1346 551/594/1346 549/592/1346 +f 890/889/1347 551/594/1347 891/890/1347 +f 890/889/1348 553/596/1348 551/594/1348 +f 888/887/1349 553/596/1349 890/889/1349 +f 888/887/1350 556/598/1350 553/596/1350 +f 886/885/1351 556/598/1351 888/887/1351 +f 886/885/1352 557/600/1352 556/598/1352 +f 885/884/1353 559/601/1353 886/885/1353 +f 559/601/1354 557/600/1354 886/885/1354 +f 883/882/1355 559/601/1355 885/884/1355 +f 883/882/1356 560/602/1356 559/601/1356 +f 881/880/1357 883/882/1357 882/881/1357 +f 881/880/1358 560/602/1358 883/882/1358 +f 881/880/1359 562/603/1359 560/602/1359 +f 879/878/1360 881/880/1360 880/879/1360 +f 881/880/1361 563/605/1361 562/603/1361 +f 879/878/1362 563/605/1362 881/880/1362 +f 879/878/1363 565/606/1363 563/605/1363 +f 877/876/1364 565/606/1364 879/878/1364 +f 877/876/1365 566/608/1365 565/606/1365 +f 875/874/1366 566/608/1366 877/876/1366 +f 873/872/1367 571/616/1367 875/874/1367 +f 571/616/1368 566/608/1368 875/874/1368 +f 871/870/1369 571/616/1369 873/872/1369 +f 871/870/1370 575/617/1370 571/616/1370 +f 869/868/1371 575/617/1371 871/870/1371 +f 869/868/1372 578/620/1372 575/617/1372 +f 868/867/1373 578/620/1373 869/868/1373 +f 868/867/1374 582/623/1374 578/620/1374 +f 867/866/1375 582/623/1375 868/867/1375 +f 867/866/1376 586/626/1376 582/623/1376 +f 867/866/1377 589/630/1377 586/626/1377 +f 865/864/1378 589/630/1378 867/866/1378 +f 865/864/1379 592/632/1379 589/630/1379 +f 863/862/1380 592/632/1380 865/864/1380 +f 863/862/1381 596/637/1381 592/632/1381 +f 861/860/1382 596/637/1382 863/862/1382 +f 861/860/1383 600/640/1383 596/637/1383 +f 859/858/1384 861/860/1384 860/859/1384 +f 859/858/1385 600/640/1385 861/860/1385 +f 859/858/1386 603/644/1386 600/640/1386 +f 857/856/1387 859/858/1387 858/857/1387 +f 859/858/1388 607/647/1388 603/644/1388 +f 857/856/1389 610/650/1389 859/858/1389 +f 610/650/1390 607/647/1390 859/858/1390 +f 855/854/1391 610/650/1391 857/856/1391 +f 855/854/1392 611/655/1392 610/650/1392 +f 853/852/1393 611/655/1393 855/854/1393 +f 853/852/1394 616/657/1394 611/655/1394 +f 851/850/1395 616/657/1395 853/852/1395 +f 851/850/1396 619/660/1396 616/657/1396 +f 849/848/1397 619/660/1397 851/850/1397 +f 849/848/1398 623/664/1398 619/660/1398 +f 847/846/1399 623/664/1399 849/848/1399 +f 847/846/1400 626/667/1400 623/664/1400 +f 846/845/1401 626/667/1401 847/846/1401 +f 846/845/1402 630/671/1402 626/667/1402 +f 845/844/1403 630/671/1403 846/845/1403 +f 845/844/1404 633/674/1404 630/671/1404 +f 845/844/1405 634/675/1405 633/674/1405 +f 843/842/1406 634/675/1406 845/844/1406 +f 634/675/1407 843/842/1407 631/672/1407 +f 971/969/1408 970/970/1408 969/971/1408 +f 631/672/1409 843/842/1409 841/840/1409 +f 631/672/1410 841/840/1410 627/668/1410 +f 971/969/1411 972/972/1411 970/970/1411 +f 627/668/1412 841/840/1412 839/838/1412 +f 627/668/1413 839/838/1413 624/665/1413 +f 837/836/1414 839/838/1414 838/837/1414 +f 973/973/1415 972/972/1415 971/969/1415 +f 967/967/1416 965/964/1416 966/965/1416 +f 624/665/1417 839/838/1417 837/836/1417 +f 624/665/1418 837/836/1418 620/661/1418 +f 973/973/1419 975/974/1419 972/972/1419 +f 976/975/1420 975/974/1420 973/973/1420 +f 974/976/1421 966/965/1421 963/962/1421 +f 974/976/1422 963/962/1422 977/977/1422 +f 835/834/1423 837/836/1423 836/835/1423 +f 835/834/1424 613/653/1424 837/836/1424 +f 620/661/1425 837/836/1425 617/658/1425 +f 976/975/1426 978/978/1426 975/974/1426 +f 617/658/1427 837/836/1427 613/653/1427 +f 979/979/1428 978/978/1428 976/975/1428 +f 833/832/1429 613/653/1429 835/834/1429 +f 833/832/1430 612/652/1430 613/653/1430 +f 977/977/1431 1033/980/1431 974/976/1431 +f 977/977/1432 980/981/1432 1033/980/1432 +f 977/977/1433 963/962/1433 960/960/1433 +f 979/979/1434 981/982/1434 978/978/1434 +f 831/830/1435 612/652/1435 833/832/1435 +f 982/983/1436 981/982/1436 979/979/1436 +f 831/830/1437 608/649/1437 612/652/1437 +f 983/984/1438 980/981/1438 977/977/1438 +f 977/977/1439 960/960/1439 984/985/1439 +f 829/828/1440 608/649/1440 831/830/1440 +f 829/828/1441 604/645/1441 608/649/1441 +f 982/983/1442 985/986/1442 981/982/1442 +f 984/985/1443 960/960/1443 986/987/1443 +f 984/985/1444 987/988/1444 983/984/1444 +f 988/989/1445 985/986/1445 982/983/1445 +f 960/960/1446 958/957/1446 989/990/1446 +f 827/826/1447 604/645/1447 829/828/1447 +f 986/987/1448 960/960/1448 989/990/1448 +f 827/826/1449 601/642/1449 604/645/1449 +f 986/987/1450 987/988/1450 984/985/1450 +f 986/987/1451 991/991/1451 987/988/1451 +f 990/992/1452 985/986/1452 988/989/1452 +f 989/990/1453 958/957/1453 955/955/1453 +f 825/824/1454 601/642/1454 827/826/1454 +f 825/824/1455 597/638/1455 601/642/1455 +f 992/993/1456 991/991/1456 986/987/1456 +f 990/992/1457 993/994/1457 985/986/1457 +f 989/990/1458 955/955/1458 994/995/1458 +f 824/823/1459 597/638/1459 825/824/1459 +f 824/823/1460 594/635/1460 597/638/1460 +f 995/996/1461 993/994/1461 990/992/1461 +f 994/995/1462 955/955/1462 953/952/1462 +f 995/996/1463 996/997/1463 993/994/1463 +f 823/822/1464 594/635/1464 824/823/1464 +f 989/990/1465 997/998/1465 992/993/1465 +f 994/995/1466 953/952/1466 951/951/1466 +f 594/635/1467 823/822/1467 590/631/1467 +f 994/995/1468 997/998/1468 989/990/1468 +f 999/999/1469 996/997/1469 995/996/1469 +f 822/821/1470 587/627/1470 823/822/1470 +f 999/999/1471 944/940/1471 996/997/1471 +f 820/819/1472 587/627/1472 822/821/1472 +f 590/631/1473 823/822/1473 587/627/1473 +f 994/995/1474 1000/1000/1474 997/998/1474 +f 998/1001/1475 994/995/1475 951/951/1475 +f 998/1001/1476 1000/1000/1476 994/995/1476 +f 1001/1002/1477 944/940/1477 999/999/1477 +f 1001/1002/1478 943/941/1478 944/940/1478 +f 998/1001/1479 951/951/1479 1002/1003/1479 +f 998/1001/1480 1003/1004/1480 1000/1000/1480 +f 1004/1005/1481 943/941/1481 1005/1006/1481 +f 587/627/1482 820/819/1482 583/624/1482 +f 1006/1007/1483 1003/1004/1483 998/1001/1483 +f 1007/1008/1484 943/941/1484 1001/1002/1484 +f 951/951/1485 950/948/1485 947/946/1485 +f 942/942/1486 943/941/1486 1004/1005/1486 +f 799/800/1487 1004/1005/1487 636/677/1487 +f 583/624/1488 820/819/1488 819/818/1488 +f 799/800/1489 942/942/1489 1004/1005/1489 +f 1002/1003/1490 951/951/1490 947/946/1490 +f 583/624/1491 819/818/1491 579/621/1491 +f 801/943/1492 799/800/1492 800/610/1492 +f 1002/1003/1493 947/946/1493 1008/1009/1493 +f 579/621/1494 819/818/1494 817/816/1494 +f 801/943/1495 942/942/1495 799/800/1495 +f 1002/1003/1496 1010/1010/1496 1006/1007/1496 +f 1008/1009/1497 947/946/1497 1009/1011/1497 +f 815/813/1498 573/613/1498 817/816/1498 +f 579/621/1499 817/816/1499 576/618/1499 +f 1008/1009/1500 1010/1010/1500 1002/1003/1500 +f 576/618/1501 817/816/1501 573/613/1501 +f 1009/1011/1502 947/946/1502 945/945/1502 +f 945/945/1503 801/943/1503 800/610/1503 +f 814/815/1504 573/613/1504 815/813/1504 +f 805/807/1505 1011/1012/1505 806/806/1505 +f 1009/1011/1506 945/945/1506 800/610/1506 +f 813/812/1507 570/1013/1507 814/815/1507 +f 573/613/1508 814/815/1508 568/614/1508 +f 1013/1014/1509 808/804/1509 806/806/1509 +f 568/614/1510 814/815/1510 570/1013/1510 +f 1014/1015/1511 1009/1011/1511 800/610/1511 +f 800/610/1512 567/609/1512 1015/1016/1512 +f 811/810/1513 570/1013/1513 813/812/1513 +f 1016/1017/1514 808/804/1514 1013/1014/1514 +f 1014/1015/1515 1017/1018/1515 1012/1019/1515 +f 1015/1016/1516 1014/1015/1516 800/610/1516 +f 567/609/1517 568/614/1517 1015/1016/1517 +f 1016/1017/1518 810/809/1518 808/804/1518 +f 568/614/1519 570/1013/1519 1015/1016/1519 +f 1016/1017/1520 811/810/1520 810/809/1520 +f 1018/1020/1521 1017/1018/1521 1014/1015/1521 +f 1014/1015/1522 1015/1016/1522 1018/1020/1522 +f 570/1013/1523 811/810/1523 1016/1017/1523 +f 1015/1016/1524 570/1013/1524 1016/1017/1524 +f 1018/1020/1525 1019/1021/1525 1017/1018/1525 +f 1018/1020/1526 1015/1016/1526 1016/1017/1526 +f 938/936/1527 941/938/1527 480/794/1527 +f 789/791/1528 933/931/1528 935/933/1528 +f 932/930/1529 933/931/1529 789/791/1529 +f 785/787/1530 930/928/1530 932/930/1530 +f 782/784/1531 930/928/1531 785/787/1531 +f 782/784/1532 927/926/1532 930/928/1532 +f 782/784/1533 926/925/1533 927/926/1533 +f 924/923/1534 926/925/1534 782/784/1534 +f 771/779/1535 914/913/1535 916/915/1535 +f 767/776/1536 914/913/1536 771/779/1536 +f 912/911/1537 914/913/1537 767/776/1537 +f 763/773/1538 908/907/1538 910/909/1538 +f 907/906/1539 908/907/1539 763/773/1539 +f 759/769/1540 905/904/1540 907/906/1540 +f 756/766/1541 905/904/1541 759/769/1541 +f 756/766/1542 903/902/1542 905/904/1542 +f 756/766/1543 902/901/1543 903/902/1543 +f 901/900/1544 902/901/1544 756/766/1544 +f 745/761/1545 891/890/1545 893/892/1545 +f 741/758/1546 891/890/1546 745/761/1546 +f 889/888/1547 891/890/1547 741/758/1547 +f 737/755/1548 885/884/1548 887/886/1548 +f 884/883/1549 885/884/1549 737/755/1549 +f 733/751/1550 882/881/1550 884/883/1550 +f 730/748/1551 882/881/1551 733/751/1551 +f 730/748/1552 880/879/1552 882/881/1552 +f 730/748/1553 879/878/1553 880/879/1553 +f 878/877/1554 879/878/1554 730/748/1554 +f 719/743/1555 868/867/1555 870/869/1555 +f 715/741/1556 868/867/1556 719/743/1556 +f 715/741/1557 867/866/1557 868/867/1557 +f 866/865/1558 867/866/1558 715/741/1558 +f 708/734/1559 860/859/1559 862/861/1559 +f 705/731/1560 860/859/1560 708/734/1560 +f 705/731/1561 858/857/1561 860/859/1561 +f 705/731/1562 857/856/1562 858/857/1562 +f 856/855/1563 857/856/1563 705/731/1563 +f 694/725/1564 846/845/1564 848/847/1564 +f 690/723/1565 846/845/1565 694/725/1565 +f 690/723/1566 845/844/1566 846/845/1566 +f 844/843/1567 845/844/1567 690/723/1567 +f 683/716/1568 838/837/1568 840/839/1568 +f 680/714/1569 838/837/1569 683/716/1569 +f 680/714/1570 836/835/1570 838/837/1570 +f 680/714/1571 835/834/1571 836/835/1571 +f 834/833/1572 835/834/1572 680/714/1572 +f 826/825/1573 669/708/1573 824/823/1573 +f 824/823/1574 669/708/1574 665/705/1574 +f 824/823/1575 665/705/1575 822/821/1575 +f 1012/1019/1576 1009/1011/1576 1014/1015/1576 +f 822/821/1577 665/705/1577 821/820/1577 +f 1008/1009/1578 1009/1011/1578 1012/1019/1578 +f 946/944/1579 996/997/1579 944/940/1579 +f 821/820/1580 661/702/1580 819/818/1580 +f 948/947/1581 993/994/1581 946/944/1581 +f 819/818/1582 661/702/1582 818/817/1582 +f 993/994/1583 996/997/1583 946/944/1583 +f 949/949/1584 993/994/1584 948/947/1584 +f 949/949/1585 985/986/1585 993/994/1585 +f 1010/1010/1586 1008/1009/1586 990/992/1586 +f 1006/1007/1587 998/1001/1587 1002/1003/1587 +f 990/992/1588 1008/1009/1588 1012/1019/1588 +f 990/992/1589 1012/1019/1589 995/996/1589 +f 816/814/1590 655/696/1590 814/815/1590 +f 952/950/1591 985/986/1591 949/949/1591 +f 995/996/1592 1012/1019/1592 1017/1018/1592 +f 990/992/1593 988/989/1593 1010/1010/1593 +f 988/989/1594 1006/1007/1594 1010/1010/1594 +f 814/815/1595 655/696/1595 813/812/1595 +f 813/812/1596 655/696/1596 812/811/1596 +f 952/950/1597 981/982/1597 985/986/1597 +f 995/996/1598 1017/1018/1598 999/999/1598 +f 1003/1004/1599 1006/1007/1599 988/989/1599 +f 954/953/1600 981/982/1600 952/950/1600 +f 982/983/1601 1003/1004/1601 988/989/1601 +f 999/999/1602 1017/1018/1602 1019/1021/1602 +f 999/999/1603 1019/1021/1603 1001/1002/1603 +f 956/954/1604 981/982/1604 954/953/1604 +f 1019/1021/1605 1018/1020/1605 1020/1022/1605 +f 1016/1017/1606 1020/1022/1606 1018/1020/1606 +f 982/983/1607 1000/1000/1607 1003/1004/1607 +f 956/954/1608 978/978/1608 981/982/1608 +f 1013/1014/1609 1020/1022/1609 1016/1017/1609 +f 979/979/1610 1000/1000/1610 982/983/1610 +f 992/993/1611 986/987/1611 989/990/1611 +f 957/956/1612 978/978/1612 956/954/1612 +f 1001/1002/1613 1019/1021/1613 1020/1022/1613 +f 979/979/1614 997/998/1614 1000/1000/1614 +f 1004/1005/1615 637/678/1615 636/677/1615 +f 1001/1002/1616 1020/1022/1616 1007/1008/1616 +f 1020/1022/1617 1013/1014/1617 1021/1023/1617 +f 975/974/1618 978/978/1618 957/956/1618 +f 1013/1014/1619 806/806/1619 1011/1012/1619 +f 1004/1005/1620 1005/1006/1620 637/678/1620 +f 1007/1008/1621 1005/1006/1621 943/941/1621 +f 1021/1023/1622 1013/1014/1622 1011/1012/1622 +f 976/975/1623 997/998/1623 979/979/1623 +f 959/958/1624 975/974/1624 957/956/1624 +f 1021/1023/1625 1007/1008/1625 1020/1022/1625 +f 807/805/1626 647/689/1626 806/806/1626 +f 806/806/1627 647/689/1627 805/807/1627 +f 637/678/1628 1005/1006/1628 638/681/1628 +f 976/975/1629 992/993/1629 997/998/1629 +f 959/958/1630 972/972/1630 975/974/1630 +f 1007/1008/1631 638/681/1631 1005/1006/1631 +f 1011/1012/1632 1022/1024/1632 1021/1023/1632 +f 973/973/1633 992/993/1633 976/975/1633 +f 1022/1024/1634 638/681/1634 1007/1008/1634 +f 1022/1024/1635 1007/1008/1635 1021/1023/1635 +f 1023/1025/1636 1022/1024/1636 1011/1012/1636 +f 802/801/1637 1011/1012/1637 805/807/1637 +f 983/984/1638 977/977/1638 984/985/1638 +f 961/959/1639 972/972/1639 959/958/1639 +f 802/801/1640 1023/1025/1640 1011/1012/1640 +f 973/973/1641 991/991/1641 992/993/1641 +f 805/807/1642 641/683/1642 802/801/1642 +f 639/682/1643 1024/1026/1643 640/680/1643 +f 1023/1025/1644 1025/1027/1644 1022/1024/1644 +f 640/680/1645 1024/1026/1645 797/798/1645 +f 1025/1027/1646 638/681/1646 1022/1024/1646 +f 971/969/1647 991/991/1647 973/973/1647 +f 1025/1027/1648 639/682/1648 638/681/1648 +f 1026/1028/1649 1025/1027/1649 1023/1025/1649 +f 802/801/1650 641/683/1650 803/802/1650 +f 802/801/1651 1026/1028/1651 1023/1025/1651 +f 1027/1029/1652 642/684/1652 644/687/1652 +f 642/684/1653 967/967/1653 966/965/1653 +f 961/959/1654 970/970/1654 972/972/1654 +f 804/803/1655 1026/1028/1655 802/801/1655 +f 642/684/1656 966/965/1656 643/685/1656 +f 1027/1029/1657 644/687/1657 797/798/1657 +f 1027/1029/1658 967/967/1658 642/684/1658 +f 962/961/1659 970/970/1659 961/959/1659 +f 1024/1026/1660 639/682/1660 1028/1030/1660 +f 971/969/1661 987/988/1661 991/991/1661 +f 643/685/1662 966/965/1662 974/976/1662 +f 1025/1027/1663 1028/1030/1663 639/682/1663 +f 1029/1031/1664 1026/1028/1664 804/803/1664 +f 1029/1031/1665 1028/1030/1665 1025/1027/1665 +f 1029/1031/1666 1025/1027/1666 1026/1028/1666 +f 803/802/1667 643/685/1667 1030/1032/1667 +f 797/798/1668 968/966/1668 1027/1029/1668 +f 1027/1029/1669 968/966/1669 967/967/1669 +f 1024/1026/1670 1028/1030/1670 797/798/1670 +f 969/971/1671 987/988/1671 971/969/1671 +f 803/802/1672 1030/1032/1672 804/803/1672 +f 964/963/1673 970/970/1673 962/961/1673 +f 804/803/1674 1030/1032/1674 1029/1031/1674 +f 969/971/1675 983/984/1675 987/988/1675 +f 797/798/1676 1028/1030/1676 968/966/1676 +f 974/976/1677 1030/1032/1677 643/685/1677 +f 968/966/1678 1028/1030/1678 1031/1033/1678 +f 1032/1034/1679 1028/1030/1679 1029/1031/1679 +f 965/964/1680 1034/968/1680 964/963/1680 +f 964/963/1681 1034/968/1681 970/970/1681 +f 969/971/1682 970/970/1682 1035/1035/1682 +f 1032/1034/1683 1031/1033/1683 1028/1030/1683 +f 1030/1032/1684 1032/1034/1684 1029/1031/1684 +f 980/981/1685 983/984/1685 969/971/1685 +f 974/976/1686 1033/980/1686 1030/1032/1686 +f 1035/1035/1687 970/970/1687 1034/968/1687 +f 1033/980/1688 1032/1034/1688 1030/1032/1688 +f 1035/1035/1689 980/981/1689 969/971/1689 +f 968/966/1690 1031/1033/1690 1034/968/1690 +f 1035/1035/1691 1034/968/1691 1031/1033/1691 +f 1035/1035/1692 1033/980/1692 980/981/1692 +f 1035/1035/1693 1031/1033/1693 1032/1034/1693 +f 1033/980/1694 1035/1035/1694 1032/1034/1694 +f 1398/1036/220 1037/1037/220 1036/1038/220 +f 1038/1039/1695 1037/1037/1695 1398/1036/1695 +f 1038/1039/222 1039/1040/222 1037/1037/222 +f 1040/1041/223 1039/1040/223 1038/1039/223 +f 1042/1042/1696 1041/1043/1696 1040/1041/1696 +f 1042/1042/225 1043/1044/225 1041/1043/225 +f 1406/1045/1697 1044/1046/1697 1043/1044/1697 +f 1406/1045/1698 1045/1047/1698 1044/1046/1698 +f 1046/1048/1699 1045/1047/1699 1406/1045/1699 +f 1046/1048/229 1047/1049/229 1045/1047/229 +f 1411/1050/1700 1047/1049/1700 1046/1048/1700 +f 1411/1050/1701 1048/1051/1701 1047/1049/1701 +f 1413/1052/232 1048/1051/232 1411/1050/232 +f 1414/1053/1702 1048/1051/1702 1413/1052/1702 +f 1414/1053/234 1049/1054/234 1048/1051/234 +f 1416/1055/1703 1049/1054/1703 1414/1053/1703 +f 1416/1055/1704 1050/1056/1704 1049/1054/1704 +f 1418/1057/1705 1050/1056/1705 1416/1055/1705 +f 1418/1057/238 1051/1058/238 1050/1056/238 +f 1421/1059/1706 1051/1058/1706 1418/1057/1706 +f 1421/1059/1707 1052/1060/1707 1051/1058/1707 +f 1423/1061/241 1052/1060/241 1421/1059/241 +f 1423/1061/1708 1053/1062/1708 1052/1060/1708 +f 1054/1063/243 1053/1062/243 1423/1061/243 +f 1054/1063/1709 1055/1064/1709 1053/1062/1709 +f 1056/1065/245 1055/1064/245 1054/1063/245 +f 1058/1066/246 1057/1067/246 1056/1065/246 +f 1058/1066/247 1059/1068/247 1057/1067/247 +f 1432/1069/1710 1060/1070/1710 1059/1068/1710 +f 1060/1070/249 1432/1069/249 1061/1071/249 +f 1061/1071/1711 1432/1069/1711 1062/1072/1711 +f 1061/1071/1712 1062/1072/1712 1436/1073/1712 +f 1061/1071/1713 1436/1073/1713 1063/1074/1713 +f 1063/1074/253 1436/1073/253 1438/1075/253 +f 1063/1074/254 1438/1075/254 1064/1076/254 +f 1064/1076/255 1438/1075/255 1440/1077/255 +f 1064/1076/1714 1440/1077/1714 1065/1078/1714 +f 1065/1078/257 1440/1077/257 1442/1079/257 +f 1065/1078/1715 1442/1079/1715 1066/1080/1715 +f 1066/1080/259 1442/1079/259 1443/1081/259 +f 1066/1080/260 1443/1081/260 1067/1082/260 +f 1067/1082/1716 1443/1081/1716 1068/1083/1716 +f 1067/1082/262 1068/1083/262 1069/1084/262 +f 1069/1084/1717 1068/1083/1717 1070/1085/1717 +f 1070/1085/1718 1071/1086/1718 1072/1087/1718 +f 1072/1087/1719 1071/1086/1719 1073/1088/1719 +f 1074/1089/1720 1073/1088/1720 1075/1090/1720 +f 1074/1089/1721 1075/1090/1721 1076/1091/1721 +f 1077/1092/1722 1076/1091/1722 1457/1093/1722 +f 1077/1092/269 1457/1093/269 1078/1094/269 +f 1078/1094/270 1457/1093/270 1459/1095/270 +f 1078/1094/271 1459/1095/271 1461/1096/271 +f 1078/1094/1723 1461/1096/1723 1079/1097/1723 +f 1079/1097/273 1461/1096/273 1463/1098/273 +f 1079/1097/274 1463/1098/274 1080/1099/274 +f 1080/1099/275 1463/1098/275 1465/1100/275 +f 1080/1099/1724 1465/1100/1724 1081/1101/1724 +f 1081/1101/1725 1465/1100/1725 1467/1102/1725 +f 1081/1101/278 1467/1102/278 1082/1103/278 +f 1082/1103/1726 1467/1102/1726 1468/1104/1726 +f 1082/1103/280 1468/1104/280 1083/1105/280 +f 1083/1105/1727 1468/1104/1727 1084/1106/1727 +f 1083/1105/1728 1084/1106/1728 1085/1107/1728 +f 1085/1107/1729 1084/1106/1729 1086/1108/1729 +f 1086/1108/284 1087/1109/284 1088/1110/284 +f 1088/1110/1730 1087/1109/1730 1089/1111/1730 +f 1090/1112/1731 1089/1111/1731 1479/1113/1731 +f 1090/1112/1732 1479/1113/1732 1091/1114/1732 +f 1091/1114/1733 1479/1113/1733 1092/1115/1733 +f 1091/1114/1734 1092/1115/1734 1093/1116/1734 +f 1093/1116/1735 1092/1115/1735 1483/1117/1735 +f 1093/1116/291 1483/1117/291 1094/1118/291 +f 1094/1118/292 1483/1117/292 1485/1119/292 +f 1094/1118/1736 1485/1119/1736 1487/1120/1736 +f 1094/1118/294 1487/1120/294 1095/1121/294 +f 1095/1121/295 1487/1120/295 1489/1122/295 +f 1095/1121/296 1489/1122/296 1096/1123/296 +f 1096/1123/1737 1489/1122/1737 1491/1124/1737 +f 1096/1123/298 1491/1124/298 1097/1125/298 +f 1097/1125/299 1491/1124/299 1493/1126/299 +f 1097/1125/1738 1493/1126/1738 1098/1127/1738 +f 1098/1127/1739 1493/1126/1739 1494/1128/1739 +f 1098/1127/1740 1494/1128/1740 1099/1129/1740 +f 1099/1129/1741 1494/1128/1741 1100/1130/1741 +f 1099/1129/304 1100/1130/304 1101/1131/304 +f 1101/1131/1742 1100/1130/1742 1102/1132/1742 +f 1102/1132/306 1103/1133/306 1104/1134/306 +f 1104/1134/1743 1103/1133/1743 1105/1135/1743 +f 1106/1136/1744 1105/1135/1744 1505/1137/1744 +f 1106/1136/309 1505/1137/309 1107/1138/309 +f 1107/1138/1745 1505/1137/1745 1108/1139/1745 +f 1107/1138/1746 1108/1139/1746 1109/1140/1746 +f 1109/1140/312 1108/1139/312 1509/1141/312 +f 1109/1140/313 1509/1141/313 1110/1142/313 +f 1110/1142/314 1509/1141/314 1511/1143/314 +f 1110/1142/315 1511/1143/315 1513/1144/315 +f 1110/1142/316 1513/1144/316 1111/1145/316 +f 1111/1145/1747 1513/1144/1747 1515/1146/1747 +f 1111/1145/1748 1515/1146/1748 1112/1147/1748 +f 1112/1147/1749 1515/1146/1749 1517/1148/1749 +f 1112/1147/1750 1517/1148/1750 1113/1149/1750 +f 1113/1149/1751 1517/1148/1751 1519/1150/1751 +f 1113/1149/1752 1519/1150/1752 1114/1151/1752 +f 1114/1151/1753 1519/1150/1753 1520/1152/1753 +f 1114/1151/1754 1520/1152/1754 1115/1153/1754 +f 1115/1153/1755 1520/1152/1755 1116/1154/1755 +f 1115/1153/326 1116/1154/326 1117/1155/326 +f 1117/1155/1756 1116/1154/1756 1118/1156/1756 +f 1118/1156/1757 1119/1157/1757 1120/1158/1757 +f 1120/1158/329 1119/1157/329 1121/1159/329 +f 1122/1160/1758 1121/1159/1758 1531/1161/1758 +f 1122/1160/331 1531/1161/331 1123/1162/331 +f 1123/1162/332 1531/1161/332 1124/1163/332 +f 1123/1162/1759 1124/1163/1759 1125/1164/1759 +f 1125/1164/334 1124/1163/334 1533/1165/334 +f 1125/1164/335 1533/1165/335 1127/1166/335 +f 1127/1166/336 1533/1165/336 1126/1167/336 +f 1127/1166/1760 1126/1167/1760 1128/1168/1760 +f 1127/1166/338 1128/1168/338 1129/1169/338 +f 1129/1169/339 1128/1168/339 1130/1170/339 +f 1129/1169/340 1130/1170/340 1131/1171/340 +f 1131/1171/1761 1130/1170/1761 1132/1172/1761 +f 1131/1171/342 1132/1172/342 1133/1173/342 +f 1133/1173/1762 1132/1172/1762 1134/1174/1762 +f 1143/1175/1763 1144/1176/1763 1145/1177/1763 +f 1147/1178/345 1143/1175/345 1146/1179/345 +f 1140/1180/1764 1139/1181/1764 1136/1182/1764 +f 1142/1183/1765 1141/1184/1765 1135/1185/1765 +f 1138/1186/350 1147/1178/350 1146/1179/350 +f 1226/1187/1766 1148/1188/1766 1140/1180/1766 +f 1150/1189/1767 1141/1184/1767 1142/1183/1767 +f 1149/1190/1768 1141/1184/1768 1150/1189/1768 +f 1151/1191/353 1143/1175/353 1147/1178/353 +f 1137/1192/354 1147/1178/354 1138/1186/354 +f 1148/1188/1769 1139/1181/1769 1140/1180/1769 +f 1142/1183/1770 1139/1181/1770 1150/1189/1770 +f 1152/1193/1771 1139/1181/1771 1148/1188/1771 +f 1152/1193/1772 1151/1191/1772 1147/1178/1772 +f 1137/1192/360 1152/1193/360 1147/1178/360 +f 1150/1189/1773 1139/1181/1773 1152/1193/1773 +f 1150/1189/1774 1152/1193/1774 1137/1192/1774 +f 1152/1193/1775 1148/1188/1775 1151/1191/1775 +f 1148/1188/1776 1154/1194/1776 1151/1191/1776 +f 1253/1195/1777 1121/1159/1777 1122/1160/1777 +f 1120/1158/1778 1121/1159/1778 1253/1195/1778 +f 1155/1196/1779 1118/1156/1779 1120/1158/1779 +f 1155/1196/1780 1117/1155/1780 1118/1156/1780 +f 1275/1197/1781 1105/1135/1781 1106/1136/1781 +f 1104/1134/1782 1105/1135/1782 1275/1197/1782 +f 1156/1198/1783 1102/1132/1783 1104/1134/1783 +f 1156/1198/372 1101/1131/372 1102/1132/372 +f 1298/1199/1784 1089/1111/1784 1090/1112/1784 +f 1088/1110/1785 1089/1111/1785 1298/1199/1785 +f 1157/1200/375 1086/1108/375 1088/1110/375 +f 1157/1200/376 1085/1107/376 1086/1108/376 +f 1040/1041/377 1158/1201/377 1039/1040/377 +f 1041/1043/378 1158/1201/378 1040/1041/378 +f 1043/1044/379 1321/1202/379 1041/1043/379 +f 1044/1046/1786 1321/1202/1786 1043/1044/1786 +f 1159/1203/1787 1076/1091/1787 1077/1092/1787 +f 1074/1089/1788 1076/1091/1788 1159/1203/1788 +f 1160/1204/1789 1073/1088/1789 1074/1089/1789 +f 1072/1087/1790 1073/1088/1790 1160/1204/1790 +f 1161/1205/1791 1070/1085/1791 1072/1087/1791 +f 1161/1205/386 1069/1084/386 1070/1085/386 +f 1056/1065/387 1162/1206/387 1055/1064/387 +f 1057/1067/388 1162/1206/388 1056/1065/388 +f 1059/1068/1792 1369/1207/1792 1057/1067/1792 +f 1060/1070/1793 1369/1207/1793 1059/1068/1793 +f 1163/1208/1794 1164/1209/1794 1165/1210/1794 +f 1163/1208/1795 1166/1211/1795 1164/1209/1795 +f 1166/1211/1796 1167/1212/1796 1164/1209/1796 +f 1165/1210/1797 1164/1209/1797 1169/1213/1797 +f 1164/1209/1798 1167/1212/1798 1169/1213/1798 +f 1172/1214/1799 1171/1215/1799 1163/1208/1799 +f 1168/1216/1800 1167/1212/1800 1166/1211/1800 +f 1168/1216/1801 1170/1217/1801 1658/1218/1801 +f 1169/1213/1802 1167/1212/1802 1173/1219/1802 +f 1168/1216/1803 1166/1211/1803 1174/1220/1803 +f 1168/1216/1804 1173/1219/1804 1167/1212/1804 +f 1174/1220/1805 1170/1217/1805 1168/1216/1805 +f 1171/1215/1806 1166/1211/1806 1163/1208/1806 +f 1168/1216/1807 1658/1218/1807 1176/1221/1807 +f 1178/1222/1808 1173/1219/1808 1168/1216/1808 +f 1174/1220/1809 1175/1223/1809 1170/1217/1809 +f 1172/1214/1810 1179/1224/1810 1171/1215/1810 +f 1171/1215/1811 1180/1225/1811 1166/1211/1811 +f 1168/1216/1812 1176/1221/1812 1178/1222/1812 +f 1169/1213/1813 1177/1226/1813 1181/1227/1813 +f 1169/1213/1814 1173/1219/1814 1177/1226/1814 +f 1182/1228/1815 1179/1224/1815 1172/1214/1815 +f 1174/1220/1816 1166/1211/1816 1180/1225/1816 +f 1179/1224/1817 1180/1225/1817 1171/1215/1817 +f 1178/1222/1818 1176/1221/1818 1184/1229/1818 +f 1181/1227/1819 1177/1226/1819 1185/1230/1819 +f 1177/1226/1820 1173/1219/1820 1188/1231/1820 +f 1174/1220/1821 1183/1232/1821 1175/1223/1821 +f 1174/1220/405 1180/1225/405 1186/1233/405 +f 1178/1222/1822 1188/1231/1822 1173/1219/1822 +f 1186/1233/1823 1183/1232/1823 1174/1220/1823 +f 1185/1230/1824 1177/1226/1824 1188/1231/1824 +f 1182/1228/1825 1189/1234/1825 1179/1224/1825 +f 1179/1224/1826 1190/1235/1826 1180/1225/1826 +f 1185/1230/1827 1188/1231/1827 1145/1177/1827 +f 1146/1179/1828 1143/1175/1828 1191/1236/1828 +f 1192/1237/1829 1189/1234/1829 1182/1228/1829 +f 1186/1233/405 1180/1225/405 1190/1235/405 +f 1145/1177/1830 1188/1231/1830 1191/1236/1830 +f 1194/1238/1831 1188/1231/1831 1178/1222/1831 +f 1186/1233/1832 1193/1239/1832 1183/1232/1832 +f 1178/1222/1833 1184/1229/1833 1194/1238/1833 +f 1194/1238/1834 1191/1236/1834 1188/1231/1834 +f 1189/1234/1835 1190/1235/1835 1179/1224/1835 +f 1184/1229/1836 1187/1240/1836 1195/1241/1836 +f 1194/1238/1837 1184/1229/1837 1195/1241/1837 +f 1186/1233/1838 1190/1235/1838 1196/1242/1838 +f 1196/1242/1839 1193/1239/1839 1186/1233/1839 +f 1137/1192/1840 1153/1243/1840 1150/1189/1840 +f 1138/1186/1841 1191/1236/1841 1194/1238/1841 +f 1138/1186/1842 1146/1179/1842 1191/1236/1842 +f 1197/1244/1843 1199/1245/1843 1192/1237/1843 +f 1189/1234/1844 1200/1246/1844 1190/1235/1844 +f 1194/1238/1845 1195/1241/1845 1138/1186/1845 +f 1199/1245/1846 1189/1234/1846 1192/1237/1846 +f 1196/1242/1847 1190/1235/1847 1200/1246/1847 +f 1201/1247/1848 1198/1248/1848 1144/1176/1848 +f 1149/1190/1849 1150/1189/1849 1153/1243/1849 +f 1196/1242/1850 1200/1246/1850 1202/1249/1850 +f 1196/1242/1851 1203/1250/1851 1193/1239/1851 +f 1199/1245/1852 1200/1246/1852 1189/1234/1852 +f 1204/1251/446 1195/1241/446 1198/1248/446 +f 1197/1244/1853 1205/1252/1853 1199/1245/1853 +f 1204/1251/1854 1138/1186/1854 1195/1241/1854 +f 1201/1247/1855 1204/1251/1855 1198/1248/1855 +f 1204/1251/450 1137/1192/450 1138/1186/450 +f 1206/1253/1856 1203/1250/1856 1196/1242/1856 +f 1202/1249/1857 1206/1253/1857 1196/1242/1857 +f 1153/1243/452 1137/1192/452 1204/1251/452 +f 1199/1245/1858 1207/1254/1858 1200/1246/1858 +f 1208/1255/454 1153/1243/454 1204/1251/454 +f 1208/1255/1859 1149/1190/1859 1153/1243/1859 +f 1205/1252/1860 1207/1254/1860 1199/1245/1860 +f 1202/1249/1861 1200/1246/1861 1207/1254/1861 +f 1209/1256/457 1149/1190/457 1208/1255/457 +f 1202/1249/1862 1207/1254/1862 1206/1253/1862 +f 1206/1253/1863 1210/1257/1863 1203/1250/1863 +f 1201/1247/460 1208/1255/460 1204/1251/460 +f 1211/1258/462 1209/1256/462 1208/1255/462 +f 1212/1259/1864 1205/1252/1864 1197/1244/1864 +f 1213/1260/465 1201/1247/465 1143/1175/465 +f 1212/1259/1865 1214/1261/1865 1205/1252/1865 +f 1211/1258/1866 1208/1255/1866 1201/1247/1866 +f 1206/1253/1867 1207/1254/1867 1215/1262/1867 +f 1215/1262/1868 1210/1257/1868 1206/1253/1868 +f 1217/1263/1869 1211/1258/1869 1201/1247/1869 +f 1221/1264/1870 1214/1261/1870 1212/1259/1870 +f 1214/1261/1871 1207/1254/1871 1205/1252/1871 +f 1217/1263/472 1201/1247/472 1213/1260/472 +f 1215/1262/1872 1216/1265/1872 1210/1257/1872 +f 1218/1266/1873 1211/1258/1873 1217/1263/1873 +f 1222/1267/1874 1211/1258/1874 1218/1266/1874 +f 1214/1261/1875 1223/1268/1875 1207/1254/1875 +f 1224/1269/475 1222/1267/475 1218/1266/475 +f 1215/1262/1876 1207/1254/1876 1223/1268/1876 +f 1226/1187/480 1218/1266/480 1217/1263/480 +f 1227/1270/481 1222/1267/481 1224/1269/481 +f 1226/1187/483 1217/1263/483 1154/1194/483 +f 1215/1262/1877 1225/1271/1877 1216/1265/1877 +f 1224/1269/1878 1218/1266/1878 1226/1187/1878 +f 1219/1272/486 1228/1273/486 1221/1264/486 +f 1221/1264/1879 1229/1274/1879 1214/1261/1879 +f 1215/1262/1861 1223/1268/1861 1230/1275/1861 +f 1230/1275/1880 1225/1271/1880 1215/1262/1880 +f 1228/1273/488 1229/1274/488 1221/1264/488 +f 1229/1274/1881 1223/1268/1881 1214/1261/1881 +f 1232/1276/489 1219/1272/489 1233/1277/489 +f 1136/1182/1882 1227/1270/1882 1224/1269/1882 +f 1230/1275/1883 1223/1268/1883 1229/1274/1883 +f 1226/1187/1884 1140/1180/1884 1136/1182/1884 +f 1230/1275/1885 1234/1278/1885 1225/1271/1885 +f 1231/1279/1886 1227/1270/1886 1136/1182/1886 +f 1232/1276/1887 1233/1277/1887 1231/1279/1887 +f 1219/1272/495 1232/1276/495 1228/1273/495 +f 1136/1182/1888 1224/1269/1888 1226/1187/1888 +f 1231/1279/1889 1235/1280/1889 1232/1276/1889 +f 1228/1273/1890 1236/1281/1890 1229/1274/1890 +f 1230/1275/1891 1229/1274/1891 1236/1281/1891 +f 1235/1280/1892 1231/1279/1892 1136/1182/1892 +f 1232/1276/1893 1237/1282/1893 1228/1273/1893 +f 1230/1275/1894 1236/1281/1894 1238/1283/1894 +f 1238/1283/1895 1234/1278/1895 1230/1275/1895 +f 1235/1280/1896 1237/1282/1896 1232/1276/1896 +f 1237/1282/1897 1236/1281/1897 1228/1273/1897 +f 1132/1172/508 1135/1185/508 1134/1174/508 +f 1235/1280/1898 1136/1182/1898 1237/1282/1898 +f 1239/1284/1899 1130/1170/1899 1128/1168/1899 +f 1238/1283/1900 1239/1284/1900 1234/1278/1900 +f 1238/1283/1901 1236/1281/1901 1237/1282/1901 +f 1240/1285/1902 1130/1170/1902 1239/1284/1902 +f 1142/1183/1903 1135/1185/1903 1240/1285/1903 +f 1136/1182/1904 1139/1181/1904 1237/1282/1904 +f 1240/1285/515 1135/1185/515 1132/1172/515 +f 1142/1183/1905 1237/1282/1905 1139/1181/1905 +f 1132/1172/1906 1130/1170/1906 1240/1285/1906 +f 1238/1283/1907 1237/1282/1907 1142/1183/1907 +f 1238/1283/1908 1240/1285/1908 1239/1284/1908 +f 1142/1183/1909 1240/1285/1909 1238/1283/1909 +f 1242/1286/521 1241/1287/521 1222/1267/521 +f 1243/1288/1910 1242/1286/1910 1222/1267/1910 +f 1244/1289/1911 1242/1286/1911 1243/1288/1911 +f 1246/1290/524 1245/1291/524 1242/1286/524 +f 1244/1289/1912 1246/1290/1912 1242/1286/1912 +f 1247/1292/1913 1246/1290/1913 1244/1289/1913 +f 1248/1293/527 1246/1290/527 1247/1292/527 +f 1250/1294/528 1245/1291/528 1246/1290/528 +f 1250/1294/529 1249/1295/529 1245/1291/529 +f 1248/1293/1914 1250/1294/1914 1246/1290/1914 +f 1251/1296/531 1250/1294/531 1248/1293/531 +f 1252/1297/532 1249/1295/532 1250/1294/532 +f 1252/1297/1915 1250/1294/1915 1251/1296/1915 +f 1254/1298/534 1249/1295/534 1252/1297/534 +f 1254/1298/535 1253/1195/535 1249/1295/535 +f 1255/1299/536 1253/1195/536 1254/1298/536 +f 1257/1300/537 1253/1195/537 1255/1299/537 +f 1257/1300/538 1256/1301/538 1253/1195/538 +f 1258/1302/539 1256/1301/539 1257/1300/539 +f 1260/1303/1916 1256/1301/1916 1258/1302/1916 +f 1260/1303/541 1259/1304/541 1256/1301/541 +f 1261/1305/542 1259/1304/542 1260/1303/542 +f 1261/1305/543 1262/1306/543 1259/1304/543 +f 1264/1307/1917 1262/1306/1917 1261/1305/1917 +f 1263/1308/545 1264/1307/545 1261/1305/545 +f 1265/1309/546 1264/1307/546 1263/1308/546 +f 1264/1307/547 1266/1310/547 1262/1306/547 +f 1267/1311/548 1264/1307/548 1265/1309/548 +f 1268/1312/549 1266/1310/549 1264/1307/549 +f 1267/1311/550 1268/1312/550 1264/1307/550 +f 1269/1313/551 1268/1312/551 1267/1311/551 +f 1270/1314/552 1268/1312/552 1269/1313/552 +f 1272/1315/553 1266/1310/553 1268/1312/553 +f 1272/1315/554 1271/1316/554 1266/1310/554 +f 1270/1314/555 1272/1315/555 1268/1312/555 +f 1273/1317/556 1272/1315/556 1270/1314/556 +f 1274/1318/557 1271/1316/557 1272/1315/557 +f 1274/1318/1918 1272/1315/1918 1273/1317/1918 +f 1276/1319/559 1271/1316/559 1274/1318/559 +f 1276/1319/560 1275/1197/560 1271/1316/560 +f 1277/1320/561 1275/1197/561 1276/1319/561 +f 1279/1321/562 1275/1197/562 1277/1320/562 +f 1279/1321/563 1278/1322/563 1275/1197/563 +f 1280/1323/564 1278/1322/564 1279/1321/564 +f 1282/1324/565 1278/1322/565 1280/1323/565 +f 1282/1324/566 1281/1325/566 1278/1322/566 +f 1283/1326/567 1281/1325/567 1282/1324/567 +f 1283/1326/568 1284/1327/568 1281/1325/568 +f 1286/1328/569 1284/1327/569 1283/1326/569 +f 1285/1329/570 1286/1328/570 1283/1326/570 +f 1287/1330/571 1286/1328/571 1285/1329/571 +f 1286/1328/572 1288/1331/572 1284/1327/572 +f 1289/1332/573 1286/1328/573 1287/1330/573 +f 1290/1333/574 1288/1331/574 1286/1328/574 +f 1289/1332/1919 1290/1333/1919 1286/1328/1919 +f 1291/1334/1920 1290/1333/1920 1289/1332/1920 +f 1290/1333/577 1292/1335/577 1288/1331/577 +f 1293/1336/1921 1290/1333/1921 1291/1334/1921 +f 1294/1337/579 1292/1335/579 1290/1333/579 +f 1293/1336/580 1294/1337/580 1290/1333/580 +f 1296/1338/581 1294/1337/581 1293/1336/581 +f 1294/1337/582 1295/1339/582 1292/1335/582 +f 1297/1340/583 1295/1339/583 1294/1337/583 +f 1297/1340/1922 1294/1337/1922 1296/1338/1922 +f 1299/1341/1923 1295/1339/1923 1297/1340/1923 +f 1299/1341/586 1298/1199/586 1295/1339/586 +f 1300/1342/587 1298/1199/587 1299/1341/587 +f 1302/1343/588 1298/1199/588 1300/1342/588 +f 1302/1343/589 1301/1344/589 1298/1199/589 +f 1303/1345/590 1301/1344/590 1302/1343/590 +f 1305/1346/591 1301/1344/591 1303/1345/591 +f 1305/1346/592 1304/1347/592 1301/1344/592 +f 1306/1348/593 1304/1347/593 1305/1346/593 +f 1158/1201/594 1307/1349/594 1539/1350/594 +f 1306/1348/595 1309/1351/595 1304/1347/595 +f 1312/1352/1924 1309/1351/1924 1306/1348/1924 +f 1307/1349/597 1313/1353/597 1308/1354/597 +f 1158/1201/598 1314/1355/598 1307/1349/598 +f 1311/1356/599 1312/1352/599 1306/1348/599 +f 1315/1357/1925 1312/1352/1925 1311/1356/1925 +f 1314/1355/601 1316/1358/601 1307/1349/601 +f 1316/1358/602 1313/1353/602 1307/1349/602 +f 1312/1352/603 1317/1359/603 1309/1351/603 +f 1318/1360/1926 1312/1352/1926 1315/1357/1926 +f 1314/1355/605 1319/1361/605 1316/1358/605 +f 1320/1362/606 1317/1359/606 1312/1352/606 +f 1318/1360/607 1320/1362/607 1312/1352/607 +f 1321/1202/608 1319/1361/608 1314/1355/608 +f 1322/1363/609 1320/1362/609 1318/1360/609 +f 1321/1202/1927 1323/1364/1927 1319/1361/1927 +f 1320/1362/611 1324/1365/611 1317/1359/611 +f 1326/1366/612 1320/1362/612 1322/1363/612 +f 1321/1202/613 1327/1367/613 1323/1364/613 +f 1328/1368/614 1324/1365/614 1320/1362/614 +f 1326/1366/1928 1328/1368/1928 1320/1362/1928 +f 1325/1369/616 1327/1367/616 1321/1202/616 +f 1329/1370/617 1328/1368/617 1326/1366/617 +f 1325/1369/618 1330/1371/618 1327/1367/618 +f 1328/1368/619 1159/1203/619 1324/1365/619 +f 1332/1372/1929 1328/1368/1929 1329/1370/1929 +f 1325/1369/1930 1333/1373/1930 1330/1371/1930 +f 1331/1374/622 1333/1373/622 1325/1369/622 +f 1333/1373/623 1334/1375/623 1330/1371/623 +f 1328/1368/624 1335/1376/624 1159/1203/624 +f 1336/1377/625 1328/1368/625 1332/1372/625 +f 1336/1377/626 1335/1376/626 1328/1368/626 +f 1333/1373/627 1337/1378/627 1334/1375/627 +f 1331/1374/628 1338/1379/628 1333/1373/628 +f 1338/1379/1931 1337/1378/1931 1333/1373/1931 +f 1340/1380/1932 1335/1376/1932 1336/1377/1932 +f 1339/1381/631 1338/1379/631 1331/1374/631 +f 1338/1379/1933 1341/1382/1933 1337/1378/1933 +f 1342/1383/633 1160/1204/633 1335/1376/633 +f 1343/1384/634 1335/1376/634 1340/1380/634 +f 1343/1384/635 1342/1383/635 1335/1376/635 +f 1338/1379/1934 1344/1385/1934 1341/1382/1934 +f 1339/1381/637 1345/1386/637 1338/1379/637 +f 1345/1386/1935 1344/1385/1935 1338/1379/1935 +f 1347/1387/639 1342/1383/639 1343/1384/639 +f 1346/1388/640 1345/1386/640 1339/1381/640 +f 1345/1386/1936 1348/1389/1936 1344/1385/1936 +f 1350/1390/642 1342/1383/642 1347/1387/642 +f 1350/1390/643 1349/1391/643 1342/1383/643 +f 1345/1386/644 1352/1392/644 1348/1389/644 +f 1346/1388/645 1353/1393/645 1345/1386/645 +f 1353/1393/1937 1352/1392/1937 1345/1386/1937 +f 1355/1394/1938 1349/1391/1938 1350/1390/1938 +f 1351/1395/1939 1355/1394/1939 1350/1390/1939 +f 1354/1396/649 1353/1393/649 1346/1388/649 +f 1356/1397/1940 1355/1394/1940 1351/1395/1940 +f 1354/1396/651 1357/1398/651 1353/1393/651 +f 1355/1394/652 1358/1399/652 1349/1391/652 +f 1359/1400/1941 1355/1394/1941 1356/1397/1941 +f 1354/1396/654 1360/1401/654 1357/1398/654 +f 1362/1402/1942 1358/1399/1942 1355/1394/1942 +f 1359/1400/1943 1362/1402/1943 1355/1394/1943 +f 1361/1403/1944 1360/1401/1944 1354/1396/1944 +f 1363/1404/1945 1362/1402/1945 1359/1400/1945 +f 1361/1403/659 1364/1405/659 1360/1401/659 +f 1362/1402/1946 1365/1406/1946 1358/1399/1946 +f 1366/1407/1947 1362/1402/1947 1363/1404/1947 +f 1361/1403/662 1367/1408/662 1364/1405/662 +f 1368/1409/1948 1365/1406/1948 1362/1402/1948 +f 1366/1407/1949 1368/1409/1949 1362/1402/1949 +f 1369/1207/1950 1367/1408/1950 1361/1403/1950 +f 1370/1410/1951 1368/1409/1951 1366/1407/1951 +f 1369/1207/1952 1371/1411/1952 1367/1408/1952 +f 1368/1409/1953 1372/1412/1953 1365/1406/1953 +f 1373/1413/1954 1372/1412/1954 1368/1409/1954 +f 1373/1413/1955 1368/1409/1955 1370/1410/1955 +f 1369/1207/1956 1374/1414/1956 1371/1411/1956 +f 1372/1412/1957 1374/1414/1957 1369/1207/1957 +f 1374/1414/1958 1372/1412/1958 1373/1413/1958 +f 1375/1415/1959 1376/1416/1959 1377/1417/1959 +f 1375/1415/677 1377/1417/677 1387/1418/677 +f 1387/1418/1960 1377/1417/1960 1379/1419/1960 +f 1377/1417/1961 1378/1420/1961 1379/1419/1961 +f 1380/1421/681 1381/1422/681 1382/1423/681 +f 1381/1422/682 1384/1424/682 1383/1425/682 +f 1380/1421/683 1385/1426/683 1381/1422/683 +f 1385/1426/684 1384/1424/684 1381/1422/684 +f 1386/1427/685 1385/1426/685 1380/1421/685 +f 1385/1426/1962 1387/1418/1962 1384/1424/1962 +f 1386/1427/687 1388/1428/687 1385/1426/687 +f 1385/1426/1963 1389/1429/1963 1387/1418/1963 +f 1388/1428/1964 1389/1429/1964 1385/1426/1964 +f 1390/1430/1965 1388/1428/1965 1386/1427/1965 +f 1388/1428/691 1391/1431/691 1389/1429/691 +f 1390/1430/692 1392/1432/692 1388/1428/692 +f 1392/1432/1966 1391/1431/1966 1388/1428/1966 +f 1392/1432/1967 1393/1433/1967 1391/1431/1967 +f 1394/1434/1968 1392/1432/1968 1390/1430/1968 +f 1394/1434/696 1395/1435/696 1392/1432/696 +f 1392/1432/697 1396/1436/697 1393/1433/697 +f 1395/1435/698 1396/1436/698 1392/1432/698 +f 1397/1437/699 1395/1435/699 1394/1434/699 +f 1395/1435/700 1398/1036/700 1396/1436/700 +f 1397/1437/701 1398/1036/701 1395/1435/701 +f 1397/1437/702 1399/1438/702 1398/1036/702 +f 1397/1437/703 1401/1439/703 1399/1438/703 +f 1400/1440/704 1402/1441/704 1397/1437/704 +f 1402/1441/705 1401/1439/705 1397/1437/705 +f 1402/1441/1969 1403/1442/1969 1401/1439/1969 +f 1404/1443/707 1402/1441/707 1400/1440/707 +f 1402/1441/708 1405/1444/708 1403/1442/708 +f 1402/1441/709 1406/1045/709 1405/1444/709 +f 1404/1443/710 1407/1445/710 1402/1441/710 +f 1407/1445/711 1406/1045/711 1402/1441/711 +f 1408/1446/712 1407/1445/712 1404/1443/712 +f 1407/1445/713 1409/1447/713 1406/1045/713 +f 1407/1445/714 1410/1448/714 1409/1447/714 +f 1408/1446/715 1410/1448/715 1407/1445/715 +f 1410/1448/1970 1411/1050/1970 1409/1447/1970 +f 1412/1449/717 1410/1448/717 1408/1446/717 +f 1410/1448/718 1413/1052/718 1411/1050/718 +f 1412/1449/1971 1413/1052/1971 1410/1448/1971 +f 1412/1449/1972 1414/1053/1972 1413/1052/1972 +f 1414/1053/721 1412/1449/721 1416/1055/721 +f 1412/1449/722 1415/1450/722 1417/1451/722 +f 1416/1055/723 1412/1449/723 1417/1451/723 +f 1417/1451/1973 1418/1057/1973 1416/1055/1973 +f 1417/1451/725 1415/1450/725 1419/1452/725 +f 1417/1451/726 1419/1452/726 1420/1453/726 +f 1417/1451/727 1421/1059/727 1418/1057/727 +f 1417/1451/728 1420/1453/728 1421/1059/728 +f 1420/1453/1974 1419/1452/1974 1422/1454/1974 +f 1421/1059/730 1420/1453/730 1423/1061/730 +f 1423/1061/1975 1420/1453/1975 1422/1454/1975 +f 1423/1061/1976 1422/1454/1976 1424/1455/1976 +f 1424/1455/1977 1422/1454/1977 1426/1456/1977 +f 1422/1454/1978 1425/1457/1978 1427/1458/1978 +f 1426/1456/1979 1422/1454/1979 1427/1458/1979 +f 1426/1456/1980 1427/1458/1980 1428/1459/1980 +f 1427/1458/1981 1425/1457/1981 1429/1460/1981 +f 1428/1459/1982 1427/1458/1982 1430/1461/1982 +f 1427/1458/1983 1429/1460/1983 1431/1462/1983 +f 1430/1461/1984 1427/1458/1984 1432/1069/1984 +f 1432/1069/1985 1427/1458/1985 1431/1462/1985 +f 1431/1462/742 1429/1460/742 1433/1463/742 +f 1432/1069/743 1431/1462/743 1434/1464/743 +f 1431/1462/744 1433/1463/744 1435/1465/744 +f 1434/1464/1986 1431/1462/1986 1435/1465/1986 +f 1435/1465/746 1436/1073/746 1434/1464/746 +f 1435/1465/747 1433/1463/747 1437/1466/747 +f 1435/1465/1987 1438/1075/1987 1436/1073/1987 +f 1435/1465/749 1437/1466/749 1439/1467/749 +f 1438/1075/750 1435/1465/750 1439/1467/750 +f 1439/1467/751 1440/1077/751 1438/1075/751 +f 1439/1467/752 1437/1466/752 1441/1468/752 +f 1439/1467/1988 1442/1079/1988 1440/1077/1988 +f 1439/1467/754 1441/1468/754 1442/1079/754 +f 1442/1079/755 1441/1468/755 1443/1081/755 +f 1441/1468/756 1444/1469/756 1445/1470/756 +f 1443/1081/757 1441/1468/757 1445/1470/757 +f 1443/1081/1989 1445/1470/1989 1446/1471/1989 +f 1445/1470/759 1444/1469/759 1447/1472/759 +f 1446/1471/760 1445/1470/760 1448/1473/760 +f 1445/1470/761 1447/1472/761 1449/1474/761 +f 1448/1473/1990 1445/1470/1990 1449/1474/1990 +f 1448/1473/763 1449/1474/763 1450/1475/763 +f 1449/1474/764 1447/1472/764 1451/1476/764 +f 1450/1475/1991 1449/1474/1991 1452/1477/1991 +f 1452/1477/1992 1449/1474/1992 1451/1476/1992 +f 1452/1477/1993 1451/1476/1993 1453/1478/1993 +f 1453/1478/1994 1451/1476/1994 1455/1479/1994 +f 1451/1476/769 1454/1480/769 1456/1481/769 +f 1455/1479/1995 1451/1476/1995 1456/1481/1995 +f 1456/1481/1996 1457/1093/1996 1455/1479/1996 +f 1456/1481/772 1454/1480/772 1458/1482/772 +f 1456/1481/1997 1459/1095/1997 1457/1093/1997 +f 1456/1481/774 1458/1482/774 1460/1483/774 +f 1459/1095/775 1456/1481/775 1460/1483/775 +f 1459/1095/1998 1460/1483/1998 1461/1096/1998 +f 1460/1483/1999 1458/1482/1999 1462/1484/1999 +f 1461/1096/2000 1460/1483/2000 1463/1098/2000 +f 1460/1483/779 1462/1484/779 1464/1485/779 +f 1463/1098/780 1460/1483/780 1464/1485/780 +f 1464/1485/781 1465/1100/781 1463/1098/781 +f 1464/1485/782 1462/1484/782 1466/1486/782 +f 1464/1485/783 1467/1102/783 1465/1100/783 +f 1464/1485/784 1466/1486/784 1467/1102/784 +f 1467/1102/785 1466/1486/785 1468/1104/785 +f 1466/1486/786 1469/1487/786 1470/1488/786 +f 1468/1104/2001 1466/1486/2001 1470/1488/2001 +f 1468/1104/2002 1470/1488/2002 1471/1489/2002 +f 1470/1488/789 1469/1487/789 1472/1490/789 +f 1471/1489/790 1470/1488/790 1473/1491/790 +f 1470/1488/791 1472/1490/791 1474/1492/791 +f 1473/1491/2003 1470/1488/2003 1474/1492/2003 +f 1473/1491/793 1474/1492/793 1475/1493/793 +f 1474/1492/794 1472/1490/794 1476/1494/794 +f 1475/1493/2004 1474/1492/2004 1477/1495/2004 +f 1474/1492/796 1476/1494/796 1478/1496/796 +f 1477/1495/2005 1474/1492/2005 1478/1496/2005 +f 1477/1495/798 1478/1496/798 1479/1113/798 +f 1478/1496/2006 1476/1494/2006 1480/1497/2006 +f 1479/1113/800 1478/1496/800 1481/1498/800 +f 1478/1496/801 1480/1497/801 1482/1499/801 +f 1481/1498/802 1478/1496/802 1482/1499/802 +f 1482/1499/2007 1483/1117/2007 1481/1498/2007 +f 1482/1499/804 1480/1497/804 1484/1500/804 +f 1482/1499/2008 1485/1119/2008 1483/1117/2008 +f 1482/1499/806 1484/1500/806 1486/1501/806 +f 1485/1119/2009 1482/1499/2009 1486/1501/2009 +f 1485/1119/2010 1486/1501/2010 1487/1120/2010 +f 1486/1501/809 1484/1500/809 1488/1502/809 +f 1487/1120/810 1486/1501/810 1489/1122/810 +f 1486/1501/811 1488/1502/811 1490/1503/811 +f 1489/1122/2011 1486/1501/2011 1490/1503/2011 +f 1490/1503/813 1491/1124/813 1489/1122/813 +f 1490/1503/814 1488/1502/814 1492/1504/814 +f 1490/1503/2012 1493/1126/2012 1491/1124/2012 +f 1490/1503/2013 1492/1504/2013 1493/1126/2013 +f 1493/1126/2014 1492/1504/2014 1494/1128/2014 +f 1492/1504/818 1495/1505/818 1496/1506/818 +f 1494/1128/2015 1492/1504/2015 1496/1506/2015 +f 1494/1128/820 1496/1506/820 1497/1507/820 +f 1496/1506/821 1495/1505/821 1498/1508/821 +f 1497/1507/822 1496/1506/822 1499/1509/822 +f 1496/1506/823 1498/1508/823 1500/1510/823 +f 1499/1509/824 1496/1506/824 1500/1510/824 +f 1499/1509/2016 1500/1510/2016 1501/1511/2016 +f 1500/1510/826 1498/1508/826 1502/1512/826 +f 1501/1511/827 1500/1510/827 1503/1513/827 +f 1500/1510/828 1502/1512/828 1504/1514/828 +f 1503/1513/829 1500/1510/829 1504/1514/829 +f 1503/1513/2017 1504/1514/2017 1505/1137/2017 +f 1504/1514/2018 1502/1512/2018 1506/1515/2018 +f 1505/1137/2019 1504/1514/2019 1507/1516/2019 +f 1504/1514/833 1506/1515/833 1508/1517/833 +f 1507/1516/834 1504/1514/834 1508/1517/834 +f 1508/1517/835 1509/1141/835 1507/1516/835 +f 1508/1517/836 1506/1515/836 1510/1518/836 +f 1508/1517/837 1511/1143/837 1509/1141/837 +f 1508/1517/838 1510/1518/838 1512/1519/838 +f 1511/1143/839 1508/1517/839 1512/1519/839 +f 1511/1143/840 1512/1519/840 1513/1144/840 +f 1512/1519/2020 1510/1518/2020 1514/1520/2020 +f 1513/1144/2021 1512/1519/2021 1515/1146/2021 +f 1512/1519/843 1514/1520/843 1516/1521/843 +f 1515/1146/844 1512/1519/844 1516/1521/844 +f 1516/1521/2022 1517/1148/2022 1515/1146/2022 +f 1516/1521/2023 1514/1520/2023 1518/1522/2023 +f 1516/1521/2024 1519/1150/2024 1517/1148/2024 +f 1516/1521/848 1518/1522/848 1519/1150/848 +f 1519/1150/2025 1518/1522/2025 1520/1152/2025 +f 1518/1522/850 1521/1523/850 1522/1524/850 +f 1520/1152/2026 1518/1522/2026 1522/1524/2026 +f 1520/1152/2027 1522/1524/2027 1523/1525/2027 +f 1522/1524/853 1521/1523/853 1524/1526/853 +f 1523/1525/854 1522/1524/854 1525/1527/854 +f 1522/1524/855 1524/1526/855 1526/1528/855 +f 1525/1527/856 1522/1524/856 1526/1528/856 +f 1525/1527/2028 1526/1528/2028 1527/1529/2028 +f 1526/1528/858 1524/1526/858 1528/1530/858 +f 1527/1529/859 1526/1528/859 1529/1531/859 +f 1526/1528/860 1528/1530/860 1530/1532/860 +f 1529/1531/861 1526/1528/861 1530/1532/861 +f 1529/1531/2029 1530/1532/2029 1531/1161/2029 +f 1530/1532/2030 1528/1530/2030 1220/1533/2030 +f 1531/1161/864 1530/1532/864 1532/1534/864 +f 1530/1532/2031 1220/1533/2031 1535/1535/2031 +f 1532/1534/866 1530/1532/866 1533/1165/866 +f 1533/1165/2032 1530/1532/2032 1535/1535/2032 +f 1239/1284/2033 1128/1168/2033 1534/1536/2033 +f 1534/1536/2034 1128/1168/2034 1126/1167/2034 +f 1534/1536/2035 1126/1167/2035 1533/1165/2035 +f 1534/1536/2036 1535/1535/2036 1239/1284/2036 +f 1242/1286/872 1133/1173/872 1241/1287/872 +f 1242/1286/2037 1131/1171/2037 1133/1173/2037 +f 1245/1291/2038 1131/1171/2038 1242/1286/2038 +f 1245/1291/2039 1129/1169/2039 1131/1171/2039 +f 1245/1291/876 1127/1166/876 1129/1169/876 +f 1124/1163/877 1532/1534/877 1533/1165/877 +f 1249/1295/878 1127/1166/878 1245/1291/878 +f 1249/1295/2040 1125/1164/2040 1127/1166/2040 +f 1531/1161/880 1532/1534/880 1124/1163/880 +f 1249/1295/881 1123/1162/881 1125/1164/881 +f 1121/1159/2041 1529/1531/2041 1531/1161/2041 +f 1249/1295/883 1122/1160/883 1123/1162/883 +f 1121/1159/2042 1527/1529/2042 1529/1531/2042 +f 1119/1157/885 1527/1529/885 1121/1159/885 +f 1253/1195/2043 1122/1160/2043 1249/1295/2043 +f 1119/1157/2044 1525/1527/2044 1527/1529/2044 +f 1118/1156/2045 1525/1527/2045 1119/1157/2045 +f 1256/1301/2046 1120/1158/2046 1253/1195/2046 +f 1118/1156/2047 1523/1525/2047 1525/1527/2047 +f 1116/1154/891 1523/1525/891 1118/1156/891 +f 1256/1301/892 1155/1196/892 1120/1158/892 +f 1520/1152/893 1523/1525/893 1116/1154/893 +f 1259/1304/894 1155/1196/894 1256/1301/894 +f 1259/1304/2048 1117/1155/2048 1155/1196/2048 +f 1259/1304/896 1115/1153/896 1117/1155/896 +f 1262/1306/2049 1115/1153/2049 1259/1304/2049 +f 1262/1306/2050 1114/1151/2050 1115/1153/2050 +f 1262/1306/899 1113/1149/899 1114/1151/899 +f 1266/1310/900 1113/1149/900 1262/1306/900 +f 1266/1310/2051 1112/1147/2051 1113/1149/2051 +f 1266/1310/902 1111/1145/902 1112/1147/902 +f 1266/1310/903 1110/1142/903 1111/1145/903 +f 1108/1139/904 1507/1516/904 1509/1141/904 +f 1271/1316/905 1110/1142/905 1266/1310/905 +f 1271/1316/906 1109/1140/906 1110/1142/906 +f 1505/1137/2052 1507/1516/2052 1108/1139/2052 +f 1271/1316/908 1107/1138/908 1109/1140/908 +f 1105/1135/2053 1503/1513/2053 1505/1137/2053 +f 1271/1316/910 1106/1136/910 1107/1138/910 +f 1105/1135/2054 1501/1511/2054 1503/1513/2054 +f 1103/1133/912 1501/1511/912 1105/1135/912 +f 1275/1197/2055 1106/1136/2055 1271/1316/2055 +f 1103/1133/914 1499/1509/914 1501/1511/914 +f 1102/1132/915 1499/1509/915 1103/1133/915 +f 1278/1322/2056 1104/1134/2056 1275/1197/2056 +f 1102/1132/917 1497/1507/917 1499/1509/917 +f 1100/1130/2057 1497/1507/2057 1102/1132/2057 +f 1278/1322/2058 1156/1198/2058 1104/1134/2058 +f 1494/1128/920 1497/1507/920 1100/1130/920 +f 1281/1325/921 1156/1198/921 1278/1322/921 +f 1281/1325/2059 1101/1131/2059 1156/1198/2059 +f 1281/1325/923 1099/1129/923 1101/1131/923 +f 1284/1327/924 1099/1129/924 1281/1325/924 +f 1284/1327/925 1098/1127/925 1099/1129/925 +f 1284/1327/926 1097/1125/926 1098/1127/926 +f 1288/1331/927 1097/1125/927 1284/1327/927 +f 1288/1331/2060 1096/1123/2060 1097/1125/2060 +f 1288/1331/929 1095/1121/929 1096/1123/929 +f 1292/1335/930 1095/1121/930 1288/1331/930 +f 1292/1335/931 1094/1118/931 1095/1121/931 +f 1092/1115/932 1481/1498/932 1483/1117/932 +f 1292/1335/933 1093/1116/933 1094/1118/933 +f 1479/1113/2061 1481/1498/2061 1092/1115/2061 +f 1295/1339/935 1093/1116/935 1292/1335/935 +f 1295/1339/936 1091/1114/936 1093/1116/936 +f 1089/1111/937 1477/1495/937 1479/1113/937 +f 1295/1339/938 1090/1112/938 1091/1114/938 +f 1089/1111/2062 1475/1493/2062 1477/1495/2062 +f 1087/1109/940 1475/1493/940 1089/1111/940 +f 1298/1199/2063 1090/1112/2063 1295/1339/2063 +f 1087/1109/942 1473/1491/942 1475/1493/942 +f 1086/1108/943 1473/1491/943 1087/1109/943 +f 1301/1344/2064 1088/1110/2064 1298/1199/2064 +f 1086/1108/945 1471/1489/945 1473/1491/945 +f 1084/1106/2065 1471/1489/2065 1086/1108/2065 +f 1301/1344/947 1157/1200/947 1088/1110/947 +f 1468/1104/2066 1471/1489/2066 1084/1106/2066 +f 1304/1347/949 1157/1200/949 1301/1344/949 +f 1304/1347/2067 1085/1107/2067 1157/1200/2067 +f 1304/1347/2068 1083/1105/2068 1085/1107/2068 +f 1309/1351/952 1083/1105/952 1304/1347/952 +f 1309/1351/2069 1082/1103/2069 1083/1105/2069 +f 1309/1351/954 1081/1101/954 1082/1103/954 +f 1317/1359/955 1081/1101/955 1309/1351/955 +f 1317/1359/2070 1080/1099/2070 1081/1101/2070 +f 1317/1359/957 1079/1097/957 1080/1099/957 +f 1324/1365/958 1079/1097/958 1317/1359/958 +f 1324/1365/959 1078/1094/959 1079/1097/959 +f 1076/1091/2071 1455/1479/2071 1457/1093/2071 +f 1324/1365/961 1077/1092/961 1078/1094/961 +f 1075/1090/2072 1455/1479/2072 1076/1091/2072 +f 1075/1090/2073 1453/1478/2073 1455/1479/2073 +f 1159/1203/2074 1077/1092/2074 1324/1365/2074 +f 1073/1088/2075 1453/1478/2075 1075/1090/2075 +f 1073/1088/2076 1452/1477/2076 1453/1478/2076 +f 1335/1376/965 1074/1089/965 1159/1203/965 +f 1073/1088/2077 1450/1475/2077 1452/1477/2077 +f 1071/1086/967 1450/1475/967 1073/1088/967 +f 1335/1376/968 1160/1204/968 1074/1089/968 +f 1071/1086/969 1448/1473/969 1450/1475/969 +f 1070/1085/2078 1448/1473/2078 1071/1086/2078 +f 1342/1383/971 1072/1087/971 1160/1204/971 +f 1070/1085/972 1446/1471/972 1448/1473/972 +f 1068/1083/973 1446/1471/973 1070/1085/973 +f 1342/1383/974 1161/1205/974 1072/1087/974 +f 1443/1081/2079 1446/1471/2079 1068/1083/2079 +f 1349/1391/2080 1161/1205/2080 1342/1383/2080 +f 1349/1391/2081 1069/1084/2081 1161/1205/2081 +f 1349/1391/978 1067/1082/978 1069/1084/978 +f 1358/1399/2082 1067/1082/2082 1349/1391/2082 +f 1358/1399/2083 1066/1080/2083 1067/1082/2083 +f 1358/1399/981 1065/1078/981 1066/1080/981 +f 1365/1406/982 1065/1078/982 1358/1399/982 +f 1365/1406/2084 1064/1076/2084 1065/1078/2084 +f 1062/1072/2085 1434/1464/2085 1436/1073/2085 +f 1365/1406/985 1063/1074/985 1064/1076/985 +f 1432/1069/2086 1434/1464/2086 1062/1072/2086 +f 1372/1412/987 1063/1074/987 1365/1406/987 +f 1372/1412/988 1061/1071/988 1063/1074/988 +f 1059/1068/2087 1430/1461/2087 1432/1069/2087 +f 1372/1412/990 1060/1070/990 1061/1071/990 +f 1058/1066/2088 1430/1461/2088 1059/1068/2088 +f 1058/1066/2089 1428/1459/2089 1430/1461/2089 +f 1060/1070/2090 1372/1412/2090 1369/1207/2090 +f 1056/1065/2091 1428/1459/2091 1058/1066/2091 +f 1056/1065/995 1426/1456/995 1428/1459/995 +f 1369/1207/2092 1361/1403/2092 1057/1067/2092 +f 1056/1065/2093 1424/1455/2093 1426/1456/2093 +f 1054/1063/998 1424/1455/998 1056/1065/998 +f 1057/1067/999 1361/1403/999 1162/1206/999 +f 1423/1061/2094 1424/1455/2094 1054/1063/2094 +f 1162/1206/1001 1361/1403/1001 1354/1396/1001 +f 1162/1206/1002 1354/1396/1002 1055/1064/1002 +f 1055/1064/1003 1354/1396/1003 1053/1062/1003 +f 1053/1062/1004 1354/1396/1004 1346/1388/1004 +f 1053/1062/1005 1346/1388/1005 1052/1060/1005 +f 1052/1060/1006 1346/1388/1006 1051/1058/1006 +f 1051/1058/1007 1346/1388/1007 1339/1381/1007 +f 1051/1058/2095 1339/1381/2095 1050/1056/2095 +f 1050/1056/1009 1339/1381/1009 1049/1054/1009 +f 1049/1054/1010 1339/1381/1010 1331/1374/1010 +f 1049/1054/1011 1331/1374/1011 1048/1051/1011 +f 1411/1050/2096 1046/1048/2096 1409/1447/2096 +f 1048/1051/2097 1331/1374/2097 1047/1049/2097 +f 1409/1447/2098 1046/1048/2098 1406/1045/2098 +f 1047/1049/2099 1331/1374/2099 1325/1369/2099 +f 1047/1049/1016 1325/1369/1016 1045/1047/1016 +f 1383/1425/1017 1379/1419/1017 1536/1537/1017 +f 1406/1045/1018 1043/1044/1018 1405/1444/1018 +f 1384/1424/1019 1379/1419/1019 1383/1425/1019 +f 1045/1047/1020 1325/1369/1020 1044/1046/1020 +f 1405/1444/1021 1043/1044/1021 1042/1042/1021 +f 1384/1424/1022 1387/1418/1022 1379/1419/1022 +f 1405/1444/1023 1042/1042/1023 1403/1442/1023 +f 1044/1046/1024 1325/1369/1024 1321/1202/1024 +f 1403/1442/1025 1042/1042/1025 1040/1041/1025 +f 1403/1442/1026 1040/1041/1026 1401/1439/1026 +f 1389/1429/1027 1375/1415/1027 1387/1418/1027 +f 1321/1202/1028 1314/1355/1028 1041/1043/1028 +f 1401/1439/1029 1040/1041/1029 1399/1438/1029 +f 1391/1431/1030 1375/1415/1030 1389/1429/1030 +f 1399/1438/1031 1040/1041/1031 1038/1039/1031 +f 1391/1431/2100 1537/1538/2100 1375/1415/2100 +f 1041/1043/1033 1314/1355/1033 1158/1201/1033 +f 1393/1433/2101 1537/1538/2101 1391/1431/2101 +f 1399/1438/2102 1038/1039/2102 1398/1036/2102 +f 1537/1538/1036 1376/1416/1036 1375/1415/1036 +f 1537/1538/2103 1538/1539/2103 1376/1416/2103 +f 1398/1036/1038 1036/1038/1038 1396/1436/1038 +f 1393/1433/2104 1538/1539/2104 1537/1538/2104 +f 1396/1436/2105 1036/1038/2105 1393/1433/2105 +f 1039/1040/2106 1158/1201/2106 1539/1350/2106 +f 1036/1038/1042 1538/1539/1042 1393/1433/1042 +f 1039/1040/1043 1539/1350/1043 1037/1037/1043 +f 1036/1038/2107 1539/1350/2107 1538/1539/2107 +f 1036/1038/1045 1037/1037/1045 1539/1350/1045 +f 1541/1540/2108 1542/1541/2108 1543/1542/2108 +f 1380/1421/2109 1382/1423/2109 1542/1541/2109 +f 1547/1543/1048 1546/1544/1048 1545/1545/1048 +f 1386/1427/1049 1380/1421/1049 1544/1546/1049 +f 1547/1543/1050 1548/1547/1050 1546/1544/1050 +f 1549/1548/1051 1548/1547/1051 1547/1543/1051 +f 1550/1549/1052 1548/1547/1052 1549/1548/1052 +f 1550/1549/2110 1551/1550/2110 1548/1547/2110 +f 1552/1551/2111 1551/1550/2111 1550/1549/2111 +f 1548/1547/1055 1386/1427/1055 1546/1544/1055 +f 1548/1547/1056 1390/1430/1056 1386/1427/1056 +f 1551/1550/2112 1390/1430/2112 1548/1547/2112 +f 1394/1434/1058 1390/1430/1058 1551/1550/1058 +f 1554/1552/1059 1555/1553/1059 1553/1554/1059 +f 1556/1555/1060 1555/1553/1060 1554/1552/1060 +f 1556/1555/1061 1557/1556/1061 1555/1553/1061 +f 1555/1553/1062 1397/1437/1062 1394/1434/1062 +f 1558/1557/1063 1557/1556/1063 1556/1555/1063 +f 1557/1556/2113 1397/1437/2113 1555/1553/2113 +f 1559/1558/2114 1560/1559/2114 1558/1557/2114 +f 1400/1440/1066 1397/1437/1066 1557/1556/1066 +f 1561/1560/1067 1560/1559/1067 1559/1558/1067 +f 1562/1561/2115 1563/1562/2115 1561/1560/2115 +f 1404/1443/1069 1400/1440/1069 1560/1559/1069 +f 1564/1563/2116 1565/1564/2116 1563/1562/2116 +f 1566/1565/2117 1565/1564/2117 1564/1563/2117 +f 1566/1565/2118 1567/1566/2118 1565/1564/2118 +f 1568/1567/2119 1567/1566/2119 1566/1565/2119 +f 1568/1567/1074 1569/1568/1074 1567/1566/1074 +f 1570/1569/1075 1569/1568/1075 1568/1567/1075 +f 1567/1566/2120 1408/1446/2120 1565/1564/2120 +f 1570/1569/1077 1571/1570/1077 1569/1568/1077 +f 1567/1566/2121 1412/1449/2121 1408/1446/2121 +f 1572/1571/2122 1571/1570/2122 1570/1569/2122 +f 1569/1568/1080 1412/1449/1080 1567/1566/1080 +f 1572/1571/1081 1573/1572/1081 1571/1570/1081 +f 1574/1573/1082 1573/1572/1082 1572/1571/1082 +f 1412/1449/2123 1569/1568/2123 1571/1570/2123 +f 1412/1449/1084 1571/1570/1084 1415/1450/1084 +f 1415/1450/2124 1571/1570/2124 1573/1572/2124 +f 1415/1450/2125 1573/1572/2125 1419/1452/2125 +f 1575/1574/2126 1576/1575/2126 1577/1576/2126 +f 1577/1576/2127 1576/1575/2127 1578/1577/2127 +f 1577/1576/2128 1578/1577/2128 1579/1578/2128 +f 1419/1452/2129 1577/1576/2129 1422/1454/2129 +f 1579/1578/2130 1578/1577/2130 1580/1579/2130 +f 1422/1454/2131 1577/1576/2131 1579/1578/2131 +f 1580/1579/2132 1581/1580/2132 1582/1581/2132 +f 1422/1454/2133 1579/1578/2133 1425/1457/2133 +f 1582/1581/2134 1581/1580/2134 1583/1582/2134 +f 1583/1582/2135 1584/1583/2135 1585/1584/2135 +f 1425/1457/2136 1582/1581/2136 1429/1460/2136 +f 1585/1584/2137 1586/1585/2137 1587/1586/2137 +f 1587/1586/2138 1586/1585/2138 1588/1587/2138 +f 1587/1586/1100 1588/1587/1100 1589/1588/1100 +f 1589/1588/1101 1588/1587/1101 1590/1589/1101 +f 1589/1588/1102 1590/1589/1102 1591/1590/1102 +f 1591/1590/2139 1590/1589/2139 1592/1591/2139 +f 1433/1463/1104 1587/1586/1104 1589/1588/1104 +f 1591/1590/2140 1592/1591/2140 1593/1592/2140 +f 1433/1463/1106 1589/1588/1106 1437/1466/1106 +f 1593/1592/1107 1592/1591/1107 1594/1593/1107 +f 1437/1466/1108 1589/1588/1108 1591/1590/1108 +f 1593/1592/2141 1594/1593/2141 1595/1594/2141 +f 1595/1594/1110 1594/1593/1110 1596/1595/1110 +f 1437/1466/2142 1591/1590/2142 1593/1592/2142 +f 1437/1466/1112 1593/1592/1112 1441/1468/1112 +f 1441/1468/2143 1593/1592/2143 1595/1594/2143 +f 1441/1468/1114 1595/1594/1114 1444/1469/1114 +f 1597/1596/2144 1598/1597/2144 1599/1598/2144 +f 1599/1598/2145 1600/1599/2145 1601/1600/2145 +f 1601/1600/1117 1600/1599/1117 1602/1601/1117 +f 1601/1600/2146 1602/1601/2146 1603/1602/2146 +f 1603/1602/2147 1602/1601/2147 1604/1603/2147 +f 1603/1602/1120 1604/1603/1120 1605/1604/1120 +f 1447/1472/1121 1601/1600/1121 1603/1602/1121 +f 1447/1472/2148 1603/1602/2148 1451/1476/2148 +f 1605/1604/2149 1604/1603/2149 1606/1605/2149 +f 1451/1476/1124 1603/1602/1124 1605/1604/1124 +f 1451/1476/1125 1605/1604/1125 1454/1480/1125 +f 1607/1606/2150 1608/1607/2150 1609/1608/2150 +f 1609/1608/1127 1608/1607/1127 1610/1609/1127 +f 1609/1608/2151 1610/1609/2151 1611/1610/2151 +f 1611/1610/2152 1610/1609/2152 1612/1611/2152 +f 1611/1610/2153 1612/1611/2153 1613/1612/2153 +f 1613/1612/1131 1612/1611/1131 1614/1613/1131 +f 1458/1482/2154 1609/1608/2154 1611/1610/2154 +f 1613/1612/1133 1614/1613/1133 1615/1614/1133 +f 1458/1482/2155 1611/1610/2155 1462/1484/2155 +f 1615/1614/1135 1614/1613/1135 1616/1615/1135 +f 1462/1484/1136 1611/1610/1136 1613/1612/1136 +f 1615/1614/1137 1616/1615/1137 1617/1616/1137 +f 1617/1616/1138 1616/1615/1138 1618/1617/1138 +f 1462/1484/2156 1613/1612/2156 1615/1614/2156 +f 1462/1484/2157 1615/1614/2157 1466/1486/2157 +f 1466/1486/2158 1615/1614/2158 1617/1616/2158 +f 1466/1486/1142 1617/1616/1142 1469/1487/1142 +f 1619/1618/2159 1620/1619/2159 1621/1620/2159 +f 1621/1620/2160 1622/1621/2160 1623/1622/2160 +f 1623/1622/2161 1622/1621/2161 1624/1623/2161 +f 1624/1623/1146 1625/1624/1146 1626/1625/1146 +f 1626/1625/1147 1625/1624/1147 1627/1626/1147 +f 1472/1490/1148 1623/1622/1148 1476/1494/1148 +f 1626/1625/1149 1627/1626/1149 1628/1627/1149 +f 1628/1627/2162 1627/1626/2162 1629/1628/2162 +f 1628/1627/2163 1629/1628/2163 1630/1629/2163 +f 1476/1494/1152 1626/1625/1152 1628/1627/1152 +f 1476/1494/2164 1628/1627/2164 1480/1497/2164 +f 1630/1629/1154 1631/1630/1154 1632/1631/1154 +f 1632/1631/2165 1631/1630/2165 1633/1632/2165 +f 1632/1631/2166 1633/1632/2166 1634/1633/2166 +f 1634/1633/1157 1633/1632/1157 1635/1634/1157 +f 1634/1633/2167 1635/1634/2167 1636/1635/2167 +f 1636/1635/2168 1635/1634/2168 1637/1636/2168 +f 1484/1500/1160 1632/1631/1160 1634/1633/1160 +f 1636/1635/1161 1637/1636/1161 1638/1637/1161 +f 1484/1500/1162 1634/1633/1162 1488/1502/1162 +f 1638/1637/2169 1637/1636/2169 1639/1638/2169 +f 1488/1502/1164 1634/1633/1164 1636/1635/1164 +f 1638/1637/1165 1639/1638/1165 1640/1639/1165 +f 1640/1639/1166 1639/1638/1166 1641/1640/1166 +f 1488/1502/1167 1636/1635/1167 1638/1637/1167 +f 1488/1502/1168 1638/1637/1168 1492/1504/1168 +f 1492/1504/1169 1638/1637/1169 1640/1639/1169 +f 1492/1504/1170 1640/1639/1170 1495/1505/1170 +f 1642/1641/2170 1643/1642/2170 1644/1643/2170 +f 1644/1643/2171 1645/1644/2171 1646/1645/2171 +f 1646/1645/2172 1645/1644/2172 1647/1646/2172 +f 1647/1646/2173 1648/1647/2173 1649/1648/2173 +f 1649/1648/1175 1648/1647/1175 1650/1649/1175 +f 1498/1508/1176 1646/1645/1176 1502/1512/1176 +f 1226/1187/2174 1154/1194/2174 1148/1188/2174 +f 1649/1648/1178 1650/1649/1178 1651/1650/1178 +f 1154/1194/2175 1217/1263/2175 1213/1260/2175 +f 1651/1650/1180 1650/1649/1180 1652/1651/1180 +f 1154/1194/1181 1213/1260/1181 1151/1191/1181 +f 1651/1650/2176 1652/1651/2176 1653/1652/2176 +f 1151/1191/2177 1213/1260/2177 1143/1175/2177 +f 1502/1512/1184 1649/1648/1184 1651/1650/1184 +f 1502/1512/2178 1651/1650/2178 1506/1515/2178 +f 1143/1175/2179 1201/1247/2179 1144/1176/2179 +f 1653/1652/1187 1654/1653/1187 1655/1654/1187 +f 1143/1175/2180 1145/1177/2180 1191/1236/2180 +f 1195/1241/2181 1187/1240/2181 1198/1248/2181 +f 1655/1654/1189 1654/1653/1189 1656/1655/1189 +f 1187/1240/2182 1144/1176/2182 1198/1248/2182 +f 1655/1654/1191 1656/1655/1191 1657/1656/1191 +f 1185/1230/2183 1145/1177/2183 1144/1176/2183 +f 1657/1656/1193 1656/1655/1193 1659/1657/1193 +f 1658/1218/2184 1144/1176/2184 1187/1240/2184 +f 1184/1229/2185 1658/1218/2185 1187/1240/2185 +f 1657/1656/1194 1659/1657/1194 1660/1658/1194 +f 1176/1221/2186 1658/1218/2186 1184/1229/2186 +f 1181/1227/2187 1185/1230/2187 1144/1176/2187 +f 1658/1218/2188 1181/1227/2188 1144/1176/2188 +f 1660/1658/2189 1659/1657/2189 1661/1659/2189 +f 1510/1518/1197 1655/1654/1197 1657/1656/1197 +f 1660/1658/2190 1661/1659/2190 1662/1660/2190 +f 1510/1518/1199 1657/1656/1199 1514/1520/1199 +f 1662/1660/2191 1661/1659/2191 1663/1661/2191 +f 1514/1520/1204 1657/1656/1204 1660/1658/1204 +f 1662/1660/2192 1663/1661/2192 1664/1662/2192 +f 1170/1217/2193 1181/1227/2193 1658/1218/2193 +f 1664/1662/2194 1663/1661/2194 1665/1663/2194 +f 1514/1520/1209 1660/1658/1209 1662/1660/1209 +f 1181/1227/2195 1165/1210/2195 1169/1213/2195 +f 1514/1520/1211 1662/1660/1211 1518/1522/1211 +f 1170/1217/2196 1165/1210/2196 1181/1227/2196 +f 1666/1664/2197 1165/1210/2197 1170/1217/2197 +f 1175/1223/2198 1666/1664/2198 1170/1217/2198 +f 1518/1522/1212 1662/1660/1212 1664/1662/1212 +f 1183/1232/2199 1666/1664/2199 1175/1223/2199 +f 1172/1214/2200 1163/1208/2200 1165/1210/2200 +f 1666/1664/2201 1172/1214/2201 1165/1210/2201 +f 1134/1174/2202 1135/1185/2202 1141/1184/2202 +f 1518/1522/1218 1664/1662/1218 1521/1523/1218 +f 1667/1665/1220 1668/1666/1220 1669/1667/1220 +f 1183/1232/2203 1172/1214/2203 1666/1664/2203 +f 1134/1174/1222 1141/1184/1222 1149/1190/1222 +f 1193/1239/2204 1172/1214/2204 1183/1232/2204 +f 1669/1667/1224 1670/1668/1224 1671/1669/1224 +f 1209/1256/1225 1134/1174/1225 1149/1190/1225 +f 1193/1239/2205 1203/1250/2205 1172/1214/2205 +f 1671/1669/1226 1670/1668/1226 1672/1670/1226 +f 1203/1250/2206 1182/1228/2206 1172/1214/2206 +f 1133/1173/2207 1134/1174/2207 1209/1256/2207 +f 1241/1287/2208 1209/1256/2208 1211/1258/2208 +f 1241/1287/1229 1133/1173/1229 1209/1256/1229 +f 1222/1267/1230 1241/1287/1230 1211/1258/1230 +f 1672/1670/1234 1673/1671/1234 1674/1672/1234 +f 1674/1672/2209 1673/1671/2209 1675/1673/2209 +f 1524/1526/1236 1671/1669/1236 1528/1530/1236 +f 1243/1288/2210 1222/1267/2210 1227/1270/2210 +f 1210/1257/2211 1676/1674/2211 1203/1250/2211 +f 1231/1279/2212 1243/1288/2212 1227/1270/2212 +f 1182/1228/2213 1197/1244/2213 1192/1237/2213 +f 1676/1674/2214 1182/1228/2214 1203/1250/2214 +f 1674/1672/1241 1675/1673/1241 1677/1675/1241 +f 1676/1674/2215 1197/1244/2215 1182/1228/2215 +f 1677/1675/1242 1675/1673/1242 1678/1676/1242 +f 1216/1265/2216 1676/1674/2216 1210/1257/2216 +f 1233/1277/2217 1243/1288/2217 1231/1279/2217 +f 1233/1277/2218 1244/1289/2218 1243/1288/2218 +f 1677/1675/1247 1678/1676/1247 1679/1677/1247 +f 1528/1530/1249 1674/1672/1249 1677/1675/1249 +f 1225/1271/2219 1676/1674/2219 1216/1265/2219 +f 1528/1530/1252 1677/1675/1252 1220/1533/1252 +f 1676/1674/2220 1212/1259/2220 1197/1244/2220 +f 1219/1272/2221 1679/1677/2221 1233/1277/2221 +f 1225/1271/2222 1212/1259/2222 1676/1674/2222 +f 1220/1533/1254 1679/1677/1254 1219/1272/1254 +f 1234/1278/2223 1239/1284/2223 1535/1535/2223 +f 1535/1535/2224 1212/1259/2224 1225/1271/2224 +f 1234/1278/2225 1535/1535/2225 1225/1271/2225 +f 1533/1165/2226 1535/1535/2226 1534/1536/2226 +f 1535/1535/2227 1220/1533/2227 1219/1272/2227 +f 1221/1264/2228 1535/1535/2228 1219/1272/2228 +f 1535/1535/2229 1221/1264/2229 1212/1259/2229 +f 1540/1678/2230 1682/1679/2230 1680/1680/2230 +f 1683/1681/2231 1682/1679/2231 1540/1678/2231 +f 1685/1682/2232 1684/1683/2232 1683/1681/2232 +f 1686/1684/2233 1687/1685/2233 1685/1682/2233 +f 1688/1686/2234 1687/1685/2234 1686/1684/2234 +f 1688/1686/2235 1689/1687/2235 1687/1685/2235 +f 1690/1688/2236 1689/1687/2236 1688/1686/2236 +f 1691/1689/2237 1690/1688/2237 1688/1686/2237 +f 1691/1689/2238 1692/1690/2238 1690/1688/2238 +f 1693/1691/2239 1692/1690/2239 1691/1689/2239 +f 1693/1691/2240 1694/1692/2240 1692/1690/2240 +f 1693/1691/2241 1695/1693/2241 1694/1692/2241 +f 1696/1694/2242 1695/1693/2242 1693/1691/2242 +f 1696/1694/2243 1697/1695/2243 1695/1693/2243 +f 1698/1696/2244 1697/1695/2244 1696/1694/2244 +f 1700/1697/2245 1699/1698/2245 1698/1696/2245 +f 1702/1699/2246 1701/1700/2246 1700/1697/2246 +f 1704/1701/1287 1701/1700/1287 1703/1702/1287 +f 1704/1701/2247 1772/1703/2247 1701/1700/2247 +f 1679/1677/1289 1244/1289/1289 1233/1277/1289 +f 1679/1677/1290 1247/1292/1290 1244/1289/1290 +f 1678/1676/1291 1247/1292/1291 1679/1677/1291 +f 1678/1676/2248 1248/1293/2248 1247/1292/2248 +f 1675/1673/2249 1248/1293/2249 1678/1676/2249 +f 1675/1673/2250 1251/1296/2250 1248/1293/2250 +f 1673/1671/2251 1251/1296/2251 1675/1673/2251 +f 1673/1671/2252 1252/1297/2252 1251/1296/2252 +f 1672/1670/1297 1254/1298/1297 1673/1671/1297 +f 1254/1298/1298 1252/1297/1298 1673/1671/1298 +f 1670/1668/1299 1254/1298/1299 1672/1670/1299 +f 1670/1668/2253 1255/1299/2253 1254/1298/2253 +f 1668/1666/1301 1670/1668/1301 1669/1667/1301 +f 1668/1666/2254 1255/1299/2254 1670/1668/2254 +f 1668/1666/2255 1257/1300/2255 1255/1299/2255 +f 1665/1663/2256 1668/1666/2256 1667/1665/2256 +f 1668/1666/2257 1258/1302/2257 1257/1300/2257 +f 1665/1663/1306 1258/1302/1306 1668/1666/1306 +f 1665/1663/1307 1260/1303/1307 1258/1302/1307 +f 1663/1661/1308 1260/1303/1308 1665/1663/1308 +f 1663/1661/1309 1261/1305/1309 1260/1303/1309 +f 1661/1659/2258 1261/1305/2258 1663/1661/2258 +f 1659/1657/2259 1263/1308/2259 1661/1659/2259 +f 1263/1308/2260 1261/1305/2260 1661/1659/2260 +f 1656/1655/2261 1263/1308/2261 1659/1657/2261 +f 1656/1655/2262 1265/1309/2262 1263/1308/2262 +f 1654/1653/1315 1265/1309/1315 1656/1655/1315 +f 1654/1653/1316 1267/1311/1316 1265/1309/1316 +f 1653/1652/1317 1267/1311/1317 1654/1653/1317 +f 1653/1652/2263 1269/1313/2263 1267/1311/2263 +f 1652/1651/2264 1269/1313/2264 1653/1652/2264 +f 1652/1651/2265 1270/1314/2265 1269/1313/2265 +f 1650/1649/1321 1270/1314/1321 1652/1651/1321 +f 1650/1649/1322 1273/1317/1322 1270/1314/1322 +f 1648/1647/1323 1273/1317/1323 1650/1649/1323 +f 1648/1647/2266 1274/1318/2266 1273/1317/2266 +f 1647/1646/2267 1276/1319/2267 1648/1647/2267 +f 1276/1319/2268 1274/1318/2268 1648/1647/2268 +f 1645/1644/1327 1276/1319/1327 1647/1646/1327 +f 1645/1644/2269 1277/1320/2269 1276/1319/2269 +f 1643/1642/2270 1645/1644/2270 1644/1643/2270 +f 1643/1642/2271 1277/1320/2271 1645/1644/2271 +f 1643/1642/2272 1279/1321/2272 1277/1320/2272 +f 1641/1640/2273 1643/1642/2273 1642/1641/2273 +f 1643/1642/1333 1280/1323/1333 1279/1321/1333 +f 1641/1640/1334 1280/1323/1334 1643/1642/1334 +f 1641/1640/1335 1282/1324/1335 1280/1323/1335 +f 1639/1638/1336 1282/1324/1336 1641/1640/1336 +f 1639/1638/2274 1283/1326/2274 1282/1324/2274 +f 1637/1636/2275 1283/1326/2275 1639/1638/2275 +f 1635/1634/1339 1285/1329/1339 1637/1636/1339 +f 1285/1329/1340 1283/1326/1340 1637/1636/1340 +f 1633/1632/1341 1285/1329/1341 1635/1634/1341 +f 1633/1632/1342 1287/1330/1342 1285/1329/1342 +f 1631/1630/2276 1287/1330/2276 1633/1632/2276 +f 1631/1630/1344 1289/1332/1344 1287/1330/1344 +f 1630/1629/1345 1289/1332/1345 1631/1630/1345 +f 1630/1629/1346 1291/1334/1346 1289/1332/1346 +f 1629/1628/1347 1291/1334/1347 1630/1629/1347 +f 1629/1628/1348 1293/1336/1348 1291/1334/1348 +f 1627/1626/1349 1293/1336/1349 1629/1628/1349 +f 1627/1626/2277 1296/1338/2277 1293/1336/2277 +f 1625/1624/1351 1296/1338/1351 1627/1626/1351 +f 1625/1624/1352 1297/1340/1352 1296/1338/1352 +f 1624/1623/2278 1299/1341/2278 1625/1624/2278 +f 1299/1341/2279 1297/1340/2279 1625/1624/2279 +f 1622/1621/2280 1299/1341/2280 1624/1623/2280 +f 1622/1621/1356 1300/1342/1356 1299/1341/1356 +f 1620/1619/2281 1622/1621/2281 1621/1620/2281 +f 1620/1619/2282 1300/1342/2282 1622/1621/2282 +f 1620/1619/1359 1302/1343/1359 1300/1342/1359 +f 1618/1617/2283 1620/1619/2283 1619/1618/2283 +f 1620/1619/2284 1303/1345/2284 1302/1343/2284 +f 1618/1617/1362 1303/1345/1362 1620/1619/1362 +f 1618/1617/2285 1305/1346/2285 1303/1345/2285 +f 1616/1615/1364 1305/1346/1364 1618/1617/1364 +f 1616/1615/1365 1306/1348/1365 1305/1346/1365 +f 1614/1613/2286 1306/1348/2286 1616/1615/2286 +f 1612/1611/1367 1311/1356/1367 1614/1613/1367 +f 1311/1356/2287 1306/1348/2287 1614/1613/2287 +f 1610/1609/2288 1311/1356/2288 1612/1611/2288 +f 1610/1609/1370 1315/1357/1370 1311/1356/1370 +f 1608/1607/1371 1315/1357/1371 1610/1609/1371 +f 1608/1607/1372 1318/1360/1372 1315/1357/1372 +f 1607/1606/2289 1318/1360/2289 1608/1607/2289 +f 1607/1606/1374 1322/1363/1374 1318/1360/1374 +f 1606/1605/1375 1322/1363/1375 1607/1606/1375 +f 1606/1605/1376 1326/1366/1376 1322/1363/1376 +f 1606/1605/1377 1329/1370/1377 1326/1366/1377 +f 1604/1603/1378 1329/1370/1378 1606/1605/1378 +f 1604/1603/1379 1332/1372/1379 1329/1370/1379 +f 1602/1601/1380 1332/1372/1380 1604/1603/1380 +f 1602/1601/1381 1336/1377/1381 1332/1372/1381 +f 1600/1599/2290 1336/1377/2290 1602/1601/2290 +f 1600/1599/1383 1340/1380/1383 1336/1377/1383 +f 1598/1597/2291 1600/1599/2291 1599/1598/2291 +f 1598/1597/2292 1340/1380/2292 1600/1599/2292 +f 1598/1597/2293 1343/1384/2293 1340/1380/2293 +f 1596/1595/1387 1598/1597/1387 1597/1596/1387 +f 1598/1597/1388 1347/1387/1388 1343/1384/1388 +f 1596/1595/1389 1350/1390/1389 1598/1597/1389 +f 1350/1390/2294 1347/1387/2294 1598/1597/2294 +f 1594/1593/1391 1350/1390/1391 1596/1595/1391 +f 1594/1593/1392 1351/1395/1392 1350/1390/1392 +f 1592/1591/1393 1351/1395/1393 1594/1593/1393 +f 1592/1591/1394 1356/1397/1394 1351/1395/1394 +f 1590/1589/1395 1356/1397/1395 1592/1591/1395 +f 1590/1589/2295 1359/1400/2295 1356/1397/2295 +f 1588/1587/2296 1359/1400/2296 1590/1589/2296 +f 1588/1587/2297 1363/1404/2297 1359/1400/2297 +f 1586/1585/1399 1363/1404/1399 1588/1587/1399 +f 1586/1585/1400 1366/1407/1400 1363/1404/1400 +f 1585/1584/1401 1366/1407/1401 1586/1585/1401 +f 1585/1584/2298 1370/1410/2298 1366/1407/2298 +f 1584/1583/2299 1370/1410/2299 1585/1584/2299 +f 1584/1583/2300 1373/1413/2300 1370/1410/2300 +f 1583/1582/2301 1374/1414/2301 1584/1583/2301 +f 1581/1580/2302 1374/1414/2302 1583/1582/2302 +f 1374/1414/2303 1373/1413/2303 1584/1583/2303 +f 1374/1414/2304 1581/1580/2304 1371/1411/2304 +f 1707/1704/2305 1706/1705/2305 1705/1706/2305 +f 1707/1704/2306 1708/1707/2306 1706/1705/2306 +f 1371/1411/2307 1581/1580/2307 1580/1579/2307 +f 1371/1411/2308 1580/1579/2308 1367/1408/2308 +f 1367/1408/2309 1580/1579/2309 1578/1577/2309 +f 1367/1408/2310 1578/1577/2310 1364/1405/2310 +f 1707/1704/2311 1709/1708/2311 1708/1707/2311 +f 1364/1405/2312 1578/1577/2312 1576/1575/2312 +f 1710/1709/2313 1709/1708/2313 1707/1704/2313 +f 1703/1702/1416 1701/1700/1416 1702/1699/1416 +f 1364/1405/2314 1576/1575/2314 1360/1401/2314 +f 1360/1401/2315 1576/1575/2315 1575/1574/2315 +f 1712/1710/2316 1709/1708/2316 1710/1709/2316 +f 1711/1711/2317 1702/1699/2317 1700/1697/2317 +f 1712/1710/2318 1713/1712/2318 1709/1708/2318 +f 1711/1711/2319 1700/1697/2319 1714/1713/2319 +f 1574/1573/2320 1353/1393/2320 1575/1574/2320 +f 1360/1401/2321 1575/1574/2321 1357/1398/2321 +f 1357/1398/2322 1575/1574/2322 1353/1393/2322 +f 1712/1710/2323 1715/1714/2323 1713/1712/2323 +f 1572/1571/1429 1353/1393/1429 1574/1573/1429 +f 1716/1715/2324 1715/1714/2324 1712/1710/2324 +f 1572/1571/2325 1352/1392/2325 1353/1393/2325 +f 1717/1716/2326 1771/1717/2326 1711/1711/2326 +f 1714/1713/2327 1700/1697/2327 1698/1696/2327 +f 1714/1713/2328 1698/1696/2328 1718/1718/2328 +f 1570/1569/2329 1352/1392/2329 1572/1571/2329 +f 1720/1719/2330 1715/1714/2330 1716/1715/2330 +f 1719/1720/2331 1714/1713/2331 1718/1718/2331 +f 1570/1569/1437 1348/1389/1437 1352/1392/1437 +f 1720/1719/2332 1722/1721/2332 1715/1714/2332 +f 1568/1567/2333 1348/1389/2333 1570/1569/2333 +f 1568/1567/1441 1344/1385/1441 1348/1389/1441 +f 1719/1720/2334 1723/1722/2334 1721/1723/2334 +f 1724/1724/2335 1722/1721/2335 1720/1719/2335 +f 1718/1718/2336 1698/1696/2336 1696/1694/2336 +f 1724/1724/2337 1725/1725/2337 1722/1721/2337 +f 1566/1565/2338 1344/1385/2338 1568/1567/2338 +f 1566/1565/1449 1341/1382/1449 1344/1385/1449 +f 1718/1718/2339 1723/1722/2339 1719/1720/2339 +f 1718/1718/2340 1696/1694/2340 1693/1691/2340 +f 1718/1718/2341 1727/1726/2341 1723/1722/2341 +f 1728/1727/2342 1725/1725/2342 1724/1724/2342 +f 1726/1728/2343 1718/1718/2343 1693/1691/2343 +f 1726/1728/2344 1727/1726/2344 1718/1718/2344 +f 1564/1563/1454 1341/1382/1454 1566/1565/1454 +f 1564/1563/2345 1337/1378/2345 1341/1382/2345 +f 1726/1728/2346 1693/1691/2346 1729/1729/2346 +f 1730/1730/2347 1727/1726/2347 1726/1728/2347 +f 1728/1727/2348 1731/1731/2348 1725/1725/2348 +f 1563/1562/1459 1337/1378/1459 1564/1563/1459 +f 1563/1562/1460 1334/1375/1460 1337/1378/1460 +f 1732/1732/2349 1731/1731/2349 1728/1727/2349 +f 1562/1561/1464 1334/1375/1464 1563/1562/1464 +f 1729/1729/2350 1733/1733/2350 1730/1730/2350 +f 1729/1729/2351 1693/1691/2351 1691/1689/2351 +f 1729/1729/2352 1691/1689/2352 1734/1734/2352 +f 1334/1375/2353 1562/1561/2353 1330/1371/2353 +f 1732/1732/2354 1682/1679/2354 1731/1731/2354 +f 1729/1729/2355 1735/1735/2355 1733/1733/2355 +f 1736/1736/2356 1682/1679/2356 1732/1732/2356 +f 1561/1560/1470 1327/1367/1470 1562/1561/1470 +f 1734/1734/2357 1735/1735/2357 1729/1729/2357 +f 1734/1734/2358 1691/1689/2358 1737/1737/2358 +f 1559/1558/1472 1327/1367/1472 1561/1560/1472 +f 1330/1371/2359 1562/1561/2359 1327/1367/2359 +f 1736/1736/2360 1680/1680/2360 1682/1679/2360 +f 1691/1689/2361 1688/1686/2361 1738/1738/2361 +f 1737/1737/2362 1691/1689/2362 1738/1738/2362 +f 1737/1737/2363 1735/1735/2363 1734/1734/2363 +f 1737/1737/2364 1739/1739/2364 1735/1735/2364 +f 1740/1740/2365 1681/1741/2365 1758/1742/2365 +f 1327/1367/1482 1559/1558/1482 1323/1364/1482 +f 1736/1736/2366 1681/1741/2366 1680/1680/2366 +f 1742/1743/2367 1681/1741/2367 1740/1740/2367 +f 1741/1744/2368 1681/1741/2368 1736/1736/2368 +f 1738/1738/2369 1688/1686/2369 1686/1684/2369 +f 1538/1539/2370 1740/1740/2370 1376/1416/2370 +f 1323/1364/1488 1559/1558/1488 1558/1557/1488 +f 1737/1737/2371 1743/1745/2371 1739/1739/2371 +f 1538/1539/2372 1742/1743/2372 1740/1740/2372 +f 1323/1364/1491 1558/1557/1491 1319/1361/1491 +f 1738/1738/2373 1743/1745/2373 1737/1737/2373 +f 1680/1680/2374 1681/1741/2374 1742/1743/2374 +f 1540/1678/2375 1538/1539/2375 1539/1350/2375 +f 1319/1361/1494 1558/1557/1494 1556/1555/1494 +f 1738/1738/2376 1686/1684/2376 1685/1682/2376 +f 1540/1678/2377 1680/1680/2377 1742/1743/2377 +f 1540/1678/2378 1742/1743/2378 1538/1539/2378 +f 1738/1738/2379 1685/1682/2379 1745/1746/2379 +f 1744/1747/2380 1738/1738/2380 1745/1746/2380 +f 1554/1552/1498 1313/1353/1498 1556/1555/1498 +f 1319/1361/1499 1556/1555/1499 1316/1358/1499 +f 1744/1747/2381 1743/1745/2381 1738/1738/2381 +f 1316/1358/1501 1556/1555/1501 1313/1353/1501 +f 1744/1747/2382 1747/1748/2382 1743/1745/2382 +f 1745/1746/2383 1685/1682/2383 1683/1681/2383 +f 1683/1681/2384 1540/1678/2384 1539/1350/2384 +f 1553/1554/1504 1313/1353/1504 1554/1552/1504 +f 1544/1546/2385 1746/1749/2385 1545/1545/2385 +f 1745/1746/2386 1749/1750/2386 1744/1747/2386 +f 1745/1746/2387 1683/1681/2387 1539/1350/2387 +f 1552/1551/1507 1310/1751/1507 1553/1554/1507 +f 1313/1353/1508 1553/1554/1508 1308/1354/1508 +f 1750/1752/2388 1547/1543/2388 1545/1545/2388 +f 1308/1354/1510 1553/1554/1510 1310/1751/1510 +f 1748/1753/2389 1745/1746/2389 1539/1350/2389 +f 1748/1753/2390 1749/1750/2390 1745/1746/2390 +f 1539/1350/1512 1307/1349/1512 1751/1754/1512 +f 1550/1549/2391 1310/1751/2391 1552/1551/2391 +f 1752/1755/1514 1547/1543/1514 1750/1752/1514 +f 1748/1753/2392 1753/1756/2392 1749/1750/2392 +f 1751/1754/2393 1748/1753/2393 1539/1350/2393 +f 1307/1349/2394 1308/1354/2394 1751/1754/2394 +f 1752/1755/1518 1549/1548/1518 1547/1543/1518 +f 1308/1354/1519 1310/1751/1519 1751/1754/1519 +f 1752/1755/2395 1550/1549/2395 1549/1548/2395 +f 1754/1757/2396 1753/1756/2396 1748/1753/2396 +f 1748/1753/2397 1751/1754/2397 1754/1757/2397 +f 1310/1751/1523 1550/1549/1523 1752/1755/1523 +f 1751/1754/2398 1310/1751/2398 1752/1755/2398 +f 1754/1757/2399 1751/1754/2399 1752/1755/2399 +f 1677/1675/2400 1679/1677/2400 1220/1533/2400 +f 1528/1530/2401 1672/1670/2401 1674/1672/2401 +f 1671/1669/1529 1672/1670/1529 1528/1530/1529 +f 1524/1526/1530 1669/1667/1530 1671/1669/1530 +f 1521/1523/2402 1669/1667/2402 1524/1526/2402 +f 1521/1523/1532 1667/1665/1532 1669/1667/1532 +f 1521/1523/1533 1665/1663/1533 1667/1665/1533 +f 1664/1662/1534 1665/1663/1534 1521/1523/1534 +f 1510/1518/1535 1653/1652/1535 1655/1654/1535 +f 1506/1515/1536 1653/1652/1536 1510/1518/1536 +f 1651/1650/1537 1653/1652/1537 1506/1515/1537 +f 1502/1512/2403 1647/1646/2403 1649/1648/2403 +f 1646/1645/1539 1647/1646/1539 1502/1512/1539 +f 1498/1508/2404 1644/1643/2404 1646/1645/2404 +f 1495/1505/1541 1644/1643/1541 1498/1508/1541 +f 1495/1505/2405 1642/1641/2405 1644/1643/2405 +f 1495/1505/2406 1641/1640/2406 1642/1641/2406 +f 1640/1639/2407 1641/1640/2407 1495/1505/2407 +f 1484/1500/2408 1630/1629/2408 1632/1631/2408 +f 1480/1497/1546 1630/1629/1546 1484/1500/1546 +f 1628/1627/1547 1630/1629/1547 1480/1497/1547 +f 1476/1494/1548 1624/1623/1548 1626/1625/1548 +f 1623/1622/2409 1624/1623/2409 1476/1494/2409 +f 1472/1490/2410 1621/1620/2410 1623/1622/2410 +f 1469/1487/2411 1621/1620/2411 1472/1490/2411 +f 1469/1487/1552 1619/1618/1552 1621/1620/1552 +f 1469/1487/1553 1618/1617/1553 1619/1618/1553 +f 1617/1616/1554 1618/1617/1554 1469/1487/1554 +f 1458/1482/1555 1607/1606/1555 1609/1608/1555 +f 1454/1480/1556 1607/1606/1556 1458/1482/1556 +f 1454/1480/1557 1606/1605/1557 1607/1606/1557 +f 1605/1604/2412 1606/1605/2412 1454/1480/2412 +f 1447/1472/1559 1599/1598/1559 1601/1600/1559 +f 1444/1469/1560 1599/1598/1560 1447/1472/1560 +f 1444/1469/1561 1597/1596/1561 1599/1598/1561 +f 1444/1469/1562 1596/1595/1562 1597/1596/1562 +f 1595/1594/1563 1596/1595/1563 1444/1469/1563 +f 1433/1463/1564 1585/1584/1564 1587/1586/1564 +f 1429/1460/2413 1585/1584/2413 1433/1463/2413 +f 1429/1460/2414 1583/1582/2414 1585/1584/2414 +f 1582/1581/2415 1583/1582/2415 1429/1460/2415 +f 1425/1457/2416 1580/1579/2416 1582/1581/2416 +f 1579/1578/2417 1580/1579/2417 1425/1457/2417 +f 1419/1452/2418 1575/1574/2418 1577/1576/2418 +f 1419/1452/2419 1574/1573/2419 1575/1574/2419 +f 1573/1572/1572 1574/1573/1572 1419/1452/1572 +f 1565/1564/1573 1408/1446/1573 1563/1562/1573 +f 1563/1562/2420 1408/1446/2420 1404/1443/2420 +f 1563/1562/1575 1404/1443/1575 1561/1560/1575 +f 1561/1560/1577 1404/1443/1577 1560/1559/1577 +f 1684/1683/2421 1682/1679/2421 1683/1681/2421 +f 1560/1559/2422 1400/1440/2422 1558/1557/2422 +f 1684/1683/2423 1731/1731/2423 1682/1679/2423 +f 1558/1557/1582 1400/1440/1582 1557/1556/1582 +f 1687/1685/2424 1684/1683/2424 1685/1682/2424 +f 1687/1685/2425 1731/1731/2425 1684/1683/2425 +f 1725/1725/2426 1731/1731/2426 1687/1685/2426 +f 1747/1748/2427 1744/1747/2427 1728/1727/2427 +f 1728/1727/2428 1744/1747/2428 1749/1750/2428 +f 1555/1553/1590 1394/1434/1590 1553/1554/1590 +f 1728/1727/2429 1749/1750/2429 1732/1732/2429 +f 1689/1687/2430 1725/1725/2430 1687/1685/2430 +f 1728/1727/2431 1743/1745/2431 1747/1748/2431 +f 1724/1724/2432 1743/1745/2432 1728/1727/2432 +f 1732/1732/2433 1749/1750/2433 1753/1756/2433 +f 1553/1554/1595 1394/1434/1595 1552/1551/1595 +f 1689/1687/2434 1722/1721/2434 1725/1725/2434 +f 1690/1688/2435 1722/1721/2435 1689/1687/2435 +f 1552/1551/1596 1394/1434/1596 1551/1550/1596 +f 1732/1732/2436 1753/1756/2436 1736/1736/2436 +f 1724/1724/2437 1739/1739/2437 1743/1745/2437 +f 1690/1688/2438 1715/1714/2438 1722/1721/2438 +f 1692/1690/2439 1715/1714/2439 1690/1688/2439 +f 1736/1736/2440 1753/1756/2440 1754/1757/2440 +f 1720/1719/2441 1739/1739/2441 1724/1724/2441 +f 1736/1736/2442 1754/1757/2442 1741/1744/2442 +f 1741/1744/2443 1754/1757/2443 1755/1758/2443 +f 1752/1755/2444 1755/1758/2444 1754/1757/2444 +f 1720/1719/2445 1735/1735/2445 1739/1739/2445 +f 1692/1690/2446 1694/1692/2446 1715/1714/2446 +f 1750/1752/1609 1755/1758/1609 1752/1755/1609 +f 1716/1715/2447 1735/1735/2447 1720/1719/2447 +f 1730/1730/2448 1726/1728/2448 1729/1729/2448 +f 1694/1692/2449 1713/1712/2449 1715/1714/2449 +f 1695/1693/2450 1713/1712/2450 1694/1692/2450 +f 1740/1740/2451 1377/1417/2451 1376/1416/2451 +f 1755/1758/2452 1750/1752/2452 1756/1759/2452 +f 1712/1710/2453 1735/1735/2453 1716/1715/2453 +f 1757/1760/2454 1681/1741/2454 1741/1744/2454 +f 1750/1752/2455 1545/1545/2455 1746/1749/2455 +f 1712/1710/2456 1733/1733/2456 1735/1735/2456 +f 1757/1760/2457 1758/1742/2457 1681/1741/2457 +f 1757/1760/2458 1741/1744/2458 1755/1758/2458 +f 1756/1759/2459 1750/1752/2459 1746/1749/2459 +f 1697/1695/2460 1713/1712/2460 1695/1693/2460 +f 1377/1417/2461 1740/1740/2461 1758/1742/2461 +f 1756/1759/2462 1757/1760/2462 1755/1758/2462 +f 1546/1544/1626 1386/1427/1626 1545/1545/1626 +f 1545/1545/1627 1386/1427/1627 1544/1546/1627 +f 1697/1695/2463 1709/1708/2463 1713/1712/2463 +f 1759/1761/2464 1758/1742/2464 1757/1760/2464 +f 1710/1709/2465 1730/1730/2465 1733/1733/2465 +f 1712/1710/2466 1710/1709/2466 1733/1733/2466 +f 1756/1759/2467 1759/1761/2467 1757/1760/2467 +f 1746/1749/2468 1759/1761/2468 1756/1759/2468 +f 1377/1417/2469 1758/1742/2469 1378/1420/2469 +f 1760/1762/2470 1759/1761/2470 1746/1749/2470 +f 1759/1761/2471 1378/1420/2471 1758/1742/2471 +f 1541/1540/1637 1746/1749/1637 1544/1546/1637 +f 1727/1726/2472 1730/1730/2472 1710/1709/2472 +f 1762/1763/2473 1378/1420/2473 1759/1761/2473 +f 1541/1540/1640 1760/1762/1640 1746/1749/1640 +f 1544/1546/1642 1380/1421/1642 1541/1540/1642 +f 1697/1695/2474 1708/1707/2474 1709/1708/2474 +f 1698/1696/2475 1708/1707/2475 1697/1695/2475 +f 1378/1420/2476 1761/1764/2476 1379/1419/2476 +f 1760/1762/2477 1762/1763/2477 1759/1761/2477 +f 1707/1704/2478 1727/1726/2478 1710/1709/2478 +f 1721/1723/2479 1714/1713/2479 1719/1720/2479 +f 1379/1419/2480 1761/1764/2480 1536/1537/2480 +f 1717/1716/2481 1714/1713/2481 1721/1723/2481 +f 1378/1420/2482 1763/1765/2482 1761/1764/2482 +f 1762/1763/2483 1763/1765/2483 1378/1420/2483 +f 1764/1766/2484 1762/1763/2484 1760/1762/2484 +f 1541/1540/1650 1380/1421/1650 1542/1541/1650 +f 1699/1698/2485 1708/1707/2485 1698/1696/2485 +f 1765/1767/2486 1763/1765/2486 1762/1763/2486 +f 1541/1540/1651 1764/1766/1651 1760/1762/1651 +f 1766/1768/1652 1381/1422/1652 1383/1425/1652 +f 1381/1422/1653 1703/1702/1653 1702/1699/1653 +f 1699/1698/2487 1706/1705/2487 1708/1707/2487 +f 1543/1542/2488 1764/1766/2488 1541/1540/2488 +f 1381/1422/1656 1702/1699/1656 1382/1423/1656 +f 1766/1768/2489 1383/1425/2489 1536/1537/2489 +f 1766/1768/1658 1703/1702/1658 1381/1422/1658 +f 1764/1766/2490 1765/1767/2490 1762/1763/2490 +f 1707/1704/2491 1723/1722/2491 1727/1726/2491 +f 1382/1423/1662 1702/1699/1662 1711/1711/1662 +f 1711/1711/2492 1714/1713/2492 1717/1716/2492 +f 1700/1697/2493 1706/1705/2493 1699/1698/2493 +f 1761/1764/2494 1763/1765/2494 1767/1769/2494 +f 1543/1542/2495 1765/1767/2495 1764/1766/2495 +f 1542/1541/2496 1382/1423/2496 1768/1770/2496 +f 1536/1537/1668 1704/1701/1668 1766/1768/1668 +f 1766/1768/1669 1704/1701/1669 1703/1702/1669 +f 1700/1697/2497 1769/1771/2497 1706/1705/2497 +f 1761/1764/2498 1767/1769/2498 1536/1537/2498 +f 1765/1767/2499 1767/1769/2499 1763/1765/2499 +f 1705/1706/1671 1723/1722/1671 1707/1704/1671 +f 1542/1541/2500 1768/1770/2500 1543/1542/2500 +f 1705/1706/2501 1721/1723/2501 1723/1722/2501 +f 1536/1537/2502 1767/1769/2502 1704/1701/2502 +f 1711/1711/1677 1768/1770/1677 1382/1423/1677 +f 1701/1700/2503 1769/1771/2503 1700/1697/2503 +f 1705/1706/1411 1706/1705/1411 1769/1771/1411 +f 1770/1772/2504 1767/1769/2504 1765/1767/2504 +f 1768/1770/2505 1765/1767/2505 1543/1542/2505 +f 1701/1700/2506 1772/1703/2506 1769/1771/2506 +f 1705/1706/2507 1769/1771/2507 1773/1773/2507 +f 1768/1770/2508 1770/1772/2508 1765/1767/2508 +f 1773/1773/2509 1721/1723/2509 1705/1706/2509 +f 1711/1711/1686 1771/1717/1686 1768/1770/1686 +f 1767/1769/2510 1772/1703/2510 1704/1701/2510 +f 1771/1717/1688 1770/1772/1688 1768/1770/1688 +f 1773/1773/2511 1717/1716/2511 1721/1723/2511 +f 1770/1772/2512 1772/1703/2512 1767/1769/2512 +f 1773/1773/2513 1769/1771/2513 1772/1703/2513 +f 1771/1717/2514 1717/1716/2514 1773/1773/2514 +f 1773/1773/2515 1772/1703/2515 1770/1772/2515 +f 1771/1717/2516 1773/1773/2516 1770/1772/2516 +f 1776/1774/2517 1775/1775/2517 1774/1776/2517 +f 1776/1774/2518 1777/1777/2518 1775/1775/2518 +f 1779/1778/2519 1777/1777/2519 1776/1774/2519 +f 1780/1779/209 1776/1774/209 1774/1776/209 +f 1775/1775/2520 1777/1777/2520 1778/1780/2520 +f 1780/1779/209 1779/1778/209 1776/1774/209 +f 1781/1781/209 1779/1778/209 1780/1779/209 +f 1779/1778/2521 1782/1782/2521 1777/1777/2521 +f 1778/1780/2522 1777/1777/2522 1782/1782/2522 +f 1783/1783/2523 1782/1782/2523 1779/1778/2523 +f 1784/1784/2524 1782/1782/2524 1783/1783/2524 +f 1783/1783/209 1779/1778/209 1781/1781/209 +f 1782/1782/2525 1785/1785/2525 1778/1780/2525 +f 1784/1784/2526 1785/1785/2526 1782/1782/2526 +f 1781/1781/209 1784/1784/209 1783/1783/209 +f 1786/1786/2527 1787/1787/2527 1785/1785/2527 +f 1788/1788/209 1784/1784/209 1781/1781/209 +f 1786/1786/2528 1785/1785/2528 1784/1784/2528 +f 1788/1788/209 1786/1786/209 1784/1784/209 +f 1791/1789/209 1792/1790/209 1793/1791/209 +f 1789/1792/2529 1790/1793/2529 1794/1794/2529 +f 1789/1792/2530 1791/1789/2530 1795/1795/2530 +f 1789/1792/2531 1796/1796/2531 1790/1793/2531 +f 1797/1797/204 1790/1793/204 1798/1798/204 +f 1791/1789/209 1793/1791/209 1799/1799/209 +f 1800/1800/2532 1801/1801/2532 1802/1802/2532 +f 1789/1792/2533 1803/1803/2533 1791/1789/2533 +f 1804/1804/2534 1793/1791/2534 1792/1790/2534 +f 1802/1802/2535 1806/1805/2535 1807/1806/2535 +f 1789/1792/2536 1794/1794/2536 1808/1807/2536 +f 1797/1797/210 1794/1794/210 1790/1793/210 +f 1797/1797/2 1804/1804/2 1809/1808/2 +f 1799/1799/209 1793/1791/209 1810/1809/209 +f 1811/1810/215 1793/1791/215 1804/1804/215 +f 1798/1798/2 1804/1804/2 1797/1797/2 +f 1795/1795/2537 1796/1796/2537 1789/1792/2537 +f 1798/1798/204 1790/1793/204 1796/1796/204 +f 1812/1811/2538 1791/1789/2538 1799/1799/2538 +f 1795/1795/2539 1791/1789/2539 1812/1811/2539 +f 1802/1802/2540 1807/1806/2540 1800/1800/2540 +f 1802/1802/2541 1801/1801/2541 1805/1812/2541 +f 1808/1807/2542 1813/1813/2542 1789/1792/2542 +f 1789/1792/2543 1813/1813/2543 1803/1803/2543 +f 1803/1803/209 1792/1790/209 1791/1789/209 +f 1804/1804/2534 1792/1790/2534 1809/1808/2534 +f 1814/1814/209 1805/1812/209 1815/1815/209 +f 1816/1816/208 1807/1806/208 1806/1805/208 +f 1808/1807/2544 1794/1794/2544 1817/1817/2544 +f 1818/1818/210 1794/1794/210 1797/1797/210 +f 1797/1797/2 1809/1808/2 1818/1818/2 +f 1819/1819/209 1810/1809/209 1820/1820/209 +f 1811/1810/2545 1810/1809/2545 1793/1791/2545 +f 1798/1798/2 1811/1810/2 1804/1804/2 +f 1795/1795/2546 1822/1821/2546 1796/1796/2546 +f 1798/1798/203 1796/1796/203 1823/1822/203 +f 1819/1819/209 1820/1820/209 1824/1823/209 +f 1799/1799/209 1810/1809/209 1819/1819/209 +f 1812/1811/2547 1822/1821/2547 1795/1795/2547 +f 1825/1824/2548 1801/1801/2548 1800/1800/2548 +f 1800/1800/2549 1807/1806/2549 1826/1825/2549 +f 1827/1826/208 1807/1806/208 1816/1816/208 +f 1828/1827/2 1816/1816/2 1829/1828/2 +f 1828/1827/2550 1814/1814/2550 1815/1815/2550 +f 1830/1829/209 1805/1812/209 1801/1801/209 +f 1803/1803/209 1813/1813/209 1792/1790/209 +f 1829/1828/2551 1814/1814/2551 1828/1827/2551 +f 1814/1814/209 1831/1830/209 1805/1812/209 +f 1802/1802/2552 1805/1812/2552 1832/1831/2552 +f 1802/1802/2553 1833/1832/2553 1806/1805/2553 +f 1816/1816/210 1806/1805/210 1834/1833/210 +f 1808/1807/2554 1835/1834/2554 1813/1813/2554 +f 1818/1818/208 1817/1817/208 1794/1794/208 +f 1829/1828/2 1816/1816/2 1834/1833/2 +f 1818/1818/2 1809/1808/2 1829/1828/2 +f 1810/1809/2555 1821/1835/2555 1820/1820/2555 +f 1785/1785/2556 1787/1787/2556 1778/1780/2556 +f 1820/1820/209 1835/1834/209 1824/1823/209 +f 1821/1835/2557 1810/1809/2557 1811/1810/2557 +f 1823/1822/2 1811/1810/2 1798/1798/2 +f 1823/1822/203 1796/1796/203 1822/1821/203 +f 1841/1836/2558 1824/1823/2558 1835/1834/2558 +f 1842/1837/2559 1819/1819/2559 1824/1823/2559 +f 1842/1837/2560 1799/1799/2560 1819/1819/2560 +f 1812/1811/2561 1799/1799/2561 1842/1837/2561 +f 1812/1811/2562 1843/1838/2562 1822/1821/2562 +f 1844/1839/2563 1845/1840/2563 1836/1841/2563 +f 1836/1841/2564 1846/1842/2564 1847/1843/2564 +f 1825/1824/2565 1848/1844/2565 1801/1801/2565 +f 1800/1800/2566 1826/1825/2566 1825/1824/2566 +f 1827/1826/207 1826/1825/207 1807/1806/207 +f 1828/1827/2 1827/1826/2 1816/1816/2 +f 1815/1815/209 1805/1812/209 1830/1829/209 +f 1828/1827/218 1815/1815/218 1849/1845/218 +f 1830/1829/209 1801/1801/209 1780/1779/209 +f 1780/1779/209 1801/1801/209 1848/1844/209 +f 1813/1813/209 1835/1834/209 1781/1781/209 +f 1792/1790/132 1829/1828/132 1809/1808/132 +f 1832/1831/2567 1805/1812/2567 1831/1830/2567 +f 1832/1831/2568 1833/1832/2568 1802/1802/2568 +f 1834/1833/210 1806/1805/210 1833/1832/210 +f 1840/1846/2569 1835/1834/2569 1808/1807/2569 +f 1808/1807/2570 1817/1817/2570 1850/1847/2570 +f 1851/1848/208 1817/1817/208 1818/1818/208 +f 1829/1828/2 1834/1833/2 1852/1849/2 +f 1818/1818/2 1829/1828/2 1851/1848/2 +f 1820/1820/8 1821/1835/8 1853/1850/8 +f 1778/1780/2571 1787/1787/2571 1854/1851/2571 +f 1836/1841/2572 1845/1840/2572 1837/1852/2572 +f 1855/1853/209 1837/1852/209 1856/1854/209 +f 1781/1781/209 1835/1834/209 1820/1820/209 +f 1857/1855/2573 1839/1856/2573 1838/1857/2573 +f 1838/1857/2574 1858/1858/2574 1859/1859/2574 +f 1823/1822/2 1821/1835/2 1811/1810/2 +f 1823/1822/206 1822/1821/206 1860/1860/206 +f 1841/1836/2575 1835/1834/2575 1840/1846/2575 +f 1842/1837/2576 1824/1823/2576 1841/1836/2576 +f 1842/1837/2577 1861/1861/2577 1812/1811/2577 +f 1812/1811/2578 1861/1861/2578 1843/1838/2578 +f 1860/1860/206 1822/1821/206 1843/1838/206 +f 1854/1851/2579 1775/1775/2579 1778/1780/2579 +f 1836/1841/2580 1847/1843/2580 1844/1839/2580 +f 1863/1862/215 1847/1843/215 1846/1842/215 +f 1864/1863/2581 1855/1853/2581 1865/1864/2581 +f 1855/1853/209 1866/1865/209 1837/1852/209 +f 1836/1841/2582 1837/1852/2582 1867/1866/2582 +f 1836/1841/2583 1868/1867/2583 1846/1842/2583 +f 1863/1862/214 1846/1842/214 1869/1868/214 +f 1825/1824/2583 1826/1825/2583 1870/1869/2583 +f 1871/1870/207 1826/1825/207 1827/1826/207 +f 1849/1845/2 1827/1826/2 1828/1827/2 +f 1849/1845/217 1815/1815/217 1830/1829/217 +f 1780/1779/212 1872/1871/212 1830/1829/212 +f 1869/1868/2 1864/1863/2 1863/1862/2 +f 1792/1790/209 1813/1813/209 1781/1781/209 +f 1814/1814/2584 1829/1828/2584 1792/1790/2584 +f 1832/1831/2585 1873/1872/2585 1833/1832/2585 +f 1834/1833/204 1833/1832/204 1852/1849/204 +f 1808/1807/2586 1850/1847/2586 1840/1846/2586 +f 1851/1848/207 1850/1847/207 1817/1817/207 +f 1851/1848/2 1829/1828/2 1852/1849/2 +f 1874/1873/209 1839/1856/209 1820/1820/209 +f 1838/1857/2587 1839/1856/2587 1874/1873/2587 +f 1820/1820/8 1853/1850/8 1875/1874/8 +f 1876/1875/2 1853/1850/2 1821/1835/2 +f 1877/1876/2588 1854/1851/2588 1787/1787/2588 +f 1837/1852/209 1845/1840/209 1862/1877/209 +f 1865/1864/2589 1855/1853/2589 1856/1854/2589 +f 1863/1862/2 1864/1863/2 1865/1864/2 +f 1820/1820/209 1839/1856/209 1781/1781/209 +f 1857/1855/2590 1878/1878/2590 1839/1856/2590 +f 1838/1857/2591 1859/1859/2591 1857/1855/2591 +f 1876/1875/203 1859/1859/203 1858/1858/203 +f 1860/1860/2 1821/1835/2 1823/1822/2 +f 1876/1875/2 1821/1835/2 1879/1879/2 +f 1840/1846/2592 1880/1880/2592 1841/1836/2592 +f 1841/1836/2593 1882/1881/2593 1842/1837/2593 +f 1842/1837/2594 1883/1882/2594 1861/1861/2594 +f 1884/1883/217 1843/1838/217 1861/1861/217 +f 1860/1860/217 1843/1838/217 1884/1883/217 +f 1774/1776/2595 1854/1851/2595 1877/1876/2595 +f 1774/1776/2596 1775/1775/2596 1854/1851/2596 +f 1862/1877/209 1845/1840/209 1885/1884/209 +f 1844/1839/2597 1847/1843/2597 1886/1885/2597 +f 1887/1886/215 1847/1843/215 1863/1862/215 +f 1867/1866/2598 1837/1852/2598 1866/1865/2598 +f 1867/1866/2566 1868/1867/2566 1836/1841/2566 +f 1869/1868/214 1846/1842/214 1868/1867/214 +f 1871/1870/214 1870/1869/214 1826/1825/214 +f 1849/1845/2 1871/1870/2 1827/1826/2 +f 1849/1845/217 1830/1829/217 1872/1871/217 +f 1780/1779/212 1864/1863/212 1872/1871/212 +f 1888/1887/2 1864/1863/2 1869/1868/2 +f 1889/1888/209 1780/1779/209 1848/1844/209 +f 1890/1889/2599 1848/1844/2599 1825/1824/2599 +f 1889/1888/209 1781/1781/209 1780/1779/209 +f 1889/1888/209 1792/1790/209 1781/1781/209 +f 1792/1790/209 1831/1830/209 1814/1814/209 +f 1852/1849/204 1833/1832/204 1873/1872/204 +f 1840/1846/2600 1850/1847/2600 1880/1880/2600 +f 1891/1890/207 1850/1847/207 1851/1848/207 +f 1851/1848/2 1852/1849/2 1892/1891/2 +f 1874/1873/209 1820/1820/209 1875/1874/209 +f 1838/1857/2601 1874/1873/2601 1893/1892/2601 +f 1838/1857/2602 1894/1893/2602 1858/1858/2602 +f 1876/1875/206 1858/1858/206 1895/1894/206 +f 1896/1895/207 1875/1874/207 1853/1850/207 +f 1895/1894/2 1853/1850/2 1876/1875/2 +f 1877/1876/2603 1787/1787/2603 1786/1786/2603 +f 1885/1884/209 1877/1876/209 1862/1877/209 +f 1856/1854/209 1837/1852/209 1862/1877/209 +f 1865/1864/203 1856/1854/203 1897/1896/203 +f 1863/1862/2 1865/1864/2 1887/1886/2 +f 1781/1781/209 1839/1856/209 1878/1878/209 +f 1857/1855/2531 1859/1859/2531 1898/1897/2531 +f 1879/1879/203 1859/1859/203 1876/1875/203 +f 1879/1879/2 1821/1835/2 1860/1860/2 +f 1841/1836/2604 1880/1880/2604 1881/1898/2604 +f 1841/1836/2605 1881/1898/2605 1882/1881/2605 +f 1842/1837/2606 1882/1881/2606 1883/1882/2606 +f 1899/1899/218 1861/1861/218 1883/1882/218 +f 1884/1883/218 1861/1861/218 1899/1899/218 +f 1900/1900/2 1860/1860/2 1884/1883/2 +f 1885/1884/209 1774/1776/209 1877/1876/209 +f 1844/1839/2607 1885/1884/2607 1845/1840/2607 +f 1887/1886/2534 1886/1885/2534 1847/1843/2534 +f 1855/1853/2608 1864/1863/2608 1780/1779/2608 +f 1855/1853/209 1901/1901/209 1866/1865/209 +f 1867/1866/2609 1866/1865/2609 1902/1902/2609 +f 1867/1866/2549 1903/1903/2549 1868/1867/2549 +f 1869/1868/207 1868/1867/207 1888/1887/207 +f 1825/1824/2564 1870/1869/2564 1904/1904/2564 +f 1905/1905/214 1870/1869/214 1871/1870/214 +f 1872/1871/2 1871/1870/2 1849/1845/2 +f 1888/1887/2 1872/1871/2 1864/1863/2 +f 1890/1889/2610 1889/1888/2610 1848/1844/2610 +f 1825/1824/2611 1904/1904/2611 1890/1889/2611 +f 1906/1906/209 1792/1790/209 1889/1888/209 +f 1792/1790/209 1906/1906/209 1831/1830/209 +f 1832/1831/2612 1831/1830/2612 1907/1907/2612 +f 1832/1831/2613 1908/1908/2613 1873/1872/2613 +f 1852/1849/203 1873/1872/203 1892/1891/203 +f 1891/1890/214 1880/1880/214 1850/1847/214 +f 1892/1891/2 1891/1890/2 1851/1848/2 +f 1875/1874/209 1909/1909/209 1874/1873/209 +f 1893/1892/2614 1874/1873/2614 1909/1909/2614 +f 1893/1892/2615 1894/1893/2615 1838/1857/2615 +f 1895/1894/206 1858/1858/206 1894/1893/206 +f 1896/1895/207 1910/1910/207 1875/1874/207 +f 1895/1894/2 1896/1895/2 1853/1850/2 +f 1788/1788/209 1877/1876/209 1786/1786/209 +f 1897/1896/204 1856/1854/204 1862/1877/204 +f 1887/1886/2 1865/1864/2 1897/1896/2 +f 1781/1781/209 1878/1878/209 1788/1788/209 +f 1857/1855/2543 1911/1911/2543 1878/1878/2543 +f 1879/1879/204 1898/1897/204 1859/1859/204 +f 1879/1879/2 1860/1860/2 1900/1900/2 +f 1912/1912/215 1881/1898/215 1880/1880/215 +f 1913/1913/2534 1882/1881/2534 1881/1898/2534 +f 1914/1914/219 1883/1882/219 1882/1881/219 +f 1899/1899/219 1883/1882/219 1914/1914/219 +f 1900/1900/2 1884/1883/2 1899/1899/2 +f 1915/1915/2616 1885/1884/2616 1844/1839/2616 +f 1844/1839/2617 1886/1885/2617 1916/1916/2617 +f 1917/1917/2534 1886/1885/2534 1887/1886/2534 +f 1780/1779/209 1901/1901/209 1855/1853/209 +f 1902/1902/2618 1866/1865/2618 1901/1901/2618 +f 1902/1902/2540 1903/1903/2540 1867/1866/2540 +f 1888/1887/207 1868/1867/207 1903/1903/207 +f 1905/1905/215 1904/1904/215 1870/1869/215 +f 1872/1871/2 1905/1905/2 1871/1870/2 +f 1918/1918/2 1872/1871/2 1888/1887/2 +f 1919/1919/2619 1889/1888/2619 1890/1889/2619 +f 1890/1889/2620 1904/1904/2620 1920/1920/2620 +f 1919/1919/2621 1906/1906/2621 1889/1888/2621 +f 1907/1907/2622 1831/1830/2622 1906/1906/2622 +f 1907/1907/2623 1908/1908/2623 1832/1831/2623 +f 1892/1891/203 1873/1872/203 1908/1908/203 +f 1912/1912/214 1880/1880/214 1891/1890/214 +f 1921/1921/2 1891/1890/2 1892/1891/2 +f 1910/1910/209 1909/1909/209 1875/1874/209 +f 1893/1892/2624 1909/1909/2624 1922/1922/2624 +f 1893/1892/2625 1923/1923/2625 1894/1893/2625 +f 1895/1894/217 1894/1893/217 1924/1924/217 +f 1925/1925/208 1910/1910/208 1896/1895/208 +f 1924/1924/2 1896/1895/2 1895/1894/2 +f 1862/1877/209 1877/1876/209 1788/1788/209 +f 1897/1896/204 1862/1877/204 1926/1926/204 +f 1887/1886/2 1897/1896/2 1917/1917/2 +f 1788/1788/209 1878/1878/209 1911/1911/209 +f 1927/1927/2626 1911/1911/2626 1857/1855/2626 +f 1857/1855/2529 1898/1897/2529 1928/1928/2529 +f 1900/1900/204 1898/1897/204 1879/1879/204 +f 1913/1913/215 1881/1898/215 1912/1912/215 +f 1914/1914/2534 1882/1881/2534 1913/1913/2534 +f 1899/1899/2 1914/1914/2 1900/1900/2 +f 1844/1839/2627 1916/1916/2627 1915/1915/2627 +f 1917/1917/219 1916/1916/219 1886/1885/219 +f 1774/1776/209 1929/1929/209 1780/1779/209 +f 1902/1902/2535 1930/1930/2535 1903/1903/2535 +f 1888/1887/208 1903/1903/208 1918/1918/208 +f 1931/1931/215 1904/1904/215 1905/1905/215 +f 1918/1918/2 1905/1905/2 1872/1871/2 +f 1890/1889/2628 1920/1920/2628 1919/1919/2628 +f 1931/1931/2534 1920/1920/2534 1904/1904/2534 +f 1907/1907/2561 1906/1906/2561 1919/1919/2561 +f 1907/1907/2562 1932/1932/2562 1908/1908/2562 +f 1892/1891/206 1908/1908/206 1921/1921/206 +f 1921/1921/2 1912/1912/2 1891/1890/2 +f 1910/1910/209 1933/1933/209 1909/1909/209 +f 1922/1922/2629 1923/1923/2629 1893/1892/2629 +f 1924/1924/217 1894/1893/217 1923/1923/217 +f 1925/1925/2630 1934/1934/2630 1910/1910/2630 +f 1924/1924/2 1925/1925/2 1896/1895/2 +f 1934/1934/2631 1935/1935/2631 1788/1788/2631 +f 1788/1788/142 1926/1926/142 1862/1877/142 +f 1917/1917/2 1897/1896/2 1926/1926/2 +f 1857/1855/2632 1928/1928/2632 1927/1927/2632 +f 1900/1900/210 1928/1928/210 1898/1897/210 +f 1936/1936/2 1913/1913/2 1912/1912/2 +f 1900/1900/2 1914/1914/2 1913/1913/2 +f 1788/1788/209 1937/1937/209 1934/1934/209 +f 1934/1934/209 1933/1933/209 1910/1910/209 +f 1774/1776/209 1885/1884/209 1929/1929/209 +f 1915/1915/2633 1916/1916/2633 1938/1938/2633 +f 1939/1939/219 1916/1916/219 1917/1917/219 +f 1780/1779/209 1929/1929/209 1940/1940/209 +f 1940/1940/209 1901/1901/209 1780/1779/209 +f 1918/1918/208 1903/1903/208 1930/1930/208 +f 1918/1918/2 1931/1931/2 1905/1905/2 +f 1919/1919/2606 1920/1920/2606 1941/1941/2606 +f 1942/1942/2534 1920/1920/2534 1931/1931/2534 +f 1919/1919/2577 1943/1943/2577 1907/1907/2577 +f 1921/1921/206 1908/1908/206 1932/1932/206 +f 1936/1936/2 1912/1912/2 1921/1921/2 +f 1922/1922/2634 1909/1909/2634 1933/1933/2634 +f 1922/1922/2594 1944/1944/2594 1923/1923/2594 +f 1924/1924/218 1923/1923/218 1945/1945/218 +f 1935/1935/2635 1934/1934/2635 1925/1925/2635 +f 1945/1945/2 1925/1925/2 1924/1924/2 +f 1788/1788/142 1935/1935/142 1926/1926/142 +f 1917/1917/2 1926/1926/2 1939/1939/2 +f 1911/1911/209 1937/1937/209 1788/1788/209 +f 1946/1946/2636 1911/1911/2636 1927/1927/2636 +f 1927/1927/2637 1928/1928/2637 1947/1947/2637 +f 1948/1948/210 1928/1928/210 1900/1900/210 +f 1900/1900/2 1913/1913/2 1936/1936/2 +f 1934/1934/209 1937/1937/209 1933/1933/209 +f 1915/1915/2638 1929/1929/2638 1885/1884/2638 +f 1939/1939/218 1938/1938/218 1916/1916/218 +f 1949/1949/2639 1940/1940/2639 1929/1929/2639 +f 1950/1950/2640 1901/1901/2640 1940/1940/2640 +f 1902/1902/2641 1901/1901/2641 1950/1950/2641 +f 1902/1902/2553 1951/1951/2553 1930/1930/2553 +f 1918/1918/210 1930/1930/210 1952/1952/210 +f 1942/1942/2 1931/1931/2 1918/1918/2 +f 1942/1942/219 1941/1941/219 1920/1920/219 +f 1919/1919/2594 1941/1941/2594 1943/1943/2594 +f 1907/1907/2578 1943/1943/2578 1932/1932/2578 +f 1921/1921/217 1932/1932/217 1936/1936/217 +f 1922/1922/2576 1933/1933/2576 1953/1953/2576 +f 1945/1945/218 1923/1923/218 1944/1944/218 +f 1945/1945/2 1935/1935/2 1925/1925/2 +f 1939/1939/2 1926/1926/2 1935/1935/2 +f 1946/1946/2642 1937/1937/2642 1911/1911/2642 +f 1927/1927/2643 1947/1947/2643 1946/1946/2643 +f 1948/1948/208 1947/1947/208 1928/1928/208 +f 1936/1936/2 1948/1948/2 1900/1900/2 +f 1953/1953/2558 1933/1933/2558 1937/1937/2558 +f 1949/1949/2644 1929/1929/2644 1915/1915/2644 +f 1915/1915/2645 1938/1938/2645 1954/1954/2645 +f 1955/1955/218 1938/1938/218 1939/1939/218 +f 1950/1950/2646 1940/1940/2646 1949/1949/2646 +f 1950/1950/2647 1951/1951/2647 1902/1902/2647 +f 1952/1952/210 1930/1930/210 1951/1951/210 +f 1918/1918/2 1952/1952/2 1942/1942/2 +f 1956/1956/219 1941/1941/219 1942/1942/219 +f 1956/1956/218 1943/1943/218 1941/1941/218 +f 1936/1936/217 1932/1932/217 1943/1943/217 +f 1953/1953/2593 1957/1957/2593 1922/1922/2593 +f 1922/1922/2606 1957/1957/2606 1944/1944/2606 +f 1945/1945/219 1944/1944/219 1958/1958/219 +f 1958/1958/2 1935/1935/2 1945/1945/2 +f 1939/1939/2 1935/1935/2 1955/1955/2 +f 1946/1946/2648 1947/1947/2648 1959/1959/2648 +f 1960/1960/208 1947/1947/208 1948/1948/208 +f 1936/1936/2 1960/1960/2 1948/1948/2 +f 1953/1953/2649 1937/1937/2649 1946/1946/2649 +f 1915/1915/2650 1954/1954/2650 1949/1949/2650 +f 1955/1955/217 1954/1954/217 1938/1938/217 +f 1949/1949/2651 1962/1961/2651 1950/1950/2651 +f 1950/1950/2652 1962/1961/2652 1951/1951/2652 +f 1952/1952/204 1951/1951/204 1963/1962/204 +f 1942/1942/2 1952/1952/2 1956/1956/2 +f 1936/1936/218 1943/1943/218 1956/1956/218 +f 1953/1953/2605 1964/1963/2605 1957/1957/2605 +f 1958/1958/219 1944/1944/219 1957/1957/219 +f 1955/1955/2 1935/1935/2 1958/1958/2 +f 1960/1960/207 1959/1959/207 1947/1947/207 +f 1965/1964/2 1960/1960/2 1936/1936/2 +f 1946/1946/2653 1966/1965/2653 1953/1953/2653 +f 1949/1949/2602 1954/1954/2602 1961/1966/2602 +f 1967/1967/217 1954/1954/217 1955/1955/217 +f 1949/1949/2574 1961/1966/2574 1962/1961/2574 +f 1963/1962/204 1951/1951/204 1962/1961/204 +f 1956/1956/2 1952/1952/2 1963/1962/2 +f 1936/1936/2 1956/1956/2 1965/1964/2 +f 1968/1968/2534 1957/1957/2534 1964/1963/2534 +f 1958/1958/2534 1957/1957/2534 1968/1968/2534 +f 1955/1955/2 1958/1958/2 1967/1967/2 +f 1946/1946/2654 1959/1959/2654 1966/1965/2654 +f 1965/1964/207 1959/1959/207 1960/1960/207 +f 1953/1953/2604 1966/1965/2604 1964/1963/2604 +f 1967/1967/206 1961/1966/206 1954/1954/206 +f 1969/1969/203 1962/1961/203 1961/1966/203 +f 1963/1962/203 1962/1961/203 1969/1969/203 +f 1956/1956/2 1963/1962/2 1965/1964/2 +f 1968/1968/215 1964/1963/215 1970/1970/215 +f 1967/1967/2 1958/1958/2 1968/1968/2 +f 1965/1964/214 1966/1965/214 1959/1959/214 +f 1970/1970/215 1964/1963/215 1966/1965/215 +f 1969/1969/206 1961/1966/206 1967/1967/206 +f 1965/1964/2 1963/1962/2 1969/1969/2 +f 1967/1967/2 1968/1968/2 1970/1970/2 +f 1970/1970/214 1966/1965/214 1965/1964/214 +f 1965/1964/2 1969/1969/2 1967/1967/2 +f 1970/1970/2 1965/1964/2 1967/1967/2 +f 2334/1971/2655 1972/1972/2655 1971/1973/2655 +f 1973/1974/2656 1972/1972/2656 2334/1971/2656 +f 1973/1974/2657 1974/1975/2657 1972/1972/2657 +f 1975/1976/2658 1974/1975/2658 1973/1974/2658 +f 1977/1977/1696 1976/1978/1696 1975/1976/1696 +f 1977/1977/225 1978/1979/225 1976/1978/225 +f 2342/1980/1697 1979/1981/1697 1978/1979/1697 +f 2342/1980/227 1980/1982/227 1979/1981/227 +f 1981/1983/228 1980/1982/228 2342/1980/228 +f 1981/1983/229 1982/1984/229 1980/1982/229 +f 2347/1985/230 1982/1984/230 1981/1983/230 +f 2347/1985/231 1983/1986/231 1982/1984/231 +f 2349/1987/232 1983/1986/232 2347/1985/232 +f 2350/1988/233 1983/1986/233 2349/1987/233 +f 2350/1988/234 1984/1989/234 1983/1986/234 +f 2352/1990/2659 1984/1989/2659 2350/1988/2659 +f 2352/1990/2660 1985/1991/2660 1984/1989/2660 +f 2354/1992/2661 1985/1991/2661 2352/1990/2661 +f 2354/1992/238 1986/1993/238 1985/1991/238 +f 2357/1994/2662 1986/1993/2662 2354/1992/2662 +f 2357/1994/240 1987/1995/240 1986/1993/240 +f 1988/1996/2663 1987/1995/2663 2357/1994/2663 +f 1989/1997/2664 1990/1998/2664 1988/1996/2664 +f 1991/1999/2665 1990/1998/2665 1989/1997/2665 +f 1993/2000/246 1992/2001/246 1991/1999/246 +f 1993/2000/2666 1994/2002/2666 1992/2001/2666 +f 2368/2003/248 1995/2004/248 1994/2002/248 +f 1995/2004/249 2368/2003/249 1996/2005/249 +f 1996/2005/250 2368/2003/250 1997/2006/250 +f 1996/2005/251 1997/2006/251 2372/2007/251 +f 1996/2005/252 2372/2007/252 1998/2008/252 +f 1998/2008/253 2372/2007/253 2374/2009/253 +f 1998/2008/254 2374/2009/254 1999/2010/254 +f 1999/2010/2667 2374/2009/2667 2376/2011/2667 +f 1999/2010/2668 2376/2011/2668 2000/2012/2668 +f 2000/2012/257 2376/2011/257 2378/2013/257 +f 2000/2012/258 2378/2013/258 2001/2014/258 +f 2001/2014/2669 2378/2013/2669 2379/2015/2669 +f 2001/2014/260 2379/2015/260 2002/2016/260 +f 2002/2016/2670 2379/2015/2670 2003/2017/2670 +f 2002/2016/2671 2003/2017/2671 2004/2018/2671 +f 2004/2018/1717 2003/2017/1717 2005/2019/1717 +f 2005/2019/264 2006/2020/264 2007/2021/264 +f 2007/2021/265 2006/2020/265 2008/2022/265 +f 2009/2023/2672 2008/2022/2672 2389/2024/2672 +f 2009/2023/267 2389/2024/267 2010/2025/267 +f 2011/2026/2673 2010/2025/2673 2393/2027/2673 +f 2011/2026/269 2393/2027/269 2012/2028/269 +f 2012/2028/270 2393/2027/270 2395/2029/270 +f 2012/2028/271 2395/2029/271 2397/2030/271 +f 2012/2028/2674 2397/2030/2674 2013/2031/2674 +f 2013/2031/273 2397/2030/273 2399/2032/273 +f 2013/2031/2675 2399/2032/2675 2014/2033/2675 +f 2014/2033/275 2399/2032/275 2401/2034/275 +f 2014/2033/276 2401/2034/276 2015/2035/276 +f 2015/2035/2676 2401/2034/2676 2403/2036/2676 +f 2015/2035/278 2403/2036/278 2016/2037/278 +f 2016/2037/2677 2403/2036/2677 2404/2038/2677 +f 2016/2037/2678 2404/2038/2678 2017/2039/2678 +f 2017/2039/281 2404/2038/281 2018/2040/281 +f 2017/2039/282 2018/2040/282 2019/2041/282 +f 2019/2041/283 2018/2040/283 2020/2042/283 +f 2020/2042/284 2021/2043/284 2022/2044/284 +f 2022/2044/285 2021/2043/285 2023/2045/285 +f 2024/2046/2679 2023/2045/2679 2415/2047/2679 +f 2024/2046/287 2415/2047/287 2025/2048/287 +f 2025/2048/2680 2415/2047/2680 2026/2049/2680 +f 2025/2048/289 2026/2049/289 2027/2050/289 +f 2027/2050/1735 2026/2049/1735 2419/2051/1735 +f 2027/2050/291 2419/2051/291 2028/2052/291 +f 2028/2052/292 2419/2051/292 2421/2053/292 +f 2028/2052/1736 2421/2053/1736 2423/2054/1736 +f 2028/2052/2681 2423/2054/2681 2029/2055/2681 +f 2029/2055/2682 2423/2054/2682 2425/2056/2682 +f 2029/2055/2683 2425/2056/2683 2030/2057/2683 +f 2030/2057/2684 2425/2056/2684 2427/2058/2684 +f 2030/2057/298 2427/2058/298 2031/2059/298 +f 2031/2059/2685 2427/2058/2685 2429/2060/2685 +f 2031/2059/300 2429/2060/300 2032/2061/300 +f 2032/2061/301 2429/2060/301 2430/2062/301 +f 2032/2061/302 2430/2062/302 2033/2063/302 +f 2033/2063/2686 2430/2062/2686 2034/2064/2686 +f 2033/2063/304 2034/2064/304 2035/2065/304 +f 2035/2065/305 2034/2064/305 2036/2066/305 +f 2036/2066/306 2037/2067/306 2038/2068/306 +f 2038/2068/307 2037/2067/307 2039/2069/307 +f 2040/2070/308 2039/2069/308 2441/2071/308 +f 2040/2070/309 2441/2071/309 2041/2072/309 +f 2041/2072/310 2441/2071/310 2042/2073/310 +f 2041/2072/1746 2042/2073/1746 2043/2074/1746 +f 2043/2074/312 2042/2073/312 2445/2075/312 +f 2043/2074/313 2445/2075/313 2044/2076/313 +f 2044/2076/2687 2445/2075/2687 2447/2077/2687 +f 2044/2076/2688 2447/2077/2688 2449/2078/2688 +f 2044/2076/2689 2449/2078/2689 2045/2079/2689 +f 2045/2079/2690 2449/2078/2690 2451/2080/2690 +f 2045/2079/2691 2451/2080/2691 2046/2081/2691 +f 2046/2081/319 2451/2080/319 2453/2082/319 +f 2046/2081/320 2453/2082/320 2047/2083/320 +f 2047/2083/2692 2453/2082/2692 2455/2084/2692 +f 2047/2083/322 2455/2084/322 2048/2085/322 +f 2048/2085/323 2455/2084/323 2456/2086/323 +f 2048/2085/324 2456/2086/324 2049/2087/324 +f 2049/2087/325 2456/2086/325 2050/2088/325 +f 2049/2087/326 2050/2088/326 2051/2089/326 +f 2051/2089/2693 2050/2088/2693 2052/2090/2693 +f 2052/2090/2694 2053/2091/2694 2054/2092/2694 +f 2054/2092/2695 2053/2091/2695 2055/2093/2695 +f 2056/2094/330 2055/2093/330 2467/2095/330 +f 2056/2094/331 2467/2095/331 2057/2096/331 +f 2057/2096/332 2467/2095/332 2058/2097/332 +f 2057/2096/1759 2058/2097/1759 2059/2098/1759 +f 2059/2098/2696 2058/2097/2696 2469/2099/2696 +f 2059/2098/335 2469/2099/335 2061/2100/335 +f 2061/2100/336 2469/2099/336 2060/2101/336 +f 2061/2100/337 2060/2101/337 2062/2102/337 +f 2061/2100/338 2062/2102/338 2063/2103/338 +f 2063/2103/2697 2062/2102/2697 2064/2104/2697 +f 2063/2103/340 2064/2104/340 2065/2105/340 +f 2065/2105/341 2064/2104/341 2066/2106/341 +f 2065/2105/342 2066/2106/342 2067/2107/342 +f 2067/2107/343 2066/2106/343 2068/2108/343 +f 2077/2109/2698 2078/2110/2698 2079/2111/2698 +f 2082/2112/345 2077/2109/345 2080/2113/345 +f 2074/2114/346 2073/2115/346 2070/2116/346 +f 2074/2114/2699 2081/2117/2699 2073/2115/2699 +f 2076/2118/2700 2073/2115/2700 2081/2117/2700 +f 2076/2118/2701 2075/2119/2701 2069/2120/2701 +f 2072/2121/2702 2082/2112/2702 2080/2113/2702 +f 2162/2122/351 2083/2123/351 2074/2114/351 +f 2085/2124/2703 2075/2119/2703 2076/2118/2703 +f 2084/2125/1768 2075/2119/1768 2085/2124/1768 +f 2086/2126/353 2077/2109/353 2082/2112/353 +f 2071/2127/2704 2082/2112/2704 2072/2121/2704 +f 2083/2123/2705 2081/2117/2705 2074/2114/2705 +f 2076/2118/2706 2081/2117/2706 2085/2124/2706 +f 2087/2128/357 2081/2117/357 2083/2123/357 +f 2087/2128/1772 2086/2126/1772 2082/2112/1772 +f 2071/2127/360 2087/2128/360 2082/2112/360 +f 2085/2124/2707 2081/2117/2707 2087/2128/2707 +f 2085/2124/1774 2087/2128/1774 2071/2127/1774 +f 2087/2128/2708 2083/2123/2708 2086/2126/2708 +f 2083/2123/364 2089/2129/364 2086/2126/364 +f 2188/2130/2709 2055/2093/2709 2056/2094/2709 +f 2054/2092/2710 2055/2093/2710 2188/2130/2710 +f 2090/2131/1779 2052/2090/1779 2054/2092/1779 +f 2090/2131/368 2051/2089/368 2052/2090/368 +f 2210/2132/1781 2039/2069/1781 2040/2070/1781 +f 2038/2068/1782 2039/2069/1782 2210/2132/1782 +f 2091/2133/1783 2036/2066/1783 2038/2068/1783 +f 2091/2133/372 2035/2065/372 2036/2066/372 +f 2233/2134/373 2023/2045/373 2024/2046/373 +f 2022/2044/374 2023/2045/374 2233/2134/374 +f 2092/2135/375 2020/2042/375 2022/2044/375 +f 2092/2135/376 2019/2041/376 2020/2042/376 +f 1975/1976/377 2093/2136/377 1974/1975/377 +f 1976/1978/2711 2093/2136/2711 1975/1976/2711 +f 1978/1979/379 2256/2137/379 1976/1978/379 +f 1979/1981/1786 2256/2137/1786 1978/1979/1786 +f 2094/2138/2712 2010/2025/2712 2011/2026/2712 +f 2009/2023/1788 2010/2025/1788 2094/2138/1788 +f 2095/2139/1789 2008/2022/1789 2009/2023/1789 +f 2007/2021/2713 2008/2022/2713 2095/2139/2713 +f 2096/2140/385 2005/2019/385 2007/2021/385 +f 2096/2140/386 2004/2018/386 2005/2019/386 +f 1988/1996/2714 2097/2141/2714 1987/1995/2714 +f 1990/1998/2715 2097/2141/2715 1988/1996/2715 +f 1991/1999/2716 2098/2142/2716 1990/1998/2716 +f 1992/2001/2717 2098/2142/2717 1991/1999/2717 +f 1994/2002/389 2099/2143/389 1992/2001/389 +f 1995/2004/2718 2099/2143/2718 1994/2002/2718 +f 2100/2144/2719 2101/2145/2719 2102/2146/2719 +f 2102/2146/2720 2101/2145/2720 2103/2147/2720 +f 2101/2145/2721 2105/2148/2721 2103/2147/2721 +f 2100/2144/393 2104/2149/393 2101/2145/393 +f 2104/2149/2722 2105/2148/2722 2101/2145/2722 +f 2106/2150/2723 2105/2148/2723 2104/2149/2723 +f 2106/2150/2724 2107/2151/2724 2110/2152/2724 +f 2110/2152/2725 2105/2148/2725 2106/2150/2725 +f 2106/2150/2726 2108/2153/2726 2107/2151/2726 +f 2100/2144/2727 2111/2154/2727 2104/2149/2727 +f 2103/2147/2728 2105/2148/2728 2113/2155/2728 +f 2109/2156/404 2111/2154/404 2100/2144/404 +f 2110/2152/2729 2107/2151/2729 2593/2157/2729 +f 2113/2155/2730 2105/2148/2730 2116/2158/2730 +f 2106/2150/2731 2112/2159/2731 2108/2153/2731 +f 2103/2147/2732 2113/2155/2732 2114/2160/2732 +f 2110/2152/2733 2116/2158/2733 2105/2148/2733 +f 2106/2150/2734 2104/2149/2734 2111/2154/2734 +f 2110/2152/2735 2593/2157/2735 2115/2161/2735 +f 2117/2162/2736 2116/2158/2736 2110/2152/2736 +f 2109/2156/2737 2119/2163/2737 2111/2154/2737 +f 2106/2150/2738 2111/2154/2738 2120/2164/2738 +f 2110/2152/2739 2115/2161/2739 2117/2162/2739 +f 2120/2164/2740 2112/2159/2740 2106/2150/2740 +f 2118/2165/2741 2119/2163/2741 2109/2156/2741 +f 2114/2160/2742 2113/2155/2742 2122/2166/2742 +f 2120/2164/2743 2121/2167/2743 2112/2159/2743 +f 2113/2155/2744 2116/2158/2744 2122/2166/2744 +f 2117/2162/2745 2124/2168/2745 2116/2158/2745 +f 2120/2164/2746 2111/2154/2746 2119/2163/2746 +f 2122/2166/2747 2116/2158/2747 2124/2168/2747 +f 2080/2113/2748 2077/2109/2748 2125/2169/2748 +f 2122/2166/2749 2124/2168/2749 2125/2169/2749 +f 2117/2162/2750 2115/2161/2750 2123/2170/2750 +f 2120/2164/2751 2127/2171/2751 2121/2167/2751 +f 2126/2172/2752 2128/2173/2752 2118/2165/2752 +f 2127/2171/2753 2129/2174/2753 2121/2167/2753 +f 2117/2162/2754 2125/2169/2754 2124/2168/2754 +f 2130/2175/2755 2125/2169/2755 2117/2162/2755 +f 2118/2165/2756 2131/2176/2756 2119/2163/2756 +f 2120/2164/2757 2119/2163/2757 2132/2177/2757 +f 2072/2121/2758 2080/2113/2758 2130/2175/2758 +f 2117/2162/2759 2123/2170/2759 2130/2175/2759 +f 2132/2177/2760 2127/2171/2760 2120/2164/2760 +f 2071/2127/1840 2088/2178/1840 2085/2124/1840 +f 2128/2173/2761 2131/2176/2761 2118/2165/2761 +f 2132/2177/2762 2119/2163/2762 2131/2176/2762 +f 2130/2175/2763 2080/2113/2763 2125/2169/2763 +f 2123/2170/2764 2133/2179/2764 2130/2175/2764 +f 2134/2180/2765 2128/2173/2765 2126/2172/2765 +f 2084/2125/2766 2085/2124/2766 2088/2178/2766 +f 2132/2177/2767 2131/2176/2767 2135/2181/2767 +f 2132/2177/2768 2136/2182/2768 2127/2171/2768 +f 2137/2183/2769 2130/2175/2769 2133/2179/2769 +f 2134/2180/2770 2140/2184/2770 2128/2173/2770 +f 2128/2173/2771 2138/2185/2771 2131/2176/2771 +f 2137/2183/2772 2072/2121/2772 2130/2175/2772 +f 2078/2110/2773 2137/2183/2773 2133/2179/2773 +f 2137/2183/2774 2071/2127/2774 2072/2121/2774 +f 2140/2184/2775 2138/2185/2775 2128/2173/2775 +f 2135/2181/2776 2131/2176/2776 2138/2185/2776 +f 2135/2181/2777 2136/2182/2777 2132/2177/2777 +f 2088/2178/452 2071/2127/452 2137/2183/452 +f 2139/2186/2778 2140/2184/2778 2134/2180/2778 +f 2142/2187/454 2088/2178/454 2137/2183/454 +f 2142/2187/455 2084/2125/455 2088/2178/455 +f 2143/2188/457 2084/2125/457 2142/2187/457 +f 2139/2186/2779 2144/2189/2779 2140/2184/2779 +f 2135/2181/2780 2138/2185/2780 2145/2190/2780 +f 2135/2181/2781 2146/2191/2781 2136/2182/2781 +f 2078/2110/2782 2142/2187/2782 2137/2183/2782 +f 2147/2192/462 2143/2188/462 2142/2187/462 +f 2145/2190/2783 2146/2191/2783 2135/2181/2783 +f 2140/2184/2784 2148/2193/2784 2138/2185/2784 +f 2141/2194/2785 2142/2187/2785 2078/2110/2785 +f 2149/2195/2786 2144/2189/2786 2139/2186/2786 +f 2144/2189/2787 2148/2193/2787 2140/2184/2787 +f 2145/2190/1861 2138/2185/1861 2148/2193/1861 +f 2147/2192/2788 2142/2187/2788 2141/2194/2788 +f 2149/2195/2789 2150/2196/2789 2144/2189/2789 +f 2152/2197/2790 2147/2192/2790 2141/2194/2790 +f 2154/2198/2791 2155/2199/2791 2156/2200/2791 +f 2145/2190/2792 2151/2201/2792 2146/2191/2792 +f 2153/2202/473 2147/2192/473 2152/2197/473 +f 2157/2203/1874 2147/2192/1874 2153/2202/1874 +f 2145/2190/1861 2148/2193/1861 2158/2204/1861 +f 2158/2204/2793 2151/2201/2793 2145/2190/2793 +f 2159/2205/2794 2157/2203/2794 2153/2202/2794 +f 2155/2199/2795 2150/2196/2795 2149/2195/2795 +f 2150/2196/2796 2148/2193/2796 2144/2189/2796 +f 2158/2204/2797 2160/2206/2797 2151/2201/2797 +f 2150/2196/2798 2161/2207/2798 2148/2193/2798 +f 2162/2122/2799 2153/2202/2799 2152/2197/2799 +f 2163/2208/481 2157/2203/481 2159/2205/481 +f 2158/2204/2800 2148/2193/2800 2161/2207/2800 +f 2162/2122/483 2152/2197/483 2089/2129/483 +f 2159/2205/1878 2153/2202/1878 2162/2122/1878 +f 2155/2199/2801 2164/2209/2801 2150/2196/2801 +f 2154/2198/2802 2164/2209/2802 2155/2199/2802 +f 2158/2204/2803 2165/2210/2803 2160/2206/2803 +f 2158/2204/2800 2161/2207/2800 2168/2211/2800 +f 2168/2211/2804 2165/2210/2804 2158/2204/2804 +f 2070/2116/490 2163/2208/490 2159/2205/490 +f 2164/2209/2805 2161/2207/2805 2150/2196/2805 +f 2162/2122/492 2074/2114/492 2070/2116/492 +f 2166/2212/493 2163/2208/493 2070/2116/493 +f 2154/2198/2806 2167/2213/2806 2166/2212/2806 +f 2070/2116/497 2159/2205/497 2162/2122/497 +f 2154/2198/2807 2169/2214/2807 2164/2209/2807 +f 2169/2214/2808 2161/2207/2808 2164/2209/2808 +f 2168/2211/2809 2171/2215/2809 2165/2210/2809 +f 2166/2212/2810 2170/2216/2810 2154/2198/2810 +f 2168/2211/2811 2161/2207/2811 2169/2214/2811 +f 2170/2216/503 2166/2212/503 2070/2116/503 +f 2154/2198/2812 2172/2217/2812 2169/2214/2812 +f 2168/2211/2813 2169/2214/2813 2173/2218/2813 +f 2173/2218/2814 2171/2215/2814 2168/2211/2814 +f 2170/2216/2815 2172/2217/2815 2154/2198/2815 +f 2066/2106/2816 2069/2120/2816 2068/2108/2816 +f 2174/2219/2817 2064/2104/2817 2062/2102/2817 +f 2173/2218/2818 2174/2219/2818 2171/2215/2818 +f 2070/2116/2819 2073/2115/2819 2170/2216/2819 +f 2173/2218/2820 2169/2214/2820 2172/2217/2820 +f 2175/2220/2821 2064/2104/2821 2174/2219/2821 +f 2076/2118/1903 2069/2120/1903 2175/2220/1903 +f 2170/2216/2822 2073/2115/2822 2172/2217/2822 +f 2175/2220/515 2069/2120/515 2066/2106/515 +f 2173/2218/2823 2172/2217/2823 2073/2115/2823 +f 2066/2106/1906 2064/2104/1906 2175/2220/1906 +f 2173/2218/2824 2073/2115/2824 2076/2118/2824 +f 2173/2218/1908 2175/2220/1908 2174/2219/1908 +f 2076/2118/2825 2175/2220/2825 2173/2218/2825 +f 2177/2221/521 2176/2222/521 2157/2203/521 +f 2178/2223/522 2177/2221/522 2157/2203/522 +f 2179/2224/523 2177/2221/523 2178/2223/523 +f 2181/2225/2826 2180/2226/2826 2177/2221/2826 +f 2179/2224/1912 2181/2225/1912 2177/2221/1912 +f 2182/2227/526 2181/2225/526 2179/2224/526 +f 2183/2228/2827 2181/2225/2827 2182/2227/2827 +f 2185/2229/2828 2180/2226/2828 2181/2225/2828 +f 2185/2229/529 2184/2230/529 2180/2226/529 +f 2183/2228/530 2185/2229/530 2181/2225/530 +f 2186/2231/531 2185/2229/531 2183/2228/531 +f 2187/2232/532 2184/2230/532 2185/2229/532 +f 2187/2232/533 2185/2229/533 2186/2231/533 +f 2189/2233/534 2184/2230/534 2187/2232/534 +f 2189/2233/535 2188/2130/535 2184/2230/535 +f 2190/2234/536 2188/2130/536 2189/2233/536 +f 2192/2235/537 2188/2130/537 2190/2234/537 +f 2192/2235/538 2191/2236/538 2188/2130/538 +f 2193/2237/539 2191/2236/539 2192/2235/539 +f 2195/2238/1916 2191/2236/1916 2193/2237/1916 +f 2195/2238/541 2194/2239/541 2191/2236/541 +f 2196/2240/542 2194/2239/542 2195/2238/542 +f 2196/2240/543 2197/2241/543 2194/2239/543 +f 2199/2242/2829 2197/2241/2829 2196/2240/2829 +f 2198/2243/545 2199/2242/545 2196/2240/545 +f 2200/2244/2830 2199/2242/2830 2198/2243/2830 +f 2199/2242/547 2201/2245/547 2197/2241/547 +f 2202/2246/548 2199/2242/548 2200/2244/548 +f 2203/2247/2831 2201/2245/2831 2199/2242/2831 +f 2202/2246/2832 2203/2247/2832 2199/2242/2832 +f 2204/2248/551 2203/2247/551 2202/2246/551 +f 2205/2249/552 2203/2247/552 2204/2248/552 +f 2207/2250/2833 2201/2245/2833 2203/2247/2833 +f 2207/2250/554 2206/2251/554 2201/2245/554 +f 2205/2249/555 2207/2250/555 2203/2247/555 +f 2208/2252/556 2207/2250/556 2205/2249/556 +f 2209/2253/557 2206/2251/557 2207/2250/557 +f 2209/2253/1918 2207/2250/1918 2208/2252/1918 +f 2211/2254/559 2206/2251/559 2209/2253/559 +f 2211/2254/560 2210/2132/560 2206/2251/560 +f 2212/2255/561 2210/2132/561 2211/2254/561 +f 2214/2256/562 2210/2132/562 2212/2255/562 +f 2214/2256/563 2213/2257/563 2210/2132/563 +f 2215/2258/564 2213/2257/564 2214/2256/564 +f 2217/2259/565 2213/2257/565 2215/2258/565 +f 2217/2259/566 2216/2260/566 2213/2257/566 +f 2218/2261/567 2216/2260/567 2217/2259/567 +f 2218/2261/568 2219/2262/568 2216/2260/568 +f 2221/2263/569 2219/2262/569 2218/2261/569 +f 2220/2264/570 2221/2263/570 2218/2261/570 +f 2222/2265/571 2221/2263/571 2220/2264/571 +f 2221/2263/572 2223/2266/572 2219/2262/572 +f 2224/2267/573 2221/2263/573 2222/2265/573 +f 2225/2268/574 2223/2266/574 2221/2263/574 +f 2224/2267/575 2225/2268/575 2221/2263/575 +f 2226/2269/2834 2225/2268/2834 2224/2267/2834 +f 2225/2268/577 2227/2270/577 2223/2266/577 +f 2228/2271/578 2225/2268/578 2226/2269/578 +f 2229/2272/579 2227/2270/579 2225/2268/579 +f 2228/2271/580 2229/2272/580 2225/2268/580 +f 2231/2273/2835 2229/2272/2835 2228/2271/2835 +f 2229/2272/582 2230/2274/582 2227/2270/582 +f 2232/2275/583 2230/2274/583 2229/2272/583 +f 2232/2275/1922 2229/2272/1922 2231/2273/1922 +f 2234/2276/585 2230/2274/585 2232/2275/585 +f 2234/2276/586 2233/2134/586 2230/2274/586 +f 2235/2277/587 2233/2134/587 2234/2276/587 +f 2237/2278/588 2233/2134/588 2235/2277/588 +f 2237/2278/589 2236/2279/589 2233/2134/589 +f 2238/2280/590 2236/2279/590 2237/2278/590 +f 2240/2281/591 2236/2279/591 2238/2280/591 +f 2240/2281/592 2239/2282/592 2236/2279/592 +f 2241/2283/593 2239/2282/593 2240/2281/593 +f 2093/2136/594 2242/2284/594 2474/2285/594 +f 2241/2283/595 2244/2286/595 2239/2282/595 +f 2247/2287/2836 2244/2286/2836 2241/2283/2836 +f 2242/2284/597 2248/2288/597 2243/2289/597 +f 2093/2136/2837 2249/2290/2837 2242/2284/2837 +f 2246/2291/599 2247/2287/599 2241/2283/599 +f 2250/2292/600 2247/2287/600 2246/2291/600 +f 2249/2290/601 2251/2293/601 2242/2284/601 +f 2251/2293/2838 2248/2288/2838 2242/2284/2838 +f 2247/2287/2839 2252/2294/2839 2244/2286/2839 +f 2253/2295/2840 2247/2287/2840 2250/2292/2840 +f 2249/2290/605 2254/2296/605 2251/2293/605 +f 2255/2297/606 2252/2294/606 2247/2287/606 +f 2253/2295/607 2255/2297/607 2247/2287/607 +f 2256/2137/608 2254/2296/608 2249/2290/608 +f 2257/2298/609 2255/2297/609 2253/2295/609 +f 2256/2137/610 2258/2299/610 2254/2296/610 +f 2255/2297/611 2259/2300/611 2252/2294/611 +f 2261/2301/612 2255/2297/612 2257/2298/612 +f 2256/2137/613 2262/2302/613 2258/2299/613 +f 2263/2303/614 2259/2300/614 2255/2297/614 +f 2261/2301/2841 2263/2303/2841 2255/2297/2841 +f 2260/2304/616 2262/2302/616 2256/2137/616 +f 2264/2305/617 2263/2303/617 2261/2301/617 +f 2260/2304/618 2265/2306/618 2262/2302/618 +f 2263/2303/619 2094/2138/619 2259/2300/619 +f 2267/2307/620 2263/2303/620 2264/2305/620 +f 2260/2304/621 2268/2308/621 2265/2306/621 +f 2266/2309/622 2268/2308/622 2260/2304/622 +f 2268/2308/623 2269/2310/623 2265/2306/623 +f 2263/2303/2842 2270/2311/2842 2094/2138/2842 +f 2271/2312/625 2263/2303/625 2267/2307/625 +f 2271/2312/626 2270/2311/626 2263/2303/626 +f 2268/2308/627 2272/2313/627 2269/2310/627 +f 2266/2309/628 2273/2314/628 2268/2308/628 +f 2273/2314/629 2272/2313/629 2268/2308/629 +f 2275/2315/630 2270/2311/630 2271/2312/630 +f 2274/2316/631 2273/2314/631 2266/2309/631 +f 2273/2314/1933 2276/2317/1933 2272/2313/1933 +f 2277/2318/2843 2095/2139/2843 2270/2311/2843 +f 2278/2319/634 2270/2311/634 2275/2315/634 +f 2278/2319/635 2277/2318/635 2270/2311/635 +f 2273/2314/636 2279/2320/636 2276/2317/636 +f 2274/2316/637 2280/2321/637 2273/2314/637 +f 2280/2321/638 2279/2320/638 2273/2314/638 +f 2282/2322/2844 2277/2318/2844 2278/2319/2844 +f 2281/2323/640 2280/2321/640 2274/2316/640 +f 2280/2321/641 2283/2324/641 2279/2320/641 +f 2285/2325/642 2277/2318/642 2282/2322/642 +f 2285/2325/643 2284/2326/643 2277/2318/643 +f 2280/2321/644 2287/2327/644 2283/2324/644 +f 2281/2323/2845 2288/2328/2845 2280/2321/2845 +f 2288/2328/646 2287/2327/646 2280/2321/646 +f 2290/2329/647 2284/2326/647 2285/2325/647 +f 2286/2330/648 2290/2329/648 2285/2325/648 +f 2289/2331/649 2288/2328/649 2281/2323/649 +f 2291/2332/1940 2290/2329/1940 2286/2330/1940 +f 2289/2331/2846 2292/2333/2846 2288/2328/2846 +f 2290/2329/652 2293/2334/652 2284/2326/652 +f 2294/2335/653 2290/2329/653 2291/2332/653 +f 2289/2331/654 2295/2336/654 2292/2333/654 +f 2296/2337/1942 2293/2334/1942 2290/2329/1942 +f 2098/2142/2847 2297/2338/2847 2289/2331/2847 +f 2294/2335/656 2296/2337/656 2290/2329/656 +f 2297/2338/2848 2295/2336/2848 2289/2331/2848 +f 2298/2339/658 2296/2337/658 2294/2335/658 +f 2297/2338/2849 2299/2340/2849 2295/2336/2849 +f 2296/2337/660 2300/2341/660 2293/2334/660 +f 2301/2342/2850 2296/2337/2850 2298/2339/2850 +f 2297/2338/2851 2302/2343/2851 2299/2340/2851 +f 2303/2344/663 2300/2341/663 2296/2337/663 +f 2301/2342/2852 2303/2344/2852 2296/2337/2852 +f 2304/2345/2853 2302/2343/2853 2297/2338/2853 +f 2099/2143/2854 2304/2345/2854 2297/2338/2854 +f 2305/2346/2855 2303/2344/2855 2301/2342/2855 +f 2304/2345/668 2306/2347/668 2302/2343/668 +f 2303/2344/669 2307/2348/669 2300/2341/669 +f 2307/2348/670 2304/2345/670 2099/2143/670 +f 2308/2349/671 2303/2344/671 2305/2346/671 +f 2304/2345/672 2307/2348/672 2303/2344/672 +f 2304/2345/673 2309/2350/673 2306/2347/673 +f 2308/2349/2856 2304/2345/2856 2303/2344/2856 +f 2309/2350/675 2304/2345/675 2308/2349/675 +f 2310/2351/676 2311/2352/676 2312/2353/676 +f 2310/2351/2857 2312/2353/2857 2323/2354/2857 +f 2315/2355/678 2313/2356/678 2314/2357/678 +f 2323/2354/679 2312/2353/679 2315/2355/679 +f 2312/2353/680 2313/2356/680 2315/2355/680 +f 2316/2358/681 2317/2359/681 2318/2360/681 +f 2317/2359/682 2320/2361/682 2319/2362/682 +f 2316/2358/683 2321/2363/683 2317/2359/683 +f 2321/2363/2858 2320/2361/2858 2317/2359/2858 +f 2322/2364/685 2321/2363/685 2316/2358/685 +f 2321/2363/2859 2323/2354/2859 2320/2361/2859 +f 2322/2364/687 2324/2365/687 2321/2363/687 +f 2321/2363/688 2325/2366/688 2323/2354/688 +f 2324/2365/689 2325/2366/689 2321/2363/689 +f 2326/2367/2860 2324/2365/2860 2322/2364/2860 +f 2324/2365/2861 2327/2368/2861 2325/2366/2861 +f 2326/2367/692 2328/2369/692 2324/2365/692 +f 2328/2369/2862 2327/2368/2862 2324/2365/2862 +f 2328/2369/694 2329/2370/694 2327/2368/694 +f 2330/2371/695 2328/2369/695 2326/2367/695 +f 2330/2371/696 2331/2372/696 2328/2369/696 +f 2328/2369/697 2332/2373/697 2329/2370/697 +f 2331/2372/2863 2332/2373/2863 2328/2369/2863 +f 2333/2374/2864 2331/2372/2864 2330/2371/2864 +f 2331/2372/2865 2334/1971/2865 2332/2373/2865 +f 2333/2374/701 2334/1971/701 2331/2372/701 +f 2333/2374/702 2335/2375/702 2334/1971/702 +f 2333/2374/703 2337/2376/703 2335/2375/703 +f 2336/2377/704 2338/2378/704 2333/2374/704 +f 2338/2378/2866 2337/2376/2866 2333/2374/2866 +f 2338/2378/1969 2339/2379/1969 2337/2376/1969 +f 2340/2380/707 2338/2378/707 2336/2377/707 +f 2338/2378/708 2341/2381/708 2339/2379/708 +f 2338/2378/709 2342/1980/709 2341/2381/709 +f 2340/2380/710 2343/2382/710 2338/2378/710 +f 2343/2382/711 2342/1980/711 2338/2378/711 +f 2344/2383/712 2343/2382/712 2340/2380/712 +f 2343/2382/713 2345/2384/713 2342/1980/713 +f 2343/2382/714 2346/2385/714 2345/2384/714 +f 2344/2383/715 2346/2385/715 2343/2382/715 +f 2346/2385/716 2347/1985/716 2345/2384/716 +f 2348/2386/717 2346/2385/717 2344/2383/717 +f 2346/2385/718 2349/1987/718 2347/1985/718 +f 2348/2386/719 2349/1987/719 2346/2385/719 +f 2348/2386/720 2350/1988/720 2349/1987/720 +f 2350/1988/721 2348/2386/721 2352/1990/721 +f 2348/2386/722 2351/2387/722 2353/2388/722 +f 2352/1990/723 2348/2386/723 2353/2388/723 +f 2353/2388/2867 2354/1992/2867 2352/1990/2867 +f 2353/2388/725 2351/2387/725 2355/2389/725 +f 2353/2388/726 2355/2389/726 2356/2390/726 +f 2353/2388/727 2357/1994/727 2354/1992/727 +f 2353/2388/728 2356/2390/728 2357/1994/728 +f 2356/2390/729 2355/2389/729 2358/2391/729 +f 2357/1994/2868 2356/2390/2868 2359/2392/2868 +f 2356/2390/731 2358/2391/731 2360/2393/731 +f 2359/2392/2869 2356/2390/2869 2360/2393/2869 +f 2359/2392/2870 2360/2393/2870 2361/2394/2870 +f 2360/2393/734 2358/2391/734 2362/2395/734 +f 2361/2394/735 2360/2393/735 2363/2396/735 +f 2363/2396/2871 2360/2393/2871 2362/2395/2871 +f 2363/2396/737 2362/2395/737 2364/2397/737 +f 2364/2397/2872 2362/2395/2872 2366/2398/2872 +f 2362/2395/739 2365/2399/739 2367/2400/739 +f 2366/2398/740 2362/2395/740 2368/2003/740 +f 2368/2003/741 2362/2395/741 2367/2400/741 +f 2367/2400/742 2365/2399/742 2369/2401/742 +f 2368/2003/743 2367/2400/743 2370/2402/743 +f 2367/2400/744 2369/2401/744 2371/2403/744 +f 2370/2402/2873 2367/2400/2873 2371/2403/2873 +f 2371/2403/746 2372/2007/746 2370/2402/746 +f 2371/2403/747 2369/2401/747 2373/2404/747 +f 2371/2403/1987 2374/2009/1987 2372/2007/1987 +f 2371/2403/749 2373/2404/749 2375/2405/749 +f 2374/2009/750 2371/2403/750 2375/2405/750 +f 2375/2405/751 2376/2011/751 2374/2009/751 +f 2375/2405/752 2373/2404/752 2377/2406/752 +f 2375/2405/2874 2378/2013/2874 2376/2011/2874 +f 2375/2405/754 2377/2406/754 2378/2013/754 +f 2378/2013/2875 2377/2406/2875 2379/2015/2875 +f 2377/2406/756 2380/2407/756 2381/2408/756 +f 2379/2015/757 2377/2406/757 2381/2408/757 +f 2379/2015/2876 2381/2408/2876 2382/2409/2876 +f 2381/2408/759 2380/2407/759 2383/2410/759 +f 2382/2409/760 2381/2408/760 2384/2411/760 +f 2381/2408/761 2383/2410/761 2385/2412/761 +f 2384/2411/2877 2381/2408/2877 2385/2412/2877 +f 2384/2411/2878 2385/2412/2878 2386/2413/2878 +f 2385/2412/764 2383/2410/764 2387/2414/764 +f 2386/2413/765 2385/2412/765 2388/2415/765 +f 2388/2415/766 2385/2412/766 2387/2414/766 +f 2388/2415/767 2387/2414/767 2389/2024/767 +f 2389/2024/768 2387/2414/768 2391/2416/768 +f 2387/2414/769 2390/2417/769 2392/2418/769 +f 2391/2416/1995 2387/2414/1995 2392/2418/1995 +f 2392/2418/771 2393/2027/771 2391/2416/771 +f 2392/2418/772 2390/2417/772 2394/2419/772 +f 2392/2418/1997 2395/2029/1997 2393/2027/1997 +f 2392/2418/774 2394/2419/774 2396/2420/774 +f 2395/2029/2879 2392/2418/2879 2396/2420/2879 +f 2395/2029/776 2396/2420/776 2397/2030/776 +f 2396/2420/777 2394/2419/777 2398/2421/777 +f 2397/2030/778 2396/2420/778 2399/2032/778 +f 2396/2420/2880 2398/2421/2880 2400/2422/2880 +f 2399/2032/780 2396/2420/780 2400/2422/780 +f 2400/2422/781 2401/2034/781 2399/2032/781 +f 2400/2422/2881 2398/2421/2881 2402/2423/2881 +f 2400/2422/2882 2403/2036/2882 2401/2034/2882 +f 2400/2422/784 2402/2423/784 2403/2036/784 +f 2403/2036/2883 2402/2423/2883 2404/2038/2883 +f 2402/2423/786 2405/2424/786 2406/2425/786 +f 2404/2038/787 2402/2423/787 2406/2425/787 +f 2404/2038/2884 2406/2425/2884 2407/2426/2884 +f 2406/2425/789 2405/2424/789 2408/2427/789 +f 2407/2426/790 2406/2425/790 2409/2428/790 +f 2406/2425/791 2408/2427/791 2410/2429/791 +f 2409/2428/792 2406/2425/792 2410/2429/792 +f 2409/2428/2885 2410/2429/2885 2411/2430/2885 +f 2410/2429/794 2408/2427/794 2412/2431/794 +f 2411/2430/795 2410/2429/795 2413/2432/795 +f 2410/2429/796 2412/2431/796 2414/2433/796 +f 2413/2432/797 2410/2429/797 2414/2433/797 +f 2413/2432/798 2414/2433/798 2415/2047/798 +f 2414/2433/2886 2412/2431/2886 2416/2434/2886 +f 2415/2047/800 2414/2433/800 2417/2435/800 +f 2414/2433/2887 2416/2434/2887 2418/2436/2887 +f 2417/2435/802 2414/2433/802 2418/2436/802 +f 2418/2436/803 2419/2051/803 2417/2435/803 +f 2418/2436/804 2416/2434/804 2420/2437/804 +f 2418/2436/2888 2421/2053/2888 2419/2051/2888 +f 2418/2436/806 2420/2437/806 2422/2438/806 +f 2421/2053/2889 2418/2436/2889 2422/2438/2889 +f 2421/2053/808 2422/2438/808 2423/2054/808 +f 2422/2438/2890 2420/2437/2890 2424/2439/2890 +f 2423/2054/2891 2422/2438/2891 2425/2056/2891 +f 2422/2438/811 2424/2439/811 2426/2440/811 +f 2425/2056/812 2422/2438/812 2426/2440/812 +f 2426/2440/2892 2427/2058/2892 2425/2056/2892 +f 2426/2440/2893 2424/2439/2893 2428/2441/2893 +f 2426/2440/2012 2429/2060/2012 2427/2058/2012 +f 2426/2440/2013 2428/2441/2013 2429/2060/2013 +f 2429/2060/2014 2428/2441/2014 2430/2062/2014 +f 2428/2441/818 2431/2442/818 2432/2443/818 +f 2430/2062/819 2428/2441/819 2432/2443/819 +f 2430/2062/2894 2432/2443/2894 2433/2444/2894 +f 2432/2443/821 2431/2442/821 2434/2445/821 +f 2433/2444/822 2432/2443/822 2435/2446/822 +f 2432/2443/823 2434/2445/823 2436/2447/823 +f 2435/2446/824 2432/2443/824 2436/2447/824 +f 2435/2446/825 2436/2447/825 2437/2448/825 +f 2436/2447/826 2434/2445/826 2438/2449/826 +f 2437/2448/827 2436/2447/827 2439/2450/827 +f 2436/2447/828 2438/2449/828 2440/2451/828 +f 2439/2450/2895 2436/2447/2895 2440/2451/2895 +f 2439/2450/2017 2440/2451/2017 2441/2071/2017 +f 2440/2451/2896 2438/2449/2896 2442/2452/2896 +f 2441/2071/832 2440/2451/832 2443/2453/832 +f 2440/2451/833 2442/2452/833 2444/2454/833 +f 2443/2453/2897 2440/2451/2897 2444/2454/2897 +f 2444/2454/2898 2445/2075/2898 2443/2453/2898 +f 2444/2454/836 2442/2452/836 2446/2455/836 +f 2444/2454/837 2447/2077/837 2445/2075/837 +f 2444/2454/838 2446/2455/838 2448/2456/838 +f 2447/2077/2899 2444/2454/2899 2448/2456/2899 +f 2447/2077/2900 2448/2456/2900 2449/2078/2900 +f 2448/2456/2901 2446/2455/2901 2450/2457/2901 +f 2449/2078/2021 2448/2456/2021 2451/2080/2021 +f 2448/2456/843 2450/2457/843 2452/2458/843 +f 2451/2080/2902 2448/2456/2902 2452/2458/2902 +f 2452/2458/845 2453/2082/845 2451/2080/845 +f 2452/2458/846 2450/2457/846 2454/2459/846 +f 2452/2458/847 2455/2084/847 2453/2082/847 +f 2452/2458/848 2454/2459/848 2455/2084/848 +f 2455/2084/849 2454/2459/849 2456/2086/849 +f 2454/2459/2903 2457/2460/2903 2458/2461/2903 +f 2456/2086/851 2454/2459/851 2458/2461/851 +f 2456/2086/2904 2458/2461/2904 2459/2462/2904 +f 2458/2461/853 2457/2460/853 2460/2463/853 +f 2459/2462/854 2458/2461/854 2461/2464/854 +f 2458/2461/2905 2460/2463/2905 2462/2465/2905 +f 2461/2464/2906 2458/2461/2906 2462/2465/2906 +f 2461/2464/2907 2462/2465/2907 2463/2466/2907 +f 2462/2465/2908 2460/2463/2908 2464/2467/2908 +f 2463/2466/2909 2462/2465/2909 2465/2468/2909 +f 2462/2465/2910 2464/2467/2910 2466/2469/2910 +f 2465/2468/2911 2462/2465/2911 2467/2095/2911 +f 2467/2095/2912 2462/2465/2912 2466/2469/2912 +f 2466/2469/2913 2464/2467/2913 2156/2200/2913 +f 2467/2095/2914 2466/2469/2914 2468/2470/2914 +f 2466/2469/2915 2156/2200/2915 2470/2471/2915 +f 2468/2470/2916 2466/2469/2916 2469/2099/2916 +f 2469/2099/2917 2466/2469/2917 2470/2471/2917 +f 2174/2219/2918 2062/2102/2918 2470/2471/2918 +f 2470/2471/2919 2062/2102/2919 2060/2101/2919 +f 2470/2471/2920 2060/2101/2920 2469/2099/2920 +f 2177/2221/872 2067/2107/872 2176/2222/872 +f 2177/2221/873 2065/2105/873 2067/2107/873 +f 2180/2226/2038 2065/2105/2038 2177/2221/2038 +f 2180/2226/2921 2063/2103/2921 2065/2105/2921 +f 2180/2226/2922 2061/2100/2922 2063/2103/2922 +f 2058/2097/877 2468/2470/877 2469/2099/877 +f 2184/2230/2923 2061/2100/2923 2180/2226/2923 +f 2184/2230/2924 2059/2098/2924 2061/2100/2924 +f 2467/2095/2925 2468/2470/2925 2058/2097/2925 +f 2184/2230/2926 2057/2096/2926 2059/2098/2926 +f 2055/2093/2041 2465/2468/2041 2467/2095/2041 +f 2184/2230/883 2056/2094/883 2057/2096/883 +f 2055/2093/884 2463/2466/884 2465/2468/884 +f 2053/2091/885 2463/2466/885 2055/2093/885 +f 2188/2130/2927 2056/2094/2927 2184/2230/2927 +f 2053/2091/2928 2461/2464/2928 2463/2466/2928 +f 2052/2090/2929 2461/2464/2929 2053/2091/2929 +f 2191/2236/2930 2054/2092/2930 2188/2130/2930 +f 2052/2090/2931 2459/2462/2931 2461/2464/2931 +f 2050/2088/891 2459/2462/891 2052/2090/891 +f 2191/2236/892 2090/2131/892 2054/2092/892 +f 2456/2086/893 2459/2462/893 2050/2088/893 +f 2194/2239/894 2090/2131/894 2191/2236/894 +f 2194/2239/895 2051/2089/895 2090/2131/895 +f 2194/2239/896 2049/2087/896 2051/2089/896 +f 2197/2241/897 2049/2087/897 2194/2239/897 +f 2197/2241/2932 2048/2085/2932 2049/2087/2932 +f 2197/2241/899 2047/2083/899 2048/2085/899 +f 2201/2245/900 2047/2083/900 2197/2241/900 +f 2201/2245/2051 2046/2081/2051 2047/2083/2051 +f 2201/2245/2933 2045/2079/2933 2046/2081/2933 +f 2201/2245/903 2044/2076/903 2045/2079/903 +f 2042/2073/2934 2443/2453/2934 2445/2075/2934 +f 2206/2251/905 2044/2076/905 2201/2245/905 +f 2206/2251/2935 2043/2074/2935 2044/2076/2935 +f 2441/2071/907 2443/2453/907 2042/2073/907 +f 2206/2251/908 2041/2072/908 2043/2074/908 +f 2039/2069/909 2439/2450/909 2441/2071/909 +f 2206/2251/910 2040/2070/910 2041/2072/910 +f 2039/2069/911 2437/2448/911 2439/2450/911 +f 2037/2067/912 2437/2448/912 2039/2069/912 +f 2210/2132/913 2040/2070/913 2206/2251/913 +f 2037/2067/914 2435/2446/914 2437/2448/914 +f 2036/2066/915 2435/2446/915 2037/2067/915 +f 2213/2257/916 2038/2068/916 2210/2132/916 +f 2036/2066/917 2433/2444/917 2435/2446/917 +f 2034/2064/918 2433/2444/918 2036/2066/918 +f 2213/2257/2936 2091/2133/2936 2038/2068/2936 +f 2430/2062/920 2433/2444/920 2034/2064/920 +f 2216/2260/921 2091/2133/921 2213/2257/921 +f 2216/2260/2059 2035/2065/2059 2091/2133/2059 +f 2216/2260/2937 2033/2063/2937 2035/2065/2937 +f 2219/2262/924 2033/2063/924 2216/2260/924 +f 2219/2262/2938 2032/2061/2938 2033/2063/2938 +f 2219/2262/926 2031/2059/926 2032/2061/926 +f 2223/2266/927 2031/2059/927 2219/2262/927 +f 2223/2266/928 2030/2057/928 2031/2059/928 +f 2223/2266/929 2029/2055/929 2030/2057/929 +f 2227/2270/930 2029/2055/930 2223/2266/930 +f 2227/2270/2939 2028/2052/2939 2029/2055/2939 +f 2026/2049/2940 2417/2435/2940 2419/2051/2940 +f 2227/2270/933 2027/2050/933 2028/2052/933 +f 2415/2047/934 2417/2435/934 2026/2049/934 +f 2230/2274/935 2027/2050/935 2227/2270/935 +f 2230/2274/936 2025/2048/936 2027/2050/936 +f 2023/2045/937 2413/2432/937 2415/2047/937 +f 2230/2274/938 2024/2046/938 2025/2048/938 +f 2023/2045/939 2411/2430/939 2413/2432/939 +f 2021/2043/940 2411/2430/940 2023/2045/940 +f 2233/2134/941 2024/2046/941 2230/2274/941 +f 2021/2043/942 2409/2428/942 2411/2430/942 +f 2020/2042/2941 2409/2428/2941 2021/2043/2941 +f 2236/2279/2064 2022/2044/2064 2233/2134/2064 +f 2020/2042/2942 2407/2426/2942 2409/2428/2942 +f 2018/2040/946 2407/2426/946 2020/2042/946 +f 2236/2279/947 2092/2135/947 2022/2044/947 +f 2404/2038/2943 2407/2426/2943 2018/2040/2943 +f 2239/2282/949 2092/2135/949 2236/2279/949 +f 2239/2282/2067 2019/2041/2067 2092/2135/2067 +f 2239/2282/2068 2017/2039/2068 2019/2041/2068 +f 2244/2286/952 2017/2039/952 2239/2282/952 +f 2244/2286/2944 2016/2037/2944 2017/2039/2944 +f 2244/2286/954 2015/2035/954 2016/2037/954 +f 2252/2294/955 2015/2035/955 2244/2286/955 +f 2252/2294/956 2014/2033/956 2015/2035/956 +f 2252/2294/957 2013/2031/957 2014/2033/957 +f 2259/2300/2945 2013/2031/2945 2252/2294/2945 +f 2259/2300/959 2012/2028/959 2013/2031/959 +f 2010/2025/960 2391/2416/960 2393/2027/960 +f 2259/2300/961 2011/2026/961 2012/2028/961 +f 2389/2024/2946 2391/2416/2946 2010/2025/2946 +f 2094/2138/2947 2011/2026/2947 2259/2300/2947 +f 2008/2022/2948 2388/2415/2948 2389/2024/2948 +f 2270/2311/965 2009/2023/965 2094/2138/965 +f 2008/2022/966 2386/2413/966 2388/2415/966 +f 2006/2020/967 2386/2413/967 2008/2022/967 +f 2270/2311/968 2095/2139/968 2009/2023/968 +f 2006/2020/969 2384/2411/969 2386/2413/969 +f 2005/2019/970 2384/2411/970 2006/2020/970 +f 2277/2318/2949 2007/2021/2949 2095/2139/2949 +f 2005/2019/2950 2382/2409/2950 2384/2411/2950 +f 2003/2017/973 2382/2409/973 2005/2019/973 +f 2277/2318/974 2096/2140/974 2007/2021/974 +f 2379/2015/2079 2382/2409/2079 2003/2017/2079 +f 2284/2326/2951 2096/2140/2951 2277/2318/2951 +f 2284/2326/977 2004/2018/977 2096/2140/977 +f 2284/2326/2952 2002/2016/2952 2004/2018/2952 +f 2293/2334/2082 2002/2016/2082 2284/2326/2082 +f 2293/2334/2953 2001/2014/2953 2002/2016/2953 +f 2293/2334/981 2000/2012/981 2001/2014/981 +f 2300/2341/982 2000/2012/982 2293/2334/982 +f 2300/2341/983 1999/2010/983 2000/2012/983 +f 1997/2006/984 2370/2402/984 2372/2007/984 +f 2300/2341/985 1998/2008/985 1999/2010/985 +f 2368/2003/986 2370/2402/986 1997/2006/986 +f 2307/2348/987 1998/2008/987 2300/2341/987 +f 2307/2348/988 1996/2005/988 1998/2008/988 +f 1994/2002/2954 2366/2398/2954 2368/2003/2954 +f 2307/2348/990 1995/2004/990 1996/2005/990 +f 1993/2000/991 2366/2398/991 1994/2002/991 +f 1993/2000/2955 2364/2397/2955 2366/2398/2955 +f 1995/2004/993 2307/2348/993 2099/2143/993 +f 1991/1999/2956 2364/2397/2956 1993/2000/2956 +f 1991/1999/995 2363/2396/995 2364/2397/995 +f 2099/2143/2957 2297/2338/2957 1992/2001/2957 +f 1991/1999/997 2361/2394/997 2363/2396/997 +f 1989/1997/2958 2361/2394/2958 1991/1999/2958 +f 1992/2001/2959 2297/2338/2959 2098/2142/2959 +f 1988/1996/2960 2361/2394/2960 1989/1997/2960 +f 1988/1996/2961 2359/2392/2961 2361/2394/2961 +f 1990/1998/2962 2098/2142/2962 2289/2331/2962 +f 2357/1994/2963 2359/2392/2963 1988/1996/2963 +f 1990/1998/2964 2289/2331/2964 2097/2141/2964 +f 2097/2141/2965 2289/2331/2965 2281/2323/2965 +f 2097/2141/2966 2281/2323/2966 1987/1995/2966 +f 1987/1995/1006 2281/2323/1006 1986/1993/1006 +f 1986/1993/1007 2281/2323/1007 2274/2316/1007 +f 1986/1993/1008 2274/2316/1008 1985/1991/1008 +f 1985/1991/1009 2274/2316/1009 1984/1989/1009 +f 1984/1989/1010 2274/2316/1010 2266/2309/1010 +f 1984/1989/1011 2266/2309/1011 1983/1986/1011 +f 2347/1985/1012 1981/1983/1012 2345/2384/1012 +f 1983/1986/2097 2266/2309/2097 1982/1984/2097 +f 2345/2384/1014 1981/1983/1014 2342/1980/1014 +f 1982/1984/1015 2266/2309/1015 2260/2304/1015 +f 1982/1984/1016 2260/2304/1016 1980/1982/1016 +f 2319/2362/2967 2315/2355/2967 2471/2472/2967 +f 2342/1980/1018 1978/1979/1018 2341/2381/1018 +f 2320/2361/1019 2315/2355/1019 2319/2362/1019 +f 1980/1982/1020 2260/2304/1020 1979/1981/1020 +f 2341/2381/2968 1978/1979/2968 1977/1977/2968 +f 2320/2361/1022 2323/2354/1022 2315/2355/1022 +f 2341/2381/1023 1977/1977/1023 2339/2379/1023 +f 1979/1981/1024 2260/2304/1024 2256/2137/1024 +f 2339/2379/2969 1977/1977/2969 1975/1976/2969 +f 2339/2379/2970 1975/1976/2970 2337/2376/2970 +f 2325/2366/1027 2310/2351/1027 2323/2354/1027 +f 2256/2137/2971 2249/2290/2971 1976/1978/2971 +f 2337/2376/1029 1975/1976/1029 2335/2375/1029 +f 2327/2368/1030 2310/2351/1030 2325/2366/1030 +f 2335/2375/1031 1975/1976/1031 1973/1974/1031 +f 2327/2368/1032 2472/2473/1032 2310/2351/1032 +f 1976/1978/1033 2249/2290/1033 2093/2136/1033 +f 2329/2370/2972 2472/2473/2972 2327/2368/2972 +f 2335/2375/2102 1973/1974/2102 2334/1971/2102 +f 2472/2473/1036 2311/2352/1036 2310/2351/1036 +f 2472/2473/1037 2473/2474/1037 2311/2352/1037 +f 2334/1971/1038 1971/1973/1038 2332/2373/1038 +f 2329/2370/1039 2473/2474/1039 2472/2473/1039 +f 2332/2373/1040 1971/1973/1040 2329/2370/1040 +f 1974/1975/2973 2093/2136/2973 2474/2285/2973 +f 1971/1973/2974 2473/2474/2974 2329/2370/2974 +f 1974/1975/2975 2474/2285/2975 1972/1972/2975 +f 1971/1973/1044 2474/2285/1044 2473/2474/1044 +f 1971/1973/1045 1972/1972/1045 2474/2285/1045 +f 2476/2475/1046 2477/2476/1046 2478/2477/1046 +f 2316/2358/1047 2318/2360/1047 2477/2476/1047 +f 2482/2478/1048 2481/2479/1048 2480/2480/1048 +f 2322/2364/1049 2316/2358/1049 2479/2481/1049 +f 2482/2478/1050 2483/2482/1050 2481/2479/1050 +f 2484/2483/2976 2483/2482/2976 2482/2478/2976 +f 2485/2484/1052 2483/2482/1052 2484/2483/1052 +f 2485/2484/2977 2486/2485/2977 2483/2482/2977 +f 2487/2486/1054 2486/2485/1054 2485/2484/1054 +f 2483/2482/2978 2322/2364/2978 2481/2479/2978 +f 2483/2482/1056 2326/2367/1056 2322/2364/1056 +f 2486/2485/2979 2326/2367/2979 2483/2482/2979 +f 2330/2371/1058 2326/2367/1058 2486/2485/1058 +f 2489/2487/1059 2490/2488/1059 2488/2489/1059 +f 2491/2490/1060 2490/2488/1060 2489/2487/1060 +f 2491/2490/2980 2492/2491/2980 2490/2488/2980 +f 2490/2488/1062 2333/2374/1062 2330/2371/1062 +f 2493/2492/2981 2492/2491/2981 2491/2490/2981 +f 2492/2491/2113 2333/2374/2113 2490/2488/2113 +f 2494/2493/2982 2495/2494/2982 2493/2492/2982 +f 2336/2377/1066 2333/2374/1066 2492/2491/1066 +f 2496/2495/1067 2495/2494/1067 2494/2493/1067 +f 2497/2496/1068 2498/2497/1068 2496/2495/1068 +f 2340/2380/2983 2336/2377/2983 2495/2494/2983 +f 2499/2498/1070 2500/2499/1070 2498/2497/1070 +f 2501/2500/2984 2500/2499/2984 2499/2498/2984 +f 2501/2500/1072 2502/2501/1072 2500/2499/1072 +f 2503/2502/2985 2502/2501/2985 2501/2500/2985 +f 2503/2502/1074 2504/2503/1074 2502/2501/1074 +f 2505/2504/1075 2504/2503/1075 2503/2502/1075 +f 2502/2501/1076 2344/2383/1076 2500/2499/1076 +f 2505/2504/2986 2506/2505/2986 2504/2503/2986 +f 2502/2501/1078 2348/2386/1078 2344/2383/1078 +f 2507/2506/2987 2506/2505/2987 2505/2504/2987 +f 2504/2503/1080 2348/2386/1080 2502/2501/1080 +f 2507/2506/1081 2508/2507/1081 2506/2505/1081 +f 2509/2508/2988 2508/2507/2988 2507/2506/2988 +f 2348/2386/1083 2504/2503/1083 2506/2505/1083 +f 2348/2386/2989 2506/2505/2989 2351/2387/2989 +f 2351/2387/1085 2506/2505/1085 2508/2507/1085 +f 2351/2387/2125 2508/2507/2125 2355/2389/2125 +f 2510/2509/2990 2511/2510/2990 2512/2511/2990 +f 2512/2511/2991 2513/2512/2991 2514/2513/2991 +f 2514/2513/2992 2513/2512/2992 2515/2514/2992 +f 2514/2513/2993 2515/2514/2993 2516/2515/2993 +f 2516/2515/1091 2515/2514/1091 2517/2516/1091 +f 2516/2515/1092 2517/2516/1092 2518/2517/1092 +f 2358/2391/1093 2514/2513/1093 2516/2515/1093 +f 2358/2391/1094 2516/2515/1094 2362/2395/1094 +f 2518/2517/1095 2517/2516/1095 2519/2518/1095 +f 2362/2395/2994 2516/2515/2994 2518/2517/2994 +f 2362/2395/1097 2518/2517/1097 2365/2399/1097 +f 2520/2519/1098 2521/2520/1098 2522/2521/1098 +f 2522/2521/1099 2521/2520/1099 2523/2522/1099 +f 2522/2521/1100 2523/2522/1100 2524/2523/1100 +f 2524/2523/2995 2523/2522/2995 2525/2524/2995 +f 2524/2523/2996 2525/2524/2996 2526/2525/2996 +f 2526/2525/2997 2525/2524/2997 2527/2526/2997 +f 2369/2401/1104 2522/2521/1104 2524/2523/1104 +f 2526/2525/2140 2527/2526/2140 2528/2527/2140 +f 2369/2401/1106 2524/2523/1106 2373/2404/1106 +f 2528/2527/2998 2527/2526/2998 2529/2528/2998 +f 2373/2404/1108 2524/2523/1108 2526/2525/1108 +f 2528/2527/2141 2529/2528/2141 2530/2529/2141 +f 2530/2529/1110 2529/2528/1110 2531/2530/1110 +f 2373/2404/1111 2526/2525/1111 2528/2527/1111 +f 2373/2404/1112 2528/2527/1112 2377/2406/1112 +f 2377/2406/1113 2528/2527/1113 2530/2529/1113 +f 2377/2406/1114 2530/2529/1114 2380/2407/1114 +f 2532/2531/1115 2533/2532/1115 2534/2533/1115 +f 2534/2533/1116 2535/2534/1116 2536/2535/1116 +f 2536/2535/1117 2535/2534/1117 2537/2536/1117 +f 2536/2535/1118 2537/2536/1118 2538/2537/1118 +f 2538/2537/1119 2537/2536/1119 2539/2538/1119 +f 2538/2537/2999 2539/2538/2999 2540/2539/2999 +f 2383/2410/1121 2536/2535/1121 2538/2537/1121 +f 2383/2410/1122 2538/2537/1122 2387/2414/1122 +f 2540/2539/1123 2539/2538/1123 2541/2540/1123 +f 2387/2414/3000 2538/2537/3000 2540/2539/3000 +f 2387/2414/1125 2540/2539/1125 2390/2417/1125 +f 2542/2541/1126 2543/2542/1126 2544/2543/1126 +f 2544/2543/3001 2543/2542/3001 2545/2544/3001 +f 2544/2543/1128 2545/2544/1128 2546/2545/1128 +f 2546/2545/3002 2545/2544/3002 2547/2546/3002 +f 2546/2545/1130 2547/2546/1130 2548/2547/1130 +f 2548/2547/3003 2547/2546/3003 2549/2548/3003 +f 2394/2419/1132 2544/2543/1132 2546/2545/1132 +f 2548/2547/1133 2549/2548/1133 2550/2549/1133 +f 2394/2419/1134 2546/2545/1134 2398/2421/1134 +f 2550/2549/3004 2549/2548/3004 2551/2550/3004 +f 2398/2421/1136 2546/2545/1136 2548/2547/1136 +f 2550/2549/3005 2551/2550/3005 2552/2551/3005 +f 2552/2551/1138 2551/2550/1138 2553/2552/1138 +f 2398/2421/3006 2548/2547/3006 2550/2549/3006 +f 2398/2421/2157 2550/2549/2157 2402/2423/2157 +f 2402/2423/2158 2550/2549/2158 2552/2551/2158 +f 2402/2423/1142 2552/2551/1142 2405/2424/1142 +f 2554/2553/3007 2555/2554/3007 2556/2555/3007 +f 2556/2555/1144 2557/2556/1144 2558/2557/1144 +f 2558/2557/3008 2557/2556/3008 2559/2558/3008 +f 2559/2558/3009 2560/2559/3009 2561/2560/3009 +f 2561/2560/1147 2560/2559/1147 2562/2561/1147 +f 2408/2427/1148 2558/2557/1148 2412/2431/1148 +f 2561/2560/1149 2562/2561/1149 2563/2562/1149 +f 2563/2562/3010 2562/2561/3010 2564/2563/3010 +f 2563/2562/3011 2564/2563/3011 2565/2564/3011 +f 2412/2431/1152 2561/2560/1152 2563/2562/1152 +f 2412/2431/1153 2563/2562/1153 2416/2434/1153 +f 2565/2564/3012 2566/2565/3012 2567/2566/3012 +f 2567/2566/2165 2566/2565/2165 2568/2567/2165 +f 2567/2566/3013 2568/2567/3013 2569/2568/3013 +f 2569/2568/1157 2568/2567/1157 2570/2569/1157 +f 2569/2568/1158 2570/2569/1158 2571/2570/1158 +f 2571/2570/1159 2570/2569/1159 2572/2571/1159 +f 2420/2437/1160 2567/2566/1160 2569/2568/1160 +f 2571/2570/1161 2572/2571/1161 2573/2572/1161 +f 2420/2437/1162 2569/2568/1162 2424/2439/1162 +f 2573/2572/1163 2572/2571/1163 2574/2573/1163 +f 2424/2439/1164 2569/2568/1164 2571/2570/1164 +f 2573/2572/3014 2574/2573/3014 2575/2574/3014 +f 2575/2574/1166 2574/2573/1166 2576/2575/1166 +f 2424/2439/3015 2571/2570/3015 2573/2572/3015 +f 2424/2439/1168 2573/2572/1168 2428/2441/1168 +f 2428/2441/1169 2573/2572/1169 2575/2574/1169 +f 2428/2441/1170 2575/2574/1170 2431/2442/1170 +f 2577/2576/1171 2578/2577/1171 2579/2578/1171 +f 2579/2578/1172 2580/2579/1172 2581/2580/1172 +f 2581/2580/1173 2580/2579/1173 2582/2581/1173 +f 2582/2581/2173 2583/2582/2173 2584/2583/2173 +f 2584/2583/3016 2583/2582/3016 2585/2584/3016 +f 2434/2445/1176 2581/2580/1176 2438/2449/1176 +f 2162/2122/3017 2089/2129/3017 2083/2123/3017 +f 2584/2583/1178 2585/2584/1178 2586/2585/1178 +f 2089/2129/3018 2152/2197/3018 2141/2194/3018 +f 2586/2585/1180 2585/2584/1180 2587/2586/1180 +f 2089/2129/3019 2141/2194/3019 2086/2126/3019 +f 2586/2585/1182 2587/2586/1182 2588/2587/1182 +f 2086/2126/3020 2141/2194/3020 2077/2109/3020 +f 2438/2449/3021 2584/2583/3021 2586/2585/3021 +f 2438/2449/2178 2586/2585/2178 2442/2452/2178 +f 2077/2109/3022 2141/2194/3022 2078/2110/3022 +f 2588/2587/1187 2589/2588/1187 2590/2589/1187 +f 2077/2109/3023 2079/2111/3023 2125/2169/3023 +f 2122/2166/3024 2079/2111/3024 2078/2110/3024 +f 2590/2589/3025 2589/2588/3025 2591/2590/3025 +f 2123/2170/3026 2078/2110/3026 2133/2179/3026 +f 2590/2589/3027 2591/2590/3027 2592/2591/3027 +f 2122/2166/3028 2125/2169/3028 2079/2111/3028 +f 2114/2160/3029 2122/2166/3029 2078/2110/3029 +f 2123/2170/3030 2114/2160/3030 2078/2110/3030 +f 2592/2591/1193 2591/2590/1193 2594/2592/1193 +f 2593/2157/3031 2114/2160/3031 2123/2170/3031 +f 2115/2161/3032 2593/2157/3032 2123/2170/3032 +f 2592/2591/1194 2594/2592/1194 2595/2593/1194 +f 2595/2593/3033 2594/2592/3033 2596/2594/3033 +f 2446/2455/1197 2590/2589/1197 2592/2591/1197 +f 2595/2593/1198 2596/2594/1198 2597/2595/1198 +f 2446/2455/3034 2592/2591/3034 2450/2457/3034 +f 2107/2151/3035 2108/2153/3035 2593/2157/3035 +f 2597/2595/1203 2596/2594/1203 2598/2596/1203 +f 2450/2457/1204 2592/2591/1204 2595/2593/1204 +f 2108/2153/3036 2114/2160/3036 2593/2157/3036 +f 2597/2595/1205 2598/2596/1205 2599/2597/1205 +f 2102/2146/3037 2103/2147/3037 2114/2160/3037 +f 2108/2153/3038 2102/2146/3038 2114/2160/3038 +f 2599/2597/1208 2598/2596/1208 2600/2598/1208 +f 2450/2457/1209 2595/2593/1209 2597/2595/1209 +f 2450/2457/1211 2597/2595/1211 2454/2459/1211 +f 2112/2159/3039 2601/2599/3039 2108/2153/3039 +f 2601/2599/3040 2102/2146/3040 2108/2153/3040 +f 2454/2459/1212 2597/2595/1212 2599/2597/1212 +f 2121/2167/3041 2601/2599/3041 2112/2159/3041 +f 2601/2599/3042 2100/2144/3042 2102/2146/3042 +f 2121/2167/3043 2129/2174/3043 2601/2599/3043 +f 2068/2108/1217 2069/2120/1217 2075/2119/1217 +f 2454/2459/1218 2599/2597/1218 2457/2460/1218 +f 2602/2600/1220 2603/2601/1220 2604/2602/1220 +f 2601/2599/3044 2109/2156/3044 2100/2144/3044 +f 2068/2108/3045 2075/2119/3045 2084/2125/3045 +f 2604/2602/1224 2605/2603/1224 2606/2604/1224 +f 2143/2188/1225 2068/2108/1225 2084/2125/1225 +f 2126/2172/3046 2109/2156/3046 2601/2599/3046 +f 2129/2174/3047 2126/2172/3047 2601/2599/3047 +f 2606/2604/1226 2605/2603/1226 2607/2605/1226 +f 2126/2172/3048 2118/2165/3048 2109/2156/3048 +f 2136/2182/3049 2129/2174/3049 2127/2171/3049 +f 2067/2107/2207 2068/2108/2207 2143/2188/2207 +f 2176/2222/1228 2143/2188/1228 2147/2192/1228 +f 2176/2222/1229 2067/2107/1229 2143/2188/1229 +f 2157/2203/3050 2176/2222/3050 2147/2192/3050 +f 2136/2182/3051 2126/2172/3051 2129/2174/3051 +f 2607/2605/3052 2608/2606/3052 2609/2607/3052 +f 2609/2607/3053 2608/2606/3053 2610/2608/3053 +f 2460/2463/1236 2606/2604/1236 2464/2467/1236 +f 2146/2191/3054 2126/2172/3054 2136/2182/3054 +f 2178/2223/1239 2157/2203/1239 2163/2208/1239 +f 2166/2212/1240 2178/2223/1240 2163/2208/1240 +f 2609/2607/1241 2610/2608/1241 2611/2609/1241 +f 2146/2191/3055 2139/2186/3055 2126/2172/3055 +f 2611/2609/3056 2610/2608/3056 2612/2610/3056 +f 2139/2186/3057 2134/2180/3057 2126/2172/3057 +f 2167/2213/2217 2178/2223/2217 2166/2212/2217 +f 2167/2213/2218 2179/2224/2218 2178/2223/2218 +f 2151/2201/3058 2139/2186/3058 2146/2191/3058 +f 2611/2609/1247 2612/2610/1247 2613/2611/1247 +f 2464/2467/3059 2609/2607/3059 2611/2609/3059 +f 2464/2467/1252 2611/2609/1252 2156/2200/1252 +f 2154/2198/3060 2613/2611/3060 2167/2213/3060 +f 2156/2200/3061 2613/2611/3061 2154/2198/3061 +f 2151/2201/3062 2149/2195/3062 2139/2186/3062 +f 2160/2206/3063 2614/2612/3063 2151/2201/3063 +f 2174/2219/3064 2155/2199/3064 2614/2612/3064 +f 2171/2215/3065 2174/2219/3065 2614/2612/3065 +f 2155/2199/3066 2174/2219/3066 2470/2471/3066 +f 2614/2612/3067 2149/2195/3067 2151/2201/3067 +f 2165/2210/3068 2614/2612/3068 2160/2206/3068 +f 2171/2215/3069 2614/2612/3069 2165/2210/3069 +f 2470/2471/3070 2156/2200/3070 2155/2199/3070 +f 2155/2199/3071 2149/2195/3071 2614/2612/3071 +f 2617/2613/3072 2616/2614/3072 2615/2615/3072 +f 2475/2616/3073 2617/2613/3073 2615/2615/3073 +f 2618/2617/3074 2619/2618/3074 2475/2616/3074 +f 2619/2618/3075 2617/2613/3075 2475/2616/3075 +f 2620/2619/3076 2619/2618/3076 2618/2617/3076 +f 2620/2619/3077 2622/2620/3077 2619/2618/3077 +f 2622/2620/3078 2621/2621/3078 2619/2618/3078 +f 2622/2620/3079 2623/2622/3079 2621/2621/3079 +f 2624/2623/3080 2623/2622/3080 2622/2620/3080 +f 2625/2624/3081 2624/2623/3081 2622/2620/3081 +f 2625/2624/3082 2626/2625/3082 2624/2623/3082 +f 2626/2625/3083 2627/2626/3083 2624/2623/3083 +f 2626/2625/3084 2629/2627/3084 2627/2626/3084 +f 2628/2628/3085 2629/2627/3085 2626/2625/3085 +f 2628/2628/3086 2631/2629/3086 2629/2627/3086 +f 2631/2629/3087 2630/2630/3087 2629/2627/3087 +f 2632/2631/3088 2633/2632/3088 2631/2629/3088 +f 2634/2633/3089 2633/2632/3089 2632/2631/3089 +f 2634/2633/3090 2635/2634/3090 2633/2632/3090 +f 2636/2635/3091 2635/2634/3091 2634/2633/3091 +f 2634/2633/3092 2637/2636/3092 2636/2635/3092 +f 2638/2637/3093 2637/2636/3093 2634/2633/3093 +f 2638/2637/3094 2639/2638/3094 2637/2636/3094 +f 2640/2639/3095 2641/2640/3095 2638/2637/3095 +f 2641/2640/3096 2639/2638/3096 2638/2637/3096 +f 2613/2611/1289 2179/2224/1289 2167/2213/1289 +f 2613/2611/1290 2182/2227/1290 2179/2224/1290 +f 2612/2610/1291 2182/2227/1291 2613/2611/1291 +f 2612/2610/1292 2183/2228/1292 2182/2227/1292 +f 2610/2608/3097 2183/2228/3097 2612/2610/3097 +f 2610/2608/3098 2186/2231/3098 2183/2228/3098 +f 2608/2606/2251 2186/2231/2251 2610/2608/2251 +f 2608/2606/3099 2187/2232/3099 2186/2231/3099 +f 2607/2605/3100 2189/2233/3100 2608/2606/3100 +f 2189/2233/3101 2187/2232/3101 2608/2606/3101 +f 2605/2603/3102 2189/2233/3102 2607/2605/3102 +f 2605/2603/3103 2190/2234/3103 2189/2233/3103 +f 2603/2601/1301 2605/2603/1301 2604/2602/1301 +f 2603/2601/1302 2190/2234/1302 2605/2603/1302 +f 2603/2601/3104 2192/2235/3104 2190/2234/3104 +f 2600/2598/1304 2603/2601/1304 2602/2600/1304 +f 2603/2601/1305 2193/2237/1305 2192/2235/1305 +f 2600/2598/1306 2193/2237/1306 2603/2601/1306 +f 2600/2598/1307 2195/2238/1307 2193/2237/1307 +f 2598/2596/1308 2195/2238/1308 2600/2598/1308 +f 2598/2596/1309 2196/2240/1309 2195/2238/1309 +f 2596/2594/1310 2196/2240/1310 2598/2596/1310 +f 2594/2592/1311 2198/2243/1311 2596/2594/1311 +f 2198/2243/1312 2196/2240/1312 2596/2594/1312 +f 2591/2590/3105 2198/2243/3105 2594/2592/3105 +f 2591/2590/1314 2200/2244/1314 2198/2243/1314 +f 2589/2588/3106 2200/2244/3106 2591/2590/3106 +f 2589/2588/3107 2202/2246/3107 2200/2244/3107 +f 2588/2587/3108 2202/2246/3108 2589/2588/3108 +f 2588/2587/1318 2204/2248/1318 2202/2246/1318 +f 2587/2586/2264 2204/2248/2264 2588/2587/2264 +f 2587/2586/3109 2205/2249/3109 2204/2248/3109 +f 2585/2584/3110 2205/2249/3110 2587/2586/3110 +f 2585/2584/1322 2208/2252/1322 2205/2249/1322 +f 2583/2582/3111 2208/2252/3111 2585/2584/3111 +f 2583/2582/1324 2209/2253/1324 2208/2252/1324 +f 2582/2581/1325 2211/2254/1325 2583/2582/1325 +f 2211/2254/2268 2209/2253/2268 2583/2582/2268 +f 2580/2579/1327 2211/2254/1327 2582/2581/1327 +f 2580/2579/1328 2212/2255/1328 2211/2254/1328 +f 2578/2577/3112 2580/2579/3112 2579/2578/3112 +f 2578/2577/1330 2212/2255/1330 2580/2579/1330 +f 2578/2577/1331 2214/2256/1331 2212/2255/1331 +f 2576/2575/1332 2578/2577/1332 2577/2576/1332 +f 2578/2577/1333 2215/2258/1333 2214/2256/1333 +f 2576/2575/1334 2215/2258/1334 2578/2577/1334 +f 2576/2575/3113 2217/2259/3113 2215/2258/3113 +f 2574/2573/1336 2217/2259/1336 2576/2575/1336 +f 2574/2573/1337 2218/2261/1337 2217/2259/1337 +f 2572/2571/1338 2218/2261/1338 2574/2573/1338 +f 2570/2569/3114 2220/2264/3114 2572/2571/3114 +f 2220/2264/3115 2218/2261/3115 2572/2571/3115 +f 2568/2567/1341 2220/2264/1341 2570/2569/1341 +f 2568/2567/1342 2222/2265/1342 2220/2264/1342 +f 2566/2565/1343 2222/2265/1343 2568/2567/1343 +f 2566/2565/1344 2224/2267/1344 2222/2265/1344 +f 2565/2564/1345 2224/2267/1345 2566/2565/1345 +f 2565/2564/1346 2226/2269/1346 2224/2267/1346 +f 2564/2563/1347 2226/2269/1347 2565/2564/1347 +f 2564/2563/1348 2228/2271/1348 2226/2269/1348 +f 2562/2561/1349 2228/2271/1349 2564/2563/1349 +f 2562/2561/2277 2231/2273/2277 2228/2271/2277 +f 2560/2559/1351 2231/2273/1351 2562/2561/1351 +f 2560/2559/3116 2232/2275/3116 2231/2273/3116 +f 2559/2558/3117 2234/2276/3117 2560/2559/3117 +f 2234/2276/1354 2232/2275/1354 2560/2559/1354 +f 2557/2556/1355 2234/2276/1355 2559/2558/1355 +f 2557/2556/1356 2235/2277/1356 2234/2276/1356 +f 2555/2554/1357 2557/2556/1357 2556/2555/1357 +f 2555/2554/2282 2235/2277/2282 2557/2556/2282 +f 2555/2554/1359 2237/2278/1359 2235/2277/1359 +f 2553/2552/3118 2555/2554/3118 2554/2553/3118 +f 2555/2554/2284 2238/2280/2284 2237/2278/2284 +f 2553/2552/1362 2238/2280/1362 2555/2554/1362 +f 2553/2552/1363 2240/2281/1363 2238/2280/1363 +f 2551/2550/1364 2240/2281/1364 2553/2552/1364 +f 2551/2550/1365 2241/2283/1365 2240/2281/1365 +f 2549/2548/3119 2241/2283/3119 2551/2550/3119 +f 2547/2546/1367 2246/2291/1367 2549/2548/1367 +f 2246/2291/1368 2241/2283/1368 2549/2548/1368 +f 2545/2544/1369 2246/2291/1369 2547/2546/1369 +f 2545/2544/3120 2250/2292/3120 2246/2291/3120 +f 2543/2542/3121 2250/2292/3121 2545/2544/3121 +f 2543/2542/1372 2253/2295/1372 2250/2292/1372 +f 2542/2541/1373 2253/2295/1373 2543/2542/1373 +f 2542/2541/1374 2257/2298/1374 2253/2295/1374 +f 2541/2540/1375 2257/2298/1375 2542/2541/1375 +f 2541/2540/1376 2261/2301/1376 2257/2298/1376 +f 2541/2540/1377 2264/2305/1377 2261/2301/1377 +f 2539/2538/1378 2264/2305/1378 2541/2540/1378 +f 2539/2538/1379 2267/2307/1379 2264/2305/1379 +f 2537/2536/1380 2267/2307/1380 2539/2538/1380 +f 2537/2536/1381 2271/2312/1381 2267/2307/1381 +f 2535/2534/1382 2271/2312/1382 2537/2536/1382 +f 2535/2534/3122 2275/2315/3122 2271/2312/3122 +f 2533/2532/1384 2535/2534/1384 2534/2533/1384 +f 2533/2532/1385 2275/2315/1385 2535/2534/1385 +f 2533/2532/3123 2278/2319/3123 2275/2315/3123 +f 2531/2530/3124 2533/2532/3124 2532/2531/3124 +f 2533/2532/1388 2282/2322/1388 2278/2319/1388 +f 2531/2530/3125 2285/2325/3125 2533/2532/3125 +f 2285/2325/2294 2282/2322/2294 2533/2532/2294 +f 2529/2528/1391 2285/2325/1391 2531/2530/1391 +f 2529/2528/1392 2286/2330/1392 2285/2325/1392 +f 2527/2526/1393 2286/2330/1393 2529/2528/1393 +f 2527/2526/3126 2291/2332/3126 2286/2330/3126 +f 2525/2524/1395 2291/2332/1395 2527/2526/1395 +f 2525/2524/1396 2294/2335/1396 2291/2332/1396 +f 2523/2522/2296 2294/2335/2296 2525/2524/2296 +f 2523/2522/2297 2298/2339/2297 2294/2335/2297 +f 2521/2520/1399 2298/2339/1399 2523/2522/1399 +f 2521/2520/3127 2301/2342/3127 2298/2339/3127 +f 2520/2519/1401 2301/2342/1401 2521/2520/1401 +f 2520/2519/1402 2305/2346/1402 2301/2342/1402 +f 2519/2518/1403 2305/2346/1403 2520/2519/1403 +f 2519/2518/1404 2308/2349/1404 2305/2346/1404 +f 2519/2518/1405 2309/2350/1405 2308/2349/1405 +f 2517/2516/1406 2309/2350/1406 2519/2518/1406 +f 2309/2350/1407 2517/2516/1407 2306/2347/1407 +f 2643/2641/3128 2645/2642/3128 2644/2643/3128 +f 2306/2347/1409 2517/2516/1409 2515/2514/1409 +f 2646/2644/3129 2645/2642/3129 2643/2641/3129 +f 2306/2347/1410 2515/2514/1410 2302/2343/1410 +f 2302/2343/3130 2515/2514/3130 2513/2512/3130 +f 2302/2343/1413 2513/2512/1413 2299/2340/1413 +f 2511/2510/3131 2513/2512/3131 2512/2511/3131 +f 2647/2645/3132 2645/2642/3132 2646/2644/3132 +f 2647/2645/3133 2648/2646/3133 2645/2642/3133 +f 2299/2340/3134 2513/2512/3134 2511/2510/3134 +f 2299/2340/3135 2511/2510/3135 2295/2336/3135 +f 2650/2647/3136 2648/2646/3136 2647/2645/3136 +f 2649/2648/3137 2640/2639/3137 2638/2637/3137 +f 2650/2647/3138 2651/2649/3138 2648/2646/3138 +f 2509/2508/3139 2511/2510/3139 2510/2509/3139 +f 2509/2508/1424 2288/2328/1424 2511/2510/1424 +f 2295/2336/1425 2511/2510/1425 2292/2333/1425 +f 2649/2648/3140 2638/2637/3140 2652/2650/3140 +f 2292/2333/3141 2511/2510/3141 2288/2328/3141 +f 2653/2651/3142 2651/2649/3142 2650/2647/3142 +f 2652/2650/3143 2638/2637/3143 2634/2633/3143 +f 2507/2506/1429 2288/2328/1429 2509/2508/1429 +f 2507/2506/3144 2287/2327/3144 2288/2328/3144 +f 2652/2650/3145 2703/2652/3145 2649/2648/3145 +f 2652/2650/3146 2654/2653/3146 2703/2652/3146 +f 2653/2651/3147 2655/2654/3147 2651/2649/3147 +f 2505/2504/3148 2287/2327/3148 2507/2506/3148 +f 2656/2655/3149 2655/2654/3149 2653/2651/3149 +f 2505/2504/1437 2283/2324/1437 2287/2327/1437 +f 2658/2656/3150 2654/2653/3150 2652/2650/3150 +f 2652/2650/3151 2634/2633/3151 2657/2657/3151 +f 2658/2656/3152 2652/2650/3152 2657/2657/3152 +f 2503/2502/1440 2283/2324/1440 2505/2504/1440 +f 2658/2656/3153 2659/2658/3153 2654/2653/3153 +f 2657/2657/3154 2634/2633/3154 2632/2631/3154 +f 2503/2502/1441 2279/2320/1441 2283/2324/1441 +f 2658/2656/3155 2657/2657/3155 2660/2659/3155 +f 2661/2660/3156 2655/2654/3156 2656/2655/3156 +f 2662/2661/3157 2659/2658/3157 2658/2656/3157 +f 2661/2660/3158 2663/2662/3158 2655/2654/3158 +f 2501/2500/1447 2279/2320/1447 2503/2502/1447 +f 2501/2500/1449 2276/2317/1449 2279/2320/1449 +f 2657/2657/3159 2632/2631/3159 2664/2663/3159 +f 2499/2498/1454 2276/2317/1454 2501/2500/1454 +f 2665/2664/3160 2663/2662/3160 2661/2660/3160 +f 2664/2663/3161 2632/2631/3161 2631/2629/3161 +f 2499/2498/1455 2272/2313/1455 2276/2317/1455 +f 2665/2664/3162 2666/2665/3162 2663/2662/3162 +f 2498/2497/1459 2272/2313/1459 2499/2498/1459 +f 2664/2663/3163 2631/2629/3163 2628/2628/3163 +f 2498/2497/1460 2269/2310/1460 2272/2313/1460 +f 2497/2496/1464 2269/2310/1464 2498/2497/1464 +f 2670/2666/3164 2666/2665/3164 2665/2664/3164 +f 2669/2667/3165 2664/2663/3165 2628/2628/3165 +f 2670/2666/3166 2671/2668/3166 2666/2665/3166 +f 2269/2310/2353 2497/2496/2353 2265/2306/2353 +f 2669/2667/3167 2672/2669/3167 2668/2670/3167 +f 2673/2671/3168 2671/2668/3168 2670/2666/3168 +f 2496/2495/1470 2262/2302/1470 2497/2496/1470 +f 2673/2671/3169 2617/2613/3169 2671/2668/3169 +f 2494/2493/3170 2262/2302/3170 2496/2495/3170 +f 2265/2306/1473 2497/2496/1473 2262/2302/1473 +f 2628/2628/3171 2626/2625/3171 2625/2624/3171 +f 2669/2667/3172 2628/2628/3172 2674/2672/3172 +f 2674/2672/3173 2628/2628/3173 2625/2624/3173 +f 2675/2673/3174 2672/2669/3174 2669/2667/3174 +f 2673/2671/3175 2616/2614/3175 2617/2613/3175 +f 2676/2674/3176 2616/2614/3176 2673/2671/3176 +f 2677/2675/1481 2616/2614/1481 2678/2676/1481 +f 2262/2302/1482 2494/2493/1482 2258/2299/1482 +f 2625/2624/3177 2622/2620/3177 2620/2619/3177 +f 2679/2677/3178 2616/2614/3178 2676/2674/3178 +f 2674/2672/3179 2625/2624/3179 2620/2619/3179 +f 2615/2615/3180 2616/2614/3180 2677/2675/3180 +f 2473/2474/1487 2677/2675/1487 2311/2352/1487 +f 2674/2672/3181 2620/2619/3181 2680/2678/3181 +f 2258/2299/3182 2494/2493/3182 2493/2492/3182 +f 2473/2474/1489 2615/2615/1489 2677/2675/1489 +f 2258/2299/1491 2493/2492/1491 2254/2296/1491 +f 2475/2616/1492 2473/2474/1492 2474/2285/1492 +f 2254/2296/3183 2493/2492/3183 2491/2490/3183 +f 2475/2616/3184 2615/2615/3184 2473/2474/3184 +f 2680/2678/3185 2681/2679/3185 2674/2672/3185 +f 2489/2487/3186 2248/2288/3186 2491/2490/3186 +f 2254/2296/3187 2491/2490/3187 2251/2293/3187 +f 2251/2293/1501 2491/2490/1501 2248/2288/1501 +f 2683/2680/3188 2681/2679/3188 2680/2678/3188 +f 2618/2617/3189 2475/2616/3189 2474/2285/3189 +f 2488/2489/1504 2248/2288/1504 2489/2487/1504 +f 2479/2481/1505 2682/2681/1505 2480/2480/1505 +f 2620/2619/3190 2618/2617/3190 2684/2682/3190 +f 2487/2486/1507 2245/2683/1507 2488/2489/1507 +f 2248/2288/1508 2488/2489/1508 2243/2289/1508 +f 2686/2684/1509 2482/2478/1509 2480/2480/1509 +f 2243/2289/1510 2488/2489/1510 2245/2683/1510 +f 2684/2682/3191 2618/2617/3191 2474/2285/3191 +f 2474/2285/1512 2242/2284/1512 2687/2685/1512 +f 2485/2484/1513 2245/2683/1513 2487/2486/1513 +f 2688/2686/1514 2482/2478/1514 2686/2684/1514 +f 2684/2682/3192 2689/2687/3192 2685/2688/3192 +f 2687/2685/3193 2684/2682/3193 2474/2285/3193 +f 2242/2284/2394 2243/2289/2394 2687/2685/2394 +f 2688/2686/1518 2484/2483/1518 2482/2478/1518 +f 2243/2289/3194 2245/2683/3194 2687/2685/3194 +f 2688/2686/1520 2485/2484/1520 2484/2483/1520 +f 2690/2689/3195 2689/2687/3195 2684/2682/3195 +f 2684/2682/3196 2687/2685/3196 2690/2689/3196 +f 2245/2683/1523 2485/2484/1523 2688/2686/1523 +f 2687/2685/3197 2245/2683/3197 2688/2686/3197 +f 2690/2689/3198 2687/2685/3198 2688/2686/3198 +f 2611/2609/2400 2613/2611/2400 2156/2200/2400 +f 2464/2467/2401 2607/2605/2401 2609/2607/2401 +f 2606/2604/1529 2607/2605/1529 2464/2467/1529 +f 2460/2463/1530 2604/2602/1530 2606/2604/1530 +f 2457/2460/1531 2604/2602/1531 2460/2463/1531 +f 2457/2460/1532 2602/2600/1532 2604/2602/1532 +f 2457/2460/1533 2600/2598/1533 2602/2600/1533 +f 2599/2597/1534 2600/2598/1534 2457/2460/1534 +f 2446/2455/1535 2588/2587/1535 2590/2589/1535 +f 2442/2452/3199 2588/2587/3199 2446/2455/3199 +f 2586/2585/1537 2588/2587/1537 2442/2452/1537 +f 2438/2449/2403 2582/2581/2403 2584/2583/2403 +f 2581/2580/1539 2582/2581/1539 2438/2449/1539 +f 2434/2445/2404 2579/2578/2404 2581/2580/2404 +f 2431/2442/1541 2579/2578/1541 2434/2445/1541 +f 2431/2442/1542 2577/2576/1542 2579/2578/1542 +f 2431/2442/3200 2576/2575/3200 2577/2576/3200 +f 2575/2574/3201 2576/2575/3201 2431/2442/3201 +f 2420/2437/2408 2565/2564/2408 2567/2566/2408 +f 2416/2434/1546 2565/2564/1546 2420/2437/1546 +f 2563/2562/1547 2565/2564/1547 2416/2434/1547 +f 2412/2431/1548 2559/2558/1548 2561/2560/1548 +f 2558/2557/1549 2559/2558/1549 2412/2431/1549 +f 2408/2427/1550 2556/2555/1550 2558/2557/1550 +f 2405/2424/1551 2556/2555/1551 2408/2427/1551 +f 2405/2424/1552 2554/2553/1552 2556/2555/1552 +f 2405/2424/1553 2553/2552/1553 2554/2553/1553 +f 2552/2551/3202 2553/2552/3202 2405/2424/3202 +f 2394/2419/1555 2542/2541/1555 2544/2543/1555 +f 2390/2417/3203 2542/2541/3203 2394/2419/3203 +f 2390/2417/1557 2541/2540/1557 2542/2541/1557 +f 2540/2539/2412 2541/2540/2412 2390/2417/2412 +f 2383/2410/3204 2534/2533/3204 2536/2535/3204 +f 2380/2407/1560 2534/2533/1560 2383/2410/1560 +f 2380/2407/1561 2532/2531/1561 2534/2533/1561 +f 2380/2407/3205 2531/2530/3205 2532/2531/3205 +f 2530/2529/1563 2531/2530/1563 2380/2407/1563 +f 2369/2401/1564 2520/2519/1564 2522/2521/1564 +f 2365/2399/1565 2520/2519/1565 2369/2401/1565 +f 2365/2399/3206 2519/2518/3206 2520/2519/3206 +f 2518/2517/3207 2519/2518/3207 2365/2399/3207 +f 2358/2391/3208 2512/2511/3208 2514/2513/3208 +f 2355/2389/3209 2512/2511/3209 2358/2391/3209 +f 2355/2389/3210 2510/2509/3210 2512/2511/3210 +f 2355/2389/1571 2509/2508/1571 2510/2509/1571 +f 2508/2507/1572 2509/2508/1572 2355/2389/1572 +f 2500/2499/1573 2344/2383/1573 2498/2497/1573 +f 2498/2497/1574 2344/2383/1574 2340/2380/1574 +f 2498/2497/1575 2340/2380/1575 2496/2495/1575 +f 2496/2495/1577 2340/2380/1577 2495/2494/1577 +f 2685/2688/3211 2620/2619/3211 2684/2682/3211 +f 2683/2680/3212 2620/2619/3212 2685/2688/3212 +f 2619/2618/3213 2671/2668/3213 2617/2613/3213 +f 2495/2494/1580 2336/2377/1580 2493/2492/1580 +f 2680/2678/3214 2620/2619/3214 2683/2680/3214 +f 2619/2618/3215 2621/2621/3215 2671/2668/3215 +f 2621/2621/3216 2666/2665/3216 2671/2668/3216 +f 2493/2492/1582 2336/2377/1582 2492/2491/1582 +f 2623/2622/3217 2666/2665/3217 2621/2621/3217 +f 2665/2664/3218 2683/2680/3218 2685/2688/3218 +f 2623/2622/3219 2663/2662/3219 2666/2665/3219 +f 2624/2623/3220 2663/2662/3220 2623/2622/3220 +f 2665/2664/3221 2685/2688/3221 2670/2666/3221 +f 2681/2679/3222 2683/2680/3222 2665/2664/3222 +f 2675/2673/3223 2669/2667/3223 2674/2672/3223 +f 2490/2488/1590 2330/2371/1590 2488/2489/1590 +f 2661/2660/3224 2681/2679/3224 2665/2664/3224 +f 2627/2626/3225 2663/2662/3225 2624/2623/3225 +f 2670/2666/3226 2685/2688/3226 2689/2687/3226 +f 2661/2660/3227 2674/2672/3227 2681/2679/3227 +f 2488/2489/3228 2330/2371/3228 2487/2486/3228 +f 2627/2626/3229 2655/2654/3229 2663/2662/3229 +f 2487/2486/1596 2330/2371/1596 2486/2485/1596 +f 2670/2666/3230 2689/2687/3230 2673/2671/3230 +f 2673/2671/3231 2689/2687/3231 2690/2689/3231 +f 2656/2655/3232 2674/2672/3232 2661/2660/3232 +f 2668/2670/3233 2664/2663/3233 2669/2667/3233 +f 2656/2655/3234 2675/2673/3234 2674/2672/3234 +f 2629/2627/3235 2630/2630/3235 2627/2626/3235 +f 2630/2630/3236 2655/2654/3236 2627/2626/3236 +f 2667/2690/3237 2664/2663/3237 2668/2670/3237 +f 2673/2671/3238 2690/2689/3238 2676/2674/3238 +f 2672/2669/3239 2675/2673/3239 2656/2655/3239 +f 2667/2690/3240 2657/2657/3240 2664/2663/3240 +f 2676/2674/3241 2690/2689/3241 2691/2691/3241 +f 2688/2686/3242 2691/2691/3242 2690/2689/3242 +f 2630/2630/3243 2651/2649/3243 2655/2654/3243 +f 2686/2684/3244 2691/2691/3244 2688/2686/3244 +f 2653/2651/3245 2672/2669/3245 2656/2655/3245 +f 2660/2659/3246 2657/2657/3246 2667/2690/3246 +f 2631/2629/3247 2651/2649/3247 2630/2630/3247 +f 2677/2675/1615 2312/2353/1615 2311/2352/1615 +f 2676/2674/3248 2691/2691/3248 2679/2677/3248 +f 2691/2691/1617 2686/2684/1617 2692/2692/1617 +f 2633/2632/3249 2651/2649/3249 2631/2629/3249 +f 2686/2684/1619 2480/2480/1619 2682/2681/1619 +f 2653/2651/3250 2668/2670/3250 2672/2669/3250 +f 2677/2675/1620 2678/2676/1620 2312/2353/1620 +f 2679/2677/3251 2678/2676/3251 2616/2614/3251 +f 2692/2692/1622 2686/2684/1622 2682/2681/1622 +f 2650/2647/3252 2668/2670/3252 2653/2651/3252 +f 2692/2692/3253 2679/2677/3253 2691/2691/3253 +f 2481/2479/1626 2322/2364/1626 2480/2480/1626 +f 2633/2632/3254 2648/2646/3254 2651/2649/3254 +f 2480/2480/1627 2322/2364/1627 2479/2481/1627 +f 2662/2661/3255 2658/2656/3255 2660/2659/3255 +f 2312/2353/1628 2678/2676/1628 2313/2356/1628 +f 2650/2647/3256 2667/2690/3256 2668/2670/3256 +f 2679/2677/1631 2313/2356/1631 2678/2676/1631 +f 2682/2681/3257 2693/2693/3257 2692/2692/3257 +f 2647/2645/3258 2667/2690/3258 2650/2647/3258 +f 2635/2634/3259 2648/2646/3259 2633/2632/3259 +f 2693/2693/1634 2313/2356/1634 2679/2677/1634 +f 2693/2693/1635 2679/2677/1635 2692/2692/1635 +f 2694/2694/1636 2693/2693/1636 2682/2681/1636 +f 2476/2475/1637 2682/2681/1637 2479/2481/1637 +f 2635/2634/3260 2645/2642/3260 2648/2646/3260 +f 2476/2475/1640 2694/2694/1640 2682/2681/1640 +f 2647/2645/3261 2660/2659/3261 2667/2690/3261 +f 2479/2481/3262 2316/2358/3262 2476/2475/3262 +f 2314/2357/1643 2695/2695/1643 2315/2355/1643 +f 2694/2694/1644 2696/2696/1644 2693/2693/1644 +f 2646/2644/3263 2660/2659/3263 2647/2645/3263 +f 2315/2355/3264 2695/2695/3264 2471/2472/3264 +f 2696/2696/1646 2313/2356/1646 2693/2693/1646 +f 2696/2696/1648 2314/2357/1648 2313/2356/1648 +f 2697/2697/3265 2696/2696/3265 2694/2694/3265 +f 2476/2475/1650 2316/2358/1650 2477/2476/1650 +f 2636/2635/3266 2645/2642/3266 2635/2634/3266 +f 2476/2475/3267 2697/2697/3267 2694/2694/3267 +f 2646/2644/3268 2662/2661/3268 2660/2659/3268 +f 2698/2698/1652 2317/2359/1652 2319/2362/1652 +f 2317/2359/3269 2641/2640/3269 2640/2639/3269 +f 2478/2477/3270 2697/2697/3270 2476/2475/3270 +f 2317/2359/1656 2640/2639/1656 2318/2360/1656 +f 2698/2698/1657 2319/2362/1657 2471/2472/1657 +f 2698/2698/3271 2641/2640/3271 2317/2359/3271 +f 2695/2695/1660 2314/2357/1660 2699/2699/1660 +f 2318/2360/3272 2640/2639/3272 2649/2648/3272 +f 2636/2635/3273 2644/2643/3273 2645/2642/3273 +f 2637/2636/3274 2644/2643/3274 2636/2635/3274 +f 2696/2696/1663 2699/2699/1663 2314/2357/1663 +f 2700/2700/1664 2697/2697/1664 2478/2477/1664 +f 2659/2658/3275 2662/2661/3275 2646/2644/3275 +f 2700/2700/3276 2699/2699/3276 2696/2696/3276 +f 2700/2700/1666 2696/2696/1666 2697/2697/1666 +f 2643/2641/3277 2659/2658/3277 2646/2644/3277 +f 2477/2476/1667 2318/2360/1667 2701/2701/1667 +f 2471/2472/3278 2642/2702/3278 2698/2698/3278 +f 2698/2698/3279 2642/2702/3279 2641/2640/3279 +f 2695/2695/1670 2699/2699/1670 2471/2472/1670 +f 2477/2476/3280 2701/2701/3280 2478/2477/3280 +f 2639/2638/3281 2644/2643/3281 2637/2636/3281 +f 2478/2477/1674 2701/2701/1674 2700/2700/1674 +f 2471/2472/3282 2699/2699/3282 2642/2702/3282 +f 2649/2648/3283 2701/2701/3283 2318/2360/3283 +f 2642/2702/3284 2699/2699/3284 2704/2703/3284 +f 2702/2704/3285 2699/2699/3285 2700/2700/3285 +f 2643/2641/3286 2654/2653/3286 2659/2658/3286 +f 2639/2638/3287 2704/2703/3287 2644/2643/3287 +f 2702/2704/2504 2704/2703/2504 2699/2699/2504 +f 2701/2701/1684 2702/2704/1684 2700/2700/1684 +f 2649/2648/3288 2703/2652/3288 2701/2701/3288 +f 2643/2641/3289 2644/2643/3289 2704/2703/3289 +f 2703/2652/1688 2702/2704/1688 2701/2701/1688 +f 2641/2640/3290 2642/2702/3290 2639/2638/3290 +f 2643/2641/3291 2704/2703/3291 2705/2705/3291 +f 2705/2705/3292 2654/2653/3292 2643/2641/3292 +f 2642/2702/3293 2704/2703/3293 2639/2638/3293 +f 2705/2705/3294 2703/2652/3294 2654/2653/3294 +f 2705/2705/3295 2704/2703/3295 2702/2704/3295 +f 2703/2652/3296 2705/2705/3296 2702/2704/3296 +f 3066/2706/220 2707/2707/220 2706/2708/220 +f 2708/2709/2656 2707/2707/2656 3066/2706/2656 +f 2708/2709/2657 2709/2710/2657 2707/2707/2657 +f 2710/2711/223 2709/2710/223 2708/2709/223 +f 2712/2712/224 2711/2713/224 2710/2711/224 +f 2712/2712/225 2713/2714/225 2711/2713/225 +f 3074/2715/1697 2714/2716/1697 2713/2714/1697 +f 3074/2715/1698 2715/2717/1698 2714/2716/1698 +f 2716/2718/3297 2715/2717/3297 3074/2715/3297 +f 2716/2718/229 2717/2719/229 2715/2717/229 +f 3079/2720/230 2717/2719/230 2716/2718/230 +f 3079/2720/1701 2718/2721/1701 2717/2719/1701 +f 3081/2722/3298 2718/2721/3298 3079/2720/3298 +f 3082/2723/3299 2718/2721/3299 3081/2722/3299 +f 3082/2723/3300 2719/2724/3300 2718/2721/3300 +f 3084/2725/1703 2719/2724/1703 3082/2723/1703 +f 3084/2725/1704 2720/2726/1704 2719/2724/1704 +f 3086/2727/2661 2720/2726/2661 3084/2725/2661 +f 3086/2727/3301 2721/2728/3301 2720/2726/3301 +f 3089/2729/3302 2721/2728/3302 3086/2727/3302 +f 3089/2729/3303 2722/2730/3303 2721/2728/3303 +f 2723/2731/2663 2722/2730/2663 3089/2729/2663 +f 2724/2732/3304 2725/2733/3304 2723/2731/3304 +f 2726/2734/3305 2725/2733/3305 2724/2732/3305 +f 2728/2735/246 2727/2736/246 2726/2734/246 +f 2728/2735/247 2729/2737/247 2727/2736/247 +f 3100/2738/1710 2730/2739/1710 2729/2737/1710 +f 2730/2739/249 3100/2738/249 2731/2740/249 +f 2731/2740/3306 3100/2738/3306 2732/2741/3306 +f 2731/2740/1712 2732/2741/1712 3104/2742/1712 +f 2731/2740/1713 3104/2742/1713 2733/2743/1713 +f 2733/2743/253 3104/2742/253 3106/2744/253 +f 2733/2743/254 3106/2744/254 2734/2745/254 +f 2734/2745/2667 3106/2744/2667 3108/2746/2667 +f 2734/2745/1714 3108/2746/1714 2735/2747/1714 +f 2735/2747/257 3108/2746/257 3110/2748/257 +f 2735/2747/258 3110/2748/258 2736/2749/258 +f 2736/2749/2669 3110/2748/2669 3111/2750/2669 +f 2736/2749/3307 3111/2750/3307 2737/2751/3307 +f 2737/2751/2670 3111/2750/2670 2738/2752/2670 +f 2737/2751/2671 2738/2752/2671 2739/2753/2671 +f 2739/2753/1717 2738/2752/1717 2740/2754/1717 +f 2740/2754/264 2741/2755/264 2742/2756/264 +f 2742/2756/1719 2741/2755/1719 2743/2757/1719 +f 2744/2758/1720 2743/2757/1720 2745/2759/1720 +f 2744/2758/1721 2745/2759/1721 2746/2760/1721 +f 2747/2761/1722 2746/2760/1722 3125/2762/1722 +f 2747/2761/269 3125/2762/269 2748/2763/269 +f 2748/2763/270 3125/2762/270 3127/2764/270 +f 2748/2763/3308 3127/2764/3308 3129/2765/3308 +f 2748/2763/1723 3129/2765/1723 2749/2766/1723 +f 2749/2766/273 3129/2765/273 3131/2767/273 +f 2749/2766/2675 3131/2767/2675 2750/2768/2675 +f 2750/2768/275 3131/2767/275 3133/2769/275 +f 2750/2768/276 3133/2769/276 2751/2770/276 +f 2751/2770/3309 3133/2769/3309 3135/2771/3309 +f 2751/2770/278 3135/2771/278 2752/2772/278 +f 2752/2772/279 3135/2771/279 3136/2773/279 +f 2752/2772/2678 3136/2773/2678 2753/2774/2678 +f 2753/2774/281 3136/2773/281 2754/2775/281 +f 2753/2774/1728 2754/2775/1728 2755/2776/1728 +f 2755/2776/283 2754/2775/283 2756/2777/283 +f 2756/2777/284 2757/2778/284 2758/2779/284 +f 2758/2779/1730 2757/2778/1730 2759/2780/1730 +f 2760/2781/1731 2759/2780/1731 3147/2782/1731 +f 2760/2781/1732 3147/2782/1732 2761/2783/1732 +f 2761/2783/2680 3147/2782/2680 2762/2784/2680 +f 2761/2783/289 2762/2784/289 2763/2785/289 +f 2763/2785/1735 2762/2784/1735 3151/2786/1735 +f 2763/2785/291 3151/2786/291 2764/2787/291 +f 2764/2787/292 3151/2786/292 3153/2788/292 +f 2764/2787/1736 3153/2788/1736 3155/2789/1736 +f 2764/2787/294 3155/2789/294 2765/2790/294 +f 2765/2790/2682 3155/2789/2682 3157/2791/2682 +f 2765/2790/2683 3157/2791/2683 2766/2792/2683 +f 2766/2792/297 3157/2791/297 3159/2793/297 +f 2766/2792/3310 3159/2793/3310 2767/2794/3310 +f 2767/2794/299 3159/2793/299 3161/2795/299 +f 2767/2794/1738 3161/2795/1738 2768/2796/1738 +f 2768/2796/1739 3161/2795/1739 3162/2797/1739 +f 2768/2796/1740 3162/2797/1740 2769/2798/1740 +f 2769/2798/1741 3162/2797/1741 2770/2799/1741 +f 2769/2798/304 2770/2799/304 2771/2800/304 +f 2771/2800/305 2770/2799/305 2772/2801/305 +f 2772/2801/306 2773/2802/306 2774/2803/306 +f 2774/2803/3311 2773/2802/3311 2775/2804/3311 +f 2776/2805/3312 2775/2804/3312 3173/2806/3312 +f 2776/2805/309 3173/2806/309 2777/2807/309 +f 2777/2807/310 3173/2806/310 2778/2808/310 +f 2777/2807/1746 2778/2808/1746 2779/2809/1746 +f 2779/2809/312 2778/2808/312 3177/2810/312 +f 2779/2809/313 3177/2810/313 2780/2811/313 +f 2780/2811/2687 3177/2810/2687 3179/2812/2687 +f 2780/2811/2688 3179/2812/2688 3181/2813/2688 +f 2780/2811/3313 3181/2813/3313 2781/2814/3313 +f 2781/2814/3314 3181/2813/3314 3183/2815/3314 +f 2781/2814/2691 3183/2815/2691 2782/2816/2691 +f 2782/2816/3315 3183/2815/3315 3185/2817/3315 +f 2782/2816/1750 3185/2817/1750 2783/2818/1750 +f 2783/2818/321 3185/2817/321 3187/2819/321 +f 2783/2818/3316 3187/2819/3316 2784/2820/3316 +f 2784/2820/323 3187/2819/323 3188/2821/323 +f 2784/2820/324 3188/2821/324 2785/2822/324 +f 2785/2822/1755 3188/2821/1755 2786/2823/1755 +f 2785/2822/3317 2786/2823/3317 2787/2824/3317 +f 2787/2824/3318 2786/2823/3318 2788/2825/3318 +f 2788/2825/2694 2789/2826/2694 2790/2827/2694 +f 2790/2827/3319 2789/2826/3319 2791/2828/3319 +f 2792/2829/330 2791/2828/330 3199/2830/330 +f 2792/2829/331 3199/2830/331 2793/2831/331 +f 2793/2831/332 3199/2830/332 2794/2832/332 +f 2793/2831/1759 2794/2832/1759 2795/2833/1759 +f 2795/2833/3320 2794/2832/3320 3202/2834/3320 +f 2795/2833/335 3202/2834/335 2797/2835/335 +f 2797/2835/336 3202/2834/336 2796/2836/336 +f 2797/2835/337 2796/2836/337 2798/2837/337 +f 2797/2835/338 2798/2837/338 2799/2838/338 +f 2799/2838/339 2798/2837/339 2800/2839/339 +f 2799/2838/3321 2800/2839/3321 2801/2840/3321 +f 2801/2840/3322 2800/2839/3322 2802/2841/3322 +f 2801/2840/342 2802/2841/342 2803/2842/342 +f 2803/2842/1762 2802/2841/1762 2804/2843/1762 +f 2812/2844/3323 2805/2845/3323 2813/2846/3323 +f 2814/2847/3324 2815/2848/3324 2816/2849/3324 +f 2819/2850/345 2814/2847/345 2817/2851/345 +f 2810/2852/3325 2809/2853/3325 2806/2854/3325 +f 2813/2846/3326 2809/2853/3326 2812/2844/3326 +f 2810/2852/2699 2818/2855/2699 2809/2853/2699 +f 2812/2844/3327 2809/2853/3327 2818/2855/3327 +f 2812/2844/3328 2811/2856/3328 2805/2845/3328 +f 2808/2857/350 2819/2850/350 2817/2851/350 +f 2896/2858/3329 2820/2859/3329 2810/2852/3329 +f 2821/2860/3330 2811/2856/3330 2822/2861/3330 +f 2823/2862/3331 2814/2847/3331 2819/2850/3331 +f 2807/2863/3332 2819/2850/3332 2808/2857/3332 +f 2820/2859/2705 2818/2855/2705 2810/2852/2705 +f 2812/2844/3333 2822/2861/3333 2811/2856/3333 +f 2824/2864/3334 2818/2855/3334 2820/2859/3334 +f 2824/2864/1772 2823/2862/1772 2819/2850/1772 +f 2807/2863/360 2824/2864/360 2819/2850/360 +f 2812/2844/3327 2818/2855/3327 2824/2864/3327 +f 2822/2861/3335 2824/2864/3335 2807/2863/3335 +f 2812/2844/3336 2824/2864/3336 2822/2861/3336 +f 2824/2864/363 2820/2859/363 2823/2862/363 +f 2820/2859/1776 2826/2865/1776 2823/2862/1776 +f 2922/2866/2709 2791/2828/2709 2792/2829/2709 +f 2790/2827/2710 2791/2828/2710 2922/2866/2710 +f 2827/2867/1779 2788/2825/1779 2790/2827/1779 +f 2827/2867/3337 2787/2824/3337 2788/2825/3337 +f 2944/2868/1781 2775/2804/1781 2776/2805/1781 +f 2774/2803/1782 2775/2804/1782 2944/2868/1782 +f 2828/2869/1783 2772/2801/1783 2774/2803/1783 +f 2828/2869/372 2771/2800/372 2772/2801/372 +f 2967/2870/373 2759/2780/373 2760/2781/373 +f 2758/2779/3338 2759/2780/3338 2967/2870/3338 +f 2829/2871/3339 2756/2777/3339 2758/2779/3339 +f 2829/2871/376 2755/2776/376 2756/2777/376 +f 2710/2711/377 2830/2872/377 2709/2710/377 +f 2711/2713/2711 2830/2872/2711 2710/2711/2711 +f 2713/2714/379 2990/2873/379 2711/2713/379 +f 2714/2716/1786 2990/2873/1786 2713/2714/1786 +f 2831/2874/1787 2746/2760/1787 2747/2761/1787 +f 2744/2758/1788 2746/2760/1788 2831/2874/1788 +f 2832/2875/3340 2743/2757/3340 2744/2758/3340 +f 2742/2756/1790 2743/2757/1790 2832/2875/1790 +f 2833/2876/385 2740/2754/385 2742/2756/385 +f 2833/2876/386 2739/2753/386 2740/2754/386 +f 2723/2731/3341 2834/2877/3341 2722/2730/3341 +f 2725/2733/2715 2834/2877/2715 2723/2731/2715 +f 2726/2734/3342 2835/2878/3342 2725/2733/3342 +f 2727/2736/3343 2835/2878/3343 2726/2734/3343 +f 2729/2737/1792 3038/2879/1792 2727/2736/1792 +f 2730/2739/1793 3038/2879/1793 2729/2737/1793 +f 2836/2880/3344 2837/2881/3344 2838/2882/3344 +f 2837/2881/3345 2839/2883/3345 2838/2882/3345 +f 2839/2883/3346 2840/2884/3346 2838/2882/3346 +f 2836/2880/3347 2838/2882/3347 2842/2885/3347 +f 2841/2886/3348 2843/2887/3348 2844/2888/3348 +f 2838/2882/3349 2840/2884/3349 2842/2885/3349 +f 2841/2886/3350 2840/2884/3350 2839/2883/3350 +f 2846/2889/3351 2840/2884/3351 2841/2886/3351 +f 2841/2886/3352 2839/2883/3352 2848/2890/3352 +f 2841/2886/3353 2844/2888/3353 2846/2889/3353 +f 2848/2890/3354 2843/2887/3354 2841/2886/3354 +f 2847/2891/3355 2839/2883/3355 2837/2881/3355 +f 2846/2889/3356 2844/2888/3356 2850/2892/3356 +f 2836/2880/3357 2842/2885/3357 2851/2893/3357 +f 2842/2885/3358 2840/2884/3358 2852/2894/3358 +f 2848/2890/3359 2849/2895/3359 2843/2887/3359 +f 2845/2896/3360 2853/2897/3360 2837/2881/3360 +f 2842/2885/3361 2852/2894/3361 2851/2893/3361 +f 2846/2889/3362 2852/2894/3362 2840/2884/3362 +f 2853/2897/3363 2847/2891/3363 2837/2881/3363 +f 2848/2890/3364 2839/2883/3364 2847/2891/3364 +f 2854/2898/3365 2853/2897/3365 2845/2896/3365 +f 2851/2893/3366 2852/2894/3366 2856/2899/3366 +f 2848/2890/3367 2855/2900/3367 2849/2895/3367 +f 2853/2897/3368 2858/2901/3368 2847/2891/3368 +f 2851/2893/3369 2856/2899/3369 3325/2902/3369 +f 2852/2894/3370 2857/2903/3370 2856/2899/3370 +f 2846/2889/3371 2857/2903/3371 2852/2894/3371 +f 2848/2890/3372 2847/2891/3372 2858/2901/3372 +f 2846/2889/3373 2850/2892/3373 2860/2904/3373 +f 2860/2904/3374 2857/2903/3374 2846/2889/3374 +f 2854/2898/3375 2861/2905/3375 2853/2897/3375 +f 2848/2890/405 2858/2901/405 2862/2906/405 +f 2817/2851/2748 2814/2847/2748 2863/2907/2748 +f 2850/2892/3376 2859/2908/3376 2860/2904/3376 +f 2862/2906/3377 2855/2900/3377 2848/2890/3377 +f 2856/2899/3378 2857/2903/3378 2863/2907/3378 +f 2862/2906/3379 2864/2909/3379 2855/2900/3379 +f 2853/2897/3380 2865/2910/3380 2858/2901/3380 +f 2860/2904/3381 2863/2907/3381 2857/2903/3381 +f 2861/2905/3382 2865/2910/3382 2853/2897/3382 +f 2862/2906/3383 2858/2901/3383 2865/2910/3383 +f 2860/2904/3384 2859/2908/3384 2866/2911/3384 +f 2808/2857/3385 2863/2907/3385 2860/2904/3385 +f 2860/2904/3386 2866/2911/3386 2808/2857/3386 +f 2807/2863/3387 2825/2912/3387 2822/2861/3387 +f 2808/2857/3388 2817/2851/3388 2863/2907/3388 +f 2854/2898/3389 2868/2913/3389 2861/2905/3389 +f 2869/2914/3390 2868/2913/3390 2854/2898/3390 +f 2862/2906/3391 2870/2915/3391 2864/2909/3391 +f 2821/2860/3392 2822/2861/3392 2825/2912/3392 +f 2862/2906/3383 2865/2910/3383 2871/2916/3383 +f 2871/2916/3393 2870/2915/3393 2862/2906/3393 +f 2868/2913/3394 2865/2910/3394 2861/2905/3394 +f 2872/2917/3395 2866/2911/3395 2867/2918/3395 +f 2868/2913/3396 2873/2919/3396 2865/2910/3396 +f 2872/2917/3397 2808/2857/3397 2866/2911/3397 +f 2815/2848/2773 2872/2917/2773 2867/2918/2773 +f 2872/2917/3398 2807/2863/3398 2808/2857/3398 +f 2871/2916/3399 2865/2910/3399 2873/2919/3399 +f 2871/2916/3400 2875/2920/3400 2870/2915/3400 +f 2825/2912/452 2807/2863/452 2872/2917/452 +f 2874/2921/3401 2876/2922/3401 2869/2914/3401 +f 2878/2923/454 2825/2912/454 2872/2917/454 +f 2878/2923/1859 2821/2860/1859 2825/2912/1859 +f 2876/2922/3402 2868/2913/3402 2869/2914/3402 +f 2879/2924/457 2821/2860/457 2878/2923/457 +f 2871/2916/1861 2873/2919/1861 2880/2925/1861 +f 2815/2848/2782 2878/2923/2782 2872/2917/2782 +f 2880/2925/3403 2875/2920/3403 2871/2916/3403 +f 2881/2926/462 2879/2924/462 2878/2923/462 +f 2876/2922/3404 2873/2919/3404 2868/2913/3404 +f 2880/2925/3405 2882/2927/3405 2875/2920/3405 +f 2876/2922/3406 2883/2928/3406 2873/2919/3406 +f 2877/2929/2785 2878/2923/2785 2815/2848/2785 +f 2884/2930/3407 2876/2922/3407 2874/2921/3407 +f 2880/2925/1876 2873/2919/1876 2883/2928/1876 +f 2881/2926/2788 2878/2923/2788 2877/2929/2788 +f 2884/2930/3408 2885/2931/3408 2876/2922/3408 +f 2886/2932/2790 2881/2926/2790 2877/2929/2790 +f 2890/2933/3409 3201/2934/3409 2888/2935/3409 +f 2887/2936/1873 2881/2926/1873 2886/2932/1873 +f 2889/2937/1874 2881/2926/1874 2887/2936/1874 +f 2880/2925/1876 2883/2928/1876 2891/2938/1876 +f 2891/2938/3410 2882/2927/3410 2880/2925/3410 +f 2892/2939/2794 2889/2937/2794 2887/2936/2794 +f 2890/2933/3411 2885/2931/3411 2884/2930/3411 +f 2885/2931/3412 2883/2928/3412 2876/2922/3412 +f 2891/2938/3413 2893/2940/3413 2882/2927/3413 +f 2890/2933/3414 2894/2941/3414 2885/2931/3414 +f 2896/2858/2799 2887/2936/2799 2886/2932/2799 +f 2897/2942/481 2889/2937/481 2892/2939/481 +f 2894/2941/3415 2895/2943/3415 2885/2931/3415 +f 2895/2943/3416 2883/2928/3416 2885/2931/3416 +f 2896/2858/483 2886/2932/483 2826/2865/483 +f 2892/2939/1878 2887/2936/1878 2896/2858/1878 +f 2891/2938/3417 2883/2928/3417 2895/2943/3417 +f 2891/2938/3418 2898/2944/3418 2893/2940/3418 +f 2900/2945/3419 2890/2933/3419 2901/2946/3419 +f 2891/2938/3420 2895/2943/3420 2902/2947/3420 +f 2902/2947/3421 2898/2944/3421 2891/2938/3421 +f 2806/2854/1882 2897/2942/1882 2892/2939/1882 +f 2896/2858/1884 2810/2852/1884 2806/2854/1884 +f 2899/2948/1886 2897/2942/1886 2806/2854/1886 +f 2900/2945/1887 2901/2946/1887 2899/2948/1887 +f 2890/2933/3422 2900/2945/3422 2894/2941/3422 +f 2894/2941/3423 2903/2949/3423 2895/2943/3423 +f 2806/2854/497 2892/2939/497 2896/2858/497 +f 2902/2947/3424 2895/2943/3424 2903/2949/3424 +f 2899/2948/500 2904/2950/500 2900/2945/500 +f 2900/2945/3425 2905/2951/3425 2894/2941/3425 +f 2905/2951/3426 2903/2949/3426 2894/2941/3426 +f 2902/2947/3427 2906/2952/3427 2898/2944/3427 +f 2904/2950/3428 2899/2948/3428 2806/2854/3428 +f 2904/2950/3429 2905/2951/3429 2900/2945/3429 +f 2902/2947/3430 2903/2949/3430 2905/2951/3430 +f 2802/2841/3431 2805/2845/3431 2804/2843/3431 +f 2908/2953/3432 2906/2952/3432 2907/2954/3432 +f 2907/2954/3433 2800/2839/3433 2798/2837/3433 +f 2806/2854/2819 2809/2853/2819 2904/2950/2819 +f 2909/2955/3434 2800/2839/3434 2907/2954/3434 +f 2813/2846/3435 2805/2845/3435 2909/2955/3435 +f 2902/2947/3436 2907/2954/3436 2906/2952/3436 +f 2904/2950/3437 2809/2853/3437 2905/2951/3437 +f 2902/2947/3438 2905/2951/3438 2813/2846/3438 +f 2909/2955/515 2805/2845/515 2802/2841/515 +f 2813/2846/3439 2907/2954/3439 2902/2947/3439 +f 2813/2846/3440 2905/2951/3440 2809/2853/3440 +f 2802/2841/517 2800/2839/517 2909/2955/517 +f 2813/2846/3441 2909/2955/3441 2907/2954/3441 +f 2911/2956/521 2910/2957/521 2889/2937/521 +f 2912/2958/1910 2911/2956/1910 2889/2937/1910 +f 2913/2959/1911 2911/2956/1911 2912/2958/1911 +f 2915/2960/524 2914/2961/524 2911/2956/524 +f 2913/2959/1912 2915/2960/1912 2911/2956/1912 +f 2916/2962/526 2915/2960/526 2913/2959/526 +f 2917/2963/3442 2915/2960/3442 2916/2962/3442 +f 2919/2964/528 2914/2961/528 2915/2960/528 +f 2919/2964/529 2918/2965/529 2914/2961/529 +f 2917/2963/530 2919/2964/530 2915/2960/530 +f 2920/2966/3443 2919/2964/3443 2917/2963/3443 +f 2921/2967/532 2918/2965/532 2919/2964/532 +f 2921/2967/533 2919/2964/533 2920/2966/533 +f 2923/2968/534 2918/2965/534 2921/2967/534 +f 2923/2968/535 2922/2866/535 2918/2965/535 +f 2924/2969/536 2922/2866/536 2923/2968/536 +f 2926/2970/537 2922/2866/537 2924/2969/537 +f 2926/2970/538 2925/2971/538 2922/2866/538 +f 2927/2972/539 2925/2971/539 2926/2970/539 +f 2929/2973/1916 2925/2971/1916 2927/2972/1916 +f 2929/2973/3444 2928/2974/3444 2925/2971/3444 +f 2930/2975/542 2928/2974/542 2929/2973/542 +f 2930/2975/543 2931/2976/543 2928/2974/543 +f 2933/2977/1917 2931/2976/1917 2930/2975/1917 +f 2932/2978/545 2933/2977/545 2930/2975/545 +f 2934/2979/546 2933/2977/546 2932/2978/546 +f 2933/2977/547 2935/2980/547 2931/2976/547 +f 2936/2981/548 2933/2977/548 2934/2979/548 +f 2937/2982/549 2935/2980/549 2933/2977/549 +f 2936/2981/550 2937/2982/550 2933/2977/550 +f 2938/2983/551 2937/2982/551 2936/2981/551 +f 2939/2984/3445 2937/2982/3445 2938/2983/3445 +f 2941/2985/2833 2935/2980/2833 2937/2982/2833 +f 2941/2985/554 2940/2986/554 2935/2980/554 +f 2939/2984/555 2941/2985/555 2937/2982/555 +f 2942/2987/556 2941/2985/556 2939/2984/556 +f 2943/2988/557 2940/2986/557 2941/2985/557 +f 2943/2988/1918 2941/2985/1918 2942/2987/1918 +f 2945/2989/559 2940/2986/559 2943/2988/559 +f 2945/2989/560 2944/2868/560 2940/2986/560 +f 2946/2990/561 2944/2868/561 2945/2989/561 +f 2948/2991/562 2944/2868/562 2946/2990/562 +f 2948/2991/563 2947/2992/563 2944/2868/563 +f 2949/2993/564 2947/2992/564 2948/2991/564 +f 2951/2994/565 2947/2992/565 2949/2993/565 +f 2951/2994/566 2950/2995/566 2947/2992/566 +f 2952/2996/567 2950/2995/567 2951/2994/567 +f 2952/2996/568 2953/2997/568 2950/2995/568 +f 2955/2998/569 2953/2997/569 2952/2996/569 +f 2954/2999/570 2955/2998/570 2952/2996/570 +f 2956/3000/3446 2955/2998/3446 2954/2999/3446 +f 2955/2998/572 2957/3001/572 2953/2997/572 +f 2958/3002/573 2955/2998/573 2956/3000/573 +f 2959/3003/574 2957/3001/574 2955/2998/574 +f 2958/3002/575 2959/3003/575 2955/2998/575 +f 2960/3004/2834 2959/3003/2834 2958/3002/2834 +f 2959/3003/3447 2961/3005/3447 2957/3001/3447 +f 2962/3006/578 2959/3003/578 2960/3004/578 +f 2963/3007/579 2961/3005/579 2959/3003/579 +f 2962/3006/580 2963/3007/580 2959/3003/580 +f 2965/3008/581 2963/3007/581 2962/3006/581 +f 2963/3007/582 2964/3009/582 2961/3005/582 +f 2966/3010/583 2964/3009/583 2963/3007/583 +f 2966/3010/1922 2963/3007/1922 2965/3008/1922 +f 2968/3011/585 2964/3009/585 2966/3010/585 +f 2968/3011/586 2967/2870/586 2964/3009/586 +f 2969/3012/587 2967/2870/587 2968/3011/587 +f 2971/3013/588 2967/2870/588 2969/3012/588 +f 2971/3013/589 2970/3014/589 2967/2870/589 +f 2972/3015/590 2970/3014/590 2971/3013/590 +f 2974/3016/591 2970/3014/591 2972/3015/591 +f 2974/3016/3448 2973/3017/3448 2970/3014/3448 +f 2975/3018/593 2973/3017/593 2974/3016/593 +f 2830/2872/594 2976/3019/594 3208/3020/594 +f 2975/3018/595 2978/3021/595 2973/3017/595 +f 2981/3022/3449 2978/3021/3449 2975/3018/3449 +f 2976/3019/597 2982/3023/597 2977/3024/597 +f 2830/2872/2837 2983/3025/2837 2976/3019/2837 +f 2980/3026/3450 2981/3022/3450 2975/3018/3450 +f 2984/3027/1925 2981/3022/1925 2980/3026/1925 +f 2983/3025/601 2985/3028/601 2976/3019/601 +f 2985/3028/602 2982/3023/602 2976/3019/602 +f 2981/3022/2839 2986/3029/2839 2978/3021/2839 +f 2987/3030/2840 2981/3022/2840 2984/3027/2840 +f 2983/3025/605 2988/3031/605 2985/3028/605 +f 2989/3032/606 2986/3029/606 2981/3022/606 +f 2987/3030/607 2989/3032/607 2981/3022/607 +f 2990/2873/608 2988/3031/608 2983/3025/608 +f 2991/3033/609 2989/3032/609 2987/3030/609 +f 2990/2873/610 2992/3034/610 2988/3031/610 +f 2989/3032/611 2993/3035/611 2986/3029/611 +f 2995/3036/612 2989/3032/612 2991/3033/612 +f 2990/2873/613 2996/3037/613 2992/3034/613 +f 2997/3038/614 2993/3035/614 2989/3032/614 +f 2995/3036/1928 2997/3038/1928 2989/3032/1928 +f 2994/3039/616 2996/3037/616 2990/2873/616 +f 2998/3040/3451 2997/3038/3451 2995/3036/3451 +f 2994/3039/3452 2999/3041/3452 2996/3037/3452 +f 2997/3038/619 2831/2874/619 2993/3035/619 +f 3001/3042/620 2997/3038/620 2998/3040/620 +f 2994/3039/621 3002/3043/621 2999/3041/621 +f 3000/3044/622 3002/3043/622 2994/3039/622 +f 3002/3043/623 3003/3045/623 2999/3041/623 +f 2997/3038/624 3004/3046/624 2831/2874/624 +f 3005/3047/625 2997/3038/625 3001/3042/625 +f 3005/3047/626 3004/3046/626 2997/3038/626 +f 3002/3043/627 3006/3048/627 3003/3045/627 +f 3000/3044/628 3007/3049/628 3002/3043/628 +f 3007/3049/1931 3006/3048/1931 3002/3043/1931 +f 3009/3050/1932 3004/3046/1932 3005/3047/1932 +f 3008/3051/631 3007/3049/631 3000/3044/631 +f 3007/3049/3453 3010/3052/3453 3006/3048/3453 +f 3011/3053/2843 2832/2875/2843 3004/3046/2843 +f 3012/3054/634 3004/3046/634 3009/3050/634 +f 3012/3054/635 3011/3053/635 3004/3046/635 +f 3007/3049/1934 3013/3055/1934 3010/3052/1934 +f 3008/3051/3454 3014/3056/3454 3007/3049/3454 +f 3014/3056/1935 3013/3055/1935 3007/3049/1935 +f 3016/3057/2844 3011/3053/2844 3012/3054/2844 +f 3015/3058/640 3014/3056/640 3008/3051/640 +f 3014/3056/1936 3017/3059/1936 3013/3055/1936 +f 3019/3060/3455 3011/3053/3455 3016/3057/3455 +f 3019/3060/643 3018/3061/643 3011/3053/643 +f 3014/3056/644 3021/3062/644 3017/3059/644 +f 3015/3058/2845 3022/3063/2845 3014/3056/2845 +f 3022/3063/646 3021/3062/646 3014/3056/646 +f 3024/3064/1938 3018/3061/1938 3019/3060/1938 +f 3020/3065/3456 3024/3064/3456 3019/3060/3456 +f 3023/3066/3457 3022/3063/3457 3015/3058/3457 +f 3025/3067/650 3024/3064/650 3020/3065/650 +f 3023/3066/2846 3026/3068/2846 3022/3063/2846 +f 3024/3064/652 3027/3069/652 3018/3061/652 +f 3028/3070/653 3024/3064/653 3025/3067/653 +f 3023/3066/654 3029/3071/654 3026/3068/654 +f 3030/3072/1942 3027/3069/1942 3024/3064/1942 +f 2835/2878/3458 3031/3073/3458 3023/3066/3458 +f 3028/3070/656 3030/3072/656 3024/3064/656 +f 3031/3073/2848 3029/3071/2848 3023/3066/2848 +f 3032/3074/658 3030/3072/658 3028/3070/658 +f 3031/3073/2849 3033/3075/2849 3029/3071/2849 +f 3030/3072/1946 3034/3076/1946 3027/3069/1946 +f 3035/3077/1947 3030/3072/1947 3032/3074/1947 +f 3031/3073/2851 3036/3078/2851 3033/3075/2851 +f 3037/3079/3459 3034/3076/3459 3030/3072/3459 +f 3035/3077/3460 3037/3079/3460 3030/3072/3460 +f 3038/2879/3461 3036/3078/3461 3031/3073/3461 +f 3039/3080/3462 3037/3079/3462 3035/3077/3462 +f 3038/2879/1952 3040/3081/1952 3036/3078/1952 +f 3037/3079/1953 3041/3082/1953 3034/3076/1953 +f 3042/3083/1954 3041/3082/1954 3037/3079/1954 +f 3042/3083/1955 3037/3079/1955 3039/3080/1955 +f 3038/2879/1956 3043/3084/1956 3040/3081/1956 +f 3041/3082/1957 3043/3084/1957 3038/2879/1957 +f 3043/3084/1958 3041/3082/1958 3042/3083/1958 +f 3057/3085/3463 3044/3086/3463 3045/3087/3463 +f 3057/3085/3464 3045/3087/3464 3055/3088/3464 +f 3055/3088/3465 3045/3087/3465 3047/3089/3465 +f 3045/3087/3466 3046/3090/3466 3047/3089/3466 +f 3048/3091/3467 3049/3092/3467 3050/3093/3467 +f 3049/3092/682 3052/3094/682 3051/3095/682 +f 3048/3091/683 3053/3096/683 3049/3092/683 +f 3053/3096/684 3052/3094/684 3049/3092/684 +f 3054/3097/685 3053/3096/685 3048/3091/685 +f 3053/3096/686 3055/3088/686 3052/3094/686 +f 3054/3097/687 3056/3098/687 3053/3096/687 +f 3053/3096/3468 3057/3085/3468 3055/3088/3468 +f 3056/3098/3469 3057/3085/3469 3053/3096/3469 +f 3058/3099/1965 3056/3098/1965 3054/3097/1965 +f 3056/3098/3470 3059/3100/3470 3057/3085/3470 +f 3058/3099/692 3060/3101/692 3056/3098/692 +f 3060/3101/1966 3059/3100/1966 3056/3098/1966 +f 3060/3101/1967 3061/3102/1967 3059/3100/1967 +f 3062/3103/1968 3060/3101/1968 3058/3099/1968 +f 3062/3103/696 3063/3104/696 3060/3101/696 +f 3060/3101/697 3064/3105/697 3061/3102/697 +f 3063/3104/3471 3064/3105/3471 3060/3101/3471 +f 3065/3106/699 3063/3104/699 3062/3103/699 +f 3063/3104/3472 3066/2706/3472 3064/3105/3472 +f 3065/3106/701 3066/2706/701 3063/3104/701 +f 3065/3106/702 3067/3107/702 3066/2706/702 +f 3065/3106/3473 3069/3108/3473 3067/3107/3473 +f 3068/3109/704 3070/3110/704 3065/3106/704 +f 3070/3110/2866 3069/3108/2866 3065/3106/2866 +f 3070/3110/3474 3071/3111/3474 3069/3108/3474 +f 3072/3112/3475 3070/3110/3475 3068/3109/3475 +f 3070/3110/708 3073/3113/708 3071/3111/708 +f 3070/3110/3476 3074/2715/3476 3073/3113/3476 +f 3072/3112/710 3075/3114/710 3070/3110/710 +f 3075/3114/711 3074/2715/711 3070/3110/711 +f 3076/3115/712 3075/3114/712 3072/3112/712 +f 3075/3114/713 3077/3116/713 3074/2715/713 +f 3075/3114/714 3078/3117/714 3077/3116/714 +f 3076/3115/715 3078/3117/715 3075/3114/715 +f 3078/3117/1970 3079/2720/1970 3077/3116/1970 +f 3080/3118/717 3078/3117/717 3076/3115/717 +f 3078/3117/718 3081/2722/718 3079/2720/718 +f 3080/3118/1971 3081/2722/1971 3078/3117/1971 +f 3080/3118/1972 3082/2723/1972 3081/2722/1972 +f 3082/2723/721 3080/3118/721 3084/2725/721 +f 3080/3118/722 3083/3119/722 3085/3120/722 +f 3084/2725/723 3080/3118/723 3085/3120/723 +f 3085/3120/3477 3086/2727/3477 3084/2725/3477 +f 3085/3120/725 3083/3119/725 3087/3121/725 +f 3085/3120/726 3087/3121/726 3088/3122/726 +f 3085/3120/727 3089/2729/727 3086/2727/727 +f 3085/3120/728 3088/3122/728 3089/2729/728 +f 3088/3122/729 3087/3121/729 3090/3123/729 +f 3089/2729/2868 3088/3122/2868 3091/3124/2868 +f 3088/3122/731 3090/3123/731 3092/3125/731 +f 3091/3124/2869 3088/3122/2869 3092/3125/2869 +f 3091/3124/2870 3092/3125/2870 3093/3126/2870 +f 3092/3125/3478 3090/3123/3478 3094/3127/3478 +f 3093/3126/3479 3092/3125/3479 3095/3128/3479 +f 3095/3128/3480 3092/3125/3480 3094/3127/3480 +f 3095/3128/3481 3094/3127/3481 3096/3129/3481 +f 3096/3129/2872 3094/3127/2872 3098/3130/2872 +f 3094/3127/739 3097/3131/739 3099/3132/739 +f 3098/3130/3482 3094/3127/3482 3100/2738/3482 +f 3100/2738/3483 3094/3127/3483 3099/3132/3483 +f 3099/3132/742 3097/3131/742 3101/3133/742 +f 3100/2738/743 3099/3132/743 3102/3134/743 +f 3099/3132/3484 3101/3133/3484 3103/3135/3484 +f 3102/3134/745 3099/3132/745 3103/3135/745 +f 3103/3135/746 3104/2742/746 3102/3134/746 +f 3103/3135/747 3101/3133/747 3105/3136/747 +f 3103/3135/1987 3106/2744/1987 3104/2742/1987 +f 3103/3135/749 3105/3136/749 3107/3137/749 +f 3106/2744/750 3103/3135/750 3107/3137/750 +f 3107/3137/751 3108/2746/751 3106/2744/751 +f 3107/3137/752 3105/3136/752 3109/3138/752 +f 3107/3137/1988 3110/2748/1988 3108/2746/1988 +f 3107/3137/754 3109/3138/754 3110/2748/754 +f 3110/2748/2875 3109/3138/2875 3111/2750/2875 +f 3109/3138/756 3112/3139/756 3113/3140/756 +f 3111/2750/757 3109/3138/757 3113/3140/757 +f 3111/2750/3485 3113/3140/3485 3114/3141/3485 +f 3113/3140/759 3112/3139/759 3115/3142/759 +f 3114/3141/760 3113/3140/760 3116/3143/760 +f 3113/3140/761 3115/3142/761 3117/3144/761 +f 3116/3143/762 3113/3140/762 3117/3144/762 +f 3116/3143/763 3117/3144/763 3118/3145/763 +f 3117/3144/3486 3115/3142/3486 3119/3146/3486 +f 3118/3145/1991 3117/3144/1991 3120/3147/1991 +f 3120/3147/1992 3117/3144/1992 3119/3146/1992 +f 3120/3147/1993 3119/3146/1993 3121/3148/1993 +f 3121/3148/1994 3119/3146/1994 3123/3149/1994 +f 3119/3146/769 3122/3150/769 3124/3151/769 +f 3123/3149/3487 3119/3146/3487 3124/3151/3487 +f 3124/3151/1996 3125/2762/1996 3123/3149/1996 +f 3124/3151/772 3122/3150/772 3126/3152/772 +f 3124/3151/1997 3127/2764/1997 3125/2762/1997 +f 3124/3151/774 3126/3152/774 3128/3153/774 +f 3127/2764/3488 3124/3151/3488 3128/3153/3488 +f 3127/2764/3489 3128/3153/3489 3129/2765/3489 +f 3128/3153/3490 3126/3152/3490 3130/3154/3490 +f 3129/2765/778 3128/3153/778 3131/2767/778 +f 3128/3153/2880 3130/3154/2880 3132/3155/2880 +f 3131/2767/780 3128/3153/780 3132/3155/780 +f 3132/3155/781 3133/2769/781 3131/2767/781 +f 3132/3155/2881 3130/3154/2881 3134/3156/2881 +f 3132/3155/3491 3135/2771/3491 3133/2769/3491 +f 3132/3155/784 3134/3156/784 3135/2771/784 +f 3135/2771/785 3134/3156/785 3136/2773/785 +f 3134/3156/786 3137/3157/786 3138/3158/786 +f 3136/2773/2001 3134/3156/2001 3138/3158/2001 +f 3136/2773/3492 3138/3158/3492 3139/3159/3492 +f 3138/3158/789 3137/3157/789 3140/3160/789 +f 3139/3159/3493 3138/3158/3493 3141/3161/3493 +f 3138/3158/791 3140/3160/791 3142/3162/791 +f 3141/3161/792 3138/3158/792 3142/3162/792 +f 3141/3161/2885 3142/3162/2885 3143/3163/2885 +f 3142/3162/794 3140/3160/794 3144/3164/794 +f 3143/3163/2004 3142/3162/2004 3145/3165/2004 +f 3142/3162/796 3144/3164/796 3146/3166/796 +f 3145/3165/2005 3142/3162/2005 3146/3166/2005 +f 3145/3165/798 3146/3166/798 3147/2782/798 +f 3146/3166/799 3144/3164/799 3148/3167/799 +f 3147/2782/800 3146/3166/800 3149/3168/800 +f 3146/3166/2887 3148/3167/2887 3150/3169/2887 +f 3149/3168/802 3146/3166/802 3150/3169/802 +f 3150/3169/3494 3151/2786/3494 3149/3168/3494 +f 3150/3169/804 3148/3167/804 3152/3170/804 +f 3150/3169/805 3153/2788/805 3151/2786/805 +f 3150/3169/806 3152/3170/806 3154/3171/806 +f 3153/2788/2889 3150/3169/2889 3154/3171/2889 +f 3153/2788/2010 3154/3171/2010 3155/2789/2010 +f 3154/3171/2890 3152/3170/2890 3156/3172/2890 +f 3155/2789/3495 3154/3171/3495 3157/2791/3495 +f 3154/3171/811 3156/3172/811 3158/3173/811 +f 3157/2791/2011 3154/3171/2011 3158/3173/2011 +f 3158/3173/2892 3159/2793/2892 3157/2791/2892 +f 3158/3173/2893 3156/3172/2893 3160/3174/2893 +f 3158/3173/2012 3161/2795/2012 3159/2793/2012 +f 3158/3173/2013 3160/3174/2013 3161/2795/2013 +f 3161/2795/2014 3160/3174/2014 3162/2797/2014 +f 3160/3174/818 3163/3175/818 3164/3176/818 +f 3162/2797/3496 3160/3174/3496 3164/3176/3496 +f 3162/2797/2894 3164/3176/2894 3165/3177/2894 +f 3164/3176/821 3163/3175/821 3166/3178/821 +f 3165/3177/822 3164/3176/822 3167/3179/822 +f 3164/3176/823 3166/3178/823 3168/3180/823 +f 3167/3179/824 3164/3176/824 3168/3180/824 +f 3167/3179/2016 3168/3180/2016 3169/3181/2016 +f 3168/3180/826 3166/3178/826 3170/3182/826 +f 3169/3181/827 3168/3180/827 3171/3183/827 +f 3168/3180/828 3170/3182/828 3172/3184/828 +f 3171/3183/829 3168/3180/829 3172/3184/829 +f 3171/3183/2017 3172/3184/2017 3173/2806/2017 +f 3172/3184/2018 3170/3182/2018 3174/3185/2018 +f 3173/2806/832 3172/3184/832 3175/3186/832 +f 3172/3184/833 3174/3185/833 3176/3187/833 +f 3175/3186/3497 3172/3184/3497 3176/3187/3497 +f 3176/3187/835 3177/2810/835 3175/3186/835 +f 3176/3187/836 3174/3185/836 3178/3188/836 +f 3176/3187/837 3179/2812/837 3177/2810/837 +f 3176/3187/838 3178/3188/838 3180/3189/838 +f 3179/2812/839 3176/3187/839 3180/3189/839 +f 3179/2812/3498 3180/3189/3498 3181/2813/3498 +f 3180/3189/2901 3178/3188/2901 3182/3190/2901 +f 3181/2813/2021 3180/3189/2021 3183/2815/2021 +f 3180/3189/843 3182/3190/843 3184/3191/843 +f 3183/2815/844 3180/3189/844 3184/3191/844 +f 3184/3191/3499 3185/2817/3499 3183/2815/3499 +f 3184/3191/2023 3182/3190/2023 3186/3192/2023 +f 3184/3191/2024 3187/2819/2024 3185/2817/2024 +f 3184/3191/848 3186/3192/848 3187/2819/848 +f 3187/2819/2025 3186/3192/2025 3188/2821/2025 +f 3186/3192/850 3189/3193/850 3190/3194/850 +f 3188/2821/2026 3186/3192/2026 3190/3194/2026 +f 3188/2821/2904 3190/3194/2904 3191/3195/2904 +f 3190/3194/853 3189/3193/853 3192/3196/853 +f 3191/3195/854 3190/3194/854 3193/3197/854 +f 3190/3194/2905 3192/3196/2905 3194/3198/2905 +f 3193/3197/3500 3190/3194/3500 3194/3198/3500 +f 3193/3197/3501 3194/3198/3501 3195/3199/3501 +f 3194/3198/2908 3192/3196/2908 3196/3200/2908 +f 3195/3199/2909 3194/3198/2909 3197/3201/2909 +f 3194/3198/2910 3196/3200/2910 3198/3202/2910 +f 3197/3201/2911 3194/3198/2911 3199/2830/2911 +f 3199/2830/2912 3194/3198/2912 3198/3202/2912 +f 3198/3202/3502 3196/3200/3502 2888/2935/3502 +f 3199/2830/3503 3198/3202/3503 3200/3203/3503 +f 3198/3202/3504 2888/2935/3504 3201/2934/3504 +f 3200/3203/2916 3198/3202/2916 3202/2834/2916 +f 3202/2834/3505 3198/3202/3505 3201/2934/3505 +f 2907/2954/3506 2798/2837/3506 3203/3204/3506 +f 3203/3204/3507 2908/2953/3507 2907/2954/3507 +f 3203/3204/869 2798/2837/869 2796/2836/869 +f 3203/3204/3508 2796/2836/3508 3202/2834/3508 +f 2911/2956/872 2803/2842/872 2910/2957/872 +f 2911/2956/2037 2801/2840/2037 2803/2842/2037 +f 2914/2961/2038 2801/2840/2038 2911/2956/2038 +f 2914/2961/2039 2799/2838/2039 2801/2840/2039 +f 2914/2961/2922 2797/2835/2922 2799/2838/2922 +f 2794/2832/877 3200/3203/877 3202/2834/877 +f 2918/2965/2923 2797/2835/2923 2914/2961/2923 +f 2918/2965/879 2795/2833/879 2797/2835/879 +f 3199/2830/880 3200/3203/880 2794/2832/880 +f 2918/2965/2926 2793/2831/2926 2795/2833/2926 +f 2791/2828/2041 3197/3201/2041 3199/2830/2041 +f 2918/2965/883 2792/2829/883 2793/2831/883 +f 2791/2828/884 3195/3199/884 3197/3201/884 +f 2789/2826/885 3195/3199/885 2791/2828/885 +f 2922/2866/2927 2792/2829/2927 2918/2965/2927 +f 2789/2826/3509 3193/3197/3509 3195/3199/3509 +f 2788/2825/2045 3193/3197/2045 2789/2826/2045 +f 2925/2971/2046 2790/2827/2046 2922/2866/2046 +f 2788/2825/890 3191/3195/890 3193/3197/890 +f 2786/2823/891 3191/3195/891 2788/2825/891 +f 2925/2971/892 2827/2867/892 2790/2827/892 +f 3188/2821/893 3191/3195/893 2786/2823/893 +f 2928/2974/894 2827/2867/894 2925/2971/894 +f 2928/2974/2048 2787/2824/2048 2827/2867/2048 +f 2928/2974/896 2785/2822/896 2787/2824/896 +f 2931/2976/897 2785/2822/897 2928/2974/897 +f 2931/2976/2050 2784/2820/2050 2785/2822/2050 +f 2931/2976/899 2783/2818/899 2784/2820/899 +f 2935/2980/3510 2783/2818/3510 2931/2976/3510 +f 2935/2980/3511 2782/2816/3511 2783/2818/3511 +f 2935/2980/2933 2781/2814/2933 2782/2816/2933 +f 2935/2980/903 2780/2811/903 2781/2814/903 +f 2778/2808/2934 3175/3186/2934 3177/2810/2934 +f 2940/2986/3512 2780/2811/3512 2935/2980/3512 +f 2940/2986/906 2779/2809/906 2780/2811/906 +f 3173/2806/907 3175/3186/907 2778/2808/907 +f 2940/2986/908 2777/2807/908 2779/2809/908 +f 2775/2804/2053 3171/3183/2053 3173/2806/2053 +f 2940/2986/910 2776/2805/910 2777/2807/910 +f 2775/2804/911 3169/3181/911 3171/3183/911 +f 2773/2802/912 3169/3181/912 2775/2804/912 +f 2944/2868/913 2776/2805/913 2940/2986/913 +f 2773/2802/914 3167/3179/914 3169/3181/914 +f 2772/2801/915 3167/3179/915 2773/2802/915 +f 2947/2992/2056 2774/2803/2056 2944/2868/2056 +f 2772/2801/3513 3165/3177/3513 3167/3179/3513 +f 2770/2799/2057 3165/3177/2057 2772/2801/2057 +f 2947/2992/2058 2828/2869/2058 2774/2803/2058 +f 3162/2797/920 3165/3177/920 2770/2799/920 +f 2950/2995/921 2828/2869/921 2947/2992/921 +f 2950/2995/2059 2771/2800/2059 2828/2869/2059 +f 2950/2995/923 2769/2798/923 2771/2800/923 +f 2953/2997/924 2769/2798/924 2950/2995/924 +f 2953/2997/2938 2768/2796/2938 2769/2798/2938 +f 2953/2997/926 2767/2794/926 2768/2796/926 +f 2957/3001/927 2767/2794/927 2953/2997/927 +f 2957/3001/3514 2766/2792/3514 2767/2794/3514 +f 2957/3001/929 2765/2790/929 2766/2792/929 +f 2961/3005/930 2765/2790/930 2957/3001/930 +f 2961/3005/2939 2764/2787/2939 2765/2790/2939 +f 2762/2784/932 3149/3168/932 3151/2786/932 +f 2961/3005/933 2763/2785/933 2764/2787/933 +f 3147/2782/2061 3149/3168/2061 2762/2784/2061 +f 2964/3009/935 2763/2785/935 2961/3005/935 +f 2964/3009/936 2761/2783/936 2763/2785/936 +f 2759/2780/3515 3145/3165/3515 3147/2782/3515 +f 2964/3009/938 2760/2781/938 2761/2783/938 +f 2759/2780/939 3143/3163/939 3145/3165/939 +f 2757/2778/940 3143/3163/940 2759/2780/940 +f 2967/2870/941 2760/2781/941 2964/3009/941 +f 2757/2778/942 3141/3161/942 3143/3163/942 +f 2756/2777/943 3141/3161/943 2757/2778/943 +f 2970/3014/944 2758/2779/944 2967/2870/944 +f 2756/2777/2942 3139/3159/2942 3141/3161/2942 +f 2754/2775/2065 3139/3159/2065 2756/2777/2065 +f 2970/3014/947 2829/2871/947 2758/2779/947 +f 3136/2773/2943 3139/3159/2943 2754/2775/2943 +f 2973/3017/949 2829/2871/949 2970/3014/949 +f 2973/3017/2067 2755/2776/2067 2829/2871/2067 +f 2973/3017/2068 2753/2774/2068 2755/2776/2068 +f 2978/3021/3516 2753/2774/3516 2973/3017/3516 +f 2978/3021/2069 2752/2772/2069 2753/2774/2069 +f 2978/3021/954 2751/2770/954 2752/2772/954 +f 2986/3029/955 2751/2770/955 2978/3021/955 +f 2986/3029/3517 2750/2768/3517 2751/2770/3517 +f 2986/3029/957 2749/2766/957 2750/2768/957 +f 2993/3035/2945 2749/2766/2945 2986/3029/2945 +f 2993/3035/3518 2748/2763/3518 2749/2766/3518 +f 2746/2760/2071 3123/3149/2071 3125/2762/2071 +f 2993/3035/961 2747/2761/961 2748/2763/961 +f 2745/2759/2072 3123/3149/2072 2746/2760/2072 +f 2745/2759/2073 3121/3148/2073 3123/3149/2073 +f 2831/2874/2074 2747/2761/2074 2993/3035/2074 +f 2743/2757/2075 3121/3148/2075 2745/2759/2075 +f 2743/2757/2076 3120/3147/2076 3121/3148/2076 +f 3004/3046/965 2744/2758/965 2831/2874/965 +f 2743/2757/2077 3118/3145/2077 3120/3147/2077 +f 2741/2755/967 3118/3145/967 2743/2757/967 +f 3004/3046/968 2832/2875/968 2744/2758/968 +f 2741/2755/3519 3116/3143/3519 3118/3145/3519 +f 2740/2754/2078 3116/3143/2078 2741/2755/2078 +f 3011/3053/2949 2742/2756/2949 2832/2875/2949 +f 2740/2754/2950 3114/3141/2950 3116/3143/2950 +f 2738/2752/3520 3114/3141/3520 2740/2754/3520 +f 3011/3053/974 2833/2876/974 2742/2756/974 +f 3111/2750/2079 3114/3141/2079 2738/2752/2079 +f 3018/3061/2080 2833/2876/2080 3011/3053/2080 +f 3018/3061/2081 2739/2753/2081 2833/2876/2081 +f 3018/3061/978 2737/2751/978 2739/2753/978 +f 3027/3069/2082 2737/2751/2082 3018/3061/2082 +f 3027/3069/3521 2736/2749/3521 2737/2751/3521 +f 3027/3069/981 2735/2747/981 2736/2749/981 +f 3034/3076/982 2735/2747/982 3027/3069/982 +f 3034/3076/983 2734/2745/983 2735/2747/983 +f 2732/2741/2085 3102/3134/2085 3104/2742/2085 +f 3034/3076/985 2733/2743/985 2734/2745/985 +f 3100/2738/2086 3102/3134/2086 2732/2741/2086 +f 3041/3082/987 2733/2743/987 3034/3076/987 +f 3041/3082/988 2731/2740/988 2733/2743/988 +f 2729/2737/2087 3098/3130/2087 3100/2738/2087 +f 3041/3082/990 2730/2739/990 2731/2740/990 +f 2728/2735/2088 3098/3130/2088 2729/2737/2088 +f 2728/2735/2089 3096/3129/2089 3098/3130/2089 +f 2730/2739/2090 3041/3082/2090 3038/2879/2090 +f 2726/2734/2091 3096/3129/2091 2728/2735/2091 +f 2726/2734/995 3095/3128/995 3096/3129/995 +f 3038/2879/3522 3031/3073/3522 2727/2736/3522 +f 2726/2734/997 3093/3126/997 3095/3128/997 +f 2724/2732/2958 3093/3126/2958 2726/2734/2958 +f 2727/2736/2959 3031/3073/2959 2835/2878/2959 +f 2723/2731/3523 3093/3126/3523 2724/2732/3523 +f 2723/2731/2961 3091/3124/2961 3093/3126/2961 +f 2725/2733/3524 2835/2878/3524 3023/3066/3524 +f 3089/2729/2963 3091/3124/2963 2723/2731/2963 +f 2725/2733/2964 3023/3066/2964 2834/2877/2964 +f 2834/2877/2965 3023/3066/2965 3015/3058/2965 +f 2834/2877/3525 3015/3058/3525 2722/2730/3525 +f 2722/2730/1006 3015/3058/1006 2721/2728/1006 +f 2721/2728/1007 3015/3058/1007 3008/3051/1007 +f 2721/2728/3526 3008/3051/3526 2720/2726/3526 +f 2720/2726/1009 3008/3051/1009 2719/2724/1009 +f 2719/2724/1010 3008/3051/1010 3000/3044/1010 +f 2719/2724/1011 3000/3044/1011 2718/2721/1011 +f 3079/2720/2096 2716/2718/2096 3077/3116/2096 +f 2718/2721/2097 3000/3044/2097 2717/2719/2097 +f 3077/3116/3527 2716/2718/3527 3074/2715/3527 +f 2717/2719/2099 3000/3044/2099 2994/3039/2099 +f 2717/2719/1016 2994/3039/1016 2715/2717/1016 +f 3051/3095/3528 3205/3205/3528 3204/3206/3528 +f 3074/2715/1018 2713/2714/1018 3073/3113/1018 +f 3052/3094/3529 3205/3205/3529 3051/3095/3529 +f 2715/2717/1020 2994/3039/1020 2714/2716/1020 +f 3073/3113/2968 2713/2714/2968 2712/2712/2968 +f 3052/3094/3530 3055/3088/3530 3205/3205/3530 +f 3073/3113/1023 2712/2712/1023 3071/3111/1023 +f 3055/3088/3531 3047/3089/3531 3205/3205/3531 +f 2714/2716/1024 2994/3039/1024 2990/2873/1024 +f 3071/3111/2969 2712/2712/2969 2710/2711/2969 +f 3071/3111/2970 2710/2711/2970 3069/3108/2970 +f 2990/2873/2971 2983/3025/2971 2711/2713/2971 +f 3069/3108/3532 2710/2711/3532 3067/3107/3532 +f 3067/3107/1031 2710/2711/1031 2708/2709/1031 +f 3059/3100/3533 3206/3207/3533 3057/3085/3533 +f 2711/2713/1033 2983/3025/1033 2830/2872/1033 +f 3206/3207/3534 3044/3086/3534 3057/3085/3534 +f 3061/3102/2972 3206/3207/2972 3059/3100/2972 +f 3067/3107/1035 2708/2709/1035 3066/2706/1035 +f 3206/3207/3535 3207/3208/3535 3044/3086/3535 +f 3066/2706/3536 2706/2708/3536 3064/3105/3536 +f 3061/3102/3537 3207/3208/3537 3206/3207/3537 +f 3064/3105/1040 2706/2708/1040 3061/3102/1040 +f 2709/2710/2973 2830/2872/2973 3208/3020/2973 +f 2706/2708/3538 3207/3208/3538 3061/3102/3538 +f 2709/2710/3539 3208/3020/3539 2707/2707/3539 +f 2706/2708/3540 3208/3020/3540 3207/3208/3540 +f 2706/2708/3541 2707/2707/3541 3208/3020/3541 +f 3209/3209/3542 3210/3210/3542 3211/3211/3542 +f 3048/3091/1047 3050/3093/1047 3210/3210/1047 +f 3215/3212/1048 3214/3213/1048 3213/3214/1048 +f 3054/3097/1049 3048/3091/1049 3212/3215/1049 +f 3215/3212/1050 3216/3216/1050 3214/3213/1050 +f 3217/3217/1051 3216/3216/1051 3215/3212/1051 +f 3218/3218/1052 3216/3216/1052 3217/3217/1052 +f 3218/3218/2110 3219/3219/2110 3216/3216/2110 +f 3220/3220/3543 3219/3219/3543 3218/3218/3543 +f 3216/3216/1055 3054/3097/1055 3214/3213/1055 +f 3216/3216/1056 3058/3099/1056 3054/3097/1056 +f 3219/3219/2112 3058/3099/2112 3216/3216/2112 +f 3062/3103/1058 3058/3099/1058 3219/3219/1058 +f 3222/3221/1059 3223/3222/1059 3221/3223/1059 +f 3224/3224/1060 3223/3222/1060 3222/3221/1060 +f 3224/3224/1061 3225/3225/1061 3223/3222/1061 +f 3223/3222/1062 3065/3106/1062 3062/3103/1062 +f 3226/3226/3544 3225/3225/3544 3224/3224/3544 +f 3225/3225/2113 3065/3106/2113 3223/3222/2113 +f 3227/3227/2114 3228/3228/2114 3226/3226/2114 +f 3068/3109/1066 3065/3106/1066 3225/3225/1066 +f 3229/3229/1067 3228/3228/1067 3227/3227/1067 +f 3230/3230/1068 3231/3231/1068 3229/3229/1068 +f 3072/3112/2983 3068/3109/2983 3228/3228/2983 +f 3232/3232/2116 3233/3233/2116 3231/3231/2116 +f 3234/3234/2984 3233/3233/2984 3232/3232/2984 +f 3234/3234/3545 3235/3235/3545 3233/3233/3545 +f 3236/3236/2119 3235/3235/2119 3234/3234/2119 +f 3236/3236/3546 3237/3237/3546 3235/3235/3546 +f 3238/3238/1075 3237/3237/1075 3236/3236/1075 +f 3235/3235/2120 3076/3115/2120 3233/3233/2120 +f 3238/3238/1077 3239/3239/1077 3237/3237/1077 +f 3235/3235/2121 3080/3118/2121 3076/3115/2121 +f 3240/3240/1079 3239/3239/1079 3238/3238/1079 +f 3237/3237/1080 3080/3118/1080 3235/3235/1080 +f 3240/3240/1081 3241/3241/1081 3239/3239/1081 +f 3242/3242/3547 3241/3241/3547 3240/3240/3547 +f 3080/3118/1083 3237/3237/1083 3239/3239/1083 +f 3080/3118/1084 3239/3239/1084 3083/3119/1084 +f 3083/3119/1085 3239/3239/1085 3241/3241/1085 +f 3083/3119/2125 3241/3241/2125 3087/3121/2125 +f 3243/3243/2990 3244/3244/2990 3245/3245/2990 +f 3245/3245/2991 3246/3246/2991 3247/3247/2991 +f 3247/3247/1089 3246/3246/1089 3248/3248/1089 +f 3247/3247/2993 3248/3248/2993 3249/3249/2993 +f 3249/3249/3548 3248/3248/3548 3250/3250/3548 +f 3249/3249/3549 3250/3250/3549 3251/3251/3549 +f 3090/3123/3550 3247/3247/3550 3249/3249/3550 +f 3090/3123/1094 3249/3249/1094 3094/3127/1094 +f 3251/3251/3551 3250/3250/3551 3252/3252/3551 +f 3094/3127/1096 3249/3249/1096 3251/3251/1096 +f 3252/3252/2135 3253/3253/2135 3254/3254/2135 +f 3094/3127/1097 3251/3251/1097 3097/3131/1097 +f 3254/3254/2137 3255/3255/2137 3256/3256/2137 +f 3256/3256/1099 3255/3255/1099 3257/3257/1099 +f 3256/3256/1100 3257/3257/1100 3258/3258/1100 +f 3258/3258/1101 3257/3257/1101 3259/3259/1101 +f 3258/3258/1102 3259/3259/1102 3260/3260/1102 +f 3260/3260/1103 3259/3259/1103 3261/3261/1103 +f 3101/3133/1104 3256/3256/1104 3258/3258/1104 +f 3260/3260/3552 3261/3261/3552 3262/3262/3552 +f 3101/3133/1106 3258/3258/1106 3105/3136/1106 +f 3262/3262/1107 3261/3261/1107 3263/3263/1107 +f 3105/3136/3553 3258/3258/3553 3260/3260/3553 +f 3262/3262/2141 3263/3263/2141 3264/3264/2141 +f 3264/3264/3554 3263/3263/3554 3265/3265/3554 +f 3105/3136/1111 3260/3260/1111 3262/3262/1111 +f 3105/3136/1112 3262/3262/1112 3109/3138/1112 +f 3109/3138/1113 3262/3262/1113 3264/3264/1113 +f 3109/3138/1114 3264/3264/1114 3112/3139/1114 +f 3266/3266/1115 3267/3267/1115 3268/3268/1115 +f 3268/3268/1116 3269/3269/1116 3270/3270/1116 +f 3270/3270/3555 3269/3269/3555 3271/3271/3555 +f 3270/3270/2146 3271/3271/2146 3272/3272/2146 +f 3272/3272/2147 3271/3271/2147 3273/3273/2147 +f 3272/3272/1120 3273/3273/1120 3274/3274/1120 +f 3115/3142/1121 3270/3270/1121 3272/3272/1121 +f 3115/3142/2148 3272/3272/2148 3119/3146/2148 +f 3274/3274/1123 3273/3273/1123 3275/3275/1123 +f 3119/3146/1124 3272/3272/1124 3274/3274/1124 +f 3119/3146/1125 3274/3274/1125 3122/3150/1125 +f 3276/3276/1126 3277/3277/1126 3278/3278/1126 +f 3278/3278/3556 3277/3277/3556 3279/3279/3556 +f 3278/3278/2151 3279/3279/2151 3280/3280/2151 +f 3280/3280/3002 3279/3279/3002 3281/3281/3002 +f 3280/3280/2153 3281/3281/2153 3282/3282/2153 +f 3282/3282/3003 3281/3281/3003 3283/3283/3003 +f 3126/3152/1132 3278/3278/1132 3280/3280/1132 +f 3282/3282/3557 3283/3283/3557 3284/3284/3557 +f 3126/3152/1134 3280/3280/1134 3130/3154/1134 +f 3284/3284/3558 3283/3283/3558 3285/3285/3558 +f 3130/3154/3559 3280/3280/3559 3282/3282/3559 +f 3284/3284/1137 3285/3285/1137 3286/3286/1137 +f 3286/3286/1138 3285/3285/1138 3287/3287/1138 +f 3130/3154/2156 3282/3282/2156 3284/3284/2156 +f 3130/3154/2157 3284/3284/2157 3134/3156/2157 +f 3134/3156/1141 3284/3284/1141 3286/3286/1141 +f 3134/3156/1142 3286/3286/1142 3137/3157/1142 +f 3288/3288/3007 3289/3289/3007 3290/3290/3007 +f 3290/3290/3560 3291/3291/3560 3292/3292/3560 +f 3292/3292/3561 3291/3291/3561 3293/3293/3561 +f 3293/3293/1146 3294/3294/1146 3295/3295/1146 +f 3295/3295/1147 3294/3294/1147 3296/3296/1147 +f 3140/3160/1148 3292/3292/1148 3144/3164/1148 +f 3295/3295/1149 3296/3296/1149 3297/3297/1149 +f 3297/3297/3562 3296/3296/3562 3298/3298/3562 +f 3297/3297/2163 3298/3298/2163 3299/3299/2163 +f 3144/3164/1152 3295/3295/1152 3297/3297/1152 +f 3144/3164/1153 3297/3297/1153 3148/3167/1153 +f 3299/3299/1154 3300/3300/1154 3301/3301/1154 +f 3301/3301/2165 3300/3300/2165 3302/3302/2165 +f 3301/3301/3013 3302/3302/3013 3303/3303/3013 +f 3303/3303/1157 3302/3302/1157 3304/3304/1157 +f 3303/3303/1158 3304/3304/1158 3305/3305/1158 +f 3305/3305/1159 3304/3304/1159 3306/3306/1159 +f 3152/3170/1160 3301/3301/1160 3303/3303/1160 +f 3305/3305/1161 3306/3306/1161 3307/3307/1161 +f 3152/3170/1162 3303/3303/1162 3156/3172/1162 +f 3307/3307/2169 3306/3306/2169 3308/3308/2169 +f 3156/3172/3563 3303/3303/3563 3305/3305/3563 +f 3307/3307/3014 3308/3308/3014 3309/3309/3014 +f 3309/3309/3564 3308/3308/3564 3310/3310/3564 +f 3156/3172/1167 3305/3305/1167 3307/3307/1167 +f 3156/3172/1168 3307/3307/1168 3160/3174/1168 +f 3160/3174/1169 3307/3307/1169 3309/3309/1169 +f 3160/3174/1170 3309/3309/1170 3163/3175/1170 +f 3311/3311/2170 3312/3312/2170 3313/3313/2170 +f 3313/3313/1172 3314/3314/1172 3315/3315/1172 +f 3315/3315/3565 3314/3314/3565 3316/3316/3565 +f 3316/3316/2173 3317/3317/2173 3318/3318/2173 +f 3318/3318/1175 3317/3317/1175 3319/3319/1175 +f 3166/3178/1176 3315/3315/1176 3170/3182/1176 +f 2896/2858/2174 2826/2865/2174 2820/2859/2174 +f 3318/3318/1178 3319/3319/1178 3320/3320/1178 +f 2826/2865/3566 2886/2932/3566 2877/2929/3566 +f 3320/3320/1180 3319/3319/1180 3321/3321/1180 +f 2826/2865/3019 2877/2929/3019 2823/2862/3019 +f 3320/3320/1182 3321/3321/1182 3322/3322/1182 +f 2823/2862/3020 2877/2929/3020 2814/2847/3020 +f 3170/3182/3567 3318/3318/3567 3320/3320/3567 +f 3170/3182/3568 3320/3320/3568 3174/3185/3568 +f 2814/2847/3022 2877/2929/3022 2815/2848/3022 +f 3322/3322/1187 3323/3323/1187 3324/3324/1187 +f 2814/2847/3023 2816/2849/3023 2863/2907/3023 +f 3325/2902/3569 2816/2849/3569 2815/2848/3569 +f 2866/2911/3570 2859/2908/3570 2867/2918/3570 +f 3324/3324/1189 3323/3323/1189 3326/3325/1189 +f 2859/2908/3571 2815/2848/3571 2867/2918/3571 +f 3324/3324/3572 3326/3325/3572 3327/3326/3572 +f 2856/2899/3573 2863/2907/3573 2816/2849/3573 +f 3325/2902/3574 2856/2899/3574 2816/2849/3574 +f 2859/2908/3575 3325/2902/3575 2815/2848/3575 +f 3327/3326/1193 3326/3325/1193 3329/3327/1193 +f 3328/3328/3576 3325/2902/3576 2859/2908/3576 +f 2850/2892/3577 3328/3328/3577 2859/2908/3577 +f 3327/3326/3578 3329/3327/3578 3330/3329/3578 +f 3330/3329/2189 3329/3327/2189 3331/3330/2189 +f 3178/3188/1197 3324/3324/1197 3327/3326/1197 +f 2844/2888/3579 3328/3328/3579 2850/2892/3579 +f 3330/3329/3580 3331/3330/3580 3332/3331/3580 +f 3178/3188/3034 3327/3326/3034 3182/3190/3034 +f 2836/2880/3581 2851/2893/3581 3325/2902/3581 +f 3328/3328/3582 2836/2880/3582 3325/2902/3582 +f 2844/2888/3583 2843/2887/3583 3328/3328/3583 +f 3332/3331/2191 3331/3330/2191 3333/3332/2191 +f 3182/3190/3584 3327/3326/3584 3330/3329/3584 +f 2843/2887/3585 2836/2880/3585 3328/3328/3585 +f 3332/3331/2192 3333/3332/2192 3334/3333/2192 +f 3334/3333/2194 3333/3332/2194 3335/3334/2194 +f 3182/3190/1209 3330/3329/1209 3332/3331/1209 +f 3182/3190/1211 3332/3331/1211 3186/3192/1211 +f 3336/3335/3586 2836/2880/3586 2843/2887/3586 +f 2849/2895/3587 3336/3335/3587 2843/2887/3587 +f 3186/3192/1212 3332/3331/1212 3334/3333/1212 +f 2855/2900/3588 3336/3335/3588 2849/2895/3588 +f 2845/2896/3589 2837/2881/3589 2836/2880/3589 +f 3336/3335/3590 2845/2896/3590 2836/2880/3590 +f 2804/2843/2202 2805/2845/2202 2811/2856/2202 +f 3186/3192/1218 3334/3333/1218 3189/3193/1218 +f 3337/3336/1220 3338/3337/1220 3339/3338/1220 +f 2855/2900/3591 2845/2896/3591 3336/3335/3591 +f 2804/2843/1222 2811/2856/1222 2821/2860/1222 +f 2864/2909/3592 2845/2896/3592 2855/2900/3592 +f 3339/3338/1224 3340/3339/1224 3341/3340/1224 +f 2879/2924/3593 2804/2843/3593 2821/2860/3593 +f 2864/2909/3594 3342/3341/3594 2845/2896/3594 +f 3341/3340/1226 3340/3339/1226 3343/3342/1226 +f 3342/3341/3595 2854/2898/3595 2845/2896/3595 +f 2870/2915/3596 3342/3341/3596 2864/2909/3596 +f 2803/2842/2207 2804/2843/2207 2879/2924/2207 +f 2910/2957/3597 2879/2924/3597 2881/2926/3597 +f 2910/2957/1229 2803/2842/1229 2879/2924/1229 +f 2889/2937/3050 2910/2957/3050 2881/2926/3050 +f 2875/2920/3598 3342/3341/3598 2870/2915/3598 +f 3343/3342/3599 3344/3343/3599 3345/3344/3599 +f 3345/3344/3053 3344/3343/3053 3346/3345/3053 +f 3192/3196/1236 3341/3340/1236 3196/3200/1236 +f 2912/2958/2210 2889/2937/2210 2897/2942/2210 +f 2899/2948/2212 2912/2958/2212 2897/2942/2212 +f 2875/2920/3600 2854/2898/3600 3342/3341/3600 +f 3345/3344/3601 3346/3345/3601 3347/3346/3601 +f 2875/2920/3602 2874/2921/3602 2854/2898/3602 +f 3347/3346/3056 3346/3345/3056 3348/3347/3056 +f 2874/2921/3603 2869/2914/3603 2854/2898/3603 +f 2901/2946/2217 2912/2958/2217 2899/2948/2217 +f 2882/2927/3604 3349/3348/3604 2875/2920/3604 +f 2901/2946/2218 2913/2959/2218 2912/2958/2218 +f 3349/3348/3605 2874/2921/3605 2875/2920/3605 +f 3347/3346/1247 3348/3347/1247 3350/3349/1247 +f 3196/3200/1249 3345/3344/1249 3347/3346/1249 +f 2893/2940/3606 3349/3348/3606 2882/2927/3606 +f 3196/3200/1252 3347/3346/1252 2888/2935/1252 +f 2890/2933/3607 3350/3349/3607 2901/2946/3607 +f 2888/2935/3608 3350/3349/3608 2890/2933/3608 +f 3349/3348/3609 2884/2930/3609 2874/2921/3609 +f 2898/2944/3610 3349/3348/3610 2893/2940/3610 +f 2898/2944/3611 2908/2953/3611 3349/3348/3611 +f 3203/3204/3612 3201/2934/3612 2908/2953/3612 +f 2908/2953/3613 2884/2930/3613 3349/3348/3613 +f 2906/2952/3614 2908/2953/3614 2898/2944/3614 +f 3202/2834/3615 3201/2934/3615 3203/3204/3615 +f 3201/2934/3616 2884/2930/3616 2908/2953/3616 +f 3201/2934/3617 2890/2933/3617 2884/2930/3617 +f 3353/3350/3618 3355/3351/3618 3351/3352/3618 +f 3354/3353/3619 3355/3351/3619 3353/3350/3619 +f 3356/3354/3620 3355/3351/3620 3354/3353/3620 +f 3356/3354/3621 3357/3355/3621 3355/3351/3621 +f 3358/3356/3622 3359/3357/3622 3356/3354/3622 +f 3359/3357/3623 3357/3355/3623 3356/3354/3623 +f 3358/3356/3624 3360/3358/3624 3359/3357/3624 +f 3362/3359/3625 3361/3360/3625 3360/3358/3625 +f 3363/3361/3626 3362/3359/3626 3360/3358/3626 +f 3364/3362/3627 3365/3363/3627 3363/3361/3627 +f 3366/3364/3628 3365/3363/3628 3364/3362/3628 +f 3364/3362/3629 3367/3365/3629 3366/3364/3629 +f 3368/3366/3630 3367/3365/3630 3364/3362/3630 +f 3368/3366/3631 3369/3367/3631 3367/3365/3631 +f 3370/3368/3632 3369/3367/3632 3368/3366/3632 +f 3371/3369/3633 3369/3367/3633 3370/3368/3633 +f 3372/3370/3634 3371/3369/3634 3370/3368/3634 +f 3372/3370/3635 3373/3371/3635 3371/3369/3635 +f 3374/3372/3095 3375/3373/3095 3372/3370/3095 +f 3375/3373/3096 3373/3371/3096 3372/3370/3096 +f 3350/3349/1289 2913/2959/1289 2901/2946/1289 +f 3350/3349/1290 2916/2962/1290 2913/2959/1290 +f 3348/3347/1291 2916/2962/1291 3350/3349/1291 +f 3348/3347/1292 2917/2963/1292 2916/2962/1292 +f 3346/3345/2249 2917/2963/2249 3348/3347/2249 +f 3346/3345/1294 2920/2966/1294 2917/2963/1294 +f 3344/3343/2251 2920/2966/2251 3346/3345/2251 +f 3344/3343/3636 2921/2967/3636 2920/2966/3636 +f 3343/3342/3100 2923/2968/3100 3344/3343/3100 +f 2923/2968/3101 2921/2967/3101 3344/3343/3101 +f 3340/3339/3102 2923/2968/3102 3343/3342/3102 +f 3340/3339/2253 2924/2969/2253 2923/2968/2253 +f 3338/3337/3637 3340/3339/3637 3339/3338/3637 +f 3338/3337/3638 2924/2969/3638 3340/3339/3638 +f 3338/3337/3639 2926/2970/3639 2924/2969/3639 +f 3335/3334/2256 3338/3337/2256 3337/3336/2256 +f 3338/3337/2257 2927/2972/2257 2926/2970/2257 +f 3335/3334/1306 2927/2972/1306 3338/3337/1306 +f 3335/3334/1307 2929/2973/1307 2927/2972/1307 +f 3333/3332/1308 2929/2973/1308 3335/3334/1308 +f 3333/3332/1309 2930/2975/1309 2929/2973/1309 +f 3331/3330/2258 2930/2975/2258 3333/3332/2258 +f 3329/3327/2259 2932/2978/2259 3331/3330/2259 +f 2932/2978/2260 2930/2975/2260 3331/3330/2260 +f 3326/3325/2261 2932/2978/2261 3329/3327/2261 +f 3326/3325/1314 2934/2979/1314 2932/2978/1314 +f 3323/3323/1315 2934/2979/1315 3326/3325/1315 +f 3323/3323/3107 2936/2981/3107 2934/2979/3107 +f 3322/3322/3640 2936/2981/3640 3323/3323/3640 +f 3322/3322/1318 2938/2983/1318 2936/2981/1318 +f 3321/3321/2264 2938/2983/2264 3322/3322/2264 +f 3321/3321/3109 2939/2984/3109 2938/2983/3109 +f 3319/3319/1321 2939/2984/1321 3321/3321/1321 +f 3319/3319/1322 2942/2987/1322 2939/2984/1322 +f 3317/3317/3111 2942/2987/3111 3319/3319/3111 +f 3317/3317/2266 2943/2988/2266 2942/2987/2266 +f 3316/3316/1325 2945/2989/1325 3317/3317/1325 +f 2945/2989/3641 2943/2988/3641 3317/3317/3641 +f 3314/3314/1327 2945/2989/1327 3316/3316/1327 +f 3314/3314/2269 2946/2990/2269 2945/2989/2269 +f 3312/3312/2270 3314/3314/2270 3313/3313/2270 +f 3312/3312/2271 2946/2990/2271 3314/3314/2271 +f 3312/3312/2272 2948/2991/2272 2946/2990/2272 +f 3310/3310/2273 3312/3312/2273 3311/3311/2273 +f 3312/3312/3642 2949/2993/3642 2948/2991/3642 +f 3310/3310/1334 2949/2993/1334 3312/3312/1334 +f 3310/3310/1335 2951/2994/1335 2949/2993/1335 +f 3308/3308/1336 2951/2994/1336 3310/3310/1336 +f 3308/3308/2274 2952/2996/2274 2951/2994/2274 +f 3306/3306/2275 2952/2996/2275 3308/3308/2275 +f 3304/3304/1339 2954/2999/1339 3306/3306/1339 +f 2954/2999/3115 2952/2996/3115 3306/3306/3115 +f 3302/3302/1341 2954/2999/1341 3304/3304/1341 +f 3302/3302/3643 2956/3000/3643 2954/2999/3643 +f 3300/3300/1343 2956/3000/1343 3302/3302/1343 +f 3300/3300/3644 2958/3002/3644 2956/3000/3644 +f 3299/3299/1345 2958/3002/1345 3300/3300/1345 +f 3299/3299/1346 2960/3004/1346 2958/3002/1346 +f 3298/3298/3645 2960/3004/3645 3299/3299/3645 +f 3298/3298/1348 2962/3006/1348 2960/3004/1348 +f 3296/3296/1349 2962/3006/1349 3298/3298/1349 +f 3296/3296/3646 2965/3008/3646 2962/3006/3646 +f 3294/3294/1351 2965/3008/1351 3296/3296/1351 +f 3294/3294/1352 2966/3010/1352 2965/3008/1352 +f 3293/3293/2278 2968/3011/2278 3294/3294/2278 +f 2968/3011/2279 2966/3010/2279 3294/3294/2279 +f 3291/3291/3647 2968/3011/3647 3293/3293/3647 +f 3291/3291/1356 2969/3012/1356 2968/3011/1356 +f 3289/3289/2281 3291/3291/2281 3290/3290/2281 +f 3289/3289/1358 2969/3012/1358 3291/3291/1358 +f 3289/3289/1359 2971/3013/1359 2969/3012/1359 +f 3287/3287/1360 3289/3289/1360 3288/3288/1360 +f 3289/3289/2284 2972/3015/2284 2971/3013/2284 +f 3287/3287/1362 2972/3015/1362 3289/3289/1362 +f 3287/3287/3648 2974/3016/3648 2972/3015/3648 +f 3285/3285/3649 2974/3016/3649 3287/3287/3649 +f 3285/3285/1365 2975/3018/1365 2974/3016/1365 +f 3283/3283/3119 2975/3018/3119 3285/3285/3119 +f 3281/3281/1367 2980/3026/1367 3283/3283/1367 +f 2980/3026/2287 2975/3018/2287 3283/3283/2287 +f 3279/3279/3650 2980/3026/3650 3281/3281/3650 +f 3279/3279/3120 2984/3027/3120 2980/3026/3120 +f 3277/3277/3121 2984/3027/3121 3279/3279/3121 +f 3277/3277/3651 2987/3030/3651 2984/3027/3651 +f 3276/3276/2289 2987/3030/2289 3277/3277/2289 +f 3276/3276/1374 2991/3033/1374 2987/3030/1374 +f 3275/3275/3652 2991/3033/3652 3276/3276/3652 +f 3275/3275/3653 2995/3036/3653 2991/3033/3653 +f 3275/3275/3654 2998/3040/3654 2995/3036/3654 +f 3273/3273/1378 2998/3040/1378 3275/3275/1378 +f 3273/3273/1379 3001/3042/1379 2998/3040/1379 +f 3271/3271/1380 3001/3042/1380 3273/3273/1380 +f 3271/3271/1381 3005/3047/1381 3001/3042/1381 +f 3269/3269/3655 3005/3047/3655 3271/3271/3655 +f 3269/3269/1383 3009/3050/1383 3005/3047/1383 +f 3267/3267/2291 3269/3269/2291 3268/3268/2291 +f 3267/3267/1385 3009/3050/1385 3269/3269/1385 +f 3267/3267/2293 3012/3054/2293 3009/3050/2293 +f 3265/3265/1387 3267/3267/1387 3266/3266/1387 +f 3267/3267/1388 3016/3057/1388 3012/3054/1388 +f 3265/3265/1389 3019/3060/1389 3267/3267/1389 +f 3019/3060/3656 3016/3057/3656 3267/3267/3656 +f 3263/3263/3657 3019/3060/3657 3265/3265/3657 +f 3263/3263/1392 3020/3065/1392 3019/3060/1392 +f 3261/3261/1393 3020/3065/1393 3263/3263/1393 +f 3261/3261/3126 3025/3067/3126 3020/3065/3126 +f 3259/3259/3658 3025/3067/3658 3261/3261/3658 +f 3259/3259/1396 3028/3070/1396 3025/3067/1396 +f 3257/3257/3659 3028/3070/3659 3259/3259/3659 +f 3257/3257/3660 3032/3074/3660 3028/3070/3660 +f 3255/3255/3661 3032/3074/3661 3257/3257/3661 +f 3255/3255/3127 3035/3077/3127 3032/3074/3127 +f 3254/3254/1401 3035/3077/1401 3255/3255/1401 +f 3254/3254/1402 3039/3080/1402 3035/3077/1402 +f 3253/3253/2299 3039/3080/2299 3254/3254/2299 +f 3253/3253/2300 3042/3083/2300 3039/3080/2300 +f 3252/3252/2301 3043/3084/2301 3253/3253/2301 +f 3250/3250/2302 3043/3084/2302 3252/3252/2302 +f 3043/3084/2303 3042/3083/2303 3253/3253/2303 +f 3043/3084/2304 3250/3250/2304 3040/3081/2304 +f 3377/3374/3662 3379/3375/3662 3378/3376/3662 +f 3040/3081/1409 3250/3250/1409 3248/3248/1409 +f 3380/3377/3663 3379/3375/3663 3377/3374/3663 +f 3040/3081/1410 3248/3248/1410 3036/3078/1410 +f 3036/3078/1412 3248/3248/1412 3246/3246/1412 +f 3036/3078/1413 3246/3246/1413 3033/3075/1413 +f 3380/3377/3664 3381/3378/3664 3379/3375/3664 +f 3244/3244/3131 3246/3246/3131 3245/3245/3131 +f 3382/3379/3665 3381/3378/3665 3380/3377/3665 +f 3033/3075/1417 3246/3246/1417 3244/3244/1417 +f 3033/3075/1418 3244/3244/1418 3029/3071/1418 +f 3384/3380/3666 3381/3378/3666 3382/3379/3666 +f 3383/3381/3137 3374/3372/3137 3372/3370/3137 +f 3384/3380/3667 3385/3382/3667 3381/3378/3667 +f 3242/3242/3139 3244/3244/3139 3243/3243/3139 +f 3242/3242/1424 3022/3063/1424 3244/3244/1424 +f 3029/3071/1425 3244/3244/1425 3026/3068/1425 +f 3383/3381/3668 3372/3370/3668 3370/3368/3668 +f 3026/3068/3669 3244/3244/3669 3022/3063/3669 +f 3386/3383/3670 3383/3381/3670 3370/3368/3670 +f 3240/3240/3671 3022/3063/3671 3242/3242/3671 +f 3387/3384/1442 3385/3382/1442 3384/3380/1442 +f 3240/3240/3672 3021/3062/3672 3022/3063/3672 +f 3386/3383/3673 3442/3385/3673 3383/3381/3673 +f 3386/3383/3674 3370/3368/3674 3388/3386/3674 +f 3386/3383/3675 3389/3387/3675 3442/3385/3675 +f 3387/3384/3676 3390/3388/3676 3385/3382/3676 +f 3238/3238/2329 3021/3062/2329 3240/3240/2329 +f 3238/3238/1437 3017/3059/1437 3021/3062/1437 +f 3388/3386/3677 3389/3387/3677 3386/3383/3677 +f 3388/3386/3678 3391/3389/3678 3389/3387/3678 +f 3392/3390/3679 3390/3388/3679 3387/3384/3679 +f 3392/3390/3680 3393/3391/3680 3390/3388/3680 +f 3370/3368/3681 3368/3366/3681 3394/3392/3681 +f 3388/3386/3682 3370/3368/3682 3395/3393/3682 +f 3236/3236/2333 3017/3059/2333 3238/3238/2333 +f 3395/3393/3683 3370/3368/3683 3394/3392/3683 +f 3236/3236/1441 3013/3055/1441 3017/3059/1441 +f 3395/3393/3684 3391/3389/3684 3388/3386/3684 +f 3394/3392/3685 3368/3366/3685 3364/3362/3685 +f 3234/3234/2338 3013/3055/2338 3236/3236/2338 +f 3396/3394/3686 3393/3391/3686 3392/3390/3686 +f 3234/3234/1449 3010/3052/1449 3013/3055/1449 +f 3396/3394/3687 3397/3395/3687 3393/3391/3687 +f 3394/3392/3688 3364/3362/3688 3398/3396/3688 +f 3400/3397/3689 3399/3398/3689 3395/3393/3689 +f 3232/3232/1454 3010/3052/1454 3234/3234/1454 +f 3401/3399/3690 3397/3395/3690 3396/3394/3690 +f 3232/3232/2345 3006/3048/2345 3010/3052/2345 +f 3231/3231/1459 3006/3048/1459 3232/3232/1459 +f 3398/3396/3691 3364/3362/3691 3363/3361/3691 +f 3231/3231/1460 3003/3045/1460 3006/3048/1460 +f 3401/3399/3692 3402/3400/3692 3397/3395/3692 +f 3398/3396/3693 3404/3401/3693 3400/3397/3693 +f 3405/3402/3694 3402/3400/3694 3401/3399/3694 +f 3398/3396/3695 3363/3361/3695 3406/3403/3695 +f 3230/3230/1464 3003/3045/1464 3231/3231/1464 +f 3403/3404/3696 3398/3396/3696 3406/3403/3696 +f 3403/3404/3697 3404/3401/3697 3398/3396/3697 +f 3405/3402/3698 3407/3405/3698 3402/3400/3698 +f 3406/3403/3699 3363/3361/3699 3360/3358/3699 +f 3003/3045/2353 3230/3230/2353 2999/3041/2353 +f 3403/3404/3700 3408/3406/3700 3404/3401/3700 +f 3409/3407/3169 3407/3405/3169 3405/3402/3169 +f 3229/3229/1470 2996/3037/1470 3230/3230/1470 +f 3406/3403/3701 3408/3406/3701 3403/3404/3701 +f 3227/3227/1472 2996/3037/1472 3229/3229/1472 +f 2999/3041/3702 3230/3230/3702 2996/3037/3702 +f 3406/3403/3703 3411/3408/3703 3408/3406/3703 +f 3409/3407/3704 3351/3352/3704 3407/3405/3704 +f 3406/3403/3705 3360/3358/3705 3358/3356/3705 +f 3410/3409/3706 3406/3403/3706 3358/3356/3706 +f 3410/3409/3707 3411/3408/3707 3406/3403/3707 +f 3430/3410/3708 3352/3411/3708 3412/3412/3708 +f 2996/3037/1482 3227/3227/1482 2992/3034/1482 +f 3409/3407/3709 3352/3411/3709 3351/3352/3709 +f 3410/3409/3710 3414/3413/3710 3411/3408/3710 +f 3413/3414/3711 3352/3411/3711 3409/3407/3711 +f 3415/3415/3712 3352/3411/3712 3430/3410/3712 +f 3207/3208/3713 3430/3410/3713 3044/3086/3713 +f 3410/3409/3714 3358/3356/3714 3416/3416/3714 +f 2992/3034/3715 3227/3227/3715 3226/3226/3715 +f 3207/3208/3716 3415/3415/3716 3430/3410/3716 +f 2992/3034/1491 3226/3226/1491 2988/3031/1491 +f 3417/3417/3717 3414/3413/3717 3410/3409/3717 +f 3415/3415/3718 3207/3208/3718 3208/3020/3718 +f 2988/3031/3183 3226/3226/3183 3224/3224/3183 +f 3415/3415/3719 3351/3352/3719 3352/3411/3719 +f 3353/3350/3720 3351/3352/3720 3415/3415/3720 +f 3358/3356/3721 3356/3354/3721 3418/3418/3721 +f 3416/3416/3722 3358/3356/3722 3419/3419/3722 +f 3419/3419/3723 3358/3356/3723 3418/3418/3723 +f 3222/3221/3724 2982/3023/3724 3224/3224/3724 +f 2988/3031/3187 3224/3224/3187 2985/3028/3187 +f 2985/3028/1501 3224/3224/1501 2982/3023/1501 +f 3416/3416/3725 3421/3420/3725 3417/3417/3725 +f 3208/3020/3726 3353/3350/3726 3415/3415/3726 +f 3418/3418/3727 3356/3354/3727 3354/3353/3727 +f 3354/3353/3728 3353/3350/3728 3208/3020/3728 +f 3221/3223/1504 2982/3023/1504 3222/3221/1504 +f 3212/3215/2385 3420/3421/2385 3213/3214/2385 +f 3419/3419/3729 3421/3420/3729 3416/3416/3729 +f 3419/3419/3730 3422/3422/3730 3421/3420/3730 +f 3418/3418/3731 3354/3353/3731 3208/3020/3731 +f 3220/3220/1507 2979/3423/1507 3221/3223/1507 +f 2982/3023/1508 3221/3223/1508 2977/3024/1508 +f 3423/3424/2388 3215/3212/2388 3213/3214/2388 +f 2977/3024/3732 3221/3223/3732 2979/3423/3732 +f 3418/3418/3733 3422/3422/3733 3419/3419/3733 +f 3208/3020/1512 2976/3019/1512 3424/3425/1512 +f 3218/3218/3734 2979/3423/3734 3220/3220/3734 +f 3425/3426/1514 3215/3212/1514 3423/3424/1514 +f 3418/3418/3735 3426/3427/3735 3422/3422/3735 +f 3424/3425/3736 3418/3418/3736 3208/3020/3736 +f 2976/3019/2394 2977/3024/2394 3424/3425/2394 +f 3425/3426/3737 3217/3217/3737 3215/3212/3737 +f 2977/3024/3738 2979/3423/3738 3424/3425/3738 +f 3425/3426/2395 3218/3218/2395 3217/3217/2395 +f 3427/3428/3739 3426/3427/3739 3418/3418/3739 +f 3418/3418/3740 3424/3425/3740 3427/3428/3740 +f 2979/3423/1523 3218/3218/1523 3425/3426/1523 +f 3424/3425/3197 2979/3423/3197 3425/3426/3197 +f 3427/3428/3741 3424/3425/3741 3425/3426/3741 +f 3347/3346/2400 3350/3349/2400 2888/2935/2400 +f 3196/3200/2401 3343/3342/2401 3345/3344/2401 +f 3341/3340/1529 3343/3342/1529 3196/3200/1529 +f 3192/3196/1530 3339/3338/1530 3341/3340/1530 +f 3189/3193/1531 3339/3338/1531 3192/3196/1531 +f 3189/3193/3742 3337/3336/3742 3339/3338/3742 +f 3189/3193/1533 3335/3334/1533 3337/3336/1533 +f 3334/3333/1534 3335/3334/1534 3189/3193/1534 +f 3178/3188/1535 3322/3322/1535 3324/3324/1535 +f 3174/3185/3199 3322/3322/3199 3178/3188/3199 +f 3320/3320/3743 3322/3322/3743 3174/3185/3743 +f 3170/3182/1538 3316/3316/1538 3318/3318/1538 +f 3315/3315/1539 3316/3316/1539 3170/3182/1539 +f 3166/3178/2404 3313/3313/2404 3315/3315/2404 +f 3163/3175/1541 3313/3313/1541 3166/3178/1541 +f 3163/3175/2405 3311/3311/2405 3313/3313/2405 +f 3163/3175/2406 3310/3310/2406 3311/3311/2406 +f 3309/3309/1544 3310/3310/1544 3163/3175/1544 +f 3152/3170/2408 3299/3299/2408 3301/3301/2408 +f 3148/3167/3744 3299/3299/3744 3152/3170/3744 +f 3297/3297/3745 3299/3299/3745 3148/3167/3745 +f 3144/3164/1548 3293/3293/1548 3295/3295/1548 +f 3292/3292/2409 3293/3293/2409 3144/3164/2409 +f 3140/3160/2410 3290/3290/2410 3292/3292/2410 +f 3137/3157/1551 3290/3290/1551 3140/3160/1551 +f 3137/3157/1552 3288/3288/1552 3290/3290/1552 +f 3137/3157/1553 3287/3287/1553 3288/3288/1553 +f 3286/3286/3202 3287/3287/3202 3137/3157/3202 +f 3126/3152/3746 3276/3276/3746 3278/3278/3746 +f 3122/3150/3203 3276/3276/3203 3126/3152/3203 +f 3122/3150/3747 3275/3275/3747 3276/3276/3747 +f 3274/3274/2412 3275/3275/2412 3122/3150/2412 +f 3115/3142/1559 3268/3268/1559 3270/3270/1559 +f 3112/3139/1560 3268/3268/1560 3115/3142/1560 +f 3112/3139/1561 3266/3266/1561 3268/3268/1561 +f 3112/3139/1562 3265/3265/1562 3266/3266/1562 +f 3264/3264/1563 3265/3265/1563 3112/3139/1563 +f 3101/3133/1564 3254/3254/1564 3256/3256/1564 +f 3097/3131/2413 3254/3254/2413 3101/3133/2413 +f 3097/3131/2414 3252/3252/2414 3254/3254/2414 +f 3251/3251/2415 3252/3252/2415 3097/3131/2415 +f 3090/3123/3208 3245/3245/3208 3247/3247/3208 +f 3087/3121/3209 3245/3245/3209 3090/3123/3209 +f 3087/3121/1570 3243/3243/1570 3245/3245/1570 +f 3087/3121/1571 3242/3242/1571 3243/3243/1571 +f 3241/3241/1572 3242/3242/1572 3087/3121/1572 +f 3233/3233/1573 3076/3115/1573 3231/3231/1573 +f 3231/3231/1574 3076/3115/1574 3072/3112/1574 +f 3231/3231/1575 3072/3112/1575 3229/3229/1575 +f 3229/3229/1577 3072/3112/1577 3228/3228/1577 +f 3355/3351/3748 3407/3405/3748 3351/3352/3748 +f 3228/3228/3749 3068/3109/3749 3226/3226/3749 +f 3402/3400/3750 3407/3405/3750 3355/3351/3750 +f 3357/3355/3751 3402/3400/3751 3355/3351/3751 +f 3226/3226/1582 3068/3109/1582 3225/3225/1582 +f 3417/3417/3752 3410/3409/3752 3416/3416/3752 +f 3357/3355/3753 3397/3395/3753 3402/3400/3753 +f 3359/3357/3754 3397/3395/3754 3357/3355/3754 +f 3360/3358/3755 3361/3360/3755 3359/3357/3755 +f 3361/3360/3756 3397/3395/3756 3359/3357/3756 +f 3401/3399/3757 3421/3420/3757 3422/3422/3757 +f 3223/3222/1590 3062/3103/1590 3221/3223/1590 +f 3401/3399/3758 3422/3422/3758 3405/3402/3758 +f 3396/3394/3759 3421/3420/3759 3401/3399/3759 +f 3396/3394/3760 3417/3417/3760 3421/3420/3760 +f 3361/3360/3761 3393/3391/3761 3397/3395/3761 +f 3405/3402/3762 3422/3422/3762 3426/3427/3762 +f 3221/3223/3228 3062/3103/3228 3220/3220/3228 +f 3362/3359/3763 3393/3391/3763 3361/3360/3763 +f 3414/3413/3764 3417/3417/3764 3396/3394/3764 +f 3220/3220/1596 3062/3103/1596 3219/3219/1596 +f 3392/3390/3765 3414/3413/3765 3396/3394/3765 +f 3405/3402/2436 3426/3427/2436 3409/3407/2436 +f 3362/3359/3766 3390/3388/3766 3393/3391/3766 +f 3363/3361/3767 3390/3388/3767 3362/3359/3767 +f 3409/3407/3768 3426/3427/3768 3427/3428/3768 +f 3392/3390/3769 3411/3408/3769 3414/3413/3769 +f 3387/3384/3770 3411/3408/3770 3392/3390/3770 +f 3365/3363/3771 3390/3388/3771 3363/3361/3771 +f 3409/3407/2442 3427/3428/2442 3413/3414/2442 +f 3413/3414/3772 3427/3428/3772 3428/3429/3772 +f 3425/3426/3773 3428/3429/3773 3427/3428/3773 +f 3423/3424/3774 3428/3429/3774 3425/3426/3774 +f 3400/3397/3775 3394/3392/3775 3398/3396/3775 +f 3365/3363/3776 3385/3382/3776 3390/3388/3776 +f 3429/3430/3777 3428/3429/3777 3423/3424/3777 +f 3387/3384/3778 3408/3406/3778 3411/3408/3778 +f 3384/3380/3779 3408/3406/3779 3387/3384/3779 +f 3366/3364/3780 3385/3382/3780 3365/3363/3780 +f 3429/3430/3781 3413/3414/3781 3428/3429/3781 +f 3431/3431/3782 3352/3411/3782 3413/3414/3782 +f 3423/3424/2455 3213/3214/2455 3420/3421/2455 +f 3384/3380/3783 3404/3401/3783 3408/3406/3783 +f 3395/3393/3784 3394/3392/3784 3400/3397/3784 +f 3430/3410/3785 3045/3087/3785 3044/3086/3785 +f 3431/3431/3786 3412/3412/3786 3352/3411/3786 +f 3431/3431/3787 3413/3414/3787 3429/3430/3787 +f 3429/3430/3788 3423/3424/3788 3420/3421/3788 +f 3214/3213/1626 3054/3097/1626 3213/3214/1626 +f 3366/3364/3789 3381/3378/3789 3385/3382/3789 +f 3420/3421/3790 3431/3431/3790 3429/3430/3790 +f 3213/3214/1627 3054/3097/1627 3212/3215/1627 +f 3367/3365/3791 3381/3378/3791 3366/3364/3791 +f 3430/3410/3792 3046/3090/3792 3045/3087/3792 +f 3430/3410/3793 3412/3412/3793 3046/3090/3793 +f 3382/3379/3794 3404/3401/3794 3384/3380/3794 +f 3432/3432/3795 3431/3431/3795 3420/3421/3795 +f 3382/3379/3796 3400/3397/3796 3404/3401/3796 +f 3431/3431/3797 3046/3090/3797 3412/3412/3797 +f 3432/3432/3798 3433/3433/3798 3431/3431/3798 +f 3209/3209/1637 3420/3421/1637 3212/3215/1637 +f 3205/3205/3799 3047/3089/3799 3434/3434/3799 +f 3433/3433/3800 3046/3090/3800 3431/3431/3800 +f 3209/3209/1640 3432/3432/1640 3420/3421/1640 +f 3212/3215/3801 3048/3091/3801 3209/3209/3801 +f 3367/3365/3802 3379/3375/3802 3381/3378/3802 +f 3380/3377/3803 3400/3397/3803 3382/3379/3803 +f 3205/3205/3804 3434/3434/3804 3204/3206/3804 +f 3380/3377/3805 3399/3398/3805 3400/3397/3805 +f 3435/3435/3806 3433/3433/3806 3432/3432/3806 +f 3209/3209/1650 3048/3091/1650 3210/3210/1650 +f 3369/3367/3807 3379/3375/3807 3367/3365/3807 +f 3047/3089/3808 3046/3090/3808 3436/3436/3808 +f 3209/3209/3267 3435/3435/3267 3432/3432/3267 +f 3437/3437/1652 3049/3092/1652 3051/3095/1652 +f 3049/3092/3269 3375/3373/3269 3374/3372/3269 +f 3047/3089/3809 3436/3436/3809 3434/3434/3809 +f 3433/3433/3810 3436/3436/3810 3046/3090/3810 +f 3211/3211/3811 3435/3435/3811 3209/3209/3811 +f 3049/3092/1656 3374/3372/1656 3050/3093/1656 +f 3437/3437/1657 3051/3095/1657 3204/3206/1657 +f 3437/3437/3812 3375/3373/3812 3049/3092/3812 +f 3438/3438/3813 3436/3436/3813 3433/3433/3813 +f 3377/3374/3814 3395/3393/3814 3399/3398/3814 +f 3380/3377/3815 3377/3374/3815 3399/3398/3815 +f 3050/3093/3272 3374/3372/3272 3383/3381/3272 +f 3369/3367/3816 3378/3376/3816 3379/3375/3816 +f 3435/3435/3817 3438/3438/3817 3433/3433/3817 +f 3371/3369/3818 3378/3376/3818 3369/3367/3818 +f 3211/3211/3819 3438/3438/3819 3435/3435/3819 +f 3210/3210/2496 3050/3093/2496 3440/3439/2496 +f 3204/3206/3820 3439/3440/3820 3437/3437/3820 +f 3437/3437/3821 3439/3440/3821 3375/3373/3821 +f 3434/3434/3822 3436/3436/3822 3204/3206/3822 +f 3391/3389/3823 3395/3393/3823 3377/3374/3823 +f 3210/3210/3824 3440/3439/3824 3211/3211/3824 +f 3376/3441/3825 3375/3373/3825 3439/3440/3825 +f 3211/3211/3826 3440/3439/3826 3438/3438/3826 +f 3377/3374/3827 3378/3376/3827 3441/3442/3827 +f 3204/3206/3828 3436/3436/3828 3439/3440/3828 +f 3441/3442/3829 3391/3389/3829 3377/3374/3829 +f 3383/3381/3283 3440/3439/3283 3050/3093/3283 +f 3373/3371/3830 3378/3376/3830 3371/3369/3830 +f 3439/3440/3831 3436/3436/3831 3376/3441/3831 +f 3383/3381/3288 3442/3385/3288 3440/3439/3288 +f 3443/3443/3832 3436/3436/3832 3438/3438/3832 +f 3442/3385/3833 3438/3438/3833 3440/3439/3833 +f 3441/3442/3834 3389/3387/3834 3391/3389/3834 +f 3375/3373/3835 3376/3441/3835 3373/3371/3835 +f 3373/3371/3836 3376/3441/3836 3378/3376/3836 +f 3441/3442/3837 3378/3376/3837 3443/3443/3837 +f 3443/3443/3838 3376/3441/3838 3436/3436/3838 +f 3442/3385/3839 3443/3443/3839 3438/3438/3839 +f 3443/3443/3840 3378/3376/3840 3376/3441/3840 +f 3443/3443/3841 3389/3387/3841 3441/3442/3841 +f 3443/3443/3842 3442/3385/3842 3389/3387/3842 +f 3444/3444/3843 3446/3445/3843 3447/3446/3843 +f 3447/3446/3844 3446/3445/3844 3448/3447/3844 +f 3447/3446/3845 3445/3448/3845 3444/3444/3845 +f 3448/3447/3846 3445/3448/3846 3447/3446/3846 +f 3446/3445/3847 3452/3449/3847 3449/3450/3847 +f 3452/3449/3848 3451/3451/3848 3449/3450/3848 +f 3450/3452/3849 3451/3451/3849 3452/3449/3849 +f 3455/3453/3850 3454/3454/3850 3453/3455/3850 +f 3456/3456/3851 3454/3454/3851 3455/3453/3851 +f 3458/3457/3852 3461/3458/3852 3457/3459/3852 +f 3461/3458/3853 3460/3460/3853 3457/3459/3853 +f 3459/3461/3854 3460/3460/3854 3461/3458/3854 +f 3464/3462/3855 3463/3463/3855 3462/3464/3855 +f 3465/3465/3856 3463/3463/3856 3464/3462/3856 +f 3467/3466/3857 3470/3467/3857 3466/3468/3857 +f 3470/3467/3858 3469/3469/3858 3466/3468/3858 +f 3468/3470/3859 3469/3469/3859 3470/3467/3859 +f 3472/3471/3860 3475/3472/3860 3471/3473/3860 +f 3475/3472/3861 3474/3474/3861 3471/3473/3861 +f 3473/3475/3862 3474/3474/3862 3475/3472/3862 +f 3478/3476/3863 3477/3477/3863 3476/3478/3863 +f 3479/3479/3864 3477/3477/3864 3478/3476/3864 +f 3483/3480/3865 3482/3481/3865 3480/3482/3865 +f 3481/3483/3866 3482/3481/3866 3483/3480/3866 +f 3485/3484/3867 3488/3485/3867 3484/3486/3867 +f 3488/3485/3868 3487/3487/3868 3484/3486/3868 +f 3486/3488/3869 3487/3487/3869 3488/3485/3869 +f 3491/3489/3870 3490/3490/3870 3489/3491/3870 +f 3492/3492/3871 3490/3490/3871 3491/3489/3871 +f 3495/3493/3872 3494/3494/3872 3493/3495/3872 +f 3496/3496/3873 3494/3494/3873 3495/3493/3873 +f 3500/3497/3874 3499/3498/3874 3497/3499/3874 +f 3498/3500/3875 3499/3498/3875 3500/3497/3875 +f 3501/3501/3876 3467/3466/3876 3466/3468/3876 +f 3502/3502/3877 3463/3463/3877 3465/3465/3877 +f 3502/3502/3878 3467/3466/3878 3501/3501/3878 +f 3464/3462/3879 3504/3503/3879 3505/3504/3879 +f 3465/3465/3880 3464/3462/3880 3505/3504/3880 +f 3506/3505/3881 3465/3465/3881 3503/3506/3881 +f 3506/3505/3882 3502/3502/3882 3465/3465/3882 +f 3503/3506/3883 3465/3465/3883 3505/3504/3883 +f 3504/3503/3884 3464/3462/3884 3467/3466/3884 +f 3467/3466/3885 3502/3502/3885 3506/3505/3885 +f 3504/3503/3886 3467/3466/3886 3506/3505/3886 +f 3505/3504/3887 3506/3505/3887 3503/3506/3887 +f 3504/3503/3888 3506/3505/3888 3505/3504/3888 +f 3467/3466/3889 3464/3462/3889 3507/3507/3889 +f 3462/3464/3890 3507/3507/3890 3464/3462/3890 +f 3462/3464/3891 3510/3508/3891 3507/3507/3891 +f 3463/3463/3892 3509/3509/3892 3508/3510/3892 +f 3510/3508/3893 3462/3464/3893 3511/3511/3893 +f 3510/3508/3894 3508/3510/3894 3509/3509/3894 +f 3462/3464/3895 3463/3463/3895 3508/3510/3895 +f 3511/3511/3896 3508/3510/3896 3510/3508/3896 +f 3511/3511/3897 3462/3464/3897 3508/3510/3897 +f 3512/3512/3898 3458/3457/3898 3457/3459/3898 +f 3513/3513/3899 3454/3454/3899 3456/3456/3899 +f 3513/3513/3900 3458/3457/3900 3512/3512/3900 +f 3455/3453/3901 3515/3514/3901 3516/3515/3901 +f 3456/3456/3902 3455/3453/3902 3516/3515/3902 +f 3517/3516/3903 3456/3456/3903 3514/3517/3903 +f 3517/3516/3904 3513/3513/3904 3456/3456/3904 +f 3514/3517/3905 3456/3456/3905 3516/3515/3905 +f 3515/3514/3906 3455/3453/3906 3458/3457/3906 +f 3458/3457/3907 3513/3513/3907 3517/3516/3907 +f 3515/3514/3908 3458/3457/3908 3517/3516/3908 +f 3516/3515/3909 3517/3516/3909 3514/3517/3909 +f 3515/3514/3910 3517/3516/3910 3516/3515/3910 +f 3458/3457/3911 3455/3453/3911 3518/3518/3911 +f 3453/3455/3912 3518/3518/3912 3455/3453/3912 +f 3454/3454/3913 3520/3519/3913 3519/3520/3913 +f 3520/3519/3914 3518/3518/3914 3522/3521/3914 +f 3518/3518/3915 3453/3455/3915 3522/3521/3915 +f 3522/3521/3916 3453/3455/3916 3521/3522/3916 +f 3522/3521/3917 3519/3520/3917 3520/3519/3917 +f 3453/3455/3918 3454/3454/3918 3519/3520/3918 +f 3521/3522/3919 3519/3520/3919 3522/3521/3919 +f 3521/3522/3920 3453/3455/3920 3519/3520/3920 +f 3476/3478/3921 3523/3523/3921 3478/3476/3921 +f 3477/3477/3922 3525/3524/3922 3524/3525/3922 +f 3525/3524/3923 3523/3523/3923 3527/3526/3923 +f 3523/3523/3924 3476/3478/3924 3527/3526/3924 +f 3527/3526/3925 3476/3478/3925 3526/3527/3925 +f 3527/3526/3926 3524/3525/3926 3525/3524/3926 +f 3476/3478/3927 3477/3477/3927 3524/3525/3927 +f 3526/3527/3928 3524/3525/3928 3527/3526/3928 +f 3526/3527/3929 3476/3478/3929 3524/3525/3929 +f 3449/3450/3930 3528/3528/3930 3446/3445/3930 +f 3529/3529/3931 3445/3448/3931 3448/3447/3931 +f 3446/3445/3932 3528/3528/3932 3531/3530/3932 +f 3448/3447/3933 3446/3445/3933 3531/3530/3933 +f 3532/3531/3934 3448/3447/3934 3530/3532/3934 +f 3532/3531/3935 3529/3529/3935 3448/3447/3935 +f 3530/3532/3936 3448/3447/3936 3531/3530/3936 +f 3528/3528/3937 3529/3529/3937 3532/3531/3937 +f 3531/3530/3938 3532/3531/3938 3530/3532/3938 +f 3528/3528/3939 3532/3531/3939 3531/3530/3939 +f 3534/3533/3940 3477/3477/3940 3479/3479/3940 +f 3523/3523/3941 3480/3482/3941 3478/3476/3941 +f 3533/3534/3942 3478/3476/3942 3480/3482/3942 +f 3478/3476/3943 3533/3534/3943 3536/3535/3943 +f 3479/3479/3944 3478/3476/3944 3536/3535/3944 +f 3537/3536/3945 3479/3479/3945 3535/3537/3945 +f 3537/3536/3946 3534/3533/3946 3479/3479/3946 +f 3535/3537/3947 3479/3479/3947 3536/3535/3947 +f 3533/3534/3948 3534/3533/3948 3537/3536/3948 +f 3536/3535/3949 3537/3536/3949 3535/3537/3949 +f 3533/3534/3950 3537/3536/3950 3536/3535/3950 +f 3444/3444/3951 3540/3538/3951 3446/3445/3951 +f 3445/3448/3952 3539/3539/3952 3538/3540/3952 +f 3540/3538/3953 3444/3444/3953 3541/3541/3953 +f 3540/3538/3954 3538/3540/3954 3539/3539/3954 +f 3444/3444/3955 3445/3448/3955 3538/3540/3955 +f 3541/3541/3956 3538/3540/3956 3540/3538/3956 +f 3541/3541/3957 3444/3444/3957 3538/3540/3957 +f 3542/3542/3958 3485/3484/3958 3484/3486/3958 +f 3544/3543/3959 3485/3484/3959 3542/3542/3959 +f 3491/3489/3960 3545/3544/3960 3546/3545/3960 +f 3492/3492/3961 3491/3489/3961 3546/3545/3961 +f 3544/3543/3962 3492/3492/3962 3543/3546/3962 +f 3543/3546/3963 3492/3492/3963 3546/3545/3963 +f 3545/3544/3964 3491/3489/3964 3485/3484/3964 +f 3545/3544/3965 3485/3484/3965 3544/3543/3965 +f 3546/3545/3966 3544/3543/3966 3543/3546/3966 +f 3545/3544/3967 3544/3543/3967 3546/3545/3967 +f 3485/3484/3968 3491/3489/3968 3547/3547/3968 +f 3489/3491/3969 3547/3547/3969 3491/3489/3969 +f 3489/3491/3970 3550/3548/3970 3547/3547/3970 +f 3490/3490/3971 3549/3549/3971 3548/3550/3971 +f 3550/3548/3972 3489/3491/3972 3551/3551/3972 +f 3550/3548/3973 3548/3550/3973 3549/3549/3973 +f 3489/3491/3974 3490/3490/3974 3548/3550/3974 +f 3551/3551/3975 3548/3550/3975 3550/3548/3975 +f 3551/3551/3976 3489/3491/3976 3548/3550/3976 +f 3554/3552/3977 3472/3471/3977 3471/3473/3977 +f 3556/3553/3978 3553/3554/3978 3552/3555/3978 +f 3556/3553/3979 3472/3471/3979 3554/3552/3979 +f 3472/3471/3980 3555/3556/3980 3716/3557/3980 +f 3555/3556/3981 3558/3558/3981 3559/3559/3981 +f 3552/3555/3982 3555/3556/3982 3559/3559/3982 +f 3560/3560/3983 3552/3555/3983 3557/3561/3983 +f 3560/3560/3984 3556/3553/3984 3552/3555/3984 +f 3557/3561/3985 3552/3555/3985 3559/3559/3985 +f 3558/3558/3986 3555/3556/3986 3472/3471/3986 +f 3472/3471/3987 3556/3553/3987 3560/3560/3987 +f 3558/3558/3988 3472/3471/3988 3560/3560/3988 +f 3559/3559/3989 3560/3560/3989 3557/3561/3989 +f 3558/3558/3990 3560/3560/3990 3559/3559/3990 +f 3555/3556/3991 3553/3554/3991 3561/3562/3991 +f 3552/3555/3992 3553/3554/3992 3555/3556/3992 +f 3564/3563/3993 3563/3564/3993 3562/3565/3993 +f 3565/3566/3994 3563/3564/3994 3564/3563/3994 +f 3568/3567/3995 3567/3568/3995 3570/3569/3995 +f 3570/3569/3996 3567/3568/3996 3571/3570/3996 +f 3569/3571/3997 3568/3567/3997 3570/3569/3997 +f 3569/3571/3998 3572/3572/3998 3566/3573/3998 +f 3571/3570/3999 3567/3568/3999 3566/3573/3999 +f 3572/3572/4000 3569/3571/4000 3570/3569/4000 +f 3572/3572/4001 3571/3570/4001 3566/3573/4001 +f 3570/3569/4002 3571/3570/4002 3572/3572/4002 +f 3445/3448/4003 3529/3529/4003 3568/3567/4003 +f 3539/3539/4004 3445/3448/4004 3568/3567/4004 +f 3446/3445/4005 3540/3538/4005 3569/3571/4005 +f 3568/3567/4006 3573/3574/4006 3539/3539/4006 +f 3569/3571/4007 3540/3538/4007 3574/3575/4007 +f 3573/3574/4008 3568/3567/4008 3569/3571/4008 +f 3574/3575/4009 3540/3538/4009 3539/3539/4009 +f 3574/3575/4010 3573/3574/4010 3569/3571/4010 +f 3539/3539/4011 3573/3574/4011 3574/3575/4011 +f 3575/3576/4012 3451/3451/4012 3529/3529/4012 +f 3451/3451/4013 3575/3576/4013 3576/3577/4013 +f 3528/3528/4014 3449/3450/4014 3577/3578/4014 +f 3575/3576/4015 3529/3529/4015 3528/3528/4015 +f 3528/3528/4016 3576/3577/4016 3575/3576/4016 +f 3449/3450/4017 3451/3451/4017 3576/3577/4017 +f 3577/3578/4018 3576/3577/4018 3528/3528/4018 +f 3577/3578/4019 3449/3450/4019 3576/3577/4019 +f 3529/3529/4020 3579/3579/4020 3580/3580/4020 +f 3580/3580/4021 3579/3579/4021 3582/3581/4021 +f 3581/3582/4022 3583/3583/4022 3578/3584/4022 +f 3582/3581/4023 3579/3579/4023 3578/3584/4023 +f 3583/3583/4024 3581/3582/4024 3580/3580/4024 +f 3583/3583/4025 3582/3581/4025 3578/3584/4025 +f 3580/3580/4026 3582/3581/4026 3583/3583/4026 +f 3450/3452/4027 3529/3529/4027 3451/3451/4027 +f 3446/3445/4028 3581/3582/4028 3452/3449/4028 +f 3450/3452/4029 3579/3579/4029 3529/3529/4029 +f 3578/3584/4030 3452/3449/4030 3581/3582/4030 +f 3452/3449/4031 3578/3584/4031 3585/3585/4031 +f 3450/3452/4032 3452/3449/4032 3585/3585/4032 +f 3579/3579/4033 3450/3452/4033 3584/3586/4033 +f 3584/3586/4034 3450/3452/4034 3585/3585/4034 +f 3585/3585/4035 3579/3579/4035 3584/3586/4035 +f 3578/3584/4036 3579/3579/4036 3585/3585/4036 +f 3586/3587/4037 3460/3460/4037 3513/3513/4037 +f 3460/3460/4038 3586/3587/4038 3587/3588/4038 +f 3512/3512/4039 3457/3459/4039 3588/3589/4039 +f 3586/3587/4040 3513/3513/4040 3512/3512/4040 +f 3512/3512/4041 3587/3588/4041 3586/3587/4041 +f 3457/3459/4042 3460/3460/4042 3587/3588/4042 +f 3588/3589/4043 3587/3588/4043 3512/3512/4043 +f 3588/3589/4044 3457/3459/4044 3587/3588/4044 +f 3454/3454/4045 3513/3513/4045 3529/3529/4045 +f 3458/3457/4046 3581/3582/4046 3446/3445/4046 +f 3454/3454/4047 3529/3529/4047 3580/3580/4047 +f 3458/3457/4048 3518/3518/4048 3581/3582/4048 +f 3520/3519/4049 3454/3454/4049 3580/3580/4049 +f 3580/3580/4050 3589/3590/4050 3520/3519/4050 +f 3589/3590/4051 3580/3580/4051 3581/3582/4051 +f 3518/3518/4052 3589/3590/4052 3581/3582/4052 +f 3520/3519/4053 3589/3590/4053 3518/3518/4053 +f 3590/3591/4054 3513/3513/4054 3460/3460/4054 +f 3459/3461/4055 3590/3591/4055 3460/3460/4055 +f 3507/3507/4056 3461/3458/4056 3458/3457/4056 +f 3591/3592/4057 3461/3458/4057 3507/3507/4057 +f 3461/3458/4058 3591/3592/4058 3593/3593/4058 +f 3459/3461/4059 3461/3458/4059 3593/3593/4059 +f 3590/3591/4060 3459/3461/4060 3594/3594/4060 +f 3594/3594/4061 3459/3461/4061 3592/3595/4061 +f 3592/3595/4062 3459/3461/4062 3593/3593/4062 +f 3591/3592/4063 3590/3591/4063 3594/3594/4063 +f 3593/3593/4064 3594/3594/4064 3592/3595/4064 +f 3591/3592/4065 3594/3594/4065 3593/3593/4065 +f 3595/3596/4066 3513/3513/4066 3590/3591/4066 +f 3595/3596/4067 3590/3591/4067 3596/3597/4067 +f 3507/3507/4068 3597/3598/4068 3591/3592/4068 +f 3596/3597/4069 3590/3591/4069 3591/3592/4069 +f 3597/3598/4070 3507/3507/4070 3595/3596/4070 +f 3597/3598/4071 3596/3597/4071 3591/3592/4071 +f 3595/3596/4072 3596/3597/4072 3597/3598/4072 +f 3463/3463/4073 3502/3502/4073 3595/3596/4073 +f 3509/3509/4074 3463/3463/4074 3595/3596/4074 +f 3507/3507/4075 3510/3508/4075 3599/3599/4075 +f 3595/3596/4076 3507/3507/4076 3599/3599/4076 +f 3595/3596/4077 3598/3600/4077 3509/3509/4077 +f 3599/3599/4078 3510/3508/4078 3600/3601/4078 +f 3598/3600/4079 3595/3596/4079 3599/3599/4079 +f 3600/3601/4080 3510/3508/4080 3509/3509/4080 +f 3600/3601/4081 3598/3600/4081 3599/3599/4081 +f 3509/3509/4082 3598/3600/4082 3600/3601/4082 +f 3601/3602/4083 3469/3469/4083 3502/3502/4083 +f 3469/3469/4084 3601/3602/4084 3602/3603/4084 +f 3501/3501/4085 3466/3468/4085 3603/3604/4085 +f 3601/3602/4086 3502/3502/4086 3501/3501/4086 +f 3501/3501/4087 3602/3603/4087 3601/3602/4087 +f 3466/3468/4088 3469/3469/4088 3602/3603/4088 +f 3603/3604/4089 3602/3603/4089 3501/3501/4089 +f 3603/3604/4090 3466/3468/4090 3602/3603/4090 +f 3606/3605/4091 3605/3606/4091 3608/3607/4091 +f 3608/3607/4092 3605/3606/4092 3609/3608/4092 +f 3607/3609/4093 3606/3605/4093 3608/3607/4093 +f 3607/3609/4094 3610/3610/4094 3604/3611/4094 +f 3609/3608/4095 3605/3606/4095 3604/3611/4095 +f 3610/3610/4096 3607/3609/4096 3608/3607/4096 +f 3610/3610/4097 3609/3608/4097 3604/3611/4097 +f 3608/3607/4098 3609/3608/4098 3610/3610/4098 +f 3606/3605/4099 3502/3502/4099 3469/3469/4099 +f 3468/3470/4100 3606/3605/4100 3469/3469/4100 +f 3467/3466/4101 3607/3609/4101 3470/3467/4101 +f 3468/3470/4102 3605/3606/4102 3606/3605/4102 +f 3604/3611/4103 3470/3467/4103 3607/3609/4103 +f 3470/3467/4104 3604/3611/4104 3612/3612/4104 +f 3468/3470/4105 3470/3467/4105 3612/3612/4105 +f 3605/3606/4106 3468/3470/4106 3611/3613/4106 +f 3611/3613/4107 3468/3470/4107 3612/3612/4107 +f 3612/3612/4108 3605/3606/4108 3611/3613/4108 +f 3604/3611/4109 3605/3606/4109 3612/3612/4109 +f 3614/3614/4110 3499/3498/4110 3613/3615/4110 +f 3499/3498/4111 3614/3614/4111 3615/3616/4111 +f 3617/3617/4112 3497/3499/4112 3616/3618/4112 +f 3614/3614/4113 3613/3615/4113 3617/3617/4113 +f 3617/3617/4114 3615/3616/4114 3614/3614/4114 +f 3497/3499/4115 3499/3498/4115 3615/3616/4115 +f 3616/3618/4116 3615/3616/4116 3617/3617/4116 +f 3616/3618/4117 3497/3499/4117 3615/3616/4117 +f 3620/3619/4118 3619/3620/4118 3622/3621/4118 +f 3622/3621/4119 3619/3620/4119 3623/3622/4119 +f 3621/3623/4120 3624/3624/4120 3618/3625/4120 +f 3623/3622/4121 3619/3620/4121 3618/3625/4121 +f 3624/3624/4122 3621/3623/4122 3622/3621/4122 +f 3624/3624/4123 3623/3622/4123 3618/3625/4123 +f 3622/3621/4124 3623/3622/4124 3624/3624/4124 +f 3565/3566/4125 3633/3626/4125 3620/3619/4125 +f 3625/3627/4126 3633/3626/4126 3565/3566/4126 +f 3755/3628/4127 3625/3627/4127 3565/3566/4127 +f 3625/3627/4128 3755/3628/4128 3626/3629/4128 +f 3629/3630/4129 3628/3631/4129 3627/3632/4129 +f 3629/3630/4130 3626/3629/4130 3755/3628/4130 +f 3628/3631/4131 3625/3627/4131 3626/3629/4131 +f 3627/3632/4132 3626/3629/4132 3629/3630/4132 +f 3627/3632/4133 3628/3631/4133 3626/3629/4133 +f 3631/3633/4134 3625/3627/4134 3628/3631/4134 +f 3630/3634/4135 3625/3627/4135 3631/3633/4135 +f 3634/3635/4136 3633/3626/4136 3636/3636/4136 +f 3635/3637/4137 3637/3638/4137 3632/3639/4137 +f 3636/3636/4138 3633/3626/4138 3632/3639/4138 +f 3637/3638/4139 3635/3637/4139 3634/3635/4139 +f 3637/3638/4140 3636/3636/4140 3632/3639/4140 +f 3634/3635/4141 3636/3636/4141 3637/3638/4141 +f 3640/3640/4142 3639/3641/4142 3638/3642/4142 +f 3641/3643/4143 3639/3641/4143 3640/3640/4143 +f 3644/3644/4144 3643/3645/4144 3642/3646/4144 +f 3643/3645/4145 3644/3644/4145 3645/3647/4145 +f 3648/3648/4146 3647/3649/4146 3646/3650/4146 +f 3644/3644/4147 3642/3646/4147 3648/3648/4147 +f 3648/3648/4148 3645/3647/4148 3644/3644/4148 +f 3647/3649/4149 3643/3645/4149 3645/3647/4149 +f 3646/3650/4150 3645/3647/4150 3648/3648/4150 +f 3646/3650/4151 3647/3649/4151 3645/3647/4151 +f 3649/3651/4152 3651/3652/4152 3647/3649/4152 +f 3651/3652/4153 3643/3645/4153 3647/3649/4153 +f 3650/3653/4154 3643/3645/4154 3651/3652/4154 +f 3654/3654/4155 3653/3655/4155 3656/3656/4155 +f 3656/3656/4156 3653/3655/4156 3657/3657/4156 +f 3655/3658/4157 3658/3659/4157 3652/3660/4157 +f 3657/3657/4158 3653/3655/4158 3652/3660/4158 +f 3658/3659/4159 3655/3658/4159 3656/3656/4159 +f 3658/3659/4160 3657/3657/4160 3652/3660/4160 +f 3656/3656/4161 3657/3657/4161 3658/3659/4161 +f 3659/3661/4162 3474/3474/4162 3556/3553/4162 +f 3474/3474/4163 3659/3661/4163 3660/3662/4163 +f 3554/3552/4164 3471/3473/4164 3661/3663/4164 +f 3659/3661/4165 3556/3553/4165 3554/3552/4165 +f 3554/3552/4166 3660/3662/4166 3659/3661/4166 +f 3471/3473/4167 3474/3474/4167 3660/3662/4167 +f 3661/3663/4168 3660/3662/4168 3554/3552/4168 +f 3661/3663/4169 3471/3473/4169 3660/3662/4169 +f 3473/3475/4170 3662/3664/4170 3474/3474/4170 +f 3523/3523/4171 3475/3472/4171 3472/3471/4171 +f 3523/3523/4172 3664/3665/4172 3475/3472/4172 +f 3473/3475/4173 3666/3666/4173 3662/3664/4173 +f 3663/3667/4174 3475/3472/4174 3664/3665/4174 +f 3475/3472/4175 3663/3667/4175 3667/3668/4175 +f 3473/3475/4176 3475/3472/4176 3667/3668/4176 +f 3666/3666/4177 3473/3475/4177 3665/3669/4177 +f 3665/3669/4178 3473/3475/4178 3667/3668/4178 +f 3667/3668/4179 3666/3666/4179 3665/3669/4179 +f 3663/3667/4180 3666/3666/4180 3667/3668/4180 +f 3662/3664/4181 3666/3666/4181 3668/3670/4181 +f 3668/3670/4182 3666/3666/4182 3669/3671/4182 +f 3664/3665/4183 3662/3664/4183 3668/3670/4183 +f 3664/3665/4184 3670/3672/4184 3663/3667/4184 +f 3669/3671/4185 3666/3666/4185 3663/3667/4185 +f 3670/3672/4186 3664/3665/4186 3668/3670/4186 +f 3670/3672/4187 3669/3671/4187 3663/3667/4187 +f 3668/3670/4188 3669/3671/4188 3670/3672/4188 +f 3486/3488/4189 3568/3567/4189 3487/3487/4189 +f 3446/3445/4190 3488/3485/4190 3485/3484/4190 +f 3446/3445/4191 3569/3571/4191 3488/3485/4191 +f 3486/3488/4192 3567/3568/4192 3568/3567/4192 +f 3566/3573/4193 3488/3485/4193 3569/3571/4193 +f 3488/3485/4194 3566/3573/4194 3672/3673/4194 +f 3486/3488/4195 3488/3485/4195 3672/3673/4195 +f 3567/3568/4196 3486/3488/4196 3671/3674/4196 +f 3671/3674/4197 3486/3488/4197 3672/3673/4197 +f 3672/3673/4198 3567/3568/4198 3671/3674/4198 +f 3566/3573/4199 3567/3568/4199 3672/3673/4199 +f 3673/3675/4200 3482/3481/4200 3534/3533/4200 +f 3482/3481/4201 3673/3675/4201 3674/3676/4201 +f 3533/3534/4202 3480/3482/4202 3675/3677/4202 +f 3673/3675/4203 3534/3533/4203 3533/3534/4203 +f 3533/3534/4204 3674/3676/4204 3673/3675/4204 +f 3480/3482/4205 3482/3481/4205 3674/3676/4205 +f 3675/3677/4206 3674/3676/4206 3533/3534/4206 +f 3675/3677/4207 3480/3482/4207 3674/3676/4207 +f 3534/3533/4208 3662/3664/4208 3477/3477/4208 +f 3525/3524/4209 3477/3477/4209 3662/3664/4209 +f 3662/3664/4210 3676/3678/4210 3525/3524/4210 +f 3664/3665/4211 3523/3523/4211 3677/3679/4211 +f 3676/3678/4212 3662/3664/4212 3664/3665/4212 +f 3677/3679/4213 3523/3523/4213 3525/3524/4213 +f 3677/3679/4214 3676/3678/4214 3664/3665/4214 +f 3525/3524/4215 3676/3678/4215 3677/3679/4215 +f 3547/3547/4216 3480/3482/4216 3523/3523/4216 +f 3547/3547/4217 3483/3480/4217 3480/3482/4217 +f 3678/3680/4218 3534/3533/4218 3482/3481/4218 +f 3481/3483/4219 3678/3680/4219 3482/3481/4219 +f 3679/3681/4220 3483/3480/4220 3547/3547/4220 +f 3483/3480/4221 3679/3681/4221 3681/3682/4221 +f 3481/3483/4222 3483/3480/4222 3681/3682/4222 +f 3678/3680/4223 3481/3483/4223 3680/3683/4223 +f 3680/3683/4224 3481/3483/4224 3681/3682/4224 +f 3681/3682/4225 3678/3680/4225 3680/3683/4225 +f 3679/3681/4226 3678/3680/4226 3681/3682/4226 +f 3487/3487/4227 3684/3684/4227 3492/3492/4227 +f 3544/3543/4228 3487/3487/4228 3492/3492/4228 +f 3487/3487/4229 3544/3543/4229 3682/3685/4229 +f 3542/3542/4230 3484/3486/4230 3683/3686/4230 +f 3542/3542/4231 3682/3685/4231 3544/3543/4231 +f 3484/3486/4232 3487/3487/4232 3682/3685/4232 +f 3683/3686/4233 3682/3685/4233 3542/3542/4233 +f 3683/3686/4234 3484/3486/4234 3682/3685/4234 +f 3684/3684/4235 3678/3680/4235 3685/3687/4235 +f 3685/3687/4236 3678/3680/4236 3686/3688/4236 +f 3547/3547/4237 3684/3684/4237 3685/3687/4237 +f 3547/3547/4238 3687/3689/4238 3679/3681/4238 +f 3686/3688/4239 3678/3680/4239 3679/3681/4239 +f 3687/3689/4240 3547/3547/4240 3685/3687/4240 +f 3687/3689/4241 3686/3688/4241 3679/3681/4241 +f 3685/3687/4242 3686/3688/4242 3687/3689/4242 +f 3492/3492/4243 3684/3684/4243 3490/3490/4243 +f 3549/3549/4244 3490/3490/4244 3684/3684/4244 +f 3547/3547/4245 3550/3548/4245 3689/3690/4245 +f 3684/3684/4246 3547/3547/4246 3689/3690/4246 +f 3684/3684/4247 3688/3691/4247 3549/3549/4247 +f 3689/3690/4248 3550/3548/4248 3690/3692/4248 +f 3688/3691/4249 3684/3684/4249 3689/3690/4249 +f 3690/3692/4250 3550/3548/4250 3549/3549/4250 +f 3690/3692/4251 3688/3691/4251 3689/3690/4251 +f 3549/3549/4252 3688/3691/4252 3690/3692/4252 +f 3494/3494/4253 3613/3615/4253 3606/3605/4253 +f 3692/3693/4254 3607/3609/4254 3467/3466/4254 +f 3691/3694/4255 3494/3494/4255 3606/3605/4255 +f 3606/3605/4256 3693/3695/4256 3691/3694/4256 +f 3607/3609/4257 3692/3693/4257 3694/3696/4257 +f 3693/3695/4258 3606/3605/4258 3607/3609/4258 +f 3694/3696/4259 3692/3693/4259 3691/3694/4259 +f 3694/3696/4260 3693/3695/4260 3607/3609/4260 +f 3691/3694/4261 3693/3695/4261 3694/3696/4261 +f 3493/3495/4262 3692/3693/4262 3495/3493/4262 +f 3494/3494/4263 3691/3694/4263 3695/3697/4263 +f 3691/3694/4264 3692/3693/4264 3697/3698/4264 +f 3692/3693/4265 3493/3495/4265 3697/3698/4265 +f 3697/3698/4266 3493/3495/4266 3696/3699/4266 +f 3697/3698/4267 3695/3697/4267 3691/3694/4267 +f 3493/3495/4268 3494/3494/4268 3695/3697/4268 +f 3696/3699/4269 3695/3697/4269 3697/3698/4269 +f 3696/3699/4270 3493/3495/4270 3695/3697/4270 +f 3613/3615/4271 3494/3494/4271 3496/3496/4271 +f 3692/3693/4272 3497/3499/4272 3495/3493/4272 +f 3617/3617/4273 3495/3493/4273 3497/3499/4273 +f 3495/3493/4274 3617/3617/4274 3699/3700/4274 +f 3496/3496/4275 3495/3493/4275 3699/3700/4275 +f 3700/3701/4276 3496/3496/4276 3698/3702/4276 +f 3700/3701/4277 3613/3615/4277 3496/3496/4277 +f 3698/3702/4278 3496/3496/4278 3699/3700/4278 +f 3617/3617/4279 3613/3615/4279 3700/3701/4279 +f 3699/3700/4280 3700/3701/4280 3698/3702/4280 +f 3617/3617/4281 3700/3701/4281 3699/3700/4281 +f 3499/3498/4282 3620/3619/4282 3613/3615/4282 +f 3621/3623/4283 3497/3499/4283 3692/3693/4283 +f 3621/3623/4284 3500/3497/4284 3497/3499/4284 +f 3498/3500/4285 3620/3619/4285 3499/3498/4285 +f 3498/3500/4286 3619/3620/4286 3620/3619/4286 +f 3618/3625/4287 3500/3497/4287 3621/3623/4287 +f 3500/3497/4288 3618/3625/4288 3702/3703/4288 +f 3498/3500/4289 3500/3497/4289 3702/3703/4289 +f 3619/3620/4290 3498/3500/4290 3701/3704/4290 +f 3701/3704/4291 3498/3500/4291 3702/3703/4291 +f 3702/3703/4292 3619/3620/4292 3701/3704/4292 +f 3618/3625/4293 3619/3620/4293 3702/3703/4293 +f 3565/3566/4294 3620/3619/4294 3563/3564/4294 +f 3621/3623/4295 3620/3619/4295 3622/3621/4295 +f 3703/3705/4296 3563/3564/4296 3620/3619/4296 +f 3621/3623/4297 3704/3706/4297 3706/3707/4297 +f 3620/3619/4298 3621/3623/4298 3706/3707/4298 +f 3620/3619/4299 3705/3708/4299 3703/3705/4299 +f 3706/3707/4300 3704/3706/4300 3707/3709/4300 +f 3705/3708/4301 3620/3619/4301 3706/3707/4301 +f 3707/3709/4302 3704/3706/4302 3703/3705/4302 +f 3707/3709/4303 3705/3708/4303 3706/3707/4303 +f 3703/3705/4304 3705/3708/4304 3707/3709/4304 +f 3710/3710/4305 3711/3711/4305 3712/3712/4305 +f 3709/3713/4306 3710/3710/4306 3712/3712/4306 +f 3713/3714/4307 3709/3713/4307 3714/3715/4307 +f 3714/3715/4308 3709/3713/4308 3708/3716/4308 +f 3708/3716/4309 3709/3713/4309 3712/3712/4309 +f 3711/3711/4310 3713/3714/4310 3714/3715/4310 +f 3712/3712/4311 3714/3715/4311 3708/3716/4311 +f 3711/3711/4312 3714/3715/4312 3712/3712/4312 +f 3715/3717/4313 3765/3718/4313 3713/3714/4313 +f 3715/3717/4314 3713/3714/4314 3717/3719/4314 +f 3716/3557/4315 3718/3720/4315 3711/3711/4315 +f 3717/3719/4316 3713/3714/4316 3711/3711/4316 +f 3718/3720/4317 3716/3557/4317 3715/3717/4317 +f 3718/3720/4318 3717/3719/4318 3711/3711/4318 +f 3715/3717/4319 3717/3719/4319 3718/3720/4319 +f 3561/3562/4320 3716/3557/4320 3555/3556/4320 +f 3561/3562/4321 3721/3721/4321 3716/3557/4321 +f 3553/3554/4322 3720/3722/4322 3719/3723/4322 +f 3721/3721/4323 3561/3562/4323 3722/3724/4323 +f 3721/3721/4324 3719/3723/4324 3720/3722/4324 +f 3561/3562/4325 3553/3554/4325 3719/3723/4325 +f 3722/3724/4326 3719/3723/4326 3721/3721/4326 +f 3722/3724/4327 3561/3562/4327 3719/3723/4327 +f 3562/3565/4328 3621/3623/4328 3564/3563/4328 +f 3562/3565/4329 3704/3706/4329 3621/3623/4329 +f 3563/3564/4330 3703/3705/4330 3723/3725/4330 +f 3704/3706/4331 3562/3565/4331 3724/3726/4331 +f 3704/3706/4332 3723/3725/4332 3703/3705/4332 +f 3562/3565/4333 3563/3564/4333 3723/3725/4333 +f 3724/3726/4334 3723/3725/4334 3704/3706/4334 +f 3724/3726/4335 3562/3565/4335 3723/3725/4335 +f 3728/3727/4336 3726/3728/4336 3725/3729/4336 +f 3727/3730/4337 3467/3466/4337 3729/3731/4337 +f 3726/3728/4338 3728/3727/4338 3730/3732/4338 +f 3726/3728/4339 3730/3732/4339 3731/3733/4339 +f 3729/3731/4340 3467/3466/4340 3507/3507/4340 +f 3728/3727/4341 3729/3731/4341 3730/3732/4341 +f 3731/3733/4342 3730/3732/4342 3732/3734/4342 +f 3729/3731/4343 3507/3507/4343 3458/3457/4343 +f 3730/3732/4344 3729/3731/4344 3733/3735/4344 +f 3732/3734/4345 3730/3732/4345 3734/3736/4345 +f 3735/3737/4346 3736/3738/4346 3737/3739/4346 +f 3738/3740/4347 3472/3471/4347 3716/3557/4347 +f 3735/3737/4348 3739/3741/4348 3736/3738/4348 +f 3729/3731/4349 3458/3457/4349 3733/3735/4349 +f 3730/3732/4350 3733/3735/4350 3734/3736/4350 +f 3732/3734/4351 3734/3736/4351 3741/3742/4351 +f 3733/3735/4352 3458/3457/4352 3446/3445/4352 +f 3742/3743/4353 3741/3742/4353 3734/3736/4353 +f 3738/3740/4354 3523/3523/4354 3472/3471/4354 +f 3739/3741/4355 3744/3744/4355 3738/3740/4355 +f 3739/3741/4356 3735/3737/4356 3744/3744/4356 +f 3733/3735/4357 3446/3445/4357 3745/3745/4357 +f 3743/3746/4358 3523/3523/4358 3738/3740/4358 +f 3744/3744/4359 3743/3746/4359 3738/3740/4359 +f 3734/3736/4360 3733/3735/4360 3745/3745/4360 +f 3741/3742/4361 3746/3747/4361 3747/3748/4361 +f 3747/3748/4362 3748/3749/4362 3735/3737/4362 +f 3744/3744/4363 3735/3737/4363 3748/3749/4363 +f 3741/3742/4364 3742/3743/4364 3746/3747/4364 +f 3747/3748/4365 3746/3747/4365 3748/3749/4365 +f 3734/3736/4366 3745/3745/4366 3742/3743/4366 +f 3748/3749/4367 3743/3746/4367 3744/3744/4367 +f 3742/3743/4368 3745/3745/4368 3750/3750/4368 +f 3749/3751/4369 3523/3523/4369 3743/3746/4369 +f 3748/3749/4370 3749/3751/4370 3743/3746/4370 +f 3746/3747/4371 3749/3751/4371 3748/3749/4371 +f 3749/3751/4372 3547/3547/4372 3523/3523/4372 +f 3746/3747/4373 3742/3743/4373 3750/3750/4373 +f 3746/3747/4374 3750/3750/4374 3749/3751/4374 +f 3745/3745/4375 3446/3445/4375 3750/3750/4375 +f 3750/3750/4376 3446/3445/4376 3485/3484/4376 +f 3749/3751/4377 3485/3484/4377 3547/3547/4377 +f 3750/3750/4378 3485/3484/4378 3749/3751/4378 +f 3553/3554/4379 3556/3553/4379 3715/3717/4379 +f 3720/3722/4380 3553/3554/4380 3715/3717/4380 +f 3716/3557/4381 3721/3721/4381 3752/3752/4381 +f 3715/3717/4382 3716/3557/4382 3752/3752/4382 +f 3715/3717/4383 3751/3753/4383 3720/3722/4383 +f 3752/3752/4384 3721/3721/4384 3753/3754/4384 +f 3751/3753/4385 3715/3717/4385 3752/3752/4385 +f 3753/3754/4386 3721/3721/4386 3720/3722/4386 +f 3753/3754/4387 3751/3753/4387 3752/3752/4387 +f 3720/3722/4388 3751/3753/4388 3753/3754/4388 +f 3635/3637/4389 3564/3563/4389 3621/3623/4389 +f 3635/3637/4390 3628/3631/4390 3564/3563/4390 +f 3629/3630/4391 3564/3563/4391 3628/3631/4391 +f 3564/3563/4392 3629/3630/4392 3756/3755/4392 +f 3565/3566/4393 3564/3563/4393 3756/3755/4393 +f 3755/3628/4394 3565/3566/4394 3754/3756/4394 +f 3754/3756/4395 3565/3566/4395 3756/3755/4395 +f 3756/3755/4396 3755/3628/4396 3754/3756/4396 +f 3629/3630/4397 3755/3628/4397 3756/3755/4397 +f 3757/3757/4398 3568/3567/4398 3529/3529/4398 +f 3758/3758/2 3731/3733/2 3732/3734/2 +f 3760/3759/2 3731/3733/2 3758/3758/2 +f 3757/3757/4399 3760/3759/4399 3758/3758/4399 +f 3757/3757/4400 3529/3529/4400 3761/3760/4400 +f 3760/3759/2 3726/3728/2 3731/3733/2 +f 3761/3760/4401 3760/3759/4401 3757/3757/4401 +f 3513/3513/4402 3761/3760/4402 3529/3529/4402 +f 3735/3737/2 3737/3739/2 3763/3761/2 +f 3759/3762/2 3735/3737/2 3763/3761/2 +f 3762/3763/4403 3759/3762/4403 3764/3764/4403 +f 3595/3596/4404 3502/3502/4404 3513/3513/4404 +f 3764/3764/4405 3759/3762/4405 3763/3761/4405 +f 3761/3760/4406 3513/3513/4406 3502/3502/4406 +f 3764/3764/4407 3654/3654/4407 3765/3718/4407 +f 3760/3759/2 3766/3765/2 3726/3728/2 +f 3642/3646/4408 3654/3654/4408 3764/3764/4408 +f 3767/3766/2 3766/3765/2 3760/3759/2 +f 3606/3605/4409 3768/3767/4409 3502/3502/4409 +f 3767/3766/2 3769/3768/2 3766/3765/2 +f 3761/3760/4410 3767/3766/4410 3760/3759/4410 +f 3502/3502/4411 3768/3767/4411 3761/3760/4411 +f 3606/3605/4412 3613/3615/4412 3768/3767/4412 +f 3763/3761/2 3770/3769/2 3771/3770/2 +f 3642/3646/4413 3764/3764/4413 3772/3771/4413 +f 3768/3767/4414 3767/3766/4414 3761/3760/4414 +f 3763/3761/2 3771/3770/2 3773/3772/2 +f 3764/3764/4415 3763/3761/4415 3772/3771/4415 +f 3634/3635/4416 3642/3646/4416 3633/3626/4416 +f 3773/3772/2 3771/3770/2 3769/3768/2 +f 3772/3771/4417 3763/3761/4417 3773/3772/4417 +f 3768/3767/4418 3613/3615/4418 3620/3619/4418 +f 3772/3771/4419 3633/3626/4419 3642/3646/4419 +f 3773/3772/2 3769/3768/2 3767/3766/2 +f 3768/3767/4420 3773/3772/4420 3767/3766/4420 +f 3772/3771/4421 3773/3772/4421 3768/3767/4421 +f 3620/3619/4422 3772/3771/4422 3768/3767/4422 +f 3633/3626/4423 3772/3771/4423 3620/3619/4423 +f 3635/3637/4424 3631/3633/4424 3628/3631/4424 +f 3630/3634/4425 3633/3626/4425 3625/3627/4425 +f 3632/3639/4426 3631/3633/4426 3635/3637/4426 +f 3631/3633/4427 3632/3639/4427 3775/3773/4427 +f 3630/3634/4428 3631/3633/4428 3775/3773/4428 +f 3633/3626/4429 3630/3634/4429 3776/3774/4429 +f 3776/3774/4430 3630/3634/4430 3774/3775/4430 +f 3774/3775/4431 3630/3634/4431 3775/3773/4431 +f 3632/3639/4432 3633/3626/4432 3776/3774/4432 +f 3775/3773/4433 3776/3774/4433 3774/3775/4433 +f 3632/3639/4434 3776/3774/4434 3775/3773/4434 +f 3639/3641/4435 3642/3646/4435 3634/3635/4435 +f 3777/3776/4436 3639/3641/4436 3634/3635/4436 +f 3635/3637/4437 3778/3777/4437 3780/3778/4437 +f 3634/3635/4438 3635/3637/4438 3780/3778/4438 +f 3634/3635/4439 3779/3779/4439 3777/3776/4439 +f 3780/3778/4440 3778/3777/4440 3781/3780/4440 +f 3779/3779/4441 3634/3635/4441 3780/3778/4441 +f 3781/3780/4442 3778/3777/4442 3777/3776/4442 +f 3781/3780/4443 3779/3779/4443 3780/3778/4443 +f 3777/3776/4444 3779/3779/4444 3781/3780/4444 +f 3649/3651/4445 3778/3777/4445 3635/3637/4445 +f 3649/3651/4446 3640/3640/4446 3778/3777/4446 +f 3638/3642/4447 3778/3777/4447 3640/3640/4447 +f 3639/3641/4448 3777/3776/4448 3782/3781/4448 +f 3778/3777/4449 3638/3642/4449 3783/3782/4449 +f 3778/3777/4450 3782/3781/4450 3777/3776/4450 +f 3638/3642/4451 3639/3641/4451 3782/3781/4451 +f 3783/3782/4452 3782/3781/4452 3778/3777/4452 +f 3783/3782/4453 3638/3642/4453 3782/3781/4453 +f 3648/3648/4454 3649/3651/4454 3647/3649/4454 +f 3642/3646/4455 3639/3641/4455 3641/3643/4455 +f 3642/3646/4456 3649/3651/4456 3648/3648/4456 +f 3640/3640/4457 3785/3783/4457 3786/3784/4457 +f 3641/3643/4458 3640/3640/4458 3786/3784/4458 +f 3787/3785/4459 3641/3643/4459 3784/3786/4459 +f 3787/3785/4460 3642/3646/4460 3641/3643/4460 +f 3784/3786/4461 3641/3643/4461 3786/3784/4461 +f 3785/3783/4462 3640/3640/4462 3649/3651/4462 +f 3649/3651/4463 3642/3646/4463 3787/3785/4463 +f 3785/3783/4464 3649/3651/4464 3787/3785/4464 +f 3786/3784/4465 3787/3785/4465 3784/3786/4465 +f 3785/3783/4466 3787/3785/4466 3786/3784/4466 +f 3654/3654/4467 3642/3646/4467 3643/3645/4467 +f 3650/3653/4468 3654/3654/4468 3643/3645/4468 +f 3649/3651/4469 3655/3658/4469 3651/3652/4469 +f 3650/3653/4470 3653/3655/4470 3654/3654/4470 +f 3652/3660/4471 3651/3652/4471 3655/3658/4471 +f 3651/3652/4472 3652/3660/4472 3789/3787/4472 +f 3650/3653/4473 3651/3652/4473 3789/3787/4473 +f 3653/3655/4474 3650/3653/4474 3788/3788/4474 +f 3788/3788/4475 3650/3653/4475 3789/3787/4475 +f 3789/3787/4476 3653/3655/4476 3788/3788/4476 +f 3652/3660/4477 3653/3655/4477 3789/3787/4477 +f 3713/3714/4478 3765/3718/4478 3791/3789/4478 +f 3791/3789/4479 3709/3713/4479 3713/3714/4479 +f 3710/3710/4480 3791/3789/4480 3790/3790/4480 +f 3709/3713/4481 3791/3789/4481 3710/3710/4481 +f 3655/3658/4482 3654/3654/4482 3656/3656/4482 +f 3792/3791/4483 3765/3718/4483 3654/3654/4483 +f 3794/3792/4484 3655/3658/4484 3649/3651/4484 +f 3793/3793/4485 3792/3791/4485 3654/3654/4485 +f 3654/3654/4486 3795/3794/4486 3793/3793/4486 +f 3655/3658/4487 3794/3792/4487 3796/3795/4487 +f 3795/3794/4488 3654/3654/4488 3655/3658/4488 +f 3796/3795/4489 3794/3792/4489 3793/3793/4489 +f 3796/3795/4490 3795/3794/4490 3655/3658/4490 +f 3793/3793/4491 3795/3794/4491 3796/3795/4491 +f 3798/3796/4492 3792/3791/4492 3797/3797/4492 +f 3799/3798/4493 3792/3791/4493 3798/3796/4493 +f 3797/3797/4494 3794/3792/4494 3798/3796/4494 +f 3792/3791/4495 3793/3793/4495 3800/3799/4495 +f 3793/3793/4496 3794/3792/4496 3802/3800/4496 +f 3794/3792/4497 3797/3797/4497 3802/3800/4497 +f 3802/3800/4498 3797/3797/4498 3801/3801/4498 +f 3802/3800/4499 3800/3799/4499 3793/3793/4499 +f 3797/3797/4500 3792/3791/4500 3800/3799/4500 +f 3801/3801/4501 3800/3799/4501 3802/3800/4501 +f 3801/3801/4502 3797/3797/4502 3800/3799/4502 +f 3715/3717/4503 3556/3553/4503 3765/3718/4503 +f 3765/3718/4504 3556/3553/4504 3764/3764/4504 +f 3764/3764/4505 3556/3553/4505 3762/3763/4505 +f 3474/3474/4506 3662/3664/4506 3556/3553/4506 +f 3762/3763/4507 3556/3553/4507 3662/3664/4507 +f 3758/3758/2 3732/3734/2 3741/3742/2 +f 3487/3487/4508 3568/3567/4508 3684/3684/4508 +f 3759/3762/2 3747/3748/2 3735/3737/2 +f 3758/3758/2 3741/3742/2 3747/3748/2 +f 3757/3757/4509 3684/3684/4509 3568/3567/4509 +f 3758/3758/2 3747/3748/2 3759/3762/2 +f 3757/3757/4510 3758/3758/4510 3762/3763/4510 +f 3762/3763/4511 3662/3664/4511 3534/3533/4511 +f 3762/3763/4512 3684/3684/4512 3757/3757/4512 +f 3762/3763/4513 3758/3758/4513 3759/3762/4513 +f 3678/3680/4514 3684/3684/4514 3534/3533/4514 +f 3684/3684/4515 3762/3763/4515 3534/3533/4515 +f 3728/3727/4516 3725/3729/4516 3729/3731/4516 +f 3766/3765/4517 3725/3729/4517 3726/3728/4517 +f 3725/3729/4518 3727/3730/4518 3729/3731/4518 +f 3725/3729/4519 3803/3802/4519 3727/3730/4519 +f 3727/3730/4520 3692/3693/4520 3467/3466/4520 +f 3725/3729/4521 3766/3765/4521 3804/3803/4521 +f 3804/3803/4522 3803/3802/4522 3725/3729/4522 +f 3769/3768/4523 3804/3803/4523 3766/3765/4523 +f 3727/3730/4524 3621/3623/4524 3692/3693/4524 +f 3804/3803/4525 3805/3804/4525 3803/3802/4525 +f 3739/3741/4526 3738/3740/4526 3736/3738/4526 +f 3807/3805/4527 3621/3623/4527 3727/3730/4527 +f 3805/3804/4528 3727/3730/4528 3803/3802/4528 +f 3806/3806/4529 3805/3804/4529 3804/3803/4529 +f 3804/3803/4530 3769/3768/4530 3806/3806/4530 +f 3736/3738/4531 3738/3740/4531 3740/3807/4531 +f 3805/3804/4532 3807/3805/4532 3727/3730/4532 +f 3737/3739/4533 3736/3738/4533 3808/3808/4533 +f 3763/3761/2 3737/3739/2 3770/3769/2 +f 3737/3739/4534 3808/3808/4534 3770/3769/4534 +f 3769/3768/4535 3809/3809/4535 3806/3806/4535 +f 3711/3711/4536 3710/3710/4536 3716/3557/4536 +f 3809/3809/4537 3805/3804/4537 3806/3806/4537 +f 3771/3770/4538 3809/3809/4538 3769/3768/4538 +f 3807/3805/4539 3635/3637/4539 3621/3623/4539 +f 3809/3809/4540 3810/3810/4540 3805/3804/4540 +f 3736/3738/4541 3740/3807/4541 3808/3808/4541 +f 3770/3769/4542 3811/3811/4542 3771/3770/4542 +f 3771/3770/4543 3811/3811/4543 3809/3809/4543 +f 3716/3557/4544 3710/3710/4544 3790/3790/4544 +f 3738/3740/4545 3716/3557/4545 3740/3807/4545 +f 3810/3810/4546 3807/3805/4546 3805/3804/4546 +f 3770/3769/4547 3808/3808/4547 3811/3811/4547 +f 3716/3557/4548 3790/3790/4548 3794/3792/4548 +f 3740/3807/4549 3716/3557/4549 3794/3792/4549 +f 3811/3811/4550 3810/3810/4550 3809/3809/4550 +f 3812/3812/4551 3635/3637/4551 3807/3805/4551 +f 3810/3810/4552 3812/3812/4552 3807/3805/4552 +f 3811/3811/4553 3812/3812/4553 3810/3810/4553 +f 3808/3808/4554 3812/3812/4554 3811/3811/4554 +f 3808/3808/4555 3740/3807/4555 3812/3812/4555 +f 3649/3651/4556 3635/3637/4556 3812/3812/4556 +f 3740/3807/4557 3794/3792/4557 3812/3812/4557 +f 3812/3812/4558 3794/3792/4558 3649/3651/4558 +f 3765/3718/4559 3815/3813/4559 3791/3789/4559 +f 3791/3789/4560 3815/3813/4560 3814/3814/4560 +f 3813/3815/4561 3790/3790/4561 3816/3816/4561 +f 3815/3813/4562 3765/3718/4562 3813/3815/4562 +f 3813/3815/4563 3814/3814/4563 3815/3813/4563 +f 3790/3790/4564 3791/3789/4564 3814/3814/4564 +f 3816/3816/4565 3814/3814/4565 3813/3815/4565 +f 3816/3816/4566 3790/3790/4566 3814/3814/4566 +f 3799/3798/4567 3765/3718/4567 3792/3791/4567 +f 3794/3792/4568 3790/3790/4568 3798/3796/4568 +f 3813/3815/4569 3798/3796/4569 3790/3790/4569 +f 3798/3796/4570 3813/3815/4570 3818/3817/4570 +f 3799/3798/4571 3798/3796/4571 3818/3817/4571 +f 3765/3718/4572 3799/3798/4572 3819/3818/4572 +f 3819/3818/4573 3799/3798/4573 3817/3819/4573 +f 3817/3819/4574 3799/3798/4574 3818/3817/4574 +f 3813/3815/4575 3765/3718/4575 3819/3818/4575 +f 3818/3817/4576 3819/3818/4576 3817/3819/4576 +f 3813/3815/4577 3819/3818/4577 3818/3817/4577 +f 3822/3820/4578 3821/3821/4578 3820/3822/4578 +f 3823/3823/4579 3821/3821/4579 3822/3820/4579 +f 3825/3824/4580 3828/3825/4580 3824/3826/4580 +f 3828/3825/3848 3827/3827/3848 3824/3826/3848 +f 3826/3828/3849 3827/3827/3849 3828/3825/3849 +f 3831/3829/3850 3830/3830/3850 3829/3831/3850 +f 3832/3832/3851 3830/3830/3851 3831/3829/3851 +f 3834/3833/4581 3837/3834/4581 3833/3835/4581 +f 3837/3834/3853 3836/3836/3853 3833/3835/3853 +f 3835/3837/3854 3836/3836/3854 3837/3834/3854 +f 3838/3838/4582 3840/3839/4582 3841/3840/4582 +f 3841/3840/4583 3840/3839/4583 3842/3841/4583 +f 3841/3840/4584 3839/3842/4584 3838/3838/4584 +f 3842/3841/4585 3839/3842/4585 3841/3840/4585 +f 3840/3839/4586 3846/3843/4586 3843/3844/4586 +f 3846/3843/3858 3845/3845/3858 3843/3844/3858 +f 3844/3846/3859 3845/3845/3859 3846/3843/3859 +f 3848/3847/4587 3851/3848/4587 3847/3849/4587 +f 3851/3848/3861 3850/3850/3861 3847/3849/3861 +f 3849/3851/3862 3850/3850/3862 3851/3848/3862 +f 3854/3852/3863 3853/3853/3863 3852/3854/3863 +f 3855/3855/3864 3853/3853/3864 3854/3852/3864 +f 3859/3856/3865 3858/3857/3865 3856/3858/3865 +f 3857/3859/3866 3858/3857/3866 3859/3856/3866 +f 3861/3860/3867 3864/3861/3867 3860/3862/3867 +f 3864/3861/4588 3863/3863/4588 3860/3862/4588 +f 3862/3864/3869 3863/3863/3869 3864/3861/3869 +f 3867/3865/3870 3866/3866/3870 3865/3867/3870 +f 3868/3868/4589 3866/3866/4589 3867/3865/4589 +f 3871/3869/3872 3870/3870/3872 3869/3871/3872 +f 3872/3872/3873 3870/3870/3873 3871/3869/3873 +f 3876/3873/4590 3875/3874/4590 3873/3875/4590 +f 3874/3876/3875 3875/3874/3875 3876/3873/3875 +f 3843/3844/4591 3877/3877/4591 3840/3839/4591 +f 3878/3878/4592 3839/3842/4592 3842/3841/4592 +f 3840/3839/4593 3877/3877/4593 3880/3879/4593 +f 3842/3841/4594 3840/3839/4594 3880/3879/4594 +f 3881/3880/4595 3842/3841/4595 3879/3881/4595 +f 3881/3880/4596 3878/3878/4596 3842/3841/4596 +f 3879/3881/3883 3842/3841/3883 3880/3879/3883 +f 3877/3877/4597 3878/3878/4597 3881/3880/4597 +f 3880/3879/3887 3881/3880/3887 3879/3881/3887 +f 3877/3877/4598 3881/3880/4598 3880/3879/4598 +f 3838/3838/4599 3884/3882/4599 3840/3839/4599 +f 3839/3842/4600 3883/3883/4600 3882/3884/4600 +f 3884/3882/3893 3838/3838/3893 3885/3885/3893 +f 3884/3882/4601 3882/3884/4601 3883/3883/4601 +f 3838/3838/3895 3839/3842/3895 3882/3884/3895 +f 3885/3885/4602 3882/3884/4602 3884/3882/4602 +f 3885/3885/3897 3838/3838/3897 3882/3884/3897 +f 3886/3886/3898 3834/3833/3898 3833/3835/3898 +f 3887/3887/4603 3830/3830/4603 3832/3832/4603 +f 3887/3887/4604 3834/3833/4604 3886/3886/4604 +f 3831/3829/4605 3889/3888/4605 3890/3889/4605 +f 3832/3832/4606 3831/3829/4606 3890/3889/4606 +f 3891/3890/4607 3832/3832/4607 3888/3891/4607 +f 3891/3890/4608 3887/3887/4608 3832/3832/4608 +f 3888/3891/4609 3832/3832/4609 3890/3889/4609 +f 3889/3888/4610 3831/3829/4610 3834/3833/4610 +f 3834/3833/4611 3887/3887/4611 3891/3890/4611 +f 3889/3888/4612 3834/3833/4612 3891/3890/4612 +f 3890/3889/4613 3891/3890/4613 3888/3891/4613 +f 3889/3888/4614 3891/3890/4614 3890/3889/4614 +f 3834/3833/4615 3831/3829/4615 3892/3892/4615 +f 3829/3831/4616 3892/3892/4616 3831/3829/4616 +f 3830/3830/3913 3894/3893/3913 3893/3894/3913 +f 3894/3893/3914 3892/3892/3914 3896/3895/3914 +f 3892/3892/4617 3829/3831/4617 3896/3895/4617 +f 3896/3895/4618 3829/3831/4618 3895/3896/4618 +f 3896/3895/3917 3893/3894/3917 3894/3893/3917 +f 3829/3831/3918 3830/3830/3918 3893/3894/3918 +f 3895/3896/3919 3893/3894/3919 3896/3895/3919 +f 3895/3896/4619 3829/3831/4619 3893/3894/4619 +f 3852/3854/4620 3897/3897/4620 3854/3852/4620 +f 3852/3854/4621 3900/3898/4621 3897/3897/4621 +f 3853/3853/3922 3899/3899/3922 3898/3900/3922 +f 3900/3898/4622 3852/3854/4622 3901/3901/4622 +f 3900/3898/4623 3898/3900/4623 3899/3899/4623 +f 3852/3854/4624 3853/3853/4624 3898/3900/4624 +f 3901/3901/4625 3898/3900/4625 3900/3898/4625 +f 3901/3901/3929 3852/3854/3929 3898/3900/3929 +f 3902/3902/4626 3825/3824/4626 3824/3826/4626 +f 3903/3903/4627 3821/3821/4627 3823/3823/4627 +f 3903/3903/4628 3825/3824/4628 3902/3902/4628 +f 3822/3820/4629 3905/3904/4629 3906/3905/4629 +f 3823/3823/4630 3822/3820/4630 3906/3905/4630 +f 3907/3906/3934 3823/3823/3934 3904/3907/3934 +f 3907/3906/4631 3903/3903/4631 3823/3823/4631 +f 3904/3907/3936 3823/3823/3936 3906/3905/3936 +f 3905/3904/4632 3822/3820/4632 3825/3824/4632 +f 3825/3824/4633 3903/3903/4633 3907/3906/4633 +f 3905/3904/4634 3825/3824/4634 3907/3906/4634 +f 3906/3905/4635 3907/3906/4635 3904/3907/4635 +f 3905/3904/4636 3907/3906/4636 3906/3905/4636 +f 4053/3908/4637 3853/3853/4637 3855/3855/4637 +f 3909/3909/4638 3854/3852/4638 3897/3897/4638 +f 3909/3909/4639 3856/3858/4639 3854/3852/4639 +f 3908/3910/3942 3854/3852/3942 3856/3858/3942 +f 3854/3852/4640 3908/3910/4640 3911/3911/4640 +f 3855/3855/4641 3854/3852/4641 3911/3911/4641 +f 3912/3912/4642 3855/3855/4642 3910/3913/4642 +f 3912/3912/4643 4053/3908/4643 3855/3855/4643 +f 3910/3913/4644 3855/3855/4644 3911/3911/4644 +f 3908/3910/4645 4053/3908/4645 3912/3912/4645 +f 3911/3911/3949 3912/3912/3949 3910/3913/3949 +f 3908/3910/4646 3912/3912/4646 3911/3911/4646 +f 3825/3824/4647 3822/3820/4647 3913/3914/4647 +f 3820/3822/4648 3913/3914/4648 3822/3820/4648 +f 3820/3822/4649 3916/3915/4649 3913/3914/4649 +f 3821/3821/3952 3915/3916/3952 3914/3917/3952 +f 3916/3915/3953 3820/3822/3953 3917/3918/3953 +f 3916/3915/4650 3914/3917/4650 3915/3916/4650 +f 3820/3822/4651 3821/3821/4651 3914/3917/4651 +f 3917/3918/4652 3914/3917/4652 3916/3915/4652 +f 3917/3918/4653 3820/3822/4653 3914/3917/4653 +f 3918/3919/4654 3861/3860/4654 3860/3862/4654 +f 3919/3920/4655 3866/3866/4655 3868/3868/4655 +f 3919/3920/4656 3861/3860/4656 3918/3919/4656 +f 3867/3865/4657 3921/3921/4657 3922/3922/4657 +f 3868/3868/4658 3867/3865/4658 3922/3922/4658 +f 3923/3923/4659 3868/3868/4659 3920/3924/4659 +f 3923/3923/4660 3919/3920/4660 3868/3868/4660 +f 3920/3924/4661 3868/3868/4661 3922/3922/4661 +f 3921/3921/3964 3867/3865/3964 3861/3860/3964 +f 3861/3860/4662 3919/3920/4662 3923/3923/4662 +f 3921/3921/4663 3861/3860/4663 3923/3923/4663 +f 3922/3922/4664 3923/3923/4664 3920/3924/4664 +f 3921/3921/4665 3923/3923/4665 3922/3922/4665 +f 3861/3860/4666 3924/3925/4666 3909/3909/4666 +f 3861/3860/4667 3867/3865/4667 3924/3925/4667 +f 3865/3867/4668 3924/3925/4668 3867/3865/4668 +f 3866/3866/3971 3926/3926/3971 3925/3927/3971 +f 3924/3925/4669 3865/3867/4669 3927/3928/4669 +f 3924/3925/4670 3925/3927/4670 3926/3926/4670 +f 3865/3867/4671 3866/3866/4671 3925/3927/4671 +f 3927/3928/4672 3925/3927/4672 3924/3925/4672 +f 3927/3928/4673 3865/3867/4673 3925/3927/4673 +f 3930/3929/4674 3848/3847/4674 3847/3849/4674 +f 3932/3930/4675 3929/3931/4675 3928/3932/4675 +f 3932/3930/4676 3848/3847/4676 3930/3929/4676 +f 3931/3933/3981 3934/3934/3981 3935/3935/3981 +f 3928/3932/4677 3931/3933/4677 3935/3935/4677 +f 3936/3936/4678 3928/3932/4678 3933/3937/4678 +f 3936/3936/4679 3932/3930/4679 3928/3932/4679 +f 3933/3937/3985 3928/3932/3985 3935/3935/3985 +f 3934/3934/4680 3931/3933/4680 3848/3847/4680 +f 3848/3847/4681 3932/3930/4681 3936/3936/4681 +f 3934/3934/4682 3848/3847/4682 3936/3936/4682 +f 3935/3935/3989 3936/3936/3989 3933/3937/3989 +f 3934/3934/3990 3936/3936/3990 3935/3935/3990 +f 3931/3933/3991 3929/3931/3991 3937/3938/3991 +f 3928/3932/3992 3929/3931/3992 3931/3933/3992 +f 3940/3939/3993 3939/3940/3993 3938/3941/3993 +f 3941/3942/4683 3939/3940/4683 3940/3939/4683 +f 3944/3943/4684 3919/3920/4684 3943/3944/4684 +f 3944/3943/4685 3943/3944/4685 3945/3945/4685 +f 3913/3914/4686 3946/3946/4686 3942/3947/4686 +f 3945/3945/4687 3943/3944/4687 3942/3947/4687 +f 3946/3946/4688 3913/3914/4688 3944/3943/4688 +f 3946/3946/4001 3945/3945/4001 3942/3947/4001 +f 3944/3943/4689 3945/3945/4689 3946/3946/4689 +f 3821/3821/4690 3903/3903/4690 3944/3943/4690 +f 3915/3916/4691 3821/3821/4691 3944/3943/4691 +f 3913/3914/4692 3916/3915/4692 3948/3948/4692 +f 3944/3943/4693 3913/3914/4693 3948/3948/4693 +f 3944/3943/4694 3947/3949/4694 3915/3916/4694 +f 3948/3948/4695 3916/3915/4695 3949/3950/4695 +f 3947/3949/4696 3944/3943/4696 3948/3948/4696 +f 3949/3950/4697 3916/3915/4697 3915/3916/4697 +f 3949/3950/4698 3947/3949/4698 3948/3948/4698 +f 3915/3916/4011 3947/3949/4011 3949/3950/4011 +f 3950/3951/4699 3827/3827/4699 3903/3903/4699 +f 3827/3827/4700 3950/3951/4700 3951/3952/4700 +f 3902/3902/4701 3824/3826/4701 3952/3953/4701 +f 3950/3951/4702 3903/3903/4702 3902/3902/4702 +f 3902/3902/4703 3951/3952/4703 3950/3951/4703 +f 3824/3826/4704 3827/3827/4704 3951/3952/4704 +f 3952/3953/4705 3951/3952/4705 3902/3902/4705 +f 3952/3953/4706 3824/3826/4706 3951/3952/4706 +f 3903/3903/4707 3954/3954/4707 3955/3955/4707 +f 3955/3955/4021 3954/3954/4021 3957/3956/4021 +f 3956/3957/4708 3958/3958/4708 3953/3959/4708 +f 3957/3956/4709 3954/3954/4709 3953/3959/4709 +f 3958/3958/4710 3956/3957/4710 3955/3955/4710 +f 3958/3958/4711 3957/3956/4711 3953/3959/4711 +f 3955/3955/4712 3957/3956/4712 3958/3958/4712 +f 3826/3828/4713 3903/3903/4713 3827/3827/4713 +f 3825/3824/4714 3956/3957/4714 3828/3825/4714 +f 3826/3828/4715 3954/3954/4715 3903/3903/4715 +f 3953/3959/4716 3828/3825/4716 3956/3957/4716 +f 3828/3825/4717 3953/3959/4717 3960/3960/4717 +f 3826/3828/4032 3828/3825/4032 3960/3960/4032 +f 3954/3954/4718 3826/3828/4718 3959/3961/4718 +f 3959/3961/4719 3826/3828/4719 3960/3960/4719 +f 3960/3960/4720 3954/3954/4720 3959/3961/4720 +f 3953/3959/4721 3954/3954/4721 3960/3960/4721 +f 3961/3962/4722 3836/3836/4722 3887/3887/4722 +f 3836/3836/4723 3961/3962/4723 3962/3963/4723 +f 3886/3886/4724 3833/3835/4724 3963/3964/4724 +f 3961/3962/4725 3887/3887/4725 3886/3886/4725 +f 3886/3886/4726 3962/3963/4726 3961/3962/4726 +f 3833/3835/4727 3836/3836/4727 3962/3963/4727 +f 3963/3964/4728 3962/3963/4728 3886/3886/4728 +f 3963/3964/4044 3833/3835/4044 3962/3963/4044 +f 3955/3955/4729 3887/3887/4729 3903/3903/4729 +f 3834/3833/4730 3956/3957/4730 3825/3824/4730 +f 3830/3830/4731 3887/3887/4731 3955/3955/4731 +f 3834/3833/4048 3892/3892/4048 3956/3957/4048 +f 3894/3893/4049 3830/3830/4049 3955/3955/4049 +f 3955/3955/4050 3964/3965/4050 3894/3893/4050 +f 3964/3965/4051 3955/3955/4051 3956/3957/4051 +f 3892/3892/4052 3964/3965/4052 3956/3957/4052 +f 3894/3893/4053 3964/3965/4053 3892/3892/4053 +f 3835/3837/4732 3887/3887/4732 3836/3836/4732 +f 3840/3839/4733 3837/3834/4733 3834/3833/4733 +f 3840/3839/4734 3966/3966/4734 3837/3834/4734 +f 3835/3837/4735 3968/3967/4735 3887/3887/4735 +f 3965/3968/4736 3837/3834/4736 3966/3966/4736 +f 3837/3834/4737 3965/3968/4737 3969/3969/4737 +f 3835/3837/4738 3837/3834/4738 3969/3969/4738 +f 3968/3967/4739 3835/3837/4739 3967/3970/4739 +f 3967/3970/4740 3835/3837/4740 3969/3969/4740 +f 3969/3969/4741 3968/3967/4741 3967/3970/4741 +f 3965/3968/4742 3968/3967/4742 3969/3969/4742 +f 3887/3887/4743 3968/3967/4743 3970/3971/4743 +f 3970/3971/4744 3968/3967/4744 3971/3972/4744 +f 3966/3966/4745 3972/3973/4745 3965/3968/4745 +f 3971/3972/4746 3968/3967/4746 3965/3968/4746 +f 3972/3973/4747 3966/3966/4747 3970/3971/4747 +f 3972/3973/4071 3971/3972/4071 3965/3968/4071 +f 3970/3971/4072 3971/3972/4072 3972/3973/4072 +f 3839/3842/4748 3878/3878/4748 3970/3971/4748 +f 3883/3883/4749 3839/3842/4749 3970/3971/4749 +f 3840/3839/4750 3884/3882/4750 3966/3966/4750 +f 3970/3971/4751 3973/3974/4751 3883/3883/4751 +f 3966/3966/4752 3884/3882/4752 3974/3975/4752 +f 3973/3974/4753 3970/3971/4753 3966/3966/4753 +f 3974/3975/4754 3884/3882/4754 3883/3883/4754 +f 3974/3975/4755 3973/3974/4755 3966/3966/4755 +f 3883/3883/4756 3973/3974/4756 3974/3975/4756 +f 3975/3976/4757 3845/3845/4757 3878/3878/4757 +f 3845/3845/4758 3975/3976/4758 3976/3977/4758 +f 3877/3877/4759 3843/3844/4759 3977/3978/4759 +f 3975/3976/4760 3878/3878/4760 3877/3877/4760 +f 3877/3877/4761 3976/3977/4761 3975/3976/4761 +f 3843/3844/4088 3845/3845/4088 3976/3977/4088 +f 3977/3978/4762 3976/3977/4762 3877/3877/4762 +f 3977/3978/4090 3843/3844/4090 3976/3977/4090 +f 3980/3979/4763 3979/3980/4763 3982/3981/4763 +f 3982/3981/4764 3979/3980/4764 3983/3982/4764 +f 3981/3983/4765 3980/3979/4765 3982/3981/4765 +f 3981/3983/4766 3984/3984/4766 3978/3985/4766 +f 3983/3982/4767 3979/3980/4767 3978/3985/4767 +f 3984/3984/4768 3981/3983/4768 3982/3981/4768 +f 3984/3984/4097 3983/3982/4097 3978/3985/4097 +f 3982/3981/4098 3983/3982/4098 3984/3984/4098 +f 3980/3979/4099 3878/3878/4099 3845/3845/4099 +f 3844/3846/4769 3980/3979/4769 3845/3845/4769 +f 3840/3839/4770 3981/3983/4770 3846/3843/4770 +f 3844/3846/4771 3979/3980/4771 3980/3979/4771 +f 3978/3985/4772 3846/3843/4772 3981/3983/4772 +f 3846/3843/4104 3978/3985/4104 3986/3986/4104 +f 3844/3846/4773 3846/3843/4773 3986/3986/4773 +f 3979/3980/4774 3844/3846/4774 3985/3987/4774 +f 3985/3987/4775 3844/3846/4775 3986/3986/4775 +f 3986/3986/4108 3979/3980/4108 3985/3987/4108 +f 3978/3985/4776 3979/3980/4776 3986/3986/4776 +f 3988/3988/4777 3875/3874/4777 3987/3989/4777 +f 3875/3874/4111 3988/3988/4111 3989/3990/4111 +f 3991/3991/4112 3873/3875/4112 3990/3992/4112 +f 3988/3988/4778 3987/3989/4778 3991/3991/4778 +f 3991/3991/4779 3989/3990/4779 3988/3988/4779 +f 3873/3875/4780 3875/3874/4780 3989/3990/4780 +f 3990/3992/4116 3989/3990/4116 3991/3991/4116 +f 3990/3992/4781 3873/3875/4781 3989/3990/4781 +f 3994/3993/4782 3987/3989/4782 3993/3994/4782 +f 3994/3993/4783 3993/3994/4783 3996/3995/4783 +f 3995/3996/4784 3997/3997/4784 3992/3998/4784 +f 3996/3995/4785 3993/3994/4785 3992/3998/4785 +f 3997/3997/4786 3995/3996/4786 3994/3993/4786 +f 3997/3997/4123 3996/3995/4123 3992/3998/4123 +f 3994/3993/4787 3996/3995/4787 3997/3997/4787 +f 4000/3999/4788 3999/4000/4788 3998/4001/4788 +f 3999/4000/4789 4000/3999/4789 4001/4002/4789 +f 4004/4003/4790 4003/4004/4790 4002/4005/4790 +f 4000/3999/4791 3998/4001/4791 4004/4003/4791 +f 4004/4003/4792 4001/4002/4792 4000/3999/4792 +f 4003/4004/4793 3999/4000/4793 4001/4002/4793 +f 4002/4005/4794 4001/4002/4794 4004/4003/4794 +f 4002/4005/4133 4003/4004/4133 4001/4002/4133 +f 4006/4006/4134 3999/4000/4134 4003/4004/4134 +f 4005/4007/4795 3999/4000/4795 4006/4006/4795 +f 3998/4001/4796 4008/4008/4796 4009/4009/4796 +f 4009/4009/4797 4008/4008/4797 4011/4010/4797 +f 4010/4011/4137 4012/4012/4137 4007/4013/4137 +f 4011/4010/4798 4008/4008/4798 4007/4013/4798 +f 4012/4012/4799 4010/4011/4799 4009/4009/4799 +f 4012/4012/4140 4011/4010/4140 4007/4013/4140 +f 4009/4009/4800 4011/4010/4800 4012/4012/4800 +f 4015/4014/4142 4014/4015/4142 4013/4016/4142 +f 4016/4017/4143 4014/4015/4143 4015/4014/4143 +f 4019/4018/4801 4018/4019/4801 4017/4020/4801 +f 4018/4019/4145 4019/4018/4145 4020/4021/4145 +f 4023/4022/4802 4022/4023/4802 4021/4024/4802 +f 4019/4018/4803 4017/4020/4803 4023/4022/4803 +f 4023/4022/4804 4020/4021/4804 4019/4018/4804 +f 4022/4023/4149 4018/4019/4149 4020/4021/4149 +f 4021/4024/4150 4020/4021/4150 4023/4022/4150 +f 4021/4024/4151 4022/4023/4151 4020/4021/4151 +f 4024/4025/4805 4026/4026/4805 4022/4023/4805 +f 4026/4026/4153 4018/4019/4153 4022/4023/4153 +f 4025/4027/4154 4018/4019/4154 4026/4026/4154 +f 4028/4028/4806 4141/4029/4806 4017/4020/4806 +f 4141/4029/4807 4028/4028/4807 4030/4030/4807 +f 4030/4030/4808 4028/4028/4808 4031/4031/4808 +f 4029/4032/4809 4032/4033/4809 4027/4034/4809 +f 4031/4031/4810 4028/4028/4810 4027/4034/4810 +f 4032/4033/4811 4029/4032/4811 4030/4030/4811 +f 4032/4033/4160 4031/4031/4160 4027/4034/4160 +f 4030/4030/4812 4031/4031/4812 4032/4033/4812 +f 4033/4035/4813 3850/3850/4813 3932/3930/4813 +f 3850/3850/4163 4033/4035/4163 4034/4036/4163 +f 3930/3929/4814 3847/3849/4814 4035/4037/4814 +f 4033/4035/4165 3932/3930/4165 3930/3929/4165 +f 3930/3929/4166 4034/4036/4166 4033/4035/4166 +f 3847/3849/4167 3850/3850/4167 4034/4036/4167 +f 4035/4037/4168 4034/4036/4168 3930/3929/4168 +f 4035/4037/4815 3847/3849/4815 4034/4036/4815 +f 3849/3851/4816 4036/4038/4816 3850/3850/4816 +f 3897/3897/4817 3851/3848/4817 3848/3847/4817 +f 3849/3851/4818 4039/4039/4818 4036/4038/4818 +f 4037/4040/4819 3851/3848/4819 3897/3897/4819 +f 3851/3848/4175 4037/4040/4175 4040/4041/4175 +f 3849/3851/4820 3851/3848/4820 4040/4041/4820 +f 4039/4039/4821 3849/3851/4821 4038/4042/4821 +f 4038/4042/4178 3849/3851/4178 4040/4041/4178 +f 4040/4041/4179 4039/4039/4179 4038/4042/4179 +f 4037/4040/4822 4039/4039/4822 4040/4041/4822 +f 4036/4038/4181 4039/4039/4181 4041/4043/4181 +f 4041/4043/4823 4039/4039/4823 4042/4044/4823 +f 3897/3897/4824 4036/4038/4824 4041/4043/4824 +f 3897/3897/4825 4043/4045/4825 4037/4040/4825 +f 4042/4044/4826 4039/4039/4826 4037/4040/4826 +f 4043/4045/4827 3897/3897/4827 4041/4043/4827 +f 4043/4045/4187 4042/4044/4187 4037/4040/4187 +f 4041/4043/4828 4042/4044/4828 4043/4045/4828 +f 3943/3944/4829 3919/3920/4829 3863/3863/4829 +f 3862/3864/4830 3943/3944/4830 3863/3863/4830 +f 3913/3914/4831 3864/3861/4831 3861/3860/4831 +f 3942/3947/4832 3864/3861/4832 3913/3914/4832 +f 3864/3861/4833 3942/3947/4833 4045/4046/4833 +f 3862/3864/4834 3864/3861/4834 4045/4046/4834 +f 3943/3944/4835 3862/3864/4835 4046/4047/4835 +f 4046/4047/4836 3862/3864/4836 4044/4048/4836 +f 4044/4048/4837 3862/3864/4837 4045/4046/4837 +f 3942/3947/4838 3943/3944/4838 4046/4047/4838 +f 4045/4046/4839 4046/4047/4839 4044/4048/4839 +f 3942/3947/4840 4046/4047/4840 4045/4046/4840 +f 4047/4049/4841 3858/3857/4841 4053/3908/4841 +f 3858/3857/4201 4047/4049/4201 4048/4050/4201 +f 3908/3910/4842 3856/3858/4842 4049/4051/4842 +f 4047/4049/4843 4053/3908/4843 3908/3910/4843 +f 3908/3910/4844 4048/4050/4844 4047/4049/4844 +f 3856/3858/4845 3858/3857/4845 4048/4050/4845 +f 4049/4051/4846 4048/4050/4846 3908/3910/4846 +f 4049/4051/4847 3856/3858/4847 4048/4050/4847 +f 4053/3908/4848 4036/4038/4848 3853/3853/4848 +f 3899/3899/4209 3853/3853/4209 4036/4038/4209 +f 3897/3897/4849 3900/3898/4849 4051/4052/4849 +f 4036/4038/4850 3897/3897/4850 4051/4052/4850 +f 4036/4038/4851 4050/4053/4851 3899/3899/4851 +f 4051/4052/4852 3900/3898/4852 4052/4054/4852 +f 4050/4053/4853 4036/4038/4853 4051/4052/4853 +f 4052/4054/4854 3900/3898/4854 3899/3899/4854 +f 4052/4054/4855 4050/4053/4855 4051/4052/4855 +f 3899/3899/4215 4050/4053/4215 4052/4054/4215 +f 3909/3909/4856 3859/3856/4856 3856/3858/4856 +f 3857/3859/4857 4053/3908/4857 3858/3857/4857 +f 3857/3859/4858 4056/4055/4858 4053/3908/4858 +f 4054/4056/4859 3859/3856/4859 3909/3909/4859 +f 3859/3856/4221 4054/4056/4221 4057/4057/4221 +f 3857/3859/4222 3859/3856/4222 4057/4057/4222 +f 4056/4055/4860 3857/3859/4860 4055/4058/4860 +f 4055/4058/4861 3857/3859/4861 4057/4057/4861 +f 4057/4057/4862 4056/4055/4862 4055/4058/4862 +f 4054/4056/4863 4056/4055/4863 4057/4057/4863 +f 4058/4059/4864 3863/3863/4864 3919/3920/4864 +f 3863/3863/4865 4058/4059/4865 4059/4060/4865 +f 3918/3919/4230 3860/3862/4230 4060/4061/4230 +f 4058/4059/4866 3919/3920/4866 3918/3919/4866 +f 3918/3919/4867 4059/4060/4867 4058/4059/4867 +f 3860/3862/4868 3863/3863/4868 4059/4060/4868 +f 4060/4061/4233 4059/4060/4233 3918/3919/4233 +f 4060/4061/4869 3860/3862/4869 4059/4060/4869 +f 4053/3908/4870 4056/4055/4870 4061/4062/4870 +f 4061/4062/4871 4056/4055/4871 4062/4063/4871 +f 3909/3909/4872 4063/4064/4872 4054/4056/4872 +f 4062/4063/4873 4056/4055/4873 4054/4056/4873 +f 4063/4064/4874 3909/3909/4874 4061/4062/4874 +f 4063/4064/4241 4062/4063/4241 4054/4056/4241 +f 4061/4062/4875 4062/4063/4875 4063/4064/4875 +f 3866/3866/4876 3919/3920/4876 4053/3908/4876 +f 3866/3866/4877 4053/3908/4877 4061/4062/4877 +f 3926/3926/4878 3866/3866/4878 4061/4062/4878 +f 3909/3909/4879 3924/3925/4879 4065/4065/4879 +f 4061/4062/4880 3909/3909/4880 4065/4065/4880 +f 4061/4062/4881 4064/4066/4881 3926/3926/4881 +f 4065/4065/4882 3924/3925/4882 4066/4067/4882 +f 4064/4066/4883 4061/4062/4883 4065/4065/4883 +f 4066/4067/4884 3924/3925/4884 3926/3926/4884 +f 4066/4067/4251 4064/4066/4251 4065/4065/4251 +f 3926/3926/4252 4064/4066/4252 4066/4067/4252 +f 3870/3870/4885 3987/3989/4885 3980/3979/4885 +f 4068/4068/4886 3981/3983/4886 3840/3839/4886 +f 4067/4069/4887 3870/3870/4887 3980/3979/4887 +f 3980/3979/4888 4069/4070/4888 4067/4069/4888 +f 3981/3983/4889 4068/4068/4889 4070/4071/4889 +f 4069/4070/4258 3980/3979/4258 3981/3983/4258 +f 4070/4071/4890 4068/4068/4890 4067/4069/4890 +f 4070/4071/4260 4069/4070/4260 3981/3983/4260 +f 4067/4069/4261 4069/4070/4261 4070/4071/4261 +f 3869/3871/4891 4068/4068/4891 3871/3869/4891 +f 3870/3870/4263 4067/4069/4263 4071/4072/4263 +f 4067/4069/4264 4068/4068/4264 4073/4073/4264 +f 4068/4068/4265 3869/3871/4265 4073/4073/4265 +f 4073/4073/4266 3869/3871/4266 4072/4074/4266 +f 4073/4073/4267 4071/4072/4267 4067/4069/4267 +f 3869/3871/4892 3870/3870/4892 4071/4072/4892 +f 4072/4074/4893 4071/4072/4893 4073/4073/4893 +f 4072/4074/4894 3869/3871/4894 4071/4072/4894 +f 3987/3989/4895 3870/3870/4895 3872/3872/4895 +f 4068/4068/4896 3873/3875/4896 3871/3869/4896 +f 3991/3991/4897 3871/3869/4897 3873/3875/4897 +f 3871/3869/4898 3991/3991/4898 4075/4075/4898 +f 3872/3872/4899 3871/3869/4899 4075/4075/4899 +f 4076/4076/4900 3872/3872/4900 4074/4077/4900 +f 4076/4076/4901 3987/3989/4901 3872/3872/4901 +f 4074/4077/4278 3872/3872/4278 4075/4075/4278 +f 3991/3991/4902 3987/3989/4902 4076/4076/4902 +f 4075/4075/4903 4076/4076/4903 4074/4077/4903 +f 3991/3991/4281 4076/4076/4281 4075/4075/4281 +f 3995/3996/4283 3873/3875/4283 4068/4068/4283 +f 3993/3994/4904 3987/3989/4904 3875/3874/4904 +f 3995/3996/4905 3876/3873/4905 3873/3875/4905 +f 3874/3876/4906 3993/3994/4906 3875/3874/4906 +f 3992/3998/4907 3876/3873/4907 3995/3996/4907 +f 3876/3873/4288 3992/3998/4288 4078/4078/4288 +f 3874/3876/4908 3876/3873/4908 4078/4078/4908 +f 3993/3994/4909 3874/3876/4909 4079/4079/4909 +f 4079/4079/4910 3874/3876/4910 4077/4080/4910 +f 4077/4080/4911 3874/3876/4911 4078/4078/4911 +f 3992/3998/4912 3993/3994/4912 4079/4079/4912 +f 4078/4078/4913 4079/4079/4913 4077/4080/4913 +f 3992/3998/4914 4079/4079/4914 4078/4078/4914 +f 3994/3993/4915 3998/4001/4915 3987/3989/4915 +f 3939/3940/4916 3998/4001/4916 3994/3993/4916 +f 4080/4081/4917 3939/3940/4917 3994/3993/4917 +f 3995/3996/4297 4081/4082/4297 4083/4083/4297 +f 3994/3993/4918 3995/3996/4918 4083/4083/4918 +f 3994/3993/4919 4082/4084/4919 4080/4081/4919 +f 4083/4083/4920 4081/4082/4920 4084/4085/4920 +f 4082/4084/4921 3994/3993/4921 4083/4083/4921 +f 4084/4085/4922 4081/4082/4922 4080/4081/4922 +f 4084/4085/4303 4082/4084/4303 4083/4083/4303 +f 4080/4081/4304 4082/4084/4304 4084/4085/4304 +f 4087/4086/4305 4088/4087/4305 4089/4088/4305 +f 4086/4089/4923 4087/4086/4923 4089/4088/4923 +f 4090/4090/4924 4086/4089/4924 4085/4091/4924 +f 4085/4091/4925 4086/4089/4925 4089/4088/4925 +f 4089/4088/4926 4090/4090/4926 4085/4091/4926 +f 4088/4087/4927 4090/4090/4927 4089/4088/4927 +f 4091/4092/4928 4090/4090/4928 4093/4093/4928 +f 4093/4093/4929 4090/4090/4929 4094/4094/4929 +f 4092/4095/4930 4091/4092/4930 4093/4093/4930 +f 4092/4095/4931 4095/4096/4931 4088/4087/4931 +f 4094/4094/4932 4090/4090/4932 4088/4087/4932 +f 4095/4096/4933 4092/4095/4933 4093/4093/4933 +f 4095/4096/4318 4094/4094/4318 4088/4087/4318 +f 4093/4093/4934 4094/4094/4934 4095/4096/4934 +f 3848/3847/4935 3931/3933/4935 4096/4097/4935 +f 3937/3938/4936 4096/4097/4936 3931/3933/4936 +f 3929/3931/4937 4098/4098/4937 4097/4099/4937 +f 4098/4098/4938 4096/4097/4938 4100/4100/4938 +f 4096/4097/4939 3937/3938/4939 4100/4100/4939 +f 4100/4100/4940 3937/3938/4940 4099/4101/4940 +f 4100/4100/4941 4097/4099/4941 4098/4098/4941 +f 3937/3938/4942 3929/3931/4942 4097/4099/4942 +f 4099/4101/4943 4097/4099/4943 4100/4100/4943 +f 4099/4101/4944 3937/3938/4944 4097/4099/4944 +f 3938/3941/4945 3995/3996/4945 3940/3939/4945 +f 3938/3941/4946 4081/4082/4946 3995/3996/4946 +f 3939/3940/4330 4080/4081/4330 4101/4102/4330 +f 4081/4082/4331 3938/3941/4331 4102/4103/4331 +f 4081/4082/4332 4101/4102/4332 4080/4081/4332 +f 3938/3941/4333 3939/3940/4333 4101/4102/4333 +f 4102/4103/4947 4101/4102/4947 4081/4082/4947 +f 4102/4103/4335 3938/3941/4335 4101/4102/4335 +f 4105/4104/4948 3840/3839/4948 4106/4105/4948 +f 4107/4106/4949 4104/4107/4949 4103/4108/4949 +f 4106/4105/4950 3840/3839/4950 4108/4109/4950 +f 4104/4107/4951 4107/4106/4951 4109/4110/4951 +f 4109/4110/4952 4107/4106/4952 4110/4111/4952 +f 4107/4106/4953 4108/4109/4953 4110/4111/4953 +f 4109/4110/4954 4110/4111/4954 4111/4112/4954 +f 4108/4109/4955 3840/3839/4955 3834/3833/4955 +f 4111/4112/4956 4110/4111/4956 4112/4113/4956 +f 4113/4114/4957 4122/4115/4957 4114/4116/4957 +f 4110/4111/4958 4108/4109/4958 4115/4117/4958 +f 4113/4114/4959 4117/4118/4959 4122/4115/4959 +f 4108/4109/4960 3834/3833/4960 4115/4117/4960 +f 4112/4113/4961 4110/4111/4961 4119/4119/4961 +f 4111/4112/4962 4112/4113/4962 4120/4120/4962 +f 4111/4112/4963 4120/4120/4963 4121/4121/4963 +f 4117/4118/4964 4118/4122/4964 4122/4115/4964 +f 4110/4111/4965 4115/4117/4965 4119/4119/4965 +f 4115/4117/4966 3834/3833/4966 3825/3824/4966 +f 4116/4123/4967 3897/3897/4967 3848/3847/4967 +f 4117/4118/4968 4116/4123/4968 4118/4122/4968 +f 4117/4118/4969 4113/4114/4969 4123/4124/4969 +f 4112/4113/4970 4119/4119/4970 4120/4120/4970 +f 4123/4124/4971 4116/4123/4971 4117/4118/4971 +f 4121/4121/4361 4124/4125/4361 4125/4126/4361 +f 4125/4126/4972 4123/4124/4972 4113/4114/4972 +f 4115/4117/4973 3825/3824/4973 4126/4127/4973 +f 4119/4119/4974 4115/4117/4974 4126/4127/4974 +f 4120/4120/4975 4119/4119/4975 4127/4128/4975 +f 4121/4121/4976 4120/4120/4976 4124/4125/4976 +f 4125/4126/4977 4124/4125/4977 4123/4124/4977 +f 4128/4129/4978 3897/3897/4978 4116/4123/4978 +f 4123/4124/4979 4129/4130/4979 4116/4123/4979 +f 4128/4129/4980 3909/3909/4980 3897/3897/4980 +f 4129/4130/4981 4128/4129/4981 4116/4123/4981 +f 4126/4127/4982 3825/3824/4982 3913/3914/4982 +f 4119/4119/4983 4126/4127/4983 4127/4128/4983 +f 4120/4120/4984 4127/4128/4984 4124/4125/4984 +f 4124/4125/4985 4129/4130/4985 4123/4124/4985 +f 4124/4125/4986 4127/4128/4986 4129/4130/4986 +f 4126/4127/4987 3913/3914/4987 3861/3860/4987 +f 4127/4128/4988 4126/4127/4988 4129/4130/4988 +f 4129/4130/4989 4126/4127/4989 4128/4129/4989 +f 4128/4129/4990 3861/3860/4990 3909/3909/4990 +f 4126/4127/4991 3861/3860/4991 4128/4129/4991 +f 3848/3847/4992 4092/4095/4992 4168/4131/4992 +f 3929/3931/4993 3932/3930/4993 4091/4092/4993 +f 3848/3847/4994 4096/4097/4994 4092/4095/4994 +f 4098/4098/4995 3929/3931/4995 4091/4092/4995 +f 4091/4092/4996 4130/4132/4996 4098/4098/4996 +f 4130/4132/4997 4091/4092/4997 4092/4095/4997 +f 4096/4097/4998 4130/4132/4998 4092/4095/4998 +f 4098/4098/4999 4130/4132/4999 4096/4097/4999 +f 3998/4001/5000 3939/3940/5000 3941/3942/5000 +f 4010/4011/4389 3940/3939/4389 3995/3996/4389 +f 4010/4011/4390 4003/4004/4390 3940/3939/4390 +f 4004/4003/5001 3940/3939/5001 4003/4004/5001 +f 3940/3939/4392 4004/4003/4392 4132/4133/4392 +f 3941/3942/5002 3940/3939/5002 4132/4133/5002 +f 4133/4134/5003 3941/3942/5003 4131/4135/5003 +f 4133/4134/5004 3998/4001/5004 3941/3942/5004 +f 4131/4135/5005 3941/3942/5005 4132/4133/5005 +f 4004/4003/5006 3998/4001/5006 4133/4134/5006 +f 4132/4133/5007 4133/4134/5007 4131/4135/5007 +f 4004/4003/5008 4133/4134/5008 4132/4133/5008 +f 3944/3943/5009 3903/3903/5009 3919/3920/5009 +f 3919/3920/5010 3903/3903/5010 4134/4136/5010 +f 4135/4137/2 4109/4110/2 4111/4112/2 +f 4134/4136/5011 3903/3903/5011 4137/4138/5011 +f 4137/4138/5012 3903/3903/5012 3887/3887/5012 +f 4135/4137/2 4104/4107/2 4109/4110/2 +f 4137/4138/5013 4135/4137/5013 4134/4136/5013 +f 4113/4114/2 4114/4116/2 4136/4139/2 +f 4138/4140/5014 4136/4139/5014 4139/4141/5014 +f 3970/3971/5015 3878/3878/5015 3887/3887/5015 +f 4142/4142/2 4104/4107/2 4135/4137/2 +f 4137/4138/5016 3887/3887/5016 3878/3878/5016 +f 4136/4139/2 4114/4116/2 4143/4143/2 +f 4142/4142/2 4144/4144/2 4104/4107/2 +f 4137/4138/5017 4142/4142/5017 4135/4137/5017 +f 4139/4141/5018 4136/4139/5018 4143/4143/5018 +f 4017/4020/5019 4141/4029/5019 4139/4141/5019 +f 3980/3979/4409 4145/4145/4409 3878/3878/4409 +f 4142/4142/2 4146/4146/2 4144/4144/2 +f 3878/3878/4411 4145/4145/4411 4137/4138/4411 +f 3980/3979/5020 3987/3989/5020 4145/4145/5020 +f 4143/4143/2 4147/4147/2 4148/4148/2 +f 4017/4020/5021 4139/4141/5021 4149/4149/5021 +f 4145/4145/5022 4142/4142/5022 4137/4138/5022 +f 4143/4143/2 4148/4148/2 4150/4150/2 +f 4139/4141/5023 4143/4143/5023 4149/4149/5023 +f 4149/4149/5024 4009/4009/5024 4017/4020/5024 +f 4150/4150/2 4148/4148/2 4146/4146/2 +f 4149/4149/5025 4143/4143/5025 4150/4150/5025 +f 4149/4149/5026 3998/4001/5026 4009/4009/5026 +f 4150/4150/2 4146/4146/2 4142/4142/2 +f 4145/4145/5027 4150/4150/5027 4142/4142/5027 +f 3998/4001/5028 4145/4145/5028 3987/3989/5028 +f 4149/4149/4421 4150/4150/4421 4145/4145/4421 +f 3998/4001/5029 4149/4149/5029 4145/4145/5029 +f 4010/4011/5030 4006/4006/5030 4003/4004/5030 +f 4005/4007/5031 3998/4001/5031 3999/4000/5031 +f 4005/4007/5032 4008/4008/5032 3998/4001/5032 +f 4007/4013/5033 4006/4006/5033 4010/4011/5033 +f 4006/4006/4427 4007/4013/4427 4152/4151/4427 +f 4005/4007/5034 4006/4006/5034 4152/4151/5034 +f 4008/4008/5035 4005/4007/5035 4151/4152/5035 +f 4151/4152/5036 4005/4007/5036 4152/4151/5036 +f 4152/4151/5037 4008/4008/5037 4151/4152/5037 +f 4007/4013/5038 4008/4008/5038 4152/4151/5038 +f 4014/4015/5039 4017/4020/5039 4009/4009/5039 +f 4153/4153/5040 4014/4015/5040 4009/4009/5040 +f 4010/4011/5041 4154/4154/5041 4156/4155/5041 +f 4009/4009/5042 4010/4011/5042 4156/4155/5042 +f 4009/4009/5043 4155/4156/5043 4153/4153/5043 +f 4156/4155/5044 4154/4154/5044 4157/4157/5044 +f 4155/4156/5045 4009/4009/5045 4156/4155/5045 +f 4157/4157/5046 4154/4154/5046 4153/4153/5046 +f 4157/4157/5047 4155/4156/5047 4156/4155/5047 +f 4153/4153/4444 4155/4156/4444 4157/4157/4444 +f 4024/4025/5048 4154/4154/5048 4010/4011/5048 +f 4024/4025/5049 4015/4014/5049 4154/4154/5049 +f 4013/4016/4447 4154/4154/4447 4015/4014/4447 +f 4014/4015/5050 4153/4153/5050 4158/4158/5050 +f 4154/4154/4449 4013/4016/4449 4159/4159/4449 +f 4154/4154/4450 4158/4158/4450 4153/4153/4450 +f 4013/4016/5051 4014/4015/5051 4158/4158/5051 +f 4159/4159/4452 4158/4158/4452 4154/4154/4452 +f 4159/4159/5052 4013/4016/5052 4158/4158/5052 +f 4023/4022/5053 4024/4025/5053 4022/4023/5053 +f 4017/4020/5054 4014/4015/5054 4016/4017/5054 +f 4017/4020/5055 4024/4025/5055 4023/4022/5055 +f 4015/4014/5056 4161/4160/5056 4162/4161/5056 +f 4016/4017/4458 4015/4014/4458 4162/4161/4458 +f 4163/4162/5057 4016/4017/5057 4160/4163/5057 +f 4163/4162/5058 4017/4020/5058 4016/4017/5058 +f 4160/4163/5059 4016/4017/5059 4162/4161/5059 +f 4161/4160/5060 4015/4014/5060 4024/4025/5060 +f 4024/4025/5061 4017/4020/5061 4163/4162/5061 +f 4161/4160/5062 4024/4025/5062 4163/4162/5062 +f 4162/4161/4465 4163/4162/4465 4160/4163/4465 +f 4161/4160/4466 4163/4162/4466 4162/4161/4466 +f 4028/4028/5063 4017/4020/5063 4018/4019/5063 +f 4025/4027/5064 4028/4028/5064 4018/4019/5064 +f 4029/4032/5065 4026/4026/5065 4024/4025/5065 +f 4027/4034/5066 4026/4026/5066 4029/4032/5066 +f 4026/4026/5067 4027/4034/5067 4165/4164/5067 +f 4025/4027/5068 4026/4026/5068 4165/4164/5068 +f 4028/4028/5069 4025/4027/5069 4164/4165/5069 +f 4164/4165/5070 4025/4027/5070 4165/4164/5070 +f 4165/4164/5071 4028/4028/5071 4164/4165/5071 +f 4027/4034/5072 4028/4028/5072 4165/4164/5072 +f 4091/4092/5073 4086/4089/5073 4090/4090/5073 +f 4167/4166/5074 4086/4089/5074 4091/4092/5074 +f 4168/4131/5075 4087/4086/5075 4166/4167/5075 +f 4087/4086/5076 4167/4166/5076 4166/4167/5076 +f 4086/4089/4481 4167/4166/4481 4087/4086/4481 +f 4140/4168/5077 4141/4029/5077 4169/4169/5077 +f 4029/4032/5078 4141/4029/5078 4030/4030/5078 +f 4170/4170/5079 4169/4169/5079 4141/4029/5079 +f 4029/4032/5080 4171/4171/5080 4173/4172/5080 +f 4141/4029/5081 4029/4032/5081 4173/4172/5081 +f 4141/4029/5082 4172/4173/5082 4170/4170/5082 +f 4173/4172/5083 4171/4171/5083 4174/4174/5083 +f 4172/4173/5084 4141/4029/5084 4173/4172/5084 +f 4174/4174/5085 4171/4171/5085 4170/4170/5085 +f 4174/4174/5086 4172/4173/5086 4173/4172/5086 +f 4170/4170/5087 4172/4173/5087 4174/4174/5087 +f 4176/4175/4492 4169/4169/4492 4175/4176/4492 +f 4140/4168/5088 4169/4169/5088 4176/4175/5088 +f 4175/4176/5089 4029/4032/5089 4176/4175/5089 +f 4175/4176/5090 4171/4171/5090 4029/4032/5090 +f 4169/4169/5091 4170/4170/5091 4177/4177/5091 +f 4171/4171/5092 4175/4176/5092 4178/4178/5092 +f 4171/4171/5093 4177/4177/5093 4170/4170/5093 +f 4175/4176/5094 4169/4169/5094 4177/4177/5094 +f 4178/4178/5095 4177/4177/5095 4171/4171/5095 +f 4178/4178/5096 4175/4176/5096 4177/4177/5096 +f 4167/4166/5097 4141/4029/5097 4140/4168/5097 +f 4167/4166/5098 4091/4092/5098 4141/4029/5098 +f 4091/4092/5099 4139/4141/5099 4141/4029/5099 +f 4091/4092/5100 3932/3930/5100 4139/4141/5100 +f 4139/4141/4505 3932/3930/4505 4138/4140/4505 +f 3850/3850/4506 4036/4038/4506 3932/3930/4506 +f 4138/4140/4507 3932/3930/4507 4036/4038/4507 +f 4135/4137/2 4111/4112/2 4121/4121/2 +f 4135/4137/2 4121/4121/2 4179/4179/2 +f 4136/4139/2 4125/4126/2 4113/4114/2 +f 4179/4179/2 4121/4121/2 4125/4126/2 +f 4134/4136/5101 4135/4137/5101 4179/4179/5101 +f 4179/4179/2 4125/4126/2 4136/4139/2 +f 4134/4136/5102 4179/4179/5102 4138/4140/5102 +f 4138/4140/5103 4036/4038/5103 4053/3908/5103 +f 4138/4140/5104 3919/3920/5104 4134/4136/5104 +f 4138/4140/5105 4179/4179/5105 4136/4139/5105 +f 4053/3908/5106 3919/3920/5106 4138/4140/5106 +f 4107/4106/5107 4106/4105/5107 4108/4109/5107 +f 4103/4108/5108 4106/4105/5108 4107/4106/5108 +f 4144/4144/5109 4103/4108/5109 4104/4107/5109 +f 4105/4104/5110 4068/4068/5110 3840/3839/5110 +f 4103/4108/5111 4105/4104/5111 4106/4105/5111 +f 4103/4108/5112 4144/4144/5112 4180/4180/5112 +f 4180/4180/5113 4105/4104/5113 4103/4108/5113 +f 4146/4146/5114 4180/4180/5114 4144/4144/5114 +f 4105/4104/5115 3995/3996/5115 4068/4068/5115 +f 4180/4180/5116 4181/4181/5116 4105/4104/5116 +f 4183/4182/5117 3995/3996/5117 4105/4104/5117 +f 4182/4183/5118 4181/4181/5118 4180/4180/5118 +f 4180/4180/4530 4146/4146/4530 4182/4183/4530 +f 4184/4184/5119 4114/4116/5119 4122/4115/5119 +f 4181/4181/5120 4183/4182/5120 4105/4104/5120 +f 4143/4143/2 4114/4116/2 4147/4147/2 +f 4114/4116/5121 4184/4184/5121 4147/4147/5121 +f 4182/4183/5122 4185/4185/5122 4181/4181/5122 +f 4146/4146/4535 4186/4186/4535 4182/4183/4535 +f 4088/4087/5123 4087/4086/5123 4092/4095/5123 +f 4116/4123/5124 3848/3847/5124 4118/4122/5124 +f 4186/4186/5125 4185/4185/5125 4182/4183/5125 +f 4184/4184/5126 4122/4115/5126 4187/4187/5126 +f 4188/4188/5127 4147/4147/5127 4184/4184/5127 +f 4148/4148/4538 4186/4186/4538 4146/4146/4538 +f 4168/4131/5128 4092/4095/5128 4087/4086/5128 +f 4118/4122/5129 3848/3847/5129 4168/4131/5129 +f 4183/4182/4539 4010/4011/4539 3995/3996/4539 +f 4122/4115/5130 4118/4122/5130 4187/4187/5130 +f 4147/4147/5131 4188/4188/5131 4148/4148/5131 +f 4148/4148/5132 4189/4189/5132 4186/4186/5132 +f 4185/4185/5133 4183/4182/5133 4181/4181/5133 +f 4189/4189/5134 4148/4148/5134 4188/4188/5134 +f 4186/4186/5135 4189/4189/5135 4185/4185/5135 +f 4184/4184/5136 4187/4187/5136 4188/4188/5136 +f 4188/4188/5137 4187/4187/5137 4190/4190/5137 +f 4118/4122/5138 4168/4131/5138 4187/4187/5138 +f 4190/4190/5139 4010/4011/5139 4183/4182/5139 +f 4185/4185/5140 4190/4190/5140 4183/4182/5140 +f 4189/4189/5141 4190/4190/5141 4185/4185/5141 +f 4188/4188/5142 4190/4190/5142 4189/4189/5142 +f 4187/4187/5143 4168/4131/5143 4029/4032/5143 +f 4024/4025/5144 4010/4011/5144 4190/4190/5144 +f 4187/4187/5145 4029/4032/5145 4024/4025/5145 +f 4187/4187/5146 4024/4025/5146 4190/4190/5146 +f 4167/4166/5147 4195/4191/5147 4191/4192/5147 +f 4195/4191/5148 4168/4131/5148 4193/4193/5148 +f 4193/4193/5149 4168/4131/5149 4166/4167/5149 +f 4193/4193/5150 4166/4167/5150 4192/4194/5150 +f 4193/4193/5151 4191/4192/5151 4195/4191/5151 +f 4166/4167/5152 4167/4166/5152 4191/4192/5152 +f 4192/4194/5153 4191/4192/5153 4193/4193/5153 +f 4192/4194/5154 4166/4167/5154 4191/4192/5154 +f 4168/4131/5155 4176/4175/5155 4029/4032/5155 +f 4140/4168/5156 4195/4191/5156 4167/4166/5156 +f 4176/4175/5157 4196/4195/5157 4197/4196/5157 +f 4140/4168/5158 4176/4175/5158 4197/4196/5158 +f 4195/4191/5159 4140/4168/5159 4194/4197/5159 +f 4194/4197/5160 4140/4168/5160 4197/4196/5160 +f 4196/4195/5161 4176/4175/5161 4168/4131/5161 +f 4196/4195/5162 4168/4131/5162 4195/4191/5162 +f 4197/4196/5163 4195/4191/5163 4194/4197/5163 +f 4196/4195/5164 4195/4191/5164 4197/4196/5164 +f 4200/4198/4578 4199/4199/4578 4198/4200/4578 +f 4201/4201/5165 4199/4199/5165 4200/4198/5165 +f 4203/4202/5166 4206/4203/5166 4202/4204/5166 +f 4206/4203/3848 4205/4205/3848 4202/4204/3848 +f 4204/4206/3849 4205/4205/3849 4206/4203/3849 +f 4209/4207/3850 4208/4208/3850 4207/4209/3850 +f 4210/4210/3851 4208/4208/3851 4209/4207/3851 +f 4214/4211/5167 4213/4212/5167 4211/4213/5167 +f 4212/4214/3854 4213/4212/3854 4214/4211/3854 +f 4217/4215/3855 4216/4216/3855 4215/4217/3855 +f 4218/4218/5168 4216/4216/5168 4217/4215/5168 +f 4222/4219/5169 4221/4220/5169 4219/4221/5169 +f 4220/4222/3859 4221/4220/3859 4222/4219/3859 +f 4224/4223/5170 4227/4224/5170 4223/4225/5170 +f 4227/4224/3861 4226/4226/3861 4223/4225/3861 +f 4225/4227/3862 4226/4226/3862 4227/4224/3862 +f 4230/4228/3863 4229/4229/3863 4228/4230/3863 +f 4231/4231/5171 4229/4229/5171 4230/4228/5171 +f 4272/4232/5172 4235/4233/5172 4232/4234/5172 +f 4235/4233/5173 4234/4235/5173 4232/4234/5173 +f 4233/4236/3866 4234/4235/3866 4235/4233/3866 +f 4239/4237/5174 4238/4238/5174 4236/4239/5174 +f 4237/4240/3869 4238/4238/3869 4239/4237/3869 +f 4242/4241/3870 4241/4242/3870 4240/4243/3870 +f 4243/4244/5175 4241/4242/5175 4242/4241/5175 +f 4246/4245/3872 4245/4246/3872 4244/4247/3872 +f 4247/4248/5176 4245/4246/5176 4246/4245/5176 +f 4249/4249/5177 4252/4250/5177 4248/4251/5177 +f 4252/4250/5178 4251/4252/5178 4248/4251/5178 +f 4250/4253/3875 4251/4252/3875 4252/4250/3875 +f 4359/4254/5179 4217/4215/5179 4254/4255/5179 +f 4359/4254/5180 4219/4221/5180 4217/4215/5180 +f 4253/4256/5181 4217/4215/5181 4219/4221/5181 +f 4217/4215/5182 4253/4256/5182 4257/4257/5182 +f 4218/4218/5183 4217/4215/5183 4257/4257/5183 +f 4256/4258/5184 4218/4218/5184 4255/4259/5184 +f 4255/4259/5185 4218/4218/5185 4257/4257/5185 +f 4257/4257/5186 4256/4258/5186 4255/4259/5186 +f 4253/4256/5187 4256/4258/5187 4257/4257/5187 +f 4215/4217/5188 4254/4255/5188 4217/4215/5188 +f 4215/4217/5189 4260/4260/5189 4254/4255/5189 +f 4216/4216/4600 4259/4261/4600 4258/4262/4600 +f 4260/4260/3893 4215/4217/3893 4261/4263/3893 +f 4260/4260/4601 4258/4262/4601 4259/4261/4601 +f 4215/4217/3895 4216/4216/3895 4258/4262/3895 +f 4261/4263/4602 4258/4262/4602 4260/4260/4602 +f 4261/4263/3897 4215/4217/3897 4258/4262/3897 +f 4263/4264/5190 4208/4208/5190 4210/4210/5190 +f 4264/4265/5191 4211/4213/5191 4209/4207/5191 +f 4262/4266/5192 4209/4207/5192 4211/4213/5192 +f 4209/4207/5193 4262/4266/5193 4266/4267/5193 +f 4210/4210/4606 4209/4207/4606 4266/4267/4606 +f 4267/4268/4607 4210/4210/4607 4265/4269/4607 +f 4267/4268/5194 4263/4264/5194 4210/4210/5194 +f 4265/4269/4609 4210/4210/4609 4266/4267/4609 +f 4262/4266/5195 4263/4264/5195 4267/4268/5195 +f 4266/4267/4613 4267/4268/4613 4265/4269/4613 +f 4262/4266/5196 4267/4268/5196 4266/4267/5196 +f 4207/4209/5197 4264/4265/5197 4209/4207/5197 +f 4208/4208/3913 4269/4270/3913 4268/4271/3913 +f 4269/4270/5198 4264/4265/5198 4271/4272/5198 +f 4264/4265/5199 4207/4209/5199 4271/4272/5199 +f 4271/4272/5200 4207/4209/5200 4270/4273/5200 +f 4271/4272/3917 4268/4271/3917 4269/4270/3917 +f 4207/4209/5201 4208/4208/5201 4268/4271/5201 +f 4270/4273/3919 4268/4271/3919 4271/4272/3919 +f 4270/4273/5202 4207/4209/5202 4268/4271/5202 +f 4228/4230/5203 4272/4232/5203 4230/4228/5203 +f 4228/4230/5204 4275/4274/5204 4272/4232/5204 +f 4229/4229/5205 4274/4275/5205 4273/4276/5205 +f 4275/4274/5206 4228/4230/5206 4276/4277/5206 +f 4275/4274/5207 4273/4276/5207 4274/4275/5207 +f 4228/4230/3927 4229/4229/3927 4273/4276/3927 +f 4276/4277/5208 4273/4276/5208 4275/4274/5208 +f 4276/4277/3929 4228/4230/3929 4273/4276/3929 +f 4277/4278/5209 4203/4202/5209 4202/4204/5209 +f 4278/4279/5210 4199/4199/5210 4201/4201/5210 +f 4278/4279/5211 4203/4202/5211 4277/4278/5211 +f 4200/4198/5212 4280/4280/5212 4281/4281/5212 +f 4201/4201/4630 4200/4198/4630 4281/4281/4630 +f 4282/4282/5213 4201/4201/5213 4279/4283/5213 +f 4282/4282/5214 4278/4279/5214 4201/4201/5214 +f 4279/4283/5215 4201/4201/5215 4281/4281/5215 +f 4280/4280/4632 4200/4198/4632 4203/4202/4632 +f 4203/4202/5216 4278/4279/5216 4282/4282/5216 +f 4280/4280/4634 4203/4202/4634 4282/4282/4634 +f 4281/4281/5217 4282/4282/5217 4279/4283/5217 +f 4280/4280/4636 4282/4282/4636 4281/4281/4636 +f 4283/4284/5218 4272/4232/5218 4232/4234/5218 +f 4285/4285/5219 4272/4232/5219 4283/4284/5219 +f 4230/4228/5220 4286/4286/5220 4287/4287/5220 +f 4231/4231/5221 4230/4228/5221 4287/4287/5221 +f 4285/4285/5222 4231/4231/5222 4284/4288/5222 +f 4284/4288/5223 4231/4231/5223 4287/4287/5223 +f 4286/4286/5224 4230/4228/5224 4272/4232/5224 +f 4286/4286/5225 4272/4232/5225 4285/4285/5225 +f 4287/4287/5226 4285/4285/5226 4284/4288/5226 +f 4286/4286/5227 4285/4285/5227 4287/4287/5227 +f 4203/4202/5228 4288/4289/5228 4289/4290/5228 +f 4203/4202/5229 4200/4198/5229 4288/4289/5229 +f 4198/4200/5230 4288/4289/5230 4200/4198/5230 +f 4199/4199/3952 4291/4291/3952 4290/4292/3952 +f 4288/4289/5231 4198/4200/5231 4292/4293/5231 +f 4288/4289/5232 4290/4292/5232 4291/4291/5232 +f 4198/4200/3955 4199/4199/3955 4290/4292/3955 +f 4292/4293/5233 4290/4292/5233 4288/4289/5233 +f 4292/4293/5234 4198/4200/5234 4290/4292/5234 +f 4294/4294/5235 4241/4242/5235 4243/4244/5235 +f 4289/4290/5236 4242/4241/5236 4295/4295/5236 +f 4289/4290/5237 4236/4239/5237 4242/4241/5237 +f 4293/4296/5238 4242/4241/5238 4236/4239/5238 +f 4242/4241/5239 4293/4296/5239 4297/4297/5239 +f 4243/4244/4658 4242/4241/4658 4297/4297/4658 +f 4298/4298/5240 4243/4244/5240 4296/4299/5240 +f 4298/4298/5241 4294/4294/5241 4243/4244/5241 +f 4296/4299/5242 4243/4244/5242 4297/4297/5242 +f 4293/4296/5243 4294/4294/5243 4298/4298/5243 +f 4297/4297/4664 4298/4298/4664 4296/4299/4664 +f 4293/4296/5244 4298/4298/5244 4297/4297/5244 +f 4240/4243/5245 4295/4295/5245 4242/4241/5245 +f 4240/4243/5246 4301/4300/5246 4295/4295/5246 +f 4241/4242/3971 4300/4301/3971 4299/4302/3971 +f 4301/4300/5247 4240/4243/5247 4302/4303/5247 +f 4301/4300/3973 4299/4302/3973 4300/4301/3973 +f 4240/4243/4671 4241/4242/4671 4299/4302/4671 +f 4302/4303/3975 4299/4302/3975 4301/4300/3975 +f 4302/4303/4673 4240/4243/4673 4299/4302/4673 +f 4305/4304/5248 4224/4223/5248 4223/4225/5248 +f 4307/4305/5249 4304/4306/5249 4303/4307/5249 +f 4307/4305/5250 4224/4223/5250 4305/4304/5250 +f 4306/4308/3981 4309/4309/3981 4310/4310/3981 +f 4303/4307/5251 4306/4308/5251 4310/4310/5251 +f 4311/4311/4678 4303/4307/4678 4308/4312/4678 +f 4311/4311/5252 4307/4305/5252 4303/4307/5252 +f 4308/4312/3985 4303/4307/3985 4310/4310/3985 +f 4309/4309/5253 4306/4308/5253 4224/4223/5253 +f 4224/4223/5254 4307/4305/5254 4311/4311/5254 +f 4309/4309/5255 4224/4223/5255 4311/4311/5255 +f 4310/4310/3989 4311/4311/3989 4308/4312/3989 +f 4309/4309/5256 4311/4311/5256 4310/4310/5256 +f 4306/4308/3991 4304/4306/3991 4312/4313/3991 +f 4303/4307/3992 4304/4306/3992 4306/4308/3992 +f 4315/4314/3993 4314/4315/3993 4313/4316/3993 +f 4316/4317/4683 4314/4315/4683 4315/4314/4683 +f 4319/4318/5257 4318/4319/5257 4320/4320/5257 +f 4320/4320/5258 4318/4319/5258 4321/4321/5258 +f 4289/4290/5259 4319/4318/5259 4320/4320/5259 +f 4289/4290/5260 4322/4322/5260 4317/4323/5260 +f 4321/4321/5261 4318/4319/5261 4317/4323/5261 +f 4322/4322/5262 4289/4290/5262 4320/4320/5262 +f 4322/4322/4001 4321/4321/4001 4317/4323/4001 +f 4320/4320/5263 4321/4321/5263 4322/4322/5263 +f 4278/4279/5264 4319/4318/5264 4199/4199/5264 +f 4291/4291/5265 4199/4199/5265 4319/4318/5265 +f 4289/4290/5266 4288/4289/5266 4324/4324/5266 +f 4319/4318/5267 4289/4290/5267 4324/4324/5267 +f 4319/4318/5268 4323/4325/5268 4291/4291/5268 +f 4324/4324/5269 4288/4289/5269 4325/4326/5269 +f 4323/4325/5270 4319/4318/5270 4324/4324/5270 +f 4325/4326/5271 4288/4289/5271 4291/4291/5271 +f 4325/4326/4698 4323/4325/4698 4324/4324/4698 +f 4291/4291/5272 4323/4325/5272 4325/4326/5272 +f 4326/4327/5273 4205/4205/5273 4278/4279/5273 +f 4205/4205/5274 4326/4327/5274 4327/4328/5274 +f 4277/4278/4701 4202/4204/4701 4328/4329/4701 +f 4326/4327/5275 4278/4279/5275 4277/4278/5275 +f 4277/4278/5276 4327/4328/5276 4326/4327/5276 +f 4202/4204/4017 4205/4205/4017 4327/4328/4017 +f 4328/4329/4705 4327/4328/4705 4277/4278/4705 +f 4328/4329/4706 4202/4204/4706 4327/4328/4706 +f 4331/4330/5277 4330/4331/5277 4333/4332/5277 +f 4333/4332/5278 4330/4331/5278 4334/4333/5278 +f 4332/4334/5279 4331/4330/5279 4333/4332/5279 +f 4332/4334/5280 4335/4335/5280 4329/4336/5280 +f 4334/4333/5281 4330/4331/5281 4329/4336/5281 +f 4335/4335/5282 4332/4334/5282 4333/4332/5282 +f 4335/4335/4711 4334/4333/4711 4329/4336/4711 +f 4333/4332/5283 4334/4333/5283 4335/4335/5283 +f 4331/4330/5284 4278/4279/5284 4205/4205/5284 +f 4204/4206/5285 4331/4330/5285 4205/4205/5285 +f 4203/4202/4714 4332/4334/4714 4206/4203/4714 +f 4204/4206/5286 4330/4331/5286 4331/4330/5286 +f 4329/4336/5287 4206/4203/5287 4332/4334/5287 +f 4206/4203/4717 4329/4336/4717 4337/4337/4717 +f 4204/4206/5288 4206/4203/5288 4337/4337/5288 +f 4330/4331/5289 4204/4206/5289 4336/4338/5289 +f 4336/4338/5290 4204/4206/5290 4337/4337/5290 +f 4337/4337/4720 4330/4331/4720 4336/4338/4720 +f 4329/4336/4721 4330/4331/4721 4337/4337/4721 +f 4338/4339/5291 4213/4212/5291 4263/4264/5291 +f 4213/4212/5292 4338/4339/5292 4339/4340/5292 +f 4262/4266/5293 4211/4213/5293 4340/4341/5293 +f 4338/4339/5294 4263/4264/5294 4262/4266/5294 +f 4262/4266/5295 4339/4340/5295 4338/4339/5295 +f 4211/4213/5296 4213/4212/5296 4339/4340/5296 +f 4340/4341/5297 4339/4340/5297 4262/4266/5297 +f 4340/4341/5298 4211/4213/5298 4339/4340/5298 +f 4263/4264/5299 4331/4330/5299 4208/4208/5299 +f 4264/4265/5300 4332/4334/5300 4203/4202/5300 +f 4269/4270/5301 4208/4208/5301 4331/4330/5301 +f 4331/4330/5302 4341/4342/5302 4269/4270/5302 +f 4332/4334/5303 4264/4265/5303 4342/4343/5303 +f 4341/4342/5304 4331/4330/5304 4332/4334/5304 +f 4342/4343/5305 4264/4265/5305 4269/4270/5305 +f 4342/4343/5306 4341/4342/5306 4332/4334/5306 +f 4269/4270/5307 4341/4342/5307 4342/4343/5307 +f 4254/4255/5308 4211/4213/5308 4264/4265/5308 +f 4343/4344/5309 4263/4264/5309 4213/4212/5309 +f 4254/4255/5310 4214/4211/5310 4211/4213/5310 +f 4212/4214/5311 4343/4344/5311 4213/4212/5311 +f 4344/4345/5312 4214/4211/5312 4254/4255/5312 +f 4214/4211/4058 4344/4345/4058 4346/4346/4058 +f 4212/4214/5313 4214/4211/5313 4346/4346/5313 +f 4343/4344/5314 4212/4214/5314 4345/4347/5314 +f 4345/4347/5315 4212/4214/5315 4346/4346/5315 +f 4346/4346/5316 4343/4344/5316 4345/4347/5316 +f 4344/4345/5317 4343/4344/5317 4346/4346/5317 +f 4347/4348/5318 4343/4344/5318 4348/4349/5318 +f 4348/4349/5319 4343/4344/5319 4349/4350/5319 +f 4254/4255/5320 4347/4348/5320 4348/4349/5320 +f 4254/4255/5321 4350/4351/5321 4344/4345/5321 +f 4349/4350/5322 4343/4344/5322 4344/4345/5322 +f 4350/4351/5323 4254/4255/5323 4348/4349/5323 +f 4350/4351/5324 4349/4350/5324 4344/4345/5324 +f 4348/4349/5325 4349/4350/5325 4350/4351/5325 +f 4218/4218/5326 4347/4348/5326 4216/4216/5326 +f 4259/4261/5327 4216/4216/5327 4347/4348/5327 +f 4254/4255/5328 4260/4260/5328 4352/4352/5328 +f 4347/4348/5329 4254/4255/5329 4352/4352/5329 +f 4347/4348/5330 4351/4353/5330 4259/4261/5330 +f 4352/4352/5331 4260/4260/5331 4353/4354/5331 +f 4351/4353/5332 4347/4348/5332 4352/4352/5332 +f 4353/4354/4754 4260/4260/4754 4259/4261/4754 +f 4353/4354/5333 4351/4353/5333 4352/4352/5333 +f 4259/4261/4756 4351/4353/4756 4353/4354/4756 +f 4221/4220/5334 4347/4348/5334 4218/4218/5334 +f 4256/4258/5335 4221/4220/5335 4218/4218/5335 +f 4221/4220/5336 4256/4258/5336 4354/4355/5336 +f 4253/4256/5337 4219/4221/5337 4355/4356/5337 +f 4253/4256/5338 4354/4355/5338 4256/4258/5338 +f 4219/4221/5339 4221/4220/5339 4354/4355/5339 +f 4355/4356/4762 4354/4355/4762 4253/4256/4762 +f 4355/4356/5340 4219/4221/5340 4354/4355/5340 +f 4358/4357/5341 4357/4358/5341 4360/4359/5341 +f 4360/4359/5342 4357/4358/5342 4361/4360/5342 +f 4359/4254/5343 4358/4357/5343 4360/4359/5343 +f 4359/4254/5344 4362/4361/5344 4356/4362/5344 +f 4361/4360/5345 4357/4358/5345 4356/4362/5345 +f 4362/4361/5346 4359/4254/5346 4360/4359/5346 +f 4362/4361/4097 4361/4360/4097 4356/4362/4097 +f 4360/4359/5347 4361/4360/5347 4362/4361/5347 +f 4221/4220/5348 4358/4357/5348 4347/4348/5348 +f 4359/4254/5349 4222/4219/5349 4219/4221/5349 +f 4220/4222/5350 4358/4357/5350 4221/4220/5350 +f 4220/4222/5351 4357/4358/5351 4358/4357/5351 +f 4356/4362/5352 4222/4219/5352 4359/4254/5352 +f 4222/4219/5353 4356/4362/5353 4364/4363/5353 +f 4220/4222/4105 4222/4219/4105 4364/4363/4105 +f 4357/4358/4774 4220/4222/4774 4363/4364/4774 +f 4363/4364/4775 4220/4222/4775 4364/4363/4775 +f 4364/4363/4108 4357/4358/4108 4363/4364/4108 +f 4356/4362/5354 4357/4358/5354 4364/4363/5354 +f 4247/4248/5355 4369/4365/5355 4358/4357/5355 +f 4251/4252/5356 4369/4365/5356 4247/4248/5356 +f 4451/4366/5357 4251/4252/5357 4247/4248/5357 +f 4251/4252/5358 4451/4366/5358 4365/4367/5358 +f 4367/4368/5359 4248/4251/5359 4366/4369/5359 +f 4367/4368/5360 4365/4367/5360 4451/4366/5360 +f 4248/4251/5361 4251/4252/5361 4365/4367/5361 +f 4366/4369/5362 4365/4367/5362 4367/4368/5362 +f 4366/4369/5363 4248/4251/5363 4365/4367/5363 +f 4370/4370/5364 4369/4365/5364 4372/4371/5364 +f 4371/4372/5365 4373/4373/5365 4368/4374/5365 +f 4372/4371/5366 4369/4365/5366 4368/4374/5366 +f 4373/4373/5367 4371/4372/5367 4370/4370/5367 +f 4373/4373/4123 4372/4371/4123 4368/4374/4123 +f 4370/4370/5368 4372/4371/5368 4373/4373/5368 +f 4376/4375/5369 4375/4376/5369 4374/4377/5369 +f 4375/4376/5370 4376/4375/5370 4377/4378/5370 +f 4380/4379/5371 4379/4380/5371 4378/4381/5371 +f 4376/4375/5372 4374/4377/5372 4380/4379/5372 +f 4380/4379/5373 4377/4378/5373 4376/4375/5373 +f 4379/4380/5374 4375/4376/5374 4377/4378/5374 +f 4378/4381/5375 4377/4378/5375 4380/4379/5375 +f 4378/4381/5376 4379/4380/5376 4377/4378/5376 +f 4381/4382/5377 4383/4383/5377 4379/4380/5377 +f 4383/4383/5378 4375/4376/5378 4379/4380/5378 +f 4382/4384/4795 4375/4376/4795 4383/4383/4795 +f 4386/4385/5379 4385/4386/5379 4388/4387/5379 +f 4388/4387/5380 4385/4386/5380 4389/4388/5380 +f 4387/4389/5381 4386/4385/5381 4388/4387/5381 +f 4387/4389/5382 4390/4390/5382 4384/4391/5382 +f 4389/4388/5383 4385/4386/5383 4384/4391/5383 +f 4390/4390/5384 4387/4389/5384 4388/4387/5384 +f 4390/4390/5385 4389/4388/5385 4384/4391/5385 +f 4388/4387/5386 4389/4388/5386 4390/4390/5386 +f 4393/4392/4142 4392/4393/4142 4391/4394/4142 +f 4394/4395/4143 4392/4393/4143 4393/4392/4143 +f 4397/4396/5387 4396/4397/5387 4395/4398/5387 +f 4396/4397/4145 4397/4396/4145 4398/4399/4145 +f 4401/4400/4802 4400/4401/4802 4399/4402/4802 +f 4397/4396/5388 4395/4398/5388 4401/4400/5388 +f 4401/4400/4148 4398/4399/4148 4397/4396/4148 +f 4400/4401/5389 4396/4397/5389 4398/4399/5389 +f 4399/4402/4150 4398/4399/4150 4401/4400/4150 +f 4399/4402/5390 4400/4401/5390 4398/4399/5390 +f 4402/4403/5391 4404/4404/5391 4400/4401/5391 +f 4404/4404/4153 4396/4397/4153 4400/4401/4153 +f 4403/4405/4154 4396/4397/4154 4404/4404/4154 +f 4407/4406/5392 4395/4398/5392 4406/4407/5392 +f 4407/4406/5393 4406/4407/5393 4409/4408/5393 +f 4408/4409/4157 4410/4410/4157 4405/4411/4157 +f 4409/4408/5394 4406/4407/5394 4405/4411/5394 +f 4410/4410/5395 4408/4409/5395 4407/4406/5395 +f 4410/4410/4160 4409/4408/4160 4405/4411/4160 +f 4407/4406/5396 4409/4408/5396 4410/4410/5396 +f 4411/4412/5397 4226/4226/5397 4307/4305/5397 +f 4226/4226/5398 4411/4412/5398 4412/4413/5398 +f 4305/4304/5399 4223/4225/5399 4413/4414/5399 +f 4411/4412/5400 4307/4305/5400 4305/4304/5400 +f 4305/4304/4166 4412/4413/4166 4411/4412/4166 +f 4223/4225/5401 4226/4226/5401 4412/4413/5401 +f 4413/4414/4168 4412/4413/4168 4305/4304/4168 +f 4413/4414/5402 4223/4225/5402 4412/4413/5402 +f 4414/4415/5403 4307/4305/5403 4226/4226/5403 +f 4225/4227/5404 4414/4415/5404 4226/4226/5404 +f 4272/4232/5405 4227/4224/5405 4224/4223/5405 +f 4272/4232/5406 4416/4416/5406 4227/4224/5406 +f 4415/4417/5407 4227/4224/5407 4416/4416/5407 +f 4227/4224/4175 4415/4417/4175 4418/4418/4175 +f 4225/4227/5408 4227/4224/5408 4418/4418/5408 +f 4414/4415/5409 4225/4227/5409 4417/4419/5409 +f 4417/4419/4178 4225/4227/4178 4418/4418/4178 +f 4418/4418/5410 4414/4415/5410 4417/4419/5410 +f 4415/4417/5411 4414/4415/5411 4418/4418/5411 +f 4419/4420/5412 4414/4415/5412 4420/4421/5412 +f 4420/4421/5413 4414/4415/5413 4421/4422/5413 +f 4416/4416/5414 4419/4420/5414 4420/4421/5414 +f 4416/4416/5415 4422/4423/5415 4415/4417/5415 +f 4421/4422/5416 4414/4415/5416 4415/4417/5416 +f 4422/4423/5417 4416/4416/5417 4420/4421/5417 +f 4422/4423/4187 4421/4422/4187 4415/4417/4187 +f 4420/4421/5418 4421/4422/5418 4422/4423/5418 +f 4289/4290/5419 4239/4237/5419 4236/4239/5419 +f 4237/4240/5420 4319/4318/5420 4238/4238/5420 +f 4237/4240/5421 4318/4319/5421 4319/4318/5421 +f 4317/4323/5422 4239/4237/5422 4289/4290/5422 +f 4239/4237/5423 4317/4323/5423 4424/4424/5423 +f 4237/4240/4834 4239/4237/4834 4424/4424/4834 +f 4318/4319/4196 4237/4240/4196 4423/4425/4196 +f 4423/4425/5424 4237/4240/5424 4424/4424/5424 +f 4424/4424/4198 4318/4319/4198 4423/4425/4198 +f 4317/4323/4199 4318/4319/4199 4424/4424/4199 +f 4285/4285/5425 4234/4235/5425 4231/4231/5425 +f 4234/4235/5426 4285/4285/5426 4425/4426/5426 +f 4283/4284/5427 4232/4234/5427 4426/4427/5427 +f 4283/4284/5428 4425/4426/5428 4285/4285/5428 +f 4232/4234/5429 4234/4235/5429 4425/4426/5429 +f 4426/4427/5430 4425/4426/5430 4283/4284/5430 +f 4426/4427/5431 4232/4234/5431 4425/4426/5431 +f 4231/4231/5432 4419/4420/5432 4229/4229/5432 +f 4274/4275/5433 4229/4229/5433 4419/4420/5433 +f 4272/4232/5434 4275/4274/5434 4416/4416/5434 +f 4419/4420/5435 4427/4428/5435 4274/4275/5435 +f 4416/4416/5436 4275/4274/5436 4428/4429/5436 +f 4427/4428/5437 4419/4420/5437 4416/4416/5437 +f 4428/4429/4854 4275/4274/4854 4274/4275/4854 +f 4428/4429/5438 4427/4428/5438 4416/4416/5438 +f 4274/4275/4215 4427/4428/4215 4428/4429/4215 +f 4233/4236/5439 4429/4430/5439 4234/4235/5439 +f 4233/4236/5440 4432/4431/5440 4429/4430/5440 +f 4430/4432/5441 4235/4233/5441 4295/4295/5441 +f 4235/4233/4221 4430/4432/4221 4433/4433/4221 +f 4233/4236/5442 4235/4233/5442 4433/4433/5442 +f 4432/4431/5443 4233/4236/5443 4431/4434/5443 +f 4431/4434/4224 4233/4236/4224 4433/4433/4224 +f 4433/4433/4862 4432/4431/4862 4431/4434/4862 +f 4430/4432/4863 4432/4431/4863 4433/4433/4863 +f 4434/4435/5444 4238/4238/5444 4294/4294/5444 +f 4238/4238/5445 4434/4435/5445 4435/4436/5445 +f 4293/4296/5446 4236/4239/5446 4436/4437/5446 +f 4434/4435/5447 4294/4294/5447 4293/4296/5447 +f 4293/4296/5448 4435/4436/5448 4434/4435/5448 +f 4236/4239/5449 4238/4238/5449 4435/4436/5449 +f 4436/4437/5450 4435/4436/5450 4293/4296/5450 +f 4436/4437/5451 4236/4239/5451 4435/4436/5451 +f 4429/4430/5452 4432/4431/5452 4437/4438/5452 +f 4437/4438/5453 4432/4431/5453 4438/4439/5453 +f 4295/4295/5454 4429/4430/5454 4437/4438/5454 +f 4295/4295/5455 4439/4440/5455 4430/4432/5455 +f 4438/4439/5456 4432/4431/5456 4430/4432/5456 +f 4439/4440/5457 4295/4295/5457 4437/4438/5457 +f 4439/4440/5458 4438/4439/5458 4430/4432/5458 +f 4437/4438/5459 4438/4439/5459 4439/4440/5459 +f 4241/4242/5460 4294/4294/5460 4429/4430/5460 +f 4300/4301/5461 4241/4242/5461 4429/4430/5461 +f 4295/4295/5462 4301/4300/5462 4441/4441/5462 +f 4429/4430/5463 4295/4295/5463 4441/4441/5463 +f 4429/4430/5464 4440/4442/5464 4300/4301/5464 +f 4441/4441/4248 4301/4300/4248 4442/4443/4248 +f 4440/4442/5465 4429/4430/5465 4441/4441/5465 +f 4442/4443/5466 4301/4300/5466 4300/4301/5466 +f 4442/4443/5467 4440/4442/5467 4441/4441/5467 +f 4300/4301/5468 4440/4442/5468 4442/4443/5468 +f 4247/4248/5469 4358/4357/5469 4245/4246/5469 +f 4443/4444/5470 4245/4246/5470 4358/4357/5470 +f 4359/4254/5471 4444/4445/5471 4446/4446/5471 +f 4358/4357/5472 4359/4254/5472 4446/4446/5472 +f 4358/4357/5473 4445/4447/5473 4443/4444/5473 +f 4446/4446/5474 4444/4445/5474 4447/4448/5474 +f 4445/4447/5475 4358/4357/5475 4446/4446/5475 +f 4447/4448/5476 4444/4445/5476 4443/4444/5476 +f 4447/4448/5477 4445/4447/5477 4446/4446/5477 +f 4443/4444/4261 4445/4447/4261 4447/4448/4261 +f 4249/4249/5478 4444/4445/5478 4359/4254/5478 +f 4249/4249/5479 4246/4245/5479 4444/4445/5479 +f 4244/4247/5480 4444/4445/5480 4246/4245/5480 +f 4245/4246/5481 4443/4444/5481 4448/4449/5481 +f 4444/4445/5482 4244/4247/5482 4449/4450/5482 +f 4444/4445/5483 4448/4449/5483 4443/4444/5483 +f 4244/4247/4892 4245/4246/4892 4448/4449/4892 +f 4449/4450/5484 4448/4449/5484 4444/4445/5484 +f 4449/4450/4894 4244/4247/4894 4448/4449/4894 +f 4367/4368/5485 4249/4249/5485 4248/4251/5485 +f 4451/4366/5486 4249/4249/5486 4367/4368/5486 +f 4246/4245/5487 4452/4451/5487 4453/4452/5487 +f 4247/4248/5488 4246/4245/5488 4453/4452/5488 +f 4451/4366/5489 4247/4248/5489 4450/4453/5489 +f 4450/4453/5490 4247/4248/5490 4453/4452/5490 +f 4452/4451/5491 4246/4245/5491 4249/4249/5491 +f 4452/4451/5492 4249/4249/5492 4451/4366/5492 +f 4453/4452/5493 4451/4366/5493 4450/4453/5493 +f 4452/4451/5494 4451/4366/5494 4453/4452/5494 +f 4250/4253/5495 4369/4365/5495 4251/4252/5495 +f 4371/4372/5496 4252/4250/5496 4249/4249/5496 +f 4368/4374/5497 4252/4250/5497 4371/4372/5497 +f 4252/4250/4288 4368/4374/4288 4455/4454/4288 +f 4250/4253/5498 4252/4250/5498 4455/4454/5498 +f 4369/4365/5499 4250/4253/5499 4456/4455/5499 +f 4456/4455/5500 4250/4253/5500 4454/4456/5500 +f 4454/4456/4291 4250/4253/4291 4455/4454/4291 +f 4368/4374/5501 4369/4365/5501 4456/4455/5501 +f 4455/4454/4913 4456/4455/4913 4454/4456/4913 +f 4368/4374/4914 4456/4455/4914 4455/4454/4914 +f 4314/4315/5502 4374/4377/5502 4370/4370/5502 +f 4457/4457/5503 4314/4315/5503 4370/4370/5503 +f 4381/4382/5504 4458/4458/5504 4371/4372/5504 +f 4370/4370/5505 4459/4459/5505 4457/4457/5505 +f 4371/4372/5506 4458/4458/5506 4460/4460/5506 +f 4459/4459/5507 4370/4370/5507 4371/4372/5507 +f 4460/4460/5508 4458/4458/5508 4457/4457/5508 +f 4460/4460/5509 4459/4459/5509 4371/4372/5509 +f 4457/4457/4304 4459/4459/4304 4460/4460/4304 +f 4463/4461/5510 4464/4462/5510 4465/4463/5510 +f 4462/4464/5511 4463/4461/5511 4465/4463/5511 +f 4466/4465/4924 4462/4464/4924 4461/4466/4924 +f 4461/4466/4925 4462/4464/4925 4465/4463/4925 +f 4465/4463/5512 4466/4465/5512 4461/4466/5512 +f 4464/4462/4927 4466/4465/4927 4465/4463/4927 +f 4467/4467/5513 4466/4465/5513 4469/4468/5513 +f 4469/4468/5514 4466/4465/5514 4470/4469/5514 +f 4468/4470/5515 4467/4467/5515 4469/4468/5515 +f 4468/4470/5516 4471/4471/5516 4464/4462/5516 +f 4470/4469/4932 4466/4465/4932 4464/4462/4932 +f 4471/4471/5517 4468/4470/5517 4469/4468/5517 +f 4471/4471/4318 4470/4469/4318 4464/4462/4318 +f 4469/4468/5518 4470/4469/5518 4471/4471/5518 +f 4224/4223/5519 4306/4308/5519 4472/4472/5519 +f 4312/4313/5520 4472/4472/5520 4306/4308/5520 +f 4304/4306/5521 4474/4473/5521 4473/4474/5521 +f 4474/4473/5522 4472/4472/5522 4476/4475/5522 +f 4472/4472/4939 4312/4313/4939 4476/4475/4939 +f 4476/4475/4940 4312/4313/4940 4475/4476/4940 +f 4476/4475/5523 4473/4474/5523 4474/4473/5523 +f 4312/4313/5524 4304/4306/5524 4473/4474/5524 +f 4475/4476/4943 4473/4474/4943 4476/4475/4943 +f 4475/4476/4327 4312/4313/4327 4473/4474/4327 +f 4313/4316/5525 4381/4382/5525 4315/4314/5525 +f 4313/4316/5526 4458/4458/5526 4381/4382/5526 +f 4314/4315/5527 4457/4457/5527 4477/4477/5527 +f 4458/4458/4331 4313/4316/4331 4478/4478/4331 +f 4458/4458/4332 4477/4477/4332 4457/4457/4332 +f 4313/4316/5528 4314/4315/5528 4477/4477/5528 +f 4478/4478/4947 4477/4477/4947 4458/4458/4947 +f 4478/4478/5529 4313/4316/5529 4477/4477/5529 +f 4482/4479/5530 4359/4254/5530 4483/4480/5530 +f 4484/4481/5531 4481/4482/5531 4479/4483/5531 +f 4481/4482/5532 4484/4481/5532 4485/4484/5532 +f 4359/4254/5533 4254/4255/5533 4483/4480/5533 +f 4485/4484/5534 4484/4481/5534 4486/4485/5534 +f 4485/4484/4954 4486/4485/4954 4487/4486/4954 +f 4484/4481/5535 4483/4480/5535 4488/4487/5535 +f 4254/4255/5536 4264/4265/5536 4483/4480/5536 +f 4484/4481/5537 4488/4487/5537 4486/4485/5537 +f 4487/4486/5538 4486/4485/5538 4489/4488/5538 +f 4490/4489/5539 4493/4490/5539 4491/4491/5539 +f 4483/4480/5540 4264/4265/5540 4488/4487/5540 +f 4487/4486/5541 4489/4488/5541 4494/4492/5541 +f 4487/4486/4963 4494/4492/4963 4495/4493/4963 +f 4486/4485/5542 4488/4487/5542 4489/4488/5542 +f 4488/4487/5543 4264/4265/5543 4203/4202/5543 +f 4496/4494/5544 4224/4223/5544 4492/4495/5544 +f 4496/4494/5545 4272/4232/5545 4224/4223/5545 +f 4493/4490/5546 4496/4494/5546 4492/4495/5546 +f 4493/4490/5547 4490/4489/5547 4497/4496/5547 +f 4497/4496/5548 4496/4494/5548 4493/4490/5548 +f 4494/4492/5549 4489/4488/5549 4498/4497/5549 +f 4489/4488/5550 4488/4487/5550 4498/4497/5550 +f 4495/4493/5551 4499/4498/5551 4500/4499/5551 +f 4500/4499/4972 4497/4496/4972 4490/4489/4972 +f 4495/4493/5552 4494/4492/5552 4499/4498/5552 +f 4500/4499/5553 4499/4498/5553 4497/4496/5553 +f 4497/4496/5554 4501/4500/5554 4496/4494/5554 +f 4488/4487/5555 4203/4202/5555 4289/4290/5555 +f 4502/4501/5556 4272/4232/5556 4496/4494/5556 +f 4501/4500/5557 4502/4501/5557 4496/4494/5557 +f 4498/4497/5558 4488/4487/5558 4502/4501/5558 +f 4494/4492/5559 4498/4497/5559 4499/4498/5559 +f 4499/4498/5560 4501/4500/5560 4497/4496/5560 +f 4295/4295/5561 4235/4233/5561 4272/4232/5561 +f 4488/4487/5562 4289/4290/5562 4502/4501/5562 +f 4295/4295/5563 4272/4232/5563 4502/4501/5563 +f 4498/4497/5564 4502/4501/5564 4499/4498/5564 +f 4499/4498/5565 4502/4501/5565 4501/4500/5565 +f 4502/4501/5566 4289/4290/5566 4295/4295/5566 +f 4304/4306/5567 4307/4305/5567 4467/4467/5567 +f 4224/4223/5568 4468/4470/5568 4542/4502/5568 +f 4224/4223/4994 4472/4472/4994 4468/4470/4994 +f 4474/4473/5569 4304/4306/5569 4467/4467/5569 +f 4467/4467/5570 4503/4503/5570 4474/4473/5570 +f 4503/4503/5571 4467/4467/5571 4468/4470/5571 +f 4472/4472/5572 4503/4503/5572 4468/4470/5572 +f 4474/4473/5573 4503/4503/5573 4472/4472/5573 +f 4380/4379/5574 4381/4382/5574 4379/4380/5574 +f 4374/4377/5575 4314/4315/5575 4316/4317/5575 +f 4374/4377/5576 4381/4382/5576 4380/4379/5576 +f 4315/4314/5577 4505/4504/5577 4506/4505/5577 +f 4316/4317/5002 4315/4314/5002 4506/4505/5002 +f 4507/4506/5578 4316/4317/5578 4504/4507/5578 +f 4507/4506/5579 4374/4377/5579 4316/4317/5579 +f 4504/4507/5580 4316/4317/5580 4506/4505/5580 +f 4505/4504/5581 4315/4314/5581 4381/4382/5581 +f 4381/4382/5582 4374/4377/5582 4507/4506/5582 +f 4505/4504/5583 4381/4382/5583 4507/4506/5583 +f 4506/4505/5007 4507/4506/5007 4504/4507/5007 +f 4505/4504/5584 4507/4506/5584 4506/4505/5584 +f 4509/4508/2 4485/4484/2 4487/4486/2 +f 4508/4509/5585 4319/4318/5585 4510/4510/5585 +f 4319/4318/5586 4278/4279/5586 4510/4510/5586 +f 4510/4510/5587 4509/4508/5587 4508/4509/5587 +f 4510/4510/5588 4278/4279/5588 4331/4330/5588 +f 4509/4508/2 4481/4482/2 4485/4484/2 +f 4263/4264/5589 4513/4511/5589 4331/4330/5589 +f 4343/4344/5590 4347/4348/5590 4263/4264/5590 +f 4490/4489/2 4491/4491/2 4511/4512/2 +f 4512/4513/5591 4511/4512/5591 4514/4514/5591 +f 4331/4330/5592 4513/4511/5592 4510/4510/5592 +f 4263/4264/5593 4347/4348/5593 4513/4511/5593 +f 4407/4406/5594 4515/4515/5594 4395/4398/5594 +f 4516/4516/2 4481/4482/2 4509/4508/2 +f 4513/4511/5595 4509/4508/5595 4510/4510/5595 +f 4511/4512/2 4491/4491/2 4517/4517/2 +f 4518/4518/5596 4395/4398/5596 4515/4515/5596 +f 4516/4516/2 4519/4519/2 4481/4482/2 +f 4513/4511/5597 4516/4516/5597 4509/4508/5597 +f 4514/4514/5598 4511/4512/5598 4517/4517/5598 +f 4518/4518/5599 4515/4515/5599 4514/4514/5599 +f 4358/4357/5600 4513/4511/5600 4347/4348/5600 +f 4514/4514/5601 4517/4517/5601 4518/4518/5601 +f 4516/4516/2 4521/4520/2 4519/4519/2 +f 4358/4357/5602 4520/4521/5602 4513/4511/5602 +f 4517/4517/2 4522/4522/2 4523/4523/2 +f 4520/4521/5603 4516/4516/5603 4513/4511/5603 +f 4520/4521/5604 4358/4357/5604 4369/4365/5604 +f 4517/4517/2 4523/4523/2 4524/4524/2 +f 4518/4518/5605 4386/4385/5605 4395/4398/5605 +f 4524/4524/2 4523/4523/2 4521/4520/2 +f 4518/4518/5606 4517/4517/5606 4524/4524/5606 +f 4524/4524/2 4521/4520/2 4516/4516/2 +f 4520/4521/5027 4524/4524/5027 4516/4516/5027 +f 4370/4370/5607 4520/4521/5607 4369/4365/5607 +f 4518/4518/5608 4374/4377/5608 4386/4385/5608 +f 4518/4518/5609 4524/4524/5609 4520/4521/5609 +f 4374/4377/5610 4520/4521/5610 4370/4370/5610 +f 4374/4377/5611 4518/4518/5611 4520/4521/5611 +f 4386/4385/5612 4374/4377/5612 4375/4376/5612 +f 4382/4384/5613 4386/4385/5613 4375/4376/5613 +f 4381/4382/5614 4387/4389/5614 4383/4383/5614 +f 4382/4384/5615 4385/4386/5615 4386/4385/5615 +f 4384/4391/5616 4383/4383/5616 4387/4389/5616 +f 4383/4383/5617 4384/4391/5617 4526/4525/5617 +f 4382/4384/4428 4383/4383/4428 4526/4525/4428 +f 4385/4386/5618 4382/4384/5618 4525/4526/5618 +f 4525/4526/5619 4382/4384/5619 4526/4525/5619 +f 4526/4525/5037 4385/4386/5037 4525/4526/5037 +f 4384/4391/5038 4385/4386/5038 4526/4525/5038 +f 4392/4393/5620 4395/4398/5620 4386/4385/5620 +f 4402/4403/5621 4387/4389/5621 4381/4382/5621 +f 4402/4403/5622 4528/4527/5622 4387/4389/5622 +f 4527/4528/5623 4392/4393/5623 4386/4385/5623 +f 4386/4385/5624 4529/4529/5624 4527/4528/5624 +f 4529/4529/5625 4386/4385/5625 4387/4389/5625 +f 4528/4527/5626 4529/4529/5626 4387/4389/5626 +f 4527/4528/5627 4529/4529/5627 4528/4527/5627 +f 4402/4403/5628 4393/4392/5628 4528/4527/5628 +f 4391/4394/5629 4528/4527/5629 4393/4392/5629 +f 4392/4393/4448 4527/4528/4448 4530/4530/4448 +f 4527/4528/5630 4528/4527/5630 4532/4531/5630 +f 4528/4527/5631 4391/4394/5631 4532/4531/5631 +f 4532/4531/5632 4391/4394/5632 4531/4532/5632 +f 4532/4531/5633 4530/4530/5633 4527/4528/5633 +f 4391/4394/5051 4392/4393/5051 4530/4530/5051 +f 4531/4532/5634 4530/4530/5634 4532/4531/5634 +f 4531/4532/5052 4391/4394/5052 4530/4530/5052 +f 4401/4400/5635 4402/4403/5635 4400/4401/5635 +f 4395/4398/5636 4392/4393/5636 4394/4395/5636 +f 4395/4398/5637 4402/4403/5637 4401/4400/5637 +f 4393/4392/5638 4534/4533/5638 4535/4534/5638 +f 4394/4395/5639 4393/4392/5639 4535/4534/5639 +f 4536/4535/5057 4394/4395/5057 4533/4536/5057 +f 4536/4535/5640 4395/4398/5640 4394/4395/5640 +f 4533/4536/4461 4394/4395/4461 4535/4534/4461 +f 4534/4533/5641 4393/4392/5641 4402/4403/5641 +f 4402/4403/5642 4395/4398/5642 4536/4535/5642 +f 4534/4533/5643 4402/4403/5643 4536/4535/5643 +f 4535/4534/4465 4536/4535/4465 4533/4536/4465 +f 4534/4533/4466 4536/4535/4466 4535/4534/4466 +f 4406/4407/5644 4395/4398/5644 4396/4397/5644 +f 4403/4405/5645 4406/4407/5645 4396/4397/5645 +f 4542/4502/5646 4404/4404/5646 4402/4403/5646 +f 4542/4502/5647 4408/4409/5647 4404/4404/5647 +f 4405/4411/5648 4404/4404/5648 4408/4409/5648 +f 4404/4404/4472 4405/4411/4472 4538/4537/4472 +f 4403/4405/5068 4404/4404/5068 4538/4537/5068 +f 4406/4407/5649 4403/4405/5649 4539/4538/5649 +f 4539/4538/5650 4403/4405/5650 4537/4539/5650 +f 4537/4539/5070 4403/4405/5070 4538/4537/5070 +f 4405/4411/5651 4406/4407/5651 4539/4538/5651 +f 4538/4537/5652 4539/4538/5652 4537/4539/5652 +f 4405/4411/5653 4539/4538/5653 4538/4537/5653 +f 4467/4467/5654 4462/4464/5654 4466/4465/5654 +f 4467/4467/5655 4515/4515/5655 4541/4540/5655 +f 4541/4540/5656 4462/4464/5656 4467/4467/5656 +f 4542/4502/5657 4463/4461/5657 4540/4541/5657 +f 4463/4461/5076 4541/4540/5076 4540/4541/5076 +f 4462/4464/4481 4541/4540/4481 4463/4461/4481 +f 4543/4542/5658 4515/4515/5658 4407/4406/5658 +f 4544/4543/5659 4543/4542/5659 4407/4406/5659 +f 4542/4502/5660 4545/4544/5660 4408/4409/5660 +f 4407/4406/5661 4546/4545/5661 4544/4543/5661 +f 4408/4409/5662 4545/4544/5662 4547/4546/5662 +f 4546/4545/5663 4407/4406/5663 4408/4409/5663 +f 4547/4546/5085 4545/4544/5085 4544/4543/5085 +f 4547/4546/4490 4546/4545/4490 4408/4409/4490 +f 4544/4543/5087 4546/4545/5087 4547/4546/5087 +f 4548/4547/5664 4542/4502/5664 4550/4548/5664 +f 4550/4548/5665 4542/4502/5665 4549/4549/5665 +f 4550/4548/5666 4543/4542/5666 4548/4547/5666 +f 4549/4549/5667 4543/4542/5667 4550/4548/5667 +f 4548/4547/5668 4545/4544/5668 4542/4502/5668 +f 4543/4542/5669 4544/4543/5669 4551/4550/5669 +f 4545/4544/5670 4548/4547/5670 4552/4551/5670 +f 4545/4544/5671 4551/4550/5671 4544/4543/5671 +f 4548/4547/5672 4543/4542/5672 4551/4550/5672 +f 4552/4551/5673 4551/4550/5673 4545/4544/5673 +f 4552/4551/5674 4548/4547/5674 4551/4550/5674 +f 4467/4467/5675 4514/4514/5675 4515/4515/5675 +f 4514/4514/5676 4467/4467/5676 4307/4305/5676 +f 4514/4514/5677 4307/4305/5677 4512/4513/5677 +f 4414/4415/5678 4419/4420/5678 4307/4305/5678 +f 4509/4508/2 4487/4486/2 4495/4493/2 +f 4419/4420/5679 4512/4513/5679 4307/4305/5679 +f 4509/4508/2 4495/4493/2 4553/4552/2 +f 4238/4238/5680 4319/4318/5680 4294/4294/5680 +f 4511/4512/2 4500/4499/2 4490/4489/2 +f 4553/4552/2 4495/4493/2 4500/4499/2 +f 4508/4509/5681 4509/4508/5681 4553/4552/5681 +f 4234/4235/5682 4419/4420/5682 4231/4231/5682 +f 4508/4509/5683 4294/4294/5683 4319/4318/5683 +f 4553/4552/2 4500/4499/2 4511/4512/2 +f 4234/4235/5684 4429/4430/5684 4419/4420/5684 +f 4512/4513/5685 4553/4552/5685 4511/4512/5685 +f 4512/4513/5686 4419/4420/5686 4429/4430/5686 +f 4508/4509/5687 4553/4552/5687 4512/4513/5687 +f 4429/4430/5688 4294/4294/5688 4508/4509/5688 +f 4429/4430/5689 4508/4509/5689 4512/4513/5689 +f 4479/4483/5690 4483/4480/5690 4484/4481/5690 +f 4519/4519/5691 4479/4483/5691 4481/4482/5691 +f 4479/4483/5692 4482/4479/5692 4483/4480/5692 +f 4519/4519/5693 4480/4553/5693 4479/4483/5693 +f 4480/4553/5694 4482/4479/5694 4479/4483/5694 +f 4482/4479/5695 4249/4249/5695 4359/4254/5695 +f 4480/4553/5696 4519/4519/5696 4554/4554/5696 +f 4554/4554/5697 4482/4479/5697 4480/4553/5697 +f 4521/4520/5698 4554/4554/5698 4519/4519/5698 +f 4555/4555/5699 4249/4249/5699 4482/4479/5699 +f 4556/4556/5700 4491/4491/5700 4493/4490/5700 +f 4555/4555/5701 4371/4372/5701 4249/4249/5701 +f 4554/4554/5702 4555/4555/5702 4482/4479/5702 +f 4557/4557/5703 4555/4555/5703 4554/4554/5703 +f 4554/4554/4530 4521/4520/4530 4557/4557/4530 +f 4555/4555/5704 4381/4382/5704 4371/4372/5704 +f 4556/4556/5705 4493/4490/5705 4492/4495/5705 +f 4491/4491/5706 4556/4556/5706 4558/4558/5706 +f 4517/4517/2 4491/4491/2 4522/4522/2 +f 4491/4491/5707 4558/4558/5707 4522/4522/5707 +f 4521/4520/5708 4559/4559/5708 4557/4557/5708 +f 4464/4462/5123 4463/4461/5123 4468/4470/5123 +f 4560/4560/5709 4381/4382/5709 4555/4555/5709 +f 4559/4559/5710 4555/4555/5710 4557/4557/5710 +f 4556/4556/5711 4492/4495/5711 4561/4561/5711 +f 4523/4523/4538 4559/4559/4538 4521/4520/4538 +f 4542/4502/5712 4468/4470/5712 4463/4461/5712 +f 4492/4495/5713 4224/4223/5713 4542/4502/5713 +f 4559/4559/5714 4560/4560/5714 4555/4555/5714 +f 4556/4556/5715 4561/4561/5715 4558/4558/5715 +f 4522/4522/5716 4562/4562/5716 4523/4523/5716 +f 4523/4523/5717 4562/4562/5717 4559/4559/5717 +f 4522/4522/5718 4558/4558/5718 4562/4562/5718 +f 4562/4562/5719 4560/4560/5719 4559/4559/5719 +f 4561/4561/5720 4492/4495/5720 4563/4563/5720 +f 4558/4558/5721 4561/4561/5721 4564/4564/5721 +f 4492/4495/5722 4542/4502/5722 4563/4563/5722 +f 4558/4558/5723 4564/4564/5723 4562/4562/5723 +f 4560/4560/5724 4402/4403/5724 4381/4382/5724 +f 4562/4562/5725 4564/4564/5725 4560/4560/5725 +f 4561/4561/5726 4563/4563/5726 4564/4564/5726 +f 4564/4564/5727 4563/4563/5727 4560/4560/5727 +f 4563/4563/5728 4402/4403/5728 4560/4560/5728 +f 4563/4563/5729 4542/4502/5729 4402/4403/5729 +f 4540/4541/5730 4565/4565/5730 4542/4502/5730 +f 4515/4515/5731 4567/4566/5731 4541/4540/5731 +f 4541/4540/5732 4567/4566/5732 4566/4567/5732 +f 4565/4565/5733 4540/4541/5733 4568/4568/5733 +f 4567/4566/5734 4515/4515/5734 4565/4565/5734 +f 4565/4565/5735 4566/4567/5735 4567/4566/5735 +f 4540/4541/5152 4541/4540/5152 4566/4567/5152 +f 4568/4568/4565 4566/4567/4565 4565/4565/4565 +f 4568/4568/5736 4540/4541/5736 4566/4567/5736 +f 4549/4549/5737 4515/4515/5737 4543/4542/5737 +f 4542/4502/5738 4565/4565/5738 4570/4569/5738 +f 4549/4549/5739 4542/4502/5739 4570/4569/5739 +f 4515/4515/5740 4549/4549/5740 4571/4570/5740 +f 4571/4570/4573 4549/4549/4573 4569/4571/4573 +f 4569/4571/5741 4549/4549/5741 4570/4569/5741 +f 4565/4565/5742 4515/4515/5742 4571/4570/5742 +f 4570/4569/4576 4571/4570/4576 4569/4571/4576 +f 4565/4565/5743 4571/4570/5743 4570/4569/5743 +f 4574/4572/4578 4573/4573/4578 4572/4574/4578 +f 4575/4575/4579 4573/4573/4579 4574/4572/4579 +f 4577/4576/4580 4580/4577/4580 4576/4578/4580 +f 4580/4577/3848 4579/4579/3848 4576/4578/3848 +f 4578/4580/3849 4579/4579/3849 4580/4577/3849 +f 4583/4581/3850 4582/4582/3850 4581/4583/3850 +f 4584/4584/3851 4582/4582/3851 4583/4581/3851 +f 4586/4585/5744 4589/4586/5744 4585/4587/5744 +f 4589/4586/3853 4588/4588/3853 4585/4587/3853 +f 4587/4589/3854 4588/4588/3854 4589/4586/3854 +f 4592/4590/3855 4591/4591/3855 4590/4592/3855 +f 4593/4593/3856 4591/4591/3856 4592/4590/3856 +f 4595/4594/3857 4598/4595/3857 4594/4596/3857 +f 4598/4595/3858 4597/4597/3858 4594/4596/3858 +f 4596/4598/3859 4597/4597/3859 4598/4595/3859 +f 4602/4599/5745 4601/4600/5745 4599/4601/5745 +f 4600/4602/3862 4601/4600/3862 4602/4599/3862 +f 4605/4603/5746 4604/4604/5746 4603/4605/5746 +f 4606/4606/3864 4604/4604/3864 4605/4603/3864 +f 4608/4607/5747 4611/4608/5747 4607/4609/5747 +f 4611/4608/5173 4610/4610/5173 4607/4609/5173 +f 4609/4611/3866 4610/4610/3866 4611/4608/3866 +f 4615/4612/5174 4614/4613/5174 4612/4614/5174 +f 4613/4615/3869 4614/4613/3869 4615/4612/3869 +f 4618/4616/3870 4617/4617/3870 4616/4618/3870 +f 4619/4619/5175 4617/4617/5175 4618/4616/5175 +f 4622/4620/5748 4621/4621/5748 4620/4622/5748 +f 4623/4623/3873 4621/4621/3873 4622/4620/3873 +f 4625/4624/5749 4628/4625/5749 4624/4626/5749 +f 4628/4625/5178 4627/4627/5178 4624/4626/5178 +f 4626/4628/5750 4627/4627/5750 4628/4625/5750 +f 4629/4629/3876 4595/4594/3876 4594/4596/3876 +f 4630/4630/4592 4591/4591/4592 4593/4593/4592 +f 4630/4630/5751 4595/4594/5751 4629/4629/5751 +f 4592/4590/5752 4632/4631/5752 4633/4632/5752 +f 4593/4593/5753 4592/4590/5753 4633/4632/5753 +f 4634/4633/5754 4593/4593/5754 4631/4634/5754 +f 4634/4633/4596 4630/4630/4596 4593/4593/4596 +f 4631/4634/5755 4593/4593/5755 4633/4632/5755 +f 4632/4631/3884 4592/4590/3884 4595/4594/3884 +f 4595/4594/5756 4630/4630/5756 4634/4633/5756 +f 4632/4631/3886 4595/4594/3886 4634/4633/3886 +f 4633/4632/3887 4634/4633/3887 4631/4634/3887 +f 4632/4631/3888 4634/4633/3888 4633/4632/3888 +f 4595/4594/5757 4592/4590/5757 4635/4635/5757 +f 4590/4592/5758 4635/4635/5758 4592/4590/5758 +f 4590/4592/5759 4638/4636/5759 4635/4635/5759 +f 4591/4591/3892 4637/4637/3892 4636/4638/3892 +f 4638/4636/5760 4590/4592/5760 4639/4639/5760 +f 4638/4636/3894 4636/4638/3894 4637/4637/3894 +f 4590/4592/5761 4591/4591/5761 4636/4638/5761 +f 4639/4639/3896 4636/4638/3896 4638/4636/3896 +f 4639/4639/3897 4590/4592/3897 4636/4638/3897 +f 4640/4640/3898 4586/4585/3898 4585/4587/3898 +f 4641/4641/5762 4582/4582/5762 4584/4584/5762 +f 4641/4641/5763 4586/4585/5763 4640/4640/5763 +f 4583/4581/3901 4643/4642/3901 4644/4643/3901 +f 4584/4584/5764 4583/4581/5764 4644/4643/5764 +f 4645/4644/5765 4584/4584/5765 4642/4645/5765 +f 4645/4644/3904 4641/4641/3904 4584/4584/3904 +f 4642/4645/5766 4584/4584/5766 4644/4643/5766 +f 4643/4642/3906 4583/4581/3906 4586/4585/3906 +f 4586/4585/5767 4641/4641/5767 4645/4644/5767 +f 4643/4642/3908 4586/4585/3908 4645/4644/3908 +f 4644/4643/3909 4645/4644/3909 4642/4645/3909 +f 4643/4642/3910 4645/4644/3910 4644/4643/3910 +f 4586/4585/4615 4583/4581/4615 4646/4646/4615 +f 4581/4583/5768 4646/4646/5768 4583/4581/5768 +f 4582/4582/3913 4648/4647/3913 4647/4648/3913 +f 4648/4647/3914 4646/4646/3914 4650/4649/3914 +f 4646/4646/3915 4581/4583/3915 4650/4649/3915 +f 4650/4649/4618 4581/4583/4618 4649/4650/4618 +f 4650/4649/3917 4647/4648/3917 4648/4647/3917 +f 4581/4583/5201 4582/4582/5201 4647/4648/5201 +f 4649/4650/3919 4647/4648/3919 4650/4649/3919 +f 4649/4650/5769 4581/4583/5769 4647/4648/5769 +f 4608/4607/5770 4651/4651/5770 4686/4652/5770 +f 4608/4607/5771 4605/4603/5771 4651/4651/5771 +f 4603/4605/5772 4651/4651/5772 4605/4603/5772 +f 4604/4604/5205 4653/4653/5205 4652/4654/5205 +f 4651/4651/5773 4603/4605/5773 4654/4655/5773 +f 4651/4651/5774 4652/4654/5774 4653/4653/5774 +f 4603/4605/5775 4604/4604/5775 4652/4654/5775 +f 4654/4655/5776 4652/4654/5776 4651/4651/5776 +f 4654/4655/5777 4603/4605/5777 4652/4654/5777 +f 4655/4656/5778 4577/4576/5778 4576/4578/5778 +f 4656/4657/3931 4573/4573/3931 4575/4575/3931 +f 4656/4657/5779 4577/4576/5779 4655/4656/5779 +f 4574/4572/5212 4658/4658/5212 4659/4659/5212 +f 4575/4575/4630 4574/4572/4630 4659/4659/4630 +f 4660/4660/5780 4575/4575/5780 4657/4661/5780 +f 4660/4660/3935 4656/4657/3935 4575/4575/3935 +f 4657/4661/5781 4575/4575/5781 4659/4659/5781 +f 4658/4658/5782 4574/4572/5782 4577/4576/5782 +f 4577/4576/5783 4656/4657/5783 4660/4660/5783 +f 4658/4658/4634 4577/4576/4634 4660/4660/4634 +f 4659/4659/3938 4660/4660/3938 4657/4661/3938 +f 4658/4658/5784 4660/4660/5784 4659/4659/5784 +f 4661/4662/5785 4608/4607/5785 4607/4609/5785 +f 4807/4663/5786 4604/4604/5786 4606/4606/5786 +f 4807/4663/5787 4608/4607/5787 4661/4662/5787 +f 4605/4603/5220 4663/4664/5220 4664/4665/5220 +f 4606/4606/5788 4605/4603/5788 4664/4665/5788 +f 4665/4666/4642 4606/4606/4642 4662/4667/4642 +f 4665/4666/5789 4807/4663/5789 4606/4606/5789 +f 4662/4667/5790 4606/4606/5790 4664/4665/5790 +f 4663/4664/5791 4605/4603/5791 4608/4607/5791 +f 4608/4607/5792 4807/4663/5792 4665/4666/5792 +f 4663/4664/5793 4608/4607/5793 4665/4666/5793 +f 4664/4665/3949 4665/4666/3949 4662/4667/3949 +f 4663/4664/5794 4665/4666/5794 4664/4665/5794 +f 4577/4576/5228 4666/4668/5228 4667/4669/5228 +f 4577/4576/5229 4574/4572/5229 4666/4668/5229 +f 4572/4574/5795 4666/4668/5795 4574/4572/5795 +f 4573/4573/3952 4669/4670/3952 4668/4671/3952 +f 4666/4668/5231 4572/4574/5231 4670/4672/5231 +f 4666/4668/5796 4668/4671/5796 4669/4670/5796 +f 4572/4574/5797 4573/4573/5797 4668/4671/5797 +f 4670/4672/5798 4668/4671/5798 4666/4668/5798 +f 4670/4672/5799 4572/4574/5799 4668/4671/5799 +f 4672/4673/5800 4617/4617/5800 4619/4619/5800 +f 4667/4669/5236 4618/4616/5236 4673/4674/5236 +f 4667/4669/5801 4612/4614/5801 4618/4616/5801 +f 4671/4675/5802 4618/4616/5802 4612/4614/5802 +f 4618/4616/5239 4671/4675/5239 4675/4676/5239 +f 4619/4619/5803 4618/4616/5803 4675/4676/5803 +f 4676/4677/4659 4619/4619/4659 4674/4678/4659 +f 4676/4677/5804 4672/4673/5804 4619/4619/5804 +f 4674/4678/5805 4619/4619/5805 4675/4676/5805 +f 4671/4675/5806 4672/4673/5806 4676/4677/5806 +f 4675/4676/4664 4676/4677/4664 4674/4678/4664 +f 4671/4675/5807 4676/4677/5807 4675/4676/5807 +f 4616/4618/5245 4673/4674/5245 4618/4616/5245 +f 4616/4618/5808 4679/4679/5808 4673/4674/5808 +f 4617/4617/3971 4678/4680/3971 4677/4681/3971 +f 4679/4679/5247 4616/4618/5247 4680/4682/5247 +f 4679/4679/3973 4677/4681/3973 4678/4680/3973 +f 4616/4618/3974 4617/4617/3974 4677/4681/3974 +f 4680/4682/3975 4677/4681/3975 4679/4679/3975 +f 4680/4682/5809 4616/4618/5809 4677/4681/5809 +f 4685/4683/3978 4682/4684/3978 4681/4685/3978 +f 4686/4652/5810 4684/4686/5810 4846/4687/5810 +f 4686/4652/5811 4599/4601/5811 4684/4686/5811 +f 4683/4688/5812 4684/4686/5812 4599/4601/5812 +f 4684/4686/5813 4683/4688/5813 4688/4689/5813 +f 4681/4685/5251 4684/4686/5251 4688/4689/5251 +f 4689/4690/3983 4681/4685/3983 4687/4691/3983 +f 4689/4690/4679 4685/4683/4679 4681/4685/4679 +f 4687/4691/3985 4681/4685/3985 4688/4689/3985 +f 4683/4688/5814 4685/4683/5814 4689/4690/5814 +f 4688/4689/3989 4689/4690/3989 4687/4691/3989 +f 4683/4688/5815 4689/4690/5815 4688/4689/5815 +f 4684/4686/3991 4682/4684/3991 4690/4692/3991 +f 4681/4685/3992 4682/4684/3992 4684/4686/3992 +f 4693/4693/5816 4692/4694/5816 4691/4695/5816 +f 4694/4696/4683 4692/4694/4683 4693/4693/4683 +f 4697/4697/5817 4696/4698/5817 4698/4699/5817 +f 4698/4699/5818 4696/4698/5818 4699/4700/5818 +f 4667/4669/5819 4697/4697/5819 4698/4699/5819 +f 4667/4669/5820 4700/4701/5820 4695/4702/5820 +f 4699/4700/5821 4696/4698/5821 4695/4702/5821 +f 4700/4701/5262 4667/4669/5262 4698/4699/5262 +f 4700/4701/4001 4699/4700/4001 4695/4702/4001 +f 4698/4699/5822 4699/4700/5822 4700/4701/5822 +f 4573/4573/5823 4656/4657/5823 4697/4697/5823 +f 4669/4670/5824 4573/4573/5824 4697/4697/5824 +f 4667/4669/5825 4666/4668/5825 4702/4703/5825 +f 4697/4697/5826 4667/4669/5826 4702/4703/5826 +f 4697/4697/5827 4701/4704/5827 4669/4670/5827 +f 4702/4703/5828 4666/4668/5828 4703/4705/5828 +f 4701/4704/5829 4697/4697/5829 4702/4703/5829 +f 4703/4705/5830 4666/4668/5830 4669/4670/5830 +f 4703/4705/5831 4701/4704/5831 4702/4703/5831 +f 4669/4670/4011 4701/4704/4011 4703/4705/4011 +f 4704/4706/5832 4579/4579/5832 4656/4657/5832 +f 4579/4579/5274 4704/4706/5274 4705/4707/5274 +f 4655/4656/5833 4576/4578/5833 4706/4708/5833 +f 4704/4706/5834 4656/4657/5834 4655/4656/5834 +f 4655/4656/5835 4705/4707/5835 4704/4706/5835 +f 4576/4578/5836 4579/4579/5836 4705/4707/5836 +f 4706/4708/4705 4705/4707/4705 4655/4656/4705 +f 4706/4708/4019 4576/4578/4019 4705/4707/4019 +f 4656/4657/4020 4708/4709/4020 4709/4710/4020 +f 4709/4710/4021 4708/4709/4021 4711/4711/4021 +f 4710/4712/4022 4712/4713/4022 4707/4714/4022 +f 4711/4711/5837 4708/4709/5837 4707/4714/5837 +f 4712/4713/4024 4710/4712/4024 4709/4710/4024 +f 4712/4713/4025 4711/4711/4025 4707/4714/4025 +f 4709/4710/4712 4711/4711/4712 4712/4713/4712 +f 4578/4580/5838 4656/4657/5838 4579/4579/5838 +f 4577/4576/4714 4710/4712/4714 4580/4577/4714 +f 4578/4580/4029 4708/4709/4029 4656/4657/4029 +f 4707/4714/5839 4580/4577/5839 4710/4712/5839 +f 4580/4577/5840 4707/4714/5840 4714/4715/5840 +f 4578/4580/5841 4580/4577/5841 4714/4715/5841 +f 4708/4709/5842 4578/4580/5842 4713/4716/5842 +f 4713/4716/4719 4578/4580/4719 4714/4715/4719 +f 4714/4715/4035 4708/4709/4035 4713/4716/4035 +f 4707/4714/4036 4708/4709/4036 4714/4715/4036 +f 4715/4717/5843 4588/4588/5843 4641/4641/5843 +f 4588/4588/5844 4715/4717/5844 4716/4718/5844 +f 4640/4640/4724 4585/4587/4724 4717/4719/4724 +f 4715/4717/4040 4641/4641/4040 4640/4640/4040 +f 4640/4640/4041 4716/4718/4041 4715/4717/4041 +f 4585/4587/4727 4588/4588/4727 4716/4718/4727 +f 4717/4719/4043 4716/4718/4043 4640/4640/4043 +f 4717/4719/5845 4585/4587/5845 4716/4718/5845 +f 4582/4582/5846 4641/4641/5846 4656/4657/5846 +f 4586/4585/5847 4710/4712/5847 4577/4576/5847 +f 4582/4582/4047 4656/4657/4047 4709/4710/4047 +f 4586/4585/4048 4646/4646/4048 4710/4712/4048 +f 4648/4647/5848 4582/4582/5848 4709/4710/5848 +f 4709/4710/5849 4718/4720/5849 4648/4647/5849 +f 4718/4720/5850 4709/4710/5850 4710/4712/5850 +f 4646/4646/4052 4718/4720/4052 4710/4712/4052 +f 4648/4647/4053 4718/4720/4053 4646/4646/4053 +f 4719/4721/4054 4641/4641/4054 4588/4588/4054 +f 4587/4589/4055 4719/4721/4055 4588/4588/4055 +f 4635/4635/4056 4589/4586/4056 4586/4585/4056 +f 4720/4722/5851 4589/4586/5851 4635/4635/5851 +f 4589/4586/5852 4720/4722/5852 4722/4723/5852 +f 4587/4589/5313 4589/4586/5313 4722/4723/5313 +f 4719/4721/5853 4587/4589/5853 4723/4724/5853 +f 4723/4724/4061 4587/4589/4061 4721/4725/4061 +f 4721/4725/5315 4587/4589/5315 4722/4723/5315 +f 4720/4722/5854 4719/4721/5854 4723/4724/5854 +f 4722/4723/4064 4723/4724/4064 4721/4725/4064 +f 4720/4722/4065 4723/4724/4065 4722/4723/4065 +f 4724/4726/5855 4641/4641/5855 4719/4721/5855 +f 4724/4726/4067 4719/4721/4067 4725/4727/4067 +f 4635/4635/4068 4726/4728/4068 4720/4722/4068 +f 4725/4727/5856 4719/4721/5856 4720/4722/5856 +f 4726/4728/5857 4635/4635/5857 4724/4726/5857 +f 4726/4728/4071 4725/4727/4071 4720/4722/4071 +f 4724/4726/4072 4725/4727/4072 4726/4728/4072 +f 4591/4591/4073 4630/4630/4073 4724/4726/4073 +f 4637/4637/5858 4591/4591/5858 4724/4726/5858 +f 4635/4635/4075 4638/4636/4075 4728/4729/4075 +f 4724/4726/5859 4635/4635/5859 4728/4729/5859 +f 4724/4726/5860 4727/4730/5860 4637/4637/5860 +f 4728/4729/5331 4638/4636/5331 4729/4731/5331 +f 4727/4730/5861 4724/4726/5861 4728/4729/5861 +f 4729/4731/4080 4638/4636/4080 4637/4637/4080 +f 4729/4731/4081 4727/4730/4081 4728/4729/4081 +f 4637/4637/4756 4727/4730/4756 4729/4731/4756 +f 4730/4732/4083 4597/4597/4083 4630/4630/4083 +f 4597/4597/4084 4730/4732/4084 4731/4733/4084 +f 4629/4629/5862 4594/4596/5862 4732/4734/5862 +f 4730/4732/4086 4630/4630/4086 4629/4629/4086 +f 4629/4629/5863 4731/4733/5863 4730/4732/5863 +f 4594/4596/4088 4597/4597/4088 4731/4733/4088 +f 4732/4734/5864 4731/4733/5864 4629/4629/5864 +f 4732/4734/5865 4594/4596/5865 4731/4733/5865 +f 4735/4735/4763 4734/4736/4763 4737/4737/4763 +f 4737/4737/5866 4734/4736/5866 4738/4738/5866 +f 4736/4739/5867 4735/4735/5867 4737/4737/5867 +f 4736/4739/5868 4739/4740/5868 4733/4741/5868 +f 4738/4738/5345 4734/4736/5345 4733/4741/5345 +f 4739/4740/5869 4736/4739/5869 4737/4737/5869 +f 4739/4740/4097 4738/4738/4097 4733/4741/4097 +f 4737/4737/4098 4738/4738/4098 4739/4740/4098 +f 4735/4735/4099 4630/4630/4099 4597/4597/4099 +f 4596/4598/5870 4735/4735/5870 4597/4597/5870 +f 4595/4594/5871 4736/4739/5871 4598/4595/5871 +f 4596/4598/4771 4734/4736/4771 4735/4735/4771 +f 4733/4741/5872 4598/4595/5872 4736/4739/5872 +f 4598/4595/5873 4733/4741/5873 4741/4742/5873 +f 4596/4598/4105 4598/4595/4105 4741/4742/4105 +f 4734/4736/5874 4596/4598/5874 4740/4743/5874 +f 4740/4743/5875 4596/4598/5875 4741/4742/5875 +f 4741/4742/4108 4734/4736/4108 4740/4743/4108 +f 4733/4741/4109 4734/4736/4109 4741/4742/4109 +f 4743/4744/5876 4627/4627/5876 4742/4745/5876 +f 4627/4627/4111 4743/4744/4111 4744/4746/4111 +f 4746/4747/5359 4624/4626/5359 4745/4748/5359 +f 4743/4744/5877 4742/4745/5877 4746/4747/5877 +f 4746/4747/5878 4744/4746/5878 4743/4744/5878 +f 4624/4626/5361 4627/4627/5361 4744/4746/5361 +f 4745/4748/5362 4744/4746/5362 4746/4747/5362 +f 4745/4748/5879 4624/4626/5879 4744/4746/5879 +f 4742/4745/5880 4748/4749/5880 4749/4750/5880 +f 4749/4750/5881 4748/4749/5881 4751/4751/5881 +f 4750/4752/5882 4752/4753/5882 4747/4754/5882 +f 4751/4751/4121 4748/4749/4121 4747/4754/4121 +f 4752/4753/5883 4750/4752/5883 4749/4750/5883 +f 4752/4753/4123 4751/4751/4123 4747/4754/4123 +f 4749/4750/5884 4751/4751/5884 4752/4753/5884 +f 4755/4755/5369 4754/4756/5369 4753/4757/5369 +f 4754/4756/5885 4755/4755/5885 4756/4758/5885 +f 4759/4759/4790 4758/4760/4790 4757/4761/4790 +f 4755/4755/5886 4753/4757/5886 4759/4759/5886 +f 4759/4759/4792 4756/4758/4792 4755/4755/4792 +f 4758/4760/5887 4754/4756/5887 4756/4758/5887 +f 4757/4761/4794 4756/4758/4794 4759/4759/4794 +f 4757/4761/5888 4758/4760/5888 4756/4758/5888 +f 4761/4762/4134 4754/4756/4134 4758/4760/4134 +f 4760/4763/4795 4754/4756/4795 4761/4762/4795 +f 4764/4764/5889 4763/4765/5889 4766/4766/5889 +f 4766/4766/5890 4763/4765/5890 4767/4767/5890 +f 4765/4768/5891 4764/4764/5891 4766/4766/5891 +f 4765/4768/5892 4768/4769/5892 4762/4770/5892 +f 4767/4767/5893 4763/4765/5893 4762/4770/5893 +f 4768/4769/5894 4765/4768/5894 4766/4766/5894 +f 4768/4769/4140 4767/4767/4140 4762/4770/4140 +f 4766/4766/5386 4767/4767/5386 4768/4769/5386 +f 4771/4771/4142 4770/4772/4142 4769/4773/4142 +f 4772/4774/5895 4770/4772/5895 4771/4771/5895 +f 4773/4775/5896 4764/4764/5896 4772/4774/5896 +f 4918/4776/5897 4773/4775/5897 4772/4774/5897 +f 4773/4775/5898 4918/4776/5898 4774/4777/5898 +f 4777/4778/4802 4776/4779/4802 4775/4780/4802 +f 4777/4778/5899 4774/4777/5899 4918/4776/5899 +f 4776/4779/5900 4773/4775/5900 4774/4777/5900 +f 4775/4780/4150 4774/4777/4150 4777/4778/4150 +f 4775/4780/4151 4776/4779/4151 4774/4777/4151 +f 4778/4781/5901 4780/4782/5901 4776/4779/5901 +f 4780/4782/4153 4773/4775/4153 4776/4779/4153 +f 4779/4783/4154 4773/4775/4154 4780/4782/4154 +f 4783/4784/5902 4782/4785/5902 4785/4786/5902 +f 4785/4786/4156 4782/4785/4156 4786/4787/4156 +f 4784/4788/5903 4787/4789/5903 4781/4790/5903 +f 4786/4787/5904 4782/4785/5904 4781/4790/5904 +f 4787/4789/5905 4784/4788/5905 4785/4786/5905 +f 4787/4789/5906 4786/4787/5906 4781/4790/5906 +f 4785/4786/4161 4786/4787/4161 4787/4789/4161 +f 4788/4791/5907 4601/4600/5907 4685/4683/5907 +f 4601/4600/4163 4788/4791/4163 4789/4792/4163 +f 4683/4688/5908 4599/4601/5908 4790/4793/5908 +f 4788/4791/5909 4685/4683/5909 4683/4688/5909 +f 4683/4688/5910 4789/4792/5910 4788/4791/5910 +f 4599/4601/5911 4601/4600/5911 4789/4792/5911 +f 4790/4793/5912 4789/4792/5912 4683/4688/5912 +f 4790/4793/5913 4599/4601/5913 4789/4792/5913 +f 4686/4652/5914 4602/4599/5914 4599/4601/5914 +f 4600/4602/5915 4791/4794/5915 4601/4600/5915 +f 4600/4602/5916 4794/4795/5916 4791/4794/5916 +f 4792/4796/5917 4602/4599/5917 4686/4652/5917 +f 4602/4599/5918 4792/4796/5918 4795/4797/5918 +f 4600/4602/4820 4602/4599/4820 4795/4797/4820 +f 4794/4795/4821 4600/4602/4821 4793/4798/4821 +f 4793/4798/5919 4600/4602/5919 4795/4797/5919 +f 4795/4797/4179 4794/4795/4179 4793/4798/4179 +f 4792/4796/4822 4794/4795/4822 4795/4797/4822 +f 4791/4794/5920 4794/4795/5920 4796/4799/5920 +f 4796/4799/4823 4794/4795/4823 4797/4800/4823 +f 4686/4652/5921 4791/4794/5921 4796/4799/5921 +f 4686/4652/5922 4798/4801/5922 4792/4796/5922 +f 4797/4800/5923 4794/4795/5923 4792/4796/5923 +f 4798/4801/5924 4686/4652/5924 4796/4799/5924 +f 4798/4801/5925 4797/4800/5925 4792/4796/5925 +f 4796/4799/5418 4797/4800/5418 4798/4801/5418 +f 4697/4697/5926 4672/4673/5926 4614/4613/5926 +f 4667/4669/5927 4615/4612/5927 4612/4614/5927 +f 4613/4615/5928 4697/4697/5928 4614/4613/5928 +f 4613/4615/5929 4696/4698/5929 4697/4697/5929 +f 4695/4702/5422 4615/4612/5422 4667/4669/5422 +f 4615/4612/5930 4695/4702/5930 4800/4802/5930 +f 4613/4615/4195 4615/4612/4195 4800/4802/4195 +f 4696/4698/4196 4613/4615/4196 4799/4803/4196 +f 4799/4803/4837 4613/4615/4837 4800/4802/4837 +f 4800/4802/4198 4696/4698/4198 4799/4803/4198 +f 4695/4702/4199 4696/4698/4199 4800/4802/4199 +f 4801/4804/5931 4610/4610/5931 4807/4663/5931 +f 4610/4610/4201 4801/4804/4201 4802/4805/4201 +f 4661/4662/5427 4607/4609/5427 4803/4806/5427 +f 4801/4804/5932 4807/4663/5932 4661/4662/5932 +f 4661/4662/5933 4802/4805/5933 4801/4804/5933 +f 4607/4609/5934 4610/4610/5934 4802/4805/5934 +f 4803/4806/5430 4802/4805/5430 4661/4662/5430 +f 4803/4806/5935 4607/4609/5935 4802/4805/5935 +f 4604/4604/5936 4807/4663/5936 4791/4794/5936 +f 4653/4653/5937 4604/4604/5937 4791/4794/5937 +f 4686/4652/5938 4651/4651/5938 4805/4807/5938 +f 4791/4794/5939 4686/4652/5939 4805/4807/5939 +f 4791/4794/5940 4804/4808/5940 4653/4653/5940 +f 4805/4807/5941 4651/4651/5941 4806/4809/5941 +f 4804/4808/5942 4791/4794/5942 4805/4807/5942 +f 4806/4809/5943 4651/4651/5943 4653/4653/5943 +f 4806/4809/5944 4804/4808/5944 4805/4807/5944 +f 4653/4653/4215 4804/4808/4215 4806/4809/4215 +f 4609/4611/5945 4807/4663/5945 4610/4610/5945 +f 4609/4611/5946 4810/4810/5946 4807/4663/5946 +f 4808/4811/5947 4611/4608/5947 4673/4674/5947 +f 4611/4608/4221 4808/4811/4221 4811/4812/4221 +f 4609/4611/4222 4611/4608/4222 4811/4812/4222 +f 4810/4810/5443 4609/4611/5443 4809/4813/5443 +f 4809/4813/5948 4609/4611/5948 4811/4812/5948 +f 4811/4812/4862 4810/4810/4862 4809/4813/4862 +f 4808/4811/4863 4810/4810/4863 4811/4812/4863 +f 4812/4814/5949 4614/4613/5949 4672/4673/5949 +f 4614/4613/5445 4812/4814/5445 4813/4815/5445 +f 4671/4675/5446 4612/4614/5446 4814/4816/5446 +f 4812/4814/5950 4672/4673/5950 4671/4675/5950 +f 4671/4675/5448 4813/4815/5448 4812/4814/5448 +f 4612/4614/5951 4614/4613/5951 4813/4815/5951 +f 4814/4816/5450 4813/4815/5450 4671/4675/5450 +f 4814/4816/5952 4612/4614/5952 4813/4815/5952 +f 4807/4663/5953 4810/4810/5953 4815/4817/5953 +f 4815/4817/5954 4810/4810/5954 4816/4818/5954 +f 4673/4674/5455 4817/4819/5455 4808/4811/5455 +f 4816/4818/5955 4810/4810/5955 4808/4811/5955 +f 4817/4819/5956 4673/4674/5956 4815/4817/5956 +f 4817/4819/4241 4816/4818/4241 4808/4811/4241 +f 4815/4817/5957 4816/4818/5957 4817/4819/5957 +f 4617/4617/5958 4672/4673/5958 4807/4663/5958 +f 4617/4617/5959 4807/4663/5959 4815/4817/5959 +f 4678/4680/5960 4617/4617/5960 4815/4817/5960 +f 4673/4674/5462 4679/4679/5462 4819/4820/5462 +f 4815/4817/5961 4673/4674/5961 4819/4820/5961 +f 4815/4817/5962 4818/4821/5962 4678/4680/5962 +f 4819/4820/4248 4679/4679/4248 4820/4822/4248 +f 4818/4821/5963 4815/4817/5963 4819/4820/5963 +f 4820/4822/5964 4679/4679/5964 4678/4680/5964 +f 4820/4822/5467 4818/4821/5467 4819/4820/5467 +f 4678/4680/4252 4818/4821/4252 4820/4822/4252 +f 4621/4621/5965 4742/4745/5965 4735/4735/5965 +f 4821/4823/4255 4621/4621/4255 4735/4735/4255 +f 4736/4739/5966 4822/4824/5966 4824/4825/5966 +f 4735/4735/5967 4736/4739/5967 4824/4825/5967 +f 4735/4735/4888 4823/4826/4888 4821/4823/4888 +f 4824/4825/5968 4822/4824/5968 4825/4827/5968 +f 4823/4826/5969 4735/4735/5969 4824/4825/5969 +f 4825/4827/5970 4822/4824/5970 4821/4823/5970 +f 4825/4827/5971 4823/4826/5971 4824/4825/5971 +f 4821/4823/5972 4823/4826/5972 4825/4827/5972 +f 4620/4622/5973 4736/4739/5973 4622/4620/5973 +f 4620/4622/5974 4822/4824/5974 4736/4739/5974 +f 4621/4621/5975 4821/4823/5975 4826/4828/5975 +f 4822/4824/5976 4620/4622/5976 4827/4829/5976 +f 4822/4824/5977 4826/4828/5977 4821/4823/5977 +f 4620/4622/4892 4621/4621/4892 4826/4828/4892 +f 4827/4829/5978 4826/4828/5978 4822/4824/5978 +f 4827/4829/5979 4620/4622/5979 4826/4828/5979 +f 4746/4747/5980 4625/4624/5980 4624/4626/5980 +f 4742/4745/5981 4621/4621/5981 4623/4623/5981 +f 4742/4745/5982 4625/4624/5982 4746/4747/5982 +f 4625/4624/5983 4622/4620/5983 4736/4739/5983 +f 4622/4620/5984 4829/4830/5984 4830/4831/5984 +f 4623/4623/5985 4622/4620/5985 4830/4831/5985 +f 4831/4832/5986 4623/4623/5986 4828/4833/5986 +f 4831/4832/5987 4742/4745/5987 4623/4623/5987 +f 4828/4833/4278 4623/4623/4278 4830/4831/4278 +f 4829/4830/5988 4622/4620/5988 4625/4624/5988 +f 4625/4624/5989 4742/4745/5989 4831/4832/5989 +f 4829/4830/5990 4625/4624/5990 4831/4832/5990 +f 4830/4831/4280 4831/4832/4280 4828/4833/4280 +f 4829/4830/5991 4831/4832/5991 4830/4831/5991 +f 4626/4628/5992 4742/4745/5992 4627/4627/5992 +f 4625/4624/5993 4750/4752/5993 4628/4625/5993 +f 4626/4628/5994 4748/4749/5994 4742/4745/5994 +f 4747/4754/5995 4628/4625/5995 4750/4752/5995 +f 4628/4625/4288 4747/4754/4288 4833/4834/4288 +f 4626/4628/5996 4628/4625/5996 4833/4834/5996 +f 4748/4749/5997 4626/4628/5997 4832/4835/5997 +f 4832/4835/4291 4626/4628/4291 4833/4834/4291 +f 4833/4834/4292 4748/4749/4292 4832/4835/4292 +f 4747/4754/4293 4748/4749/4293 4833/4834/4293 +f 4692/4694/5998 4753/4757/5998 4742/4745/5998 +f 4835/4836/5999 4750/4752/5999 4625/4624/5999 +f 4692/4694/6000 4742/4745/6000 4749/4750/6000 +f 4834/4837/6001 4692/4694/6001 4749/4750/6001 +f 4749/4750/6002 4836/4838/6002 4834/4837/6002 +f 4750/4752/6003 4835/4836/6003 4837/4839/6003 +f 4836/4838/6004 4749/4750/6004 4750/4752/6004 +f 4837/4839/6005 4835/4836/6005 4834/4837/6005 +f 4837/4839/6006 4836/4838/6006 4750/4752/6006 +f 4834/4837/4304 4836/4838/4304 4837/4839/4304 +f 4840/4840/5510 4841/4841/5510 4842/4842/5510 +f 4839/4843/6007 4840/4840/6007 4842/4842/6007 +f 4843/4844/4307 4839/4843/4307 4844/4845/4307 +f 4844/4845/4308 4839/4843/4308 4838/4846/4308 +f 4838/4846/4925 4839/4843/4925 4842/4842/4925 +f 4841/4841/4310 4843/4844/4310 4844/4845/4310 +f 4842/4842/4311 4844/4845/4311 4838/4846/4311 +f 4841/4841/6008 4844/4845/6008 4842/4842/6008 +f 4845/4847/6009 4897/4848/6009 4843/4844/6009 +f 4845/4847/4314 4843/4844/4314 4847/4849/4314 +f 4846/4687/6010 4848/4850/6010 4841/4841/6010 +f 4847/4849/4316 4843/4844/4316 4841/4841/4316 +f 4848/4850/6011 4846/4687/6011 4845/4847/6011 +f 4848/4850/4318 4847/4849/4318 4841/4841/4318 +f 4845/4847/6012 4847/4849/6012 4848/4850/6012 +f 4690/4692/6013 4846/4687/6013 4684/4686/6013 +f 4690/4692/6014 4851/4851/6014 4846/4687/6014 +f 4682/4684/5521 4850/4852/5521 4849/4853/5521 +f 4851/4851/6015 4690/4692/6015 4852/4854/6015 +f 4851/4851/4324 4849/4853/4324 4850/4852/4324 +f 4690/4692/5524 4682/4684/5524 4849/4853/5524 +f 4852/4854/6016 4849/4853/6016 4851/4851/6016 +f 4852/4854/6017 4690/4692/6017 4849/4853/6017 +f 4691/4695/6018 4835/4836/6018 4693/4693/6018 +f 4692/4694/5527 4834/4837/5527 4853/4855/5527 +f 4834/4837/6019 4835/4836/6019 4855/4856/6019 +f 4835/4836/6020 4691/4695/6020 4855/4856/6020 +f 4855/4856/6021 4691/4695/6021 4854/4857/6021 +f 4855/4856/6022 4853/4855/6022 4834/4837/6022 +f 4691/4695/5528 4692/4694/5528 4853/4855/5528 +f 4854/4857/6023 4853/4855/6023 4855/4856/6023 +f 4854/4857/5529 4691/4695/5529 4853/4855/5529 +f 4859/4858/6024 4595/4594/6024 4860/4859/6024 +f 4858/4860/6025 4856/4861/6025 4861/4862/6025 +f 4858/4860/4339 4861/4862/4339 4862/4863/4339 +f 4860/4859/6026 4595/4594/6026 4635/4635/6026 +f 4856/4861/6027 4863/4864/6027 4861/4862/6027 +f 4860/4859/6028 4635/4635/6028 4864/4865/6028 +f 4862/4863/4342 4861/4862/4342 4865/4866/4342 +f 4864/4865/6029 4635/4635/6029 4586/4585/6029 +f 4863/4864/6030 4860/4859/6030 4864/4865/6030 +f 4865/4866/6031 4861/4862/6031 4866/4867/6031 +f 4867/4868/6032 4868/4869/6032 4869/4870/6032 +f 4870/4871/6033 4686/4652/6033 4846/4687/6033 +f 4867/4868/6034 4871/4872/6034 4868/4869/6034 +f 4861/4862/6035 4863/4864/6035 4866/4867/6035 +f 4865/4866/6036 4866/4867/6036 4873/4873/6036 +f 4865/4866/4963 4873/4873/4963 4874/4874/4963 +f 4864/4865/6037 4586/4585/6037 4577/4576/6037 +f 4866/4867/6038 4863/4864/6038 4875/4875/6038 +f 4871/4872/6039 4876/4876/6039 4870/4871/6039 +f 4871/4872/6040 4867/4868/6040 4877/4877/6040 +f 4863/4864/6041 4864/4865/6041 4875/4875/6041 +f 4864/4865/6042 4577/4576/6042 4875/4875/6042 +f 4876/4876/6043 4686/4652/6043 4870/4871/6043 +f 4877/4877/6044 4876/4876/6044 4871/4872/6044 +f 4873/4873/6045 4866/4867/6045 4875/4875/6045 +f 4874/4874/4361 4878/4878/4361 4879/4879/4361 +f 4879/4879/6046 4877/4877/6046 4867/4868/6046 +f 4876/4876/6047 4608/4607/6047 4686/4652/6047 +f 4873/4873/6048 4875/4875/6048 4880/4880/6048 +f 4874/4874/4976 4873/4873/4976 4878/4878/4976 +f 4879/4879/6049 4878/4878/6049 4877/4877/6049 +f 4875/4875/2780 4577/4576/2780 4667/4669/2780 +f 4873/4873/4984 4880/4880/4984 4878/4878/4984 +f 4878/4878/6050 4881/4881/6050 4877/4877/6050 +f 4673/4674/6051 4611/4608/6051 4608/4607/6051 +f 4881/4881/6052 4876/4876/6052 4877/4877/6052 +f 4880/4880/6053 4875/4875/6053 4882/4882/6053 +f 4878/4878/6054 4880/4880/6054 4881/4881/6054 +f 4875/4875/6055 4667/4669/6055 4882/4882/6055 +f 4673/4674/6056 4608/4607/6056 4876/4876/6056 +f 4882/4882/6057 4673/4674/6057 4876/4876/6057 +f 4881/4881/6058 4882/4882/6058 4876/4876/6058 +f 4880/4880/6059 4882/4882/6059 4881/4881/6059 +f 4882/4882/6060 4667/4669/6060 4673/4674/6060 +f 4682/4684/4379 4685/4683/4379 4845/4847/4379 +f 4850/4852/6061 4682/4684/6061 4845/4847/6061 +f 4846/4687/6062 4851/4851/6062 4884/4883/6062 +f 4845/4847/6063 4846/4687/6063 4884/4883/6063 +f 4845/4847/4383 4883/4884/4383 4850/4852/4383 +f 4884/4883/6064 4851/4851/6064 4885/4885/6064 +f 4883/4884/4385 4845/4847/4385 4884/4883/4385 +f 4885/4885/4386 4851/4851/4386 4850/4852/4386 +f 4885/4885/6065 4883/4884/6065 4884/4883/6065 +f 4850/4852/4388 4883/4884/4388 4885/4885/4388 +f 4753/4757/5575 4692/4694/5575 4694/4696/5575 +f 4835/4836/6066 4758/4760/6066 4693/4693/6066 +f 4759/4759/4391 4693/4693/4391 4758/4760/4391 +f 4693/4693/4392 4759/4759/4392 4887/4886/4392 +f 4694/4696/6067 4693/4693/6067 4887/4886/6067 +f 4888/4887/6068 4694/4696/6068 4886/4888/6068 +f 4888/4887/5579 4753/4757/5579 4694/4696/5579 +f 4886/4888/6069 4694/4696/6069 4887/4886/6069 +f 4759/4759/6070 4753/4757/6070 4888/4887/6070 +f 4887/4886/6071 4888/4887/6071 4886/4888/6071 +f 4759/4759/6072 4888/4887/6072 4887/4886/6072 +f 4889/4889/6073 4672/4673/6073 4697/4697/6073 +f 4889/4889/6074 4697/4697/6074 4656/4657/6074 +f 4890/4890/2 4862/4863/2 4865/4866/2 +f 4892/4891/2 4862/4863/2 4890/4890/2 +f 4889/4889/6075 4892/4891/6075 4890/4890/6075 +f 4889/4889/6076 4656/4657/6076 4893/4892/6076 +f 4892/4891/2 4858/4860/2 4862/4863/2 +f 4893/4892/6077 4892/4891/6077 4889/4889/6077 +f 4641/4641/6078 4893/4892/6078 4656/4657/6078 +f 4867/4868/2 4869/4870/2 4895/4893/2 +f 4891/4894/2 4867/4868/2 4895/4893/2 +f 4894/4895/6079 4891/4894/6079 4896/4896/6079 +f 4724/4726/4404 4630/4630/4404 4641/4641/4404 +f 4896/4896/6080 4891/4894/6080 4895/4893/6080 +f 4898/4897/2 4858/4860/2 4892/4891/2 +f 4893/4892/6081 4641/4641/6081 4630/4630/6081 +f 4896/4896/6082 4783/4784/6082 4897/4848/6082 +f 4898/4897/2 4901/4898/2 4858/4860/2 +f 4893/4892/6083 4898/4897/6083 4892/4891/6083 +f 4893/4892/6084 4630/4630/6084 4899/4899/6084 +f 4900/4900/6085 4783/4784/6085 4896/4896/6085 +f 4899/4899/6086 4898/4897/6086 4893/4892/6086 +f 4735/4735/6087 4899/4899/6087 4630/4630/6087 +f 4896/4896/6088 4895/4893/6088 4900/4900/6088 +f 4783/4784/6089 4900/4900/6089 4764/4764/6089 +f 4898/4897/2 4902/4901/2 4901/4898/2 +f 4735/4735/6090 4742/4745/6090 4899/4899/6090 +f 4903/4902/2 4904/4903/2 4905/4904/2 +f 4900/4900/6091 4895/4893/6091 4903/4902/6091 +f 4906/4905/2 4902/4901/2 4898/4897/2 +f 4899/4899/6092 4906/4905/6092 4898/4897/6092 +f 4899/4899/6093 4742/4745/6093 4907/4906/6093 +f 4906/4905/2 4905/4904/2 4902/4901/2 +f 4907/4906/6094 4906/4905/6094 4899/4899/6094 +f 4903/4902/2 4905/4904/2 4906/4905/2 +f 4900/4900/6095 4903/4902/6095 4907/4906/6095 +f 4763/4765/6096 4764/4764/6096 4753/4757/6096 +f 4907/4906/6097 4764/4764/6097 4900/4900/6097 +f 4907/4906/6098 4903/4902/6098 4906/4905/6098 +f 4907/4906/6099 4753/4757/6099 4764/4764/6099 +f 4753/4757/6100 4907/4906/6100 4742/4745/6100 +f 4765/4768/6101 4758/4760/6101 4835/4836/6101 +f 4763/4765/6102 4753/4757/6102 4754/4756/6102 +f 4765/4768/6103 4761/4762/6103 4758/4760/6103 +f 4760/4763/6104 4763/4765/6104 4754/4756/6104 +f 4762/4770/6105 4761/4762/6105 4765/4768/6105 +f 4761/4762/6106 4762/4770/6106 4909/4907/6106 +f 4760/4763/6107 4761/4762/6107 4909/4907/6107 +f 4763/4765/6108 4760/4763/6108 4908/4908/6108 +f 4908/4908/6109 4760/4763/6109 4909/4907/6109 +f 4909/4907/6110 4763/4765/6110 4908/4908/6110 +f 4762/4770/6111 4763/4765/6111 4909/4907/6111 +f 4772/4774/6112 4764/4764/6112 4770/4772/6112 +f 4910/4909/6113 4770/4772/6113 4764/4764/6113 +f 4765/4768/6114 4911/4910/6114 4913/4911/6114 +f 4764/4764/6115 4765/4768/6115 4913/4911/6115 +f 4764/4764/6116 4912/4912/6116 4910/4909/6116 +f 4913/4911/6117 4911/4910/6117 4914/4913/6117 +f 4912/4912/6118 4764/4764/6118 4913/4911/6118 +f 4914/4913/6119 4911/4910/6119 4910/4909/6119 +f 4914/4913/4443 4912/4912/4443 4913/4911/4443 +f 4910/4909/4444 4912/4912/4444 4914/4913/4444 +f 4769/4773/6120 4765/4768/6120 4771/4771/6120 +f 4769/4773/6121 4911/4910/6121 4765/4768/6121 +f 4770/4772/6122 4910/4909/6122 4915/4914/6122 +f 4911/4910/6123 4769/4773/6123 4916/4915/6123 +f 4911/4910/6124 4915/4914/6124 4910/4909/6124 +f 4769/4773/4451 4770/4772/4451 4915/4914/4451 +f 4916/4915/6125 4915/4914/6125 4911/4910/6125 +f 4916/4915/6126 4769/4773/6126 4915/4914/6126 +f 4777/4778/6127 4778/4781/6127 4776/4779/6127 +f 4918/4776/6128 4778/4781/6128 4777/4778/6128 +f 4778/4781/6129 4771/4771/6129 4765/4768/6129 +f 4771/4771/5056 4919/4916/5056 4920/4917/5056 +f 4772/4774/6130 4771/4771/6130 4920/4917/6130 +f 4918/4776/6131 4772/4774/6131 4917/4918/6131 +f 4917/4918/6132 4772/4774/6132 4920/4917/6132 +f 4919/4916/6133 4771/4771/6133 4778/4781/6133 +f 4919/4916/6134 4778/4781/6134 4918/4776/6134 +f 4920/4917/6135 4918/4776/6135 4917/4918/6135 +f 4919/4916/6136 4918/4776/6136 4920/4917/6136 +f 4773/4775/6137 4783/4784/6137 4764/4764/6137 +f 4779/4783/6138 4783/4784/6138 4773/4775/6138 +f 4778/4781/6139 4784/4788/6139 4780/4782/6139 +f 4779/4783/6140 4782/4785/6140 4783/4784/6140 +f 4781/4790/6141 4780/4782/6141 4784/4788/6141 +f 4780/4782/6142 4781/4790/6142 4922/4919/6142 +f 4779/4783/6143 4780/4782/6143 4922/4919/6143 +f 4782/4785/4474 4779/4783/4474 4921/4920/4474 +f 4921/4920/4475 4779/4783/4475 4922/4919/4475 +f 4922/4919/4476 4782/4785/4476 4921/4920/4476 +f 4781/4790/4477 4782/4785/4477 4922/4919/4477 +f 4843/4844/4478 4897/4848/4478 4924/4921/4478 +f 4924/4921/6144 4839/4843/6144 4843/4844/6144 +f 4925/4922/6145 4840/4840/6145 4923/4923/6145 +f 4840/4840/5076 4924/4921/5076 4923/4923/5076 +f 4839/4843/4481 4924/4921/4481 4840/4840/4481 +f 4784/4788/6146 4783/4784/6146 4785/4786/6146 +f 4926/4924/6147 4897/4848/6147 4783/4784/6147 +f 4925/4922/6148 4784/4788/6148 4778/4781/6148 +f 4925/4922/6149 4928/4925/6149 4784/4788/6149 +f 4927/4926/6150 4926/4924/6150 4783/4784/6150 +f 4783/4784/6151 4929/4927/6151 4927/4926/6151 +f 4929/4927/6152 4783/4784/6152 4784/4788/6152 +f 4928/4925/6153 4929/4927/6153 4784/4788/6153 +f 4927/4926/6154 4929/4927/6154 4928/4925/6154 +f 4931/4928/4492 4926/4924/4492 4930/4929/4492 +f 4932/4930/4493 4926/4924/4493 4931/4928/4493 +f 4925/4922/6155 4931/4928/6155 4928/4925/6155 +f 4930/4929/6156 4928/4925/6156 4931/4928/6156 +f 4926/4924/5669 4927/4926/5669 4933/4931/5669 +f 4927/4926/6157 4928/4925/6157 4935/4932/6157 +f 4928/4925/6158 4930/4929/6158 4935/4932/6158 +f 4935/4932/6159 4930/4929/6159 4934/4933/6159 +f 4935/4932/4499 4933/4931/4499 4927/4926/4499 +f 4930/4929/6160 4926/4924/6160 4933/4931/6160 +f 4934/4933/4501 4933/4931/4501 4935/4932/4501 +f 4934/4933/5096 4930/4929/5096 4933/4931/5096 +f 4845/4847/4503 4685/4683/4503 4897/4848/4503 +f 4897/4848/6161 4685/4683/6161 4896/4896/6161 +f 4896/4896/6162 4685/4683/6162 4894/4895/6162 +f 4601/4600/6163 4791/4794/6163 4685/4683/6163 +f 4894/4895/6164 4685/4683/6164 4791/4794/6164 +f 4890/4890/2 4865/4866/2 4874/4874/2 +f 4891/4894/2 4879/4879/2 4867/4868/2 +f 4890/4890/2 4874/4874/2 4879/4879/2 +f 4791/4794/6165 4807/4663/6165 4894/4895/6165 +f 4879/4879/2 4891/4894/2 4890/4890/2 +f 4889/4889/6166 4890/4890/6166 4891/4894/6166 +f 4889/4889/6167 4891/4894/6167 4894/4895/6167 +f 4807/4663/6168 4672/4673/6168 4889/4889/6168 +f 4807/4663/6169 4889/4889/6169 4894/4895/6169 +f 4856/4861/6170 4860/4859/6170 4863/4864/6170 +f 4901/4898/6171 4856/4861/6171 4858/4860/6171 +f 4901/4898/6172 4857/4934/6172 4856/4861/6172 +f 4857/4934/6173 4860/4859/6173 4856/4861/6173 +f 4857/4934/6174 4859/4858/6174 4860/4859/6174 +f 4859/4858/6175 4736/4739/6175 4595/4594/6175 +f 4857/4934/6176 4901/4898/6176 4936/4935/6176 +f 4936/4935/6177 4859/4858/6177 4857/4934/6177 +f 4859/4858/6178 4625/4624/6178 4736/4739/6178 +f 4902/4901/6179 4936/4935/6179 4901/4898/6179 +f 4937/4936/6180 4625/4624/6180 4859/4858/6180 +f 4936/4935/6181 4937/4936/6181 4859/4858/6181 +f 4871/4872/6182 4870/4871/6182 4868/4869/6182 +f 4938/4937/6183 4937/4936/6183 4936/4935/6183 +f 4936/4935/6184 4902/4901/6184 4938/4937/6184 +f 4937/4936/6185 4835/4836/6185 4625/4624/6185 +f 4939/4938/6186 4835/4836/6186 4937/4936/6186 +f 4868/4869/6187 4870/4871/6187 4872/4939/6187 +f 4869/4870/6188 4868/4869/6188 4940/4940/6188 +f 4895/4893/2 4869/4870/2 4904/4903/2 +f 4869/4870/5707 4940/4940/5707 4904/4903/5707 +f 4902/4901/5708 4941/4941/5708 4938/4937/5708 +f 4895/4893/2 4904/4903/2 4903/4902/2 +f 4841/4841/6189 4840/4840/6189 4846/4687/6189 +f 4870/4871/6190 4846/4687/6190 4872/4939/6190 +f 4941/4941/6191 4937/4936/6191 4938/4937/6191 +f 4905/4904/4538 4941/4941/4538 4902/4901/4538 +f 4941/4941/6192 4939/4938/6192 4937/4936/6192 +f 4868/4869/6193 4872/4939/6193 4940/4940/6193 +f 4904/4903/5716 4942/4942/5716 4905/4904/5716 +f 4905/4904/5717 4942/4942/5717 4941/4941/5717 +f 4846/4687/6194 4840/4840/6194 4925/4922/6194 +f 4765/4768/6195 4835/4836/6195 4939/4938/6195 +f 4904/4903/5718 4940/4940/5718 4942/4942/5718 +f 4872/4939/6196 4846/4687/6196 4925/4922/6196 +f 4942/4942/6197 4939/4938/6197 4941/4941/6197 +f 4940/4940/6198 4872/4939/6198 4943/4943/6198 +f 4872/4939/6199 4925/4922/6199 4944/4944/6199 +f 4944/4944/6200 4765/4768/6200 4939/4938/6200 +f 4940/4940/6201 4943/4943/6201 4942/4942/6201 +f 4942/4942/6202 4944/4944/6202 4939/4938/6202 +f 4942/4942/6203 4943/4943/6203 4944/4944/6203 +f 4872/4939/6204 4944/4944/6204 4943/4943/6204 +f 4944/4944/6205 4778/4781/6205 4765/4768/6205 +f 4944/4944/6206 4925/4922/6206 4778/4781/6206 +f 4897/4848/6207 4946/4945/6207 4924/4921/6207 +f 4924/4921/4560 4946/4945/4560 4945/4946/4560 +f 4897/4848/6208 4925/4922/6208 4948/4947/6208 +f 4948/4947/6209 4925/4922/6209 4923/4923/6209 +f 4948/4947/6210 4923/4923/6210 4947/4948/6210 +f 4946/4945/6211 4897/4848/6211 4948/4947/6211 +f 4948/4947/6212 4945/4946/6212 4946/4945/6212 +f 4923/4923/5152 4924/4921/5152 4945/4946/5152 +f 4947/4948/5153 4945/4946/5153 4948/4947/5153 +f 4947/4948/6213 4923/4923/6213 4945/4946/6213 +f 4932/4930/6214 4897/4848/6214 4926/4924/6214 +f 4931/4928/6215 4950/4949/6215 4951/4950/6215 +f 4932/4930/6216 4931/4928/6216 4951/4950/6216 +f 4897/4848/4572 4932/4930/4572 4952/4951/4572 +f 4952/4951/4573 4932/4930/4573 4949/4952/4573 +f 4949/4952/6217 4932/4930/6217 4951/4950/6217 +f 4950/4949/6218 4931/4928/6218 4925/4922/6218 +f 4925/4922/6219 4897/4848/6219 4952/4951/6219 +f 4950/4949/6220 4925/4922/6220 4952/4951/6220 +f 4951/4950/4576 4952/4951/4576 4949/4952/4576 +f 4950/4949/6221 4952/4951/6221 4951/4950/6221 +f 4954/4953/6222 4955/4954/6222 4956/4955/6222 +f 4953/4956/6223 4955/4954/6223 4954/4953/6223 +f 4955/4954/6224 4957/4957/6224 4956/4955/6224 +f 4956/4955/6225 4957/4957/6225 4958/4958/6225 +f 4956/4955/8 4959/4959/8 4954/4953/8 +f 4955/4960/212 4953/4961/212 4957/4962/212 +f 4957/4957/6226 4960/4963/6226 4958/4958/6226 +f 4958/4958/8 4959/4959/8 4956/4955/8 +f 4959/4959/6227 4953/4956/6227 4954/4953/6227 +f 4953/4961/212 4960/4964/212 4957/4962/212 +f 4958/4958/6228 4960/4963/6228 4959/4959/6228 +f 4960/4963/6229 4953/4956/6229 4959/4959/6229 +f 4963/4965/6230 4964/4966/6230 4965/4967/6230 +f 4967/4968/6231 4966/4969/6231 5096/4970/6231 +f 4968/4971/6231 4966/4969/6231 4967/4968/6231 +f 4969/4972/6231 4966/4969/6231 4968/4971/6231 +f 4970/4973/2 4971/4974/2 4972/4975/2 +f 4972/4975/2 4973/4976/2 4970/4973/2 +f 4971/4974/6232 4961/4977/6232 4972/4975/6232 +f 4972/4975/6233 4961/4977/6233 4962/4978/6233 +f 4964/4966/132 4970/4973/132 4973/4976/132 +f 4973/4976/6234 4965/4967/6234 4964/4966/6234 +f 4961/4977/6235 4974/4979/6235 4962/4978/6235 +f 4962/4978/6236 4974/4979/6236 4975/4980/6236 +f 4965/4967/6237 4976/4981/6237 4963/4965/6237 +f 4974/4979/6238 4977/4982/6238 4975/4980/6238 +f 4978/4983/6239 4976/4981/6239 4965/4967/6239 +f 4975/4980/6238 4977/4982/6238 4966/4969/6238 +f 4976/4981/6240 4978/4983/6240 5192/4984/6240 +f 5096/4970/6231 4966/4969/6231 4977/4982/6231 +f 5192/4984/6241 4978/4983/6241 4979/4985/6241 +f 4980/4986/6231 4966/4969/6231 4969/4972/6231 +f 4982/4987/209 4983/4988/209 4980/4986/209 +f 4980/4986/209 4983/4988/209 5012/4989/209 +f 4985/4990/6242 4986/4991/6242 4987/4992/6242 +f 4988/4993/6243 4986/4991/6243 4985/4990/6243 +f 4991/4994/6244 4990/4995/6244 4989/4996/6244 +f 4989/4996/6245 4992/4997/6245 4991/4994/6245 +f 5646/4998/6246 4991/4994/6246 4992/4997/6246 +f 4997/4999/6246 4991/4994/6246 5646/4998/6246 +f 4988/4993/6247 4985/4990/6247 4993/5000/6247 +f 4993/5000/6247 4985/4990/6247 4994/5001/6247 +f 5000/5002/209 4995/5003/209 4994/5001/209 +f 4996/5004/6246 4991/4994/6246 4997/4999/6246 +f 4998/5005/209 4995/5003/209 5000/5002/209 +f 4978/4983/6248 4984/5006/6248 4981/5007/6248 +f 5012/4989/209 4983/4988/209 5001/5008/209 +f 5002/5009/2 4984/5006/2 5003/5010/2 +f 5003/5010/6249 4984/5006/6249 4978/4983/6249 +f 5000/5002/209 5001/5008/209 5004/5011/209 +f 5006/5012/2 5007/5013/2 5005/5014/2 +f 5005/5014/2 5007/5013/2 5008/5015/2 +f 5012/4989/209 5001/5008/209 5000/5002/209 +f 5009/5016/132 5010/5017/132 5005/5014/132 +f 5005/5014/132 5010/5017/132 5006/5012/132 +f 4986/4991/6250 5010/5017/6250 5009/5016/6250 +f 5007/5013/142 5011/5018/142 5008/5015/142 +f 4987/4992/6251 4986/4991/6251 5009/5016/6251 +f 5008/5015/6252 5011/5018/6252 4990/4995/6252 +f 4990/4995/6253 5011/5018/6253 4989/4996/6253 +f 5004/5011/209 4998/5005/209 5000/5002/209 +f 4999/5019/2 5002/5009/2 5003/5010/2 +f 5003/5010/2 4996/5004/2 4999/5019/2 +f 5014/5020/209 5013/5021/209 5034/5022/209 +f 5013/5021/209 5014/5020/209 5015/5023/209 +f 5013/5021/209 5015/5023/209 5016/5024/209 +f 5018/5025/6254 5015/5023/6254 5019/5026/6254 +f 5016/5024/209 5017/5027/209 5048/5028/209 +f 5016/5024/6255 5015/5023/6255 5018/5025/6255 +f 5020/5029/6256 5021/5030/6256 5022/5031/6256 +f 5023/5032/6257 5021/5030/6257 5020/5029/6257 +f 5020/5029/209 4967/4968/209 5023/5032/209 +f 5016/5024/6258 5018/5025/6258 5017/5027/6258 +f 5017/5027/6259 5018/5025/6259 5024/5033/6259 +f 5017/5027/209 5023/5032/209 4967/4968/209 +f 5017/5027/6260 5024/5033/6260 5023/5032/6260 +f 5023/5032/6261 5024/5033/6261 5021/5030/6261 +f 5025/5034/6262 5026/5035/6262 5027/5036/6262 +f 5025/5034/2 5028/5037/2 5190/5038/2 +f 5028/5037/2 5029/5039/2 5190/5038/2 +f 5030/5040/6263 5031/5041/6263 5032/5042/6263 +f 5032/5042/209 5081/5043/209 5030/5040/209 +f 5033/5044/209 5030/5040/209 5081/5043/209 +f 5035/5045/209 5033/5044/209 5081/5043/209 +f 5035/5045/209 5081/5043/209 5037/5046/209 +f 5039/5047/6264 5040/5048/6264 5036/5049/6264 +f 5037/5046/209 5081/5043/209 5034/5022/209 +f 5035/5045/6265 5037/5046/6265 5038/5050/6265 +f 5036/5049/209 5041/5051/209 5034/5022/209 +f 5036/5049/6266 5040/5048/6266 5041/5051/6266 +f 5029/5039/2 5040/5048/2 5039/5047/2 +f 5037/5046/209 5034/5022/209 5042/5052/209 +f 5038/5050/6267 5037/5046/6267 5043/5053/6267 +f 5034/5022/209 5041/5051/209 5044/5054/209 +f 5045/5055/6268 5041/5051/6268 5040/5048/6268 +f 5034/5022/209 5044/5054/209 5042/5052/209 +f 5029/5039/2 5045/5055/2 5040/5048/2 +f 5029/5039/2 5038/5050/2 5043/5053/2 +f 5043/5053/6269 5037/5046/6269 5042/5052/6269 +f 5045/5055/6268 5044/5054/6268 5041/5051/6268 +f 5046/5056/6270 5042/5052/6270 5044/5054/6270 +f 5043/5053/2 5045/5055/2 5029/5039/2 +f 5043/5053/6269 5042/5052/6269 5046/5056/6269 +f 5046/5056/6270 5044/5054/6270 5045/5055/6270 +f 5043/5053/2 5046/5056/2 5045/5055/2 +f 5049/5057/6271 5050/5058/6271 5051/5059/6271 +f 5052/5060/6272 5050/5058/6272 5049/5057/6272 +f 5053/5061/2 5049/5057/2 5051/5059/2 +f 5052/5060/6273 5055/5062/6273 5050/5058/6273 +f 5053/5061/2 5052/5060/2 5049/5057/2 +f 5048/5028/209 5055/5062/209 5056/5063/209 +f 5057/5064/6274 5055/5062/6274 5052/5060/6274 +f 5057/5064/6274 5056/5063/6274 5055/5062/6274 +f 5053/5061/2 5057/5064/2 5052/5060/2 +f 5056/5063/209 5058/5065/209 5048/5028/209 +f 5058/5065/6275 5056/5063/6275 5059/5066/6275 +f 5059/5066/6276 5056/5063/6276 5057/5064/6276 +f 5053/5061/2 5059/5066/2 5057/5064/2 +f 5048/5028/209 5058/5065/209 5016/5024/209 +f 5016/5024/209 5058/5065/209 5060/5067/209 +f 5058/5065/6277 5059/5066/6277 5060/5067/6277 +f 5016/5024/209 5060/5067/209 5013/5021/209 +f 5024/5033/2 5018/5025/2 5053/5061/2 +f 5060/5067/6278 5059/5066/6278 5061/5068/6278 +f 5018/5025/2 5059/5066/2 5053/5061/2 +f 5019/5026/2 5029/5039/2 5018/5025/2 +f 5018/5025/2 5061/5068/2 5059/5066/2 +f 5060/5067/6279 5062/5069/6279 5013/5021/6279 +f 5036/5049/6280 5062/5069/6280 5039/5047/6280 +f 5034/5022/209 5013/5021/209 5036/5049/209 +f 5061/5068/6281 5062/5069/6281 5060/5067/6281 +f 5029/5039/2 5039/5047/2 5062/5069/2 +f 5013/5021/6282 5062/5069/6282 5036/5049/6282 +f 5018/5025/2 5062/5069/2 5061/5068/2 +f 5018/5025/2 5029/5039/2 5062/5069/2 +f 5048/5028/209 5050/5058/209 5055/5062/209 +f 5048/5028/209 5065/5070/209 5050/5058/209 +f 5066/5071/209 5064/5072/209 5063/5073/209 +f 5065/5070/6283 5051/5059/6283 5050/5058/6283 +f 5069/5074/2 5053/5061/2 5051/5059/2 +f 5054/5075/2 5053/5061/2 5068/5076/2 +f 5067/5077/209 5065/5070/209 5048/5028/209 +f 5371/5078/209 5066/5071/209 5063/5073/209 +f 5069/5074/6284 5051/5059/6284 5065/5070/6284 +f 5068/5076/2 5053/5061/2 5069/5074/2 +f 5048/5028/209 5064/5072/209 5066/5071/209 +f 5067/5077/209 5048/5028/209 5071/5079/209 +f 5065/5070/209 5067/5077/209 5070/5080/209 +f 5071/5079/209 5048/5028/209 5066/5071/209 +f 5071/5079/6285 5068/5076/6285 5067/5077/6285 +f 5070/5080/209 5073/5081/209 5065/5070/209 +f 5073/5081/6286 5069/5074/6286 5065/5070/6286 +f 5068/5076/2 5069/5074/2 5074/5082/2 +f 5067/5077/6287 5068/5076/6287 5070/5080/6287 +f 5075/5083/209 5066/5071/209 5371/5078/209 +f 5071/5079/209 5066/5071/209 5075/5083/209 +f 5054/5075/6288 5068/5076/6288 5071/5079/6288 +f 5073/5081/6289 5076/5084/6289 5069/5074/6289 +f 5070/5080/6290 5068/5076/6290 5074/5082/6290 +f 5074/5082/2 5069/5074/2 5076/5084/2 +f 5077/5085/209 5071/5079/209 5075/5083/209 +f 5077/5085/6291 5054/5075/6291 5071/5079/6291 +f 5077/5085/6289 5078/5086/6289 5054/5075/6289 +f 5033/5044/209 5073/5081/209 5070/5080/209 +f 5074/5082/6292 5079/5087/6292 5070/5080/6292 +f 5070/5080/6293 5079/5087/6293 5030/5040/6293 +f 5080/5088/209 5081/5043/209 5032/5042/209 +f 5072/5089/2 5054/5075/2 5078/5086/2 +f 5070/5080/209 5030/5040/209 5033/5044/209 +f 5073/5081/6294 5033/5044/6294 5076/5084/6294 +f 5074/5082/2 5076/5084/2 5079/5087/2 +f 5032/5042/209 5082/5090/209 5080/5088/209 +f 5075/5083/209 5083/5091/209 5077/5085/209 +f 5077/5085/6294 5083/5091/6294 5078/5086/6294 +f 5076/5084/6295 5033/5044/6295 5084/5092/6295 +f 5079/5087/2 5076/5084/2 5084/5092/2 +f 5129/5093/209 5083/5091/209 5075/5083/209 +f 5078/5086/6295 5083/5091/6295 5085/5094/6295 +f 5072/5089/2 5078/5086/2 5085/5094/2 +f 5086/5095/209 5082/5090/209 5032/5042/209 +f 5072/5089/2 5085/5094/2 5131/5096/2 +f 5035/5045/6296 5038/5050/6296 5033/5044/6296 +f 5030/5040/6297 5079/5087/6297 5031/5041/6297 +f 5088/5097/209 5129/5093/209 5089/5098/209 +f 5129/5093/209 5088/5097/209 5087/5099/209 +f 5087/5099/209 5090/5100/209 5032/5042/209 +f 5091/5101/6298 5082/5090/6298 5086/5095/6298 +f 5087/5099/209 5083/5091/209 5129/5093/209 +f 5083/5091/6299 5092/5102/6299 5085/5094/6299 +f 5033/5044/6300 5038/5050/6300 5084/5092/6300 +f 5079/5087/2 5084/5092/2 5031/5041/2 +f 5089/5098/6301 5093/5103/6301 5088/5097/6301 +f 5087/5099/209 5088/5097/209 5090/5100/209 +f 5032/5042/209 5090/5100/209 5086/5095/209 +f 5091/5101/6302 5086/5095/6302 5094/5104/6302 +f 5087/5099/6296 5092/5102/6296 5083/5091/6296 +f 5131/5096/2 5085/5094/2 5092/5102/2 +f 5029/5039/2 5084/5092/2 5038/5050/2 +f 5094/5104/2 5031/5041/2 5091/5101/2 +f 5095/5105/6303 5090/5100/6303 5088/5097/6303 +f 5094/5104/6304 5086/5095/6304 5090/5100/6304 +f 5032/5042/6305 5092/5102/6305 5087/5099/6305 +f 5031/5041/2 5084/5092/2 5029/5039/2 +f 5095/5105/6306 5088/5097/6306 5093/5103/6306 +f 5094/5104/6304 5090/5100/6304 5095/5105/6304 +f 5031/5041/6307 5092/5102/6307 5032/5042/6307 +f 5093/5103/2 5131/5096/2 5095/5105/2 +f 5095/5105/2 5031/5041/2 5094/5104/2 +f 5131/5096/2 5092/5102/2 5031/5041/2 +f 5095/5105/2 5131/5096/2 5031/5041/2 +f 4971/4974/6308 4964/4966/6308 4961/4977/6308 +f 4964/4966/6309 4963/4965/6309 4961/4977/6309 +f 4963/4965/6310 4974/4979/6310 4961/4977/6310 +f 4963/4965/212 4977/4982/212 4974/4979/212 +f 4976/4981/212 4977/4982/212 4963/4965/212 +f 5097/5106/2534 5098/5107/2534 5099/5108/2534 +f 4976/4981/212 5096/4970/212 4977/4982/212 +f 5097/5106/215 5100/5109/215 5098/5107/215 +f 5101/5110/212 5096/4970/212 4976/4981/212 +f 5102/5111/215 5100/5109/215 5097/5106/215 +f 5098/5107/2 5100/5109/2 5101/5110/2 +f 5103/5112/204 5096/4970/204 5101/5110/204 +f 5103/5112/204 5104/5113/204 5096/4970/204 +f 5105/5114/203 5106/5115/203 5104/5113/203 +f 5102/5111/214 5107/5116/214 5100/5109/214 +f 5101/5110/2 5100/5109/2 5103/5112/2 +f 5105/5114/203 5104/5113/203 5103/5112/203 +f 5111/5117/206 5106/5115/206 5105/5114/206 +f 5103/5112/2 5100/5109/2 5107/5116/2 +f 5105/5114/2 5103/5112/2 5111/5117/2 +f 5111/5117/2 5103/5112/2 5107/5116/2 +f 5108/5118/6311 5111/5117/6311 5109/5119/6311 +f 5110/5120/2 5111/5117/2 5107/5116/2 +f 5017/5027/209 4967/4968/209 5048/5028/209 +f 5114/5121/209 5115/5122/209 4967/4968/209 +f 5116/5123/6312 5112/5124/6312 5113/5125/6312 +f 5021/5030/2 5118/5126/2 5022/5031/2 +f 5117/5127/2 5116/5123/2 5113/5125/2 +f 4967/4968/209 5115/5122/209 5119/5128/209 +f 5120/5129/6313 5121/5130/6313 5122/5131/6313 +f 4967/4968/209 5122/5131/209 5121/5130/209 +f 5115/5122/6314 5123/5132/6314 5119/5128/6314 +f 5115/5122/6315 5116/5123/6315 5123/5132/6315 +f 5116/5123/2 5117/5127/2 5118/5126/2 +f 5120/5129/6313 5122/5131/6313 5124/5133/6313 +f 5119/5128/209 5122/5131/209 4967/4968/209 +f 5118/5126/2 5123/5132/2 5116/5123/2 +f 5119/5128/6316 5124/5133/6316 5122/5131/6316 +f 5123/5132/6317 5124/5133/6317 5119/5128/6317 +f 5124/5133/2 5123/5132/2 5118/5126/2 +f 5125/5134/6318 5229/5135/6318 5126/5136/6318 +f 5127/5137/6319 5229/5135/6319 5125/5134/6319 +f 5129/5093/6320 5130/5138/6320 5128/5139/6320 +f 5127/5137/209 5125/5134/209 5363/5140/209 +f 5131/5096/6321 5130/5138/6321 5132/5141/6321 +f 5133/5142/209 5130/5138/209 5129/5093/209 +f 5363/5140/209 5125/5134/209 5134/5143/209 +f 5135/5144/6322 5125/5134/6322 5126/5136/6322 +f 5133/5142/209 5132/5141/209 5130/5138/209 +f 5363/5140/209 5134/5143/209 5136/5145/209 +f 5137/5146/6323 5138/5147/6323 5139/5148/6323 +f 5135/5144/6324 5134/5143/6324 5125/5134/6324 +f 5136/5145/209 5134/5143/209 5140/5149/209 +f 5141/5150/209 5132/5141/209 5133/5142/209 +f 5142/5151/6325 5143/5152/6325 5144/5153/6325 +f 5145/5154/6326 5140/5149/6326 5134/5143/6326 +f 5145/5154/6326 5134/5143/6326 5135/5144/6326 +f 5136/5145/209 5140/5149/209 5146/5155/209 +f 5136/5145/209 5146/5155/209 5141/5150/209 +f 5141/5150/209 5147/5156/209 5148/5157/209 +f 5142/5151/6327 5147/5156/6327 5143/5152/6327 +f 5149/5158/209 5141/5150/209 5148/5157/209 +f 5150/5159/6328 5146/5155/6328 5140/5149/6328 +f 5150/5159/6329 5140/5149/6329 5145/5154/6329 +f 5145/5154/2 5135/5144/2 5155/5160/2 +f 5137/5146/6330 5136/5145/6330 5138/5147/6330 +f 5151/5161/209 5136/5145/209 5137/5146/209 +f 5152/5162/6331 5148/5157/6331 5147/5156/6331 +f 5152/5162/6331 5147/5156/6331 5142/5151/6331 +f 5149/5158/6332 5148/5157/6332 5153/5163/6332 +f 5155/5160/2 5150/5159/2 5145/5154/2 +f 5154/5164/6333 5141/5150/6333 5146/5155/6333 +f 5136/5145/209 5141/5150/209 5149/5158/209 +f 5138/5147/6334 5136/5145/6334 5155/5160/6334 +f 5153/5163/6335 5148/5157/6335 5152/5162/6335 +f 5156/5165/2 5152/5162/2 5142/5151/2 +f 5154/5164/6336 5146/5155/6336 5150/5159/6336 +f 5156/5165/2 5153/5163/2 5152/5162/2 +f 5154/5164/2 5150/5159/2 5155/5160/2 +f 5149/5158/6337 5155/5160/6337 5136/5145/6337 +f 5149/5158/6338 5153/5163/6338 5155/5160/6338 +f 5156/5165/2 5154/5164/2 5155/5160/2 +f 5156/5165/2 5155/5160/2 5153/5163/2 +f 5159/5166/6339 5089/5098/6339 5129/5093/6339 +f 5159/5166/6340 5093/5103/6340 5089/5098/6340 +f 5128/5139/6341 5130/5138/6341 5131/5096/6341 +f 5159/5166/6342 5129/5093/6342 5128/5139/6342 +f 5093/5103/2 5159/5166/2 5131/5096/2 +f 5156/5165/6343 5132/5141/6343 5141/5150/6343 +f 5075/5083/209 5158/5167/209 5161/5168/209 +f 5158/5167/6287 5160/5169/6287 5161/5168/6287 +f 5131/5096/2 5159/5166/2 5128/5139/2 +f 5156/5165/6343 5141/5150/6343 5154/5164/6343 +f 5131/5096/6321 5132/5141/6321 5156/5165/6321 +f 5141/5150/209 5143/5152/209 5147/5156/209 +f 5161/5168/6344 5160/5169/6344 5162/5170/6344 +f 5072/5089/2 5160/5169/2 5428/5171/2 +f 5133/5142/209 5129/5093/209 5075/5083/209 +f 5133/5142/209 5143/5152/209 5141/5150/209 +f 5075/5083/209 5161/5168/209 5163/5172/209 +f 5162/5170/2 5160/5169/2 5072/5089/2 +f 5075/5083/209 5163/5172/209 5133/5142/209 +f 5144/5153/2 5156/5165/2 5142/5151/2 +f 5161/5168/6293 5164/5173/6293 5163/5172/6293 +f 5162/5170/6292 5164/5173/6292 5161/5168/6292 +f 5165/5174/6345 5144/5153/6345 5143/5152/6345 +f 5131/5096/2 5156/5165/2 5144/5153/2 +f 5165/5174/209 5143/5152/209 5133/5142/209 +f 5072/5089/2 5164/5173/2 5162/5170/2 +f 5166/5175/6346 5144/5153/6346 5165/5174/6346 +f 5163/5172/209 5165/5174/209 5133/5142/209 +f 5131/5096/2 5164/5173/2 5072/5089/2 +f 5131/5096/2 5144/5153/2 5166/5175/2 +f 5163/5172/6347 5166/5175/6347 5165/5174/6347 +f 5163/5172/6297 5164/5173/6297 5166/5175/6297 +f 5166/5175/2 5164/5173/2 5131/5096/2 +f 5167/5176/209 5168/5177/209 4968/4971/209 +f 5115/5122/6348 5112/5124/6348 5116/5123/6348 +f 5169/5178/6349 5170/5179/6349 5171/5180/6349 +f 4968/4971/209 5168/5177/209 5172/5181/209 +f 5173/5182/209 5171/5180/209 5170/5179/209 +f 5174/5183/6350 5170/5179/6350 5169/5178/6350 +f 5112/5124/209 5115/5122/209 5114/5121/209 +f 5169/5178/6351 5171/5180/6351 5175/5184/6351 +f 5172/5181/6352 5168/5177/6352 5176/5185/6352 +f 4968/4971/209 5172/5181/209 5179/5186/209 +f 5174/5183/6350 5173/5182/6350 5170/5179/6350 +f 5175/5184/2 5174/5183/2 5169/5178/2 +f 5182/5187/209 5171/5180/209 5173/5182/209 +f 5176/5185/6353 5168/5177/6353 5178/5188/6353 +f 5182/5187/6354 5173/5182/6354 5181/5189/6354 +f 5181/5189/6355 5173/5182/6355 5174/5183/6355 +f 5182/5187/209 5112/5124/209 5114/5121/209 +f 5182/5187/209 5183/5190/209 5171/5180/209 +f 5177/5191/2 5176/5185/2 5178/5188/2 +f 5175/5184/2 5181/5189/2 5174/5183/2 +f 5182/5187/6356 5113/5125/6356 5112/5124/6356 +f 5114/5121/209 4967/4968/209 5020/5029/209 +f 5183/5190/6357 5175/5184/6357 5171/5180/6357 +f 5183/5190/209 5179/5186/209 5172/5181/209 +f 5184/5192/6358 5026/5035/6358 5025/5034/6358 +f 5182/5187/209 5114/5121/209 5183/5190/209 +f 5114/5121/209 5179/5186/209 5183/5190/209 +f 5185/5193/2 5181/5189/2 5175/5184/2 +f 5182/5187/6359 5181/5189/6359 5113/5125/6359 +f 5185/5193/6360 5175/5184/6360 5183/5190/6360 +f 5172/5181/6361 5176/5185/6361 5185/5193/6361 +f 5186/5194/2 5176/5185/2 5177/5191/2 +f 5172/5181/6362 5185/5193/6362 5183/5190/6362 +f 5190/5038/2 5184/5192/2 5025/5034/2 +f 5187/5195/209 5179/5186/209 5114/5121/209 +f 5117/5127/2 5113/5125/2 5181/5189/2 +f 5186/5194/2 5185/5193/2 5176/5185/2 +f 5117/5127/2 5181/5189/2 5185/5193/2 +f 5020/5029/6279 5188/5196/6279 5114/5121/6279 +f 5117/5127/2 5184/5192/2 5190/5038/2 +f 5022/5031/6281 5188/5196/6281 5020/5029/6281 +f 5186/5194/2 5117/5127/2 5185/5193/2 +f 5118/5126/2 5188/5196/2 5022/5031/2 +f 5014/5020/6356 5019/5026/6356 5015/5023/6356 +f 5114/5121/209 5189/5197/209 5187/5195/209 +f 5114/5121/6282 5188/5196/6282 5189/5197/6282 +f 5014/5020/6359 5190/5038/6359 5019/5026/6359 +f 5187/5195/209 5189/5197/209 5034/5022/209 +f 5189/5197/6280 5188/5196/6280 5191/5198/6280 +f 5118/5126/2 5117/5127/2 5188/5196/2 +f 5029/5039/2 5019/5026/2 5190/5038/2 +f 5014/5020/209 5034/5022/209 5189/5197/209 +f 5117/5127/2 5191/5198/2 5188/5196/2 +f 5014/5020/6363 5189/5197/6363 5190/5038/6363 +f 5190/5038/6364 5189/5197/6364 5191/5198/6364 +f 5190/5038/2 5191/5198/2 5117/5127/2 +f 5192/4984/2 5021/5030/2 5024/5033/2 +f 5192/4984/2 5118/5126/2 5021/5030/2 +f 5192/4984/2 5193/5199/2 5118/5126/2 +f 4968/4971/209 5194/5200/209 4969/4972/209 +f 5194/5200/209 5195/5201/209 4969/4972/209 +f 4979/4985/2 5193/5199/2 5192/4984/2 +f 4969/4972/209 5195/5201/209 5196/5202/209 +f 5197/5203/2 5193/5199/2 4979/4985/2 +f 5198/5204/209 4969/4972/209 5196/5202/209 +f 5484/5205/209 4969/4972/209 5198/5204/209 +f 5197/5203/2 4979/4985/2 5199/5206/2 +f 5196/5202/219 5199/5206/219 5198/5204/219 +f 5198/5204/209 5200/5207/209 5484/5205/209 +f 5201/5208/209 5484/5205/209 5202/5209/209 +f 5198/5204/218 5204/5210/218 5200/5207/218 +f 5199/5206/6365 4979/4985/6365 4978/4983/6365 +f 5198/5204/219 5199/5206/219 5204/5210/219 +f 5202/5209/203 5205/5211/203 5201/5208/203 +f 5203/5212/209 5484/5205/209 5200/5207/209 +f 5203/5212/209 5202/5209/209 5484/5205/209 +f 5200/5207/218 5204/5210/218 5206/5213/218 +f 5199/5206/6366 4978/4983/6366 5204/5210/6366 +f 5202/5209/206 5207/5214/206 5205/5211/206 +f 5200/5207/217 5206/5213/217 5203/5212/217 +f 5203/5212/206 5207/5214/206 5202/5209/206 +f 4978/4983/6367 5206/5213/6367 5204/5210/6367 +f 5458/5215/2 5205/5211/2 5207/5214/2 +f 5203/5212/217 5206/5213/217 5207/5214/217 +f 4978/4983/6368 5458/5215/6368 5206/5213/6368 +f 5207/5214/2 5206/5213/2 5458/5215/2 +f 5167/5176/6337 5178/5188/6337 5168/5177/6337 +f 5167/5176/6338 5208/5216/6338 5178/5188/6338 +f 5208/5216/2 5177/5191/2 5178/5188/2 +f 5209/5217/209 5167/5176/209 4968/4971/209 +f 5167/5176/6369 5209/5217/6369 5208/5216/6369 +f 5210/5218/6370 5211/5219/6370 5121/5130/6370 +f 5212/5220/6371 5209/5217/6371 5211/5219/6371 +f 5208/5216/6372 5209/5217/6372 5212/5220/6372 +f 5193/5199/2 5177/5191/2 5208/5216/2 +f 5209/5217/209 4968/4971/209 5211/5219/209 +f 4967/4968/209 5121/5130/209 5211/5219/209 +f 5210/5218/6370 5121/5130/6370 5120/5129/6370 +f 5118/5126/2 5120/5129/2 5124/5133/2 +f 5212/5220/6371 5211/5219/6371 5210/5218/6371 +f 5193/5199/2 5208/5216/2 5212/5220/2 +f 5211/5219/209 4968/4971/209 4967/4968/209 +f 5118/5126/2 5210/5218/2 5120/5129/2 +f 5212/5220/2 5210/5218/2 5193/5199/2 +f 4970/4973/6373 4964/4966/6373 4971/4974/6373 +f 5193/5199/2 5210/5218/2 5118/5126/2 +f 5111/5117/206 5064/5072/206 5106/5115/206 +f 5213/5221/214 5107/5116/214 5102/5111/214 +f 5106/5115/209 5064/5072/209 5104/5113/209 +f 5213/5221/207 5110/5120/207 5107/5116/207 +f 5104/5113/209 5213/5221/209 5102/5111/209 +f 5104/5113/6374 5214/5222/6374 5213/5221/6374 +f 5104/5113/209 5064/5072/209 5214/5222/209 +f 5214/5222/207 5110/5120/207 5213/5221/207 +f 5214/5222/208 5215/5223/208 5110/5120/208 +f 5104/5113/209 5102/5111/209 5096/4970/209 +f 5214/5222/209 5064/5072/209 5048/5028/209 +f 5216/5224/208 5215/5223/208 5214/5222/208 +f 5072/5089/2 5111/5117/2 5110/5120/2 +f 5102/5111/209 5097/5106/209 5096/4970/209 +f 5048/5028/209 5216/5224/209 5214/5222/209 +f 5216/5224/210 5217/5225/210 5215/5223/210 +f 5110/5120/2 5215/5223/2 5072/5089/2 +f 5096/4970/209 5097/5106/209 5099/5108/209 +f 5048/5028/209 5218/5226/209 5216/5224/209 +f 5218/5226/210 5217/5225/210 5216/5224/210 +f 5072/5089/2 5215/5223/2 5217/5225/2 +f 5219/5227/209 5218/5226/209 5048/5028/209 +f 5218/5226/204 5053/5061/204 5217/5225/204 +f 5072/5089/2 5217/5225/2 5053/5061/2 +f 5096/4970/209 5099/5108/209 5220/5228/209 +f 5219/5227/209 5048/5028/209 4967/4968/209 +f 5099/5108/219 5221/5229/219 5220/5228/219 +f 5099/5108/2534 5098/5107/2534 5221/5229/2534 +f 5219/5227/204 5053/5061/204 5218/5226/204 +f 5096/4970/209 5220/5228/209 4967/4968/209 +f 5220/5228/219 5221/5229/219 5222/5230/219 +f 5101/5110/2 5221/5229/2 5098/5107/2 +f 5219/5227/203 5223/5231/203 5053/5061/203 +f 5220/5228/209 5224/5232/209 4967/4968/209 +f 4967/4968/209 5226/5233/209 5219/5227/209 +f 5220/5228/218 5222/5230/218 5224/5232/218 +f 5101/5110/2 5222/5230/2 5221/5229/2 +f 4976/4981/6375 5192/4984/6375 5101/5110/6375 +f 5226/5233/203 5223/5231/203 5219/5227/203 +f 5024/5033/2 5053/5061/2 5223/5231/2 +f 4967/4968/209 5224/5232/209 5225/5234/209 +f 4967/4968/209 5225/5234/209 5226/5233/209 +f 5224/5232/218 5222/5230/218 5227/5235/218 +f 5192/4984/2 5222/5230/2 5101/5110/2 +f 5226/5233/206 5228/5236/206 5223/5231/206 +f 5224/5232/217 5227/5235/217 5225/5234/217 +f 5225/5234/206 5228/5236/206 5226/5233/206 +f 5192/4984/2 5227/5235/2 5222/5230/2 +f 5024/5033/2 5223/5231/2 5228/5236/2 +f 5225/5234/217 5227/5235/217 5228/5236/217 +f 5192/4984/2 5024/5033/2 5227/5235/2 +f 5228/5236/2 5227/5235/2 5024/5033/2 +f 5230/5237/6376 5231/5238/6376 5127/5137/6376 +f 5127/5137/6377 5231/5238/6377 5229/5135/6377 +f 5362/5239/2 5229/5135/2 5231/5238/2 +f 5232/5240/209 5230/5237/209 5127/5137/209 +f 5233/5241/6378 5080/5088/6378 5082/5090/6378 +f 5234/5242/6379 5235/5243/6379 5080/5088/6379 +f 5236/5244/6380 5235/5243/6380 5234/5242/6380 +f 5230/5237/6381 5236/5244/6381 5231/5238/6381 +f 5184/5192/6382 5180/5245/6382 5026/5035/6382 +f 5034/5022/209 5180/5245/209 5187/5195/209 +f 5237/5246/6383 5236/5244/6383 5230/5237/6383 +f 5236/5244/6380 5237/5246/6380 5235/5243/6380 +f 5080/5088/209 5235/5243/209 5081/5043/209 +f 5233/5241/6384 5082/5090/6384 5091/5101/6384 +f 5234/5242/6379 5080/5088/6379 5233/5241/6379 +f 5236/5244/2 5234/5242/2 5238/5247/2 +f 5231/5238/2 5236/5244/2 5238/5247/2 +f 5362/5239/2 5231/5238/2 5238/5247/2 +f 5034/5022/209 5026/5035/209 5180/5245/209 +f 5232/5240/209 5237/5246/209 5230/5237/209 +f 5081/5043/209 5235/5243/209 5237/5246/209 +f 5031/5041/2 5233/5241/2 5091/5101/2 +f 5238/5247/2 5234/5242/2 5233/5241/2 +f 5081/5043/209 5237/5246/209 5232/5240/209 +f 5232/5240/6385 5362/5239/6385 5238/5247/6385 +f 5238/5247/2 5233/5241/2 5031/5041/2 +f 5026/5035/209 5034/5022/209 5027/5036/209 +f 5025/5034/6386 5027/5036/6386 5028/5037/6386 +f 5029/5039/2 5238/5247/2 5031/5041/2 +f 5027/5036/209 5034/5022/209 5081/5043/209 +f 5028/5037/6387 5027/5036/6387 5081/5043/6387 +f 5239/5248/6388 5232/5240/6388 5238/5247/6388 +f 5028/5037/6387 5081/5043/6387 5029/5039/6387 +f 5029/5039/2 5239/5248/2 5238/5247/2 +f 5241/5249/209 5081/5043/209 5232/5240/209 +f 5239/5248/6388 5241/5249/6388 5232/5240/6388 +f 5029/5039/6389 5081/5043/6389 5240/5250/6389 +f 5242/5251/2 5239/5248/2 5029/5039/2 +f 5240/5250/209 5081/5043/209 5244/5252/209 +f 5241/5249/209 5244/5252/209 5081/5043/209 +f 5242/5251/6390 5241/5249/6390 5239/5248/6390 +f 5029/5039/6389 5240/5250/6389 5243/5253/6389 +f 5243/5253/2 5242/5251/2 5029/5039/2 +f 5240/5250/209 5244/5252/209 5247/5254/209 +f 5242/5251/6390 5244/5252/6390 5241/5249/6390 +f 5243/5253/6391 5240/5250/6391 5247/5254/6391 +f 5248/5255/2 5242/5251/2 5243/5253/2 +f 5247/5254/209 5244/5252/209 5249/5256/209 +f 5248/5255/6392 5244/5252/6392 5242/5251/6392 +f 5243/5253/6393 5247/5254/6393 5250/5257/6393 +f 5243/5253/2 5250/5257/2 5248/5255/2 +f 5248/5255/6392 5249/5256/6392 5244/5252/6392 +f 5248/5255/2 5250/5257/2 5251/5258/2 +f 5247/5254/209 5249/5256/209 5252/5259/209 +f 5251/5258/6394 5249/5256/6394 5248/5255/6394 +f 5246/5260/209 5247/5254/209 5253/5261/209 +f 5251/5258/6394 5252/5259/6394 5249/5256/6394 +f 5252/5259/209 5253/5261/209 5247/5254/209 +f 5245/5262/6395 5246/5260/6395 5253/5261/6395 +f 5251/5258/2 5250/5257/2 5254/5263/2 +f 5252/5259/6396 5251/5258/6396 5253/5261/6396 +f 5245/5262/6397 5253/5261/6397 5254/5263/6397 +f 5253/5261/6396 5251/5258/6396 5254/5263/6396 +f 5254/5263/2 5250/5257/2 5245/5262/2 +f 5255/5264/6398 5256/5265/6398 5257/5266/6398 +f 5255/5264/6399 5257/5266/6399 5258/5267/6399 +f 5259/5268/6400 5256/5265/6400 5255/5264/6400 +f 5259/5268/2 5255/5264/2 5258/5267/2 +f 5262/5269/2 5259/5268/2 5263/5270/2 +f 5265/5271/6401 5266/5272/6401 5267/5273/6401 +f 5260/5274/6402 5261/5275/6402 5268/5276/6402 +f 5267/5273/6403 5266/5272/6403 5259/5268/6403 +f 5271/5277/6404 5267/5273/6404 5272/5278/6404 +f 5268/5276/6405 5261/5275/6405 5273/5279/6405 +f 5262/5269/2 5270/5280/2 5259/5268/2 +f 5265/5271/6406 5267/5273/6406 5271/5277/6406 +f 5266/5272/209 5265/5271/209 5274/5281/209 +f 5276/5282/209 5266/5272/209 5274/5281/209 +f 5260/5274/209 5268/5276/209 5269/5283/209 +f 5270/5280/2 5267/5273/2 5259/5268/2 +f 5272/5278/2 5267/5273/2 5264/5284/2 +f 5275/5285/6407 5276/5282/6407 5268/5276/6407 +f 5273/5279/2 5261/5275/2 5264/5284/2 +f 5265/5271/209 5271/5277/209 5274/5281/209 +f 5264/5284/2 5267/5273/2 5270/5280/2 +f 5275/5285/6408 5268/5276/6408 5273/5279/6408 +f 5269/5283/209 5268/5276/209 5276/5282/209 +f 5264/5284/2 5275/5285/2 5273/5279/2 +f 5276/5282/209 5274/5281/209 5269/5283/209 +f 5270/5280/2 5275/5285/2 5264/5284/2 +f 5180/5245/6409 5184/5192/6409 5187/5195/6409 +f 5269/5283/209 5277/5286/209 5278/5287/209 +f 5269/5283/209 5274/5281/209 5277/5286/209 +f 5280/5288/6410 5278/5287/6410 5281/5289/6410 +f 5187/5195/6411 5184/5192/6411 5283/5290/6411 +f 5278/5287/209 5277/5286/209 5281/5289/209 +f 5274/5281/209 5279/5291/209 5277/5286/209 +f 5283/5290/2 5184/5192/2 5117/5127/2 +f 5284/5292/6412 5281/5289/6412 5285/5293/6412 +f 5280/5288/6410 5281/5289/6410 5284/5292/6410 +f 5282/5294/2 5280/5288/2 5264/5284/2 +f 5277/5286/209 5285/5293/209 5281/5289/209 +f 5284/5292/6413 5285/5293/6413 5286/5295/6413 +f 5264/5284/2 5280/5288/2 5284/5292/2 +f 5284/5292/2 5286/5295/2 5264/5284/2 +f 5287/5296/209 5285/5293/209 5277/5286/209 +f 5287/5296/209 5288/5297/209 5285/5293/209 +f 5286/5295/6414 5285/5293/6414 5288/5297/6414 +f 5289/5298/6415 5187/5195/6415 5283/5290/6415 +f 5465/5299/2 5283/5290/2 5117/5127/2 +f 5264/5284/2 5286/5295/2 5465/5299/2 +f 5187/5195/209 5290/5300/209 5287/5296/209 +f 5289/5298/6416 5290/5300/6416 5187/5195/6416 +f 5291/5301/209 5288/5297/209 5287/5296/209 +f 5286/5295/6417 5288/5297/6417 5292/5302/6417 +f 5465/5299/2 5289/5298/2 5283/5290/2 +f 5465/5299/2 5286/5295/2 5292/5302/2 +f 5287/5296/209 5290/5300/209 5293/5303/209 +f 5294/5304/6418 5290/5300/6418 5289/5298/6418 +f 5293/5303/209 5291/5301/209 5287/5296/209 +f 5292/5302/6419 5288/5297/6419 5291/5301/6419 +f 5294/5304/2 5289/5298/2 5465/5299/2 +f 5465/5299/2 5292/5302/2 5295/5305/2 +f 5294/5304/6418 5293/5303/6418 5290/5300/6418 +f 5293/5303/209 5296/5306/209 5291/5301/209 +f 5292/5302/6419 5291/5301/6419 5295/5305/6419 +f 5295/5305/2 5294/5304/2 5465/5299/2 +f 5297/5307/6420 5293/5303/6420 5294/5304/6420 +f 5297/5307/6421 5298/5308/6421 5293/5303/6421 +f 5298/5308/209 5296/5306/209 5293/5303/209 +f 5295/5305/6422 5291/5301/6422 5296/5306/6422 +f 5299/5309/2 5294/5304/2 5295/5305/2 +f 5299/5309/2 5297/5307/2 5294/5304/2 +f 5295/5305/6423 5296/5306/6423 5299/5309/6423 +f 5302/5310/6424 5301/5311/6424 5300/5312/6424 +f 5300/5312/6425 5301/5311/6425 5306/5313/6425 +f 5307/5314/6426 5298/5308/6426 5297/5307/6426 +f 5307/5314/6427 5308/5315/6427 5298/5308/6427 +f 5303/5316/6428 5305/5317/6428 5304/5318/6428 +f 5308/5315/209 5296/5306/209 5298/5308/209 +f 5302/5310/6429 5309/5319/6429 5301/5311/6429 +f 5301/5311/209 5309/5319/209 5306/5313/209 +f 5300/5312/6430 5306/5313/6430 5310/5320/6430 +f 5311/5321/209 5305/5317/209 5308/5315/209 +f 5299/5309/2 5307/5314/2 5297/5307/2 +f 5312/5322/6431 5308/5315/6431 5307/5314/6431 +f 5313/5323/6432 5305/5317/6432 5303/5316/6432 +f 5308/5315/209 5305/5317/209 5296/5306/209 +f 5302/5310/2 5300/5312/2 5310/5320/2 +f 5304/5318/6433 5309/5319/6433 5303/5316/6433 +f 5311/5321/209 5304/5318/209 5305/5317/209 +f 5314/5324/209 5309/5319/209 5304/5318/209 +f 5312/5322/6431 5311/5321/6431 5308/5315/6431 +f 5312/5322/2 5307/5314/2 5299/5309/2 +f 5299/5309/6434 5296/5306/6434 5313/5323/6434 +f 5315/5325/2 5313/5323/2 5303/5316/2 +f 5313/5323/6435 5296/5306/6435 5305/5317/6435 +f 5303/5316/6436 5309/5319/6436 5302/5310/6436 +f 5314/5324/209 5304/5318/209 5311/5321/209 +f 5306/5313/209 5309/5319/209 5314/5324/209 +f 5315/5325/6437 5311/5321/6437 5312/5322/6437 +f 5313/5323/2 5312/5322/2 5299/5309/2 +f 5302/5310/2 5315/5325/2 5303/5316/2 +f 5315/5325/6437 5314/5324/6437 5311/5321/6437 +f 5306/5313/6438 5314/5324/6438 5310/5320/6438 +f 5313/5323/2 5315/5325/2 5312/5322/2 +f 5302/5310/2 5310/5320/2 5315/5325/2 +f 5310/5320/6439 5314/5324/6439 5315/5325/6439 +f 5318/5326/6440 5319/5327/6440 5322/5328/6440 +f 5321/5329/6441 5323/5330/6441 5322/5328/6441 +f 5324/5331/209 5322/5328/209 5319/5327/209 +f 5320/5332/6442 5321/5329/6442 5325/5333/6442 +f 5320/5332/6443 5325/5333/6443 5326/5334/6443 +f 5327/5335/6444 5317/5336/6444 5316/5337/6444 +f 5328/5338/6445 5319/5327/6445 5318/5326/6445 +f 5320/5332/6446 5323/5330/6446 5321/5329/6446 +f 5318/5326/6447 5322/5328/6447 5323/5330/6447 +f 5326/5334/6448 5325/5333/6448 5329/5339/6448 +f 5330/5340/2 5327/5335/2 5316/5337/2 +f 5324/5331/209 5321/5329/209 5322/5328/209 +f 5331/5341/209 5332/5342/209 5333/5343/209 +f 5327/5335/6449 5332/5342/6449 5317/5336/6449 +f 5328/5338/6450 5324/5331/6450 5319/5327/6450 +f 5326/5334/2 5323/5330/2 5320/5332/2 +f 5328/5338/2 5318/5326/2 5323/5330/2 +f 5326/5334/6451 5329/5339/6451 5334/5344/6451 +f 5331/5341/209 5333/5343/209 5335/5345/209 +f 5336/5346/6452 5332/5342/6452 5327/5335/6452 +f 5337/5347/2 5327/5335/2 5330/5340/2 +f 5336/5346/6452 5333/5343/6452 5332/5342/6452 +f 5325/5333/209 5321/5329/209 5324/5331/209 +f 5335/5345/209 5329/5339/209 5331/5341/209 +f 5317/5336/209 5332/5342/209 5331/5341/209 +f 5328/5338/2 5323/5330/2 5326/5334/2 +f 5340/5348/6453 5335/5345/6453 5333/5343/6453 +f 5329/5339/6454 5335/5345/6454 5334/5344/6454 +f 5337/5347/2 5336/5346/2 5327/5335/2 +f 5340/5348/6453 5333/5343/6453 5336/5346/6453 +f 5329/5339/209 5325/5333/209 5331/5341/209 +f 5343/5349/209 5317/5336/209 5331/5341/209 +f 5334/5344/6455 5335/5345/6455 5340/5348/6455 +f 5340/5348/2 5336/5346/2 5337/5347/2 +f 5339/5350/6456 5341/5351/6456 5342/5352/6456 +f 5343/5349/209 5331/5341/209 5345/5353/209 +f 5334/5344/2 5337/5347/2 5326/5334/2 +f 5337/5347/2 5334/5344/2 5340/5348/2 +f 5325/5333/209 5324/5331/209 5331/5341/209 +f 5345/5353/209 5339/5350/209 5342/5352/209 +f 5346/5354/6457 5324/5331/6457 5328/5338/6457 +f 5337/5347/2 5328/5338/2 5326/5334/2 +f 5331/5341/209 5324/5331/209 5347/5355/209 +f 5346/5354/6458 5347/5355/6458 5324/5331/6458 +f 5344/5356/6459 5355/5357/6459 5350/5358/6459 +f 5344/5356/209 5339/5350/209 5345/5353/209 +f 5337/5347/2 5346/5354/2 5328/5338/2 +f 5345/5353/209 5331/5341/209 5352/5359/209 +f 5345/5353/209 5352/5359/209 5353/5360/209 +f 5331/5341/209 5347/5355/209 5352/5359/209 +f 5354/5361/6460 5347/5355/6460 5346/5354/6460 +f 5355/5357/6461 5349/5362/6461 5348/5363/6461 +f 5355/5357/6462 5345/5353/6462 5349/5362/6462 +f 5345/5353/6463 5355/5357/6463 5344/5356/6463 +f 5354/5361/2 5346/5354/2 5337/5347/2 +f 5354/5361/6460 5352/5359/6460 5347/5355/6460 +f 5357/5364/2 5354/5361/2 5337/5347/2 +f 5351/5365/2 5357/5364/2 5337/5347/2 +f 5357/5364/6464 5352/5359/6464 5354/5361/6464 +f 5356/5366/209 5353/5360/209 5358/5367/209 +f 5345/5353/209 5356/5366/209 5349/5362/209 +f 5356/5366/209 5345/5353/209 5353/5360/209 +f 5349/5362/6465 5356/5366/6465 5348/5363/6465 +f 5357/5364/6464 5353/5360/6464 5352/5359/6464 +f 5359/5368/6466 5358/5367/6466 5353/5360/6466 +f 5355/5357/2 5357/5364/2 5351/5365/2 +f 5360/5369/6467 5358/5367/6467 5359/5368/6467 +f 5348/5363/6468 5356/5366/6468 5360/5369/6468 +f 5359/5368/6469 5353/5360/6469 5357/5364/6469 +f 5348/5363/2 5360/5369/2 5355/5357/2 +f 5360/5369/6470 5356/5366/6470 5358/5367/6470 +f 5355/5357/2 5360/5369/2 5357/5364/2 +f 5360/5369/2 5359/5368/2 5357/5364/2 +f 5361/5370/2 5126/5136/2 5229/5135/2 +f 5232/5240/209 5127/5137/209 5363/5140/209 +f 5363/5140/6471 5362/5239/6471 5232/5240/6471 +f 5365/5371/6472 5366/5372/6472 5367/5373/6472 +f 5362/5239/6473 5363/5140/6473 5366/5372/6473 +f 5365/5371/6472 5367/5373/6472 5368/5374/6472 +f 5362/5239/2 5361/5370/2 5229/5135/2 +f 5361/5370/2 5135/5144/2 5126/5136/2 +f 5364/5375/209 5366/5372/209 5363/5140/209 +f 5362/5239/6474 5366/5372/6474 5365/5371/6474 +f 5369/5376/2 5365/5371/2 5368/5374/2 +f 5155/5160/2 5135/5144/2 5361/5370/2 +f 5361/5370/2 5362/5239/2 5365/5371/2 +f 5361/5370/2 5365/5371/2 5369/5376/2 +f 5364/5375/209 5363/5140/209 5136/5145/209 +f 5361/5370/6475 5369/5376/6475 5364/5375/6475 +f 5364/5375/209 5136/5145/209 5372/5377/209 +f 5372/5377/6476 5373/5378/6476 5364/5375/6476 +f 5364/5375/6477 5373/5378/6477 5361/5370/6477 +f 5155/5160/2 5361/5370/2 5373/5378/2 +f 5374/5379/2 5375/5380/2 5376/5381/2 +f 5136/5145/209 5377/5382/209 5372/5377/209 +f 5376/5381/2 5375/5380/2 5378/5383/2 +f 5111/5117/2 5072/5089/2 5109/5119/2 +f 5379/5384/2 5380/5385/2 5381/5386/2 +f 5382/5387/2 5380/5385/2 5379/5384/2 +f 5377/5382/6478 5373/5378/6478 5372/5377/6478 +f 5157/5388/2 5155/5160/2 5373/5378/2 +f 5378/5383/2 5375/5380/2 5383/5389/2 +f 5381/5386/6479 5384/5390/6479 5379/5384/6479 +f 5384/5390/6480 5382/5387/6480 5379/5384/6480 +f 5380/5385/6481 5385/5391/6481 5381/5386/6481 +f 5386/5392/8 5380/5385/8 5382/5387/8 +f 5387/5393/210 5388/5394/210 5389/5395/210 +f 5390/5396/209 5151/5161/209 5371/5078/209 +f 5151/5161/209 5377/5382/209 5136/5145/209 +f 5157/5388/6482 5373/5378/6482 5377/5382/6482 +f 5381/5386/6483 5391/5397/6483 5384/5390/6483 +f 5381/5386/6484 5385/5391/6484 5391/5397/6484 +f 5111/5117/142 5047/5398/142 5064/5072/142 +f 5386/5392/6485 5382/5387/6485 5384/5390/6485 +f 5386/5392/8 5385/5391/8 5380/5385/8 +f 5389/5395/210 5388/5394/210 5392/5399/210 +f 5393/5400/209 5387/5393/209 5389/5395/209 +f 5394/5401/209 5075/5083/209 5371/5078/209 +f 5072/5089/2 5053/5061/2 5054/5075/2 +f 5385/5391/6486 5396/5402/6486 5391/5397/6486 +f 5108/5118/142 5047/5398/142 5111/5117/142 +f 5396/5402/6487 5385/5391/6487 5386/5392/6487 +f 5397/5403/214 5398/5404/214 5399/5405/214 +f 5400/5406/207 5401/5407/207 5398/5404/207 +f 5402/5408/208 5392/5399/208 5401/5407/208 +f 5389/5395/208 5392/5399/208 5402/5408/208 +f 5393/5400/209 5389/5395/209 5403/5409/209 +f 5404/5410/2 5378/5383/2 5383/5389/2 +f 5390/5396/6488 5404/5410/6488 5151/5161/6488 +f 5151/5161/6489 5157/5388/6489 5377/5382/6489 +f 5151/5161/209 5137/5146/209 5139/5148/209 +f 5158/5167/209 5075/5083/209 5394/5401/209 +f 5063/5073/209 5064/5072/209 5405/5411/209 +f 5064/5072/6490 5047/5398/6490 5395/5412/6490 +f 5406/5413/6491 5384/5390/6491 5391/5397/6491 +f 5108/5118/142 5407/5414/142 5047/5398/142 +f 5408/5415/6492 5384/5390/6492 5407/5414/6492 +f 5386/5392/6493 5384/5390/6493 5408/5415/6493 +f 5386/5392/6494 5408/5415/6494 5396/5402/6494 +f 5400/5406/214 5398/5404/214 5397/5403/214 +f 5402/5408/207 5401/5407/207 5400/5406/207 +f 5403/5409/209 5389/5395/209 5402/5408/209 +f 5409/5416/219 5393/5400/219 5403/5409/219 +f 5151/5161/6495 5404/5410/6495 5157/5388/6495 +f 5157/5388/2 5383/5389/2 5155/5160/2 +f 5139/5148/209 5371/5078/209 5151/5161/209 +f 5394/5401/209 5371/5078/209 5410/5417/209 +f 5158/5167/6496 5394/5401/6496 5160/5169/6496 +f 5405/5411/6490 5064/5072/6490 5395/5412/6490 +f 5406/5413/6497 5407/5414/6497 5384/5390/6497 +f 5395/5412/6498 5047/5398/6498 5407/5414/6498 +f 5396/5402/6499 5406/5413/6499 5391/5397/6499 +f 5408/5415/142 5407/5414/142 5108/5118/142 +f 5063/5073/209 5400/5406/209 5397/5403/209 +f 5411/5418/209 5402/5408/209 5400/5406/209 +f 5403/5409/209 5402/5408/209 5411/5418/209 +f 5409/5416/219 5403/5409/219 5412/5419/219 +f 5157/5388/2 5404/5410/2 5383/5389/2 +f 5383/5389/2 5138/5147/2 5155/5160/2 +f 5410/5417/209 5371/5078/209 5413/5420/209 +f 5414/5421/6500 5394/5401/6500 5410/5417/6500 +f 5160/5169/6501 5394/5401/6501 5414/5421/6501 +f 5108/5118/6311 5109/5119/6311 5415/5422/6311 +f 5395/5412/6498 5407/5414/6498 5406/5413/6498 +f 5415/5422/6502 5408/5415/6502 5108/5118/6502 +f 5411/5418/209 5400/5406/209 5063/5073/209 +f 5412/5419/218 5403/5409/218 5411/5418/218 +f 5139/5148/6503 5138/5147/6503 5416/5423/6503 +f 5413/5420/209 5371/5078/209 5139/5148/209 +f 5417/5424/6504 5410/5417/6504 5413/5420/6504 +f 5414/5421/6500 5410/5417/6500 5417/5424/6500 +f 5414/5421/2 5428/5171/2 5160/5169/2 +f 5396/5402/132 5395/5412/132 5406/5413/132 +f 5396/5402/6505 5408/5415/6505 5415/5422/6505 +f 5063/5073/209 5405/5411/209 5411/5418/209 +f 5412/5419/218 5411/5418/218 5418/5425/218 +f 5416/5423/2 5138/5147/2 5383/5389/2 +f 5139/5148/6506 5419/5426/6506 5413/5420/6506 +f 5417/5424/6507 5413/5420/6507 5419/5426/6507 +f 5414/5421/2 5417/5424/2 5428/5171/2 +f 5415/5422/132 5395/5412/132 5396/5402/132 +f 5418/5425/217 5411/5418/217 5405/5411/217 +f 5416/5423/6508 5419/5426/6508 5139/5148/6508 +f 5109/5119/2 5072/5089/2 5418/5425/2 +f 5415/5422/132 5405/5411/132 5395/5412/132 +f 5418/5425/217 5405/5411/217 5109/5119/217 +f 5416/5423/2 5383/5389/2 5419/5426/2 +f 5417/5424/2 5419/5426/2 5428/5171/2 +f 5109/5119/132 5405/5411/132 5415/5422/132 +f 5419/5426/2 5383/5389/2 5428/5171/2 +f 5397/5403/215 5399/5405/215 5420/5427/215 +f 5387/5393/204 5421/5428/204 5388/5394/204 +f 5063/5073/209 5397/5403/209 5420/5427/209 +f 5420/5427/2534 5422/5429/2534 5423/5430/2534 +f 5420/5427/215 5399/5405/215 5422/5429/215 +f 5424/5431/204 5421/5428/204 5387/5393/204 +f 5420/5427/209 5423/5430/209 5063/5073/209 +f 5423/5430/2534 5422/5429/2534 5425/5432/2534 +f 5072/5089/2 5422/5429/2 5399/5405/2 +f 5424/5431/203 5426/5433/203 5421/5428/203 +f 5393/5400/209 5424/5431/209 5387/5393/209 +f 5427/5434/2 5428/5171/2 5426/5433/2 +f 5427/5434/2 5429/5435/2 5428/5171/2 +f 5429/5435/2 5430/5436/2 5428/5171/2 +f 5431/5437/219 5425/5432/219 5430/5436/219 +f 5423/5430/219 5425/5432/219 5431/5437/219 +f 5371/5078/209 5063/5073/209 5423/5430/209 +f 5072/5089/2 5425/5432/2 5422/5429/2 +f 5428/5171/2 5430/5436/2 5425/5432/2 +f 5432/5438/203 5426/5433/203 5424/5431/203 +f 5370/5439/209 5424/5431/209 5393/5400/209 +f 5432/5438/206 5427/5434/206 5426/5433/206 +f 5433/5440/217 5429/5435/217 5427/5434/217 +f 5434/5441/218 5430/5436/218 5429/5435/218 +f 5431/5437/218 5430/5436/218 5434/5441/218 +f 5371/5078/209 5423/5430/209 5431/5437/209 +f 5428/5171/2 5425/5432/2 5072/5089/2 +f 5370/5439/209 5432/5438/209 5424/5431/209 +f 5433/5440/206 5427/5434/206 5432/5438/206 +f 5434/5441/217 5429/5435/217 5433/5440/217 +f 5431/5437/209 5434/5441/209 5371/5078/209 +f 5433/5440/209 5432/5438/209 5370/5439/209 +f 5371/5078/209 5434/5441/209 5433/5440/209 +f 5371/5078/209 5433/5440/209 5370/5439/209 +f 5437/5442/6509 5436/5443/6509 5435/5444/6509 +f 5437/5442/6510 5438/5445/6510 5436/5443/6510 +f 5375/5380/2 5436/5443/2 5438/5445/2 +f 5370/5439/209 5442/5446/209 5439/5447/209 +f 5443/5448/209 5440/5449/209 5441/5450/209 +f 5444/5451/6511 5441/5450/6511 5445/5452/6511 +f 5375/5380/2 5447/5453/2 5383/5389/2 +f 5375/5380/2 5438/5445/2 5448/5454/2 +f 5442/5446/209 5440/5449/209 5443/5448/209 +f 5449/5455/209 5439/5447/209 5442/5446/209 +f 5444/5451/6511 5443/5448/6511 5441/5450/6511 +f 5446/5456/209 5437/5442/209 5439/5447/209 +f 5437/5442/6512 5446/5456/6512 5438/5445/6512 +f 5448/5454/2 5447/5453/2 5375/5380/2 +f 5449/5455/209 5442/5446/209 5443/5448/209 +f 5450/5457/6513 5443/5448/6513 5444/5451/6513 +f 5446/5456/209 5439/5447/209 5449/5455/209 +f 5438/5445/6514 5446/5456/6514 5448/5454/6514 +f 5450/5457/6513 5449/5455/6513 5443/5448/6513 +f 5448/5454/6515 5446/5456/6515 5449/5455/6515 +f 5448/5454/6515 5449/5455/6515 5450/5457/6515 +f 5196/5202/2534 5197/5203/2534 5199/5206/2534 +f 5195/5201/2534 5197/5203/2534 5196/5202/2534 +f 5193/5199/2 5452/5458/2 5177/5191/2 +f 5195/5201/215 5193/5199/215 5197/5203/215 +f 5194/5200/215 5193/5199/215 5195/5201/215 +f 5194/5200/214 5453/5459/214 5193/5199/214 +f 5454/5460/209 5194/5200/209 4968/4971/209 +f 5454/5460/214 5453/5459/214 5194/5200/214 +f 5455/5461/209 5454/5460/209 4968/4971/209 +f 5453/5459/2 5452/5458/2 5193/5199/2 +f 5454/5460/207 5457/5462/207 5453/5459/207 +f 5455/5461/207 5457/5462/207 5454/5460/207 +f 5456/5463/209 5455/5461/209 4968/4971/209 +f 5457/5462/2 5452/5458/2 5453/5459/2 +f 5455/5461/208 5459/5464/208 5457/5462/208 +f 5451/5465/6516 5456/5463/6516 4968/4971/6516 +f 5457/5462/2 5459/5464/2 5452/5458/2 +f 5456/5463/208 5459/5464/208 5455/5461/208 +f 5201/5208/209 5451/5465/209 5484/5205/209 +f 5456/5463/210 5460/5466/210 5459/5464/210 +f 5458/5215/2 5469/5467/2 5452/5458/2 +f 5460/5466/2 5452/5458/2 5459/5464/2 +f 5201/5208/204 5461/5468/204 5451/5465/204 +f 5451/5465/210 5460/5466/210 5456/5463/210 +f 5201/5208/203 5205/5211/203 5461/5468/203 +f 5460/5466/2 5458/5215/2 5452/5458/2 +f 5451/5465/204 5461/5468/204 5460/5466/204 +f 4978/4983/6517 5462/5469/6517 5458/5215/6517 +f 5205/5211/2 5458/5215/2 5461/5468/2 +f 5461/5468/2 5458/5215/2 5460/5466/2 +f 5463/5470/6518 5464/5471/6518 5465/5299/6518 +f 5463/5470/209 5287/5296/209 5464/5471/209 +f 5465/5299/6519 5464/5471/6519 5466/5472/6519 +f 5463/5470/209 5467/5473/209 5287/5296/209 +f 5287/5296/209 5179/5186/209 5187/5195/209 +f 5463/5470/6406 5465/5299/6406 5467/5473/6406 +f 5277/5286/209 5279/5291/209 5287/5296/209 +f 5264/5284/2 5465/5299/2 5466/5472/2 +f 5287/5296/209 5467/5473/209 5179/5186/209 +f 5467/5473/6404 5465/5299/6404 5186/5194/6404 +f 5287/5296/209 5279/5291/209 5464/5471/209 +f 5271/5277/6520 5472/5474/6520 5470/5475/6520 +f 5468/5476/6521 5472/5474/6521 5469/5467/6521 +f 5451/5465/209 5470/5475/209 5468/5476/209 +f 5272/5278/6522 5472/5474/6522 5271/5277/6522 +f 5186/5194/2 5465/5299/2 5117/5127/2 +f 5271/5277/209 5470/5475/209 5274/5281/209 +f 5464/5471/209 5279/5291/209 5471/5477/209 +f 5471/5477/6362 5466/5472/6362 5464/5471/6362 +f 5470/5475/6523 5472/5474/6523 5468/5476/6523 +f 5264/5284/2 5466/5472/2 5472/5474/2 +f 5179/5186/209 5467/5473/209 5473/5478/209 +f 5274/5281/209 5470/5475/209 5451/5465/209 +f 5471/5477/6524 5474/5479/6524 5466/5472/6524 +f 5467/5473/6520 5475/5480/6520 5473/5478/6520 +f 5179/5186/209 5473/5478/209 4968/4971/209 +f 5186/5194/6522 5475/5480/6522 5467/5473/6522 +f 5274/5281/209 5451/5465/209 5279/5291/209 +f 5476/5481/6525 5474/5479/6525 5471/5477/6525 +f 5472/5474/2 5466/5472/2 5474/5479/2 +f 5264/5284/2 5472/5474/2 5272/5278/2 +f 5476/5481/209 5471/5477/209 5279/5291/209 +f 5477/5482/6526 5474/5479/6526 5476/5481/6526 +f 4968/4971/209 5473/5478/209 5478/5483/209 +f 5279/5291/209 5451/5465/209 5476/5481/209 +f 5472/5474/2 5474/5479/2 5477/5482/2 +f 5473/5478/6476 5475/5480/6476 5478/5483/6476 +f 5451/5465/209 4968/4971/209 5478/5483/209 +f 5475/5480/2 5186/5194/2 5177/5191/2 +f 5476/5481/209 5451/5465/209 5479/5484/209 +f 5478/5483/6477 5475/5480/6477 5480/5485/6477 +f 5475/5480/2 5177/5191/2 5480/5485/2 +f 5479/5484/6527 5452/5458/6527 5476/5481/6527 +f 5476/5481/6528 5452/5458/6528 5477/5482/6528 +f 5472/5474/2 5477/5482/2 5452/5458/2 +f 5479/5484/209 5451/5465/209 5478/5483/209 +f 5480/5485/2 5177/5191/2 5452/5458/2 +f 5478/5483/6529 5452/5458/6529 5479/5484/6529 +f 5480/5485/6530 5452/5458/6530 5478/5483/6530 +f 5481/5486/6531 5482/5487/6531 5483/5488/6531 +f 5483/5488/209 5482/5487/209 4982/4987/209 +f 4982/4987/209 5482/5487/209 5484/5205/209 +f 5484/5205/209 5482/5487/209 5485/5489/209 +f 5484/5205/209 5485/5489/209 5486/5490/209 +f 5487/5491/6532 5486/5490/6532 5485/5489/6532 +f 5488/5492/6533 5486/5490/6533 5487/5491/6533 +f 5489/5493/6534 5486/5490/6534 5488/5492/6534 +f 5458/5215/2 5488/5492/2 5487/5491/2 +f 5486/5490/209 5490/5494/209 5484/5205/209 +f 5489/5493/6535 5490/5494/6535 5486/5490/6535 +f 5458/5215/2 5489/5493/2 5488/5492/2 +f 5490/5494/209 5492/5495/209 5484/5205/209 +f 5484/5205/209 4980/4986/209 4969/4972/209 +f 5492/5495/209 5491/5496/209 4980/4986/209 +f 5489/5493/6536 5492/5495/6536 5490/5494/6536 +f 5484/5205/209 5492/5495/209 4980/4986/209 +f 5462/5469/2 5489/5493/2 5458/5215/2 +f 5462/5469/6537 5492/5495/6537 5489/5493/6537 +f 5493/5497/6538 4978/4983/6538 5494/5498/6538 +f 5493/5497/6539 5462/5469/6539 4978/4983/6539 +f 5259/5268/6400 5266/5272/6400 5256/5265/6400 +f 5270/5280/6540 5276/5282/6540 5275/5285/6540 +f 5256/5265/209 5266/5272/209 5276/5282/209 +f 5270/5280/6540 5495/5499/6540 5276/5282/6540 +f 5262/5269/6541 5495/5499/6541 5270/5280/6541 +f 5256/5265/209 5276/5282/209 5495/5499/209 +f 5262/5269/6542 5498/5500/6542 5495/5499/6542 +f 5496/5501/209 5500/5502/209 5497/5503/209 +f 5495/5499/209 5498/5500/209 5256/5265/209 +f 5497/5503/6543 5500/5502/6543 5499/5504/6543 +f 5501/5505/209 5500/5502/209 5496/5501/209 +f 5501/5505/209 5496/5501/209 5256/5265/209 +f 5499/5504/6544 5500/5502/6544 5502/5506/6544 +f 5502/5506/6545 5500/5502/6545 5501/5505/6545 +f 5256/5265/209 5498/5500/209 5503/5507/209 +f 5263/5270/6546 5498/5500/6546 5262/5269/6546 +f 5256/5265/209 5503/5507/209 5501/5505/209 +f 5502/5506/2 5504/5508/2 5499/5504/2 +f 5502/5506/6545 5501/5505/6545 5505/5509/6545 +f 5263/5270/6547 5503/5507/6547 5498/5500/6547 +f 5505/5509/6548 5501/5505/6548 5503/5507/6548 +f 5258/5267/2 5504/5508/2 5259/5268/2 +f 5505/5509/2 5504/5508/2 5502/5506/2 +f 5505/5509/6548 5503/5507/6548 5263/5270/6548 +f 5505/5509/2 5259/5268/2 5504/5508/2 +f 5263/5270/2 5259/5268/2 5505/5509/2 +f 5510/5510/6549 5497/5503/6549 5499/5504/6549 +f 5511/5511/6293 5507/5512/6293 5506/5513/6293 +f 5496/5501/209 5506/5513/209 5508/5514/209 +f 5512/5515/6550 5246/5260/6550 5245/5262/6550 +f 5246/5260/209 5513/5516/209 5247/5254/209 +f 5512/5515/6551 5513/5516/6551 5246/5260/6551 +f 5247/5254/209 5514/5517/209 5515/5518/209 +f 5510/5510/6552 5518/5519/6552 5497/5503/6552 +f 5496/5501/209 5511/5511/209 5506/5513/209 +f 5515/5518/6553 5519/5520/6553 5247/5254/6553 +f 5247/5254/6554 5519/5520/6554 5250/5257/6554 +f 5250/5257/2 5512/5515/2 5245/5262/2 +f 5247/5254/209 5513/5516/209 5514/5517/209 +f 5520/5521/6555 5513/5516/6555 5512/5515/6555 +f 5515/5518/209 5514/5517/209 5516/5522/209 +f 5515/5518/209 5516/5522/209 5521/5523/209 +f 5522/5524/209 5509/5525/209 5517/5526/209 +f 5282/5294/6556 5278/5287/6556 5280/5288/6556 +f 5497/5503/209 5518/5519/209 5496/5501/209 +f 5510/5510/2 5499/5504/2 5504/5508/2 +f 5523/5527/209 5524/5528/209 5522/5524/209 +f 5525/5529/6557 5521/5523/6557 5526/5530/6557 +f 5519/5520/6558 5515/5518/6558 5521/5523/6558 +f 5519/5520/2 5520/5521/2 5250/5257/2 +f 5250/5257/2 5520/5521/2 5512/5515/2 +f 5520/5521/6559 5514/5517/6559 5513/5516/6559 +f 5521/5523/209 5516/5522/209 5527/5531/209 +f 5521/5523/209 5527/5531/209 5526/5530/209 +f 5528/5532/209 5260/5274/209 5269/5283/209 +f 5282/5294/6556 5269/5283/6556 5278/5287/6556 +f 5529/5533/6560 5526/5530/6560 5530/5534/6560 +f 5496/5501/209 5518/5519/209 5531/5535/209 +f 5518/5519/6561 5532/5536/6561 5531/5535/6561 +f 5510/5510/6562 5532/5536/6562 5518/5519/6562 +f 5496/5501/209 5533/5537/209 5511/5511/209 +f 5525/5529/6557 5526/5530/6557 5529/5533/6557 +f 5519/5520/6558 5521/5523/6558 5525/5529/6558 +f 5520/5521/6563 5516/5522/6563 5514/5517/6563 +f 5527/5531/209 5530/5534/209 5526/5530/209 +f 5528/5532/209 5535/5538/209 5260/5274/209 +f 5535/5538/6564 5536/5539/6564 5260/5274/6564 +f 5260/5274/6565 5536/5539/6565 5261/5275/6565 +f 5537/5540/2 5264/5284/2 5261/5275/2 +f 5269/5283/6566 5282/5294/6566 5528/5532/6566 +f 5529/5533/6560 5530/5534/6560 5538/5541/6560 +f 5538/5541/6567 5530/5534/6567 5528/5532/6567 +f 5510/5510/2 5504/5508/2 5532/5536/2 +f 5496/5501/209 5527/5531/209 5533/5537/209 +f 5533/5537/6287 5539/5542/6287 5511/5511/6287 +f 5511/5511/6568 5539/5542/6568 5534/5543/6568 +f 5541/5544/6569 5524/5528/6569 5523/5527/6569 +f 5542/5545/2 5525/5529/2 5529/5533/2 +f 5520/5521/2 5519/5520/2 5525/5529/2 +f 5543/5546/6570 5516/5522/6570 5520/5521/6570 +f 5522/5524/209 5540/5547/209 5523/5527/209 +f 5527/5531/209 5516/5522/209 5540/5547/209 +f 5527/5531/209 5528/5532/209 5530/5534/209 +f 5537/5540/2 5261/5275/2 5536/5539/2 +f 5282/5294/2 5264/5284/2 5537/5540/2 +f 5528/5532/6566 5282/5294/6566 5537/5540/6566 +f 5542/5545/2 5529/5533/2 5538/5541/2 +f 5538/5541/6567 5528/5532/6567 5537/5540/6567 +f 5531/5535/209 5544/5548/209 5496/5501/209 +f 5545/5549/6571 5531/5535/6571 5532/5536/6571 +f 5496/5501/209 5544/5548/209 5527/5531/209 +f 5534/5543/2 5539/5542/2 5504/5508/2 +f 5541/5544/6569 5523/5527/6569 5546/5550/6569 +f 5628/5551/2 5547/5552/2 5541/5544/2 +f 5520/5521/2 5525/5529/2 5542/5545/2 +f 5527/5531/209 5540/5547/209 5522/5524/209 +f 5537/5540/2 5542/5545/2 5538/5541/2 +f 5545/5549/6572 5544/5548/6572 5531/5535/6572 +f 5504/5508/2 5545/5549/2 5532/5536/2 +f 5544/5548/209 5548/5553/209 5527/5531/209 +f 5527/5531/6285 5539/5542/6285 5533/5537/6285 +f 5546/5550/6573 5523/5527/6573 5540/5547/6573 +f 5628/5551/2 5541/5544/2 5546/5550/2 +f 5543/5546/2 5520/5521/2 5542/5545/2 +f 5549/5554/6574 5540/5547/6574 5516/5522/6574 +f 5551/5555/209 5528/5532/209 5527/5531/209 +f 5535/5538/209 5528/5532/209 5551/5555/209 +f 5527/5531/209 5548/5553/209 5552/5556/209 +f 5553/5557/6575 5544/5548/6575 5545/5549/6575 +f 5559/5558/2 5545/5549/2 5504/5508/2 +f 5553/5557/6575 5548/5553/6575 5544/5548/6575 +f 5559/5558/6576 5539/5542/6576 5527/5531/6576 +f 5504/5508/2 5539/5542/2 5559/5558/2 +f 5546/5550/6573 5540/5547/6573 5549/5554/6573 +f 5549/5554/6577 5516/5522/6577 5543/5546/6577 +f 5551/5555/209 5527/5531/209 5550/5559/209 +f 5551/5555/6578 5554/5560/6578 5535/5538/6578 +f 5535/5538/6579 5554/5560/6579 5536/5539/6579 +f 5537/5540/2 5536/5539/2 5542/5545/2 +f 5555/5561/6580 5552/5556/6580 5548/5553/6580 +f 5559/5558/2 5553/5557/2 5545/5549/2 +f 5555/5561/6581 5548/5553/6581 5553/5557/6581 +f 5543/5546/2 5542/5545/2 5549/5554/2 +f 5552/5556/209 5556/5562/209 5527/5531/209 +f 5527/5531/209 5556/5562/209 5550/5559/209 +f 5554/5560/6582 5551/5555/6582 5550/5559/6582 +f 5542/5545/2 5536/5539/2 5554/5560/2 +f 5555/5561/2 5553/5557/2 5559/5558/2 +f 5557/5563/6583 5556/5562/6583 5552/5556/6583 +f 5558/5564/6584 5550/5559/6584 5556/5562/6584 +f 5554/5560/6582 5550/5559/6582 5558/5564/6582 +f 5542/5545/2 5554/5560/2 5559/5558/2 +f 5557/5563/6585 5552/5556/6585 5555/5561/6585 +f 5559/5558/2 5549/5554/2 5542/5545/2 +f 5558/5564/6584 5556/5562/6584 5557/5563/6584 +f 5559/5558/2 5554/5560/2 5558/5564/2 +f 5559/5558/2 5557/5563/2 5555/5561/2 +f 5559/5558/2 5546/5550/2 5549/5554/2 +f 5559/5558/2 5558/5564/2 5557/5563/2 +f 4983/4988/209 4982/4987/209 5484/5205/209 +f 5560/5565/6297 5561/5566/6297 5562/5567/6297 +f 5564/5568/209 5509/5525/209 5565/5569/209 +f 5517/5526/209 5509/5525/209 5564/5568/209 +f 5522/5524/209 5560/5565/209 5563/5570/209 +f 5566/5571/6586 5564/5568/6586 5565/5569/6586 +f 5522/5524/209 5567/5572/209 5560/5565/209 +f 5568/5573/6587 5564/5568/6587 5566/5571/6587 +f 5517/5526/209 5569/5574/209 5522/5524/209 +f 5571/5575/209 5569/5574/209 5517/5526/209 +f 5568/5573/6587 5517/5526/6587 5564/5568/6587 +f 5546/5550/2 5572/5576/2 5628/5551/2 +f 5567/5572/6568 5573/5577/6568 5570/5578/6568 +f 5522/5524/209 5569/5574/209 5567/5572/209 +f 5574/5579/6588 5571/5575/6588 5517/5526/6588 +f 5569/5574/6589 5571/5575/6589 5573/5577/6589 +f 5574/5579/6588 5517/5526/6588 5568/5573/6588 +f 5568/5573/2 5572/5576/2 5546/5550/2 +f 5569/5574/6287 5573/5577/6287 5567/5572/6287 +f 5573/5577/6590 5571/5575/6590 5574/5579/6590 +f 5546/5550/2 5574/5579/2 5568/5573/2 +f 5546/5550/2 5573/5577/2 5574/5579/2 +f 5390/5396/6591 5378/5383/6591 5404/5410/6591 +f 5439/5447/209 5371/5078/209 5370/5439/209 +f 5350/5358/6592 5339/5350/6592 5344/5356/6592 +f 5338/5580/6593 5339/5350/6593 5350/5358/6593 +f 5441/5450/209 5440/5449/209 5575/5581/209 +f 5437/5442/209 5435/5444/209 5439/5447/209 +f 5680/5582/209 5576/5583/209 5442/5446/209 +f 5577/5584/6594 5578/5585/6594 5579/5586/6594 +f 5575/5581/6595 5445/5452/6595 5441/5450/6595 +f 5435/5444/209 5371/5078/209 5439/5447/209 +f 5581/5587/6596 5576/5583/6596 5582/5588/6596 +f 5442/5446/209 5576/5583/209 5581/5587/209 +f 5579/5586/209 5578/5585/209 5583/5589/209 +f 5584/5590/6597 5578/5585/6597 5577/5584/6597 +f 5577/5584/6598 5579/5586/6598 5585/5591/6598 +f 5586/5592/209 5575/5581/209 5440/5449/209 +f 5587/5593/6599 5445/5452/6599 5575/5581/6599 +f 5444/5451/2 5445/5452/2 5580/5594/2 +f 5582/5588/6600 5576/5583/6600 5588/5595/6600 +f 5338/5580/6601 5341/5351/6601 5339/5350/6601 +f 5355/5357/2 5338/5580/2 5350/5358/2 +f 5584/5590/6597 5583/5589/6597 5578/5585/6597 +f 5585/5591/2 5584/5590/2 5577/5584/2 +f 5589/5596/209 5590/5597/209 5583/5589/209 +f 5591/5598/209 5586/5592/209 5440/5449/209 +f 5586/5592/6602 5587/5593/6602 5575/5581/6602 +f 5580/5594/2 5445/5452/2 5587/5593/2 +f 5666/5599/2 5582/5588/2 5588/5595/2 +f 5666/5599/2 5588/5595/2 5746/5600/2 +f 5355/5357/2 5341/5351/2 5338/5580/2 +f 5583/5589/209 5590/5597/209 5579/5586/209 +f 5592/5601/112 5583/5589/112 5584/5590/112 +f 5589/5596/6603 5583/5589/6603 5592/5601/6603 +f 5440/5449/209 5593/5602/209 5591/5598/209 +f 5591/5598/6604 5594/5603/6604 5586/5592/6604 +f 5586/5592/6605 5594/5603/6605 5587/5593/6605 +f 5435/5444/209 5595/5604/209 5596/5605/209 +f 5596/5605/209 5590/5597/209 5589/5596/209 +f 5442/5446/209 5597/5606/209 5593/5602/209 +f 5442/5446/209 5598/5607/209 5597/5606/209 +f 5581/5587/6359 5582/5588/6359 5599/5608/6359 +f 5581/5587/6356 5599/5608/6356 5600/5609/6356 +f 5601/5610/6606 5342/5352/6606 5341/5351/6606 +f 5590/5597/6607 5585/5591/6607 5579/5586/6607 +f 5585/5591/2 5592/5601/2 5584/5590/2 +f 5602/5611/6608 5594/5603/6608 5591/5598/6608 +f 5580/5594/2 5587/5593/2 5594/5603/2 +f 5597/5606/6609 5598/5607/6609 5603/5612/6609 +f 5390/5396/209 5371/5078/209 5435/5444/209 +f 5595/5604/209 5590/5597/209 5596/5605/209 +f 5593/5602/209 5596/5605/209 5589/5596/209 +f 5666/5599/2 5599/5608/2 5582/5588/2 +f 5442/5446/209 5581/5587/209 5600/5609/209 +f 5355/5357/2 5601/5610/2 5341/5351/2 +f 5601/5610/6610 5604/5613/6610 5342/5352/6610 +f 5605/5614/6611 5585/5591/6611 5590/5597/6611 +f 5593/5602/209 5589/5596/209 5591/5598/209 +f 5606/5615/2 5594/5603/2 5602/5611/2 +f 5603/5612/6612 5598/5607/6612 5607/5616/6612 +f 5390/5396/6613 5376/5381/6613 5378/5383/6613 +f 5435/5444/209 5608/5617/209 5390/5396/209 +f 5435/5444/6478 5609/5618/6478 5595/5604/6478 +f 5595/5604/6476 5609/5618/6476 5590/5597/6476 +f 5364/5375/209 5367/5373/209 5366/5372/209 +f 5596/5605/209 5608/5617/209 5435/5444/209 +f 5597/5606/6614 5603/5612/6614 5593/5602/6614 +f 5351/5365/2 5601/5610/2 5355/5357/2 +f 5345/5353/209 5342/5352/209 5604/5613/209 +f 5351/5365/6615 5604/5613/6615 5601/5610/6615 +f 5585/5591/2 5605/5614/2 5592/5601/2 +f 5590/5597/6477 5609/5618/6477 5605/5614/6477 +f 5589/5596/6616 5602/5611/6616 5591/5598/6616 +f 5580/5594/2 5594/5603/2 5606/5615/2 +f 5580/5594/2 5607/5616/2 5666/5599/2 +f 5580/5594/2 5603/5612/2 5607/5616/2 +f 5611/5619/209 5612/5620/209 5367/5373/209 +f 5608/5617/6617 5376/5381/6617 5390/5396/6617 +f 5436/5443/6482 5609/5618/6482 5435/5444/6482 +f 5611/5619/209 5367/5373/209 5364/5375/209 +f 5593/5602/6618 5603/5612/6618 5613/5621/6618 +f 5610/5622/209 5615/5623/209 5442/5446/209 +f 5598/5607/209 5442/5446/209 5615/5623/209 +f 5598/5607/6619 5616/5624/6619 5607/5616/6619 +f 5617/5625/6254 5600/5609/6254 5599/5608/6254 +f 5610/5622/209 5442/5446/209 5600/5609/209 +f 5604/5613/209 5618/5626/209 5345/5353/209 +f 5351/5365/6615 5618/5626/6615 5604/5613/6615 +f 5374/5379/2 5605/5614/2 5609/5618/2 +f 5589/5596/6620 5592/5601/6620 5602/5611/6620 +f 5368/5374/6621 5367/5373/6621 5612/5620/6621 +f 5436/5443/2 5375/5380/2 5609/5618/2 +f 5364/5375/6622 5369/5376/6622 5611/5619/6622 +f 5608/5617/6330 5596/5605/6330 5376/5381/6330 +f 5613/5621/2 5603/5612/2 5606/5615/2 +f 5614/5627/6623 5593/5602/6623 5620/5628/6623 +f 5611/5619/209 5596/5605/209 5593/5602/209 +f 5615/5623/6624 5616/5624/6624 5598/5607/6624 +f 5666/5599/2 5617/5625/2 5599/5608/2 +f 5616/5624/2 5666/5599/2 5607/5616/2 +f 5610/5622/6255 5600/5609/6255 5617/5625/6255 +f 5345/5353/209 5618/5626/209 5622/5629/209 +f 5621/5630/6625 5618/5626/6625 5351/5365/6625 +f 5345/5353/209 5622/5629/209 5343/5349/209 +f 5623/5631/209 5619/5632/209 5611/5619/209 +f 5374/5379/2 5592/5601/2 5605/5614/2 +f 5606/5615/2 5602/5611/2 5592/5601/2 +f 5606/5615/2 5603/5612/2 5580/5594/2 +f 5611/5619/209 5619/5632/209 5612/5620/209 +f 5368/5374/6626 5612/5620/6626 5624/5633/6626 +f 5374/5379/2 5609/5618/2 5375/5380/2 +f 5376/5381/6334 5596/5605/6334 5374/5379/6334 +f 5620/5628/6627 5593/5602/6627 5613/5621/6627 +f 5614/5627/209 5611/5619/209 5593/5602/209 +f 5509/5525/209 5626/5634/209 5610/5622/209 +f 5570/5578/2 5573/5577/2 5546/5550/2 +f 5610/5622/209 5627/5635/209 5615/5623/209 +f 5627/5635/6628 5616/5624/6628 5615/5623/6628 +f 5628/5551/2 5666/5599/2 5616/5624/2 +f 5566/5571/6586 5565/5569/6586 5572/5576/6586 +f 5568/5573/2 5566/5571/2 5572/5576/2 +f 5351/5365/2 5337/5347/2 5621/5630/2 +f 5621/5630/6629 5622/5629/6629 5618/5626/6629 +f 5611/5619/209 5629/5636/209 5623/5631/209 +f 5630/5637/6630 5619/5632/6630 5623/5631/6630 +f 5606/5615/2 5592/5601/2 5374/5379/2 +f 5619/5632/6631 5630/5637/6631 5612/5620/6631 +f 5369/5376/2 5368/5374/2 5624/5633/2 +f 5611/5619/6337 5374/5379/6337 5596/5605/6337 +f 5343/5349/209 5622/5629/209 5629/5636/209 +f 5611/5619/209 5625/5638/209 5629/5636/209 +f 5343/5349/209 5631/5639/209 5317/5336/209 +f 5606/5615/2 5620/5628/2 5613/5621/2 +f 5614/5627/6632 5620/5628/6632 5632/5640/6632 +f 5632/5640/209 5611/5619/209 5614/5627/209 +f 5634/5641/6633 5616/5624/6633 5627/5635/6633 +f 5626/5634/209 5627/5635/209 5610/5622/209 +f 5610/5622/6632 5617/5625/6632 5509/5525/6632 +f 5628/5551/2 5617/5625/2 5666/5599/2 +f 5509/5525/6634 5572/5576/6634 5565/5569/6634 +f 5316/5337/6635 5317/5336/6635 5631/5639/6635 +f 5621/5630/2 5337/5347/2 5330/5340/2 +f 5330/5340/6636 5629/5636/6636 5622/5629/6636 +f 5635/5642/6637 5623/5631/6637 5629/5636/6637 +f 5630/5637/6630 5623/5631/6630 5635/5642/6630 +f 5612/5620/6638 5630/5637/6638 5624/5633/6638 +f 5611/5619/6338 5369/5376/6338 5374/5379/6338 +f 5625/5638/209 5343/5349/209 5629/5636/209 +f 5626/5634/209 5625/5638/209 5611/5619/209 +f 5343/5349/209 5636/5643/209 5631/5639/209 +f 5611/5619/209 5632/5640/209 5626/5634/209 +f 5632/5640/6639 5620/5628/6639 5637/5644/6639 +f 5616/5624/2 5634/5641/2 5628/5551/2 +f 5626/5634/6640 5634/5641/6640 5627/5635/6640 +f 5509/5525/6639 5617/5625/6639 5638/5645/6639 +f 5638/5645/6641 5572/5576/6641 5509/5525/6641 +f 5639/5646/6642 5631/5639/6642 5636/5643/6642 +f 5316/5337/6643 5631/5639/6643 5639/5646/6643 +f 5330/5340/6644 5622/5629/6644 5621/5630/6644 +f 5635/5642/6637 5629/5636/6637 5330/5340/6637 +f 5369/5376/2 5630/5637/2 5635/5642/2 +f 5369/5376/2 5624/5633/2 5630/5637/2 +f 5625/5638/209 5636/5643/209 5343/5349/209 +f 5509/5525/209 5522/5524/209 5626/5634/209 +f 5620/5628/2 5606/5615/2 5637/5644/2 +f 5626/5634/6645 5640/5647/6645 5634/5641/6645 +f 5628/5551/2 5638/5645/2 5617/5625/2 +f 5628/5551/2 5572/5576/2 5638/5645/2 +f 5639/5646/6642 5636/5643/6642 5641/5648/6642 +f 5316/5337/2 5639/5646/2 5330/5340/2 +f 5635/5642/2 5330/5340/2 5369/5376/2 +f 5374/5379/2 5637/5644/2 5606/5615/2 +f 5641/5648/6646 5636/5643/6646 5625/5638/6646 +f 5522/5524/209 5524/5528/209 5626/5634/209 +f 5625/5638/209 5626/5634/209 5642/5649/209 +f 5632/5640/6647 5640/5647/6647 5626/5634/6647 +f 5628/5551/2 5634/5641/2 5640/5647/2 +f 5639/5646/2 5641/5648/2 5330/5340/2 +f 5369/5376/2 5637/5644/2 5374/5379/2 +f 5641/5648/6648 5625/5638/6648 5643/5650/6648 +f 5524/5528/209 5644/5651/209 5626/5634/209 +f 5547/5552/6649 5524/5528/6649 5541/5544/6649 +f 5626/5634/209 5644/5651/209 5642/5649/209 +f 5637/5644/6650 5640/5647/6650 5632/5640/6650 +f 5330/5340/2 5641/5648/2 5643/5650/2 +f 5369/5376/2 5330/5340/2 5643/5650/2 +f 5369/5376/2 5643/5650/2 5637/5644/2 +f 5547/5552/6649 5644/5651/6649 5524/5528/6649 +f 5645/5652/6651 5642/5649/6651 5644/5651/6651 +f 5642/5649/6652 5645/5652/6652 5625/5638/6652 +f 5628/5551/2 5640/5647/2 5637/5644/2 +f 5645/5652/6651 5644/5651/6651 5547/5552/6651 +f 5625/5638/6653 5645/5652/6653 5643/5650/6653 +f 5637/5644/2 5643/5650/2 5628/5551/2 +f 5547/5552/2 5628/5551/2 5645/5652/2 +f 5645/5652/2 5628/5551/2 5643/5650/2 +f 5072/5089/2 5399/5405/2 5398/5404/2 +f 5072/5089/2 5398/5404/2 5418/5425/2 +f 5418/5425/2 5398/5404/2 5401/5407/2 +f 5418/5425/2 5401/5407/2 5412/5419/2 +f 5412/5419/2 5401/5407/2 5392/5399/2 +f 5426/5433/2 5428/5171/2 5646/4998/2 +f 5646/4998/2 5421/5428/2 5426/5433/2 +f 5412/5419/2 5392/5399/2 5409/5416/2 +f 5646/4998/2 5428/5171/2 5383/5389/2 +f 5646/4998/2 5388/5394/2 5421/5428/2 +f 5409/5416/2 5392/5399/2 5388/5394/2 +f 5646/4998/2 5383/5389/2 5447/5453/2 +f 4988/4993/6247 5370/5439/6247 5393/5400/6247 +f 5409/5416/2 5388/5394/2 5646/4998/2 +f 5450/5457/2 5447/5453/2 5448/5454/2 +f 5450/5457/2 5444/5451/2 5580/5594/2 +f 5409/5416/212 4988/4993/212 5393/5400/212 +f 4992/4997/6246 5409/5416/6246 5646/4998/6246 +f 5580/5594/2 5447/5453/2 5450/5457/2 +f 4992/4997/212 4988/4993/212 5409/5416/212 +f 5646/4998/2 5447/5453/2 5580/5594/2 +f 4992/4997/212 4986/4991/212 4988/4993/212 +f 4989/4996/212 4986/4991/212 4992/4997/212 +f 4998/5005/209 4993/5000/209 5647/5653/209 +f 5648/5654/209 5649/5655/209 5370/5439/209 +f 4988/4993/6247 4993/5000/6247 5370/5439/6247 +f 5648/5654/209 5370/5439/209 5650/5656/209 +f 5648/5654/210 5651/5657/210 5652/5658/210 +f 5648/5654/208 5652/5658/208 5649/5655/208 +f 5370/5439/209 5649/5655/209 5442/5446/209 +f 5650/5656/209 5370/5439/209 4993/5000/209 +f 5650/5656/210 5651/5657/210 5648/5654/210 +f 5654/5659/209 4993/5000/209 4998/5005/209 +f 5649/5655/207 5655/5660/207 5656/5661/207 +f 5646/4998/2 5652/5658/2 5651/5657/2 +f 5649/5655/208 5652/5658/208 5655/5660/208 +f 5656/5661/209 5442/5446/209 5649/5655/209 +f 5666/5599/2 5746/5600/2 5653/5662/2 +f 5650/5656/209 4993/5000/209 5657/5663/209 +f 5657/5663/204 5658/5664/204 5650/5656/204 +f 5650/5656/204 5658/5664/204 5651/5657/204 +f 5646/4998/2 5651/5657/2 4997/4999/2 +f 5656/5661/207 5655/5660/207 5660/5665/207 +f 5655/5660/2 5652/5658/2 5646/4998/2 +f 5656/5661/209 5661/5666/209 5442/5446/209 +f 5657/5663/209 4993/5000/209 5663/5667/209 +f 5657/5663/203 5664/5668/203 5658/5664/203 +f 4997/4999/2 5651/5657/2 5658/5664/2 +f 5659/5669/209 4993/5000/209 5654/5659/209 +f 5656/5661/214 5660/5665/214 5661/5666/214 +f 5646/4998/2 5660/5665/2 5655/5660/2 +f 5661/5666/209 5665/5670/209 5442/5446/209 +f 5666/5599/2 5653/5662/2 5662/5671/2 +f 5667/5672/209 5663/5667/209 4993/5000/209 +f 5663/5667/203 5664/5668/203 5657/5663/203 +f 5658/5664/2 5664/5668/2 4997/4999/2 +f 5659/5669/209 5667/5672/209 4993/5000/209 +f 5661/5666/215 5668/5673/215 5665/5670/215 +f 5661/5666/214 5660/5665/214 5668/5673/214 +f 5646/4998/2 5666/5599/2 5660/5665/2 +f 5442/5446/209 5665/5670/209 5669/5674/209 +f 5646/4998/2 5580/5594/2 5666/5599/2 +f 5670/5675/2 5662/5671/2 5671/5676/2 +f 5667/5672/206 5672/5677/206 5663/5667/206 +f 5663/5667/206 5672/5677/206 5664/5668/206 +f 4997/4999/2 5664/5668/2 5670/5675/2 +f 5442/5446/209 5669/5674/209 5659/5669/209 +f 5673/5678/209 5667/5672/209 5659/5669/209 +f 5665/5670/215 5668/5673/215 5674/5679/215 +f 5666/5599/2 5668/5673/2 5660/5665/2 +f 5665/5670/2534 5674/5679/2534 5669/5674/2534 +f 5666/5599/2 5662/5671/2 5670/5675/2 +f 5673/5678/217 5675/5680/217 5667/5672/217 +f 5667/5672/217 5675/5680/217 5672/5677/217 +f 5664/5668/2 5672/5677/2 5670/5675/2 +f 5659/5669/209 5669/5674/209 5676/5681/209 +f 5659/5669/209 5676/5681/209 5673/5678/209 +f 5666/5599/2 5674/5679/2 5668/5673/2 +f 5669/5674/2534 5674/5679/2534 5677/5682/2534 +f 5673/5678/218 5678/5683/218 5675/5680/218 +f 5670/5675/2 5672/5677/2 5675/5680/2 +f 5669/5674/219 5677/5682/219 5676/5681/219 +f 5676/5681/218 5678/5683/218 5673/5678/218 +f 5677/5682/2 5674/5679/2 5666/5599/2 +f 5670/5675/2 5675/5680/2 5678/5683/2 +f 5676/5681/219 5677/5682/219 5678/5683/219 +f 5670/5675/2 5677/5682/2 5666/5599/2 +f 5678/5683/2 5677/5682/2 5670/5675/2 +f 5440/5449/209 5442/5446/209 5593/5602/209 +f 5679/5684/209 4993/5000/209 4994/5001/209 +f 5659/5669/209 5680/5582/209 5442/5446/209 +f 5681/5685/209 5682/5686/209 5680/5582/209 +f 5659/5669/209 5681/5685/209 5680/5582/209 +f 5683/5687/6654 5682/5686/6654 5681/5685/6654 +f 5647/5653/209 4993/5000/209 5679/5684/209 +f 5682/5686/209 5684/5688/209 5680/5582/209 +f 5671/5676/6655 5682/5686/6655 5683/5687/6655 +f 5670/5675/2 5671/5676/2 5683/5687/2 +f 5679/5684/209 4994/5001/209 5686/5689/209 +f 5687/5690/6656 5647/5653/6656 5679/5684/6656 +f 5687/5690/6657 5679/5684/6657 5685/5691/6657 +f 5671/5676/6658 5684/5688/6658 5682/5686/6658 +f 5659/5669/209 5688/5692/209 5681/5685/209 +f 5689/5693/6659 5681/5685/6659 5688/5692/6659 +f 5683/5687/6660 5681/5685/6660 5689/5693/6660 +f 5685/5691/6531 5679/5684/6531 5686/5689/6531 +f 4995/5003/209 5686/5689/209 4994/5001/209 +f 5690/5694/209 4998/5005/209 5647/5653/209 +f 4996/5004/2 5687/5690/2 5685/5691/2 +f 5680/5582/209 5684/5688/209 5691/5695/209 +f 5692/5696/6661 5684/5688/6661 5671/5676/6661 +f 5683/5687/2 5689/5693/2 5670/5675/2 +f 5654/5659/209 5688/5692/209 5659/5669/209 +f 5685/5691/6662 5686/5689/6662 5693/5697/6662 +f 5694/5698/209 5686/5689/209 4995/5003/209 +f 5690/5694/209 5695/5699/209 4998/5005/209 +f 5696/5700/6663 5647/5653/6663 5687/5690/6663 +f 5696/5700/6664 5690/5694/6664 5647/5653/6664 +f 4998/5005/209 5695/5699/209 4995/5003/209 +f 5662/5671/2 5692/5696/2 5671/5676/2 +f 5692/5696/6665 5691/5695/6665 5684/5688/6665 +f 5654/5659/209 5698/5701/209 5688/5692/209 +f 4996/5004/2 5685/5691/2 5693/5697/2 +f 5693/5697/6666 5686/5689/6666 5694/5698/6666 +f 5697/5702/6667 5695/5699/6667 5690/5694/6667 +f 4995/5003/209 5695/5699/209 5694/5698/209 +f 4997/4999/2 5696/5700/2 5687/5690/2 +f 5697/5702/6668 5690/5694/6668 5696/5700/6668 +f 4997/4999/2 5687/5690/2 4996/5004/2 +f 5691/5695/209 5699/5703/209 5680/5582/209 +f 5699/5703/209 5700/5704/209 5680/5582/209 +f 5701/5705/6669 5700/5704/6669 5699/5703/6669 +f 5702/5706/6670 5691/5695/6670 5692/5696/6670 +f 5691/5695/209 5703/5707/209 5654/5659/209 +f 5704/5708/6671 5688/5692/6671 5698/5701/6671 +f 5689/5693/6672 5688/5692/6672 5704/5708/6672 +f 5670/5675/2 5689/5693/2 5706/5709/2 +f 5703/5707/209 5698/5701/209 5654/5659/209 +f 5693/5697/2 4999/5019/2 4996/5004/2 +f 5693/5697/6673 5694/5698/6673 5705/5710/6673 +f 5706/5709/6537 5695/5699/6537 5697/5702/6537 +f 5705/5710/6674 5694/5698/6674 5695/5699/6674 +f 5697/5702/2 5696/5700/2 4997/4999/2 +f 5707/5711/2 5692/5696/2 5662/5671/2 +f 5708/5712/6675 5700/5704/6675 5701/5705/6675 +f 5707/5711/2 5702/5706/2 5692/5696/2 +f 5702/5706/6676 5703/5707/6676 5691/5695/6676 +f 5704/5708/6677 5698/5701/6677 5709/5713/6677 +f 5706/5709/2 5689/5693/2 5704/5708/2 +f 5709/5713/6678 5698/5701/6678 5703/5707/6678 +f 4999/5019/2 5693/5697/2 5705/5710/2 +f 5705/5710/6679 5695/5699/6679 5706/5709/6679 +f 4997/4999/2 5706/5709/2 5697/5702/2 +f 5680/5582/209 5710/5714/209 4998/5005/209 +f 5691/5695/209 5711/5715/209 5699/5703/209 +f 5712/5716/6659 5699/5703/6659 5711/5715/6659 +f 5701/5705/6660 5699/5703/6660 5712/5716/6660 +f 5680/5582/209 5700/5704/209 5710/5714/209 +f 5662/5671/2 5653/5662/2 5707/5711/2 +f 5707/5711/2 5708/5712/2 5701/5705/2 +f 5709/5713/6680 5703/5707/6680 5702/5706/6680 +f 5706/5709/2 5704/5708/2 5709/5713/2 +f 4998/5005/209 5710/5714/209 5713/5717/209 +f 5701/5705/2 5712/5716/2 5707/5711/2 +f 4998/5005/209 5711/5715/209 5691/5695/209 +f 5714/5718/6681 5710/5714/6681 5700/5704/6681 +f 5714/5718/6682 5700/5704/6682 5708/5712/6682 +f 5707/5711/2 5653/5662/2 5708/5712/2 +f 5702/5706/2 5707/5711/2 5709/5713/2 +f 4997/4999/2 5670/5675/2 5706/5709/2 +f 5706/5709/2 4999/5019/2 5705/5710/2 +f 5714/5718/6683 5713/5717/6683 5710/5714/6683 +f 4998/5005/209 5715/5719/209 5711/5715/209 +f 5653/5662/2 5714/5718/2 5708/5712/2 +f 5709/5713/2 5707/5711/2 5706/5709/2 +f 5716/5720/6670 5713/5717/6670 5714/5718/6670 +f 5713/5717/209 5717/5721/209 4998/5005/209 +f 5718/5722/6671 5711/5715/6671 5715/5719/6671 +f 5712/5716/6684 5711/5715/6684 5718/5722/6684 +f 5707/5711/2 5712/5716/2 5706/5709/2 +f 5717/5721/209 5715/5719/209 4998/5005/209 +f 5653/5662/2 5716/5720/2 5714/5718/2 +f 5716/5720/6685 5717/5721/6685 5713/5717/6685 +f 5718/5722/6677 5715/5719/6677 5719/5723/6677 +f 5706/5709/2 5712/5716/2 5718/5722/2 +f 5719/5723/6686 5715/5719/6686 5717/5721/6686 +f 5719/5723/6680 5717/5721/6680 5716/5720/6680 +f 5706/5709/2 5718/5722/2 5719/5723/2 +f 5716/5720/2 5653/5662/2 5719/5723/2 +f 5719/5723/2 5653/5662/2 5706/5709/2 +f 5706/5709/2 5653/5662/2 4999/5019/2 +f 5493/5497/6679 5492/5495/6679 5462/5469/6679 +f 5493/5497/6674 5491/5496/6674 5492/5495/6674 +f 5494/5498/6673 5491/5496/6673 5493/5497/6673 +f 5494/5498/6666 5483/5488/6666 5491/5496/6666 +f 4982/4987/209 5491/5496/209 5483/5488/209 +f 4980/4986/209 5491/5496/209 4982/4987/209 +f 5481/5486/6662 5483/5488/6662 5494/5498/6662 +f 4978/4983/6687 4981/5007/6687 5494/5498/6687 +f 5452/5458/2 5469/5467/2 5472/5474/2 +f 4981/5007/2 5481/5486/2 5494/5498/2 +f 5487/5491/6688 5485/5489/6688 5482/5487/6688 +f 5469/5467/6689 5720/5724/6689 5468/5476/6689 +f 5487/5491/6657 5482/5487/6657 5481/5486/6657 +f 5487/5491/2 5481/5486/2 4981/5007/2 +f 5721/5725/209 5722/5726/209 5001/5008/209 +f 5001/5008/209 5484/5205/209 5451/5465/209 +f 4981/5007/2 5458/5215/2 5487/5491/2 +f 5721/5725/209 5001/5008/209 5724/5727/209 +f 5725/5728/6690 5722/5726/6690 5721/5725/6690 +f 5001/5008/209 5722/5726/209 5484/5205/209 +f 5469/5467/2 5458/5215/2 5723/5729/2 +f 5726/5730/6691 5721/5725/6691 5724/5727/6691 +f 5725/5728/6692 5721/5725/6692 5726/5730/6692 +f 5002/5009/2 5725/5728/2 5726/5730/2 +f 5727/5731/6693 5722/5726/6693 5725/5728/6693 +f 5722/5726/209 5728/5732/209 5484/5205/209 +f 5724/5727/209 5001/5008/209 5729/5733/209 +f 5726/5730/6694 5724/5727/6694 5730/5734/6694 +f 5727/5731/6535 5728/5732/6535 5722/5726/6535 +f 5727/5731/2 5725/5728/2 5002/5009/2 +f 5728/5732/209 5731/5735/209 5484/5205/209 +f 4984/5006/2 5458/5215/2 4981/5007/2 +f 5730/5734/6695 5724/5727/6695 5729/5733/6695 +f 5726/5730/2 5730/5734/2 5002/5009/2 +f 4983/4988/209 5729/5733/209 5001/5008/209 +f 5727/5731/6536 5731/5735/6536 5728/5732/6536 +f 5727/5731/2 5002/5009/2 5458/5215/2 +f 5730/5734/6696 5729/5733/6696 5732/5736/6696 +f 5730/5734/2 4984/5006/2 5002/5009/2 +f 5484/5205/209 5731/5735/209 4983/4988/209 +f 5733/5737/209 5729/5733/209 4983/4988/209 +f 5734/5738/6697 5731/5735/6697 5727/5731/6697 +f 5732/5736/6666 5729/5733/6666 5733/5737/6666 +f 5730/5734/2 5732/5736/2 4984/5006/2 +f 4983/4988/209 5731/5735/209 5733/5737/209 +f 5458/5215/2 5734/5738/2 5727/5731/2 +f 5732/5736/6698 5733/5737/6698 5735/5739/6698 +f 5734/5738/6665 5733/5737/6665 5731/5735/6665 +f 4984/5006/2 5732/5736/2 5735/5739/2 +f 5735/5739/6699 5733/5737/6699 5734/5738/6699 +f 4984/5006/2 5734/5738/2 5458/5215/2 +f 5735/5739/2 5734/5738/2 4984/5006/2 +f 5720/5724/209 5451/5465/209 5468/5476/209 +f 5736/5740/209 5451/5465/209 5737/5741/209 +f 5720/5724/209 5737/5741/209 5451/5465/209 +f 5723/5729/6700 5720/5724/6700 5469/5467/6700 +f 5738/5742/2 5723/5729/2 5458/5215/2 +f 5256/5265/209 5739/5743/209 5257/5266/209 +f 5739/5743/6701 5258/5267/6701 5257/5266/6701 +f 5496/5501/209 5739/5743/209 5256/5265/209 +f 5740/5744/6702 5258/5267/6702 5739/5743/6702 +f 5740/5744/2 5504/5508/2 5258/5267/2 +f 5741/5745/209 5739/5743/209 5496/5501/209 +f 5741/5745/6291 5740/5744/6291 5739/5743/6291 +f 5741/5745/6289 5742/5746/6289 5740/5744/6289 +f 5743/5747/209 5576/5583/209 5680/5582/209 +f 5504/5508/2 5740/5744/2 5742/5746/2 +f 5588/5595/6703 5576/5583/6703 5743/5747/6703 +f 5744/5748/209 5743/5747/209 5680/5582/209 +f 5738/5742/6704 5720/5724/6704 5723/5729/6704 +f 5496/5501/209 5745/5749/209 5741/5745/209 +f 5741/5745/6294 5745/5749/6294 5742/5746/6294 +f 5534/5543/6292 5507/5512/6292 5511/5511/6292 +f 5522/5524/6705 5559/5558/6705 5527/5531/6705 +f 5588/5595/6703 5743/5747/6703 5746/5600/6703 +f 5746/5600/6706 5743/5747/6706 5744/5748/6706 +f 5738/5742/6704 5737/5741/6704 5720/5724/6704 +f 5742/5746/6295 5745/5749/6295 5747/5750/6295 +f 5504/5508/2 5742/5746/2 5747/5750/2 +f 5508/5514/209 5745/5749/209 5496/5501/209 +f 5504/5508/2 5507/5512/2 5534/5543/2 +f 5522/5524/6289 5748/5751/6289 5559/5558/6289 +f 5680/5582/209 5563/5570/209 5749/5752/209 +f 5746/5600/6707 5744/5748/6707 5750/5753/6707 +f 5749/5752/209 5563/5570/209 5560/5565/209 +f 5508/5514/209 5451/5465/209 5751/5754/209 +f 5752/5755/6708 5737/5741/6708 5738/5742/6708 +f 5752/5755/6708 5736/5740/6708 5737/5741/6708 +f 5751/5754/209 5451/5465/209 5736/5740/209 +f 5751/5754/209 5753/5756/209 5508/5514/209 +f 5504/5508/2 5747/5750/2 5754/5757/2 +f 5508/5514/209 5753/5756/209 5745/5749/209 +f 5506/5513/209 5755/5758/209 5508/5514/209 +f 5754/5757/2 5507/5512/2 5504/5508/2 +f 5546/5550/2 5559/5558/2 5748/5751/2 +f 5749/5752/209 5744/5748/209 5680/5582/209 +f 5560/5565/6347 5562/5567/6347 5749/5752/6347 +f 5754/5757/2 5752/5755/2 5738/5742/2 +f 5756/5759/6709 5736/5740/6709 5752/5755/6709 +f 5756/5759/6709 5751/5754/6709 5736/5740/6709 +f 5753/5756/6710 5751/5754/6710 5757/5760/6710 +f 5745/5749/6711 5757/5760/6711 5747/5750/6711 +f 5753/5756/6296 5757/5760/6296 5745/5749/6296 +f 5001/5008/209 5508/5514/209 5755/5758/209 +f 5506/5513/6263 5758/5761/6263 5755/5758/6263 +f 5506/5513/6297 5507/5512/6297 5758/5761/6297 +f 5563/5570/209 5001/5008/209 5759/5762/209 +f 5522/5524/6294 5563/5570/6294 5748/5751/6294 +f 5749/5752/6712 5750/5753/6712 5744/5748/6712 +f 5001/5008/209 5451/5465/209 5508/5514/209 +f 5680/5582/209 5001/5008/209 5563/5570/209 +f 5754/5757/2 5738/5742/2 5458/5215/2 +f 5756/5759/2 5752/5755/2 5754/5757/2 +f 5757/5760/6713 5751/5754/6713 5756/5759/6713 +f 5754/5757/2 5747/5750/2 5757/5760/2 +f 5759/5762/209 5001/5008/209 5755/5758/209 +f 5758/5761/2 5507/5512/2 5754/5757/2 +f 5748/5751/6295 5563/5570/6295 5760/5763/6295 +f 5546/5550/2 5748/5751/2 5760/5763/2 +f 5562/5567/6714 5750/5753/6714 5749/5752/6714 +f 5746/5600/2 5750/5753/2 5633/5764/2 +f 5567/5572/6293 5561/5566/6293 5560/5565/6293 +f 5458/5215/2 5002/5009/2 5754/5757/2 +f 5756/5759/2 5754/5757/2 5757/5760/2 +f 5755/5758/6305 5761/5765/6305 5759/5762/6305 +f 5746/5600/2 5633/5764/2 5002/5009/2 +f 5759/5762/6296 5761/5765/6296 5563/5570/6296 +f 5546/5550/2 5760/5763/2 5633/5764/2 +f 5633/5764/2 5750/5753/2 5562/5567/2 +f 5570/5578/6292 5561/5566/6292 5567/5572/6292 +f 5562/5567/2 5561/5566/2 5633/5764/2 +f 5758/5761/6307 5761/5765/6307 5755/5758/6307 +f 5563/5570/6299 5761/5765/6299 5760/5763/6299 +f 5546/5550/2 5561/5566/2 5570/5578/2 +f 5754/5757/2 5761/5765/2 5758/5761/2 +f 5633/5764/2 5760/5763/2 5761/5765/2 +f 5633/5764/2 5561/5566/2 5546/5550/2 +f 5002/5009/2 5761/5765/2 5754/5757/2 +f 5633/5764/2 5761/5765/2 5002/5009/2 +f 5001/5008/209 5764/5766/209 5004/5011/209 +f 4998/5005/209 5763/5767/209 5680/5582/209 +f 5765/5768/6715 5004/5011/6715 5764/5766/6715 +f 5766/5769/209 4998/5005/209 5004/5011/209 +f 5762/5770/6660 5763/5767/6660 5767/5771/6660 +f 5653/5662/2 5762/5770/2 5767/5771/2 +f 5768/5772/6716 5004/5011/6716 5765/5768/6716 +f 4998/5005/209 5769/5773/209 5763/5767/209 +f 5767/5771/6532 5763/5767/6532 5769/5773/6532 +f 5766/5769/209 5769/5773/209 4998/5005/209 +f 5770/5774/6531 5766/5769/6531 5004/5011/6531 +f 5770/5774/6717 5004/5011/6717 5768/5772/6717 +f 5653/5662/2 5767/5771/2 4999/5019/2 +f 5767/5771/6688 5769/5773/6688 5766/5769/6688 +f 5770/5774/2 5768/5772/2 4999/5019/2 +f 5767/5771/6657 5766/5769/6657 5770/5774/6657 +f 5767/5771/2 5770/5774/2 4999/5019/2 +f 5010/5017/6373 5007/5013/6373 5006/5012/6373 +f 5010/5017/212 4986/4991/212 5011/5018/212 +f 5011/5018/6373 5007/5013/6373 5010/5017/6373 +f 5763/5767/209 5771/5775/209 5680/5582/209 +f 5762/5770/6669 5771/5775/6669 5763/5767/6669 +f 5011/5018/212 4986/4991/212 4989/4996/212 +f 5772/5776/6718 5771/5775/6718 5762/5770/6718 +f 5680/5582/209 5771/5775/209 5001/5008/209 +f 5653/5662/2 5772/5776/2 5762/5770/2 +f 5001/5008/209 5771/5775/209 5773/5777/209 +f 5773/5777/209 5764/5766/209 5001/5008/209 +f 5774/5778/6682 5771/5775/6682 5772/5776/6682 +f 5774/5778/6719 5773/5777/6719 5771/5775/6719 +f 5765/5768/6720 5764/5766/6720 5773/5777/6720 +f 5653/5662/2 5746/5600/2 5002/5009/2 +f 5653/5662/2 5774/5778/2 5772/5776/2 +f 5765/5768/6721 5773/5777/6721 5774/5778/6721 +f 5654/5659/209 4998/5005/209 5691/5695/209 +f 5002/5009/2 5765/5768/2 5774/5778/2 +f 5774/5778/2 5653/5662/2 5002/5009/2 +f 5768/5772/2 5765/5768/2 5002/5009/2 +f 4999/5019/2 5768/5772/2 5002/5009/2 +f 4991/4994/8 4985/4990/8 4990/4995/8 +f 4990/4995/8 4985/4990/8 4987/4992/8 +f 4990/4995/8 4987/4992/8 5009/5016/8 +f 4990/4995/8 5009/5016/8 5008/5015/8 +f 5008/5015/8 5009/5016/8 5005/5014/8 +f 4973/4976/8 4972/4975/8 4965/4967/8 +f 4965/4967/8 4972/4975/8 4962/4978/8 +f 4965/4967/8 4962/4978/8 4975/4980/8 +f 4965/4967/8 4975/4980/8 4966/4969/8 +f 4965/4967/8 4966/4969/8 4978/4983/8 +f 5000/5002/8 4996/5004/8 5003/5010/8 +f 4985/4990/8 4991/4994/8 4996/5004/8 +f 4985/4990/8 4996/5004/8 4994/5001/8 +f 4980/4986/8 5003/5010/8 4978/4983/8 +f 4980/4986/8 4978/4983/8 4966/4969/8 +f 5012/4989/8 5003/5010/8 4980/4986/8 +f 4994/5001/8 4996/5004/8 5000/5002/8 +f 5000/5002/8 5003/5010/8 5012/4989/8 +f 5775/5779/6722 5776/5780/6722 5781/5781/6722 +f 5781/5781/6723 5776/5780/6723 5777/5782/6723 +f 5782/5783/209 5777/5782/209 5780/5784/209 +f 5778/5785/2 5779/5786/2 5781/5781/2 +f 5779/5786/2 5775/5779/2 5781/5781/2 +f 5777/5782/209 5776/5780/209 5780/5784/209 +f 5782/5783/6724 5780/5784/6724 5778/5785/6724 +f 5778/5785/6725 5780/5784/6725 5779/5786/6725 +f 5775/5779/6726 5779/5786/6726 5776/5780/6726 +f 5776/5780/6727 5779/5786/6727 5780/5784/6727 +f 5781/5781/8 5777/5782/8 5778/5785/8 +f 5778/5785/8 5777/5782/8 5782/5783/8 diff --git a/resources/meshes/flsun_sr.3mf b/resources/meshes/flsun_sr.3mf new file mode 100644 index 0000000000..7eba390a66 Binary files /dev/null and b/resources/meshes/flsun_sr.3mf differ diff --git a/resources/meshes/hellbot_hidra.obj b/resources/meshes/hellbot_hidra.obj new file mode 100644 index 0000000000..8f5a11b3e9 --- /dev/null +++ b/resources/meshes/hellbot_hidra.obj @@ -0,0 +1,840 @@ +# Exported from 3D Builder +mtllib hellbot_hidra.mtl + +o Object.1 +v -48.976158 -116.868103 -0.999955 188 188 188 +v -63.523849 -108.540039 1.000040 188 188 188 +v -63.523849 -108.540039 -0.999959 188 188 188 +v -48.224991 -117.215614 -0.999955 188 188 188 +v -47.425320 -117.428368 -0.999955 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v 64.275002 -108.192528 -0.999959 188 188 188 +v 65.074684 -107.979774 -0.999959 188 188 188 +v 111.585709 115.523048 -1.000041 188 188 188 +v 111.978226 114.881371 -1.000041 188 188 188 +v 110.526627 116.584053 -1.000042 188 188 188 +v 108.461647 117.440948 -1.000042 188 188 188 +v 108.461647 117.440948 0.999956 188 188 188 +v 107.712769 117.499992 0.999956 188 188 188 +v -107.712776 117.499992 0.999956 188 188 188 +v -112.500000 -103.112236 -0.999961 188 188 188 +v -107.712776 117.499992 -1.000042 188 188 188 +v -64.275009 -108.192528 -0.999959 188 188 188 +v -64.275009 -108.192528 1.000039 188 188 188 +v -65.074684 -107.979774 1.000039 188 188 188 +v -65.074684 -107.979774 -0.999959 188 188 188 +v -109.192108 117.265266 0.999956 188 188 188 +v -108.461655 117.440948 0.999956 188 188 188 +v -109.886131 116.977264 -1.000042 188 188 188 +v -110.526642 116.584053 0.999957 188 188 188 +v -109.886131 116.977264 0.999956 188 188 188 +v -110.526642 116.584053 -1.000042 188 188 188 +v -111.097855 116.095299 0.999957 188 188 188 +v -111.097855 116.095299 -1.000041 188 188 188 +v -111.978226 114.881371 -1.000041 188 188 188 +v -111.585724 115.523048 0.999957 188 188 188 +v -111.978226 114.881371 0.999957 188 188 188 +v -112.265701 114.186096 0.999957 188 188 188 +v -112.441063 113.454323 -1.000040 188 188 188 +v -112.265701 114.186096 -1.000041 188 188 188 +v -112.441063 113.454323 0.999958 188 188 188 +v -112.500000 112.704071 0.999958 188 188 188 +v -111.585724 115.523048 -1.000041 188 188 188 +v -109.192108 117.265266 -1.000042 188 188 188 +v -112.500000 -103.112236 1.000037 188 188 188 +v -112.441063 -103.862495 1.000038 188 188 188 +v -112.441063 -103.862495 -0.999960 188 188 188 +v -112.265701 -104.594269 -0.999960 188 188 188 +v -111.978226 -105.289551 -0.999960 188 188 188 +v -111.978226 -105.289551 1.000038 188 188 188 +v -111.585724 -105.931221 -0.999959 188 188 188 +v -111.585724 -105.931221 1.000039 188 188 188 +v -111.097855 -106.503471 -0.999959 188 188 188 +v -111.097855 -106.503471 1.000039 188 188 188 +v -110.526642 -106.992226 1.000039 188 188 188 +v -109.886131 -107.385437 -0.999959 188 188 188 +v -110.526642 -106.992226 -0.999959 188 188 188 +v -109.886131 -107.385437 1.000039 188 188 188 +v -108.461655 -107.849106 -0.999959 188 188 188 +v -109.192108 -107.673416 1.000039 188 188 188 +v -109.192108 -107.673416 -0.999959 188 188 188 +v -108.461655 -107.849106 1.000039 188 188 188 +v -107.712776 -107.908150 1.000039 188 188 188 +v -107.712776 -107.908150 -0.999959 188 188 188 +v -65.898979 -107.908150 1.000039 188 188 188 +v -65.898979 -107.908150 -0.999959 188 188 188 +v -112.265701 -104.594269 1.000038 188 188 188 +v 63.523842 -108.540039 1.000040 188 188 188 +v 48.976147 -116.868103 1.000043 188 188 188 +v 63.523842 -108.540039 -0.999959 188 188 188 +v 46.601025 -117.499992 1.000043 188 188 188 +v 47.425320 -117.428368 -0.999955 188 188 188 +v -46.601025 -117.499992 1.000043 188 188 188 +v -47.425320 -117.428368 1.000043 188 188 188 +v -48.976158 -116.868103 1.000043 188 188 188 +v -48.224991 -117.215614 1.000043 188 188 188 +v 48.976147 -116.868103 -0.999955 188 188 188 +v 48.224983 -117.215614 1.000043 188 188 188 +v 48.224983 -117.215614 -0.999955 188 188 188 +v 47.425320 -117.428368 1.000043 188 188 188 +v -112.500000 112.704071 -1.000040 188 188 188 +v -108.461655 117.440948 -1.000042 188 188 188 +v 109.886116 116.977264 0.999956 188 188 188 +v 110.526627 116.584053 0.999957 188 188 188 +v 109.886116 116.977264 -1.000042 188 188 188 +v 111.585709 115.523048 0.999957 188 188 188 +v 111.978226 114.881371 0.999957 188 188 188 +v 112.265694 114.186096 0.999957 188 188 188 +v 112.441063 113.454323 0.999958 188 188 188 +v 112.500000 -103.112236 1.000037 188 188 188 +v 112.500000 112.704071 -1.000040 188 188 188 +v 112.500000 -103.112236 -0.999961 188 188 188 +v 112.441063 -103.862495 1.000038 188 188 188 +v 112.441063 -103.862495 -0.999960 188 188 188 +v 107.712769 -107.908150 -0.999959 188 188 188 +v 65.898979 -107.908150 1.000039 188 188 188 +v 107.712769 -107.908150 1.000039 188 188 188 +v 108.461647 -107.849106 -0.999959 188 188 188 +v 109.192108 -107.673416 -0.999959 188 188 188 +v 108.461647 -107.849106 1.000039 188 188 188 +v 109.192108 -107.673416 1.000039 188 188 188 +v 109.886116 -107.385437 1.000039 188 188 188 +v 109.886116 -107.385437 -0.999959 188 188 188 +v 110.526627 -106.992226 1.000039 188 188 188 +v 111.097839 -106.503471 -0.999959 188 188 188 +v 111.097839 -106.503471 1.000039 188 188 188 +v 111.585709 -105.931221 1.000039 188 188 188 +v 111.978226 -105.289551 1.000038 188 188 188 +v 112.265694 -104.594269 1.000038 188 188 188 +v 112.265694 -104.594269 -0.999960 188 188 188 +v 111.978226 -105.289551 -0.999960 188 188 188 +v 111.585709 -105.931221 -0.999959 188 188 188 +v 110.526627 -106.992226 -0.999959 188 188 188 +v 65.074684 -107.979774 1.000039 188 188 188 +v 64.275002 -108.192528 1.000039 188 188 188 +v 109.192108 117.265266 0.999956 188 188 188 +v 109.192108 117.265266 -1.000042 188 188 188 +v 111.097839 116.095299 0.999957 188 188 188 +v 111.097839 116.095299 -1.000041 188 188 188 +v 112.265694 114.186096 -1.000041 188 188 188 +v 112.500000 112.704071 0.999958 188 188 188 +v 112.441063 113.454323 -1.000040 188 188 188 +v 65.898979 -107.908150 -0.999959 188 188 188 +v 46.601025 -117.499992 -0.999955 188 188 188 +v -46.601025 -117.499992 -0.999955 188 188 188 + +v -48.976158 -116.868103 -0.999955 188 188 188 +v -63.523849 -108.540039 -0.999959 188 188 188 +v -48.976158 -116.868103 -0.999955 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v -48.224991 -117.215614 -0.999955 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v -47.425320 -117.428368 -0.999955 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v -46.601025 -117.499992 -0.999955 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v 63.523842 -108.540039 -0.999959 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v 64.275002 -108.192528 -0.999959 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v 65.074684 -107.979774 -0.999959 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v 65.898979 -107.908150 -0.999959 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v 112.500000 112.704071 -1.000040 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v 112.441063 113.454323 -1.000040 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v 112.265694 114.186096 -1.000041 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v 111.978226 114.881371 -1.000041 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v 111.585709 115.523048 -1.000041 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v 111.097839 116.095299 -1.000041 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v 110.526627 116.584053 -1.000042 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v 109.886116 116.977264 -1.000042 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v 109.192108 117.265266 -1.000042 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v 108.461647 117.440948 -1.000042 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v 108.461647 117.440948 0.999956 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v 107.712769 117.499992 0.999956 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v 107.712769 117.499992 0.999956 188 188 188 +v -107.712776 117.499992 -1.000042 188 188 188 +v -107.712776 117.499992 0.999956 188 188 188 +v -107.712776 117.499992 -1.000042 188 188 188 +v -108.461655 117.440948 -1.000042 188 188 188 +v -107.712776 117.499992 -1.000042 188 188 188 +v -112.500000 112.704071 -1.000040 188 188 188 +v -107.712776 117.499992 -1.000042 188 188 188 +v -112.500000 -103.112236 -0.999961 188 188 188 +v -107.712776 117.499992 -1.000042 188 188 188 +v -65.898979 -107.908150 -0.999959 188 188 188 +v -107.712776 117.499992 -1.000042 188 188 188 +v -65.074684 -107.979774 -0.999959 188 188 188 +v -107.712776 117.499992 -1.000042 188 188 188 +v -64.275009 -108.192528 -0.999959 188 188 188 +v -65.074684 -107.979774 -0.999959 188 188 188 +v -64.275009 -108.192528 1.000039 188 188 188 +v -65.074684 -107.979774 -0.999959 188 188 188 +v -109.192108 117.265266 0.999956 188 188 188 +v -109.192108 117.265266 -1.000042 188 188 188 +v -112.500000 112.704071 -1.000040 188 188 188 +v -109.886131 116.977264 -1.000042 188 188 188 +v -109.192108 117.265266 -1.000042 188 188 188 +v -112.500000 112.704071 -1.000040 188 188 188 +v -109.886131 116.977264 -1.000042 188 188 188 +v -110.526642 116.584053 -1.000042 188 188 188 +v -109.886131 116.977264 -1.000042 188 188 188 +v -109.886131 116.977264 0.999956 188 188 188 +v -110.526642 116.584053 -1.000042 188 188 188 +v -110.526642 116.584053 0.999957 188 188 188 +v -110.526642 116.584053 -1.000042 188 188 188 +v -110.526642 116.584053 0.999957 188 188 188 +v -111.097855 116.095299 -1.000041 188 188 188 +v -111.097855 116.095299 0.999957 188 188 188 +v -111.097855 116.095299 -1.000041 188 188 188 +v -112.500000 112.704071 -1.000040 188 188 188 +v -111.585724 115.523048 -1.000041 188 188 188 +v -111.097855 116.095299 -1.000041 188 188 188 +v -112.500000 112.704071 -1.000040 188 188 188 +v -111.585724 115.523048 -1.000041 188 188 188 +v -111.978226 114.881371 -1.000041 188 188 188 +v -111.585724 115.523048 -1.000041 188 188 188 +v -111.585724 115.523048 0.999957 188 188 188 +v -111.978226 114.881371 -1.000041 188 188 188 +v -111.978226 114.881371 0.999957 188 188 188 +v -111.978226 114.881371 -1.000041 188 188 188 +v -111.978226 114.881371 0.999957 188 188 188 +v -112.265701 114.186096 -1.000041 188 188 188 +v -112.265701 114.186096 0.999957 188 188 188 +v -112.265701 114.186096 -1.000041 188 188 188 +v -112.500000 112.704071 -1.000040 188 188 188 +v -112.441063 113.454323 -1.000040 188 188 188 +v -112.265701 114.186096 -1.000041 188 188 188 +v -112.500000 112.704071 -1.000040 188 188 188 +v -112.441063 113.454323 -1.000040 188 188 188 +v -112.441063 113.454323 0.999958 188 188 188 +v -112.500000 112.704071 -1.000040 188 188 188 +v -112.441063 113.454323 0.999958 188 188 188 +v -112.265701 114.186096 0.999957 188 188 188 +v -112.441063 113.454323 -1.000040 188 188 188 +v -112.500000 112.704071 -1.000040 188 188 188 +v -112.265701 114.186096 -1.000041 188 188 188 +v -111.978226 114.881371 -1.000041 188 188 188 +v -111.585724 115.523048 0.999957 188 188 188 +v -111.097855 116.095299 0.999957 188 188 188 +v -111.585724 115.523048 -1.000041 188 188 188 +v -112.500000 112.704071 -1.000040 188 188 188 +v -111.097855 116.095299 -1.000041 188 188 188 +v -110.526642 116.584053 -1.000042 188 188 188 +v -109.886131 116.977264 0.999956 188 188 188 +v -109.192108 117.265266 0.999956 188 188 188 +v -109.886131 116.977264 -1.000042 188 188 188 +v -109.192108 117.265266 -1.000042 188 188 188 +v -108.461655 117.440948 0.999956 188 188 188 +v -108.461655 117.440948 -1.000042 188 188 188 +v -112.500000 112.704071 0.999958 188 188 188 +v -112.500000 -103.112236 -0.999961 188 188 188 +v -112.500000 -103.112236 1.000037 188 188 188 +v -112.500000 -103.112236 -0.999961 188 188 188 +v -112.500000 -103.112236 1.000037 188 188 188 +v -112.441063 -103.862495 -0.999960 188 188 188 +v -112.441063 -103.862495 1.000038 188 188 188 +v -112.441063 -103.862495 -0.999960 188 188 188 +v -65.898979 -107.908150 -0.999959 188 188 188 +v -112.265701 -104.594269 -0.999960 188 188 188 +v -112.441063 -103.862495 -0.999960 188 188 188 +v -65.898979 -107.908150 -0.999959 188 188 188 +v -112.265701 -104.594269 -0.999960 188 188 188 +v -111.978226 -105.289551 -0.999960 188 188 188 +v -112.265701 -104.594269 -0.999960 188 188 188 +v -112.265701 -104.594269 1.000038 188 188 188 +v -111.978226 -105.289551 -0.999960 188 188 188 +v -111.978226 -105.289551 1.000038 188 188 188 +v -111.978226 -105.289551 -0.999960 188 188 188 +v -111.978226 -105.289551 1.000038 188 188 188 +v -111.585724 -105.931221 -0.999959 188 188 188 +v -111.585724 -105.931221 1.000039 188 188 188 +v -111.585724 -105.931221 -0.999959 188 188 188 +v -65.898979 -107.908150 -0.999959 188 188 188 +v -111.097855 -106.503471 -0.999959 188 188 188 +v -111.585724 -105.931221 -0.999959 188 188 188 +v -65.898979 -107.908150 -0.999959 188 188 188 +v -111.097855 -106.503471 -0.999959 188 188 188 +v -110.526642 -106.992226 -0.999959 188 188 188 +v -111.097855 -106.503471 -0.999959 188 188 188 +v -111.097855 -106.503471 1.000039 188 188 188 +v -110.526642 -106.992226 -0.999959 188 188 188 +v -110.526642 -106.992226 1.000039 188 188 188 +v -110.526642 -106.992226 -0.999959 188 188 188 +v -110.526642 -106.992226 1.000039 188 188 188 +v -109.886131 -107.385437 -0.999959 188 188 188 +v -109.886131 -107.385437 1.000039 188 188 188 +v -109.886131 -107.385437 -0.999959 188 188 188 +v -65.898979 -107.908150 -0.999959 188 188 188 +v -109.192108 -107.673416 -0.999959 188 188 188 +v -109.886131 -107.385437 -0.999959 188 188 188 +v -65.898979 -107.908150 -0.999959 188 188 188 +v -109.192108 -107.673416 -0.999959 188 188 188 +v -107.712776 -107.908150 -0.999959 188 188 188 +v -109.192108 -107.673416 -0.999959 188 188 188 +v -108.461655 -107.849106 -0.999959 188 188 188 +v -109.192108 -107.673416 -0.999959 188 188 188 +v -109.192108 -107.673416 1.000039 188 188 188 +v -108.461655 -107.849106 -0.999959 188 188 188 +v -108.461655 -107.849106 1.000039 188 188 188 +v -107.712776 -107.908150 -0.999959 188 188 188 +v -107.712776 -107.908150 -0.999959 188 188 188 +v -108.461655 -107.849106 1.000039 188 188 188 +v -108.461655 -107.849106 -0.999959 188 188 188 +v -65.898979 -107.908150 -0.999959 188 188 188 +v -107.712776 -107.908150 1.000039 188 188 188 +v -107.712776 -107.908150 -0.999959 188 188 188 +v -107.712776 -107.908150 1.000039 188 188 188 +v -65.898979 -107.908150 -0.999959 188 188 188 +v -109.192108 -107.673416 1.000039 188 188 188 +v -109.886131 -107.385437 1.000039 188 188 188 +v -109.192108 -107.673416 -0.999959 188 188 188 +v -65.898979 -107.908150 -0.999959 188 188 188 +v -109.886131 -107.385437 -0.999959 188 188 188 +v -110.526642 -106.992226 -0.999959 188 188 188 +v -111.097855 -106.503471 1.000039 188 188 188 +v -111.585724 -105.931221 1.000039 188 188 188 +v -111.097855 -106.503471 -0.999959 188 188 188 +v -65.898979 -107.908150 -0.999959 188 188 188 +v -111.585724 -105.931221 -0.999959 188 188 188 +v -111.978226 -105.289551 -0.999960 188 188 188 +v -112.265701 -104.594269 1.000038 188 188 188 +v -112.441063 -103.862495 1.000038 188 188 188 +v -112.265701 -104.594269 -0.999960 188 188 188 +v -65.074684 -107.979774 1.000039 188 188 188 +v -65.898979 -107.908150 1.000039 188 188 188 +v -65.898979 -107.908150 -0.999959 188 188 188 +v 63.523842 -108.540039 -0.999959 188 188 188 +v 63.523842 -108.540039 1.000040 188 188 188 +v 63.523842 -108.540039 -0.999959 188 188 188 +v 48.976147 -116.868103 1.000043 188 188 188 +v 63.523842 -108.540039 -0.999959 188 188 188 +v 48.976147 -116.868103 -0.999955 188 188 188 +v 63.523842 -108.540039 -0.999959 188 188 188 +v 47.425320 -117.428368 -0.999955 188 188 188 +v 63.523842 -108.540039 -0.999959 188 188 188 +v 46.601025 -117.499992 -0.999955 188 188 188 +v 47.425320 -117.428368 -0.999955 188 188 188 +v 46.601025 -117.499992 1.000043 188 188 188 +v 46.601025 -117.499992 -0.999955 188 188 188 +v -46.601025 -117.499992 1.000043 188 188 188 +v -46.601025 -117.499992 -0.999955 188 188 188 +v 46.601025 -117.499992 -0.999955 188 188 188 +v -46.601025 -117.499992 1.000043 188 188 188 +v -46.601025 -117.499992 -0.999955 188 188 188 +v -48.224991 -117.215614 -0.999955 188 188 188 +v -47.425320 -117.428368 1.000043 188 188 188 +v -48.224991 -117.215614 1.000043 188 188 188 +v -47.425320 -117.428368 -0.999955 188 188 188 +v 47.425320 -117.428368 -0.999955 188 188 188 +v 48.976147 -116.868103 -0.999955 188 188 188 +v 48.224983 -117.215614 -0.999955 188 188 188 +v 48.976147 -116.868103 -0.999955 188 188 188 +v 47.425320 -117.428368 -0.999955 188 188 188 +v 48.224983 -117.215614 -0.999955 188 188 188 +v 48.976147 -116.868103 1.000043 188 188 188 +v 48.224983 -117.215614 1.000043 188 188 188 +v 48.976147 -116.868103 -0.999955 188 188 188 +v 48.224983 -117.215614 1.000043 188 188 188 +v 47.425320 -117.428368 1.000043 188 188 188 +v 48.224983 -117.215614 -0.999955 188 188 188 +v 47.425320 -117.428368 1.000043 188 188 188 +v 46.601025 -117.499992 1.000043 188 188 188 +v 47.425320 -117.428368 -0.999955 188 188 188 +v -63.523849 -108.540039 1.000040 188 188 188 +v -64.275009 -108.192528 1.000039 188 188 188 +v -64.275009 -108.192528 -0.999959 188 188 188 +v -65.074684 -107.979774 -0.999959 188 188 188 +v -65.074684 -107.979774 1.000039 188 188 188 +v -65.898979 -107.908150 -0.999959 188 188 188 +v -65.898979 -107.908150 -0.999959 188 188 188 +v -112.441063 -103.862495 -0.999960 188 188 188 +v -112.500000 -103.112236 -0.999961 188 188 188 +v -112.500000 -103.112236 -0.999961 188 188 188 +v -112.500000 112.704071 0.999958 188 188 188 +v -112.500000 112.704071 -1.000040 188 188 188 +v -112.500000 112.704071 -1.000040 188 188 188 +v -109.192108 117.265266 -1.000042 188 188 188 +v -108.461655 117.440948 -1.000042 188 188 188 +v -108.461655 117.440948 0.999956 188 188 188 +v -107.712776 117.499992 0.999956 188 188 188 +v -108.461655 117.440948 -1.000042 188 188 188 +v 109.192108 117.265266 -1.000042 188 188 188 +v 109.886116 116.977264 0.999956 188 188 188 +v 109.886116 116.977264 -1.000042 188 188 188 +v 110.526627 116.584053 0.999957 188 188 188 +v 110.526627 116.584053 -1.000042 188 188 188 +v 111.097839 116.095299 0.999957 188 188 188 +v 111.097839 116.095299 -1.000041 188 188 188 +v 111.585709 115.523048 0.999957 188 188 188 +v 111.585709 115.523048 -1.000041 188 188 188 +v 111.978226 114.881371 0.999957 188 188 188 +v 111.978226 114.881371 -1.000041 188 188 188 +v 112.265694 114.186096 0.999957 188 188 188 +v 112.265694 114.186096 -1.000041 188 188 188 +v 112.441063 113.454323 0.999958 188 188 188 +v 112.441063 113.454323 -1.000040 188 188 188 +v 112.500000 112.704071 0.999958 188 188 188 +v 112.500000 112.704071 -1.000040 188 188 188 +v 112.500000 -103.112236 1.000037 188 188 188 +v 112.500000 112.704071 -1.000040 188 188 188 +v 112.500000 -103.112236 1.000037 188 188 188 +v 112.500000 -103.112236 -0.999961 188 188 188 +v 112.441063 -103.862495 1.000038 188 188 188 +v 112.500000 -103.112236 -0.999961 188 188 188 +v 112.441063 -103.862495 -0.999960 188 188 188 +v 112.500000 -103.112236 -0.999961 188 188 188 +v 107.712769 -107.908150 -0.999959 188 188 188 +v 65.898979 -107.908150 -0.999959 188 188 188 +v 112.500000 -103.112236 -0.999961 188 188 188 +v 107.712769 -107.908150 -0.999959 188 188 188 +v 65.898979 -107.908150 -0.999959 188 188 188 +v 65.898979 -107.908150 1.000039 188 188 188 +v 107.712769 -107.908150 -0.999959 188 188 188 +v 107.712769 -107.908150 1.000039 188 188 188 +v 107.712769 -107.908150 -0.999959 188 188 188 +v 107.712769 -107.908150 1.000039 188 188 188 +v 108.461647 -107.849106 -0.999959 188 188 188 +v 108.461647 -107.849106 1.000039 188 188 188 +v 108.461647 -107.849106 -0.999959 188 188 188 +v 108.461647 -107.849106 1.000039 188 188 188 +v 109.192108 -107.673416 -0.999959 188 188 188 +v 109.192108 -107.673416 1.000039 188 188 188 +v 109.192108 -107.673416 -0.999959 188 188 188 +v 109.192108 -107.673416 1.000039 188 188 188 +v 109.886116 -107.385437 -0.999959 188 188 188 +v 109.886116 -107.385437 1.000039 188 188 188 +v 109.886116 -107.385437 -0.999959 188 188 188 +v 109.886116 -107.385437 1.000039 188 188 188 +v 110.526627 -106.992226 -0.999959 188 188 188 +v 110.526627 -106.992226 1.000039 188 188 188 +v 110.526627 -106.992226 -0.999959 188 188 188 +v 110.526627 -106.992226 1.000039 188 188 188 +v 111.097839 -106.503471 -0.999959 188 188 188 +v 111.097839 -106.503471 1.000039 188 188 188 +v 111.097839 -106.503471 -0.999959 188 188 188 +v 111.097839 -106.503471 1.000039 188 188 188 +v 111.585709 -105.931221 -0.999959 188 188 188 +v 111.585709 -105.931221 1.000039 188 188 188 +v 111.585709 -105.931221 -0.999959 188 188 188 +v 111.585709 -105.931221 1.000039 188 188 188 +v 111.978226 -105.289551 -0.999960 188 188 188 +v 111.978226 -105.289551 1.000038 188 188 188 +v 111.978226 -105.289551 -0.999960 188 188 188 +v 111.978226 -105.289551 1.000038 188 188 188 +v 112.265694 -104.594269 -0.999960 188 188 188 +v 112.265694 -104.594269 1.000038 188 188 188 +v 112.265694 -104.594269 -0.999960 188 188 188 +v 112.441063 -103.862495 -0.999960 188 188 188 +v 111.978226 -105.289551 -0.999960 188 188 188 +v 107.712769 -107.908150 -0.999959 188 188 188 +v 112.265694 -104.594269 -0.999960 188 188 188 +v 111.585709 -105.931221 -0.999959 188 188 188 +v 109.886116 -107.385437 -0.999959 188 188 188 +v 111.978226 -105.289551 -0.999960 188 188 188 +v 111.097839 -106.503471 -0.999959 188 188 188 +v 109.886116 -107.385437 -0.999959 188 188 188 +v 111.585709 -105.931221 -0.999959 188 188 188 +v 110.526627 -106.992226 -0.999959 188 188 188 +v 109.886116 -107.385437 -0.999959 188 188 188 +v 111.097839 -106.503471 -0.999959 188 188 188 +v 109.886116 -107.385437 -0.999959 188 188 188 +v 109.192108 -107.673416 -0.999959 188 188 188 +v 111.978226 -105.289551 -0.999960 188 188 188 +v 109.192108 -107.673416 -0.999959 188 188 188 +v 108.461647 -107.849106 -0.999959 188 188 188 +v 111.978226 -105.289551 -0.999960 188 188 188 +v 108.461647 -107.849106 -0.999959 188 188 188 +v 107.712769 -107.908150 -0.999959 188 188 188 +v 111.978226 -105.289551 -0.999960 188 188 188 +v 112.265694 -104.594269 -0.999960 188 188 188 +v 107.712769 -107.908150 -0.999959 188 188 188 +v 112.441063 -103.862495 -0.999960 188 188 188 +v 112.441063 -103.862495 1.000038 188 188 188 +v 112.265694 -104.594269 1.000038 188 188 188 +v 112.441063 -103.862495 -0.999960 188 188 188 +v 65.898979 -107.908150 1.000039 188 188 188 +v 65.074684 -107.979774 -0.999959 188 188 188 +v 65.074684 -107.979774 1.000039 188 188 188 +v 64.275002 -108.192528 1.000039 188 188 188 +v 64.275002 -108.192528 -0.999959 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v -64.275009 -108.192528 -0.999959 188 188 188 +v -107.712776 117.499992 -1.000042 188 188 188 +v 108.461647 117.440948 0.999956 188 188 188 +v 109.192108 117.265266 0.999956 188 188 188 +v 108.461647 117.440948 -1.000042 188 188 188 +v 109.192108 117.265266 0.999956 188 188 188 +v 109.192108 117.265266 -1.000042 188 188 188 +v 108.461647 117.440948 -1.000042 188 188 188 +v 109.886116 116.977264 0.999956 188 188 188 +v 109.886116 116.977264 -1.000042 188 188 188 +v 109.192108 117.265266 -1.000042 188 188 188 +v 110.526627 116.584053 0.999957 188 188 188 +v 110.526627 116.584053 -1.000042 188 188 188 +v 109.886116 116.977264 -1.000042 188 188 188 +v 111.097839 116.095299 0.999957 188 188 188 +v 111.097839 116.095299 -1.000041 188 188 188 +v 110.526627 116.584053 -1.000042 188 188 188 +v 111.585709 115.523048 0.999957 188 188 188 +v 111.585709 115.523048 -1.000041 188 188 188 +v 111.097839 116.095299 -1.000041 188 188 188 +v 111.978226 114.881371 0.999957 188 188 188 +v 111.978226 114.881371 -1.000041 188 188 188 +v 111.585709 115.523048 -1.000041 188 188 188 +v 112.265694 114.186096 0.999957 188 188 188 +v 112.265694 114.186096 -1.000041 188 188 188 +v 111.978226 114.881371 -1.000041 188 188 188 +v 112.441063 113.454323 0.999958 188 188 188 +v 112.441063 113.454323 -1.000040 188 188 188 +v 112.265694 114.186096 -1.000041 188 188 188 +v 112.500000 112.704071 0.999958 188 188 188 +v 112.500000 112.704071 -1.000040 188 188 188 +v 112.441063 113.454323 -1.000040 188 188 188 +v 112.500000 -103.112236 -0.999961 188 188 188 +v 65.898979 -107.908150 -0.999959 188 188 188 +v 112.500000 112.704071 -1.000040 188 188 188 +v 65.898979 -107.908150 1.000039 188 188 188 +v 65.074684 -107.979774 -0.999959 188 188 188 +v 65.898979 -107.908150 -0.999959 188 188 188 +v 65.074684 -107.979774 1.000039 188 188 188 +v 64.275002 -108.192528 -0.999959 188 188 188 +v 65.074684 -107.979774 -0.999959 188 188 188 +v 64.275002 -108.192528 1.000039 188 188 188 +v 63.523842 -108.540039 -0.999959 188 188 188 +v 64.275002 -108.192528 -0.999959 188 188 188 +v 46.601025 -117.499992 -0.999955 188 188 188 +v -46.601025 -117.499992 -0.999955 188 188 188 +v 63.523842 -108.540039 -0.999959 188 188 188 +v -46.601025 -117.499992 -0.999955 188 188 188 +v -47.425320 -117.428368 1.000043 188 188 188 +v -47.425320 -117.428368 -0.999955 188 188 188 +v -47.425320 -117.428368 -0.999955 188 188 188 +v -48.224991 -117.215614 1.000043 188 188 188 +v -48.224991 -117.215614 -0.999955 188 188 188 +v -48.224991 -117.215614 -0.999955 188 188 188 +v -48.976158 -116.868103 1.000043 188 188 188 +v -48.976158 -116.868103 -0.999955 188 188 188 +v -63.523849 -108.540039 -0.999959 188 188 188 +v -64.275009 -108.192528 -0.999959 188 188 188 +v 107.712769 117.499992 -1.000042 188 188 188 +v -63.523849 -108.540039 -0.999959 188 188 188 +v -63.523849 -108.540039 1.000040 188 188 188 +v -64.275009 -108.192528 -0.999959 188 188 188 +v -48.976158 -116.868103 1.000043 188 188 188 +v -63.523849 -108.540039 1.000040 188 188 188 +v -48.976158 -116.868103 -0.999955 188 188 188 + +f 1 2 3 +f 121 122 6 +f 4 123 124 +f 5 125 126 +f 120 127 128 +f 65 129 130 +f 7 131 132 +f 8 133 134 +f 118 135 136 +f 86 137 138 +f 117 139 140 +f 115 141 142 +f 10 143 144 +f 9 145 146 +f 114 147 148 +f 11 149 150 +f 80 151 152 +f 112 153 154 +f 12 155 156 +f 13 157 158 +f 14 159 160 +f 161 162 17 +f 15 163 164 +f 77 165 166 +f 76 167 168 +f 16 169 170 +f 61 171 172 +f 21 173 174 +f 18 175 176 +f 177 19 178 +f 179 20 180 +f 22 23 39 +f 24 181 182 +f 183 184 185 +f 186 27 187 +f 188 26 189 +f 25 190 191 +f 29 192 193 +f 28 194 195 +f 38 196 197 +f 198 199 200 +f 201 30 202 +f 203 31 204 +f 32 205 206 +f 35 207 208 +f 33 209 210 +f 34 211 212 +f 213 214 215 +f 216 36 217 +f 37 218 219 +f 220 221 222 +f 223 224 225 +f 226 227 228 +f 229 230 231 +f 232 233 234 +f 235 236 237 +f 40 238 239 +f 42 240 241 +f 41 242 243 +f 43 244 245 +f 246 247 248 +f 249 44 250 +f 251 62 252 +f 45 253 254 +f 46 255 256 +f 47 257 258 +f 48 259 260 +f 261 262 263 +f 264 52 265 +f 266 49 267 +f 50 268 269 +f 51 270 271 +f 53 272 273 +f 56 274 275 +f 276 277 278 +f 279 59 280 +f 281 54 282 +f 283 55 284 +f 57 285 286 +f 58 287 288 +f 289 290 291 +f 292 293 294 +f 60 295 296 +f 297 298 299 +f 300 301 302 +f 303 304 305 +f 306 307 308 +f 309 310 311 +f 312 313 314 +f 110 63 315 +f 316 64 317 +f 318 72 319 +f 320 67 321 +f 322 119 323 +f 66 324 325 +f 326 68 327 +f 328 329 330 +f 331 69 332 +f 71 70 333 +f 334 335 336 +f 74 337 338 +f 73 339 340 +f 75 341 342 +f 343 344 345 +f 346 347 348 +f 349 350 351 +f 352 353 354 +f 355 356 357 +f 358 359 360 +f 361 362 363 +f 364 365 366 +f 367 368 369 +f 111 78 370 +f 371 79 372 +f 373 113 374 +f 375 81 376 +f 377 82 378 +f 379 83 380 +f 381 84 382 +f 383 116 384 +f 385 85 386 +f 387 87 388 +f 389 88 390 +f 391 89 392 +f 393 90 394 +f 395 396 397 +f 398 91 399 +f 92 400 401 +f 402 403 93 +f 95 404 405 +f 406 407 94 +f 96 408 409 +f 410 411 98 +f 97 412 413 +f 414 415 108 +f 99 416 417 +f 418 419 100 +f 101 420 421 +f 422 423 107 +f 102 424 425 +f 426 427 106 +f 103 428 429 +f 430 431 105 +f 104 432 433 +f 434 435 436 +f 437 438 439 +f 440 441 442 +f 443 444 445 +f 446 447 448 +f 449 450 451 +f 452 453 454 +f 455 456 457 +f 458 459 460 +f 461 462 463 +f 464 109 465 +f 466 467 468 +f 469 470 471 +f 472 473 474 +f 475 476 477 +f 478 479 480 +f 481 482 483 +f 484 485 486 +f 487 488 489 +f 490 491 492 +f 493 494 495 +f 496 497 498 +f 499 500 501 +f 502 503 504 +f 505 506 507 +f 508 509 510 +f 511 512 513 +f 514 515 516 +f 517 518 519 +f 520 521 522 +f 523 524 525 +f 526 527 528 +f 529 530 531 +f 532 533 534 + +vt 0.772312 0.059824 +vt 0.956681 0.977000 +vt 0.042319 0.977000 +vt 0.769123 0.058412 +vt 0.707376 0.024568 +vt 0.704188 0.023156 +vt 0.700794 0.022291 +vt 0.697295 0.022000 +vt 0.229877 0.058412 +vt 0.226688 0.059824 +vt 0.223294 0.060689 +vt 0.219795 0.060980 +vt 0.022000 0.957510 +vt 0.022000 0.080469 +vt 0.042319 0.060980 +vt 0.022250 0.077420 +vt 0.022994 0.074447 +vt 0.024215 0.071621 +vt 0.025881 0.069014 +vt 0.027951 0.066688 +vt 0.030376 0.064702 +vt 0.033094 0.063104 +vt 0.036040 0.061934 +vt 0.039141 0.061220 +vt 0.039141 0.976760 +vt 0.036040 0.976046 +vt 0.033094 0.974876 +vt 0.030376 0.973278 +vt 0.027951 0.971292 +vt 0.025881 0.968966 +vt 0.024215 0.966358 +vt 0.022994 0.963533 +vt 0.022250 0.960559 +vt 0.301705 0.022000 +vt 0.298206 0.022291 +vt 0.291623 0.024568 +vt 0.294812 0.023156 +vt 0.775706 0.060689 +vt 0.779204 0.060980 +vt 0.977000 0.080469 +vt 0.976750 0.077420 +vt 0.976005 0.074447 +vt 0.974785 0.071621 +vt 0.973119 0.069014 +vt 0.971049 0.066688 +vt 0.968624 0.064702 +vt 0.965905 0.063104 +vt 0.962960 0.061934 +vt 0.956681 0.060980 +vt 0.959859 0.061220 +vt 0.977000 0.957510 +vt 0.976750 0.960559 +vt 0.976005 0.963533 +vt 0.974785 0.966358 +vt 0.973119 0.968966 +vt 0.971049 0.971292 +vt 0.968624 0.973278 +vt 0.965905 0.974876 +vt 0.962960 0.976046 +vt 0.959859 0.976760 + +usemtl Mat_0 +f 20/11 19/10 15/3 +f 60/12 20/11 15/3 +f 37/13 60/12 15/3 +f 23/25 37/13 15/3 +f 22/26 37/13 23/25 +f 36/33 37/13 33/32 +f 33/32 37/13 32/31 +f 32/31 37/13 31/30 +f 31/30 37/13 28/29 +f 28/29 37/13 25/28 +f 25/28 37/13 26/27 +f 26/27 37/13 22/26 +f 40/14 60/12 37/13 +f 57/24 58/15 55/23 +f 55/23 58/15 53/22 +f 53/22 58/15 50/21 +f 50/21 58/15 49/20 +f 49/20 58/15 47/19 +f 47/19 58/15 45/18 +f 45/18 58/15 62/17 +f 62/17 58/15 41/16 +f 41/16 58/15 40/14 +f 58/15 60/12 40/14 +f 19/10 2/9 15/3 +f 2/9 66/8 15/3 +f 66/8 75/7 15/3 +f 75/7 73/6 15/3 +f 73/6 64/5 15/3 +f 64/5 63/4 15/3 +f 63/4 110/1 15/3 +f 69/35 68/34 2/9 +f 70/36 69/35 2/9 +f 71/37 69/35 70/36 +f 68/34 66/8 2/9 +f 110/1 14/2 15/3 +f 110/1 109/38 14/2 +f 109/38 91/39 14/2 +f 91/39 85/40 14/2 +f 85/40 116/51 14/2 +f 116/51 84/52 14/2 +f 84/52 83/53 14/2 +f 83/53 82/54 14/2 +f 82/54 81/55 14/2 +f 81/55 113/56 14/2 +f 113/56 79/57 14/2 +f 79/57 78/58 14/2 +f 78/58 111/59 14/2 +f 91/39 103/43 104/42 +f 91/39 104/42 88/41 +f 91/39 102/44 103/43 +f 91/39 101/45 102/44 +f 91/39 99/46 101/45 +f 91/39 97/47 99/46 +f 91/39 96/48 97/47 +f 92/49 95/50 96/48 +f 91/39 92/49 96/48 +f 91/39 88/41 85/40 +f 111/59 13/60 14/2 + diff --git a/resources/meshes/hellbot_hidra_plus.obj b/resources/meshes/hellbot_hidra_plus.obj new file mode 100644 index 0000000000..725c577fc3 --- /dev/null +++ b/resources/meshes/hellbot_hidra_plus.obj @@ -0,0 +1,896 @@ +# Exported from 3D Builder +mtllib hellbot_hidra_plus.mtl + +o Object.1 +v -150.000000 160.000168 -1.000108 188 188 188 +v -91.259621 -159.160385 -0.999880 188 188 188 +v -150.782166 159.938614 -1.000108 188 188 188 +v 155.000000 155.000168 -1.000105 188 188 188 +v 150.000000 -150.000137 -0.999887 188 188 188 +v 150.000000 160.000168 -1.000108 188 188 188 +v 154.045105 157.939102 -1.000107 188 188 188 +v -150.782166 159.938614 0.999893 188 188 188 +v 150.782166 159.938614 -1.000108 188 188 188 +v 150.782166 159.938614 0.999893 188 188 188 +v -151.545074 159.755463 -1.000108 188 188 188 +v 152.269958 159.455200 -1.000108 188 188 188 +v 151.545074 159.755463 -1.000108 188 188 188 +v -152.938934 159.045258 -1.000108 188 188 188 +v -152.269958 159.455200 -1.000108 188 188 188 +v 152.938934 159.045258 -1.000108 188 188 188 +v 152.269958 159.455200 0.999894 188 188 188 +v 153.535522 158.535706 0.999894 188 188 188 +v -153.535522 158.535706 -1.000107 188 188 188 +v -154.045090 157.939102 -1.000107 188 188 188 +v 153.535522 158.535706 -1.000107 188 188 188 +v -154.455032 157.270126 -1.000107 188 188 188 +v 154.755280 156.545258 -1.000106 188 188 188 +v 154.455048 157.270126 -1.000107 188 188 188 +v 154.755280 156.545258 0.999896 188 188 188 +v -154.755280 156.545258 0.999896 188 188 188 +v -154.455032 157.270126 0.999895 188 188 188 +v -154.755280 156.545258 -1.000106 188 188 188 +v 154.938446 155.782349 -1.000106 188 188 188 +v -155.000000 155.000168 -1.000105 188 188 188 +v -154.938446 155.782349 -1.000106 188 188 188 +v 155.000000 155.000168 0.999897 188 188 188 +v -155.000000 -145.000137 -0.999890 188 188 188 +v -154.938446 155.782349 0.999897 188 188 188 +v 155.000000 -145.000137 -0.999890 188 188 188 +v -154.938446 -145.782303 -0.999890 188 188 188 +v 150.782166 -149.938553 -0.999887 188 188 188 +v 154.938446 -145.782303 -0.999890 188 188 188 +v -105.781517 -150.054062 -0.999887 188 188 188 +v 154.755280 -146.545212 -0.999889 188 188 188 +v -154.455032 -147.270096 -0.999889 188 188 188 +v -154.755280 -146.545212 -0.999889 188 188 188 +v -154.938446 -145.782303 1.000112 188 188 188 +v -154.755280 -146.545212 1.000113 188 188 188 +v 154.455048 -147.270096 -0.999889 188 188 188 +v -154.455032 -147.270096 1.000113 188 188 188 +v 154.045105 -147.939041 1.000114 188 188 188 +v -153.535522 -148.535660 -0.999888 188 188 188 +v -154.045090 -147.939041 1.000114 188 188 188 +v -154.045090 -147.939041 -0.999888 188 188 188 +v 151.545074 -149.755417 -0.999887 188 188 188 +v 154.045105 -147.939041 -0.999888 188 188 188 +v 153.535522 -148.535660 -0.999888 188 188 188 +v -106.513878 -150.000137 -0.999887 188 188 188 +v -152.938934 -149.045212 -0.999887 188 188 188 +v 152.269958 -149.455154 -0.999887 188 188 188 +v 152.938934 -149.045212 1.000114 188 188 188 +v 152.938934 -149.045212 -0.999887 188 188 188 +v -152.938934 -149.045212 1.000114 188 188 188 +v -152.269958 -149.455154 -0.999887 188 188 188 +v 151.545074 -149.755417 1.000115 188 188 188 +v -150.000000 -150.000137 -0.999887 188 188 188 +v -150.782166 -149.938553 -0.999887 188 188 188 +v -151.545074 -149.755417 -0.999887 188 188 188 +v -151.545074 -149.755417 1.000115 188 188 188 +v 150.782166 -149.938553 1.000115 188 188 188 +v -150.782166 -149.938553 1.000115 188 188 188 +v 150.000000 -150.000137 1.000115 188 188 188 +v -150.000000 -150.000137 1.000115 188 188 188 +v -106.513878 -150.000137 1.000115 188 188 188 +v 106.513885 -150.000137 -0.999887 188 188 188 +v -105.064957 -150.214676 1.000115 188 188 188 +v 105.781525 -150.054062 -0.999887 188 188 188 +v -105.064957 -150.214676 -0.999887 188 188 188 +v 105.064972 -150.214676 -0.999887 188 188 188 +v -103.740379 -150.839890 1.000116 188 188 188 +v -104.379646 -150.478500 -0.999886 188 188 188 +v -104.379646 -150.478500 1.000115 188 188 188 +v 104.379639 -150.478500 -0.999886 188 188 188 +v -103.740379 -150.839890 -0.999886 188 188 188 +v 89.218491 -159.946213 -0.999880 188 188 188 +v 103.740387 -150.839890 1.000116 188 188 188 +v 103.740387 -150.839890 -0.999886 188 188 188 +v 91.259628 -159.160385 -0.999880 188 188 188 +v 90.620361 -159.521744 1.000122 188 188 188 +v -90.620354 -159.521744 1.000122 188 188 188 +v -90.620354 -159.521744 -0.999880 188 188 188 +v 89.935043 -159.785599 -0.999880 188 188 188 +v 90.620361 -159.521744 -0.999880 188 188 188 +v -89.935043 -159.785599 -0.999880 188 188 188 +v 89.935043 -159.785599 1.000122 188 188 188 +v -89.218483 -159.946213 -0.999880 188 188 188 +v -88.486122 -160.000137 -0.999880 188 188 188 +v 89.218491 -159.946213 1.000122 188 188 188 +v 88.486115 -160.000137 -0.999880 188 188 188 +v -89.218483 -159.946213 1.000122 188 188 188 +v -150.000000 160.000168 0.999893 188 188 188 +v -105.781517 -150.054062 1.000115 188 188 188 +v 104.379639 -150.478500 1.000115 188 188 188 +v 91.259628 -159.160385 1.000122 188 188 188 +v 150.000000 160.000168 0.999893 188 188 188 +v -155.000000 155.000168 0.999897 188 188 188 +v 151.545074 159.755463 0.999894 188 188 188 +v -151.545074 159.755463 0.999894 188 188 188 +v 105.064972 -150.214676 1.000115 188 188 188 +v -152.938934 159.045258 0.999894 188 188 188 +v -152.269958 159.455200 0.999894 188 188 188 +v 152.938934 159.045258 0.999894 188 188 188 +v -153.535522 158.535706 0.999894 188 188 188 +v -154.045090 157.939102 0.999895 188 188 188 +v 154.045105 157.939102 0.999895 188 188 188 +v 154.455048 157.270126 0.999895 188 188 188 +v 154.938446 155.782349 0.999897 188 188 188 +v -155.000000 -145.000137 1.000112 188 188 188 +v 155.000000 -145.000137 1.000112 188 188 188 +v -153.535522 -148.535660 1.000114 188 188 188 +v -152.269958 -149.455154 1.000115 188 188 188 +v 154.755280 -146.545212 1.000113 188 188 188 +v 154.938446 -145.782303 1.000112 188 188 188 +v 105.781525 -150.054062 1.000115 188 188 188 +v 154.455048 -147.270096 1.000113 188 188 188 +v 153.535522 -148.535660 1.000114 188 188 188 +v 106.513885 -150.000137 1.000115 188 188 188 +v 152.269958 -149.455154 1.000115 188 188 188 +v 88.486115 -160.000137 1.000122 188 188 188 +v -91.259621 -159.160385 1.000122 188 188 188 +v -88.486122 -160.000137 1.000122 188 188 188 +v -89.935043 -159.785599 1.000122 188 188 188 + +v 150.000000 160.000168 0.999893 188 188 188 +v -150.000000 160.000168 -1.000108 188 188 188 +v -150.000000 160.000168 0.999893 188 188 188 +v -150.000000 160.000168 -1.000108 188 188 188 +v -150.782166 159.938614 -1.000108 188 188 188 +v -150.000000 160.000168 -1.000108 188 188 188 +v -105.064957 -150.214676 -0.999887 188 188 188 +v -150.000000 160.000168 -1.000108 188 188 188 +v -104.379646 -150.478500 -0.999886 188 188 188 +v -150.000000 160.000168 -1.000108 188 188 188 +v -103.740379 -150.839890 -0.999886 188 188 188 +v -150.000000 160.000168 -1.000108 188 188 188 +v -91.259621 -159.160385 -0.999880 188 188 188 +v -150.000000 160.000168 -1.000108 188 188 188 +v -90.620354 -159.521744 -0.999880 188 188 188 +v -150.000000 160.000168 -1.000108 188 188 188 +v -89.935043 -159.785599 -0.999880 188 188 188 +v -150.000000 160.000168 -1.000108 188 188 188 +v -89.218483 -159.946213 -0.999880 188 188 188 +v -150.000000 160.000168 -1.000108 188 188 188 +v -88.486122 -160.000137 -0.999880 188 188 188 +v -150.000000 160.000168 -1.000108 188 188 188 +v 104.379639 -150.478500 -0.999886 188 188 188 +v -150.000000 160.000168 -1.000108 188 188 188 +v 105.064972 -150.214676 -0.999887 188 188 188 +v -150.000000 160.000168 -1.000108 188 188 188 +v 105.064972 -150.214676 -0.999887 188 188 188 +v 105.781525 -150.054062 -0.999887 188 188 188 +v 105.781525 -150.054062 1.000115 188 188 188 +v 105.781525 -150.054062 -0.999887 188 188 188 +v 106.513885 -150.000137 1.000115 188 188 188 +v 105.781525 -150.054062 -0.999887 188 188 188 +v 106.513885 -150.000137 1.000115 188 188 188 +v 106.513885 -150.000137 -0.999887 188 188 188 +v 150.000000 -150.000137 -0.999887 188 188 188 +v 106.513885 -150.000137 -0.999887 188 188 188 +v 150.000000 160.000168 -1.000108 188 188 188 +v 150.000000 -150.000137 -0.999887 188 188 188 +v 150.000000 160.000168 -1.000108 188 188 188 +v 155.000000 155.000168 -1.000105 188 188 188 +v 150.000000 160.000168 -1.000108 188 188 188 +v 154.938446 155.782349 -1.000106 188 188 188 +v 150.000000 160.000168 -1.000108 188 188 188 +v 154.755280 156.545258 -1.000106 188 188 188 +v 150.000000 160.000168 -1.000108 188 188 188 +v 154.455048 157.270126 -1.000107 188 188 188 +v 150.000000 160.000168 -1.000108 188 188 188 +v 154.045105 157.939102 -1.000107 188 188 188 +v 150.000000 160.000168 -1.000108 188 188 188 +v 153.535522 158.535706 -1.000107 188 188 188 +v 150.000000 160.000168 -1.000108 188 188 188 +v 150.782166 159.938614 -1.000108 188 188 188 +v 150.000000 160.000168 -1.000108 188 188 188 +v 150.782166 159.938614 0.999893 188 188 188 +v 150.782166 159.938614 -1.000108 188 188 188 +v 151.545074 159.755463 0.999894 188 188 188 +v 150.782166 159.938614 -1.000108 188 188 188 +v 151.545074 159.755463 0.999894 188 188 188 +v 151.545074 159.755463 -1.000108 188 188 188 +v 152.269958 159.455200 0.999894 188 188 188 +v 151.545074 159.755463 -1.000108 188 188 188 +v 152.269958 159.455200 -1.000108 188 188 188 +v 151.545074 159.755463 -1.000108 188 188 188 +v 152.938934 159.045258 -1.000108 188 188 188 +v 153.535522 158.535706 -1.000107 188 188 188 +v 151.545074 159.755463 -1.000108 188 188 188 +v 153.535522 158.535706 -1.000107 188 188 188 +v 152.938934 159.045258 -1.000108 188 188 188 +v 153.535522 158.535706 0.999894 188 188 188 +v 152.938934 159.045258 -1.000108 188 188 188 +v 154.045105 157.939102 -1.000107 188 188 188 +v 154.455048 157.270126 0.999895 188 188 188 +v 154.455048 157.270126 -1.000107 188 188 188 +v 154.755280 156.545258 0.999896 188 188 188 +v 154.755280 156.545258 -1.000106 188 188 188 +v 154.938446 155.782349 0.999897 188 188 188 +v 154.938446 155.782349 -1.000106 188 188 188 +v 155.000000 155.000168 0.999897 188 188 188 +v 155.000000 155.000168 -1.000105 188 188 188 +v 155.000000 -145.000137 1.000112 188 188 188 +v 155.000000 155.000168 -1.000105 188 188 188 +v 155.000000 -145.000137 1.000112 188 188 188 +v 155.000000 -145.000137 -0.999890 188 188 188 +v 154.938446 -145.782303 1.000112 188 188 188 +v 155.000000 -145.000137 -0.999890 188 188 188 +v 154.938446 -145.782303 -0.999890 188 188 188 +v 155.000000 -145.000137 -0.999890 188 188 188 +v 151.545074 -149.755417 -0.999887 188 188 188 +v 155.000000 -145.000137 -0.999890 188 188 188 +v 150.782166 -149.938553 -0.999887 188 188 188 +v 150.000000 -150.000137 -0.999887 188 188 188 +v 155.000000 -145.000137 -0.999890 188 188 188 +v 150.000000 -150.000137 -0.999887 188 188 188 +v 150.782166 -149.938553 -0.999887 188 188 188 +v 150.000000 -150.000137 1.000115 188 188 188 +v 150.782166 -149.938553 -0.999887 188 188 188 +v 154.755280 -146.545212 1.000113 188 188 188 +v 154.755280 -146.545212 -0.999889 188 188 188 +v 154.938446 -145.782303 -0.999890 188 188 188 +v 154.455048 -147.270096 1.000113 188 188 188 +v 154.755280 -146.545212 -0.999889 188 188 188 +v 154.455048 -147.270096 -0.999889 188 188 188 +v 151.545074 -149.755417 -0.999887 188 188 188 +v 154.755280 -146.545212 -0.999889 188 188 188 +v 151.545074 -149.755417 -0.999887 188 188 188 +v 154.455048 -147.270096 -0.999889 188 188 188 +v 154.045105 -147.939041 -0.999888 188 188 188 +v 154.455048 -147.270096 -0.999889 188 188 188 +v 151.545074 -149.755417 -0.999887 188 188 188 +v 154.045105 -147.939041 -0.999888 188 188 188 +v 153.535522 -148.535660 -0.999888 188 188 188 +v 154.045105 -147.939041 -0.999888 188 188 188 +v 151.545074 -149.755417 -0.999887 188 188 188 +v 153.535522 -148.535660 -0.999888 188 188 188 +v 152.938934 -149.045212 -0.999887 188 188 188 +v 153.535522 -148.535660 -0.999888 188 188 188 +v 151.545074 -149.755417 -0.999887 188 188 188 +v 152.938934 -149.045212 -0.999887 188 188 188 +v 152.269958 -149.455154 -0.999887 188 188 188 +v 152.938934 -149.045212 -0.999887 188 188 188 +v 151.545074 -149.755417 -0.999887 188 188 188 +v 152.269958 -149.455154 -0.999887 188 188 188 +v 154.455048 -147.270096 1.000113 188 188 188 +v 154.045105 -147.939041 1.000114 188 188 188 +v 154.455048 -147.270096 -0.999889 188 188 188 +v 154.045105 -147.939041 1.000114 188 188 188 +v 153.535522 -148.535660 1.000114 188 188 188 +v 154.045105 -147.939041 -0.999888 188 188 188 +v 153.535522 -148.535660 1.000114 188 188 188 +v 152.938934 -149.045212 1.000114 188 188 188 +v 153.535522 -148.535660 -0.999888 188 188 188 +v 152.938934 -149.045212 1.000114 188 188 188 +v 152.269958 -149.455154 1.000115 188 188 188 +v 152.938934 -149.045212 -0.999887 188 188 188 +v 152.269958 -149.455154 1.000115 188 188 188 +v 151.545074 -149.755417 1.000115 188 188 188 +v 152.269958 -149.455154 -0.999887 188 188 188 +v 151.545074 -149.755417 1.000115 188 188 188 +v 150.782166 -149.938553 1.000115 188 188 188 +v 151.545074 -149.755417 -0.999887 188 188 188 +v 150.782166 -149.938553 1.000115 188 188 188 +v 150.782166 -149.938553 -0.999887 188 188 188 +v 151.545074 -149.755417 -0.999887 188 188 188 +v 154.755280 -146.545212 -0.999889 188 188 188 +v 151.545074 -149.755417 -0.999887 188 188 188 +v 154.938446 -145.782303 -0.999890 188 188 188 +v 154.938446 -145.782303 1.000112 188 188 188 +v 154.755280 -146.545212 1.000113 188 188 188 +v 154.938446 -145.782303 -0.999890 188 188 188 +v 153.535522 158.535706 0.999894 188 188 188 +v 154.045105 157.939102 0.999895 188 188 188 +v 153.535522 158.535706 -1.000107 188 188 188 +v 152.938934 159.045258 0.999894 188 188 188 +v 152.938934 159.045258 -1.000108 188 188 188 +v 152.269958 159.455200 -1.000108 188 188 188 +v 152.269958 159.455200 0.999894 188 188 188 +v 152.938934 159.045258 0.999894 188 188 188 +v 152.269958 159.455200 -1.000108 188 188 188 +v -105.064957 -150.214676 -0.999887 188 188 188 +v -105.064957 -150.214676 1.000115 188 188 188 +v -105.781517 -150.054062 -0.999887 188 188 188 +v -105.064957 -150.214676 -0.999887 188 188 188 +v -105.781517 -150.054062 -0.999887 188 188 188 +v -105.064957 -150.214676 -0.999887 188 188 188 +v -155.000000 155.000168 -1.000105 188 188 188 +v -105.064957 -150.214676 -0.999887 188 188 188 +v -154.938446 155.782349 -1.000106 188 188 188 +v -105.064957 -150.214676 -0.999887 188 188 188 +v -154.755280 156.545258 -1.000106 188 188 188 +v -105.064957 -150.214676 -0.999887 188 188 188 +v -154.455032 157.270126 -1.000107 188 188 188 +v -105.064957 -150.214676 -0.999887 188 188 188 +v -154.045090 157.939102 -1.000107 188 188 188 +v -105.064957 -150.214676 -0.999887 188 188 188 +v -153.535522 158.535706 -1.000107 188 188 188 +v -105.064957 -150.214676 -0.999887 188 188 188 +v -152.938934 159.045258 -1.000108 188 188 188 +v -105.064957 -150.214676 -0.999887 188 188 188 +v -152.269958 159.455200 -1.000108 188 188 188 +v -152.269958 159.455200 -1.000108 188 188 188 +v -151.545074 159.755463 -1.000108 188 188 188 +v -151.545074 159.755463 0.999894 188 188 188 +v -151.545074 159.755463 -1.000108 188 188 188 +v -151.545074 159.755463 -1.000108 188 188 188 +v -150.782166 159.938614 0.999893 188 188 188 +v -150.782166 159.938614 -1.000108 188 188 188 +v -105.781517 -150.054062 1.000115 188 188 188 +v -106.513878 -150.000137 1.000115 188 188 188 +v -106.513878 -150.000137 -0.999887 188 188 188 +v -106.513878 -150.000137 -0.999887 188 188 188 +v -150.000000 -150.000137 1.000115 188 188 188 +v -106.513878 -150.000137 -0.999887 188 188 188 +v -150.000000 -150.000137 -0.999887 188 188 188 +v -106.513878 -150.000137 -0.999887 188 188 188 +v -151.545074 -149.755417 -0.999887 188 188 188 +v -106.513878 -150.000137 -0.999887 188 188 188 +v -152.269958 -149.455154 -0.999887 188 188 188 +v -106.513878 -150.000137 -0.999887 188 188 188 +v -152.938934 -149.045212 -0.999887 188 188 188 +v -106.513878 -150.000137 -0.999887 188 188 188 +v -153.535522 -148.535660 -0.999888 188 188 188 +v -106.513878 -150.000137 -0.999887 188 188 188 +v -154.045090 -147.939041 -0.999888 188 188 188 +v -106.513878 -150.000137 -0.999887 188 188 188 +v -154.455032 -147.270096 -0.999889 188 188 188 +v -106.513878 -150.000137 -0.999887 188 188 188 +v -154.755280 -146.545212 -0.999889 188 188 188 +v -105.781517 -150.054062 -0.999887 188 188 188 +v -106.513878 -150.000137 -0.999887 188 188 188 +v -154.938446 -145.782303 -0.999890 188 188 188 +v -105.781517 -150.054062 -0.999887 188 188 188 +v -154.938446 -145.782303 -0.999890 188 188 188 +v -154.938446 -145.782303 -0.999890 188 188 188 +v -155.000000 -145.000137 -0.999890 188 188 188 +v -155.000000 -145.000137 1.000112 188 188 188 +v -155.000000 -145.000137 -0.999890 188 188 188 +v -155.000000 -145.000137 -0.999890 188 188 188 +v -155.000000 155.000168 0.999897 188 188 188 +v -155.000000 155.000168 -1.000105 188 188 188 +v -155.000000 155.000168 0.999897 188 188 188 +v -155.000000 155.000168 -1.000105 188 188 188 +v -155.000000 -145.000137 1.000112 188 188 188 +v -154.938446 -145.782303 -0.999890 188 188 188 +v -150.000000 -150.000137 -0.999887 188 188 188 +v -150.782166 -149.938553 1.000115 188 188 188 +v -150.782166 -149.938553 -0.999887 188 188 188 +v -150.782166 -149.938553 -0.999887 188 188 188 +v -151.545074 -149.755417 1.000115 188 188 188 +v -151.545074 -149.755417 -0.999887 188 188 188 +v -151.545074 -149.755417 1.000115 188 188 188 +v -151.545074 -149.755417 -0.999887 188 188 188 +v -152.269958 -149.455154 1.000115 188 188 188 +v -152.269958 -149.455154 -0.999887 188 188 188 +v -152.938934 -149.045212 1.000114 188 188 188 +v -152.938934 -149.045212 -0.999887 188 188 188 +v -153.535522 -148.535660 1.000114 188 188 188 +v -153.535522 -148.535660 -0.999888 188 188 188 +v -154.045090 -147.939041 1.000114 188 188 188 +v -154.045090 -147.939041 -0.999888 188 188 188 +v -154.455032 -147.270096 1.000113 188 188 188 +v -154.455032 -147.270096 -0.999889 188 188 188 +v -154.755280 -146.545212 1.000113 188 188 188 +v -154.938446 -145.782303 1.000112 188 188 188 +v -154.755280 -146.545212 -0.999889 188 188 188 +v -154.755280 -146.545212 -0.999889 188 188 188 +v -154.938446 -145.782303 1.000112 188 188 188 +v -154.938446 -145.782303 -0.999890 188 188 188 +v -154.455032 -147.270096 -0.999889 188 188 188 +v -154.755280 -146.545212 1.000113 188 188 188 +v -154.755280 -146.545212 -0.999889 188 188 188 +v -154.045090 -147.939041 -0.999888 188 188 188 +v -154.455032 -147.270096 1.000113 188 188 188 +v -154.455032 -147.270096 -0.999889 188 188 188 +v -153.535522 -148.535660 -0.999888 188 188 188 +v -154.045090 -147.939041 1.000114 188 188 188 +v -154.045090 -147.939041 -0.999888 188 188 188 +v -152.938934 -149.045212 -0.999887 188 188 188 +v -153.535522 -148.535660 1.000114 188 188 188 +v -153.535522 -148.535660 -0.999888 188 188 188 +v -152.269958 -149.455154 -0.999887 188 188 188 +v -152.938934 -149.045212 1.000114 188 188 188 +v -152.938934 -149.045212 -0.999887 188 188 188 +v -151.545074 -149.755417 -0.999887 188 188 188 +v -152.269958 -149.455154 1.000115 188 188 188 +v -152.269958 -149.455154 -0.999887 188 188 188 +v -150.000000 -150.000137 -0.999887 188 188 188 +v -150.782166 -149.938553 -0.999887 188 188 188 +v -151.545074 -149.755417 -0.999887 188 188 188 +v -150.000000 -150.000137 1.000115 188 188 188 +v -150.782166 -149.938553 1.000115 188 188 188 +v -150.000000 -150.000137 -0.999887 188 188 188 +v -152.938934 159.045258 -1.000108 188 188 188 +v -152.938934 159.045258 0.999894 188 188 188 +v -153.535522 158.535706 -1.000107 188 188 188 +v -153.535522 158.535706 0.999894 188 188 188 +v -154.045090 157.939102 -1.000107 188 188 188 +v -154.045090 157.939102 0.999895 188 188 188 +v -154.455032 157.270126 -1.000107 188 188 188 +v -154.455032 157.270126 0.999895 188 188 188 +v -154.755280 156.545258 -1.000106 188 188 188 +v -154.938446 155.782349 0.999897 188 188 188 +v -154.755280 156.545258 0.999896 188 188 188 +v -154.938446 155.782349 -1.000106 188 188 188 +v -152.269958 159.455200 0.999894 188 188 188 +v -151.545074 159.755463 0.999894 188 188 188 +v -152.269958 159.455200 -1.000108 188 188 188 +v -152.938934 159.045258 -1.000108 188 188 188 +v -152.269958 159.455200 0.999894 188 188 188 +v -152.269958 159.455200 -1.000108 188 188 188 +v -153.535522 158.535706 -1.000107 188 188 188 +v -152.938934 159.045258 0.999894 188 188 188 +v -152.938934 159.045258 -1.000108 188 188 188 +v -154.045090 157.939102 -1.000107 188 188 188 +v -153.535522 158.535706 0.999894 188 188 188 +v -153.535522 158.535706 -1.000107 188 188 188 +v -154.455032 157.270126 -1.000107 188 188 188 +v -154.045090 157.939102 0.999895 188 188 188 +v -154.045090 157.939102 -1.000107 188 188 188 +v -154.755280 156.545258 -1.000106 188 188 188 +v -154.455032 157.270126 0.999895 188 188 188 +v -154.455032 157.270126 -1.000107 188 188 188 +v -154.938446 155.782349 -1.000106 188 188 188 +v -154.755280 156.545258 0.999896 188 188 188 +v -154.755280 156.545258 -1.000106 188 188 188 +v -155.000000 155.000168 -1.000105 188 188 188 +v -154.938446 155.782349 0.999897 188 188 188 +v -154.938446 155.782349 -1.000106 188 188 188 +v -105.781517 -150.054062 -0.999887 188 188 188 +v -155.000000 -145.000137 -0.999890 188 188 188 +v -155.000000 155.000168 -1.000105 188 188 188 +v -105.781517 -150.054062 -0.999887 188 188 188 +v -105.781517 -150.054062 1.000115 188 188 188 +v -106.513878 -150.000137 -0.999887 188 188 188 +v -105.064957 -150.214676 1.000115 188 188 188 +v -105.064957 -150.214676 -0.999887 188 188 188 +v -104.379646 -150.478500 1.000115 188 188 188 +v -104.379646 -150.478500 -0.999886 188 188 188 +v -103.740379 -150.839890 1.000116 188 188 188 +v -91.259621 -159.160385 -0.999880 188 188 188 +v -91.259621 -159.160385 1.000122 188 188 188 +v -90.620354 -159.521744 -0.999880 188 188 188 +v -90.620354 -159.521744 1.000122 188 188 188 +v -89.935043 -159.785599 -0.999880 188 188 188 +v -89.935043 -159.785599 1.000122 188 188 188 +v -89.218483 -159.946213 -0.999880 188 188 188 +v -89.218483 -159.946213 1.000122 188 188 188 +v -88.486122 -160.000137 -0.999880 188 188 188 +v -88.486122 -160.000137 1.000122 188 188 188 +v -88.486122 -160.000137 -0.999880 188 188 188 +v 88.486115 -160.000137 -0.999880 188 188 188 +v -88.486122 -160.000137 -0.999880 188 188 188 +v 88.486115 -160.000137 -0.999880 188 188 188 +v 103.740387 -150.839890 -0.999886 188 188 188 +v 89.218491 -159.946213 -0.999880 188 188 188 +v 103.740387 -150.839890 -0.999886 188 188 188 +v 89.935043 -159.785599 -0.999880 188 188 188 +v 103.740387 -150.839890 -0.999886 188 188 188 +v 91.259628 -159.160385 -0.999880 188 188 188 +v 103.740387 -150.839890 -0.999886 188 188 188 +v 89.935043 -159.785599 -0.999880 188 188 188 +v 91.259628 -159.160385 -0.999880 188 188 188 +v 90.620361 -159.521744 -0.999880 188 188 188 +v 91.259628 -159.160385 -0.999880 188 188 188 +v 89.935043 -159.785599 -0.999880 188 188 188 +v 90.620361 -159.521744 -0.999880 188 188 188 +v 89.218491 -159.946213 -0.999880 188 188 188 +v 89.935043 -159.785599 -0.999880 188 188 188 +v 88.486115 -160.000137 -0.999880 188 188 188 +v 89.218491 -159.946213 -0.999880 188 188 188 +v 88.486115 -160.000137 1.000122 188 188 188 +v -88.486122 -160.000137 1.000122 188 188 188 +v 88.486115 -160.000137 -0.999880 188 188 188 +v 89.218491 -159.946213 1.000122 188 188 188 +v 88.486115 -160.000137 1.000122 188 188 188 +v 89.218491 -159.946213 -0.999880 188 188 188 +v 89.935043 -159.785599 1.000122 188 188 188 +v 89.218491 -159.946213 1.000122 188 188 188 +v 89.935043 -159.785599 -0.999880 188 188 188 +v 90.620361 -159.521744 1.000122 188 188 188 +v 89.935043 -159.785599 1.000122 188 188 188 +v 90.620361 -159.521744 -0.999880 188 188 188 +v 91.259628 -159.160385 1.000122 188 188 188 +v 90.620361 -159.521744 1.000122 188 188 188 +v 91.259628 -159.160385 -0.999880 188 188 188 +v 91.259628 -159.160385 1.000122 188 188 188 +v 103.740387 -150.839890 -0.999886 188 188 188 +v 103.740387 -150.839890 1.000116 188 188 188 +v 103.740387 -150.839890 -0.999886 188 188 188 +v 104.379639 -150.478500 1.000115 188 188 188 +v 103.740387 -150.839890 -0.999886 188 188 188 +v 104.379639 -150.478500 -0.999886 188 188 188 +v 104.379639 -150.478500 1.000115 188 188 188 +v 104.379639 -150.478500 -0.999886 188 188 188 +v 151.545074 159.755463 -1.000108 188 188 188 +v 153.535522 158.535706 -1.000107 188 188 188 +v 150.782166 159.938614 -1.000108 188 188 188 +v 154.045105 157.939102 0.999895 188 188 188 +v 154.045105 157.939102 -1.000107 188 188 188 +v 153.535522 158.535706 -1.000107 188 188 188 +v 154.455048 157.270126 0.999895 188 188 188 +v 154.455048 157.270126 -1.000107 188 188 188 +v 154.045105 157.939102 -1.000107 188 188 188 +v 154.755280 156.545258 0.999896 188 188 188 +v 154.755280 156.545258 -1.000106 188 188 188 +v 154.455048 157.270126 -1.000107 188 188 188 +v 154.938446 155.782349 0.999897 188 188 188 +v 154.938446 155.782349 -1.000106 188 188 188 +v 154.755280 156.545258 -1.000106 188 188 188 +v 155.000000 155.000168 0.999897 188 188 188 +v 155.000000 155.000168 -1.000105 188 188 188 +v 154.938446 155.782349 -1.000106 188 188 188 +v 155.000000 -145.000137 -0.999890 188 188 188 +v 150.000000 -150.000137 -0.999887 188 188 188 +v 155.000000 155.000168 -1.000105 188 188 188 +v 150.000000 -150.000137 1.000115 188 188 188 +v 106.513885 -150.000137 1.000115 188 188 188 +v 150.000000 -150.000137 -0.999887 188 188 188 +v 106.513885 -150.000137 -0.999887 188 188 188 +v 105.781525 -150.054062 -0.999887 188 188 188 +v 150.000000 160.000168 -1.000108 188 188 188 +v 105.781525 -150.054062 1.000115 188 188 188 +v 105.064972 -150.214676 1.000115 188 188 188 +v 105.064972 -150.214676 -0.999887 188 188 188 +v 105.064972 -150.214676 1.000115 188 188 188 +v 104.379639 -150.478500 -0.999886 188 188 188 +v 105.064972 -150.214676 -0.999887 188 188 188 +v 103.740387 -150.839890 -0.999886 188 188 188 +v -88.486122 -160.000137 -0.999880 188 188 188 +v 104.379639 -150.478500 -0.999886 188 188 188 +v -88.486122 -160.000137 -0.999880 188 188 188 +v -89.218483 -159.946213 1.000122 188 188 188 +v -89.218483 -159.946213 -0.999880 188 188 188 +v -89.218483 -159.946213 -0.999880 188 188 188 +v -89.935043 -159.785599 1.000122 188 188 188 +v -89.935043 -159.785599 -0.999880 188 188 188 +v -89.935043 -159.785599 -0.999880 188 188 188 +v -90.620354 -159.521744 1.000122 188 188 188 +v -90.620354 -159.521744 -0.999880 188 188 188 +v -90.620354 -159.521744 -0.999880 188 188 188 +v -91.259621 -159.160385 1.000122 188 188 188 +v -91.259621 -159.160385 -0.999880 188 188 188 +v -91.259621 -159.160385 -0.999880 188 188 188 +v -103.740379 -150.839890 1.000116 188 188 188 +v -103.740379 -150.839890 -0.999886 188 188 188 +v -103.740379 -150.839890 -0.999886 188 188 188 +v -103.740379 -150.839890 1.000116 188 188 188 +v -104.379646 -150.478500 -0.999886 188 188 188 +v -104.379646 -150.478500 -0.999886 188 188 188 +v -104.379646 -150.478500 1.000115 188 188 188 +v -105.064957 -150.214676 -0.999887 188 188 188 +v -105.064957 -150.214676 -0.999887 188 188 188 +v -151.545074 159.755463 -1.000108 188 188 188 +v -150.782166 159.938614 -1.000108 188 188 188 +v -150.782166 159.938614 0.999893 188 188 188 +v -150.000000 160.000168 0.999893 188 188 188 +v -150.782166 159.938614 -1.000108 188 188 188 +v 150.000000 160.000168 -1.000108 188 188 188 +v 105.781525 -150.054062 -0.999887 188 188 188 +v -150.000000 160.000168 -1.000108 188 188 188 +v 150.000000 160.000168 0.999893 188 188 188 +v 150.782166 159.938614 0.999893 188 188 188 +v 150.000000 160.000168 -1.000108 188 188 188 + +f 101 6 1 +f 97 129 130 +f 3 131 132 +f 74 133 134 +f 77 135 136 +f 80 137 138 +f 2 139 140 +f 87 141 142 +f 90 143 144 +f 92 145 146 +f 93 147 148 +f 79 149 150 +f 75 151 152 +f 73 153 154 +f 120 155 156 +f 123 157 158 +f 159 160 71 +f 5 161 162 +f 163 164 165 +f 4 166 167 +f 29 168 169 +f 23 170 171 +f 24 172 173 +f 7 174 175 +f 21 176 177 +f 9 178 179 +f 10 180 181 +f 182 103 183 +f 184 13 185 +f 186 17 187 +f 188 12 189 +f 190 16 191 +f 192 193 194 +f 18 195 196 +f 108 197 198 +f 111 112 199 +f 200 25 201 +f 202 113 203 +f 204 32 205 +f 206 115 207 +f 208 35 209 +f 210 119 211 +f 212 38 213 +f 214 51 215 +f 216 37 217 +f 218 219 220 +f 68 221 222 +f 66 223 224 +f 118 121 40 +f 225 226 227 +f 228 45 229 +f 230 231 232 +f 52 233 234 +f 47 235 236 +f 53 237 238 +f 122 239 240 +f 58 241 242 +f 57 243 244 +f 56 245 246 +f 124 247 248 +f 61 249 250 +f 251 252 253 +f 254 255 256 +f 257 258 259 +f 260 261 262 +f 263 264 265 +f 266 267 268 +f 269 270 271 +f 272 273 274 +f 275 276 277 +f 278 279 280 +f 281 282 283 +f 284 285 286 +f 72 98 39 +f 287 288 289 +f 290 291 30 +f 292 293 31 +f 294 295 28 +f 296 297 22 +f 298 299 20 +f 300 301 19 +f 302 303 14 +f 304 305 15 +f 306 307 11 +f 308 104 309 +f 310 8 311 +f 312 313 314 +f 315 70 54 +f 316 69 317 +f 318 319 62 +f 320 321 64 +f 322 323 60 +f 324 325 55 +f 326 327 48 +f 328 329 50 +f 330 331 41 +f 332 333 42 +f 334 335 36 +f 336 337 338 +f 339 340 33 +f 341 114 342 +f 343 102 344 +f 345 346 347 +f 348 34 349 +f 43 350 351 +f 67 65 63 +f 352 353 354 +f 355 356 357 +f 358 117 359 +f 360 59 361 +f 362 116 363 +f 364 49 365 +f 366 46 367 +f 368 44 369 +f 370 371 372 +f 373 374 375 +f 376 377 378 +f 379 380 381 +f 382 383 384 +f 385 386 387 +f 388 389 390 +f 391 392 393 +f 394 395 396 +f 397 398 399 +f 106 107 400 +f 109 401 402 +f 110 403 404 +f 27 405 406 +f 26 407 408 +f 409 410 411 +f 412 413 414 +f 415 416 417 +f 418 419 420 +f 421 422 423 +f 424 425 426 +f 427 428 429 +f 430 431 432 +f 433 434 435 +f 436 437 438 +f 439 440 441 +f 78 442 443 +f 76 444 445 +f 126 446 447 +f 86 448 449 +f 128 450 451 +f 96 452 453 +f 127 454 455 +f 95 456 457 +f 458 459 83 +f 81 460 461 +f 88 462 463 +f 84 464 465 +f 100 466 467 +f 89 468 469 +f 85 470 471 +f 91 472 473 +f 94 474 475 +f 125 476 477 +f 478 479 480 +f 481 482 483 +f 484 485 486 +f 487 488 489 +f 490 491 492 +f 82 493 494 +f 99 495 496 +f 497 498 499 +f 105 500 501 +f 502 503 504 +f 505 506 507 +f 508 509 510 +f 511 512 513 +f 514 515 516 +f 517 518 519 +f 520 521 522 +f 523 524 525 +f 526 527 528 +f 529 530 531 +f 532 533 534 +f 535 536 537 +f 538 539 540 +f 541 542 543 +f 544 545 546 +f 547 548 549 +f 550 551 552 +f 553 554 555 +f 556 557 558 +f 559 560 561 +f 562 563 564 +f 565 566 567 +f 568 569 570 + +vt 0.171943 0.045844 +vt 0.766094 0.016000 +vt 0.955597 0.971000 +vt 0.768350 0.016000 +vt 0.770558 0.016000 +vt 0.772669 0.016000 +vt 0.774639 0.018984 +vt 0.813087 0.042859 +vt 0.815057 0.045844 +vt 0.817168 0.045844 +vt 0.958006 0.971000 +vt 0.960357 0.971000 +vt 0.962590 0.968016 +vt 0.964651 0.968016 +vt 0.966488 0.968016 +vt 0.968058 0.965031 +vt 0.969321 0.962047 +vt 0.970246 0.962047 +vt 0.970810 0.959062 +vt 0.971000 0.956078 +vt 0.819375 0.045844 +vt 0.971000 0.060766 +vt 0.970810 0.057781 +vt 0.821631 0.045844 +vt 0.970246 0.054797 +vt 0.969321 0.054797 +vt 0.968058 0.051812 +vt 0.966488 0.048828 +vt 0.964651 0.048828 +vt 0.962590 0.048828 +vt 0.960357 0.045844 +vt 0.955597 0.045844 +vt 0.958006 0.045844 +vt 0.173913 0.042859 +vt 0.220906 0.016000 +vt 0.218650 0.016000 +vt 0.216442 0.016000 +vt 0.212361 0.018984 +vt 0.214331 0.016000 +vt 0.169832 0.045844 +vt 0.167625 0.045844 +vt 0.031403 0.971000 +vt 0.165369 0.045844 +vt 0.016000 0.956078 +vt 0.028994 0.971000 +vt 0.026643 0.971000 +vt 0.016190 0.959062 +vt 0.016754 0.962047 +vt 0.024410 0.968016 +vt 0.022349 0.968016 +vt 0.020512 0.968016 +vt 0.018942 0.965031 +vt 0.017679 0.962047 +vt 0.016000 0.060766 +vt 0.031403 0.045844 +vt 0.028994 0.045844 +vt 0.026643 0.045844 +vt 0.024410 0.048828 +vt 0.022349 0.048828 +vt 0.020512 0.048828 +vt 0.018942 0.051812 +vt 0.017679 0.054797 +vt 0.016754 0.054797 +vt 0.016190 0.057781 + +usemtl Mat_0 +f 105/10 18/15 108/14 +f 105/10 108/14 17/13 +f 105/10 111/16 18/15 +f 105/10 112/17 111/16 +f 105/10 25/18 112/17 +f 105/10 113/19 25/18 +f 105/10 32/20 113/19 +f 105/10 120/21 32/20 +f 120/21 115/22 32/20 +f 68/32 66/33 61/31 +f 123/24 68/32 61/31 +f 123/24 61/31 124/30 +f 123/24 124/30 57/29 +f 123/24 57/29 122/28 +f 123/24 122/28 47/27 +f 123/24 47/27 121/26 +f 123/24 121/26 118/25 +f 123/24 118/25 119/23 +f 120/21 119/23 115/22 +f 105/10 17/13 103/12 +f 105/10 103/12 10/11 +f 105/10 10/11 101/3 +f 99/9 105/10 101/3 +f 82/8 99/9 101/3 +f 100/7 82/8 101/3 +f 85/6 100/7 101/3 +f 91/5 85/6 101/3 +f 94/4 91/5 101/3 +f 125/2 94/4 101/3 +f 78/1 125/2 101/3 +f 72/40 78/1 101/3 +f 98/41 72/40 101/3 +f 104/46 102/44 8/45 +f 8/45 102/44 97/42 +f 102/44 70/43 97/42 +f 70/43 98/41 97/42 +f 43/64 44/63 114/54 +f 44/63 46/62 114/54 +f 46/62 49/61 114/54 +f 49/61 116/60 114/54 +f 116/60 59/59 114/54 +f 59/59 117/58 114/54 +f 117/58 65/57 114/54 +f 65/57 67/56 114/54 +f 67/56 69/55 114/54 +f 69/55 70/43 114/54 +f 114/54 70/43 102/44 +f 34/47 102/44 104/46 +f 26/48 34/47 104/46 +f 107/49 26/48 104/46 +f 106/50 26/48 107/49 +f 109/51 26/48 106/50 +f 110/52 26/48 109/51 +f 27/53 26/48 110/52 +f 76/34 125/2 78/1 +f 127/35 125/2 76/34 +f 96/36 127/35 76/34 +f 128/37 96/36 76/34 +f 126/38 128/37 76/34 +f 86/39 128/37 126/38 +f 120/21 123/24 119/23 +f 98/41 101/3 97/42 + diff --git a/resources/meshes/inat_proton_x_buildplate.stl b/resources/meshes/inat_proton_x_buildplate.stl new file mode 100644 index 0000000000..61c856cbc0 Binary files /dev/null and b/resources/meshes/inat_proton_x_buildplate.stl differ diff --git a/resources/meshes/jgaurora_a6_platform.stl b/resources/meshes/jgaurora_a6_platform.stl new file mode 100644 index 0000000000..b02686dbad Binary files /dev/null and b/resources/meshes/jgaurora_a6_platform.stl differ diff --git a/resources/meshes/longer_235mm_platform.stl b/resources/meshes/longer_235mm_platform.stl new file mode 100644 index 0000000000..1066268133 Binary files /dev/null and b/resources/meshes/longer_235mm_platform.stl differ diff --git a/resources/meshes/longer_310mm_platform.stl b/resources/meshes/longer_310mm_platform.stl new file mode 100644 index 0000000000..6090b86b3f Binary files /dev/null and b/resources/meshes/longer_310mm_platform.stl differ diff --git a/resources/meshes/longer_415mm_platform.stl b/resources/meshes/longer_415mm_platform.stl new file mode 100644 index 0000000000..c925e994b3 Binary files /dev/null and b/resources/meshes/longer_415mm_platform.stl differ diff --git a/resources/meshes/longer_cube2_platform.stl b/resources/meshes/longer_cube2_platform.stl new file mode 100644 index 0000000000..d9385aa340 Binary files /dev/null and b/resources/meshes/longer_cube2_platform.stl differ diff --git a/resources/meshes/lulzbot_mini.stl b/resources/meshes/lulzbot_mini.stl new file mode 100755 index 0000000000..fc4a991fca Binary files /dev/null and b/resources/meshes/lulzbot_mini.stl differ diff --git a/resources/meshes/lulzbot_taz_pro_bed.stl b/resources/meshes/lulzbot_taz_pro_bed.stl new file mode 100644 index 0000000000..49dbb4d57e Binary files /dev/null and b/resources/meshes/lulzbot_taz_pro_bed.stl differ diff --git a/resources/meshes/mingda_d2_base.stl b/resources/meshes/mingda_d2_base.stl new file mode 100644 index 0000000000..025900f243 Binary files /dev/null and b/resources/meshes/mingda_d2_base.stl differ diff --git a/resources/meshes/mingda_d4pro_base.stl b/resources/meshes/mingda_d4pro_base.stl new file mode 100644 index 0000000000..f9366df5f5 Binary files /dev/null and b/resources/meshes/mingda_d4pro_base.stl differ diff --git a/resources/meshes/mingda_rock3_base.stl b/resources/meshes/mingda_rock3_base.stl new file mode 100644 index 0000000000..019764c2a5 Binary files /dev/null and b/resources/meshes/mingda_rock3_base.stl differ diff --git a/resources/meshes/pbr3d_g1_buildplate.stl b/resources/meshes/pbr3d_g1_buildplate.stl new file mode 100644 index 0000000000..1f7b77bd78 Binary files /dev/null and b/resources/meshes/pbr3d_g1_buildplate.stl differ diff --git a/resources/meshes/rigid3d_mucit2_platform.3mf b/resources/meshes/rigid3d_mucit2_platform.3mf new file mode 100644 index 0000000000..553cd36508 Binary files /dev/null and b/resources/meshes/rigid3d_mucit2_platform.3mf differ diff --git a/resources/meshes/sapphireplus_platform.stl b/resources/meshes/sapphireplus_platform.stl new file mode 100644 index 0000000000..7b36da2d89 Binary files /dev/null and b/resources/meshes/sapphireplus_platform.stl differ diff --git a/resources/meshes/sapphirepro_platform.stl b/resources/meshes/sapphirepro_platform.stl new file mode 100644 index 0000000000..34e796c4ee Binary files /dev/null and b/resources/meshes/sapphirepro_platform.stl differ diff --git a/resources/meshes/trimaker_cosmosII_platform.stl b/resources/meshes/trimaker_cosmosII_platform.stl new file mode 100644 index 0000000000..dadebf5e81 Binary files /dev/null and b/resources/meshes/trimaker_cosmosII_platform.stl differ diff --git a/resources/meshes/trimaker_nebula_platform.stl b/resources/meshes/trimaker_nebula_platform.stl new file mode 100644 index 0000000000..f4f4c7b0be Binary files /dev/null and b/resources/meshes/trimaker_nebula_platform.stl differ diff --git a/resources/meshes/twotrees235x235_generic.stl b/resources/meshes/twotrees235x235_generic.stl new file mode 100644 index 0000000000..f28d89e7a3 Binary files /dev/null and b/resources/meshes/twotrees235x235_generic.stl differ diff --git a/resources/meshes/twotrees300x300_generic.stl b/resources/meshes/twotrees300x300_generic.stl new file mode 100644 index 0000000000..566d3b84bb Binary files /dev/null and b/resources/meshes/twotrees300x300_generic.stl differ diff --git a/resources/meshes/voron0_120_bed.stl b/resources/meshes/voron0_120_bed.stl new file mode 100644 index 0000000000..d2cc655f25 Binary files /dev/null and b/resources/meshes/voron0_120_bed.stl differ diff --git a/resources/qml/Account/AccountWidget.qml b/resources/qml/Account/AccountWidget.qml index 48c05f8a11..ef1622daee 100644 --- a/resources/qml/Account/AccountWidget.qml +++ b/resources/qml/Account/AccountWidget.qml @@ -54,9 +54,10 @@ Item id: accountWidget anchors.verticalCenter: parent.verticalCenter + anchors.horizontalCenter: signInButton.horizontalCenter - implicitHeight: UM.Theme.getSize("main_window_header").height - implicitWidth: UM.Theme.getSize("main_window_header").height + implicitHeight: Math.round(0.5 * UM.Theme.getSize("main_window_header").height) + implicitWidth: Math.round(0.5 * UM.Theme.getSize("main_window_header").height) hoverEnabled: true @@ -68,8 +69,8 @@ Item { id: avatar - width: Math.round(0.8 * accountWidget.width) - height: Math.round(0.8 * accountWidget.height) + width: accountWidget.width + height: accountWidget.height anchors.verticalCenter: accountWidget.verticalCenter anchors.horizontalCenter: accountWidget.horizontalCenter @@ -86,7 +87,7 @@ Item { id: initialCircle anchors.centerIn: parent - width: Math.min(parent.width, parent.height) + width: Math.min(accountWidget.width, accountWidget.height) height: width radius: width color: accountWidget.hovered ? UM.Theme.getColor("primary_text") : "transparent" @@ -141,7 +142,7 @@ Item borderColor: UM.Theme.getColor("lining") borderWidth: UM.Theme.getSize("default_lining").width - target: Qt.point(width - (accountWidget.width / 2), -10) + target: Qt.point(width - (signInButton.width / 2), -10) arrowSize: UM.Theme.getSize("default_arrow").width } diff --git a/resources/qml/Account/AvatarImage.qml b/resources/qml/Account/AvatarImage.qml index 120173366f..58c39e5065 100644 --- a/resources/qml/Account/AvatarImage.qml +++ b/resources/qml/Account/AvatarImage.qml @@ -52,7 +52,7 @@ Item width: parent.width + 2 height: parent.height + 2 visible: hasAvatar - source: UM.Theme.getIcon("circle_outline") + source: UM.Theme.getIcon("CircleOutline") sourceSize: Qt.size(parent.width, parent.height) color: UM.Theme.getColor("account_widget_outline_active") } diff --git a/resources/qml/Account/GeneralOperations.qml b/resources/qml/Account/GeneralOperations.qml index 9562f940a4..c78e9ad828 100644 --- a/resources/qml/Account/GeneralOperations.qml +++ b/resources/qml/Account/GeneralOperations.qml @@ -11,35 +11,26 @@ Column { spacing: UM.Theme.getSize("default_margin").width padding: UM.Theme.getSize("default_margin").width - Image - { - id: machinesImage - anchors.horizontalCenter: parent.horizontalCenter - source: UM.Theme.getIcon("sign_in_to_cloud") - horizontalAlignment: Image.AlignHCenter - verticalAlignment: Image.AlignVCenter - } Label { id: title anchors.horizontalCenter: parent.horizontalCenter - horizontalAlignment: Text.AlignHCenter renderType: Text.NativeRendering - text: "Ultimaker Account" + text: catalog.i18nc("@label", "Sign in to the Ultimaker platform") font: UM.Theme.getFont("large_bold") color: UM.Theme.getColor("text") } - Label + Image { - id: generalInformation + id: machinesImage anchors.horizontalCenter: parent.horizontalCenter - horizontalAlignment: Text.AlignHCenter - renderType: Text.NativeRendering - text: catalog.i18nc("@label", "Your key to connected 3D printing") - font: UM.Theme.getFont("default_bold") - color: UM.Theme.getColor("text") + source: UM.Theme.getImage("welcome_cura") + width: parent.width / 2 + fillMode: Image.PreserveAspectFit + horizontalAlignment: Image.AlignHCenter + verticalAlignment: Image.AlignVCenter } Label @@ -48,18 +39,12 @@ Column anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignLeft renderType: Text.NativeRendering - text: catalog.i18nc("@text", "- Customize your experience with more print profiles and plugins\n- Stay flexible by syncing your setup and loading it anywhere\n- Increase efficiency with a remote workflow on Ultimaker printers") + text: catalog.i18nc("@text", "- Add material profiles and plug-ins from the Marketplace\n- Back-up and sync your material profiles and plug-ins\n- Share ideas and get help from 48,000+ users in the Ultimaker community") lineHeight: 1.4 font: UM.Theme.getFont("default") color: UM.Theme.getColor("text") } - // placeholder - Label - { - text: " " - } - Cura.PrimaryButton { anchors.horizontalCenter: parent.horizontalCenter @@ -70,13 +55,11 @@ Column fixedWidthMode: true } - Cura.SecondaryButton + Cura.TertiaryButton { anchors.horizontalCenter: parent.horizontalCenter - width: UM.Theme.getSize("account_button").width height: UM.Theme.getSize("account_button").height - text: catalog.i18nc("@button", "Create account") + text: catalog.i18nc("@button", "Create a free Ultimaker account") onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "/app/create") - fixedWidthMode: true } -} \ No newline at end of file +} diff --git a/resources/qml/Account/SyncState.qml b/resources/qml/Account/SyncState.qml index f7630b500a..d5a9d392e2 100644 --- a/resources/qml/Account/SyncState.qml +++ b/resources/qml/Account/SyncState.qml @@ -18,27 +18,27 @@ Row // Sync state icon + message { name: "idle" when: syncState == Cura.AccountSyncState.IDLE - PropertyChanges { target: icon; source: UM.Theme.getIcon("update")} + PropertyChanges { target: icon; source: UM.Theme.getIcon("ArrowDoubleCircleRight")} }, State { name: "syncing" when: syncState == Cura.AccountSyncState.SYNCING - PropertyChanges { target: icon; source: UM.Theme.getIcon("update") } + PropertyChanges { target: icon; source: UM.Theme.getIcon("ArrowDoubleCircleRight") } PropertyChanges { target: stateLabel; text: catalog.i18nc("@label", "Checking...")} }, State { name: "up_to_date" when: syncState == Cura.AccountSyncState.SUCCESS - PropertyChanges { target: icon; source: UM.Theme.getIcon("checked") } + PropertyChanges { target: icon; source: UM.Theme.getIcon("CheckCircle") } PropertyChanges { target: stateLabel; text: catalog.i18nc("@label", "Account synced")} }, State { name: "error" when: syncState == Cura.AccountSyncState.ERROR - PropertyChanges { target: icon; source: UM.Theme.getIcon("warning_light") } + PropertyChanges { target: icon; source: UM.Theme.getIcon("Warning") } PropertyChanges { target: stateLabel; text: catalog.i18nc("@label", "Something went wrong...")} } ] diff --git a/resources/qml/Account/UserOperations.qml b/resources/qml/Account/UserOperations.qml index 19e92e0249..f5241596d5 100644 --- a/resources/qml/Account/UserOperations.qml +++ b/resources/qml/Account/UserOperations.qml @@ -9,7 +9,7 @@ import Cura 1.1 as Cura Column { - spacing: UM.Theme.getSize("narrow_margin").height + spacing: UM.Theme.getSize("default_margin").height topPadding: UM.Theme.getSize("default_margin").height bottomPadding: UM.Theme.getSize("default_margin").height width: childrenRect.width @@ -18,7 +18,7 @@ Column { id: accountInfo width: childrenRect.width - height: childrenRect.height + height: accountSyncDetailsColumn.height anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width AvatarImage @@ -56,6 +56,7 @@ Column Column { + id: accountSyncDetailsColumn anchors.left: avatar.right anchors.leftMargin: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("narrow_margin").height diff --git a/resources/qml/ActionButton.qml b/resources/qml/ActionButton.qml index 0c1be007b5..582df3d87c 100644 --- a/resources/qml/ActionButton.qml +++ b/resources/qml/ActionButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2020 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 @@ -18,19 +18,17 @@ Button property alias textFont: buttonText.font property alias cornerRadius: backgroundRect.radius property alias tooltip: tooltip.tooltipText - property alias cornerSide: backgroundRect.cornerSide + property alias tooltipWidth: tooltip.width property color color: UM.Theme.getColor("primary") property color hoverColor: UM.Theme.getColor("primary_hover") property color disabledColor: color property color textColor: UM.Theme.getColor("button_text") property color textHoverColor: textColor - property color textDisabledColor: textColor + property color textDisabledColor: disabledColor property color outlineColor: color - property color outlineHoverColor: hoverColor - property color outlineDisabledColor: outlineColor - property alias shadowColor: shadow.color - property alias shadowEnabled: shadow.visible + property color outlineHoverColor: outlineColor + property color outlineDisabledColor: disabledColor property alias busy: busyIndicator.visible property bool underlineTextOnHover: false @@ -46,6 +44,49 @@ Button // but it can exceed a maximum, then this value have to be set. property int maximumWidth: 0 + // These properties are deprecated. + // To (maybe) prevent a major SDK upgrade, mark them as deprecated instead of just outright removing them. + // Note, if you still want rounded corners, use (something based on) Cura.RoundedRectangle. + property alias cornerSide: deprecatedProperties.cornerSide + property alias shadowColor: deprecatedProperties.shadowColor + property alias shadowEnabled: deprecatedProperties.shadowEnabled + + Item + { + id: deprecatedProperties + + visible: false + enabled: false + width: 0 + height: 0 + + property var cornerSide: null + property var shadowColor: null + property var shadowEnabled: null + + onCornerSideChanged: + { + if (cornerSide != null) + { + CuraApplication.writeToLog("w", "'ActionButton.cornerSide' is deprecated since 4.11. Rounded corners can still be made with 'Cura.RoundedRectangle'."); + } + } + onShadowColorChanged: + { + if (shadowColor != null) + { + CuraApplication.writeToLog("w", "'ActionButton.shadowColor' is deprecated since 4.11.") + } + } + onShadowEnabledChanged: + { + if (shadowEnabled != null) + { + CuraApplication.writeToLog("w", "'ActionButton.shadowEnabled' is deprecated since 4.11.") + } + } + } + leftPadding: UM.Theme.getSize("default_margin").width rightPadding: UM.Theme.getSize("default_margin").width height: UM.Theme.getSize("action_button").height @@ -130,24 +171,13 @@ Button background: Cura.RoundedRectangle { id: backgroundRect - cornerSide: Cura.RoundedRectangle.Direction.All color: button.enabled ? (button.hovered ? button.hoverColor : button.color) : button.disabledColor - radius: UM.Theme.getSize("action_button_radius").width border.width: UM.Theme.getSize("default_lining").width border.color: button.enabled ? (button.hovered ? button.outlineHoverColor : button.outlineColor) : button.outlineDisabledColor - } - DropShadow - { - id: shadow - // Don't blur the shadow + // Disable the rounded-ness of this rectangle. We can't use a normal Rectangle here yet, as the API/SDK has only just been deprecated. radius: 0 - anchors.fill: backgroundRect - source: backgroundRect - verticalOffset: 2 - visible: false - // Should always be drawn behind the background. - z: backgroundRect.z - 1 + cornerSide: Cura.RoundedRectangle.Direction.None } Cura.ToolTip @@ -189,4 +219,4 @@ Button duration: 2500 } } -} \ No newline at end of file +} diff --git a/resources/qml/ActionPanel/ActionPanelWidget.qml b/resources/qml/ActionPanel/ActionPanelWidget.qml index deb7275e78..b3cf6d23a9 100644 --- a/resources/qml/ActionPanel/ActionPanelWidget.qml +++ b/resources/qml/ActionPanel/ActionPanelWidget.qml @@ -93,7 +93,7 @@ Item Connections { target: CuraApplication - onAdditionalComponentsChanged: base.addAdditionalComponents() + function onAdditionalComponentsChanged(areaId) { base.addAdditionalComponents() } } function addAdditionalComponents() diff --git a/resources/qml/ActionPanel/OutputDevicesActionButton.qml b/resources/qml/ActionPanel/OutputDevicesActionButton.qml index 866b8cc627..48416e69fd 100644 --- a/resources/qml/ActionPanel/OutputDevicesActionButton.qml +++ b/resources/qml/ActionPanel/OutputDevicesActionButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 @@ -23,7 +23,6 @@ Item id: saveToButton height: parent.height fixedWidthMode: true - cornerSide: deviceSelectionMenu.visible ? Cura.RoundedRectangle.Direction.Left : Cura.RoundedRectangle.Direction.All anchors { @@ -43,15 +42,11 @@ Item } } - Cura.ActionButton + Cura.PrimaryButton { id: deviceSelectionMenu height: parent.height - shadowEnabled: true - shadowColor: UM.Theme.getColor("primary_shadow") - cornerSide: Cura.RoundedRectangle.Direction.Right - anchors { top: parent.top @@ -60,8 +55,8 @@ Item leftPadding: UM.Theme.getSize("narrow_margin").width //Need more space than usual here for wide text. rightPadding: UM.Theme.getSize("narrow_margin").width - iconSource: popup.opened ? UM.Theme.getIcon("arrow_top") : UM.Theme.getIcon("arrow_bottom") - color: UM.Theme.getColor("action_panel_secondary") + iconSource: popup.opened ? UM.Theme.getIcon("ChevronSingleUp") : UM.Theme.getIcon("ChevronSingleDown") + color: popup.opened ? hoverColor : UM.Theme.getColor("action_panel_secondary") visible: (devicesModel.deviceCount > 1) onClicked: popup.opened ? popup.close() : popup.open() @@ -70,6 +65,7 @@ Item { id: popup padding: 0 + spacing: 0 y: -height x: parent.width - width @@ -78,17 +74,16 @@ Item contentItem: ColumnLayout { + spacing: 0 + Repeater { model: devicesModel - delegate: Cura.ActionButton + delegate: Cura.PrimaryButton { text: model.description visible: model.id != UM.OutputDeviceManager.activeDevice // Don't show the active device in the list - color: "transparent" - cornerRadius: 0 - hoverColor: UM.Theme.getColor("primary") Layout.fillWidth: true // The total width of the popup should be defined by the largest button. By stating that each // button should be minimally the size of it's content (aka; implicitWidth) we can ensure that. @@ -102,15 +97,8 @@ Item } } } - - background: Rectangle - { - opacity: visible ? 1 : 0 - Behavior on opacity { NumberAnimation { duration: 100 } } - color: UM.Theme.getColor("action_panel_secondary") - } } } UM.OutputDevicesModel { id: devicesModel } -} \ No newline at end of file +} diff --git a/resources/qml/ActionPanel/OutputProcessWidget.qml b/resources/qml/ActionPanel/OutputProcessWidget.qml index be6d68de4f..6e412c9a04 100644 --- a/resources/qml/ActionPanel/OutputProcessWidget.qml +++ b/resources/qml/ActionPanel/OutputProcessWidget.qml @@ -57,7 +57,7 @@ Column width: parent.width text: preSlicedData ? catalog.i18nc("@label", "No time estimation available") : PrintInformation.currentPrintTime.getDisplayString(UM.DurationFormat.Long) - source: UM.Theme.getIcon("clock") + source: UM.Theme.getIcon("Clock") font: UM.Theme.getFont("medium_bold") } @@ -99,7 +99,7 @@ Column } return totalWeights + "g · " + totalLengths.toFixed(2) + "m" } - source: UM.Theme.getIcon("spool") + source: UM.Theme.getIcon("Spool") font: UM.Theme.getFont("default") } } @@ -142,4 +142,4 @@ Column height: UM.Theme.getSize("action_button").height } } -} \ No newline at end of file +} diff --git a/resources/qml/ActionPanel/PrintInformationWidget.qml b/resources/qml/ActionPanel/PrintInformationWidget.qml index 097f281946..d9923ce4e8 100644 --- a/resources/qml/ActionPanel/PrintInformationWidget.qml +++ b/resources/qml/ActionPanel/PrintInformationWidget.qml @@ -11,7 +11,7 @@ UM.RecolorImage { id: widget - source: UM.Theme.getIcon("info") + source: UM.Theme.getIcon("Information") width: visible ? UM.Theme.getSize("section_icon").width : 0 height: UM.Theme.getSize("section_icon").height @@ -58,4 +58,4 @@ UM.RecolorImage arrowSize: UM.Theme.getSize("default_arrow").width } } -} \ No newline at end of file +} diff --git a/resources/qml/ActionPanel/PrintJobInformation.qml b/resources/qml/ActionPanel/PrintJobInformation.qml index 5b80e1a614..9cdbf0714f 100644 --- a/resources/qml/ActionPanel/PrintJobInformation.qml +++ b/resources/qml/ActionPanel/PrintJobInformation.qml @@ -144,7 +144,7 @@ Column { names.push(printMaterialNames[index]) lengths.push(printMaterialLengths[index].toFixed(2)) - weights.push(String(Math.round(printMaterialWeights[index]))) + weights.push(String(printMaterialWeights[index].toFixed(1))) var cost = printMaterialCosts[index] == undefined ? 0 : printMaterialCosts[index].toFixed(2) costs.push(cost) } @@ -153,7 +153,7 @@ Column if(lengths.length == 0) { lengths = ["0.00"] - weights = ["0"] + weights = ["0.0"] costs = ["0.00"] } diff --git a/resources/qml/ActionPanel/SliceProcessWidget.qml b/resources/qml/ActionPanel/SliceProcessWidget.qml index 40e76826ca..42df08560a 100644 --- a/resources/qml/ActionPanel/SliceProcessWidget.qml +++ b/resources/qml/ActionPanel/SliceProcessWidget.qml @@ -65,7 +65,7 @@ Column visible: widget.backendState == UM.Backend.Error text: catalog.i18nc("@label:PrintjobStatus", "Unable to slice") - source: UM.Theme.getIcon("warning") + source: UM.Theme.getIcon("Warning") iconColor: UM.Theme.getColor("warning") } @@ -127,7 +127,7 @@ Column Connections { target: UM.Preferences - onPreferenceChanged: + function onPreferenceChanged(preference) { if (preference !== "general/auto_slice") { diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index c62b0cb89a..95c6778b87 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. pragma Singleton @@ -21,6 +21,7 @@ Item property alias view3DCamera: view3DCameraAction; property alias viewFrontCamera: viewFrontCameraAction; property alias viewTopCamera: viewTopCameraAction; + property alias viewBottomCamera: viewBottomCameraAction; property alias viewLeftSideCamera: viewLeftSideCameraAction; property alias viewRightSideCamera: viewRightSideCameraAction; @@ -121,7 +122,15 @@ Item Action { id: quitAction - text: catalog.i18nc("@action:inmenu menubar:file","&Quit") + + //On MacOS, don't translate the "Quit" word. + //Qt moves the "quit" entry to a different place, and if it got renamed can't find it again when it attempts to + //delete the item upon closing the application, causing a crash. + //In the new location, these items are translated automatically according to the system's language. + //For more information, see: + //- https://doc.qt.io/qt-5/macos-issues.html#menu-bar + //- https://doc.qt.io/qt-5/qmenubar.html#qmenubar-as-a-global-menu-bar + text: (Qt.platform.os == "osx") ? "&Quit" : catalog.i18nc("@action:inmenu menubar:file", "&Quit") iconName: "application-exit" shortcut: StandardKey.Quit } @@ -147,6 +156,13 @@ Item onTriggered: UM.Controller.setCameraRotation("y", 90) } + Action + { + id: viewBottomCameraAction + text: catalog.i18nc("@action:inmenu menubar:view", "Bottom View") + onTriggered: UM.Controller.setCameraRotation("y", -90) + } + Action { id: viewLeftSideCameraAction @@ -164,7 +180,14 @@ Item Action { id: preferencesAction - text: catalog.i18nc("@action:inmenu", "Configure Cura...") + //On MacOS, don't translate the "Configure" word. + //Qt moves the "configure" entry to a different place, and if it got renamed can't find it again when it + //attempts to delete the item upon closing the application, causing a crash. + //In the new location, these items are translated automatically according to the system's language. + //For more information, see: + //- https://doc.qt.io/qt-5/macos-issues.html#menu-bar + //- https://doc.qt.io/qt-5/qmenubar.html#qmenubar-as-a-global-menu-bar + text: (Qt.platform.os == "osx") ? "Configure Cura..." : catalog.i18nc("@action:inmenu", "Configure Cura...") iconName: "configure" } @@ -255,14 +278,22 @@ Item Action { id: aboutAction; - text: catalog.i18nc("@action:inmenu menubar:help", "About..."); + + //On MacOS, don't translate the "About" word. + //Qt moves the "about" entry to a different place, and if it got renamed can't find it again when it + //attempts to delete the item upon closing the application, causing a crash. + //In the new location, these items are translated automatically according to the system's language. + //For more information, see: + //- https://doc.qt.io/qt-5/macos-issues.html#menu-bar + //- https://doc.qt.io/qt-5/qmenubar.html#qmenubar-as-a-global-menu-bar + text: (Qt.platform.os == "osx") ? "About..." : catalog.i18nc("@action:inmenu menubar:help", "About..."); iconName: "help-about"; } Action { id: deleteSelectionAction; - text: catalog.i18ncp("@action:inmenu menubar:edit", "Delete Selected Model", "Delete Selected Models", UM.Selection.selectionCount); + text: catalog.i18nc("@action:inmenu menubar:edit", "Delete Selected"); enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection; iconName: "edit-delete"; shortcut: StandardKey.Delete | "Backspace" @@ -272,7 +303,7 @@ Item Action { id: centerSelectionAction; - text: catalog.i18ncp("@action:inmenu menubar:edit", "Center Selected Model", "Center Selected Models", UM.Selection.selectionCount); + text: catalog.i18nc("@action:inmenu menubar:edit", "Center Selected"); enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection; iconName: "align-vertical-center"; onTriggered: CuraActions.centerSelection(); @@ -281,7 +312,7 @@ Item Action { id: multiplySelectionAction; - text: catalog.i18ncp("@action:inmenu menubar:edit", "Multiply Selected Model", "Multiply Selected Models", UM.Selection.selectionCount); + text: catalog.i18nc("@action:inmenu menubar:edit", "Multiply Selected"); enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection; iconName: "edit-duplicate"; shortcut: "Ctrl+M" @@ -416,9 +447,13 @@ Item Action { id: openAction; + property var fileProviderModel: CuraApplication.getFileProviderModel() + text: catalog.i18nc("@action:inmenu menubar:file","&Open File(s)..."); iconName: "document-open"; - shortcut: StandardKey.Open; + // Unassign the shortcut when there are more than one file providers, since then the file provider's shortcut is + // enabled instead, and Ctrl+O is assigned to the local file provider + shortcut: fileProviderModel.count == 1 ? StandardKey.Open : ""; } Action diff --git a/resources/qml/CheckBoxWithTooltip.qml b/resources/qml/CheckBoxWithTooltip.qml index 403efb4d7b..e17940014a 100644 --- a/resources/qml/CheckBoxWithTooltip.qml +++ b/resources/qml/CheckBoxWithTooltip.qml @@ -32,7 +32,7 @@ CheckBox height: Math.round(parent.height / 2.5) sourceSize.height: width color: UM.Theme.getColor("checkbox_mark") - source: UM.Theme.getIcon("check") + source: UM.Theme.getIcon("Check") opacity: checkbox.checked Behavior on opacity { NumberAnimation { duration: 100; } } } diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 9f24d91caf..7782ace3af 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2020 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 @@ -88,7 +88,7 @@ UM.MainWindow { // This connection is used when there is no ActiveMachine and the user is logged in target: CuraApplication - onShowAddPrintersUncancellableDialog: + function onShowAddPrintersUncancellableDialog() { Cura.Actions.parent = backgroundItem @@ -102,7 +102,7 @@ UM.MainWindow Connections { target: CuraApplication - onInitializationFinished: + function onInitializationFinished() { // Workaround silly issues with QML Action's shortcut property. // @@ -149,15 +149,6 @@ UM.MainWindow id: backgroundItem anchors.fill: parent - signal hasMesh(string name) //this signal sends the filebase name so it can be used for the JobSpecs.qml - function getMeshName(path) - { - //takes the path the complete path of the meshname and returns only the filebase - var fileName = path.slice(path.lastIndexOf("/") + 1) - var fileBase = fileName.slice(0, fileName.indexOf(".")) - return fileBase - } - //DeleteSelection on the keypress backspace event Keys.onPressed: { @@ -426,6 +417,7 @@ UM.MainWindow Cura.PrimaryButton { text: model.name + iconSource: UM.Theme.getIcon(model.icon) height: UM.Theme.getSize("message_action_button").height } } @@ -435,6 +427,23 @@ UM.MainWindow Cura.SecondaryButton { text: model.name + iconSource: UM.Theme.getIcon(model.icon) + height: UM.Theme.getSize("message_action_button").height + } + } + link: Component + { + Cura.TertiaryButton + { + text: model.name + iconSource: + { + if (model.icon == null || model.icon == "") + { + return UM.Theme.getIcon("LinkExternal") + } + return UM.Theme.getIcon(model.icon) + } height: UM.Theme.getSize("message_action_button").height } } @@ -480,19 +489,19 @@ UM.MainWindow Connections { target: Cura.Actions.preferences - onTriggered: preferences.visible = true + function onTriggered() { preferences.visible = true } } Connections { target: CuraApplication - onShowPreferencesWindow: preferences.visible = true + function onShowPreferencesWindow() { preferences.visible = true } } Connections { target: Cura.Actions.addProfile - onTriggered: + function onTriggered() { preferences.show(); preferences.setPage(4); @@ -504,7 +513,7 @@ UM.MainWindow Connections { target: Cura.Actions.configureMachines - onTriggered: + function onTriggered() { preferences.visible = true; preferences.setPage(2); @@ -514,7 +523,7 @@ UM.MainWindow Connections { target: Cura.Actions.manageProfiles - onTriggered: + function onTriggered() { preferences.visible = true; preferences.setPage(4); @@ -524,7 +533,7 @@ UM.MainWindow Connections { target: Cura.Actions.manageMaterials - onTriggered: + function onTriggered() { preferences.visible = true; preferences.setPage(3) @@ -534,7 +543,7 @@ UM.MainWindow Connections { target: Cura.Actions.configureSettingVisibility - onTriggered: + function onTriggered(source) { preferences.visible = true; preferences.setPage(1); @@ -559,7 +568,7 @@ UM.MainWindow Connections { target: Cura.MachineManager - onBlurSettings: + function onBlurSettings() { contentItem.forceActiveFocus() } @@ -603,7 +612,7 @@ UM.MainWindow Connections { target: CuraApplication - onShowConfirmExitDialog: + function onShowConfirmExitDialog(message) { exitConfirmationDialog.text = message; exitConfirmationDialog.open(); @@ -613,19 +622,19 @@ UM.MainWindow Connections { target: Cura.Actions.quit - onTriggered: CuraApplication.checkAndExitApplication(); + function onTriggered() { CuraApplication.checkAndExitApplication(); } } Connections { target: Cura.Actions.toggleFullScreen - onTriggered: base.toggleFullscreen() + function onTriggered() { base.toggleFullscreen() } } Connections { target: Cura.Actions.exitFullScreen - onTriggered: base.exitFullscreen() + function onTriggered() { base.exitFullscreen() } } FileDialog @@ -700,6 +709,9 @@ UM.MainWindow function handleOpenFiles(selectedMultipleFiles, hasProjectFile, fileUrlList, projectFileUrlList) { + // Make sure the files opened through the openFilesIncludingProjectDialog are added to the recent files list + openFilesIncludingProjectsDialog.addToRecent = true; + // we only allow opening one project file if (selectedMultipleFiles && hasProjectFile) { @@ -726,6 +738,7 @@ UM.MainWindow { // ask whether to open as project or as models askOpenAsProjectOrModelsDialog.fileUrl = projectFile; + askOpenAsProjectOrModelsDialog.addToRecent = true; askOpenAsProjectOrModelsDialog.show(); } } @@ -766,7 +779,7 @@ UM.MainWindow Connections { target: Cura.Actions.open - onTriggered: openDialog.open() + function onTriggered() { openDialog.open() } } OpenFilesIncludingProjectsDialog @@ -782,9 +795,10 @@ UM.MainWindow Connections { target: CuraApplication - onOpenProjectFile: + function onOpenProjectFile(project_file, add_to_recent_files) { askOpenAsProjectOrModelsDialog.fileUrl = project_file; + askOpenAsProjectOrModelsDialog.addToRecent = add_to_recent_files; askOpenAsProjectOrModelsDialog.show(); } } @@ -792,7 +806,7 @@ UM.MainWindow Connections { target: Cura.Actions.showProfileFolder - onTriggered: + function onTriggered() { var path = UM.Resources.getPath(UM.Resources.Preferences, ""); if(Qt.platform.os == "windows") @@ -824,7 +838,7 @@ UM.MainWindow Connections { target: CuraApplication - onShowMessageBox: + function onShowMessageBox(title, text, informativeText, detailedText, buttons, icon) { messageDialog.title = title messageDialog.text = text @@ -848,7 +862,7 @@ UM.MainWindow Connections { target: CuraApplication - onShowDiscardOrKeepProfileChanges: + function onShowDiscardOrKeepProfileChanges() { discardOrKeepProfileChangesDialogLoader.sourceComponent = discardOrKeepProfileChangesDialogComponent discardOrKeepProfileChangesDialogLoader.item.show() @@ -867,6 +881,8 @@ UM.MainWindow { id: whatsNewDialog title: catalog.i18nc("@title:window", "What's New") + minimumWidth: UM.Theme.getSize("welcome_wizard_window").width + minimumHeight: UM.Theme.getSize("welcome_wizard_window").height model: CuraApplication.getWhatsNewPagesModel() progressBarVisible: false visible: false @@ -875,13 +891,13 @@ UM.MainWindow Connections { target: Cura.Actions.whatsNew - onTriggered: whatsNewDialog.show() + function onTriggered() { whatsNewDialog.show() } } Connections { target: Cura.Actions.addMachine - onTriggered: + function onTriggered() { // Make sure to show from the first page when the dialog shows up. addMachineDialog.resetModelState() @@ -897,7 +913,7 @@ UM.MainWindow Connections { target: Cura.Actions.about - onTriggered: aboutDialog.visible = true; + function onTriggered() { aboutDialog.visible = true; } } Timer diff --git a/resources/qml/Dialogs/AboutDialog.qml b/resources/qml/Dialogs/AboutDialog.qml index f8018d3d34..1ee0b31040 100644 --- a/resources/qml/Dialogs/AboutDialog.qml +++ b/resources/qml/Dialogs/AboutDialog.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2020 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -15,7 +15,7 @@ UM.Dialog title: catalog.i18nc("@title:window The argument is the application name.", "About %1").arg(CuraApplication.applicationDisplayName) minimumWidth: 500 * screenScaleFactor - minimumHeight: 650 * screenScaleFactor + minimumHeight: 700 * screenScaleFactor width: minimumWidth height: minimumHeight @@ -158,7 +158,8 @@ UM.Dialog projectsModel.append({ name: "Sentry", description: catalog.i18nc("@Label", "Python Error tracking library"), license: "BSD 2-Clause 'Simplified'", url: "https://sentry.io/for/python/" }); projectsModel.append({ name: "libnest2d", description: catalog.i18nc("@label", "Polygon packing library, developed by Prusa Research"), license: "LGPL", url: "https://github.com/tamasmeszaros/libnest2d" }); projectsModel.append({ name: "pynest2d", description: catalog.i18nc("@label", "Python bindings for libnest2d"), license: "LGPL", url: "https://github.com/Ultimaker/pynest2d" }); - + projectsModel.append({ name: "keyring", description: catalog.i18nc("@label", "Support library for system keyring access"), license: "MIT", url: "https://github.com/jaraco/keyring" }); + projectsModel.append({ name: "pywin32", description: catalog.i18nc("@label", "Python extensions for Microsoft Windows"), license: "PSF", url: "https://github.com/mhammond/pywin32" }); projectsModel.append({ name: "Noto Sans", description: catalog.i18nc("@label", "Font"), license: "Apache 2.0", url: "https://www.google.com/get/noto/" }); projectsModel.append({ name: "Font-Awesome-SVG-PNG", description: catalog.i18nc("@label", "SVG icons"), license: "SIL OFL 1.1", url: "https://github.com/encharm/Font-Awesome-SVG-PNG" }); projectsModel.append({ name: "AppImageKit", description: catalog.i18nc("@label", "Linux cross-distribution application deployment"), license: "MIT", url: "https://github.com/AppImage/AppImageKit" }); diff --git a/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml b/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml index 8cdaeea5fa..ba0d3fb6ca 100644 --- a/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml +++ b/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2015 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -29,33 +29,28 @@ UM.Dialog modality: Qt.WindowModal property var fileUrl + property var addToRecent: true //Whether to add this file to the recent files list after reading it. // load the entire project function loadProjectFile() { - // update preference if (rememberChoiceCheckBox.checked) { UM.Preferences.setValue("cura/choice_on_open_project", "open_as_project") } - UM.WorkspaceFileHandler.readLocalFile(base.fileUrl) - var meshName = backgroundItem.getMeshName(base.fileUrl.toString()) - backgroundItem.hasMesh(decodeURIComponent(meshName)) + UM.WorkspaceFileHandler.readLocalFile(base.fileUrl, base.addToRecent); base.hide() } // load the project file as separated models function loadModelFiles() { - // update preference if (rememberChoiceCheckBox.checked) { UM.Preferences.setValue("cura/choice_on_open_project", "open_as_model") } - CuraApplication.readLocalFile(base.fileUrl, "open_as_model") - var meshName = backgroundItem.getMeshName(base.fileUrl.toString()) - backgroundItem.hasMesh(decodeURIComponent(meshName)) + CuraApplication.readLocalFile(base.fileUrl, "open_as_model", base.addToRecent) base.hide() } diff --git a/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml b/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml index 187578f12c..3f1900c66b 100644 --- a/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml +++ b/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2017 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -28,25 +28,20 @@ UM.Dialog modality: Qt.WindowModal property var fileUrls: [] + property var addToRecent: true property int spacerHeight: 10 * screenScaleFactor function loadProjectFile(projectFile) { - UM.WorkspaceFileHandler.readLocalFile(projectFile); - - var meshName = backgroundItem.getMeshName(projectFile.toString()); - backgroundItem.hasMesh(decodeURIComponent(meshName)); + UM.WorkspaceFileHandler.readLocalFile(projectFile, base.addToRecent); } function loadModelFiles(fileUrls) { for (var i in fileUrls) { - CuraApplication.readLocalFile(fileUrls[i], "open_as_model"); + CuraApplication.readLocalFile(fileUrls[i], "open_as_model", base.addToRecent); } - - var meshName = backgroundItem.getMeshName(fileUrls[0].toString()); - backgroundItem.hasMesh(decodeURIComponent(meshName)); } Column @@ -108,5 +103,11 @@ UM.Dialog } } } + + UM.I18nCatalog + { + id: catalog + name: "cura" + } } -} +} \ No newline at end of file diff --git a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml index 32015b902a..9e0e972361 100644 --- a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml +++ b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml @@ -1,8 +1,9 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 import QtQuick.Controls 1.4 +import QtQuick.Controls 2.0 as Controls2 import QtQuick.Layouts 1.3 import QtQuick.Window 2.2 @@ -281,7 +282,7 @@ UM.Dialog text: catalog.i18nc("@action:label", "Don't show project summary on save again") checked: dontShowAgain } - Button + Controls2.Button { id: cancel_button anchors @@ -293,7 +294,7 @@ UM.Dialog enabled: true onClicked: close() } - Button + Controls2.Button { id: ok_button anchors.right: parent.right diff --git a/resources/qml/ExpandableComponent.qml b/resources/qml/ExpandableComponent.qml index b3fe3fa763..18eb8c0fa6 100644 --- a/resources/qml/ExpandableComponent.qml +++ b/resources/qml/ExpandableComponent.qml @@ -7,8 +7,6 @@ import QtQuick.Controls 2.3 import UM 1.2 as UM import Cura 1.0 as Cura -import QtGraphicalEffects 1.0 // For the dropshadow - // The expandable component has 2 major sub components: // * The headerItem; Always visible and should hold some info about what happens if the component is expanded // * The contentItem; The content that needs to be shown if the component is expanded. @@ -56,6 +54,11 @@ Item // How much padding is needed around the header & button property alias headerPadding: background.padding + property alias headerBackgroundBorder: background.border + + // Whether or not to show the background border + property bool enableHeaderBackgroundBorder: true + // What icon should be displayed on the right. property alias iconSource: collapseButton.source @@ -73,11 +76,7 @@ Item // On what side should the header corners be shown? 1 is down, 2 is left, 3 is up and 4 is right. property alias headerCornerSide: background.cornerSide - property alias headerShadowColor: shadow.color - - property alias enableHeaderShadow: shadow.visible - - property int shadowOffset: 2 + property int popupOffset: 2 // Prefix used for the dragged position preferences. Preferences not used if empty. Don't translate! property string dragPreferencesNamePrefix: "" @@ -92,6 +91,15 @@ Item contentContainer.trySetPosition(contentContainer.x, contentContainer.y); } + onEnabledChanged: + { + if (!base.enabled && expanded) + { + toggleContent(); + updateDragPosition(); + } + } + // Add this binding since the background color is not updated otherwise Binding { @@ -103,20 +111,6 @@ Item } } - // The panel needs to close when it becomes disabled - Connections - { - target: base - onEnabledChanged: - { - if (!base.enabled && expanded) - { - toggleContent(); - updateDragPosition(); - } - } - } - implicitHeight: 100 * screenScaleFactor implicitWidth: 400 * screenScaleFactor @@ -125,6 +119,9 @@ Item id: background property real padding: UM.Theme.getSize("default_margin").width + border.width: base.enableHeaderBackgroundBorder ? UM.Theme.getSize("default_lining").width : 0 + border.color: UM.Theme.getColor("lining") + color: base.enabled ? (base.expanded ? headerActiveColor : headerBackgroundColor) : UM.Theme.getColor("disabled") anchors.fill: parent @@ -170,7 +167,7 @@ Item verticalCenter: parent.verticalCenter margins: background.padding } - source: UM.Theme.getIcon("pencil") + source: UM.Theme.getIcon("ChevronSingleDown") visible: source != "" width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height @@ -189,20 +186,6 @@ Item } } - DropShadow - { - id: shadow - // Don't blur the shadow - radius: 0 - anchors.fill: background - source: background - verticalOffset: base.shadowOffset - visible: true - color: UM.Theme.getColor("action_button_shadow") - // Should always be drawn behind the background. - z: background.z - 1 - } - Cura.RoundedRectangle { id: contentContainer @@ -214,7 +197,7 @@ Item height: childrenRect.height // Ensure that the content is located directly below the headerItem - y: dragPreferencesNamePrefix === "" ? (background.height + base.shadowOffset + base.contentSpacingY) : UM.Preferences.getValue(dragPreferencesNamePrefix + dragPreferencesNameY) + y: dragPreferencesNamePrefix === "" ? (background.height + base.popupOffset + base.contentSpacingY) : UM.Preferences.getValue(dragPreferencesNamePrefix + dragPreferencesNameY) // Make the content aligned with the rest, using the property contentAlignment to decide whether is right or left. // In case of right alignment, the 3x padding is due to left, right and padding between the button & text. @@ -233,7 +216,7 @@ Item var maxPt = base.mapFromItem(null, CuraApplication.appWidth() - (contentContainer.width + margin.width), CuraApplication.appHeight() - (contentContainer.height + margin.height)); - var initialY = background.height + base.shadowOffset + margin.height; + var initialY = background.height + base.popupOffset + margin.height; contentContainer.x = Math.max(minPt.x, Math.min(maxPt.x, posNewX)); contentContainer.y = Math.max(initialY, Math.min(maxPt.y, posNewY)); @@ -300,7 +283,7 @@ Item Connections { target: UM.Preferences - onPreferenceChanged: + function onPreferenceChanged(preference) { if ( @@ -342,8 +325,8 @@ Item { // Since it could be that the content is dynamically populated, we should also take these changes into account. target: content.contentItem - onWidthChanged: content.width = content.contentItem.width + 2 * content.padding - onHeightChanged: + function onWidthChanged() { content.width = content.contentItem.width + 2 * content.padding } + function onHeightChanged() { content.height = content.contentItem.height + 2 * content.padding contentContainer.height = contentHeader.height + content.height diff --git a/resources/qml/ExpandableComponentHeader.qml b/resources/qml/ExpandableComponentHeader.qml index cd6ccfb825..7dd1aa358a 100644 --- a/resources/qml/ExpandableComponentHeader.qml +++ b/resources/qml/ExpandableComponentHeader.qml @@ -59,11 +59,11 @@ Cura.RoundedRectangle anchors.fill: parent sourceSize.width: width color: closeButton.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text") - source: UM.Theme.getIcon("cross1") + source: UM.Theme.getIcon("Cancel") } background: Item {} onClicked: toggleContent() // Will hide the popup item } -} \ No newline at end of file +} diff --git a/resources/qml/ExpandablePopup.qml b/resources/qml/ExpandablePopup.qml index eb949a84ec..3bcfdbb6f8 100644 --- a/resources/qml/ExpandablePopup.qml +++ b/resources/qml/ExpandablePopup.qml @@ -7,8 +7,6 @@ import QtQuick.Controls 2.3 import UM 1.2 as UM import Cura 1.0 as Cura -import QtGraphicalEffects 1.0 // For the dropshadow - // The expandable component has 2 major sub components: // * The headerItem; Always visible and should hold some info about what happens if the component is expanded // * The contentItem; The content that needs to be shown if the component is expanded. @@ -50,6 +48,11 @@ Item // How much padding is needed around the header & button property alias headerPadding: background.padding + property alias headerBackgroundBorder: background.border + + // Whether or not to show the background border + property bool enableHeaderBackgroundBorder: true + // What icon should be displayed on the right. property alias iconSource: collapseButton.source @@ -72,11 +75,15 @@ Item // Change the contentItem close behaviour property alias contentClosePolicy : content.closePolicy - property alias headerShadowColor: shadow.color + property int popupOffset: 2 - property alias enableHeaderShadow: shadow.visible - - property int shadowOffset: 2 + onEnabledChanged: + { + if (!base.enabled && expanded) + { + toggleContent() + } + } function toggleContent() { @@ -98,19 +105,6 @@ Item value: base.enabled ? headerBackgroundColor : UM.Theme.getColor("disabled") } - // The panel needs to close when it becomes disabled - Connections - { - target: base - onEnabledChanged: - { - if (!base.enabled && expanded) - { - toggleContent() - } - } - } - implicitHeight: 100 * screenScaleFactor implicitWidth: 400 * screenScaleFactor @@ -119,6 +113,9 @@ Item id: background property real padding: UM.Theme.getSize("default_margin").width + border.width: base.enableHeaderBackgroundBorder ? UM.Theme.getSize("default_lining").width : 0 + border.color: UM.Theme.getColor("lining") + color: base.enabled ? headerBackgroundColor : UM.Theme.getColor("disabled") anchors.fill: parent @@ -183,7 +180,7 @@ Item verticalCenter: parent.verticalCenter margins: background.padding } - source: expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") + source: UM.Theme.getIcon("ChevronSingleDown") visible: source != "" width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height @@ -193,26 +190,12 @@ Item } - DropShadow - { - id: shadow - // Don't blur the shadow - radius: 0 - anchors.fill: background - source: background - verticalOffset: base.shadowOffset - visible: true - color: UM.Theme.getColor("action_button_shadow") - // Should always be drawn behind the background. - z: background.z - 1 - } - Popup { id: content // Ensure that the content is located directly below the headerItem - y: background.height + base.shadowOffset + y: background.height + base.popupOffset // Make the content aligned with the rest, using the property contentAlignment to decide whether is right or left. // In case of right alignment, the 3x padding is due to left, right and padding between the button & text. @@ -247,7 +230,7 @@ Item { // Since it could be that the content is dynamically populated, we should also take these changes into account. target: content.contentItem - onWidthChanged: content.width = content.contentItem.width + 2 * content.padding - onHeightChanged: content.height = content.contentItem.height + 2 * content.padding + function onWidthChanged() { content.width = content.contentItem.width + 2 * content.padding } + function onHeightChanged() { content.height = content.contentItem.height + 2 * content.padding } } } diff --git a/resources/qml/ExtruderButton.qml b/resources/qml/ExtruderButton.qml index feb399d528..b87855e25e 100644 --- a/resources/qml/ExtruderButton.qml +++ b/resources/qml/ExtruderButton.qml @@ -22,6 +22,7 @@ Cura.ToolbarButton { materialColor: extruder.color extruderEnabled: extruder.stack.isEnabled + iconVariant: "default" property int index: extruder.index } diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml index 015ebea52e..ed392d13d7 100644 --- a/resources/qml/ExtruderIcon.qml +++ b/resources/qml/ExtruderIcon.qml @@ -1,7 +1,7 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.7 +import QtQuick 2.11 import QtQuick.Controls 1.1 import UM 1.2 as UM @@ -16,31 +16,30 @@ Item property color materialColor property alias textColor: extruderNumberText.color property bool extruderEnabled: true - - UM.RecolorImage + property alias iconSize: mainIcon.sourceSize + property string iconVariant: "medium" + layer.enabled: true // Prevent weird opacity effects. + Item { - id: mainIcon + opacity: extruderEnabled ? 1 : UM.Theme.getColor("extruder_disabled").a anchors.fill: parent - source: UM.Theme.getIcon("extruder_button") - color: extruderEnabled ? materialColor: UM.Theme.getColor("disabled") - } - - Rectangle - { - id: extruderNumberCircle - - width: height - height: Math.round(parent.height / 2) - radius: Math.round(width / 2) - color: UM.Theme.getColor("toolbar_background") - - anchors + UM.RecolorImage { - horizontalCenter: parent.horizontalCenter - top: parent.top - // The circle needs to be slightly off center (so it sits in the middle of the square bit of the icon) - topMargin: (parent.height - height) / 2 - 0.1 * parent.height + anchors.fill: parent + sourceSize: mainIcon.sourceSize + + source: UM.Theme.getIcon("ExtruderColor", iconVariant) + color: materialColor + } + UM.RecolorImage + { + id: mainIcon + anchors.fill: parent + sourceSize: UM.Theme.getSize("extruder_icon") + + source: UM.Theme.getIcon("Extruder", iconVariant) + color: extruderNumberText.color } Label @@ -48,25 +47,13 @@ Item id: extruderNumberText anchors.centerIn: parent text: index + 1 - font: UM.Theme.getFont("small") + font: UM.Theme.getFont("small_emphasis") color: UM.Theme.getColor("text") width: contentWidth height: contentHeight - visible: extruderEnabled renderType: Text.NativeRendering horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } - - UM.RecolorImage - { - id: disabledIcon - anchors.fill: parent - anchors.margins: UM.Theme.getSize("thick_lining").width - sourceSize.height: width - source: UM.Theme.getIcon("cross1") - visible: !extruderEnabled - color: UM.Theme.getColor("text") - } } -} \ No newline at end of file +} diff --git a/resources/qml/JobSpecs.qml b/resources/qml/JobSpecs.qml index 097100e217..4aa5fa8bd5 100644 --- a/resources/qml/JobSpecs.qml +++ b/resources/qml/JobSpecs.qml @@ -66,7 +66,7 @@ Item sourceSize.width: width sourceSize.height: width color: control.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text") - source: UM.Theme.getIcon("pencil") + source: UM.Theme.getIcon("Pen") } } } @@ -149,7 +149,7 @@ Item Connections { target: CuraApplication - onAdditionalComponentsChanged: base.addAdditionalComponents("jobSpecsButton") + function onAdditionalComponentsChanged(areaId) { base.addAdditionalComponents("jobSpecsButton") } } function addAdditionalComponents(areaId) diff --git a/resources/qml/MachineSettings/ComboBoxWithOptions.qml b/resources/qml/MachineSettings/ComboBoxWithOptions.qml index 67177ce936..0ad4f8bb0c 100644 --- a/resources/qml/MachineSettings/ComboBoxWithOptions.qml +++ b/resources/qml/MachineSettings/ComboBoxWithOptions.qml @@ -93,8 +93,8 @@ UM.TooltipArea Connections { target: propertyProvider - onContainerStackChanged: defaultOptionsModel.updateModel() - onIsValueUsedChanged: defaultOptionsModel.updateModel() + function onContainerStackChanged() { defaultOptionsModel.updateModel() } + function onIsValueUsedChanged() { defaultOptionsModel.updateModel() } } Cura.ComboBox diff --git a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml index 031ef5241a..32e0e6dcaa 100644 --- a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml +++ b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml @@ -156,12 +156,24 @@ UM.TooltipArea const value = propertyProvider.properties.value return value ? value : "" } - validator: DoubleValidator + property string validatorString: { - bottom: numericTextFieldWithUnit.minimum - top: numericTextFieldWithUnit.maximum - decimals: numericTextFieldWithUnit.decimals - notation: DoubleValidator.StandardNotation + var digits = Math.min(8, 1 + Math.floor( + Math.log(Math.max(Math.abs(numericTextFieldWithUnit.maximum), Math.abs(numericTextFieldWithUnit.minimum)))/Math.log(10) + )) + var minus = numericTextFieldWithUnit.minimum < 0 ? "-?" : "" + if (numericTextFieldWithUnit.decimals == 0) + { + return "^%0\\d{1,%1}$".arg(minus).arg(digits) + } + else + { + return "^%0\\d{0,%1}[.,]?\\d{0,%2}$".arg(minus).arg(digits).arg(numericTextFieldWithUnit.decimals) + } + } + validator: RegExpValidator + { + regExp: new RegExp(textFieldWithUnit.validatorString) } //Enforce actual minimum and maximum values. diff --git a/resources/qml/MachineSettings/PrintHeadMinMaxTextField.qml b/resources/qml/MachineSettings/PrintHeadMinMaxTextField.qml index 8f24ce6204..0b38a91f81 100644 --- a/resources/qml/MachineSettings/PrintHeadMinMaxTextField.qml +++ b/resources/qml/MachineSettings/PrintHeadMinMaxTextField.qml @@ -54,7 +54,7 @@ NumericTextFieldWithUnit Connections { target: textField - onActiveFocusChanged: + function onActiveFocusChanged() { // When this text field loses focus and the entered text is not valid, make sure to recreate the binding to // show the correct value. diff --git a/resources/qml/MainWindow/ApplicationMenu.qml b/resources/qml/MainWindow/ApplicationMenu.qml index 4e08cb08dd..62b3a71ee8 100644 --- a/resources/qml/MainWindow/ApplicationMenu.qml +++ b/resources/qml/MainWindow/ApplicationMenu.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 @@ -48,7 +48,17 @@ Item ViewMenu { title: catalog.i18nc("@title:menu menubar:toplevel", "&View") } - SettingsMenu { title: catalog.i18nc("@title:menu menubar:toplevel", "&Settings") } + SettingsMenu + { + //On MacOS, don't translate the "Settings" word. + //Qt moves the "settings" entry to a different place, and if it got renamed can't find it again when it + //attempts to delete the item upon closing the application, causing a crash. + //In the new location, these items are translated automatically according to the system's language. + //For more information, see: + //- https://doc.qt.io/qt-5/macos-issues.html#menu-bar + //- https://doc.qt.io/qt-5/qmenubar.html#qmenubar-as-a-global-menu-bar + title: (Qt.platform.os == "osx") ? "&Settings" : catalog.i18nc("@title:menu menubar:toplevel", "&Settings") + } Menu { @@ -91,7 +101,15 @@ Item Menu { id: preferencesMenu - title: catalog.i18nc("@title:menu menubar:toplevel", "P&references") + + //On MacOS, don't translate the "Preferences" word. + //Qt moves the "preferences" entry to a different place, and if it got renamed can't find it again when it + //attempts to delete the item upon closing the application, causing a crash. + //In the new location, these items are translated automatically according to the system's language. + //For more information, see: + //- https://doc.qt.io/qt-5/macos-issues.html#menu-bar + //- https://doc.qt.io/qt-5/qmenubar.html#qmenubar-as-a-global-menu-bar + title: (Qt.platform.os == "osx") ? "&Preferences" : catalog.i18nc("@title:menu menubar:toplevel", "P&references") MenuItem { action: Cura.Actions.preferences } } @@ -169,7 +187,7 @@ Item Connections { target: Cura.Actions.newProject - onTriggered: + function onTriggered() { if(Printer.platformActivity || Cura.MachineManager.hasUserSettings) { @@ -182,7 +200,7 @@ Item Connections { target: Cura.Actions.browsePackages - onTriggered: + function onTriggered() { curaExtensions.callExtensionMethod("Toolbox", "launch") } @@ -192,7 +210,7 @@ Item Connections { target: Cura.Actions.marketplaceMaterials - onTriggered: + function onTriggered() { curaExtensions.callExtensionMethod("Toolbox", "launch") curaExtensions.callExtensionMethod("Toolbox", "setViewCategoryToMaterials") diff --git a/resources/qml/MainWindow/MainWindowHeader.qml b/resources/qml/MainWindow/MainWindowHeader.qml index 5d1a20c8b1..c670abb67a 100644 --- a/resources/qml/MainWindow/MainWindowHeader.qml +++ b/resources/qml/MainWindow/MainWindowHeader.qml @@ -8,7 +8,6 @@ import QtQuick.Controls.Styles 1.1 import UM 1.4 as UM import Cura 1.0 as Cura -import QtGraphicalEffects 1.0 import "../Account" @@ -63,7 +62,7 @@ Item anchors.verticalCenter: parent.verticalCenter exclusiveGroup: mainWindowHeaderMenuGroup style: UM.Theme.styles.main_window_header_tab - height: UM.Theme.getSize("main_window_header_button").height + height: Math.round(0.5 * UM.Theme.getSize("main_window_header").height) iconSource: model.stage.iconSource property color overlayColor: "transparent" diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml index 372c3897e3..92b88d3c09 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml @@ -93,7 +93,7 @@ Button id: icon anchors.verticalCenter: unknownMaterialMessage.verticalCenter - source: UM.Theme.getIcon("warning") + source: UM.Theme.getIcon("Warning") color: UM.Theme.getColor("warning") width: UM.Theme.getSize("section_icon").width height: width @@ -219,7 +219,7 @@ Button Connections { target: Cura.MachineManager - onCurrentConfigurationChanged: + function onCurrentConfigurationChanged() { configurationItem.checked = Cura.MachineManager.matchesConfiguration(configuration) } diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml index b68d37d1ea..afedafa9c2 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml @@ -32,19 +32,20 @@ Item anchors.top: parent.top anchors.topMargin: UM.Theme.getSize("default_margin").height - UM.RecolorImage + Rectangle { id: icon - - anchors.left: parent.left - anchors.verticalCenter: label.verticalCenter - - source: UM.Theme.getIcon("warning") color: UM.Theme.getColor("warning") width: UM.Theme.getSize("section_icon").width height: width + radius: width / 2 + UM.RecolorImage + { + anchors.fill:parent + source: UM.Theme.getIcon("Warning", "low") + color: UM.Theme.getColor("message_warning_icon") + } } - Label { id: label @@ -126,7 +127,7 @@ Item Connections { target: outputDevice - onUniqueConfigurationsChanged: + function onUniqueConfigurationsChanged() { forceModelUpdate() } @@ -135,7 +136,7 @@ Item Connections { target: Cura.MachineManager - onOutputDevicesChanged: + function onOutputDevicesChanged() { forceModelUpdate() } diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml index a499242c94..43ccde461e 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml @@ -56,51 +56,76 @@ Cura.ExpandablePopup id: extruderIcon materialColor: model.color extruderEnabled: model.enabled - height: parent.height - width: height + anchors.verticalCenter: parent.verticalCenter } - // Label for the brand of the material - Label + ColumnLayout { - id: typeAndBrandNameLabel - - text: model.material_brand + " " + model.material - elide: Text.ElideRight - font: UM.Theme.getFont("default") - color: UM.Theme.getColor("text") - renderType: Text.NativeRendering - - anchors - { - top: extruderIcon.top - left: extruderIcon.right - leftMargin: UM.Theme.getSize("default_margin").width - right: parent.right - rightMargin: UM.Theme.getSize("default_margin").width - } - } - // Label that shows the name of the variant - Label - { - id: variantLabel - - visible: Cura.MachineManager.activeMachine ? Cura.MachineManager.activeMachine.hasVariants : false - - text: model.variant - elide: Text.ElideRight - font: UM.Theme.getFont("default_bold") - color: UM.Theme.getColor("text") - renderType: Text.NativeRendering - + opacity: model.enabled ? 1 : UM.Theme.getColor("extruder_disabled").a + spacing: 0 anchors { left: extruderIcon.right leftMargin: UM.Theme.getSize("default_margin").width - top: typeAndBrandNameLabel.bottom + verticalCenter: parent.verticalCenter right: parent.right rightMargin: UM.Theme.getSize("default_margin").width } + // Label for the brand of the material + Label + { + id: materialBrandColorTypeLabel + + text: model.material_brand == model.color_name ? model.color_name + " " + model.material_type : model.material_brand + " " + model.color_name + " " + model.material_type + elide: Text.ElideRight + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering + width: parent.width + + visible: !truncated + } + + Label + { + id: materialColorTypeLabel + + text: model.color_name + " " + model.material_type + elide: Text.ElideRight + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering + width: parent.width + + visible: !materialBrandColorTypeLabel.visible && !truncated + } + + Label + { + id: materialTypeLabel + + text: model.material_type + elide: Text.ElideRight + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering + width: parent.width + visible: !materialBrandColorTypeLabel.visible && !materialColorTypeLabel.visible + } + // Label that shows the name of the variant + Label + { + id: variantLabel + + visible: Cura.MachineManager.activeMachine ? Cura.MachineManager.activeMachine.hasVariants : false + + text: model.variant + elide: Text.ElideRight + font: UM.Theme.getFont("default_bold") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering + width: parent.width + } } } } @@ -206,7 +231,7 @@ Cura.ExpandablePopup anchors.right: parent.right - iconSource: UM.Theme.getIcon("arrow_right") + iconSource: UM.Theme.getIcon("ChevronSingleRight") isIconOnRightSide: true onClicked: @@ -222,7 +247,7 @@ Cura.ExpandablePopup visible: popupItem.configuration_method == ConfigurationMenu.ConfigurationMethod.Custom text: catalog.i18nc("@label", "Configurations") - iconSource: UM.Theme.getIcon("arrow_left") + iconSource: UM.Theme.getIcon("ChevronSingleLeft") onClicked: { @@ -236,6 +261,6 @@ Cura.ExpandablePopup Connections { target: Cura.MachineManager - onGlobalContainerChanged: popupItem.manual_selected_method = -1 // When switching printers, reset the value of the manual selected method + function onGlobalContainerChanged() { popupItem.manual_selected_method = -1 } // When switching printers, reset the value of the manual selected method } } diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index c4fa83a5b8..8376693ad1 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -118,7 +118,7 @@ Item Connections { target: Cura.ExtruderManager - onActiveExtruderChanged: + function onActiveExtruderChanged() { tabBar.setCurrentIndex(Cura.ExtruderManager.activeExtruderIndex); } @@ -139,7 +139,7 @@ Item Connections { target: repeater.model - onModelChanged: + function onModelChanged() { tabBar.setCurrentIndex(Cura.ExtruderManager.activeExtruderIndex) } @@ -289,27 +289,32 @@ Item style: UM.Theme.styles.print_setup_header_button activeFocusOnPress: true - menu: Cura.MaterialMenu + Cura.MaterialMenu { + id: materialsMenu extruderIndex: Cura.ExtruderManager.activeExtruderIndex updateModels: materialSelection.visible } + onClicked: + { + materialsMenu.popup(); + } } Item { - width: instructionButton.width + 2 * UM.Theme.getSize("default_margin").width + width: instructionButton.width + 2 * UM.Theme.getSize("narrow_margin").width height: instructionButton.visible ? materialSelection.height: 0 Button { id: instructionButton hoverEnabled: true contentItem: Item {} - height: 0.5 * materialSelection.height - width: height + height: UM.Theme.getSize("small_button").height + width: UM.Theme.getSize("small_button").width anchors.centerIn: parent background: UM.RecolorImage { - source: UM.Theme.getIcon("printing_guideline") + source: UM.Theme.getIcon("Guide") color: instructionButton.hovered ? UM.Theme.getColor("primary") : UM.Theme.getColor("icon") } visible: selectors.instructionLink != "" @@ -345,7 +350,15 @@ Item activeFocusOnPress: true enabled: enabledCheckbox.checked - menu: Cura.NozzleMenu { extruderIndex: Cura.ExtruderManager.activeExtruderIndex } + Cura.NozzleMenu + { + id: nozzlesMenu + extruderIndex: Cura.ExtruderManager.activeExtruderIndex + } + onClicked: + { + nozzlesMenu.popup(); + } } } @@ -375,7 +388,7 @@ Item { id: warningImage anchors.left: parent.left - source: UM.Theme.getIcon("warning") + source: UM.Theme.getIcon("Warning") width: UM.Theme.getSize("section_icon").width height: UM.Theme.getSize("section_icon").height sourceSize.width: width diff --git a/resources/qml/Menus/ContextMenu.qml b/resources/qml/Menus/ContextMenu.qml index cb10d50ce8..1709d70ab5 100644 --- a/resources/qml/Menus/ContextMenu.qml +++ b/resources/qml/Menus/ContextMenu.qml @@ -90,13 +90,13 @@ Menu Connections { target: UM.Controller - onContextMenuRequested: base.popup(); + function onContextMenuRequested() { base.popup(); } } Connections { target: Cura.Actions.multiplySelection - onTriggered: multiplyDialog.open() + function onTriggered() { multiplyDialog.open() } } UM.SettingPropertyProvider diff --git a/resources/qml/Menus/FileMenu.qml b/resources/qml/Menus/FileMenu.qml index b9845678d6..681e0b06ce 100644 --- a/resources/qml/Menus/FileMenu.qml +++ b/resources/qml/Menus/FileMenu.qml @@ -4,13 +4,14 @@ import QtQuick 2.2 import QtQuick.Controls 1.1 -import UM 1.2 as UM +import UM 1.6 as UM import Cura 1.0 as Cura Menu { id: base title: catalog.i18nc("@title:menu menubar:toplevel", "&File") + property var fileProviderModel: CuraApplication.getFileProviderModel() MenuItem { @@ -22,6 +23,13 @@ Menu { id: openMenu action: Cura.Actions.open + visible: (base.fileProviderModel.count == 1) + } + + OpenFilesMenu + { + id: openFilesMenu + visible: (base.fileProviderModel.count > 1) } RecentFilesMenu { } @@ -29,8 +37,10 @@ Menu MenuItem { id: saveWorkspaceMenu - shortcut: StandardKey.Save + shortcut: visible ? StandardKey.Save : "" text: catalog.i18nc("@title:menu menubar:file", "&Save Project...") + visible: saveProjectMenu.model.count == 1 + enabled: UM.WorkspaceFileHandler.enabled onTriggered: { var args = { "filter_by_machine": false, "file_type": "workspace", "preferred_mimetypes": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml" }; @@ -46,6 +56,16 @@ Menu } } + UM.ProjectOutputDevicesModel { id: projectOutputDevicesModel } + + SaveProjectMenu + { + id: saveProjectMenu + model: projectOutputDevicesModel + visible: model.count > 1 + enabled: UM.WorkspaceFileHandler.enabled + } + MenuSeparator { } MenuItem diff --git a/resources/qml/Menus/OpenFilesMenu.qml b/resources/qml/Menus/OpenFilesMenu.qml new file mode 100644 index 0000000000..3c2b64ee62 --- /dev/null +++ b/resources/qml/Menus/OpenFilesMenu.qml @@ -0,0 +1,46 @@ +// Copyright (c) 2020 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.2 +import QtQuick.Controls 1.1 + +import UM 1.6 as UM +import Cura 1.0 as Cura + +import "../Dialogs" + +Menu +{ + id: openFilesMenu + title: catalog.i18nc("@title:menu menubar:file", "Open File(s)...") + iconName: "document-open-recent"; + + Instantiator + { + id: fileProviders + model: CuraApplication.getFileProviderModel() + MenuItem + { + text: + { + return model.displayText; + } + onTriggered: + { + if (model.index == 0) // The 0th element is the "From Disk" option, which should activate the open local file dialog + { + Cura.Actions.open.trigger() + } + else + { + CuraApplication.getFileProviderModel().trigger(model.name); + } + } + // Unassign the shortcuts when the submenu is invisible (i.e. when there is only one file provider) to avoid ambiguous shortcuts. + // When there is a signle file provider, the openAction is assigned with the Ctrl+O shortcut instead. + shortcut: openFilesMenu.visible ? model.shortcut : "" + } + onObjectAdded: openFilesMenu.insertItem(index, object) + onObjectRemoved: openFilesMenu.removeItem(object) + } +} diff --git a/resources/qml/Menus/RecentFilesMenu.qml b/resources/qml/Menus/RecentFilesMenu.qml index 9de523280c..de6d2e3817 100644 --- a/resources/qml/Menus/RecentFilesMenu.qml +++ b/resources/qml/Menus/RecentFilesMenu.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2016 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -27,13 +27,7 @@ Menu var path = decodeURIComponent(modelData.toString()) return (index + 1) + ". " + path.slice(path.lastIndexOf("/") + 1); } - onTriggered: - { - CuraApplication.readLocalFile(modelData); - - var meshName = backgroundItem.getMeshName(modelData.toString()) - backgroundItem.hasMesh(decodeURIComponent(meshName)) - } + onTriggered: CuraApplication.readLocalFile(modelData) } onObjectAdded: menu.insertItem(index, object) onObjectRemoved: menu.removeItem(object) diff --git a/resources/qml/Menus/SaveProjectMenu.qml b/resources/qml/Menus/SaveProjectMenu.qml new file mode 100644 index 0000000000..afc6008717 --- /dev/null +++ b/resources/qml/Menus/SaveProjectMenu.qml @@ -0,0 +1,58 @@ +// Copyright (c) 2021 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.2 +import QtQuick.Controls 1.1 + +import UM 1.6 as UM +import Cura 1.1 as Cura + +import "../Dialogs" + +Menu +{ + id: saveProjectMenu + title: catalog.i18nc("@title:menu menubar:file", "Save Project...") + property alias model: projectOutputDevices.model + + Instantiator + { + id: projectOutputDevices + MenuItem + { + text: model.name + onTriggered: + { + if(!UM.WorkspaceFileHandler.enabled) + { + // Prevent shortcut triggering if the item is disabled! + return + } + var args = { "filter_by_machine": false, "file_type": "workspace", "preferred_mimetypes": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml" }; + if (UM.Preferences.getValue("cura/dialog_on_project_save")) + { + saveWorkspaceDialog.deviceId = model.id + saveWorkspaceDialog.args = args + saveWorkspaceDialog.open() + } + else + { + UM.OutputDeviceManager.requestWriteToDevice(model.id, PrintInformation.jobName, args) + } + } + // Unassign the shortcuts when the submenu is invisible (i.e. when there is only one project output device) to avoid ambiguous shortcuts. + // When there is only the LocalFileOutputDevice, the Ctrl+S shortcut is assigned to the saveWorkspaceMenu MenuItem + shortcut: saveProjectMenu.visible ? model.shortcut : "" + } + onObjectAdded: saveProjectMenu.insertItem(index, object) + onObjectRemoved: saveProjectMenu.removeItem(object) + } + + WorkspaceSummaryDialog + { + id: saveWorkspaceDialog + property var args + property var deviceId + onYes: UM.OutputDeviceManager.requestWriteToDevice(deviceId, PrintInformation.jobName, args) + } +} diff --git a/resources/qml/Menus/SettingVisibilityPresetsMenu.qml b/resources/qml/Menus/SettingVisibilityPresetsMenu.qml index 56cb001ff5..08d74a74ce 100644 --- a/resources/qml/Menus/SettingVisibilityPresetsMenu.qml +++ b/resources/qml/Menus/SettingVisibilityPresetsMenu.qml @@ -1,14 +1,17 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.7 -import QtQuick.Controls 1.4 +import QtQuick 2.10 +import QtQuick.Controls 2.11 +import QtQml.Models 2.14 as Models import UM 1.2 as UM import Cura 1.0 as Cura -Menu +Cura.Menu { + ActionGroup { id: group } + id: menu title: catalog.i18nc("@action:inmenu", "Visible Settings") @@ -16,16 +19,16 @@ Menu signal collapseAllCategories() - Instantiator + Models.Instantiator { model: settingVisibilityPresetsModel.items - MenuItem + Cura.MenuItem { text: modelData.name checkable: true checked: modelData.presetId == settingVisibilityPresetsModel.activePreset - exclusiveGroup: group + ActionGroup.group: group onTriggered: { settingVisibilityPresetsModel.setActivePreset(modelData.presetId); @@ -36,8 +39,8 @@ Menu onObjectRemoved: menu.removeItem(object) } - MenuSeparator {} - MenuItem + Cura.MenuSeparator {} + Cura.MenuItem { text: catalog.i18nc("@action:inmenu", "Collapse All Categories") onTriggered: @@ -45,13 +48,11 @@ Menu collapseAllCategories(); } } - MenuSeparator {} - MenuItem + Cura.MenuSeparator {} + Cura.MenuItem { text: catalog.i18nc("@action:inmenu", "Manage Setting Visibility...") - iconName: "configure" + icon.name: "configure" onTriggered: Cura.Actions.configureSettingVisibility.trigger() } - - ExclusiveGroup { id: group } } diff --git a/resources/qml/Menus/ViewMenu.qml b/resources/qml/Menus/ViewMenu.qml index a4ded0980c..af1a4c3be4 100644 --- a/resources/qml/Menus/ViewMenu.qml +++ b/resources/qml/Menus/ViewMenu.qml @@ -20,6 +20,7 @@ Menu MenuItem { action: Cura.Actions.view3DCamera; } MenuItem { action: Cura.Actions.viewFrontCamera; } MenuItem { action: Cura.Actions.viewTopCamera; } + MenuItem { action: Cura.Actions.viewBottomCamera; } MenuItem { action: Cura.Actions.viewLeftSideCamera; } MenuItem { action: Cura.Actions.viewRightSideCamera; } } @@ -31,7 +32,7 @@ Menu Connections { target: UM.Preferences - onPreferenceChanged: + function onPreferenceChanged(preference) { if (preference !== "general/camera_perspective_mode") { diff --git a/resources/qml/MonitorButton.qml b/resources/qml/MonitorButton.qml index 99640b1059..e6248f43b4 100644 --- a/resources/qml/MonitorButton.qml +++ b/resources/qml/MonitorButton.qml @@ -252,9 +252,10 @@ Item buttonsRow.updateAdditionalComponents("monitorButtons") } - Connections { + Connections + { target: CuraApplication - onAdditionalComponentsChanged: buttonsRow.updateAdditionalComponents("monitorButtons") + function onAdditionalComponentsChanged() { buttonsRow.updateAdditionalComponents("monitorButtons") } } function updateAdditionalComponents (areaId) { diff --git a/resources/qml/ObjectItemButton.qml b/resources/qml/ObjectItemButton.qml index 5867a1c544..1637b8d0cd 100644 --- a/resources/qml/ObjectItemButton.qml +++ b/resources/qml/ObjectItemButton.qml @@ -13,8 +13,6 @@ Button width: parent.width height: UM.Theme.getSize("action_button").height - leftPadding: UM.Theme.getSize("thin_margin").width - rightPadding: perObjectSettingsInfo.visible ? UM.Theme.getSize("default_lining").width : UM.Theme.getSize("thin_margin").width checkable: true hoverEnabled: true @@ -46,14 +44,14 @@ Button width: objectItemButton.width - objectItemButton.leftPadding height: UM.Theme.getSize("action_button").height - UM.RecolorImage + Rectangle { id: swatch anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left - width: height - height: parent.height - UM.Theme.getSize("narrow_margin").height - source: UM.Theme.getIcon("extruder_button") + width: UM.Theme.getSize("standard_arrow").height + height: UM.Theme.getSize("standard_arrow").height + radius: Math.round(width / 2) color: extruderColor visible: showExtruderSwatches && extruderColor != "" } @@ -168,12 +166,12 @@ Button { switch (meshType) { case "support_mesh": - return UM.Theme.getIcon("pos_print_as_support"); + return UM.Theme.getIcon("MeshTypeSupport"); case "cutting_mesh": case "infill_mesh": - return UM.Theme.getIcon("pos_modify_overlaps"); + return UM.Theme.getIcon("MeshTypeIntersect"); case "anti_overhang_mesh": - return UM.Theme.getIcon("pos_modify_dont_support_overlap"); + return UM.Theme.getIcon("BlockSupportOverlaps"); } return ""; } diff --git a/resources/qml/ObjectSelector.qml b/resources/qml/ObjectSelector.qml index 15cb476e08..0cdc2b3f80 100644 --- a/resources/qml/ObjectSelector.qml +++ b/resources/qml/ObjectSelector.qml @@ -48,7 +48,7 @@ Item sourceSize.width: width anchors.left: parent.left color: openCloseButton.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text") - source: objectSelector.opened ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_top") + source: objectSelector.opened ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleUp") } Label diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index c0c443eec2..341b51c8b4 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -1,13 +1,15 @@ // Copyright (c) 2020 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.1 +import QtQuick 2.10 import QtQuick.Controls 1.1 import QtQuick.Layouts 1.1 import QtQuick.Controls.Styles 1.1 +import QtQuick.Controls 2.3 as NewControls + import UM 1.1 as UM -import Cura 1.0 as Cura +import Cura 1.1 as Cura UM.PreferencesPage { @@ -123,8 +125,6 @@ UM.PreferencesPage width: parent.width height: parent.height - flickableItem.flickableDirection: Flickable.VerticalFlick; - Column { @@ -141,6 +141,7 @@ UM.PreferencesPage { id: interfaceGrid columns: 4 + width: parent.width Label { @@ -148,39 +149,45 @@ UM.PreferencesPage text: "Language:" //Don't translate this, to make it easier to find the language drop-down if you can't read the current language. } - ComboBox + ListModel { - id: languageComboBox - model: ListModel + id: languageList + + Component.onCompleted: { - id: languageList + append({ text: "English", code: "en_US" }) + append({ text: "Čeština", code: "cs_CZ" }) + append({ text: "Deutsch", code: "de_DE" }) + append({ text: "Español", code: "es_ES" }) + //Finnish is disabled for being incomplete: append({ text: "Suomi", code: "fi_FI" }) + append({ text: "Français", code: "fr_FR" }) + append({ text: "Italiano", code: "it_IT" }) + append({ text: "日本語", code: "ja_JP" }) + append({ text: "한국어", code: "ko_KR" }) + append({ text: "Nederlands", code: "nl_NL" }) + //Polish is disabled for being incomplete: append({ text: "Polski", code: "pl_PL" }) + append({ text: "Português do Brasil", code: "pt_BR" }) + append({ text: "Português", code: "pt_PT" }) + append({ text: "Русский", code: "ru_RU" }) + append({ text: "Türkçe", code: "tr_TR" }) + append({ text: "简体中文", code: "zh_CN" }) + append({ text: "正體字", code: "zh_TW" }) - Component.onCompleted: { - append({ text: "English", code: "en_US" }) - //Czech is disabled for being incomplete: append({ text: "Čeština", code: "cs_CZ" }) - append({ text: "Deutsch", code: "de_DE" }) - append({ text: "Español", code: "es_ES" }) - //Finnish is disabled for being incomplete: append({ text: "Suomi", code: "fi_FI" }) - append({ text: "Français", code: "fr_FR" }) - append({ text: "Italiano", code: "it_IT" }) - append({ text: "日本語", code: "ja_JP" }) - append({ text: "한국어", code: "ko_KR" }) - append({ text: "Nederlands", code: "nl_NL" }) - //Polish is disabled for being incomplete: append({ text: "Polski", code: "pl_PL" }) - append({ text: "Português do Brasil", code: "pt_BR" }) - append({ text: "Português", code: "pt_PT" }) - append({ text: "Русский", code: "ru_RU" }) - append({ text: "Türkçe", code: "tr_TR" }) - append({ text: "简体中文", code: "zh_CN" }) - append({ text: "正體字", code: "zh_TW" }) - - var date_object = new Date(); - if (date_object.getUTCMonth() == 8 && date_object.getUTCDate() == 19) //Only add Pirate on the 19th of September. - { - append({ text: "Pirate", code: "en_7S" }) - } + var date_object = new Date(); + if (date_object.getUTCMonth() == 8 && date_object.getUTCDate() == 19) //Only add Pirate on the 19th of September. + { + append({ text: "Pirate", code: "en_7S" }) } } + } + + NewControls.ComboBox + { + id: languageComboBox + + textRole: "text" + model: languageList + Layout.fillWidth: true currentIndex: { @@ -194,20 +201,6 @@ UM.PreferencesPage } } onActivated: UM.Preferences.setValue("general/language", model.get(index).code) - - Component.onCompleted: - { - // Because ListModel is stupid and does not allow using qsTr() for values. - for(var i = 0; i < languageList.count; ++i) - { - languageList.setProperty(i, "text", catalog.i18n(languageList.get(i).text)); - } - - // Glorious hack time. ComboBox does not update the text properly after changing the - // model. So change the indices around to force it to update. - currentIndex += 1; - currentIndex -= 1; - } } Label @@ -229,22 +222,26 @@ UM.PreferencesPage text: catalog.i18nc("@label","Theme:") } - ComboBox + ListModel + { + id: themeList + + Component.onCompleted: { + var themes = UM.Theme.getThemes() + for (var i = 0; i < themes.length; i++) + { + append({ text: themes[i].name.toString(), code: themes[i].id.toString() }); + } + } + } + + NewControls.ComboBox { id: themeComboBox - model: ListModel - { - id: themeList - - Component.onCompleted: { - var themes = UM.Theme.getThemes() - for (var i = 0; i < themes.length; i++) - { - append({ text: themes[i].name.toString(), code: themes[i].id.toString() }); - } - } - } + model: themeList + textRole: "text" + Layout.fillWidth: true currentIndex: { @@ -259,21 +256,6 @@ UM.PreferencesPage return 0; } onActivated: UM.Preferences.setValue("general/theme", model.get(index).code) - - Component.onCompleted: - { - // Because ListModel is stupid and does not allow using qsTr() for values. - for(var i = 0; i < themeList.count; ++i) - { - themeList.setProperty(i, "text", catalog.i18n(themeList.get(i).text)); - } - - // Glorious hack time. ComboBox does not update the text properly after changing the - // model. So change the indices around to force it to update. - currentIndex += 1; - currentIndex -= 1; - } - } } @@ -416,7 +398,7 @@ UM.PreferencesPage Connections { target: UM.Preferences - onPreferenceChanged: + function onPreferenceChanged(preference) { if(preference != "general/camera_perspective_mode") { @@ -519,19 +501,22 @@ UM.PreferencesPage { text: catalog.i18nc("@window:text", "Camera rendering:") } - ComboBox + ListModel + { + id: comboBoxList + Component.onCompleted: + { + append({ text: catalog.i18n("Perspective"), code: "perspective" }) + append({ text: catalog.i18n("Orthographic"), code: "orthographic" }) + } + } + + NewControls.ComboBox { id: cameraComboBox - model: ListModel - { - id: comboBoxList - - Component.onCompleted: { - append({ text: catalog.i18n("Perspective"), code: "perspective" }) - append({ text: catalog.i18n("Orthographic"), code: "orthographic" }) - } - } + model: comboBoxList + textRole: "text" currentIndex: { @@ -667,10 +652,10 @@ UM.PreferencesPage text: catalog.i18nc("@window:text", "Default behavior when opening a project file: ") } - ComboBox + NewControls.ComboBox { id: choiceOnOpenProjectDropDownButton - width: 200 * screenScaleFactor + width: Math.round(250 * screenScaleFactor) model: ListModel { @@ -683,6 +668,7 @@ UM.PreferencesPage append({ text: catalog.i18nc("@option:openProject", "Always import models"), code: "open_as_model" }) } } + textRole: "text" currentIndex: { @@ -733,11 +719,11 @@ UM.PreferencesPage text: catalog.i18nc("@window:text", "Default behavior for changed setting values when switching to a different profile: ") } - ComboBox + NewControls.ComboBox { id: choiceOnProfileOverrideDropDownButton - width: 200 * screenScaleFactor - + width: Math.round(250 * screenScaleFactor) + popup.width: Math.round(350 * screenScaleFactor) model: ListModel { id: discardOrKeepProfileListModel @@ -749,6 +735,7 @@ UM.PreferencesPage append({ text: catalog.i18nc("@option:discardOrKeep", "Always transfer changed settings to new profile"), code: "always_keep" }) } } + textRole: "text" currentIndex: { @@ -856,7 +843,7 @@ UM.PreferencesPage Connections { target: UM.Preferences - onPreferenceChanged: + function onPreferenceChanged(preference) { if (preference !== "info/send_slice_info") { diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml index b61f866833..a8b64f94a4 100644 --- a/resources/qml/Preferences/MachinesPage.qml +++ b/resources/qml/Preferences/MachinesPage.qml @@ -166,7 +166,7 @@ UM.ManagementPage Connections { target: Cura.MachineManager - onGlobalContainerChanged: + function onGlobalContainerChanged() { objectList.currentIndex = activeMachineIndex() objectList.onCurrentIndexChanged() diff --git a/resources/qml/Preferences/Materials/MaterialsBrandSection.qml b/resources/qml/Preferences/Materials/MaterialsBrandSection.qml index 5dd68c426f..dc8be9563b 100644 --- a/resources/qml/Preferences/Materials/MaterialsBrandSection.qml +++ b/resources/qml/Preferences/Materials/MaterialsBrandSection.qml @@ -66,7 +66,7 @@ Item width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height color: "black" - source: brand_section.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") + source: brand_section.expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft") } } } @@ -134,7 +134,7 @@ Item Connections { target: UM.Preferences - onPreferenceChanged: + function onPreferenceChanged(preference) { if (preference !== "cura/expanded_types" && preference !== "cura/expanded_brands") { @@ -144,4 +144,4 @@ Item expanded = materialList.expandedBrands.indexOf(sectionName) > -1 } } -} \ No newline at end of file +} diff --git a/resources/qml/Preferences/Materials/MaterialsList.qml b/resources/qml/Preferences/Materials/MaterialsList.qml index 8b82a87820..3173fbd680 100644 --- a/resources/qml/Preferences/Materials/MaterialsList.qml +++ b/resources/qml/Preferences/Materials/MaterialsList.qml @@ -124,13 +124,13 @@ Item Connections { target: materialsModel - onItemsChanged: updateAfterModelChanges() + function onItemsChanged() { updateAfterModelChanges() } } Connections { target: genericMaterialsModel - onItemsChanged: updateAfterModelChanges() + function onItemsChanged() { updateAfterModelChanges() } } Column diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml index 791d6685de..4de3ad918b 100644 --- a/resources/qml/Preferences/Materials/MaterialsPage.qml +++ b/resources/qml/Preferences/Materials/MaterialsPage.qml @@ -1,5 +1,5 @@ -// Copyright (c) 2018 Ultimaker B.V. -// Uranium is released under the terms of the LGPLv3 or higher. +// Copyright (c) 2021 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 import QtQuick.Controls 1.4 @@ -191,6 +191,21 @@ Item } enabled: base.hasCurrentItem } + + //Sync button. + Button + { + id: syncMaterialsButton + text: catalog.i18nc("@action:button Sending materials to printers", "Sync with Printers") + iconName: "sync-synchronizing" + onClicked: + { + forceActiveFocus(); + exportAllMaterialsDialog.folder = base.materialManagementModel.getPreferredExportAllPath(); + exportAllMaterialsDialog.open(); + } + visible: Cura.MachineManager.activeMachine.supportsMaterialExport + } } Item { @@ -368,6 +383,19 @@ Item } } + FileDialog + { + id: exportAllMaterialsDialog + title: catalog.i18nc("@title:window", "Export All Materials") + selectExisting: false + nameFilters: ["Material archives (*.umm)", "All files (*)"] + onAccepted: + { + base.materialManagementModel.exportAll(fileUrl); + CuraApplication.setDefaultPath("dialog_material_path", folder); + } + } + MessageDialog { id: messageDialog diff --git a/resources/qml/Preferences/Materials/MaterialsSlot.qml b/resources/qml/Preferences/Materials/MaterialsSlot.qml index 81bb8759ff..840c636196 100644 --- a/resources/qml/Preferences/Materials/MaterialsSlot.qml +++ b/resources/qml/Preferences/Materials/MaterialsSlot.qml @@ -122,7 +122,7 @@ Rectangle } } } - source: materialSlot.is_favorite ? UM.Theme.getIcon("favorites_star_full") : UM.Theme.getIcon("favorites_star_empty") + source: materialSlot.is_favorite ? UM.Theme.getIcon("StarFilled") : UM.Theme.getIcon("Star") } } -} \ No newline at end of file +} diff --git a/resources/qml/Preferences/Materials/MaterialsTypeSection.qml b/resources/qml/Preferences/Materials/MaterialsTypeSection.qml index 07630a83b4..09f9964604 100644 --- a/resources/qml/Preferences/Materials/MaterialsTypeSection.qml +++ b/resources/qml/Preferences/Materials/MaterialsTypeSection.qml @@ -78,7 +78,7 @@ Item width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height color: "black" - source: material_type_section.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") + source: material_type_section.expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft") } } @@ -124,7 +124,7 @@ Item Connections { target: UM.Preferences - onPreferenceChanged: + function onPreferenceChanged(preference) { if (preference !== "cura/expanded_types" && preference !== "cura/expanded_brands") { @@ -134,4 +134,4 @@ Item expanded = materialList.expandedTypes.indexOf(materialBrand + "_" + materialName) > -1 } } -} \ No newline at end of file +} diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml index 5ee6dc32ce..9144d4dbe1 100644 --- a/resources/qml/Preferences/ProfilesPage.qml +++ b/resources/qml/Preferences/ProfilesPage.qml @@ -83,10 +83,10 @@ Item id: activateMenuButton text: catalog.i18nc("@action:button", "Activate") iconName: "list-activate" - enabled: !isCurrentItemActivated + enabled: !isCurrentItemActivated && base.currentItem onClicked: { - if (base.currentItem.is_read_only) + if(base.currentItem.is_read_only) { Cura.IntentManager.selectIntent(base.currentItem.intent_category, base.currentItem.quality_type); } @@ -217,7 +217,7 @@ Item Connections { target: base.qualityManagementModel - onItemsChanged: + function onItemsChanged() { var toSelectItemName = base.currentItem == null ? "" : base.currentItem.name; if (newQualityNameToSelect != "") @@ -232,14 +232,17 @@ Item for (var idx = 0; idx < base.qualityManagementModel.count; ++idx) { var item = base.qualityManagementModel.getItem(idx); - if (item.name == toSelectItemName) + if (item && item.name == toSelectItemName) { // Switch to the newly created profile if needed newIdx = idx; if (base.toActivateNewQuality) { // Activate this custom quality if required - Cura.MachineManager.setQualityChangesGroup(item.quality_changes_group); + if(item.quality_changes_group) + { + Cura.MachineManager.setQualityChangesGroup(item.quality_changes_group); + } } break; } diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml index eda40af0b1..d2fd5c7e94 100644 --- a/resources/qml/Preferences/SettingVisibilityPage.qml +++ b/resources/qml/Preferences/SettingVisibilityPage.qml @@ -5,6 +5,8 @@ import QtQuick 2.1 import QtQuick.Controls 1.1 import QtQuick.Controls.Styles 1.1 +import QtQuick.Controls 2.3 as NewControls + import UM 1.2 as UM import Cura 1.0 as Cura @@ -93,10 +95,10 @@ UM.PreferencesPage placeholderText: catalog.i18nc("@label:textbox", "Filter...") - onTextChanged: definitionsModel.filter = {"i18n_label": "*" + text} + onTextChanged: definitionsModel.filter = {"i18n_label|i18n_description": "*" + text} } - ComboBox + NewControls.ComboBox { id: visibilityPreset width: 150 * screenScaleFactor @@ -104,6 +106,7 @@ UM.PreferencesPage { top: parent.top right: parent.right + bottom: scrollView.top } model: settingVisibilityPresetsModel.items @@ -163,7 +166,7 @@ UM.PreferencesPage { id: loader - width: parent.width + width: settingsListView.width height: model.type != undefined ? UM.Theme.getSize("section").height : 0 property var definition: model diff --git a/resources/qml/PrimaryButton.qml b/resources/qml/PrimaryButton.qml index fca63d2cdb..52c460bde4 100644 --- a/resources/qml/PrimaryButton.qml +++ b/resources/qml/PrimaryButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -9,8 +9,6 @@ import Cura 1.1 as Cura Cura.ActionButton { - shadowEnabled: true - shadowColor: enabled ? UM.Theme.getColor("primary_button_shadow"): UM.Theme.getColor("action_button_disabled_shadow") color: UM.Theme.getColor("primary_button") textColor: UM.Theme.getColor("primary_button_text") outlineColor: "transparent" diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index db19ed89df..cde2cd8dfc 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -158,7 +158,7 @@ Item anchors.rightMargin: UM.Theme.getSize("default_margin").width color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button"); - iconSource: UM.Theme.getIcon("star") + iconSource: UM.Theme.getIcon("StarFilled") onClicked: { @@ -176,7 +176,7 @@ Item { id: downArrow - source: UM.Theme.getIcon("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height @@ -226,9 +226,12 @@ Item { Cura.ExtruderIcon { - anchors.horizontalCenter: parent.horizontalCenter + anchors.centerIn: parent materialColor: model.color extruderEnabled: model.enabled + iconVariant: "default" + height: parent.height + width: height } } onClicked: @@ -244,7 +247,7 @@ Item Connections { target: Cura.ExtruderManager - onActiveExtruderChanged: + function onActiveExtruderChanged() { tabBar.setCurrentIndex(Cura.ExtruderManager.activeExtruderIndex); } @@ -256,7 +259,7 @@ Item Connections { target: repeater.model - onModelChanged: + function onModelChanged() { tabBar.setCurrentIndex(Cura.ExtruderManager.activeExtruderIndex) } diff --git a/resources/qml/PrintSetupSelector/NoIntentIcon.qml b/resources/qml/PrintSetupSelector/NoIntentIcon.qml index 7943a05ab4..6fc883fdef 100644 --- a/resources/qml/PrintSetupSelector/NoIntentIcon.qml +++ b/resources/qml/PrintSetupSelector/NoIntentIcon.qml @@ -18,7 +18,7 @@ Item UM.RecolorImage { - source: UM.Theme.getIcon("info") + source: UM.Theme.getIcon("Information") color: UM.Theme.getColor("icon") anchors.fill: parent } @@ -33,4 +33,4 @@ Item } onExited: base.hideTooltip() } -} \ No newline at end of file +} diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml index 79013233ed..0a5a466780 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml @@ -84,7 +84,7 @@ Item Connections { target: UM.Preferences - onPreferenceChanged: + function onPreferenceChanged(preference) { if (preference !== "view/settings_list_height" && preference !== "general/window_height" && preference !== "general/window_state") { @@ -142,7 +142,7 @@ Item leftPadding: UM.Theme.getSize("default_margin").width rightPadding: UM.Theme.getSize("default_margin").width text: catalog.i18nc("@button", "Recommended") - iconSource: UM.Theme.getIcon("arrow_left") + iconSource: UM.Theme.getIcon("ChevronSingleLeft") visible: currentModeIndex == PrintSetupSelectorContents.Mode.Custom onClicked: currentModeIndex = PrintSetupSelectorContents.Mode.Recommended } @@ -156,7 +156,7 @@ Item leftPadding: UM.Theme.getSize("default_margin").width rightPadding: UM.Theme.getSize("default_margin").width text: catalog.i18nc("@button", "Custom") - iconSource: UM.Theme.getIcon("arrow_right") + iconSource: UM.Theme.getIcon("ChevronSingleRight") isIconOnRightSide: true visible: currentModeIndex == PrintSetupSelectorContents.Mode.Recommended onClicked: @@ -233,10 +233,10 @@ Item height: UM.Theme.getSize("drag_icon").height anchors.centerIn: parent - source: UM.Theme.getIcon("resize") + source: UM.Theme.getIcon("ThreeDots") color: UM.Theme.getColor("small_button_text") } } } } -} \ No newline at end of file +} diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml index 1a15980693..3b6fc37eb4 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml @@ -15,7 +15,8 @@ RowLayout Cura.IconWithText { - source: UM.Theme.getIcon("category_layer_height") + source: UM.Theme.getIcon("Sliders", "medium") + iconSize: UM.Theme.getSize("button_icon").width text: { if (Cura.MachineManager.activeStack) @@ -50,9 +51,10 @@ RowLayout Cura.IconWithText { - source: UM.Theme.getIcon("category_infill") + source: UM.Theme.getIcon("Infill1") text: Cura.MachineManager.activeStack ? parseInt(infillDensity.properties.value) + "%" : "0%" font: UM.Theme.getFont("medium") + iconSize: UM.Theme.getSize("medium_button_icon").width UM.SettingPropertyProvider { @@ -65,9 +67,10 @@ RowLayout Cura.IconWithText { - source: UM.Theme.getIcon("category_support") + source: UM.Theme.getIcon("Support") text: supportEnabled.properties.value == "True" ? enabledText : disabledText font: UM.Theme.getFont("medium") + iconSize: UM.Theme.getSize("medium_button_icon").width UM.SettingPropertyProvider { @@ -80,9 +83,10 @@ RowLayout Cura.IconWithText { - source: UM.Theme.getIcon("category_adhesion") + source: UM.Theme.getIcon("Adhesion") text: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" ? enabledText : disabledText font: UM.Theme.getFont("medium") + iconSize: UM.Theme.getSize("medium_button_icon").width UM.SettingPropertyProvider { @@ -92,4 +96,4 @@ RowLayout watchedProperties: [ "value"] } } -} \ No newline at end of file +} diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index 1ae265ab47..a3a5047ee9 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -25,10 +25,11 @@ Item id: enableAdhesionRowTitle anchors.top: parent.top anchors.left: parent.left - source: UM.Theme.getIcon("category_adhesion") + source: UM.Theme.getIcon("Adhesion") text: catalog.i18nc("@label", "Adhesion") font: UM.Theme.getFont("medium") width: labelColumnWidth + iconSize: UM.Theme.getSize("medium_button_icon").width } Item @@ -87,4 +88,4 @@ Item watchedProperties: [ "value", "resolve", "enabled" ] storeIndex: 0 } -} \ No newline at end of file +} diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml index 19f199fea6..705a3e95ef 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml @@ -29,21 +29,21 @@ Item var density = parseInt(infillDensity.properties.value) if (parseInt(infillSteps.properties.value) != 0) { - return UM.Theme.getIcon("gradual") + return UM.Theme.getIcon("InfillGradual") } if (density <= 0) { - return UM.Theme.getIcon("hollow") + return UM.Theme.getIcon("Infill0") } if (density < 40) { - return UM.Theme.getIcon("sparse") + return UM.Theme.getIcon("Infill3") } if (density < 90) { - return UM.Theme.getIcon("dense") + return UM.Theme.getIcon("Infill2") } - return UM.Theme.getIcon("solid") + return UM.Theme.getIcon("Infill100") } } @@ -61,10 +61,11 @@ Item id: infillRowTitle anchors.top: parent.top anchors.left: parent.left - source: UM.Theme.getIcon("category_infill") + source: UM.Theme.getIcon("Infill1") text: catalog.i18nc("@label", "Infill") + " (%)" font: UM.Theme.getFont("medium") width: labelColumnWidth + iconSize: UM.Theme.getSize("medium_button_icon").width } Item @@ -119,6 +120,8 @@ Item implicitWidth: UM.Theme.getSize("print_setup_slider_handle").width implicitHeight: implicitWidth radius: Math.round(implicitWidth / 2) + border.color: UM.Theme.getColor("slider_groove_fill") + border.width: UM.Theme.getSize("default_lining").height } tickmarks: Repeater @@ -252,4 +255,4 @@ Item watchedProperties: ["value", "enabled"] storeIndex: 0 } -} \ No newline at end of file +} diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 337aff573f..0823b5cb62 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -48,10 +48,11 @@ Item Cura.IconWithText { id: profileLabel - source: UM.Theme.getIcon("category_layer_height") + source: UM.Theme.getIcon("PrintQuality") text: catalog.i18nc("@label", "Profiles") font: UM.Theme.getFont("medium") width: labelColumnWidth + iconSize: UM.Theme.getSize("medium_button_icon").width } UM.SimpleButton { @@ -69,7 +70,7 @@ Item } color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button") - iconSource: UM.Theme.getIcon("reset") + iconSource: UM.Theme.getIcon("ArrowReset") onClicked: { @@ -91,6 +92,7 @@ Item { left: profileLabel.right right: parent.right + verticalCenter: profileLabel.verticalCenter } model: Cura.QualityProfilesDropDownMenuModel @@ -198,4 +200,4 @@ Item } } -} \ No newline at end of file +} diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index 92f0024b23..4e2341fb57 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -26,10 +26,11 @@ Item anchors.top: parent.top anchors.left: parent.left visible: enableSupportCheckBox.visible - source: UM.Theme.getIcon("category_support") + source: UM.Theme.getIcon("Support") text: catalog.i18nc("@label", "Support") font: UM.Theme.getFont("medium") width: labelColumnWidth + iconSize: UM.Theme.getSize("medium_button_icon").width } Item @@ -128,7 +129,7 @@ Item Connections { target: extruderModel - onModelChanged: + function onModelChanged() { var maybeColor = supportExtruderCombobox.model.getItem(supportExtruderCombobox.currentIndex).color if (maybeColor) @@ -162,7 +163,7 @@ Item x: supportExtruderCombobox.width - width - supportExtruderCombobox.rightPadding y: supportExtruderCombobox.topPadding + Math.round((supportExtruderCombobox.availableHeight - height) / 2) - source: UM.Theme.getIcon("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height sourceSize.width: width + 5 * screenScaleFactor @@ -218,18 +219,16 @@ Item elide: Text.ElideLeft verticalAlignment: Text.AlignVCenter - background: UM.RecolorImage + background: Rectangle { id: swatch height: Math.round(parent.height / 2) width: height + radius: Math.round(width / 2) anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.rightMargin: UM.Theme.getSize("thin_margin").width - sourceSize.width: width - sourceSize.height: height - source: UM.Theme.getIcon("extruder_button") color: supportExtruderCombobox.color } } @@ -288,18 +287,16 @@ Item verticalAlignment: Text.AlignVCenter rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width - background: UM.RecolorImage + background: Rectangle { id: swatch height: Math.round(parent.height / 2) width: height + radius: Math.round(width / 2) anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.rightMargin: UM.Theme.getSize("thin_margin").width - sourceSize.width: width - sourceSize.height: height - source: UM.Theme.getIcon("extruder_button") color: supportExtruderCombobox.model.getItem(index).color } } @@ -342,4 +339,4 @@ Item watchedProperties: ["value"] storeIndex: 0 } -} \ No newline at end of file +} diff --git a/resources/qml/PrinterOutput/ExtruderBox.qml b/resources/qml/PrinterOutput/ExtruderBox.qml index ddd0a87c9f..63927cd98d 100644 --- a/resources/qml/PrinterOutput/ExtruderBox.qml +++ b/resources/qml/PrinterOutput/ExtruderBox.qml @@ -173,7 +173,7 @@ Item { base.showTooltip( base, - {x: 0, y: preheatTemperatureInputMouseArea.mapToItem(base, 0, 0).y}, + {x: 0, y: preheatTemperatureInputMouseArea.mapToItem(base, 0, -parent.height/2).y}, catalog.i18nc("@tooltip of temperature input", "The temperature to pre-heat the hotend to.") ); } @@ -366,7 +366,7 @@ Item { base.showTooltip( base, - {x: 0, y: preheatButton.mapToItem(base, 0, 0).y}, + {x: 0, y: preheatButton.mapToItem(base, 0, -parent.height).y}, catalog.i18nc("@tooltip of pre-heat", "Heat the hotend in advance before printing. You can continue adjusting your print while it is heating, and you won't have to wait for the hotend to heat up when you're ready to print.") ); } diff --git a/resources/qml/PrinterOutput/ManualPrinterControl.qml b/resources/qml/PrinterOutput/ManualPrinterControl.qml index e8947bfdf4..3213f1ace8 100644 --- a/resources/qml/PrinterOutput/ManualPrinterControl.qml +++ b/resources/qml/PrinterOutput/ManualPrinterControl.qml @@ -102,7 +102,7 @@ Item Layout.column: 1 Layout.preferredWidth: width Layout.preferredHeight: height - iconSource: UM.Theme.getIcon("arrow_top"); + iconSource: UM.Theme.getIcon("ChevronSingleUp"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -119,7 +119,7 @@ Item Layout.column: 0 Layout.preferredWidth: width Layout.preferredHeight: height - iconSource: UM.Theme.getIcon("arrow_left"); + iconSource: UM.Theme.getIcon("ChevronSingleLeft"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -136,7 +136,7 @@ Item Layout.column: 2 Layout.preferredWidth: width Layout.preferredHeight: height - iconSource: UM.Theme.getIcon("arrow_right"); + iconSource: UM.Theme.getIcon("ChevronSingleRight"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -153,7 +153,7 @@ Item Layout.column: 1 Layout.preferredWidth: width Layout.preferredHeight: height - iconSource: UM.Theme.getIcon("arrow_bottom"); + iconSource: UM.Theme.getIcon("ChevronSingleDown"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -170,7 +170,7 @@ Item Layout.column: 1 Layout.preferredWidth: width Layout.preferredHeight: height - iconSource: UM.Theme.getIcon("home"); + iconSource: UM.Theme.getIcon("House"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -200,7 +200,7 @@ Item Button { - iconSource: UM.Theme.getIcon("arrow_top"); + iconSource: UM.Theme.getIcon("ChevronSingleUp"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -213,7 +213,7 @@ Item Button { - iconSource: UM.Theme.getIcon("home"); + iconSource: UM.Theme.getIcon("House"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -226,7 +226,7 @@ Item Button { - iconSource: UM.Theme.getIcon("arrow_bottom"); + iconSource: UM.Theme.getIcon("ChevronSingleDown"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height diff --git a/resources/qml/PrinterOutput/OutputDeviceHeader.qml b/resources/qml/PrinterOutput/OutputDeviceHeader.qml index 47f855266b..cbb9461778 100644 --- a/resources/qml/PrinterOutput/OutputDeviceHeader.qml +++ b/resources/qml/PrinterOutput/OutputDeviceHeader.qml @@ -17,7 +17,7 @@ Item Connections { target: Cura.MachineManager - onGlobalContainerChanged: + function onGlobalContainerChanged() { outputDevice = Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null; } diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml index 17bb80906a..c12e364339 100644 --- a/resources/qml/PrinterSelector/MachineSelector.qml +++ b/resources/qml/PrinterSelector/MachineSelector.qml @@ -93,11 +93,11 @@ Cura.ExpandablePopup { if (isGroup) { - return UM.Theme.getIcon("printer_group") + return UM.Theme.getIcon("PrinterTriple", "medium") } else if (isNetworkPrinter || isCloudRegistered) { - return UM.Theme.getIcon("printer_single") + return UM.Theme.getIcon("Printer", "medium") } else { @@ -114,11 +114,26 @@ Cura.ExpandablePopup anchors { bottom: parent.bottom + bottomMargin: - height * 1 / 6 left: parent.left - leftMargin: UM.Theme.getSize("thick_margin").width + leftMargin: iconSize - width * 5 / 6 } - source: UM.Theme.getIcon(connectionStatus) + source: + { + if (connectionStatus == "printer_connected") + { + return UM.Theme.getIcon("CheckBlueBG", "low") + } + else if (connectionStatus == "printer_cloud_connected" || connectionStatus == "printer_cloud_not_available") + { + return UM.Theme.getIcon("CloudBadge", "low") + } + else + { + return "" + } + } width: UM.Theme.getSize("printer_status_icon").width height: UM.Theme.getSize("printer_status_icon").height @@ -132,11 +147,10 @@ Cura.ExpandablePopup { id: iconBackground anchors.centerIn: parent - // Make it a bit bigger so there is an outline - width: parent.width + 2 * UM.Theme.getSize("default_lining").width - height: parent.height + 2 * UM.Theme.getSize("default_lining").height - radius: Math.round(width / 2) - color: UM.Theme.getColor("main_background") + width: parent.width - 1.5 //1.5 pixels smaller, (at least sqrt(2), regardless of screen pixel scale) so that the circle doesn't show up behind the icon due to anti-aliasing. + height: parent.height - 1.5 + radius: width / 2 + color: UM.Theme.getColor("connection_badge_background") z: parent.z - 1 } diff --git a/resources/qml/PrinterSelector/MachineSelectorButton.qml b/resources/qml/PrinterSelector/MachineSelectorButton.qml index 115957dd64..bb30cded9f 100644 --- a/resources/qml/PrinterSelector/MachineSelectorButton.qml +++ b/resources/qml/PrinterSelector/MachineSelectorButton.qml @@ -105,13 +105,13 @@ Button Connections { target: outputDevice - onUniqueConfigurationsChanged: updatePrinterTypesFunction() + function onUniqueConfigurationsChanged() { updatePrinterTypesFunction() } } Connections { target: Cura.MachineManager - onOutputDevicesChanged: updatePrinterTypesFunction() + function onOutputDevicesChanged() { updatePrinterTypesFunction() } } Component.onCompleted: updatePrinterTypesFunction() diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index 0b8709fe7a..5aea771a44 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -146,6 +146,7 @@ Item } radius: Math.round(width / 2) color: activeColor + border.color: defaultItemColor visible: checkbox.checked } } diff --git a/resources/qml/SecondaryButton.qml b/resources/qml/SecondaryButton.qml index f03d8acdfa..ba4e0bb2c1 100644 --- a/resources/qml/SecondaryButton.qml +++ b/resources/qml/SecondaryButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -9,11 +9,9 @@ import Cura 1.1 as Cura Cura.ActionButton { - shadowEnabled: true - shadowColor: enabled ? UM.Theme.getColor("secondary_button_shadow"): UM.Theme.getColor("action_button_disabled_shadow") color: UM.Theme.getColor("secondary_button") textColor: UM.Theme.getColor("secondary_button_text") - outlineColor: "transparent" + outlineColor: UM.Theme.getColor("secondary_button_text") disabledColor: UM.Theme.getColor("action_button_disabled") textDisabledColor: UM.Theme.getColor("action_button_disabled_text") hoverColor: UM.Theme.getColor("secondary_button_hover") diff --git a/resources/qml/Settings/SettingCategory.qml b/resources/qml/Settings/SettingCategory.qml index e3e12d7753..5beb6e209e 100644 --- a/resources/qml/Settings/SettingCategory.qml +++ b/resources/qml/Settings/SettingCategory.qml @@ -16,10 +16,13 @@ Button anchors.rightMargin: 2 * UM.Theme.getSize("thin_margin").width hoverEnabled: true + height: UM.Theme.getSize("section_icon_column").height + background: Rectangle { id: backgroundRectangle height: UM.Theme.getSize("section").height + anchors.verticalCenter: parent.verticalCenter color: { if (!base.enabled) @@ -93,7 +96,7 @@ Button height: UM.Theme.getSize("standard_arrow").height sourceSize.height: width color: UM.Theme.getColor("setting_control_button") - source: definition.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") + source: definition.expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft") } } @@ -107,8 +110,8 @@ Button source: UM.Theme.getIcon(definition.icon) width: UM.Theme.getSize("section_icon").width height: UM.Theme.getSize("section_icon").height - sourceSize.width: width + 15 * screenScaleFactor - sourceSize.height: width + 15 * screenScaleFactor + sourceSize.width: width + sourceSize.height: width } onClicked: @@ -141,8 +144,8 @@ Button id: settingsButton visible: base.hovered || settingsButton.hovered - height: Math.round(base.height * 0.6) - width: Math.round(base.height * 0.6) + height: UM.Theme.getSize("small_button_icon").height + width: height anchors { @@ -154,7 +157,7 @@ Button color: UM.Theme.getColor("setting_control_button") hoverColor: UM.Theme.getColor("setting_control_button_hover") - iconSource: UM.Theme.getIcon("settings") + iconSource: UM.Theme.getIcon("Sliders") onClicked: Cura.Actions.configureSettingVisibility.trigger(definition) } @@ -184,7 +187,7 @@ Button return false } - height: Math.round(parent.height / 2) + height: UM.Theme.getSize("small_button_icon").height width: height onClicked: @@ -195,7 +198,7 @@ Button color: UM.Theme.getColor("setting_control_button") hoverColor: UM.Theme.getColor("setting_control_button_hover") - iconSource: UM.Theme.getIcon("notice") + iconSource: UM.Theme.getIcon("Information") onEntered: base.showTooltip(catalog.i18nc("@label","Some hidden settings use values different from their normal calculated value.\n\nClick to make these settings visible.")) diff --git a/resources/qml/Settings/SettingCheckBox.qml b/resources/qml/Settings/SettingCheckBox.qml index e3de6e219d..20693b92e3 100644 --- a/resources/qml/Settings/SettingCheckBox.qml +++ b/resources/qml/Settings/SettingCheckBox.qml @@ -151,7 +151,7 @@ SettingItem height: Math.round(parent.height / 2.5) sourceSize.height: width color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text"); - source: UM.Theme.getIcon("check") + source: UM.Theme.getIcon("Check") opacity: control.checked ? 1 : 0 Behavior on opacity { NumberAnimation { duration: 100; } } } diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml index ff57381ddf..ea514eb069 100644 --- a/resources/qml/Settings/SettingExtruder.qml +++ b/resources/qml/Settings/SettingExtruder.qml @@ -24,7 +24,7 @@ SettingItem Connections { target: extrudersModel - onModelChanged: + function onModelChanged() { control.color = extrudersModel.getItem(control.currentIndex).color } @@ -77,7 +77,7 @@ SettingItem currentIndex: propertyProvider.properties.value !== undefined ? propertyProvider.properties.value : 0 - property string color: "#fff" + property string color: "transparent" Binding { @@ -85,7 +85,7 @@ SettingItem // explicit binding here otherwise we do not handle value changes after the model changes. target: control property: "color" - value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : "" + value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : "transparent" } Binding @@ -104,7 +104,7 @@ SettingItem x: control.width - width - control.rightPadding y: control.topPadding + Math.round((control.availableHeight - height) / 2) - source: UM.Theme.getIcon("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height sourceSize.width: width + 5 * screenScaleFactor @@ -160,18 +160,16 @@ SettingItem elide: Text.ElideLeft verticalAlignment: Text.AlignVCenter - background: UM.RecolorImage + background: Rectangle { id: swatch height: Math.round(parent.height / 2) width: height + radius: Math.round(width / 2) anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.rightMargin: UM.Theme.getSize("thin_margin").width - sourceSize.width: width - sourceSize.height: height - source: UM.Theme.getIcon("extruder_button") color: control.color } } @@ -229,18 +227,16 @@ SettingItem verticalAlignment: Text.AlignVCenter rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width - background: UM.RecolorImage + background: Rectangle { id: swatch height: Math.round(parent.height / 2) width: height + radius: Math.round(width / 2) anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.rightMargin: UM.Theme.getSize("thin_margin").width - sourceSize.width: width - sourceSize.height: height - source: UM.Theme.getIcon("extruder_button") color: control.model.getItem(index).color } } diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index f0c748d190..35172fc799 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -156,7 +156,7 @@ Item { id: settingControls - height: UM.Theme.getSize("section_control").height + height: UM.Theme.getSize("small_button_icon").height spacing: Math.round(UM.Theme.getSize("thick_margin").height / 2) anchors @@ -174,12 +174,13 @@ Item anchors.top: parent.top anchors.bottom: parent.bottom + height: UM.Theme.getSize("small_button_icon").height width: height color: UM.Theme.getColor("setting_control_button") hoverColor: UM.Theme.getColor("setting_control_button") - iconSource: UM.Theme.getIcon("link") + iconSource: UM.Theme.getIcon("Link") onEntered: { @@ -203,12 +204,13 @@ Item anchors.top: parent.top anchors.bottom: parent.bottom + height: UM.Theme.getSize("small_button_icon").height width: height color: UM.Theme.getColor("setting_control_button") hoverColor: UM.Theme.getColor("setting_control_button_hover") - iconSource: UM.Theme.getIcon("reset") + iconSource: UM.Theme.getIcon("ArrowReset") onClicked: { @@ -286,6 +288,7 @@ Item anchors.top: parent.top anchors.bottom: parent.bottom + height: UM.Theme.getSize("small_button_icon").height width: height onClicked: @@ -324,7 +327,7 @@ Item color: UM.Theme.getColor("setting_control_button") hoverColor: UM.Theme.getColor("setting_control_button_hover") - iconSource: UM.Theme.getIcon("formula") + iconSource: UM.Theme.getIcon("Function") onEntered: { hoverTimer.stop(); base.showTooltip(catalog.i18nc("@label", "This setting is normally calculated, but it currently has an absolute value set.\n\nClick to restore the calculated value.")) } onExited: base.showTooltip(base.createTooltipText()) diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml index 714e49e500..94df1bcc03 100644 --- a/resources/qml/Settings/SettingOptionalExtruder.qml +++ b/resources/qml/Settings/SettingOptionalExtruder.qml @@ -29,7 +29,7 @@ SettingItem Connections { target: base.extrudersWithOptionalModel - onModelChanged: control.color = base.extrudersWithOptionalModel.getItem(control.currentIndex).color + function onModelChanged() { control.color = base.extrudersWithOptionalModel.getItem(control.currentIndex).color } } textRole: "name" @@ -88,7 +88,7 @@ SettingItem when: control.model.items.length > 0 } - property string color: "#fff" + property string color: "transparent" Binding { @@ -96,7 +96,7 @@ SettingItem // explicit binding here otherwise we do not handle value changes after the model changes. target: control property: "color" - value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : "" + value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : "transparent" } indicator: UM.RecolorImage @@ -105,7 +105,7 @@ SettingItem x: control.width - width - control.rightPadding y: control.topPadding + Math.round((control.availableHeight - height) / 2) - source: UM.Theme.getIcon("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height sourceSize.width: width + 5 * screenScaleFactor @@ -161,18 +161,16 @@ SettingItem elide: Text.ElideRight verticalAlignment: Text.AlignVCenter - background: UM.RecolorImage + background: Rectangle { id: swatch height: Math.round(parent.height / 2) width: height + radius: Math.round(width / 2) anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.rightMargin: UM.Theme.getSize("thin_margin").width - sourceSize.width: width - sourceSize.height: height - source: UM.Theme.getIcon("extruder_button") color: control.color } } @@ -226,18 +224,16 @@ SettingItem verticalAlignment: Text.AlignVCenter rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width - background: UM.RecolorImage + background: Rectangle { id: swatch height: Math.round(parent.height / 2) width: height + radius: Math.round(width / 2) anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.rightMargin: UM.Theme.getSize("thin_margin").width - sourceSize.width: width - sourceSize.height: height - source: UM.Theme.getIcon("extruder_button") color: control.model.getItem(index).color } } diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml index 9fc3d0a554..a5647e2d3a 100644 --- a/resources/qml/Settings/SettingTextField.qml +++ b/resources/qml/Settings/SettingTextField.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2017 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 @@ -92,11 +92,18 @@ SettingItem Label { - anchors.right: parent.right - anchors.rightMargin: Math.round(UM.Theme.getSize("setting_unit_margin").width) - anchors.verticalCenter: parent.verticalCenter + anchors + { + left: parent.left + leftMargin: Math.round(UM.Theme.getSize("setting_unit_margin").width) + right: parent.right + rightMargin: Math.round(UM.Theme.getSize("setting_unit_margin").width) + verticalCenter: parent.verticalCenter + } text: definition.unit + //However the setting value is aligned, align the unit opposite. That way it stays readable with right-to-left languages. + horizontalAlignment: (input.effectiveHorizontalAlignment == Text.AlignLeft) ? Text.AlignRight : Text.AlignLeft textFormat: Text.PlainText renderType: Text.NativeRendering color: UM.Theme.getColor("setting_unit") diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index 02e20a5a5b..26d88db911 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 @@ -65,7 +65,13 @@ Item anchors.right: clearFilterButton.left anchors.rightMargin: Math.round(UM.Theme.getSize("thick_margin").width) - placeholderText: "" + "
    " + catalog.i18nc("@label:textbox", "Search settings") + placeholderText: + { + var imageSize = "width='" + UM.Theme.getSize("small_button_icon").width + "' height='" + UM.Theme.getSize("small_button_icon").height + var imageSource = "' src='"+ UM.Theme.getIcon("Magnifier") + var searchPlaceholder = catalog.i18nc("@label:textbox", "Search settings") + return "" + "
    " + searchPlaceholder + } style: TextFieldStyle { @@ -133,7 +139,7 @@ Item UM.SimpleButton { id: clearFilterButton - iconSource: UM.Theme.getIcon("cross1") + iconSource: UM.Theme.getIcon("Cancel") visible: findingSettings height: Math.round(parent.height * 0.4) @@ -154,6 +160,20 @@ Item } } + SettingVisibilityPresetsMenu + { + id: settingVisibilityPresetsMenu + x: settingVisibilityMenu.x + y: settingVisibilityMenu.y + onCollapseAllCategories: + { + settingsSearchTimer.stop() + filter.text = "" // clear search field + filter.editingFinished() + definitionsModel.collapseAllCategories() + } + } + ToolButton { id: settingVisibilityMenu @@ -165,6 +185,8 @@ Item right: parent.right rightMargin: UM.Theme.getSize("wide_margin").width } + width: UM.Theme.getSize("medium_button_icon").width + height: UM.Theme.getSize("medium_button_icon").height style: ButtonStyle { @@ -174,26 +196,24 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter - width: UM.Theme.getSize("standard_arrow").width - height: UM.Theme.getSize("standard_arrow").height + width: UM.Theme.getSize("medium_button_icon").width + height: UM.Theme.getSize("medium_button_icon").height sourceSize.width: width sourceSize.height: height color: control.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text") - source: UM.Theme.getIcon("menu") + source: UM.Theme.getIcon("Hamburger") } } label: Label {} } - menu: SettingVisibilityPresetsMenu + onClicked: { - onCollapseAllCategories: - { - settingsSearchTimer.stop() - filter.text = "" // clear search field - filter.editingFinished() - definitionsModel.collapseAllCategories() - } + settingVisibilityPresetsMenu.popup( + settingVisibilityMenu, + -settingVisibilityPresetsMenu.width + UM.Theme.getSize("default_margin").width, + settingVisibilityMenu.height + ) } } @@ -357,16 +377,16 @@ Item Connections { target: item - onContextMenuRequested: + function onContextMenuRequested() { contextMenu.key = model.key; contextMenu.settingVisible = model.visible; contextMenu.provider = provider contextMenu.popup(); } - onShowTooltip: base.showTooltip(delegate, Qt.point(-settingsView.x - UM.Theme.getSize("default_margin").width, 0), text) - onHideTooltip: base.hideTooltip() - onShowAllHiddenInheritedSettings: + function onShowTooltip(text) { base.showTooltip(delegate, Qt.point(-settingsView.x - UM.Theme.getSize("default_margin").width, 0), text) } + function onHideTooltip() { base.hideTooltip() } + function onShowAllHiddenInheritedSettings() { var children_with_override = Cura.SettingInheritanceManager.getChildrenKeysWithOverride(category_id) for(var i = 0; i < children_with_override.length; i++) @@ -375,7 +395,7 @@ Item } Cura.SettingInheritanceManager.manualRemoveOverride(category_id) } - onFocusReceived: + function onFocusReceived() { contents.indexWithFocus = index; animateContentY.from = contents.contentY; @@ -383,7 +403,7 @@ Item animateContentY.to = contents.contentY; animateContentY.running = true; } - onSetActiveFocusToNextSetting: + function onSetActiveFocusToNextSetting(forward) { if (forward == undefined || forward) { diff --git a/resources/qml/TableView.qml b/resources/qml/TableView.qml new file mode 100644 index 0000000000..1b084be5a0 --- /dev/null +++ b/resources/qml/TableView.qml @@ -0,0 +1,68 @@ +// Copyright (C) 2021 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.10 +import QtQuick.Controls 1.4 as OldControls // TableView doesn't exist in the QtQuick Controls 2.x in 5.10, so use the old one +import QtQuick.Controls 2.3 +import QtQuick.Controls.Styles 1.4 + +import UM 1.2 as UM + + +OldControls.TableView +{ + itemDelegate: Item + { + height: tableCellLabel.implicitHeight + + Label + { + id: tableCellLabel + color: styleData.selected ? UM.Theme.getColor("primary_button_text") : UM.Theme.getColor("text") + elide: Text.ElideRight + text: styleData.value + anchors.fill: parent + anchors.leftMargin: 10 * screenScaleFactor + verticalAlignment: Text.AlignVCenter + } + } + + rowDelegate: Rectangle + { + color: styleData.selected ? UM.Theme.getColor("primary_button") : UM.Theme.getColor("main_background") + height: UM.Theme.getSize("table_row").height + } + + // Use the old styling technique since it's the only way to make the scrollbars themed in the TableView + style: TableViewStyle + { + backgroundColor: UM.Theme.getColor("main_background") + + handle: Rectangle + { + // Both implicit width and height have to be set, since the handle is used by both the horizontal and the vertical scrollbars + implicitWidth: UM.Theme.getSize("scrollbar").width + implicitHeight: UM.Theme.getSize("scrollbar").width + radius: width / 2 + color: UM.Theme.getColor(styleData.pressed ? "scrollbar_handle_down" : (styleData.hovered ? "scrollbar_handle_hover" : "scrollbar_handle")) + } + + scrollBarBackground: Rectangle + { + // Both implicit width and height have to be set, since the handle is used by both the horizontal and the vertical scrollbars + implicitWidth: UM.Theme.getSize("scrollbar").width + implicitHeight: UM.Theme.getSize("scrollbar").width + color: UM.Theme.getColor("main_background") + } + + // The little rectangle between the vertical and horizontal scrollbars + corner: Rectangle + { + color: UM.Theme.getColor("main_background") + } + + // Override the control arrows + incrementControl: Item { } + decrementControl: Item { } + } +} \ No newline at end of file diff --git a/resources/qml/TertiaryButton.qml b/resources/qml/TertiaryButton.qml index eb714c22f6..76684b6ef2 100644 --- a/resources/qml/TertiaryButton.qml +++ b/resources/qml/TertiaryButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2020 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -9,8 +9,6 @@ import Cura 1.1 as Cura Cura.ActionButton { - shadowEnabled: true - shadowColor: enabled ? UM.Theme.getColor("secondary_button_shadow"): UM.Theme.getColor("action_button_disabled_shadow") color: "transparent" textColor: UM.Theme.getColor("text_link") outlineColor: "transparent" diff --git a/resources/qml/ToolTip.qml b/resources/qml/ToolTip.qml index b8873439f1..3157f81d89 100644 --- a/resources/qml/ToolTip.qml +++ b/resources/qml/ToolTip.qml @@ -59,6 +59,7 @@ ToolTip color: UM.Theme.getColor("tooltip") target: Qt.point(targetPoint.x - tooltip.x, targetPoint.y - tooltip.y) arrowSize: UM.Theme.getSize("default_arrow").width + visible: tooltip.height != 0 } contentItem: Label diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml index 89d64b06ad..c948bb8242 100644 --- a/resources/qml/Toolbar.qml +++ b/resources/qml/Toolbar.qml @@ -44,7 +44,6 @@ Item anchors.top: parent.top anchors.right: parent.right - spacing: UM.Theme.getSize("default_lining").height Repeater { @@ -69,7 +68,8 @@ Item source: UM.Theme.getIcon(model.icon) != "" ? UM.Theme.getIcon(model.icon) : "file:///" + model.location + "/" + model.icon color: UM.Theme.getColor("icon") - sourceSize: UM.Theme.getSize("button_icon") + sourceSize.height: Math.round(UM.Theme.getSize("button").height / 2) + sourceSize.width: Math.round(UM.Theme.getSize("button").width / 2) } onCheckedChanged: @@ -131,7 +131,6 @@ Item anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.top: toolButtons.bottom anchors.right: parent.right - spacing: UM.Theme.getSize("default_lining").height Repeater { diff --git a/resources/qml/ToolbarButton.qml b/resources/qml/ToolbarButton.qml index b3f84bba1d..206ab23dc4 100644 --- a/resources/qml/ToolbarButton.qml +++ b/resources/qml/ToolbarButton.qml @@ -25,22 +25,7 @@ Button { implicitWidth: UM.Theme.getSize("button").width implicitHeight: UM.Theme.getSize("button").height - color: - { - if (base.checked && base.hovered) - { - return UM.Theme.getColor("toolbar_button_active_hover") - } - else if (base.checked) - { - return UM.Theme.getColor("toolbar_button_active") - } - else if(base.hovered) - { - return UM.Theme.getColor("toolbar_button_hover") - } - return UM.Theme.getColor("toolbar_background") - } + color: UM.Theme.getColor("toolbar_background") radius: UM.Theme.getSize("default_radius").width Rectangle @@ -84,16 +69,35 @@ Button color: parent.color } } - - contentItem: Item + contentItem: Rectangle { opacity: parent.enabled ? 1.0 : 0.2 + implicitWidth: Math.round(UM.Theme.getSize("button").width * 0.75) + implicitHeight: Math.round(UM.Theme.getSize("button").height * 0.75) + radius: Math.round(width * 0.5) + + color: + { + if (base.checked && base.hovered) + { + return UM.Theme.getColor("toolbar_button_active_hover") + } + else if (base.checked) + { + return UM.Theme.getColor("toolbar_button_active") + } + else if(base.hovered) + { + return UM.Theme.getColor("toolbar_button_hover") + } + return UM.Theme.getColor("toolbar_background") + } Loader { id: contentItemLoader anchors.centerIn: parent - width: UM.Theme.getSize("button_icon").width - height: UM.Theme.getSize("button_icon").height + width: Math.round(UM.Theme.getSize("button").width / 2) + height: Math.round(UM.Theme.getSize("button").height / 2) } } diff --git a/resources/qml/ViewOrientationButton.qml b/resources/qml/ViewOrientationButton.qml index 5d72de9a8d..7040447b29 100644 --- a/resources/qml/ViewOrientationButton.qml +++ b/resources/qml/ViewOrientationButton.qml @@ -11,5 +11,4 @@ UM.SimpleButton height: UM.Theme.getSize("small_button").height hoverColor: UM.Theme.getColor("small_button_text_hover") color: UM.Theme.getColor("small_button_text") - iconMargin: UM.Theme.getSize("thick_lining").width } \ No newline at end of file diff --git a/resources/qml/ViewOrientationControls.qml b/resources/qml/ViewOrientationControls.qml index 97f2bb9400..fc0f20fa77 100644 --- a/resources/qml/ViewOrientationControls.qml +++ b/resources/qml/ViewOrientationControls.qml @@ -18,7 +18,7 @@ Row ViewOrientationButton { - iconSource: UM.Theme.getIcon("view_3d") + iconSource: UM.Theme.getIcon("View3D") onClicked: Cura.Actions.view3DCamera.trigger() UM.TooltipArea @@ -31,7 +31,7 @@ Row ViewOrientationButton { - iconSource: UM.Theme.getIcon("view_front") + iconSource: UM.Theme.getIcon("ViewFront") onClicked: Cura.Actions.viewFrontCamera.trigger() UM.TooltipArea @@ -44,7 +44,7 @@ Row ViewOrientationButton { - iconSource: UM.Theme.getIcon("view_top") + iconSource: UM.Theme.getIcon("ViewTop") onClicked: Cura.Actions.viewTopCamera.trigger() UM.TooltipArea @@ -57,7 +57,7 @@ Row ViewOrientationButton { - iconSource: UM.Theme.getIcon("view_left") + iconSource: UM.Theme.getIcon("ViewLeft") onClicked: Cura.Actions.viewLeftSideCamera.trigger() UM.TooltipArea @@ -70,7 +70,7 @@ Row ViewOrientationButton { - iconSource: UM.Theme.getIcon("view_right") + iconSource: UM.Theme.getIcon("ViewRight") onClicked: Cura.Actions.viewRightSideCamera.trigger() UM.TooltipArea diff --git a/resources/qml/WelcomePages/AddCloudPrintersView.qml b/resources/qml/WelcomePages/AddCloudPrintersView.qml index 32e6ffec39..524bf288a0 100644 --- a/resources/qml/WelcomePages/AddCloudPrintersView.qml +++ b/resources/qml/WelcomePages/AddCloudPrintersView.qml @@ -215,7 +215,7 @@ Item id: finishButton anchors.right: parent.right anchors.bottom: parent.bottom - text: catalog.i18nc("@button", "Finish") + text: base.currentItem.next_page_button_text onClicked: { discoveredCloudPrintersModel.clear() diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml index f9193e724d..fb809426f4 100644 --- a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml @@ -143,7 +143,7 @@ Item sourceSize.width: width sourceSize.height: height color: UM.Theme.getColor("text") - source: base.currentSection == section ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right") + source: base.currentSection == section ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight") } Label @@ -208,8 +208,8 @@ Item Label { - width: parent.width - wrapMode: Text.WordWrap + width: parent.width - (2 * UM.Theme.getSize("default_margin").width) + wrapMode: Text.Wrap text: base.getMachineName() color: UM.Theme.getColor("primary_button") font: UM.Theme.getFont("huge") @@ -273,6 +273,7 @@ Item id: printerNameTextField placeholderText: catalog.i18nc("@text", "Please name your printer") maximumLength: 40 + width: parent.width - (printerNameLabel.width + (3 * UM.Theme.getSize("default_margin").width)) validator: RegExpValidator { regExp: printerNameTextField.machineNameValidator.machineNameRegex diff --git a/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml index c2706cb8d4..edf6fe5974 100644 --- a/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml +++ b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml @@ -54,7 +54,7 @@ Item { id: networkPrinterScrollView - maxItemCountAtOnce: 10 // show at max 10 items at once, otherwise you need to scroll. + maxItemCountAtOnce: 9 // show at max 9 items at once, otherwise you need to scroll. onRefreshButtonClicked: { @@ -158,9 +158,8 @@ Item const networkPrinterItem = addNetworkPrinterDropDown.contentItem.currentItem CuraApplication.getDiscoveredPrintersModel().createMachineFromDiscoveredPrinter(networkPrinterItem) - // If we have created a machine, end the wizard (since this is the last page) - base.endWizard() - + // After the networked machine has been created, go to the next page + base.showNextPage() } else { diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml index 9d79c421bd..58cadbec37 100644 --- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -214,22 +214,22 @@ Item id: troubleshootingButton anchors.right: parent.right - anchors.rightMargin: UM.Theme.getSize("default_margin").width + anchors.rightMargin: UM.Theme.getSize("thin_margin").width anchors.verticalCenter: parent.verticalCenter height: troubleshootingLinkIcon.height - width: troubleshootingLinkIcon.width + troubleshootingLabel.width + UM.Theme.getSize("default_margin").width + width: troubleshootingLinkIcon.width + troubleshootingLabel.width + UM.Theme.getSize("thin_margin").width UM.RecolorImage { id: troubleshootingLinkIcon anchors.right: troubleshootingLabel.left - anchors.rightMargin: UM.Theme.getSize("default_margin").width + anchors.rightMargin: UM.Theme.getSize("thin_margin").width anchors.verticalCenter: parent.verticalCenter height: troubleshootingLabel.height width: height sourceSize.height: width color: UM.Theme.getColor("text_link") - source: UM.Theme.getIcon("external_link") + source: UM.Theme.getIcon("LinkExternal") } Label diff --git a/resources/qml/WelcomePages/AddPrinterByIpContent.qml b/resources/qml/WelcomePages/AddPrinterByIpContent.qml index 97c71b37a4..9a69b78a83 100644 --- a/resources/qml/WelcomePages/AddPrinterByIpContent.qml +++ b/resources/qml/WelcomePages/AddPrinterByIpContent.qml @@ -41,7 +41,7 @@ Item Connections { target: CuraApplication.getDiscoveredPrintersModel() - onDiscoveredPrintersChanged: + function onDiscoveredPrintersChanged() { if (hasRequestFinished && currentRequestAddress) { @@ -310,7 +310,7 @@ Item Connections { target: CuraApplication.getDiscoveredPrintersModel() - onManualDeviceRequestFinished: + function onManualDeviceRequestFinished(success) { var discovered_printers_model = CuraApplication.getDiscoveredPrintersModel() var printer = discovered_printers_model.discoveredPrintersByAddress[hostnameField.text] diff --git a/resources/qml/WelcomePages/ChangelogContent.qml b/resources/qml/WelcomePages/ChangelogContent.qml new file mode 100644 index 0000000000..d106f94c04 --- /dev/null +++ b/resources/qml/WelcomePages/ChangelogContent.qml @@ -0,0 +1,59 @@ +// Copyright (c) 2021 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.10 +import QtQuick.Controls 2.3 + +import UM 1.3 as UM +import Cura 1.1 as Cura + + +// +// This component contains the content for the "What's new in Ultimaker Cura" page of the welcome on-boarding process. +// +Item +{ + UM.I18nCatalog { id: catalog; name: "cura" } + + Label + { + id: titleLabel + anchors.top: parent.top + anchors.horizontalCenter: parent.horizontalCenter + horizontalAlignment: Text.AlignHCenter + text: catalog.i18nc("@label", "Release Notes") + color: UM.Theme.getColor("primary_button") + font: UM.Theme.getFont("huge") + renderType: Text.NativeRendering + } + + Cura.ScrollableTextArea + { + id: changelogTextArea + + anchors.top: titleLabel.bottom + anchors.bottom: getStartedButton.top + anchors.topMargin: UM.Theme.getSize("wide_margin").height + anchors.bottomMargin: UM.Theme.getSize("wide_margin").height + anchors.left: parent.left + anchors.right: parent.right + + ScrollBar.horizontal.policy: ScrollBar.AlwaysOff + + textArea.text: CuraApplication.getTextManager().getChangeLogText() + textArea.textFormat: Text.RichText + textArea.wrapMode: Text.WordWrap + textArea.readOnly: true + textArea.font: UM.Theme.getFont("default") + textArea.onLinkActivated: Qt.openUrlExternally(link) + } + + Cura.PrimaryButton + { + id: getStartedButton + anchors.right: parent.right + anchors.bottom: parent.bottom + text: base.currentItem.next_page_button_text + onClicked: base.showNextPage() + } +} diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml index 48410f7f12..26e3a2f87c 100644 --- a/resources/qml/WelcomePages/CloudContent.qml +++ b/resources/qml/WelcomePages/CloudContent.qml @@ -34,93 +34,167 @@ Item } } - Label - { - id: titleLabel - anchors.top: parent.top - anchors.horizontalCenter: parent.horizontalCenter - horizontalAlignment: Text.AlignHCenter - text: catalog.i18nc("@label", "Ultimaker Account") - color: UM.Theme.getColor("primary_button") - font: UM.Theme.getFont("huge") - renderType: Text.NativeRendering - } - // Area where the cloud contents can be put. Pictures, texts and such. Item { id: cloudContentsArea anchors { - top: titleLabel.bottom + top: parent.top bottom: skipButton.top left: parent.left right: parent.right - topMargin: UM.Theme.getSize("default_margin").height } // Pictures and texts are arranged using Columns with spacing. The whole picture and text area is centered in // the cloud contents area. Column { - anchors.centerIn: parent + anchors.horizontalCenter: parent.horizontalCenter width: parent.width height: childrenRect.height - spacing: 20 * screenScaleFactor + spacing: UM.Theme.getSize("thick_margin").height - Image // Cloud image + Label + { + id: titleLabel + anchors.horizontalCenter: parent.horizontalCenter + horizontalAlignment: Text.AlignHCenter + text: catalog.i18nc("@label", "Sign in to the Ultimaker platform") + color: UM.Theme.getColor("primary_button") + font: UM.Theme.getFont("huge") + renderType: Text.NativeRendering + } + + // Filler item + Item + { + height: UM.Theme.getSize("default_margin").height + width: parent.width + } + + // Cloud image + Image { id: cloudImage anchors.horizontalCenter: parent.horizontalCenter source: UM.Theme.getImage("first_run_ultimaker_cloud") + fillMode: Image.PreserveAspectFit + width: UM.Theme.getSize("welcome_wizard_content_image_big").width + sourceSize.width: width + sourceSize.height: height } - Label // A title-ish text + + // Filler item + Item { - id: highlightTextLabel - anchors.horizontalCenter: parent.horizontalCenter - horizontalAlignment: Text.AlignHCenter - text: catalog.i18nc("@text", "Your key to connected 3D printing") - textFormat: Text.RichText - color: UM.Theme.getColor("primary") - font: UM.Theme.getFont("medium") - renderType: Text.NativeRendering + height: UM.Theme.getSize("default_margin").height + width: parent.width } - Label // A number of text items + // Motivational icons + Row { - id: textLabel - anchors.horizontalCenter: parent.horizontalCenter - text: + id: motivationRow + width: parent.width + + Column { - // There are 3 text items, each of which is translated separately as a single piece of text. - var full_text = "" - var t = "" + id: marketplaceColumn + width: Math.round(parent.width / 3) + spacing: UM.Theme.getSize("default_margin").height - t = catalog.i18nc("@text", "- Customize your experience with more print profiles and plugins") - full_text += "

    " + t + "

    " - - t = catalog.i18nc("@text", "- Stay flexible by syncing your setup and loading it anywhere") - full_text += "

    " + t + "

    " - - t = catalog.i18nc("@text", "- Increase efficiency with a remote workflow on Ultimaker printers") - full_text += "

    " + t + "

    " - - return full_text + Image + { + id: marketplaceImage + anchors.horizontalCenter: parent.horizontalCenter + fillMode: Image.PreserveAspectFit + width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width + source: UM.Theme.getIcon("Plugin") + sourceSize.width: width + sourceSize.height: height + } + Label + { + id: marketplaceTextLabel + anchors.horizontalCenter: parent.horizontalCenter + width: parent.width + text: catalog.i18nc("@text", "Add material settings and plugins from the Marketplace") + wrapMode: Text.Wrap + horizontalAlignment: Text.AlignHCenter + color: UM.Theme.getColor("text") + font: UM.Theme.getFont("default") + renderType: Text.NativeRendering + } + } + + Column + { + id: syncColumn + width: Math.round(parent.width / 3) + spacing: UM.Theme.getSize("default_margin").height + + Image + { + id: syncImage + anchors.horizontalCenter: parent.horizontalCenter + fillMode: Image.PreserveAspectFit + width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width + source: UM.Theme.getIcon("Spool") + sourceSize.width: width + sourceSize.height: height + } + Label + { + id: syncTextLabel + anchors.horizontalCenter: parent.horizontalCenter + width: parent.width + text: catalog.i18nc("@text", "Backup and sync your material settings and plugins") + wrapMode: Text.Wrap + horizontalAlignment: Text.AlignHCenter + color: UM.Theme.getColor("text") + font: UM.Theme.getFont("default") + renderType: Text.NativeRendering + } + } + + Column + { + id: communityColumn + width: Math.round(parent.width / 3) + spacing: UM.Theme.getSize("default_margin").height + + Image + { + id: communityImage + anchors.horizontalCenter: communityColumn.horizontalCenter + fillMode: Image.PreserveAspectFit + width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width + source: UM.Theme.getIcon("PrinterTriple", "medium") + sourceSize.width: width + sourceSize.height: height + } + Label + { + id: communityTextLabel + anchors.horizontalCenter: communityColumn.horizontalCenter + width: parent.width + text: catalog.i18nc("@text", "Share ideas and get help from 48,000+ users in the Ultimaker Community") + wrapMode: Text.Wrap + horizontalAlignment: Text.AlignHCenter + color: UM.Theme.getColor("text") + font: UM.Theme.getFont("default") + renderType: Text.NativeRendering + } } - textFormat: Text.RichText - font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") - renderType: Text.NativeRendering } - // "Sign in" and "Create an account" exist inside the column + // Sign in Button Cura.PrimaryButton { id: signInButton - height: createAccountButton.height - width: createAccountButton.width anchors.horizontalCenter: parent.horizontalCenter text: catalog.i18nc("@button", "Sign in") onClicked: Cura.API.account.login() @@ -135,16 +209,15 @@ Item } } - Cura.SecondaryButton + // Create an account button + Cura.TertiaryButton { id: createAccountButton anchors.horizontalCenter: parent.horizontalCenter - text: catalog.i18nc("@button","Create account") - onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "/app/create") + text: catalog.i18nc("@text", "Create a free Ultimaker Account") + onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "/app/create") } } - - } // The "Skip" button exists on the bottom right diff --git a/resources/qml/WelcomePages/DropDownHeader.qml b/resources/qml/WelcomePages/DropDownHeader.qml index 88da32c879..cb41ca808b 100644 --- a/resources/qml/WelcomePages/DropDownHeader.qml +++ b/resources/qml/WelcomePages/DropDownHeader.qml @@ -27,7 +27,7 @@ Cura.RoundedRectangle cornerSide: contentShown ? Cura.RoundedRectangle.Direction.Up : Cura.RoundedRectangle.Direction.All property string title: "" - property url rightIconSource: UM.Theme.getIcon("arrow_bottom") + property url rightIconSource: UM.Theme.getIcon("ChevronSingleDown") // If the tab is under hovering state property bool hovered: false diff --git a/resources/qml/WelcomePages/DropDownWidget.qml b/resources/qml/WelcomePages/DropDownWidget.qml index 526027ea53..b129673905 100644 --- a/resources/qml/WelcomePages/DropDownWidget.qml +++ b/resources/qml/WelcomePages/DropDownWidget.qml @@ -35,7 +35,7 @@ Item Connections { target: header - onClicked: + function onClicked() { base.contentShown = !base.contentShown clicked() @@ -49,7 +49,7 @@ Item anchors.left: parent.left anchors.right: parent.right height: UM.Theme.getSize("expandable_component_content_header").height - rightIconSource: contentShown ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") + rightIconSource: contentShown ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft") contentShown: base.contentShown } diff --git a/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml b/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml index 53504d7e92..64a815855b 100644 --- a/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml +++ b/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml @@ -27,7 +27,7 @@ Item Connections { target: machineActionsModel - onAllFinished: + function onAllFinished() { if (visible) { diff --git a/resources/qml/WelcomePages/WelcomeContent.qml b/resources/qml/WelcomePages/WelcomeContent.qml index 1464e363a8..619780435d 100644 --- a/resources/qml/WelcomePages/WelcomeContent.qml +++ b/resources/qml/WelcomePages/WelcomeContent.qml @@ -7,7 +7,6 @@ import QtQuick.Controls 2.3 import UM 1.3 as UM import Cura 1.1 as Cura - // // This component contains the content for the "Welcome" page of the welcome on-boarding process. // @@ -15,11 +14,39 @@ Item { UM.I18nCatalog { id: catalog; name: "cura" } - Column // Arrange the items vertically and put everything in the center + // Arrange the items vertically and put everything in the center + Column { - anchors.centerIn: parent - width: parent.width - spacing: 2 * UM.Theme.getSize("wide_margin").height + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + spacing: UM.Theme.getSize("thick_margin").height + width:parent.width + + + // Filler item + Item + { + height: UM.Theme.getSize("thick_margin").width + width: parent.width + } + + Image + { + id: curaImage + anchors.horizontalCenter: parent.horizontalCenter + source: UM.Theme.getImage("welcome_cura") + fillMode: Image.PreserveAspectFit + width: UM.Theme.getSize("welcome_wizard_content_image_big").width + sourceSize.width: width + sourceSize.height: height + } + + // Filler item + Item + { + height: UM.Theme.getSize("thick_margin").width + width: parent.width + } Label { @@ -28,35 +55,43 @@ Item horizontalAlignment: Text.AlignHCenter text: catalog.i18nc("@label", "Welcome to Ultimaker Cura") color: UM.Theme.getColor("primary_button") - font: UM.Theme.getFont("huge") + font: UM.Theme.getFont("huge_bold") renderType: Text.NativeRendering } - Image - { - id: curaImage - anchors.horizontalCenter: parent.horizontalCenter - source: UM.Theme.getImage("first_run_welcome_cura") - } - Label { id: textLabel anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignHCenter - text: catalog.i18nc("@text", "Please follow these steps to set up\nUltimaker Cura. This will only take a few moments.") + width: titleLabel.width + 2 * UM.Theme.getSize("thick_margin").width + text: catalog.i18nc("@text", "Please follow these steps to set up Ultimaker Cura. This will only take a few moments.") + wrapMode: Text.Wrap font: UM.Theme.getFont("medium") color: UM.Theme.getColor("text") renderType: Text.NativeRendering } + // Filler item + Item + { + height: UM.Theme.getSize("thick_margin").height + width: parent.width + } + Cura.PrimaryButton { id: getStartedButton anchors.horizontalCenter: parent.horizontalCenter - anchors.margins: UM.Theme.getSize("wide_margin").width text: catalog.i18nc("@button", "Get started") onClicked: base.showNextPage() } + + // Filler item + Item + { + height: UM.Theme.getSize("thick_margin").height + width: parent.width + } } } diff --git a/resources/qml/WelcomePages/WelcomeDialogItem.qml b/resources/qml/WelcomePages/WelcomeDialogItem.qml index 5b90a8732e..2d01642ada 100644 --- a/resources/qml/WelcomePages/WelcomeDialogItem.qml +++ b/resources/qml/WelcomePages/WelcomeDialogItem.qml @@ -61,6 +61,6 @@ Item Connections { target: model - onAllFinished: dialog.visible = false + function onAllFinished() { dialog.visible = false } } } diff --git a/resources/qml/WelcomePages/WhatsNewContent.qml b/resources/qml/WelcomePages/WhatsNewContent.qml index 0fc5fa06ba..65989ee536 100644 --- a/resources/qml/WelcomePages/WhatsNewContent.qml +++ b/resources/qml/WelcomePages/WhatsNewContent.qml @@ -1,8 +1,9 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 import QtQuick.Controls 2.3 +import QtQuick.Layouts 1.3 import UM 1.3 as UM import Cura 1.1 as Cura @@ -10,9 +11,12 @@ import Cura 1.1 as Cura // // This component contains the content for the "What's new in Ultimaker Cura" page of the welcome on-boarding process. +// Previously this was just the changelog, but now it will just have the larger stories, the changelog has its own page. // Item { + property var manager: CuraApplication.getWhatsNewPagesModel() + UM.I18nCatalog { id: catalog; name: "cura" } Label @@ -21,39 +25,160 @@ Item anchors.top: parent.top anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignHCenter - text: catalog.i18nc("@label", "What's new in Ultimaker Cura") + text: catalog.i18nc("@label", "What's New") color: UM.Theme.getColor("primary_button") font: UM.Theme.getFont("huge") renderType: Text.NativeRendering } - Cura.ScrollableTextArea + Rectangle { - id: whatsNewTextArea + anchors + { + top: titleLabel.bottom + topMargin: UM.Theme.getSize("default_margin").width + bottom: whatsNewDots.top + bottomMargin: UM.Theme.getSize("narrow_margin").width + left: parent.left + right: parent.right + } - anchors.top: titleLabel.bottom - anchors.bottom: getStartedButton.top - anchors.topMargin: UM.Theme.getSize("wide_margin").height - anchors.bottomMargin: UM.Theme.getSize("wide_margin").height - anchors.left: parent.left - anchors.right: parent.right + color: UM.Theme.getColor("viewport_overlay") - ScrollBar.horizontal.policy: ScrollBar.AlwaysOff + StackLayout + { + id: whatsNewViewport - textArea.text: CuraApplication.getTextManager().getChangeLogText() - textArea.textFormat: Text.RichText - textArea.wrapMode: Text.WordWrap - textArea.readOnly: true - textArea.font: UM.Theme.getFont("medium") - textArea.onLinkActivated: Qt.openUrlExternally(link) + anchors + { + top: parent.top + horizontalCenter: parent.horizontalCenter + } + height: parent.height + width: parent.width + + currentIndex: whatsNewDots.currentIndex + + Repeater + { + + model: manager.subpageCount + + Rectangle + { + Layout.alignment: Qt.AlignHCenter + color: UM.Theme.getColor("viewport_overlay") + width: whatsNewViewport.width + height: whatsNewViewport.height + + AnimatedImage + { + id: subpageImage + + anchors + { + top: parent.top + topMargin: UM.Theme.getSize("thick_margin").width + left: parent.left + leftMargin: UM.Theme.getSize("thick_margin").width + right: parent.right + rightMargin: UM.Theme.getSize("thick_margin").width + } + width: Math.round(parent.width - (UM.Theme.getSize("thick_margin").height * 2)) + fillMode: Image.PreserveAspectFit + onStatusChanged: playing = (status == AnimatedImage.Ready) + + source: manager.getSubpageImageSource(index) + } + + Cura.ScrollableTextArea + { + id: subpageText + + anchors + { + top: subpageImage.bottom + topMargin: UM.Theme.getSize("default_margin").height + bottom: parent.bottom + bottomMargin: UM.Theme.getSize("thin_margin").height + left: subpageImage.left + right: subpageImage.right + } + + ScrollBar.horizontal.policy: ScrollBar.AlwaysOff + + back_color: UM.Theme.getColor("viewport_overlay") + do_borders: false + + textArea.wrapMode: TextEdit.Wrap + textArea.text: manager.getSubpageText(index) + textArea.textFormat: Text.RichText + textArea.readOnly: true + textArea.font: UM.Theme.getFont("default") + textArea.onLinkActivated: Qt.openUrlExternally(link) + textArea.leftPadding: 0 + textArea.rightPadding: 0 + } + } + } + } } - Cura.PrimaryButton + PageIndicator { - id: getStartedButton - anchors.right: parent.right + id: whatsNewDots + + currentIndex: whatsNewViewport.currentIndex + count: whatsNewViewport.count + interactive: true + + anchors + { + bottom: whatsNewNextButton.top + bottomMargin: UM.Theme.getSize("wide_margin").height + horizontalCenter: parent.horizontalCenter + } + + delegate: + Rectangle + { + width: UM.Theme.getSize("thin_margin").width + height: UM.Theme.getSize("thin_margin").height + + radius: width / 2 + color: + index === whatsNewViewport.currentIndex ? + UM.Theme.getColor("primary") : + UM.Theme.getColor("secondary_button_shadow") + } + } + + Item + { + id: bottomSpacer + anchors.bottom: whatsNewNextButton.top + height: UM.Theme.getSize("default_margin").height / 2 + width: UM.Theme.getSize("default_margin").width / 2 + } + + Cura.TertiaryButton + { + id: whatsNewNextButton + anchors.left: parent.left anchors.bottom: parent.bottom text: base.currentItem.next_page_button_text onClicked: base.showNextPage() } + + Cura.PrimaryButton + { + id: whatsNewSubpageButton + anchors.right: parent.right + anchors.bottom: parent.bottom + text: catalog.i18nc("@button", "Next") + onClicked: + whatsNewDots.currentIndex === (whatsNewDots.count - 1) ? + base.showNextPage() : + ++whatsNewDots.currentIndex + } } diff --git a/resources/qml/WelcomePages/WizardDialog.qml b/resources/qml/WelcomePages/WizardDialog.qml index 3bee9fcb5c..8629f47115 100644 --- a/resources/qml/WelcomePages/WizardDialog.qml +++ b/resources/qml/WelcomePages/WizardDialog.qml @@ -24,6 +24,8 @@ Window minimumWidth: UM.Theme.getSize("modal_window_minimum").width minimumHeight: UM.Theme.getSize("modal_window_minimum").height + maximumWidth: minimumWidth + maximumHeight: minimumHeight color: UM.Theme.getColor("main_background") @@ -47,6 +49,6 @@ Window Connections { target: model - onAllFinished: dialog.hide() + function onAllFinished() { dialog.hide() } } } diff --git a/resources/qml/WelcomePages/WizardPanel.qml b/resources/qml/WelcomePages/WizardPanel.qml index db4b66d18b..99492d4862 100644 --- a/resources/qml/WelcomePages/WizardPanel.qml +++ b/resources/qml/WelcomePages/WizardPanel.qml @@ -53,7 +53,7 @@ Item anchors.left: parent.left anchors.right: parent.right - height: UM.Theme.getSize("progressbar").height + height: visible ? UM.Theme.getSize("progressbar").height : 0 value: base.progressValue } @@ -64,7 +64,6 @@ Item anchors { margins: UM.Theme.getSize("wide_margin").width - bottomMargin: UM.Theme.getSize("default_margin").width top: progressBar.bottom bottom: parent.bottom left: parent.left diff --git a/resources/qml/Widgets/CheckBox.qml b/resources/qml/Widgets/CheckBox.qml index f79dc1620e..295283d76e 100644 --- a/resources/qml/Widgets/CheckBox.qml +++ b/resources/qml/Widgets/CheckBox.qml @@ -58,7 +58,7 @@ CheckBox height: Math.round(parent.height / 2.5) sourceSize.height: width color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text") - source: UM.Theme.getIcon("check") + source: UM.Theme.getIcon("Check") opacity: control.checked ? 1 : 0 Behavior on opacity { NumberAnimation { duration: 100; } } } diff --git a/resources/qml/Widgets/ComboBox.qml b/resources/qml/Widgets/ComboBox.qml index d4c526e265..f0ee3bdc00 100644 --- a/resources/qml/Widgets/ComboBox.qml +++ b/resources/qml/Widgets/ComboBox.qml @@ -15,6 +15,18 @@ ComboBox { id: control + UM.I18nCatalog + { + id: catalog + name: "cura" + } + + property var defaultTextOnEmptyModel: catalog.i18nc("@label", "No items to select from") // Text displayed in the combobox when the model is empty + property var defaultTextOnEmptyIndex: "" // Text displayed in the combobox when the model has items but no item is selected + enabled: delegateModel.count > 0 + + onVisibleChanged: { popup.close() } + states: [ State { @@ -50,7 +62,7 @@ ComboBox x: control.width - width - control.rightPadding y: control.topPadding + Math.round((control.availableHeight - height) / 2) - source: UM.Theme.getIcon("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height sourceSize.width: width + 5 * screenScaleFactor @@ -67,11 +79,22 @@ ComboBox anchors.verticalCenter: parent.verticalCenter anchors.right: downArrow.left - text: control.currentText + text: + { + if (control.delegateModel.count == 0) + { + return control.defaultTextOnEmptyModel != "" ? control.defaultTextOnEmptyModel : control.defaultTextOnEmptyIndex + } + else + { + return control.currentIndex == -1 ? control.defaultTextOnEmptyIndex : control.currentText + } + } + textFormat: Text.PlainText renderType: Text.NativeRendering font: UM.Theme.getFont("default") - color: UM.Theme.getColor("setting_control_text") + color: control.currentIndex == -1 ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text") elide: Text.ElideRight verticalAlignment: Text.AlignVCenter } @@ -81,6 +104,7 @@ ComboBox y: control.height - UM.Theme.getSize("default_lining").height width: control.width implicitHeight: contentItem.implicitHeight + 2 * UM.Theme.getSize("default_lining").width + bottomMargin: UM.Theme.getSize("default_margin").height padding: UM.Theme.getSize("default_lining").width contentItem: ListView @@ -133,7 +157,7 @@ ComboBox text: delegateItem.text textFormat: Text.PlainText renderType: Text.NativeRendering - color: control.contentItem.color + color: UM.Theme.getColor("setting_control_text") font: UM.Theme.getFont("default") elide: Text.ElideRight verticalAlignment: Text.AlignVCenter diff --git a/resources/qml/Widgets/Menu.qml b/resources/qml/Widgets/Menu.qml new file mode 100644 index 0000000000..1c6a55c28a --- /dev/null +++ b/resources/qml/Widgets/Menu.qml @@ -0,0 +1,24 @@ +// Copyright (c) 2021 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.7 +import QtQuick.Controls 2.3 + +import UM 1.1 as UM + +// +// Menu with Cura styling. +// +Menu +{ + id: menu + padding: 0 + + implicitWidth: UM.Theme.getSize("setting_control").width + width: Math.max.apply(Math, Object.values(contentChildren).map(function(c) { return c.width })) + + background: Rectangle { + color: UM.Theme.getColor("setting_control") + border.color: UM.Theme.getColor("setting_control_border") + } +} \ No newline at end of file diff --git a/resources/qml/Widgets/MenuItem.qml b/resources/qml/Widgets/MenuItem.qml new file mode 100644 index 0000000000..f0824b4d98 --- /dev/null +++ b/resources/qml/Widgets/MenuItem.qml @@ -0,0 +1,66 @@ +// Copyright (c) 2021 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.7 +import QtQuick.Controls 2.3 + +import UM 1.1 as UM + +// +// MenuItem with Cura styling. +// +MenuItem +{ + id: menuItem + + implicitHeight: UM.Theme.getSize("setting_control").height + UM.Theme.getSize("narrow_margin").height + opacity: enabled ? 1.0 : 0.5 + + arrow: UM.RecolorImage + { + visible: menuItem.subMenu + height: UM.Theme.getSize("default_arrow").height + width: height + anchors.verticalCenter: parent.verticalCenter + anchors.right: parent.right + anchors.rightMargin: UM.Theme.getSize("default_margin").width + source: UM.Theme.getIcon("ChevronSingleRight") + color: UM.Theme.getColor("setting_control_text") + } + + indicator: UM.RecolorImage + { + id: check + visible: menuItem.checkable && menuItem.checked + height: UM.Theme.getSize("default_arrow").height + width: height + anchors.verticalCenter: parent.verticalCenter + anchors.left: parent.left + anchors.leftMargin: UM.Theme.getSize("default_margin").width + source: UM.Theme.getIcon("Check") + color: UM.Theme.getColor("setting_control_text") + } + + contentItem: Text { + leftPadding: menuItem.checkable ? menuItem.indicator.width + UM.Theme.getSize("default_margin").width : UM.Theme.getSize("thin_margin").width + rightPadding: menuItem.subMenu ? menuItem.arrow.width + UM.Theme.getSize("default_margin").width : UM.Theme.getSize("thin_margin").width + text: menuItem.text + + textFormat: Text.PlainText + renderType: Text.NativeRendering + color: UM.Theme.getColor("setting_control_text") + font: UM.Theme.getFont("default") + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter + } + + background: Rectangle { + x: UM.Theme.getSize("default_lining").width + y: UM.Theme.getSize("default_lining").width + width: menuItem.width - 2 * UM.Theme.getSize("default_lining").width + height: menuItem.height - 2 * UM.Theme.getSize("default_lining").height + + color: menuItem.highlighted ? UM.Theme.getColor("setting_control_highlight") : "transparent" + border.color: menuItem.highlighted ? UM.Theme.getColor("setting_control_border_highlight") : "transparent" + } +} \ No newline at end of file diff --git a/resources/qml/Widgets/MenuSeparator.qml b/resources/qml/Widgets/MenuSeparator.qml new file mode 100644 index 0000000000..cfc696fbb3 --- /dev/null +++ b/resources/qml/Widgets/MenuSeparator.qml @@ -0,0 +1,20 @@ +// Copyright (c) 2021 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.7 +import QtQuick.Controls 2.3 + +import UM 1.1 as UM + +// +// MenuSeparator with Cura styling. +// +MenuSeparator +{ + padding: 0 + + contentItem: Rectangle { + implicitHeight: UM.Theme.getSize("default_lining").height + color: UM.Theme.getColor("setting_control_border") + } +} \ No newline at end of file diff --git a/resources/qml/Widgets/ScrollableTextArea.qml b/resources/qml/Widgets/ScrollableTextArea.qml index 48a7f49255..6becf75cb1 100644 --- a/resources/qml/Widgets/ScrollableTextArea.qml +++ b/resources/qml/Widgets/ScrollableTextArea.qml @@ -15,13 +15,16 @@ ScrollView { property alias textArea: _textArea + property var back_color: UM.Theme.getColor("main_background") + property var do_borders: true + clip: true background: Rectangle // Border { - color: UM.Theme.getColor("main_background") + color: back_color border.color: UM.Theme.getColor("thick_lining") - border.width: UM.Theme.getSize("default_lining").width + border.width: do_borders ? UM.Theme.getSize("default_lining").width : 0 } TextArea @@ -31,6 +34,7 @@ ScrollView color: UM.Theme.getColor("text") textFormat: TextEdit.PlainText renderType: Text.NativeRendering + wrapMode: Text.Wrap selectByMouse: true } } diff --git a/resources/qml/Widgets/TextField.qml b/resources/qml/Widgets/TextField.qml index 28074d4415..c126c8a6e0 100644 --- a/resources/qml/Widgets/TextField.qml +++ b/resources/qml/Widgets/TextField.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -15,6 +15,8 @@ TextField { id: textField + property alias leftIcon: iconLeft.source + UM.I18nCatalog { id: catalog; name: "cura" } hoverEnabled: true @@ -22,6 +24,7 @@ TextField font: UM.Theme.getFont("default") color: UM.Theme.getColor("text") renderType: Text.NativeRendering + leftPadding: iconLeft.visible ? iconLeft.width + UM.Theme.getSize("default_margin").width * 2 : UM.Theme.getSize("thin_margin").width states: [ State @@ -52,7 +55,6 @@ TextField color: UM.Theme.getColor("main_background") - anchors.margins: Math.round(UM.Theme.getSize("default_lining").width) radius: UM.Theme.getSize("setting_control_radius").width border.color: @@ -67,5 +69,23 @@ TextField } return UM.Theme.getColor("setting_control_border") } + + //Optional icon added on the left hand side. + UM.RecolorImage + { + id: iconLeft + + anchors + { + verticalCenter: parent.verticalCenter + left: parent.left + leftMargin: UM.Theme.getSize("default_margin").width + } + + visible: source != "" + height: UM.Theme.getSize("small_button_icon").height + width: visible ? height : 0 + color: textField.color + } } } diff --git a/resources/qml/qmldir b/resources/qml/qmldir index ab61101778..df2518c988 100644 --- a/resources/qml/qmldir +++ b/resources/qml/qmldir @@ -36,6 +36,9 @@ Scrollable 1.0 Scrollable.qml TabButton 1.0 TabButton.qml TextField 1.0 TextField.qml ScrollView 1.0 ScrollView.qml +Menu 1.0 Menu.qml +MenuItem 1.0 MenuItem.qml +MenuSeparator 1.0 MenuSeparator.qml # Cura/MachineSettings diff --git a/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg index 3cd2637f98..b2d46783e9 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = leapfrog_bolt_pro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard weight = 0 diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg index 50458b8519..cecf94663e 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = leapfrog_bolt_pro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard weight = 0 diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg index 51866fc18b..b4175d5de2 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = leapfrog_bolt_pro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard weight = 0 diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg index a33864af97..fb9a71ff89 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = leapfrog_bolt_pro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard weight = 0 diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg index 89fa5c616c..b688ddcd85 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = leapfrog_bolt_pro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard weight = 0 diff --git a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg index e104bec82a..e95e999e26 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = leapfrog_bolt_pro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard weight = 0 diff --git a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg index 14f88625ea..aa4de25021 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = leapfrog_bolt_pro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard weight = 0 diff --git a/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg b/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg index f2010ea56a..1d0827568e 100644 --- a/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg +++ b/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_pri3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/abax_pri3/apri3_pla_high.inst.cfg b/resources/quality/abax_pri3/apri3_pla_high.inst.cfg index 4a22e790c8..722b46d62c 100644 --- a/resources/quality/abax_pri3/apri3_pla_high.inst.cfg +++ b/resources/quality/abax_pri3/apri3_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = abax_pri3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg b/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg index 60f1b12f79..96bead1a87 100644 --- a/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg +++ b/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_pri3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg b/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg index b2163fd9d7..e612736446 100644 --- a/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg +++ b/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_pri5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/abax_pri5/apri5_pla_high.inst.cfg b/resources/quality/abax_pri5/apri5_pla_high.inst.cfg index 3331857bb0..8a9f7290f5 100644 --- a/resources/quality/abax_pri5/apri5_pla_high.inst.cfg +++ b/resources/quality/abax_pri5/apri5_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = abax_pri5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg b/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg index 288f2120d3..615f68485c 100644 --- a/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg +++ b/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_pri5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/abax_titan/atitan_pla_fast.inst.cfg b/resources/quality/abax_titan/atitan_pla_fast.inst.cfg index fa460cdb8f..0950d80606 100644 --- a/resources/quality/abax_titan/atitan_pla_fast.inst.cfg +++ b/resources/quality/abax_titan/atitan_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_titan [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/abax_titan/atitan_pla_high.inst.cfg b/resources/quality/abax_titan/atitan_pla_high.inst.cfg index 547759017b..2de791e7de 100644 --- a/resources/quality/abax_titan/atitan_pla_high.inst.cfg +++ b/resources/quality/abax_titan/atitan_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = abax_titan [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/abax_titan/atitan_pla_normal.inst.cfg b/resources/quality/abax_titan/atitan_pla_normal.inst.cfg index 32bb03b6ad..c9429817c2 100644 --- a/resources/quality/abax_titan/atitan_pla_normal.inst.cfg +++ b/resources/quality/abax_titan/atitan_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = abax_titan [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg index c31cbfcbc5..a287c1a136 100644 --- a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg +++ b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_4max [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg index bf4d28de26..045abc3534 100644 --- a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg +++ b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_4max [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg index 0108a05246..d66900b28c 100644 --- a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg +++ b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_4max [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg b/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg index 89f841628a..85e7686328 100644 --- a/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg +++ b/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_4max [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg b/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg index 2eab069b38..c4f3242265 100644 --- a/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg +++ b/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_4max [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg b/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg index 985e4cb06c..c71f0a00dc 100644 --- a/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg +++ b/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_4max [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg index 68afb6ee11..4de65f3aef 100644 --- a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg +++ b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_4max [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg index 0c5214f41a..3986aeab4b 100644 --- a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg +++ b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_4max [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg index 635a8650e6..8bf0cffa10 100644 --- a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg +++ b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_4max [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg index b409b3adab..622bf54f85 100644 --- a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg +++ b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_4max [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg index 5ca7c12a8a..80f38627ad 100644 --- a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg +++ b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_4max [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg index c3f1b725d9..d991ed12f8 100644 --- a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg +++ b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_4max [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg index dff8bd5e68..9b896e7252 100644 --- a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg +++ b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_4max [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg index 1a12e64471..d74dfa163c 100644 --- a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg +++ b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_4max [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg index 745fa1d6b1..16fd177736 100644 --- a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg +++ b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_4max [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg b/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg index f9dc60257f..e9a868b138 100644 --- a/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg +++ b/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_chiron [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg b/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg index 270d8dabee..a2c1d39e47 100644 --- a/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg +++ b/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_chiron [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg b/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg index cc190e5c04..8adc92a480 100644 --- a/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg +++ b/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_chiron [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg index 27bf2ce7dd..5188910913 100644 --- a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg +++ b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_i3_mega [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 @@ -17,8 +17,7 @@ acceleration_travel = 3000 adhesion_type = skirt brim_width = 4.0 cool_fan_full_at_height = 0.5 -cool_fan_speed = 100 -cool_fan_speed_0 = 100 +cool_fan_speed_max = 100 infill_overlap = 15 infill_pattern = zigzag infill_sparse_density = 25 @@ -28,10 +27,7 @@ jerk_print = 8 jerk_travel = 10 layer_height = 0.3 layer_height_0 = 0.3 -material_bed_temperature = 60 material_diameter = 1.75 -material_print_temperature = 200 -material_print_temperature_layer_0 = 0 retract_at_layer_change = False retraction_amount = 6 retraction_hop = 0.075 diff --git a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg index 6005152107..8b4e60c6f7 100644 --- a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg +++ b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_i3_mega [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 @@ -17,8 +17,7 @@ acceleration_travel = 3000 adhesion_type = skirt brim_width = 4.0 cool_fan_full_at_height = 0.5 -cool_fan_speed = 100 -cool_fan_speed_0 = 100 +cool_fan_speed_max = 100 infill_overlap = 15 infill_pattern = zigzag infill_sparse_density = 25 @@ -28,10 +27,7 @@ jerk_print = 8 jerk_travel = 10 layer_height = 0.1 layer_height_0 = 0.1 -material_bed_temperature = 60 material_diameter = 1.75 -material_print_temperature = 200 -material_print_temperature_layer_0 = 0 retract_at_layer_change = False retraction_amount = 6 retraction_hop = 0.075 diff --git a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg index b2c0309dc9..23e523629f 100644 --- a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg +++ b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_i3_mega [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 @@ -17,8 +17,7 @@ acceleration_travel = 3000 adhesion_type = skirt brim_width = 4.0 cool_fan_full_at_height = 0.5 -cool_fan_speed = 100 -cool_fan_speed_0 = 100 +cool_fan_speed_max = 100 infill_overlap = 15 infill_pattern = zigzag infill_sparse_density = 25 @@ -28,10 +27,7 @@ jerk_print = 8 jerk_travel = 10 layer_height = 0.2 layer_height_0 = 0.2 -material_bed_temperature = 60 material_diameter = 1.75 -material_print_temperature = 200 -material_print_temperature_layer_0 = 0 retract_at_layer_change = False retraction_amount = 6 retraction_hop = 0.075 diff --git a/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_draft.inst.cfg b/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_draft.inst.cfg new file mode 100644 index 0000000000..5ee72cd232 --- /dev/null +++ b/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft +definition = anycubic_i3_mega_s + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +global_quality = True + +[values] +layer_height = 0.3 \ No newline at end of file diff --git a/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_high.inst.cfg b/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_high.inst.cfg new file mode 100644 index 0000000000..14ece958fa --- /dev/null +++ b/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_high.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = High +definition = anycubic_i3_mega_s + +[metadata] +setting_version = 17 +type = quality +quality_type = high +weight = 1 +global_quality = True + +[values] +layer_height = 0.1 \ No newline at end of file diff --git a/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_normal.inst.cfg b/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_normal.inst.cfg new file mode 100644 index 0000000000..edcd5e581a --- /dev/null +++ b/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_normal.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Normal +definition = anycubic_i3_mega_s + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = 0 +global_quality = True + +[values] +layer_height = 0.2 \ No newline at end of file diff --git a/resources/quality/anycubic_mega_zero/anycubic_mega_zero_draft.inst.cfg b/resources/quality/anycubic_mega_zero/anycubic_mega_zero_draft.inst.cfg index afeea532a1..4c54e17a71 100644 --- a/resources/quality/anycubic_mega_zero/anycubic_mega_zero_draft.inst.cfg +++ b/resources/quality/anycubic_mega_zero/anycubic_mega_zero_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = anycubic_mega_zero [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_mega_zero/anycubic_mega_zero_high.inst.cfg b/resources/quality/anycubic_mega_zero/anycubic_mega_zero_high.inst.cfg index 87aaf2e17b..592d9f7216 100644 --- a/resources/quality/anycubic_mega_zero/anycubic_mega_zero_high.inst.cfg +++ b/resources/quality/anycubic_mega_zero/anycubic_mega_zero_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = anycubic_mega_zero [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/anycubic_mega_zero/anycubic_mega_zero_normal.inst.cfg b/resources/quality/anycubic_mega_zero/anycubic_mega_zero_normal.inst.cfg index 62e5d99bbb..997622231e 100644 --- a/resources/quality/anycubic_mega_zero/anycubic_mega_zero_normal.inst.cfg +++ b/resources/quality/anycubic_mega_zero/anycubic_mega_zero_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = anycubic_mega_zero [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/anycubic_predator/predator_coarse.inst.cfg b/resources/quality/anycubic_predator/predator_coarse.inst.cfg index eb6ba5b23a..959ffa2422 100644 --- a/resources/quality/anycubic_predator/predator_coarse.inst.cfg +++ b/resources/quality/anycubic_predator/predator_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = predator [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/anycubic_predator/predator_draft.inst.cfg b/resources/quality/anycubic_predator/predator_draft.inst.cfg index ac6fa9c24a..24e79b0e38 100644 --- a/resources/quality/anycubic_predator/predator_draft.inst.cfg +++ b/resources/quality/anycubic_predator/predator_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = predator [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/anycubic_predator/predator_extra_coarse.inst.cfg b/resources/quality/anycubic_predator/predator_extra_coarse.inst.cfg index 233557fa61..483c45765c 100644 --- a/resources/quality/anycubic_predator/predator_extra_coarse.inst.cfg +++ b/resources/quality/anycubic_predator/predator_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = predator [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Xcoarse weight = -4 diff --git a/resources/quality/anycubic_predator/predator_extra_fine.inst.cfg b/resources/quality/anycubic_predator/predator_extra_fine.inst.cfg index 86137c881b..e4e3483646 100644 --- a/resources/quality/anycubic_predator/predator_extra_fine.inst.cfg +++ b/resources/quality/anycubic_predator/predator_extra_fine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = predator [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Xfine weight = 1 diff --git a/resources/quality/anycubic_predator/predator_fine.inst.cfg b/resources/quality/anycubic_predator/predator_fine.inst.cfg index 261bf3f62c..66cedf91f4 100644 --- a/resources/quality/anycubic_predator/predator_fine.inst.cfg +++ b/resources/quality/anycubic_predator/predator_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = predator [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine weight = 1 diff --git a/resources/quality/anycubic_predator/predator_normal.inst.cfg b/resources/quality/anycubic_predator/predator_normal.inst.cfg index 36bf776088..f2e3118823 100644 --- a/resources/quality/anycubic_predator/predator_normal.inst.cfg +++ b/resources/quality/anycubic_predator/predator_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = predator [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/artillery/ABS/artillery_0.2_ABS_super.inst.cfg b/resources/quality/artillery/ABS/artillery_0.2_ABS_super.inst.cfg index 7d3df95c67..7264a15db4 100644 --- a/resources/quality/artillery/ABS/artillery_0.2_ABS_super.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.2_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/artillery/ABS/artillery_0.2_ABS_ultra.inst.cfg b/resources/quality/artillery/ABS/artillery_0.2_ABS_ultra.inst.cfg index b389640863..863a383277 100644 --- a/resources/quality/artillery/ABS/artillery_0.2_ABS_ultra.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.2_ABS_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra material = generic_abs diff --git a/resources/quality/artillery/ABS/artillery_0.3_ABS_adaptive.inst.cfg b/resources/quality/artillery/ABS/artillery_0.3_ABS_adaptive.inst.cfg index f15554870f..94a00b4adc 100644 --- a/resources/quality/artillery/ABS/artillery_0.3_ABS_adaptive.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.3_ABS_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_abs diff --git a/resources/quality/artillery/ABS/artillery_0.3_ABS_low.inst.cfg b/resources/quality/artillery/ABS/artillery_0.3_ABS_low.inst.cfg index 3f97ae55ec..54ec42487f 100644 --- a/resources/quality/artillery/ABS/artillery_0.3_ABS_low.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.3_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/artillery/ABS/artillery_0.3_ABS_standard.inst.cfg b/resources/quality/artillery/ABS/artillery_0.3_ABS_standard.inst.cfg index 203c26c56d..ec93f4fde7 100644 --- a/resources/quality/artillery/ABS/artillery_0.3_ABS_standard.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.3_ABS_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_abs diff --git a/resources/quality/artillery/ABS/artillery_0.3_ABS_super.inst.cfg b/resources/quality/artillery/ABS/artillery_0.3_ABS_super.inst.cfg index 6780ffd158..46a6786591 100644 --- a/resources/quality/artillery/ABS/artillery_0.3_ABS_super.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.3_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/artillery/ABS/artillery_0.4_ABS_adaptive.inst.cfg b/resources/quality/artillery/ABS/artillery_0.4_ABS_adaptive.inst.cfg index 37242464f1..f7638c8521 100644 --- a/resources/quality/artillery/ABS/artillery_0.4_ABS_adaptive.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.4_ABS_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_abs diff --git a/resources/quality/artillery/ABS/artillery_0.4_ABS_low.inst.cfg b/resources/quality/artillery/ABS/artillery_0.4_ABS_low.inst.cfg index cc7e90cfae..3d332e2305 100644 --- a/resources/quality/artillery/ABS/artillery_0.4_ABS_low.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.4_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/artillery/ABS/artillery_0.4_ABS_standard.inst.cfg b/resources/quality/artillery/ABS/artillery_0.4_ABS_standard.inst.cfg index 282965cb4c..e2df011212 100644 --- a/resources/quality/artillery/ABS/artillery_0.4_ABS_standard.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.4_ABS_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_abs diff --git a/resources/quality/artillery/ABS/artillery_0.4_ABS_super.inst.cfg b/resources/quality/artillery/ABS/artillery_0.4_ABS_super.inst.cfg index 2db2d67d57..f3aa4793c8 100644 --- a/resources/quality/artillery/ABS/artillery_0.4_ABS_super.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.4_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/artillery/ABS/artillery_0.5_ABS_adaptive.inst.cfg b/resources/quality/artillery/ABS/artillery_0.5_ABS_adaptive.inst.cfg index 5f97805b7e..1f511c3ff0 100644 --- a/resources/quality/artillery/ABS/artillery_0.5_ABS_adaptive.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.5_ABS_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_abs diff --git a/resources/quality/artillery/ABS/artillery_0.5_ABS_low.inst.cfg b/resources/quality/artillery/ABS/artillery_0.5_ABS_low.inst.cfg index 7e09919ffd..3580446d7e 100644 --- a/resources/quality/artillery/ABS/artillery_0.5_ABS_low.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.5_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/artillery/ABS/artillery_0.5_ABS_standard.inst.cfg b/resources/quality/artillery/ABS/artillery_0.5_ABS_standard.inst.cfg index 8238be8224..f4f26c28b5 100644 --- a/resources/quality/artillery/ABS/artillery_0.5_ABS_standard.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.5_ABS_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_abs diff --git a/resources/quality/artillery/ABS/artillery_0.5_ABS_super.inst.cfg b/resources/quality/artillery/ABS/artillery_0.5_ABS_super.inst.cfg index 179972187a..fa8a634297 100644 --- a/resources/quality/artillery/ABS/artillery_0.5_ABS_super.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.5_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/artillery/ABS/artillery_0.6_ABS_standard.inst.cfg b/resources/quality/artillery/ABS/artillery_0.6_ABS_standard.inst.cfg index 9cddca9cd8..359a112f62 100644 --- a/resources/quality/artillery/ABS/artillery_0.6_ABS_standard.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.6_ABS_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_abs diff --git a/resources/quality/artillery/ABS/artillery_0.8_ABS_draft.inst.cfg b/resources/quality/artillery/ABS/artillery_0.8_ABS_draft.inst.cfg index 92ccc32ef7..38ada0bc5b 100644 --- a/resources/quality/artillery/ABS/artillery_0.8_ABS_draft.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.8_ABS_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_abs diff --git a/resources/quality/artillery/ABS/artillery_1.0_ABS_draft.inst.cfg b/resources/quality/artillery/ABS/artillery_1.0_ABS_draft.inst.cfg index 3644e0461c..59fb714004 100644 --- a/resources/quality/artillery/ABS/artillery_1.0_ABS_draft.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_1.0_ABS_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_abs diff --git a/resources/quality/artillery/PETG/artillery_0.2_PETG_super.inst.cfg b/resources/quality/artillery/PETG/artillery_0.2_PETG_super.inst.cfg index 416f740701..5d7e9a753f 100644 --- a/resources/quality/artillery/PETG/artillery_0.2_PETG_super.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.2_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/artillery/PETG/artillery_0.2_PETG_ultra.inst.cfg b/resources/quality/artillery/PETG/artillery_0.2_PETG_ultra.inst.cfg index 08855ce29d..9a12940898 100644 --- a/resources/quality/artillery/PETG/artillery_0.2_PETG_ultra.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.2_PETG_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra material = generic_petg diff --git a/resources/quality/artillery/PETG/artillery_0.3_PETG_adaptive.inst.cfg b/resources/quality/artillery/PETG/artillery_0.3_PETG_adaptive.inst.cfg index 083d1afd42..9987db15b3 100644 --- a/resources/quality/artillery/PETG/artillery_0.3_PETG_adaptive.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.3_PETG_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_petg diff --git a/resources/quality/artillery/PETG/artillery_0.3_PETG_low.inst.cfg b/resources/quality/artillery/PETG/artillery_0.3_PETG_low.inst.cfg index b6ae0b7e86..e15ef83d0f 100644 --- a/resources/quality/artillery/PETG/artillery_0.3_PETG_low.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.3_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/artillery/PETG/artillery_0.3_PETG_standard.inst.cfg b/resources/quality/artillery/PETG/artillery_0.3_PETG_standard.inst.cfg index 2b82fdf9b5..0f87d22110 100644 --- a/resources/quality/artillery/PETG/artillery_0.3_PETG_standard.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.3_PETG_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_petg diff --git a/resources/quality/artillery/PETG/artillery_0.3_PETG_super.inst.cfg b/resources/quality/artillery/PETG/artillery_0.3_PETG_super.inst.cfg index 3b2233503f..ba7aa6010a 100644 --- a/resources/quality/artillery/PETG/artillery_0.3_PETG_super.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.3_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/artillery/PETG/artillery_0.4_PETG_adaptive.inst.cfg b/resources/quality/artillery/PETG/artillery_0.4_PETG_adaptive.inst.cfg index 75883c36ba..ef15416607 100644 --- a/resources/quality/artillery/PETG/artillery_0.4_PETG_adaptive.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.4_PETG_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_petg diff --git a/resources/quality/artillery/PETG/artillery_0.4_PETG_low.inst.cfg b/resources/quality/artillery/PETG/artillery_0.4_PETG_low.inst.cfg index 9a89510522..31dc110a84 100644 --- a/resources/quality/artillery/PETG/artillery_0.4_PETG_low.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.4_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/artillery/PETG/artillery_0.4_PETG_standard.inst.cfg b/resources/quality/artillery/PETG/artillery_0.4_PETG_standard.inst.cfg index 41cb1842ee..e4d3082f43 100644 --- a/resources/quality/artillery/PETG/artillery_0.4_PETG_standard.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.4_PETG_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_petg diff --git a/resources/quality/artillery/PETG/artillery_0.4_PETG_super.inst.cfg b/resources/quality/artillery/PETG/artillery_0.4_PETG_super.inst.cfg index 8639fe6f00..898d5fbaa8 100644 --- a/resources/quality/artillery/PETG/artillery_0.4_PETG_super.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.4_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/artillery/PETG/artillery_0.5_PETG_adaptive.inst.cfg b/resources/quality/artillery/PETG/artillery_0.5_PETG_adaptive.inst.cfg index 24927b6ac8..38acc323bc 100644 --- a/resources/quality/artillery/PETG/artillery_0.5_PETG_adaptive.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.5_PETG_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_petg diff --git a/resources/quality/artillery/PETG/artillery_0.5_PETG_low.inst.cfg b/resources/quality/artillery/PETG/artillery_0.5_PETG_low.inst.cfg index 95e23ebc36..3256114737 100644 --- a/resources/quality/artillery/PETG/artillery_0.5_PETG_low.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.5_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/artillery/PETG/artillery_0.5_PETG_standard.inst.cfg b/resources/quality/artillery/PETG/artillery_0.5_PETG_standard.inst.cfg index f2f8cddcd4..ca62005409 100644 --- a/resources/quality/artillery/PETG/artillery_0.5_PETG_standard.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.5_PETG_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_petg diff --git a/resources/quality/artillery/PETG/artillery_0.5_PETG_super.inst.cfg b/resources/quality/artillery/PETG/artillery_0.5_PETG_super.inst.cfg index d6c73c8fe0..f876733297 100644 --- a/resources/quality/artillery/PETG/artillery_0.5_PETG_super.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.5_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/artillery/PETG/artillery_0.6_PETG_standard.inst.cfg b/resources/quality/artillery/PETG/artillery_0.6_PETG_standard.inst.cfg index 9c07aa0100..78a8bc8471 100644 --- a/resources/quality/artillery/PETG/artillery_0.6_PETG_standard.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.6_PETG_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_petg diff --git a/resources/quality/artillery/PETG/artillery_0.8_PETG_draft.inst.cfg b/resources/quality/artillery/PETG/artillery_0.8_PETG_draft.inst.cfg index c4a037e19d..a6b438e14c 100644 --- a/resources/quality/artillery/PETG/artillery_0.8_PETG_draft.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.8_PETG_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_petg diff --git a/resources/quality/artillery/PETG/artillery_1.0_PETG_draft.inst.cfg b/resources/quality/artillery/PETG/artillery_1.0_PETG_draft.inst.cfg index 3edeaa44c9..48ed582791 100644 --- a/resources/quality/artillery/PETG/artillery_1.0_PETG_draft.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_1.0_PETG_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_petg diff --git a/resources/quality/artillery/PLA/artillery_0.2_PLA_super.inst.cfg b/resources/quality/artillery/PLA/artillery_0.2_PLA_super.inst.cfg index 8f80333c18..caa5232ded 100644 --- a/resources/quality/artillery/PLA/artillery_0.2_PLA_super.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.2_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/artillery/PLA/artillery_0.2_PLA_ultra.inst.cfg b/resources/quality/artillery/PLA/artillery_0.2_PLA_ultra.inst.cfg index 00ca91cce6..92d815d33e 100644 --- a/resources/quality/artillery/PLA/artillery_0.2_PLA_ultra.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.2_PLA_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra material = generic_pla diff --git a/resources/quality/artillery/PLA/artillery_0.3_PLA_adaptive.inst.cfg b/resources/quality/artillery/PLA/artillery_0.3_PLA_adaptive.inst.cfg index 9e4ce5f725..a964275057 100644 --- a/resources/quality/artillery/PLA/artillery_0.3_PLA_adaptive.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.3_PLA_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_pla diff --git a/resources/quality/artillery/PLA/artillery_0.3_PLA_low.inst.cfg b/resources/quality/artillery/PLA/artillery_0.3_PLA_low.inst.cfg index 1e0769b752..5e8c71adb0 100644 --- a/resources/quality/artillery/PLA/artillery_0.3_PLA_low.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.3_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/artillery/PLA/artillery_0.3_PLA_standard.inst.cfg b/resources/quality/artillery/PLA/artillery_0.3_PLA_standard.inst.cfg index 742756a5c2..6abd33b774 100644 --- a/resources/quality/artillery/PLA/artillery_0.3_PLA_standard.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.3_PLA_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_pla diff --git a/resources/quality/artillery/PLA/artillery_0.3_PLA_super.inst.cfg b/resources/quality/artillery/PLA/artillery_0.3_PLA_super.inst.cfg index 1b3cdd67af..6f901287c4 100644 --- a/resources/quality/artillery/PLA/artillery_0.3_PLA_super.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.3_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/artillery/PLA/artillery_0.4_PLA_adaptive.inst.cfg b/resources/quality/artillery/PLA/artillery_0.4_PLA_adaptive.inst.cfg index e90c95d039..ac943df387 100644 --- a/resources/quality/artillery/PLA/artillery_0.4_PLA_adaptive.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.4_PLA_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_pla diff --git a/resources/quality/artillery/PLA/artillery_0.4_PLA_low.inst.cfg b/resources/quality/artillery/PLA/artillery_0.4_PLA_low.inst.cfg index 7b6f95954e..da79780582 100644 --- a/resources/quality/artillery/PLA/artillery_0.4_PLA_low.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.4_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/artillery/PLA/artillery_0.4_PLA_standard.inst.cfg b/resources/quality/artillery/PLA/artillery_0.4_PLA_standard.inst.cfg index e2f349b210..4ea0fa4e17 100644 --- a/resources/quality/artillery/PLA/artillery_0.4_PLA_standard.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.4_PLA_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_pla diff --git a/resources/quality/artillery/PLA/artillery_0.4_PLA_super.inst.cfg b/resources/quality/artillery/PLA/artillery_0.4_PLA_super.inst.cfg index aae1630fdc..35af1abfbf 100644 --- a/resources/quality/artillery/PLA/artillery_0.4_PLA_super.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.4_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/artillery/PLA/artillery_0.5_PLA_adaptive.inst.cfg b/resources/quality/artillery/PLA/artillery_0.5_PLA_adaptive.inst.cfg index 05e76a902a..e175015f3f 100644 --- a/resources/quality/artillery/PLA/artillery_0.5_PLA_adaptive.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.5_PLA_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_pla diff --git a/resources/quality/artillery/PLA/artillery_0.5_PLA_low.inst.cfg b/resources/quality/artillery/PLA/artillery_0.5_PLA_low.inst.cfg index 6c2faa1f41..00f166168c 100644 --- a/resources/quality/artillery/PLA/artillery_0.5_PLA_low.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.5_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/artillery/PLA/artillery_0.5_PLA_standard.inst.cfg b/resources/quality/artillery/PLA/artillery_0.5_PLA_standard.inst.cfg index 85ff1f2248..11171760e6 100644 --- a/resources/quality/artillery/PLA/artillery_0.5_PLA_standard.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.5_PLA_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_pla diff --git a/resources/quality/artillery/PLA/artillery_0.5_PLA_super.inst.cfg b/resources/quality/artillery/PLA/artillery_0.5_PLA_super.inst.cfg index 6f979f71d7..991da55229 100644 --- a/resources/quality/artillery/PLA/artillery_0.5_PLA_super.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.5_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/artillery/PLA/artillery_0.6_PLA_draft.inst.cfg b/resources/quality/artillery/PLA/artillery_0.6_PLA_draft.inst.cfg index 6289ece068..835315d766 100644 --- a/resources/quality/artillery/PLA/artillery_0.6_PLA_draft.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.6_PLA_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_pla diff --git a/resources/quality/artillery/PLA/artillery_0.6_PLA_low.inst.cfg b/resources/quality/artillery/PLA/artillery_0.6_PLA_low.inst.cfg index 3af8e4df6d..bf46191936 100644 --- a/resources/quality/artillery/PLA/artillery_0.6_PLA_low.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.6_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/artillery/PLA/artillery_0.6_PLA_standard.inst.cfg b/resources/quality/artillery/PLA/artillery_0.6_PLA_standard.inst.cfg index 0b5e128662..31b0c1dd9c 100644 --- a/resources/quality/artillery/PLA/artillery_0.6_PLA_standard.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.6_PLA_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_pla diff --git a/resources/quality/artillery/PLA/artillery_0.8_PLA_draft.inst.cfg b/resources/quality/artillery/PLA/artillery_0.8_PLA_draft.inst.cfg index 8df3c60dda..685d792730 100644 --- a/resources/quality/artillery/PLA/artillery_0.8_PLA_draft.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.8_PLA_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_pla diff --git a/resources/quality/artillery/PLA/artillery_1.0_PLA_draft.inst.cfg b/resources/quality/artillery/PLA/artillery_1.0_PLA_draft.inst.cfg index 3a451c22a3..706ae537e1 100644 --- a/resources/quality/artillery/PLA/artillery_1.0_PLA_draft.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_1.0_PLA_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_pla diff --git a/resources/quality/artillery/TPU/artillery_0.3_TPU_adaptive.inst.cfg b/resources/quality/artillery/TPU/artillery_0.3_TPU_adaptive.inst.cfg index faa051f002..3083d6b8a9 100644 --- a/resources/quality/artillery/TPU/artillery_0.3_TPU_adaptive.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.3_TPU_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_tpu diff --git a/resources/quality/artillery/TPU/artillery_0.3_TPU_standard.inst.cfg b/resources/quality/artillery/TPU/artillery_0.3_TPU_standard.inst.cfg index 56b167f300..2fb1a28c92 100644 --- a/resources/quality/artillery/TPU/artillery_0.3_TPU_standard.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.3_TPU_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_tpu diff --git a/resources/quality/artillery/TPU/artillery_0.3_TPU_super.inst.cfg b/resources/quality/artillery/TPU/artillery_0.3_TPU_super.inst.cfg index c42f696262..b5abd8ab64 100644 --- a/resources/quality/artillery/TPU/artillery_0.3_TPU_super.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.3_TPU_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_tpu diff --git a/resources/quality/artillery/TPU/artillery_0.4_TPU_adaptive.inst.cfg b/resources/quality/artillery/TPU/artillery_0.4_TPU_adaptive.inst.cfg index 08d476e6dd..f74fb38482 100644 --- a/resources/quality/artillery/TPU/artillery_0.4_TPU_adaptive.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.4_TPU_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_tpu diff --git a/resources/quality/artillery/TPU/artillery_0.4_TPU_standard.inst.cfg b/resources/quality/artillery/TPU/artillery_0.4_TPU_standard.inst.cfg index cca62a46b7..24b6451895 100644 --- a/resources/quality/artillery/TPU/artillery_0.4_TPU_standard.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.4_TPU_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_tpu diff --git a/resources/quality/artillery/TPU/artillery_0.4_TPU_super.inst.cfg b/resources/quality/artillery/TPU/artillery_0.4_TPU_super.inst.cfg index 556bb313bf..bac5551fab 100644 --- a/resources/quality/artillery/TPU/artillery_0.4_TPU_super.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.4_TPU_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_tpu diff --git a/resources/quality/artillery/TPU/artillery_0.5_TPU_adaptive.inst.cfg b/resources/quality/artillery/TPU/artillery_0.5_TPU_adaptive.inst.cfg index 86288628ab..a28b272693 100644 --- a/resources/quality/artillery/TPU/artillery_0.5_TPU_adaptive.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.5_TPU_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_tpu diff --git a/resources/quality/artillery/TPU/artillery_0.5_TPU_standard.inst.cfg b/resources/quality/artillery/TPU/artillery_0.5_TPU_standard.inst.cfg index 7801d72c54..3450952d24 100644 --- a/resources/quality/artillery/TPU/artillery_0.5_TPU_standard.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.5_TPU_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_tpu diff --git a/resources/quality/artillery/TPU/artillery_0.5_TPU_super.inst.cfg b/resources/quality/artillery/TPU/artillery_0.5_TPU_super.inst.cfg index deb88f7e78..ff2315d64f 100644 --- a/resources/quality/artillery/TPU/artillery_0.5_TPU_super.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.5_TPU_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_tpu diff --git a/resources/quality/artillery/TPU/artillery_0.6_TPU_standard.inst.cfg b/resources/quality/artillery/TPU/artillery_0.6_TPU_standard.inst.cfg index cb08b67850..2aeb3bbb9a 100644 --- a/resources/quality/artillery/TPU/artillery_0.6_TPU_standard.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.6_TPU_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_tpu diff --git a/resources/quality/artillery/TPU/artillery_0.8_TPU_draft.inst.cfg b/resources/quality/artillery/TPU/artillery_0.8_TPU_draft.inst.cfg index 430336e476..999a184b9a 100644 --- a/resources/quality/artillery/TPU/artillery_0.8_TPU_draft.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.8_TPU_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_tpu diff --git a/resources/quality/artillery/TPU/artillery_1.0_TPU_draft.inst.cfg b/resources/quality/artillery/TPU/artillery_1.0_TPU_draft.inst.cfg index 5a363982e4..2ba4124a39 100644 --- a/resources/quality/artillery/TPU/artillery_1.0_TPU_draft.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_1.0_TPU_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_tpu diff --git a/resources/quality/artillery/artillery_global_adaptive.inst.cfg b/resources/quality/artillery/artillery_global_adaptive.inst.cfg index 692cbd663b..e9346d2912 100644 --- a/resources/quality/artillery/artillery_global_adaptive.inst.cfg +++ b/resources/quality/artillery/artillery_global_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive weight = -2 diff --git a/resources/quality/artillery/artillery_global_draft.inst.cfg b/resources/quality/artillery/artillery_global_draft.inst.cfg index 747e52295f..fc5f84d9ae 100644 --- a/resources/quality/artillery/artillery_global_draft.inst.cfg +++ b/resources/quality/artillery/artillery_global_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -5 diff --git a/resources/quality/artillery/artillery_global_low.inst.cfg b/resources/quality/artillery/artillery_global_low.inst.cfg index b91160bac6..1c26274701 100644 --- a/resources/quality/artillery/artillery_global_low.inst.cfg +++ b/resources/quality/artillery/artillery_global_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low weight = -4 diff --git a/resources/quality/artillery/artillery_global_standard.inst.cfg b/resources/quality/artillery/artillery_global_standard.inst.cfg index 737d595b70..6af82c7bc0 100644 --- a/resources/quality/artillery/artillery_global_standard.inst.cfg +++ b/resources/quality/artillery/artillery_global_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard weight = -3 diff --git a/resources/quality/artillery/artillery_global_super.inst.cfg b/resources/quality/artillery/artillery_global_super.inst.cfg index 200851e043..6a5b7dffd7 100644 --- a/resources/quality/artillery/artillery_global_super.inst.cfg +++ b/resources/quality/artillery/artillery_global_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super weight = -1 diff --git a/resources/quality/artillery/artillery_global_ultra.inst.cfg b/resources/quality/artillery/artillery_global_ultra.inst.cfg index aa1c238a4e..0f7a09d4d6 100644 --- a/resources/quality/artillery/artillery_global_ultra.inst.cfg +++ b/resources/quality/artillery/artillery_global_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra weight = 0 diff --git a/resources/quality/atmat_signal_pro/signal_pro_global_extrafast_quality.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_global_extrafast_quality.inst.cfg index 674832ebef..b420faae60 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_global_extrafast_quality.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_global_extrafast_quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast global_quality = True diff --git a/resources/quality/atmat_signal_pro/signal_pro_global_extrafine_quality.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_global_extrafine_quality.inst.cfg index 9ef71093e3..94301c55c2 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_global_extrafine_quality.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_global_extrafine_quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafine global_quality = True diff --git a/resources/quality/atmat_signal_pro/signal_pro_global_fast_quality.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_global_fast_quality.inst.cfg index fb033c011f..41b7a73722 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_global_fast_quality.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_global_fast_quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast global_quality = True diff --git a/resources/quality/atmat_signal_pro/signal_pro_global_fine_quality.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_global_fine_quality.inst.cfg index 2d385246be..9540d432fe 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_global_fine_quality.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_global_fine_quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine global_quality = True diff --git a/resources/quality/atmat_signal_pro/signal_pro_global_normal_quality.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_global_normal_quality.inst.cfg index da6a534c85..67e6561078 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_global_normal_quality.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_global_normal_quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal global_quality = True diff --git a/resources/quality/atmat_signal_pro/signal_pro_global_sprint_quality.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_global_sprint_quality.inst.cfg index 8b5d96a99d..c472b9af9d 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_global_sprint_quality.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_global_sprint_quality.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint global_quality = True diff --git a/resources/quality/atmat_signal_pro/signal_pro_global_supersprint_quality.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_global_supersprint_quality.inst.cfg index 3c64c6e418..e053f7f326 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_global_supersprint_quality.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_global_supersprint_quality.inst.cfg @@ -4,7 +4,7 @@ name = Super Sprint definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint global_quality = True diff --git a/resources/quality/atmat_signal_pro/signal_pro_global_ultrasprint_quality.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_global_ultrasprint_quality.inst.cfg index 522eb27035..90a865ea82 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_global_ultrasprint_quality.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_global_ultrasprint_quality.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Sprint definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultrasprint global_quality = True diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_extrafast.inst.cfg index 835e15d051..477e244c0a 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_extrafast.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_abs_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_fast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_fast.inst.cfg index c1ae7953d5..0ef1ab45bd 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_fast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_abs_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_fine.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_fine.inst.cfg index 4c68e71898..a26a0f4df9 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_fine.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_abs_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_normal.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_normal.inst.cfg index 31f043e248..6bb9be4ec8 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_normal.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_abs_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_extrafast.inst.cfg index 31484f8ac0..7310a9916f 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_extrafast.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_hips_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_fast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_fast.inst.cfg index 7c5ca015dd..718facc609 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_fast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_hips_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_fine.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_fine.inst.cfg index 6204b0d2e9..555954db2e 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_fine.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_hips_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_normal.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_normal.inst.cfg index a3751cad21..089e1f80fb 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_normal.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_hips_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_extrafast.inst.cfg index 84017cd21b..d46146464c 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_extrafast.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_nylon_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_fast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_fast.inst.cfg index 4915208886..3a3b68e805 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_fast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_nylon_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_fine.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_fine.inst.cfg index 53d5a273eb..04fda8803f 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_fine.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_nylon_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_normal.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_normal.inst.cfg index f1cd91c44d..b35a0837d1 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_normal.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_nylon_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_extrafast.inst.cfg index 9d48dcbbad..fb5e0f97b8 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_extrafast.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_pc_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_fast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_fast.inst.cfg index 4433ab1fdf..3f6511f614 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_fast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_pc_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_fine.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_fine.inst.cfg index e5cf544a7f..d60877f539 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_fine.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_pc_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_normal.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_normal.inst.cfg index 0e6d053e84..094161de6c 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_normal.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pc_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_extrafast.inst.cfg index eb27e76046..8721072b80 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_extrafast.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_petg_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_fast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_fast.inst.cfg index 6e67f3c255..689b4e8939 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_fast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_petg_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_fine.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_fine.inst.cfg index 688ac9a0a7..563db3e271 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_fine.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_petg_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_normal.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_normal.inst.cfg index 190520cec1..fe5545dd3e 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_normal.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_petg_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_extrafast.inst.cfg index 8306fb5b35..71b948ba13 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_extrafast.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_pla_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_fast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_fast.inst.cfg index 10a9e233d8..4aeae3f393 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_fast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_pla_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_fine.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_fine.inst.cfg index eb71e5a503..409d937627 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_fine.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_pla_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_normal.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_normal.inst.cfg index 7a77f77b89..9fe85d998f 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_normal.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pla_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_extrafast.inst.cfg index c56e17a09e..75b289c551 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_extrafast.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_pva_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_fast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_fast.inst.cfg index 1212c00869..1c5773d723 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_fast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_pva_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_fine.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_fine.inst.cfg index 28e6ef804a..450c22b9b6 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_fine.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_pva_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_normal.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_normal.inst.cfg index fb206310cb..4c0a3f694a 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_normal.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pva_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_extrafast.inst.cfg index 1cb0b53593..09fc1e8b49 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_extrafast.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_tpu_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_fast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_fast.inst.cfg index 5648531609..4d200d2904 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_tpu_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_fine.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_fine.inst.cfg index 53f785513d..61d535ae66 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_tpu_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_normal.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_normal.inst.cfg index 65fc9f24c6..398a77d369 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_tpu_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_extrafast.inst.cfg index 466236d8d4..429f5e6d74 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_extrafast.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_abs_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_sprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_sprint.inst.cfg index 1e634ecf6b..66594200b7 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_sprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_sprint.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_abs_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_supersprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_supersprint.inst.cfg index 1f5e8b7682..09d79571fe 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_supersprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_supersprint.inst.cfg @@ -4,7 +4,7 @@ name = Super Sprint definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_abs_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_extrafast.inst.cfg index b0b7986e74..2ae50d46b0 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_extrafast.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_hips_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_sprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_sprint.inst.cfg index aea8eacd90..66a7db63a3 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_sprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_sprint.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_hips_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_supersprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_supersprint.inst.cfg index 98baeaadfe..557f4732a6 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_supersprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_supersprint.inst.cfg @@ -4,7 +4,7 @@ name = Super Sprint definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_hips_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_extrafast.inst.cfg index 8747d23a63..20f3572495 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_extrafast.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_nylon_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_sprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_sprint.inst.cfg index 387d198764..32d5b2bb6f 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_sprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_sprint.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_nylon_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_supersprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_supersprint.inst.cfg index ca7fb2146a..04c845d058 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_supersprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_supersprint.inst.cfg @@ -4,7 +4,7 @@ name = Super Sprint definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_nylon_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_extrafast.inst.cfg index 1fbbc3cc17..6270452444 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_extrafast.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_pc_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_sprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_sprint.inst.cfg index b2df2652c3..dbdf609b6e 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_sprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_sprint.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_pc_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_supersprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_supersprint.inst.cfg index 2847c477b2..b0a615a794 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_supersprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_supersprint.inst.cfg @@ -4,7 +4,7 @@ name = Super Sprint definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_pc_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_extrafast.inst.cfg index 5792b4e336..b683151b32 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_extrafast.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_petg_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_sprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_sprint.inst.cfg index 7190f8455f..862adcf229 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_sprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_sprint.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_petg_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_supersprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_supersprint.inst.cfg index 7b1b87bcf9..a217664e1b 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_supersprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_supersprint.inst.cfg @@ -4,7 +4,7 @@ name = Super Sprint definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_petg_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_extrafast.inst.cfg index 0855f8420e..b3990e201b 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_extrafast.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_pla_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_sprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_sprint.inst.cfg index 3acb2d07ac..690ce5efd4 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_sprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_sprint.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_pla_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_supersprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_supersprint.inst.cfg index a92af7b7d9..4fae662805 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_supersprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_supersprint.inst.cfg @@ -4,7 +4,7 @@ name = Super Sprint definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_pla_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_extrafast.inst.cfg index 53554ac050..e32c620426 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_extrafast.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_pva_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_sprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_sprint.inst.cfg index c2399f1a78..d71e0aead9 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_sprint.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_pva_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_supersprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_supersprint.inst.cfg index 0aab01c919..758f6db531 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_supersprint.inst.cfg @@ -4,7 +4,7 @@ name = Super Sprint definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_pva_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_extrafast.inst.cfg index 0a9bb80da0..b34341a138 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_extrafast.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_tpu_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_sprint.inst.cfg index 60e51753d8..1bcbbc14ff 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_sprint.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_tpu_175 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_supersprint.inst.cfg index 376bd962fb..2c9c72b695 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_supersprint.inst.cfg @@ -4,7 +4,7 @@ name = Super Sprint definition = atmat_signal_pro_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_tpu_175 diff --git a/resources/quality/beamup_l/beamup_l_coarse.inst.cfg b/resources/quality/beamup_l/beamup_l_coarse.inst.cfg index cf44e37f7e..d5276ea861 100644 --- a/resources/quality/beamup_l/beamup_l_coarse.inst.cfg +++ b/resources/quality/beamup_l/beamup_l_coarse.inst.cfg @@ -4,7 +4,7 @@ name = BeamUp L Coarse definition = beamup_l [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/beamup_l/beamup_l_draft.inst.cfg b/resources/quality/beamup_l/beamup_l_draft.inst.cfg index ed10788f53..7f364d6840 100644 --- a/resources/quality/beamup_l/beamup_l_draft.inst.cfg +++ b/resources/quality/beamup_l/beamup_l_draft.inst.cfg @@ -4,7 +4,7 @@ name = BeamUp L Draft definition = beamup_l [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/beamup_l/beamup_l_extra_fine.inst.cfg b/resources/quality/beamup_l/beamup_l_extra_fine.inst.cfg index 82959cca94..3fcd43772b 100644 --- a/resources/quality/beamup_l/beamup_l_extra_fine.inst.cfg +++ b/resources/quality/beamup_l/beamup_l_extra_fine.inst.cfg @@ -4,7 +4,7 @@ name = BeamUp L Extra Fine definition = beamup_l [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/beamup_l/beamup_l_fine.inst.cfg b/resources/quality/beamup_l/beamup_l_fine.inst.cfg index 830562c067..213727a2a3 100644 --- a/resources/quality/beamup_l/beamup_l_fine.inst.cfg +++ b/resources/quality/beamup_l/beamup_l_fine.inst.cfg @@ -4,7 +4,7 @@ name = BeamUp L Fine definition = beamup_l [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/beamup_l/beamup_l_normal.inst.cfg b/resources/quality/beamup_l/beamup_l_normal.inst.cfg index a9d67bd9b9..20f80c40d0 100644 --- a/resources/quality/beamup_l/beamup_l_normal.inst.cfg +++ b/resources/quality/beamup_l/beamup_l_normal.inst.cfg @@ -4,7 +4,7 @@ name = BeamUp L Normal definition = beamup_l [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/beamup_s/beamup_s_coarse.inst.cfg b/resources/quality/beamup_s/beamup_s_coarse.inst.cfg index 4824f4b9bc..07697a4aae 100644 --- a/resources/quality/beamup_s/beamup_s_coarse.inst.cfg +++ b/resources/quality/beamup_s/beamup_s_coarse.inst.cfg @@ -4,7 +4,7 @@ name = BeamUp S Coarse definition = beamup_s [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/beamup_s/beamup_s_draft.inst.cfg b/resources/quality/beamup_s/beamup_s_draft.inst.cfg index 1bbf4e0ecf..bae355d9ce 100644 --- a/resources/quality/beamup_s/beamup_s_draft.inst.cfg +++ b/resources/quality/beamup_s/beamup_s_draft.inst.cfg @@ -4,7 +4,7 @@ name = BeamUp S Draft definition = beamup_s [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/beamup_s/beamup_s_extra_fine.inst.cfg b/resources/quality/beamup_s/beamup_s_extra_fine.inst.cfg index 64c0eacdbb..93607aba6a 100644 --- a/resources/quality/beamup_s/beamup_s_extra_fine.inst.cfg +++ b/resources/quality/beamup_s/beamup_s_extra_fine.inst.cfg @@ -4,7 +4,7 @@ name = BeamUp S Extra Fine definition = beamup_s [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/beamup_s/beamup_s_fine.inst.cfg b/resources/quality/beamup_s/beamup_s_fine.inst.cfg index 0705cd53c5..64d41c1298 100644 --- a/resources/quality/beamup_s/beamup_s_fine.inst.cfg +++ b/resources/quality/beamup_s/beamup_s_fine.inst.cfg @@ -4,7 +4,7 @@ name = BeamUp S Fine definition = beamup_s [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/beamup_s/beamup_s_normal.inst.cfg b/resources/quality/beamup_s/beamup_s_normal.inst.cfg index 1fa9300404..77f92b72ab 100644 --- a/resources/quality/beamup_s/beamup_s_normal.inst.cfg +++ b/resources/quality/beamup_s/beamup_s_normal.inst.cfg @@ -4,7 +4,7 @@ name = BeamUp S Normal definition = beamup_s [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/biqu/base/biqu_base_0.2_ABS_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.2_ABS_super.inst.cfg index ec804e8bab..4f3e6dbf5e 100644 --- a/resources/quality/biqu/base/biqu_base_0.2_ABS_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.2_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_abs_175 diff --git a/resources/quality/biqu/base/biqu_base_0.2_ABS_ultra.inst.cfg b/resources/quality/biqu/base/biqu_base_0.2_ABS_ultra.inst.cfg index 4e1508e73d..c29f50bd97 100644 --- a/resources/quality/biqu/base/biqu_base_0.2_ABS_ultra.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.2_ABS_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra material = generic_abs_175 diff --git a/resources/quality/biqu/base/biqu_base_0.2_PETG_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.2_PETG_super.inst.cfg index 7d7185837e..e1ee4dd2c5 100644 --- a/resources/quality/biqu/base/biqu_base_0.2_PETG_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.2_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_petg_175 diff --git a/resources/quality/biqu/base/biqu_base_0.2_PETG_ultra.inst.cfg b/resources/quality/biqu/base/biqu_base_0.2_PETG_ultra.inst.cfg index 8d1c0a7938..0962b35611 100644 --- a/resources/quality/biqu/base/biqu_base_0.2_PETG_ultra.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.2_PETG_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra material = generic_petg_175 diff --git a/resources/quality/biqu/base/biqu_base_0.2_PLA_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.2_PLA_super.inst.cfg index 3acdd46ade..a4e2af5af7 100644 --- a/resources/quality/biqu/base/biqu_base_0.2_PLA_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.2_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_pla_175 diff --git a/resources/quality/biqu/base/biqu_base_0.2_PLA_ultra.inst.cfg b/resources/quality/biqu/base/biqu_base_0.2_PLA_ultra.inst.cfg index 421584b154..2e5412d866 100644 --- a/resources/quality/biqu/base/biqu_base_0.2_PLA_ultra.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.2_PLA_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra material = generic_pla_175 diff --git a/resources/quality/biqu/base/biqu_base_0.3_ABS_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_ABS_adaptive.inst.cfg index cfaa3dcb0c..2cb1033287 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_ABS_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_ABS_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_abs_175 diff --git a/resources/quality/biqu/base/biqu_base_0.3_ABS_low.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_ABS_low.inst.cfg index 96bfa20f10..ea3e2dcd52 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_ABS_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_abs_175 diff --git a/resources/quality/biqu/base/biqu_base_0.3_ABS_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_ABS_standard.inst.cfg index 01a5ae8f8c..219d26bd7f 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_ABS_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_ABS_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_abs_175 diff --git a/resources/quality/biqu/base/biqu_base_0.3_ABS_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_ABS_super.inst.cfg index 767bb7767a..4edd4c3abf 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_ABS_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_abs_175 diff --git a/resources/quality/biqu/base/biqu_base_0.3_PETG_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_PETG_adaptive.inst.cfg index 2ad747db7e..6140755974 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_PETG_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_PETG_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_petg_175 diff --git a/resources/quality/biqu/base/biqu_base_0.3_PETG_low.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_PETG_low.inst.cfg index c5fda34eaa..c050c238fb 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_PETG_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_petg_175 diff --git a/resources/quality/biqu/base/biqu_base_0.3_PETG_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_PETG_standard.inst.cfg index fcdb1220c0..e9029b43d2 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_PETG_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_PETG_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_petg_175 diff --git a/resources/quality/biqu/base/biqu_base_0.3_PETG_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_PETG_super.inst.cfg index 2f66939544..1fad146399 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_PETG_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_petg_175 diff --git a/resources/quality/biqu/base/biqu_base_0.3_PLA_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_PLA_adaptive.inst.cfg index 7aff470176..cee74eed87 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_PLA_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_PLA_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_pla_175 diff --git a/resources/quality/biqu/base/biqu_base_0.3_PLA_low.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_PLA_low.inst.cfg index 17c1c725c2..cd438a8cf9 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_PLA_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla_175 diff --git a/resources/quality/biqu/base/biqu_base_0.3_PLA_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_PLA_standard.inst.cfg index 02720317ea..90187baf20 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_PLA_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_PLA_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_pla_175 diff --git a/resources/quality/biqu/base/biqu_base_0.3_PLA_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_PLA_super.inst.cfg index 012306c17b..44c7b2e04e 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_PLA_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_pla_175 diff --git a/resources/quality/biqu/base/biqu_base_0.3_TPU_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_TPU_adaptive.inst.cfg index d9a32f183f..2b7cba7882 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_TPU_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_TPU_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_tpu_175 diff --git a/resources/quality/biqu/base/biqu_base_0.3_TPU_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_TPU_standard.inst.cfg index a267cb9b89..d34cb31eda 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_TPU_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_TPU_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_tpu_175 diff --git a/resources/quality/biqu/base/biqu_base_0.3_TPU_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_TPU_super.inst.cfg index abcabd8285..49cff301bf 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_TPU_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_TPU_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_tpu_175 diff --git a/resources/quality/biqu/base/biqu_base_0.4_ABS_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_ABS_adaptive.inst.cfg index 44dd5065cb..010fdd2d51 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_ABS_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_ABS_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_abs_175 diff --git a/resources/quality/biqu/base/biqu_base_0.4_ABS_low.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_ABS_low.inst.cfg index fb5d1ad439..46251b4818 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_ABS_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_abs_175 diff --git a/resources/quality/biqu/base/biqu_base_0.4_ABS_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_ABS_standard.inst.cfg index f8319878cc..4075e326f3 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_ABS_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_ABS_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_abs_175 diff --git a/resources/quality/biqu/base/biqu_base_0.4_ABS_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_ABS_super.inst.cfg index 8dc442790e..8e8207cd1b 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_ABS_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_abs_175 diff --git a/resources/quality/biqu/base/biqu_base_0.4_PETG_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_PETG_adaptive.inst.cfg index 8813bdae3b..9e3a2cb3a4 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_PETG_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_PETG_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_petg_175 diff --git a/resources/quality/biqu/base/biqu_base_0.4_PETG_low.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_PETG_low.inst.cfg index 8fc3ae87b3..7714ed9097 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_PETG_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_petg_175 diff --git a/resources/quality/biqu/base/biqu_base_0.4_PETG_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_PETG_standard.inst.cfg index d60458d612..74a26b547f 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_PETG_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_PETG_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_petg_175 diff --git a/resources/quality/biqu/base/biqu_base_0.4_PETG_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_PETG_super.inst.cfg index 264c64e1d0..805cb89e6a 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_PETG_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_petg_175 diff --git a/resources/quality/biqu/base/biqu_base_0.4_PLA_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_PLA_adaptive.inst.cfg index c25090ead6..0e112d2c75 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_PLA_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_PLA_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_pla_175 diff --git a/resources/quality/biqu/base/biqu_base_0.4_PLA_low.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_PLA_low.inst.cfg index bee1419010..073f2b588b 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_PLA_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla_175 diff --git a/resources/quality/biqu/base/biqu_base_0.4_PLA_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_PLA_standard.inst.cfg index 0d70eb4c77..65e6c6e205 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_PLA_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_PLA_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_pla_175 diff --git a/resources/quality/biqu/base/biqu_base_0.4_PLA_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_PLA_super.inst.cfg index 6081cae7ae..ec27c10193 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_PLA_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_pla_175 diff --git a/resources/quality/biqu/base/biqu_base_0.4_TPU_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_TPU_adaptive.inst.cfg index 9bd256c1a8..8b7bd5f8d9 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_TPU_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_TPU_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_tpu_175 diff --git a/resources/quality/biqu/base/biqu_base_0.4_TPU_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_TPU_standard.inst.cfg index 3c2c0dd142..3473d852f8 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_TPU_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_TPU_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_tpu_175 diff --git a/resources/quality/biqu/base/biqu_base_0.4_TPU_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_TPU_super.inst.cfg index 5bcd03f334..467557b25b 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_TPU_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_TPU_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_tpu_175 diff --git a/resources/quality/biqu/base/biqu_base_0.5_ABS_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_ABS_adaptive.inst.cfg index f72b0f2a58..019f36ff78 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_ABS_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_ABS_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_abs_175 diff --git a/resources/quality/biqu/base/biqu_base_0.5_ABS_low.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_ABS_low.inst.cfg index 99713d0632..7c5bd852f5 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_ABS_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_abs_175 diff --git a/resources/quality/biqu/base/biqu_base_0.5_ABS_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_ABS_standard.inst.cfg index 2f41f70334..bb63c2060a 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_ABS_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_ABS_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_abs_175 diff --git a/resources/quality/biqu/base/biqu_base_0.5_ABS_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_ABS_super.inst.cfg index 9d395b3936..9c7c144d1b 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_ABS_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_abs_175 diff --git a/resources/quality/biqu/base/biqu_base_0.5_PETG_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_PETG_adaptive.inst.cfg index 487450666d..346799a2a2 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_PETG_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_PETG_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_petg_175 diff --git a/resources/quality/biqu/base/biqu_base_0.5_PETG_low.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_PETG_low.inst.cfg index 01eb05906b..0c19569778 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_PETG_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_petg_175 diff --git a/resources/quality/biqu/base/biqu_base_0.5_PETG_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_PETG_standard.inst.cfg index 0f0a2e4ace..3939ea893d 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_PETG_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_PETG_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_petg_175 diff --git a/resources/quality/biqu/base/biqu_base_0.5_PETG_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_PETG_super.inst.cfg index 6a3809b16d..f9df77524a 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_PETG_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_petg_175 diff --git a/resources/quality/biqu/base/biqu_base_0.5_PLA_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_PLA_adaptive.inst.cfg index d3fe56fef5..dc6ccb5d46 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_PLA_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_PLA_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_pla_175 diff --git a/resources/quality/biqu/base/biqu_base_0.5_PLA_low.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_PLA_low.inst.cfg index 961018cb7a..250364ca35 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_PLA_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla_175 diff --git a/resources/quality/biqu/base/biqu_base_0.5_PLA_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_PLA_standard.inst.cfg index e52c88a8ff..c18fd70ea3 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_PLA_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_PLA_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_pla_175 diff --git a/resources/quality/biqu/base/biqu_base_0.5_PLA_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_PLA_super.inst.cfg index d31a01893c..5a2fd94dc1 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_PLA_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_pla_175 diff --git a/resources/quality/biqu/base/biqu_base_0.5_TPU_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_TPU_adaptive.inst.cfg index b68bf9621b..c6443e8f46 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_TPU_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_TPU_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_tpu_175 diff --git a/resources/quality/biqu/base/biqu_base_0.5_TPU_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_TPU_standard.inst.cfg index 6d41c9af22..890fea2d63 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_TPU_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_TPU_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_tpu_175 diff --git a/resources/quality/biqu/base/biqu_base_0.5_TPU_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_TPU_super.inst.cfg index f93caed975..193ea3e7b9 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_TPU_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_TPU_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_tpu_175 diff --git a/resources/quality/biqu/base/biqu_base_0.6_ABS_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.6_ABS_standard.inst.cfg index e2b2f73bed..f76239dacf 100644 --- a/resources/quality/biqu/base/biqu_base_0.6_ABS_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.6_ABS_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_abs_175 diff --git a/resources/quality/biqu/base/biqu_base_0.6_PETG_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.6_PETG_standard.inst.cfg index add215be41..ce47b2e5ec 100644 --- a/resources/quality/biqu/base/biqu_base_0.6_PETG_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.6_PETG_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_petg_175 diff --git a/resources/quality/biqu/base/biqu_base_0.6_PLA_draft.inst.cfg b/resources/quality/biqu/base/biqu_base_0.6_PLA_draft.inst.cfg index 70389a2335..2d384bf676 100644 --- a/resources/quality/biqu/base/biqu_base_0.6_PLA_draft.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.6_PLA_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_pla_175 diff --git a/resources/quality/biqu/base/biqu_base_0.6_PLA_low.inst.cfg b/resources/quality/biqu/base/biqu_base_0.6_PLA_low.inst.cfg index 68423c7f95..f2030f1108 100644 --- a/resources/quality/biqu/base/biqu_base_0.6_PLA_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.6_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla_175 diff --git a/resources/quality/biqu/base/biqu_base_0.6_PLA_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.6_PLA_standard.inst.cfg index a4230991c6..40d45032f7 100644 --- a/resources/quality/biqu/base/biqu_base_0.6_PLA_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.6_PLA_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_pla_175 diff --git a/resources/quality/biqu/base/biqu_base_0.6_TPU_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.6_TPU_standard.inst.cfg index c01b4dfecd..71e15e27d4 100644 --- a/resources/quality/biqu/base/biqu_base_0.6_TPU_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.6_TPU_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_tpu_175 diff --git a/resources/quality/biqu/base/biqu_base_0.8_ABS_draft.inst.cfg b/resources/quality/biqu/base/biqu_base_0.8_ABS_draft.inst.cfg index 1101e290da..42e763cb35 100644 --- a/resources/quality/biqu/base/biqu_base_0.8_ABS_draft.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.8_ABS_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_abs_175 diff --git a/resources/quality/biqu/base/biqu_base_0.8_PETG_draft.inst.cfg b/resources/quality/biqu/base/biqu_base_0.8_PETG_draft.inst.cfg index 52214da812..af5c61b1f9 100644 --- a/resources/quality/biqu/base/biqu_base_0.8_PETG_draft.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.8_PETG_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_petg_175 diff --git a/resources/quality/biqu/base/biqu_base_0.8_PLA_draft.inst.cfg b/resources/quality/biqu/base/biqu_base_0.8_PLA_draft.inst.cfg index 8aca9d4577..b5cd6fd5b1 100644 --- a/resources/quality/biqu/base/biqu_base_0.8_PLA_draft.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.8_PLA_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_pla_175 diff --git a/resources/quality/biqu/base/biqu_base_0.8_TPU_draft.inst.cfg b/resources/quality/biqu/base/biqu_base_0.8_TPU_draft.inst.cfg index ca881da56d..e69ced53ec 100644 --- a/resources/quality/biqu/base/biqu_base_0.8_TPU_draft.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.8_TPU_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_tpu_175 diff --git a/resources/quality/biqu/base/biqu_base_1.0_ABS_draft.inst.cfg b/resources/quality/biqu/base/biqu_base_1.0_ABS_draft.inst.cfg index 280d64a865..7f1e25f822 100644 --- a/resources/quality/biqu/base/biqu_base_1.0_ABS_draft.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_1.0_ABS_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_abs_175 diff --git a/resources/quality/biqu/base/biqu_base_1.0_PETG_draft.inst.cfg b/resources/quality/biqu/base/biqu_base_1.0_PETG_draft.inst.cfg index c1ad705237..255086cd4e 100644 --- a/resources/quality/biqu/base/biqu_base_1.0_PETG_draft.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_1.0_PETG_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_petg_175 diff --git a/resources/quality/biqu/base/biqu_base_1.0_PLA_draft.inst.cfg b/resources/quality/biqu/base/biqu_base_1.0_PLA_draft.inst.cfg index e5cfd1b674..879efffb5c 100644 --- a/resources/quality/biqu/base/biqu_base_1.0_PLA_draft.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_1.0_PLA_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_pla_175 diff --git a/resources/quality/biqu/base/biqu_base_1.0_TPU_draft.inst.cfg b/resources/quality/biqu/base/biqu_base_1.0_TPU_draft.inst.cfg index 7ce4e77182..6df0b1b846 100644 --- a/resources/quality/biqu/base/biqu_base_1.0_TPU_draft.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_1.0_TPU_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_tpu_175 diff --git a/resources/quality/biqu/base/biqu_base_global_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_global_adaptive.inst.cfg index 17f2af7e60..ec591faf98 100644 --- a/resources/quality/biqu/base/biqu_base_global_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_global_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive weight = -2 diff --git a/resources/quality/biqu/base/biqu_base_global_draft.inst.cfg b/resources/quality/biqu/base/biqu_base_global_draft.inst.cfg index 634c69b15c..64e3dccbcd 100644 --- a/resources/quality/biqu/base/biqu_base_global_draft.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_global_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -5 diff --git a/resources/quality/biqu/base/biqu_base_global_low.inst.cfg b/resources/quality/biqu/base/biqu_base_global_low.inst.cfg index 941aa95784..4f38e2181e 100644 --- a/resources/quality/biqu/base/biqu_base_global_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_global_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low weight = -4 diff --git a/resources/quality/biqu/base/biqu_base_global_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_global_standard.inst.cfg index 0f6c943234..673e5d647d 100644 --- a/resources/quality/biqu/base/biqu_base_global_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_global_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard weight = -3 diff --git a/resources/quality/biqu/base/biqu_base_global_super.inst.cfg b/resources/quality/biqu/base/biqu_base_global_super.inst.cfg index 82e5cd97b1..891b3eae3f 100644 --- a/resources/quality/biqu/base/biqu_base_global_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_global_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super weight = -1 diff --git a/resources/quality/biqu/base/biqu_base_global_ultra.inst.cfg b/resources/quality/biqu/base/biqu_base_global_ultra.inst.cfg index 6564ba225b..033fca274c 100644 --- a/resources/quality/biqu/base/biqu_base_global_ultra.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_global_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra weight = 0 diff --git a/resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg index 43b3ff05ef..d1e057f4d0 100644 --- a/resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg index 06c6f72878..021d2c1274 100644 --- a/resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg index 199b5e3a09..d77c404d6a 100644 --- a/resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg index 318fff60c5..42bf68f555 100644 --- a/resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg index 7be7d35cfb..724e9b06d4 100644 --- a/resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg index b22cbbe2be..834f27aee4 100644 --- a/resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg index 83ab861d08..2fc1bc8c24 100644 --- a/resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg index da4047bc60..cb2d7e45ee 100644 --- a/resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg index 6c34cc23bf..8cd368f333 100644 --- a/resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg index 8162d88661..0a8a0f5b28 100644 --- a/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg index f65cac4db6..e350677b1c 100644 --- a/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg index 0f1391c60a..39216f60b5 100644 --- a/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg index ff56bd82f1..3b7dea65c5 100644 --- a/resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg index 05807493a7..52f3cd1f02 100644 --- a/resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg index f15219f54c..4a8e0ad3b2 100644 --- a/resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg index c12a9c8ae4..9fde2d3d1d 100644 --- a/resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = builder_premium_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/builder_premium/bp_global_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_global_High_Quality.inst.cfg index dca0d475e1..e1cf52892c 100644 --- a/resources/quality/builder_premium/bp_global_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = builder_premium_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg index affb12baa8..5bc3cb072c 100644 --- a/resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = builder_premium_small [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg index 5440d4f7e5..9c3f460b00 100644 --- a/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg index b24e341fd0..f0d5a7b986 100644 --- a/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg index a5f67760c7..22f86e2b60 100644 --- a/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg index f536a1c02b..b0ada78077 100644 --- a/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg index 8129e428de..6de386972d 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg index c3c1feedff..47076d533d 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg index f5c6ddcaed..23d21394c0 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg index ea97c92014..40cba11154 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg index 5379629066..3199834724 100644 --- a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg +++ b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg index 06208214ff..139e739a64 100644 --- a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg +++ b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg index ce99162a1a..a17a389f54 100644 --- a/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg +++ b/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg index cb59850971..f81604ad64 100644 --- a/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra coarse weight = -4 diff --git a/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg index 9db56c6d58..356361fe21 100644 --- a/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg +++ b/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg index 384ae99f0f..3fe23d5f7f 100644 --- a/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg +++ b/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg index 65c53301bb..095f78ca55 100644 --- a/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg index a81a4d2ef4..6bcbc308f7 100644 --- a/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg index ddce3cf2e3..e57ed2622a 100644 --- a/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg index 9d50295307..8ea8997989 100644 --- a/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg index 387bfc539c..2b9c66174e 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg index 7b67796b1d..501730b447 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg index fd43c3d274..bf606c43c0 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg index e9e1e21f2d..0d2c45df64 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg index b358a546bb..fbc090de1e 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg index ae5981b713..7d34491a68 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg index ab8901b8a0..7baadfc795 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg index f28efd37ad..2518e281b5 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg index d37de109a6..aec5839007 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg index 355bc5a076..32af63d6ca 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg index c90b52e0d8..b4a7a5990c 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg index 04fcf2d939..49a2e67d77 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg index ba2121ad66..157db609b0 100644 --- a/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg index 2d7b4e4168..3dafdcb0ac 100644 --- a/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg index 080b2ee184..4218ba4cdb 100644 --- a/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg index de957dad5c..482de59383 100644 --- a/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg index cafb12c5d0..e88dbe3f1c 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg index 96ec9ef0b7..423bc93c23 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg index c4184973ee..b69a32a0b4 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg index 551cba54e8..05de6f2db9 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg index 13122c8286..e0f8eab122 100644 --- a/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg index 9ef5141895..c9eb5c5818 100644 --- a/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg index 8e8c9e6dcc..468efbaf6d 100644 --- a/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg index 29561e2af3..5b4c7fb669 100644 --- a/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg index cfc97c6924..682530f404 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg index 2de7603bf0..d8175c4935 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg index cbeeb848b9..69891332ea 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg index f3d000db77..663e49e657 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg index 8005e06889..25155c94f3 100644 --- a/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg index e4c910dede..a2f8dc2c21 100644 --- a/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg index 5d8e9ce306..996d2f7d2e 100644 --- a/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg index 9fef9ccaa1..b96e1442ad 100644 --- a/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg index b024701c70..764989fefb 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg index 93c6b4a981..d22a667fb8 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra coarse weight = -4 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg index ac10d993e8..4a492255bb 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg index 983fb29323..e05cdd2e4b 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg index d9a8bfcac4..e32a9fcd1f 100644 --- a/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg index 77f37cb628..5f33208e5e 100644 --- a/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg index 20cf2ebeae..7da7d8d629 100644 --- a/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg index 6baa9b6fa4..25cce77f09 100644 --- a/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg index a52195e82f..2fcc20d5f3 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg index a97361a8fa..1e2452012f 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra coarse weight = 4 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg index 1eddb4db38..cd5cf43d9d 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg index 96aed57880..4a4ebbb2bd 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = cartesio [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/coarse.inst.cfg b/resources/quality/coarse.inst.cfg index 6ec9646372..f723269f1a 100644 --- a/resources/quality/coarse.inst.cfg +++ b/resources/quality/coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = fdmprinter [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/creality/base/base_0.2_ABS_super.inst.cfg b/resources/quality/creality/base/base_0.2_ABS_super.inst.cfg index 77cf2bff15..1f76facbbf 100644 --- a/resources/quality/creality/base/base_0.2_ABS_super.inst.cfg +++ b/resources/quality/creality/base/base_0.2_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/creality/base/base_0.2_ABS_ultra.inst.cfg b/resources/quality/creality/base/base_0.2_ABS_ultra.inst.cfg index 3f39a9b574..5159ede954 100644 --- a/resources/quality/creality/base/base_0.2_ABS_ultra.inst.cfg +++ b/resources/quality/creality/base/base_0.2_ABS_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra material = generic_abs diff --git a/resources/quality/creality/base/base_0.2_PETG_super.inst.cfg b/resources/quality/creality/base/base_0.2_PETG_super.inst.cfg index 4c8aec600c..4e9d52964d 100644 --- a/resources/quality/creality/base/base_0.2_PETG_super.inst.cfg +++ b/resources/quality/creality/base/base_0.2_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/creality/base/base_0.2_PETG_ultra.inst.cfg b/resources/quality/creality/base/base_0.2_PETG_ultra.inst.cfg index 25f3e83e89..8f8d2f5dba 100644 --- a/resources/quality/creality/base/base_0.2_PETG_ultra.inst.cfg +++ b/resources/quality/creality/base/base_0.2_PETG_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra material = generic_petg diff --git a/resources/quality/creality/base/base_0.2_PLA_super.inst.cfg b/resources/quality/creality/base/base_0.2_PLA_super.inst.cfg index 3adb87d8af..d8cb3a169f 100644 --- a/resources/quality/creality/base/base_0.2_PLA_super.inst.cfg +++ b/resources/quality/creality/base/base_0.2_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/creality/base/base_0.2_PLA_ultra.inst.cfg b/resources/quality/creality/base/base_0.2_PLA_ultra.inst.cfg index 4da796a64c..3c49462d70 100644 --- a/resources/quality/creality/base/base_0.2_PLA_ultra.inst.cfg +++ b/resources/quality/creality/base/base_0.2_PLA_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra material = generic_pla diff --git a/resources/quality/creality/base/base_0.3_ABS_adaptive.inst.cfg b/resources/quality/creality/base/base_0.3_ABS_adaptive.inst.cfg index 79b075b963..8ed5d5babf 100644 --- a/resources/quality/creality/base/base_0.3_ABS_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.3_ABS_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_abs diff --git a/resources/quality/creality/base/base_0.3_ABS_low.inst.cfg b/resources/quality/creality/base/base_0.3_ABS_low.inst.cfg index d6f78cbd25..2d37b7a02f 100644 --- a/resources/quality/creality/base/base_0.3_ABS_low.inst.cfg +++ b/resources/quality/creality/base/base_0.3_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/creality/base/base_0.3_ABS_standard.inst.cfg b/resources/quality/creality/base/base_0.3_ABS_standard.inst.cfg index 5890c3cdc6..5701a88e6b 100644 --- a/resources/quality/creality/base/base_0.3_ABS_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.3_ABS_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_abs diff --git a/resources/quality/creality/base/base_0.3_ABS_super.inst.cfg b/resources/quality/creality/base/base_0.3_ABS_super.inst.cfg index 7aeea9b554..b97ee34c48 100644 --- a/resources/quality/creality/base/base_0.3_ABS_super.inst.cfg +++ b/resources/quality/creality/base/base_0.3_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/creality/base/base_0.3_PETG_adaptive.inst.cfg b/resources/quality/creality/base/base_0.3_PETG_adaptive.inst.cfg index 965b254674..71445c8d55 100644 --- a/resources/quality/creality/base/base_0.3_PETG_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PETG_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_petg diff --git a/resources/quality/creality/base/base_0.3_PETG_low.inst.cfg b/resources/quality/creality/base/base_0.3_PETG_low.inst.cfg index 9cf5bed630..7dd091eb01 100644 --- a/resources/quality/creality/base/base_0.3_PETG_low.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/creality/base/base_0.3_PETG_standard.inst.cfg b/resources/quality/creality/base/base_0.3_PETG_standard.inst.cfg index 3262f1270c..871126a0e6 100644 --- a/resources/quality/creality/base/base_0.3_PETG_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PETG_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_petg diff --git a/resources/quality/creality/base/base_0.3_PETG_super.inst.cfg b/resources/quality/creality/base/base_0.3_PETG_super.inst.cfg index 078b82af36..e605fda1ee 100644 --- a/resources/quality/creality/base/base_0.3_PETG_super.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/creality/base/base_0.3_PLA_adaptive.inst.cfg b/resources/quality/creality/base/base_0.3_PLA_adaptive.inst.cfg index ce5604e44c..46f1394ca5 100644 --- a/resources/quality/creality/base/base_0.3_PLA_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PLA_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_pla diff --git a/resources/quality/creality/base/base_0.3_PLA_low.inst.cfg b/resources/quality/creality/base/base_0.3_PLA_low.inst.cfg index 2962389566..1ee6c9d249 100644 --- a/resources/quality/creality/base/base_0.3_PLA_low.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/creality/base/base_0.3_PLA_standard.inst.cfg b/resources/quality/creality/base/base_0.3_PLA_standard.inst.cfg index 9f1997738b..b919c284ad 100644 --- a/resources/quality/creality/base/base_0.3_PLA_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PLA_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_pla diff --git a/resources/quality/creality/base/base_0.3_PLA_super.inst.cfg b/resources/quality/creality/base/base_0.3_PLA_super.inst.cfg index 680b59a666..717f7fc2a9 100644 --- a/resources/quality/creality/base/base_0.3_PLA_super.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/creality/base/base_0.3_TPU_adaptive.inst.cfg b/resources/quality/creality/base/base_0.3_TPU_adaptive.inst.cfg index 0f4a143ebd..4782571677 100644 --- a/resources/quality/creality/base/base_0.3_TPU_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.3_TPU_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_tpu diff --git a/resources/quality/creality/base/base_0.3_TPU_standard.inst.cfg b/resources/quality/creality/base/base_0.3_TPU_standard.inst.cfg index ee916f25ef..eff4c9ac32 100644 --- a/resources/quality/creality/base/base_0.3_TPU_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.3_TPU_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_tpu diff --git a/resources/quality/creality/base/base_0.3_TPU_super.inst.cfg b/resources/quality/creality/base/base_0.3_TPU_super.inst.cfg index 00ccbe1f9b..fe355b601f 100644 --- a/resources/quality/creality/base/base_0.3_TPU_super.inst.cfg +++ b/resources/quality/creality/base/base_0.3_TPU_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_tpu diff --git a/resources/quality/creality/base/base_0.4_ABS_adaptive.inst.cfg b/resources/quality/creality/base/base_0.4_ABS_adaptive.inst.cfg index feef81f092..70d58dab43 100644 --- a/resources/quality/creality/base/base_0.4_ABS_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.4_ABS_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_abs diff --git a/resources/quality/creality/base/base_0.4_ABS_low.inst.cfg b/resources/quality/creality/base/base_0.4_ABS_low.inst.cfg index 5a9d804d70..a4994588cc 100644 --- a/resources/quality/creality/base/base_0.4_ABS_low.inst.cfg +++ b/resources/quality/creality/base/base_0.4_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/creality/base/base_0.4_ABS_standard.inst.cfg b/resources/quality/creality/base/base_0.4_ABS_standard.inst.cfg index 47c47c65f8..f3fe22c9d9 100644 --- a/resources/quality/creality/base/base_0.4_ABS_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.4_ABS_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_abs diff --git a/resources/quality/creality/base/base_0.4_ABS_super.inst.cfg b/resources/quality/creality/base/base_0.4_ABS_super.inst.cfg index 9db3ee00aa..cf3e5c31b6 100644 --- a/resources/quality/creality/base/base_0.4_ABS_super.inst.cfg +++ b/resources/quality/creality/base/base_0.4_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/creality/base/base_0.4_PETG_adaptive.inst.cfg b/resources/quality/creality/base/base_0.4_PETG_adaptive.inst.cfg index c4f12bd736..b4747f6f13 100644 --- a/resources/quality/creality/base/base_0.4_PETG_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PETG_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_petg diff --git a/resources/quality/creality/base/base_0.4_PETG_low.inst.cfg b/resources/quality/creality/base/base_0.4_PETG_low.inst.cfg index acee177f9a..0031a6483d 100644 --- a/resources/quality/creality/base/base_0.4_PETG_low.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/creality/base/base_0.4_PETG_standard.inst.cfg b/resources/quality/creality/base/base_0.4_PETG_standard.inst.cfg index f5e725727b..8e7b3d409f 100644 --- a/resources/quality/creality/base/base_0.4_PETG_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PETG_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_petg diff --git a/resources/quality/creality/base/base_0.4_PETG_super.inst.cfg b/resources/quality/creality/base/base_0.4_PETG_super.inst.cfg index a96c4ea555..141573113e 100644 --- a/resources/quality/creality/base/base_0.4_PETG_super.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/creality/base/base_0.4_PLA_adaptive.inst.cfg b/resources/quality/creality/base/base_0.4_PLA_adaptive.inst.cfg index 0ae1a908b3..5e3d29d6a4 100644 --- a/resources/quality/creality/base/base_0.4_PLA_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PLA_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_pla diff --git a/resources/quality/creality/base/base_0.4_PLA_low.inst.cfg b/resources/quality/creality/base/base_0.4_PLA_low.inst.cfg index ae4f002c59..60366ea96e 100644 --- a/resources/quality/creality/base/base_0.4_PLA_low.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/creality/base/base_0.4_PLA_standard.inst.cfg b/resources/quality/creality/base/base_0.4_PLA_standard.inst.cfg index 42ece47b1b..59ac002dda 100644 --- a/resources/quality/creality/base/base_0.4_PLA_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PLA_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_pla diff --git a/resources/quality/creality/base/base_0.4_PLA_super.inst.cfg b/resources/quality/creality/base/base_0.4_PLA_super.inst.cfg index 4755c4a53e..a12e39fd0a 100644 --- a/resources/quality/creality/base/base_0.4_PLA_super.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/creality/base/base_0.4_TPU_adaptive.inst.cfg b/resources/quality/creality/base/base_0.4_TPU_adaptive.inst.cfg index d74e5936e6..96a8514f3a 100644 --- a/resources/quality/creality/base/base_0.4_TPU_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.4_TPU_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_tpu diff --git a/resources/quality/creality/base/base_0.4_TPU_standard.inst.cfg b/resources/quality/creality/base/base_0.4_TPU_standard.inst.cfg index 325694dda2..37d41cb5ff 100644 --- a/resources/quality/creality/base/base_0.4_TPU_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.4_TPU_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_tpu diff --git a/resources/quality/creality/base/base_0.4_TPU_super.inst.cfg b/resources/quality/creality/base/base_0.4_TPU_super.inst.cfg index d3c2faecb2..ab3662a9fb 100644 --- a/resources/quality/creality/base/base_0.4_TPU_super.inst.cfg +++ b/resources/quality/creality/base/base_0.4_TPU_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_tpu diff --git a/resources/quality/creality/base/base_0.5_ABS_adaptive.inst.cfg b/resources/quality/creality/base/base_0.5_ABS_adaptive.inst.cfg index 9c9cc2d31e..c680a25052 100644 --- a/resources/quality/creality/base/base_0.5_ABS_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.5_ABS_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_abs diff --git a/resources/quality/creality/base/base_0.5_ABS_low.inst.cfg b/resources/quality/creality/base/base_0.5_ABS_low.inst.cfg index 5b10ef184c..07a85c2930 100644 --- a/resources/quality/creality/base/base_0.5_ABS_low.inst.cfg +++ b/resources/quality/creality/base/base_0.5_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/creality/base/base_0.5_ABS_standard.inst.cfg b/resources/quality/creality/base/base_0.5_ABS_standard.inst.cfg index 1dca1a24a6..d68beddd80 100644 --- a/resources/quality/creality/base/base_0.5_ABS_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.5_ABS_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_abs diff --git a/resources/quality/creality/base/base_0.5_ABS_super.inst.cfg b/resources/quality/creality/base/base_0.5_ABS_super.inst.cfg index c2833aa16d..06096567fb 100644 --- a/resources/quality/creality/base/base_0.5_ABS_super.inst.cfg +++ b/resources/quality/creality/base/base_0.5_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/creality/base/base_0.5_PETG_adaptive.inst.cfg b/resources/quality/creality/base/base_0.5_PETG_adaptive.inst.cfg index f250a664b8..e0fd92af6f 100644 --- a/resources/quality/creality/base/base_0.5_PETG_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PETG_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_petg diff --git a/resources/quality/creality/base/base_0.5_PETG_low.inst.cfg b/resources/quality/creality/base/base_0.5_PETG_low.inst.cfg index 19bc643bac..495a61808f 100644 --- a/resources/quality/creality/base/base_0.5_PETG_low.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/creality/base/base_0.5_PETG_standard.inst.cfg b/resources/quality/creality/base/base_0.5_PETG_standard.inst.cfg index 88927ab85b..8fb6155b8d 100644 --- a/resources/quality/creality/base/base_0.5_PETG_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PETG_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_petg diff --git a/resources/quality/creality/base/base_0.5_PETG_super.inst.cfg b/resources/quality/creality/base/base_0.5_PETG_super.inst.cfg index 7790838640..e8913e0f27 100644 --- a/resources/quality/creality/base/base_0.5_PETG_super.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/creality/base/base_0.5_PLA_adaptive.inst.cfg b/resources/quality/creality/base/base_0.5_PLA_adaptive.inst.cfg index 2cd8081c9f..cc3823e583 100644 --- a/resources/quality/creality/base/base_0.5_PLA_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PLA_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_pla diff --git a/resources/quality/creality/base/base_0.5_PLA_low.inst.cfg b/resources/quality/creality/base/base_0.5_PLA_low.inst.cfg index b0cea0ede8..a9105fadf0 100644 --- a/resources/quality/creality/base/base_0.5_PLA_low.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/creality/base/base_0.5_PLA_standard.inst.cfg b/resources/quality/creality/base/base_0.5_PLA_standard.inst.cfg index c2c1714fb8..1d429d8079 100644 --- a/resources/quality/creality/base/base_0.5_PLA_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PLA_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_pla diff --git a/resources/quality/creality/base/base_0.5_PLA_super.inst.cfg b/resources/quality/creality/base/base_0.5_PLA_super.inst.cfg index e55a0024ae..9fd760540a 100644 --- a/resources/quality/creality/base/base_0.5_PLA_super.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/creality/base/base_0.5_TPU_adaptive.inst.cfg b/resources/quality/creality/base/base_0.5_TPU_adaptive.inst.cfg index 33d181f2f5..2d032723d6 100644 --- a/resources/quality/creality/base/base_0.5_TPU_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.5_TPU_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_tpu diff --git a/resources/quality/creality/base/base_0.5_TPU_standard.inst.cfg b/resources/quality/creality/base/base_0.5_TPU_standard.inst.cfg index 95a8ab945d..b8642e3c78 100644 --- a/resources/quality/creality/base/base_0.5_TPU_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.5_TPU_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_tpu diff --git a/resources/quality/creality/base/base_0.5_TPU_super.inst.cfg b/resources/quality/creality/base/base_0.5_TPU_super.inst.cfg index 51610063d2..459551d734 100644 --- a/resources/quality/creality/base/base_0.5_TPU_super.inst.cfg +++ b/resources/quality/creality/base/base_0.5_TPU_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_tpu diff --git a/resources/quality/creality/base/base_0.6_ABS_standard.inst.cfg b/resources/quality/creality/base/base_0.6_ABS_standard.inst.cfg index 26eadd44ff..3e9a5bd3a6 100644 --- a/resources/quality/creality/base/base_0.6_ABS_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.6_ABS_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_abs diff --git a/resources/quality/creality/base/base_0.6_PETG_standard.inst.cfg b/resources/quality/creality/base/base_0.6_PETG_standard.inst.cfg index a7da39339b..7d9e4402bb 100644 --- a/resources/quality/creality/base/base_0.6_PETG_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.6_PETG_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_petg diff --git a/resources/quality/creality/base/base_0.6_PLA_draft.inst.cfg b/resources/quality/creality/base/base_0.6_PLA_draft.inst.cfg index a0824a6f29..aca985457c 100644 --- a/resources/quality/creality/base/base_0.6_PLA_draft.inst.cfg +++ b/resources/quality/creality/base/base_0.6_PLA_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_pla diff --git a/resources/quality/creality/base/base_0.6_PLA_low.inst.cfg b/resources/quality/creality/base/base_0.6_PLA_low.inst.cfg index e4669ee2bd..4396d68aa3 100644 --- a/resources/quality/creality/base/base_0.6_PLA_low.inst.cfg +++ b/resources/quality/creality/base/base_0.6_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/creality/base/base_0.6_PLA_standard.inst.cfg b/resources/quality/creality/base/base_0.6_PLA_standard.inst.cfg index a47e4b2253..690b91ea67 100644 --- a/resources/quality/creality/base/base_0.6_PLA_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.6_PLA_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_pla diff --git a/resources/quality/creality/base/base_0.6_TPU_standard.inst.cfg b/resources/quality/creality/base/base_0.6_TPU_standard.inst.cfg index ee6bcc7fd7..f4d1e80606 100644 --- a/resources/quality/creality/base/base_0.6_TPU_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.6_TPU_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_tpu diff --git a/resources/quality/creality/base/base_0.8_ABS_draft.inst.cfg b/resources/quality/creality/base/base_0.8_ABS_draft.inst.cfg index 590addae42..13281831b1 100644 --- a/resources/quality/creality/base/base_0.8_ABS_draft.inst.cfg +++ b/resources/quality/creality/base/base_0.8_ABS_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_abs diff --git a/resources/quality/creality/base/base_0.8_PETG_draft.inst.cfg b/resources/quality/creality/base/base_0.8_PETG_draft.inst.cfg index c088686f2a..be4e7ee29c 100644 --- a/resources/quality/creality/base/base_0.8_PETG_draft.inst.cfg +++ b/resources/quality/creality/base/base_0.8_PETG_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_petg diff --git a/resources/quality/creality/base/base_0.8_PLA_draft.inst.cfg b/resources/quality/creality/base/base_0.8_PLA_draft.inst.cfg index f7ab4beffb..bdbdd83d4d 100644 --- a/resources/quality/creality/base/base_0.8_PLA_draft.inst.cfg +++ b/resources/quality/creality/base/base_0.8_PLA_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_pla diff --git a/resources/quality/creality/base/base_0.8_TPU_draft.inst.cfg b/resources/quality/creality/base/base_0.8_TPU_draft.inst.cfg index 0708ece771..90f1bb75e2 100644 --- a/resources/quality/creality/base/base_0.8_TPU_draft.inst.cfg +++ b/resources/quality/creality/base/base_0.8_TPU_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_tpu diff --git a/resources/quality/creality/base/base_1.0_ABS_draft.inst.cfg b/resources/quality/creality/base/base_1.0_ABS_draft.inst.cfg index 0abdae2b56..be29e649f1 100644 --- a/resources/quality/creality/base/base_1.0_ABS_draft.inst.cfg +++ b/resources/quality/creality/base/base_1.0_ABS_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_abs diff --git a/resources/quality/creality/base/base_1.0_PETG_draft.inst.cfg b/resources/quality/creality/base/base_1.0_PETG_draft.inst.cfg index 3d89d56089..2389e000cc 100644 --- a/resources/quality/creality/base/base_1.0_PETG_draft.inst.cfg +++ b/resources/quality/creality/base/base_1.0_PETG_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_petg diff --git a/resources/quality/creality/base/base_1.0_PLA_draft.inst.cfg b/resources/quality/creality/base/base_1.0_PLA_draft.inst.cfg index 1556da650a..6986b2ac42 100644 --- a/resources/quality/creality/base/base_1.0_PLA_draft.inst.cfg +++ b/resources/quality/creality/base/base_1.0_PLA_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_pla diff --git a/resources/quality/creality/base/base_1.0_TPU_draft.inst.cfg b/resources/quality/creality/base/base_1.0_TPU_draft.inst.cfg index 878e1eed09..a74ff7aef8 100644 --- a/resources/quality/creality/base/base_1.0_TPU_draft.inst.cfg +++ b/resources/quality/creality/base/base_1.0_TPU_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_tpu diff --git a/resources/quality/creality/base/base_global_adaptive.inst.cfg b/resources/quality/creality/base/base_global_adaptive.inst.cfg index d318eeefd7..9e60d610b0 100644 --- a/resources/quality/creality/base/base_global_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_global_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive weight = -2 diff --git a/resources/quality/creality/base/base_global_draft.inst.cfg b/resources/quality/creality/base/base_global_draft.inst.cfg index 208bf02734..a0e0b7d87e 100644 --- a/resources/quality/creality/base/base_global_draft.inst.cfg +++ b/resources/quality/creality/base/base_global_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -5 diff --git a/resources/quality/creality/base/base_global_low.inst.cfg b/resources/quality/creality/base/base_global_low.inst.cfg index 5e465841c8..ff50c3a86c 100644 --- a/resources/quality/creality/base/base_global_low.inst.cfg +++ b/resources/quality/creality/base/base_global_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low weight = -4 diff --git a/resources/quality/creality/base/base_global_standard.inst.cfg b/resources/quality/creality/base/base_global_standard.inst.cfg index eb4a595e28..923fe9b839 100644 --- a/resources/quality/creality/base/base_global_standard.inst.cfg +++ b/resources/quality/creality/base/base_global_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard weight = -3 diff --git a/resources/quality/creality/base/base_global_super.inst.cfg b/resources/quality/creality/base/base_global_super.inst.cfg index 375f3a0dbe..aa84e090c1 100644 --- a/resources/quality/creality/base/base_global_super.inst.cfg +++ b/resources/quality/creality/base/base_global_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super weight = -1 diff --git a/resources/quality/creality/base/base_global_ultra.inst.cfg b/resources/quality/creality/base/base_global_ultra.inst.cfg index 3930319af0..d53ccb7726 100644 --- a/resources/quality/creality/base/base_global_ultra.inst.cfg +++ b/resources/quality/creality/base/base_global_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra weight = 0 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fast.inst.cfg index e47f2c729e..e0b0210370 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_discoeasy200_bicolor [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fine.inst.cfg index c5841ce5f5..e46ef1250a 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = dagoma_discoeasy200_bicolor [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_standard.inst.cfg index 4cd6a1a259..785ee88ab9 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = dagoma_discoeasy200_bicolor [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg index 283b8ac4c5..0f7f6d0bf6 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_discoeasy200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg index 3e15f1f17b..34f9e59188 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = dagoma_discoeasy200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg index a03a55e3ed..5082462909 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = dagoma_discoeasy200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fast.inst.cfg index 71fef2f88d..5dc74c357e 100644 --- a/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_discoultimate_bicolor [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fine.inst.cfg index 3784c5bd0f..8e00dd06ba 100644 --- a/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = dagoma_discoultimate_bicolor [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_standard.inst.cfg index 1067f34c37..3018b7c4a0 100644 --- a/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = dagoma_discoultimate_bicolor [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/dagoma/dagoma_discoultimate_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_pla_fast.inst.cfg index 7e9cc106a6..3f9e25d549 100644 --- a/resources/quality/dagoma/dagoma_discoultimate_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoultimate_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_discoultimate [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_discoultimate_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_pla_fine.inst.cfg index 2cd23feb79..3afd133fa2 100644 --- a/resources/quality/dagoma/dagoma_discoultimate_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoultimate_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = dagoma_discoultimate [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/dagoma/dagoma_discoultimate_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_pla_standard.inst.cfg index 3678739a25..ce0f7df158 100644 --- a/resources/quality/dagoma/dagoma_discoultimate_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoultimate_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = dagoma_discoultimate [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg index 9c43fbd1ba..4023a6f69d 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_magis [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg index 66ae4af541..b0358ed765 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = dagoma_magis [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg index 4911642b43..210c8bb00f 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = dagoma_magis [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg index 3e26611a65..3e2237a545 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_neva [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg index de4880f3cf..80f1f1f0b8 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = dagoma_neva [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg index 726506b171..58d6fdad81 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard definition = dagoma_neva [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_A.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_A.inst.cfg old mode 100755 new mode 100644 index 087bb80ca5..a6df2cfb2d --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_A.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_A.inst.cfg @@ -4,14 +4,14 @@ name = A definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = a +quality_type = D005 material = generic_abs variant = DBE 0.25mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 0.5 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_B.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_B.inst.cfg old mode 100755 new mode 100644 index c80cc10585..e302068c61 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_B.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_B.inst.cfg @@ -4,14 +4,14 @@ name = B definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = b +quality_type = D010 material = generic_abs variant = DBE 0.25mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 0.5 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_C.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_C.inst.cfg old mode 100755 new mode 100644 index 6c9980688e..24501a5b18 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_C.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_C.inst.cfg @@ -4,14 +4,14 @@ name = C definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = c +quality_type = D015 material = generic_abs variant = DBE 0.25mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 0.5 cool_fan_speed = 50 cool_fan_speed_max = 50 @@ -19,4 +19,4 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 32 \ No newline at end of file +speed_print = 32 diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_A.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_A.inst.cfg old mode 100755 new mode 100644 index 7426459df6..18657e2d68 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_A.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_A.inst.cfg @@ -4,14 +4,14 @@ name = A definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = a +quality_type = D005 material = generic_abs variant = DBE 0.40mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_B.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_B.inst.cfg old mode 100755 new mode 100644 index dedcb45937..047bf4e214 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_B.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_B.inst.cfg @@ -4,14 +4,14 @@ name = B definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = b +quality_type = D010 material = generic_abs variant = DBE 0.40mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_C.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_C.inst.cfg old mode 100755 new mode 100644 index 1cab0b1394..f95d0665e7 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_C.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_C.inst.cfg @@ -4,14 +4,14 @@ name = C definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = c +quality_type = D015 material = generic_abs variant = DBE 0.40mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_D.inst.cfg old mode 100755 new mode 100644 index 9d961a2020..187f473be0 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_D.inst.cfg @@ -4,18 +4,18 @@ name = D definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = d +quality_type = D020 material = generic_abs -variant = FBE 0.40mm +variant = DBE 0.40mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_E.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_E.inst.cfg old mode 100755 new mode 100644 index a628377548..22664723de --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_E.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_E.inst.cfg @@ -4,14 +4,14 @@ name = E definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = e +quality_type = D030 material = generic_abs variant = DBE 0.40mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_C.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_C.inst.cfg old mode 100755 new mode 100644 index ebd2583f50..4f47162832 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_C.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_C.inst.cfg @@ -4,14 +4,14 @@ name = C definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = c +quality_type = D015 material = generic_abs variant = DBE 0.60mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_D.inst.cfg old mode 100755 new mode 100644 index d256fa46c7..a9d5e5868d --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_D.inst.cfg @@ -4,18 +4,18 @@ name = D definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = d +quality_type = D020 material = generic_abs -variant = FBE 0.60mm +variant = DBE 0.60mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_E.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_E.inst.cfg old mode 100755 new mode 100644 index d5cd1266ba..32a5aca0c5 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_E.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_E.inst.cfg @@ -4,14 +4,14 @@ name = E definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = e +quality_type = D030 material = generic_abs variant = DBE 0.60mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_F.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_F.inst.cfg old mode 100755 new mode 100644 index 8f4bc16b5f..f01607e392 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_F.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_F.inst.cfg @@ -1,17 +1,17 @@ [general] version = 4 -name = A +name = F definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = f +quality_type = D045 material = generic_abs variant = DBE 0.60mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 @@ -19,4 +19,4 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 45 \ No newline at end of file +speed_print = 45 diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_A.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_A.inst.cfg old mode 100755 new mode 100644 index de6cfb88a6..397fb8bd40 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_A.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_A.inst.cfg @@ -4,14 +4,14 @@ name = A definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = a +quality_type = D005 material = generic_abs variant = FBE 0.25mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 0.5 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_B.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_B.inst.cfg old mode 100755 new mode 100644 index 484b5a46df..bc54750afe --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_B.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_B.inst.cfg @@ -4,14 +4,14 @@ name = B definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = b +quality_type = D010 material = generic_abs variant = FBE 0.25mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 0.5 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_C.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_C.inst.cfg old mode 100755 new mode 100644 index ed2e3ef5fd..99f22240a4 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_C.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_C.inst.cfg @@ -4,14 +4,14 @@ name = C definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = c +quality_type = D015 material = generic_abs variant = FBE 0.25mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 0.5 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_A.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_A.inst.cfg old mode 100755 new mode 100644 index 60009a8305..45b878ca4d --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_A.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_A.inst.cfg @@ -4,14 +4,14 @@ name = A definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = a +quality_type = D005 material = generic_abs variant = FBE 0.40mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_B.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_B.inst.cfg old mode 100755 new mode 100644 index 0742a58c27..e1756b2497 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_B.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_B.inst.cfg @@ -4,14 +4,14 @@ name = B definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = b +quality_type = D010 material = generic_abs variant = FBE 0.40mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_C.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_C.inst.cfg old mode 100755 new mode 100644 index 84a84f3294..a9dbdfab95 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_C.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_C.inst.cfg @@ -4,14 +4,14 @@ name = C definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = c +quality_type = D015 material = generic_abs variant = FBE 0.40mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_D.inst.cfg old mode 100755 new mode 100644 index 9d961a2020..0338836562 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_D.inst.cfg @@ -4,14 +4,14 @@ name = D definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = d +quality_type = D020 material = generic_abs variant = FBE 0.40mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_E.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_E.inst.cfg old mode 100755 new mode 100644 index 0611db92f9..32c7882596 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_E.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_E.inst.cfg @@ -4,14 +4,14 @@ name = E definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = e +quality_type = D030 material = generic_abs variant = FBE 0.40mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_C.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_C.inst.cfg old mode 100755 new mode 100644 index 82fa6d824d..f8251d260c --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_C.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_C.inst.cfg @@ -4,14 +4,14 @@ name = C definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = c +quality_type = D015 material = generic_abs variant = FBE 0.60mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_D.inst.cfg old mode 100755 new mode 100644 index d256fa46c7..63098f5397 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_D.inst.cfg @@ -4,14 +4,14 @@ name = D definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = d +quality_type = D020 material = generic_abs variant = FBE 0.60mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_E.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_E.inst.cfg old mode 100755 new mode 100644 index 7a28aadb23..a9abfa6001 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_E.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_E.inst.cfg @@ -4,14 +4,14 @@ name = E definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = e +quality_type = D030 material = generic_abs variant = FBE 0.60mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_F.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_F.inst.cfg old mode 100755 new mode 100644 index 7fccd59280..175b133b3b --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_F.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_F.inst.cfg @@ -1,17 +1,17 @@ [general] version = 4 -name = A +name = F definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = f +quality_type = D045 material = generic_abs variant = FBE 0.60mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 @@ -19,4 +19,4 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 45 \ No newline at end of file +speed_print = 45 diff --git a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_D.inst.cfg old mode 100755 new mode 100644 index e267c20de4..6ed527311e --- a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_D.inst.cfg @@ -4,14 +4,14 @@ name = D definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = d +quality_type = D020 material = generic_abs -variant = V-FBE 0.80mm +variant = V-DBE 0.80mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 @@ -19,4 +19,4 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 150 \ No newline at end of file +speed_print = 150 diff --git a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_E.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_E.inst.cfg old mode 100755 new mode 100644 index b2f4e19f96..e657ead88d --- a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_E.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_E.inst.cfg @@ -4,14 +4,14 @@ name = E definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = e +quality_type = D030 material = generic_abs variant = V-DBE 0.80mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_F.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_F.inst.cfg old mode 100755 new mode 100644 index 32617279ac..c0ebe870b0 --- a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_F.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_F.inst.cfg @@ -1,17 +1,17 @@ [general] version = 4 -name = A +name = F definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = f +quality_type = D045 material = generic_abs variant = V-DBE 0.80mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 @@ -19,4 +19,4 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 75 \ No newline at end of file +speed_print = 75 diff --git a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_G.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_G.inst.cfg old mode 100755 new mode 100644 index 84695a0726..4aa5e29071 --- a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_G.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_G.inst.cfg @@ -1,17 +1,17 @@ [general] version = 4 -name = C +name = G definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = c +quality_type = D060 material = generic_abs variant = V-DBE 0.80mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 @@ -19,4 +19,4 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 55 \ No newline at end of file +speed_print = 55 diff --git a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_D.inst.cfg old mode 100755 new mode 100644 index e267c20de4..0aadf93657 --- a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_D.inst.cfg @@ -4,14 +4,14 @@ name = D definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = d +quality_type = D020 material = generic_abs variant = V-FBE 0.80mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_E.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_E.inst.cfg old mode 100755 new mode 100644 index f437ebb490..20643f1b72 --- a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_E.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_E.inst.cfg @@ -4,14 +4,14 @@ name = E definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = e +quality_type = D030 material = generic_abs variant = V-FBE 0.80mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 diff --git a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_F.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_F.inst.cfg old mode 100755 new mode 100644 index 27a51c4836..8111d7a27c --- a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_F.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_F.inst.cfg @@ -1,17 +1,17 @@ [general] version = 4 -name = A +name = F definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = f +quality_type = D045 material = generic_abs variant = V-FBE 0.80mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 @@ -19,4 +19,4 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 75 \ No newline at end of file +speed_print = 75 diff --git a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_G.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_G.inst.cfg old mode 100755 new mode 100644 index 788665b03c..cc09c892e4 --- a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_G.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_G.inst.cfg @@ -1,17 +1,17 @@ [general] version = 4 -name = C +name = G definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = g +quality_type = D060 material = generic_abs variant = V-FBE 0.80mm [values] -adhesion_type = raft +adhesion_type = brim cool_fan_full_at_height = 1 cool_fan_speed = 50 cool_fan_speed_max = 50 @@ -19,4 +19,4 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 55 \ No newline at end of file +speed_print = 55 diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_A.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_A.inst.cfg index 38b03c2f07..fbd1d9e769 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_A.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_A.inst.cfg @@ -4,14 +4,15 @@ name = A definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = a +quality_type = D005 material = generic_petg variant = DBE 0.40mm [values] -adhesion_type = skirt +material_print_temperature = 225 +layer_height_0 = 0.2 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 @@ -20,11 +21,16 @@ speed_print = 50 speed_infill = =speed_print speed_wall_0 = =speed_print * 0.5 speed_roofing = =speed_print * 0.5 -default_material_print_temperature = 235 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 +material_flow = 95 +infill_enable_travel_optimization = True initial_layer_line_width_factor = 120 -retraction_speed = 40 +retraction_amount = 5 coasting_enable = True coasting_volume = 0.256 +coasting_min_volume = 3 +coasting_speed = 70 +travel_avoid_other_parts = False retraction_combing_max_distance = 5 +support_z_distance = =layer_height * 2 \ No newline at end of file diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_B.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_B.inst.cfg index c9178c9a24..aaba6c643f 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_B.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_B.inst.cfg @@ -4,14 +4,15 @@ name = B definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = b +quality_type = D010 material = generic_petg variant = DBE 0.40mm [values] -adhesion_type = skirt +material_print_temperature = 225 +layer_height_0 = 0.2 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 @@ -20,11 +21,16 @@ speed_print = 50 speed_infill = =speed_print speed_wall_0 = =speed_print * 0.5 speed_roofing = =speed_print * 0.5 -default_material_print_temperature = 235 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 +material_flow = 95 +infill_enable_travel_optimization = True initial_layer_line_width_factor = 120 -retraction_speed = 40 +retraction_amount = 5 coasting_enable = True coasting_volume = 0.256 +coasting_min_volume = 3 +coasting_speed = 70 +travel_avoid_other_parts = False retraction_combing_max_distance = 5 +support_z_distance = =layer_height * 2 diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_C.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_C.inst.cfg index 2c22f3190b..ac895ae3ad 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_C.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_C.inst.cfg @@ -4,14 +4,15 @@ name = C definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = c +quality_type = D015 material = generic_petg variant = DBE 0.40mm [values] -adhesion_type = skirt +material_print_temperature = 225 +layer_height_0 = 0.2 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 @@ -20,11 +21,16 @@ speed_print = 50 speed_infill = =speed_print speed_wall_0 = =speed_print * 0.5 speed_roofing = =speed_print * 0.5 -default_material_print_temperature = 235 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 +material_flow = 95 +infill_enable_travel_optimization = True initial_layer_line_width_factor = 120 -retraction_speed = 40 +retraction_amount = 5 coasting_enable = True coasting_volume = 0.256 +coasting_min_volume = 3 +coasting_speed = 70 +travel_avoid_other_parts = False retraction_combing_max_distance = 5 +support_z_distance = =layer_height * 2 \ No newline at end of file diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_D.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_D.inst.cfg index 823df00100..7b95e53f1c 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_D.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_D.inst.cfg @@ -4,14 +4,14 @@ name = D definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = d +quality_type = D020 material = generic_petg variant = DBE 0.40mm [values] -adhesion_type = skirt +material_print_temperature = 225 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 @@ -20,11 +20,15 @@ speed_print = 50 speed_infill = =speed_print speed_wall_0 = =speed_print * 0.5 speed_roofing = =speed_print * 0.5 -default_material_print_temperature = 235 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 +material_flow = 95 +infill_enable_travel_optimization = True initial_layer_line_width_factor = 120 -retraction_speed = 40 +retraction_amount = 5 coasting_enable = True coasting_volume = 0.256 -retraction_combing_max_distance = 5 +coasting_min_volume = 3 +coasting_speed = 70 +travel_avoid_other_parts = False +retraction_combing_max_distance = 5 \ No newline at end of file diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_E.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_E.inst.cfg index e4ef2787b5..9fb13563d6 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_E.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_E.inst.cfg @@ -4,14 +4,14 @@ name = E definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = e +quality_type = D030 material = generic_petg variant = DBE 0.40mm [values] -adhesion_type = skirt +material_print_temperature = 225 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 @@ -20,11 +20,15 @@ speed_print = 50 speed_infill = =speed_print speed_wall_0 = =speed_print * 0.5 speed_roofing = =speed_print * 0.5 -default_material_print_temperature = 235 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 +material_flow = 95 +infill_enable_travel_optimization = True initial_layer_line_width_factor = 120 -retraction_speed = 40 +retraction_amount = 5 coasting_enable = True coasting_volume = 0.256 -retraction_combing_max_distance = 5 +coasting_min_volume = 3 +coasting_speed = 70 +travel_avoid_other_parts = False +retraction_combing_max_distance = 5 \ No newline at end of file diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_C.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_C.inst.cfg index c697e52272..dcf3944944 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_C.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_C.inst.cfg @@ -4,14 +4,14 @@ name = C definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = c +quality_type = D015 material = generic_petg variant = DBE 0.60mm [values] -adhesion_type = skirt +material_print_temperature = 225 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 @@ -20,11 +20,16 @@ speed_print = 50 speed_infill = =speed_print speed_wall_0 = =speed_print * 0.5 speed_roofing = =speed_print * 0.5 -default_material_print_temperature = 235 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 +material_flow = 95 +infill_enable_travel_optimization = True initial_layer_line_width_factor = 120 -retraction_speed = 40 +retraction_amount = 5 coasting_enable = True coasting_volume = 0.256 +coasting_min_volume = 3 +coasting_speed = 70 +travel_avoid_other_parts = False retraction_combing_max_distance = 5 +support_z_distance = =layer_height * 2 \ No newline at end of file diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_D.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_D.inst.cfg index 7212a7b741..531a3fa4b9 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_D.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_D.inst.cfg @@ -4,14 +4,14 @@ name = D definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = d +quality_type = D020 material = generic_petg variant = DBE 0.60mm [values] -adhesion_type = skirt +material_print_temperature = 225 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 @@ -20,11 +20,15 @@ speed_print = 50 speed_infill = =speed_print speed_wall_0 = =speed_print * 0.5 speed_roofing = =speed_print * 0.5 -default_material_print_temperature = 235 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 +material_flow = 95 +infill_enable_travel_optimization = True initial_layer_line_width_factor = 120 -retraction_speed = 40 +retraction_amount = 5 coasting_enable = True coasting_volume = 0.256 -retraction_combing_max_distance = 5 +coasting_min_volume = 3 +coasting_speed = 70 +travel_avoid_other_parts = False +retraction_combing_max_distance = 5 \ No newline at end of file diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_E.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_E.inst.cfg index 967c29b215..1b5e619c6c 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_E.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_E.inst.cfg @@ -4,14 +4,14 @@ name = E definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = e +quality_type = D030 material = generic_petg variant = DBE 0.60mm [values] -adhesion_type = skirt +material_print_temperature = 225 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 @@ -20,11 +20,15 @@ speed_print = 40 speed_infill = =speed_print speed_wall_0 = =speed_print * 0.7 speed_roofing = =speed_print * 0.7 -default_material_print_temperature = 235 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 +material_flow = 95 +infill_enable_travel_optimization = True initial_layer_line_width_factor = 120 -retraction_speed = 40 +retraction_amount = 5 coasting_enable = True coasting_volume = 0.256 -retraction_combing_max_distance = 5 +coasting_min_volume = 3 +coasting_speed = 70 +travel_avoid_other_parts = False +retraction_combing_max_distance = 5 \ No newline at end of file diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_F.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_F.inst.cfg index dcc153b950..c77ea365d8 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_F.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_F.inst.cfg @@ -4,14 +4,14 @@ name = F definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = f +quality_type = D045 material = generic_petg variant = DBE 0.60mm [values] -adhesion_type = skirt +material_print_temperature = 225 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 @@ -20,11 +20,15 @@ speed_print = 26 speed_infill = =speed_print speed_wall_0 = =speed_print speed_roofing = =speed_print -default_material_print_temperature = 235 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 +material_flow = 95 +infill_enable_travel_optimization = True initial_layer_line_width_factor = 120 -retraction_speed = 40 +retraction_amount = 5 coasting_enable = True coasting_volume = 0.256 -retraction_combing_max_distance = 5 +coasting_min_volume = 3 +coasting_speed = 70 +travel_avoid_other_parts = False +retraction_combing_max_distance = 5 \ No newline at end of file diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_A.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_A.inst.cfg index 14a92499a8..07d51583cd 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_A.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_A.inst.cfg @@ -4,14 +4,15 @@ name = A definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = a +quality_type = D005 material = generic_petg variant = FBE 0.40mm [values] -adhesion_type = skirt +material_print_temperature = 225 +layer_height_0 = 0.2 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 @@ -20,11 +21,16 @@ speed_print = 50 speed_infill = =speed_print speed_wall_0 = =speed_print * 0.5 speed_roofing = =speed_print * 0.5 -default_material_print_temperature = 235 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 +material_flow = 95 +infill_enable_travel_optimization = True initial_layer_line_width_factor = 120 -retraction_speed = 40 +retraction_amount = 5 coasting_enable = True coasting_volume = 0.256 +coasting_min_volume = 3 +coasting_speed = 70 +travel_avoid_other_parts = False retraction_combing_max_distance = 5 +support_z_distance = =layer_height * 2 \ No newline at end of file diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_B.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_B.inst.cfg index a3f5d5f132..f46c282016 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_B.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_B.inst.cfg @@ -4,14 +4,15 @@ name = B definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = b +quality_type = D010 material = generic_petg variant = FBE 0.40mm [values] -adhesion_type = skirt +material_print_temperature = 225 +layer_height_0 = 0.2 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 @@ -20,11 +21,16 @@ speed_print = 50 speed_infill = =speed_print speed_wall_0 = =speed_print * 0.5 speed_roofing = =speed_print * 0.5 -default_material_print_temperature = 235 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 +material_flow = 95 +infill_enable_travel_optimization = True initial_layer_line_width_factor = 120 -retraction_speed = 40 +retraction_amount = 5 coasting_enable = True coasting_volume = 0.256 +coasting_min_volume = 3 +coasting_speed = 70 +travel_avoid_other_parts = False retraction_combing_max_distance = 5 +support_z_distance = =layer_height * 2 \ No newline at end of file diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_C.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_C.inst.cfg index c59490c64d..c3214bb959 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_C.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_C.inst.cfg @@ -4,14 +4,15 @@ name = C definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = c +quality_type = D015 material = generic_petg variant = FBE 0.40mm [values] -adhesion_type = skirt +material_print_temperature = 225 +layer_height_0 = 0.2 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 @@ -20,11 +21,16 @@ speed_print = 50 speed_infill = =speed_print speed_wall_0 = =speed_print * 0.5 speed_roofing = =speed_print * 0.5 -default_material_print_temperature = 235 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 +material_flow = 95 +infill_enable_travel_optimization = True initial_layer_line_width_factor = 120 -retraction_speed = 40 +retraction_amount = 5 coasting_enable = True coasting_volume = 0.256 +coasting_min_volume = 3 +coasting_speed = 70 +travel_avoid_other_parts = False retraction_combing_max_distance = 5 +support_z_distance = =layer_height * 2 \ No newline at end of file diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_D.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_D.inst.cfg index d1b2a28cd9..551211982a 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_D.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_D.inst.cfg @@ -4,14 +4,14 @@ name = D definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = d +quality_type = D020 material = generic_petg variant = FBE 0.40mm [values] -adhesion_type = skirt +material_print_temperature = 225 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 @@ -20,11 +20,15 @@ speed_print = 50 speed_infill = =speed_print speed_wall_0 = =speed_print * 0.5 speed_roofing = =speed_print * 0.5 -default_material_print_temperature = 235 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 +material_flow = 95 +infill_enable_travel_optimization = True initial_layer_line_width_factor = 120 -retraction_speed = 40 +retraction_amount = 5 coasting_enable = True coasting_volume = 0.256 -retraction_combing_max_distance = 5 +coasting_min_volume = 3 +coasting_speed = 70 +travel_avoid_other_parts = False +retraction_combing_max_distance = 5 \ No newline at end of file diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_E.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_E.inst.cfg index 6eed5112d1..ab38930103 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_E.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_E.inst.cfg @@ -4,14 +4,14 @@ name = E definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = e +quality_type = D030 material = generic_petg variant = FBE 0.40mm [values] -adhesion_type = skirt +material_print_temperature = 225 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 @@ -20,11 +20,15 @@ speed_print = 50 speed_infill = =speed_print speed_wall_0 = =speed_print * 0.5 speed_roofing = =speed_print * 0.5 -default_material_print_temperature = 235 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 +material_flow = 95 +infill_enable_travel_optimization = True initial_layer_line_width_factor = 120 -retraction_speed = 40 +retraction_amount = 5 coasting_enable = True coasting_volume = 0.256 -retraction_combing_max_distance = 5 +coasting_min_volume = 3 +coasting_speed = 70 +travel_avoid_other_parts = False +retraction_combing_max_distance = 5 \ No newline at end of file diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_C.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_C.inst.cfg index 7252acb534..d3a1f05991 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_C.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_C.inst.cfg @@ -4,14 +4,14 @@ name = C definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = c +quality_type = D015 material = generic_petg variant = FBE 0.60mm [values] -adhesion_type = skirt +material_print_temperature = 225 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 @@ -20,11 +20,16 @@ speed_print = 50 speed_infill = =speed_print speed_wall_0 = =speed_print * 0.5 speed_roofing = =speed_print * 0.5 -default_material_print_temperature = 235 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 +material_flow = 95 +infill_enable_travel_optimization = True initial_layer_line_width_factor = 120 -retraction_speed = 40 +retraction_amount = 5 coasting_enable = True coasting_volume = 0.256 +coasting_min_volume = 3 +coasting_speed = 70 +travel_avoid_other_parts = False retraction_combing_max_distance = 5 +support_z_distance = =layer_height * 2 \ No newline at end of file diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_D.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_D.inst.cfg index 98616359a1..973197de38 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_D.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_D.inst.cfg @@ -4,14 +4,14 @@ name = D definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = d +quality_type = D020 material = generic_petg variant = FBE 0.60mm [values] -adhesion_type = skirt +material_print_temperature = 225 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 @@ -20,11 +20,15 @@ speed_print = 50 speed_infill = =speed_print speed_wall_0 = =speed_print * 0.5 speed_roofing = =speed_print * 0.5 -default_material_print_temperature = 235 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 +material_flow = 95 +infill_enable_travel_optimization = True initial_layer_line_width_factor = 120 -retraction_speed = 40 +retraction_amount = 5 coasting_enable = True coasting_volume = 0.256 -retraction_combing_max_distance = 5 +coasting_min_volume = 3 +coasting_speed = 70 +travel_avoid_other_parts = False +retraction_combing_max_distance = 5 \ No newline at end of file diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_E.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_E.inst.cfg index 1250b615fb..ef31b88136 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_E.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_E.inst.cfg @@ -4,14 +4,14 @@ name = E definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = e +quality_type = D030 material = generic_petg variant = FBE 0.60mm [values] -adhesion_type = skirt +material_print_temperature = 225 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 @@ -20,11 +20,15 @@ speed_print = 40 speed_infill = =speed_print speed_wall_0 = =speed_print * 0.7 speed_roofing = =speed_print * 0.7 -default_material_print_temperature = 235 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 +material_flow = 95 +infill_enable_travel_optimization = True initial_layer_line_width_factor = 120 -retraction_speed = 40 +retraction_amount = 5 coasting_enable = True coasting_volume = 0.256 -retraction_combing_max_distance = 5 +coasting_min_volume = 3 +coasting_speed = 70 +travel_avoid_other_parts = False +retraction_combing_max_distance = 5 \ No newline at end of file diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_F.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_F.inst.cfg index 81819ea206..4be5164b20 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_F.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_F.inst.cfg @@ -4,14 +4,14 @@ name = F definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = f +quality_type = D045 material = generic_petg variant = FBE 0.60mm [values] -adhesion_type = skirt +material_print_temperature = 225 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 @@ -20,11 +20,15 @@ speed_print = 26 speed_infill = =speed_print speed_wall_0 = =speed_print speed_roofing = =speed_print -default_material_print_temperature = 235 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 +material_flow = 95 +infill_enable_travel_optimization = True initial_layer_line_width_factor = 120 -retraction_speed = 40 +retraction_amount = 5 coasting_enable = True coasting_volume = 0.256 +coasting_min_volume = 3 +coasting_speed = 70 +travel_avoid_other_parts = False retraction_combing_max_distance = 5 diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_A.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_A.inst.cfg old mode 100755 new mode 100644 index 5015fe0769..aeee56f726 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_A.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_A.inst.cfg @@ -4,15 +4,15 @@ name = A definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = a +quality_type = D005 material = generic_pla -variant = DBE 0.40mm +variant = DBE 0.25mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_fan_speed_min = 100 \ No newline at end of file +cool_fan_speed_min = 100 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_B.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_B.inst.cfg old mode 100755 new mode 100644 index 471f6cbf91..1511ad794e --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_B.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_B.inst.cfg @@ -4,16 +4,16 @@ name = B definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = b +quality_type = D010 material = generic_pla -variant = DBE 0.40mm +variant = DBE 0.25mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -speed_print = 55 \ No newline at end of file +speed_print = 55 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_C.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_C.inst.cfg old mode 100755 new mode 100644 index 4c35f61394..264301b90d --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_C.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_C.inst.cfg @@ -4,16 +4,16 @@ name = C definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = c +quality_type = D015 material = generic_pla -variant = DBE 0.40mm +variant = DBE 0.25mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -speed_print = 32 \ No newline at end of file +speed_print = 32 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_A.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_A.inst.cfg old mode 100755 new mode 100644 index 5015fe0769..557aeff095 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_A.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_A.inst.cfg @@ -4,15 +4,15 @@ name = A definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = a +quality_type = D005 material = generic_pla variant = DBE 0.40mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_fan_speed_min = 100 \ No newline at end of file +cool_fan_speed_min = 100 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_B.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_B.inst.cfg old mode 100755 new mode 100644 index 40f8d89278..ddb83e5028 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_B.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_B.inst.cfg @@ -4,15 +4,15 @@ name = B definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = b +quality_type = D010 material = generic_pla variant = DBE 0.40mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_fan_speed_min = 100 \ No newline at end of file +cool_fan_speed_min = 100 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_C.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_C.inst.cfg old mode 100755 new mode 100644 index 2633726b01..cc2a96a02d --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_C.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_C.inst.cfg @@ -4,15 +4,15 @@ name = C definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = c +quality_type = D015 material = generic_pla variant = DBE 0.40mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_fan_speed_min = 100 \ No newline at end of file +cool_fan_speed_min = 100 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_D.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_D.inst.cfg old mode 100755 new mode 100644 index 457f84f37f..8956d46aab --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_D.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_D.inst.cfg @@ -4,15 +4,15 @@ name = D definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = d +quality_type = D020 material = generic_pla variant = DBE 0.40mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_fan_speed_min = 100 \ No newline at end of file +cool_fan_speed_min = 100 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_E.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_E.inst.cfg old mode 100755 new mode 100644 index 7f78e16e0a..e9689700e9 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_E.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_E.inst.cfg @@ -4,15 +4,15 @@ name = E definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = e +quality_type = D030 material = generic_pla variant = DBE 0.40mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_fan_speed_min = 100 \ No newline at end of file +cool_fan_speed_min = 100 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_C.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_C.inst.cfg old mode 100755 new mode 100644 index 99abeba209..547c257f25 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_C.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_C.inst.cfg @@ -4,15 +4,15 @@ name = C definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = c +quality_type = D015 material = generic_pla variant = DBE 0.60mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_fan_speed_min = 100 \ No newline at end of file +cool_fan_speed_min = 100 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_D.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_D.inst.cfg old mode 100755 new mode 100644 index 65fd630285..69175a8a7b --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_D.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_D.inst.cfg @@ -4,15 +4,15 @@ name = D definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = d +quality_type = D020 material = generic_pla variant = DBE 0.60mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_fan_speed_min = 100 \ No newline at end of file +cool_fan_speed_min = 100 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_E.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_E.inst.cfg old mode 100755 new mode 100644 index d4bccf1206..ea0d4f8da6 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_E.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_E.inst.cfg @@ -4,16 +4,16 @@ name = E definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = e +quality_type = D030 material = generic_pla variant = DBE 0.60mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -speed_print = 65 \ No newline at end of file +speed_print = 65 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_F.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_F.inst.cfg old mode 100755 new mode 100644 index 0531b0b861..c296b33d45 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_F.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_F.inst.cfg @@ -4,16 +4,16 @@ name = F definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = f +quality_type = D045 material = generic_pla variant = DBE 0.60mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -speed_print = 45 \ No newline at end of file +speed_print = 45 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_A.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_A.inst.cfg old mode 100755 new mode 100644 index 3f5a1920e9..fb06a062e7 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_A.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_A.inst.cfg @@ -4,15 +4,15 @@ name = A definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = a +quality_type = D005 material = generic_pla -variant = FBE 0.40mm +variant = FBE 0.25mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_fan_speed_min = 100 \ No newline at end of file +cool_fan_speed_min = 100 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_B.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_B.inst.cfg old mode 100755 new mode 100644 index 713ed18167..d421347baf --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_B.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_B.inst.cfg @@ -4,16 +4,16 @@ name = B definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = b +quality_type = D010 material = generic_pla -variant = FBE 0.40mm +variant = FBE 0.25mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -speed_print = 55 \ No newline at end of file +speed_print = 55 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_C.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_C.inst.cfg old mode 100755 new mode 100644 index e7222c80fb..8f06acbd66 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_C.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_C.inst.cfg @@ -4,16 +4,16 @@ name = C definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = c +quality_type = D015 material = generic_pla -variant = FBE 0.40mm +variant = FBE 0.25mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -speed_print = 32 \ No newline at end of file +speed_print = 32 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_A.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_A.inst.cfg old mode 100755 new mode 100644 index 3f5a1920e9..49712b9a25 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_A.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_A.inst.cfg @@ -4,15 +4,15 @@ name = A definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = a +quality_type = D005 material = generic_pla variant = FBE 0.40mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_fan_speed_min = 100 \ No newline at end of file +cool_fan_speed_min = 100 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_B.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_B.inst.cfg old mode 100755 new mode 100644 index eb7fa9ada5..4dd1447921 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_B.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_B.inst.cfg @@ -4,15 +4,15 @@ name = B definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = b +quality_type = D010 material = generic_pla variant = FBE 0.40mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_fan_speed_min = 100 \ No newline at end of file +cool_fan_speed_min = 100 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_C.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_C.inst.cfg old mode 100755 new mode 100644 index 7986b6c5a2..724daf3055 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_C.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_C.inst.cfg @@ -4,15 +4,15 @@ name = C definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = c +quality_type = D015 material = generic_pla variant = FBE 0.40mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_fan_speed_min = 100 \ No newline at end of file +cool_fan_speed_min = 100 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_D.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_D.inst.cfg old mode 100755 new mode 100644 index 68ac0c8251..68a0ddea74 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_D.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_D.inst.cfg @@ -4,15 +4,15 @@ name = D definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = d +quality_type = D020 material = generic_pla variant = FBE 0.40mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_fan_speed_min = 100 \ No newline at end of file +cool_fan_speed_min = 100 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_E.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_E.inst.cfg old mode 100755 new mode 100644 index 562f5eaf96..08cf9772af --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_E.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_E.inst.cfg @@ -4,15 +4,15 @@ name = E definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = e +quality_type = D030 material = generic_pla variant = FBE 0.40mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_fan_speed_min = 100 \ No newline at end of file +cool_fan_speed_min = 100 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_C.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_C.inst.cfg old mode 100755 new mode 100644 index d3661463d4..02154266fd --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_C.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_C.inst.cfg @@ -4,15 +4,15 @@ name = C definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = c +quality_type = D015 material = generic_pla variant = FBE 0.60mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_D.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_D.inst.cfg old mode 100755 new mode 100644 index 357bce53b4..7493f7b5d9 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_D.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_D.inst.cfg @@ -4,15 +4,15 @@ name = D definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = d +quality_type = D020 material = generic_pla variant = FBE 0.60mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_E.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_E.inst.cfg old mode 100755 new mode 100644 index c14aa1272d..685701bfe7 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_E.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_E.inst.cfg @@ -4,16 +4,16 @@ name = E definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = e +quality_type = D030 material = generic_pla variant = FBE 0.60mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -speed_print = 65 \ No newline at end of file +speed_print = 65 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_F.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_F.inst.cfg old mode 100755 new mode 100644 index 0ca14a8773..08e395e00f --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_F.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_F.inst.cfg @@ -4,16 +4,16 @@ name = F definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = f +quality_type = D045 material = generic_pla variant = FBE 0.60mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -speed_print = 45 \ No newline at end of file +speed_print = 45 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_D.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_D.inst.cfg old mode 100755 new mode 100644 index 56f95b4428..bec9b9a82b --- a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_D.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_D.inst.cfg @@ -4,16 +4,16 @@ name = D definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = d +quality_type = D020 material = generic_pla variant = V-DBE 0.80mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -speed_print = 150 \ No newline at end of file +speed_print = 150 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_E.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_E.inst.cfg old mode 100755 new mode 100644 index d7f084ffa9..d788ead673 --- a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_E.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_E.inst.cfg @@ -4,16 +4,16 @@ name = E definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = e +quality_type = D030 material = generic_pla variant = V-DBE 0.80mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -speed_print = 110 \ No newline at end of file +speed_print = 110 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_F.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_F.inst.cfg old mode 100755 new mode 100644 index c2ded0f4cd..86e5da74f9 --- a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_F.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_F.inst.cfg @@ -4,16 +4,16 @@ name = F definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = f +quality_type = D045 material = generic_pla variant = V-DBE 0.80mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -speed_print = 75 \ No newline at end of file +speed_print = 75 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_G.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_G.inst.cfg old mode 100755 new mode 100644 index b98657b7ee..3a6dbd758f --- a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_G.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_G.inst.cfg @@ -4,16 +4,16 @@ name = G definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = g +quality_type = D060 material = generic_pla variant = V-DBE 0.80mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -speed_print = 55 \ No newline at end of file +speed_print = 55 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_D.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_D.inst.cfg old mode 100755 new mode 100644 index 0871173ff6..5842885d5b --- a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_D.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_D.inst.cfg @@ -4,16 +4,16 @@ name = D definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = d +quality_type = D020 material = generic_pla variant = V-FBE 0.80mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -speed_print = 150 \ No newline at end of file +speed_print = 150 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_E.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_E.inst.cfg old mode 100755 new mode 100644 index b47d6d2dc7..c357fa2b4d --- a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_E.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_E.inst.cfg @@ -4,16 +4,16 @@ name = E definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = e +quality_type = D030 material = generic_pla variant = V-FBE 0.60mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -speed_print = 110 \ No newline at end of file +speed_print = 110 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_F.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_F.inst.cfg old mode 100755 new mode 100644 index 13808dea80..8249498432 --- a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_F.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_F.inst.cfg @@ -4,16 +4,16 @@ name = F definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = f +quality_type = D045 material = generic_pla variant = V-FBE 0.80mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -speed_print = 75 \ No newline at end of file +speed_print = 75 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_G.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_G.inst.cfg old mode 100755 new mode 100644 index e82acdb324..a8a96d2ab0 --- a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_G.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_G.inst.cfg @@ -4,16 +4,16 @@ name = G definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = g +quality_type = D060 material = generic_pla variant = V-FBE 0.80mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -speed_print = 55 \ No newline at end of file +speed_print = 55 +material_bed_temperature = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_A.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_A.inst.cfg new file mode 100644 index 0000000000..52b0ebac0e --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_A.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = A +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D005 +material = generic_pva +variant = DBE 0.40mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_B.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_B.inst.cfg new file mode 100644 index 0000000000..56db6fbc31 --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_B.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = B +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D010 +material = generic_pva +variant = DBE 0.40mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_C.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_C.inst.cfg new file mode 100644 index 0000000000..f43ebf316c --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_C.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D015 +material = generic_pva +variant = DBE 0.40mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_D.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_D.inst.cfg new file mode 100644 index 0000000000..632db06707 --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_D.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D020 +material = generic_pva +variant = DBE 0.40mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_E.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_E.inst.cfg new file mode 100644 index 0000000000..d18f42420d --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_E.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D030 +material = generic_pva +variant = DBE 0.40mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_C.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_C.inst.cfg new file mode 100644 index 0000000000..2c6948432c --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_C.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D015 +material = generic_pva +variant = DBE 0.60mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_D.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_D.inst.cfg new file mode 100644 index 0000000000..34681ca16a --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_D.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D020 +material = generic_pva +variant = DBE 0.60mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_E.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_E.inst.cfg new file mode 100644 index 0000000000..a6d634e713 --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_E.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D030 +material = generic_pva +variant = DBE 0.60mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_F.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_F.inst.cfg new file mode 100644 index 0000000000..33bbb02cb3 --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_F.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = F +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D045 +material = generic_pva +variant = DBE 0.60mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_A.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_A.inst.cfg new file mode 100644 index 0000000000..5d30e71e7b --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_A.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = A +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D005 +material = generic_pva +variant = FBE 0.40mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_B.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_B.inst.cfg new file mode 100644 index 0000000000..3d7ffc09af --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_B.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = B +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D010 +material = generic_pva +variant = FBE 0.40mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_C.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_C.inst.cfg new file mode 100644 index 0000000000..9801747822 --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_C.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D015 +material = generic_pva +variant = FBE 0.40mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_D.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_D.inst.cfg new file mode 100644 index 0000000000..8945e848eb --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_D.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D020 +material = generic_pva +variant = FBE 0.40mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_E.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_E.inst.cfg new file mode 100644 index 0000000000..c78fa4a4f6 --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_E.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D030 +material = generic_pva +variant = FBE 0.40mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_C.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_C.inst.cfg new file mode 100644 index 0000000000..ee7ab5e445 --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_C.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D015 +material = generic_pva +variant = FBE 0.60mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_D.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_D.inst.cfg new file mode 100644 index 0000000000..6b4d35d3e3 --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_D.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D020 +material = generic_pva +variant = FBE 0.60mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_E.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_E.inst.cfg new file mode 100644 index 0000000000..d37b582ee8 --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_E.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D030 +material = generic_pva +variant = FBE 0.60mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_F.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_F.inst.cfg new file mode 100644 index 0000000000..7dfccefb81 --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_F.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = F +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D045 +material = generic_pva +variant = FBE 0.60mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_D.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_D.inst.cfg new file mode 100644 index 0000000000..7f6d7a3582 --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_D.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D020 +material = generic_pva +variant = V-DBE 0.80mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_E.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_E.inst.cfg new file mode 100644 index 0000000000..b0c5cae576 --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_E.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D030 +material = generic_pva +variant = V-DBE 0.80mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_F.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_F.inst.cfg new file mode 100644 index 0000000000..a936e81c26 --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_F.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = F +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D045 +material = generic_pva +variant = V-DBE 0.80mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_G.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_G.inst.cfg new file mode 100644 index 0000000000..750e3db6b2 --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_G.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = G +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D060 +material = generic_pva +variant = V-DBE 0.80mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_D.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_D.inst.cfg new file mode 100644 index 0000000000..8617c0e1df --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_D.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D020 +material = generic_pva +variant = V-FBE 0.80mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_E.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_E.inst.cfg new file mode 100644 index 0000000000..c0ba9ba981 --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_E.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D030 +material = generic_pva +variant = V-FBE 0.60mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_F.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_F.inst.cfg new file mode 100644 index 0000000000..652cac903b --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_F.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = F +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D045 +material = generic_pva +variant = V-FBE 0.80mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_G.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_G.inst.cfg new file mode 100644 index 0000000000..df98fcfeeb --- /dev/null +++ b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_G.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = G +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D060 +material = generic_pva +variant = V-FBE 0.80mm + +[values] +brim_replaces_support = False +material_standby_temperature = 100 +prime_tower_enable = False +support_brim_enable = True +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_B.inst.cfg b/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_B.inst.cfg new file mode 100644 index 0000000000..7db800023c --- /dev/null +++ b/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_B.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = B +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D010 +material = generic_tpu +variant = DBE 0.40mm + +[values] +cool_fan_full_at_height = =layer_height * 6 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 70 +speed_print = 25 +speed_travel = 300 +acceleration_travel = 10000 +retraction_amount = 5 +retraction_hop_enabled = False +ironing_flow = 5 +jerk_ironing = 5 +speed_ironing = =speed_print +switch_extruder_retraction_amount = 10 \ No newline at end of file diff --git a/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_C.inst.cfg b/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_C.inst.cfg new file mode 100644 index 0000000000..ef1e8d9eaa --- /dev/null +++ b/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_C.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D015 +material = generic_tpu +variant = DBE 0.40mm + +[values] +cool_fan_full_at_height = =layer_height * 6 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 70 +speed_print = 25 +speed_travel = 300 +acceleration_travel = 10000 +retraction_amount = 5 +retraction_hop_enabled = False +ironing_flow = 5 +jerk_ironing = 5 +speed_ironing = =speed_print +switch_extruder_retraction_amount = 10 \ No newline at end of file diff --git a/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_D.inst.cfg b/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_D.inst.cfg new file mode 100644 index 0000000000..12a40b5dcc --- /dev/null +++ b/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_D.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 17 +type = quality +quality_type = D020 +material = generic_tpu +variant = DBE 0.40mm + +[values] +cool_fan_full_at_height = =layer_height * 6 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 70 +speed_print = 25 +speed_travel = 300 +acceleration_travel = 10000 +retraction_amount = 5 +retraction_hop_enabled = False +ironing_flow = 5 +jerk_ironing = 5 +speed_ironing = =speed_print +switch_extruder_retraction_amount = 10 \ No newline at end of file diff --git a/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_B.inst.cfg b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_B.inst.cfg old mode 100755 new mode 100644 index 747495919d..97b9b9a207 --- a/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_B.inst.cfg +++ b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_B.inst.cfg @@ -4,14 +4,13 @@ name = B definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = b +quality_type = D010 material = generic_tpu variant = FBE 0.40mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 6 cool_fan_speed = 100 cool_fan_speed_max = 100 @@ -23,4 +22,5 @@ retraction_amount = 5 retraction_hop_enabled = False ironing_flow = 5 jerk_ironing = 5 -speed_ironing = =speed_print \ No newline at end of file +speed_ironing = =speed_print +switch_extruder_retraction_amount = 10 \ No newline at end of file diff --git a/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_C.inst.cfg b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_C.inst.cfg old mode 100755 new mode 100644 index 0ab6bfb70f..e12343c85a --- a/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_C.inst.cfg +++ b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_C.inst.cfg @@ -4,14 +4,13 @@ name = C definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = c +quality_type = D015 material = generic_tpu variant = FBE 0.40mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 6 cool_fan_speed = 100 cool_fan_speed_max = 100 @@ -24,3 +23,4 @@ retraction_hop_enabled = False ironing_flow = 5 jerk_ironing = 5 speed_ironing = =speed_print +switch_extruder_retraction_amount = 10 \ No newline at end of file diff --git a/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_D.inst.cfg b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_D.inst.cfg old mode 100755 new mode 100644 index b4af34b48a..78d5350427 --- a/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_D.inst.cfg +++ b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_D.inst.cfg @@ -4,14 +4,13 @@ name = D definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = d +quality_type = D020 material = generic_tpu variant = FBE 0.40mm [values] -adhesion_type = skirt cool_fan_full_at_height = =layer_height * 6 cool_fan_speed = 100 cool_fan_speed_max = 100 @@ -24,3 +23,4 @@ retraction_hop_enabled = False ironing_flow = 5 jerk_ironing = 5 speed_ironing = =speed_print +switch_extruder_retraction_amount = 10 \ No newline at end of file diff --git a/resources/quality/deltacomb/deltacomb_global_A.inst.cfg b/resources/quality/deltacomb/deltacomb_global_A.inst.cfg old mode 100755 new mode 100644 index 3eb4966a70..36cb1e40c6 --- a/resources/quality/deltacomb/deltacomb_global_A.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_A.inst.cfg @@ -4,19 +4,20 @@ name = Extra Fine definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = a +quality_type = D005 weight = 1 global_quality = True [values] +adhesion_type = skirt layer_height = 0.05 layer_height_0 = 0.1 cool_fan_enabled = True cool_min_layer_time = 10 cool_min_layer_time_fan_speed_max = 10 cool_min_speed = 5 -material_flow_layer_0 = =material_flow * 1.2 material_print_temperature_layer_0 = =default_material_print_temperature + 5 support_angle = 80 +prime_tower_brim_enable = False \ No newline at end of file diff --git a/resources/quality/deltacomb/deltacomb_global_B.inst.cfg b/resources/quality/deltacomb/deltacomb_global_B.inst.cfg old mode 100755 new mode 100644 index cbb6b72a66..5c32030bf9 --- a/resources/quality/deltacomb/deltacomb_global_B.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_B.inst.cfg @@ -4,19 +4,19 @@ name = Fine definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = b +quality_type = D010 weight = 0 global_quality = True [values] +adhesion_type = skirt layer_height = 0.1 -layer_height_0 = 0.1 cool_fan_enabled = True cool_min_layer_time = 10 cool_min_layer_time_fan_speed_max = 10 cool_min_speed = 5 -material_flow_layer_0 = =material_flow * 1.2 material_print_temperature_layer_0 = =default_material_print_temperature + 5 support_angle = 65 +prime_tower_brim_enable = False \ No newline at end of file diff --git a/resources/quality/deltacomb/deltacomb_global_C.inst.cfg b/resources/quality/deltacomb/deltacomb_global_C.inst.cfg old mode 100755 new mode 100644 index 820521aa1c..7898182d3b --- a/resources/quality/deltacomb/deltacomb_global_C.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_C.inst.cfg @@ -4,18 +4,19 @@ name = Normal definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = c +quality_type = D015 weight = -1 global_quality = True [values] +adhesion_type = skirt layer_height = 0.15 cool_fan_enabled = True cool_min_layer_time = 10 cool_min_layer_time_fan_speed_max = 10 cool_min_speed = 5 -material_flow_layer_0 = =material_flow * 1.2 material_print_temperature_layer_0 = =default_material_print_temperature + 5 support_angle = 55 +prime_tower_brim_enable = False \ No newline at end of file diff --git a/resources/quality/deltacomb/deltacomb_global_D.inst.cfg b/resources/quality/deltacomb/deltacomb_global_D.inst.cfg old mode 100755 new mode 100644 index 536d28426b..89488afdc1 --- a/resources/quality/deltacomb/deltacomb_global_D.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_D.inst.cfg @@ -4,17 +4,18 @@ name = Fast definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = d +quality_type = D020 weight = -2 global_quality = True [values] +adhesion_type = skirt layer_height = 0.2 cool_fan_enabled = True cool_min_layer_time = 10 cool_min_layer_time_fan_speed_max = 10 cool_min_speed = 5 -material_flow_layer_0 = =material_flow * 1.2 material_print_temperature_layer_0 = =default_material_print_temperature + 5 +prime_tower_brim_enable = False \ No newline at end of file diff --git a/resources/quality/deltacomb/deltacomb_global_E.inst.cfg b/resources/quality/deltacomb/deltacomb_global_E.inst.cfg old mode 100755 new mode 100644 index 065e4c2193..1da66c564e --- a/resources/quality/deltacomb/deltacomb_global_E.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_E.inst.cfg @@ -4,17 +4,18 @@ name = Extra Fast definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = e +quality_type = D030 weight = -3 global_quality = True [values] +adhesion_type = skirt layer_height = 0.3 cool_fan_enabled = True cool_min_layer_time = 10 cool_min_layer_time_fan_speed_max = 10 cool_min_speed = 5 -material_flow_layer_0 = =material_flow * 1.2 material_print_temperature_layer_0 = =default_material_print_temperature + 5 +prime_tower_brim_enable = False \ No newline at end of file diff --git a/resources/quality/deltacomb/deltacomb_global_F.inst.cfg b/resources/quality/deltacomb/deltacomb_global_F.inst.cfg old mode 100755 new mode 100644 index 177d2e06bd..1e6e29c93b --- a/resources/quality/deltacomb/deltacomb_global_F.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_F.inst.cfg @@ -4,17 +4,18 @@ name = Coarse definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = f +quality_type = D045 weight = -4 global_quality = True [values] +adhesion_type = skirt layer_height = 0.45 cool_fan_enabled = True cool_min_layer_time = 10 cool_min_layer_time_fan_speed_max = 10 cool_min_speed = 5 -material_flow_layer_0 = =material_flow * 1.2 material_print_temperature_layer_0 = =default_material_print_temperature + 5 +prime_tower_brim_enable = False \ No newline at end of file diff --git a/resources/quality/deltacomb/deltacomb_global_G.inst.cfg b/resources/quality/deltacomb/deltacomb_global_G.inst.cfg old mode 100755 new mode 100644 index 3d2237d7e9..df4b47bfeb --- a/resources/quality/deltacomb/deltacomb_global_G.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_G.inst.cfg @@ -4,17 +4,18 @@ name = Extra Coarse definition = deltacomb_base [metadata] -setting_version = 16 +setting_version = 17 type = quality -quality_type = g +quality_type = D060 weight = -5 global_quality = True [values] +adhesion_type = skirt layer_height = 0.6 cool_fan_enabled = True cool_min_layer_time = 10 cool_min_layer_time_fan_speed_max = 10 cool_min_speed = 5 -material_flow_layer_0 = =material_flow * 1.2 material_print_temperature_layer_0 = =default_material_print_temperature + 5 +prime_tower_brim_enable = False \ No newline at end of file diff --git a/resources/quality/diy220/diy220_draft.inst.cfg b/resources/quality/diy220/diy220_draft.inst.cfg new file mode 100644 index 0000000000..0d47709e30 --- /dev/null +++ b/resources/quality/diy220/diy220_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft +definition = diy220 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +global_quality = True + +[values] +layer_height = 0.2 diff --git a/resources/quality/diy220/diy220_fast.inst.cfg b/resources/quality/diy220/diy220_fast.inst.cfg new file mode 100644 index 0000000000..2fe85474f7 --- /dev/null +++ b/resources/quality/diy220/diy220_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Normal +definition = diy220 + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -1 +global_quality = True + +[values] +layer_height = 0.15 diff --git a/resources/quality/diy220/diy220_high.inst.cfg b/resources/quality/diy220/diy220_high.inst.cfg new file mode 100644 index 0000000000..fd46f5275a --- /dev/null +++ b/resources/quality/diy220/diy220_high.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Extra Fine +definition = diy220 + +[metadata] +setting_version = 17 +type = quality +quality_type = high +weight = 1 +global_quality = True + +[values] +layer_height = 0.06 diff --git a/resources/quality/diy220/diy220_normal.inst.cfg b/resources/quality/diy220/diy220_normal.inst.cfg new file mode 100644 index 0000000000..d19fdb6a7e --- /dev/null +++ b/resources/quality/diy220/diy220_normal.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Fine +definition = diy220 + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = 0 +global_quality = True + +[values] diff --git a/resources/quality/draft.inst.cfg b/resources/quality/draft.inst.cfg index c8115f1512..dd0c0b7f79 100644 --- a/resources/quality/draft.inst.cfg +++ b/resources/quality/draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = fdmprinter [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/eryone_er20/eryone_er20_draft.inst.cfg b/resources/quality/eryone_er20/eryone_er20_draft.inst.cfg new file mode 100644 index 0000000000..dc723985d1 --- /dev/null +++ b/resources/quality/eryone_er20/eryone_er20_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Draft +definition = eryone_er20 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +global_quality = True + +[values] +acceleration_print = 1500 +layer_height = 0.3 +layer_height_0 = 0.3 +speed_print = 80 +speed_support = 60 \ No newline at end of file diff --git a/resources/quality/eryone_er20/eryone_er20_high.inst.cfg b/resources/quality/eryone_er20/eryone_er20_high.inst.cfg new file mode 100644 index 0000000000..b2f16f1496 --- /dev/null +++ b/resources/quality/eryone_er20/eryone_er20_high.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = High +definition = eryone_er20 + +[metadata] +setting_version = 17 +type = quality +quality_type = high +weight = 1 +global_quality = True + +[values] +acceleration_print = 500 +layer_height = 0.15 +layer_height_0 = 0.2 +speed_print = 50 +speed_support = 30 \ No newline at end of file diff --git a/resources/quality/eryone_er20/eryone_er20_normal.inst.cfg b/resources/quality/eryone_er20/eryone_er20_normal.inst.cfg new file mode 100644 index 0000000000..03511cda4c --- /dev/null +++ b/resources/quality/eryone_er20/eryone_er20_normal.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Normal +definition = eryone_er20 + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = 0 +global_quality = True + +[values] +acceleration_print = 1000 +layer_height = 0.2 +layer_height_0 = 0.2 +speed_print = 50 +speed_support = 30 \ No newline at end of file diff --git a/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg new file mode 100644 index 0000000000..f7d701f771 --- /dev/null +++ b/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Fast +definition = eryone_thinker + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -1 +global_quality = True + +[values] +infill_sparse_density = 15 +initial_layer_line_width_factor = 100.0 +layer_height = 0.3 +layer_height_0 = =layer_height +material_bed_temperature = =default_material_bed_temperature +material_bed_temperature_layer_0 = =material_bed_temperature +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =max(-273.15, material_print_temperature + 5) +speed_infill = =math.ceil(speed_print * 80 / 60) +speed_topbottom = =math.ceil(speed_print * 40 / 60) +speed_travel = =speed_print if magic_spiralize else 150 +speed_wall_x = =math.ceil(speed_print * 80 / 60) +speed_z_hop = =math.ceil(speed_print * 30 / 60) +top_layers = 4 +bottom_layers = 2 +wall_line_count = 2 diff --git a/resources/quality/eryone_thinker/eryone_thinker_high.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_high.inst.cfg new file mode 100644 index 0000000000..057b9dcb53 --- /dev/null +++ b/resources/quality/eryone_thinker/eryone_thinker_high.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = High +definition = eryone_thinker + +[metadata] +setting_version = 17 +type = quality +quality_type = high +weight = 1 +global_quality = True + +[values] +alternate_extra_perimeter = true +infill_sparse_density = 25 +initial_layer_line_width_factor = 130.0 +layer_height = 0.1 +layer_height_0 = =layer_height +material_bed_temperature = =default_material_bed_temperature +material_bed_temperature_layer_0 = =material_bed_temperature +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =max(-273.15, material_print_temperature + 5) +speed_print = 50.0 +speed_topbottom = =math.ceil(speed_print * 30 / 60) +speed_travel = =speed_print if magic_spiralize else 100 +speed_z_hop = =math.ceil(speed_print * 30 / 60) +top_layers = 12 +bottom_layers = 8 diff --git a/resources/quality/eryone_thinker/eryone_thinker_normal.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_normal.inst.cfg new file mode 100644 index 0000000000..667d72fe09 --- /dev/null +++ b/resources/quality/eryone_thinker/eryone_thinker_normal.inst.cfg @@ -0,0 +1,28 @@ +[general] +version = 4 +name = Normal +definition = eryone_thinker + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = 0 +global_quality = True + +[values] +infill_sparse_density = 20 +initial_layer_line_width_factor = 120.0 +layer_height = 0.2 +layer_height_0 = =layer_height +material_bed_temperature = =default_material_bed_temperature +material_bed_temperature_layer_0 = =material_bed_temperature +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =max(-273.15, material_print_temperature + 5) +speed_travel = =speed_print if magic_spiralize else 120 +speed_z_hop = =math.ceil(speed_print * 30 / 60) +top_layers = 6 +bottom_layers = 4 + diff --git a/resources/quality/extra_coarse.inst.cfg b/resources/quality/extra_coarse.inst.cfg index 4bd75fbe89..707e093a79 100644 --- a/resources/quality/extra_coarse.inst.cfg +++ b/resources/quality/extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse definition = fdmprinter [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra coarse weight = -4 diff --git a/resources/quality/extra_fast.inst.cfg b/resources/quality/extra_fast.inst.cfg index 9b42648734..c1a4bdb99f 100644 --- a/resources/quality/extra_fast.inst.cfg +++ b/resources/quality/extra_fast.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = fdmprinter [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg index 5e4e9adceb..4b128f38c9 100644 --- a/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = Fast Quality [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg index 46b9f884fc..d077d1dce5 100644 --- a/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = High Quality [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg index 87f3a8de6c..e0e74fd20b 100644 --- a/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = Normal Quality [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg index 3757b9bee8..c63cb12fae 100644 --- a/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast Quality definition = fabtotum [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg index a584a3c31b..741b89c3b1 100644 --- a/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = fabtotum [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg index b0b90924df..9aec9cffc9 100644 --- a/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = fabtotum [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg index 73ec5390d2..729ced50d8 100644 --- a/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = Fast Quality [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg index 040731a45e..7c2063b00b 100644 --- a/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = High Quality [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg index 02ce8b06cf..cae04df9bc 100644 --- a/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg @@ -4,7 +4,7 @@ definition = fabtotum name = Normal Quality [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg index cd878d88e6..7a51800f6d 100644 --- a/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg @@ -5,7 +5,7 @@ name = Fast Quality [metadata] type = quality -setting_version = 16 +setting_version = 17 material = generic_tpu variant = Lite 0.4 mm quality_type = fast diff --git a/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg b/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg index 58850837e6..f97f5e6b46 100644 --- a/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg @@ -5,7 +5,7 @@ name = High Quality [metadata] type = quality -setting_version = 16 +setting_version = 17 material = generic_tpu variant = Lite 0.4 mm quality_type = high diff --git a/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg index b2d4ef8e4b..d0452e976b 100644 --- a/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg @@ -5,7 +5,7 @@ name = Normal Quality [metadata] type = quality -setting_version = 16 +setting_version = 17 material = generic_tpu variant = Lite 0.4 mm quality_type = normal diff --git a/resources/quality/fabxpro/fabxpro_abs_draft.inst.cfg b/resources/quality/fabxpro/fabxpro_abs_draft.inst.cfg index f28c4cd357..45dc4483f7 100644 --- a/resources/quality/fabxpro/fabxpro_abs_draft.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Draft weight = -2 diff --git a/resources/quality/fabxpro/fabxpro_abs_fine.inst.cfg b/resources/quality/fabxpro/fabxpro_abs_fine.inst.cfg index 5ec800f301..9a667ca15b 100644 --- a/resources/quality/fabxpro/fabxpro_abs_fine.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_abs_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Fine weight = -2 diff --git a/resources/quality/fabxpro/fabxpro_abs_normal.inst.cfg b/resources/quality/fabxpro/fabxpro_abs_normal.inst.cfg index ddd0fffc72..dc21dba3ed 100644 --- a/resources/quality/fabxpro/fabxpro_abs_normal.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Normal weight = -2 diff --git a/resources/quality/fabxpro/fabxpro_asa_draft.inst.cfg b/resources/quality/fabxpro/fabxpro_asa_draft.inst.cfg index 8100d49aa6..0a6d6d99c1 100644 --- a/resources/quality/fabxpro/fabxpro_asa_draft.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_asa_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Draft weight = -2 diff --git a/resources/quality/fabxpro/fabxpro_asa_fine.inst.cfg b/resources/quality/fabxpro/fabxpro_asa_fine.inst.cfg index 590457238b..c7bd7b195b 100644 --- a/resources/quality/fabxpro/fabxpro_asa_fine.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_asa_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Fine weight = -2 diff --git a/resources/quality/fabxpro/fabxpro_asa_normal.inst.cfg b/resources/quality/fabxpro/fabxpro_asa_normal.inst.cfg index d22bd88bae..8a66d3d42c 100644 --- a/resources/quality/fabxpro/fabxpro_asa_normal.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_asa_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Normal weight = -2 diff --git a/resources/quality/fabxpro/fabxpro_hips_draft.inst.cfg b/resources/quality/fabxpro/fabxpro_hips_draft.inst.cfg index 9651f10214..290b53d83d 100644 --- a/resources/quality/fabxpro/fabxpro_hips_draft.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_hips_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Draft weight = -2 diff --git a/resources/quality/fabxpro/fabxpro_hips_fine.inst.cfg b/resources/quality/fabxpro/fabxpro_hips_fine.inst.cfg index ed90f9c178..e6bf7d10d9 100644 --- a/resources/quality/fabxpro/fabxpro_hips_fine.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_hips_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Fine weight = -2 diff --git a/resources/quality/fabxpro/fabxpro_hips_normal.inst.cfg b/resources/quality/fabxpro/fabxpro_hips_normal.inst.cfg index cc9ff6b758..59c6c39d27 100644 --- a/resources/quality/fabxpro/fabxpro_hips_normal.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_hips_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Normal weight = -2 diff --git a/resources/quality/fabxpro/fabxpro_nylon_draft.inst.cfg b/resources/quality/fabxpro/fabxpro_nylon_draft.inst.cfg index d8e0f7d04d..02ad9ec107 100644 --- a/resources/quality/fabxpro/fabxpro_nylon_draft.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_nylon_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Draft weight = -2 diff --git a/resources/quality/fabxpro/fabxpro_nylon_fine.inst.cfg b/resources/quality/fabxpro/fabxpro_nylon_fine.inst.cfg index 3bc4c0386e..f2bf72476d 100644 --- a/resources/quality/fabxpro/fabxpro_nylon_fine.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_nylon_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Fine weight = -2 diff --git a/resources/quality/fabxpro/fabxpro_nylon_normal.inst.cfg b/resources/quality/fabxpro/fabxpro_nylon_normal.inst.cfg index 8b8b353bee..4234d65cf5 100644 --- a/resources/quality/fabxpro/fabxpro_nylon_normal.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Normal weight = -2 diff --git a/resources/quality/fabxpro/fabxpro_petg_draft.inst.cfg b/resources/quality/fabxpro/fabxpro_petg_draft.inst.cfg index 65f2898995..5989b5024d 100644 --- a/resources/quality/fabxpro/fabxpro_petg_draft.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_petg_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Draft weight = -2 diff --git a/resources/quality/fabxpro/fabxpro_petg_fine.inst.cfg b/resources/quality/fabxpro/fabxpro_petg_fine.inst.cfg index 51b43a04ca..1323cde1af 100644 --- a/resources/quality/fabxpro/fabxpro_petg_fine.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_petg_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Fine weight = -2 diff --git a/resources/quality/fabxpro/fabxpro_petg_normal.inst.cfg b/resources/quality/fabxpro/fabxpro_petg_normal.inst.cfg index a95d605015..10199791be 100644 --- a/resources/quality/fabxpro/fabxpro_petg_normal.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Normal weight = -2 diff --git a/resources/quality/fabxpro/fabxpro_pla_draft.inst.cfg b/resources/quality/fabxpro/fabxpro_pla_draft.inst.cfg index 216a4efa63..eea1058019 100644 --- a/resources/quality/fabxpro/fabxpro_pla_draft.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Draft weight = -2 diff --git a/resources/quality/fabxpro/fabxpro_pla_fine.inst.cfg b/resources/quality/fabxpro/fabxpro_pla_fine.inst.cfg index 127ff61f82..5a7a3a3355 100644 --- a/resources/quality/fabxpro/fabxpro_pla_fine.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Fine weight = -2 diff --git a/resources/quality/fabxpro/fabxpro_pla_normal.inst.cfg b/resources/quality/fabxpro/fabxpro_pla_normal.inst.cfg index efe087b7f4..0f86e9c5af 100644 --- a/resources/quality/fabxpro/fabxpro_pla_normal.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Normal weight = -2 diff --git a/resources/quality/fabxpro/fabxpro_tpe_draft.inst.cfg b/resources/quality/fabxpro/fabxpro_tpe_draft.inst.cfg index db08e03bf2..11f3aa9d41 100644 --- a/resources/quality/fabxpro/fabxpro_tpe_draft.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_tpe_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Draft weight = -2 diff --git a/resources/quality/fabxpro/fabxpro_tpe_fine.inst.cfg b/resources/quality/fabxpro/fabxpro_tpe_fine.inst.cfg index f38b30d1be..6cd786e157 100644 --- a/resources/quality/fabxpro/fabxpro_tpe_fine.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_tpe_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Fine weight = -2 diff --git a/resources/quality/fabxpro/fabxpro_tpe_normal.inst.cfg b/resources/quality/fabxpro/fabxpro_tpe_normal.inst.cfg index 40fc3df972..719188f4ce 100644 --- a/resources/quality/fabxpro/fabxpro_tpe_normal.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_tpe_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = fabxpro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Normal weight = -2 diff --git a/resources/quality/fast.inst.cfg b/resources/quality/fast.inst.cfg index b471d52540..0e653919c6 100644 --- a/resources/quality/fast.inst.cfg +++ b/resources/quality/fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = fdmprinter [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/flashforge/abs/flashforge_0.20_abs_super.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.20_abs_super.inst.cfg new file mode 100644 index 0000000000..a836c9f003 --- /dev/null +++ b/resources/quality/flashforge/abs/flashforge_0.20_abs_super.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Super Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_abs +variant = 0.2mm Nozzle + +[values] +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 105 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/abs/flashforge_0.20_abs_ultra.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.20_abs_ultra.inst.cfg new file mode 100644 index 0000000000..ddfe4943f2 --- /dev/null +++ b/resources/quality/flashforge/abs/flashforge_0.20_abs_ultra.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Ultra Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = ultra +material = generic_abs +variant = 0.2mm Nozzle + +[values] +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 105 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 \ No newline at end of file diff --git a/resources/quality/flashforge/abs/flashforge_0.30_abs_adaptive.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.30_abs_adaptive.inst.cfg new file mode 100644 index 0000000000..67bb56d7b1 --- /dev/null +++ b/resources/quality/flashforge/abs/flashforge_0.30_abs_adaptive.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.2mm Nozzle + +[values] +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 105 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/abs/flashforge_0.30_abs_standard.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.30_abs_standard.inst.cfg new file mode 100644 index 0000000000..5d1c271b8f --- /dev/null +++ b/resources/quality/flashforge/abs/flashforge_0.30_abs_standard.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Standard Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +material = generic_abs +variant = 0.3mm Nozzle + +[values] +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 105 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/abs/flashforge_0.30_abs_super.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.30_abs_super.inst.cfg new file mode 100644 index 0000000000..144ae0904f --- /dev/null +++ b/resources/quality/flashforge/abs/flashforge_0.30_abs_super.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Super Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_abs +variant = 0.3mm Nozzle + +[values] +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 105 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/abs/flashforge_0.40_abs_adaptive.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.40_abs_adaptive.inst.cfg new file mode 100644 index 0000000000..7b81a98b4e --- /dev/null +++ b/resources/quality/flashforge/abs/flashforge_0.40_abs_adaptive.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.4mm Nozzle + +[values] +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 105 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/abs/flashforge_0.40_abs_draft.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.40_abs_draft.inst.cfg new file mode 100644 index 0000000000..db1dfadc1c --- /dev/null +++ b/resources/quality/flashforge/abs/flashforge_0.40_abs_draft.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Draft Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_abs +variant = 0.4mm Nozzle + +[values] +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 105 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/abs/flashforge_0.40_abs_low.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.40_abs_low.inst.cfg new file mode 100644 index 0000000000..7cef7d8ffd --- /dev/null +++ b/resources/quality/flashforge/abs/flashforge_0.40_abs_low.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Low Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_abs +variant = 0.4mm Nozzle + +[values] +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 105 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 \ No newline at end of file diff --git a/resources/quality/flashforge/abs/flashforge_0.40_abs_standard.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.40_abs_standard.inst.cfg new file mode 100644 index 0000000000..e5e707380b --- /dev/null +++ b/resources/quality/flashforge/abs/flashforge_0.40_abs_standard.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Standard Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +material = generic_abs +variant = 0.4mm Nozzle + +[values] +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 105 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/abs/flashforge_0.40_abs_super.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.40_abs_super.inst.cfg new file mode 100644 index 0000000000..7b69dd796a --- /dev/null +++ b/resources/quality/flashforge/abs/flashforge_0.40_abs_super.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Super Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_abs +variant = 0.4mm Nozzle + +[values] +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 105 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/abs/flashforge_0.50_abs_adaptive.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.50_abs_adaptive.inst.cfg new file mode 100644 index 0000000000..1a7fd56480 --- /dev/null +++ b/resources/quality/flashforge/abs/flashforge_0.50_abs_adaptive.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.5mm Nozzle + +[values] +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 105 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/abs/flashforge_0.50_abs_coarse.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.50_abs_coarse.inst.cfg new file mode 100644 index 0000000000..ae53c309d0 --- /dev/null +++ b/resources/quality/flashforge/abs/flashforge_0.50_abs_coarse.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Coarse Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = coarse +material = generic_abs +variant = 0.5mm Nozzle + +[values] +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 105 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/abs/flashforge_0.50_abs_draft.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.50_abs_draft.inst.cfg new file mode 100644 index 0000000000..7a1ecf7af3 --- /dev/null +++ b/resources/quality/flashforge/abs/flashforge_0.50_abs_draft.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Draft Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_abs +variant = 0.5mm Nozzle + +[values] +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 105 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/abs/flashforge_0.50_abs_low.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.50_abs_low.inst.cfg new file mode 100644 index 0000000000..b38a8e428d --- /dev/null +++ b/resources/quality/flashforge/abs/flashforge_0.50_abs_low.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Low Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_abs +variant = 0.5mm Nozzle + +[values] +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 105 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 \ No newline at end of file diff --git a/resources/quality/flashforge/abs/flashforge_0.50_abs_standard.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.50_abs_standard.inst.cfg new file mode 100644 index 0000000000..ef0e01d485 --- /dev/null +++ b/resources/quality/flashforge/abs/flashforge_0.50_abs_standard.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Standard Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +material = generic_abs +variant = 0.5mm Nozzle + +[values] +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 105 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/abs/flashforge_0.60_abs_coarse.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.60_abs_coarse.inst.cfg new file mode 100644 index 0000000000..25466d2346 --- /dev/null +++ b/resources/quality/flashforge/abs/flashforge_0.60_abs_coarse.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Coarse Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = coarse +material = generic_abs +variant = 0.6mm Nozzle + +[values] +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 105 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/abs/flashforge_0.60_abs_draft.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.60_abs_draft.inst.cfg new file mode 100644 index 0000000000..89d0dd380a --- /dev/null +++ b/resources/quality/flashforge/abs/flashforge_0.60_abs_draft.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Draft Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_abs +variant = 0.6mm Nozzle + +[values] +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 105 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/abs/flashforge_0.60_abs_extra_coarse.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.60_abs_extra_coarse.inst.cfg new file mode 100644 index 0000000000..a84a25fc27 --- /dev/null +++ b/resources/quality/flashforge/abs/flashforge_0.60_abs_extra_coarse.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Extra Coarse Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = Xcoarse +material = generic_abs +variant = 0.6mm Nozzle + +[values] +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 105 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/abs/flashforge_0.60_abs_standard.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.60_abs_standard.inst.cfg new file mode 100644 index 0000000000..06b291c8e1 --- /dev/null +++ b/resources/quality/flashforge/abs/flashforge_0.60_abs_standard.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Standard Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +material = generic_abs +variant = 0.6mm Nozzle + +[values] +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 105 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/flashforge_global_0.08_ultra.inst.cfg b/resources/quality/flashforge/flashforge_global_0.08_ultra.inst.cfg new file mode 100644 index 0000000000..29822906ab --- /dev/null +++ b/resources/quality/flashforge/flashforge_global_0.08_ultra.inst.cfg @@ -0,0 +1,27 @@ +[general] +version = 4 +name = Ultra Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = ultra +weight = 0 +global_quality = True + +[values] +adhesion_type = brim +brim_width = 2.0 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +layer_height = 0.08 +layer_height_0 = 0.12 +material_bed_temperature = 40 +material_diameter = 1.75 +material_print_temperature = 200 +material_print_temperature_layer_0 = 0 +speed_infill = =speed_print +speed_print = 40 +speed_support = 30 +speed_travel = 70 diff --git a/resources/quality/flashforge/flashforge_global_0.12_super.inst.cfg b/resources/quality/flashforge/flashforge_global_0.12_super.inst.cfg new file mode 100644 index 0000000000..391af5cb78 --- /dev/null +++ b/resources/quality/flashforge/flashforge_global_0.12_super.inst.cfg @@ -0,0 +1,27 @@ +[general] +version = 4 +name = Super Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +weight = -1 +global_quality = True + +[values] +adhesion_type = brim +brim_width = 2.0 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +layer_height = 0.12 +layer_height_0 = 0.16 +material_bed_temperature = 40 +material_diameter = 1.75 +material_print_temperature = 200 +material_print_temperature_layer_0 = 0 +speed_infill = =speed_print +speed_print = 40 +speed_support = 30 +speed_travel = 70 diff --git a/resources/quality/flashforge/flashforge_global_0.16_adaptive.inst.cfg b/resources/quality/flashforge/flashforge_global_0.16_adaptive.inst.cfg new file mode 100644 index 0000000000..7b6fe5ac08 --- /dev/null +++ b/resources/quality/flashforge/flashforge_global_0.16_adaptive.inst.cfg @@ -0,0 +1,28 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +weight = -2 +global_quality = True + +[values] +adaptive_layer_height_enabled = true +adhesion_type = brim +brim_width = 2.0 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +layer_height = 0.16 +layer_height_0 = 0.2 +material_bed_temperature = 40 +material_diameter = 1.75 +material_print_temperature = 200 +material_print_temperature_layer_0 = 0 +speed_infill = =speed_print +speed_print = 50 +speed_support = 30 +speed_travel = 70 diff --git a/resources/quality/flashforge/flashforge_global_0.20_standard.inst.cfg b/resources/quality/flashforge/flashforge_global_0.20_standard.inst.cfg new file mode 100644 index 0000000000..9b84b13324 --- /dev/null +++ b/resources/quality/flashforge/flashforge_global_0.20_standard.inst.cfg @@ -0,0 +1,27 @@ +[general] +version = 4 +name = Standard Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = -3 +global_quality = True + +[values] +adhesion_type = brim +brim_width = 2.0 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +layer_height = 0.2 +layer_height_0 = 0.28 +material_bed_temperature = 40 +material_diameter = 1.75 +material_print_temperature = 200 +material_print_temperature_layer_0 = 0 +speed_infill = =speed_print +speed_print = 50 +speed_support = 30 +speed_travel = 70 diff --git a/resources/quality/flashforge/flashforge_global_0.28_low.inst.cfg b/resources/quality/flashforge/flashforge_global_0.28_low.inst.cfg new file mode 100644 index 0000000000..3e53aa4d29 --- /dev/null +++ b/resources/quality/flashforge/flashforge_global_0.28_low.inst.cfg @@ -0,0 +1,27 @@ +[general] +version = 4 +name = Low Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +weight = -4 +global_quality = True + +[values] +adhesion_type = brim +brim_width = 2.0 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +layer_height = 0.28 +layer_height_0 = 0.32 +material_bed_temperature = 40 +material_diameter = 1.75 +material_print_temperature = 200 +material_print_temperature_layer_0 = 0 +speed_infill = =speed_print +speed_print = 50 +speed_support = 30 +speed_travel = 70 diff --git a/resources/quality/flashforge/flashforge_global_0.32_draft.inst.cfg b/resources/quality/flashforge/flashforge_global_0.32_draft.inst.cfg new file mode 100644 index 0000000000..2ad0be4952 --- /dev/null +++ b/resources/quality/flashforge/flashforge_global_0.32_draft.inst.cfg @@ -0,0 +1,27 @@ +[general] +version = 4 +name = Draft Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -5 +global_quality = True + +[values] +adhesion_type = brim +brim_width = 2.0 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +layer_height = 0.32 +layer_height_0 = 0.32 +material_bed_temperature = 40 +material_diameter = 1.75 +material_print_temperature = 200 +material_print_temperature_layer_0 = 0 +speed_infill = =speed_print +speed_print = 40 +speed_support = 30 +speed_travel = 70 diff --git a/resources/quality/flashforge/flashforge_global_0.40_coarse.inst.cfg b/resources/quality/flashforge/flashforge_global_0.40_coarse.inst.cfg new file mode 100644 index 0000000000..cca63f96fe --- /dev/null +++ b/resources/quality/flashforge/flashforge_global_0.40_coarse.inst.cfg @@ -0,0 +1,27 @@ +[general] +version = 4 +name = Coarse Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = coarse +weight = -6 +global_quality = True + +[values] +adhesion_type = brim +brim_width = 2.0 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +layer_height = 0.4 +layer_height_0 = 0.4 +material_bed_temperature = 40 +material_diameter = 1.75 +material_print_temperature = 205 +material_print_temperature_layer_0 = 0 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 70 diff --git a/resources/quality/flashforge/flashforge_global_0.48_extra_coarse.inst.cfg b/resources/quality/flashforge/flashforge_global_0.48_extra_coarse.inst.cfg new file mode 100644 index 0000000000..b20031490c --- /dev/null +++ b/resources/quality/flashforge/flashforge_global_0.48_extra_coarse.inst.cfg @@ -0,0 +1,27 @@ +[general] +version = 4 +name = Extra Coarse Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = Xcoarse +weight = -7 +global_quality = True + +[values] +adhesion_type = brim +brim_width = 3.0 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +layer_height = 0.48 +layer_height_0 = 0.48 +material_bed_temperature = 40 +material_diameter = 1.75 +material_print_temperature = 205 +material_print_temperature_layer_0 = 0 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 70 diff --git a/resources/quality/flashforge/petg/flashforge_0.2_petg_super.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.2_petg_super.inst.cfg new file mode 100644 index 0000000000..65dc98bb03 --- /dev/null +++ b/resources/quality/flashforge/petg/flashforge_0.2_petg_super.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Super Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_petg +variant = 0.2mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 75 +material_bed_temperature_layer_0 = 75 +material_print_temperature = 240 +material_print_temperature_layer_0 = 240 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/petg/flashforge_0.2_petg_ultra.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.2_petg_ultra.inst.cfg new file mode 100644 index 0000000000..2df9b6653d --- /dev/null +++ b/resources/quality/flashforge/petg/flashforge_0.2_petg_ultra.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Ultra Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = ultra +material = generic_petg +variant = 0.2mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 75 +material_bed_temperature_layer_0 = 75 +material_print_temperature = 240 +material_print_temperature_layer_0 = 240 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/petg/flashforge_0.30_petg_adaptive.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.30_petg_adaptive.inst.cfg new file mode 100644 index 0000000000..3d4cd6a339 --- /dev/null +++ b/resources/quality/flashforge/petg/flashforge_0.30_petg_adaptive.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.3mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 75 +material_bed_temperature_layer_0 = 75 +material_print_temperature = 240 +material_print_temperature_layer_0 = 240 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/petg/flashforge_0.30_petg_standard.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.30_petg_standard.inst.cfg new file mode 100644 index 0000000000..7eedbc8fd0 --- /dev/null +++ b/resources/quality/flashforge/petg/flashforge_0.30_petg_standard.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Standard Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +material = generic_petg +variant = 0.3mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 75 +material_bed_temperature_layer_0 = 75 +material_print_temperature = 240 +material_print_temperature_layer_0 = 240 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/petg/flashforge_0.30_petg_super.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.30_petg_super.inst.cfg new file mode 100644 index 0000000000..8d54a72014 --- /dev/null +++ b/resources/quality/flashforge/petg/flashforge_0.30_petg_super.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Super Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_petg +variant = 0.3mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 75 +material_bed_temperature_layer_0 = 75 +material_print_temperature = 240 +material_print_temperature_layer_0 = 240 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/petg/flashforge_0.40_petg_adaptive.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.40_petg_adaptive.inst.cfg new file mode 100644 index 0000000000..9e715ffb17 --- /dev/null +++ b/resources/quality/flashforge/petg/flashforge_0.40_petg_adaptive.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.4mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 75 +material_bed_temperature_layer_0 = 75 +material_print_temperature = 240 +material_print_temperature_layer_0 = 240 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/petg/flashforge_0.40_petg_draft.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.40_petg_draft.inst.cfg new file mode 100644 index 0000000000..0bc15b0d88 --- /dev/null +++ b/resources/quality/flashforge/petg/flashforge_0.40_petg_draft.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Draft Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_petg +variant = 0.4mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 75 +material_bed_temperature_layer_0 = 75 +material_print_temperature = 240 +material_print_temperature_layer_0 = 240 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/petg/flashforge_0.40_petg_low.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.40_petg_low.inst.cfg new file mode 100644 index 0000000000..e96afdbf30 --- /dev/null +++ b/resources/quality/flashforge/petg/flashforge_0.40_petg_low.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Low Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_petg +variant = 0.4mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 75 +material_bed_temperature_layer_0 = 75 +material_print_temperature = 240 +material_print_temperature_layer_0 = 240 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/petg/flashforge_0.40_petg_standard.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.40_petg_standard.inst.cfg new file mode 100644 index 0000000000..c163de0011 --- /dev/null +++ b/resources/quality/flashforge/petg/flashforge_0.40_petg_standard.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Standard Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +material = generic_petg +variant = 0.4mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 75 +material_bed_temperature_layer_0 = 75 +material_print_temperature = 240 +material_print_temperature_layer_0 = 240 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/petg/flashforge_0.40_petg_super.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.40_petg_super.inst.cfg new file mode 100644 index 0000000000..0e260e6cf5 --- /dev/null +++ b/resources/quality/flashforge/petg/flashforge_0.40_petg_super.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Super Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_petg +variant = 0.4mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 75 +material_bed_temperature_layer_0 = 75 +material_print_temperature = 240 +material_print_temperature_layer_0 = 240 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/petg/flashforge_0.50_petg_adaptive.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.50_petg_adaptive.inst.cfg new file mode 100644 index 0000000000..0d7b5eee85 --- /dev/null +++ b/resources/quality/flashforge/petg/flashforge_0.50_petg_adaptive.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.5mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 75 +material_bed_temperature_layer_0 = 75 +material_print_temperature = 240 +material_print_temperature_layer_0 = 240 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/petg/flashforge_0.50_petg_coarse.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.50_petg_coarse.inst.cfg new file mode 100644 index 0000000000..f40bd3f8ff --- /dev/null +++ b/resources/quality/flashforge/petg/flashforge_0.50_petg_coarse.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Coarse Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = coarse +material = generic_petg +variant = 0.5mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 75 +material_bed_temperature_layer_0 = 75 +material_print_temperature = 240 +material_print_temperature_layer_0 = 240 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/petg/flashforge_0.50_petg_draft.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.50_petg_draft.inst.cfg new file mode 100644 index 0000000000..36aa939184 --- /dev/null +++ b/resources/quality/flashforge/petg/flashforge_0.50_petg_draft.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Draft Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_petg +variant = 0.5mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 75 +material_bed_temperature_layer_0 = 75 +material_print_temperature = 240 +material_print_temperature_layer_0 = 240 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/petg/flashforge_0.50_petg_low.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.50_petg_low.inst.cfg new file mode 100644 index 0000000000..e23b870f91 --- /dev/null +++ b/resources/quality/flashforge/petg/flashforge_0.50_petg_low.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Low Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_petg +variant = 0.5mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 75 +material_bed_temperature_layer_0 = 75 +material_print_temperature = 240 +material_print_temperature_layer_0 = 240 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 \ No newline at end of file diff --git a/resources/quality/flashforge/petg/flashforge_0.50_petg_standard.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.50_petg_standard.inst.cfg new file mode 100644 index 0000000000..dbc4682f66 --- /dev/null +++ b/resources/quality/flashforge/petg/flashforge_0.50_petg_standard.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Standard Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +material = generic_petg +variant = 0.5mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 75 +material_bed_temperature_layer_0 = 75 +material_print_temperature = 240 +material_print_temperature_layer_0 = 240 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/petg/flashforge_0.60_petg_draft.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.60_petg_draft.inst.cfg new file mode 100644 index 0000000000..c53fe8e0eb --- /dev/null +++ b/resources/quality/flashforge/petg/flashforge_0.60_petg_draft.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Draft Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_petg +variant = 0.6mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 75 +material_bed_temperature_layer_0 = 75 +material_print_temperature = 240 +material_print_temperature_layer_0 = 240 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/petg/flashforge_0.60_petg_extra_coarse.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.60_petg_extra_coarse.inst.cfg new file mode 100644 index 0000000000..44c12dd620 --- /dev/null +++ b/resources/quality/flashforge/petg/flashforge_0.60_petg_extra_coarse.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Extra Coarse Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = Xcoarse +material = generic_petg +variant = 0.6mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 75 +material_bed_temperature_layer_0 = 75 +material_print_temperature = 240 +material_print_temperature_layer_0 = 240 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/petg/flashforge_0.60_petg_standard.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.60_petg_standard.inst.cfg new file mode 100644 index 0000000000..7adb943d01 --- /dev/null +++ b/resources/quality/flashforge/petg/flashforge_0.60_petg_standard.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Standard Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +material = generic_petg +variant = 0.6mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 75 +material_bed_temperature_layer_0 = 75 +material_print_temperature = 240 +material_print_temperature_layer_0 = 240 +speed_infill = =speed_print +speed_print = 30 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/pla/flashforge_0.20_pla_super.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.20_pla_super.inst.cfg new file mode 100644 index 0000000000..342083a41d --- /dev/null +++ b/resources/quality/flashforge/pla/flashforge_0.20_pla_super.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Super Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_pla +variant = 0.2mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 200 +material_print_temperature_layer_0 = 200 +speed_infill = =speed_print +speed_print = 50 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/pla/flashforge_0.20_pla_ultra.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.20_pla_ultra.inst.cfg new file mode 100644 index 0000000000..eee88b2723 --- /dev/null +++ b/resources/quality/flashforge/pla/flashforge_0.20_pla_ultra.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Ultra Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = ultra +material = generic_pla +variant = 0.2mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 200 +material_print_temperature_layer_0 = 200 +speed_infill = =speed_print +speed_print = 50 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/pla/flashforge_0.30_pla_adaptive.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.30_pla_adaptive.inst.cfg new file mode 100644 index 0000000000..86affaba79 --- /dev/null +++ b/resources/quality/flashforge/pla/flashforge_0.30_pla_adaptive.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.3mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 200 +material_print_temperature_layer_0 = 200 +speed_infill = =speed_print +speed_print = 50 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/pla/flashforge_0.30_pla_standard.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.30_pla_standard.inst.cfg new file mode 100644 index 0000000000..88c4035d4f --- /dev/null +++ b/resources/quality/flashforge/pla/flashforge_0.30_pla_standard.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Standard Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +material = generic_pla +variant = 0.3mm Nozzle + +[values] +layer_height_0 = 0.24 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 200 +material_print_temperature_layer_0 = 200 +speed_infill = =speed_print +speed_print = 50 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/pla/flashforge_0.30_pla_super.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.30_pla_super.inst.cfg new file mode 100644 index 0000000000..c1ba75374f --- /dev/null +++ b/resources/quality/flashforge/pla/flashforge_0.30_pla_super.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Super Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_pla +variant = 0.3mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 200 +material_print_temperature_layer_0 = 200 +speed_infill = =speed_print +speed_print = 50 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/pla/flashforge_0.40_pla_adaptive.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.40_pla_adaptive.inst.cfg new file mode 100644 index 0000000000..0eec95632e --- /dev/null +++ b/resources/quality/flashforge/pla/flashforge_0.40_pla_adaptive.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.4mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 200 +material_print_temperature_layer_0 = 200 +speed_infill = =speed_print +speed_print = 50 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/pla/flashforge_0.40_pla_draft.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.40_pla_draft.inst.cfg new file mode 100644 index 0000000000..b2891ac29b --- /dev/null +++ b/resources/quality/flashforge/pla/flashforge_0.40_pla_draft.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Draft Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_pla +variant = 0.4mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 200 +material_print_temperature_layer_0 = 200 +speed_infill = =speed_print +speed_print = 50 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/pla/flashforge_0.40_pla_low.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.40_pla_low.inst.cfg new file mode 100644 index 0000000000..360a2d4644 --- /dev/null +++ b/resources/quality/flashforge/pla/flashforge_0.40_pla_low.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Low Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_pla +variant = 0.4mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 200 +material_print_temperature_layer_0 = 200 +speed_infill = =speed_print +speed_print = 50 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/pla/flashforge_0.40_pla_standard.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.40_pla_standard.inst.cfg new file mode 100644 index 0000000000..6a584295a4 --- /dev/null +++ b/resources/quality/flashforge/pla/flashforge_0.40_pla_standard.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Standard Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +material = generic_pla +variant = 0.4mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 200 +material_print_temperature_layer_0 = 200 +speed_infill = =speed_print +speed_print = 50 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/pla/flashforge_0.40_pla_super.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.40_pla_super.inst.cfg new file mode 100644 index 0000000000..41b319984d --- /dev/null +++ b/resources/quality/flashforge/pla/flashforge_0.40_pla_super.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Super Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_pla +variant = 0.4mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 200 +material_print_temperature_layer_0 = 200 +speed_infill = =speed_print +speed_print = 50 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/pla/flashforge_0.50_pla_adaptive.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.50_pla_adaptive.inst.cfg new file mode 100644 index 0000000000..141e65d3d4 --- /dev/null +++ b/resources/quality/flashforge/pla/flashforge_0.50_pla_adaptive.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.5mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 200 +material_print_temperature_layer_0 = 200 +speed_infill = =speed_print +speed_print = 50 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/pla/flashforge_0.50_pla_coarse.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.50_pla_coarse.inst.cfg new file mode 100644 index 0000000000..bd06117355 --- /dev/null +++ b/resources/quality/flashforge/pla/flashforge_0.50_pla_coarse.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Coarse Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = coarse +material = generic_pla +variant = 0.5mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 205 +material_print_temperature_layer_0 = 210 +speed_infill = =speed_print +speed_print = 40 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/pla/flashforge_0.50_pla_draft.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.50_pla_draft.inst.cfg new file mode 100644 index 0000000000..f5f46af9cd --- /dev/null +++ b/resources/quality/flashforge/pla/flashforge_0.50_pla_draft.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Draft Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_pla +variant = 0.5mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 200 +material_print_temperature_layer_0 = 200 +speed_infill = =speed_print +speed_print = 50 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/pla/flashforge_0.50_pla_low.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.50_pla_low.inst.cfg new file mode 100644 index 0000000000..b56a5967db --- /dev/null +++ b/resources/quality/flashforge/pla/flashforge_0.50_pla_low.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Low Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_pla +variant = 0.5mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 200 +material_print_temperature_layer_0 = 200 +speed_infill = =speed_print +speed_print = 50 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/pla/flashforge_0.50_pla_standard.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.50_pla_standard.inst.cfg new file mode 100644 index 0000000000..efdfe415ef --- /dev/null +++ b/resources/quality/flashforge/pla/flashforge_0.50_pla_standard.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Standard Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +material = generic_pla +variant = 0.5mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 200 +material_print_temperature_layer_0 = 200 +speed_infill = =speed_print +speed_print = 50 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/pla/flashforge_0.60_pla_draft.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.60_pla_draft.inst.cfg new file mode 100644 index 0000000000..35821de108 --- /dev/null +++ b/resources/quality/flashforge/pla/flashforge_0.60_pla_draft.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Draft Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_pla +variant = 0.6mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 205 +material_print_temperature_layer_0 = 205 +speed_infill = =speed_print +speed_print = 50 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/pla/flashforge_0.60_pla_extra Coarse.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.60_pla_extra Coarse.inst.cfg new file mode 100644 index 0000000000..5c52cf96ff --- /dev/null +++ b/resources/quality/flashforge/pla/flashforge_0.60_pla_extra Coarse.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Extra Coarse Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = Xcoarse +material = generic_pla +variant = 0.6mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 205 +material_print_temperature_layer_0 = 210 +speed_infill = =speed_print +speed_print = 40 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/pla/flashforge_0.60_pla_standard.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.60_pla_standard.inst.cfg new file mode 100644 index 0000000000..b3e22f4c28 --- /dev/null +++ b/resources/quality/flashforge/pla/flashforge_0.60_pla_standard.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Standard Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +material = generic_pla +variant = 0.6mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 205 +material_print_temperature_layer_0 = 205 +speed_infill = =speed_print +speed_print = 50 +speed_support = 30 +speed_travel = 100 diff --git a/resources/quality/flashforge/tpu/flashforge_0.40_tpu_adaptive.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.40_tpu_adaptive.inst.cfg new file mode 100644 index 0000000000..e8b39c5b55 --- /dev/null +++ b/resources/quality/flashforge/tpu/flashforge_0.40_tpu_adaptive.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.4mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 15 +speed_layer_0 = 10 +speed_support = 15 +speed_travel = 100 diff --git a/resources/quality/flashforge/tpu/flashforge_0.40_tpu_draft.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.40_tpu_draft.inst.cfg new file mode 100644 index 0000000000..3e7451fefa --- /dev/null +++ b/resources/quality/flashforge/tpu/flashforge_0.40_tpu_draft.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Draft Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_tpu +variant = 0.4mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 15 +speed_layer_0 = 10 +speed_support = 15 +speed_travel = 100 diff --git a/resources/quality/flashforge/tpu/flashforge_0.40_tpu_low.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.40_tpu_low.inst.cfg new file mode 100644 index 0000000000..8a0c380410 --- /dev/null +++ b/resources/quality/flashforge/tpu/flashforge_0.40_tpu_low.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Low Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_tpu +variant = 0.4mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 15 +speed_layer_0 = 10 +speed_support = 15 +speed_travel = 100 diff --git a/resources/quality/flashforge/tpu/flashforge_0.40_tpu_standard.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.40_tpu_standard.inst.cfg new file mode 100644 index 0000000000..e0155ce764 --- /dev/null +++ b/resources/quality/flashforge/tpu/flashforge_0.40_tpu_standard.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Standard Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +material = generic_tpu +variant = 0.4mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 15 +speed_layer_0 = 10 +speed_support = 15 +speed_travel = 100 diff --git a/resources/quality/flashforge/tpu/flashforge_0.40_tpu_super.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.40_tpu_super.inst.cfg new file mode 100644 index 0000000000..555ec028aa --- /dev/null +++ b/resources/quality/flashforge/tpu/flashforge_0.40_tpu_super.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Super Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_tpu +variant = 0.4mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 15 +speed_layer_0 = 10 +speed_support = 15 +speed_travel = 100 diff --git a/resources/quality/flashforge/tpu/flashforge_0.50_tpu_adaptive.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.50_tpu_adaptive.inst.cfg new file mode 100644 index 0000000000..b3584ae420 --- /dev/null +++ b/resources/quality/flashforge/tpu/flashforge_0.50_tpu_adaptive.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Dynamic Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.5mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 15 +speed_layer_0 = 10 +speed_support = 15 +speed_travel = 100 diff --git a/resources/quality/flashforge/tpu/flashforge_0.50_tpu_draft.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.50_tpu_draft.inst.cfg new file mode 100644 index 0000000000..cf1bc8eddd --- /dev/null +++ b/resources/quality/flashforge/tpu/flashforge_0.50_tpu_draft.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Draft Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_tpu +variant = 0.5mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 15 +speed_layer_0 = 10 +speed_support = 15 +speed_travel = 100 diff --git a/resources/quality/flashforge/tpu/flashforge_0.50_tpu_low.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.50_tpu_low.inst.cfg new file mode 100644 index 0000000000..98992a13d8 --- /dev/null +++ b/resources/quality/flashforge/tpu/flashforge_0.50_tpu_low.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Low Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_tpu +variant = 0.5mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 15 +speed_layer_0 = 10 +speed_support = 15 +speed_travel = 100 diff --git a/resources/quality/flashforge/tpu/flashforge_0.50_tpu_standard.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.50_tpu_standard.inst.cfg new file mode 100644 index 0000000000..a2c587cd73 --- /dev/null +++ b/resources/quality/flashforge/tpu/flashforge_0.50_tpu_standard.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Standard Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +material = generic_tpu +variant = 0.5mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 15 +speed_layer_0 = 10 +speed_support = 15 +speed_travel = 100 diff --git a/resources/quality/flashforge/tpu/flashforge_0.60_tpu_draft.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.60_tpu_draft.inst.cfg new file mode 100644 index 0000000000..517430a1af --- /dev/null +++ b/resources/quality/flashforge/tpu/flashforge_0.60_tpu_draft.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Draft Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_tpu +variant = 0.6mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 15 +speed_layer_0 = 10 +speed_support = 15 +speed_travel = 100 diff --git a/resources/quality/flashforge/tpu/flashforge_0.60_tpu_low.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.60_tpu_low.inst.cfg new file mode 100644 index 0000000000..057992d8f0 --- /dev/null +++ b/resources/quality/flashforge/tpu/flashforge_0.60_tpu_low.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Low Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_tpu +variant = 0.6mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 15 +speed_layer_0 = 10 +speed_support = 15 +speed_travel = 100 diff --git a/resources/quality/flashforge/tpu/flashforge_0.60_tpu_standard.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.60_tpu_standard.inst.cfg new file mode 100644 index 0000000000..5af1e45b18 --- /dev/null +++ b/resources/quality/flashforge/tpu/flashforge_0.60_tpu_standard.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Standard Quality +definition = flashforge_base + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +material = generic_tpu +variant = 0.6mm Nozzle + +[values] +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +material_bed_temperature = 35 +material_bed_temperature_layer_0 = 40 +material_print_temperature = 230 +material_print_temperature_layer_0 = 235 +speed_infill = =speed_print +speed_print = 15 +speed_layer_0 = 10 +speed_support = 15 +speed_travel = 100 diff --git a/resources/quality/flyingbear/abs/flyingbear_0.25_abs_super.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.25_abs_super.inst.cfg index 46da7e3d5c..3709cf3bb7 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.25_abs_super.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.25_abs_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/flyingbear/abs/flyingbear_0.25_abs_ultra.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.25_abs_ultra.inst.cfg index 60819c9d93..fbfe469428 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.25_abs_ultra.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.25_abs_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra material = generic_abs diff --git a/resources/quality/flyingbear/abs/flyingbear_0.30_abs_adaptive.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.30_abs_adaptive.inst.cfg index 31e64d16d1..30d590e1ad 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.30_abs_adaptive.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.30_abs_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_abs diff --git a/resources/quality/flyingbear/abs/flyingbear_0.30_abs_standard.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.30_abs_standard.inst.cfg index 9709177bb0..936e870cd9 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.30_abs_standard.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.30_abs_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_abs diff --git a/resources/quality/flyingbear/abs/flyingbear_0.30_abs_super.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.30_abs_super.inst.cfg index 366c0a27d2..65b04bcb71 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.30_abs_super.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.30_abs_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_adaptive.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_adaptive.inst.cfg index 684c89048f..57fed4247f 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_adaptive.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_abs diff --git a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_low.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_low.inst.cfg index b63f676ab8..c3b8418695 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_low.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_standard.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_standard.inst.cfg index 2522cf753e..1e46db043a 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_standard.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_abs diff --git a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_super.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_super.inst.cfg index 04c5bcf001..c1221ff051 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_super.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/flyingbear/abs/flyingbear_0.50_abs_adaptive.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_adaptive.inst.cfg index ea45626c8d..7c4ca634d7 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.50_abs_adaptive.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_abs diff --git a/resources/quality/flyingbear/abs/flyingbear_0.50_abs_draft.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_draft.inst.cfg index 158f63fe9a..47b0577d95 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.50_abs_draft.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_abs diff --git a/resources/quality/flyingbear/abs/flyingbear_0.50_abs_low.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_low.inst.cfg index 576d9d85de..4a457934b1 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.50_abs_low.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/flyingbear/abs/flyingbear_0.50_abs_standard.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_standard.inst.cfg index a8e42daddb..800376b70f 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.50_abs_standard.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_abs diff --git a/resources/quality/flyingbear/abs/flyingbear_0.60_abs_draft.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.60_abs_draft.inst.cfg index ae2ab02c98..f1a3f0daad 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.60_abs_draft.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.60_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_abs diff --git a/resources/quality/flyingbear/abs/flyingbear_0.60_abs_low.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.60_abs_low.inst.cfg index 68bc92debb..3c65bf635f 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.60_abs_low.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.60_abs_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/flyingbear/abs/flyingbear_0.60_abs_standard.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.60_abs_standard.inst.cfg index 52d418a842..83c9959a20 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.60_abs_standard.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.60_abs_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_abs diff --git a/resources/quality/flyingbear/abs/flyingbear_0.80_abs_coarse.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.80_abs_coarse.inst.cfg index 30bbf07397..1757c397fa 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.80_abs_coarse.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.80_abs_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse material = generic_abs diff --git a/resources/quality/flyingbear/abs/flyingbear_0.80_abs_draft.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.80_abs_draft.inst.cfg index 9f964ea7b2..24af305655 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.80_abs_draft.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.80_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_abs diff --git a/resources/quality/flyingbear/flyingbear_global_0.08_ultra.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.08_ultra.inst.cfg index cccc0522d8..437a5cd426 100644 --- a/resources/quality/flyingbear/flyingbear_global_0.08_ultra.inst.cfg +++ b/resources/quality/flyingbear/flyingbear_global_0.08_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra weight = 0 diff --git a/resources/quality/flyingbear/flyingbear_global_0.12_super.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.12_super.inst.cfg index 7d63d82166..931eb692af 100644 --- a/resources/quality/flyingbear/flyingbear_global_0.12_super.inst.cfg +++ b/resources/quality/flyingbear/flyingbear_global_0.12_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super weight = -1 diff --git a/resources/quality/flyingbear/flyingbear_global_0.16_adaptive.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.16_adaptive.inst.cfg index edab4db0c4..eef4c5aecb 100644 --- a/resources/quality/flyingbear/flyingbear_global_0.16_adaptive.inst.cfg +++ b/resources/quality/flyingbear/flyingbear_global_0.16_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive weight = -2 diff --git a/resources/quality/flyingbear/flyingbear_global_0.20_standard.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.20_standard.inst.cfg index 27a6624a66..f097f467c0 100644 --- a/resources/quality/flyingbear/flyingbear_global_0.20_standard.inst.cfg +++ b/resources/quality/flyingbear/flyingbear_global_0.20_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = -3 diff --git a/resources/quality/flyingbear/flyingbear_global_0.28_low.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.28_low.inst.cfg index e5e4894e9e..417651d774 100644 --- a/resources/quality/flyingbear/flyingbear_global_0.28_low.inst.cfg +++ b/resources/quality/flyingbear/flyingbear_global_0.28_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low weight = -4 diff --git a/resources/quality/flyingbear/flyingbear_global_0.32_draft.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.32_draft.inst.cfg index 1b38448908..68b9ee5bec 100644 --- a/resources/quality/flyingbear/flyingbear_global_0.32_draft.inst.cfg +++ b/resources/quality/flyingbear/flyingbear_global_0.32_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -5 diff --git a/resources/quality/flyingbear/flyingbear_global_0.40_coarse.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.40_coarse.inst.cfg index 0417904eac..e46deb7a33 100644 --- a/resources/quality/flyingbear/flyingbear_global_0.40_coarse.inst.cfg +++ b/resources/quality/flyingbear/flyingbear_global_0.40_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -6 diff --git a/resources/quality/flyingbear/hips/flyingbear_0.25_hips_super.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.25_hips_super.inst.cfg index 74094e8449..2cf59924f1 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.25_hips_super.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.25_hips_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_hips diff --git a/resources/quality/flyingbear/hips/flyingbear_0.25_hips_ultra.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.25_hips_ultra.inst.cfg index 0cc01ae806..9f1f346986 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.25_hips_ultra.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.25_hips_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra material = generic_hips diff --git a/resources/quality/flyingbear/hips/flyingbear_0.30_hips_adaptive.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.30_hips_adaptive.inst.cfg index ce6f7552a0..6d5514a975 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.30_hips_adaptive.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.30_hips_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_hips diff --git a/resources/quality/flyingbear/hips/flyingbear_0.30_hips_standard.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.30_hips_standard.inst.cfg index fe82b5404a..2035ab42be 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.30_hips_standard.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.30_hips_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_hips diff --git a/resources/quality/flyingbear/hips/flyingbear_0.30_hips_super.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.30_hips_super.inst.cfg index 761dd40dc6..1dd5710176 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.30_hips_super.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.30_hips_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_hips diff --git a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_adaptive.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_adaptive.inst.cfg index ce9f4abba4..2c1a93902f 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_adaptive.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_hips diff --git a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_low.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_low.inst.cfg index d1302bf9b3..e5288aac86 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_low.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_hips diff --git a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_standard.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_standard.inst.cfg index 722841e8dd..a89963cf0b 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_standard.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_hips diff --git a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_super.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_super.inst.cfg index 4a913ef698..eca4c840ec 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_super.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_hips diff --git a/resources/quality/flyingbear/hips/flyingbear_0.50_hips_adaptive.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_adaptive.inst.cfg index ee847b4800..da6ad81293 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.50_hips_adaptive.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_hips diff --git a/resources/quality/flyingbear/hips/flyingbear_0.50_hips_draft.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_draft.inst.cfg index ae7c1ebdc3..de1ed7aec4 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.50_hips_draft.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_hips diff --git a/resources/quality/flyingbear/hips/flyingbear_0.50_hips_low.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_low.inst.cfg index 6a7d064060..2d29a1416a 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.50_hips_low.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_hips diff --git a/resources/quality/flyingbear/hips/flyingbear_0.50_hips_standard.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_standard.inst.cfg index 45bcf498d4..eef75606bd 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.50_hips_standard.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_hips diff --git a/resources/quality/flyingbear/hips/flyingbear_0.60_hips_draft.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.60_hips_draft.inst.cfg index cc7e034c74..4eab5921e9 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.60_hips_draft.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.60_hips_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_hips diff --git a/resources/quality/flyingbear/hips/flyingbear_0.60_hips_low.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.60_hips_low.inst.cfg index 19e1fb6540..aef96881aa 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.60_hips_low.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.60_hips_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_hips diff --git a/resources/quality/flyingbear/hips/flyingbear_0.60_hips_standard.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.60_hips_standard.inst.cfg index 9c8db9c3dc..4433d84b81 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.60_hips_standard.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.60_hips_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_hips diff --git a/resources/quality/flyingbear/hips/flyingbear_0.80_hips_coarse.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.80_hips_coarse.inst.cfg index 1bffc1c0d6..a6769c1195 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.80_hips_coarse.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.80_hips_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse material = generic_hips diff --git a/resources/quality/flyingbear/hips/flyingbear_0.80_hips_draft.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.80_hips_draft.inst.cfg index cad1c23588..64b24cc418 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.80_hips_draft.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.80_hips_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_hips diff --git a/resources/quality/flyingbear/petg/flyingbear_0.25_petg_super.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.25_petg_super.inst.cfg index 92960388e7..6731166931 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.25_petg_super.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.25_petg_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/flyingbear/petg/flyingbear_0.25_petg_ultra.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.25_petg_ultra.inst.cfg index 5c521e1d16..6a14d5101e 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.25_petg_ultra.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.25_petg_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra material = generic_petg diff --git a/resources/quality/flyingbear/petg/flyingbear_0.30_petg_adaptive.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.30_petg_adaptive.inst.cfg index e5d422212a..6722b360cb 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.30_petg_adaptive.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.30_petg_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_petg diff --git a/resources/quality/flyingbear/petg/flyingbear_0.30_petg_standard.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.30_petg_standard.inst.cfg index b0ec869ad1..f9f861272c 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.30_petg_standard.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.30_petg_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_petg diff --git a/resources/quality/flyingbear/petg/flyingbear_0.30_petg_super.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.30_petg_super.inst.cfg index 220f9c7a23..6ce94fcc68 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.30_petg_super.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.30_petg_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_adaptive.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_adaptive.inst.cfg index 5cf7c17b9e..e3c454d1c6 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_adaptive.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_petg diff --git a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_low.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_low.inst.cfg index 228e47b2a5..ff42919ade 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_low.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_standard.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_standard.inst.cfg index 878e38ef82..133da1b65a 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_standard.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_petg diff --git a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_super.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_super.inst.cfg index d69174433f..449547dae6 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_super.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/flyingbear/petg/flyingbear_0.50_petg_adaptive.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_adaptive.inst.cfg index f04efc28e2..b0a9548ebe 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.50_petg_adaptive.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_petg diff --git a/resources/quality/flyingbear/petg/flyingbear_0.50_petg_draft.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_draft.inst.cfg index 2e85f48592..ba274780cc 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.50_petg_draft.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_petg diff --git a/resources/quality/flyingbear/petg/flyingbear_0.50_petg_low.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_low.inst.cfg index 6ae7b08313..a2c5069b7f 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.50_petg_low.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/flyingbear/petg/flyingbear_0.50_petg_standard.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_standard.inst.cfg index 75f2291e9d..7e840fd56d 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.50_petg_standard.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_petg diff --git a/resources/quality/flyingbear/petg/flyingbear_0.60_petg_draft.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.60_petg_draft.inst.cfg index a058985dfb..5ff1a83548 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.60_petg_draft.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.60_petg_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_petg diff --git a/resources/quality/flyingbear/petg/flyingbear_0.60_petg_low.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.60_petg_low.inst.cfg index 077d3a49e3..1131634c17 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.60_petg_low.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.60_petg_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/flyingbear/petg/flyingbear_0.60_petg_standard.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.60_petg_standard.inst.cfg index e43bdc48d2..8ba87ef9cd 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.60_petg_standard.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.60_petg_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_petg diff --git a/resources/quality/flyingbear/petg/flyingbear_0.80_petg_coarse.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.80_petg_coarse.inst.cfg index f7b0e2a5e6..ab164285fe 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.80_petg_coarse.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.80_petg_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse material = generic_petg diff --git a/resources/quality/flyingbear/petg/flyingbear_0.80_petg_draft.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.80_petg_draft.inst.cfg index d10fa03c4e..c7a70242fe 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.80_petg_draft.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.80_petg_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_petg diff --git a/resources/quality/flyingbear/pla/flyingbear_0.25_pla_super.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.25_pla_super.inst.cfg index ba4c5e1648..6a584cb6ea 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.25_pla_super.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.25_pla_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/flyingbear/pla/flyingbear_0.25_pla_ultra.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.25_pla_ultra.inst.cfg index 1e8ad9b833..f738524baf 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.25_pla_ultra.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.25_pla_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra material = generic_pla diff --git a/resources/quality/flyingbear/pla/flyingbear_0.30_pla_adaptive.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.30_pla_adaptive.inst.cfg index ea3cefebe8..bbf182d774 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.30_pla_adaptive.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.30_pla_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_pla diff --git a/resources/quality/flyingbear/pla/flyingbear_0.30_pla_standard.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.30_pla_standard.inst.cfg index 3dd1a3440e..da9afe8add 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.30_pla_standard.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.30_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pla diff --git a/resources/quality/flyingbear/pla/flyingbear_0.30_pla_super.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.30_pla_super.inst.cfg index 48da029b38..2daf08080d 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.30_pla_super.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.30_pla_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/flyingbear/pla/flyingbear_0.40_pla_adaptive.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.40_pla_adaptive.inst.cfg index b283f30fed..66d5c8d778 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.40_pla_adaptive.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.40_pla_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_pla diff --git a/resources/quality/flyingbear/pla/flyingbear_0.40_pla_low.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.40_pla_low.inst.cfg index 769198fa11..233c774058 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.40_pla_low.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.40_pla_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/flyingbear/pla/flyingbear_0.40_pla_standard.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.40_pla_standard.inst.cfg index 036eda137b..2b8e97a8bb 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.40_pla_standard.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.40_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pla diff --git a/resources/quality/flyingbear/pla/flyingbear_0.40_pla_super.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.40_pla_super.inst.cfg index 25d6a9f318..c181b48509 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.40_pla_super.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.40_pla_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/flyingbear/pla/flyingbear_0.50_pla_adaptive.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_adaptive.inst.cfg index 4b8d01d7e2..60edc2f583 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.50_pla_adaptive.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_pla diff --git a/resources/quality/flyingbear/pla/flyingbear_0.50_pla_draft.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_draft.inst.cfg index 3b9a88ff47..75f1b8cc9d 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.50_pla_draft.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_pla diff --git a/resources/quality/flyingbear/pla/flyingbear_0.50_pla_low.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_low.inst.cfg index 615c167334..a14cefa6af 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.50_pla_low.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/flyingbear/pla/flyingbear_0.50_pla_standard.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_standard.inst.cfg index bce2e6c152..1addea3aca 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.50_pla_standard.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pla diff --git a/resources/quality/flyingbear/pla/flyingbear_0.60_pla_draft.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.60_pla_draft.inst.cfg index 6897d01deb..a3ae82072c 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.60_pla_draft.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.60_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_pla diff --git a/resources/quality/flyingbear/pla/flyingbear_0.60_pla_low.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.60_pla_low.inst.cfg index 5e83592372..89f538e4c2 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.60_pla_low.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.60_pla_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/flyingbear/pla/flyingbear_0.60_pla_standard.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.60_pla_standard.inst.cfg index 131d2f8834..1825ffb259 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.60_pla_standard.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.60_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pla diff --git a/resources/quality/flyingbear/pla/flyingbear_0.80_pla_coarse.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.80_pla_coarse.inst.cfg index aa65064905..28a435868e 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.80_pla_coarse.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.80_pla_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse material = generic_pla diff --git a/resources/quality/flyingbear/pla/flyingbear_0.80_pla_draft.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.80_pla_draft.inst.cfg index 620467c578..c41241e213 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.80_pla_draft.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.80_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_pla diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.25_plapro_super.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.25_plapro_super.inst.cfg index 80177b9861..9c10206210 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.25_plapro_super.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.25_plapro_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = eSUN_PLA_PRO_Black diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.25_plapro_ultra.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.25_plapro_ultra.inst.cfg index ef05d1e5f8..c612089c4a 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.25_plapro_ultra.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.25_plapro_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra material = eSUN_PLA_PRO_Black diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_adaptive.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_adaptive.inst.cfg index 51cbc0ce26..83ddf905d1 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_adaptive.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = eSUN_PLA_PRO_Black diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_standard.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_standard.inst.cfg index dd19777925..27b04e47c5 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_standard.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = eSUN_PLA_PRO_Black diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_super.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_super.inst.cfg index 129f47da6d..0aca7549bb 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_super.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = eSUN_PLA_PRO_Black diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_adaptive.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_adaptive.inst.cfg index 54e28d4543..ebd08ab547 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_adaptive.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = eSUN_PLA_PRO_Black diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_low.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_low.inst.cfg index 9984d7288d..ab8eba3de4 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_low.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = eSUN_PLA_PRO_Black diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_standard.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_standard.inst.cfg index 9eca5e2499..167faf573d 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_standard.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = eSUN_PLA_PRO_Black diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_super.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_super.inst.cfg index 15bdcbc3f8..ee77455488 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_super.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = eSUN_PLA_PRO_Black diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_adaptive.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_adaptive.inst.cfg index ad06743572..99ac15affa 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_adaptive.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = eSUN_PLA_PRO_Black diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_draft.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_draft.inst.cfg index 8513b1c310..21e7af117a 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_draft.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = eSUN_PLA_PRO_Black diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_low.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_low.inst.cfg index 0b53a9edec..39797ae963 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_low.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = eSUN_PLA_PRO_Black diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_standard.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_standard.inst.cfg index 9119c62ebd..e4ae3eded8 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_standard.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = eSUN_PLA_PRO_Black diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_draft.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_draft.inst.cfg index 05240327c1..4edd758630 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_draft.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = eSUN_PLA_PRO_Black diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_low.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_low.inst.cfg index 20dbdc6409..435ac7c14b 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_low.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = eSUN_PLA_PRO_Black diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_standard.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_standard.inst.cfg index 60a2426276..07556ca30f 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_standard.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = eSUN_PLA_PRO_Black diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_coarse.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_coarse.inst.cfg index 1a640a8421..d276f644d5 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_coarse.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse material = eSUN_PLA_PRO_Black diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_draft.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_draft.inst.cfg index 918771e1dc..c4826fa547 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_draft.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = eSUN_PLA_PRO_Black diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_adaptive.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_adaptive.inst.cfg index f53bcfa071..a75a11e794 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_adaptive.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_tpu diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_low.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_low.inst.cfg index fc59c61cba..cc6595044b 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_low.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_tpu diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_standard.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_standard.inst.cfg index df34d67357..bf7a0726af 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_standard.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_tpu diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_super.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_super.inst.cfg index e5c139a63e..3291fc4192 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_super.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_tpu diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_adaptive.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_adaptive.inst.cfg index 78db7430cc..db080a7758 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_adaptive.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_tpu diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_draft.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_draft.inst.cfg index 3631ddc8a4..d996c0779a 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_draft.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_tpu diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_low.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_low.inst.cfg index e60a9e8a40..aae583c753 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_low.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_tpu diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_standard.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_standard.inst.cfg index 62c72c8bf3..a5daba7226 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_standard.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_tpu diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_draft.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_draft.inst.cfg index 7099b02d0c..d4c9194418 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_draft.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_tpu diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_low.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_low.inst.cfg index 9519e5d0a6..6cec4fb781 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_low.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_tpu diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_standard.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_standard.inst.cfg index e051ce8d08..b9346e0f40 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_standard.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_tpu diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_coarse.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_coarse.inst.cfg index 38a1b1bfb0..5703fe2182 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_coarse.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse material = generic_tpu diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_draft.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_draft.inst.cfg index e8a99ec905..c90dffdda7 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_draft.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_tpu diff --git a/resources/quality/fusedform/base/base_PVA_draft.inst.cfg b/resources/quality/fusedform/base/base_PVA_draft.inst.cfg index 1a14478d70..d35473bd73 100644 --- a/resources/quality/fusedform/base/base_PVA_draft.inst.cfg +++ b/resources/quality/fusedform/base/base_PVA_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/fusedform/base/base_PVA_high.inst.cfg b/resources/quality/fusedform/base/base_PVA_high.inst.cfg index 86012c4ad2..d7857d6741 100644 --- a/resources/quality/fusedform/base/base_PVA_high.inst.cfg +++ b/resources/quality/fusedform/base/base_PVA_high.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = -1 diff --git a/resources/quality/fusedform/base/base_PVA_normal.inst.cfg b/resources/quality/fusedform/base/base_PVA_normal.inst.cfg index b4b59a2476..97a1a8783a 100644 --- a/resources/quality/fusedform/base/base_PVA_normal.inst.cfg +++ b/resources/quality/fusedform/base/base_PVA_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = -2 diff --git a/resources/quality/fusedform/base/base_abs_draft.inst.cfg b/resources/quality/fusedform/base/base_abs_draft.inst.cfg index fe228582e2..20027361f1 100644 --- a/resources/quality/fusedform/base/base_abs_draft.inst.cfg +++ b/resources/quality/fusedform/base/base_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_abs diff --git a/resources/quality/fusedform/base/base_abs_high.inst.cfg b/resources/quality/fusedform/base/base_abs_high.inst.cfg index 25f4abe26d..535bfbfe68 100644 --- a/resources/quality/fusedform/base/base_abs_high.inst.cfg +++ b/resources/quality/fusedform/base/base_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = -1 diff --git a/resources/quality/fusedform/base/base_abs_normal.inst.cfg b/resources/quality/fusedform/base/base_abs_normal.inst.cfg index 702fd71d7f..23d4588297 100644 --- a/resources/quality/fusedform/base/base_abs_normal.inst.cfg +++ b/resources/quality/fusedform/base/base_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = -2 diff --git a/resources/quality/fusedform/base/base_abs_ultra_high.inst.cfg b/resources/quality/fusedform/base/base_abs_ultra_high.inst.cfg index 8a1c2c81ce..639094b47d 100644 --- a/resources/quality/fusedform/base/base_abs_ultra_high.inst.cfg +++ b/resources/quality/fusedform/base/base_abs_ultra_high.inst.cfg @@ -4,7 +4,7 @@ name = Ultra High Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type =ultra high weight = -1 diff --git a/resources/quality/fusedform/base/base_draft.inst.cfg b/resources/quality/fusedform/base/base_draft.inst.cfg index 434e5130b3..b6e8ccacfb 100644 --- a/resources/quality/fusedform/base/base_draft.inst.cfg +++ b/resources/quality/fusedform/base/base_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -4 diff --git a/resources/quality/fusedform/base/base_flex_high.inst.cfg b/resources/quality/fusedform/base/base_flex_high.inst.cfg index a842c25e0b..f12686a620 100644 --- a/resources/quality/fusedform/base/base_flex_high.inst.cfg +++ b/resources/quality/fusedform/base/base_flex_high.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = -1 diff --git a/resources/quality/fusedform/base/base_flex_normal.inst.cfg b/resources/quality/fusedform/base/base_flex_normal.inst.cfg index cc5ea842bb..3459cae147 100644 --- a/resources/quality/fusedform/base/base_flex_normal.inst.cfg +++ b/resources/quality/fusedform/base/base_flex_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = -2 diff --git a/resources/quality/fusedform/base/base_high.inst.cfg b/resources/quality/fusedform/base/base_high.inst.cfg index b02ef47528..5c886a078b 100644 --- a/resources/quality/fusedform/base/base_high.inst.cfg +++ b/resources/quality/fusedform/base/base_high.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = -1 diff --git a/resources/quality/fusedform/base/base_hips_draft.inst.cfg b/resources/quality/fusedform/base/base_hips_draft.inst.cfg index c1061abe98..e0b7fe9022 100644 --- a/resources/quality/fusedform/base/base_hips_draft.inst.cfg +++ b/resources/quality/fusedform/base/base_hips_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_hips diff --git a/resources/quality/fusedform/base/base_hips_high.inst.cfg b/resources/quality/fusedform/base/base_hips_high.inst.cfg index 8ea0458964..41ccc5276e 100644 --- a/resources/quality/fusedform/base/base_hips_high.inst.cfg +++ b/resources/quality/fusedform/base/base_hips_high.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = -1 diff --git a/resources/quality/fusedform/base/base_hips_normal.inst.cfg b/resources/quality/fusedform/base/base_hips_normal.inst.cfg index 1b3a407be4..921c5999d0 100644 --- a/resources/quality/fusedform/base/base_hips_normal.inst.cfg +++ b/resources/quality/fusedform/base/base_hips_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = -2 diff --git a/resources/quality/fusedform/base/base_hips_ultra_high.inst.cfg b/resources/quality/fusedform/base/base_hips_ultra_high.inst.cfg index f9ef4f7042..3372e01dfd 100644 --- a/resources/quality/fusedform/base/base_hips_ultra_high.inst.cfg +++ b/resources/quality/fusedform/base/base_hips_ultra_high.inst.cfg @@ -4,7 +4,7 @@ name = Ultra High Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type =ultra high weight = -1 diff --git a/resources/quality/fusedform/base/base_normal.inst.cfg b/resources/quality/fusedform/base/base_normal.inst.cfg index 05774db49c..6b431e22f3 100644 --- a/resources/quality/fusedform/base/base_normal.inst.cfg +++ b/resources/quality/fusedform/base/base_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = -2 diff --git a/resources/quality/fusedform/base/base_nylon_draft.inst.cfg b/resources/quality/fusedform/base/base_nylon_draft.inst.cfg index adfd943759..f7d794ff84 100644 --- a/resources/quality/fusedform/base/base_nylon_draft.inst.cfg +++ b/resources/quality/fusedform/base/base_nylon_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft material = generic_nylon diff --git a/resources/quality/fusedform/base/base_nylon_high.inst.cfg b/resources/quality/fusedform/base/base_nylon_high.inst.cfg index c9c3f38252..455f83b2a9 100644 --- a/resources/quality/fusedform/base/base_nylon_high.inst.cfg +++ b/resources/quality/fusedform/base/base_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = -1 diff --git a/resources/quality/fusedform/base/base_nylon_normal.inst.cfg b/resources/quality/fusedform/base/base_nylon_normal.inst.cfg index 83fc6dd543..40ace81308 100644 --- a/resources/quality/fusedform/base/base_nylon_normal.inst.cfg +++ b/resources/quality/fusedform/base/base_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = -2 diff --git a/resources/quality/fusedform/base/base_nylon_ultra_high.inst.cfg b/resources/quality/fusedform/base/base_nylon_ultra_high.inst.cfg index 67d4384610..16492cd812 100644 --- a/resources/quality/fusedform/base/base_nylon_ultra_high.inst.cfg +++ b/resources/quality/fusedform/base/base_nylon_ultra_high.inst.cfg @@ -4,7 +4,7 @@ name = Ultra High Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type =ultra high weight = -1 diff --git a/resources/quality/fusedform/base/base_petg_high.inst.cfg b/resources/quality/fusedform/base/base_petg_high.inst.cfg index 890d85ded5..dc74ae7622 100644 --- a/resources/quality/fusedform/base/base_petg_high.inst.cfg +++ b/resources/quality/fusedform/base/base_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = -1 diff --git a/resources/quality/fusedform/base/base_petg_normal.inst.cfg b/resources/quality/fusedform/base/base_petg_normal.inst.cfg index 862976042c..fbee281cbd 100644 --- a/resources/quality/fusedform/base/base_petg_normal.inst.cfg +++ b/resources/quality/fusedform/base/base_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = -2 diff --git a/resources/quality/fusedform/base/base_pla_draft.inst.cfg b/resources/quality/fusedform/base/base_pla_draft.inst.cfg index 35952fe582..a3f464203f 100644 --- a/resources/quality/fusedform/base/base_pla_draft.inst.cfg +++ b/resources/quality/fusedform/base/base_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -4 diff --git a/resources/quality/fusedform/base/base_pla_high.inst.cfg b/resources/quality/fusedform/base/base_pla_high.inst.cfg index 187723811c..a92c9a9175 100644 --- a/resources/quality/fusedform/base/base_pla_high.inst.cfg +++ b/resources/quality/fusedform/base/base_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = -1 diff --git a/resources/quality/fusedform/base/base_pla_normal.inst.cfg b/resources/quality/fusedform/base/base_pla_normal.inst.cfg index 87424e63a0..af4a1ff10b 100644 --- a/resources/quality/fusedform/base/base_pla_normal.inst.cfg +++ b/resources/quality/fusedform/base/base_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = -2 diff --git a/resources/quality/fusedform/base/base_pla_ultra_high.inst.cfg b/resources/quality/fusedform/base/base_pla_ultra_high.inst.cfg index 4e9f14101b..d3559e399d 100644 --- a/resources/quality/fusedform/base/base_pla_ultra_high.inst.cfg +++ b/resources/quality/fusedform/base/base_pla_ultra_high.inst.cfg @@ -4,7 +4,7 @@ name =Ultra High Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type =ultra high weight = -2 diff --git a/resources/quality/fusedform/base/base_ultra_high.inst.cfg b/resources/quality/fusedform/base/base_ultra_high.inst.cfg index 9562c35151..3b480fa5ee 100644 --- a/resources/quality/fusedform/base/base_ultra_high.inst.cfg +++ b/resources/quality/fusedform/base/base_ultra_high.inst.cfg @@ -4,7 +4,7 @@ name = Ultra High Quality definition = fusedform_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type =ultra high weight = -1 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg index 1105a85ad7..340046f66c 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Dual Normal Layers definition = gmax15plus_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg index ee60701845..c794fd627e 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Dual Thick Layers definition = gmax15plus_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = course weight = -2 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg index 0660b9a5d4..c3068d4e84 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Dual Thin Layers definition = gmax15plus_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg index 76fd05dc18..a59d26131a 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Dual Very Thick Layers definition = gmax15plus_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra_course weight = -3 diff --git a/resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg index 894c534f57..786206b92a 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Normal Layers definition = gmax15plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg index 0a20bc0c84..989e109484 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Thick Layers definition = gmax15plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = course weight = -2 diff --git a/resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg index d386201dbd..1e1ad041c3 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Thin Layers definition = gmax15plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg index 7cbc9fba9f..ca7b68ac53 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg @@ -4,7 +4,7 @@ name = gMax 1.5+ Very Thick Layers definition = gmax15plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra_course weight = -3 diff --git a/resources/quality/high.inst.cfg b/resources/quality/high.inst.cfg index 572e73ee15..1392702c36 100644 --- a/resources/quality/high.inst.cfg +++ b/resources/quality/high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = fdmprinter [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg b/resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg index 03a54f0887..5863653de3 100644 --- a/resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = hms434 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -1 diff --git a/resources/quality/hms434/hms434_global_High_Quality.inst.cfg b/resources/quality/hms434/hms434_global_High_Quality.inst.cfg index f30f14f752..8c846ebaab 100644 --- a/resources/quality/hms434/hms434_global_High_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = hms434 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg b/resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg index eb51b3db32..e04e341537 100644 --- a/resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = hms434 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg b/resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg index a98a9058be..61f407cec8 100644 --- a/resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg +++ b/resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = hms434 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg index 81d5ba2972..72b199af1e 100644 --- a/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = imade3d_jellybox [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_fine.inst.cfg index 99e72b6271..68926324c7 100644 --- a/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = imade3d_jellybox [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_medium.inst.cfg index 59ed5c65a9..5ff2ea6450 100644 --- a/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_medium.inst.cfg +++ b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_medium.inst.cfg @@ -4,7 +4,7 @@ name = Medium definition = imade3d_jellybox [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg index 58c142e212..256fd4134e 100644 --- a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = imade3d_jellybox [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_fine.inst.cfg index 452639d61e..3bc0a50583 100644 --- a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = imade3d_jellybox [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_medium.inst.cfg index 45e9e7cbe6..1000d2ff09 100644 --- a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_medium.inst.cfg +++ b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_medium.inst.cfg @@ -4,7 +4,7 @@ name = Medium definition = imade3d_jellybox [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_ultrafine.inst.cfg index f4ad147c4d..5d20dac337 100644 --- a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_ultrafine.inst.cfg @@ -4,7 +4,7 @@ name = UltraFine definition = imade3d_jellybox [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultrahigh weight = 2 diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg index 0a4db8d895..4ecf1dadb5 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = imade3d_jellybox [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg index 1f5e0c2009..5acfd2a019 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = imade3d_jellybox [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg index c22751abe2..96c271b0e3 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg @@ -4,7 +4,7 @@ name = Medium definition = imade3d_jellybox [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg index e0748b9a4c..79370a650e 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg @@ -4,7 +4,7 @@ name = UltraFine definition = imade3d_jellybox [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultrahigh weight = 2 diff --git a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_coarse.inst.cfg index c2ef898beb..5f76a37547 100644 --- a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = imade3d_jellybox_2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_fine.inst.cfg index 9f4d35b0d7..396e0b2414 100644 --- a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = imade3d_jellybox_2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_medium.inst.cfg index a46dee5c0d..d977ae4eea 100644 --- a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_medium.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_medium.inst.cfg @@ -4,7 +4,7 @@ name = Medium definition = imade3d_jellybox_2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_coarse.inst.cfg index 727c4626d3..122433bc80 100644 --- a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = imade3d_jellybox_2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_fine.inst.cfg index 72c9828d80..181938d32e 100644 --- a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = imade3d_jellybox_2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_medium.inst.cfg index e9707dd7d9..ff0c338a47 100644 --- a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_medium.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_medium.inst.cfg @@ -4,7 +4,7 @@ name = Medium definition = imade3d_jellybox_2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_ultrafine.inst.cfg index 092815eb87..8a65771716 100644 --- a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_ultrafine.inst.cfg @@ -4,7 +4,7 @@ name = UltraFine definition = imade3d_jellybox_2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultrahigh weight = 2 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg index cd4a0f0e51..5d7bbf0ad1 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = imade3d_jellybox_2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg index cc8c968b4b..e962a2d64f 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = imade3d_jellybox_2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg index 6b2927cc0a..d05daa790a 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = Medium definition = imade3d_jellybox_2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg index e224e35bb7..e1866eb1c7 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg @@ -4,7 +4,7 @@ name = UltraFine definition = imade3d_jellybox_2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultrahigh weight = 2 diff --git a/resources/quality/inat/inat_base_advanced_materials.inst.cfg b/resources/quality/inat/inat_base_advanced_materials.inst.cfg new file mode 100644 index 0000000000..643ec180b9 --- /dev/null +++ b/resources/quality/inat/inat_base_advanced_materials.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Advanced materials +definition = inat_base + +[metadata] +setting_version = 17 +type = quality +quality_type = normal_advanced +weight = -1 +global_quality = True + +[values] +layer_height = 0.2 +adhesion_type = brim +speed_layer_0 = 20 +speed_print = 60 +speed_travel = 100 +xy_offset_layer_0 = 0 +brim_width = =30*skirt_brim_line_width*initial_layer_line_width_factor/100.0 diff --git a/resources/quality/inat/inat_base_draft.inst.cfg b/resources/quality/inat/inat_base_draft.inst.cfg new file mode 100644 index 0000000000..1101ca24ed --- /dev/null +++ b/resources/quality/inat/inat_base_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft +definition = inat_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = 0 +global_quality = True + +[values] +layer_height = 0.32 +infill_sparse_density = 15 +speed_print = 80 diff --git a/resources/quality/inat/inat_base_fine.inst.cfg b/resources/quality/inat/inat_base_fine.inst.cfg new file mode 100644 index 0000000000..de47267b5a --- /dev/null +++ b/resources/quality/inat/inat_base_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Fine +definition = inat_base + +[metadata] +setting_version = 17 +type = quality +quality_type = fine +weight = 1 +global_quality = True + +[values] +layer_height = 0.12 \ No newline at end of file diff --git a/resources/quality/inat/inat_base_standard.inst.cfg b/resources/quality/inat/inat_base_standard.inst.cfg new file mode 100644 index 0000000000..3c98fb6e25 --- /dev/null +++ b/resources/quality/inat/inat_base_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard +definition = inat_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +weight = 0 +global_quality = True + +[values] +speed_print = 80 diff --git a/resources/quality/inat/inat_base_strong.inst.cfg b/resources/quality/inat/inat_base_strong.inst.cfg new file mode 100644 index 0000000000..5d77dfb63d --- /dev/null +++ b/resources/quality/inat/inat_base_strong.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Strong +definition = inat_base + +[metadata] +setting_version = 17 +type = quality +quality_type = strong +weight = -3 +global_quality = True + +[values] +speed_print = 50 +speed_layer_0 = 20 +wall_thickness = =8*wall_line_width +top_bottom_thickness = 2.0 +alternate_extra_perimeter = True +infill_sparse_density = 80 +cool_fan_enabled = False +adhesion_type = brim \ No newline at end of file diff --git a/resources/quality/inat/inat_base_tree_support.inst.cfg b/resources/quality/inat/inat_base_tree_support.inst.cfg new file mode 100644 index 0000000000..ba41419259 --- /dev/null +++ b/resources/quality/inat/inat_base_tree_support.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Tree supports +definition = inat_base + +[metadata] +setting_version = 17 +type = quality +quality_type = normal_tree_supp +weight = -2 +global_quality = True + +[values] +support_structure = tree +support_type = buildplate +support_enable = True diff --git a/resources/quality/jgaurora_a6/jgaurora_a6_0.12_detail.inst.cfg b/resources/quality/jgaurora_a6/jgaurora_a6_0.12_detail.inst.cfg new file mode 100644 index 0000000000..9b27a42c40 --- /dev/null +++ b/resources/quality/jgaurora_a6/jgaurora_a6_0.12_detail.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Detail 0.12 +definition = jgaurora_a6 + +[metadata] +setting_version = 17 +quality_type = detail +type = quality +weight = 0 +global_quality = true + +[values] +layer_height = 0.12 +layer_height_0 = 0.2 +initial_layer_line_width_factor = 150 +infill_before_walls = true +speed_print = 50 +speed_travel = 80 +retraction_amount = 4 +acceleration_enabled = True +adhesion_type = skirt +jerk_enabled = True +retraction_combing = infill +support_enable = False +travel_retract_before_outer_wall = True diff --git a/resources/quality/jgaurora_a6/jgaurora_a6_0.16_optimal.inst.cfg b/resources/quality/jgaurora_a6/jgaurora_a6_0.16_optimal.inst.cfg new file mode 100644 index 0000000000..3b0153d8d9 --- /dev/null +++ b/resources/quality/jgaurora_a6/jgaurora_a6_0.16_optimal.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Optimal 0.16 +definition = jgaurora_a6 + +[metadata] +quality_type = optimal +setting_version = 17 +type = quality +weight = -1 +global_quality = true + +[values] +layer_height = 0.16 +layer_height_0 = 0.2 +initial_layer_line_width_factor = 150 +infill_before_walls = true +speed_print = 55 +speed_travel = 80 +retraction_amount = 4 +adhesion_type = skirt +acceleration_enabled = True +jerk_enabled = True +retraction_combing = infill +support_enable = False +travel_retract_before_outer_wall = True diff --git a/resources/quality/jgaurora_a6/jgaurora_a6_0.24_draft.inst.cfg b/resources/quality/jgaurora_a6/jgaurora_a6_0.24_draft.inst.cfg new file mode 100644 index 0000000000..69b50881dd --- /dev/null +++ b/resources/quality/jgaurora_a6/jgaurora_a6_0.24_draft.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Draft 0.24 +definition = jgaurora_a6 + +[metadata] +quality_type = draft +setting_version = 17 +type = quality +weight = -3 +global_quality = true + +[values] +layer_height = 0.24 +layer_height_0 = 0.24 +speed_print = 60 +retraction_amount = 4 +adhesion_type = skirt +retraction_combing = infill +support_enable = False +travel_retract_before_outer_wall = True diff --git a/resources/quality/jgaurora_a6/jgaurora_a6_0.28_fast.inst.cfg.txt b/resources/quality/jgaurora_a6/jgaurora_a6_0.28_fast.inst.cfg.txt new file mode 100644 index 0000000000..33c846074d --- /dev/null +++ b/resources/quality/jgaurora_a6/jgaurora_a6_0.28_fast.inst.cfg.txt @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Fast 0.28 +definition = jgaurora_a6 + +[metadata] +quality_type = fast +setting_version = 17 +type = quality +weight = -4 +global_quality = true + +[values] +layer_height = 0.28 +layer_height_0 = 0.28 +speed_print = 60 +speed_travel = 120 +speed_layer_0 = 30 +wall_thickness = =line_width * 4 +retraction_amount = 4 +adhesion_type = skirt +retraction_combing = infill +support_enable = False +travel_retract_before_outer_wall = True diff --git a/resources/quality/jgaurora_a6/jgaurora_a6_0.2_normal.inst.cfg b/resources/quality/jgaurora_a6/jgaurora_a6_0.2_normal.inst.cfg new file mode 100644 index 0000000000..0111567fc9 --- /dev/null +++ b/resources/quality/jgaurora_a6/jgaurora_a6_0.2_normal.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Normal 0.20 +definition = jgaurora_a6 + +[metadata] +quality_type = normal +setting_version = 17 +type = quality +weight = -2 +global_quality = true + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +speed_print = 60 +speed_travel = 100 +adhesion_type = skirt +retraction_combing = infill +support_enable = False +travel_retract_before_outer_wall = True diff --git a/resources/quality/katihal/alya3dp_normal.inst.cfg b/resources/quality/katihal/alya3dp_normal.inst.cfg index f0f072a40f..b8236074e3 100644 --- a/resources/quality/katihal/alya3dp_normal.inst.cfg +++ b/resources/quality/katihal/alya3dp_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = alya3dp [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = alya_normal weight = 0 diff --git a/resources/quality/katihal/alya3dp_normal_generic_pla.inst.cfg b/resources/quality/katihal/alya3dp_normal_generic_pla.inst.cfg index 70f9c9d7d6..8a2c8d5f9c 100644 --- a/resources/quality/katihal/alya3dp_normal_generic_pla.inst.cfg +++ b/resources/quality/katihal/alya3dp_normal_generic_pla.inst.cfg @@ -4,7 +4,7 @@ definition = alya3dp name = Normal [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = alya_normal weight = 3 diff --git a/resources/quality/katihal/alyanx3dp_normal.inst.cfg b/resources/quality/katihal/alyanx3dp_normal.inst.cfg index 45c7fae325..b33da8bce5 100644 --- a/resources/quality/katihal/alyanx3dp_normal.inst.cfg +++ b/resources/quality/katihal/alyanx3dp_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = alyanx3dp [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = alyanx_normal weight = 0 diff --git a/resources/quality/katihal/alyanx3dp_normal_generic_pla.inst.cfg b/resources/quality/katihal/alyanx3dp_normal_generic_pla.inst.cfg index 77cc642ecf..00585f51ee 100644 --- a/resources/quality/katihal/alyanx3dp_normal_generic_pla.inst.cfg +++ b/resources/quality/katihal/alyanx3dp_normal_generic_pla.inst.cfg @@ -4,7 +4,7 @@ definition = alyanx3dp name = Normal [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = alyanx_normal weight = 2 diff --git a/resources/quality/katihal/kupido_normal.inst.cfg b/resources/quality/katihal/kupido_normal.inst.cfg index e0c72461c6..1ad69bd665 100644 --- a/resources/quality/katihal/kupido_normal.inst.cfg +++ b/resources/quality/katihal/kupido_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = kupido [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = kupido_normal weight = 0 diff --git a/resources/quality/katihal/kupido_normal_generic_abs.inst.cfg b/resources/quality/katihal/kupido_normal_generic_abs.inst.cfg index 9d5d4bc0d8..f960b4e6b2 100644 --- a/resources/quality/katihal/kupido_normal_generic_abs.inst.cfg +++ b/resources/quality/katihal/kupido_normal_generic_abs.inst.cfg @@ -4,7 +4,7 @@ definition = kupido name = Normal [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = kupido_normal weight = 3 diff --git a/resources/quality/katihal/kupido_normal_generic_pla.inst.cfg b/resources/quality/katihal/kupido_normal_generic_pla.inst.cfg index f6f525051f..2eeb0a67bd 100644 --- a/resources/quality/katihal/kupido_normal_generic_pla.inst.cfg +++ b/resources/quality/katihal/kupido_normal_generic_pla.inst.cfg @@ -4,7 +4,7 @@ definition = kupido name = Normal [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = kupido_normal weight = 3 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg index 820468f0e5..d94a172514 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = kemiq_q2_beta [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg index 912a5e09aa..85b23cddf4 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = kemiq_q2_beta [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg index 311248f056..2653bd620b 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = kemiq_q2_beta [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg index 54109a683f..a8c546cb97 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg @@ -4,7 +4,7 @@ name = Low definition = kemiq_q2_beta [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg index 59afe1e031..3e27c3be3d 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = kemiq_q2_beta [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg index 5275d71735..5710c33f77 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = kemiq_q2_beta [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg index faaeb247fa..d9d7a2dff5 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = kemiq_q2_beta [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg index 65663a674a..717a61b9a0 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = kemiq_q2_beta [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg index 68aed09d37..13a8d36bf4 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg @@ -4,7 +4,7 @@ name = Low definition = kemiq_q2_beta [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg index f6860f06a0..eba1db03a6 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = kemiq_q2_beta [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg index 2dfdbc09f6..2e1c48789c 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = kemiq_q2_gama [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg index 471176334e..301a3dc541 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = kemiq_q2_gama [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg index 37972c802a..52946fcf36 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = kemiq_q2_gama [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg index 34eb095724..e36bcfaf50 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg @@ -4,7 +4,7 @@ name = Low definition = kemiq_q2_gama [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg index 1097e75566..69951b473f 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = kemiq_q2_gama [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/key3d/key3d_tyro_best.inst.cfg b/resources/quality/key3d/key3d_tyro_best.inst.cfg index e792e0f6a4..af25394879 100644 --- a/resources/quality/key3d/key3d_tyro_best.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_best.inst.cfg @@ -4,7 +4,7 @@ name = Best Quality definition = key3d_tyro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = best weight = 1 diff --git a/resources/quality/key3d/key3d_tyro_fast.inst.cfg b/resources/quality/key3d/key3d_tyro_fast.inst.cfg index c3a49dae87..13038d8807 100644 --- a/resources/quality/key3d/key3d_tyro_fast.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast Quality definition = key3d_tyro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/key3d/key3d_tyro_normal.inst.cfg b/resources/quality/key3d/key3d_tyro_normal.inst.cfg index 0c403e220f..1e15836ad2 100644 --- a/resources/quality/key3d/key3d_tyro_normal.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = key3d_tyro [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/koonovo/koonovo_base_global_draft.inst.cfg b/resources/quality/koonovo/koonovo_base_global_draft.inst.cfg index 13f4b951e0..bab7568eca 100644 --- a/resources/quality/koonovo/koonovo_base_global_draft.inst.cfg +++ b/resources/quality/koonovo/koonovo_base_global_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = koonovo_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft global_quality = True diff --git a/resources/quality/koonovo/koonovo_base_global_standard.inst.cfg b/resources/quality/koonovo/koonovo_base_global_standard.inst.cfg index 4eb54bbcb4..1949bdfcb6 100644 --- a/resources/quality/koonovo/koonovo_base_global_standard.inst.cfg +++ b/resources/quality/koonovo/koonovo_base_global_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = koonovo_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard weight = -3 diff --git a/resources/quality/koonovo/koovono_base_global_high.inst.cfg b/resources/quality/koonovo/koovono_base_global_high.inst.cfg index ee5c69b135..9358d44ed0 100644 --- a/resources/quality/koonovo/koovono_base_global_high.inst.cfg +++ b/resources/quality/koonovo/koovono_base_global_high.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = koonovo_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = -1 diff --git a/resources/quality/liquid/liquid_global_Draft_Quality.inst.cfg b/resources/quality/liquid/liquid_global_Draft_Quality.inst.cfg index fa4dcd6807..0150a9151f 100644 --- a/resources/quality/liquid/liquid_global_Draft_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_global_Fast_Quality.inst.cfg b/resources/quality/liquid/liquid_global_Fast_Quality.inst.cfg index b12e9ad52e..be9fc6ecd6 100644 --- a/resources/quality/liquid/liquid_global_Fast_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/liquid/liquid_global_High_Quality.inst.cfg b/resources/quality/liquid/liquid_global_High_Quality.inst.cfg index cecbdd1b80..e8c57afcdd 100644 --- a/resources/quality/liquid/liquid_global_High_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/liquid/liquid_global_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_global_Normal_Quality.inst.cfg index b44c43d3c7..afe7c85b22 100644 --- a/resources/quality/liquid/liquid_global_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/liquid/liquid_global_Superdraft_Quality.inst.cfg b/resources/quality/liquid/liquid_global_Superdraft_Quality.inst.cfg index 67ff310e8c..7c172c27ee 100644 --- a/resources/quality/liquid/liquid_global_Superdraft_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_global_Superdraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/liquid/liquid_global_Verydraft_Quality.inst.cfg b/resources/quality/liquid/liquid_global_Verydraft_Quality.inst.cfg index b5713aff75..3bdd29605f 100644 --- a/resources/quality/liquid/liquid_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_global_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/liquid/liquid_vo0.4_ABS_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_ABS_Draft_Print.inst.cfg index e882694cdb..faa6288fa1 100644 --- a/resources/quality/liquid/liquid_vo0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.4_ABS_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_ABS_Fast_Print.inst.cfg index d05a0e3505..2a18535c3e 100644 --- a/resources/quality/liquid/liquid_vo0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_ABS_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/liquid/liquid_vo0.4_ABS_High_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_ABS_High_Quality.inst.cfg index dbed018698..ef9c332f7a 100644 --- a/resources/quality/liquid/liquid_vo0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_ABS_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/liquid/liquid_vo0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_ABS_Normal_Quality.inst.cfg index ba39c4a6ce..a6c7138e20 100644 --- a/resources/quality/liquid/liquid_vo0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/liquid/liquid_vo0.4_CPE_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_CPE_Draft_Print.inst.cfg index 3a72aa9d92..aee84e3c39 100644 --- a/resources/quality/liquid/liquid_vo0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.4_CPE_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_CPE_Fast_Print.inst.cfg index c5474f8f0c..db85859ff5 100644 --- a/resources/quality/liquid/liquid_vo0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_CPE_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/liquid/liquid_vo0.4_CPE_High_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_CPE_High_Quality.inst.cfg index b396232f67..c0eed6a65b 100644 --- a/resources/quality/liquid/liquid_vo0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_CPE_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/liquid/liquid_vo0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_CPE_Normal_Quality.inst.cfg index b8edf5ef16..b8146125fc 100644 --- a/resources/quality/liquid/liquid_vo0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/liquid/liquid_vo0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_Nylon_Draft_Print.inst.cfg index e2c32638e1..e2a1881322 100644 --- a/resources/quality/liquid/liquid_vo0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_Nylon_Fast_Print.inst.cfg index ce9fe8adce..b72b39a462 100644 --- a/resources/quality/liquid/liquid_vo0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_Nylon_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/liquid/liquid_vo0.4_Nylon_High_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_Nylon_High_Quality.inst.cfg index cc32585272..a7fc9e5bdb 100644 --- a/resources/quality/liquid/liquid_vo0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_Nylon_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/liquid/liquid_vo0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_Nylon_Normal_Quality.inst.cfg index 23f565b2b5..3148223f68 100644 --- a/resources/quality/liquid/liquid_vo0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/liquid/liquid_vo0.4_PC_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PC_Draft_Print.inst.cfg index 743ac94ebd..9d760700d7 100644 --- a/resources/quality/liquid/liquid_vo0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PC_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.4_PC_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PC_Fast_Print.inst.cfg index 7e7b1dd466..954b4e4d33 100644 --- a/resources/quality/liquid/liquid_vo0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/liquid/liquid_vo0.4_PC_High_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PC_High_Quality.inst.cfg index ea9a0a9c65..b2a6c0b065 100644 --- a/resources/quality/liquid/liquid_vo0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PC_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/liquid/liquid_vo0.4_PC_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PC_Normal_Quality.inst.cfg index 6dca6308f2..0db5b1ab0d 100644 --- a/resources/quality/liquid/liquid_vo0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/liquid/liquid_vo0.4_PETG_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PETG_Draft_Print.inst.cfg index 15880e38d6..5113116d15 100644 --- a/resources/quality/liquid/liquid_vo0.4_PETG_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PETG_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.4_PETG_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PETG_Fast_Print.inst.cfg index 33d7a80374..1635d51ac6 100644 --- a/resources/quality/liquid/liquid_vo0.4_PETG_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PETG_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/liquid/liquid_vo0.4_PETG_High_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PETG_High_Quality.inst.cfg index 1e53fa09d0..b9638e3518 100644 --- a/resources/quality/liquid/liquid_vo0.4_PETG_High_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PETG_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/liquid/liquid_vo0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PETG_Normal_Quality.inst.cfg index 91bf2d713b..49ef48da43 100644 --- a/resources/quality/liquid/liquid_vo0.4_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PETG_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/liquid/liquid_vo0.4_PLA_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PLA_Draft_Print.inst.cfg index e33244adfb..e19d11b89a 100644 --- a/resources/quality/liquid/liquid_vo0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.4_PLA_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PLA_Fast_Print.inst.cfg index 4aad3db5ec..05171cd6d3 100644 --- a/resources/quality/liquid/liquid_vo0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/liquid/liquid_vo0.4_PLA_High_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PLA_High_Quality.inst.cfg index e94c97116f..49f9f8d870 100644 --- a/resources/quality/liquid/liquid_vo0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/liquid/liquid_vo0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PLA_Normal_Quality.inst.cfg index 53b7b837cb..3d6f46173d 100644 --- a/resources/quality/liquid/liquid_vo0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/liquid/liquid_vo0.4_PP_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PP_Draft_Print.inst.cfg index 58dc4490c9..03736fdee3 100644 --- a/resources/quality/liquid/liquid_vo0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.4_PP_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PP_Fast_Print.inst.cfg index 87ddc20162..ff494ea7c7 100644 --- a/resources/quality/liquid/liquid_vo0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/liquid/liquid_vo0.4_PP_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PP_Normal_Quality.inst.cfg index a7b1f7453a..671832d772 100644 --- a/resources/quality/liquid/liquid_vo0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/liquid/liquid_vo0.4_TPU_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_TPU_Draft_Print.inst.cfg index 8bb0f0c1db..255e693039 100644 --- a/resources/quality/liquid/liquid_vo0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.4_TPU_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_TPU_Fast_Print.inst.cfg index 5a5341c9ae..bb8de7ab71 100644 --- a/resources/quality/liquid/liquid_vo0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_TPU_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/liquid/liquid_vo0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_TPU_Normal_Quality.inst.cfg index 9de28ab3bd..53526c1b35 100644 --- a/resources/quality/liquid/liquid_vo0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_TPU_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/liquid/liquid_vo0.6_CFFCPE_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.6_CFFCPE_Draft_Print.inst.cfg index b1e8e129d8..5e759a6aac 100644 --- a/resources/quality/liquid/liquid_vo0.6_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.6_CFFCPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.6_CFFPA_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.6_CFFPA_Draft_Print.inst.cfg index 2ef3ba9fbf..d38b447d06 100644 --- a/resources/quality/liquid/liquid_vo0.6_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.6_CFFPA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.6_GFFCPE_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.6_GFFCPE_Draft_Print.inst.cfg index 1e8490d679..2338bd793c 100644 --- a/resources/quality/liquid/liquid_vo0.6_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.6_GFFCPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.6_GFFPA_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.6_GFFPA_Draft_Print.inst.cfg index ecf7afa863..9679cbca5c 100644 --- a/resources/quality/liquid/liquid_vo0.6_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.6_GFFPA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.6_PETG_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.6_PETG_Draft_Print.inst.cfg index e2028dbea0..386ea3c9a7 100644 --- a/resources/quality/liquid/liquid_vo0.6_PETG_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.6_PETG_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -3 diff --git a/resources/quality/liquid/liquid_vo0.6_PETG_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.6_PETG_Fast_Print.inst.cfg index a47590dbac..01197a50c7 100644 --- a/resources/quality/liquid/liquid_vo0.6_PETG_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.6_PETG_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.6_PLA_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.6_PLA_Draft_Print.inst.cfg index ad48d1c978..97680def3a 100644 --- a/resources/quality/liquid/liquid_vo0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.6_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -3 diff --git a/resources/quality/liquid/liquid_vo0.6_PLA_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.6_PLA_Fast_Print.inst.cfg index d179a2acab..3c6253a6a2 100644 --- a/resources/quality/liquid/liquid_vo0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.6_PLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.8_ABS_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_ABS_Draft_Print.inst.cfg index 75b8f8ff62..d6c6f59760 100644 --- a/resources/quality/liquid/liquid_vo0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_ABS_Superdraft_Print.inst.cfg index f5494f4ce0..45b33fbaa4 100644 --- a/resources/quality/liquid/liquid_vo0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_ABS_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/liquid/liquid_vo0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_ABS_Verydraft_Print.inst.cfg index 96c7c864ba..35f8c1b655 100644 --- a/resources/quality/liquid/liquid_vo0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_ABS_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/liquid/liquid_vo0.8_CPE_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_CPE_Draft_Print.inst.cfg index fbd0da1942..fca9c79aef 100644 --- a/resources/quality/liquid/liquid_vo0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_CPE_Superdraft_Print.inst.cfg index 1e89223d7b..f13b299a98 100644 --- a/resources/quality/liquid/liquid_vo0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_CPE_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/liquid/liquid_vo0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_CPE_Verydraft_Print.inst.cfg index 4061755472..9a773195fd 100644 --- a/resources/quality/liquid/liquid_vo0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_CPE_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/liquid/liquid_vo0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_Nylon_Draft_Print.inst.cfg index 1f3d01c751..e31ca6037b 100644 --- a/resources/quality/liquid/liquid_vo0.8_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_Nylon_Superdraft_Print.inst.cfg index 6d2596e0ad..133b304baf 100644 --- a/resources/quality/liquid/liquid_vo0.8_Nylon_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_Nylon_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/liquid/liquid_vo0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_Nylon_Verydraft_Print.inst.cfg index 77ab637ca9..688b73add3 100644 --- a/resources/quality/liquid/liquid_vo0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_Nylon_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/liquid/liquid_vo0.8_PC_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PC_Fast_Print.inst.cfg index 56fa21160c..9393e7c267 100644 --- a/resources/quality/liquid/liquid_vo0.8_PC_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PC_Superdraft_Print.inst.cfg index e93676f336..08e08baf7d 100644 --- a/resources/quality/liquid/liquid_vo0.8_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PC_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/liquid/liquid_vo0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PC_Verydraft_Print.inst.cfg index 563ccb7c4b..66722e1d1a 100644 --- a/resources/quality/liquid/liquid_vo0.8_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PC_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/liquid/liquid_vo0.8_PETG_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PETG_Draft_Print.inst.cfg index bcd41791a7..5f39116368 100644 --- a/resources/quality/liquid/liquid_vo0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PETG_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PETG_Superdraft_Print.inst.cfg index c586542618..c8edf974ea 100644 --- a/resources/quality/liquid/liquid_vo0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PETG_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/liquid/liquid_vo0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PETG_Verydraft_Print.inst.cfg index ec1719c11c..718ba8e1dc 100644 --- a/resources/quality/liquid/liquid_vo0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PETG_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/liquid/liquid_vo0.8_PLA_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PLA_Draft_Print.inst.cfg index f6cc9ced8e..395fcf9649 100644 --- a/resources/quality/liquid/liquid_vo0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PLA_Superdraft_Print.inst.cfg index e6ebc15606..36d5427bcd 100644 --- a/resources/quality/liquid/liquid_vo0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/liquid/liquid_vo0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PLA_Verydraft_Print.inst.cfg index 16be1997f7..9e5dba6a0e 100644 --- a/resources/quality/liquid/liquid_vo0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/liquid/liquid_vo0.8_PP_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PP_Draft_Print.inst.cfg index 30a517d937..ba1fbd709a 100644 --- a/resources/quality/liquid/liquid_vo0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PP_Superdraft_Print.inst.cfg index 3f1b1172b8..26bc68513a 100644 --- a/resources/quality/liquid/liquid_vo0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/liquid/liquid_vo0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PP_Verydraft_Print.inst.cfg index a5a949b72b..7e1bbcae8f 100644 --- a/resources/quality/liquid/liquid_vo0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/liquid/liquid_vo0.8_TPU_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_TPU_Draft_Print.inst.cfg index 5b4cd8a8a0..694ca08049 100644 --- a/resources/quality/liquid/liquid_vo0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/liquid/liquid_vo0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_TPU_Superdraft_Print.inst.cfg index a146b9d3e1..f87a4057e5 100644 --- a/resources/quality/liquid/liquid_vo0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_TPU_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/liquid/liquid_vo0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_TPU_Verydraft_Print.inst.cfg index 74ce79eb58..728e6ca563 100644 --- a/resources/quality/liquid/liquid_vo0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_TPU_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/longer/ABS/longer_0.4_ABS_adaptive.inst.cfg b/resources/quality/longer/ABS/longer_0.4_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..2ab3e02e92 --- /dev/null +++ b/resources/quality/longer/ABS/longer_0.4_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/longer/ABS/longer_0.4_ABS_low.inst.cfg b/resources/quality/longer/ABS/longer_0.4_ABS_low.inst.cfg new file mode 100644 index 0000000000..0a189f56a7 --- /dev/null +++ b/resources/quality/longer/ABS/longer_0.4_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/longer/ABS/longer_0.4_ABS_standard.inst.cfg b/resources/quality/longer/ABS/longer_0.4_ABS_standard.inst.cfg new file mode 100644 index 0000000000..70d9fc9554 --- /dev/null +++ b/resources/quality/longer/ABS/longer_0.4_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/longer/ABS/longer_0.4_ABS_super.inst.cfg b/resources/quality/longer/ABS/longer_0.4_ABS_super.inst.cfg new file mode 100644 index 0000000000..ee01169b18 --- /dev/null +++ b/resources/quality/longer/ABS/longer_0.4_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/longer/PETG/longer_0.4_PETG_adaptive.inst.cfg b/resources/quality/longer/PETG/longer_0.4_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..6e661d9448 --- /dev/null +++ b/resources/quality/longer/PETG/longer_0.4_PETG_adaptive.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Dynamic Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/longer/PETG/longer_0.4_PETG_low.inst.cfg b/resources/quality/longer/PETG/longer_0.4_PETG_low.inst.cfg new file mode 100644 index 0000000000..ef175846c7 --- /dev/null +++ b/resources/quality/longer/PETG/longer_0.4_PETG_low.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Low Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/longer/PETG/longer_0.4_PETG_standard.inst.cfg b/resources/quality/longer/PETG/longer_0.4_PETG_standard.inst.cfg new file mode 100644 index 0000000000..519978ad8b --- /dev/null +++ b/resources/quality/longer/PETG/longer_0.4_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/longer/PETG/longer_0.4_PETG_super.inst.cfg b/resources/quality/longer/PETG/longer_0.4_PETG_super.inst.cfg new file mode 100644 index 0000000000..c732684395 --- /dev/null +++ b/resources/quality/longer/PETG/longer_0.4_PETG_super.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Super Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/longer/PLA/longer_0.4_PLA_adaptive.inst.cfg b/resources/quality/longer/PLA/longer_0.4_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..1695849e9b --- /dev/null +++ b/resources/quality/longer/PLA/longer_0.4_PLA_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/longer/PLA/longer_0.4_PLA_low.inst.cfg b/resources/quality/longer/PLA/longer_0.4_PLA_low.inst.cfg new file mode 100644 index 0000000000..8274452968 --- /dev/null +++ b/resources/quality/longer/PLA/longer_0.4_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/longer/PLA/longer_0.4_PLA_standard.inst.cfg b/resources/quality/longer/PLA/longer_0.4_PLA_standard.inst.cfg new file mode 100644 index 0000000000..79d5e12ac5 --- /dev/null +++ b/resources/quality/longer/PLA/longer_0.4_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/longer/PLA/longer_0.4_PLA_super.inst.cfg b/resources/quality/longer/PLA/longer_0.4_PLA_super.inst.cfg new file mode 100644 index 0000000000..1c924b60c4 --- /dev/null +++ b/resources/quality/longer/PLA/longer_0.4_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/longer/TPU/longer_0.4_TPU_adaptive.inst.cfg b/resources/quality/longer/TPU/longer_0.4_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..f357bf5b09 --- /dev/null +++ b/resources/quality/longer/TPU/longer_0.4_TPU_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/longer/TPU/longer_0.4_TPU_standard.inst.cfg b/resources/quality/longer/TPU/longer_0.4_TPU_standard.inst.cfg new file mode 100644 index 0000000000..70a4ed37fc --- /dev/null +++ b/resources/quality/longer/TPU/longer_0.4_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/longer/TPU/longer_0.4_TPU_super.inst.cfg b/resources/quality/longer/TPU/longer_0.4_TPU_super.inst.cfg new file mode 100644 index 0000000000..60f5d655f3 --- /dev/null +++ b/resources/quality/longer/TPU/longer_0.4_TPU_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/longer/longer_global_adaptive.inst.cfg b/resources/quality/longer/longer_global_adaptive.inst.cfg new file mode 100644 index 0000000000..3d8299c14f --- /dev/null +++ b/resources/quality/longer/longer_global_adaptive.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Dynamic Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +weight = -2 +global_quality = True + +[values] +layer_height = 0.16 +layer_height_0 = 0.20 +top_bottom_thickness = =layer_height_0+layer_height*4 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*6 +adaptive_layer_height_enabled = true diff --git a/resources/quality/longer/longer_global_draft.inst.cfg b/resources/quality/longer/longer_global_draft.inst.cfg new file mode 100644 index 0000000000..7c7811f6ba --- /dev/null +++ b/resources/quality/longer/longer_global_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Draft Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -5 +global_quality = True + +[values] +layer_height = 0.32 +layer_height_0 = 0.32 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/longer/longer_global_low.inst.cfg b/resources/quality/longer/longer_global_low.inst.cfg new file mode 100644 index 0000000000..d829aed27d --- /dev/null +++ b/resources/quality/longer/longer_global_low.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Low Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +weight = -4 +global_quality = True + +[values] +layer_height = 0.28 +layer_height_0 = 0.28 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/longer/longer_global_standard.inst.cfg b/resources/quality/longer/longer_global_standard.inst.cfg new file mode 100644 index 0000000000..75ab5cffa2 --- /dev/null +++ b/resources/quality/longer/longer_global_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Standard Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +weight = -3 +global_quality = True + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/longer/longer_global_super.inst.cfg b/resources/quality/longer/longer_global_super.inst.cfg new file mode 100644 index 0000000000..2c6945a941 --- /dev/null +++ b/resources/quality/longer/longer_global_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Super Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +weight = -1 +global_quality = True + +[values] +layer_height = 0.12 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*6 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*8 diff --git a/resources/quality/longer/longer_global_ultra.inst.cfg b/resources/quality/longer/longer_global_ultra.inst.cfg new file mode 100644 index 0000000000..8836b06983 --- /dev/null +++ b/resources/quality/longer/longer_global_ultra.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Ultra Quality +definition = longer_base + +[metadata] +setting_version = 17 +type = quality +quality_type = ultra +weight = 0 +global_quality = True + +[values] +layer_height = 0.08 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*10 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*12 diff --git a/resources/quality/makeblock/makeblock_mcreate_pla_normal.inst.cfg b/resources/quality/makeblock/makeblock_mcreate_pla_normal.inst.cfg index 3b3ec04ace..773e829b0b 100644 --- a/resources/quality/makeblock/makeblock_mcreate_pla_normal.inst.cfg +++ b/resources/quality/makeblock/makeblock_mcreate_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = makeblock_mcreate [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg index 298f6102f5..a44d1ffe2b 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg index fe38df87ba..99cbe70a62 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg index cf440ebc59..762e3023b0 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg index f33d68fa00..9347c50327 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg index 5f10dd6fec..74ae43391c 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg index ee3809e355..706ff06b76 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg index f540fa5595..7ff8b8e12f 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg index e8b19a9291..58b306de9e 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg index 3fd8140a52..84f58459ce 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg index d5cdb58c43..d9a234b48e 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/malyan_m200/malyan_m200_global_High_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_High_Quality.inst.cfg index 23e828867c..b33382a34b 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_High_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg index 0b208914f0..2488a8862d 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg index e8de94f79c..655d325630 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/malyan_m200/malyan_m200_global_ThickerDraft_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_ThickerDraft_Quality.inst.cfg index 29303389d6..13ec85d76e 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_ThickerDraft_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_ThickerDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg index d9325aea01..fd15ce1bc1 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg index 15819b4e76..1940abf7e9 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg index afba70c13f..188c4eda98 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg index 8a03c0eaf6..a877eb7613 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg index 3b05714ef2..902a65e414 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg index 69e0dab5f8..231e75d02a 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg index 60ac8d81c6..eb3f68ca97 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg index 806691d362..31ed034806 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg index 70f3ab1618..3cd734d169 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg index fe0af64a4f..30680cf4f6 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg index 51c51225c3..9eabf5a91e 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg index b209250b78..1f64a24c02 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg index 376b447efa..da29cbed99 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg index e80fb368c3..c024449a15 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg index 5eed218054..0af5777470 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg index fb4a0a7578..737bcc9e6f 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg index 225646ba82..225a053d6e 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg index 16f3050404..c2a3b30eee 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = malyan_m200 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/mingda/ABS/mingda_0.2_ABS_super.inst.cfg b/resources/quality/mingda/ABS/mingda_0.2_ABS_super.inst.cfg new file mode 100644 index 0000000000..d729f374cb --- /dev/null +++ b/resources/quality/mingda/ABS/mingda_0.2_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_abs +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/mingda/ABS/mingda_0.2_ABS_ultra.inst.cfg b/resources/quality/mingda/ABS/mingda_0.2_ABS_ultra.inst.cfg new file mode 100644 index 0000000000..de20ab4a80 --- /dev/null +++ b/resources/quality/mingda/ABS/mingda_0.2_ABS_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Ultra Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = ultra +material = generic_abs +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/mingda/ABS/mingda_0.3_ABS_adaptive.inst.cfg b/resources/quality/mingda/ABS/mingda_0.3_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..2dc491fe51 --- /dev/null +++ b/resources/quality/mingda/ABS/mingda_0.3_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/ABS/mingda_0.3_ABS_low.inst.cfg b/resources/quality/mingda/ABS/mingda_0.3_ABS_low.inst.cfg new file mode 100644 index 0000000000..6c5ced12ef --- /dev/null +++ b/resources/quality/mingda/ABS/mingda_0.3_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/ABS/mingda_0.3_ABS_standard.inst.cfg b/resources/quality/mingda/ABS/mingda_0.3_ABS_standard.inst.cfg new file mode 100644 index 0000000000..b7ba568da0 --- /dev/null +++ b/resources/quality/mingda/ABS/mingda_0.3_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/ABS/mingda_0.3_ABS_super.inst.cfg b/resources/quality/mingda/ABS/mingda_0.3_ABS_super.inst.cfg new file mode 100644 index 0000000000..3417e06240 --- /dev/null +++ b/resources/quality/mingda/ABS/mingda_0.3_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/ABS/mingda_0.4_ABS_adaptive.inst.cfg b/resources/quality/mingda/ABS/mingda_0.4_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..db1e63f63e --- /dev/null +++ b/resources/quality/mingda/ABS/mingda_0.4_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/ABS/mingda_0.4_ABS_low.inst.cfg b/resources/quality/mingda/ABS/mingda_0.4_ABS_low.inst.cfg new file mode 100644 index 0000000000..2507eb9a8c --- /dev/null +++ b/resources/quality/mingda/ABS/mingda_0.4_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/ABS/mingda_0.4_ABS_standard.inst.cfg b/resources/quality/mingda/ABS/mingda_0.4_ABS_standard.inst.cfg new file mode 100644 index 0000000000..983415731c --- /dev/null +++ b/resources/quality/mingda/ABS/mingda_0.4_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/ABS/mingda_0.4_ABS_super.inst.cfg b/resources/quality/mingda/ABS/mingda_0.4_ABS_super.inst.cfg new file mode 100644 index 0000000000..3dc07d6264 --- /dev/null +++ b/resources/quality/mingda/ABS/mingda_0.4_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/ABS/mingda_0.5_ABS_adaptive.inst.cfg b/resources/quality/mingda/ABS/mingda_0.5_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..002974a2a3 --- /dev/null +++ b/resources/quality/mingda/ABS/mingda_0.5_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/ABS/mingda_0.5_ABS_low.inst.cfg b/resources/quality/mingda/ABS/mingda_0.5_ABS_low.inst.cfg new file mode 100644 index 0000000000..0661728179 --- /dev/null +++ b/resources/quality/mingda/ABS/mingda_0.5_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/ABS/mingda_0.5_ABS_standard.inst.cfg b/resources/quality/mingda/ABS/mingda_0.5_ABS_standard.inst.cfg new file mode 100644 index 0000000000..d8deec9b0b --- /dev/null +++ b/resources/quality/mingda/ABS/mingda_0.5_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/ABS/mingda_0.5_ABS_super.inst.cfg b/resources/quality/mingda/ABS/mingda_0.5_ABS_super.inst.cfg new file mode 100644 index 0000000000..267dee72be --- /dev/null +++ b/resources/quality/mingda/ABS/mingda_0.5_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/ABS/mingda_0.6_ABS_standard.inst.cfg b/resources/quality/mingda/ABS/mingda_0.6_ABS_standard.inst.cfg new file mode 100644 index 0000000000..bdcb03e6ce --- /dev/null +++ b/resources/quality/mingda/ABS/mingda_0.6_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_abs +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/mingda/ABS/mingda_0.8_ABS_draft.inst.cfg b/resources/quality/mingda/ABS/mingda_0.8_ABS_draft.inst.cfg new file mode 100644 index 0000000000..5619e90baa --- /dev/null +++ b/resources/quality/mingda/ABS/mingda_0.8_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_abs +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/mingda/ABS/mingda_1.0_ABS_draft.inst.cfg b/resources/quality/mingda/ABS/mingda_1.0_ABS_draft.inst.cfg new file mode 100644 index 0000000000..97fcc60af4 --- /dev/null +++ b/resources/quality/mingda/ABS/mingda_1.0_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_abs +variant = 1.0mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/mingda/PETG/mingda_0.2_PETG_super.inst.cfg b/resources/quality/mingda/PETG/mingda_0.2_PETG_super.inst.cfg new file mode 100644 index 0000000000..dd2beccf31 --- /dev/null +++ b/resources/quality/mingda/PETG/mingda_0.2_PETG_super.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Super Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_petg +variant = 0.2mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*8 diff --git a/resources/quality/mingda/PETG/mingda_0.2_PETG_ultra.inst.cfg b/resources/quality/mingda/PETG/mingda_0.2_PETG_ultra.inst.cfg new file mode 100644 index 0000000000..b5b303d928 --- /dev/null +++ b/resources/quality/mingda/PETG/mingda_0.2_PETG_ultra.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Ultra Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = ultra +material = generic_petg +variant = 0.2mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*8 diff --git a/resources/quality/mingda/PETG/mingda_0.3_PETG_adaptive.inst.cfg b/resources/quality/mingda/PETG/mingda_0.3_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..798d319185 --- /dev/null +++ b/resources/quality/mingda/PETG/mingda_0.3_PETG_adaptive.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Dynamic Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/PETG/mingda_0.3_PETG_low.inst.cfg b/resources/quality/mingda/PETG/mingda_0.3_PETG_low.inst.cfg new file mode 100644 index 0000000000..37b0071031 --- /dev/null +++ b/resources/quality/mingda/PETG/mingda_0.3_PETG_low.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Low Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_petg +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/PETG/mingda_0.3_PETG_standard.inst.cfg b/resources/quality/mingda/PETG/mingda_0.3_PETG_standard.inst.cfg new file mode 100644 index 0000000000..29d3843bbc --- /dev/null +++ b/resources/quality/mingda/PETG/mingda_0.3_PETG_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_petg +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/PETG/mingda_0.3_PETG_super.inst.cfg b/resources/quality/mingda/PETG/mingda_0.3_PETG_super.inst.cfg new file mode 100644 index 0000000000..024c3487e1 --- /dev/null +++ b/resources/quality/mingda/PETG/mingda_0.3_PETG_super.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Super Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_petg +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/PETG/mingda_0.4_PETG_adaptive.inst.cfg b/resources/quality/mingda/PETG/mingda_0.4_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..1cc5dddf77 --- /dev/null +++ b/resources/quality/mingda/PETG/mingda_0.4_PETG_adaptive.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Dynamic Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/PETG/mingda_0.4_PETG_low.inst.cfg b/resources/quality/mingda/PETG/mingda_0.4_PETG_low.inst.cfg new file mode 100644 index 0000000000..7a1137d7bf --- /dev/null +++ b/resources/quality/mingda/PETG/mingda_0.4_PETG_low.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Low Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/PETG/mingda_0.4_PETG_standard.inst.cfg b/resources/quality/mingda/PETG/mingda_0.4_PETG_standard.inst.cfg new file mode 100644 index 0000000000..cf5d1bba18 --- /dev/null +++ b/resources/quality/mingda/PETG/mingda_0.4_PETG_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/PETG/mingda_0.4_PETG_super.inst.cfg b/resources/quality/mingda/PETG/mingda_0.4_PETG_super.inst.cfg new file mode 100644 index 0000000000..dc05edb6fc --- /dev/null +++ b/resources/quality/mingda/PETG/mingda_0.4_PETG_super.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Super Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/PETG/mingda_0.5_PETG_adaptive.inst.cfg b/resources/quality/mingda/PETG/mingda_0.5_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..efaa018589 --- /dev/null +++ b/resources/quality/mingda/PETG/mingda_0.5_PETG_adaptive.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Dynamic Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/PETG/mingda_0.5_PETG_low.inst.cfg b/resources/quality/mingda/PETG/mingda_0.5_PETG_low.inst.cfg new file mode 100644 index 0000000000..e4654234d2 --- /dev/null +++ b/resources/quality/mingda/PETG/mingda_0.5_PETG_low.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Low Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_petg +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/PETG/mingda_0.5_PETG_standard.inst.cfg b/resources/quality/mingda/PETG/mingda_0.5_PETG_standard.inst.cfg new file mode 100644 index 0000000000..22340dcfa2 --- /dev/null +++ b/resources/quality/mingda/PETG/mingda_0.5_PETG_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_petg +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/PETG/mingda_0.5_PETG_super.inst.cfg b/resources/quality/mingda/PETG/mingda_0.5_PETG_super.inst.cfg new file mode 100644 index 0000000000..c767bd09bc --- /dev/null +++ b/resources/quality/mingda/PETG/mingda_0.5_PETG_super.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Super Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_petg +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 diff --git a/resources/quality/mingda/PETG/mingda_0.6_PETG_standard.inst.cfg b/resources/quality/mingda/PETG/mingda_0.6_PETG_standard.inst.cfg new file mode 100644 index 0000000000..708c49c4d4 --- /dev/null +++ b/resources/quality/mingda/PETG/mingda_0.6_PETG_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_petg +variant = 0.6mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 diff --git a/resources/quality/mingda/PETG/mingda_0.8_PETG_draft.inst.cfg b/resources/quality/mingda/PETG/mingda_0.8_PETG_draft.inst.cfg new file mode 100644 index 0000000000..8453f919d1 --- /dev/null +++ b/resources/quality/mingda/PETG/mingda_0.8_PETG_draft.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Draft Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_petg +variant = 0.8mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 diff --git a/resources/quality/mingda/PETG/mingda_1.0_PETG_draft.inst.cfg b/resources/quality/mingda/PETG/mingda_1.0_PETG_draft.inst.cfg new file mode 100644 index 0000000000..2e06cfdfb4 --- /dev/null +++ b/resources/quality/mingda/PETG/mingda_1.0_PETG_draft.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Draft Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_petg +variant = 1.0mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 diff --git a/resources/quality/mingda/PLA/mingda_0.2_PLA_super.inst.cfg b/resources/quality/mingda/PLA/mingda_0.2_PLA_super.inst.cfg new file mode 100644 index 0000000000..96fc4e386f --- /dev/null +++ b/resources/quality/mingda/PLA/mingda_0.2_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_pla +variant = 0.2mm Nozzle + +[values] diff --git a/resources/quality/mingda/PLA/mingda_0.2_PLA_ultra.inst.cfg b/resources/quality/mingda/PLA/mingda_0.2_PLA_ultra.inst.cfg new file mode 100644 index 0000000000..501b071a7a --- /dev/null +++ b/resources/quality/mingda/PLA/mingda_0.2_PLA_ultra.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Ultra Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = ultra +material = generic_pla +variant = 0.2mm Nozzle + +[values] diff --git a/resources/quality/mingda/PLA/mingda_0.3_PLA_adaptive.inst.cfg b/resources/quality/mingda/PLA/mingda_0.3_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..86ca4878b3 --- /dev/null +++ b/resources/quality/mingda/PLA/mingda_0.3_PLA_adaptive.inst.cfg @@ -0,0 +1,12 @@ +[general] +version = 4 +name = Dynamic Quality +definition = mingda_base +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/mingda/PLA/mingda_0.3_PLA_low.inst.cfg b/resources/quality/mingda/PLA/mingda_0.3_PLA_low.inst.cfg new file mode 100644 index 0000000000..e9e11db2dc --- /dev/null +++ b/resources/quality/mingda/PLA/mingda_0.3_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_pla +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/mingda/PLA/mingda_0.3_PLA_standard.inst.cfg b/resources/quality/mingda/PLA/mingda_0.3_PLA_standard.inst.cfg new file mode 100644 index 0000000000..9898be885b --- /dev/null +++ b/resources/quality/mingda/PLA/mingda_0.3_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_pla +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/mingda/PLA/mingda_0.3_PLA_super.inst.cfg b/resources/quality/mingda/PLA/mingda_0.3_PLA_super.inst.cfg new file mode 100644 index 0000000000..6d21dcb0a4 --- /dev/null +++ b/resources/quality/mingda/PLA/mingda_0.3_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_pla +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/mingda/PLA/mingda_0.4_PLA_adaptive.inst.cfg b/resources/quality/mingda/PLA/mingda_0.4_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..399b8b42bf --- /dev/null +++ b/resources/quality/mingda/PLA/mingda_0.4_PLA_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/mingda/PLA/mingda_0.4_PLA_low.inst.cfg b/resources/quality/mingda/PLA/mingda_0.4_PLA_low.inst.cfg new file mode 100644 index 0000000000..6241d3691b --- /dev/null +++ b/resources/quality/mingda/PLA/mingda_0.4_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/mingda/PLA/mingda_0.4_PLA_standard.inst.cfg b/resources/quality/mingda/PLA/mingda_0.4_PLA_standard.inst.cfg new file mode 100644 index 0000000000..0f2d446237 --- /dev/null +++ b/resources/quality/mingda/PLA/mingda_0.4_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/mingda/PLA/mingda_0.4_PLA_super.inst.cfg b/resources/quality/mingda/PLA/mingda_0.4_PLA_super.inst.cfg new file mode 100644 index 0000000000..9be30285be --- /dev/null +++ b/resources/quality/mingda/PLA/mingda_0.4_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/mingda/PLA/mingda_0.5_PLA_adaptive.inst.cfg b/resources/quality/mingda/PLA/mingda_0.5_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..30a6e1b1e4 --- /dev/null +++ b/resources/quality/mingda/PLA/mingda_0.5_PLA_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/mingda/PLA/mingda_0.5_PLA_low.inst.cfg b/resources/quality/mingda/PLA/mingda_0.5_PLA_low.inst.cfg new file mode 100644 index 0000000000..09d6699fb7 --- /dev/null +++ b/resources/quality/mingda/PLA/mingda_0.5_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/mingda/PLA/mingda_0.5_PLA_standard.inst.cfg b/resources/quality/mingda/PLA/mingda_0.5_PLA_standard.inst.cfg new file mode 100644 index 0000000000..2fe9b66efd --- /dev/null +++ b/resources/quality/mingda/PLA/mingda_0.5_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/mingda/PLA/mingda_0.5_PLA_super.inst.cfg b/resources/quality/mingda/PLA/mingda_0.5_PLA_super.inst.cfg new file mode 100644 index 0000000000..e05236c4e0 --- /dev/null +++ b/resources/quality/mingda/PLA/mingda_0.5_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/mingda/PLA/mingda_0.6_PLA_draft.inst.cfg b/resources/quality/mingda/PLA/mingda_0.6_PLA_draft.inst.cfg new file mode 100644 index 0000000000..ca46e960eb --- /dev/null +++ b/resources/quality/mingda/PLA/mingda_0.6_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/mingda/PLA/mingda_0.6_PLA_low.inst.cfg b/resources/quality/mingda/PLA/mingda_0.6_PLA_low.inst.cfg new file mode 100644 index 0000000000..ef2f926610 --- /dev/null +++ b/resources/quality/mingda/PLA/mingda_0.6_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/mingda/PLA/mingda_0.6_PLA_standard.inst.cfg b/resources/quality/mingda/PLA/mingda_0.6_PLA_standard.inst.cfg new file mode 100644 index 0000000000..34c1398fce --- /dev/null +++ b/resources/quality/mingda/PLA/mingda_0.6_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/mingda/PLA/mingda_0.8_PLA_draft.inst.cfg b/resources/quality/mingda/PLA/mingda_0.8_PLA_draft.inst.cfg new file mode 100644 index 0000000000..8b0a4bd657 --- /dev/null +++ b/resources/quality/mingda/PLA/mingda_0.8_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_pla +variant = 0.8mm Nozzle + +[values] diff --git a/resources/quality/mingda/PLA/mingda_1.0_PLA_draft.inst.cfg b/resources/quality/mingda/PLA/mingda_1.0_PLA_draft.inst.cfg new file mode 100644 index 0000000000..256d6ea7d6 --- /dev/null +++ b/resources/quality/mingda/PLA/mingda_1.0_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_pla +variant = 1.0mm Nozzle + +[values] diff --git a/resources/quality/mingda/TPU/mingda_0.3_TPU_adaptive.inst.cfg b/resources/quality/mingda/TPU/mingda_0.3_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..c65f90962e --- /dev/null +++ b/resources/quality/mingda/TPU/mingda_0.3_TPU_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/mingda/TPU/mingda_0.3_TPU_standard.inst.cfg b/resources/quality/mingda/TPU/mingda_0.3_TPU_standard.inst.cfg new file mode 100644 index 0000000000..f5f9842221 --- /dev/null +++ b/resources/quality/mingda/TPU/mingda_0.3_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/mingda/TPU/mingda_0.3_TPU_super.inst.cfg b/resources/quality/mingda/TPU/mingda_0.3_TPU_super.inst.cfg new file mode 100644 index 0000000000..8b8f827f9d --- /dev/null +++ b/resources/quality/mingda/TPU/mingda_0.3_TPU_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_tpu +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/mingda/TPU/mingda_0.4_TPU_adaptive.inst.cfg b/resources/quality/mingda/TPU/mingda_0.4_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..20a1b14b53 --- /dev/null +++ b/resources/quality/mingda/TPU/mingda_0.4_TPU_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/mingda/TPU/mingda_0.4_TPU_standard.inst.cfg b/resources/quality/mingda/TPU/mingda_0.4_TPU_standard.inst.cfg new file mode 100644 index 0000000000..419361b62b --- /dev/null +++ b/resources/quality/mingda/TPU/mingda_0.4_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/mingda/TPU/mingda_0.4_TPU_super.inst.cfg b/resources/quality/mingda/TPU/mingda_0.4_TPU_super.inst.cfg new file mode 100644 index 0000000000..74258ddda1 --- /dev/null +++ b/resources/quality/mingda/TPU/mingda_0.4_TPU_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/mingda/TPU/mingda_0.5_TPU_adaptive.inst.cfg b/resources/quality/mingda/TPU/mingda_0.5_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..1f946adb66 --- /dev/null +++ b/resources/quality/mingda/TPU/mingda_0.5_TPU_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/mingda/TPU/mingda_0.5_TPU_standard.inst.cfg b/resources/quality/mingda/TPU/mingda_0.5_TPU_standard.inst.cfg new file mode 100644 index 0000000000..57e2380367 --- /dev/null +++ b/resources/quality/mingda/TPU/mingda_0.5_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/mingda/TPU/mingda_0.5_TPU_super.inst.cfg b/resources/quality/mingda/TPU/mingda_0.5_TPU_super.inst.cfg new file mode 100644 index 0000000000..cc39db3e61 --- /dev/null +++ b/resources/quality/mingda/TPU/mingda_0.5_TPU_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_tpu +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/mingda/TPU/mingda_0.6_TPU_standard.inst.cfg b/resources/quality/mingda/TPU/mingda_0.6_TPU_standard.inst.cfg new file mode 100644 index 0000000000..995e3e8d81 --- /dev/null +++ b/resources/quality/mingda/TPU/mingda_0.6_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/mingda/TPU/mingda_0.8_TPU_draft.inst.cfg b/resources/quality/mingda/TPU/mingda_0.8_TPU_draft.inst.cfg new file mode 100644 index 0000000000..ee5cf2b7cc --- /dev/null +++ b/resources/quality/mingda/TPU/mingda_0.8_TPU_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_tpu +variant = 0.8mm Nozzle + +[values] diff --git a/resources/quality/mingda/TPU/mingda_1.0_TPU_draft.inst.cfg b/resources/quality/mingda/TPU/mingda_1.0_TPU_draft.inst.cfg new file mode 100644 index 0000000000..7eb77a1ef3 --- /dev/null +++ b/resources/quality/mingda/TPU/mingda_1.0_TPU_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_tpu +variant = 1.0mm Nozzle + +[values] diff --git a/resources/quality/mingda/mingda_global_adaptive.inst.cfg b/resources/quality/mingda/mingda_global_adaptive.inst.cfg new file mode 100644 index 0000000000..238fd4092f --- /dev/null +++ b/resources/quality/mingda/mingda_global_adaptive.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Dynamic Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +weight = -2 +global_quality = True + +[values] +layer_height = 0.16 +layer_height_0 = 0.20 +top_bottom_thickness = =layer_height_0+layer_height*4 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*6 +adaptive_layer_height_enabled = true diff --git a/resources/quality/mingda/mingda_global_draft.inst.cfg b/resources/quality/mingda/mingda_global_draft.inst.cfg new file mode 100644 index 0000000000..5bc03d8fe6 --- /dev/null +++ b/resources/quality/mingda/mingda_global_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Draft Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -5 +global_quality = True + +[values] +layer_height = 0.32 +layer_height_0 = 0.32 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/mingda/mingda_global_low.inst.cfg b/resources/quality/mingda/mingda_global_low.inst.cfg new file mode 100644 index 0000000000..39f6eb3b52 --- /dev/null +++ b/resources/quality/mingda/mingda_global_low.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Low Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +weight = -4 +global_quality = True + +[values] +layer_height = 0.28 +layer_height_0 = 0.28 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/mingda/mingda_global_standard.inst.cfg b/resources/quality/mingda/mingda_global_standard.inst.cfg new file mode 100644 index 0000000000..558bc5f60b --- /dev/null +++ b/resources/quality/mingda/mingda_global_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Standard Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +weight = -3 +global_quality = True + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*5 diff --git a/resources/quality/mingda/mingda_global_super.inst.cfg b/resources/quality/mingda/mingda_global_super.inst.cfg new file mode 100644 index 0000000000..0137d241cf --- /dev/null +++ b/resources/quality/mingda/mingda_global_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Super Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +weight = -1 +global_quality = True + +[values] +layer_height = 0.12 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*6 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*8 diff --git a/resources/quality/mingda/mingda_global_ultra.inst.cfg b/resources/quality/mingda/mingda_global_ultra.inst.cfg new file mode 100644 index 0000000000..778fbd6b23 --- /dev/null +++ b/resources/quality/mingda/mingda_global_ultra.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Ultra Quality +definition = mingda_base + +[metadata] +setting_version = 17 +type = quality +quality_type = ultra +weight = 0 +global_quality = True + +[values] +layer_height = 0.08 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*10 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*12 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_draft.inst.cfg index fdc63d4e88..8da071fd25 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_fast.inst.cfg index 6d8497c4cc..67e92b885d 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_high.inst.cfg index ddbf80dcde..a5cc35d097 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_normal.inst.cfg index b74c6c26c5..bb002c6744 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg index d65a5d2e71..7cf73170ae 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg index 70f43cdb38..b82cc5ace6 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_ultra.inst.cfg index 0349be0833..01c4cbda3d 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = thickerdraft weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg index 20f652c1d7..8a7cd23674 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Draft_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Draft_Quality.inst.cfg index 2a114f73b4..8bbbfc11d4 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Draft_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Fast_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Fast_Quality.inst.cfg index bf3344c357..c17da2d2f3 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Fast_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_High_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_High_Quality.inst.cfg index 3ab0db7e39..45abe54079 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_High_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Normal_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Normal_Quality.inst.cfg index 8dfffc9cbf..2efcb3902d 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Normal_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg index 5a1add03f1..15aa2b3d0f 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg index ddb092988e..4324a414e5 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg index bbaec52c77..0c1d4036d9 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg index 58632e4d2d..831311552f 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg index 78916b43b5..cb2e2350c9 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg index 91fcb5bc3b..ef8baf6240 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_high.inst.cfg index 5fdd6fb3a8..444387156a 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg index d151d0cd88..b394684b6a 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg index c73e43843f..f6190e1293 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg index 0410979ae8..3b13aa1205 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg index 0db75730e6..e5211a8c67 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg index 79fd20744a..e610068f1e 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_draft.inst.cfg index 94914a8fb1..27fded4a6d 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_fast.inst.cfg index cfc3632bf5..367b47168b 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_high.inst.cfg index 7b10f6b9a0..ee22f444b7 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_normal.inst.cfg index 2e3d2b2f0d..8d51d172d8 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg index 2613bdf3de..cbf2abce5c 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg index 5390f70b67..7f7abca798 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_ultra.inst.cfg index 63d845f034..07c00587d0 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg index b7063dbd79..c9d339f6a5 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_draft.inst.cfg index 8a2304aa8e..674de90807 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_fast.inst.cfg index 2bf9222fab..9639919794 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_high.inst.cfg index bead27fd2f..4f28a5e516 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_normal.inst.cfg index aee3256d26..861e64f01c 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg index 62783375f0..5378927d80 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg index ff0cf9544a..feef979b27 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_ultra.inst.cfg index 81a801cc16..5e43b08d29 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg index 1366991706..19c1b3f06a 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_draft.inst.cfg index 5eeeeb2d84..c97a101123 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_fast.inst.cfg index 585f660418..6fa96637eb 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_high.inst.cfg index ad4e7484a3..63a437347a 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = Finer definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_normal.inst.cfg index 22056bbf4d..5e964c1ca2 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg index aed7bd6502..675e538816 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg @@ -4,7 +4,7 @@ name = Lowest Quality Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -5 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg index 9939d2d222..e1f01cf4f6 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = thickerdraft weight = -3 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_ultra.inst.cfg index 0ad8b7fea7..07bb175c01 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Fine definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra weight = 2 diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg index b09ba1b6f9..dba795ecef 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Low Detail Draft definition = monoprice_select_mini_v2 [metadata] -setting_version = 16 +setting_version = 17 type = quality material = generic_pla weight = 0 diff --git a/resources/quality/normal.inst.cfg b/resources/quality/normal.inst.cfg index c475ffa23b..703eb05660 100644 --- a/resources/quality/normal.inst.cfg +++ b/resources/quality/normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = fdmprinter [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg index 7348a4bd1c..8c23fb8c91 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg @@ -5,7 +5,7 @@ name = Best Quality definition = nwa3d_a31 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = best weight = 1 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg index 90fb8fc8f8..8d1f47b618 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg @@ -4,7 +4,7 @@ name = 0.6 Engineering Quality definition = nwa3d_a31 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = Engineering weight = -2 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg index 6a002f6a81..60c59f562e 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg @@ -5,7 +5,7 @@ name = Fast Quality definition = nwa3d_a31 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg index d39e4acbd1..d1d808e2a3 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = nwa3d_a31 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg index 8041c1c5d4..9fe8c62c1f 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg @@ -4,7 +4,7 @@ name = Best Quality definition = nwa3d_a5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = best weight = 1 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg index a0c8146f7e..1c78b99ad3 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast Quality definition = nwa3d_a5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg index ba5ae77ea1..c84aacd772 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = nwa3d_a5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg index 0397ab0692..09b02d7ce8 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = peopoly_moai [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = 3 diff --git a/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg index 2707b664af..a655bc013a 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = peopoly_moai [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg index d495fe8df9..5c77ded223 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra High definition = peopoly_moai [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra_high weight = 0 diff --git a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg index cb772cde5a..04558dda11 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = peopoly_moai [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg index 5dc550a124..272cdca02d 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = peopoly_moai [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg index 92f2870b44..2e383eb320 100644 --- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_abs diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg index 52f97abd7c..b18e77b81e 100644 --- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg @@ -4,7 +4,7 @@ name = Good Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = good material = generic_abs diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg index 1986536dfd..d6bc5e6280 100644 --- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg index 2c2c4d406c..2985b9ffb0 100644 --- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_abs diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg index b825b688c8..8b8cfa7559 100644 --- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg index 250ca049b7..6daec21e45 100644 --- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra material = generic_abs diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg index 948fdbc2d6..5853545750 100644 --- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_nylon diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg index 3219fab268..31a793372a 100644 --- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg @@ -4,7 +4,7 @@ name = Good Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = good material = generic_nylon diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg index 4bbe9c5f4d..8ad9403a67 100644 --- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_nylon diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg index 94afbf48c9..75ce470e8d 100644 --- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_nylon diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg index 72e5fa525c..7ac48fab51 100644 --- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_nylon diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg index d7423662e7..9e850671b0 100644 --- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra material = generic_nylon diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg index 814a2d8612..ce6b84e089 100644 --- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_petg diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg index 66b6d4231a..28fd3d5ab0 100644 --- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg @@ -4,7 +4,7 @@ name = Good Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = good material = generic_petg diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg index e1e71ff8d8..9ca1ef4bfb 100644 --- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg index c8e5e07f08..ce5c693075 100644 --- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_petg diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg index c091d842ac..dce79cd59b 100644 --- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg index f3fe6fdc78..c33b28ebbb 100644 --- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra material = generic_petg diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg index 8ad658ce1d..c1d951c417 100644 --- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_pla diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg index f19d664474..9a5c04577f 100644 --- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg @@ -4,7 +4,7 @@ name = Good Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = good material = generic_pla diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg index b08432e38b..164dab4b01 100644 --- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg index 62bd12a5d0..d7e69b9a66 100644 --- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_pla diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg index 8a518a09ac..69c84231a9 100644 --- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg index 96e038a631..43e6349b8e 100644 --- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra material = generic_pla diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg index 261a6d4b0f..2b5c6cc293 100644 --- a/resources/quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg +++ b/resources/quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive weight = -6 @@ -13,7 +13,4 @@ global_quality = True [values] layer_height = 0.24 layer_height_0 = 0.20 -top_bottom_thickness = =layer_height_0+layer_height*3 -wall_thickness = =line_width*2 -support_interface_height = =layer_height*4 adaptive_layer_height_enabled = true diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_good.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_good.inst.cfg index 0caae8a506..ae94a05a46 100644 --- a/resources/quality/rigid3d_base/rigid3d_base_global_good.inst.cfg +++ b/resources/quality/rigid3d_base/rigid3d_base_global_good.inst.cfg @@ -4,7 +4,7 @@ name = Good Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = good weight = -2 @@ -13,6 +13,3 @@ global_quality = True [values] layer_height = 0.16 layer_height_0 = 0.20 -top_bottom_thickness = =layer_height_0+layer_height*4 -wall_thickness = =line_width*3 -support_interface_height = =layer_height*5 diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg index 0034a88154..4a8f9aa929 100644 --- a/resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg +++ b/resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low weight = -4 @@ -13,6 +13,3 @@ global_quality = True [values] layer_height = 0.28 layer_height_0 = 0.2 -top_bottom_thickness = =layer_height_0+layer_height*3 -wall_thickness = =line_width*2 -support_interface_height = =layer_height*3 diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg index 2edfd98358..f4149cb022 100644 --- a/resources/quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg +++ b/resources/quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard weight = -3 @@ -13,6 +13,3 @@ global_quality = True [values] layer_height = 0.2 layer_height_0 = 0.2 -top_bottom_thickness = =layer_height_0+layer_height*3 -wall_thickness = =line_width*2 -support_interface_height = =layer_height*4 diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_super.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_super.inst.cfg index f1689a6d76..f2f820556c 100644 --- a/resources/quality/rigid3d_base/rigid3d_base_global_super.inst.cfg +++ b/resources/quality/rigid3d_base/rigid3d_base_global_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super weight = -1 @@ -13,6 +13,3 @@ global_quality = True [values] layer_height = 0.12 layer_height_0 = 0.20 -top_bottom_thickness = =layer_height_0+layer_height*6 -wall_thickness = =line_width*3 -support_interface_height = =layer_height*7 diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg index ce767bf4bf..bf1dd1cdb2 100644 --- a/resources/quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg +++ b/resources/quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra weight = 0 @@ -13,6 +13,3 @@ global_quality = True [values] layer_height = 0.06 layer_height_0 = 0.20 -top_bottom_thickness = =layer_height_0+layer_height*10 -wall_thickness = =line_width*3 -support_interface_height = =layer_height*12 diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg index 4119f1b16f..80164030f1 100644 --- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = adaptive material = generic_tpu diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg index 944c9d359e..60d2260f93 100644 --- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg @@ -4,7 +4,7 @@ name = Good Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = good material = generic_tpu diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg index 5d2ff4ceae..2611546092 100644 --- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_tpu diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg index 598cf9017f..0538d85633 100644 --- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = standard material = generic_tpu diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg index f69088b370..769d4d7bd5 100644 --- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_tpu diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg index cc51f88bba..ceec6aa22b 100644 --- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = rigid3d_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultra material = generic_tpu diff --git a/resources/quality/skriware_2/sk2_advanced.inst.cfg b/resources/quality/skriware_2/sk2_advanced.inst.cfg new file mode 100644 index 0000000000..dacbcb50ec --- /dev/null +++ b/resources/quality/skriware_2/sk2_advanced.inst.cfg @@ -0,0 +1,35 @@ +[general] +version = 4 +name = Advanced +definition = skriware_2 + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = 0 +global_quality = True + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +speed_travel = 80 +acceleration_travel = 400 +jerk_travel = 10 +acceleration_layer_0 = 200 +acceleration_print_layer_0 = 200 +acceleration_travel_layer_0 = 200 +jerk_layer_0 = 2 +jerk_print_layer_0 = 2 +jerk_travel_layer_0 = 2 +raft_interface_line_spacing = 0.8 +raft_interface_line_width = 0.6 +raft_interface_speed = 40 +raft_interface_thickness = 0.2 +raft_base_line_spacing = 1.5 +raft_base_line_width = 0.8 +raft_base_speed = 20 +raft_base_thickness = 0.3 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_speed = 60 diff --git a/resources/quality/skriware_2/sk2_fast.inst.cfg b/resources/quality/skriware_2/sk2_fast.inst.cfg new file mode 100644 index 0000000000..4a04270877 --- /dev/null +++ b/resources/quality/skriware_2/sk2_fast.inst.cfg @@ -0,0 +1,63 @@ +[general] +version = 4 +name = Fast +definition = skriware_2 + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -1 +global_quality = True + +[values] +layer_height = 0.3 +layer_height_0 = 0.3 +support_infill_sparse_thickness = 0.3 +speed_travel = 100 +acceleration_travel = 400 +jerk_travel = 10 +speed_wall = 40 +speed_wall_0 = 30 +speed_wall_x = 40 +acceleration_wall = 400 +acceleration_wall_0 = 400 +acceleration_wall_x = 400 +jerk_wall = 10 +jerk_wall_0 = 10 +jerk_wall_x = 10 +speed_infill = 80 +acceleration_infill = 400 +jerk_infill = 10 +speed_roofing = 30 +acceleration_roofing = 400 +jerk_roofing = 10 +speed_topbottom = 30 +acceleration_topbottom = 400 +jerk_topbottom = 10 +speed_support = 50 +acceleration_support = 400 +jerk_support = 10 +speed_travel_layer_0 = 80 +speed_print_layer_0 = 20 +speed_layer_0 = 10 +acceleration_layer_0 = 200 +acceleration_print_layer_0 = 200 +acceleration_travel_layer_0 = 200 +jerk_layer_0 = 5 +jerk_print_layer_0 = 2 +jerk_travel_layer_0 = 10 +speed_print = 40 +acceleration_print = 400 +jerk_print = 10 +raft_interface_line_spacing = 0.8 +raft_interface_line_width = 0.6 +raft_interface_speed = 40 +raft_interface_thickness = 0.2 +raft_base_line_spacing = 1.5 +raft_base_line_width = 0.8 +raft_base_speed = 20 +raft_base_thickness = 0.3 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_speed = 60 diff --git a/resources/quality/skriware_2/sk2_precise.inst.cfg b/resources/quality/skriware_2/sk2_precise.inst.cfg new file mode 100644 index 0000000000..3d8cb6ae9d --- /dev/null +++ b/resources/quality/skriware_2/sk2_precise.inst.cfg @@ -0,0 +1,63 @@ +[general] +version = 4 +name = Precise +definition = skriware_2 + +[metadata] +setting_version = 17 +type = quality +quality_type = best +weight = -1 +global_quality = True + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +speed_print = 20 +speed_travel = 80 +acceleration_travel = 400 +jerk_travel = 10 +speed_wall = 20 +speed_wall_0 = 20 +speed_wall_x = 20 +acceleration_wall = 400 +acceleration_wall_0 = 200 +acceleration_wall_x = 200 +jerk_wall = 10 +jerk_wall_0 = 5 +jerk_wall_x = 10 +speed_infill = 80 +acceleration_infill = 400 +jerk_infill = 10 +speed_roofing = 20 +acceleration_roofing = 400 +jerk_roofing = 10 +speed_topbottom = 20 +acceleration_topbottom = 400 +jerk_topbottom = 10 +speed_support = 50 +acceleration_support = 400 +jerk_support = 10 +speed_travel_layer_0 = 80 +speed_print_layer_0 = 20 +speed_layer_0 = 20 +acceleration_layer_0 = 200 +acceleration_print_layer_0 = 200 +acceleration_travel_layer_0 = 200 +jerk_layer_0 = 10 +jerk_print_layer_0 = 10 +jerk_travel_layer_0 = 10 +speed_print = 20 +acceleration_print = 400 +jerk_print = 10 +raft_interface_line_spacing = 0.8 +raft_interface_line_width = 0.6 +raft_interface_speed = 40 +raft_interface_thickness = 0.2 +raft_base_line_spacing = 1.5 +raft_base_line_width = 0.8 +raft_base_speed = 20 +raft_base_thickness = 0.3 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_speed = 60 diff --git a/resources/quality/snapmaker2/snapmaker2_fast.inst.cfg b/resources/quality/snapmaker2/snapmaker2_fast.inst.cfg new file mode 100644 index 0000000000..ce607f630b --- /dev/null +++ b/resources/quality/snapmaker2/snapmaker2_fast.inst.cfg @@ -0,0 +1,66 @@ +[general] +version = 4 +name = Fast +definition = snapmaker2 + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -2 +global_quality = True + +[values] +layer_height = 0.24 +layer_height_0 = 0.2 +initial_layer_line_width_factor = 100 + +wall_thickness = 0.8 +wall_line_count = 2 +top_thickness = 0.8 +top_layers = 4 +bottom_thickness = 0.8 +bottom_layers = 4 +outer_inset_first = False +skin_outline_count = 0 + +; infill_line_distance = 8 +infill_sparse_density = 15 +infill_sparse_thickness = 0.24 +skin_preshrink = 0.8 +top_skin_preshrink = 0.8 +bottom_skin_preshrink = 0.8 +expand_skins_expand_distance = 0.8 +top_skin_expand_distance = 0.8 +bottom_skin_expand_distance = 0.8 + +speed_travel = 80 +speed_topbottom = 30 +speed_wall_x = 25 +speed_wall_0 = 20 +speed_wall = 40 +speed_infill = 60 +speed_print = 60 +speed_print_layer_0 = 18 +speed_travel_layer_0 = 24 +skirt_brim_speed = 18 + +retraction_hop = 1 +retraction_hop_enabled = False + +magic_spiralize = False +magic_mesh_surface_mode = normal + +adhesion_type = skirt +skirt_line_count = 1 +brim_width = 8 +brim_line_count = 20 +raft_margin = 15 + +support_enable = False +support_type = everywhere +support_pattern = zigzag +support_angle = 50 +support_infill_rate = 15 +support_line_distance = 2.66 +support_initial_layer_line_distance = 2.66 \ No newline at end of file diff --git a/resources/quality/snapmaker2/snapmaker2_high.inst.cfg b/resources/quality/snapmaker2/snapmaker2_high.inst.cfg new file mode 100644 index 0000000000..24bcfd2103 --- /dev/null +++ b/resources/quality/snapmaker2/snapmaker2_high.inst.cfg @@ -0,0 +1,65 @@ +[general] +version = 4 +name = High +definition = snapmaker2 + +[metadata] +setting_version = 17 +type = quality +quality_type = high +weight = 1 +global_quality = True + +[values] +layer_height = 0.08 +layer_height_0 = 0.15 +initial_layer_line_width_factor = 100 + +wall_thickness = 1.2 +wall_line_count = 3 +top_thickness = 0.8 +top_layers = 10 +bottom_thickness = 0.8 +bottom_layers = 10 +outer_inset_first = False +skin_outline_count = 1 + +; infill_line_distance = 8 +infill_sparse_density = 15 +infill_sparse_thickness = 0.08 +skin_preshrink = 1.2 +top_skin_preshrink = 1.2 +bottom_skin_preshrink = 1.2 +expand_skins_expand_distance = 1.2 +top_skin_expand_distance = 1.2 +bottom_skin_expand_distance = 1.2 + +speed_travel = 60 +speed_topbottom = 20 +speed_wall_x = 15 +speed_wall_0 = 10 +speed_wall = 30 +speed_infill = 40 +speed_print = 40 +speed_print_layer_0 = 18 +speed_travel_layer_0 = 24 +skirt_brim_speed = 18 + +retraction_hop = 1 +retraction_hop_enabled = False + +magic_spiralize = False +magic_mesh_surface_mode = normal + +adhesion_type = skirt +skirt_line_count = 1 +brim_width = 8 +brim_line_count = 20 +raft_margin = 15 + +support_enable = False +support_type = everywhere +support_pattern = zigzag +support_angle = 50 +support_infill_rate = 15 +support_line_distance = 2.66 diff --git a/resources/quality/snapmaker2/snapmaker2_normal.inst.cfg b/resources/quality/snapmaker2/snapmaker2_normal.inst.cfg new file mode 100644 index 0000000000..b6bb40aec2 --- /dev/null +++ b/resources/quality/snapmaker2/snapmaker2_normal.inst.cfg @@ -0,0 +1,66 @@ +[general] +version = 4 +name = Normal +definition = snapmaker2 + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = 0 +global_quality = True + +[values] +layer_height = 0.16 +layer_height_0 = 0.2 +initial_layer_line_width_factor = 100 + +wall_thickness = 1.2 +wall_line_count = 3 +top_thickness = 0.8 +top_layers = 5 +bottom_thickness = 0.8 +bottom_layers = 5 +outer_inset_first = False +skin_outline_count = 0 + +; infill_line_distance = 8 +infill_sparse_density = 15 +infill_sparse_thickness = 0.16 +skin_preshrink = 1.2 +top_skin_preshrink = 1.2 +bottom_skin_preshrink = 1.2 +expand_skins_expand_distance = 1.2 +top_skin_expand_distance = 1.2 +bottom_skin_expand_distance = 1.2 + +speed_travel = 70 +speed_topbottom = 25 +speed_wall_x = 20 +speed_wall_0 = 15 +speed_wall = 30 +speed_infill = 50 +speed_print = 50 +speed_print_layer_0 = 18 +speed_travel_layer_0 = 24 +skirt_brim_speed = 18 + +retraction_hop = 1 +retraction_hop_enabled = False + +magic_spiralize = False +magic_mesh_surface_mode = normal + +adhesion_type = skirt +skirt_line_count = 1 +brim_width = 8 +brim_line_count = 20 +raft_margin = 15 + +support_enable = False +support_type = everywhere +support_pattern = zigzag +support_angle = 50 +support_infill_rate = 15 +support_line_distance = 2.66 +support_initial_layer_line_distance = 2.66 \ No newline at end of file diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_A.inst.cfg new file mode 100644 index 0000000000..76ec06262a --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_A.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_absx +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 19 * layer_height +cool_min_speed = 10 +support_angle = 65 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 100 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_B.inst.cfg new file mode 100644 index 0000000000..f3f24b3469 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_B.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_absx +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 96 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_C.inst.cfg new file mode 100644 index 0000000000..1a81a07607 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_C.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_absx +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 60 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 91 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_A.inst.cfg new file mode 100644 index 0000000000..ccb80ab2f1 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_A.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_abs +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 19 * layer_height +cool_min_speed = 10 +support_angle = 65 +material_print_temperature = =default_material_print_temperature + 1 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 100 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_B.inst.cfg new file mode 100644 index 0000000000..25f6aef09a --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_B.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_abs +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature + 1 +material_flow = 96 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_C.inst.cfg new file mode 100644 index 0000000000..3413ce30aa --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_C.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_abs +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 60 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +3 +material_flow = 91 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_A.inst.cfg new file mode 100644 index 0000000000..739ae5bf06 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_A.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_acetate +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +speed_topbottom = =math.ceil(speed_print * 33/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 10 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 98 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_B.inst.cfg new file mode 100644 index 0000000000..7787def8bb --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_B.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_acetate +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 27/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 7 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 2 +material_print_temperature_layer_0 = =default_material_print_temperature + 0 +material_flow = 95 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_C.inst.cfg new file mode 100644 index 0000000000..f670bb6eb1 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_C.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_acetate +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 60 +speed_wall = =math.ceil(speed_print * 45/60) +speed_wall_0 = =math.ceil(speed_wall * 33/45) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 5 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_A.inst.cfg new file mode 100644 index 0000000000..cfe30caf9f --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_A.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_asax +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 75 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 19 * layer_height +cool_min_speed = 10 +support_angle = 65 +material_print_temperature = =default_material_print_temperature + 1 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 100 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_B.inst.cfg new file mode 100644 index 0000000000..2d113281a8 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_B.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_asax +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 75 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 96 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_C.inst.cfg new file mode 100644 index 0000000000..7dc65e54da --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_C.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_asax +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 60 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 75 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 7 +material_flow = 91 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_A.inst.cfg new file mode 100644 index 0000000000..010c252721 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_A.inst.cfg @@ -0,0 +1,62 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_copa +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 20 +cool_fan_speed_max = 80 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 2 +cool_lift_head = True +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 91 +skin_material_flow = 92 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 8 +bridge_wall_material_flow = 50 +bridge_skin_speed = 8 +bridge_skin_material_flow = 60 +bridge_skin_density = 80 +bridge_fan_speed = 80 +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_B.inst.cfg new file mode 100644 index 0000000000..80c7c4c6ad --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_B.inst.cfg @@ -0,0 +1,62 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_copa +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 20 +cool_fan_speed_max = 80 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 2 +cool_lift_head = True +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 91 +skin_material_flow = 92 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 8 +bridge_wall_material_flow = 50 +bridge_skin_speed = 8 +bridge_skin_material_flow = 60 +bridge_skin_density = 80 +bridge_fan_speed = 80 +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_C.inst.cfg new file mode 100644 index 0000000000..5de7b0ea9f --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_C.inst.cfg @@ -0,0 +1,62 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_copa +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 20 +cool_fan_speed_max = 80 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 2 +cool_lift_head = True +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 91 +skin_material_flow = 92 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 8 +bridge_wall_material_flow = 50 +bridge_skin_speed = 8 +bridge_skin_material_flow = 60 +bridge_skin_density = 80 +bridge_fan_speed = 80 +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_A.inst.cfg new file mode 100644 index 0000000000..cb3871fc6d --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_A.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_hips +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_B.inst.cfg new file mode 100644 index 0000000000..d29a61bae6 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_B.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_hips +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_C.inst.cfg new file mode 100644 index 0000000000..46b30ef1a1 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_C.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_hips +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_A.inst.cfg new file mode 100644 index 0000000000..c2065bf506 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_A.inst.cfg @@ -0,0 +1,61 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_pc +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 10 +cool_fan_speed_max = 10 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 12 +support_angle = 60 +cool_lift_head = true +material_print_temperature = 260 +material_print_temperature_layer_0 = 265 +material_flow = 88 +wall_line_count = 3 +retraction_extra_prime_amount = 0.1 +retraction_speed = 30 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +adhesion_type = brim + +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 12 +bridge_wall_material_flow = 50 +bridge_skin_speed = 12.5 +bridge_skin_material_flow = 100 +bridge_skin_density = 80 +bridge_fan_speed = 100 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_B.inst.cfg new file mode 100644 index 0000000000..e3804df9e2 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_B.inst.cfg @@ -0,0 +1,61 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_pc +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 10 +cool_fan_speed_max = 10 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 12 +cool_lift_head = true +support_angle = 60 +material_print_temperature = 270 +material_print_temperature_layer_0 = 275 +material_flow = 88 +wall_line_count = 3 +retraction_speed = 30 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True + +adhesion_type = brim + +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 12 +bridge_wall_material_flow = 50 +bridge_skin_speed = 12.5 +bridge_skin_material_flow = 100 +bridge_skin_density = 80 +bridge_fan_speed = 100 diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_C.inst.cfg new file mode 100644 index 0000000000..453c4c8700 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_C.inst.cfg @@ -0,0 +1,61 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_pc +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 10 +cool_fan_speed_max = 10 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 12 +support_angle = 60 +cool_lift_head = true +material_print_temperature = 270 +material_print_temperature_layer_0 = 275 +material_flow = 88 +wall_line_count = 3 +retraction_speed = 30 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True + +adhesion_type = brim + +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 12 +bridge_wall_material_flow = 50 +bridge_skin_speed = 12.5 +bridge_skin_material_flow = 100 +bridge_skin_density = 80 +bridge_fan_speed = 100 diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PEKK_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PEKK_B.inst.cfg new file mode 100644 index 0000000000..3782c7f994 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PEKK_B.inst.cfg @@ -0,0 +1,58 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_pekk +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +initial_layer_line_width_factor = 120 +material_flow_layer_0 = 120 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = 10 +speed_travel_layer_0 = 100 +skirt_brim_speed = 5 +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 30 +cool_fan_speed_max = 30 +cool_min_layer_time_fan_speed_max = 10 +cool_min_layer_time = 11 +cool_fan_full_layer = 2 +cool_min_speed = 5 +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 15 +material_flow = 105 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 105 +prime_tower_enable = True +bridge_settings_enabled = True +bridge_wall_speed = 5 +bridge_wall_material_flow = 185 +bridge_skin_speed = =bridge_wall_speed +bridge_skin_material_flow = =bridge_wall_material_flow +bridge_fan_speed = 100 +bridge_enable_more_layers = False diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_A.inst.cfg new file mode 100644 index 0000000000..a5bf7374ca --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_A.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_petg +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 65 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 98 +retraction_extra_prime_amount = 0 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_B.inst.cfg new file mode 100644 index 0000000000..91d3015b25 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_B.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_petg +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_C.inst.cfg new file mode 100644 index 0000000000..77bd280b59 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_C.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_petg +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 60 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature +5 +material_flow = 91 +retraction_extra_prime_amount = 0 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_A.inst.cfg new file mode 100644 index 0000000000..5ee51facb5 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_A.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_pla +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 65 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature -5 +material_flow = 98 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_B.inst.cfg new file mode 100644 index 0000000000..b575c4db11 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_B.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_pla +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_C.inst.cfg new file mode 100644 index 0000000000..3dd12ec3d3 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_C.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_pla +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 60 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 91 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_A.inst.cfg new file mode 100644 index 0000000000..46a34e8290 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_A.inst.cfg @@ -0,0 +1,55 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_pla_hr_870 +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +speed_print = 30 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 4 +support_angle = 65 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 10 +material_initial_print_temperature = =default_material_print_temperature + 5 +material_final_print_temperature = =default_material_print_temperature + 5 +material_flow = 91 +skin_material_flow = 92 +retraction_amount = 2 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 +cool_lift_head = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_B.inst.cfg new file mode 100644 index 0000000000..504695192f --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_B.inst.cfg @@ -0,0 +1,54 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_pla_hr_870 +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 4 +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 91 +skin_material_flow = 92 +retraction_amount = 2 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 +cool_lift_head = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_C.inst.cfg new file mode 100644 index 0000000000..1bc06df105 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_C.inst.cfg @@ -0,0 +1,54 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_pla_hr_870 +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 4 +support_angle = 55 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 91 +skin_material_flow = 92 +retraction_amount = 2 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 +cool_lift_head = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_A.inst.cfg new file mode 100644 index 0000000000..5a2e9009be --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_A.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_tpu98a +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 30 +speed_wall = =math.ceil(speed_print * 30/30) +speed_wall_0 = =math.ceil(speed_print * 25/30) +speed_topbottom = =math.ceil(speed_print * 25/30) +speed_layer_0 = =math.ceil(speed_print * 20/30) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature - 3 +material_flow = 107 +retraction_extra_prime_amount = 0.2 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.5 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_B.inst.cfg new file mode 100644 index 0000000000..46bdc28c7e --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_B.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_tpu98a +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_print * 27/35) +speed_topbottom = =math.ceil(speed_print * 25/35) +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 103 +retraction_extra_prime_amount = 0.2 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.5 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_C.inst.cfg new file mode 100644 index 0000000000..57a47f9a3b --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_C.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_tpu98a +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 40/40) +speed_wall_0 = =math.ceil(speed_print * 30/40) +speed_topbottom = =math.ceil(speed_print * 27/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 7 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 101 +retraction_extra_prime_amount = 0.2 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.5 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_A.inst.cfg index 8fcfde369f..4cd7e8cc3b 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_B.inst.cfg index 216125d9a3..caaf0c4c44 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_C.inst.cfg index d385c0ff30..1d6582a92e 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg index 9a1639165e..776404fc19 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg index f2da5b39b8..50a526d37a 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg index b579c4b05b..1ae65e1bf6 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_A.inst.cfg index 08f8508763..ca18f75870 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_B.inst.cfg index 8bb20b2914..c882abcc2e 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_C.inst.cfg index 6169d736c3..935c808404 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_A.inst.cfg index dd60a23275..2f7952fa3e 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_B.inst.cfg index 80be1ecf9c..22df0629e6 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_C.inst.cfg index 07fabf6a6c..b2c2b760bf 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_A.inst.cfg index 9c3816aff9..245edbb95d 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_B.inst.cfg index 4063c3959a..e7f1863c58 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_C.inst.cfg index e175f91a4d..2bb3dbf266 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_A.inst.cfg new file mode 100644 index 0000000000..1385892136 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_A.inst.cfg @@ -0,0 +1,62 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_copa +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 20 +cool_fan_speed_max = 80 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 2 +cool_lift_head = True +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 91 +skin_material_flow = 92 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 8 +bridge_wall_material_flow = 50 +bridge_skin_speed = 8 +bridge_skin_material_flow = 60 +bridge_skin_density = 80 +bridge_fan_speed = 80 +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_B.inst.cfg new file mode 100644 index 0000000000..8f22831fb1 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_B.inst.cfg @@ -0,0 +1,62 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_copa +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 20 +cool_fan_speed_max = 80 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 2 +cool_lift_head = True +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 91 +skin_material_flow = 92 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 8 +bridge_wall_material_flow = 50 +bridge_skin_speed = 8 +bridge_skin_material_flow = 60 +bridge_skin_density = 80 +bridge_fan_speed = 80 +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_C.inst.cfg new file mode 100644 index 0000000000..d60e56429c --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_C.inst.cfg @@ -0,0 +1,62 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_copa +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 20 +cool_fan_speed_max = 80 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 2 +cool_lift_head = True +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 91 +skin_material_flow = 92 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 8 +bridge_wall_material_flow = 50 +bridge_skin_speed = 8 +bridge_skin_material_flow = 60 +bridge_skin_density = 80 +bridge_fan_speed = 80 +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg index 086f8a7929..4b4196ebc7 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg index fb848950ce..a975b19623 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg index 3fb9938232..c15582732e 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_A.inst.cfg new file mode 100644 index 0000000000..f66fe17a69 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_A.inst.cfg @@ -0,0 +1,61 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_pc +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 10 +cool_fan_speed_max = 10 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 12 +support_angle = 60 +cool_lift_head = true +material_print_temperature = 260 +material_print_temperature_layer_0 = 265 +material_flow = 88 +wall_line_count = 3 +retraction_extra_prime_amount = 0.1 +retraction_speed = 30 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +adhesion_type = brim + +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 12 +bridge_wall_material_flow = 50 +bridge_skin_speed = 12.5 +bridge_skin_material_flow = 100 +bridge_skin_density = 80 +bridge_fan_speed = 100 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_B.inst.cfg new file mode 100644 index 0000000000..9f2c00f3a6 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_B.inst.cfg @@ -0,0 +1,61 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_pc +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 10 +cool_fan_speed_max = 10 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 12 +cool_lift_head = true +support_angle = 60 +material_print_temperature = 270 +material_print_temperature_layer_0 = 275 +material_flow = 88 +wall_line_count = 3 +retraction_speed = 30 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True + +adhesion_type = brim + +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 12 +bridge_wall_material_flow = 50 +bridge_skin_speed = 12.5 +bridge_skin_material_flow = 100 +bridge_skin_density = 80 +bridge_fan_speed = 100 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_C.inst.cfg new file mode 100644 index 0000000000..8e66d72cfa --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_C.inst.cfg @@ -0,0 +1,61 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_pc +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 10 +cool_fan_speed_max = 10 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 12 +support_angle = 60 +cool_lift_head = true +material_print_temperature = 270 +material_print_temperature_layer_0 = 275 +material_flow = 88 +wall_line_count = 3 +retraction_speed = 30 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True + +adhesion_type = brim + +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 12 +bridge_wall_material_flow = 50 +bridge_skin_speed = 12.5 +bridge_skin_material_flow = 100 +bridge_skin_density = 80 +bridge_fan_speed = 100 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg index f72b70e9bd..641c7c0deb 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg index e7a4bfc114..4ab06e285f 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg index 8d262aa732..e7ca83c936 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg index 113a418f85..694d9c08a0 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg index b88f739cbd..88b41dda14 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg index 939dc1ebbd..e3a2df55cd 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_A.inst.cfg new file mode 100644 index 0000000000..448731a1e0 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_A.inst.cfg @@ -0,0 +1,55 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_pla_hr_870 +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +speed_print = 30 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 4 +support_angle = 65 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 10 +material_initial_print_temperature = =default_material_print_temperature + 5 +material_final_print_temperature = =default_material_print_temperature + 5 +material_flow = 91 +skin_material_flow = 92 +retraction_amount = 2 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 +cool_lift_head = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_B.inst.cfg new file mode 100644 index 0000000000..e1721baee4 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_B.inst.cfg @@ -0,0 +1,54 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_pla_hr_870 +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 4 +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 91 +skin_material_flow = 92 +retraction_amount = 2 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 +cool_lift_head = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_C.inst.cfg new file mode 100644 index 0000000000..1da8326dec --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_C.inst.cfg @@ -0,0 +1,54 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_pla_hr_870 +variant = Standard 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 4 +support_angle = 55 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 91 +skin_material_flow = 92 +retraction_amount = 2 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 +cool_lift_head = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg index 059e5ce050..2281fb64e5 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg index 3bc099c81b..b26dcb504f 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg index 76440baa91..d489795c0f 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg index de0d422c75..ab54ffd04d 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg index 87e1c3b394..446e947f59 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg index 95baf7c2f5..be67ed1e89 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg index 911c301441..87c7b32981 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg @@ -4,7 +4,7 @@ name = A definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = a weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg index 9e362208dc..b6ca72a247 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg index 7b55f58b54..9df2d308d5 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_B.inst.cfg index e15f0039ee..30ecbbd6d5 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_C.inst.cfg index 78717b6d22..a31857602f 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_D.inst.cfg index fdb24bd1ce..85084f892f 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg index 3c9b1ff438..73184a6ad2 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg index b8020035b3..be2afed6ec 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg index 1729e1ba90..cd57f0e804 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_B.inst.cfg index 0d3d36fdad..50f811962b 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_C.inst.cfg index 9e088490bd..a3e1202bde 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_D.inst.cfg index d69b80028b..b123239075 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg index d6c7bf609c..962750385d 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg index d55b7895cb..32e359e9c3 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg index 167ea04597..34ba2373f5 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_B.inst.cfg index 4c71d4ceea..3c0ab3e9c0 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_C.inst.cfg index 8e7c795497..29722743ce 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_D.inst.cfg index 6fea1d0be0..bbb65fc7b0 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_B.inst.cfg new file mode 100644 index 0000000000..aff9f31a2c --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_B.inst.cfg @@ -0,0 +1,64 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 1 +material = emotiontech_copa +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +speed_topbottom = =math.ceil(speed_print * 33/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 20 +cool_fan_speed_max = 80 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 3 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 4 +cool_lift_head = True +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 90 +skin_material_flow = 92 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +retraction_amount = 3 +retraction_speed = 35 +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 10 +bridge_wall_material_flow = 50 +bridge_skin_speed = 10 +bridge_skin_material_flow = 60 +bridge_skin_density = 80 +bridge_fan_speed = 80 +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_C.inst.cfg new file mode 100644 index 0000000000..7186d398c7 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_C.inst.cfg @@ -0,0 +1,64 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = 0 +material = emotiontech_copa +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 27/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 20 +cool_fan_speed_max = 80 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 3 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 4 +cool_lift_head = True +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 90 +skin_material_flow = 92 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +retraction_amount = 3 +retraction_speed = 35 +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 10 +bridge_wall_material_flow = 50 +bridge_skin_speed = 10 +bridge_skin_material_flow = 60 +bridge_skin_density = 80 +bridge_fan_speed = 80 +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_D.inst.cfg new file mode 100644 index 0000000000..e4d54450b3 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_D.inst.cfg @@ -0,0 +1,64 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = d +weight = -1 +material = emotiontech_copa +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 43/60) +speed_wall_0 = =math.ceil(speed_wall * 33/43) +speed_topbottom = =math.ceil(speed_print * 37/60) +speed_layer_0 = =math.ceil(speed_print * 25/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 20 +cool_fan_speed_max = 80 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 3 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 4 +cool_lift_head = True +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 91 +skin_material_flow = 92 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +retraction_amount = 3 +retraction_speed = 35 +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 10 +bridge_wall_material_flow = 50 +bridge_skin_speed = 10 +bridge_skin_material_flow = 60 +bridge_skin_density = 80 +bridge_fan_speed = 80 +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg index 017903b368..3d99441988 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg index 6345fe6dd9..8602dfc761 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg index 2b026ab417..85196b4301 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg index 8aae83ed4c..c921e7fd1f 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_B.inst.cfg new file mode 100644 index 0000000000..c41a78e05d --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_B.inst.cfg @@ -0,0 +1,59 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 1 +material = emotiontech_pc +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +speed_topbottom = =math.ceil(speed_print * 33/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 20 +cool_fan_speed_max = 20 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 3 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 8 +cool_lift_head = true +support_angle = 60 +material_print_temperature = 270 +material_print_temperature_layer_0 = 275 +material_flow = 87 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +retraction_amount = 2 +retraction_speed = 25 + +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 10 +bridge_wall_material_flow = 75 +bridge_skin_speed = 10 +bridge_skin_material_flow = 80 +bridge_skin_density = 100 +bridge_fan_speed = 100 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_C.inst.cfg new file mode 100644 index 0000000000..9b0aafff0f --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_C.inst.cfg @@ -0,0 +1,59 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = 0 +material = emotiontech_pc +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 27/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 20 +cool_fan_speed_max = 20 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 3 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 8 +cool_lift_head = true +support_angle = 60 +material_print_temperature = 270 +material_print_temperature_layer_0 = 275 +material_flow = 87 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +retraction_amount = 2 +retraction_speed = 25 + +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 10 +bridge_wall_material_flow = 75 +bridge_skin_speed = 10 +bridge_skin_material_flow = 80 +bridge_skin_density = 100 +bridge_fan_speed = 100 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_D.inst.cfg new file mode 100644 index 0000000000..e45d87873e --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_D.inst.cfg @@ -0,0 +1,59 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = d +weight = -1 +material = emotiontech_pc +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 43/60) +speed_wall_0 = =math.ceil(speed_wall * 33/43) +speed_topbottom = =math.ceil(speed_print * 37/60) +speed_layer_0 = =math.ceil(speed_print * 25/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 20 +cool_fan_speed_max = 20 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 3 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 8 +cool_lift_head = true +support_angle = 60 +material_print_temperature = 270 +material_print_temperature_layer_0 = 275 +material_flow = 87 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +retraction_amount = 2 +retraction_speed = 25 + +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 10 +bridge_wall_material_flow = 75 +bridge_skin_speed = 10 +bridge_skin_material_flow = 80 +bridge_skin_density = 100 +bridge_fan_speed = 100 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg index a2381e040c..ac715b20ba 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg index 1b9f02cf49..ae6f261f80 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg index d4c5674d28..8cfc91a9e1 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg index 5d68172d1c..6aab20f03b 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg index 2b72fc3889..17e4164ee0 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg index ea7b045e66..420241d024 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_B.inst.cfg new file mode 100644 index 0000000000..55168308cf --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_B.inst.cfg @@ -0,0 +1,53 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 1 +material = emotiontech_pla_hr_870 +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +speed_topbottom = =math.ceil(speed_print * 33/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 3 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 2 +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 90 +skin_material_flow = 91 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 +cool_lift_head = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_C.inst.cfg new file mode 100644 index 0000000000..69b19aff7a --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_C.inst.cfg @@ -0,0 +1,53 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = 0 +material = emotiontech_pla_hr_870 +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 27/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 3 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 2 +support_angle = 55 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 90 +skin_material_flow = 91 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 +cool_lift_head = True diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_D.inst.cfg new file mode 100644 index 0000000000..dd8ed86814 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_D.inst.cfg @@ -0,0 +1,53 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = d +weight = -1 +material = emotiontech_pla_hr_870 +variant = Standard 0.6 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 45/60) +speed_wall_0 = =math.ceil(speed_wall * 33/45) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 3 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 2 +support_angle = 50 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 90 +skin_material_flow = 91 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 +cool_lift_head = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg index 3422e084aa..091ed0d480 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg index 25bb0015e0..be7929f052 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg index d73456f988..9ff56ec834 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg index 0f9af47558..ec8d13dcf5 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg index ed8b6b3c2b..3099b953e1 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg index f3768081fe..e8bd101396 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg index 1f29b4cc38..f5294dfdf3 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg @@ -4,7 +4,7 @@ name = B definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg index 63f19483fc..d26b4cee9f 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg index 41cc12fe64..7d0122221f 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_C.inst.cfg index 369dc67542..054891c67a 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_D.inst.cfg index 9fde31fc3d..c8432f192d 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_E.inst.cfg index dbc457014e..619694afa1 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg index 5851a53f90..11722b89cf 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg index 65ed9167a3..9f199bceb3 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg index d0b8a577bb..cefb21a518 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_C.inst.cfg index d909afc11f..8b2fbab3a0 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_D.inst.cfg index dadf338a3e..8bd87e5587 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_E.inst.cfg index 95bc022b1d..c5ae875217 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_C.inst.cfg index e9e7226977..8753d6b95a 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_D.inst.cfg index c691bbe1ad..933af41f63 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_E.inst.cfg index c32f6be4b0..1cac25f9eb 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_C.inst.cfg new file mode 100644 index 0000000000..99161b76d6 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_C.inst.cfg @@ -0,0 +1,65 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = 1 +material = emotiontech_copa +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 4 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 20 +cool_fan_speed_max = 80 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 4 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 8 +cool_lift_head = True +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 93 +skin_material_flow = 94 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +retraction_hop_enabled = True +retraction_hop = 2 +retraction_speed = 35 +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 10 +bridge_wall_material_flow = 50 +bridge_skin_speed = 10 +bridge_skin_material_flow = 60 +bridge_skin_density = 80 +bridge_fan_speed = 80 +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_D.inst.cfg new file mode 100644 index 0000000000..4efb7851cd --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_D.inst.cfg @@ -0,0 +1,65 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = d +weight = 0 +material = emotiontech_copa +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 4 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 20 +cool_fan_speed_max = 80 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 4 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 8 +cool_lift_head = True +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 93 +skin_material_flow = 94 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +retraction_hop_enabled = True +retraction_hop = 2 +retraction_speed = 35 +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 10 +bridge_wall_material_flow = 50 +bridge_skin_speed = 10 +bridge_skin_material_flow = 60 +bridge_skin_density = 80 +bridge_fan_speed = 80 +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_E.inst.cfg new file mode 100644 index 0000000000..030938b4ff --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_E.inst.cfg @@ -0,0 +1,65 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = e +weight = -1 +material = emotiontech_copa +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 4 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 20 +cool_fan_speed_max = 80 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 4 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 8 +cool_lift_head = True +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 93 +skin_material_flow = 94 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +retraction_hop_enabled = True +retraction_hop = 2 +retraction_speed = 35 +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 10 +bridge_wall_material_flow = 50 +bridge_skin_speed = 10 +bridge_skin_material_flow = 60 +bridge_skin_density = 80 +bridge_fan_speed = 80 +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg index 22a6e64c2e..dcd79403e5 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg index d7ed593040..76e0cf0893 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg index 6df7d91114..8b26efde2e 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_C.inst.cfg new file mode 100644 index 0000000000..17f070b9b8 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_C.inst.cfg @@ -0,0 +1,60 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = 1 +material = emotiontech_pc +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 3 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 12 +cool_lift_head = True +support_angle = 60 +material_print_temperature = 280 +material_print_temperature_layer_0 = 285 +material_flow = 89 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_speed = 35 +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True + +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 12 +bridge_wall_material_flow = 50 +bridge_skin_speed = 12 +bridge_skin_material_flow = 60 +bridge_skin_density = 80 +bridge_fan_speed = 100 +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_D.inst.cfg new file mode 100644 index 0000000000..670e923ed9 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_D.inst.cfg @@ -0,0 +1,61 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = d +weight = 0 +material = emotiontech_pc +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 3 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 12 +cool_lift_head = True +support_angle = 60 +material_print_temperature = 280 +material_print_temperature_layer_0 = 285 +material_flow = 89 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_speed = 35 + +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True + +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 12 +bridge_wall_material_flow = 50 +bridge_skin_speed = 12 +bridge_skin_material_flow = 60 +bridge_skin_density = 80 +bridge_fan_speed = 100 +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_E.inst.cfg new file mode 100644 index 0000000000..c332a1d0ee --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_E.inst.cfg @@ -0,0 +1,60 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = e +weight = -1 +material = emotiontech_pc +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 3 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 12 +cool_lift_head = True +support_angle = 60 +material_print_temperature = 280 +material_print_temperature_layer_0 = 285 +material_flow = 89 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_speed = 35 +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True + +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 12 +bridge_wall_material_flow = 50 +bridge_skin_speed = 12 +bridge_skin_material_flow = 60 +bridge_skin_density = 80 +bridge_fan_speed = 100 +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg index 7cea0b09b9..ca630c7671 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg index 446610e711..4caabdf67f 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg index 89689e9d6c..d668d03ef0 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg index acc5f9e70b..94f6340353 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg index 4e4e07181c..747a3e941a 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg index c117fd554b..4380506c2f 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_C.inst.cfg new file mode 100644 index 0000000000..c2d9fd7054 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_C.inst.cfg @@ -0,0 +1,51 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = 1 +material = emotiontech_pla_hr_870 +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 4 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 2 +support_angle = 55 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 93 +skin_material_flow = 94 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +cool_lift_head = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_D.inst.cfg new file mode 100644 index 0000000000..bdf28fd9d3 --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_D.inst.cfg @@ -0,0 +1,53 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = d +weight = 0 +material = emotiontech_pla_hr_870 +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 4 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 2 +support_angle = 50 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 93 +skin_material_flow = 94 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 +cool_lift_head = True \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_E.inst.cfg new file mode 100644 index 0000000000..b35461087f --- /dev/null +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_E.inst.cfg @@ -0,0 +1,53 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = e +weight = -1 +material = emotiontech_pla_hr_870 +variant = Standard 0.8 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 4 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 2 +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 93 +skin_material_flow = 94 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 +cool_lift_head = True diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg index cf4801e819..d2dc7ba0ea 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg index 8d2d3af34c..4df4121e0b 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg index 956d61e90f..47d21539d6 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg index 4ba72e4d91..79a4dae34d 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg index 5f2e3f458d..b32cb0825d 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg index 90af7b8616..af29e0b09d 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_C.inst.cfg index f8af449ae1..a279e9a3ff 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_D.inst.cfg index 1f377ba3d0..e378fa8643 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_E.inst.cfg index c1d146788f..f7a4040c87 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg index 721641255c..2f870571b2 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg @@ -4,7 +4,7 @@ name = C definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 1 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg index e21668b02a..98492bbfb0 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg @@ -4,7 +4,7 @@ name = D definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg index 3fdeaf332d..a7d8fd292f 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg @@ -4,7 +4,7 @@ name = E definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = e weight = -1 diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_D.inst.cfg new file mode 100644 index 0000000000..590f4b20f2 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_D.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = d +weight = 1 +material = emotiontech_abs +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 45 +speed_wall = =math.ceil(speed_print * 37/45) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +speed_topbottom = =math.ceil(speed_print * 35/45) +speed_layer_0 = =math.ceil(speed_print * 25/45) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =layer_height +support_xy_distance = =line_width * 2 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_E.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_E.inst.cfg new file mode 100644 index 0000000000..cc672b0aea --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_E.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = e +weight = 0 +material = emotiontech_abs +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 45 +speed_wall = =math.ceil(speed_print * 37/45) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +speed_topbottom = =math.ceil(speed_print * 35/45) +speed_layer_0 = =math.ceil(speed_print * 25/45) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 97 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =layer_height +support_xy_distance = =line_width * 2 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_F.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_F.inst.cfg new file mode 100644 index 0000000000..4e1e8501b2 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_F.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = F +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = f +weight = -1 +material = emotiontech_abs +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 45 +speed_wall = =math.ceil(speed_print * 37/45) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +speed_topbottom = =math.ceil(speed_print * 35/45) +speed_layer_0 = =math.ceil(speed_print * 25/45) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature +5 +material_flow = 97 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =layer_height +support_xy_distance = =line_width * 2 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_D.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_D.inst.cfg new file mode 100644 index 0000000000..1b62d1b71c --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_D.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = d +weight = 1 +material = emotiontech_asax +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 45 +speed_wall = =math.ceil(speed_print * 37/45) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +speed_topbottom = =math.ceil(speed_print * 35/45) +speed_layer_0 = =math.ceil(speed_print * 25/45) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 75 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 1 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 100 +retraction_extra_prime_amount = 0.4 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =layer_height +support_xy_distance = =line_width * 1.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_E.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_E.inst.cfg new file mode 100644 index 0000000000..62bb0316f6 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_E.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = e +weight = 0 +material = emotiontech_asax +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 45 +speed_wall = =math.ceil(speed_print * 37/45) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +speed_topbottom = =math.ceil(speed_print * 35/45) +speed_layer_0 = =math.ceil(speed_print * 25/45) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 75 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 100 +retraction_extra_prime_amount = 0.4 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =layer_height +support_xy_distance = =line_width * 1.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_F.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_F.inst.cfg new file mode 100644 index 0000000000..29d8938ac5 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_F.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = F +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = f +weight = -1 +material = emotiontech_asax +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 45 +speed_wall = =math.ceil(speed_print * 37/45) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +speed_topbottom = =math.ceil(speed_print * 35/45) +speed_layer_0 = =math.ceil(speed_print * 25/45) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 75 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 7 +material_flow = 100 +retraction_extra_prime_amount = 0.4 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =layer_height +support_xy_distance = =line_width * 1.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_D.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_D.inst.cfg new file mode 100644 index 0000000000..915b0d81d6 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_D.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = d +weight = 1 +material = emotiontech_bvoh +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 25/30) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 47 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_E.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_E.inst.cfg new file mode 100644 index 0000000000..e69e2b865a --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_E.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = e +weight = 0 +material = emotiontech_bvoh +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 25/30) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 47 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_F.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_F.inst.cfg new file mode 100644 index 0000000000..a760db4f9b --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_F.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = F +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = f +weight = -1 +material = emotiontech_bvoh +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 25/30) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 47 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_D.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_D.inst.cfg new file mode 100644 index 0000000000..1f6197da9b --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_D.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = d +weight = 1 +material = emotiontech_hips +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 47 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_E.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_E.inst.cfg new file mode 100644 index 0000000000..212d7a4802 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_E.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = e +weight = 0 +material = emotiontech_hips +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 47 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_F.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_F.inst.cfg new file mode 100644 index 0000000000..d882d8a3a5 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_F.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = F +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = f +weight = -1 +material = emotiontech_hips +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 47 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_D.inst.cfg new file mode 100644 index 0000000000..da3d006daa --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_D.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = d +weight = 1 +material = emotiontech_petg +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 45 +speed_wall = =math.ceil(speed_print * 40/45) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/45) +speed_layer_0 = =math.ceil(speed_print * 25/45) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 70 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_E.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_E.inst.cfg new file mode 100644 index 0000000000..50d1996ef4 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_E.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = e +weight = 0 +material = emotiontech_petg +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 45 +speed_wall = =math.ceil(speed_print * 40/45) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/45) +speed_layer_0 = =math.ceil(speed_print * 25/45) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 70 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 95 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_F.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_F.inst.cfg new file mode 100644 index 0000000000..2c0d6c3d03 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_F.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = F +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = f +weight = -1 +material = emotiontech_petg +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 45 +speed_wall = =math.ceil(speed_print * 40/45) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/45) +speed_layer_0 = =math.ceil(speed_print * 25/45) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 70 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 95 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_D.inst.cfg new file mode 100644 index 0000000000..ebabcc2950 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_D.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = d +weight = 1 +material = emotiontech_pla +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 100 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_E.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_E.inst.cfg new file mode 100644 index 0000000000..baadc15a06 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_E.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = e +weight = 0 +material = emotiontech_pla +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 100 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_F.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_F.inst.cfg new file mode 100644 index 0000000000..62adc58107 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_F.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = F +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = f +weight = -1 +material = emotiontech_pla +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature +5 +material_flow = 100 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_D.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_D.inst.cfg new file mode 100644 index 0000000000..7ff6deaed1 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_D.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = d +weight = 1 +material = emotiontech_pva-m +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 47 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_E.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_E.inst.cfg new file mode 100644 index 0000000000..d801fab511 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_E.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = e +weight = 0 +material = emotiontech_pva-m +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 47 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_F.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_F.inst.cfg new file mode 100644 index 0000000000..c55d3b4f05 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_F.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = F +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = f +weight = -1 +material = emotiontech_pva-m +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 47 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_D.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_D.inst.cfg new file mode 100644 index 0000000000..44955c20d1 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_D.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = d +weight = 1 +material = emotiontech_pva-s +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 47 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_E.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_E.inst.cfg new file mode 100644 index 0000000000..8242a1322c --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_E.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = e +weight = 0 +material = emotiontech_pva-s +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 47 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_F.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_F.inst.cfg new file mode 100644 index 0000000000..6a90bb8a33 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_F.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = F +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = f +weight = -1 +material = emotiontech_pva-s +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 47 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_D.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_D.inst.cfg new file mode 100644 index 0000000000..c475536506 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_D.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = D +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = d +weight = 1 +material = emotiontech_tpu98a +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_0_wipe_dist = =machine_nozzle_size +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 2 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 107 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.7 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_E.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_E.inst.cfg new file mode 100644 index 0000000000..c9a5ea06bf --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_E.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = E +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = e +weight = 0 +material = emotiontech_tpu98a +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_0_wipe_dist = =machine_nozzle_size +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 107 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.7 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_F.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_F.inst.cfg new file mode 100644 index 0000000000..fe48eb0c7d --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_F.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = F +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = f +weight = -1 +material = emotiontech_tpu98a +variant = Standard 1.0 Experimental + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_0_wipe_dist = =machine_nozzle_size +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 8 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 107 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.7 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_F.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_F.inst.cfg new file mode 100644 index 0000000000..3b5bb9161a --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_F.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = F +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = f +weight = 1 +material = emotiontech_abs +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_print * 25/40) +speed_topbottom = =math.ceil(speed_print * 35/40) +speed_layer_0 = =math.ceil(speed_print * 25/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 103 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =layer_height +support_xy_distance = =line_width * 2 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_G.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_G.inst.cfg new file mode 100644 index 0000000000..bb3b26d217 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_G.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = G +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = g +weight = 0 +material = emotiontech_abs +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 37 +speed_wall = =math.ceil(speed_print * 30/37) +speed_wall_0 = =math.ceil(speed_print * 25/37) +speed_topbottom = =math.ceil(speed_print * 33/37) +speed_layer_0 = =math.ceil(speed_print * 25/37) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 102 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =layer_height +support_xy_distance = =line_width * 2 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_H.inst.cfg new file mode 100644 index 0000000000..4052293a35 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_H.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = H +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = h +weight = -1 +material = emotiontech_abs +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 27/35) +speed_wall_0 = =math.ceil(speed_print * 23/35) +speed_topbottom = =math.ceil(speed_print * 30/35) +speed_layer_0 = =math.ceil(speed_print * 25/35) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature +5 +material_flow = 101 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =layer_height +support_xy_distance = =line_width * 2 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_F.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_F.inst.cfg new file mode 100644 index 0000000000..d768f5e908 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_F.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = F +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = f +weight = 1 +material = emotiontech_asax +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_print * 25/40) +speed_topbottom = =math.ceil(speed_print * 35/40) +speed_layer_0 = =math.ceil(speed_print * 25/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 75 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 1 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 100 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =layer_height +support_xy_distance = =line_width * 1.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_G.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_G.inst.cfg new file mode 100644 index 0000000000..66fc758a0a --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_G.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = G +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = g +weight = 0 +material = emotiontech_asax +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 37 +speed_wall = =math.ceil(speed_print * 30/37) +speed_wall_0 = =math.ceil(speed_print * 25/37) +speed_topbottom = =math.ceil(speed_print * 33/37) +speed_layer_0 = =math.ceil(speed_print * 25/37) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 75 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 100 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =layer_height +support_xy_distance = =line_width * 1.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_H.inst.cfg new file mode 100644 index 0000000000..9bab5ea0f5 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_H.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = H +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = h +weight = -1 +material = emotiontech_asax +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 27/35) +speed_wall_0 = =math.ceil(speed_print * 23/35) +speed_topbottom = =math.ceil(speed_print * 30/35) +speed_layer_0 = =math.ceil(speed_print * 25/35) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 75 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 7 +material_flow = 100 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =layer_height +support_xy_distance = =line_width * 1.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_F.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_F.inst.cfg new file mode 100644 index 0000000000..7477b95b03 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_F.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = F +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = f +weight = 1 +material = emotiontech_bvoh +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 25/30) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 100 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_G.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_G.inst.cfg new file mode 100644 index 0000000000..a47892ba69 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_G.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = G +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = g +weight = 0 +material = emotiontech_bvoh +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 25/30) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 100 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_H.inst.cfg new file mode 100644 index 0000000000..3acd1e90ae --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_H.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = H +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = h +weight = -1 +material = emotiontech_bvoh +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 25/30) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 100 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_F.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_F.inst.cfg new file mode 100644 index 0000000000..b80ca1d75c --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_F.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = F +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = f +weight = 1 +material = emotiontech_hips +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 103 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_G.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_G.inst.cfg new file mode 100644 index 0000000000..1ad4d5ca5b --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_G.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = G +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = g +weight = 0 +material = emotiontech_hips +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 102 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_H.inst.cfg new file mode 100644 index 0000000000..ebeb355465 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_H.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = H +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = h +weight = -1 +material = emotiontech_hips +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 101 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_F.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_F.inst.cfg new file mode 100644 index 0000000000..20c03f53c2 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_F.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = F +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = f +weight = 1 +material = emotiontech_petg +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_print * 25/40) +speed_topbottom = =math.ceil(speed_print * 35/40) +speed_layer_0 = =math.ceil(speed_print * 25/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 70 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 100 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_G.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_G.inst.cfg new file mode 100644 index 0000000000..de913c8ef1 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_G.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = G +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = g +weight = 0 +material = emotiontech_petg +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 37 +speed_wall = =math.ceil(speed_print * 30/37) +speed_wall_0 = =math.ceil(speed_print * 25/37) +speed_topbottom = =math.ceil(speed_print * 33/37) +speed_layer_0 = =math.ceil(speed_print * 25/37) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 70 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 100 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_H.inst.cfg new file mode 100644 index 0000000000..32947c23b6 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_H.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = H +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = h +weight = -1 +material = emotiontech_petg +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 27/35) +speed_wall_0 = =math.ceil(speed_print * 23/35) +speed_topbottom = =math.ceil(speed_print * 30/35) +speed_layer_0 = =math.ceil(speed_print * 25/35) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 70 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 95 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_F.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_F.inst.cfg new file mode 100644 index 0000000000..e7da037c59 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_F.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = F +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = f +weight = 1 +material = emotiontech_pla +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_print * 25/40) +speed_topbottom = =math.ceil(speed_print * 35/40) +speed_layer_0 = =math.ceil(speed_print * 25/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 107 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_G.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_G.inst.cfg new file mode 100644 index 0000000000..b3ec9192e7 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_G.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = G +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = g +weight = 0 +material = emotiontech_pla +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 37 +speed_wall = =math.ceil(speed_print * 30/37) +speed_wall_0 = =math.ceil(speed_print * 25/37) +speed_topbottom = =math.ceil(speed_print * 33/37) +speed_layer_0 = =math.ceil(speed_print * 25/37) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 105 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = True +skin_overlap = 5 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_H.inst.cfg new file mode 100644 index 0000000000..8da3e18804 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_H.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = H +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = h +weight = -1 +material = emotiontech_pla +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 27/35) +speed_wall_0 = =math.ceil(speed_print * 23/35) +speed_topbottom = =math.ceil(speed_print * 30/35) +speed_layer_0 = =math.ceil(speed_print * 25/35) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 103 +retraction_extra_prime_amount = 0.5 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_F.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_F.inst.cfg new file mode 100644 index 0000000000..d57d04cc26 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_F.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = F +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = f +weight = 1 +material = emotiontech_pva-m +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 37 +speed_wall = =math.ceil(speed_print * 30/37) +speed_wall_0 = =math.ceil(speed_print * 25/37) +speed_topbottom = =math.ceil(speed_print * 33/37) +speed_layer_0 = =math.ceil(speed_print * 25/37) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 100 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_G.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_G.inst.cfg new file mode 100644 index 0000000000..68fc8a6237 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_G.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = G +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = g +weight = 0 +material = emotiontech_pva-m +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 100 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_H.inst.cfg new file mode 100644 index 0000000000..0a23b294a7 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_H.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = H +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = h +weight = -1 +material = emotiontech_pva-m +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 100 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_F.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_F.inst.cfg new file mode 100644 index 0000000000..67e9559e05 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_F.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = F +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = f +weight = 1 +material = emotiontech_pva-s +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 100 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_G.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_G.inst.cfg new file mode 100644 index 0000000000..e35289b07f --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_G.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = G +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = g +weight = 0 +material = emotiontech_pva-s +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 100 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_H.inst.cfg new file mode 100644 index 0000000000..42040afbf3 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_H.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = H +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = h +weight = -1 +material = emotiontech_pva-s +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 100 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_F.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_F.inst.cfg new file mode 100644 index 0000000000..9017394bca --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_F.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = F +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = f +weight = 1 +material = emotiontech_tpu98a +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_0_wipe_dist = =machine_nozzle_size +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 2 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 111 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = False +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_G.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_G.inst.cfg new file mode 100644 index 0000000000..5c84946e6e --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_G.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = G +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = g +weight = 0 +material = emotiontech_tpu98a +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_0_wipe_dist = =machine_nozzle_size +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 111 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = False +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_H.inst.cfg new file mode 100644 index 0000000000..245f216c84 --- /dev/null +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_H.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = H +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = h +weight = -1 +material = emotiontech_tpu98a +variant = Standard 1.2 Experimental + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_0_wipe_dist = =machine_nozzle_size +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_speed = 10 +support_angle = 45 +material_print_temperature = =default_material_print_temperature + 8 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 111 +retraction_extra_prime_amount = 0.3 +retraction_min_travel = =2*line_width +retraction_hop_only_when_collides = False +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/s3d_global_A.inst.cfg b/resources/quality/strateo3d/s3d_global_A.inst.cfg index 8bd3f4f606..a947c12ea4 100644 --- a/resources/quality/strateo3d/s3d_global_A.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_A.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = a weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_B.inst.cfg b/resources/quality/strateo3d/s3d_global_B.inst.cfg index 0b2dc3326c..194068b614 100644 --- a/resources/quality/strateo3d/s3d_global_B.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_B.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = b weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_C.inst.cfg b/resources/quality/strateo3d/s3d_global_C.inst.cfg index a969ae50aa..57dbffdb8c 100644 --- a/resources/quality/strateo3d/s3d_global_C.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_C.inst.cfg @@ -4,7 +4,7 @@ name = High Quality definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = c weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_D.inst.cfg b/resources/quality/strateo3d/s3d_global_D.inst.cfg index 4bfca9575e..707f5c8dab 100644 --- a/resources/quality/strateo3d/s3d_global_D.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_D.inst.cfg @@ -4,7 +4,7 @@ name = Medium Quality definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = d weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_E.inst.cfg b/resources/quality/strateo3d/s3d_global_E.inst.cfg index 09d28d0f7b..acf86bb252 100644 --- a/resources/quality/strateo3d/s3d_global_E.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_E.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = e weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_F.inst.cfg b/resources/quality/strateo3d/s3d_global_F.inst.cfg index d97103f42c..202bdc7846 100644 --- a/resources/quality/strateo3d/s3d_global_F.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_F.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = f weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_G.inst.cfg b/resources/quality/strateo3d/s3d_global_G.inst.cfg index 9799d5a5d8..b03f59279f 100644 --- a/resources/quality/strateo3d/s3d_global_G.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_G.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse Quality definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = g weight = 0 diff --git a/resources/quality/strateo3d/s3d_global_H.inst.cfg b/resources/quality/strateo3d/s3d_global_H.inst.cfg index f5bf915e7a..1b0f92b995 100644 --- a/resources/quality/strateo3d/s3d_global_H.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_H.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Coarse Quality definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = h weight = 0 diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg index 06b6b74401..c31abb0716 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tevo_blackwidow [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg index 8f816b9ad1..43aad026ad 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tevo_blackwidow [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg index ced44806e3..c61677511f 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tevo_blackwidow [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tinyboy/tinyboy_e10_draft.inst.cfg b/resources/quality/tinyboy/tinyboy_e10_draft.inst.cfg index b7dec8193d..d765aa5902 100644 --- a/resources/quality/tinyboy/tinyboy_e10_draft.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_e10_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tinyboy_e10 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = 0 diff --git a/resources/quality/tinyboy/tinyboy_e10_high.inst.cfg b/resources/quality/tinyboy/tinyboy_e10_high.inst.cfg index dd59a0afc5..52bd779f5a 100644 --- a/resources/quality/tinyboy/tinyboy_e10_high.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_e10_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tinyboy_e10 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 2 diff --git a/resources/quality/tinyboy/tinyboy_e10_normal.inst.cfg b/resources/quality/tinyboy/tinyboy_e10_normal.inst.cfg index be71f963ed..7051f6ff22 100644 --- a/resources/quality/tinyboy/tinyboy_e10_normal.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_e10_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tinyboy_e10 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 1 diff --git a/resources/quality/tinyboy/tinyboy_e16_draft.inst.cfg b/resources/quality/tinyboy/tinyboy_e16_draft.inst.cfg index 12a2ea1696..f836e2713c 100644 --- a/resources/quality/tinyboy/tinyboy_e16_draft.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_e16_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tinyboy_e16 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = 0 diff --git a/resources/quality/tinyboy/tinyboy_e16_high.inst.cfg b/resources/quality/tinyboy/tinyboy_e16_high.inst.cfg index e8850857f8..e21327846d 100644 --- a/resources/quality/tinyboy/tinyboy_e16_high.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_e16_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tinyboy_e16 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 2 diff --git a/resources/quality/tinyboy/tinyboy_e16_normal.inst.cfg b/resources/quality/tinyboy/tinyboy_e16_normal.inst.cfg index b8559259a1..5cc51874e8 100644 --- a/resources/quality/tinyboy/tinyboy_e16_normal.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_e16_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tinyboy_e16 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 1 diff --git a/resources/quality/tinyboy/tinyboy_fabrikator15_draft.inst.cfg b/resources/quality/tinyboy/tinyboy_fabrikator15_draft.inst.cfg index cff940e779..d2bf7c116c 100644 --- a/resources/quality/tinyboy/tinyboy_fabrikator15_draft.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_fabrikator15_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tinyboy_fabrikator15 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = 0 diff --git a/resources/quality/tinyboy/tinyboy_fabrikator15_high.inst.cfg b/resources/quality/tinyboy/tinyboy_fabrikator15_high.inst.cfg index 64cf212eeb..4382f0fd11 100644 --- a/resources/quality/tinyboy/tinyboy_fabrikator15_high.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_fabrikator15_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tinyboy_fabrikator15 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 2 diff --git a/resources/quality/tinyboy/tinyboy_fabrikator15_normal.inst.cfg b/resources/quality/tinyboy/tinyboy_fabrikator15_normal.inst.cfg index 4b5ad60a45..c128dc8a3d 100644 --- a/resources/quality/tinyboy/tinyboy_fabrikator15_normal.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_fabrikator15_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tinyboy_fabrikator15 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 1 diff --git a/resources/quality/tinyboy/tinyboy_ra20_draft.inst.cfg b/resources/quality/tinyboy/tinyboy_ra20_draft.inst.cfg index d26d5dd96f..6e956ed2e7 100644 --- a/resources/quality/tinyboy/tinyboy_ra20_draft.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_ra20_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tinyboy_ra20 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = 0 diff --git a/resources/quality/tinyboy/tinyboy_ra20_high.inst.cfg b/resources/quality/tinyboy/tinyboy_ra20_high.inst.cfg index 78d84af889..715c6cc91f 100644 --- a/resources/quality/tinyboy/tinyboy_ra20_high.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_ra20_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tinyboy_ra20 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 2 diff --git a/resources/quality/tinyboy/tinyboy_ra20_normal.inst.cfg b/resources/quality/tinyboy/tinyboy_ra20_normal.inst.cfg index b2f4da644e..1b8339bc7e 100644 --- a/resources/quality/tinyboy/tinyboy_ra20_normal.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_ra20_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tinyboy_ra20 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg index 31ca81d68b..3ac0c23fc8 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg index 86340249d5..c904cdc280 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg index 0968d93aa9..a97e61d3cf 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg index e8a3f43099..beedac210f 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg index 1bbbace69c..1b35ffc12d 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg index be9ed58e97..d0188deeeb 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg index e56f835fbd..76eff86afc 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg index ac533fd910..670c138087 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg index 9f7430ecc1..7d128b0e45 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg index 7a7e04f8f1..b7b64c6662 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_extra_coarse.inst.cfg index 204ba12577..4919f0b0fc 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_extra_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg index 2edb91efe8..e2a5ddd239 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg index d8ac8dc29a..3c20e41b6a 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg index b68c75da62..febef3af09 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg index f9f1924cc5..20aff985ed 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg index c06bc83868..8d7cd95ae8 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg index 2b331458df..f0f78b5e48 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg index ca97d42290..219a9af407 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg index a629a8ec24..9f327d7035 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg index a0e75ba188..25a8093e4a 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg index 02936426c3..5d27eedec9 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg index 0003bb48aa..90ed65eb98 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg index 0dc709ea25..4ce7d30bd0 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg index b2c0256323..6ba7e4a608 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg index fc667268eb..678bf1a7b4 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg index 2ceb24e0cb..821dc7221c 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg index 128dde75c9..25a27c8dcb 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg index f3e025e96c..7e125ad938 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg index c121664eac..a65bacf7c1 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg index caa28df1a0..1e357eec95 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg index a7cf3b1eb2..29b0be4452 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg index 929638b079..1b74e17bfd 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg index 35f2f3500a..71c1263662 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg index 710532e151..63f134a89d 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg index 2c5ae2d7ff..0728856684 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg index dd48448cb6..dbfc6f816c 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_extra_coarse.inst.cfg index cc6a20a104..b96f2d4b90 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_extra_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Coarse definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg index c24c69d0a4..9fe4e8a30e 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg index 4e2af0d172..39ca581824 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg index 747c436323..dc6b2eb441 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg index 54c44aea42..38daa84b3c 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg index 8b9442742c..5cabb5c236 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg index 045635ce5b..4c6024557a 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg index 79a4a18a9b..74e2c7601d 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg index f6af4579e0..99c690f215 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg index 686ad6f767..7d04ee2bf9 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_coarse.inst.cfg index 2df2058e08..5f28e59ede 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg index 60ac46167a..5efaac3140 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg index 85eafab1ec..7d12ae6522 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_extra_coarse.inst.cfg index 68b6841252..fa78c51e1a 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_extra_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg index 2cef1a8775..b7d771f755 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg index 6152322c19..70596e4799 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.2_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.2_pla_bois_high.inst.cfg index f3eb1bf404..ea8eabea17 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.2_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.2_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.3_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.3_pla_bois_high.inst.cfg index eda66c271d..b3d93021a7 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.3_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.3_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_high.inst.cfg index f12a7a5df9..f496b8358d 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_normal.inst.cfg index 264b64e762..2343b6e9e7 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_draft.inst.cfg index f5c54da4b8..40ff490e96 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg index 0233c3fb71..6c3fd9d95c 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_normal.inst.cfg index 5b68b52b16..03634ca00c 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_coarse.inst.cfg index a6f9b82082..79c9b5b083 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg index 06c714bae2..bc866666b7 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_normal.inst.cfg index bfcff6cf1d..aa739ad1dd 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_extra_coarse.inst.cfg index 1312332a9b..395e7258a0 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_extra_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_extra_coarse.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg index e9bdb9b3f1..59d5efbefd 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_normal.inst.cfg index 9dff816bff..2af97b6981 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg index 0e2d5bf7b0..8222ec1573 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg index d98780ff4e..cdb7936e3b 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg index bd76d0c1b1..386aa34326 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra coarse weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_High_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_High_Quality.inst.cfg index 9370630267..9237a26e68 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_High_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg index e40a4778d5..a84a9bedb6 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg index 0c7ab631da..5db2e2bbc6 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_normal.inst.cfg index acf7a9e65b..caf7c53797 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg index dc6648d2df..16afdc5003 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg index 3c86b66aed..2953753f3d 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex.inst.cfg index 6ae824ed35..53f0eaa15b 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg index 24c1722868..35386f0ff0 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg @@ -4,7 +4,7 @@ name = Flex Only definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg index a04a9b7089..8fef4461da 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg index 10dd41c6cf..75b9e275d4 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg @@ -4,7 +4,7 @@ name = Flex Only definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_high.inst.cfg index 66ad1932af..066e760f70 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_normal.inst.cfg index 5ccbe52742..c015eab120 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg index 17049b4d6f..6c6e3cd171 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg index 64237dfe46..b1bb8f02d8 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg index 9bcce42912..3baedf40d1 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg index 4f187e0fdc..63e2644e36 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg @@ -4,7 +4,7 @@ name = Flex Only definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg index 03554fca3f..c279d9c17b 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_normal.inst.cfg index 5b2b4cdcc0..92287ca49c 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg index 99c0f0353c..9a8d2d5ef1 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg @@ -4,7 +4,7 @@ name = PVA and PLA definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg index 916782c277..988380215f 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg index 66423b16d3..16348d089d 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg @@ -4,7 +4,7 @@ name = Flex Only definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg index 8fa0822f1a..0c79146cdc 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg index ab7d5d63b5..285429badd 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg index d8b01f6c79..37ecae9dda 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg @@ -4,7 +4,7 @@ name = PVA and PLA definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg index 1a0801fffc..678b0a655c 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg index bd9ef7b964..58f6bdfa16 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg index 88c090eb20..72e3ea8716 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg index b2acd6b79d..810c07fae5 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg index f94228e97d..6654d02dc0 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg index 9ffa86c8a0..8f56ad8140 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg index 08cfa0fecb..902f21b157 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg @@ -4,7 +4,7 @@ name = PVA and PLA definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg index 993fc7481b..8ac5c88525 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg @@ -4,7 +4,7 @@ name = PVA and PLA definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg index 002a27c794..209a21c3a7 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Flex Only definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg index df040a2c04..667b2b3618 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Flex and PLA definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg index 899ff5c415..46ad9c1a0b 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg index 212b590dfb..81d169e934 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg index 177a1c88f5..656e5e7a60 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg @@ -4,7 +4,7 @@ name = PVA and PLA definition = tizyx_evy_dual [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg b/resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg index 03ce4b3c32..f0e8615404 100644 --- a/resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_k25 [metadata] quality_type = draft -setting_version = 16 +setting_version = 17 type = quality global_quality = True diff --git a/resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg b/resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg index ae3a43f8fc..964ad7ac4b 100644 --- a/resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_k25 [metadata] quality_type = normal -setting_version = 16 +setting_version = 17 type = quality global_quality = True diff --git a/resources/quality/trimaker_cosmosII/trimaker_cosmosII_fast.inst.cfg b/resources/quality/trimaker_cosmosII/trimaker_cosmosII_fast.inst.cfg new file mode 100644 index 0000000000..63fc4765e3 --- /dev/null +++ b/resources/quality/trimaker_cosmosII/trimaker_cosmosII_fast.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Fast +definition = trimaker_cosmosII + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = 1 +global_quality = True + +[values] +layer_height = 0.3 +speed_print = 60 \ No newline at end of file diff --git a/resources/quality/trimaker_cosmosII/trimaker_cosmosII_normal.inst.cfg b/resources/quality/trimaker_cosmosII/trimaker_cosmosII_normal.inst.cfg new file mode 100644 index 0000000000..51491b18bf --- /dev/null +++ b/resources/quality/trimaker_cosmosII/trimaker_cosmosII_normal.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Normal +definition = trimaker_cosmosII + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = 0 +global_quality = True + +[values] +layer_height = 0.2 +speed_print = 45 diff --git a/resources/quality/trimaker_cosmosII/trimaker_cosmosII_slow.inst.cfg b/resources/quality/trimaker_cosmosII/trimaker_cosmosII_slow.inst.cfg new file mode 100644 index 0000000000..c6b7688501 --- /dev/null +++ b/resources/quality/trimaker_cosmosII/trimaker_cosmosII_slow.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Slow +definition = trimaker_cosmosII + +[metadata] +setting_version = 17 +type = quality +quality_type = slow +weight = -1 +global_quality = True + +[values] +layer_height = 0.1 +speed_print = 30 \ No newline at end of file diff --git a/resources/quality/trimaker_nebula/trimaker_nebula_fast.inst.cfg b/resources/quality/trimaker_nebula/trimaker_nebula_fast.inst.cfg new file mode 100644 index 0000000000..cd71c6e445 --- /dev/null +++ b/resources/quality/trimaker_nebula/trimaker_nebula_fast.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Fast +definition = trimaker_nebula + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = 1 +global_quality = True + +[values] +layer_height = 0.3 +speed_print = 60 \ No newline at end of file diff --git a/resources/quality/trimaker_nebula/trimaker_nebula_normal.inst.cfg b/resources/quality/trimaker_nebula/trimaker_nebula_normal.inst.cfg new file mode 100644 index 0000000000..d9b77dc0b5 --- /dev/null +++ b/resources/quality/trimaker_nebula/trimaker_nebula_normal.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Normal +definition = trimaker_nebula + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = 0 +global_quality = True + +[values] +layer_height = 0.2 +speed_print = 45 diff --git a/resources/quality/trimaker_nebula/trimaker_nebula_slow.inst.cfg b/resources/quality/trimaker_nebula/trimaker_nebula_slow.inst.cfg new file mode 100644 index 0000000000..e2037cb3a3 --- /dev/null +++ b/resources/quality/trimaker_nebula/trimaker_nebula_slow.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Slow +definition = trimaker_nebula + +[metadata] +setting_version = 17 +type = quality +quality_type = slow +weight = -1 +global_quality = True + +[values] +layer_height = 0.1 +speed_print = 30 \ No newline at end of file diff --git a/resources/quality/tronxy/tronxy_0.2_ABS_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.2_ABS_extra.inst.cfg index 4aeed5046f..2089931d9b 100644 --- a/resources/quality/tronxy/tronxy_0.2_ABS_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.2_ABS_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.2_ABS_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.2_ABS_fine.inst.cfg index 03755d4abd..61eba042e9 100644 --- a/resources/quality/tronxy/tronxy_0.2_ABS_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.2_ABS_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.2_ABS_super.inst.cfg b/resources/quality/tronxy/tronxy_0.2_ABS_super.inst.cfg index f9d5efb26c..4086b7ea2e 100644 --- a/resources/quality/tronxy/tronxy_0.2_ABS_super.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.2_ABS_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.2_PETG_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.2_PETG_extra.inst.cfg index 86344e4c35..a9d328fbe5 100644 --- a/resources/quality/tronxy/tronxy_0.2_PETG_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.2_PETG_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.2_PETG_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.2_PETG_fine.inst.cfg index 89c1cc8625..d8bf7dde79 100644 --- a/resources/quality/tronxy/tronxy_0.2_PETG_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.2_PETG_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.2_PETG_super.inst.cfg b/resources/quality/tronxy/tronxy_0.2_PETG_super.inst.cfg index d1a1ac009b..c30c10fefe 100644 --- a/resources/quality/tronxy/tronxy_0.2_PETG_super.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.2_PETG_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.2_PLA_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.2_PLA_extra.inst.cfg index b1cfc83c12..eab7a744ee 100644 --- a/resources/quality/tronxy/tronxy_0.2_PLA_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.2_PLA_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.2_PLA_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.2_PLA_fine.inst.cfg index 36e998c31f..eba9238d3c 100644 --- a/resources/quality/tronxy/tronxy_0.2_PLA_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.2_PLA_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.2_PLA_super.inst.cfg b/resources/quality/tronxy/tronxy_0.2_PLA_super.inst.cfg index 3e39dc08ce..b8d571acc7 100644 --- a/resources/quality/tronxy/tronxy_0.2_PLA_super.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.2_PLA_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.3_ABS_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.3_ABS_extra.inst.cfg index 9a1a373eb0..a9ecbc49ea 100644 --- a/resources/quality/tronxy/tronxy_0.3_ABS_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_ABS_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.3_ABS_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.3_ABS_fine.inst.cfg index 46df99da5f..d2df50374a 100644 --- a/resources/quality/tronxy/tronxy_0.3_ABS_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_ABS_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.3_ABS_low.inst.cfg b/resources/quality/tronxy/tronxy_0.3_ABS_low.inst.cfg index 6d85e46994..bdd764ee66 100644 --- a/resources/quality/tronxy/tronxy_0.3_ABS_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.3_ABS_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.3_ABS_normal.inst.cfg index 423e9b6c64..92ef1c40c0 100644 --- a/resources/quality/tronxy/tronxy_0.3_ABS_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_ABS_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.3_PETG_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PETG_extra.inst.cfg index 06fd3f6d26..384f90b7ec 100644 --- a/resources/quality/tronxy/tronxy_0.3_PETG_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_PETG_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.3_PETG_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PETG_fine.inst.cfg index 26855224a5..2cc0ebb61d 100644 --- a/resources/quality/tronxy/tronxy_0.3_PETG_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_PETG_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.3_PETG_low.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PETG_low.inst.cfg index 6fa921fdda..7bb48aeda7 100644 --- a/resources/quality/tronxy/tronxy_0.3_PETG_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.3_PETG_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PETG_normal.inst.cfg index 65226e0f6c..505d0b9ddf 100644 --- a/resources/quality/tronxy/tronxy_0.3_PETG_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_PETG_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.3_PLA_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PLA_extra.inst.cfg index b413b13de8..558efe9154 100644 --- a/resources/quality/tronxy/tronxy_0.3_PLA_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_PLA_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.3_PLA_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PLA_fine.inst.cfg index 270387e9e8..f2f7d09e98 100644 --- a/resources/quality/tronxy/tronxy_0.3_PLA_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_PLA_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.3_PLA_low.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PLA_low.inst.cfg index 5bd8e8261c..e1972d3e23 100644 --- a/resources/quality/tronxy/tronxy_0.3_PLA_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.3_PLA_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PLA_normal.inst.cfg index 48aad45f82..5cc674af8e 100644 --- a/resources/quality/tronxy/tronxy_0.3_PLA_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_PLA_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.3_TPU_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.3_TPU_extra.inst.cfg index 2b54428f12..926d66eff0 100644 --- a/resources/quality/tronxy/tronxy_0.3_TPU_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_TPU_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra material = generic_tpu diff --git a/resources/quality/tronxy/tronxy_0.3_TPU_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.3_TPU_fine.inst.cfg index 904402d4a6..fb8b015bbf 100644 --- a/resources/quality/tronxy/tronxy_0.3_TPU_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_TPU_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_tpu diff --git a/resources/quality/tronxy/tronxy_0.3_TPU_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.3_TPU_normal.inst.cfg index 80ca371935..98a9d1ed40 100644 --- a/resources/quality/tronxy/tronxy_0.3_TPU_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_TPU_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_tpu diff --git a/resources/quality/tronxy/tronxy_0.4_ABS_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.4_ABS_extra.inst.cfg index 25877cf39a..a43651d23e 100644 --- a/resources/quality/tronxy/tronxy_0.4_ABS_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_ABS_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.4_ABS_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.4_ABS_fine.inst.cfg index 74699049db..db4253756b 100644 --- a/resources/quality/tronxy/tronxy_0.4_ABS_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_ABS_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.4_ABS_low.inst.cfg b/resources/quality/tronxy/tronxy_0.4_ABS_low.inst.cfg index e02e00f8f1..f898a38bd7 100644 --- a/resources/quality/tronxy/tronxy_0.4_ABS_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.4_ABS_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.4_ABS_normal.inst.cfg index 2e452deb68..2ffa95ff81 100644 --- a/resources/quality/tronxy/tronxy_0.4_ABS_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_ABS_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.4_ABS_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.4_ABS_rough.inst.cfg index 44a1d364d3..216d25a9e5 100644 --- a/resources/quality/tronxy/tronxy_0.4_ABS_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_ABS_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rough material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.4_PETG_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PETG_extra.inst.cfg index f86cf1d7ed..8337e737d6 100644 --- a/resources/quality/tronxy/tronxy_0.4_PETG_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_PETG_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.4_PETG_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PETG_fine.inst.cfg index 53e190bc05..da5c6b570d 100644 --- a/resources/quality/tronxy/tronxy_0.4_PETG_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_PETG_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.4_PETG_low.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PETG_low.inst.cfg index ed3e6abe01..11b3cf42f2 100644 --- a/resources/quality/tronxy/tronxy_0.4_PETG_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.4_PETG_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PETG_normal.inst.cfg index 3359621d5f..23745ce9ee 100644 --- a/resources/quality/tronxy/tronxy_0.4_PETG_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_PETG_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.4_PETG_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PETG_rough.inst.cfg index 8ac85d8743..f8c147a7df 100644 --- a/resources/quality/tronxy/tronxy_0.4_PETG_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_PETG_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rough material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.4_PLA_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PLA_extra.inst.cfg index ecb715478a..1e71bc2465 100644 --- a/resources/quality/tronxy/tronxy_0.4_PLA_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_PLA_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.4_PLA_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PLA_fine.inst.cfg index eb5a37877c..86dc8c3205 100644 --- a/resources/quality/tronxy/tronxy_0.4_PLA_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_PLA_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.4_PLA_low.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PLA_low.inst.cfg index ed66ad89d3..674c9125d9 100644 --- a/resources/quality/tronxy/tronxy_0.4_PLA_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.4_PLA_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PLA_normal.inst.cfg index 3d939c95c5..6a30a4104d 100644 --- a/resources/quality/tronxy/tronxy_0.4_PLA_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_PLA_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.4_PLA_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PLA_rough.inst.cfg index a343cb6f16..2516234246 100644 --- a/resources/quality/tronxy/tronxy_0.4_PLA_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_PLA_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rough material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.4_TPU_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.4_TPU_extra.inst.cfg index c1ebd3bdb3..04c64e9c0d 100644 --- a/resources/quality/tronxy/tronxy_0.4_TPU_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_TPU_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra material = generic_tpu diff --git a/resources/quality/tronxy/tronxy_0.4_TPU_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.4_TPU_fine.inst.cfg index 29234d2576..d2c9e7c91f 100644 --- a/resources/quality/tronxy/tronxy_0.4_TPU_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_TPU_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_tpu diff --git a/resources/quality/tronxy/tronxy_0.4_TPU_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.4_TPU_normal.inst.cfg index 9e82141f10..8e41a3f453 100644 --- a/resources/quality/tronxy/tronxy_0.4_TPU_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_TPU_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_tpu diff --git a/resources/quality/tronxy/tronxy_0.5_ABS_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.5_ABS_fine.inst.cfg index 69b737d8be..5411615777 100644 --- a/resources/quality/tronxy/tronxy_0.5_ABS_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_ABS_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.5_ABS_low.inst.cfg b/resources/quality/tronxy/tronxy_0.5_ABS_low.inst.cfg index 957dd6a359..5d0be3cb11 100644 --- a/resources/quality/tronxy/tronxy_0.5_ABS_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.5_ABS_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.5_ABS_normal.inst.cfg index 5fd3eaa47d..3e8657cd7a 100644 --- a/resources/quality/tronxy/tronxy_0.5_ABS_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_ABS_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.5_ABS_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.5_ABS_rapid.inst.cfg index 8df1132fd6..b5432da82a 100644 --- a/resources/quality/tronxy/tronxy_0.5_ABS_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_ABS_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rapid material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.5_ABS_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.5_ABS_rough.inst.cfg index 7e9866e5c4..420ac65927 100644 --- a/resources/quality/tronxy/tronxy_0.5_ABS_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_ABS_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rough material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.5_PETG_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PETG_fine.inst.cfg index 796e289a8e..2fc2c0b459 100644 --- a/resources/quality/tronxy/tronxy_0.5_PETG_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_PETG_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.5_PETG_low.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PETG_low.inst.cfg index ee8b2d3472..b791aea06d 100644 --- a/resources/quality/tronxy/tronxy_0.5_PETG_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.5_PETG_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PETG_normal.inst.cfg index 6bbb7c5d9a..1478f16519 100644 --- a/resources/quality/tronxy/tronxy_0.5_PETG_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_PETG_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.5_PETG_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PETG_rapid.inst.cfg index 71f6a7803f..b58e264a59 100644 --- a/resources/quality/tronxy/tronxy_0.5_PETG_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_PETG_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rapid material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.5_PETG_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PETG_rough.inst.cfg index 930c7a782e..15a6830b74 100644 --- a/resources/quality/tronxy/tronxy_0.5_PETG_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_PETG_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rough material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.5_PLA_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PLA_fine.inst.cfg index 26f7e35ee4..136996468a 100644 --- a/resources/quality/tronxy/tronxy_0.5_PLA_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_PLA_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.5_PLA_low.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PLA_low.inst.cfg index 1ecaf28022..0138c08574 100644 --- a/resources/quality/tronxy/tronxy_0.5_PLA_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.5_PLA_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PLA_normal.inst.cfg index f3ee8bd583..600658332a 100644 --- a/resources/quality/tronxy/tronxy_0.5_PLA_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_PLA_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.5_PLA_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PLA_rapid.inst.cfg index 71884ddcd5..5a48e5f444 100644 --- a/resources/quality/tronxy/tronxy_0.5_PLA_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_PLA_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rapid material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.5_PLA_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PLA_rough.inst.cfg index 711e2a572c..acf7f6cbcf 100644 --- a/resources/quality/tronxy/tronxy_0.5_PLA_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_PLA_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rough material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.5_TPU_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.5_TPU_fine.inst.cfg index 18c2e5fda8..e591c21b4b 100644 --- a/resources/quality/tronxy/tronxy_0.5_TPU_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_TPU_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_tpu diff --git a/resources/quality/tronxy/tronxy_0.5_TPU_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.5_TPU_normal.inst.cfg index 1e08c24c3f..2d1b4b889e 100644 --- a/resources/quality/tronxy/tronxy_0.5_TPU_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_TPU_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_tpu diff --git a/resources/quality/tronxy/tronxy_0.5_TPU_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.5_TPU_rapid.inst.cfg index 9f2255e3dd..35cebe2303 100644 --- a/resources/quality/tronxy/tronxy_0.5_TPU_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_TPU_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rapid material = generic_tpu diff --git a/resources/quality/tronxy/tronxy_0.6_ABS_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.6_ABS_normal.inst.cfg index e9d47cb9d5..cc75b4bb1f 100644 --- a/resources/quality/tronxy/tronxy_0.6_ABS_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_ABS_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.6_ABS_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.6_ABS_rapid.inst.cfg index 3023a5216e..1d39d74773 100644 --- a/resources/quality/tronxy/tronxy_0.6_ABS_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_ABS_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rapid material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.6_ABS_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.6_ABS_rough.inst.cfg index fd1861ec1f..26af918374 100644 --- a/resources/quality/tronxy/tronxy_0.6_ABS_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_ABS_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rough material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.6_PETG_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PETG_normal.inst.cfg index 114003c948..b5a7e6f39a 100644 --- a/resources/quality/tronxy/tronxy_0.6_PETG_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_PETG_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.6_PETG_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PETG_rapid.inst.cfg index 2b5cb7ce8b..2f5e7f5a65 100644 --- a/resources/quality/tronxy/tronxy_0.6_PETG_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_PETG_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rapid material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.6_PETG_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PETG_rough.inst.cfg index 2d0b108e4e..25c013e782 100644 --- a/resources/quality/tronxy/tronxy_0.6_PETG_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_PETG_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rough material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.6_PLA_low.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PLA_low.inst.cfg index 46864f1ab7..1c1baab16b 100644 --- a/resources/quality/tronxy/tronxy_0.6_PLA_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.6_PLA_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PLA_normal.inst.cfg index 19405fc566..0262671a6f 100644 --- a/resources/quality/tronxy/tronxy_0.6_PLA_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_PLA_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.6_PLA_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PLA_rapid.inst.cfg index fdeddc16ec..39a8bf652a 100644 --- a/resources/quality/tronxy/tronxy_0.6_PLA_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_PLA_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rapid material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.6_PLA_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PLA_rough.inst.cfg index 0b45f5e425..6466c14563 100644 --- a/resources/quality/tronxy/tronxy_0.6_PLA_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_PLA_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rough material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.6_TPU_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.6_TPU_normal.inst.cfg index 9261bf119a..4a12315d15 100644 --- a/resources/quality/tronxy/tronxy_0.6_TPU_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_TPU_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_tpu diff --git a/resources/quality/tronxy/tronxy_0.6_TPU_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.6_TPU_rapid.inst.cfg index 9ad3dc487e..b06e7ff17b 100644 --- a/resources/quality/tronxy/tronxy_0.6_TPU_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_TPU_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rapid material = generic_tpu diff --git a/resources/quality/tronxy/tronxy_0.8_ABS_low.inst.cfg b/resources/quality/tronxy/tronxy_0.8_ABS_low.inst.cfg index 16d21909ac..b9ede8f693 100644 --- a/resources/quality/tronxy/tronxy_0.8_ABS_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_ABS_low.inst.cfg @@ -4,7 +4,7 @@ name = Low definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.8_ABS_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.8_ABS_rapid.inst.cfg index abd5c13c93..852d338f66 100644 --- a/resources/quality/tronxy/tronxy_0.8_ABS_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_ABS_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rapid material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.8_ABS_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.8_ABS_rough.inst.cfg index ec2bdf8a3a..fc11180be1 100644 --- a/resources/quality/tronxy/tronxy_0.8_ABS_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_ABS_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rough material = generic_abs diff --git a/resources/quality/tronxy/tronxy_0.8_PETG_low.inst.cfg b/resources/quality/tronxy/tronxy_0.8_PETG_low.inst.cfg index c2497470bc..e0c475bad3 100644 --- a/resources/quality/tronxy/tronxy_0.8_PETG_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_PETG_low.inst.cfg @@ -4,7 +4,7 @@ name = Low definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.8_PETG_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.8_PETG_rapid.inst.cfg index f3f210ee8a..29713bf42a 100644 --- a/resources/quality/tronxy/tronxy_0.8_PETG_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_PETG_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rapid material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.8_PETG_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.8_PETG_rough.inst.cfg index fc90743f7a..9f650ffc72 100644 --- a/resources/quality/tronxy/tronxy_0.8_PETG_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_PETG_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rough material = generic_petg diff --git a/resources/quality/tronxy/tronxy_0.8_PLA_low.inst.cfg b/resources/quality/tronxy/tronxy_0.8_PLA_low.inst.cfg index 34ee60006a..fb1fd5bab1 100644 --- a/resources/quality/tronxy/tronxy_0.8_PLA_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_PLA_low.inst.cfg @@ -4,7 +4,7 @@ name = Low definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.8_PLA_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.8_PLA_rapid.inst.cfg index a87b9c81f9..3e2a9a7482 100644 --- a/resources/quality/tronxy/tronxy_0.8_PLA_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_PLA_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rapid material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.8_PLA_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.8_PLA_rough.inst.cfg index a64b867563..9a14b26d5e 100644 --- a/resources/quality/tronxy/tronxy_0.8_PLA_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_PLA_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rough material = generic_pla diff --git a/resources/quality/tronxy/tronxy_0.8_TPU_low.inst.cfg b/resources/quality/tronxy/tronxy_0.8_TPU_low.inst.cfg index 14510ab221..7453e96861 100644 --- a/resources/quality/tronxy/tronxy_0.8_TPU_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_TPU_low.inst.cfg @@ -4,7 +4,7 @@ name = Low definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low material = generic_tpu diff --git a/resources/quality/tronxy/tronxy_0.8_TPU_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.8_TPU_rapid.inst.cfg index 173ca02342..c26dd07bf0 100644 --- a/resources/quality/tronxy/tronxy_0.8_TPU_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_TPU_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rapid material = generic_tpu diff --git a/resources/quality/tronxy/tronxy_0.8_TPU_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.8_TPU_rough.inst.cfg index 978b59a14c..c90b2f1484 100644 --- a/resources/quality/tronxy/tronxy_0.8_TPU_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_TPU_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rough material = generic_tpu diff --git a/resources/quality/tronxy/tronxy_global_extra.inst.cfg b/resources/quality/tronxy/tronxy_global_extra.inst.cfg index 277a9b990d..06f2f24cd7 100644 --- a/resources/quality/tronxy/tronxy_global_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_global_extra.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra weight = -1 diff --git a/resources/quality/tronxy/tronxy_global_fine.inst.cfg b/resources/quality/tronxy/tronxy_global_fine.inst.cfg index 6976c108ef..e861d8a375 100644 --- a/resources/quality/tronxy/tronxy_global_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_global_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine weight = -2 diff --git a/resources/quality/tronxy/tronxy_global_low.inst.cfg b/resources/quality/tronxy/tronxy_global_low.inst.cfg index 1f44ce4cb9..cb326d5a62 100644 --- a/resources/quality/tronxy/tronxy_global_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_global_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = low weight = -4 diff --git a/resources/quality/tronxy/tronxy_global_normal.inst.cfg b/resources/quality/tronxy/tronxy_global_normal.inst.cfg index 45c345e506..d2c64e1225 100644 --- a/resources/quality/tronxy/tronxy_global_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = -3 diff --git a/resources/quality/tronxy/tronxy_global_rapid.inst.cfg b/resources/quality/tronxy/tronxy_global_rapid.inst.cfg index 26a9ca56cd..c5b2b3ef66 100644 --- a/resources/quality/tronxy/tronxy_global_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_global_rapid.inst.cfg @@ -4,7 +4,7 @@ name = Rough/Fast Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rapid weight = -5 diff --git a/resources/quality/tronxy/tronxy_global_rough.inst.cfg b/resources/quality/tronxy/tronxy_global_rough.inst.cfg index 13725539b5..065a3acc39 100644 --- a/resources/quality/tronxy/tronxy_global_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_global_rough.inst.cfg @@ -4,7 +4,7 @@ name = Rough Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = rough weight = -5 diff --git a/resources/quality/tronxy/tronxy_global_super.inst.cfg b/resources/quality/tronxy/tronxy_global_super.inst.cfg index f904671b28..b8a6dca9a1 100644 --- a/resources/quality/tronxy/tronxy_global_super.inst.cfg +++ b/resources/quality/tronxy/tronxy_global_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Fine Quality definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = super weight = 0 diff --git a/resources/quality/twotrees/abs/two_trees_0.2_ABS_super.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.2_ABS_super.inst.cfg new file mode 100644 index 0000000000..f035711794 --- /dev/null +++ b/resources/quality/twotrees/abs/two_trees_0.2_ABS_super.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Super Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_abs +variant = 0.2mm Nozzle + +[values] +material_bed_temperature = 100 +material_print_temperature_layer_0 = 245 +material_print_temperature = 240 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = False +retraction_hop = 0.2 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/abs/two_trees_0.2_ABS_ultra.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.2_ABS_ultra.inst.cfg new file mode 100644 index 0000000000..4e7015e5b9 --- /dev/null +++ b/resources/quality/twotrees/abs/two_trees_0.2_ABS_ultra.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Ultra Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = ultra +material = generic_abs +variant = 0.2mm Nozzle + +[values] +material_bed_temperature = 100 +material_print_temperature_layer_0 = 245 +material_print_temperature = 240 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = False +retraction_hop = 0.2 +retraction_hop_only_when_collides = True diff --git a/resources/quality/twotrees/abs/two_trees_0.3_ABS_adaptive.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.3_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..65e44e524c --- /dev/null +++ b/resources/quality/twotrees/abs/two_trees_0.3_ABS_adaptive.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Dynamic Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.3mm Nozzle + +[values] +material_bed_temperature = 100 +material_print_temperature_layer_0 = 245 +material_print_temperature = 240 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = False +retraction_hop = 0.2 +retraction_hop_only_when_collides = True diff --git a/resources/quality/twotrees/abs/two_trees_0.3_ABS_low.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.3_ABS_low.inst.cfg new file mode 100644 index 0000000000..cc02a1ab2f --- /dev/null +++ b/resources/quality/twotrees/abs/two_trees_0.3_ABS_low.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Low Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_abs +variant = 0.3mm Nozzle + +[values] +material_bed_temperature = 100 +material_print_temperature_layer_0 = 245 +material_print_temperature = 240 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = False +retraction_hop = 0.4 +retraction_hop_only_when_collides = True diff --git a/resources/quality/twotrees/abs/two_trees_0.3_ABS_standard.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.3_ABS_standard.inst.cfg new file mode 100644 index 0000000000..5f34fd9aeb --- /dev/null +++ b/resources/quality/twotrees/abs/two_trees_0.3_ABS_standard.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Standard Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_abs +variant = 0.3mm Nozzle + +[values] +material_bed_temperature = 100 +material_print_temperature_layer_0 = 245 +material_print_temperature = 240 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = False +retraction_hop = 0.3 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/abs/two_trees_0.3_ABS_super.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.3_ABS_super.inst.cfg new file mode 100644 index 0000000000..faa73635e8 --- /dev/null +++ b/resources/quality/twotrees/abs/two_trees_0.3_ABS_super.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Super Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_abs +variant = 0.3mm Nozzle + +[values] +material_bed_temperature = 100 +material_print_temperature_layer_0 = 245 +material_print_temperature = 240 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = False +retraction_hop = 0.2 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/abs/two_trees_0.4_ABS_adaptive.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.4_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..102ab5ba20 --- /dev/null +++ b/resources/quality/twotrees/abs/two_trees_0.4_ABS_adaptive.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Dynamic Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.4mm Nozzle + +[values] +material_bed_temperature = 100 +material_print_temperature_layer_0 = 245 +material_print_temperature = 240 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = False +retraction_hop = 0.2 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/abs/two_trees_0.4_ABS_low.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.4_ABS_low.inst.cfg new file mode 100644 index 0000000000..93f9d522ee --- /dev/null +++ b/resources/quality/twotrees/abs/two_trees_0.4_ABS_low.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Low Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_abs +variant = 0.4mm Nozzle + +[values] +material_bed_temperature = 100 +material_print_temperature_layer_0 = 245 +material_print_temperature = 240 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = False +retraction_hop = 0.4 +retraction_hop_only_when_collides = True diff --git a/resources/quality/twotrees/abs/two_trees_0.4_ABS_standard.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.4_ABS_standard.inst.cfg new file mode 100644 index 0000000000..19e95592b2 --- /dev/null +++ b/resources/quality/twotrees/abs/two_trees_0.4_ABS_standard.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Standard Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_abs +variant = 0.4mm Nozzle + +[values] +material_bed_temperature = 100 +material_print_temperature_layer_0 = 245 +material_print_temperature = 240 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = False +retraction_hop = 0.3 +retraction_hop_only_when_collides = True diff --git a/resources/quality/twotrees/abs/two_trees_0.4_ABS_super.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.4_ABS_super.inst.cfg new file mode 100644 index 0000000000..392174f99f --- /dev/null +++ b/resources/quality/twotrees/abs/two_trees_0.4_ABS_super.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Super Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_abs +variant = 0.4mm Nozzle + +[values] +material_bed_temperature = 100 +material_print_temperature_layer_0 = 245 +material_print_temperature = 240 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = False +retraction_hop = 0.2 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/abs/two_trees_0.5_ABS_adaptive.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.5_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..5881a49e7c --- /dev/null +++ b/resources/quality/twotrees/abs/two_trees_0.5_ABS_adaptive.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Dynamic Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.5mm Nozzle + +[values] +material_bed_temperature = 100 +material_print_temperature_layer_0 = 245 +material_print_temperature = 240 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = False +retraction_hop = 0.2 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/abs/two_trees_0.5_ABS_low.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.5_ABS_low.inst.cfg new file mode 100644 index 0000000000..130ee72845 --- /dev/null +++ b/resources/quality/twotrees/abs/two_trees_0.5_ABS_low.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Low Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_abs +variant = 0.5mm Nozzle + +[values] +material_bed_temperature = 100 +material_print_temperature_layer_0 = 245 +material_print_temperature = 240 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = False +retraction_hop = 0.4 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/abs/two_trees_0.5_ABS_standard.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.5_ABS_standard.inst.cfg new file mode 100644 index 0000000000..6a058c2542 --- /dev/null +++ b/resources/quality/twotrees/abs/two_trees_0.5_ABS_standard.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Standard Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_abs +variant = 0.5mm Nozzle + +[values] +material_bed_temperature = 100 +material_print_temperature_layer_0 = 245 +material_print_temperature = 240 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = False +retraction_hop = 0.3 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/abs/two_trees_0.5_ABS_super.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.5_ABS_super.inst.cfg new file mode 100644 index 0000000000..cbe66cb80f --- /dev/null +++ b/resources/quality/twotrees/abs/two_trees_0.5_ABS_super.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Super Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_abs +variant = 0.5mm Nozzle + +[values] +material_bed_temperature = 100 +material_print_temperature_layer_0 = 245 +material_print_temperature = 240 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = False +retraction_hop = 0.2 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/abs/two_trees_0.6_ABS_standard.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.6_ABS_standard.inst.cfg new file mode 100644 index 0000000000..a7811175cd --- /dev/null +++ b/resources/quality/twotrees/abs/two_trees_0.6_ABS_standard.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Standard Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_abs +variant = 0.6mm Nozzle + +[values] +material_bed_temperature = 100 +material_print_temperature_layer_0 = 245 +material_print_temperature = 240 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = False +retraction_hop = 0.3 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/abs/two_trees_0.8_ABS_draft.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.8_ABS_draft.inst.cfg new file mode 100644 index 0000000000..385f2aeb39 --- /dev/null +++ b/resources/quality/twotrees/abs/two_trees_0.8_ABS_draft.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Draft Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_abs +variant = 0.8mm Nozzle + +[values] +material_bed_temperature = 100 +material_print_temperature_layer_0 = 245 +material_print_temperature = 240 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = False +retraction_hop = 0.4 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/abs/two_trees_1.0_ABS_draft.inst.cfg b/resources/quality/twotrees/abs/two_trees_1.0_ABS_draft.inst.cfg new file mode 100644 index 0000000000..25fc30560b --- /dev/null +++ b/resources/quality/twotrees/abs/two_trees_1.0_ABS_draft.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Draft Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_abs +variant = 1.0mm Nozzle + +[values] +material_bed_temperature = 100 +material_print_temperature_layer_0 = 245 +material_print_temperature = 240 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = False +retraction_hop = 0.4 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/petg/two_trees_0.2_PETG_super.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.2_PETG_super.inst.cfg new file mode 100644 index 0000000000..a47107df65 --- /dev/null +++ b/resources/quality/twotrees/petg/two_trees_0.2_PETG_super.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Super Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_petg +variant = 0.2mm Nozzle + +[values] +material_bed_temperature = 80 +material_print_temperature_layer_0 = 225 +material_print_temperature = 220 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/petg/two_trees_0.2_PETG_ultra.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.2_PETG_ultra.inst.cfg new file mode 100644 index 0000000000..399cd41c98 --- /dev/null +++ b/resources/quality/twotrees/petg/two_trees_0.2_PETG_ultra.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Ultra Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = ultra +material = generic_petg +variant = 0.2mm Nozzle + +[values] +material_bed_temperature = 80 +material_print_temperature_layer_0 = 225 +material_print_temperature = 220 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/petg/two_trees_0.3_PETG_adaptive.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.3_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..40cd579bb9 --- /dev/null +++ b/resources/quality/twotrees/petg/two_trees_0.3_PETG_adaptive.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Dynamic Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.3mm Nozzle + +[values] +material_bed_temperature = 80 +material_print_temperature_layer_0 = 225 +material_print_temperature = 220 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True diff --git a/resources/quality/twotrees/petg/two_trees_0.3_PETG_low.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.3_PETG_low.inst.cfg new file mode 100644 index 0000000000..7c87bebd12 --- /dev/null +++ b/resources/quality/twotrees/petg/two_trees_0.3_PETG_low.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Low Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_petg +variant = 0.3mm Nozzle + +[values] +material_bed_temperature = 80 +material_print_temperature_layer_0 = 225 +material_print_temperature = 220 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.4 +retraction_hop_only_when_collides = True diff --git a/resources/quality/twotrees/petg/two_trees_0.3_PETG_standard.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.3_PETG_standard.inst.cfg new file mode 100644 index 0000000000..c36d96f1a5 --- /dev/null +++ b/resources/quality/twotrees/petg/two_trees_0.3_PETG_standard.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Standard Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_petg +variant = 0.3mm Nozzle + +[values] +material_bed_temperature = 80 +material_print_temperature_layer_0 = 225 +material_print_temperature = 220 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.3 +retraction_hop_only_when_collides = True diff --git a/resources/quality/twotrees/petg/two_trees_0.3_PETG_super.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.3_PETG_super.inst.cfg new file mode 100644 index 0000000000..283a47f1e5 --- /dev/null +++ b/resources/quality/twotrees/petg/two_trees_0.3_PETG_super.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Super Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_petg +variant = 0.3mm Nozzle + +[values] +material_bed_temperature = 80 +material_print_temperature_layer_0 = 225 +material_print_temperature = 220 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True diff --git a/resources/quality/twotrees/petg/two_trees_0.4_PETG_adaptive.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.4_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..666d905880 --- /dev/null +++ b/resources/quality/twotrees/petg/two_trees_0.4_PETG_adaptive.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Dynamic Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.4mm Nozzle + +[values] +material_bed_temperature = 80 +material_print_temperature_layer_0 = 225 +material_print_temperature = 220 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/twotrees/petg/two_trees_0.4_PETG_low.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.4_PETG_low.inst.cfg new file mode 100644 index 0000000000..994fc5c336 --- /dev/null +++ b/resources/quality/twotrees/petg/two_trees_0.4_PETG_low.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Low Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_petg +variant = 0.4mm Nozzle + +[values] +material_bed_temperature = 80 +material_print_temperature_layer_0 = 225 +material_print_temperature = 220 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.4 +retraction_hop_only_when_collides = True +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/twotrees/petg/two_trees_0.4_PETG_standard.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.4_PETG_standard.inst.cfg new file mode 100644 index 0000000000..72b91f5450 --- /dev/null +++ b/resources/quality/twotrees/petg/two_trees_0.4_PETG_standard.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Standard Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_petg +variant = 0.4mm Nozzle + +[values] +material_bed_temperature = 80 +material_print_temperature_layer_0 = 225 +material_print_temperature = 220 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.3 +retraction_hop_only_when_collides = True +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/twotrees/petg/two_trees_0.4_PETG_super.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.4_PETG_super.inst.cfg new file mode 100644 index 0000000000..9d2002c7d1 --- /dev/null +++ b/resources/quality/twotrees/petg/two_trees_0.4_PETG_super.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Super Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_petg +variant = 0.4mm Nozzle + +[values] +material_bed_temperature = 80 +material_print_temperature_layer_0 = 225 +material_print_temperature = 220 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/twotrees/petg/two_trees_0.5_PETG_adaptive.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.5_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..eb1b626c0a --- /dev/null +++ b/resources/quality/twotrees/petg/two_trees_0.5_PETG_adaptive.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Dynamic Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.5mm Nozzle + +[values] +material_bed_temperature = 80 +material_print_temperature_layer_0 = 225 +material_print_temperature = 220 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True diff --git a/resources/quality/twotrees/petg/two_trees_0.5_PETG_low.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.5_PETG_low.inst.cfg new file mode 100644 index 0000000000..61727202dd --- /dev/null +++ b/resources/quality/twotrees/petg/two_trees_0.5_PETG_low.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Low Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_petg +variant = 0.5mm Nozzle + +[values] +material_bed_temperature = 80 +material_print_temperature_layer_0 = 225 +material_print_temperature = 220 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.4 +retraction_hop_only_when_collides = True diff --git a/resources/quality/twotrees/petg/two_trees_0.5_PETG_standard.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.5_PETG_standard.inst.cfg new file mode 100644 index 0000000000..3afbbdbee5 --- /dev/null +++ b/resources/quality/twotrees/petg/two_trees_0.5_PETG_standard.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Standard Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_petg +variant = 0.5mm Nozzle + +[values] +material_bed_temperature = 80 +material_print_temperature_layer_0 = 225 +material_print_temperature = 220 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.3 +retraction_hop_only_when_collides = True diff --git a/resources/quality/twotrees/petg/two_trees_0.5_PETG_super.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.5_PETG_super.inst.cfg new file mode 100644 index 0000000000..7da0047996 --- /dev/null +++ b/resources/quality/twotrees/petg/two_trees_0.5_PETG_super.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Super Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_petg +variant = 0.5mm Nozzle + +[values] +material_bed_temperature = 80 +material_print_temperature_layer_0 = 225 +material_print_temperature = 220 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True diff --git a/resources/quality/twotrees/petg/two_trees_0.6_PETG_standard.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.6_PETG_standard.inst.cfg new file mode 100644 index 0000000000..add678c9fe --- /dev/null +++ b/resources/quality/twotrees/petg/two_trees_0.6_PETG_standard.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Standard Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_petg +variant = 0.6mm Nozzle + +[values] +material_bed_temperature = 80 +material_print_temperature_layer_0 = 225 +material_print_temperature = 220 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.3 +retraction_hop_only_when_collides = True diff --git a/resources/quality/twotrees/petg/two_trees_0.8_PETG_draft.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.8_PETG_draft.inst.cfg new file mode 100644 index 0000000000..41ba0dfc71 --- /dev/null +++ b/resources/quality/twotrees/petg/two_trees_0.8_PETG_draft.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Draft Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_petg +variant = 0.8mm Nozzle + +[values] +material_bed_temperature = 80 +material_print_temperature_layer_0 = 225 +material_print_temperature = 220 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.4 +retraction_hop_only_when_collides = True diff --git a/resources/quality/twotrees/petg/two_trees_1.0_PETG_draft.inst.cfg b/resources/quality/twotrees/petg/two_trees_1.0_PETG_draft.inst.cfg new file mode 100644 index 0000000000..dbab69daee --- /dev/null +++ b/resources/quality/twotrees/petg/two_trees_1.0_PETG_draft.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Draft Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_petg +variant = 1.0mm Nozzle + +[values] +material_bed_temperature = 80 +material_print_temperature_layer_0 = 225 +material_print_temperature = 220 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.4 +retraction_hop_only_when_collides = True diff --git a/resources/quality/twotrees/pla/two_trees_0.2_PLA_super.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.2_PLA_super.inst.cfg new file mode 100644 index 0000000000..aa305e5da2 --- /dev/null +++ b/resources/quality/twotrees/pla/two_trees_0.2_PLA_super.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Super Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_pla +variant = 0.2mm Nozzle + +[values] +material_bed_temperature = 60 +material_print_temperature_layer_0 = 195 +material_print_temperature = 190 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/pla/two_trees_0.2_PLA_ultra.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.2_PLA_ultra.inst.cfg new file mode 100644 index 0000000000..02a37b5b74 --- /dev/null +++ b/resources/quality/twotrees/pla/two_trees_0.2_PLA_ultra.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Ultra Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = ultra +material = generic_pla +variant = 0.2mm Nozzle + +[values] +material_bed_temperature = 60 +material_print_temperature_layer_0 = 195 +material_print_temperature = 190 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/pla/two_trees_0.3_PLA_adaptive.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.3_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..ac246d1b1e --- /dev/null +++ b/resources/quality/twotrees/pla/two_trees_0.3_PLA_adaptive.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Dynamic Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.3mm Nozzle + +[values] +material_bed_temperature = 60 +material_print_temperature_layer_0 = 195 +material_print_temperature = 190 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/pla/two_trees_0.3_PLA_low.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.3_PLA_low.inst.cfg new file mode 100644 index 0000000000..cbbfea8b94 --- /dev/null +++ b/resources/quality/twotrees/pla/two_trees_0.3_PLA_low.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Low Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_pla +variant = 0.3mm Nozzle + +[values] +material_bed_temperature = 60 +material_print_temperature_layer_0 = 195 +material_print_temperature = 190 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.4 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/pla/two_trees_0.3_PLA_standard.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.3_PLA_standard.inst.cfg new file mode 100644 index 0000000000..21227f0c1d --- /dev/null +++ b/resources/quality/twotrees/pla/two_trees_0.3_PLA_standard.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Standard Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_pla +variant = 0.3mm Nozzle + +[values] +material_bed_temperature = 60 +material_print_temperature_layer_0 = 195 +material_print_temperature = 190 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.3 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/pla/two_trees_0.3_PLA_super.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.3_PLA_super.inst.cfg new file mode 100644 index 0000000000..33baef9046 --- /dev/null +++ b/resources/quality/twotrees/pla/two_trees_0.3_PLA_super.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Super Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_pla +variant = 0.3mm Nozzle + +[values] +material_bed_temperature = 60 +material_print_temperature_layer_0 = 195 +material_print_temperature = 190 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/pla/two_trees_0.4_PLA_adaptive.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.4_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..497b2edd0f --- /dev/null +++ b/resources/quality/twotrees/pla/two_trees_0.4_PLA_adaptive.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Dynamic Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.4mm Nozzle + +[values] +material_bed_temperature = 60 +material_print_temperature_layer_0 = 195 +material_print_temperature = 190 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/pla/two_trees_0.4_PLA_low.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.4_PLA_low.inst.cfg new file mode 100644 index 0000000000..dab8feabbf --- /dev/null +++ b/resources/quality/twotrees/pla/two_trees_0.4_PLA_low.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Low Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_pla +variant = 0.4mm Nozzle + +[values] +material_bed_temperature = 60 +material_print_temperature_layer_0 = 195 +material_print_temperature = 190 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.4 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/pla/two_trees_0.4_PLA_standard.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.4_PLA_standard.inst.cfg new file mode 100644 index 0000000000..efa946a46e --- /dev/null +++ b/resources/quality/twotrees/pla/two_trees_0.4_PLA_standard.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Standard Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_pla +variant = 0.4mm Nozzle + +[values] +material_bed_temperature = 60 +material_print_temperature_layer_0 = 195 +material_print_temperature = 190 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.3 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/pla/two_trees_0.4_PLA_super.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.4_PLA_super.inst.cfg new file mode 100644 index 0000000000..2ecc05b561 --- /dev/null +++ b/resources/quality/twotrees/pla/two_trees_0.4_PLA_super.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Super Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_pla +variant = 0.4mm Nozzle + +[values] +material_bed_temperature = 60 +material_print_temperature_layer_0 = 195 +material_print_temperature = 190 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/pla/two_trees_0.5_PLA_adaptive.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.5_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..6fdca47154 --- /dev/null +++ b/resources/quality/twotrees/pla/two_trees_0.5_PLA_adaptive.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Dynamic Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.5mm Nozzle + +[values] +material_bed_temperature = 60 +material_print_temperature_layer_0 = 195 +material_print_temperature = 190 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/pla/two_trees_0.5_PLA_low.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.5_PLA_low.inst.cfg new file mode 100644 index 0000000000..d5d3169523 --- /dev/null +++ b/resources/quality/twotrees/pla/two_trees_0.5_PLA_low.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Low Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_pla +variant = 0.5mm Nozzle + +[values] +material_bed_temperature = 60 +material_print_temperature_layer_0 = 195 +material_print_temperature = 190 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.4 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/pla/two_trees_0.5_PLA_standard.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.5_PLA_standard.inst.cfg new file mode 100644 index 0000000000..1a0e2beffd --- /dev/null +++ b/resources/quality/twotrees/pla/two_trees_0.5_PLA_standard.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Standard Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_pla +variant = 0.5mm Nozzle + +[values] +material_bed_temperature = 60 +material_print_temperature_layer_0 = 195 +material_print_temperature = 190 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.3 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/pla/two_trees_0.5_PLA_super.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.5_PLA_super.inst.cfg new file mode 100644 index 0000000000..85473ecef7 --- /dev/null +++ b/resources/quality/twotrees/pla/two_trees_0.5_PLA_super.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Super Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_pla +variant = 0.5mm Nozzle + +[values] +material_bed_temperature = 60 +material_print_temperature_layer_0 = 195 +material_print_temperature = 190 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/pla/two_trees_0.6_PLA_draft.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.6_PLA_draft.inst.cfg new file mode 100644 index 0000000000..464e9f9a45 --- /dev/null +++ b/resources/quality/twotrees/pla/two_trees_0.6_PLA_draft.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Draft Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_pla +variant = 0.6mm Nozzle + +[values] +material_bed_temperature = 60 +material_print_temperature_layer_0 = 195 +material_print_temperature = 190 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.4 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/pla/two_trees_0.6_PLA_low.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.6_PLA_low.inst.cfg new file mode 100644 index 0000000000..77b92764ce --- /dev/null +++ b/resources/quality/twotrees/pla/two_trees_0.6_PLA_low.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Low Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +material = generic_pla +variant = 0.6mm Nozzle + +[values] +material_bed_temperature = 60 +material_print_temperature_layer_0 = 195 +material_print_temperature = 190 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.4 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/pla/two_trees_0.6_PLA_standard.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.6_PLA_standard.inst.cfg new file mode 100644 index 0000000000..0d67fdaff3 --- /dev/null +++ b/resources/quality/twotrees/pla/two_trees_0.6_PLA_standard.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Standard Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_pla +variant = 0.6mm Nozzle + +[values] +material_bed_temperature = 60 +material_print_temperature_layer_0 = 195 +material_print_temperature = 190 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.3 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/pla/two_trees_0.8_PLA_draft.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.8_PLA_draft.inst.cfg new file mode 100644 index 0000000000..8e118c6556 --- /dev/null +++ b/resources/quality/twotrees/pla/two_trees_0.8_PLA_draft.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Draft Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_pla +variant = 0.8mm Nozzle + +[values] +material_bed_temperature = 60 +material_print_temperature_layer_0 = 195 +material_print_temperature = 190 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.4 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/pla/two_trees_1.0_PLA_draft.inst.cfg b/resources/quality/twotrees/pla/two_trees_1.0_PLA_draft.inst.cfg new file mode 100644 index 0000000000..1bb8dc132a --- /dev/null +++ b/resources/quality/twotrees/pla/two_trees_1.0_PLA_draft.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Draft Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_pla +variant = 1.0mm Nozzle + +[values] +material_bed_temperature = 60 +material_print_temperature_layer_0 = 195 +material_print_temperature = 190 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.4 +retraction_hop_only_when_collides = True \ No newline at end of file diff --git a/resources/quality/twotrees/tpu/two_trees_0.3_TPU_adaptive.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.3_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..03ffe6f8c4 --- /dev/null +++ b/resources/quality/twotrees/tpu/two_trees_0.3_TPU_adaptive.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Dynamic Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.3mm Nozzle + +[values] +material_bed_temperature = 0 +material_print_temperature_layer_0 = 210 +material_print_temperature = 210 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True +speed_print = 20 +retraction_speed = 40 +retraction_amount = 7 \ No newline at end of file diff --git a/resources/quality/twotrees/tpu/two_trees_0.3_TPU_standard.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.3_TPU_standard.inst.cfg new file mode 100644 index 0000000000..5f77baeab8 --- /dev/null +++ b/resources/quality/twotrees/tpu/two_trees_0.3_TPU_standard.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Standard Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.3mm Nozzle + +[values] +material_bed_temperature = 0 +material_print_temperature_layer_0 = 210 +material_print_temperature = 210 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.4 +retraction_hop_only_when_collides = True +speed_print = 20 +retraction_speed = 40 +retraction_amount = 7 \ No newline at end of file diff --git a/resources/quality/twotrees/tpu/two_trees_0.3_TPU_super.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.3_TPU_super.inst.cfg new file mode 100644 index 0000000000..5929bfb63a --- /dev/null +++ b/resources/quality/twotrees/tpu/two_trees_0.3_TPU_super.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Super Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_tpu +variant = 0.3mm Nozzle + +[values] +material_bed_temperature = 0 +material_print_temperature_layer_0 = 210 +material_print_temperature = 210 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True +speed_print = 20 +retraction_speed = 40 +retraction_amount = 7 \ No newline at end of file diff --git a/resources/quality/twotrees/tpu/two_trees_0.4_TPU_adaptive.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.4_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..d2c59179a5 --- /dev/null +++ b/resources/quality/twotrees/tpu/two_trees_0.4_TPU_adaptive.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Dynamic Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.4mm Nozzle + +[values] +material_bed_temperature = 0 +material_print_temperature_layer_0 = 210 +material_print_temperature = 210 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True +speed_print = 20 +retraction_speed = 40 +retraction_amount = 7 \ No newline at end of file diff --git a/resources/quality/twotrees/tpu/two_trees_0.4_TPU_standard.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.4_TPU_standard.inst.cfg new file mode 100644 index 0000000000..14e7362563 --- /dev/null +++ b/resources/quality/twotrees/tpu/two_trees_0.4_TPU_standard.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Standard Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.4mm Nozzle + +[values] +material_bed_temperature = 0 +material_print_temperature_layer_0 = 210 +material_print_temperature = 210 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.3 +retraction_hop_only_when_collides = True +speed_print = 20 +retraction_speed = 40 +retraction_amount = 7 \ No newline at end of file diff --git a/resources/quality/twotrees/tpu/two_trees_0.4_TPU_super.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.4_TPU_super.inst.cfg new file mode 100644 index 0000000000..024ccf8534 --- /dev/null +++ b/resources/quality/twotrees/tpu/two_trees_0.4_TPU_super.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Super Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_tpu +variant = 0.4mm Nozzle + +[values] +material_bed_temperature = 0 +material_print_temperature_layer_0 = 210 +material_print_temperature = 210 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True +speed_print = 20 +retraction_speed = 40 +retraction_amount = 7 \ No newline at end of file diff --git a/resources/quality/twotrees/tpu/two_trees_0.5_TPU_adaptive.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.5_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..ffb88e931d --- /dev/null +++ b/resources/quality/twotrees/tpu/two_trees_0.5_TPU_adaptive.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Dynamic Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.5mm Nozzle + +[values] +material_bed_temperature = 0 +material_print_temperature_layer_0 = 210 +material_print_temperature = 210 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True +speed_print = 20 +retraction_speed = 40 +retraction_amount = 7 \ No newline at end of file diff --git a/resources/quality/twotrees/tpu/two_trees_0.5_TPU_standard.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.5_TPU_standard.inst.cfg new file mode 100644 index 0000000000..a8fa652049 --- /dev/null +++ b/resources/quality/twotrees/tpu/two_trees_0.5_TPU_standard.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Standard Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.5mm Nozzle + +[values] +material_bed_temperature = 0 +material_print_temperature_layer_0 = 210 +material_print_temperature = 210 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.3 +retraction_hop_only_when_collides = True +speed_print = 20 +retraction_speed = 40 +retraction_amount = 7 \ No newline at end of file diff --git a/resources/quality/twotrees/tpu/two_trees_0.5_TPU_super.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.5_TPU_super.inst.cfg new file mode 100644 index 0000000000..4653ed2e5b --- /dev/null +++ b/resources/quality/twotrees/tpu/two_trees_0.5_TPU_super.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Super Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +material = generic_tpu +variant = 0.5mm Nozzle + +[values] +material_bed_temperature = 0 +material_print_temperature_layer_0 = 210 +material_print_temperature = 210 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.2 +retraction_hop_only_when_collides = True +speed_print = 20 +retraction_speed = 40 +retraction_amount = 7 \ No newline at end of file diff --git a/resources/quality/twotrees/tpu/two_trees_0.6_TPU_standard.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.6_TPU_standard.inst.cfg new file mode 100644 index 0000000000..9c946916e2 --- /dev/null +++ b/resources/quality/twotrees/tpu/two_trees_0.6_TPU_standard.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Standard Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.6mm Nozzle + +[values] +material_bed_temperature = 0 +material_print_temperature_layer_0 = 210 +material_print_temperature = 210 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.3 +retraction_hop_only_when_collides = True +speed_print = 20 +retraction_speed = 40 +retraction_amount = 7 \ No newline at end of file diff --git a/resources/quality/twotrees/tpu/two_trees_0.8_TPU_draft.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.8_TPU_draft.inst.cfg new file mode 100644 index 0000000000..55a32c0c53 --- /dev/null +++ b/resources/quality/twotrees/tpu/two_trees_0.8_TPU_draft.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Draft Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_tpu +variant = 0.8mm Nozzle + +[values] +material_bed_temperature = 0 +material_print_temperature_layer_0 = 210 +material_print_temperature = 210 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.4 +retraction_hop_only_when_collides = True +speed_print = 20 +retraction_speed = 40 +retraction_amount = 7 \ No newline at end of file diff --git a/resources/quality/twotrees/tpu/two_trees_1.0_TPU_draft.inst.cfg b/resources/quality/twotrees/tpu/two_trees_1.0_TPU_draft.inst.cfg new file mode 100644 index 0000000000..2a7cac091b --- /dev/null +++ b/resources/quality/twotrees/tpu/two_trees_1.0_TPU_draft.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Draft Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +material = generic_tpu +variant = 1.0mm Nozzle + +[values] +material_bed_temperature = 0 +material_print_temperature_layer_0 = 210 +material_print_temperature = 210 +material_standby_temperature = =material_print_temperature +material_initial_print_temperature= =material_print_temperature +material_final_print_temperature= =material_print_temperature +cool_fan_enabled = True +retraction_hop = 0.4 +retraction_hop_only_when_collides = True +speed_print = 20 +retraction_speed = 40 +retraction_amount = 7 \ No newline at end of file diff --git a/resources/quality/twotrees/two_trees_global_adaptive.inst.cfg b/resources/quality/twotrees/two_trees_global_adaptive.inst.cfg new file mode 100644 index 0000000000..f56f4e3b70 --- /dev/null +++ b/resources/quality/twotrees/two_trees_global_adaptive.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Dynamic Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = adaptive +weight = -2 +global_quality = True + +[values] +layer_height = 0.16 +layer_height_0 = 0.2 +top_bottom_thickness = =layer_height_0+layer_height*4 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*6 +adaptive_layer_height_enabled = true diff --git a/resources/quality/twotrees/two_trees_global_draft.inst.cfg b/resources/quality/twotrees/two_trees_global_draft.inst.cfg new file mode 100644 index 0000000000..89e8ed340b --- /dev/null +++ b/resources/quality/twotrees/two_trees_global_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Draft Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -5 +global_quality = True + +[values] +layer_height = 0.32 +layer_height_0 = 0.32 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/twotrees/two_trees_global_low.inst.cfg b/resources/quality/twotrees/two_trees_global_low.inst.cfg new file mode 100644 index 0000000000..4aac0cc82a --- /dev/null +++ b/resources/quality/twotrees/two_trees_global_low.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Low Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = low +weight = -4 +global_quality = True + +[values] +layer_height = 0.28 +layer_height_0 = 0.28 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/twotrees/two_trees_global_standard.inst.cfg b/resources/quality/twotrees/two_trees_global_standard.inst.cfg new file mode 100644 index 0000000000..ef7cb999f3 --- /dev/null +++ b/resources/quality/twotrees/two_trees_global_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Standard Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = standard +weight = -3 +global_quality = True + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*4 diff --git a/resources/quality/twotrees/two_trees_global_super.inst.cfg b/resources/quality/twotrees/two_trees_global_super.inst.cfg new file mode 100644 index 0000000000..d6a5523d81 --- /dev/null +++ b/resources/quality/twotrees/two_trees_global_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Super Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = super +weight = -1 +global_quality = True + +[values] +layer_height = 0.12 +layer_height_0 = 0.2 +top_bottom_thickness = =layer_height_0+layer_height*6 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*8 diff --git a/resources/quality/twotrees/two_trees_global_ultra.inst.cfg b/resources/quality/twotrees/two_trees_global_ultra.inst.cfg new file mode 100644 index 0000000000..d6541ca9a5 --- /dev/null +++ b/resources/quality/twotrees/two_trees_global_ultra.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Ultra Quality +definition = two_trees_base + +[metadata] +setting_version = 17 +type = quality +quality_type = ultra +weight = 0 +global_quality = True + +[values] +layer_height = 0.08 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*10 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*12 diff --git a/resources/quality/ultimaker2/um2_draft.inst.cfg b/resources/quality/ultimaker2/um2_draft.inst.cfg index 87f7a2367b..f8a0f3e9af 100644 --- a/resources/quality/ultimaker2/um2_draft.inst.cfg +++ b/resources/quality/ultimaker2/um2_draft.inst.cfg @@ -4,7 +4,7 @@ name = Draft definition = ultimaker2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2/um2_fast.inst.cfg b/resources/quality/ultimaker2/um2_fast.inst.cfg index 2ed04b510c..0be3fa6761 100644 --- a/resources/quality/ultimaker2/um2_fast.inst.cfg +++ b/resources/quality/ultimaker2/um2_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2/um2_high.inst.cfg b/resources/quality/ultimaker2/um2_high.inst.cfg index c75f8f3a56..632837f67f 100644 --- a/resources/quality/ultimaker2/um2_high.inst.cfg +++ b/resources/quality/ultimaker2/um2_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2/um2_normal.inst.cfg b/resources/quality/ultimaker2/um2_normal.inst.cfg index 1a69471b40..b2b432f5f0 100644 --- a/resources/quality/ultimaker2/um2_normal.inst.cfg +++ b/resources/quality/ultimaker2/um2_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg index 84feea8bd4..3631727e92 100644 --- a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg index c0aaf3e410..0e707b6e80 100644 --- a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg index f7ccecd188..02c9c14040 100644 --- a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg index 0a50f0ad46..b779740bca 100644 --- a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg index 68c2e2bec8..d2a7521933 100644 --- a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg index b28ad830c7..14cb8ca956 100644 --- a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg index 1409496828..74fb634e11 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg index fdca61fff3..bf7b1c6f11 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg index 4d36c46fec..f508bf298c 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg index eb8a4f83ac..a869bb1a0f 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg index 257bd8f8fc..c40530490b 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg index f648bcd508..03cde2366f 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg index 443c907cd2..07b49b5e53 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg index 021aa688cd..a681827079 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg index c98e2afc31..83d3d693ae 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg index 7f3405d19b..483246a48e 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg index 8cfbe23951..c7a03cd6b0 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg index bcfcfcfb73..8ae12810bf 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg index 8046ae2eac..f33b7b3572 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg index 69268b9bee..5888db2b8d 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg index fbf0026508..567f4b8bec 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = slightlycoarse weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg index 787ff975e3..9dcf9bbb20 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg index 42a7ec7b69..96af374586 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = slightlycoarse weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg index e9df8fd91e..b5589c77af 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg index 7f637bd932..be4e2e944e 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -4 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg index 08f01667e1..da9a810df0 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg index e205b59a1c..668cbb9f23 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse Quality definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extracoarse weight = -3 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg index 5741ebdee0..6910dbfbe0 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg index 1a4e0ecc5b..88c81bc7c6 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg index cf30d4af13..d6f7c56d9c 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg index ab7c7af9e4..d71e220212 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = slightlycoarse weight = -4 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg index 23afc4dd5e..edb8ebfc70 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg index d7aae946d6..0dddabd6ff 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg index bc10a8b597..36fdf8a4e8 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg index 1ede19780b..cba69857f7 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg index 9e20f49c44..87ecad7805 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = slightlycoarse weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg index f6f6e3e81e..ced8063481 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg index 24ac3ebd14..7cf59596b3 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = slightlycoarse weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg index 9ee69c78e7..17883b0082 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg index e3074039ea..8b9e15eaca 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg index 37db2322a6..2a127d6573 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg index e6cdef59d1..2e103941bd 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg index 8383e2a631..0323710d73 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg index d02bc9010b..df965bc95e 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = slightlycoarse weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg index 994e6a8654..6a319bf368 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg index 9110dd9041..1649a4be70 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extracoarse weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg index 04a30ea331..9beb8bc692 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg index 607bce75dd..e7b8cfdf30 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg index ce71848a65..842bc15dd9 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg index 34284f1538..1c8324630f 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg index 6e899a3876..9c2d0ba792 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg index 47191fedd1..ffd5356046 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg index 65b0f2792f..fc9bad4e5a 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = slightlycoarse weight = -3 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg index 0615ad5b5f..38760e0a4e 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg index 0f73982ac5..8710cc0c5b 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg index 28c3eeef26..00dc8e798c 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.25_normal.inst.cfg index 43dc3faca8..3b936d3f77 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_fast.inst.cfg index 286bebf854..aecfb3c85e 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_high.inst.cfg index 614744aada..c51a11062a 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_normal.inst.cfg index b84d4c9a3f..ae9d1b8b1e 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.6_normal.inst.cfg index ac192c9685..f5c6dd92f2 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.8_normal.inst.cfg index d2cffb1c55..1b88891819 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.25_normal.inst.cfg index efb0361c6e..f2e6828ee0 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg index a45f1d3e6c..3aca738149 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 @@ -27,3 +27,4 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45) speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45) speed_infill = =math.ceil(speed_print * 45 / 45) +retraction_combing_max_distance = 50 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg index bcbc535fe0..074dd142e0 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 @@ -24,3 +24,4 @@ top_bottom_thickness = 0.72 wall_thickness = 1.05 speed_topbottom = =math.ceil(speed_print * 15 / 45) speed_infill = =math.ceil(speed_print * 45 / 45) +retraction_combing_max_distance = 50 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg index 71f2916a3a..4a20d752e9 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 @@ -22,3 +22,4 @@ speed_print = 45 speed_wall = =math.ceil(speed_print * 30 / 45) top_bottom_thickness = 0.8 wall_thickness = 1.05 +retraction_combing_max_distance = 50 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg index fabf1214ee..25fb02bb13 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.8_normal.inst.cfg index 96d2433ffa..28c341b752 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg index ed6f5a0c5e..a4ba12e45b 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 @@ -34,7 +34,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25) speed_wall_x = =speed_print support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.5 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg index 2aebe1e918..da6faaf07a 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = 0 @@ -34,7 +34,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 35) speed_wall_x = =math.ceil(speed_print * 30 / 35) support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.5 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg index 78ffe10ce9..46b6e2721d 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = slightlycoarse weight = -2 @@ -36,7 +36,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25) speed_wall_x = =speed_print support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20 support_line_distance = 2.85 support_pattern = lines support_xy_distance = 0.6 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg index 2099ea7cbf..f3ddc2a27f 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = 0 @@ -36,7 +36,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 35) speed_wall_x = =speed_print support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20 support_line_distance = 2.85 support_pattern = lines support_xy_distance = 0.6 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg index bf4be03a20..93db0945ba 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = slightlycoarse weight = -2 @@ -33,7 +33,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25) speed_wall_x = =speed_print support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg index f1dd92db53..1c7e0c2ec8 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = 0 @@ -33,7 +33,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30) speed_wall_x = =speed_print support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_global_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_global_Coarse_Quality.inst.cfg index e642fb9857..d76a1a5044 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_global_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -4 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_global_Draft_Quality.inst.cfg index 27801010ca..9211132821 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_global_Extra_Coarse_Quality.inst.cfg index 8db35032aa..256211eaf2 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_global_Extra_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse Quality definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extracoarse weight = -3 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_global_Fast_Quality.inst.cfg index 39c8927c80..6002d3a0b0 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_global_High_Quality.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_global_High_Quality.inst.cfg index 3e3ca23ac7..304bff08d7 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_global_Normal_Quality.inst.cfg index 1530bdb200..ce8b164940 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_global_Slightly_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_global_Slightly_Coarse_Quality.inst.cfg index e3bac84215..325491ecdf 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_global_Slightly_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_global_Slightly_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = slightlycoarse weight = -4 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg index 2fd638f0e9..0fd7722b1f 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 @@ -34,7 +34,7 @@ speed_travel = 150 speed_wall_0 = =math.ceil(speed_print * 20 / 40) speed_wall_x = =speed_print support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_xy_distance = 0.6 support_z_distance = =layer_height * 2 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg index d7a64e12c8..7df63c901d 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 @@ -34,7 +34,7 @@ speed_travel = 150 speed_wall_0 = =math.ceil(speed_print * 20 / 40) speed_wall_x = =speed_print support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_xy_distance = 0.6 support_z_distance = =layer_height * 2 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg index d62a4e79ee..ed7cf16eea 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -1 @@ -33,7 +33,7 @@ speed_travel = 150 speed_wall = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25 support_pattern = lines support_xy_distance = 0.6 support_z_distance = =layer_height * 2 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg index a6161c2a07..64ad87ac1c 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = 0 @@ -32,7 +32,7 @@ speed_travel = 150 speed_wall = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25 support_pattern = lines support_xy_distance = 0.6 support_z_distance = =layer_height * 2 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg index dbb90918b8..f12d16dd2f 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = slightlycoarse weight = -1 @@ -37,7 +37,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55) support_angle = 45 support_bottom_distance = 0.55 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25 support_pattern = lines support_top_distance = 0.55 support_xy_distance = 0.7 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg index 172ef69c01..6d07352e0d 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = 0 @@ -36,7 +36,7 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 55) speed_wall_x = =math.ceil(speed_print * 40 / 55) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25 support_pattern = lines support_xy_distance = 0.7 support_z_distance = =layer_height * 2 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg index c85bacb89e..6a0b66fffc 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = slightlycoarse weight = -2 @@ -36,7 +36,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55) support_angle = 45 support_bottom_distance = 0.65 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25 support_pattern = lines support_top_distance = 0.5 support_xy_distance = 0.75 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg index 153f206b19..9781f52d8a 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = 0 @@ -36,7 +36,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55) support_angle = 45 support_bottom_distance = 0.65 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25 support_pattern = lines support_top_distance = 0.5 support_xy_distance = 0.75 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg index 062e7f97b5..3217c512aa 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 @@ -30,7 +30,7 @@ raft_surface_line_width = 0.2 speed_layer_0 = =round(speed_print * 30 / 30) speed_print = 30 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_z_distance = 0.19 wall_thickness = 0.88 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg index 20ab28f97b..38bfaa9150 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 @@ -30,7 +30,7 @@ raft_surface_line_width = 0.2 speed_layer_0 = =round(speed_print * 30 / 30) speed_print = 30 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_z_distance = 0.19 wall_thickness = 0.88 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg index 249bfb9053..21bedcb7df 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -1 @@ -31,7 +31,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 45) speed_wall_x = =math.ceil(speed_print * 30 / 45) support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_z_distance = 0.19 wall_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg index 86a2dabb6f..d49cdbbedb 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 @@ -31,7 +31,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 45) speed_wall_x = =math.ceil(speed_print * 30 / 45) support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20 support_pattern = lines support_z_distance = 0.19 wall_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg index 95bbbff2d3..716d421973 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = slightlycoarse weight = -1 @@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20 support_line_distance = 3.5333 support_pattern = lines support_z_distance = 0.21 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg index c4f451d972..8b07695490 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = 0 @@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 20 support_line_distance = 3.5333 support_pattern = lines support_z_distance = 0.21 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg index c9fe800c7b..3dfaf5721c 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = 0 @@ -30,7 +30,7 @@ speed_layer_0 = =round(speed_print * 30 / 40) speed_print = 40 support_angle = 45 support_enable = True -support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20 +support_infill_rate = =0 if support_structure == 'tree' else 20 support_pattern = lines support_z_distance = 0.26 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg new file mode 100644 index 0000000000..31c0fc677b --- /dev/null +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Extra Fine +definition = ultimaker2_plus_connect + +[metadata] +setting_version = 17 +type = quality +quality_type = high +weight = 1 +material = generic_petg +variant = 0.25 mm + +[values] +cool_fan_speed_min = =cool_fan_speed * 0.2 +cool_min_layer_time = 2 +cool_min_layer_time_fan_speed_max = 25 +cool_min_speed = 15 +infill_sparse_density = 20 +speed_layer_0 = 30 +speed_print = 30 +top_bottom_thickness = 0.72 +wall_thickness = 0.88 +retraction_combing_max_distance = 8 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg new file mode 100644 index 0000000000..e3219b8051 --- /dev/null +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = Fast +definition = ultimaker2_plus_connect + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +material = generic_petg +variant = 0.4 mm + +[values] +cool_fan_speed_min = =cool_fan_speed * 0.8 +cool_min_layer_time = 3 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 10 +infill_sparse_density = 20 +speed_layer_0 = 30 +speed_print = 45 +speed_travel = 150 +speed_wall = =math.ceil(speed_print * 40 / 45) +top_bottom_thickness = 0.75 +wall_thickness = 0.7 +speed_wall_0 = =math.ceil(speed_print * 30 / 45) +speed_topbottom = =math.ceil(speed_print * 30 / 45) +speed_wall_x = =math.ceil(speed_print * 40 / 45) +speed_infill = =math.ceil(speed_print * 45 / 45) +retraction_combing_max_distance = 8 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg new file mode 100644 index 0000000000..555228ae11 --- /dev/null +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = Normal +definition = ultimaker2_plus_connect + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -1 +material = generic_petg +variant = 0.4 mm + +[values] +cool_fan_speed_min = =cool_fan_speed * 0.8 +cool_min_layer_time = 3 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 10 +infill_sparse_density = 20 +speed_layer_0 = 30 +speed_print = 45 +speed_travel = 150 +speed_wall = =math.ceil(speed_print * 40 / 45) +top_bottom_thickness = 0.75 +wall_thickness = 0.7 +speed_wall_0 = =math.ceil(speed_print * 30 / 45) +speed_topbottom = =math.ceil(speed_print * 30 / 45) +speed_wall_x = =math.ceil(speed_print * 40 / 45) +speed_infill = =math.ceil(speed_print * 45 / 45) +retraction_combing_max_distance = 8 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg new file mode 100644 index 0000000000..5e72f44f65 --- /dev/null +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Fine +definition = ultimaker2_plus_connect + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = 0 +material = generic_petg +variant = 0.4 mm + +[values] +cool_fan_speed_min = =cool_fan_speed * 0.8 +cool_min_layer_time = 3 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 10 +infill_sparse_density = 20 +speed_layer_0 = 30 +speed_print = 45 +speed_wall = =math.ceil(speed_print * 30 / 45) +top_bottom_thickness = 0.8 +wall_thickness = 1.05 +retraction_combing_max_distance = 8 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg new file mode 100644 index 0000000000..6782dc02ba --- /dev/null +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Fine +definition = ultimaker2_plus_connect + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = 0 +material = generic_petg +variant = 0.6 mm + +[values] +cool_fan_speed_min = =cool_fan_speed * 0.8 +cool_min_layer_time = 5 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 8 +infill_sparse_density = 20 +speed_layer_0 = 30 +speed_print = 40 +top_bottom_thickness = 1.2 +wall_thickness = 1.59 +retraction_combing_max_distance = 8 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg new file mode 100644 index 0000000000..932ad0a5e1 --- /dev/null +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Normal +definition = ultimaker2_plus_connect + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -1 +material = generic_petg +variant = 0.8 mm + +[values] +cool_fan_speed_min = =cool_fan_speed * 0.8 +cool_min_layer_time = 3 +cool_min_layer_time_fan_speed_max = 25 +cool_min_speed = 8 +infill_sparse_density = 20 +speed_layer_0 = 30 +speed_print = 40 +top_bottom_thickness = 1.2 +wall_thickness = 2.1 +retraction_combing_max_distance = 8 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.25_normal.inst.cfg index 3c2288f052..47a69a4555 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_draft.inst.cfg index 48d37de4c6..de322b24e2 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_fast.inst.cfg index 23e1a1396a..740330cebc 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_high.inst.cfg index 8e8cea39df..0db7fdfcf9 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_normal.inst.cfg index 68c1a2960e..5c6c3af164 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.6_normal.inst.cfg index 942f69c910..72fd527ed3 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.8_normal.inst.cfg index 3bae17f1a7..fa22eb737e 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg index 787cf2d779..2928efc9fd 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg index 48062237b6..bb96858f08 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg index 86cecc00f0..2b67fbac3c 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg index 6e21a94da9..0dd7e016de 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg index d93d807812..f9158efe5a 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg index bd28518e4a..e4166238a2 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = slightlycoarse weight = -3 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.25_normal.inst.cfg index 8d1a329422..efbaa41751 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.25_normal.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_draft.inst.cfg index 06474184be..6d65773b4f 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_draft.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_fast.inst.cfg index d25748e82f..2af498d11a 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_normal.inst.cfg index 7660043d51..a2c142eb9d 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.6_normal.inst.cfg index 0371972d42..6e04c36ddc 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.6_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = 0 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.8_normal.inst.cfg index 8fd4c747c4..f5d50dc4e2 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -1 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg index f03f8ca03d..f9a39d1dc9 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 @@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 40) speed_wall_x = =math.ceil(speed_print * 38 / 40) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25 support_xy_distance = 0.6 support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg index 40e8daa71f..16b94257a1 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 @@ -33,7 +33,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 40) speed_wall_x = =math.ceil(speed_print * 35 / 40) support_angle = 45 support_enable = True -support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25 +support_infill_rate = =0 if support_enable and support_structure == 'tree' else 25 support_xy_distance = 0.65 support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg index 35ce420405..f925cbe3fb 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 @@ -14,8 +14,8 @@ variant = 0.6 mm [values] adhesion_type = brim brim_line_count = 20 -cool_fan_speed = 60 -cool_fan_speed_min = =cool_fan_speed * 35 / 60 +cool_fan_speed = 80 +cool_fan_speed_min = =cool_fan_speed cool_min_speed = 15 infill_sparse_density = 10 layer_0_z_overlap = 0.12 diff --git a/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg index 54ff2680c2..e33efe544b 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg index 882aedcad3..82d198fcfd 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg index dce1c0e717..cf3add925f 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg index 4fb4a75c4b..9035cf8182 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg new file mode 100644 index 0000000000..1a54a96772 --- /dev/null +++ b/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Fine +definition = ultimaker3 + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = 0 +material = generic_petg +variant = AA 0.25 + +[values] +retraction_extrusion_window = 0.5 +speed_infill = =math.ceil(speed_print * 40 / 55) +speed_topbottom = =math.ceil(speed_print * 30 / 55) +top_bottom_thickness = 0.8 +wall_thickness = 0.92 +material_print_temperature = =default_material_print_temperature - 5 +retraction_combing_max_distance = 8 +retraction_combing = all diff --git a/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg index 2a7281aa86..5dd39bc2b0 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg index d9da25f43d..5a7f5eae90 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg index 97426aa53b..e654e6cb98 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg index 43ede99cf0..eca798c787 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg index ac1973de22..00bf855b3c 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg index 9c9aae3faf..e2fdc7b5d6 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg index f27c13c055..b47fb56953 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg index a5a9b5a7cc..d1bae36b9d 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg index 44dca1bea5..21e3233a35 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg index 3dac347328..e1444db297 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg index 6587b88246..ece9c09fa9 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg index e05ebc0309..091d77f743 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg index e222cb15a9..d845b1629f 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg index 830483435e..bac4e38b36 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg index 47cb11b7d0..bc223b4c94 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg index e86723c4cd..5a69df1f29 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg index 4a43ff7ed4..dd9843687b 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg index ee622c0de6..8bbe73fe6a 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg index f0228f3653..e83128b91f 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg index 1ec6c5cbec..cb65967138 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg index 008aa8065c..d21492ef6c 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg index 7672e5bda0..e7169ffcda 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg index b9987023c8..fc834e55cc 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg index 1759547388..b4d267c47e 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg index 5bd5db2a57..43d0f08be9 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg index 077f9b6cce..fb96b45dcf 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg new file mode 100644 index 0000000000..f629b0c15d --- /dev/null +++ b/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg @@ -0,0 +1,27 @@ +[general] +version = 4 +name = Fast +definition = ultimaker3 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +material = generic_petg +variant = AA 0.4 + +[values] +material_print_temperature = =default_material_print_temperature + 5 +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature - 5 +material_standby_temperature = 100 +skin_overlap = 20 +speed_print = 60 +speed_layer_0 = =math.ceil(speed_print * 20 / 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) +wall_thickness = 1 +retraction_combing_max_distance = 8 +retraction_combing = all diff --git a/resources/quality/ultimaker3/um3_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PETG_Fast_Print.inst.cfg new file mode 100644 index 0000000000..7bacf4dba5 --- /dev/null +++ b/resources/quality/ultimaker3/um3_aa0.4_PETG_Fast_Print.inst.cfg @@ -0,0 +1,27 @@ +[general] +version = 4 +name = Normal +definition = ultimaker3 + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -1 +material = generic_petg +variant = AA 0.4 + +[values] +cool_min_speed = 7 +material_print_temperature = =default_material_print_temperature +material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 +material_standby_temperature = 100 +speed_print = 60 +speed_layer_0 = =math.ceil(speed_print * 20 / 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) +speed_infill = =math.ceil(speed_print * 50 / 60) +retraction_combing_max_distance = 8 +retraction_combing = all diff --git a/resources/quality/ultimaker3/um3_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PETG_Normal_Quality.inst.cfg new file mode 100644 index 0000000000..ff4f8c1a05 --- /dev/null +++ b/resources/quality/ultimaker3/um3_aa0.4_PETG_Normal_Quality.inst.cfg @@ -0,0 +1,27 @@ +[general] +version = 4 +name = Fine +definition = ultimaker3 + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = 0 +material = generic_petg +variant = AA 0.4 + +[values] +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_print_temperature = =default_material_print_temperature - 5 +material_initial_print_temperature = =material_print_temperature - 10 +material_final_print_temperature = =material_print_temperature - 15 +material_standby_temperature = 100 +speed_print = 55 +speed_layer_0 = =math.ceil(speed_print * 20 / 55) +speed_topbottom = =math.ceil(speed_print * 30 / 55) +speed_wall = =math.ceil(speed_print * 30 / 55) +speed_infill = =math.ceil(speed_print * 45 / 55) +retraction_combing_max_distance = 8 +retraction_combing = all diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg index 40229a6cf9..61f0ecb42e 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg index 1f4b90c032..b865a7f82e 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg index e9784b98b5..e1c550bb41 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg index 833ec1a6ad..aa390b3177 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg index 453278848f..cb3984e980 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg index e7c5aac672..be72b03a87 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg index df74562ec3..615ecc9c4a 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg index 916e0fe34b..948c0ec259 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg index 215da5e01b..cecd872cc2 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg index 9bf2067b34..d7e051ef77 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg index 4e9888a519..edbb182c8a 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg index 30bd7504de..1926213e79 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg index 9f15dcde7b..99e71d51ea 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg index c1f6a65dde..7ca9e87d04 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg index fde76bd549..7e083a5725 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg index 80055aee28..8d594b37c8 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg index aa3ca74f86..674c6e531e 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg index 7dff129431..4990be4a9b 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg index babe132300..3871de17c6 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg index a5271f2048..49d152beb7 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg index 25010bfb09..19033acb9f 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg index 3c89c8c695..f8b9490904 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg index ed6c3a8562..ea817a1250 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg index e98ff0c50e..64c618cb8e 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg index 7d7f616359..90c267578f 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg index 2815b11ebf..1990e3dc58 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg index 1c4c3703f8..f420d27026 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg index d5959e653f..6e459423ca 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg new file mode 100644 index 0000000000..a52b0bf923 --- /dev/null +++ b/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Fast +definition = ultimaker3 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +material = generic_petg +variant = AA 0.8 + +[values] +brim_width = 7 +line_width = =machine_nozzle_size * 0.875 +material_print_temperature = =default_material_print_temperature - 5 +material_standby_temperature = 100 +prime_tower_enable = True +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 25 / 40) +speed_wall = =math.ceil(speed_print * 30 / 40) +retraction_combing_max_distance = 8 +retraction_combing = all diff --git a/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg new file mode 100644 index 0000000000..fee09b164b --- /dev/null +++ b/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Sprint +definition = ultimaker3 + +[metadata] +setting_version = 17 +type = quality +quality_type = superdraft +weight = -4 +material = generic_petg +variant = AA 0.8 + +[values] +brim_width = 7 +layer_height = 0.4 +line_width = =machine_nozzle_size * 0.875 +material_print_temperature = =default_material_print_temperature - 5 +material_standby_temperature = 100 +prime_tower_enable = True +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 30 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +retraction_combing_max_distance = 8 +retraction_combing = all diff --git a/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg new file mode 100644 index 0000000000..c6281c5369 --- /dev/null +++ b/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Extra Fast +definition = ultimaker3 + +[metadata] +setting_version = 17 +type = quality +quality_type = verydraft +weight = -3 +material = generic_petg +variant = AA 0.8 + +[values] +brim_width = 7 +layer_height = 0.3 +line_width = =machine_nozzle_size * 0.875 +material_print_temperature = =default_material_print_temperature - 5 +material_standby_temperature = 100 +prime_tower_enable = True +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 25 / 40) +speed_wall = =math.ceil(speed_print * 30 / 40) +retraction_combing_max_distance = 8 +retraction_combing = all diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg index b7c35551cf..58ee629112 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg index 14b978bf2d..ce7940f251 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg index 7f5b66ef63..412378b689 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg index 9e72749c56..6b15dace64 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg index 8af35bb3a5..6fdc537ec8 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg index a63ef5b0d4..1bd7f19da9 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg index 6aa68cb374..af1c584841 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg index f365c47aa2..6c6a523ed8 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg index 97c8c60b7c..ef89c818aa 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg index dd54fde24c..ee82c4656b 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg index 520bea01b0..795ab3be41 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg index 022cc4c8fd..07cfb23955 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg index da13576992..2b3f9f0a95 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg index 424eb537eb..699bc8d8f0 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg index cd98a41418..b4a90dc634 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg index d46eeb1ce5..81c38f57ab 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg index 5c02ee6f2b..d68ff9e4fc 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg index 0bde76869e..b448811253 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg index 13eec91bdc..a666f4c7c2 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg index 271b33383d..f4447806be 100644 --- a/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg index 95926f3858..7f81dd2f55 100644 --- a/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg index dba397b207..beaf9cec46 100644 --- a/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg index 29ea49e196..bd7ff99ad7 100644 --- a/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg index 384faa8a40..c96b100241 100644 --- a/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg index 0aa3ed6699..8548513910 100644 --- a/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg index 01badb1bdf..db81bbe679 100644 --- a/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Coarse Quality definition = ultimaker_original [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = coarse weight = -3 diff --git a/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg index 346b330c2c..3ed769bf8a 100644 --- a/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = ultimaker_original [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg index 80b72892d7..3d68b7916f 100644 --- a/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Coarse Quality definition = ultimaker_original [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extra coarse weight = -4 diff --git a/resources/quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg index 03e8c89cf2..c4fe5beff2 100644 --- a/resources/quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_original [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg index b9a409f0c8..ab12950bf7 100644 --- a/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_original [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_original/umo_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Normal_Quality.inst.cfg index a5d2ff3a36..07168ef802 100644 --- a/resources/quality/ultimaker_original/umo_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_original [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg index d711de8fc8..f95f827f55 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg index 705cc015df..43be843e4e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg index 08a27aa3b4..13e74a1451 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 @@ -19,7 +19,7 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 ooze_shield_angle = 40 raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) +raft_airgap = 0.4 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 3) raft_jerk = =jerk_layer_0 raft_margin = 10 @@ -33,6 +33,5 @@ switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 wall_line_width_x = =wall_line_width -raft_airgap = 0.4 raft_surface_speed = 45 speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg index 57dba029d6..4688116e5a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg new file mode 100644 index 0000000000..2617a43fbe --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Fine +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = 0 +material = generic_petg +variant = AA 0.25 + +[values] +retraction_combing_max_distance = 8 +retraction_extrusion_window = 0.5 +speed_infill = =math.ceil(speed_print * 40 / 55) +speed_topbottom = =math.ceil(speed_print * 30 / 55) +top_bottom_thickness = 0.8 +wall_thickness = 0.92 +initial_layer_line_width_factor = 100 +infill_before_walls = true +material_print_temperature = =default_material_print_temperature - 5 \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg index 99c1b88304..b6f28649e7 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg index 10a38da284..e4744aa80f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg index ce4ab73f01..ef17d87895 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg index 9a8ed386c0..116ad91bed 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 @@ -20,7 +20,7 @@ material_final_print_temperature = =material_print_temperature - 20 prime_tower_enable = False skin_overlap = 20 speed_print = 60 -speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_layer_0 = 10 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) @@ -30,4 +30,3 @@ infill_line_width = =round(line_width * 0.4 / 0.35, 2) speed_infill = =math.ceil(speed_print * 50 / 60) raft_airgap = 0.15 -speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg index 615e8cc487..1af262d98d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 @@ -20,7 +20,7 @@ material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 prime_tower_enable = False speed_print = 60 -speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_layer_0 = 10 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) @@ -29,4 +29,3 @@ infill_line_width = =round(line_width * 0.4 / 0.35, 2) speed_infill = =math.ceil(speed_print * 45 / 60) raft_airgap = 0.15 -speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg index 10149781cb..903143d422 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 @@ -20,7 +20,7 @@ material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 prime_tower_enable = False speed_print = 50 -speed_layer_0 = =math.ceil(speed_print * 20 / 50) +speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) @@ -28,4 +28,3 @@ infill_line_width = =round(line_width * 0.4 / 0.35, 2) speed_infill = =math.ceil(speed_print * 40 / 50) raft_airgap = 0.15 -speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg index 137a316f14..d2d5b0d598 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 @@ -19,7 +19,7 @@ material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 prime_tower_enable = False speed_print = 55 -speed_layer_0 = =math.ceil(speed_print * 20 / 55) +speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) @@ -27,4 +27,3 @@ infill_line_width = =round(line_width * 0.4 / 0.35, 2) speed_infill = =math.ceil(speed_print * 40 / 55) raft_airgap = 0.15 -speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg index ac8d13beed..5a955c20a2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg index cb76875ef1..0d2975af52 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg index 632bf4ae66..083f0dabf1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg index 6067cb1ba2..db9339b7a1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg index a43baa7587..f58fdab115 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg index 25c1388fc2..9264ff5707 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg index 057a149c6b..b367521994 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg index f09c922d32..5517ee4006 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg index 36c0d3b813..47ccd64594 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg index 62d312dc9b..8782dcd835 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg index 45772626dc..e5205cb2b5 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg index f98d5c5d70..d4fd3889eb 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 @@ -23,13 +23,13 @@ material_final_print_temperature = =material_print_temperature - 10 material_standby_temperature = 100 ooze_shield_angle = 40 raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) +raft_airgap = 0.4 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_jerk = =jerk_layer_0 raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) skin_overlap = 50 -speed_layer_0 = =math.ceil(speed_print * 20 / 70) +speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 @@ -37,6 +37,4 @@ wall_line_width_x = =wall_line_width jerk_travel = 50 -raft_airgap = 0.4 raft_surface_speed = 45 -speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg index 9e4d40bcf3..46a3b69710 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 @@ -23,13 +23,13 @@ material_final_print_temperature = =material_print_temperature - 10 material_standby_temperature = 100 ooze_shield_angle = 40 raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) +raft_airgap = 0.4 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_jerk = =jerk_layer_0 raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) skin_overlap = 50 -speed_layer_0 = =math.ceil(speed_print * 20 / 70) +speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 @@ -37,6 +37,4 @@ wall_line_width_x = =wall_line_width jerk_travel = 50 -raft_airgap = 0.4 raft_surface_speed = 45 -speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg index 755127b66f..671765214c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 @@ -22,13 +22,13 @@ material_final_print_temperature = =material_print_temperature - 10 material_standby_temperature = 100 ooze_shield_angle = 40 raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) +raft_airgap = 0.4 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_jerk = =jerk_layer_0 raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) skin_overlap = 50 -speed_layer_0 = =math.ceil(speed_print * 20 / 70) +speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 @@ -36,6 +36,4 @@ wall_line_width_x = =wall_line_width jerk_travel = 50 -raft_airgap = 0.4 raft_surface_speed = 45 -speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg index 26f0b52f91..4e8dd5890b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 @@ -22,13 +22,13 @@ material_final_print_temperature = =material_print_temperature - 10 material_standby_temperature = 100 ooze_shield_angle = 40 raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) +raft_airgap = 0.4 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_jerk = =jerk_layer_0 raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) skin_overlap = 50 -speed_layer_0 = =math.ceil(speed_print * 20 / 70) +speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 @@ -36,6 +36,4 @@ wall_line_width_x = =wall_line_width jerk_travel = 50 -raft_airgap = 0.4 raft_surface_speed = 45 -speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg index 89aeed7e44..3fe24433d4 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg index 18fc078655..deb45a4716 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg index 92cbf5d7a9..8e57e274d9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg index 491430de2c..6f863051cd 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg new file mode 100644 index 0000000000..6b89810bf1 --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +material = generic_petg +variant = AA 0.4 + +[values] +material_print_temperature = =default_material_print_temperature + 5 +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature - 5 +retraction_combing_max_distance = 8 +skin_overlap = 20 +speed_print = 60 +speed_layer_0 = =math.ceil(speed_print * 20 / 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) +wall_thickness = 1 + + +infill_pattern = triangles +speed_infill = =math.ceil(speed_print * 50 / 60) +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg new file mode 100644 index 0000000000..5d370e4f4b --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg @@ -0,0 +1,28 @@ +[general] +version = 4 +name = Normal +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -1 +material = generic_petg +variant = AA 0.4 + +[values] +cool_min_speed = 7 +material_print_temperature = =default_material_print_temperature +material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 +retraction_combing_max_distance = 8 +speed_print = 60 +speed_layer_0 = =math.ceil(speed_print * 20 / 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) + +infill_pattern = triangles +speed_infill = =math.ceil(speed_print * 50 / 60) +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg new file mode 100644 index 0000000000..a4c38784bc --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg @@ -0,0 +1,29 @@ +[general] +version = 4 +name = Extra Fine +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = quality +quality_type = high +weight = 1 +material = generic_petg +variant = AA 0.4 + +[values] +cool_min_speed = 12 +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_print_temperature = =default_material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 10 +material_final_print_temperature = =material_print_temperature - 15 +retraction_combing_max_distance = 8 +speed_print = 50 +speed_layer_0 = =math.ceil(speed_print * 20 / 50) +speed_topbottom = =math.ceil(speed_print * 30 / 50) +speed_wall = =math.ceil(speed_print * 30 / 50) + +infill_pattern = triangles +speed_infill = =math.ceil(speed_print * 40 / 50) +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg new file mode 100644 index 0000000000..2f48f82fa0 --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg @@ -0,0 +1,28 @@ +[general] +version = 4 +name = Fine +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = 0 +material = generic_petg +variant = AA 0.4 + +[values] +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_print_temperature = =default_material_print_temperature - 5 +material_initial_print_temperature = =material_print_temperature - 10 +material_final_print_temperature = =material_print_temperature - 15 +retraction_combing_max_distance = 8 +speed_print = 55 +speed_layer_0 = =math.ceil(speed_print * 20 / 55) +speed_topbottom = =math.ceil(speed_print * 30 / 55) +speed_wall = =math.ceil(speed_print * 30 / 55) + +infill_pattern = triangles +speed_infill = =math.ceil(speed_print * 45 / 55) +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg index c5613e0f49..83b6b9631a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 @@ -20,7 +20,7 @@ material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 prime_tower_enable = False skin_overlap = 20 -speed_layer_0 = =math.ceil(speed_print * 20 / 70) +speed_layer_0 = 10 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) @@ -35,4 +35,3 @@ acceleration_wall = 2000 acceleration_wall_0 = 2000 raft_airgap = 0.25 -speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg index 17967f923c..3f1b10e5a5 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 @@ -19,7 +19,7 @@ machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 prime_tower_enable = False speed_print = 70 -speed_layer_0 = =math.ceil(speed_print * 20 / 70) +speed_layer_0 = 10 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) @@ -31,4 +31,3 @@ infill_line_width = =round(line_width * 0.42 / 0.35, 2) layer_height_0 = 0.2 raft_airgap = 0.25 -speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg index 1c271f6af1..d315355316 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 @@ -22,7 +22,7 @@ material_standby_temperature = 100 prime_tower_enable = False skin_overlap = 10 speed_print = 50 -speed_layer_0 = =math.ceil(speed_print * 20 / 50) +speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 35 / 50) top_bottom_thickness = 1 @@ -33,4 +33,3 @@ infill_line_width = =round(line_width * 0.42 / 0.35, 2) layer_height_0 = 0.2 raft_airgap = 0.25 -speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg index 0aae33c115..cfdc666561 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 @@ -20,7 +20,7 @@ machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 prime_tower_enable = False skin_overlap = 10 -speed_layer_0 = =math.ceil(speed_print * 20 / 70) +speed_layer_0 = 10 top_bottom_thickness = 1 wall_thickness = 1 @@ -29,4 +29,3 @@ infill_line_width = =round(line_width * 0.42 / 0.35, 2) layer_height_0 = 0.2 raft_airgap = 0.25 -speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg index 80a6b0a3b2..f526aedeeb 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg index e4053a8ab2..7c9c4f9331 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg index ff6608664a..34f91ec505 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg index ef7439dcc4..cbded5073a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg index 3c75cc3071..9f08095a74 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg index 3ee53c0861..746be00a1e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg index 4dc4f9ec82..2f2216e735 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg index 6afcb68c6a..3039cdc443 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg index fc8e8a36be..cd57a6dc4d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg index 22718d782a..65fead2c77 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg index 4278a6ef68..3f3cba64df 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg index 3c27443d77..5e31148f27 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg index 8b61c706a5..bcab838f25 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg index 30650796e1..acb2956ba0 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg index 7600d786cb..5172e47945 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg index 2337c0ecdd..d4a24e5eda 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg index ff606c48fe..7a6d3e2a80 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg index 672b84ba4d..b617af05b6 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg index 48e90fb513..3aae5688f2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg index fb7b8420de..ec212ad66e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg index 10d127a2eb..2c076ff813 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg index c94cc67b42..d63d9feb60 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg index a67e2bcee1..c6f3be366d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg index a80ec126a8..26cf831350 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg index a02837146e..2adf259845 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg new file mode 100644 index 0000000000..da6d3a34db --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg @@ -0,0 +1,27 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +material = generic_petg +variant = AA 0.8 + +[values] +brim_width = 7 +line_width = =machine_nozzle_size * 0.875 +material_print_temperature = =default_material_print_temperature - 5 +material_standby_temperature = 100 +prime_tower_enable = True +retraction_combing_max_distance = 8 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 25 / 40) +speed_wall = =math.ceil(speed_print * 30 / 40) +jerk_travel = 50 +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 +infill_before_walls = true \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg new file mode 100644 index 0000000000..ca29c2e9cc --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -0,0 +1,28 @@ +[general] +version = 4 +name = Sprint +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = quality +quality_type = superdraft +weight = -4 +material = generic_petg +variant = AA 0.8 + +[values] +brim_width = 7 +line_width = =machine_nozzle_size * 0.875 +material_print_temperature = =default_material_print_temperature - 5 +material_standby_temperature = 100 +prime_tower_enable = True +retraction_combing_max_distance = 8 +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 30 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +jerk_travel = 50 +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 +infill_before_walls = true \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg new file mode 100644 index 0000000000..adfe9566e1 --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -0,0 +1,28 @@ +[general] +version = 4 +name = Extra Fast +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = quality +quality_type = verydraft +weight = -3 +material = generic_petg +variant = AA 0.8 + +[values] +brim_width = 7 +line_width = =machine_nozzle_size * 0.875 +material_print_temperature = =default_material_print_temperature - 5 +material_standby_temperature = 100 +prime_tower_enable = True +retraction_combing_max_distance = 8 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 25 / 40) +speed_wall = =math.ceil(speed_print * 30 / 40) +jerk_travel = 50 +cool_fan_speed = 20 +layer_height_0 = 0.27 +initial_layer_line_width_factor = 100 +infill_before_walls = true diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg index 4da6edfe09..032fb460ac 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg index 70669967e7..7e48c54c99 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg index 7e751f971c..aa8af68fda 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg index 11eabbc98d..f153052075 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg index 91b6511783..d80bdf2400 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg index 2c1617a1e1..57802d961a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg index 9482e22f30..b10c37c7bd 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg index e88c66c180..a086b13b0d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg index 1384d85108..47cd2201b8 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg index 3d4eca3f3b..fa261a74f4 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg index c7c41e82b6..79803399f0 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg index 443bd49225..ec5dd72392 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg index a641331337..c9878078a9 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg index 46332989bb..204dcec1db 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg index af8e10e76a..0229422380 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg index 186901179e..9e3a8fa99f 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg index b0c8e93142..25298ed621 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg index b1a9c3ab9d..2102b5c07d 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg index 0aecb35ddf..27bebd0e58 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg new file mode 100644 index 0000000000..47eea46ca2 --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +material = generic_cffcpe +variant = CC 0.4 + +[values] +adhesion_type = skirt +cool_fan_enabled = True +cool_min_layer_time = 7 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 6 +infill_line_width = =line_width +initial_layer_line_width_factor = 130.0 +line_width = =machine_nozzle_size +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_standby_temperature = 100 +skin_overlap = 20 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +wall_line_width_x = =line_width diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg new file mode 100644 index 0000000000..af41302428 --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Normal +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -2 +material = generic_cffcpe +variant = CC 0.4 + +[values] +adhesion_type = skirt +cool_fan_enabled = True +cool_min_layer_time = 7 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 6 +infill_line_width = =line_width +initial_layer_line_width_factor = 130.0 +line_width = =machine_nozzle_size +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_standby_temperature = 100 +skin_overlap = 20 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +wall_line_width_x = =line_width diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg new file mode 100644 index 0000000000..c9200fc7b4 --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +material = generic_cffpa +variant = CC 0.4 + +[values] +adhesion_type = skirt +cool_fan_enabled = True +cool_min_layer_time = 7 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 6 +infill_line_width = =line_width +initial_layer_line_width_factor = 130.0 +line_width = =machine_nozzle_size +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_standby_temperature = 100 +skin_overlap = 20 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +wall_line_width_x = =line_width diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg new file mode 100644 index 0000000000..55894e6671 --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Normal +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -2 +material = generic_cffpa +variant = CC 0.4 + +[values] +adhesion_type = skirt +cool_fan_enabled = True +cool_min_layer_time = 7 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 6 +infill_line_width = =line_width +initial_layer_line_width_factor = 130.0 +line_width = =machine_nozzle_size +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_standby_temperature = 100 +skin_overlap = 20 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +wall_line_width_x = =line_width diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg new file mode 100644 index 0000000000..137cac4578 --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +material = generic_gffcpe +variant = CC 0.4 + +[values] +adhesion_type = brim +cool_fan_enabled = True +cool_min_layer_time = 7 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 6 +infill_line_width = =line_width +initial_layer_line_width_factor = 130.0 +line_width = =machine_nozzle_size +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_standby_temperature = 100 +skin_overlap = 20 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +wall_line_width_x = =line_width diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg new file mode 100644 index 0000000000..8f71778f53 --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Normal +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -2 +material = generic_gffcpe +variant = CC 0.4 + +[values] +adhesion_type = brim +cool_fan_enabled = True +cool_min_layer_time = 7 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 6 +infill_line_width = =line_width +initial_layer_line_width_factor = 130.0 +line_width = =machine_nozzle_size +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_standby_temperature = 100 +skin_overlap = 20 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +wall_line_width_x = =line_width diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg new file mode 100644 index 0000000000..b761989d41 --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +material = generic_gffpa +variant = CC 0.4 + +[values] +adhesion_type = brim +cool_fan_enabled = True +cool_min_layer_time = 7 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 6 +infill_line_width = =line_width +initial_layer_line_width_factor = 130.0 +line_width = =machine_nozzle_size +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_standby_temperature = 100 +skin_overlap = 20 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +wall_line_width_x = =line_width diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg new file mode 100644 index 0000000000..49c9f990fc --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Normal +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -2 +material = generic_gffpa +variant = CC 0.4 + +[values] +adhesion_type = brim +cool_fan_enabled = True +cool_min_layer_time = 7 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 6 +infill_line_width = =line_width +initial_layer_line_width_factor = 130.0 +line_width = =machine_nozzle_size +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_standby_temperature = 100 +skin_overlap = 20 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +wall_line_width_x = =line_width diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg new file mode 100644 index 0000000000..0b159caaae --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg @@ -0,0 +1,43 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -3 +material = generic_pla +variant = CC 0.4 +is_experimental = True + +[values] +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_fan_speed_max = =100 +cool_min_speed = 2 +gradual_infill_step_height = =3 * layer_height +infill_line_width = =round(line_width * 0.65 / 0.75, 2) +infill_pattern = triangles +line_width = =machine_nozzle_size +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_final_print_temperature = =max(-273.15, material_print_temperature - 15) +material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_print_temperature = =default_material_print_temperature + 10 +material_standby_temperature = 100 +prime_tower_enable = True +retract_at_layer_change = False +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_x = =speed_wall +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +support_angle = 70 +support_line_width = =line_width * 0.75 +support_pattern = ='triangles' +support_xy_distance = =wall_line_width_0 * 1.5 +top_bottom_thickness = =layer_height * 4 +wall_line_width = =round(line_width * 0.75 / 0.75, 2) +wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) +wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg new file mode 100644 index 0000000000..bc66356818 --- /dev/null +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg @@ -0,0 +1,43 @@ +[general] +version = 4 +name = Normal +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -2 +material = generic_pla +variant = CC 0.4 +is_experimental = True + +[values] +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_fan_speed_max = =100 +cool_min_speed = 2 +gradual_infill_step_height = =3 * layer_height +infill_line_width = =round(line_width * 0.65 / 0.75, 2) +infill_pattern = triangles +line_width = =machine_nozzle_size +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_final_print_temperature = =max(-273.15, material_print_temperature - 15) +material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_print_temperature = =default_material_print_temperature + 10 +material_standby_temperature = 100 +prime_tower_enable = True +retract_at_layer_change = False +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_x = =speed_wall +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +support_angle = 70 +support_line_width = =line_width * 0.75 +support_pattern = ='triangles' +support_xy_distance = =wall_line_width_0 * 1.5 +top_bottom_thickness = =layer_height * 4 +wall_line_width = =round(line_width * 0.75 / 0.75, 2) +wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) +wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg index 3e5076991f..181c0c3b00 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg index e8feb6208b..cc0fcf4b57 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg index 3a785456b2..9b8ed176dc 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg index f7bee52c43..a971c9a424 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg index ba0661e399..d6a178208d 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -3 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg index 61c70ddb9e..4ebd0bc401 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Draft_Quality.inst.cfg index c57ab48382..c558a3d796 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg index 60055e1647..58f2e334f0 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg index 1326f3b1ee..cba9f9509b 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg index 155c48fe5d..1683f2cd0b 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_global_Superdraft_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Superdraft_Quality.inst.cfg index 456aadfdad..12d39c8c0a 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Superdraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Superdraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s3/um_s3_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Verydraft_Quality.inst.cfg index 1ca4950e7f..075a1fe520 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg index c602e076f7..b64a7bcad1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg index 3cc29c5e6b..9350fcc1cb 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg index 5c5ff16348..8557325517 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg index bb3266c30b..beb1524922 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg new file mode 100644 index 0000000000..8c6f6adf61 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg @@ -0,0 +1,23 @@ +[general] +version = 4 +name = Fine +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = 0 +material = generic_petg +variant = AA 0.25 + +[values] +retraction_combing_max_distance = 8 +retraction_extrusion_window = 0.5 +speed_infill = =math.ceil(speed_print * 40 / 55) +speed_topbottom = =math.ceil(speed_print * 30 / 55) +top_bottom_thickness = 0.8 +wall_thickness = 0.92 +initial_layer_line_width_factor = 100 +infill_before_walls = true +material_print_temperature = =default_material_print_temperature - 5 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg index 2df5de17af..24af92d4bf 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg index 6c578d0517..70e12cb59e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine - Experimental definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg index bbec7fe1ad..7c24d2457a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg index 193e6de18b..051f4fa66d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 @@ -20,7 +20,7 @@ material_final_print_temperature = =material_print_temperature - 20 prime_tower_enable = False skin_overlap = 20 speed_print = 60 -speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_layer_0 = 10 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) @@ -30,4 +30,3 @@ infill_line_width = =round(line_width * 0.4 / 0.35, 2) speed_infill = =math.ceil(speed_print * 50 / 60) raft_airgap = 0.15 -speed_layer_0 = 10 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg index 1aae14fe6b..0533b0b5a4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 @@ -20,7 +20,7 @@ material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 prime_tower_enable = False speed_print = 60 -speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_layer_0 = 10 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) @@ -29,4 +29,3 @@ infill_line_width = =round(line_width * 0.4 / 0.35, 2) speed_infill = =math.ceil(speed_print * 45 / 60) raft_airgap = 0.15 -speed_layer_0 = 10 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg index 1c57587309..3f89d6c781 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 @@ -20,7 +20,7 @@ material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 prime_tower_enable = False speed_print = 50 -speed_layer_0 = =math.ceil(speed_print * 20 / 50) +speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) @@ -28,4 +28,3 @@ infill_line_width = =round(line_width * 0.4 / 0.35, 2) speed_infill = =math.ceil(speed_print * 40 / 50) raft_airgap = 0.15 -speed_layer_0 = 10 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg index ec2819cf93..e888afc296 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 @@ -19,11 +19,10 @@ material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 prime_tower_enable = False speed_print = 55 -speed_layer_0 = =math.ceil(speed_print * 20 / 55) +speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) infill_line_width = =round(line_width * 0.4 / 0.35, 2) speed_infill = =math.ceil(speed_print * 40 / 55) raft_airgap = 0.15 -speed_layer_0 = 10 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg index 45c5258655..3e6d895fe4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg index 39958c8abe..da61b269a5 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg index 6b8db228a9..57f591e025 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg index 9cf6804301..810fcda222 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg index 940a2cf4fd..29257ab771 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg index be65f2734d..1aa2cada17 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg index 4fb4f3c8ca..bdd977e4cc 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg index f5f4dbe092..2ce4cf7c2c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg index aa4f197735..cc011a92d6 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg index 25b721bbe7..59f14f480d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg index 0853a7d437..639ebb0fce 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg index 0f1f2c872b..776b098ba8 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 @@ -23,19 +23,17 @@ material_final_print_temperature = =material_print_temperature - 10 material_standby_temperature = 100 ooze_shield_angle = 40 raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) +raft_airgap = 0.4 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_jerk = =jerk_layer_0 raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) skin_overlap = 50 -speed_layer_0 = =math.ceil(speed_print * 20 / 70) +speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 wall_line_width_x = =wall_line_width jerk_travel = 50 -raft_airgap = 0.4 raft_surface_speed = 45 -speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg index d3e3e43830..7d5d4492da 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 @@ -23,19 +23,17 @@ material_final_print_temperature = =material_print_temperature - 10 material_standby_temperature = 100 ooze_shield_angle = 40 raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) +raft_airgap = 0.4 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_jerk = =jerk_layer_0 raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) skin_overlap = 50 -speed_layer_0 = =math.ceil(speed_print * 20 / 70) +speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 wall_line_width_x = =wall_line_width jerk_travel = 50 -raft_airgap = 0.4 raft_surface_speed = 45 -speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg index 4a838d3b02..d67106e567 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 @@ -22,19 +22,17 @@ material_final_print_temperature = =material_print_temperature - 10 material_standby_temperature = 100 ooze_shield_angle = 40 raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) +raft_airgap = 0.4 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_jerk = =jerk_layer_0 raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) skin_overlap = 50 -speed_layer_0 = =math.ceil(speed_print * 20 / 70) +speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 wall_line_width_x = =wall_line_width jerk_travel = 50 -raft_airgap = 0.4 raft_surface_speed = 45 -speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg index 8c86a63b0b..4c66ccd167 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 @@ -22,19 +22,17 @@ material_final_print_temperature = =material_print_temperature - 10 material_standby_temperature = 100 ooze_shield_angle = 40 raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) +raft_airgap = 0.4 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_jerk = =jerk_layer_0 raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) skin_overlap = 50 -speed_layer_0 = =math.ceil(speed_print * 20 / 70) +speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 wall_line_width_x = =wall_line_width jerk_travel = 50 -raft_airgap = 0.4 raft_surface_speed = 45 -speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg index 0814e94810..b1d02ebaf9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg index 0854848b89..3de2fcff20 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg index 0ce829e978..9dbbc26b92 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg index 750156166c..c4fea005ab 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg new file mode 100644 index 0000000000..a0e9583330 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +material = generic_petg +variant = AA 0.4 + +[values] +material_print_temperature = =default_material_print_temperature + 5 +material_initial_print_temperature = =material_print_temperature +material_final_print_temperature = =material_print_temperature - 5 +retraction_combing_max_distance = 8 +skin_edge_support_thickness = =0.8 if infill_sparse_density < 30 else 0 +skin_overlap = 20 +speed_print = 60 +speed_layer_0 = =math.ceil(speed_print * 20 / 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) +top_thickness = =0.8 if infill_sparse_density < 30 and skin_edge_support_thickness == 0.8 else top_bottom_thickness +wall_thickness = 1 + +infill_pattern = triangles +speed_infill = =math.ceil(speed_print * 50 / 60) +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg new file mode 100644 index 0000000000..2b6713aed4 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg @@ -0,0 +1,28 @@ +[general] +version = 4 +name = Normal +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -1 +material = generic_petg +variant = AA 0.4 + +[values] +cool_min_speed = 7 +material_print_temperature = =default_material_print_temperature +material_initial_print_temperature = =material_print_temperature - 5 +material_final_print_temperature = =material_print_temperature - 10 +retraction_combing_max_distance = 8 +speed_print = 60 +speed_layer_0 = =math.ceil(speed_print * 20 / 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) + +infill_pattern = triangles +speed_infill = =math.ceil(speed_print * 50 / 60) +initial_layer_line_width_factor = 100 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg new file mode 100644 index 0000000000..8e58a3be8e --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg @@ -0,0 +1,29 @@ +[general] +version = 4 +name = Extra Fine +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = quality +quality_type = high +weight = 1 +material = generic_petg +variant = AA 0.4 + +[values] +cool_min_speed = 12 +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_print_temperature = =default_material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 10 +material_final_print_temperature = =material_print_temperature - 15 +retraction_combing_max_distance = 8 +speed_print = 50 +speed_layer_0 = =math.ceil(speed_print * 20 / 50) +speed_topbottom = =math.ceil(speed_print * 30 / 50) +speed_wall = =math.ceil(speed_print * 30 / 50) + +infill_pattern = triangles +speed_infill = =math.ceil(speed_print * 40 / 50) +initial_layer_line_width_factor = 100 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg new file mode 100644 index 0000000000..f52b1a6023 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg @@ -0,0 +1,27 @@ +[general] +version = 4 +name = Fine +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = 0 +material = generic_petg +variant = AA 0.4 + +[values] +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +material_print_temperature = =default_material_print_temperature - 5 +material_initial_print_temperature = =material_print_temperature - 10 +material_final_print_temperature = =material_print_temperature - 15 +retraction_combing_max_distance = 8 +speed_print = 55 +speed_layer_0 = =math.ceil(speed_print * 20 / 55) +speed_topbottom = =math.ceil(speed_print * 30 / 55) +speed_wall = =math.ceil(speed_print * 30 / 55) +infill_pattern = triangles +speed_infill = =math.ceil(speed_print * 45 / 55) +initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg index 25235ba336..86a808cabb 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 @@ -21,7 +21,7 @@ material_standby_temperature = 100 prime_tower_enable = False skin_edge_support_thickness = =0.8 if infill_sparse_density < 30 else 0 skin_overlap = 20 -speed_layer_0 = =math.ceil(speed_print * 20 / 70) +speed_layer_0 = 10 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) @@ -35,4 +35,3 @@ layer_height_0 = 0.2 acceleration_wall = 2000 acceleration_wall_0 = 2000 raft_airgap = 0.25 -speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg index f9ed0bc62a..9a94b97028 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 @@ -19,7 +19,7 @@ machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 prime_tower_enable = False speed_print = 70 -speed_layer_0 = =math.ceil(speed_print * 20 / 70) +speed_layer_0 = 10 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) @@ -30,4 +30,3 @@ jerk_travel = 50 infill_line_width = =round(line_width * 0.42 / 0.35, 2) layer_height_0 = 0.2 raft_airgap = 0.25 -speed_layer_0 = 10 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg index 23042d0f23..b0ff7ddf55 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 @@ -22,7 +22,7 @@ material_standby_temperature = 100 prime_tower_enable = False skin_overlap = 10 speed_print = 50 -speed_layer_0 = =math.ceil(speed_print * 20 / 50) +speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 35 / 50) top_bottom_thickness = 1 @@ -32,4 +32,3 @@ jerk_travel = 50 infill_line_width = =round(line_width * 0.42 / 0.35, 2) layer_height_0 = 0.2 raft_airgap = 0.25 -speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg index c0414898af..7e456edaa8 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 @@ -20,7 +20,7 @@ machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 prime_tower_enable = False skin_overlap = 10 -speed_layer_0 = =math.ceil(speed_print * 20 / 70) +speed_layer_0 = 10 top_bottom_thickness = 1 wall_thickness = 1 @@ -28,4 +28,3 @@ jerk_travel = 50 infill_line_width = =round(line_width * 0.42 / 0.35, 2) layer_height_0 = 0.2 raft_airgap = 0.25 -speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg index 8a381b3a7f..f51da10121 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg index 8e3b8158c8..0e69f5c690 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg index 69fd7027fe..c343052560 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg index 06f73f5e01..1ee994d3c9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg index cbbc56f2f0..0c58eb3c3d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg index 6c54a1dd26..040aad4c7f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg index d45b97c8da..08cc0b932a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg index cec89da171..b6d250cb38 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg index 6d1be9be4b..3e4ae7c21b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg index b6169d4b6f..d2ad2229a0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg index 6bb11a164f..f282a02a0d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg index 0d25df24d1..6d1e555ada 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg index f66573f5e0..7b32a740c6 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg index 49d0260763..ffd6339ac7 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg index 1e940cb84f..c3e3229d9a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg index 1c44713688..1de7418ffc 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg index c084d04821..d019a82ea2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg index 4e6343fa4b..79b6545f1f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg index 6cd82d7dea..8025057884 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg index 0bdae89376..0e39b1f58e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg index b2dbe9a4dc..170e43a811 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg index 7396b12076..7d8bd681fa 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg index 613f4245da..58e87fcd63 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast - Experimental definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg index 6db4cb8d78..c5073fb76d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint - Experimental definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg index 0271da259c..e15399605b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast - Experimental definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg new file mode 100644 index 0000000000..40c7ab37b5 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg @@ -0,0 +1,27 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +material = generic_petg +variant = AA 0.8 + +[values] +brim_width = 7 +line_width = =machine_nozzle_size * 0.875 +material_print_temperature = =default_material_print_temperature - 5 +material_standby_temperature = 100 +prime_tower_enable = True +retraction_combing_max_distance = 8 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 25 / 40) +speed_wall = =math.ceil(speed_print * 30 / 40) +jerk_travel = 50 +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 +infill_before_walls = true \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg new file mode 100644 index 0000000000..5ccdde4c27 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -0,0 +1,28 @@ +[general] +version = 4 +name = Sprint +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = quality +quality_type = superdraft +weight = -4 +material = generic_petg +variant = AA 0.8 + +[values] +brim_width = 7 +line_width = =machine_nozzle_size * 0.875 +material_print_temperature = =default_material_print_temperature - 5 +material_standby_temperature = 100 +prime_tower_enable = True +retraction_combing_max_distance = 8 +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 30 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +jerk_travel = 50 +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 +infill_before_walls = true diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg new file mode 100644 index 0000000000..1a7c642630 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -0,0 +1,27 @@ +[general] +version = 4 +name = Extra Fast +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = quality +quality_type = verydraft +weight = -3 +material = generic_petg +variant = AA 0.8 + +[values] +brim_width = 7 +line_width = =machine_nozzle_size * 0.875 +material_print_temperature = =default_material_print_temperature - 5 +material_standby_temperature = 100 +prime_tower_enable = True +retraction_combing_max_distance = 8 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 25 / 40) +speed_wall = =math.ceil(speed_print * 30 / 40) +jerk_travel = 50 +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 +infill_before_walls = true diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg index 9135a3d628..1bbd71def3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg index c841754960..6bd6273181 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg index b1f335f6d3..7191e32cf4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg index 26bcf55021..5d27f4f326 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg index 8050a15142..330f9180d2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg index f759149031..f062068896 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg index e193607cbc..73c68015c1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg index 1b58abd05f..9b596875c3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg index 04594fe40d..496e93a34c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg index 90feb9ab37..0161516841 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg index 975df6944b..57f8e59466 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg index 6e9c70260f..473aca93dc 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg index c5deabd7f8..8be95c4084 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg index f0af2e630a..65f687ba47 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg index 42c7398853..26c158a3f6 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg index c4cb1a8649..a2ab10fc8a 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg index 51e6faedb5..59e69a3ca0 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg index 4883ce0905..9e6f8e406e 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg index a397282562..8e56e5d9fe 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg new file mode 100644 index 0000000000..374bcf6426 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +material = generic_cffcpe +variant = CC 0.4 + +[values] +adhesion_type = skirt +cool_fan_enabled = True +cool_min_layer_time = 7 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 6 +infill_line_width = =line_width +initial_layer_line_width_factor = 130.0 +line_width = =machine_nozzle_size +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_standby_temperature = 100 +skin_overlap = 20 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +wall_line_width_x = =line_width diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg new file mode 100644 index 0000000000..f0469adc00 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Normal +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -2 +material = generic_cffcpe +variant = CC 0.4 + +[values] +adhesion_type = skirt +cool_fan_enabled = True +cool_min_layer_time = 7 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 6 +infill_line_width = =line_width +initial_layer_line_width_factor = 130.0 +line_width = =machine_nozzle_size +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_standby_temperature = 100 +skin_overlap = 20 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +wall_line_width_x = =line_width diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg new file mode 100644 index 0000000000..62a699d0ea --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +material = generic_cffpa +variant = CC 0.4 + +[values] +adhesion_type = skirt +cool_fan_enabled = True +cool_min_layer_time = 7 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 6 +infill_line_width = =line_width +initial_layer_line_width_factor = 130.0 +line_width = =machine_nozzle_size +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_standby_temperature = 100 +skin_overlap = 20 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +wall_line_width_x = =line_width diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg new file mode 100644 index 0000000000..b3180a591f --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Normal +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -2 +material = generic_cffpa +variant = CC 0.4 + +[values] +adhesion_type = skirt +cool_fan_enabled = True +cool_min_layer_time = 7 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 6 +infill_line_width = =line_width +initial_layer_line_width_factor = 130.0 +line_width = =machine_nozzle_size +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_standby_temperature = 100 +skin_overlap = 20 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +wall_line_width_x = =line_width diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg new file mode 100644 index 0000000000..c1cf305c5f --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +material = generic_gffcpe +variant = CC 0.4 + +[values] +adhesion_type = brim +cool_fan_enabled = True +cool_min_layer_time = 7 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 6 +infill_line_width = =line_width +initial_layer_line_width_factor = 130.0 +line_width = =machine_nozzle_size +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_standby_temperature = 100 +skin_overlap = 20 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +wall_line_width_x = =line_width diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg new file mode 100644 index 0000000000..59fb6c774f --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Normal +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -2 +material = generic_gffcpe +variant = CC 0.4 + +[values] +adhesion_type = brim +cool_fan_enabled = True +cool_min_layer_time = 7 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 6 +infill_line_width = =line_width +initial_layer_line_width_factor = 130.0 +line_width = =machine_nozzle_size +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_standby_temperature = 100 +skin_overlap = 20 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +wall_line_width_x = =line_width diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg new file mode 100644 index 0000000000..3afdaf6474 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +material = generic_gffpa +variant = CC 0.4 + +[values] +adhesion_type = brim +cool_fan_enabled = True +cool_min_layer_time = 7 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 6 +infill_line_width = =line_width +initial_layer_line_width_factor = 130.0 +line_width = =machine_nozzle_size +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_standby_temperature = 100 +skin_overlap = 20 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +wall_line_width_x = =line_width diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg new file mode 100644 index 0000000000..2771bcc7a0 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg @@ -0,0 +1,31 @@ +[general] +version = 4 +name = Normal +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -2 +material = generic_gffpa +variant = CC 0.4 + +[values] +adhesion_type = brim +cool_fan_enabled = True +cool_min_layer_time = 7 +cool_min_layer_time_fan_speed_max = 15 +cool_min_speed = 6 +infill_line_width = =line_width +initial_layer_line_width_factor = 130.0 +line_width = =machine_nozzle_size +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +material_standby_temperature = 100 +skin_overlap = 20 +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +wall_line_width_x = =line_width diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg new file mode 100644 index 0000000000..12143e81d7 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg @@ -0,0 +1,43 @@ +[general] +version = 4 +name = Fast +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -3 +material = generic_pla +variant = CC 0.4 +is_experimental = True + +[values] +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_fan_speed_max = =100 +cool_min_speed = 2 +gradual_infill_step_height = =3 * layer_height +infill_line_width = =round(line_width * 0.65 / 0.75, 2) +infill_pattern = triangles +line_width = =machine_nozzle_size +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_final_print_temperature = =max(-273.15, material_print_temperature - 15) +material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_print_temperature = =default_material_print_temperature + 10 +material_standby_temperature = 100 +prime_tower_enable = True +retract_at_layer_change = False +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_x = =speed_wall +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +support_angle = 70 +support_line_width = =line_width * 0.75 +support_pattern = ='triangles' +support_xy_distance = =wall_line_width_0 * 1.5 +top_bottom_thickness = =layer_height * 4 +wall_line_width = =round(line_width * 0.75 / 0.75, 2) +wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) +wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg new file mode 100644 index 0000000000..36a9c35550 --- /dev/null +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg @@ -0,0 +1,43 @@ +[general] +version = 4 +name = Normal +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -2 +material = generic_pla +variant = CC 0.4 +is_experimental = True + +[values] +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_fan_speed_max = =100 +cool_min_speed = 2 +gradual_infill_step_height = =3 * layer_height +infill_line_width = =round(line_width * 0.65 / 0.75, 2) +infill_pattern = triangles +line_width = =machine_nozzle_size +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_final_print_temperature = =max(-273.15, material_print_temperature - 15) +material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) +material_print_temperature = =default_material_print_temperature + 10 +material_standby_temperature = 100 +prime_tower_enable = True +retract_at_layer_change = False +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_x = =speed_wall +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +support_angle = 70 +support_line_width = =line_width * 0.75 +support_pattern = ='triangles' +support_xy_distance = =wall_line_width_0 * 1.5 +top_bottom_thickness = =layer_height * 4 +wall_line_width = =round(line_width * 0.75 / 0.75, 2) +wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) +wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg index bc65409a04..cc72bfe7f5 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg index f40522be6e..afff7623fb 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg index 9aeb71c544..63e7e58bbc 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg index 7827c62ed7..a44c68e57d 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg index 98c9f3c86e..437a4a45b5 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -3 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg index 092de699e2..d9628abb66 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg index 3af13538ba..de875dda93 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg index eaf792928a..022aa80bee 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg index 7e44849db3..07f4d8bc24 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg index f11984c00f..82ecf40b0d 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg index 47adb38caf..b96532c854 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = superdraft weight = -4 diff --git a/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg index e6350a7353..fc063ad236 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = verydraft weight = -3 diff --git a/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.10.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.10.inst.cfg index deb1c343c2..eff5d4f83d 100644 --- a/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.10.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = abs_n0.30_l0.10 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q010 material = generic_abs diff --git a/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.15.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.15.inst.cfg index 84483ea568..7743bc0fee 100644 --- a/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = abs_n0.30_l0.15 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q015 material = generic_abs diff --git a/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.20.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.20.inst.cfg index 1636fefe51..f38eaa60fd 100644 --- a/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = abs_n0.30_l0.20 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q020 material = generic_abs diff --git a/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.25.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.25.inst.cfg index f2790744c3..d5afbff24c 100644 --- a/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = abs_n0.30_l0.25 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q025 material = generic_abs diff --git a/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.10.inst.cfg index d64f65ddaa..f0bd541f56 100644 --- a/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = abs_n0.40_l0.10 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q010 material = generic_abs diff --git a/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.15.inst.cfg index 0145ee9410..b44409eca2 100644 --- a/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = abs_n0.40_l0.15 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q015 material = generic_abs diff --git a/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.20.inst.cfg index 2c33ae5c0f..ade389ec99 100644 --- a/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = abs_n0.40_l0.20 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q020 material = generic_abs diff --git a/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.25.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.25.inst.cfg index 0d4e45d992..88c4f70002 100644 --- a/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = abs_n0.40_l0.25 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q025 material = generic_abs diff --git a/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.30.inst.cfg index 94acb2794b..f44edfbdaa 100644 --- a/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = abs_n0.40_l0.30 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q030 material = generic_abs diff --git a/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.15.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.15.inst.cfg index d64dc93636..3174ba0de2 100644 --- a/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = abs_n0.50_l0.15 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q015 material = generic_abs diff --git a/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.20.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.20.inst.cfg index 39316afe00..73680584b1 100644 --- a/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = abs_n0.50_l0.20 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q020 material = generic_abs diff --git a/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.25.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.25.inst.cfg index c7dc6baa64..0c8972e078 100644 --- a/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = abs_n0.50_l0.25 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q025 material = generic_abs diff --git a/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.30.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.30.inst.cfg index 1266d55fc2..efb08ad538 100644 --- a/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.30.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = abs_n0.50_l0.30 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q030 material = generic_abs diff --git a/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.35.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.35.inst.cfg index 052c06f988..9a7e3a50cd 100644 --- a/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.35.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = abs_n0.50_l0.35 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q035 material = generic_abs diff --git a/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.10.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.10.inst.cfg index 8accec1346..97e2d7a56f 100644 --- a/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.10.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = hips_n0.30_l0.10 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q010 material = generic_hips diff --git a/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.15.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.15.inst.cfg index 57c1d83f0b..f8342d3bf5 100644 --- a/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = hips_n0.30_l0.15 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q015 material = generic_hips diff --git a/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.20.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.20.inst.cfg index febe0f3bba..5cdca9f8a8 100644 --- a/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = hips_n0.30_l0.20 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q020 material = generic_hips diff --git a/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.25.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.25.inst.cfg index d2e0949191..ca1144a25a 100644 --- a/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = hips_n0.30_l0.25 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q025 material = generic_hips diff --git a/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.10.inst.cfg index 1e5aa48b8c..238ffd5803 100644 --- a/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = hips_n0.40_l0.10 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q010 material = generic_hips diff --git a/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.15.inst.cfg index defbe75cdb..f210a9e775 100644 --- a/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = hips_n0.40_l0.15 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q015 material = generic_hips diff --git a/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.20.inst.cfg index e36eba0add..a70c57e601 100644 --- a/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = hips_n0.40_l0.20 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q020 material = generic_hips diff --git a/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.25.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.25.inst.cfg index e46994ee33..4a6429b922 100644 --- a/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = hips_n0.40_l0.25 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q025 material = generic_abs diff --git a/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.30.inst.cfg index 3447b3b81a..5ac23b0d8a 100644 --- a/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = hips_n0.40_l0.30 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q030 material = generic_hips diff --git a/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.15.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.15.inst.cfg index c4a51d11aa..88b254f599 100644 --- a/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = hips_n0.50_l0.15 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q015 material = generic_hips diff --git a/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.20.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.20.inst.cfg index d726414397..c3c6fe56b9 100644 --- a/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = hips_n0.50_l0.20 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q020 material = generic_hips diff --git a/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.25.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.25.inst.cfg index 9d9aee8fc0..5ca970bc9c 100644 --- a/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = hips_n0.50_l0.25 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q025 material = generic_hips diff --git a/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.30.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.30.inst.cfg index d2f3245e16..2dac72c644 100644 --- a/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.30.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = hips_n0.50_l0.30 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q030 material = generic_hips diff --git a/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.35.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.35.inst.cfg index 54da0473c2..1da113491f 100644 --- a/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.35.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = hips_n0.50_l0.35 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q035 material = generic_hips diff --git a/resources/quality/uni_base/layer_0.05.inst.cfg b/resources/quality/uni_base/layer_0.05.inst.cfg index 653a1587a1..08c2898a8e 100644 --- a/resources/quality/uni_base/layer_0.05.inst.cfg +++ b/resources/quality/uni_base/layer_0.05.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q005 weight = -1 diff --git a/resources/quality/uni_base/layer_0.10.inst.cfg b/resources/quality/uni_base/layer_0.10.inst.cfg index 53b356e92c..359cd19b12 100644 --- a/resources/quality/uni_base/layer_0.10.inst.cfg +++ b/resources/quality/uni_base/layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q010 weight = -2 diff --git a/resources/quality/uni_base/layer_0.15.inst.cfg b/resources/quality/uni_base/layer_0.15.inst.cfg index 95d351b29e..1c50033230 100644 --- a/resources/quality/uni_base/layer_0.15.inst.cfg +++ b/resources/quality/uni_base/layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = Fast Super Quality definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q015 weight = -3 diff --git a/resources/quality/uni_base/layer_0.20.inst.cfg b/resources/quality/uni_base/layer_0.20.inst.cfg index a652736892..17e655a62e 100644 --- a/resources/quality/uni_base/layer_0.20.inst.cfg +++ b/resources/quality/uni_base/layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = Standart Quality definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q020 weight = -4 diff --git a/resources/quality/uni_base/layer_0.25.inst.cfg b/resources/quality/uni_base/layer_0.25.inst.cfg index 3f2b449494..e83cf23cf3 100644 --- a/resources/quality/uni_base/layer_0.25.inst.cfg +++ b/resources/quality/uni_base/layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = Fast Standart Quality definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q025 weight = -5 diff --git a/resources/quality/uni_base/layer_0.30.inst.cfg b/resources/quality/uni_base/layer_0.30.inst.cfg index e5429f24d9..8a7633c50b 100644 --- a/resources/quality/uni_base/layer_0.30.inst.cfg +++ b/resources/quality/uni_base/layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = Fast Print Quality definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q030 weight = -6 diff --git a/resources/quality/uni_base/layer_0.35.inst.cfg b/resources/quality/uni_base/layer_0.35.inst.cfg index 942a69ab9d..b02bbeb789 100644 --- a/resources/quality/uni_base/layer_0.35.inst.cfg +++ b/resources/quality/uni_base/layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q035 weight = -7 diff --git a/resources/quality/uni_base/layer_0.40.inst.cfg b/resources/quality/uni_base/layer_0.40.inst.cfg index 369e8d1fab..ca71c62969 100644 --- a/resources/quality/uni_base/layer_0.40.inst.cfg +++ b/resources/quality/uni_base/layer_0.40.inst.cfg @@ -4,7 +4,7 @@ name = Poor Draft Quality definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q040 weight = -8 diff --git a/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.10.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.10.inst.cfg index f59d6ac23b..80a1f02413 100644 --- a/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.10.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = petg_n0.30_l0.10 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q010 material = generic_petg diff --git a/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.15.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.15.inst.cfg index edd39d3eb3..c7ea1a292b 100644 --- a/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = petg_n0.30_l0.15 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q015 material = generic_petg diff --git a/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.20.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.20.inst.cfg index 3efb808bcb..375117a473 100644 --- a/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = petg_n0.30_l0.20 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q020 material = generic_petg diff --git a/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.25.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.25.inst.cfg index 0a21eeb4fe..5f9541c58e 100644 --- a/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = petg_n0.30_l0.25 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q025 material = generic_petg diff --git a/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.10.inst.cfg index f6bf527c7e..077af364bd 100644 --- a/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = petg_n0.40_l0.10 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q010 material = generic_petg diff --git a/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.15.inst.cfg index 6fde00e4de..5b4b04efea 100644 --- a/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = petg_n0.40_l0.15 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q015 material = generic_petg diff --git a/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.20.inst.cfg index e9b53e4aef..186889d4a5 100644 --- a/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = petg_n0.40_l0.20 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q020 material = generic_petg diff --git a/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.25.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.25.inst.cfg index 7ed852d911..d525c622d4 100644 --- a/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = petg_n0.40_l0.25 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q025 material = generic_petg diff --git a/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.30.inst.cfg index 9dcd980b97..7283df9d7f 100644 --- a/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = petg_n0.40_l0.30 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q030 material = generic_petg diff --git a/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.15.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.15.inst.cfg index a6269dac15..432d4098ad 100644 --- a/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = petg_n0.50_l0.15 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q015 material = generic_petg diff --git a/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.20.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.20.inst.cfg index 37772ab2c6..54ac7820c8 100644 --- a/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = petg_n0.50_l0.20 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q020 material = generic_petg diff --git a/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.25.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.25.inst.cfg index c7bd8f1698..5e922bd3d4 100644 --- a/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = petg_n0.50_l0.25 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q025 material = generic_petg diff --git a/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.30.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.30.inst.cfg index dd92717145..132b4ec33a 100644 --- a/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.30.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = petg_n0.50_l0.30 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q030 material = generic_petg diff --git a/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.35.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.35.inst.cfg index 6c2afec866..04a611b514 100644 --- a/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.35.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = petg_n0.50_l0.35 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q035 material = generic_petg diff --git a/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.10.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.10.inst.cfg index 0d78423d8e..564ad50dae 100644 --- a/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.10.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = pla_n0.30_l0.10 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q010 material = generic_pla diff --git a/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.15.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.15.inst.cfg index 08e85b2054..345c0800fd 100644 --- a/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = pla_n0.30_l0.15 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q015 material = generic_pla diff --git a/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.20.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.20.inst.cfg index ceb66b30f6..0fb505867b 100644 --- a/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = pla_n0.30_l0.20 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q020 material = generic_pla diff --git a/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.25.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.25.inst.cfg index 09d3424f94..3d714e7643 100644 --- a/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = pla_n0.30_l0.25 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q025 material = generic_pla diff --git a/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.10.inst.cfg index c894f9ed6c..60a6664b64 100644 --- a/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = pla_n0.40_l0.10 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q010 material = generic_pla diff --git a/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.15.inst.cfg index 0d9742e370..1af08ec21c 100644 --- a/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = pla_n0.40_l0.15 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q015 material = generic_pla diff --git a/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.20.inst.cfg index 1acdc361fe..59200c1142 100644 --- a/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = pla_n0.40_l0.20 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q020 material = generic_pla diff --git a/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.25.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.25.inst.cfg index f71ed4386d..bc653477a6 100644 --- a/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = pla_n0.40_l0.25 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q025 material = generic_pla diff --git a/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.30.inst.cfg index 697828904e..eb31f86a05 100644 --- a/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = pla_n0.40_l0.30 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q030 material = generic_pla diff --git a/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.15.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.15.inst.cfg index d70d84199f..62bf222496 100644 --- a/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = pla_n0.50_l0.15 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q015 material = generic_pla diff --git a/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.20.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.20.inst.cfg index 59dff263aa..f19ad2c6ee 100644 --- a/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = pla_n0.50_l0.20 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q020 material = generic_pla diff --git a/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.25.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.25.inst.cfg index d15518e3f0..59de9b5795 100644 --- a/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = pla_n0.50_l0.25 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q025 material = generic_pla diff --git a/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.30.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.30.inst.cfg index 9571b3a1c1..1fe9a41bfb 100644 --- a/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.30.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = pla_n0.50_l0.30 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q030 material = generic_pla diff --git a/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.35.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.35.inst.cfg index ecb159e3b8..ee86c2b6ed 100644 --- a/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.35.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = pla_n0.50_l0.35 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = q035 material = generic_pla diff --git a/resources/quality/vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg index ae9ff6bab6..495779d2ef 100644 --- a/resources/quality/vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extreme definition = vertex_delta_k8800 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extreme weight = 2 diff --git a/resources/quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg index 3e859ff822..3f331b7ca4 100644 --- a/resources/quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = vertex_delta_k8800 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg index 80c04af125..c92ba2f524 100644 --- a/resources/quality/vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = vertex_delta_k8800 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg index 0b82c82575..2082bc8827 100644 --- a/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extreme definition = vertex_delta_k8800 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extreme weight = 2 diff --git a/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg index 2011a3d00c..33b13e16b5 100644 --- a/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = vertex_delta_k8800 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg index 045e83febb..9c0de57aba 100644 --- a/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = vertex_delta_k8800 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg index dd2b8cc77b..0333ea2560 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extreme definition = vertex_delta_k8800 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extreme weight = 2 diff --git a/resources/quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg index 5dc870a344..59a93a80df 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = vertex_delta_k8800 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg index 93ab2f101a..c89ea21715 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = vertex_delta_k8800 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg index 4c78d348e4..1cc37642b1 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extreme definition = vertex_delta_k8800 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extreme weight = 2 diff --git a/resources/quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg index 091e763efb..026cae88d5 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = vertex_delta_k8800 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg index 900c64c501..987fa4be72 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = vertex_delta_k8800 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg index 88adeac37f..e54d293ec5 100644 --- a/resources/quality/vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Extreme definition = vertex_delta_k8800 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extreme weight = 2 diff --git a/resources/quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg index 345449518e..e0df3c4205 100644 --- a/resources/quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg @@ -4,7 +4,7 @@ name = High definition = vertex_delta_k8800 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = high weight = 1 diff --git a/resources/quality/vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg index 81fc55a42e..e32540ad53 100644 --- a/resources/quality/vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = vertex_delta_k8800 [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/volumic/stream20dual_mk2_coarse.inst.cfg b/resources/quality/volumic/stream20dual_mk2_coarse.inst.cfg new file mode 100644 index 0000000000..64cddd9bd3 --- /dev/null +++ b/resources/quality/volumic/stream20dual_mk2_coarse.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Low +definition = stream20dual_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = coarse +weight = -1 +global_quality = True + +[values] +layer_height = 0.250 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream20dual_mk2_draft.inst.cfg b/resources/quality/volumic/stream20dual_mk2_draft.inst.cfg new file mode 100644 index 0000000000..86cab86770 --- /dev/null +++ b/resources/quality/volumic/stream20dual_mk2_draft.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Standard +definition = stream20dual_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +global_quality = True + +[values] +layer_height = 0.2 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream20dual_mk2_extra_coarse.inst.cfg b/resources/quality/volumic/stream20dual_mk2_extra_coarse.inst.cfg new file mode 100644 index 0000000000..910a29d36e --- /dev/null +++ b/resources/quality/volumic/stream20dual_mk2_extra_coarse.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Very low +definition = stream20dual_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = extra coarse +weight = 0 +global_quality = True + +[values] +layer_height = 0.275 +top_bottom_thickness = 1.1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream20dual_mk2_fast.inst.cfg b/resources/quality/volumic/stream20dual_mk2_fast.inst.cfg new file mode 100644 index 0000000000..9f95e342f5 --- /dev/null +++ b/resources/quality/volumic/stream20dual_mk2_fast.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Medium +definition = stream20dual_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -3 +global_quality = True + +[values] +layer_height = 0.15 +top_bottom_thickness = 1.05 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream20dual_mk2_high.inst.cfg b/resources/quality/volumic/stream20dual_mk2_high.inst.cfg new file mode 100644 index 0000000000..288f2cbe72 --- /dev/null +++ b/resources/quality/volumic/stream20dual_mk2_high.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Very high +definition = stream20dual_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = high +weight = -5 +global_quality = True + +[values] +layer_height = 0.05 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream20dual_mk2_normal.inst.cfg b/resources/quality/volumic/stream20dual_mk2_normal.inst.cfg new file mode 100644 index 0000000000..bc37d30a5e --- /dev/null +++ b/resources/quality/volumic/stream20dual_mk2_normal.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = High +definition = stream20dual_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = -4 +global_quality = True + +[values] +layer_height = 0.1 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream20pro_mk2_coarse.inst.cfg b/resources/quality/volumic/stream20pro_mk2_coarse.inst.cfg new file mode 100644 index 0000000000..87fb0cd912 --- /dev/null +++ b/resources/quality/volumic/stream20pro_mk2_coarse.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Low +definition = stream20pro_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = coarse +weight = -1 +global_quality = True + +[values] +layer_height = 0.250 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream20pro_mk2_draft.inst.cfg b/resources/quality/volumic/stream20pro_mk2_draft.inst.cfg new file mode 100644 index 0000000000..2f078f20d7 --- /dev/null +++ b/resources/quality/volumic/stream20pro_mk2_draft.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Standard +definition = stream20pro_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +global_quality = True + +[values] +layer_height = 0.2 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream20pro_mk2_extra_coarse.inst.cfg b/resources/quality/volumic/stream20pro_mk2_extra_coarse.inst.cfg new file mode 100644 index 0000000000..d8f150edd4 --- /dev/null +++ b/resources/quality/volumic/stream20pro_mk2_extra_coarse.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Very low +definition = stream20pro_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = extra coarse +weight = 0 +global_quality = True + +[values] +layer_height = 0.275 +top_bottom_thickness = 1.1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream20pro_mk2_fast.inst.cfg b/resources/quality/volumic/stream20pro_mk2_fast.inst.cfg new file mode 100644 index 0000000000..a8316e0961 --- /dev/null +++ b/resources/quality/volumic/stream20pro_mk2_fast.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Medium +definition = stream20pro_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -3 +global_quality = True + +[values] +layer_height = 0.15 +top_bottom_thickness = 1.05 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream20pro_mk2_high.inst.cfg b/resources/quality/volumic/stream20pro_mk2_high.inst.cfg new file mode 100644 index 0000000000..4180c82542 --- /dev/null +++ b/resources/quality/volumic/stream20pro_mk2_high.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Very high +definition = stream20pro_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = high +weight = -5 +global_quality = True + +[values] +layer_height = 0.05 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream20pro_mk2_normal.inst.cfg b/resources/quality/volumic/stream20pro_mk2_normal.inst.cfg new file mode 100644 index 0000000000..7e9daec452 --- /dev/null +++ b/resources/quality/volumic/stream20pro_mk2_normal.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = High +definition = stream20pro_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = -4 +global_quality = True + +[values] +layer_height = 0.1 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30dual_mk2_coarse.inst.cfg b/resources/quality/volumic/stream30dual_mk2_coarse.inst.cfg new file mode 100644 index 0000000000..8f63dfa422 --- /dev/null +++ b/resources/quality/volumic/stream30dual_mk2_coarse.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Low +definition = stream30dual_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = coarse +weight = -1 +global_quality = True + +[values] +layer_height = 0.250 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30dual_mk2_draft.inst.cfg b/resources/quality/volumic/stream30dual_mk2_draft.inst.cfg new file mode 100644 index 0000000000..7b412c6229 --- /dev/null +++ b/resources/quality/volumic/stream30dual_mk2_draft.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Standard +definition = stream30dual_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +global_quality = True + +[values] +layer_height = 0.2 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30dual_mk2_extra_coarse.inst.cfg b/resources/quality/volumic/stream30dual_mk2_extra_coarse.inst.cfg new file mode 100644 index 0000000000..792d7fc220 --- /dev/null +++ b/resources/quality/volumic/stream30dual_mk2_extra_coarse.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Very low +definition = stream30dual_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = extra coarse +weight = 0 +global_quality = True + +[values] +layer_height = 0.275 +top_bottom_thickness = 1.1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30dual_mk2_fast.inst.cfg b/resources/quality/volumic/stream30dual_mk2_fast.inst.cfg new file mode 100644 index 0000000000..35f1dba9cf --- /dev/null +++ b/resources/quality/volumic/stream30dual_mk2_fast.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Medium +definition = stream30dual_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -3 +global_quality = True + +[values] +layer_height = 0.15 +top_bottom_thickness = 1.05 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30dual_mk2_high.inst.cfg b/resources/quality/volumic/stream30dual_mk2_high.inst.cfg new file mode 100644 index 0000000000..089eccfcfc --- /dev/null +++ b/resources/quality/volumic/stream30dual_mk2_high.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Very high +definition = stream30dual_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = high +weight = -5 +global_quality = True + +[values] +layer_height = 0.05 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30dual_mk2_normal.inst.cfg b/resources/quality/volumic/stream30dual_mk2_normal.inst.cfg new file mode 100644 index 0000000000..1cd061a148 --- /dev/null +++ b/resources/quality/volumic/stream30dual_mk2_normal.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = High +definition = stream30dual_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = -4 +global_quality = True + +[values] +layer_height = 0.1 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30pro_mk2_coarse.inst.cfg b/resources/quality/volumic/stream30pro_mk2_coarse.inst.cfg new file mode 100644 index 0000000000..c5f895dab3 --- /dev/null +++ b/resources/quality/volumic/stream30pro_mk2_coarse.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Low +definition = stream30pro_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = coarse +weight = -1 +global_quality = True + +[values] +layer_height = 0.250 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30pro_mk2_draft.inst.cfg b/resources/quality/volumic/stream30pro_mk2_draft.inst.cfg new file mode 100644 index 0000000000..c9205c1765 --- /dev/null +++ b/resources/quality/volumic/stream30pro_mk2_draft.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Standard +definition = stream30pro_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +global_quality = True + +[values] +layer_height = 0.2 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30pro_mk2_extra_coarse.inst.cfg b/resources/quality/volumic/stream30pro_mk2_extra_coarse.inst.cfg new file mode 100644 index 0000000000..7490b44601 --- /dev/null +++ b/resources/quality/volumic/stream30pro_mk2_extra_coarse.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Very low +definition = stream30pro_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = extra coarse +weight = 0 +global_quality = True + +[values] +layer_height = 0.275 +top_bottom_thickness = 1.1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30pro_mk2_fast.inst.cfg b/resources/quality/volumic/stream30pro_mk2_fast.inst.cfg new file mode 100644 index 0000000000..36485f4946 --- /dev/null +++ b/resources/quality/volumic/stream30pro_mk2_fast.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Medium +definition = stream30pro_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -3 +global_quality = True + +[values] +layer_height = 0.15 +top_bottom_thickness = 1.05 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30pro_mk2_high.inst.cfg b/resources/quality/volumic/stream30pro_mk2_high.inst.cfg new file mode 100644 index 0000000000..84a3933a79 --- /dev/null +++ b/resources/quality/volumic/stream30pro_mk2_high.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Very high +definition = stream30pro_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = high +weight = -5 +global_quality = True + +[values] +layer_height = 0.05 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30pro_mk2_normal.inst.cfg b/resources/quality/volumic/stream30pro_mk2_normal.inst.cfg new file mode 100644 index 0000000000..008ebe5e0c --- /dev/null +++ b/resources/quality/volumic/stream30pro_mk2_normal.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = High +definition = stream30pro_mk2 + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = -4 +global_quality = True + +[values] +layer_height = 0.1 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 60 +speed_layer_0 = 30 +speed_print = 60 +speed_topbottom = 48 +speed_travel = 100 +speed_wall = 30 +speed_wall_0 = 30 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30ultra_coarse.inst.cfg b/resources/quality/volumic/stream30ultra_coarse.inst.cfg new file mode 100644 index 0000000000..afe057a527 --- /dev/null +++ b/resources/quality/volumic/stream30ultra_coarse.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Low +definition = stream30ultra + +[metadata] +setting_version = 17 +type = quality +quality_type = coarse +weight = -1 +global_quality = True + +[values] +layer_height = 0.250 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30ultra_draft.inst.cfg b/resources/quality/volumic/stream30ultra_draft.inst.cfg new file mode 100644 index 0000000000..6dc5cc8e0f --- /dev/null +++ b/resources/quality/volumic/stream30ultra_draft.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Standard +definition = stream30ultra + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +global_quality = True + +[values] +layer_height = 0.2 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30ultra_extra_coarse.inst.cfg b/resources/quality/volumic/stream30ultra_extra_coarse.inst.cfg new file mode 100644 index 0000000000..5e6a6fb19e --- /dev/null +++ b/resources/quality/volumic/stream30ultra_extra_coarse.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Very low +definition = stream30ultra + +[metadata] +setting_version = 17 +type = quality +quality_type = extra coarse +weight = 0 +global_quality = True + +[values] +layer_height = 0.3 +top_bottom_thickness = 1.1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30ultra_fast.inst.cfg b/resources/quality/volumic/stream30ultra_fast.inst.cfg new file mode 100644 index 0000000000..06271769d1 --- /dev/null +++ b/resources/quality/volumic/stream30ultra_fast.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Medium +definition = stream30ultra + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -3 +global_quality = True + +[values] +layer_height = 0.15 +top_bottom_thickness = 1.05 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30ultra_high.inst.cfg b/resources/quality/volumic/stream30ultra_high.inst.cfg new file mode 100644 index 0000000000..94f9d3de2d --- /dev/null +++ b/resources/quality/volumic/stream30ultra_high.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Very high +definition = stream30ultra + +[metadata] +setting_version = 17 +type = quality +quality_type = high +weight = -5 +global_quality = True + +[values] +layer_height = 0.05 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30ultra_normal.inst.cfg b/resources/quality/volumic/stream30ultra_normal.inst.cfg new file mode 100644 index 0000000000..20c6f938b1 --- /dev/null +++ b/resources/quality/volumic/stream30ultra_normal.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = High +definition = stream30ultra + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = -4 +global_quality = True + +[values] +layer_height = 0.1 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30ultrasc_coarse.inst.cfg b/resources/quality/volumic/stream30ultrasc_coarse.inst.cfg new file mode 100644 index 0000000000..d6103dd241 --- /dev/null +++ b/resources/quality/volumic/stream30ultrasc_coarse.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Low +definition = stream30ultrasc + +[metadata] +setting_version = 17 +type = quality +quality_type = coarse +weight = -1 +global_quality = True + +[values] +layer_height = 0.250 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30ultrasc_draft.inst.cfg b/resources/quality/volumic/stream30ultrasc_draft.inst.cfg new file mode 100644 index 0000000000..5c34b7f16f --- /dev/null +++ b/resources/quality/volumic/stream30ultrasc_draft.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Standard +definition = stream30ultrasc + +[metadata] +setting_version = 17 +type = quality +quality_type = draft +weight = -2 +global_quality = True + +[values] +layer_height = 0.2 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30ultrasc_extra_coarse.inst.cfg b/resources/quality/volumic/stream30ultrasc_extra_coarse.inst.cfg new file mode 100644 index 0000000000..46c278cf02 --- /dev/null +++ b/resources/quality/volumic/stream30ultrasc_extra_coarse.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Very low +definition = stream30ultrasc + +[metadata] +setting_version = 17 +type = quality +quality_type = extra coarse +weight = 0 +global_quality = True + +[values] +layer_height = 0.3 +top_bottom_thickness = 1.1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30ultrasc_fast.inst.cfg b/resources/quality/volumic/stream30ultrasc_fast.inst.cfg new file mode 100644 index 0000000000..376cef51e0 --- /dev/null +++ b/resources/quality/volumic/stream30ultrasc_fast.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Medium +definition = stream30ultrasc + +[metadata] +setting_version = 17 +type = quality +quality_type = fast +weight = -3 +global_quality = True + +[values] +layer_height = 0.15 +top_bottom_thickness = 1.05 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30ultrasc_high.inst.cfg b/resources/quality/volumic/stream30ultrasc_high.inst.cfg new file mode 100644 index 0000000000..7f2c733400 --- /dev/null +++ b/resources/quality/volumic/stream30ultrasc_high.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Very high +definition = stream30ultrasc + +[metadata] +setting_version = 17 +type = quality +quality_type = high +weight = -5 +global_quality = True + +[values] +layer_height = 0.05 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/volumic/stream30ultrasc_normal.inst.cfg b/resources/quality/volumic/stream30ultrasc_normal.inst.cfg new file mode 100644 index 0000000000..097bfd7952 --- /dev/null +++ b/resources/quality/volumic/stream30ultrasc_normal.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = High +definition = stream30ultrasc + +[metadata] +setting_version = 17 +type = quality +quality_type = normal +weight = -4 +global_quality = True + +[values] +layer_height = 0.1 +top_bottom_thickness = 1 +wall_thickness = 1.2 +line_width = 0.4 +travel_avoid_distance = 1 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 \ No newline at end of file diff --git a/resources/quality/voron2/voron2_global_extrafast_quality.inst.cfg b/resources/quality/voron2/voron2_global_extrafast_quality.inst.cfg index 74adba9143..1da7367e50 100644 --- a/resources/quality/voron2/voron2_global_extrafast_quality.inst.cfg +++ b/resources/quality/voron2/voron2_global_extrafast_quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast global_quality = True diff --git a/resources/quality/voron2/voron2_global_extrafine_quality.inst.cfg b/resources/quality/voron2/voron2_global_extrafine_quality.inst.cfg index 2cd399b723..6343ed36b0 100644 --- a/resources/quality/voron2/voron2_global_extrafine_quality.inst.cfg +++ b/resources/quality/voron2/voron2_global_extrafine_quality.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafine global_quality = True diff --git a/resources/quality/voron2/voron2_global_fast_quality.inst.cfg b/resources/quality/voron2/voron2_global_fast_quality.inst.cfg index 3c08a9a7dd..9f5e4a4008 100644 --- a/resources/quality/voron2/voron2_global_fast_quality.inst.cfg +++ b/resources/quality/voron2/voron2_global_fast_quality.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast global_quality = True diff --git a/resources/quality/voron2/voron2_global_fine_quality.inst.cfg b/resources/quality/voron2/voron2_global_fine_quality.inst.cfg index f2159b2e79..1cc90861e7 100644 --- a/resources/quality/voron2/voron2_global_fine_quality.inst.cfg +++ b/resources/quality/voron2/voron2_global_fine_quality.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine global_quality = True diff --git a/resources/quality/voron2/voron2_global_normal_quality.inst.cfg b/resources/quality/voron2/voron2_global_normal_quality.inst.cfg index 0f310bfd97..c9680d4c45 100644 --- a/resources/quality/voron2/voron2_global_normal_quality.inst.cfg +++ b/resources/quality/voron2/voron2_global_normal_quality.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal global_quality = True diff --git a/resources/quality/voron2/voron2_global_sprint_quality.inst.cfg b/resources/quality/voron2/voron2_global_sprint_quality.inst.cfg index 381509a2a4..81ce0cc3e6 100644 --- a/resources/quality/voron2/voron2_global_sprint_quality.inst.cfg +++ b/resources/quality/voron2/voron2_global_sprint_quality.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint global_quality = True diff --git a/resources/quality/voron2/voron2_global_supersprint_quality.inst.cfg b/resources/quality/voron2/voron2_global_supersprint_quality.inst.cfg index 7314e1303d..944e169817 100644 --- a/resources/quality/voron2/voron2_global_supersprint_quality.inst.cfg +++ b/resources/quality/voron2/voron2_global_supersprint_quality.inst.cfg @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint global_quality = True diff --git a/resources/quality/voron2/voron2_global_ultrasprint_quality.inst.cfg b/resources/quality/voron2/voron2_global_ultrasprint_quality.inst.cfg index ca2c62a6fa..e4f72b3e62 100644 --- a/resources/quality/voron2/voron2_global_ultrasprint_quality.inst.cfg +++ b/resources/quality/voron2/voron2_global_ultrasprint_quality.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultrasprint global_quality = True 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 7818bba6a9..cd051ee668 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 @@ -4,7 +4,7 @@ name = Extra Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafine material = generic_abs 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 c2315518da..234723f38e 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_abs 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 1a086ada8b..65429f5f56 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 @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_abs 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 70d7990b05..387e50531f 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_abs 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 81fbef7895..ff653b7524 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 @@ -4,7 +4,7 @@ name = Extra Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafine material = generic_nylon 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 be3f2ea8a1..79f7657169 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_nylon 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 5180329940..9f89f51a3a 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 @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_nylon 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 a85cdc7063..f3e45a0a30 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_nylon 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 e18c2e255e..9c5ac0c689 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 @@ -4,7 +4,7 @@ name = Extra Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafine material = generic_pc 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 89ce21960c..637f48a8ed 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_pc 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 419a6e4eeb..d81278cef4 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 @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_pc 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 56d9d32d12..ab1c350e0b 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pc 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 4c167c842b..aac7408df5 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 @@ -4,7 +4,7 @@ name = Extra Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafine material = generic_petg 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 46b33f5fe9..da66129d5d 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_petg 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 58445434c1..f71d117ad9 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 @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_petg 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 804bda5fd4..20c44bcd77 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_petg 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 26c72945f1..5a925d13f8 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 @@ -4,7 +4,7 @@ name = Extra Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafine material = generic_pla 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 4e38f5d2c0..6642c8d1b3 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_pla 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 0837ff7ab9..019f826cb2 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 @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_pla 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 508b42b217..ba7f2abe47 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pla 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 05df087a6d..8a32507c5c 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 @@ -4,7 +4,7 @@ name = Extra Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafine material = generic_abs 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 9dbf8acc83..685ad4443e 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_abs 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 887e41adb9..58aff7e2fc 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 @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_abs 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 d313c9682b..9a164a8866 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_abs 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 7d8fb3457b..2eafb8f86c 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 @@ -4,7 +4,7 @@ name = Extra Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafine material = generic_nylon 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 ced55c1771..24df1fb797 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_nylon 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 f42046dcbd..16c05586f5 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 @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_nylon 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 287194a9db..51398a6690 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_nylon 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 6854562240..3ed0627166 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 @@ -4,7 +4,7 @@ name = Extra Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafine material = generic_pc 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 5eaa7f9af2..8d106f8050 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_pc 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 5de95509a7..340e7499d0 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 @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_pc 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 de99c944f7..54d16c7947 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pc 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 a4643c75c7..afc8679208 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 @@ -4,7 +4,7 @@ name = Extra Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafine material = generic_petg 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 0b5ff6fb20..dce46507d0 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_petg 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 b788659a8c..ad545416d4 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 @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_petg 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 00b37ebbfb..c546551145 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_petg 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 7d4d3f2faa..17282ba276 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 @@ -4,7 +4,7 @@ name = Extra Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafine material = generic_pla 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 d50f280cd9..a85fae3e2c 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_pla 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 a928fe7649..67174e4520 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 @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_pla 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 08775a564b..05857f04b9 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pla 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 bd6463a336..fff1013dd6 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_abs 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 6e38dd4ad8..98255b6579 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 @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_abs 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 686968d64e..9ed1b1224a 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_abs 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 f5d888e6b8..9dfc12a1af 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_nylon 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 47c9d0b636..4da4dcf23d 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 @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_nylon 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 6903e8a840..685080b81e 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_nylon 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 3204ec0af8..5e7214e15e 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_pc 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 aba1826e91..3ccf6ac0c9 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 @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_pc 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 890eb978db..c6986b651b 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pc 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 83076cc860..c6985b36e3 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_petg 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 9ab67bdf73..8e6ecdb95e 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 @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_petg 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 23536f64f7..c307d4d53d 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_petg 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 0306970114..d3f79c495a 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_pla 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 71e3e0493a..09e610b947 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 @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_pla 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 28e730602b..314637a38d 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pla 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 bbc4680efa..977937c9d3 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_abs 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 307f401931..65cc400c30 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_abs 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 69d52a4fb5..8a968b1aca 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 @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_abs 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 1f46e284ea..a261fa8fce 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_abs 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 acae6d41bd..3f39670952 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_nylon 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 02110e3410..fc642178bd 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_nylon 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 09d1551837..fd4d9a78fb 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 @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_nylon 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 5a4558a6cc..c62114b1b8 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_nylon 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 c54e5b0a86..9fc3b551dd 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_pc 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 105900d0c3..724f27d034 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_pc 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 46a78d67e9..033b111759 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 @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_pc 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 a093c678e8..286f3f4c25 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pc 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 1d8e572d44..114d5c2d04 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_petg 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 ce2943c3ca..6663d847e4 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_petg 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 ac32cc3edd..b8dc1ce88f 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 @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_petg 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 c67cc642ca..2d8ae79963 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_petg 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 96582ae2de..424bc31774 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_pla 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 b6fc980849..6bcc6406ea 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_pla 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 7d6fa3fbc0..2569f59205 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 @@ -4,7 +4,7 @@ name = Fine definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine material = generic_pla 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 efa0d2475a..47da404ed5 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pla 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 1cc536c62d..725faa161a 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_abs 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 6764f5a7ad..d43eb24235 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_abs 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 0f6276b3d4..c7ee2a2860 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_abs 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 dfeb25a4ee..832e28bf0f 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_abs 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 0821eb4bcc..7e76489c93 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_nylon 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 c9ca6be1a0..9889e2538c 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_nylon 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 b94d37671b..306e60b4bc 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_nylon 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 866fcf3ba7..c9a17745ef 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_nylon 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 cff91fcbbf..8e37fedf77 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_pc 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 964ee5f510..e54effaac3 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_pc 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 fdcc413be8..47fa92e8d3 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pc 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 f7fc8d8bf6..7de6128d0b 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_pc 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 73a0477107..4a3be11379 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_petg 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 a9d02fcd0a..1ebf9a5bfc 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_petg 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 b780efae08..46f13bf385 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_petg 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 6c8c82521f..a0667fc1f2 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_petg 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 a3c191fd85..0b1084ae80 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_pla 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 5ab987b700..858166cdc5 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_pla 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 12d3d4b21f..f3c6adbad5 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pla 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 3ccce96a21..d14066786d 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_pla 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 b8c5d42648..2c125bf70b 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_abs 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 0904cede8d..25b1ac65a9 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_abs 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 7b870770b0..4403a51347 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_abs 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 690d1df707..ab82392b3d 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_nylon 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 266756210a..09f935f33c 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_nylon 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 17c4398237..3ff0dd7ef7 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_nylon 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 f61f2f4b1d..c8ffa23334 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_pc 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 b3875ddf51..d5291fe492 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_pc 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 b1e1ddf050..0daef4bf08 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_pc 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 f49da19db6..852124a987 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_petg 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 2733bf72a5..bb6ee68d8a 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_petg 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 64673b153c..46bf693afe 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_petg 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 cddfe69d75..280af043c4 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_pla 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 5a0d4e33f1..6facc61303 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_pla 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 60409f3f78..a483d73983 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_pla 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 ec2a537f03..f8632007b8 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_abs 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 b7679735e5..4a214905d2 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_abs 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 43a6ddd8f6..c4d242a6c7 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 @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_abs 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 8d819d24ee..d5b1420cdc 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_nylon 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 d2445bbd67..fc928f4823 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_nylon 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 9c206c3249..07c4171c10 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 @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_nylon 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 7a9e07144b..fa54adbffe 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_pc 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 ed13eccabc..c76fc17088 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_pc 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 c69170785c..ac7ece6f4c 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 @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_pc 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 8da6c0e1cf..8600608037 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_petg 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 c7741ff2cb..07e26bc1b7 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_petg 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 652074f39e..ebd1aabb21 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 @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_petg 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 c453dc0dcd..5707aed0fc 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_pla 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 53ea1fb281..9b4d8b4f63 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_pla 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 6e46784743..d97cbca66d 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 @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_pla 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 10ed6092de..2f776f265f 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_abs 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 854158c07e..a93d11e353 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_abs 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 dd0e5aa37a..006f8346d9 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_abs 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 146c4d4760..03414b71d5 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_nylon 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 992d5a871c..96ec3c80b7 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_nylon 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 5e1c9ab0be..1ec741ab83 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_nylon 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 78060ee2b9..ed0c579c7e 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_pc 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 3022ff7679..23a962a11e 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_pc 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 d1f323f316..34629375eb 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pc 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 10e287eb94..1ec4aaa3ee 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_petg 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 926928f3c6..37c6566685 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_petg 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 7f57dd0fa1..d8df501645 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_petg 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 7a049a147e..ecc94d2e90 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_pla 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 c74d94214c..5297faa02a 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_pla 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 1bca16b490..aabf88de3c 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 @@ -4,7 +4,7 @@ name = Normal definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal material = generic_pla 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 ff67c80325..f8b27fd431 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_abs 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 b770a0f920..223f5dce5c 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_abs 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 bd25b2147f..ec1f6779a3 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_abs 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 930e261a63..18dff9069f 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_nylon 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 22b1bfd2ea..79fd215280 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_nylon 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 1ff9c86e7b..6d2ff619ba 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_nylon 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 cd28cabe15..42602f9220 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_pc 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 2546ca3ee2..fe419aa75b 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_pc 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 d1c1b1abbc..7c06d32d09 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_pc 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 9667439dd3..aa6c9b306f 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_petg 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 1be750fbf4..203f88214e 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_petg 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 5ba36dda05..5221b564d0 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_petg 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 ccadde7cb5..cdc3a8acd8 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_pla 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 6327948606..1c12d26b0b 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 @@ -4,7 +4,7 @@ name = Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast material = generic_pla 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 482382b55c..bc191bb1f1 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_pla 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 ca540a4188..bcb5e46a3e 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_abs 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 0d55c1eacf..90f2b3a7e6 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_abs 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 f41e007ceb..04ee33f326 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 @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_abs 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 9623bf31c8..ff776bfb65 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_nylon 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 1942b77314..cececc5504 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_nylon 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 a5ce357795..52f8494bfa 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 @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_nylon 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 4997a26f9d..49aac44ec8 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_pc 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 5860e2eab3..2c9c3c89b9 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_pc 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 374586a723..9da131e904 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 @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_pc 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 31800cf8dd..8f45812636 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_petg 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 d08b17795b..7f01ba69dd 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_petg 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 8be6bdde9e..85d118a55d 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 @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_petg 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 fdf9f5cc7a..38c8301565 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 @@ -4,7 +4,7 @@ name = Extra Fast definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = extrafast material = generic_pla 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 f36fb01737..5bc55e324d 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_pla 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 542c50e847..5c95b0a5ff 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 @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_pla 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 158bfd1b91..da26ba744f 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_abs 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 2efc0f731c..70b22771e7 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 @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_abs 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 26ab9163a8..24b500ca4b 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 @@ -4,7 +4,7 @@ name = Ultra Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultrasprint material = generic_abs 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 e271f6b93e..3a097ccf2d 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_nylon 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 1c2c593f6e..f3bfaf0920 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 @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_nylon 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 9bd7a6d931..2de957db5d 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 @@ -4,7 +4,7 @@ name = Ultra Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultrasprint material = generic_nylon 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 dd468e0bed..e71b5f43e9 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_pc 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 bc93a013de..9721e176b2 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 @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_pc 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 6cc499de86..4d437b6fd7 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 @@ -4,7 +4,7 @@ name = Ultra Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultrasprint material = generic_pc 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 c24098fa66..bac1b6cfdb 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_petg 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 4b87403019..ac989db0b8 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 @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_petg 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 1bafd5d8fe..d37fba46d8 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 @@ -4,7 +4,7 @@ name = Ultra Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultrasprint material = generic_petg 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 543da88405..39e27b9764 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_pla 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 7e98833fa2..f89a8d0b99 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 @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_pla 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 7a8a229ac1..a2f3f305a1 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 @@ -4,7 +4,7 @@ name = Ultra Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultrasprint material = generic_pla 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 9b48d74206..1d41fdc87a 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_abs 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 f321db297c..a8c1f6932c 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 @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_abs 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 66154632f0..b9e7c111e6 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 @@ -4,7 +4,7 @@ name = Ultra Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultrasprint material = generic_abs 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 d71c792ab7..d96921d9fb 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_nylon 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 f9654ca01e..5c862dab11 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 @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_nylon 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 c08aaa0613..a004a71aa7 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 @@ -4,7 +4,7 @@ name = Ultra Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultrasprint material = generic_nylon 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 77887a051e..3ab2749226 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_pc 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 0b4c542253..80121b2a70 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 @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_pc 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 aa41d3623e..c2519cb916 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 @@ -4,7 +4,7 @@ name = Ultra Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultrasprint material = generic_pc 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 2deee94f74..0cf751373c 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_petg 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 f7f03b0161..4e0a080e14 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 @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_petg 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 4a79bee845..4447befa4d 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 @@ -4,7 +4,7 @@ name = Ultra Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultrasprint material = generic_petg 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 32c7c389cf..9b058463fd 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 @@ -4,7 +4,7 @@ name = Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = sprint material = generic_pla 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 fdbf6daf3b..b91b4a31f7 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 @@ -4,7 +4,7 @@ name = Super Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = supersprint material = generic_pla 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 9d20bdfd1a..9edd08fb13 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 @@ -4,7 +4,7 @@ name = Ultra Sprint definition = voron2_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ultrasprint material = generic_pla diff --git a/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.05.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.05.inst.cfg index 733c37104b..f49aa6efba 100644 --- a/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.05.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.05.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.20_lay0.05 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_005 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.10.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.10.inst.cfg index bd82fcc550..e1ac9f5a87 100644 --- a/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.20_lay0.10 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_010 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.15.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.15.inst.cfg index d325f5c864..ce19a54f0b 100644 --- a/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.20_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.05.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.05.inst.cfg index d17b9adae4..1abe7b3b62 100644 --- a/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.05.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.05.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.25_lay0.05 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_005 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.10.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.10.inst.cfg index 1b93886287..ff6d3ef1e8 100644 --- a/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.25_lay0.10 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_010 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.15.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.15.inst.cfg index 23455e4dfd..cdf983d767 100644 --- a/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.25_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.20.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.20.inst.cfg index 45035e2d0f..1c97c7b2f9 100644 --- a/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.25_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.10.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.10.inst.cfg index 037858c3af..db24ab36fb 100644 --- a/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.30_lay0.10 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_010 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.15.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.15.inst.cfg index d5cca9e858..b72d2f65cb 100644 --- a/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.30_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.20.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.20.inst.cfg index c4dd37c644..58f665aaaa 100644 --- a/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.30_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.25.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.25.inst.cfg index 2e1d550953..aff39f5aea 100644 --- a/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.30_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.10.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.10.inst.cfg index 4e38163caf..775c58b5cf 100644 --- a/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.35_lay0.10 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_010 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.15.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.15.inst.cfg index b069422f62..15d56f9bc6 100644 --- a/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.35_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.20.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.20.inst.cfg index 35d4c5d84c..300fdb0074 100644 --- a/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.35_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.25.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.25.inst.cfg index 46cd8eaa9b..9476b39ee1 100644 --- a/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.35_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.10.inst.cfg index 9398d20aa6..0117638bd1 100644 --- a/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.40_lay0.10 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_010 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.15.inst.cfg index 0545475160..fd52e93e0b 100644 --- a/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.40_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.20.inst.cfg index 6ccc406b53..f55b249c99 100644 --- a/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.40_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.25.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.25.inst.cfg index 12e9d5f9a4..e0a0deb698 100644 --- a/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.40_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.30.inst.cfg index 85e1622458..bdf2c7744c 100644 --- a/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.40_lay0.30 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_030 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.10.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.10.inst.cfg index c5b6664807..c5aef24c65 100644 --- a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.45_lay0.10 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_010 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.15.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.15.inst.cfg index 0c7881c935..9b9eefca4e 100644 --- a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.45_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.20.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.20.inst.cfg index bfb6f28d6c..5f18e8901a 100644 --- a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.45_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.25.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.25.inst.cfg index 6723c47cac..e985507ee5 100644 --- a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.45_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.30.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.30.inst.cfg index a2e03b6da9..fd4f0a3574 100644 --- a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.45_lay0.30 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_030 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.35.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.35.inst.cfg index e643511549..4e940640fe 100644 --- a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.45_lay0.35 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_035 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.15.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.15.inst.cfg index d4303df427..04b3b6b961 100644 --- a/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.50_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.20.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.20.inst.cfg index a440dd730c..0a907a9a54 100644 --- a/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.50_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.25.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.25.inst.cfg index 07b2532e05..a8ac764d0a 100644 --- a/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.50_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.30.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.30.inst.cfg index eb4cdac686..3b6d232072 100644 --- a/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.50_lay0.30 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_030 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.35.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.35.inst.cfg index e669d943ae..ff02813377 100644 --- a/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.50_lay0.35 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_035 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.15.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.15.inst.cfg index f879a8cf6e..2bf1ebbd31 100644 --- a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.60_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.20.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.20.inst.cfg index c0caf57a20..a34c41acd5 100644 --- a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.60_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.25.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.25.inst.cfg index d9219f4646..1edcb5b936 100644 --- a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.60_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.30.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.30.inst.cfg index bafcfb0c91..dbb7cdbf16 100644 --- a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.60_lay0.30 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_030 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.35.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.35.inst.cfg index af1165de98..1628351d67 100644 --- a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.60_lay0.35 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_035 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.40.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.40.inst.cfg index 89aabcf525..d52992efe5 100644 --- a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.40.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.40.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.60_lay0.40 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_040 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.20.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.20.inst.cfg index 1dcbf3825a..2544b856dd 100644 --- a/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.80_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.25.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.25.inst.cfg index 18aab11224..313c6b58e6 100644 --- a/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.80_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.30.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.30.inst.cfg index affb7b4ad1..64e746ee5f 100644 --- a/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.80_lay0.30 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_030 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.35.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.35.inst.cfg index 65a1214773..10b8fa9583 100644 --- a/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.80_lay0.35 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_035 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.40.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.40.inst.cfg index 62b2e86d02..fbe01dc482 100644 --- a/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.40.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.40.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz0.80_lay0.40 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_040 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.25.inst.cfg b/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.25.inst.cfg index 872768f007..cf0808c667 100644 --- a/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz1.00_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.30.inst.cfg b/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.30.inst.cfg index 978f75c05d..2764b97ee9 100644 --- a/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz1.00_lay0.30 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_030 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.35.inst.cfg b/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.35.inst.cfg index 6297a64eb8..6e90b68f78 100644 --- a/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz1.00_lay0.35 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_035 material = generic_abs diff --git a/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.40.inst.cfg b/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.40.inst.cfg index 82acbcf790..75cfc48e87 100644 --- a/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.40.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.40.inst.cfg @@ -4,7 +4,7 @@ name = abs_noz1.00_lay0.40 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_040 material = generic_abs diff --git a/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.05.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.05.inst.cfg index d50dfd46c9..1cad57f527 100644 --- a/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.05.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.05.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.20_lay0.05 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_005 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.10.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.10.inst.cfg index b86f08301b..e083459a14 100644 --- a/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.20_lay0.10 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_010 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.15.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.15.inst.cfg index f757394fde..cb89c91fb6 100644 --- a/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.20_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.05.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.05.inst.cfg index ca332d09f4..a296abfae0 100644 --- a/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.05.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.05.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.25_lay0.05 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_005 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.10.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.10.inst.cfg index af5799944b..f9287075a7 100644 --- a/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.25_lay0.10 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_010 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.15.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.15.inst.cfg index 1ee3cec608..2c09fff5ae 100644 --- a/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.25_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.20.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.20.inst.cfg index 5b6bf9ff77..5842a20d52 100644 --- a/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.25_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.10.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.10.inst.cfg index fb0141e76f..42414d553d 100644 --- a/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.30_lay0.10 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_010 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.15.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.15.inst.cfg index b0db9b1fe7..1ac134381c 100644 --- a/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.30_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.20.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.20.inst.cfg index 0b0f00e7eb..cd838cc667 100644 --- a/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.30_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.25.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.25.inst.cfg index 71adb8e1fa..08853e94e2 100644 --- a/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.30_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.10.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.10.inst.cfg index 1405bd187b..7395bce88c 100644 --- a/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.35_lay0.10 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_010 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.15.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.15.inst.cfg index a3f45590bc..9c92e1a075 100644 --- a/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.35_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.20.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.20.inst.cfg index c9856ec7a4..e8589e890a 100644 --- a/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.35_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.25.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.25.inst.cfg index f3afc237c2..ddbaf42e76 100644 --- a/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.35_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.10.inst.cfg index fb62fcf4fc..af1b046af8 100644 --- a/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.40_lay0.10 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_010 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.15.inst.cfg index 18562fb470..41b9d770d5 100644 --- a/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.40_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.20.inst.cfg index ceaea31a95..ab2b64b2b1 100644 --- a/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.40_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.25.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.25.inst.cfg index 13d5b37e9c..063ecfd44e 100644 --- a/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.40_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.30.inst.cfg index 738025db6c..eec655e442 100644 --- a/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.40_lay0.30 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_030 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.10.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.10.inst.cfg index 786f7a9dcb..2e3bfd74ac 100644 --- a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.45_lay0.10 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_010 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.15.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.15.inst.cfg index 74db6625e6..c22fbc08ea 100644 --- a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.45_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.20.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.20.inst.cfg index 81c9b60919..bf2a1252dd 100644 --- a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.45_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.25.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.25.inst.cfg index c55d3645da..4f8efbb16a 100644 --- a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.45_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.30.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.30.inst.cfg index d56b7d053e..0177d2a524 100644 --- a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.45_lay0.30 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_030 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.35.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.35.inst.cfg index b3d396d23d..513edc647f 100644 --- a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.45_lay0.35 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_035 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.15.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.15.inst.cfg index 2ef17759db..ebb8368fb0 100644 --- a/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.50_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.20.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.20.inst.cfg index d3e9d2e9c1..c1cee2fb76 100644 --- a/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.50_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.25.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.25.inst.cfg index 47bba68048..5740a92038 100644 --- a/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.50_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.30.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.30.inst.cfg index 8192099aca..cb7539d9e9 100644 --- a/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.50_lay0.30 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_030 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.35.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.35.inst.cfg index b8683807f3..c95fd7b0c3 100644 --- a/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.50_lay0.35 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_035 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.15.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.15.inst.cfg index 4f23553cfd..4d81ef5e1b 100644 --- a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.60_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.20.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.20.inst.cfg index 90c41c7a48..fdee650a52 100644 --- a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.60_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.25.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.25.inst.cfg index e5d5e1457d..e3f04ac214 100644 --- a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.60_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.30.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.30.inst.cfg index 7598c5b03c..ec50ded68f 100644 --- a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.60_lay0.30 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_030 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.35.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.35.inst.cfg index 577b43148f..1d60ebf0fa 100644 --- a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.60_lay0.35 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_035 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.40.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.40.inst.cfg index 5d74076e80..7b236ea520 100644 --- a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.40.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.40.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.60_lay0.40 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_040 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.20.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.20.inst.cfg index 1526c783bc..0e504b0d3c 100644 --- a/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.80_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.25.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.25.inst.cfg index 7c68bba8a2..525383238f 100644 --- a/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.80_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.30.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.30.inst.cfg index 7d32d724c5..b596cd83f4 100644 --- a/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.80_lay0.30 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_030 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.35.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.35.inst.cfg index 39ba9c2bac..48adfa799c 100644 --- a/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.80_lay0.35 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_035 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.40.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.40.inst.cfg index 445976b2fa..8d8023d19d 100644 --- a/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.40.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.40.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz0.80_lay0.40 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_040 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.25.inst.cfg b/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.25.inst.cfg index 436bbf282a..1850a8b4a3 100644 --- a/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz1.00_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.30.inst.cfg b/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.30.inst.cfg index 83521d58c6..f96326e664 100644 --- a/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz1.00_lay0.30 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_030 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.35.inst.cfg b/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.35.inst.cfg index 61344e904f..4fb5f9991c 100644 --- a/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz1.00_lay0.35 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_035 material = generic_petg diff --git a/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.40.inst.cfg b/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.40.inst.cfg index 7d7dc6f420..85bbf08066 100644 --- a/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.40.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.40.inst.cfg @@ -4,7 +4,7 @@ name = petg_noz1.00_lay0.40 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_040 material = generic_petg diff --git a/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.05.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.05.inst.cfg index f000bde685..67bbfb2dc5 100644 --- a/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.05.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.05.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.20_lay0.05 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_005 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.10.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.10.inst.cfg index 27a33d2096..3e30fb5872 100644 --- a/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.20_lay0.10 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_010 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.15.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.15.inst.cfg index 2029b0a10d..af980f531f 100644 --- a/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.20_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.05.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.05.inst.cfg index c7eaed0dbf..709c871c9d 100644 --- a/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.05.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.05.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.25_lay0.05 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_005 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.10.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.10.inst.cfg index a9d2b55d0f..134095df2b 100644 --- a/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.25_lay0.10 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_010 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.15.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.15.inst.cfg index a4a95d9c63..70c745dffc 100644 --- a/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.25_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.20.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.20.inst.cfg index d0028f9ec6..96a14fec50 100644 --- a/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.25_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.10.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.10.inst.cfg index f44856dab6..4db1a169e6 100644 --- a/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.30_lay0.10 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_010 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.15.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.15.inst.cfg index 74856365b0..0f219331da 100644 --- a/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.30_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.20.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.20.inst.cfg index fb9ee81472..82834e5f91 100644 --- a/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.30_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.25.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.25.inst.cfg index 5f484cfd5e..a172ed68d6 100644 --- a/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.30_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.10.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.10.inst.cfg index bade5b3475..484c33f11f 100644 --- a/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.35_lay0.10 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_010 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.15.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.15.inst.cfg index 10bb278311..ac03808b5c 100644 --- a/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.35_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.20.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.20.inst.cfg index d6173de6f6..7d275e2fe7 100644 --- a/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.35_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.25.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.25.inst.cfg index 1c7a15ed2e..5318ccf58e 100644 --- a/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.35_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.10.inst.cfg index 42b61accd2..921e1d7034 100644 --- a/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.40_lay0.10 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_010 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.15.inst.cfg index 88a1dbc43b..e76776a62e 100644 --- a/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.40_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.20.inst.cfg index f971e6d22f..4b97cea0a7 100644 --- a/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.40_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.25.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.25.inst.cfg index c34cd7c917..570ccc6e60 100644 --- a/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.40_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.30.inst.cfg index 2cc1355bf9..f01be1b0a9 100644 --- a/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.40_lay0.30 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_030 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.10.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.10.inst.cfg index 041217f43f..6536228dcd 100644 --- a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.45_lay0.10 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_010 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.15.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.15.inst.cfg index 3c12306bcb..1bc4e7b6d7 100644 --- a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.45_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.20.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.20.inst.cfg index 785355b2cc..645e3ac958 100644 --- a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.45_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.25.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.25.inst.cfg index b61eac2396..ea1dac8cc6 100644 --- a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.45_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.30.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.30.inst.cfg index 87270b56fa..a510c89be1 100644 --- a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.45_lay0.30 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_030 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.35.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.35.inst.cfg index 2c64760c07..6a3495ff20 100644 --- a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.45_lay0.35 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_035 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.15.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.15.inst.cfg index 3b1a5d1a80..9e5a343483 100644 --- a/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.50_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.20.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.20.inst.cfg index 05b46184bc..ccd52c8cf3 100644 --- a/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.50_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.25.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.25.inst.cfg index edc085379f..6fabfd9538 100644 --- a/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.50_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.30.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.30.inst.cfg index 6f67bd7aca..4a53d994e7 100644 --- a/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.50_lay0.30 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_030 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.35.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.35.inst.cfg index 0b3a2c5732..34e702812c 100644 --- a/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.50_lay0.35 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_035 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.15.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.15.inst.cfg index 55e02a7d44..3d83a4d5d7 100644 --- a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.60_lay0.15 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.20.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.20.inst.cfg index 8156e81505..182fa1befa 100644 --- a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.60_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.25.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.25.inst.cfg index 9628110e75..f31acf5dca 100644 --- a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.60_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.30.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.30.inst.cfg index 2d991e7a69..0d09bd84f4 100644 --- a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.60_lay0.30 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_030 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.35.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.35.inst.cfg index 32277a21ab..8762443d77 100644 --- a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.60_lay0.35 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_035 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.40.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.40.inst.cfg index e8c9e39f21..a64fcba9b3 100644 --- a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.40.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.40.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.60_lay0.40 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_040 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.20.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.20.inst.cfg index b8e33bb0d3..40ad00d442 100644 --- a/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.80_lay0.20 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.25.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.25.inst.cfg index f20fbffc2c..b0a1f7809f 100644 --- a/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.80_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.30.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.30.inst.cfg index ee6b498f31..753d872472 100644 --- a/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.80_lay0.30 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_030 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.35.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.35.inst.cfg index 47749310e9..dec573b097 100644 --- a/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.80_lay0.35 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_035 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.40.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.40.inst.cfg index c5418c3e49..90803f5629 100644 --- a/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.40.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.40.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz0.80_lay0.40 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_040 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.25.inst.cfg b/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.25.inst.cfg index d46b70a4b3..234f6fdd7a 100644 --- a/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz1.00_lay0.25 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.30.inst.cfg b/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.30.inst.cfg index 8226e6755d..dbe1b68be9 100644 --- a/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz1.00_lay0.30 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_030 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.35.inst.cfg b/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.35.inst.cfg index 4ed5b9afe7..91c9664f5d 100644 --- a/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz1.00_lay0.35 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_035 material = generic_pla diff --git a/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.40.inst.cfg b/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.40.inst.cfg index 2a2c234ee4..facaf551dd 100644 --- a/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.40.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.40.inst.cfg @@ -4,7 +4,7 @@ name = pla_noz1.00_lay0.40 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_040 material = generic_pla diff --git a/resources/quality/zav_base/zav_layer_0.05.inst.cfg b/resources/quality/zav_base/zav_layer_0.05.inst.cfg index 1b0f1bab1f..7da4f92fa0 100644 --- a/resources/quality/zav_base/zav_layer_0.05.inst.cfg +++ b/resources/quality/zav_base/zav_layer_0.05.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_005 weight = -1 diff --git a/resources/quality/zav_base/zav_layer_0.10.inst.cfg b/resources/quality/zav_base/zav_layer_0.10.inst.cfg index 4031194dc2..7329c71d14 100644 --- a/resources/quality/zav_base/zav_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/zav_layer_0.10.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_010 weight = -2 diff --git a/resources/quality/zav_base/zav_layer_0.15.inst.cfg b/resources/quality/zav_base/zav_layer_0.15.inst.cfg index ad90314b74..1ef5fa57ea 100644 --- a/resources/quality/zav_base/zav_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/zav_layer_0.15.inst.cfg @@ -4,7 +4,7 @@ name = Fast Super Quality definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_015 weight = -3 diff --git a/resources/quality/zav_base/zav_layer_0.20.inst.cfg b/resources/quality/zav_base/zav_layer_0.20.inst.cfg index eea3f24a22..1afcb2cc68 100644 --- a/resources/quality/zav_base/zav_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/zav_layer_0.20.inst.cfg @@ -4,7 +4,7 @@ name = Standart Quality definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_020 weight = -4 diff --git a/resources/quality/zav_base/zav_layer_0.25.inst.cfg b/resources/quality/zav_base/zav_layer_0.25.inst.cfg index f9ce9ca360..0c3874ab59 100644 --- a/resources/quality/zav_base/zav_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/zav_layer_0.25.inst.cfg @@ -4,7 +4,7 @@ name = Fast Standart Quality definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_025 weight = -5 diff --git a/resources/quality/zav_base/zav_layer_0.30.inst.cfg b/resources/quality/zav_base/zav_layer_0.30.inst.cfg index c1926bff32..625283107c 100644 --- a/resources/quality/zav_base/zav_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/zav_layer_0.30.inst.cfg @@ -4,7 +4,7 @@ name = Fast Print Quality definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_030 weight = -6 diff --git a/resources/quality/zav_base/zav_layer_0.35.inst.cfg b/resources/quality/zav_base/zav_layer_0.35.inst.cfg index edaac01e75..072faf9fe0 100644 --- a/resources/quality/zav_base/zav_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/zav_layer_0.35.inst.cfg @@ -4,7 +4,7 @@ name = Draft Quality definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_035 weight = -7 diff --git a/resources/quality/zav_base/zav_layer_0.40.inst.cfg b/resources/quality/zav_base/zav_layer_0.40.inst.cfg index ac21b64288..1baac5c023 100644 --- a/resources/quality/zav_base/zav_layer_0.40.inst.cfg +++ b/resources/quality/zav_base/zav_layer_0.40.inst.cfg @@ -4,7 +4,7 @@ name = Poor Draft Quality definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = ZAV_layer_040 weight = -8 diff --git a/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg b/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg index 733085d248..5abbf8e3fc 100644 --- a/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = zyyx_agile [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg b/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg index 0b7db60481..d42f44f69e 100644 --- a/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = zyyx_agile [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg b/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg index 1c4b19a1a0..681b38f1ec 100644 --- a/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_agile [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg index 9334da920d..60abe34b8d 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = zyyx_agile [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg index aef3a22fdc..32f1e8a2f5 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = zyyx_agile [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg index 4842391cee..da498f4bd4 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_agile [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg index c4843b26ad..529300b6d8 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = zyyx_agile [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fast weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg index 0b1e4b6325..fde8bd40be 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = zyyx_agile [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = fine weight = 1 diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg index 2638349c49..16def77172 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_agile [metadata] -setting_version = 16 +setting_version = 17 type = quality quality_type = normal weight = 0 diff --git a/resources/setting_visibility/advanced.cfg b/resources/setting_visibility/advanced.cfg index d3ed1094a6..9198f390fc 100644 --- a/resources/setting_visibility/advanced.cfg +++ b/resources/setting_visibility/advanced.cfg @@ -1,6 +1,7 @@ [general] name = Advanced weight = 2 +version = 2 [machine_settings] @@ -21,15 +22,17 @@ wall_0_extruder_nr wall_x_extruder_nr wall_thickness wall_line_count +optimize_wall_printing_order +fill_perimeter_gaps +xy_offset + +[top_bottom] top_bottom_extruder_nr top_bottom_thickness top_thickness top_layers bottom_thickness bottom_layers -optimize_wall_printing_order -fill_perimeter_gaps -xy_offset ironing_enabled [infill] diff --git a/resources/setting_visibility/basic.cfg b/resources/setting_visibility/basic.cfg index 82045db93b..6952baee2a 100644 --- a/resources/setting_visibility/basic.cfg +++ b/resources/setting_visibility/basic.cfg @@ -1,6 +1,7 @@ [general] name = Basic weight = 1 +version = 2 [machine_settings] @@ -10,12 +11,14 @@ layer_height [shell] wall_thickness wall_line_count +xy_offset + +[top_bottom] top_bottom_thickness top_thickness top_layers bottom_thickness bottom_layers -xy_offset [infill] infill_sparse_density diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index e96c4c342e..274433b7b2 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -1,6 +1,7 @@ [general] name = Expert weight = 3 +version = 2 [machine_settings] @@ -28,17 +29,6 @@ wall_x_extruder_nr wall_thickness wall_line_count wall_0_wipe_dist -roofing_layer_count -top_bottom_extruder_nr -top_bottom_thickness -top_thickness -top_layers -bottom_thickness -bottom_layers -top_bottom_pattern -top_bottom_pattern_0 -connect_skin_polygons -skin_angles wall_0_inset optimize_wall_printing_order outer_inset_first @@ -58,6 +48,19 @@ z_seam_x z_seam_y z_seam_corner z_seam_relative + +[top_bottom] +roofing_layer_count +top_bottom_extruder_nr +top_bottom_thickness +top_thickness +top_layers +bottom_thickness +bottom_layers +top_bottom_pattern +top_bottom_pattern_0 +connect_skin_polygons +skin_angles skin_no_small_gaps_heuristic skin_outline_count ironing_enabled diff --git a/resources/shaders/overhang.shader b/resources/shaders/overhang.shader index 3438c1b3ca..9f07d23567 100644 --- a/resources/shaders/overhang.shader +++ b/resources/shaders/overhang.shader @@ -32,6 +32,7 @@ fragment = uniform lowp float u_overhangAngle; uniform lowp vec4 u_overhangColor; + uniform lowp float u_lowestPrintableHeight; uniform lowp vec4 u_faceColor; uniform highp int u_faceId; @@ -61,11 +62,11 @@ fragment = highp float NdotR = clamp(dot(viewVector, reflectedLight), 0.0, 1.0); finalColor += pow(NdotR, u_shininess) * u_specularColor; - finalColor = (f_vertex.y > 0.0001 && -normal.y > u_overhangAngle) ? u_overhangColor : finalColor; + finalColor = (f_vertex.y >= 0.0 && -normal.y > u_overhangAngle) ? u_overhangColor : finalColor; highp vec3 grid = vec3(f_vertex.x - floor(f_vertex.x - 0.5), f_vertex.y - floor(f_vertex.y - 0.5), f_vertex.z - floor(f_vertex.z - 0.5)); finalColor.a = (u_renderError > 0.5) && dot(grid, grid) < 0.245 ? 0.667 : 1.0; - if (f_vertex.y <= 0.0) + if (f_vertex.y <= u_lowestPrintableHeight) { finalColor.rgb = vec3(1.0, 1.0, 1.0) - finalColor.rgb; } @@ -109,6 +110,7 @@ fragment41core = uniform lowp float u_overhangAngle; uniform lowp vec4 u_overhangColor; + uniform lowp float u_lowestPrintableHeight; uniform lowp vec4 u_faceColor; uniform highp int u_faceId; @@ -138,10 +140,10 @@ fragment41core = highp float NdotR = clamp(dot(viewVector, reflectedLight), 0.0, 1.0); finalColor += pow(NdotR, u_shininess) * u_specularColor; - finalColor = (u_faceId != gl_PrimitiveID) ? ((f_vertex.y > 0.0001 && -normal.y > u_overhangAngle) ? u_overhangColor : finalColor) : u_faceColor; + finalColor = (u_faceId != gl_PrimitiveID) ? ((f_vertex.y >= 0.0 && -normal.y > u_overhangAngle) ? u_overhangColor : finalColor) : u_faceColor; frag_color = finalColor; - if (f_vertex.y <= 0.0) + if (f_vertex.y <= u_lowestPrintableHeight) { frag_color.rgb = vec3(1.0, 1.0, 1.0) - frag_color.rgb; } @@ -157,6 +159,7 @@ u_overhangColor = [1.0, 0.0, 0.0, 1.0] u_faceColor = [0.0, 0.0, 1.0, 1.0] u_shininess = 20.0 u_renderError = 1.0 +u_lowestPrintableHeight = 0.0 [bindings] u_modelMatrix = model_matrix diff --git a/resources/shaders/striped.shader b/resources/shaders/striped.shader index 31ae2d5047..5c69f0675f 100644 --- a/resources/shaders/striped.shader +++ b/resources/shaders/striped.shader @@ -36,6 +36,7 @@ fragment = uniform mediump float u_width; uniform bool u_vertical_stripes; + uniform lowp float u_lowestPrintableHeight; varying highp vec3 v_position; varying highp vec3 v_vertex; @@ -64,7 +65,7 @@ fragment = highp vec3 viewVector = normalize(u_viewPosition - v_vertex); highp float NdotR = clamp(dot(viewVector, reflectedLight), 0.0, 1.0); finalColor += pow(NdotR, u_shininess) * u_specularColor; - if (v_vertex.y <= 0.0) + if (v_vertex.y <= u_lowestPrintableHeight) { finalColor.rgb = vec3(1.0, 1.0, 1.0) - finalColor.rgb; } @@ -112,6 +113,7 @@ fragment41core = uniform mediump float u_width; uniform mediump bool u_vertical_stripes; + uniform lowp float u_lowestPrintableHeight; in highp vec3 v_position; in highp vec3 v_vertex; @@ -144,7 +146,7 @@ fragment41core = finalColor += pow(NdotR, u_shininess) * u_specularColor; frag_color = finalColor; - if (v_vertex.y <= 0.0) + if (v_vertex.y <= u_lowestPrintableHeight) { frag_color.rgb = vec3(1.0, 1.0, 1.0) - frag_color.rgb; } @@ -160,6 +162,7 @@ u_opacity = 1.0 u_shininess = 20.0 u_width = 5.0 u_vertical_stripes = 0 +u_lowestPrintableHeight = 0.0 [bindings] u_modelMatrix = model_matrix diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 19d539cbde..df347ef8aa 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -1,3 +1,159 @@ +[4.10.0] +For an overview of the new features in Cura 4.10, please watch our video. + +*Native CAD import plugin +Ultimaker Professional and Excellence subscribers can now directly import native CAD files into Ultimaker Cura. +Enable this feature by downloading the Native CAD import plugin from the Ultimaker marketplace. + +*Flow visualization +In preview mode you can now visualize the flow. Contributed by khani3s. + +*Show loading plugins on startup +When starting Cura you will now see which plugins Cura is loading. + +*Add Z position parameter to FilamentChange +With the FilamentChange script you can now control all 3 coordinates. + +*Allow FilamentChange script to use Marlin M600 configuration +Contributed by Sekisback. + +*Double click on file in Digital Factory +When double clicking on a file in the open project dialog in Digital Factory it will now open in Cura. + +* Bug Fixes +- Fixed temperature exceptions for UM2+C material profiles. +- Fixed a bug where pause at height stops all extrusion if relative extrusion is used. +- Fixed authentication issues when logging into UM account. Contributed by fieldOfView. +- Fixed the pause-at-height retract with Repetier-flavour. +- Fixed erasing z-coordinate in the move tool to the value of 0. +- Fixed the limit range of layer view to only visible structures. +- Fixed a bug where Cura crashes when scaling a model on Linux. +- Fixed path minimum limit. +- Fixed a bug when using right to left language numbers were overlaying on text in the print settings. +- Fixed edge case with disabling bridging. +- Fixed a bug where some names with Unicode characters crashes Cura when trying to authorize. +- Fixed renaming groups. Contributed by fieldOfView. +- Fixed a bug when the seam was not placed in sharpest corner. +- Fixed the gantry height for S-line printers. +- Fixed a bug where a model is partially below build plate if center selected model is used. +- Fixed a bug where a tootip arrow appeared when the "Manage printers" button is hovered. +- Fixed a bug where assemblies were not arranged in the center of the build plate. + +* Printer definitions, profiles and materials. +- Add CC0.4 core and materials for S3 and S5. +- Updated Axi machine start gcodes, contributed by Synsuiter. +- Volumic 3D printer definitions, contributed by VOLUMIC. +- Anycubic Mega X and Anycubic Mega S, contributed by NilsRo. +- Updated Deltacomb printer profiles, contributed by kaleidoscopeit. +- eMotionTech Strateo3D materials and profiles, contributed by ChronosTech. +- Sovol SV03, contributed by balacij. +- Two Trees Bluer, Bluer Plus, Sapphire Pro and Sapphire Plus, contributed by Lester3DGadgets. +- Update Skriware 2, contributed by Lukkoz. +- Longer LK1, LK1 Pro, LK1 Plus, LK4, LK4 Pro, LK5, LK5 Plus and Cube 2, contributed by lowkeyjoe. +- Mingda D3, D4 and Rock3, contributed by cataclism. +- JGAurora A6, contributed by CrissR. + +Please, be aware that after version 4.10 Ultimaker Cura will only be supported on operating systems actively maintained by their software manufacturer or community. This means Windows 7 and MacOS 10.13 will no longer be supported. Technically this means Ultimaker will stop testing and developing for such operating systems. However, even though it is no longer supported, there is still a high likelihood the application keeps functioning. + +[4.9.1] +* PETG Profile update. +Ultimaker PETG profiles have been added. The Generic PETG profile for 2.85mm filaments has been updated as well. + +* Bug Fixes +- The second extruder should now prime properly again when using a prime blob. +- Reduced the flood of QML errors in the log file. Contributed by fieldOfView. +- Fixed a crash when entering layer view on MacOS 10.13.6. Contributed by jwrw. +- Fixed a crash when there was an inaccessible X: drive in Windows. Cura should no longer try to access the X: drive now. + +[4.9.0] +For an overview of the new features in Cura 4.9, please watch our video. + +* Digital factory integration. +Now you can open files directly from Digital Library projects. Then, after preparation, quickly and easily export them back. This feature is available for all users with an Ultimaker Essentials, Professional, or Excellence subscription. Learn more + +* "Line type" is now the default color scheme. +When entering the Preview mode, you don't have to switch manually to line type. + +* Z-seam is now clearly shown in preview mode. +This ensures that you will know whether the seam will be sufficiently hidden in the end product. This will also indicate the starting point of the print. + Thanks to BasF0 for contributing to this feature + +* New 'line width' color-scheme available in preview mode. +Line-width can now be selected as a color-scheme in preview mode. + +* Weight estimation in decimals. +This provides a more detailed idea of the amount of material used - which is especially useful for smaller prints. + +* Split Shell category into Walls and Top/Bottom. +The shell category was a mix of settings about walls and settings about top/bottom, splitting them into two categories makes more sense. + +* Post-processing script to embed screenshot in g-code. +The ability to have thumbnails embedded. Contributed by Gravedigger7789. + +* Add checkbox for Extruder Offsets. +Ability to enable or disable the extruder offsets to gcode. This will be enabled by default, unless it is in the printer's def.json file. Contributed by RFBomb. + +* Cura should work properly on MacOS 'Big Sur' now, afforded by upgrades to Python (to 3.8) and Qt (to 5.15). +If you had (UX, visual, graphics card) problems, specifically on (newer) MacOS versions, like Big Sur, you should be able to use this new version. + +* Bug Fixes +- Fixed a security vulnerability on windows permitting the openssl library used to launch other programs. Thanks to Xavier Danest for raising this bug. +- Fixed Connect Top/Bottom Polygons. +- Fixed closing Marketplace after quitting Cura. +- Fixed clicking on Marketplace button to go to web Marketplace. +- Fixed Pause at Height when using Repetier flavour. Contributed by EGOiST1991. +- Fixed correct desity for current PETG filaments. Contributed by kad. +- Fixed Pause at height post processing script that returns to right position. +- Fixed layer view being grayed out after reslicing. +- Fixed fan speed issue due to reuse of empty extruder plan. +- Fixed loading OBJ files with no texture references, but does have normal references. +- Fixed retraction/priming while extruder switches. Contributed by sisu70. +- Fixed loading script from all registered resource path. Contributed by fieldOfView. +- Fixed typeError: define_round_method. Contributed by Sophist-UK. +- Fixed missing layer with Hole Horizontal Expansion. +- Fixed Tree Support Floor layers. Contributed by ThomasRahm. +- Fixed Top Surface Skin Layers if Top layers = 0. +- Fixed recent files on opening as project. +- Fixed opening project file from command-line. +- Fixed thumbnail in UFP files. +- Fixed validator for floats in Machine Settings dialog. Contributed by fieldOfView. +- Fixed recessed areas at the bottom of a model while using Make Overhangs Printable. Contributed by OpusMcN. +- Fixed slicing grouped models if one of the group parts is below Z=0. +- Fixed material temperatures and fan speed for Anycubic i3 Mega. Contributed by trunneml. +- Fixed drop model down to buildplate when always drop to buildplate is disabled. +- Fixed drop objects to buildplate after scaling. +- Fixed disallowed areas while using Brim Line Widths. +- Fixed message for non manifold models. +- Fixed setting category arrows. Contributed by fieldOfView. +- Fixed metadate tags for 3MF files. +- Fixed engine crash when using low-density Cross Infill. +- Improved performance of loading .def.json files. + +* Printer definitions, profiles and materials +- 3DFuel Pro PLA and SnapSupport materials, contributed by grk3010. +- Cubincon Style NeoA31, contributed by HUNIBESTHyVISION. +- Eryone thinker series and Eryone ER20, contributed by Eryone. +- Flashforge DreamerNX, contributed by KeltE. +- Fused Form FF300, contributed by FusedForm. +- Geeetech A10 improved start and end gcode, contributed by TheTRCG. +- ideagen3D Sapphire and ideagen3D Sapphire Plus, contributed by Firedrops. +- INAT Proton X printers, contributed by MarkINAT. +- Koonovo, contributed by KOONOVO3DPRINTER. +- Liquid, contributed by alexgrigoras. +- Lulzbot TAZ Pro and Lulzbot Mini 2, contributed by spotrh. +- Maker Made 300x printer, contributed by skilescm. +- MINGDA D2, contributed by cataclism. +- Snapmaker 2.0, contributed by maihde. +- Sri Vignan Technologies, contributed by venkatkamesh. +- Syndaver AXI Machine, contributed by synsuiter. +- Tinyboy Fabricator Mini 1.5, contributed by reibuehl. +- Trimaker printers, contributed by tomasbaldi. +- TwoTrees Bluer, contributed by WashingtonJunior. +- Update Hellbot Magna 1 and Hellbot Magna dual, contributed by DevelopmentHellbot. +- Update Rigid3D and added Rigid3D Mucit2, contributed by mehmetsutas. +- Update TPU profiles for 0.6mm nozzle of UM2+C. +- ZAV series, contributed by kimer2002. + [4.8.0] For an overview of the new features in Cura 4.8, please see this video: Change log overview. @@ -299,1854 +455,5 @@ hussainsail2002 has contributed machine definitions for FabX Pro and print profi * Disclaimer: Third-party machine definitions are accepted as contributed, and are not tested or maintained in any way by the Cura development team. [4.5.0] -* Ultimaker Marketplace sync. -Plugins and print profiles downloaded from the Ultimaker Marketplace will now become associated with your Ultimaker account when logged in. If changes are detected in your installation after logging in, an option to sync a list of available packages will become available. You can also add packages to your installation using the web-based Ultimaker Marketplace. -* Layer preview number. -The layer slider number in preview mode is now at the top, instead of on the left, for a neater fit next to the settings panel. - -* Project name in window title. -In the same way your browser shows the page title next to the name of the application, Cura now shows the name of the loaded file in the title bar. - -* Fuzzy skin outside only. -When enabled, this option prevents fuzzy skin inside holes. This way you can still fit your prints around other things – useful for printing grips or similar applications. - -* Brim distance. -This new setting contributed by SmartAvionics allows you to define a gap between the brim and the model for easier brim removal and reduced chance of leaving a mark on the finished piece. - -* 'Skin Edge Support' settings. -It’s now possible to add an extra line inside your infill that supports the edge of the skin better. Two new settings contributed by SmartAvionics control this feature: ‘Skin Edge Support Thickness’ and ‘Skin Edge Support Layers’. Find these under ‘Infill settings’. - -* Bridge over low density infill. -SmartAvionics has contributed a new setting that determines if the infill density in a location is lower than the specified infill density, skin and walls above it should be treated as bridging. - -* Shared heater. -A new ‘Shared heater’ checkbox has been added to the machine settings page to support printers that have one nozzle and one heater, but multiple feeders. When enabled, heating and pre-heating procedures act differently so that the nozzle doesn’t cool down for the stand-by temperature or the initial/final printing temperatures. Contributed by SmartAvionics. - -* Material mixing. -A new post-processing script can be used to mix materials if you have a mixing nozzle. Mix materials of different colors in order to print in a different color than either of your currently loaded materials. Contributed by Hrybmo. - -* Infill mesh planning. -Another contribution from SmartAvionics optimizes the order in which infill meshes print their parts. It now takes the previous location into account instead of always the starting location. - -* Automatic extruder values. -Automatic extruder values are now added for dual extrusion when slicing via the command line. - -* Gamma correction for lithopanes. -Loading an image file into Cura creates a heightmap that can be used to make lithopanes. BagelOrb has altered the method of calculating this to apply gamma correction, so that the lightness of the pane is more truthful to the original lightness. - -* Support for alpha channels in ImageReader. -Added support for images with transparency, such as PNGs. When using an image with transparency, the contours of the transparent layer will be followed. Contributed by BagelOrb. - -* Speed up plugin loading. -fieldOfView has contributed a code optimization to load plugins faster on start. Mileage may vary, but Cura’s startup speed should see a marked improvement. - -* Crash logging. -We switched to a more robust provider for crash analytics, so we can develop a more stable product for you. We also added some extra datapoints to crash reports. - -* Scene re-rendering. -A new performance enhancement that limits re-rendering of the application interface from ‘constant’ to ‘only-when-necessary’. - -* HTTP request handling. -Previous versions used different ways of handling HTTP requests. This version uses a unified method, for better performance. - -* Job names less sensitive to being touched. -A contribution from fieldOfview has fixed an issue where the jobname in the bottom-left of the scene is no longer made static by clicking on it. If you load a model and change to another printer, the prefix is now correctly updated. - -* Property checks on instance containers. -A new speed optimization for reading setting values from profiles. - -* Native support has been added for the following third-party printers. Find them in the ‘Add printer’ list. -- BeamUp S. Contributed by Beamup3D. -- Anet3D. Contributed by springtiger. -- Lotmaxx. Contributed by sm3dp. -- eMotionTech. KOUBeMT has contributed updates to eMotionTech materials and the Strateo3D printer. -- HMS434. Updates contributed by maukcc. -- 3D Tech. Contributed by dvdsouza. -- Skriware 2. Contributed by skriDude. -- Leapfrog Bolt. Contributed by VincentRiemens. -- Makeblock mCreate. Contributed by pkz0313. -- Voron2. Contributed by Fulg. - -* Bug fixes -- Fixed a bug in some Windows graphics drivers that would prevent Cura from starting. -- Round interpolated Z values when spiralizing. Contributed by SmartAvionics. -- Corrected build plate temperature limits for Ultimaker S-line printers. -- Fixed delete button on Apple keyboards to delete selected models. -- Fixed an issue where selecting ‘all settings’ visibility in custom mode would override a custom selection of settings when switching back. -- Min x/y distance on sloped walls. Contribution from SmartAvionics that uses minimum x/y distance when the layer below protrudes beyond current layer (i.e. sloped walls). -- Speed up for determining the print order when many parts are in the scene. Another contribution from SmartAvionics. -- Fixed an issue where overlapping volumes interfered with each other when in surface mode. Contributed by BagelOrb. -- Fixed a wrong extrusion move between the last x/y position and the ‘park head to take a photo’ position in the timelapse post-processing script. -- Fixed an issue where window sizes weren’t saved when closing Ultimaker Cura. Contributed by fieldOfView. -- Fixed an issue where a duplicate brim was created when adhesion and a prime tower brim was enabled at the same time. Contributed by SmartAvionics. -- Fixed an issue where settings are lost when switching between printers within a group of network-connected printers. -- Fixed an issue where one-at-a-time mode was marking models as unprintable even though they were. -- Fixed an issue where there was a huge extrusion move after bridge wall lines. -- Prevent "Minimum Support Area" causing support to intersect with the model. This has been fixed by SmartAvionics. -- Fixed running Qt with alternative Qt versions. This has been fixed by SmartAvionics. -- Fixed "Retraction Minimum Travel". This has been fixed by SmartAvionics. -- The model no longer flips upside-down when using Lay Flat on a mirrored object. -- Improved the spinning animation in the splash screen. -- The horizontal layer progress bar no longer gets obscured by the print action panel. -- Fixed an issue where the specified extruder for brims would not extrude for every brim when working with multiple models in one-at-a-time mode. -- Fixed style inconsistencies when using dark mode with the intent profile selection. -- Fixed pause at height pausing too late. -- Fixed the Material Volume Between Wipes setting not functioning at all. -- Fixed an issue where comments were stripped out of G-code in start/end G-code fields. -- Fixed an issue where changes did not show up when creating, deleting, renaming, or duplicating print profiles for some printers. -- Removed hidden printers from the user's profile folder, which were causing Cura to slow down sometimes. -- Improved performance of discovering printers on the network using Zeroconf. -- The ‘Support Wall Line Count’ setting now applies to tree support as well. The specific setting for Tree Support has been removed. -- Fixed random crashes when loading project files for custom FFF printers. -- Fixed an issue where a duplicated material profile would assign values in the wrong fields. -- Fixed an issue where large areas of concentric skin would accumulate small errors. Contributed by SmartAvionics. - -[4.4.1] -* Bug fixes - - Fixed problem where wrong material was selected by default. - - Fixed a problem where custom profiles were disappearing when loading a project without a nozzle profile. - -[4.4.0] -*Intent profiles. -What’s the intent of your print? A rapid prototype? A visual prototype? An end-use part with specific holes sizes? Intent profiles accelerate the CAD-CAM workflow by preconfiguring all the right settings in Ultimaker Cura for each of these use cases. Simply select a profile that matches the intent of your design, slice, and you’re ready to print immediately, without the need to adjust the typical settings. For now, there are three Intent profiles: -*‘Draft’ -Intended for initial prototypes and concept validation, and will print your design in the shortest time possible. -*‘Engineering’ -Intended for high-dimensional accuracy, to print functional prototypes and mechanical end-use parts. -*‘Visual’ -Intended for visual prototypes and prints that need excellent aesthetic quality. -For now, these profiles work for the Ultimaker S5 and Ultimaker S3 with Ultimaker PLA, Tough PLA, and ABS materials, and include PVA and Breakaway combinations. More profiles will follow over time. - -*Per-model settings. -Per-model settings are a set of very powerful features for users who need to tweak specific settings in specific parts of the model. In previous releases these were buried in the interface somewhat, so this release has made them more discoverable with clear icons in the toolbar, so everyone can discover them. The per-model settings can now be accessed both when working from the recommended and the custom print settings mode. - -*Specify network printer. -When connected to an Ultimaker Connect group of multiple printers, Ultimaker Cura once again shows a pop-up to select a designated printer for your printjob. This functionality had been disabled in the last version to ensure reliability when printing remotely. - -*Performance improvements. -Various tweaks under the hood for a snappier, more responsive interface. This improvement is most noticeable when switching extruders, print profiles, hovering over tooltips and when scrolling through the print settings list. - -*SDK version increment. -The changes made in version 4.4 (mainly for intents but also other things) are so thorough that we needed to do a major increment of the SDK version. Contributors – please update your packages! - -*Pause at height message. -A setting has been added to the pause at height script that displays a custom message on screen. This can be used to give instructions to operators to perform an action during the pause, e.g. ‘Place 626 bearings in slots now’. - -*Restore window preference. -https://github.com/fieldOfView has contributed a new preference around restoring the previous window position/size to the last used position/size on start up. This would be a workaround for those setups where starting Ultimaker Cura on a secondary screen will prevent it from working. - -*Group Linux instances. -https://github.com/MatthewCroughan has contributed a fix so that multiple instances of Ultimaker Cura get grouped in one application group in Gnome (the Linux front-end). It adds a bit of metadata to the .desktop file so that the windows can be grouped. - -* Known bugs -Cura not starting on Windows 10. Some users started reporting that Ultimaker Cura 4.3 and higher did not start properly, fur unknown reasons. We have implemented some code to get a better understanding of the issue, but we have not been able to fix it just yet. -As a quick fix: Go to the install path, by default “C:\Program Files\Ultimaker Cura 4.4”. Right click Cura.exe and select ‘properties’. Click the ‘compatibility’ tab and select “Run This Program in Compatibility Mode For: Windows 8”. If this does not fix your issue, please contact your service provider. - -* Minor improvements - - Reweighting stages. - - Small plug-in system improvements - - Add RetractContinue post-processing script. - - Add DisplayRemainingTimeOnLCD post-processing script by https://github.com/iLyngklip - - Thickness of the very bottom layer - -* Updated third party printers - - Strateo3D. https://github.com/KOUBeMT has updated the machine profile for Strateo3D. - - Key3D Tyro. https://github.com/DragonJe has created a definition, extruder, and profiles for the Key3D Tyro. - - Prusa i3 MK3/MK3S printer. https://github.com/samirabaza has contributed the latest definition for Prusa i3 MK3/MK3s made by Prusa Research with a minor modification to fit in Prusa folder under "add printer". - - Hellbot printer. https://github.com/F-Fischer has contributed a machine profile for the Hellbot printer. - - HMS434 update by https://github.com/maukcc - - Add CR-10 MAX and Ender-5 plus by https://github.com/trouch - - Modify Cubicon device profile by https://github.com/HUNIBEST-HyVISION - - Add Cubicon printer definitions by https://github.com/HUNIBEST-HyVISION - -* Bug fixes - - Re-calculating retraction-safe area with every wall by https://github.com/smartavionics - - Fix Normals after Mirror Operation - - Crash when loading PJ with creality - - Per-object setting stacks checked for errors even if they are empty by https://github.com/smartavionics - - getAngleLeft gives wrong results when lines are colinear - - Lots of qml warnings regarding MaterialsTypeSelection.qml - - PR: Avoid unwanted travel with ironing by https://github.com/smartavionics - - PR: Remove all travel moves < 5um by https://github.com/smartavionics - - AMF files are mirrored - - Changes to Material diameter do not get applied - - Long string of text on profile names goes through borders - - CURA 4.3 - Crash when connecting networked Ultimaker S5 - - Layer slider falls behind action panel, on low resolution displays only by https://github.com/AMI3 - - Deleting profiles will not update the size of the drop-down menu - - Create / Update / Discard options are enabled when they should be greyed out - - Scroll bar for profile dropdown - - Can't change printhead X/Y Min/Max - - Syncing to a printer that has both nozzles disabled causes Cura to crash - - Project file open behavior preference is ignored when opening from command line. - - Create CFFF printer and change nozzle diameter will cause a crash - - Pause At Height resumes with wrong speed - - One-at-a-time ordering wrong - - Fix license extraction from CuraPackage - - Invalid firmware for UM2 update continues forever - - Infill inset too much with connected lines and thicker infill by https://github.com/smartavionics - - Reworked line polygon crossings by https://github.com/smartavionics - - -[4.3.0] -*Ultimaker S3. -This release includes a new profile for our latest S-line of 3D printers: the Ultimaker S3. Eagle-eyed beta testers may have noticed this extra printer profile in the beta release, too. Well done to those who spotted it. Learn more about the Ultimaker S3 by reading the blog on Ultimaker.com. - -*Even more 3D file formats. -This version is compatible with even more 3D file formats out-of-the-box, so you can integrate CAD software, 3D scanning software, and 3D modeling software into your workflow with ease. Natively open Collada, GLTF, OpenCTM, and PLY formats, to name a few. And don’t forget, downloading plugins from the Ultimaker Marketplace brings in support for many more. - -*Align faces to the build plate. -Orienting your models with the rotation tool or the lay flat tool can be a hassle with complex geometries. This new time-saving feature lets you select a face of your model to rest on the build plate, so you can get the orientation you need quickly and easily. Please note this is disabled in compatibility mode (and if your machine is running OpenGL 3.2 or lower). - -*Support infill/interface line directions. -Improve reliability with more precise control over certain aspects of your print. Choose the angle that support-infill and interfaces print at, thanks to a contribution from vgribinchuck. Input a set of angles you want lines generated at, and these will be placed sequentially throughout your 3D print. - -*Randomize infill start. -Randomize which infill line is printed first. This distributes strength across the model, preventing one segment becoming the weakest link, at the cost of an additional travel move. - -*Print small features slower. -Smartavionics has contributed a setting which recognizes small perimeters and reduces print speed in order to boost the reliability and accuracy of small printed features. This is especially useful for small perimeters such as printed holes, as they tend to get ripped away from the build plate easily due to their low contact area. - -*Easy selector for Z seam positions. -Z seams are now easier to position on your model, thanks to a contribution by trouch. A drop down selection box has been added to custom mode, giving you a list of presets to place the z seam on your model. - -*Colorblind assist theme. -Nubnubbud has added a new theme for colorblind users which makes more distinction between colors, such as the yellow/green line colors in the layer view. - -*DisplayFilenameAndLayerOnLCD script. -Some improvements for this post processing script from the community. N95JPL has contributed updates to offer a wider range of optional information. Adecastilho has contributed updates so that the layer count is displayed before the filename to prevent the layer number getting truncated in the event of long filename, as well as an option to start layer count at either 0 or 1. The ':' in the display string has also been removed as it is a GCODE command that splits the line into two different commands. - -*Peripheral information for output devices. -Architectural changes in Ultimaker Cura to allow display information about peripherals in the printer output device, so that I can use it to later on show that information in the Monitor stage plugin. - -*Quality changes on import. -Users can now import profiles that have been created on a different machine other than the active one. - -*Remove prime after coasting. -Reduce the visibility of the z seam when printing with coasting by preventing nozzle priming. - -*Map Material Station slot data. -The available configurations drop down will display information about a Ultimaker S5 Material Station if connected. Read more about the Ultimaker S5 Material Station on ultimaker.com - -*Manage Printer link. -Added a “Manage Printer” link in the monitor tab which takes you to Ultimaker Connect. - -*Improvement in code quality. -Improved code quality resulting in improved stability. - -* Bug fixes -- Uninstall in silent mode. Fixed an issue where a dialog displays when uninstalling in silent mode. -- Build Interface if Support is Present. In some cases, support could be pushed away by large support XY distance, but interfaces could be left on overhangs which leads to situation when interface is generated without support. This has been fixed. -- Install in silent mode. The bundled Arduino driver is signed by a certificate that's not trusted on Windows by default, so there was no way to suppress the prompt or to have the installer skip driver installation. This has been fixed. -- 3MF project printer connection not included. When loading a project file that was saved while a network connection was active, the network connection is not re-established. This has been fixed. -- Thin Walls broken. Fixed an error with thin walls being broken. -- Tray icon remaining. Fixed a bug where the tray icon would remain after closing the application. -- Marketplace text. Fixed an issue where Marketplace text is blurry on some screens -- Unsupported profile imports. Fixed an issue where exported profiles could not be reimported. -- Loading file message. Added visual feedback when loading files such as STLs -- Loading GCODE on disabled extruders. Fixed an issue where GCODE imported using multi-extrusion fails to load if an extruder is disabled. -- Support brim with concentric support pattern. Fixed an issue where support would be in mid-air. -- Reduced cloud logging. Logging has been reduced for cloud connections on unstable connections. -- Application menu extruder menu. Fixed an issue where changing the extruder via the application menu didn’t work. -- Tool handles move when rotating. Fixed an issue where rotate tool handles would change location when rotating. -- F5 reload. Fixed an issue where F5 doesn't reload GCODE. -- Application not starting before the splash screen. Fixed an issue where the application wouldn’t start before the splash window. -- Qt 5.13 crashes. Fixed an issue where the ShaderEffect crashes using Qt 5.13 -- Can’t select other materials in print setting tab. Fixed an issue where other materials couldn’t be selected using the print settings tab. -- Drop down to buildplate after resize. Models don’t drop down to the build plate if they are scaled down from ‘too large to fit’. -- Unsupported quality profiles. Fixed unsupported quality profiles appearing for 0.25 + 0.8 print core combinations. -- 'Arrange all models' for groups. Fixed an issue where arrange all models hangs for grouped models. -- Update Checker not working. Fixed this so that updates are visible if using a legacy version. -- Missing support brim. Fixed an issue where support brim was missing if platform adhesion set to ‘None’. -- Multiply non-normal mesh doesn't work. Fixed instances where processes stopped and messages would hang. -- Settings not updating in GUI with inheritance. Fixed settings not updating GUI with inheritance. -- Prevent 'generic'-part in name of specific materials. Introduced checks for ‘generic’ material types to help material categorization. -- Hide temperature settings. The "Default Print Temperature" setting is currently editable, but editing this setting can cause problems with temperatures later especially when you have it in your custom profile. We decided to hide this setting so users can no longer edit it in the later releases to avoid confusion. The "Default Build Plate Temperature" has also been hidden because it causes a similar issue. -- Add machine_heated_build_volume. Introduced a new machine_heated_build_volume machine-setting, which is set it to false by default, and only set it to true for the Ultimaker S5. Users can alter their own definition if they do have a heated build volume. -- Z-hops on first layer. First move other start GCODE not z-hopped. Contributed by sailorgreg. -- Preserve extruder-only moves in post stretch script. Contributed by sgtnoodle. -- “Print via Cloud” is no longer possible without an Internet connection -- Monitor tab no longer sometimes shows incorrect printer name or type -- Long print job names are no longer overlapping other text in the monitor tab -- “Connected to Cloud” pop-up now only displays when the currently selected printer is connected to Ultimaker cloud. -- Monitor tab is no longer greyed out when idle. - -*Third-party printer definitions -New machine definitions added for: -- IMADE3D Jellybox. Contributed by filipgoc for IMADE3D Jellybox printers, which adds JellyBOX 2 printer and revises settings of JellyBOX Original. -- Vertex Nano. Contributed by velbn -- Felix Pro 2. Contributed by pnks -- JGAurora A35. Contributed by pinchies. -- eMotionTech Strateo3D. Contributed by KOUBeMT. -- NWA3D A31. Contributed by DragonJe. - -[4.2.0] -*Orthographic view. -When preparing prints, professional users wanted more control over the 3D view type, so this version introduces an orthographic view, which is the same view type used by most professional CAD software packages. Find the orthographic view in View > Camera view > Orthographic, and compare the dimensions of your model to your CAD design with ease. - -*Object list. -Easily identify corresponding filenames and models with this new popup list. Click a model in the viewport and its filename will highlight, or click a filename in the list and the corresponding model will highlight. The open or hidden state of the list will persist between sessions. How convenient. - -*Print previews. -Some improvements have been made to print previews displayed in the monitor tab, Ultimaker Connect, or the Ultimaker S5 interface. In some instances, previews were clipped at the bottom or side, and sometimes models outside of the build plate area were visible. This is all fixed now. - -*AMF file compatibility. -Ultimaker Cura now supports AMF (Additive manufacturing file format) files out-of-the-box, thanks to an AMF file reader contributed by fieldOfView. - -*Slice button delay. -After clicking ‘Slice’, a lack of response could lead to frustrated buttonclicking. This version changes the button text to read ‘Processing’ during any pre-slicing delay. - -*Layer view line type. -The line type color scheme in the layer view has been tweaked with new colors for infill and support interfaces so that they can be distinguished better. - -*Nozzle switch prime distance. -Certain materials “ooze” more than others during retraction and long moves. Vgribinchuk has contributed a new setting that lets you finetune the restart distance, so that the full extrusion width is achieved when resuming a print. - -*Smart Z seam. -A new option to increase the aesthetic quality of your prints has been added to custom mode, under Z seam settings. Smart Z seam works by analyzing your model’s geometry and automatically choosing when to hide or expose the seam, so that visible seams on outer walls are kept to a minimum. - -*Separate Z axis movements. -Z axis movement handling has been improved to reduce the chance of print head collisions with prints. - -*Flow per feature. -You can now adjust material flow for specific features of your print, such as walls, infill, support, prime towers, and adhesion. This allows line spacing to be controlled separately from flow settings. - -*Merge infill lines. -We did some finetuning of the CuraEngine to improve print quality by filling thin infill areas more precisely and efficiently, and reducing movements that caused excessive gantry vibration. - -*Z hop speed. -The Z hop speed for printers with no specific speed value would default to ‘299792458000’ (light speed!) The new Z hop speed setting ensures that all Z hops are performed at a more sensible speed, which you can control. - -*Support tower diameter. -The ‘Minimum diameter’ setting for support towers has been renamed to ‘Maximum Tower-Supported Diameter’, which is more accurate and more specific because it mentions towers. - -*Square prime towers. -Circular prime towers are now the default option. Square prime towers have been eradicated forever. - -*Third-party printer order. -The ‘add printer’ menu now includes third-party printers that are ordered by manufacturer, so that specific machines can be found easily. Printer definitions. New machine definitions added for: -- Anet A6 contributed by markbernard -- Stereotech ST320 and START contributed by frylock34 -- Erzay3D contributed by Robokinetics -- FL Sun QQ contributed by curso007 -- GeeTech A30 contributed by curso007 - -*Creawsome mod. -This version has pulled the Creawsome mod, made by trouch, which adds a lot of print profiles for Creality printers. It includes definitions for Creality CR10 Mini, CR10s, CR10s Pro, CR20, CR20 Pro, Ender 2, Ender 4 and Ender 5, and updates the definitions for CR10, CR10s4, CR10s5 and Ender3. The CRX is untouched. Pull requests are now submitted that merge the mod into mainline Cura. - -* Bug fixes -- Noto Sans. Noto Sans was introduced as the default font in Ultimaker Cura some versions ago, but until now it wouldn’t render properly in the application unless already installed on your computer. This release forces the application to render Noto Sans even when it’s not installed as a font on your computer. Fun fact: Ultimaker recently rebranded, and we made Noto Sans our corporate font as well. -- Reslice with per-model settings. When slicing a model with per-model settings, a change of one of the per model settings would not trigger a reslice. This has been fixed. Serial port interruptions. This version adds a way to stop serial connections if you add command line parameters. -- Print one-at-a-time blob. In print-one-at-a-time mode, prime blobs could cause obstructions and cause prints to fail. This has been fixed. -- Prime tower brim overlap fix. Fixed an issue where models on the build plate could overlap with brims of other models. -- Wrong printer name. Fixed an issue where Ultimaker 3D printers that are synchronized over the network would display ‘Extruder 1’ in place of the printer’s hostname. -- Unnecessary travel at print start. Fixed an issue where printing without a prime blob would cause the print head to make a 10 mm travel move for no reason. -- Stair step height. This version fixes support stair step height, which influences the adhesion between the model and support printed on top (supports everywhere). For now, this bug has had no influence on PVA supported prints. - -[4.1.0] -*Draggable settings panels -There was a lot of feedback from the 4.0 release about the collapsible settings panels. Based on this feedback, we decided to make them completely draggable. The print settings panel (prepare stage) and the color scheme panel (preview stage) can now be dragged and positioned anywhere in the 3D viewer. A double click of the header will reset each to their default position. - -*Updated onboarding flow. -The onboarding flow on first startup has been updated with a look and feel more in line with the new interface. A series of setup steps will be shown, including Welcome, User agreement, Change log, the option to add a (networked) printer, and the option to sign up/sign in with an Ultimaker account. - -*Add printer menu. -Various updates in the ‘Add printer menu’. The machine settings menu has been updated in line with the new look and feel of the interface, and it's now possible to directly add machines from discovered network printers. - -*Expert settings visibility. -Previously, new settings weren't displayed in the expert preset even though they were expert-level settings. The latest features (e.g. Prime tower brim) are now included in the expert preset, for easy access. - -*Experimental print profile indicator. -When an experimental print profile is activated, the settings panel header will now display an "Experimental" tag. - -*Printing guidelines. -More information about how to print advanced materials can be quickly and easily accessed via the interface. When a material is chosen in the configuration selector, an icon will appear next to it, which when clicked will direct the user to a 'Printing Guidelines' page specified by the print profile supplier. - -*Increased rendering speed. -Rendering speed improvements that should be quite noticeable with multiple objects on the build plate. - -*Layer change script. -This new post-processing script injects custom Gcode on a layer change, so that manual commands can be defined, e.g. park the print head. Contributed by wporter82. https://github.com/wporter82 - -*Prime tower brim. -Prime towers might need the extra adhesion of a brim even when the model doesn’t, so an option for a prime tower to print with a brim independently of the model has been added. This setting is available when the adhesion type is set to 'None', 'Skirt' or 'Brim', and the prime tower is enabled. Currently this option doesn’t work with rafts. - -*Prime tower Gcode comments. -Gcode now contains comments to indicate when a prime tower is printed, like so: {code};TYPE:PRIME-TOWER{code} - -*Maximum deviation setting. -Previously, the maximum deviation was hard-coded in CuraEngine to be half of the maximum resolution. A new setting has been added that sets the maximum allowed deviation from the original polygon when reducing model resolution. If line segments are shorter than the maximum resolution, they are removed, unless this introduces a deviation greater than the maximum deviation. - -*Gyroid support. -Smartavionics has contributed a new option for a gyroid support pattern, similar to his gyroid infill contribution. A gyroid pattern is relatively efficient with material, so gyroid patterns permeable to water can dissolve faster. It’s also easier to pull gyroid structures off your model with pliers compared to some other support patterns. https://github.com/smartavionics - -*Purchase materials. -The Marketplace now includes a direct link to a site where users can buy specific materials to work with the corresponding print profile. The link is specified by the print profile supplier through the contributor portal. - -*Marketplace notifications. -When a plugin or print profile in the Marketplace has updates, a badge notification will appear over the Marketplace button and installed packages tab, prompting you to update. - -* New third-party definitions: -- NWA3D A5. Contributed by DragonJe. https://github.com/DragonJe -- Anycubic Chiron. Contributed by BluefireXD. https://github.com/BluefireXD -- Alfawise u30. Contributed by NicolasNSSM. https://github.com/NicolasNSSM -- Cubicon. Contributed by Hyvision. https://github.com/Hyvision -- Wanhao Duplicator 9. Contributed by matshch. https://github.com/matshch -- Creality 3D-X. Contributed by steverc1572 https://github.com/steverc1572 -- Z-Bolt. Contributed by alexkv. https://github.com/alexkv -- TiZYX Evy. Contributed by ValentinPitre. https://github.com/ValentinPitre -- FLSUN QQ. Contributed by ranfahrer. https://github.com/radfahrer -- Structur3D Silicone. Contributed by afinkle. https://github.com/afinkle -- TiZYX Evy Dual. Contributed by ValentinPitre. https://github.com/ValentinPitre - -*Bug fixes: -- Fixed an issue where the application crashed when opening the Ultimaker Marketplace after being logged in for more than 10 minutes. This was due to an expired token when checking network requests. -- For PLA-PLA support combinations, the horizontal expansion value has changed from 0.2 to 0 by default. This fixes an issue where unnecessary support is generated. The default value for PVA remains the same. -- Fixed an issue where choosing to "Update Existing" profile during project file loading did not overwrite the current settings with what was in the project file. -- Removed the GFF and CFF materials from this version onwards. These materials are intended only for testing and are incompatible with the Ultimaker 2+ -- Fixed an issue where the maximum resolution setting removed more vertices than necessary. -- Improved gyroid infill to stop very small (less than 10 uM) line segments being created when the gyroid infill lines are connected, increasing print consistency and reliability. Contributed by smartavionics https://github.com/smartavionics -- Previously, disabling build plate adhesion would also disable support brim settings. A support brim can now be enabled independently of build plate adhesion. -- Improved combing moves over thin model areas. Contributed by smartavionics https://github.com/smartavionics -- Fixed an issue where the printer selector panel text would exceed the boundaries of popups in languages other than English. -- Removed the ability to create print profiles with duplicate names in the print profile manager. Print profiles with the equal names would eventually lead to crashes or undefined behavior. -- Fixed an issue where the application would not remember the previous save path after saving again in the same session. -- Older machines running Mac OS X don't always support OpenGL 4.0+. For better performance the software can now detect if a machine doesn’t support it, and use OpenGL 2.0 instead. Contributed by fieldOfview. https://github.com/fieldofview -- Fixed an issue where the application would crash when selecting the support eraser tool. -- Fixed an issue where Z seams didn’t snap to the sharpest corner. -- Fixed issues where prints would have imperfections and on vertical surfaces. - -[4.0.0] -*Updated user interface -Ultimaker Cura is a very powerful tool with many features to support users’ needs. In the new UI, we present these features in a better, more intuitive way based on the workflow of our users. The Marketplace and user account control have been integrated into the main interface to easily access material profiles and plugins. Three stages are shown in the header to give a clear guidance of the flow. The stage menu is populated with collapsible panels that allow users to focus on the 3D view when needed, while still showing important information at the same time, such as slicing configuration and settings. Users can now easily go to the preview stage to examine the layer view after slicing the model, which previously was less obvious or hidden. The new UI also creates more distinction between recommended and custom mode. Novice users or users who are not interested in all the settings can easily prepare a file, relying on the strength of expert-configured print profiles. Experienced users who want greater control can configure over 300 settings to their needs. - -*Redesigned "Add Printer" dialog -Updated one of the first dialogs a new user is presented with. The layout is loosely modeled on the layout of the Ultimaker 3/Ultimaker S5 "Connect to Network" dialog, and adds some instructions and intention to the dialog. Contributed by fieldOfView. - -*Updated custom mode panel -Based on feedback from 4.0 beta, the custom mode panel is now resizable to make more settings visible. The set position will persist between sessions. - -*Monitor tab -Updated the monitor tab interface for better alignment with Cura Connect interface. - -*Remote printing -Use your Ultimaker S5 printer with an Ultimaker account to send and monitor print jobs from outside your local network. Requires firmware 5.2 (coming soon). - -*User ratings for plugins -With an Ultimaker account, users can now give feedback on their experience by rating their favourite plugins. - -*Integrated backups -‘Cura backups’ has been integrated into Ultimaker Cura and can be found in the ‘extensions’ menu. With this feature, users can use their Ultimaker account to backup their Ultimaker Cura configurations to the cloud for easy, convenient retrieval. - -*Plugin versioning -Newer plug-ins can't load in older versions if they use newer features, while old plug-ins may still load in newer versions. - -*LAN and cloud printer icons -Users can now quickly see if their printer is network or cloud enabled with new icons. - -*Improved UI speed -This version switches faster between extruders and printers. Your mileage may vary depending on your system specifications. - -*Floats precision -No settings in Ultimaker Cura require more than three digits of precision, so floats in setting input fields have been limited to three digits only. Contributed by fieldOfView. - -*Minimum support area -This feature allows set minimum area size for support and support interface polygons. Polygons which area are smaller than set value will not be generated. Contributed by vgribinchuk/Desktop Metal. - -*Lazy Tree Support calculation -In previous versions, 95% of Tree Support’s computation time was used to calculate the collision volumes to make sure that the branches avoid collisions with the meshes. Now it calculates these volumes only when necessary, reducing the computation time. Contributed by bjude. - -*CPE and CPE+ comb retractions -Changed all CPE and CPE+ profiles to travel up to 50 mm without retraction, decreasing blobs caused by combing long distances. - -*Marketplace improvements -Added optimizations to show a support site instead of an email address, increased the number of lines that are shown for the description, and show a 'website' link so people can order material directly. - -*Arduino drivers silent install -Previous versions stopped silent installation because the Arduino drivers packaged with Cura are not signed. Arduino drivers are now skipped when performing a silent install. - -*New third-party definitions -- Wanhao. Updated printer profiles to use new travel_speed macro (Contributed by forkineye). -- JGAurora A1, A5 and Z-603S (Contributed by pinchies). -- Alfawise U20 (Contributed by pinchies). -- Cocoon Create ModelMaker (Contributed by pinchies). -- Ender-3. Updates to the printer definition (Contributed by stelgenhof). - -*Bug fixes -- Fixed an issue which prevented slicing when per extruder settings were changed with a disabled extruder. -- Improved handling of non-Ultimaker network connected printers within Ultimaker Cura. Contributed by fieldOfView -- Fixed an issue where printing with the second extruder only would retract material unnecessarily. -- Fixed an issue where outdated plugins remained partially activated. -- Fixed an issue where combing was not working when tweaking Retraction minimum travel. -- Fixed an oversized print head collision zone when using print one-at-a-time mode. -- Due to inaccuracy of floats in very large prints, the position is reset again several times using "G92 E0" commands. -- Improved update checker text for better readability. -- Updated the implementation of 3MF in Ultimaker Cura for better consistency with 3MF consortium specifications. -- Removed all final and initial print temperature offsets, and increased first layer print temperature to fix under-extrusion problems. -- Holding shift and rotating a model on its axis for fine-grained rotations would sometimes pan the camera. This has now been fixed. -- Added file type associations for .gcode and .g extensions. -- Marked some more profiles as experimental. -- Fixed an issue where duplicated PLA with a different label would replace the original PLA entry. -- Updated which profile new materials are based when you create a brand new material. Contributed by fieldOfView. -- Fixed adhesion type errors on startup. -- Fixed an issue where system tray icons would remain when Ultimaker Cura is closed until mouse-over. -- Added extra tooltip to give extra information about start/end g-codes. -- Fixed an issue where clicking 'Create Account' would go to login instead of sign-up. -- Fixed an issue where the legacy profile importer would generate corrupt profiles. -- Fixed an issue where Ultimaker Cura could crash on start-up during the upgrading of your configuration to the newest version for some people. -- Fixed an issue where Ultimaker Cura would crash after downloading plugin from Marketplace. -- Ignores plugins folder when checking files for version upgrade. Start-up is now much faster if you've installed a lot of plugins or have used many versions of Ultimaker Cura. -- Fixed an issue where the firmware checker shows up when there is no internet connection. -- Fixed an issue where settings could not be made visible again after hiding all settings. -- Fixed false configuration error for CC Red 0.6 core after a version upgrade. -- Fixed an issue where a warning is issued when selecting a printer with no material loaded. The extruder will now be disabled instead. - -[3.6.0] -*Gyroid infill -New infill pattern with enhanced strength properties. Gyroid infill is one of the strongest infill types for a given weight, has isotropic properties, and prints relatively fast with reduced material use and a fully connected part interior. Note: Slicing time can increase up to 40 seconds or more, depending on the model. Contributed by smartavionics. - -*Support brim -New setting that integrates the first layer of support material with the brim’s geometry. This significantly improves adhesion when printing with support material. Contributed by BagelOrb. - -*Cooling fan number -It is now possible to specify the cooling fan to use if your printer has multiple fans. This is implemented under Machine settings in the Extruder tab. Contributed by smartavionics. - -*Settings refactor -The CuraEngine has been refactored to create a more testable, future-proof way of storing and representing settings. This makes slicing faster, and future development easier. - -*Print core CC 0.6 -The new print core CC 0.6 is selectable when the Ultimaker S5 profile is active. This print core is optimized for use with abrasive materials and composites. - -*File name and layer display -Added M117 commands to GCODE to give real-time information about the print job file name and layer number shown on the printer’s display when printing via USB. Contributed by adecastilho. - -*Firmware checker/Ultimaker S5 -The update checker code has been improved and tested for more reliable firmware update notifications in Ultimaker Cura. The Ultimaker S5 is now included. - -*Fullscreen mode shortcuts -Fullscreen mode can be toggled using the View menu or with the keyboard shortcuts: Command + Control + F (macOS), or F11 (Windows and Linux). Contributed by KangDroid. - -*Configuration error message -In previous versions, Ultimaker Cura would display an error dialog explaining when something happened to user configuration files, including the option to reset to factory defaults. This would not warn about losing the current printer and print profile settings, so this information has been added. - -*Rename Toolbox to Marketplace -The entry points to the Toolbox are now renamed to Marketplace. - -*Materials in the Marketplace -A new tab has been added to the Marketplace that includes downloadable material profiles, to quickly and easily prepare models for a range of third-party materials. - -*New third-party definitions -New profiles added for Anycube 4MAx and Tizyx K25. Contributed by jscurtu and ValentinPitre respectively. - -*Improved definitions for Ender-3 -The Ender-3 build plate size has been adjusted to the correct size of 235 x 235 mm, corrected the start-up sequence, and the printhead position has been adjusted when prints are purged or completed. Contributed by stelgenhof. - -*Add mesh names to slicing message -Added comment generation to indicate which mesh the GCODE after this comment is constructing. Contributed by paukstelis. - -*Bug fixes -- The active material is highlighted in Ultimaker Cura’s material manager list. This behavior is now consistent with the profile and machine manager. -- The option to use 1.75 mm diameter filament with third-party 3D printers is now fixed and does not revert back to 2.85 mm. This fix also applies the appropriate a Z-axis speed change for 1.75 mm filament printers. Contributed by kaleidoscopeit. -- A fix was created to handle OSX version 10.10, but due to the QT upgrade, users with older versions won’t be able to run Ultimaker Cura on their system without a system update. This applies to OSX version 10.09 and 10.08. -- Fixed a memory leak when leaving the “Monitor” page open. -- Added performance improvements to the PolygonConnector to efficiently connect polygons that are close to each other. This also reduces the chances of the print head collide with previously printed things. Contributed by BagelOrb. -- Fixed a bug where the GCODE reader didn’t show retractions. -- Changes the USBPrinting update thread to prevent flooding the printer with M105 temperature update requests. Contributed by fieldOfView. -- Fix the behavior of the "manage visible settings" button, when pressing the "cog" icon of a particular category. Contributed by fieldOfView. -- Add a new post processing script that pauses the print at a certain height that works with RepRap printers. Contributed by Kriechi. -- Fix updates to the print monitor temperatures while preheating. Contributed by fieldOfView. -- Fixed a bug where material cost is not shown unless weight is changed. -- Fixed bugs crashing the CuraEngine when TreeSupport is enabled. -- Fixed a bug where Ultimaker Cura would upload the wrong firmware after switching printers in the UI. -- Fixed a bug where the layer view was missing if the first layer was empty. -- Fixed a bug where erroneous combing movements were taking place. -- Fixed a bug where the initial layer temperature is set correctly for the first object but then never again. -- Fixed a bug where clicking the fx icon didn’t respond. - -[3.5.1] -*Bug fixes -- Fixed M104 temperature commands giving inaccurate results. -- Fixed crashes caused by loading files from USB stick on Windows platforms. -- Fixed several issues with configuration files that missed the type in the metadata. -- Fixed issues caused by skin/infill optimization. -- Fixed several issues related to missing definition files for third-party printers. -- Fixed an issue where combing path generation cuts corners. -- Fixed a range of crashes caused by lock files. -- Fixed issues with remembering save directories on MacOS. -- Fixed an issue where CuraEngine uses incorrect material settings. -- Fixed an issue where some support layers don't have support infill. - -[3.5.0] -*Monitor page -The monitor page of Ultimaker Cura has been remodeled for better consistency with the Cura Connect ‘Print jobs’ interface. This means less switching between interfaces, and more control from within Ultimaker Cura. - -*Open recent projects -Project files can now be found in the ‘Open Recent’ menu. - -*New tool hotkeys -New hotkeys have been assigned for quick toggling between the translate (T), scale (S), rotate (R) and mirror (M) tools. - -*Project files use 3MF only -A 3MF extension is now used for project files. The ‘.curaproject’ extension is no longer used. - -*Camera maximum zoom -The maximum zoom has been adjusted to scale with the size of the selected printer. This fixes third-party printers with huge build volumes to be correctly visible. - -*Corrected width of layer number box -The layer number indicator in the layer view now displays numbers above 999 correctly. - -*Materials preferences -This screen has been redesigned to improve user experience. Materials can now be set as a favorites, so they can be easily accessed in the material selection panel at the top-right of the screen. - -*Installed packages checkmark -Packages that are already installed in the Toolbox are now have a checkmark for easy reference. - -*Mac OSX save dialog -The save dialog has been restored to its native behavior and bugs have been fixed. - -*Removed .gz extension -Saving compressed g-code files from the save dialog has been removed because of incompatibility with MacOS. If sending jobs over Wi-Fi, g-code is still compressed. - -*Updates to Chinese translations -Improved and updated Chinese translations. Contributed by MarmaladeForMeat. - -*Save project -Saving the project no longer triggers the project to reslice. - -*File menu -The Save option in the file menu now saves project files. The export option now saves other types of files, such as STL. - -*Improved processing of overhang walls -Overhang walls are detected and printed with different speeds. It will not start a perimeter on an overhanging wall. The quality of overhanging walls may be improved by printing those at a different speed. Contributed by smartavionics. - -*Prime tower reliability -The prime tower has been improved for better reliability. This is especially useful when printing with two materials that do not adhere well. - -*Support infill line direction -The support infill lines can now be rotated to increase the supporting capabilities and reduce artifacts on the model. This setting rotates existing patterns, like triangle support infill. Contributed by fieldOfView. - -*Minimum polygon circumference -Polygons in sliced layers that have a circumference smaller than the setting value will be filtered out. Lower values lead to higher resolution meshes at the cost of increased slicing time. This setting is ideal for very tiny prints with a lot of detail, or for SLA printers. Contributed by cubiq. - -*Initial layer support line distance -This setting enables the user to reduce or increase the density of the support initial layer in order to increase or reduce adhesion to the build plate and the overall strength. - -*Extra infill wall line count -Adds extra walls around infill. Contributed by BagelOrb. - -*Multiply infill -Creates multiple infill lines on the same pattern for sturdier infill. Contributed by BagelOrb. - -*Connected infill polygons -Connecting infill lines now also works with concentric and cross infill patterns. The benefit would be stronger infill and more consistent material flow/saving retractions. Contributed by BagelOrb. - -*Fan speed override -New setting to modify the fan speed of supported areas. This setting can be found in Support settings > Fan Speed Override when support is enabled. Contributed by smartavionics. - -*Minimum wall flow -New setting to define a minimum flow for thin printed walls. Contributed by smartavionics. - -*Custom support plugin -A tool downloadable from the toolbox, similar to the support blocker, that adds cubes of support to the model manually by clicking parts of it. Contributed by Lokster. - -*Quickly toggle autoslicing -Adds a pause/play button to the progress bar to quickly toggle autoslicing. Contributed by fieldOfview. - -*Cura-DuetRRFPlugin -Adds output devices for a Duet RepRapFirmware printer: "Print", "Simulate", and "Upload". Contributed by Kriechi. - -*Dremel 3D20 -This plugin adds the Dremel printer to Ultimaker Cura. Contributed by Kriechi. - -*Bug fixes -- Removed extra M109 commands. Older versions would generate superfluous M109 commands. This has been fixed for better temperature stability when printing. -- Fixed minor mesh handling bugs. A few combinations of modifier meshes now lead to expected behavior. -- Removed unnecessary travels. Connected infill lines are now always printed completely connected, without unnecessary travel moves. -- Removed concentric 3D infill. This infill type has been removed due to lack of reliability. -- Extra skin wall count. Fixed an issue that caused extra print moves with this setting enabled. -- Concentric skin. Small gaps in concentric skin are now filled correctly. -- Order of printed models. The order of a large batch of printed models is now more consistent, instead of random. - -*Third party printers -- TiZYX -- Winbo -- Tevo Tornado -- Creality CR-10S -- Wanhao Duplicator -- Deltacomb (update) -- Dacoma (update) - -[3.4.1] -*Bug fixes -- Fixed an issue that would occasionally cause an unnecessary extra skin wall to be printed, which increased print time. -- Fixed an issue in which supports were not generated on the initial layer, because the engine expected a brim to be in place. -- Conical and tree supports are now limited within the build plate volume. -- Fixed various startup crashes, including: copying of the version folder, errors while deleting packages, storing the old files, and losing data on install. - -[3.4.0] - -*Toolbox -The plugin browser has been remodeled into the Toolbox. Navigation now involves graphical elements such as tiles, which can be clicked for further details. - -*Upgradable bundled resources -It is now possible to have multiple versions of bundled resources installed: the bundled version and the downloaded upgrade. If an upgrade in the form of a package is present, the bundled version will not be loaded. If it's not present, Ultimaker Cura will revert to the bundled version. - -*Package manager recognizes bundled resources -Bundled packages are now made visible to the CuraPackageMangager. This means the resources are included by default, as well as the "wrapping" of a package, (e.g. package.json) so that the CuraPackageManger and Toolbox recognize them as being installed. - -*Retraction combing max distance -New setting for maximum combing travel distance. Combing travel moves longer than this value will use retraction. Contributed by smartavionics. - -*Infill support -When enabled, infill will be generated only where it is needed using a specialized support generation algorithm for the internal support structures of a part. Contributed by BagelOrb. - -*Print outside perimeter before holes -This prioritizes outside perimeters before printing holes. By printing holes as late as possible, there is a reduced risk of travel moves dislodging them from the build plate. This setting should only have an effect if printing outer before inner walls. Contributed by smartavionics. - -*Disable omitting retractions in support -Previous versions had no option to disable omitting retraction moves when printing supports, which could cause issues with third-party machines or materials. An option has been added to disable this. Contributed by BagelOrb. - -*Support wall line count -Added setting to configure how many walls to print around supports. Contributed by BagelOrb. - -*Maximum combing resolution -Combing travel moves are kept at least 1.5 mm long to prevent buffer underruns. - -*Avoid supports when traveling -Added setting to avoid supports when performing travel moves. This minimizes the risk of the print head hitting support material. - -*Rewrite cross infill -Experimental setting that allows you to input a path to an image to manipulate the cross infill density. This will overlay that image on your model. Contributed by BagelOrb. - -*Backup and restore -Added functionality to backup and restore settings and profiles to cloud using the Cura Backups plugin. - -*Auto-select model after import -User can now set preferences for the behavior of selecting a newly imported model or not. - -*Settings filter timeout -The settings filter is triggered on enter or after a 500ms timeout when typing a setting to filter. - -*Event measurements -Added time measurement to logs for occurrences, including startup time, file load time, number of items on the build plate when slicing, slicing time, and time and performance when moving items on the build plate, for benchmarking purposes. - -*Send anonymous data -Disable button on the ‘Send anonymous data’ popup has changed to a ‘more info’ button, with further options to enable/disable anonymous data messages. - -*Configuration error assistant -Detect and show potential configuration file errors to users, e.g. incorrect files and duplicate files in material or quality profiles, there are several places to check. Information is stored and communicated to the user to prevent crashing in future. - -*Disable ensure models are kept apart -Disable "Ensure models are kept apart" by default due to to a change in preference files. - -*Prepare and monitor QML files -Created two separate QML files for the Prepare and Monitor stages. - -*Hide bed temperature -Option to hide bed temperature when no heated bed is present. Contributed by ngraziano. - -*Reprap/Marlin GCODE flavor -RepRap firmware now lists values for all extruders in the "Filament used" GCODE comment. Contributed by smartavionics. - -*AutoDesk Inventor integration -Open AutoDesk inventor files (parts, assemblies, drawings) directly into Ultimaker Cura. Contributed by thopiekar. - -*Blender integration -Open Blender files directly into Ultimaker Cura. Contributed by thopiekar. - -*OpenSCAD integration -Open OpenSCAD files directly into Ultimaker Cura. Contributed by thopiekar. - -*FreeCAD integration -Open FreeCAD files directly into Ultimaker Cura. Contributed by thopiekar. - -*OctoPrint plugin -New version of the OctoPrint plugin for Ultimaker Cura. Contributed by fieldOfView. - -*Cura Backups -Backup and restore your configuration, including settings, materials and plugins, for use across different systems. - -*MakePrintable -New version of the MakePrintable plugin. - -*Compact Prepare sidebar -Plugin that replaces the sidebar with a more compact variation of the original sidebar. Nozzle and material dropdowns are combined into a single line, the “Check compatibility” link is removed, extruder selection buttons are downsized, recommended and custom mode selection buttons are moved to a combobox at the top, and margins are tweaked. Contributed by fieldOfView. - -*PauseAtHeight plugin -Bug fixes and improvements for PauseAtHeight plugin. Plugin now accounts for raft layers when choosing “Pause of layer no.” Now positions the nozzle at x and y values of the next layer when resuming. Contributed by JPFrancoia. - -*Bug fixes -- Prime tower purge fix. Prime tower purge now starts away from the center, minimizing the chance of overextrusion and nozzle obstructions. Contributed by BagelOrb. -- Extruder 2 temp via USB. Fixed a bug where temperatures can’t be read for a second extruder via USB. Contributed by kirilledelman. -- Move to next object position before bed heat. Print one at a time mode caused waiting for the bed temperature to reach the first layer temperature while the nozzle was still positioned on the top of the last part. This has been fixed so that the nozzle moves to the location of the next part before waiting for heat up. Contributed by smartavionics. -- Non-GCODE USB. Fixed a bug where the USB port doesn’t open if printer doesn't support GCODE. Contributed by ohrn. -- Improved wall overlap compensation. Minimizes unexpected behavior on overlap lines, providing smoother results. Contributed by BagelOrb. -- Configuration/sync. Fixes minor issues with the configuration/sync menu, such as text rendering on some OSX systems and untranslatable text. Contributed by fieldOfView. -- Print job name reslice. Fixed behavior where print job name changes back to origin when reslicing. -- Discard/keep. Customized settings don't give an 'discard or keep' dialog when changing material. -- Message box styling. Fixed bugs related to message box styling, such as the progress bar overlapping the button in the ‘Sending Data’ popup. -- Curaproject naming. Fixed bug related to two "curaprojects" in the file name when saving a project. -- No support on first layers. Fixed a bug related to no support generated causing failed prints when model is floating above build plate. -- False incompatible configuration. Fixed a bug where PrintCore and materials were flagged even though the configurations are compatible. -- Spiralize contour overlaps. Fixed a bug related to spiralize contour overlaps. -- Model saved outside build volume. Fixed a bug that would saved a model to file (GCODE) outside the build volume. -- Filament diameter line width. Adjust filament diameter to calculate line width in the GCODE parser. -- Holes in model surfaces. Fixed a bug where illogical travel moves leave holes in the model surface. -- Nozzle legacy file variant. Fixed crashes caused by loading legacy nozzle variant files. -- Brim wall order. Fixed a bug related to brim wall order. Contributed by smartavionics. -- GCODE reader gaps. Fixed a GCODE reader bug that can create a gap at the start of a spiralized layer. -- Korean translation. Fixed some typos in Korean translation. -- ARM/Mali systems. Graphics pipeline for ARM/Mali fixed. Contributed by jwalt. -- NGC Writer. Fixed missing author for NGC Writer plugin. -- Support blocker legacy GPU. Fixes depth picking on older GPUs that do not support the 4.1 shading model which caused the support blocker to put cubes in unexpected locations. Contributed by fieldOfView. - -*Third-party printers -- Felix Tec4 printer. Updated definitions for Felix Tec4. Contributed by kerog777. -- Deltacomb. Updated definitions for Deltacomb. Contributed by kaleidoscopeit. -- Rigid3D Mucit. Added definitions for Rigid3D Mucit. Contributed by Rigid3D. - -[3.3.0] - -*Profile for the Ultimaker S5 -New printer profile for the Ultimaker S5, our latest 3D printer. - -*Profile for Tough PLA -New material profile for Tough PLA, a material that prints with the convenience of PLA but with toughness and impact strength similar to ABS. - -*Configuration/sync button -Configuration and synchronization button now available for Ultimaker network-connected printers to easily synchronize all possible available configurations in your Cura Connect group. The name of the group host is automatically pulled from the API, and network printers and local printers are separated in the list for clarity. - -*Setting visibility preset -Presets guide you to find the most important settings incrementally. A small menu is located next to the search bar to easily access these new setting visibility presets. Contributed by fieldOfView. - -*Print/save hotkey -Send a print to the queue using Ctrl + P (Windows/Linux) or Cmd + P (Mac). If no printer is present on the network, it will save to file instead. - -*3D model assistant -Models sliced to print with ABS, PC, PP or CPE+ that have a larger footprint than 150 x 150 x 150 mm will notify the user with an icon and popup of how they can achieve the best possible print quality and reliability. - -*Refactored machine manager -Refactored machine manager resulted in less manager classes. Changing settings, materials, variants and machines is now clearer. This results in an overall speed up when making changes. - -*Multiply models faster -Significant speed increase when multiplying models. - -*Auto slicing disabled by default -The auto slice tool is now disabled by default. Users can still enable the feature in the user preferences dialog. - -*Updated fonts -Default font changed to NotoSans to increase readability and consistency with Cura Connect. - -*Plugin browser look and feel -The plugin browser has been updated with a better look and feel to bring it in line with other UI elements. The author name is clickable, which opens email for support. Plugins can now be uninstalled with an uninstall button. - -*Show tooltip for unavailable profile -Tooltips have been added to incompatible settings, to give explanations why they are incompatible. - -*Empty material slots Ultimaker 3 -When a material is not loaded in the Ultimaker 3, it is now displayed as ‘Empty’ rather than ‘Unknown’. - -*Send over network confirmation -When a print job is sent to a networked printer, a popup will confirm the job was sent, with a button to redirect the user to the monitor in Cura Connect. - -*Post processing scripts -Fixed an issue where post processing scripts could be lost between sessions. Post processing scripts are now persistent between sessions. - -*Single extrusion mode -Disable an extruder on a dual extrusion printer, so you are not limited by the other extruder’s parameters. To disable an extruder, right click it in the right panel, and select ‘Disable extruder’ to disable it. Re-enable by right clicking and selecting ‘enable extruder’. Printing profiles are optimized for the active extruder, as well as global settings, such as build plate temperature, to achieve better print quality. Using single extrusion mode also makes the ‘print one at a time’ feature available for the Ultimaker 3 and Ultimaker S5. - -*New UFP extension -UFP (Ultimaker format package) is a new file extension that contains compressed gcode and a preview thumbnail. Using this extension enables a model preview (similar to the solid view) on the Ultimaker S5 touchscreen and in Cura Connect. - -*Compressed Gcode -Gcode saved from Ultimaker Cura using the Ultimaker 3 profile is compressed (using gzip) to save space on printers. - -*Circular prime tower -Prime towers are now circular, resulting in a less jerky print head action, a more robust structure, better layer adhesion, and better build plate adhesion compared to square prime towers, reducing the chance of prime tower failure mid-print. - -*Connected infill lines -Grid and triangular infill patterns now have connected lines for a more constant flow, better model rigidity, and reduced impact on the quality of the outer wall. - -*Support blocker - fieldOfView -Generate a cube mesh to prevent support material generation in specific areas of a model. Each cube can be scaled, rotated, and moved with the standard adjustment tools to fit your requirements. When the support blocker tool is selected, single click in the area you want to block support to generate a mesh. If it is positioned by accident, click it again to remove it. - -*Real bridging - smartavionics -New experimental feature that detects bridges, adjusting the print speed, slow and fan speed to enhance print quality on bridging parts. - -*Updated CuraEngine executable - thopiekar & Ultimaker B.V. -The CuraEngine executable contains a dedicated icon, author and license info on Windows now. The icon has been designed by Ultimaker B.V. - -*Use RapidJSON and ClipperLib from system libraries -Application updated to use verified copies of libraries, reducing maintenance time keeping them up to date (the operating system is now responsible), as well as reducing the amount of code shipped (as necessary code is already on the user’s system). - -*Initial layer flow -New setting in the ‘material’ category where the initial layer flow can be adjusted. - -*Initial travel move retraction - smartavionics -Retraction has been added to the initial travel move, reducing the chance of prime blobs getting dragged into parts before brim/skirts are printed. - -*Unnecessary retractions in spiralize - smartavionics -Removes retractions on layer change in spiralize mode, improving model quality. - -*Faster travel paths - smartavionics -Until now, the path order optimizer worked on the basis that the shortest possible route could be taken from any one point to another. When combing is used, any route may longer, due to the need to route around obstacles. Now, it can use the combed distances to give more consistent results. - -*New plugins - Pheneeny -Three new plugins have been added to Ultimaker Cura: Scalable extra prime, Print temperature offset, and Enclosure fan. - -*Pre-heat extruders - fieldOfView -This new feature allows to preheat the extruders in the printer monitor. - -*Renamed TweakAtZ to ‘ChangeAtZ’ -This script has been renamed to be more consistent with other scripts. - -*Import XML material profile checks -XML material profile files are now checked before import in Ultimaker Cura to avoid potential issues. Contributed by fieldOfView. - -*Bug fixes -- Slice engine crash default temperature 0. Fixed an issue where the slicing engine could crash when slicing with a material at 0°C. -- Network printer reconnect. Fixed an issue where the user could not connect to the printer after losing connection. -- Pause at height ‘redo layers’ broken. Fixed an issue where setting ‘pause at height redo layers’ to 1 or more would cause failed prints. -- Reset icon fix. Fixed an issue where manually reverting a default print profile value instead of using the reset button would cause the reset icon to remain. -- Infill density for all extruders. The infill density in the recommended mode now applies to all extruders instead of extruder 1. -- Polypropylene 0.25mm print profile. Fixed the maximum number of allowed extrusions for all 0.25mm Polypropylene profile prints. -- SolidWorks plugin. Replaced comtypes module with win32com to fix issues. -- Font rendering issues. Fixed font rendering issues on Max OSX. -- Slice engine avoids broken wall segments. Fixed an issue where narrow walls created broken line segments by testing for such situations and using slightly narrow lines in those cases. - -*Third party printers - -- FABtotum TPU profiles. Added third-party material profiles for TPU. Contributed by krios-fabteam. -- Dagoma profiles. Updated printer profiles contributed by dagoma3d. -- uBuild profile. Updated printer profiles contributed by uBuild-3D. -- Cartesio printer updates. Updated profiles contributed by maukcc. -- Printrbot Simple Maker's Kit 1405. Profiles contributed by timur-tabi. -- Added SeeMeCNC. Profiles contributed by pouncingiguana. -- Velleman Vertex. Updated printer and quality profiles contributed by velbn. -- gMax 1.5. Profiles contributed by gordo3di. - -[3.2.1] -*Bug fixes -- Fixed issues where Cura crashes on startup and loading profiles -- Updated translations -- Fixed an issue where the text would not render properly - -[3.2.0] -*Tree support -Experimental tree-like support structure that uses ‘branches’ to support prints. Branches ‘grow’ and multiply towards the model, with fewer contact points than alternative support methods. This results in better surface finishes for organic-shaped prints. - -*Adaptive layers -Prints with a variable layer thickness which adapts to the angle of the model’s surfaces. The result is high-quality surface finishes with a marginally increased print time. This setting can be found under the experimental category. - -*Faster startup -Printer definitions are now loaded when adding a printer, instead of loading all available printers on startup. - -*Backface culling in layer view -Doubled frame rate by only rendering visible surfaces of the model in the layer view, instead of rendering the entire model. Good for lower spec GPUs as it is less resource-intensive. - -*Multi build plate -Experimental feature that creates separate build plates with shared settings in a single session, eliminating the need to clear the build plate multiple times. Multiple build plates can be sliced and sent to a printer or printer group in Cura Connect. This feature must be enabled manually in the preferences ‘general’ tab. - -*Improved mesh type selection -New button in the left toolbar to edit per model settings, giving the user more control over where to place support. Objects can be used as meshes, with a drop down list where ‘Print as support’, ‘Don't overlap support with other models’, ‘Modify settings for overlap with other models’, or ‘Modify settings for infill of other models’ can be specified. Contributed by fieldOfView. - -*View optimization -Quick camera controls introduced in version 3.1 have been revised to create more accurate isometric, front, left, and right views. - -*Updated sidebar to QtQuick 2.0 -Application framework updated to increase speed, achieve a better width and style fit, and gives users dropdown menus that are styled to fit the enabled Ultimaker Cura theme, instead of the operating system’s theme. - -*Hide sidebar -The sidebar can now be hidden/shown by selecting View > Expand/Collapse Sidebar, or with the hotkey CMD + E (Mac) or CTRL + E (PC and Linux). - -*Disable ‘Send slice information’ -A shortcut to disable ‘Send slice information’ has been added to the first launch to make it easier for privacy-conscious users to keep slice information private. - -*Signed binaries (Windows) -For security-conscious users, the Windows installer and Windows binaries have been digitally signed to prevent “Unknown application” warnings and virus scanner false-positives. - -*Start/end gcode script per extruder -Variables from both extruders in the start and end gcode snippets can now be accessed and edited, creating uniformity between profiles in different slicing environments. Contributed by fieldOfView. - -*OctoPrint plugin added to plugin browser -This plugin enables printers managed with OctoPrint to print via Ultimaker Cura interface (version 3.2 or later). - -*Bugfixes -- Fixed a bug where the mirror tool and center model options when used together would reset the model transformations -- Updated config file path to fix crashes caused by user config files that are located on remote drives -- Updated Arduino drivers to fix triggering errors during OTA updates in shared environments. This also fixes an issue when upgrading the firmware of the Ultimaker Original. -- Fixed an issue where arranging small models would fail, due to conflict with small model files combined with the “Ensure models are kept apart” option - -[3.1.0] -*Profile added for 0.25 mm print core -This new print core gives extra fine line widths which gives prints extra definition and surface quality. - -*Profile added for Breakaway material -New material profile for Breakaway material, a new dry post processing support material, which can be used for models with flat surface area overhangs. - -*Layer view -The existing Layer View has been updated in order to see a live simulation of all the paths within a layer. - -*Quick camera controls -New buttons have been added to the interface that can quickly reposition the camera view of the buildplate. - -*Lock model on platform -The move tool has a new option to lock a selected model to the platform. - -*Faster profile switching speed -Duplicating and removing a profile could take Ultimaker Cura quite some time, it now happens instantly. - -*Faster printer selection -Removing a printer from the library is now instant. No more unresponsive screens. - -*Faster processing speed -A 5 - 10 % speed increase when calculating normals, loading models, and slicing. - -*Feedrate visualization -Feedrate visualization has been added to the Layer view. Using this gives the user an idea of the print speeds per model part, allowing for better control over prints. - -*Jogging -It allows the printhead to be moved with on-screen controls. Contributed by fieldOfView. - -*Large model loading -A new feature has been added which unloads the layer view when switching to solid mode, speeding Ultimaker Cura back up without losing your G-code/layer view information. - -*Scripts folder -A scripts folder is now available in the Ultimaker Cura configuration folder. This folder can be loaded with post processing plugins scripts, which will automatically show in Ultimaker Cura. Contributed by fieldOfView. - -*Optimized workflow for crash reporting -Crash reports are automatically generated and allow the user, in case of a crash, to easily send their report with a description to developers. - -*Floating models enabled -In previous releases, models were dropped to the build plate when support was disabled. Models now float when the setting is enabled (even if creates an impossible-to-print situation). This can be used to stack separate models on top of each other. - -*Slicing tolerance -A new setting that affects the intersect point to influence the dimensional accuracy for diagonal surfaces. The user can select the behaviour: ‘Inclusive’ makes gaps narrower, ‘Exclusive’ makes gaps wider, and ‘Middle’ is the fastest to process. This can be used to create better tolerances for printed screw holes. Contributed by BagelOrb. - -*Optimized zig zag patterns -Zig zag patterns now print more consistently. Lines now have a 5 micron tolerance in which they are printed any way, resulting in longer connected lines. Contributed by smartavionics. - -*Aligned z-seam inner wall moves -Inner wall travel moves are aligned with the z-seam. This reduces the number of travel moves and reduces the chance of more unwanted seams. - -*Relative positioning of infill patterns -Infill patterns are now positioned relative to the center of loaded models and an offset can be applied to control the infill more precisely and adjust it to preference or strength. Contributed by smartavionics. - -*Line resolution -Enables the user to specify the minimum allowed distance value between two points in G-code to create lower or higher resolution polygons. - -*Custom mode changes -If profile settings have been modified in recommended mode under custom mode, a reset icon will appear to notify the user. Click the icon to show the changes that have been made, and revert back to the default profile settings. - -*Bugfixes -- Fix for layer numbers being displayed incorrectly when switching between solid and layer mode -- Fix for Ultimaker Cura engine crashes on certain models -- Fix for Uninstalling previous versions of Cura on Windows platforms -- Fix for displaying visible settings -- Fix for importing legacy .ini files -- Prevent skipping user agreement dialog by pressing escape - -[3.0.4] -*Bug fixes -- Fixed OpenGL issue that prevents Cura from starting. - -*License agreement on the first startup has been added - -[3.0.3] -*Bug fixes -- Add missing libraries for the MakePrintable plugin. - -[3.0.0] -*Faster start-up -Start-up speed has been cut in half compared to the previous version. - -*New color scheme -Color scheme has been updated to reflect Ultimaker Cura rebrand. - -*Updated UX design -The Ultimaker Cura logo has moved from the bottom to the top of the interface. Print status icons have been updated and repositioned. - -*Redesigned splash screen -A new splash screen on Ultimaker Cura startup has been added. - -*Top navigation bar improvements -The width of tab functionality changes accordingly to the word space (multilingual). - -*Print quality slider -A slider can now be used to control the quality profile in recommended mode. - -*Infill slider -Model infill can now be changed using a slider in recommended mode. - -*Changed layer view -Layer view icon, panel and slider have moved to top-right of interface. - -*Rasterized build plate -The build plate now shows graduations of 10 mm and 1 mm for easy model positioning. - -*Changed row of extruder buttons -Extruder tabs have become buttons and icons have been updated. - -*Add an "Export to Cura" button in SOLIDWORKS -A macro can be added to your SOLIDWORKS installation that loads your model into Ultimaker Cura. - -*Siemens NX macro -When a user updates models in Siemens NX and clicks the button, the updated models replace the models opened in Ultimaker Cura. - -*Skin removal width -Remove thin strips of skin from a model to prevent print head zigzagging, in turn preventing vibrations. - -*Skin expand distance -Cutting away skins on steep overhangs makes prints less sturdy. By expanding skins with the thickness of walls, features will be better supported. In addition, features such as towers on top of infill will be stronger. - -*Extra skin wall count -Printing extra skin directly on top of infill can lead to gaps, curling and pillowing. This is reduced by printing a wall around the skin first, and also improves the printing speed. - -*Minimum extrusion for skin -Will prevent filling small gaps that are probably filled already, resulting in less strings, better top details and faster prints. - -*PVA retractions -PVA (switch) retraction length is increased, minimum travel distance for retraction is decreased and max count is slightly increased, this reduces stringing by a lot at the cost of slightly increased print time. - -*Z seam options -Gives the user control over where to place the seam - hide it in convex corners or in easy to remove locations such as concave corners. Don’t let corner angles influence the seam position. - -*Quarter cubic infill -Similar to tetrahedral (octet) infill, but half of the lines are shifted half of the period up. This pattern sacrifices some rigidity of octet infill for greater toughness. - -*Cross infill -A fractal pattern infill that requires fewer retractions than other infill types. This is useful for flexible materials as it causes less material elongation. The internal structure given by this infill also assists flexible models having more resistance, while retaining ‘soft’ properties in all directions. - -*Layer start negative position -Layer start X/Y values can be less than 0 when the machine centre is zero. - -*PostProcessing stretch script -This new script performs "post stretch" algorithm to fix the problem of insufficient inner and outer diameters. Thanks to electrocbd for contributing. - -*Ironing speed settings -Ironing speed settings have been moved to experimental category. - -*Doodle3D plugin -Update Doodle3D plugin to connect with printers. Thanks to mith for contributing. - -*Bug fixes -- Customized profiles are not sent when connecting to a printer -- Sync z-hop with layer changes, thanks to smartavionics for contributing -- Memory leaks on MacOS -- Printer name not loaded when project file is opened -- Doodle3D Wifi box was selected by default on non-UM3 printers - -[2.7.0] -*Top surface skin -Specify print settings of the top-most layers separately in order to improve print duration and achieve higher quality top surfaces. - -*Print thin walls -An experimental function that enables features to be printed up to two times smaller than the nozzle size. - -*Ironing (a.k.a. Neosanding) -An experimental function that enables the heated nozzle to travel over printed top layers without extrusion to create a smooth finish. Made after an idea by Neotko. - -*Gradual support infill -Supports will print faster and with less material while improving overhang quality. - -*Support infill layer thickness -Users are able to configure “Support infill layer thickness” for thicker support layers. - -*Relative Z seam -A function that positions the Z seam relative to the bounding box of the model, so that the seam stays at the same location no matter what the position of the object is. - -*Prime tower purge -In order to prevent under extrusion when printing a prime tower, and to prevent a prime tower failing half way through a job, a feature has been added to wipe off oozed/purged material in the middle of a hollow prime tower before starting to print the next layer of it. The amount of material to purge can be specified in the “Prime Tower Purge Volume” setting. - -*First layer line width -A multiplier setting for the line width of the first layer of a print. Multiplying line width gives fewer lines but with greater width, which improves build plate adhesion. - -*Pause standby and resume temperature -Turn off the nozzle when printing with extended pauses to prevent burned filament and nozzle clogging. At the end of a pause, the nozzle will reach printing temperature before resuming a print. - -*Extruder per feature -Assign specific print features (walls, infill, skin, etc.) to a specific nozzle. A possible application of this would be to print an outer shell of an object with a fine nozzle at a greater level of detail while using a larger second nozzle to print infill faster. - -*Dark theme -A dark theme for Cura. Select this theme to reduce eyestrain when working in dark environments. Activate it by selecting “Preferences > Themes > Dark". - -*Top navigation bar redesign -The top bar user interface been improved so that “Prepare” and “Print” have moved from the right side of the interface to the left side. - -*New keyboard shortcuts -Models can now be manipulated on the build plate using hotkeys Q, A, Z, W, and tab keys. Q selects “move”, A selects “scale”, Z selects “rotate”, and W selects “mirror”. Use the tab key to navigate between settings. - -*Plugin browser -Easily download and install plugins using an integrated plugin browser. Go to “Extensions > Plugin Browser > Browse plugins” to select it. - -*Import SolidWorks files as STL -A new plugin that enables SolidWorks compatible .SLDPRT files to be imported directly into Cura, where they are automatically converted to .STL format. This plugin can be found in the plugin browser. - -*Zoom towards mouse cursor position -Cura preferences now include an option to zoom towards the cursor position on screen. - -*Increased scroll speed in setting lists -The scroll speed in the setting lists is now three times faster than previous versions. - -*Extra tooltips -Extra tooltips have been added to clarify the machine settings. - -*Polish now supported -Polish language support added. This can be selected in the preferences menu. - -*Chinese now supported -Chinese language support added. This can be selected in the preferences menu. - -*Bug fixes -- Cura project Mac extensions -- Crashes when adding printers -- Jerk fixes -- Z-hop over-extrusion -- Material diameter in machine settings - -*3rd party printers -- Peopoly Moai -- DiscoEasy200 -- Cartesio -- EasyArt Ares -- 3Dator -- Rigid3D -- Type A Series 1 -- HelloBEEPrusa - -[2.6.2] - -*Bug fixes -- Fixed an issue with Cura crashing on older versions of MacOS. - -[2.6.1] -*New profiles -The Polypropylene material is added and supported with the Ultimaker 3. Support for CPE+ and PC with 0.8mm nozzles is added as well. - -[2.6.0] -*Cura versions -Cura 2.6 has local version folders, which means the new version won’t overwrite the existing configuration and profiles from older versions, but can create a new folder instead. You can now safely check out new beta versions and, if necessary, start up an older version without the danger of losing your profiles. - -*Better support adhesion -We’ve added extra support settings to allow the creation of improved support profiles with better PVA/PLA adhesion. The Support Interface settings, such as speed and density, are now split up into Support Roof and Support Floor settings. - -*Multi-extrusion support for custom FDM printers -Custom third-party printers and Ultimaker modifications now have multi-extrusion support. Thanks to Aldo Hoeben for this feature. - -*Model auto-arrange -We’ve improved placing multiple models or multiplying the same ones, making it easier to arrange your build plate. If there’s not enough build plate space or the model is placed beyond the build plate, you can rectify this by selecting ‘Arrange all models’ in the context menu or by pressing Command+R (MacOS) or Ctrl+R (Windows and Linux). Cura 2.6 will then find a better solution for model positioning. - -*Gradual infill -You can now find the Gradual Infill button in Recommended mode. This setting makes the infill concentrated near the top of the model – so that we can save time and material for the lower parts of the model. This functionality is especially useful when printing with flexible materials. - -*Support meshes -It’s now possible to load an extra model that will be used as a support structure. - -*Mold -This is a bit of an experimental improvement. Users can use it to print a mold from a 3D model, which can be cast afterwards with the material that you would like your model to have. - -*Towers for tiny overhangs -We’ve added a new support option allowing users to achieve more reliable results by creating towers to support even the smallest overhangs. - -*Cutting meshes -Easily transform any model into a dual-extrusion print by applying a pattern for the second extruder. All areas of the original model, which also fall inside the pattern model, will be printed by the extruder selected for the pattern. - -*Extruder per model selection via the context menu or extruder buttons -You can now select the necessary extruder in the right-click menu or extruder buttons. This is a quicker and more user-friendly process. The material color for each extruder will also be represented in the extruder icons. - -*Custom toggle -We have made the interface a little bit cleaner and more user-friendly for switching from Recommended to Custom mode. - -*Plugin installer -It used to be fairly tricky to install new plugins. We have now added a button to select and install new plugins with ease – you will find it in Preferences. - -*Project-based menu -It’s a lot simpler to save and open files, and Cura will know if it’s a project, model, or gcode. - -*Theme picker -If you have a custom theme, you can now apply it more easily in the preferences screen. - -*Time estimates per feature -You can hover over the print time estimate in the lower right corner to see how the printing time is divided over the printing features (walls, infill, etc.). Thanks to 14bitVoid for this feature. - -*Invert the direction of camera zoom -We’ve added an option to invert mouse direction for a better user experience. - -*Olsson block upgrade -Ultimaker 2 users can now specify if they have the Olsson block installed on their machine. Thanks to Aldo Hoeben for this feature. - -*OctoPrint plugin -Cura 2.6 allows users to send prints to OctoPrint. Thanks to Aldo Hoeben for this feature. - -*Bug fixes -- Post Processing plugin -- Font rendering -- Progress bar -- Support Bottom Distance issues - -*3rd party printers -- MAKEIT -- Alya -- Peopoly Moai -- Rigid3D Zero -- 3D maker - -[2.5.0] -*Improved speed -We’ve made changing printers, profiles, materials, and print cores even faster. 3MF processing is also much faster now. Opening a 3MF file now takes one tenth of the time. - -*Speedup engine – Multithreading -Cura can process multiple operations at the same time during slicing. Supported by Windows and Linux operating systems only. - -*Preheat the build plate (with a connected printer) -Users can now set the Ultimaker 3 to preheat the build plate, which reduces the downtime, allowing to manually speed up the printing workflow. - -*Better layout for 3D layer view options -An improved layer view has been implemented for computers that support OpenGL 4.1. For OpenGL 2.0 to 4.0, we will automatically switch to the old layer view. - -*Disable automatic slicing -An option to disable auto-slicing has been added for the better user experience. - -*Auto-scale off by default -This change speaks for itself. - -*Print cost calculation -The latest version of Cura now contains code to help users calculate the cost of their prints. To do so, users need to enter a cost per spool and an amount of materials per spool. It is also possible to set the cost per material and gain better control of the expenses. Thanks to our community member Aldo Hoeben for adding this feature. - -*G-code reader -The g-code reader has been reintroduced, which means users can load g-code from file and display it in layer view. Users can also print saved g-code files with Cura, share and re-use them, as well as preview the printed object via the g-code viewer. Thanks to AlephObjects for this feature. - -*Discard or Keep Changes popup -We’ve changed the popup that appears when a user changes a printing profile after setting custom printing settings. It is now more informative and helpful. - -*Bug fixes -- Window overflow: On some configurations (OS and screen dependant), an overflow on the General (Preferences) panel and the credits list on the About window occurred. This is now fixed. -- “Center camera when the item is selected”: This is now set to ‘off’ by default. -- Removal of file extension: When users save a file or project (without changing the file type), no file extension is added to the name. It’s only when users change to another file type that the extension is added. -- Ultimaker 3 Extended connectivity. Selecting Ultimaker 3 Extended in Cura let you connect and print with Ultimaker 3, without any warning. This now has been fixed. -- Different Y / Z colors: Y and Z colors in the tool menu are now similar to the colors on the build plate. -- No collision areas: No collision areas used to be generated for some models when "keep models apart" was activated. This is now fixed. -- Perimeter gaps: Perimeter gaps are not filled often enough; we’ve now amended this. -- File location after restart: The old version of Cura didn’t remember the last opened file location after it’s been restarted. Now it has been fixed. -- Project name: The project name changes after the project is opened. This now has been fixed. -- Slicing when error value is given (print core 2): When a support is printed with the Extruder 2 (PVA), some support settings will trigger a slice when an error value is given. We’ve now sorted this out. -- Support Towers: Support Towers can now be disabled. -- Support bottoms: When putting one object on top of another with some space in between, and selecting support with support bottom interface, no support bottom is printed. This has now been resolved. -- Summary box size: We’ve enlarged the summary box when saving the project. -- Cubic subdivision infill: In the past, the cubic subdivision infill sometimes didn’t produce the infill (WIN) – this has now been addressed. -- Spiralize outer contour and fill small gaps: When combining Fill Gaps Between Walls with Spiralize Outer Contour, the model gets a massive infill. -- Experimental post-processing plugin: Since the TweakAtZ post-processing plugin is not officially supported, we added the ‘Experimental’ tag. - -*3rd party printers (bug fixes) -- Folgertech printer definition has been added. -- Hello BEE Prusa printer definition has been added. -- Velleman Vertex K8400 printer definitions have been added for both single-extrusion and dual-extrusion versions. -- Material profiles for Cartesio printers have been updated. - -[2.4.0] -*Project saving & opening -You can now save your build plate configuration - with all your active machine’s meshes and settings. When you reopen the project file, you’ll find that the build plate configuration and all settings will be exactly as you last left them when you saved the project. - -*Setting search -You can now search the custom settings directly from the side panel, which means you can easily locate the setting you need to tweak. Thanks to community member Aldo Hoeben & LulzBot for this feature. - -*Editing start g-code and end g-code -Aldo Hoeben also added this feature, enabling you to alter both start and end code g-code settings for single extrusion machines. - -*Multiply object function -By right-clicking on an object, you can multiply it by a variable amount, rather than duplicating multiple times. Thanks again to Aldo Hoeben for this feature. - -*Ultimaker 3 single extrusion prints -Dual extrusion printers now allow for single extrusion prints in a larger printable area. - -*Streaming printer monitor view -Ultimaker 3’s camera views no longer only show snapshots. They now show a live stream. - -*Explain why slicing is disabled -When slicing is blocked by settings with error values, a message now appears, clearly indicating which settings need to be changed. - -*Ultimaker 3 print profiles -The initial and final printing temperatures reduce the amount of oozing during PLA-PLA, PLA-PVA and Nylon-PVA prints. This means printing a prime tower is now optional (except for CPE and ABS at the moment). The new Ultimaker 3 printing profiles ensure increased reliability and shorter print time. - -*Initial Layer Printing Temperature -Initial and final printing temperature settings have been tuned for higher quality results. For all materials the initial print temperature is 5 degrees above the default value. - -*Printing temperature of the materials -The printing temperature of the materials in the material profiles is now the same as the printing temperature for the Fine profile. - -*Improved PLA-PVA layer adhesion -The PVA jerk and acceleration have been optimized to improve the layer adhesion between PVA and PLA. - -*Default build plate adhesion type for Nylon -The default build plate adhesion type for Nylon prints has been changed from raft to brim. - -*Support Interface Thickness -The Support Roof Thickness is now 0.8 mm and PVA support infill has been slightly decreased to lower the printing time. - -*Ultimaker 2+ PC prints -In the polycarbonate profiles, the raft settings for the 0.25 mm and 0.4 mm nozzles are tweaked for less warping. - -*Hollow prime tower -Print the prime tower hollow to minimize material use while maintaining stability. Wiping the oozed material on the prime tower is now done from the inside, which means the excess material is contained within the prime tower. - -*Precooling and prewarming -Printing now starts at a lower temperature, before increasing swiftly to the normal printing temperature. Cooling also starts earlier than the last extrusion (with that print core). This minimizes the material’s heat absorption, which decreases the amount of degradation of the PVA material. This reduces the risk of clogging your nozzles. - -*Remove Mesh Intersection -You are now able to turn off resolving of overlapping meshes. Models can now overlap, so you can perform build plate color mixing, by placing meshes over one another and lowering their flow. - -*Alternate Mesh Removal -For areas where two models overlap, let each layer of the overlapping volume alternate (depending on which object the overlapping area of that layer belongs to). This improves the bonding between dual color models and allows for more controlled build plate color mixing. - -*Hollow Object -Remove the infill from a mesh and treat internal cavities as overhangs, so as to create support in the model’s interior. This experimental setting greatly reduces the amount of material needed on the inside of the print. - -*Fill Gaps Between Walls -Fill up small gaps between consecutive walls, making thin pieces in your model dense, rather than hollow. This feature makes the thin pieces stronger. - -*Cubic subdivision infill -This experimental new infill pattern is similar to cubic infill, but generates bigger cubes farther inside the mesh. This greatly reduces print times and material use, while maintaining structural integrity. Thanks to community members Martin Boerwinckle and Nicholas Seward for this feature. - -*Concentric 3D infill -This new infill pattern is similar to concentric infill, but touches the shell every X layers, creating better support for the top layers. - -* Printing Temperature Initial Layer -Nozzle temperature to be used during the first layer. - -*Build Plate Temperature Initial Layer -Bed temperature to be used during the first layer. - -*Initial Fan Speed -Fan speed to be used during the first layer. - -*Retract at Layer Change -Retract each time the printer progresses to the next layer. - -*Outer Wall Wipe Distance -Wipe the nozzle after printing the outer wall. - -*Set X-Y coordinate of z-seam -Select where to place the Z seam. - -*Start Layers with the Same Part -Start each layer with the part closest to a given location. - -*Turn off nozzle after last use -Turn off the nozzle after its last use, while other nozzles are still in use. - -*Option for no build plate adhesion -Select not to print any build plate adhesion helper parts. - -*Anti-overhang and support meshes -Use a mesh to specify a volume within which to classify nothing as overhang for support or specify a volume within which to print support. - -*Delta printer support -This release adds support for printers with elliptic buildplates. This feature has not been extensively tested so please let us know if it works or get involved in improving it. - -*AppImage for Linux -The Linux distribution is now in AppImage format, which makes Cura easier to install. - -*Bugfixes -The user is now notified when a new version of Cura is available. -When searching in the setting visibility preferences, the category for each setting is always displayed. -3MF files are now saved and loaded correctly. -Dragging a profile onto Cura now loads it automatically. -You can now view which print cores and materials are currently in your Ultimaker 3, via the machine manager. -You can now add the heated bed upgrade etc. from the machine manager. -Print core and material is now arranged under extruder tabs. -Cura now remembers all printers and profiles when you open just after closing it. -You can now duplicate the standard profiles. -Layer view now doesn’t use as much RAM. -It’s now quicker to change the value of the Support Enable setting. -Changing a setting updates all dependent settings more quickly. -Having errors in your setting values now always blocks slicing. -Selecting a model with any active tool no longer causes a reslice. -The prime poop now introduces a separate area where you cannot print. -Support Extruder setting is now near the support settings. -Build Plate Adhesion Extruder setting is now near the build plate adhesion settings. -Z hop settings have been moved to the Travel category. -Inactive nozzle wiping on the prime tower is re-enabled. -There are no more unnecessary retractions in support. -Each layer now has less extruder switches than the machine has extruders. -Concentric infill doesn’t generate the first infill perimeter next to the walls. -Extruder priming now always happens on the first layer. -Raising the build plate of the Ultimaker 2 now has the proper speed again. -Changing material while the Ultimaker 2 is paused works again. - -[2.3.1] -*Layer Height in Profile Selection -Added the layer height to the profile selection menu. - -*Bug fixes -Fixed the option to import g-code from related machines as a profile -Fixed a bug where editing material settings has no effect on 3D prints -Fixed an issue with automatic profile importing on Cura 2.1 on Mac OSX -Fixed an inheritance issue for dual extrusion -Fixed an issue with "i" symbol updates -Fixed a freeze that can occur while printing via Wi-Fi - -[2.3.0] -*Multi Extrusion Support -Machines with multiple extruders are now supported. Ultimaker 3 printers and Ultimaker Original printers with dual extrusion upgrade kit are currently supported. - -*Network Printing for Ultimaker 3 -Sending a print to an Ultimaker 3 remotely via the network is now possible. Requires Wi-Fi or LAN to connect to the printer. - -*Print Monitoring for Ultimaker 3 -You can monitor your print on an Ultimaker 3 with a live camera feed. Requires Wi-Fi or LAN to connect to the printer. - -*Material and Print Core Synchronization -Connecting to an Ultimaker 3 now gives you the option to synchronize the materials in Cura with what is loaded in the printer. - -*Speed improvements -The first thing you will notice is the speed. STL loading is now 10 to 20 times faster, layer view is significantly faster and slicing speed is slightly improved. - -*Improved Position Tool -Place objects precisely where you want them by manually entering the values for the position. - -*Custom Machine Support -It’s now much easier to use Cura with custom machines. You can edit the machine settings when you load a new custom machine. - -*Improved Grouping -It's now possible to transform objects that are already grouped. -Select an individual item in a group or merged object and edit as usual. Just Ctrl + Click and edit away. - -*Enhanced Profile Management -Profile management is improved. You can now easily see and track changes made to your profiles. - -*Improved Setting Visibility -Make multiple settings visible at the same time with a checkbox. The Visibility Overview setting indicates why a setting is not shown in the sidebar even if it is enabled. - -*Improved time estimation -Time estimations are more accurate. Based on our test time estimations should be within 5% accuracy for Ultimaker printers. - -*Optional G-code Machine Prefix -Disable the g-code prefix in Preferences. No more UM2_ on your printer display! - -*Print Weight Estimates -Cura now estimates print weight as well as length. - -*Automatic Import Configuration -Configurations from older installations of Cura 2.1 are automatically imported into the newest installation. - -*Slicing features -*Infill Types -Two new infill types are now introduced: Tetrahedral and Cubic. They change along with the Z-axis for more uniform strength in all directions. There are now seven infill types to choose from. - -*Gradual Infill -Gradual infill lets users adjust infill density, based on the distance from the top layers. This offers faster printing and reduced material requirements, whilst maintaining surface quality. - -*Set Acceleration and Jerk by Feature -You can now set Jerk and Acceleration by feature-type (infill, walls, top/bottom, etc), for more precision. - -*Outer Wall Offset -If your outer wall line width is smaller than your nozzle size, move the nozzle a bit inward when printing the outer wall, to improve surface quality. - -*Enhanced Combing -The “No Skin” option allows you to comb over infill only to avoid scars on top surfaces. - -*Z Hop -Can’t avoid previously printed parts by horizontal moves? The Z Hop Only Over Printed Parts gives you the ability to Z Hop to avoid collisions for better surface quality. - -*Skin and Wall Overlap -The Skin Overlap setting allows you to overlap the skin lines with the walls for better adhesion. - -*Adjust Initial Layer Travel Speed -Set the travel speed of the initial layer(s) to reduce risk of extruder pulling the print from the bed. - -*Support Interface -It is now possible to print a support bottom as well as a support roof. Support bottoms are placed where the support rests on the model. Printing the support interface with PVA leads to improved surface quality. - -*Bug fixes -Deleting grouped objects -Duplicating groups -Bridging -Drag and drop (first Windows run) -Unretraction speeds -Bottom layer in Spiralize mode -Overlap Compensation -Raft retractions -Retractions now occur after each object printed in one-at-a-time mode -Rafts are no longer printed outside of build area -Spiralize no longer limited to the first printed segment only -Line distance is now the actual line distance -Enabling raft doesn’t influence at which height the model is sliced any more -Brim is now always printed just once -Support roofs now only occur just below overhang - -*Minor changes -Message display time increased to 30 seconds -Notification if you try to save to a locked SD card -Engine log now included in the application log -Undo and Redo now function with multiple operations -The last used folder is now remembered rather than defaulting to home folder -Import X3D files -Made it possible to add multiple Per Model Settings at once -Bed Level and Checkup procedures for UMO+ can be performed without re-adding machine -Combing applied in more cases and results in better paths -Infill thickness now supports Grid infill also for even multiples of the layer height -Support is no longer removed by unprintable thin parts of the model -Support generated on each appropriate layer -Support no longer goes outside overhang areas -Support no longer removes brim around the object -Brim is now also generated under the support -Draft and Ooze shield get their own brim or raft -Settings shared between skirt and brim now also activate when brim is selected -Compensate overlapping wall parts now also works for inner walls -Bed lowering speed can be adjusted for each layer - -[2.1.3] - -*Material Profiles -New material profiles for CPE+, PC, Nylon and TPU for the Ultimaker 2+ family. - -[2.1.2] - -Cura has been completely reengineered from the ground up for an even more seamless integration between hardware, software and materials. Together with its intuitive new user interface, it’s now also ready for any future developments. For the beginner Cura makes 3D printing incredibly easy, and for more advanced users, there are over 200 customizable settings. - -*Select Multiple Objects -You now have the freedom to select and manipulate multiple objects at the same time. - -*Grouping -You can now group objects together to make it easier to manipulate multiple objects. - -*Undo/Redo -You can now undo and redo your actions, like moving an object or scaling. - -*Setting Profiles -The new GUI allows custom profiles to load easily and intuitively, directly from Cura. - -*3MF File Loading Support -We’re happy to report we now support loading 3MF files. This is a new file format similar to AMF, but freely available. - -*Intuitive Cut-Off Object Bottom -We’ve added a feature that allows you to move objects below the build plate. You can either correct a model with a rough bottom, or print only a part of an object. Please note that the implementation differs greatly from the old one when it was just a setting. - -*64-bit Windows Builds -An optimized 64-bit Windows Cura version is now available. This allows you to load larger model files. - -*Automatic calculations -Cura allows you to set a number of lines/layers instead of millimeters. The engine automatically calculates the right settings. - -*Per-Object Settings -Per-object settings allow you to override individual profile settings per object. - -*Engine Features - -*Line Width -Line width settings added per feature: Global, Walls, Top/Bottom, Infill, Skirt, Support. - -*Pattern Settings -Pattern settings improved per feature: Top/Bottom, Infill, Support. - -*Shell - -*Alternate Skin Rotation -Helps to combat the pillowing problem on top layers. - -*Alternate Extra Wall -For better infill adhesion. - -*Horizontal Expansion -Allows to compensate model x,y-size to get a 1:1 result. - -*Travel - -*Avoid Printed Parts -When moving to the next part to print, avoid collisions between the nozzle and other parts which are already printed. - -*Support - -*Stair Step Height -Sets the balance between sturdy and hard to remove support. By setting steps of the stair-like bottom of the support resting on the model. - -*ZigZag -A new, infill type that’s easily breakable, introduced specially for support. - -*Support Roofs -A new sub-feature to reduce scars the support leaves on overhangs. - -*Support Towers -Specialized support for tiny overhang areas. - -*Special Modes - -*Surface Mode -This mode will print the surface of the mesh instead of the enclosed volume. This used to be called ‘Only follow mesh surface’. In addition to the ‘surface mode’ and ‘normal’, a ‘both’ mode has now been added. This ensures all closed volumes are printed as normal and all loose geometry as single walls. - -*Experimental Features - -*Conical Support -An experimental filament, cost-reduction feature, for support. - -*Draft Shield -Prints a protective wall at a set distance around the object that prevents air from hitting the print, reducing warping. - -*Fuzzy Skin -Prints the outer walls with a jittering motion to give your object a diffuse finish. - -*Wire Printing -The object is printed with a mid-air / net-like structure, following the mesh surface. The build plate will move up and down during diagonal segments. Though not visible in layer view, you can view the result in other software, such as Repetier Host or http://chilipeppr.com/tinyg. - - -[15.06 Beta] - -Cura 15.06 is a new release built from the ground up on a completely new -framework called Uranium. This framework has been designed to make it easier to -extend Cura with additional functionality as well as provide a cleaner UI. - -[15.05.95] - -* Fixed: Selection ghost remains visible after deleting an object -* Fixed: Window does not show up immediately after starting application on OSX -* Fixed: Added display of rotation angle during rotation -* Fixed: Object changes position while rotating/scaling -* Fixed: Loading improvements in the layer view -* Fixed: Added application icons -* Fixed: Improved feedback when loading models -* Fixed: Eject device on MacOSX now provides proper feedback -* Fixed: Make it possible to show retraction settings for UM2 -* Fixed: Opening the machine preferences page will switch to the first available machine -* Fixed: Improved tool handle hit area size -* Fixed: Render lines with a thickness based on screen DPI - -[15.05.94] - -* Added Russian translations -* Fixed: Infill not displayed in layer view -* Fixed: Cannot select/scale/rotate when first activating the tool and then trying to select a model. -* Fixed: Improved font rendering on Windows -* Fixed: Help > Show Documentation crashes Cura on Windows -* Fixed: "There is no disk in the drive" repeating messages on Windows -* Fixed: Retraction settings not visible for Ultimaker2 -* Fixed: Display rotation angle when rotating an object -* Fixed: Time/Quality slider values are properly rounded -* Fixed: Improved clarity of buttons and text -* Fixed: No indication that anything is happening when loading a model -* Fixed: Eject device now works on Windows - -[15.05.93] - -* Fixed: No shortcuts for moving up/down layers in layer view. -* Fixed: Last view layers could not be scrolled through in layer view. -* Fixed: Files provided on command line would not actually show up on the build - platform. -* Fixed: Render a ghost of the selection in Layer view to make the actual object - position clear. -* Fixed: Showing a menu would clear the selection. -* Fixed: Size and scaling factor display for scale tool. -* Fixed: Missing background for additional tool controls. -* Fixed: Loading message times out when loading large files. -* Fixed: Show recent files in the file menu. -* Fixed: Windows installer will now install MSVC 2010 redistributable, to - prevent issues with missing DLL's. -* Fixed: Collapsed/expanded state of setting categories not stored. - -[15.05.91] - -* There is now a working MacOSX version. Currently it supports OSX 10.7 and - higher. -* Fixed: Need to deselect before selecting a different object. -* Fixed: Object can be moved on Z axis. -* Fixed: Error values should be considered invalid values and will not trigger a - slice. -* Fixed: Text fields used a locale-aware validator while the underlying code did - not. -* Fixed: Text fields will trigger a slice on text change, not only after focus - change/enter press. -* Fixed: Rotate Tool snaps to incorrect value. -* Fixed: Object Collision would only moved objects to the right. -* Fixed: Object Collision would move the selected object when it should not. -* Fixed: Camera panning now works correctly instead of doing nothing. -* Fixed: Camera would flip around center point at maximum rotation. -* Fixed: Build platform grid blocked view from below objects. -* Fixed: Viewport on MacOSX with high-DPI screens was only taking 1/4th of the -window - -[15.05.90] - -* Fixed: Additional UI elements for tools and views not loading. -* Fixed: Double click needed to change setting dialog page. -* Fixed: Context menu entries (reload, center object, etc.) not working. -* Fixed: "Open With" or passing files from command line not working. -* Fixed: "Reload All" would not reload files. - -In addition, a lot of work has gone into getting a usable Mac OSX version. - -New Features ------------- - -* Plugin based system - The Uranium framework provides us with a plugin-based system - that provides additional flexibility when extending Cura. Think - of new views, tools, file formats, etc. This is probably the - biggest new feature. -* Improved UI - The UI has received a complete overhaul. -* Time-Quality Slider - The 4 static quick print profiles have been replaced with - a slider that should make it easier to find the right spot - between print time and print quality. -* More Settings - The Advanced mode is now configurable and can show many - additional settings that were previously not available, while at - the same time not overwhelming new users with too many settings. - Custom set of visible settings can be created by the user. -* Support for high-DPI screens - The refreshed UI has been designed with high-DPI screens in - mind which should improve the experience of Cura on such - devices. -* Improved language support - (Not yet available for the Beta release.) -* Improved support structure generation - The new version of the CuraEngine now features improved - support generation algorithms and additional options for support - structure generation. -* Experimental Feature: Wire Printing - Wire Printing has been added as an experimental new feature. It - will print objects as a structure of lines. It can be enabled by - from Advanced Mode -> Fixes -> Wire Printing. -* Undo/Redo - It is now possible to undo and redo most scene operations, like - moving or rotating objects. - -Features from earlier versions not (yet) in this release --------------------------------------------------------- - -* The All-at-once/One-at-a-time toggle is not available. - We are working on an improved implementation of this mechanism - but it will not be available for this release. -* No dual extrusion features are available yet. - We are working on a completely new workflow for this but this - needs additional time. -* “Lay Flat” has been removed. - The existing implementation was unfortunately not salvageable. - We will be looking into an improved implementation for this - feature. -* "Split Object Into Parts" has been removed. - Due to the same reason as Lay Flat. -* Support for AMF and DAE file formats has been removed. - Both of these will be implemented as plugins in the future. -* Support for directly loading a GCode file is not yet available. - This will be implemented as a plugin in the future. -* Support for PNG, JPG and other image formats has been removed. - These can be supported by a plugin with an improved UI. -* Support for loading Minecraft levels has been removed. - This can be implemented as a plugin. -* Windows XP support has been dropped. - Microsoft is no longer supporting xp, so they no longer back - port certain features that we require. -* X-Ray view is missing. - Will be implemented as a (you might have guessed it) plugin. -* Fixes: Follow Mesh Surface - Has been removed from the engine, the same result can be - achieved using no infill or top/bottom layers. - -Known Issues ------------- -* Some OBJ files are rendered as black objects due to missing - normals. -* Disabling plugins does not work correctly yet. -* Unicorn occasionally still requires feeding. Do not feed it - after midnight. +The release notes of versions <= 4.5.0 can be found in our releases GitHub page. diff --git a/resources/texts/whats_new/0.html b/resources/texts/whats_new/0.html new file mode 100644 index 0000000000..d0a7459099 --- /dev/null +++ b/resources/texts/whats_new/0.html @@ -0,0 +1,3 @@ +

    Open native CAD files for Ultimaker Professional and Excellence

    +

    Ultimaker Professional and Excellence subscribers can now directly import native CAD files into Ultimaker Cura. This provides users with an even more effective workflow by boosting productivity and increasing first-time right results.
    +Learn more about our enterprise plans to access this feature.

    \ No newline at end of file diff --git a/resources/texts/whats_new/1.html b/resources/texts/whats_new/1.html new file mode 100644 index 0000000000..2537344454 --- /dev/null +++ b/resources/texts/whats_new/1.html @@ -0,0 +1,2 @@ +

    Try Ultimaker 3D Printing Academy and level up your slicing skills

    +

    Follow the Expert Tips for Ultimaker Cura course in the Ultimaker 3D Printing Academy and expand your knowledge. Get the most out of your slicing software by learning how to optimize prints and receive plugin recommendations from our team of 3D printing experts.

    diff --git a/resources/texts/whats_new/2.html b/resources/texts/whats_new/2.html new file mode 100644 index 0000000000..a6f20cb493 --- /dev/null +++ b/resources/texts/whats_new/2.html @@ -0,0 +1,2 @@ +

    Ultimaker PETG print profiles are now available for the Ultimaker 3

    +

    Ultimaker PETG sets the standard for industrial applications and is suitable for a wide range of use cases thanks to its ease of use and versatility. Ultimaker PETG is now fully supported on the Ultimaker 3. Find out more.

    \ No newline at end of file diff --git a/resources/texts/whats_new/3.html b/resources/texts/whats_new/3.html new file mode 100644 index 0000000000..a433453bde --- /dev/null +++ b/resources/texts/whats_new/3.html @@ -0,0 +1,2 @@ +

    Flow rate

    +

    Thanks to Khani3s, we have now added the volumetric flow rate (in mm³/s) to the preview mode color schemes. In addition, we tweaked the minimum/maximum color values, making it easier to optimize your print strategy displayed as the flow, layer thickness, line width and speed.

    \ No newline at end of file diff --git a/resources/texts/whats_new/4.html b/resources/texts/whats_new/4.html new file mode 100644 index 0000000000..5997ce2408 --- /dev/null +++ b/resources/texts/whats_new/4.html @@ -0,0 +1,2 @@ +

    Learn more!

    +

    Want more information for Ultimaker Cura 4.10? Read the blog post or watch the video, and don't forget to give us your feedback!

    \ No newline at end of file diff --git a/resources/themes/cura-dark-colorblind/icons/sign_in_to_cloud.svg b/resources/themes/cura-dark-colorblind/icons/sign_in_to_cloud.svg deleted file mode 100644 index 09ba300b6a..0000000000 --- a/resources/themes/cura-dark-colorblind/icons/sign_in_to_cloud.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - Group-cloud Copy - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-dark/icons/sign_in_to_cloud.svg b/resources/themes/cura-dark/icons/sign_in_to_cloud.svg deleted file mode 100644 index 09ba300b6a..0000000000 --- a/resources/themes/cura-dark/icons/sign_in_to_cloud.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - Group-cloud Copy - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index e3266b923b..457d2092c1 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -16,13 +16,20 @@ "primary_text": [255, 255, 255, 204], "secondary": [95, 95, 95, 255], - "icon": [204, 204, 204, 255], + "secondary_button": [39, 44, 48, 255], + "secondary_button_hover": [85, 85, 87, 255], + "secondary_button_text": [255, 255, 255, 255], + + "icon": [255, 255, 255, 255], "toolbar_background": [39, 44, 48, 255], - "toolbar_button_active": [95, 95, 95, 255], - "toolbar_button_hover": [95, 95, 95, 255], - "toolbar_button_active_hover": [95, 95, 95, 255], + "toolbar_button_active": [57, 57, 58, 255], + "toolbar_button_hover": [57, 57, 58, 255], + "toolbar_button_active_hover": [57, 57, 58, 255], "main_window_header_button_text_inactive": [128, 128, 128, 255], + "main_window_header_background": [14, 14, 14, 255], + "main_window_header_background_gradient": [32, 32, 32, 255], + "main_window_header_button_background_hovered": [46, 46, 46, 255], "account_sync_state_icon": [255, 255, 255, 204], @@ -32,7 +39,7 @@ "text": [255, 255, 255, 204], "text_detail": [255, 255, 255, 172], - "text_link": [255, 255, 255, 127], + "text_link": [25, 110, 240, 255], "text_inactive": [255, 255, 255, 88], "text_hover": [255, 255, 255, 204], "text_pressed": [255, 255, 255, 204], @@ -87,8 +94,8 @@ "action_button_active": [39, 44, 48, 30], "action_button_active_text": [255, 255, 255, 255], "action_button_active_border": [255, 255, 255, 100], - "action_button_disabled": [19, 24, 28, 255], - "action_button_disabled_text": [200, 200, 200, 80], + "action_button_disabled": [85, 85, 87, 255], + "action_button_disabled_text": [103, 103, 104, 255], "action_button_disabled_border": [255, 255, 255, 30], "scrollbar_background": [39, 44, 48, 0], diff --git a/resources/themes/cura-light-colorblind/icons/sign_in_to_cloud.svg b/resources/themes/cura-light-colorblind/icons/sign_in_to_cloud.svg deleted file mode 100644 index 09ba300b6a..0000000000 --- a/resources/themes/cura-light-colorblind/icons/sign_in_to_cloud.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - Group-cloud Copy - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/application.svg b/resources/themes/cura-light/icons/application.svg deleted file mode 100644 index a76323a7d4..0000000000 --- a/resources/themes/cura-light/icons/application.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/arrow_bottom.svg b/resources/themes/cura-light/icons/arrow_bottom.svg deleted file mode 100644 index 102f7b54a2..0000000000 --- a/resources/themes/cura-light/icons/arrow_bottom.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/arrow_left.svg b/resources/themes/cura-light/icons/arrow_left.svg deleted file mode 100644 index e48cece556..0000000000 --- a/resources/themes/cura-light/icons/arrow_left.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/arrow_right.svg b/resources/themes/cura-light/icons/arrow_right.svg deleted file mode 100644 index 6562a3e80b..0000000000 --- a/resources/themes/cura-light/icons/arrow_right.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/arrow_top.svg b/resources/themes/cura-light/icons/arrow_top.svg deleted file mode 100644 index 7af5913a32..0000000000 --- a/resources/themes/cura-light/icons/arrow_top.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/basic.svg b/resources/themes/cura-light/icons/basic.svg deleted file mode 100644 index b30d0669b3..0000000000 --- a/resources/themes/cura-light/icons/basic.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/buildplate.svg b/resources/themes/cura-light/icons/buildplate.svg deleted file mode 100644 index 7505c8204e..0000000000 --- a/resources/themes/cura-light/icons/buildplate.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/category_adhesion.svg b/resources/themes/cura-light/icons/category_adhesion.svg deleted file mode 100644 index dc119d889a..0000000000 --- a/resources/themes/cura-light/icons/category_adhesion.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/category_blackmagic.svg b/resources/themes/cura-light/icons/category_blackmagic.svg deleted file mode 100644 index d4e2b89ba4..0000000000 --- a/resources/themes/cura-light/icons/category_blackmagic.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - ? - - - - - diff --git a/resources/themes/cura-light/icons/category_cool.svg b/resources/themes/cura-light/icons/category_cool.svg deleted file mode 100644 index db74322a2c..0000000000 --- a/resources/themes/cura-light/icons/category_cool.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_dual.svg b/resources/themes/cura-light/icons/category_dual.svg deleted file mode 100644 index 2a53292379..0000000000 --- a/resources/themes/cura-light/icons/category_dual.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_experimental.svg b/resources/themes/cura-light/icons/category_experimental.svg deleted file mode 100644 index 9fc7d74880..0000000000 --- a/resources/themes/cura-light/icons/category_experimental.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_fixes.svg b/resources/themes/cura-light/icons/category_fixes.svg deleted file mode 100644 index 963338088a..0000000000 --- a/resources/themes/cura-light/icons/category_fixes.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_infill.svg b/resources/themes/cura-light/icons/category_infill.svg deleted file mode 100644 index e1660ca8e2..0000000000 --- a/resources/themes/cura-light/icons/category_infill.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_layer_height.svg b/resources/themes/cura-light/icons/category_layer_height.svg deleted file mode 100644 index 474e81f14e..0000000000 --- a/resources/themes/cura-light/icons/category_layer_height.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_machine.svg b/resources/themes/cura-light/icons/category_machine.svg deleted file mode 100644 index 25c84aa4f2..0000000000 --- a/resources/themes/cura-light/icons/category_machine.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/category_material.svg b/resources/themes/cura-light/icons/category_material.svg deleted file mode 100644 index 0d8ae42d9d..0000000000 --- a/resources/themes/cura-light/icons/category_material.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_shell.svg b/resources/themes/cura-light/icons/category_shell.svg deleted file mode 100644 index 61e112d88c..0000000000 --- a/resources/themes/cura-light/icons/category_shell.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/category_shield.svg b/resources/themes/cura-light/icons/category_shield.svg deleted file mode 100644 index 99a245936d..0000000000 --- a/resources/themes/cura-light/icons/category_shield.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/category_speed.svg b/resources/themes/cura-light/icons/category_speed.svg deleted file mode 100644 index 36d1b3f2e1..0000000000 --- a/resources/themes/cura-light/icons/category_speed.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/category_support.svg b/resources/themes/cura-light/icons/category_support.svg deleted file mode 100644 index 693e1f5f37..0000000000 --- a/resources/themes/cura-light/icons/category_support.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/category_travel.svg b/resources/themes/cura-light/icons/category_travel.svg deleted file mode 100644 index 67f5713671..0000000000 --- a/resources/themes/cura-light/icons/category_travel.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_unknown.svg b/resources/themes/cura-light/icons/category_unknown.svg deleted file mode 100644 index 67f5713671..0000000000 --- a/resources/themes/cura-light/icons/category_unknown.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/check.svg b/resources/themes/cura-light/icons/check.svg deleted file mode 100644 index 62b6993763..0000000000 --- a/resources/themes/cura-light/icons/check.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/checked.svg b/resources/themes/cura-light/icons/checked.svg deleted file mode 100644 index 22d1278667..0000000000 --- a/resources/themes/cura-light/icons/checked.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - checked - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/clock.svg b/resources/themes/cura-light/icons/clock.svg deleted file mode 100644 index 0b6cb78881..0000000000 --- a/resources/themes/cura-light/icons/clock.svg +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/cross1.svg b/resources/themes/cura-light/icons/cross1.svg deleted file mode 100644 index 63b7a6951c..0000000000 --- a/resources/themes/cura-light/icons/cross1.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/cross2.svg b/resources/themes/cura-light/icons/cross2.svg deleted file mode 100644 index 7d4a3a878d..0000000000 --- a/resources/themes/cura-light/icons/cross2.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Adhesion.svg b/resources/themes/cura-light/icons/default/Adhesion.svg new file mode 100755 index 0000000000..9848ccca95 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Adhesion.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg b/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg new file mode 100755 index 0000000000..8c23b85331 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ArrowFourWay.svg b/resources/themes/cura-light/icons/default/ArrowFourWay.svg new file mode 100755 index 0000000000..885db61589 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ArrowFourWay.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ArrowReset.svg b/resources/themes/cura-light/icons/default/ArrowReset.svg new file mode 100755 index 0000000000..6e54ece698 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ArrowReset.svg @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/resources/themes/cura-light/icons/default/Bandage.svg b/resources/themes/cura-light/icons/default/Bandage.svg new file mode 100755 index 0000000000..74e45f009e --- /dev/null +++ b/resources/themes/cura-light/icons/default/Bandage.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/BlackMagic.svg b/resources/themes/cura-light/icons/default/BlackMagic.svg new file mode 100755 index 0000000000..539b341950 --- /dev/null +++ b/resources/themes/cura-light/icons/default/BlackMagic.svg @@ -0,0 +1,7 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg b/resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg new file mode 100644 index 0000000000..21d48f8e9e --- /dev/null +++ b/resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/resources/themes/cura-light/icons/default/Cancel.svg b/resources/themes/cura-light/icons/default/Cancel.svg new file mode 100755 index 0000000000..82992683d8 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Cancel.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/CancelBlock.svg b/resources/themes/cura-light/icons/default/CancelBlock.svg new file mode 100755 index 0000000000..10b7917247 --- /dev/null +++ b/resources/themes/cura-light/icons/default/CancelBlock.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/CancelCircle.svg b/resources/themes/cura-light/icons/default/CancelCircle.svg new file mode 100755 index 0000000000..40423ffd8d --- /dev/null +++ b/resources/themes/cura-light/icons/default/CancelCircle.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Check.svg b/resources/themes/cura-light/icons/default/Check.svg new file mode 100755 index 0000000000..c64667efd8 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Check.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/CheckCircle.svg b/resources/themes/cura-light/icons/default/CheckCircle.svg new file mode 100755 index 0000000000..c364a1ecb9 --- /dev/null +++ b/resources/themes/cura-light/icons/default/CheckCircle.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/ChevronSingleDown.svg b/resources/themes/cura-light/icons/default/ChevronSingleDown.svg new file mode 100755 index 0000000000..f39c7de600 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ChevronSingleDown.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg b/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg new file mode 100755 index 0000000000..ad59cf483b --- /dev/null +++ b/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ChevronSingleRight.svg b/resources/themes/cura-light/icons/default/ChevronSingleRight.svg new file mode 100755 index 0000000000..5ee4ce7e82 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ChevronSingleRight.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ChevronSingleUp.svg b/resources/themes/cura-light/icons/default/ChevronSingleUp.svg new file mode 100755 index 0000000000..80d2e44ac9 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ChevronSingleUp.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/circle_outline.svg b/resources/themes/cura-light/icons/default/CircleOutline.svg similarity index 81% rename from resources/themes/cura-light/icons/circle_outline.svg rename to resources/themes/cura-light/icons/default/CircleOutline.svg index 3a8fb197f3..6f7cd6aca0 100644 --- a/resources/themes/cura-light/icons/circle_outline.svg +++ b/resources/themes/cura-light/icons/default/CircleOutline.svg @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/resources/themes/cura-light/icons/default/Clock.svg b/resources/themes/cura-light/icons/default/Clock.svg new file mode 100755 index 0000000000..aa00d5d322 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Clock.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Cloud.svg b/resources/themes/cura-light/icons/default/Cloud.svg new file mode 100755 index 0000000000..97905fea55 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Cloud.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/DualExtrusion.svg b/resources/themes/cura-light/icons/default/DualExtrusion.svg new file mode 100755 index 0000000000..b8cf505d8e --- /dev/null +++ b/resources/themes/cura-light/icons/default/DualExtrusion.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Experiment.svg b/resources/themes/cura-light/icons/default/Experiment.svg new file mode 100755 index 0000000000..fd40fc30c8 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Experiment.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Extruder.svg b/resources/themes/cura-light/icons/default/Extruder.svg new file mode 100644 index 0000000000..7c17fa67ca --- /dev/null +++ b/resources/themes/cura-light/icons/default/Extruder.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/ExtruderColor.svg b/resources/themes/cura-light/icons/default/ExtruderColor.svg new file mode 100644 index 0000000000..ff202e7296 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ExtruderColor.svg @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Eye.svg b/resources/themes/cura-light/icons/default/Eye.svg new file mode 100755 index 0000000000..9711c56999 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Eye.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Fan.svg b/resources/themes/cura-light/icons/default/Fan.svg new file mode 100755 index 0000000000..1578e91bcc --- /dev/null +++ b/resources/themes/cura-light/icons/default/Fan.svg @@ -0,0 +1,8 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Folder.svg b/resources/themes/cura-light/icons/default/Folder.svg new file mode 100755 index 0000000000..e13942ba0c --- /dev/null +++ b/resources/themes/cura-light/icons/default/Folder.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Formula.svg b/resources/themes/cura-light/icons/default/Formula.svg new file mode 100755 index 0000000000..987489bf44 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Formula.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/Function.svg b/resources/themes/cura-light/icons/default/Function.svg new file mode 100644 index 0000000000..4947b6d248 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Function.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/resources/themes/cura-light/icons/default/Guide.svg b/resources/themes/cura-light/icons/default/Guide.svg new file mode 100755 index 0000000000..2f3e7caa87 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Guide.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Hamburger.svg b/resources/themes/cura-light/icons/default/Hamburger.svg new file mode 100755 index 0000000000..762784cbb6 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Hamburger.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/resources/themes/cura-light/icons/default/House.svg b/resources/themes/cura-light/icons/default/House.svg new file mode 100755 index 0000000000..8ee7c34f84 --- /dev/null +++ b/resources/themes/cura-light/icons/default/House.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Infill0.svg b/resources/themes/cura-light/icons/default/Infill0.svg new file mode 100755 index 0000000000..3764899206 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Infill0.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Infill1.svg b/resources/themes/cura-light/icons/default/Infill1.svg new file mode 100755 index 0000000000..07e19a15aa --- /dev/null +++ b/resources/themes/cura-light/icons/default/Infill1.svg @@ -0,0 +1,8 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Infill100.svg b/resources/themes/cura-light/icons/default/Infill100.svg new file mode 100644 index 0000000000..d136666990 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Infill100.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/themes/cura-light/icons/default/Infill2.svg b/resources/themes/cura-light/icons/default/Infill2.svg new file mode 100755 index 0000000000..e61aad960e --- /dev/null +++ b/resources/themes/cura-light/icons/default/Infill2.svg @@ -0,0 +1,7 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Infill3.svg b/resources/themes/cura-light/icons/default/Infill3.svg new file mode 100755 index 0000000000..3d2daa7e95 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Infill3.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/InfillGradual.svg b/resources/themes/cura-light/icons/default/InfillGradual.svg new file mode 100755 index 0000000000..1d901a887d --- /dev/null +++ b/resources/themes/cura-light/icons/default/InfillGradual.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Information.svg b/resources/themes/cura-light/icons/default/Information.svg new file mode 100755 index 0000000000..dcfee1087a --- /dev/null +++ b/resources/themes/cura-light/icons/default/Information.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/LayFlat.svg b/resources/themes/cura-light/icons/default/LayFlat.svg new file mode 100755 index 0000000000..3ce87cce68 --- /dev/null +++ b/resources/themes/cura-light/icons/default/LayFlat.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/LayFlatOnFace.svg b/resources/themes/cura-light/icons/default/LayFlatOnFace.svg new file mode 100755 index 0000000000..1bd3a0f23a --- /dev/null +++ b/resources/themes/cura-light/icons/default/LayFlatOnFace.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Layers.svg b/resources/themes/cura-light/icons/default/Layers.svg new file mode 100755 index 0000000000..2d802066a1 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Layers.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/Lightning.svg b/resources/themes/cura-light/icons/default/Lightning.svg new file mode 100644 index 0000000000..08c7e39e39 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Lightning.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Link.svg b/resources/themes/cura-light/icons/default/Link.svg new file mode 100755 index 0000000000..b0158158dd --- /dev/null +++ b/resources/themes/cura-light/icons/default/Link.svg @@ -0,0 +1,8 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/LinkExternal.svg b/resources/themes/cura-light/icons/default/LinkExternal.svg new file mode 100755 index 0000000000..fd75e4ae06 --- /dev/null +++ b/resources/themes/cura-light/icons/default/LinkExternal.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Magnifier.svg b/resources/themes/cura-light/icons/default/Magnifier.svg new file mode 100755 index 0000000000..dd8f0a2109 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Magnifier.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/MeshType.svg b/resources/themes/cura-light/icons/default/MeshType.svg new file mode 100755 index 0000000000..8c440378d9 --- /dev/null +++ b/resources/themes/cura-light/icons/default/MeshType.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/MeshTypeIntersect.svg b/resources/themes/cura-light/icons/default/MeshTypeIntersect.svg new file mode 100755 index 0000000000..485e4a7953 --- /dev/null +++ b/resources/themes/cura-light/icons/default/MeshTypeIntersect.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/MeshTypeNormal.svg b/resources/themes/cura-light/icons/default/MeshTypeNormal.svg new file mode 100755 index 0000000000..3764899206 --- /dev/null +++ b/resources/themes/cura-light/icons/default/MeshTypeNormal.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/MeshTypeSupport.svg b/resources/themes/cura-light/icons/default/MeshTypeSupport.svg new file mode 100755 index 0000000000..7e21d6761d --- /dev/null +++ b/resources/themes/cura-light/icons/default/MeshTypeSupport.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Minus.svg b/resources/themes/cura-light/icons/default/Minus.svg new file mode 100755 index 0000000000..c32b6d2de1 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Minus.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Mirror.svg b/resources/themes/cura-light/icons/default/Mirror.svg new file mode 100755 index 0000000000..5b6bcd9a42 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Mirror.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Pen.svg b/resources/themes/cura-light/icons/default/Pen.svg new file mode 100755 index 0000000000..375cfca53a --- /dev/null +++ b/resources/themes/cura-light/icons/default/Pen.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Plugin.svg b/resources/themes/cura-light/icons/default/Plugin.svg new file mode 100755 index 0000000000..516fbfeda6 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Plugin.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Plus.svg b/resources/themes/cura-light/icons/default/Plus.svg new file mode 100755 index 0000000000..8507121d21 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Plus.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/PrintQuality.svg b/resources/themes/cura-light/icons/default/PrintQuality.svg new file mode 100755 index 0000000000..2af638f6b5 --- /dev/null +++ b/resources/themes/cura-light/icons/default/PrintQuality.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/resources/themes/cura-light/icons/default/PrintShell.svg b/resources/themes/cura-light/icons/default/PrintShell.svg new file mode 100755 index 0000000000..b4aac134d7 --- /dev/null +++ b/resources/themes/cura-light/icons/default/PrintShell.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/PrintTopBottom.svg b/resources/themes/cura-light/icons/default/PrintTopBottom.svg new file mode 100644 index 0000000000..97d66fd19c --- /dev/null +++ b/resources/themes/cura-light/icons/default/PrintTopBottom.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/PrintTravel.svg b/resources/themes/cura-light/icons/default/PrintTravel.svg new file mode 100755 index 0000000000..0b7cb888d3 --- /dev/null +++ b/resources/themes/cura-light/icons/default/PrintTravel.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/Printer.svg b/resources/themes/cura-light/icons/default/Printer.svg new file mode 100755 index 0000000000..3dfb91ac3f --- /dev/null +++ b/resources/themes/cura-light/icons/default/Printer.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/PrinterTriple.svg b/resources/themes/cura-light/icons/default/PrinterTriple.svg new file mode 100755 index 0000000000..5165aee91f --- /dev/null +++ b/resources/themes/cura-light/icons/default/PrinterTriple.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Quick.svg b/resources/themes/cura-light/icons/default/Quick.svg new file mode 100755 index 0000000000..a05a008393 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Quick.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Rotate.svg b/resources/themes/cura-light/icons/default/Rotate.svg new file mode 100755 index 0000000000..43e4d51d5e --- /dev/null +++ b/resources/themes/cura-light/icons/default/Rotate.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Scale.svg b/resources/themes/cura-light/icons/default/Scale.svg new file mode 100755 index 0000000000..2a31c93403 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Scale.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/ScaleMax.svg b/resources/themes/cura-light/icons/default/ScaleMax.svg new file mode 100755 index 0000000000..62d9710bc8 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ScaleMax.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/Shield.svg b/resources/themes/cura-light/icons/default/Shield.svg new file mode 100755 index 0000000000..a6f48919e6 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Shield.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Sliders.svg b/resources/themes/cura-light/icons/default/Sliders.svg new file mode 100755 index 0000000000..1f0b0f5c41 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Sliders.svg @@ -0,0 +1,8 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Solid.svg b/resources/themes/cura-light/icons/default/Solid.svg new file mode 100644 index 0000000000..608a56a3e3 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Solid.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/themes/cura-light/icons/default/SpeedOMeter.svg b/resources/themes/cura-light/icons/default/SpeedOMeter.svg new file mode 100755 index 0000000000..4f5ba6b3bd --- /dev/null +++ b/resources/themes/cura-light/icons/default/SpeedOMeter.svg @@ -0,0 +1,7 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Spool.svg b/resources/themes/cura-light/icons/default/Spool.svg new file mode 100755 index 0000000000..fcc2d19f77 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Spool.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Sputnik.svg b/resources/themes/cura-light/icons/default/Sputnik.svg new file mode 100755 index 0000000000..0273f611c3 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Sputnik.svg @@ -0,0 +1,9 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Star.svg b/resources/themes/cura-light/icons/default/Star.svg new file mode 100755 index 0000000000..15b8776c31 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Star.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/StarFilled.svg b/resources/themes/cura-light/icons/default/StarFilled.svg new file mode 100755 index 0000000000..2b085dd3f5 --- /dev/null +++ b/resources/themes/cura-light/icons/default/StarFilled.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Support.svg b/resources/themes/cura-light/icons/default/Support.svg new file mode 100755 index 0000000000..e6afd2956d --- /dev/null +++ b/resources/themes/cura-light/icons/default/Support.svg @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/SupportBlocker.svg b/resources/themes/cura-light/icons/default/SupportBlocker.svg new file mode 100755 index 0000000000..1e170b05e9 --- /dev/null +++ b/resources/themes/cura-light/icons/default/SupportBlocker.svg @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/ThreeDots.svg b/resources/themes/cura-light/icons/default/ThreeDots.svg new file mode 100755 index 0000000000..a73e40d056 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ThreeDots.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/UltimakerCura.svg b/resources/themes/cura-light/icons/default/UltimakerCura.svg new file mode 100755 index 0000000000..a4f208602b --- /dev/null +++ b/resources/themes/cura-light/icons/default/UltimakerCura.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/View3D.svg b/resources/themes/cura-light/icons/default/View3D.svg new file mode 100755 index 0000000000..0a106fa98d --- /dev/null +++ b/resources/themes/cura-light/icons/default/View3D.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ViewFront.svg b/resources/themes/cura-light/icons/default/ViewFront.svg new file mode 100755 index 0000000000..fdd379fcf9 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ViewFront.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ViewLeft.svg b/resources/themes/cura-light/icons/default/ViewLeft.svg new file mode 100755 index 0000000000..1dc50f74b7 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ViewLeft.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ViewRight.svg b/resources/themes/cura-light/icons/default/ViewRight.svg new file mode 100755 index 0000000000..c05bde40fa --- /dev/null +++ b/resources/themes/cura-light/icons/default/ViewRight.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ViewTop.svg b/resources/themes/cura-light/icons/default/ViewTop.svg new file mode 100755 index 0000000000..dea916e669 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ViewTop.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Warning.svg b/resources/themes/cura-light/icons/default/Warning.svg new file mode 100755 index 0000000000..828e866435 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Warning.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/dense.svg b/resources/themes/cura-light/icons/dense.svg deleted file mode 100644 index a8f65fecc7..0000000000 --- a/resources/themes/cura-light/icons/dense.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/resources/themes/cura-light/icons/deprecated_icons.json b/resources/themes/cura-light/icons/deprecated_icons.json new file mode 100644 index 0000000000..df286cffc7 --- /dev/null +++ b/resources/themes/cura-light/icons/deprecated_icons.json @@ -0,0 +1,306 @@ +{ + "notice": { + "new_icon": "Information", + "size": "default" + }, + "info": { + "new_icon": "Information", + "size": "default" + }, + "plus": { + "new_icon": "Plus", + "size": "default" + }, + "cross1": { + "new_icon": "Cancel", + "size": "default" + }, + "application": { + "new_icon": "UltimakerCura", + "size": "default" + }, + "printer_single": { + "new_icon": "Printer", + "size": "default" + }, + "category_material": { + "new_icon": "Spool", + "size": "default" + }, + "settings": { + "new_icon": "Sliders", + "size": "default" + }, + "plugin": { + "new_icon": "Plugin", + "size": "default" + }, + "external_link": { + "new_icon": "LinkExternal", + "size": "default" + }, + "arrow_top": { + "new_icon": "ChevronSingleUp", + "size": "default" + }, + "arrow_bottom": { + "new_icon": "ChevronSingleDown", + "size": "default" + }, + "arrow_right": { + "new_icon": "ChevronSingleRight", + "size": "default" + }, + "pos_normal": { + "new_icon": "Infill0", + "size": "default" + }, + "pos_print_as_support": { + "new_icon": "MeshTypeSupport", + "size": "default" + }, + "pos_modify_overlaps": { + "new_icon": "MeshTypeIntersect", + "size": "default" + }, + "pos_modify_dont_support_overlap": { + "new_icon": "BlockSupportOverlaps", + "size": "default" + }, + "minus": { + "new_icon": "Minus", + "size": "default" + }, + "load": { + "new_icon": "Folder", + "size": "default" + }, + "extruder_button": { + "new_icon": "Extruder", + "size": "medium" + }, + "category_adhesion": { + "new_icon": "Adhesion", + "size": "default" + }, + "category_machine": { + "new_icon": "Printer", + "size": "default" + }, + "category_layer_height": { + "new_icon": "PrintQuality", + "size": "default" + }, + "category_shell": { + "new_icon": "PrintShell", + "size": "default" + }, + "category_topbottom": { + "new_icon": "PrintTopBottom", + "size": "default" + }, + "category_infill": { + "new_icon": "Infill1", + "size": "default" + }, + "category_speed": { + "new_icon": "SpeedOMeter", + "size": "default" + }, + "category_travel": { + "new_icon": "PrintTravel", + "size": "default" + }, + "category_cool": { + "new_icon": "Fan", + "size": "default" + }, + "category_support": { + "new_icon": "Support", + "size": "default" + }, + "category_dual": { + "new_icon": "DualExtrusion", + "size": "default" + }, + "category_fixes": { + "new_icon": "Bandage", + "size": "default" + }, + "category_blackmagic": { + "new_icon": "BlackMagic", + "size": "default" + }, + "category_experimental": { + "new_icon": "Experiment", + "size": "default" + }, + "circle_outline": { + "new_icon": "CircleOutline", + "size": "default" + }, + "update": { + "new_icon": "ArrowDoubleCircleRight", + "size": "default" + }, + "checked": { + "new_icon": "CheckCircle", + "size": "default" + }, + "warning_light": { + "new_icon": "Warning", + "size": "default" + }, + "clock": { + "new_icon": "Clock", + "size": "default" + }, + "spool": { + "new_icon": "Spool", + "size": "default" + }, + "warning": { + "new_icon": "Warning", + "size": "default" + }, + "check": { + "new_icon": "Check", + "size": "default" + }, + "pencil": { + "new_icon": "Pencil", + "size": "default" + }, + "printing_guideline": { + "new_icon": "Guide", + "size": "default" + }, + "favorites_star_full": { + "new_icon": "StarFilled", + "size": "default" + }, + "favorites_star_empty": { + "new_icon": "Star", + "size": "default" + }, + "resize": { + "new_icon": "ThreeDots", + "size": "default" + }, + "gradual": { + "new_icon": "InfillGradual", + "size": "default" + }, + "hollow": { + "new_icon": "Infill0", + "size": "default" + }, + "sparse": { + "new_icon": "Infill3", + "size": "default" + }, + "dense": { + "new_icon": "Infill2", + "size": "default" + }, + "solid": { + "new_icon": "Solid", + "size": "default" + }, + "reset": { + "new_icon": "ArrowReset", + "size": "default" + }, + "arrow_left": { + "new_icon": "ChevronSingleLeft", + "size": "default" + }, + "home": { + "new_icon": "House", + "size": "default" + }, + "printer_group": { + "new_icon": "PrinterTriple", + "size": "medium" + }, + "formula": { + "new_icon": "Function", + "size": "default" + }, + "search": { + "new_icon": "Magnifier", + "size": "default" + }, + "menu": { + "new_icon": "Hamburger", + "size": "default" + }, + "view_3d": { + "new_icon": "View3D", + "size": "default" + }, + "view_layer": { + "new_icon": "Layers", + "size": "default" + }, + "view_front": { + "new_icon": "ViewFront", + "size": "default" + }, + "view_top": { + "new_icon": "ViewTop", + "size": "default" + }, + "view_left": { + "new_icon": "ViewLeft", + "size": "default" + }, + "view_right": { + "new_icon": "ViewRight", + "size": "default" + }, + "package": { + "new_icon": "Plugin", + "size": "default" + }, + "material_spool": { + "new_icon": "Spool", + "size": "default" + }, + "dot": { + "new_icon": "Dot", + "size": "low" + }, + "mirror": { + "new_icon": "Mirror", + "size": "default" + }, + "rotate_reset": { + "new_icon": "ArrowReset", + "size": "default" + }, + "rotate_layflat": { + "new_icon": "LayFlat", + "size": "default" + }, + "rotate_face_layflat": { + "new_icon": "LayFlatOnFace", + "size": "default" + }, + "rotate": { + "new_icon": "Rotate", + "size": "default" + }, + "scale_reset": { + "new_icon": "ArrowReset", + "size": "default" + }, + "scale": { + "new_icon": "Scale", + "size": "default" + }, + "translate": { + "new_icon": "ArrowFourWay", + "size": "default" + } +} \ No newline at end of file diff --git a/resources/themes/cura-light/icons/drop_down_button.svg b/resources/themes/cura-light/icons/drop_down_button.svg deleted file mode 100644 index 18748e6d70..0000000000 --- a/resources/themes/cura-light/icons/drop_down_button.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/external_link.svg b/resources/themes/cura-light/icons/external_link.svg deleted file mode 100644 index a2130fb97b..0000000000 --- a/resources/themes/cura-light/icons/external_link.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/extruder_button.svg b/resources/themes/cura-light/icons/extruder_button.svg deleted file mode 100644 index c79ba5c5df..0000000000 --- a/resources/themes/cura-light/icons/extruder_button.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/favorites_star_empty.svg b/resources/themes/cura-light/icons/favorites_star_empty.svg deleted file mode 100644 index bb1205e7a7..0000000000 --- a/resources/themes/cura-light/icons/favorites_star_empty.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/resources/themes/cura-light/icons/favorites_star_full.svg b/resources/themes/cura-light/icons/favorites_star_full.svg deleted file mode 100644 index aad45c5d02..0000000000 --- a/resources/themes/cura-light/icons/favorites_star_full.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/resources/themes/cura-light/icons/formula.svg b/resources/themes/cura-light/icons/formula.svg deleted file mode 100644 index ae810bc014..0000000000 --- a/resources/themes/cura-light/icons/formula.svg +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/resources/themes/cura-light/icons/gradual.svg b/resources/themes/cura-light/icons/gradual.svg deleted file mode 100644 index ed7f301e18..0000000000 --- a/resources/themes/cura-light/icons/gradual.svg +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/hollow.svg b/resources/themes/cura-light/icons/hollow.svg deleted file mode 100644 index a63bfd9bfc..0000000000 --- a/resources/themes/cura-light/icons/hollow.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/home.svg b/resources/themes/cura-light/icons/home.svg deleted file mode 100644 index a355aa07f6..0000000000 --- a/resources/themes/cura-light/icons/home.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/info.svg b/resources/themes/cura-light/icons/info.svg deleted file mode 100644 index 9896b3dac8..0000000000 --- a/resources/themes/cura-light/icons/info.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - Icon/ info - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/link.svg b/resources/themes/cura-light/icons/link.svg deleted file mode 100644 index 12b3abbe73..0000000000 --- a/resources/themes/cura-light/icons/link.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/load.svg b/resources/themes/cura-light/icons/load.svg deleted file mode 100644 index 7b3e966634..0000000000 --- a/resources/themes/cura-light/icons/load.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/low/Cancel.svg b/resources/themes/cura-light/icons/low/Cancel.svg new file mode 100644 index 0000000000..6fc1159747 --- /dev/null +++ b/resources/themes/cura-light/icons/low/Cancel.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/low/Check.svg b/resources/themes/cura-light/icons/low/Check.svg new file mode 100644 index 0000000000..a20a9b1b70 --- /dev/null +++ b/resources/themes/cura-light/icons/low/Check.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/low/CheckBlueBG.svg b/resources/themes/cura-light/icons/low/CheckBlueBG.svg new file mode 100644 index 0000000000..d4fa12a354 --- /dev/null +++ b/resources/themes/cura-light/icons/low/CheckBlueBG.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/low/CircleSolid.svg b/resources/themes/cura-light/icons/low/CircleSolid.svg new file mode 100644 index 0000000000..18f38a2341 --- /dev/null +++ b/resources/themes/cura-light/icons/low/CircleSolid.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/themes/cura-light/icons/low/CloudBadge.svg b/resources/themes/cura-light/icons/low/CloudBadge.svg new file mode 100644 index 0000000000..e37fb324d4 --- /dev/null +++ b/resources/themes/cura-light/icons/low/CloudBadge.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/dot.svg b/resources/themes/cura-light/icons/low/Dot.svg similarity index 59% rename from resources/themes/cura-light/icons/dot.svg rename to resources/themes/cura-light/icons/low/Dot.svg index 79244caea4..188a487287 100644 --- a/resources/themes/cura-light/icons/dot.svg +++ b/resources/themes/cura-light/icons/low/Dot.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/themes/cura-light/icons/low/Warning.svg b/resources/themes/cura-light/icons/low/Warning.svg new file mode 100644 index 0000000000..0def040628 --- /dev/null +++ b/resources/themes/cura-light/icons/low/Warning.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/medium/Extruder.svg b/resources/themes/cura-light/icons/medium/Extruder.svg new file mode 100644 index 0000000000..775505952a --- /dev/null +++ b/resources/themes/cura-light/icons/medium/Extruder.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/medium/ExtruderColor.svg b/resources/themes/cura-light/icons/medium/ExtruderColor.svg new file mode 100644 index 0000000000..cd4452b246 --- /dev/null +++ b/resources/themes/cura-light/icons/medium/ExtruderColor.svg @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/medium/Folder.svg b/resources/themes/cura-light/icons/medium/Folder.svg new file mode 100644 index 0000000000..8dc9b5ea9f --- /dev/null +++ b/resources/themes/cura-light/icons/medium/Folder.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/resources/themes/cura-light/icons/medium/Printer.svg b/resources/themes/cura-light/icons/medium/Printer.svg new file mode 100644 index 0000000000..ef67996d48 --- /dev/null +++ b/resources/themes/cura-light/icons/medium/Printer.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/medium/PrinterTriple.svg b/resources/themes/cura-light/icons/medium/PrinterTriple.svg new file mode 100644 index 0000000000..f036565293 --- /dev/null +++ b/resources/themes/cura-light/icons/medium/PrinterTriple.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/medium/Sliders.svg b/resources/themes/cura-light/icons/medium/Sliders.svg new file mode 100644 index 0000000000..91bd9ae0fd --- /dev/null +++ b/resources/themes/cura-light/icons/medium/Sliders.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/menu.svg b/resources/themes/cura-light/icons/menu.svg deleted file mode 100644 index 85fbfb072c..0000000000 --- a/resources/themes/cura-light/icons/menu.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/minus.svg b/resources/themes/cura-light/icons/minus.svg deleted file mode 100644 index 22f2d2910d..0000000000 --- a/resources/themes/cura-light/icons/minus.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/mirror.svg b/resources/themes/cura-light/icons/mirror.svg deleted file mode 100644 index 2a53292379..0000000000 --- a/resources/themes/cura-light/icons/mirror.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/notice.svg b/resources/themes/cura-light/icons/notice.svg deleted file mode 100644 index 36154d6729..0000000000 --- a/resources/themes/cura-light/icons/notice.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/pencil.svg b/resources/themes/cura-light/icons/pencil.svg deleted file mode 100644 index d17c09884d..0000000000 --- a/resources/themes/cura-light/icons/pencil.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/play.svg b/resources/themes/cura-light/icons/play.svg deleted file mode 100644 index 04aea11a9b..0000000000 --- a/resources/themes/cura-light/icons/play.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/plugin.svg b/resources/themes/cura-light/icons/plugin.svg deleted file mode 100644 index 5773c906ee..0000000000 --- a/resources/themes/cura-light/icons/plugin.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/plus.svg b/resources/themes/cura-light/icons/plus.svg deleted file mode 100644 index 211cdf6d23..0000000000 --- a/resources/themes/cura-light/icons/plus.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/pos_modify_dont_support_overlap.svg b/resources/themes/cura-light/icons/pos_modify_dont_support_overlap.svg deleted file mode 100644 index 124e95f558..0000000000 --- a/resources/themes/cura-light/icons/pos_modify_dont_support_overlap.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - pms_modify_dont_support_overlap - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/pos_modify_overlaps.svg b/resources/themes/cura-light/icons/pos_modify_overlaps.svg deleted file mode 100644 index a664e820a6..0000000000 --- a/resources/themes/cura-light/icons/pos_modify_overlaps.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - pms_modify_overlaps - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/pos_normal.svg b/resources/themes/cura-light/icons/pos_normal.svg deleted file mode 100644 index 8a49ef3a00..0000000000 --- a/resources/themes/cura-light/icons/pos_normal.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - pms_Normal - Created with Sketch. - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/pos_print_as_support.svg b/resources/themes/cura-light/icons/pos_print_as_support.svg deleted file mode 100644 index 3562ca1fe0..0000000000 --- a/resources/themes/cura-light/icons/pos_print_as_support.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - pms_printassupport - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/print_time.svg b/resources/themes/cura-light/icons/print_time.svg deleted file mode 100644 index 0c5d4ed6a2..0000000000 --- a/resources/themes/cura-light/icons/print_time.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/printer_cloud_connected.svg b/resources/themes/cura-light/icons/printer_cloud_connected.svg deleted file mode 100644 index 3bc94a05e7..0000000000 --- a/resources/themes/cura-light/icons/printer_cloud_connected.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - Artboard Copy 2 - Created with Sketch. - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/printer_cloud_not_available.svg b/resources/themes/cura-light/icons/printer_cloud_not_available.svg deleted file mode 100644 index 248df27338..0000000000 --- a/resources/themes/cura-light/icons/printer_cloud_not_available.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - Artboard Copy 4 - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/printer_connected.svg b/resources/themes/cura-light/icons/printer_connected.svg deleted file mode 100644 index a8ff015a9d..0000000000 --- a/resources/themes/cura-light/icons/printer_connected.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - Connected - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/printer_group.svg b/resources/themes/cura-light/icons/printer_group.svg deleted file mode 100644 index 5e439faca4..0000000000 --- a/resources/themes/cura-light/icons/printer_group.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - Icon/ group printer/ disconnected - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/printer_single.svg b/resources/themes/cura-light/icons/printer_single.svg deleted file mode 100644 index 69c4e212bc..0000000000 --- a/resources/themes/cura-light/icons/printer_single.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - Icon/ single printer/ disconnected - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/printing_guideline.svg b/resources/themes/cura-light/icons/printing_guideline.svg deleted file mode 100644 index d306d046f9..0000000000 --- a/resources/themes/cura-light/icons/printing_guideline.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - Icon/ guideline on hover - Created with Sketch. - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/printsetup.svg b/resources/themes/cura-light/icons/printsetup.svg deleted file mode 100644 index 67f5713671..0000000000 --- a/resources/themes/cura-light/icons/printsetup.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/quick.svg b/resources/themes/cura-light/icons/quick.svg deleted file mode 100644 index f5261e1e5b..0000000000 --- a/resources/themes/cura-light/icons/quick.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/reset.svg b/resources/themes/cura-light/icons/reset.svg deleted file mode 100644 index df95e2c554..0000000000 --- a/resources/themes/cura-light/icons/reset.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/resize.svg b/resources/themes/cura-light/icons/resize.svg deleted file mode 100644 index d6a16649e1..0000000000 --- a/resources/themes/cura-light/icons/resize.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - Group - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/rotate.svg b/resources/themes/cura-light/icons/rotate.svg deleted file mode 100644 index 5944ad7ce9..0000000000 --- a/resources/themes/cura-light/icons/rotate.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/rotate_face_layflat.svg b/resources/themes/cura-light/icons/rotate_face_layflat.svg deleted file mode 100644 index 261a624cf0..0000000000 --- a/resources/themes/cura-light/icons/rotate_face_layflat.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - select face lay flat - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/rotate_layflat.svg b/resources/themes/cura-light/icons/rotate_layflat.svg deleted file mode 100644 index b2fe5c84b8..0000000000 --- a/resources/themes/cura-light/icons/rotate_layflat.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/rotate_reset.svg b/resources/themes/cura-light/icons/rotate_reset.svg deleted file mode 100644 index c953bceffa..0000000000 --- a/resources/themes/cura-light/icons/rotate_reset.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/scale.svg b/resources/themes/cura-light/icons/scale.svg deleted file mode 100644 index 2db809b7e7..0000000000 --- a/resources/themes/cura-light/icons/scale.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/scale_max.svg b/resources/themes/cura-light/icons/scale_max.svg deleted file mode 100644 index f3bb75b399..0000000000 --- a/resources/themes/cura-light/icons/scale_max.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/scale_reset.svg b/resources/themes/cura-light/icons/scale_reset.svg deleted file mode 100644 index 77210be8c5..0000000000 --- a/resources/themes/cura-light/icons/scale_reset.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/search.svg b/resources/themes/cura-light/icons/search.svg deleted file mode 100644 index a9ccb612fd..0000000000 --- a/resources/themes/cura-light/icons/search.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - Shape - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/setting_per_object.svg b/resources/themes/cura-light/icons/setting_per_object.svg deleted file mode 100644 index f4cfb3b145..0000000000 --- a/resources/themes/cura-light/icons/setting_per_object.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/settings.svg b/resources/themes/cura-light/icons/settings.svg deleted file mode 100644 index b96970307e..0000000000 --- a/resources/themes/cura-light/icons/settings.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/sign_in_to_cloud.svg b/resources/themes/cura-light/icons/sign_in_to_cloud.svg deleted file mode 100644 index 27471fddce..0000000000 --- a/resources/themes/cura-light/icons/sign_in_to_cloud.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - Group-cloud - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/solid.svg b/resources/themes/cura-light/icons/solid.svg deleted file mode 100644 index ed44f367b3..0000000000 --- a/resources/themes/cura-light/icons/solid.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/sparse.svg b/resources/themes/cura-light/icons/sparse.svg deleted file mode 100644 index 91f8858326..0000000000 --- a/resources/themes/cura-light/icons/sparse.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/resources/themes/cura-light/icons/spool.svg b/resources/themes/cura-light/icons/spool.svg deleted file mode 100644 index 0d8ae42d9d..0000000000 --- a/resources/themes/cura-light/icons/spool.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/star.svg b/resources/themes/cura-light/icons/star.svg deleted file mode 100644 index f6f91238e4..0000000000 --- a/resources/themes/cura-light/icons/star.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/star_empty.svg b/resources/themes/cura-light/icons/star_empty.svg deleted file mode 100644 index 39b5791e91..0000000000 --- a/resources/themes/cura-light/icons/star_empty.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - Star Copy 8 - Created with Sketch. - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/star_filled.svg b/resources/themes/cura-light/icons/star_filled.svg deleted file mode 100644 index d4e161f6c6..0000000000 --- a/resources/themes/cura-light/icons/star_filled.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - Star Copy 7 - Created with Sketch. - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/translate.svg b/resources/themes/cura-light/icons/translate.svg deleted file mode 100644 index 6a76ef4614..0000000000 --- a/resources/themes/cura-light/icons/translate.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/ulti.svg b/resources/themes/cura-light/icons/ulti.svg deleted file mode 100644 index b30d0669b3..0000000000 --- a/resources/themes/cura-light/icons/ulti.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/update.svg b/resources/themes/cura-light/icons/update.svg deleted file mode 100644 index 0a6e8fee5a..0000000000 --- a/resources/themes/cura-light/icons/update.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - update - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/view_3d.svg b/resources/themes/cura-light/icons/view_3d.svg deleted file mode 100644 index cfe394e65d..0000000000 --- a/resources/themes/cura-light/icons/view_3d.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - icn_perspectives_white - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/view_front.svg b/resources/themes/cura-light/icons/view_front.svg deleted file mode 100644 index 7de9abe0af..0000000000 --- a/resources/themes/cura-light/icons/view_front.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - icn_front_white - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/view_layer.svg b/resources/themes/cura-light/icons/view_layer.svg deleted file mode 100644 index 3e4bf8e074..0000000000 --- a/resources/themes/cura-light/icons/view_layer.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/resources/themes/cura-light/icons/view_left.svg b/resources/themes/cura-light/icons/view_left.svg deleted file mode 100644 index 1770da4c81..0000000000 --- a/resources/themes/cura-light/icons/view_left.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - icn_left_white - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/view_normal.svg b/resources/themes/cura-light/icons/view_normal.svg deleted file mode 100644 index 676031dbbd..0000000000 --- a/resources/themes/cura-light/icons/view_normal.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/view_right.svg b/resources/themes/cura-light/icons/view_right.svg deleted file mode 100644 index 5e0628e60e..0000000000 --- a/resources/themes/cura-light/icons/view_right.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - icn_right_white - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/view_top.svg b/resources/themes/cura-light/icons/view_top.svg deleted file mode 100644 index 3eb32e9878..0000000000 --- a/resources/themes/cura-light/icons/view_top.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - icn_top_white - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/view_xray.svg b/resources/themes/cura-light/icons/view_xray.svg deleted file mode 100644 index 5983c92c2f..0000000000 --- a/resources/themes/cura-light/icons/view_xray.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/viewmode.svg b/resources/themes/cura-light/icons/viewmode.svg deleted file mode 100644 index a21df01f37..0000000000 --- a/resources/themes/cura-light/icons/viewmode.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/warning.svg b/resources/themes/cura-light/icons/warning.svg deleted file mode 100644 index 14b7d797d0..0000000000 --- a/resources/themes/cura-light/icons/warning.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - Icon/warning-s - Created with Sketch. - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/warning_light.svg b/resources/themes/cura-light/icons/warning_light.svg deleted file mode 100644 index f9ca90f6a9..0000000000 --- a/resources/themes/cura-light/icons/warning_light.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - warning - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/images/first_run_ultimaker_cloud.svg b/resources/themes/cura-light/images/first_run_ultimaker_cloud.svg index 1e9b313862..1476e7705d 100644 --- a/resources/themes/cura-light/images/first_run_ultimaker_cloud.svg +++ b/resources/themes/cura-light/images/first_run_ultimaker_cloud.svg @@ -1,12 +1,17 @@ - - - - Group-cloud - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + diff --git a/resources/themes/cura-light/images/first_run_welcome_cura.svg b/resources/themes/cura-light/images/first_run_welcome_cura.svg deleted file mode 100644 index fddb073c82..0000000000 --- a/resources/themes/cura-light/images/first_run_welcome_cura.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - cura - Created with Sketch. - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/images/welcome_cura.svg b/resources/themes/cura-light/images/welcome_cura.svg new file mode 100644 index 0000000000..33816dbd18 --- /dev/null +++ b/resources/themes/cura-light/images/welcome_cura.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml index daf06ac6af..1320b54f37 100755 --- a/resources/themes/cura-light/styles.qml +++ b/resources/themes/cura-light/styles.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -21,49 +21,49 @@ QtObject { if(control.valueError) { - return Theme.getColor("setting_validation_error_background"); + return UM.Theme.getColor("setting_validation_error_background"); } else if(control.valueWarning) { - return Theme.getColor("setting_validation_warning_background"); + return UM.Theme.getColor("setting_validation_warning_background"); } else { - return Theme.getColor("setting_control"); + return UM.Theme.getColor("setting_control"); } } else { - return Theme.getColor("setting_control_disabled"); + return UM.Theme.getColor("setting_control_disabled"); } } radius: UM.Theme.getSize("setting_control_radius").width - border.width: Theme.getSize("default_lining").width + border.width: UM.Theme.getSize("default_lining").width border.color: { if (control.enabled) { if (control.valueError) { - return Theme.getColor("setting_validation_error"); + return UM.Theme.getColor("setting_validation_error"); } else if (control.valueWarning) { - return Theme.getColor("setting_validation_warning"); + return UM.Theme.getColor("setting_validation_warning"); } else if (control.hovered) { - return Theme.getColor("setting_control_border_highlight"); + return UM.Theme.getColor("setting_control_border_highlight"); } else { - return Theme.getColor("setting_control_border"); + return UM.Theme.getColor("setting_control_border"); } } else { - return Theme.getColor("setting_control_disabled_border"); + return UM.Theme.getColor("setting_control_disabled_border"); } } UM.RecolorImage @@ -71,25 +71,25 @@ QtObject id: downArrow anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right - anchors.rightMargin: Theme.getSize("default_margin").width - width: Theme.getSize("standard_arrow").width - height: Theme.getSize("standard_arrow").height + anchors.rightMargin: UM.Theme.getSize("default_margin").width + width: UM.Theme.getSize("standard_arrow").width + height: UM.Theme.getSize("standard_arrow").height sourceSize.height: width - color: control.enabled ? Theme.getColor("setting_control_button") : Theme.getColor("setting_category_disabled_text") - source: Theme.getIcon("arrow_bottom") + color: control.enabled ? UM.Theme.getColor("setting_control_button") : UM.Theme.getColor("setting_category_disabled_text") + source: UM.Theme.getIcon("ChevronSingleDown") } Label { id: printSetupComboBoxLabel - color: control.enabled ? Theme.getColor("setting_control_text") : Theme.getColor("setting_control_disabled_text") + color: control.enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text") text: control.text; elide: Text.ElideRight; anchors.left: parent.left; - anchors.leftMargin: Theme.getSize("setting_unit_margin").width + anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width anchors.right: downArrow.left; anchors.rightMargin: control.rightMargin; anchors.verticalCenter: parent.verticalCenter; - font: Theme.getFont("default") + font: UM.Theme.getFont("default") } } label: Label{} @@ -175,25 +175,25 @@ QtObject { background: Item { - implicitWidth: Theme.getSize("button").width - implicitHeight: Theme.getSize("button").height + implicitWidth: UM.Theme.getSize("button").width + implicitHeight: UM.Theme.getSize("button").height UM.PointingRectangle { id: button_tooltip anchors.left: parent.right - anchors.leftMargin: Theme.getSize("button_tooltip_arrow").width * 2 + anchors.leftMargin: UM.Theme.getSize("button_tooltip_arrow").width * 2 anchors.verticalCenter: parent.verticalCenter target: Qt.point(parent.x, y + Math.round(height/2)) - arrowSize: Theme.getSize("button_tooltip_arrow").width - color: Theme.getColor("button_tooltip") + arrowSize: UM.Theme.getSize("button_tooltip_arrow").width + color: UM.Theme.getColor("button_tooltip") opacity: control.hovered ? 1.0 : 0.0; visible: control.text != "" - width: control.hovered ? button_tip.width + Theme.getSize("button_tooltip").width : 0 - height: Theme.getSize("button_tooltip").height + width: control.hovered ? button_tip.width + UM.Theme.getSize("button_tooltip").width : 0 + height: UM.Theme.getSize("button_tooltip").height Behavior on width { NumberAnimation { duration: 100; } } Behavior on opacity { NumberAnimation { duration: 100; } } @@ -206,8 +206,8 @@ QtObject anchors.verticalCenter: parent.verticalCenter text: control.text - font: Theme.getFont("default") - color: Theme.getColor("tooltip_text") + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("tooltip_text") } } @@ -226,22 +226,22 @@ QtObject } else if(control.checkable && control.checked && control.hovered) { - return Theme.getColor("toolbar_button_active_hover") + return UM.Theme.getColor("toolbar_button_active_hover") } else if(control.pressed || (control.checkable && control.checked)) { - return Theme.getColor("toolbar_button_active") + return UM.Theme.getColor("toolbar_button_active") } else if(control.hovered) { - return Theme.getColor("toolbar_button_hover") + return UM.Theme.getColor("toolbar_button_hover") } - return Theme.getColor("toolbar_background") + return UM.Theme.getColor("toolbar_background") } Behavior on color { ColorAnimation { duration: 50; } } - border.width: (control.hasOwnProperty("needBorder") && control.needBorder) ? Theme.getSize("default_lining").width : 0 - border.color: control.checked ? Theme.getColor("icon") : Theme.getColor("lining") + border.width: (control.hasOwnProperty("needBorder") && control.needBorder) ? UM.Theme.getSize("default_lining").width : 0 + border.color: control.checked ? UM.Theme.getColor("icon") : UM.Theme.getColor("lining") } } @@ -252,11 +252,11 @@ QtObject anchors.centerIn: parent opacity: control.enabled ? 1.0 : 0.2 source: control.iconSource - width: Theme.getSize("button_icon").width - height: Theme.getSize("button_icon").height - color: Theme.getColor("icon") + width: UM.Theme.getSize("medium_button_icon").width + height: UM.Theme.getSize("medium_button_icon").height + color: UM.Theme.getColor("icon") - sourceSize: Theme.getSize("button_icon") + sourceSize: UM.Theme.getSize("medium_button_icon") } } } @@ -268,10 +268,10 @@ QtObject { background: Rectangle { - implicitWidth: Theme.getSize("message").width - (Theme.getSize("default_margin").width * 2) - implicitHeight: Theme.getSize("progressbar").height - color: control.hasOwnProperty("backgroundColor") ? control.backgroundColor : Theme.getColor("progressbar_background") - radius: Theme.getSize("progressbar_radius").width + implicitWidth: UM.Theme.getSize("message").width - (UM.Theme.getSize("default_margin").width * 2) + implicitHeight: UM.Theme.getSize("progressbar").height + color: control.hasOwnProperty("backgroundColor") ? control.backgroundColor : UM.Theme.getColor("progressbar_background") + radius: UM.Theme.getSize("progressbar_radius").width } progress: Rectangle { @@ -287,22 +287,22 @@ QtObject } else { - return Theme.getColor("progressbar_control"); + return UM.Theme.getColor("progressbar_control"); } } - radius: Theme.getSize("progressbar_radius").width + radius: UM.Theme.getSize("progressbar_radius").width Rectangle { - radius: Theme.getSize("progressbar_radius").width - color: control.hasOwnProperty("controlColor") ? control.controlColor : Theme.getColor("progressbar_control") - width: Theme.getSize("progressbar_control").width - height: Theme.getSize("progressbar_control").height + radius: UM.Theme.getSize("progressbar_radius").width + color: control.hasOwnProperty("controlColor") ? control.controlColor : UM.Theme.getColor("progressbar_control") + width: UM.Theme.getSize("progressbar_control").width + height: UM.Theme.getSize("progressbar_control").height visible: control.indeterminate SequentialAnimation on x { id: xAnim - property int animEndPoint: Theme.getSize("message").width - Math.round((Theme.getSize("default_margin").width * 2.5)) - Theme.getSize("progressbar_control").width + property int animEndPoint: UM.Theme.getSize("message").width - Math.round((UM.Theme.getSize("default_margin").width * 2.5)) - UM.Theme.getSize("progressbar_control").width running: control.indeterminate && control.visible loops: Animation.Infinite NumberAnimation { from: 0; to: xAnim.animEndPoint; duration: 2000;} @@ -324,18 +324,18 @@ QtObject scrollBarBackground: Rectangle { - implicitWidth: Theme.getSize("scrollbar").width + implicitWidth: UM.Theme.getSize("scrollbar").width radius: Math.round(implicitWidth / 2) - color: Theme.getColor("scrollbar_background") + color: UM.Theme.getColor("scrollbar_background") } handle: Rectangle { id: scrollViewHandle - implicitWidth: Theme.getSize("scrollbar").width + implicitWidth: UM.Theme.getSize("scrollbar").width radius: Math.round(implicitWidth / 2) - color: styleData.pressed ? Theme.getColor("scrollbar_handle_down") : styleData.hovered ? Theme.getColor("scrollbar_handle_hover") : Theme.getColor("scrollbar_handle") + color: styleData.pressed ? UM.Theme.getColor("scrollbar_handle_down") : styleData.hovered ? UM.Theme.getColor("scrollbar_handle_hover") : UM.Theme.getColor("scrollbar_handle") Behavior on color { ColorAnimation { duration: 50; } } } } @@ -348,14 +348,14 @@ QtObject background: Rectangle { - implicitHeight: Theme.getSize("setting_control").height; - implicitWidth: Theme.getSize("setting_control").width; + implicitHeight: UM.Theme.getSize("setting_control").height; + implicitWidth: UM.Theme.getSize("setting_control").width; color: control.hovered ? UM.Theme.getColor("setting_control_highlight") : UM.Theme.getColor("setting_control") Behavior on color { ColorAnimation { duration: 50; } } - border.width: Theme.getSize("default_lining").width; - border.color: control.hovered ? Theme.getColor("setting_control_border_highlight") : Theme.getColor("setting_control_border"); + border.width: UM.Theme.getSize("default_lining").width; + border.color: control.hovered ? UM.Theme.getColor("setting_control_border_highlight") : UM.Theme.getColor("setting_control_border"); radius: UM.Theme.getSize("setting_control_radius").width } @@ -364,14 +364,14 @@ QtObject Label { anchors.left: parent.left - anchors.leftMargin: Theme.getSize("default_lining").width + anchors.leftMargin: UM.Theme.getSize("default_lining").width anchors.right: downArrow.left - anchors.rightMargin: Theme.getSize("default_lining").width + anchors.rightMargin: UM.Theme.getSize("default_lining").width anchors.verticalCenter: parent.verticalCenter text: control.currentText - font: Theme.getFont("default"); - color: !enabled ? Theme.getColor("setting_control_disabled_text") : Theme.getColor("setting_control_text") + font: UM.Theme.getFont("default"); + color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text") elide: Text.ElideRight verticalAlignment: Text.AlignVCenter @@ -381,16 +381,16 @@ QtObject { id: downArrow anchors.right: parent.right - anchors.rightMargin: Theme.getSize("default_lining").width * 2 + anchors.rightMargin: UM.Theme.getSize("default_lining").width * 2 anchors.verticalCenter: parent.verticalCenter - source: Theme.getIcon("arrow_bottom") - width: Theme.getSize("standard_arrow").width - height: Theme.getSize("standard_arrow").height + source: UM.Theme.getIcon("ChevronSingleDown") + width: UM.Theme.getSize("standard_arrow").width + height: UM.Theme.getSize("standard_arrow").height sourceSize.width: width + 5 * screenScaleFactor sourceSize.height: width + 5 * screenScaleFactor - color: Theme.getColor("setting_control_button"); + color: UM.Theme.getColor("setting_control_button"); } } } @@ -403,16 +403,16 @@ QtObject background: Item { } indicator: Rectangle { - implicitWidth: Theme.getSize("checkbox").width - implicitHeight: Theme.getSize("checkbox").height + implicitWidth: UM.Theme.getSize("checkbox").width + implicitHeight: UM.Theme.getSize("checkbox").height - color: (control.hovered || control._hovered) ? Theme.getColor("checkbox_hover") : (control.enabled ? Theme.getColor("checkbox") : Theme.getColor("checkbox_disabled")) + color: (control.hovered || control._hovered) ? UM.Theme.getColor("checkbox_hover") : (control.enabled ? UM.Theme.getColor("checkbox") : UM.Theme.getColor("checkbox_disabled")) Behavior on color { ColorAnimation { duration: 50; } } - radius: control.exclusiveGroup ? Math.round(Theme.getSize("checkbox").width / 2) : Theme.getSize("checkbox_radius").width + radius: control.exclusiveGroup ? Math.round(UM.Theme.getSize("checkbox").width / 2) : UM.Theme.getSize("checkbox_radius").width - border.width: Theme.getSize("default_lining").width - border.color: (control.hovered || control._hovered) ? Theme.getColor("checkbox_border_hover") : Theme.getColor("checkbox_border") + border.width: UM.Theme.getSize("default_lining").width + border.color: (control.hovered || control._hovered) ? UM.Theme.getColor("checkbox_border_hover") : UM.Theme.getColor("checkbox_border") UM.RecolorImage { @@ -421,8 +421,8 @@ QtObject width: Math.round(parent.width / 2.5) height: Math.round(parent.height / 2.5) sourceSize.height: width - color: Theme.getColor("checkbox_mark") - source: control.exclusiveGroup ? Theme.getIcon("dot") : Theme.getIcon("check") + color: UM.Theme.getColor("checkbox_mark") + source: control.exclusiveGroup ? UM.Theme.getIcon("Dot") : UM.Theme.getIcon("Check") opacity: control.checked Behavior on opacity { NumberAnimation { duration: 100; } } } @@ -430,8 +430,8 @@ QtObject label: Label { text: control.text - color: Theme.getColor("checkbox_text") - font: Theme.getFont("default") + color: UM.Theme.getColor("checkbox_text") + font: UM.Theme.getFont("default") elide: Text.ElideRight renderType: Text.NativeRendering } @@ -445,16 +445,16 @@ QtObject background: Item { } indicator: Rectangle { - implicitWidth: Theme.getSize("checkbox").width - implicitHeight: Theme.getSize("checkbox").height + implicitWidth: UM.Theme.getSize("checkbox").width + implicitHeight: UM.Theme.getSize("checkbox").height - color: (control.hovered || control._hovered) ? Theme.getColor("checkbox_hover") : Theme.getColor("checkbox"); + color: (control.hovered || control._hovered) ? UM.Theme.getColor("checkbox_hover") : UM.Theme.getColor("checkbox"); Behavior on color { ColorAnimation { duration: 50; } } - radius: control.exclusiveGroup ? Math.round(Theme.getSize("checkbox").width / 2) : UM.Theme.getSize("checkbox_radius").width + radius: control.exclusiveGroup ? Math.round(UM.Theme.getSize("checkbox").width / 2) : UM.Theme.getSize("checkbox_radius").width - border.width: Theme.getSize("default_lining").width; - border.color: (control.hovered || control._hovered) ? Theme.getColor("checkbox_border_hover") : Theme.getColor("checkbox_border"); + border.width: UM.Theme.getSize("default_lining").width; + border.color: (control.hovered || control._hovered) ? UM.Theme.getColor("checkbox_border_hover") : UM.Theme.getColor("checkbox_border"); UM.RecolorImage { @@ -463,16 +463,16 @@ QtObject width: Math.round(parent.width / 2.5) height: Math.round(parent.height / 2.5) sourceSize.height: width - color: Theme.getColor("checkbox_mark") + color: UM.Theme.getColor("checkbox_mark") source: { if (control.checkbox_state == 2) { - return Theme.getIcon("solid"); + return UM.Theme.getIcon("Solid"); } else { - return control.exclusiveGroup ? Theme.getIcon("dot") : Theme.getIcon("check"); + return control.exclusiveGroup ? UM.Theme.getIcon("Dot", "low") : UM.Theme.getIcon("Check"); } } opacity: control.checked @@ -482,8 +482,8 @@ QtObject label: Label { text: control.text - color: Theme.getColor("checkbox_text") - font: Theme.getFont("default") + color: UM.Theme.getColor("checkbox_text") + font: UM.Theme.getFont("default") } } } @@ -492,30 +492,30 @@ QtObject { TextFieldStyle { - textColor: Theme.getColor("setting_control_text") - placeholderTextColor: Theme.getColor("setting_control_text") - font: Theme.getFont("default") + textColor: UM.Theme.getColor("setting_control_text") + placeholderTextColor: UM.Theme.getColor("setting_control_text") + font: UM.Theme.getFont("default") background: Rectangle { implicitHeight: control.height; implicitWidth: control.width; - border.width: Theme.getSize("default_lining").width; - border.color: control.hovered ? Theme.getColor("setting_control_border_highlight") : Theme.getColor("setting_control_border"); + border.width: UM.Theme.getSize("default_lining").width; + border.color: control.hovered ? UM.Theme.getColor("setting_control_border_highlight") : UM.Theme.getColor("setting_control_border"); radius: UM.Theme.getSize("setting_control_radius").width - color: Theme.getColor("setting_validation_ok"); + color: UM.Theme.getColor("setting_validation_ok"); Label { anchors.right: parent.right; - anchors.rightMargin: Theme.getSize("setting_unit_margin").width; + anchors.rightMargin: UM.Theme.getSize("setting_unit_margin").width; anchors.verticalCenter: parent.verticalCenter; text: control.unit ? control.unit : "" - color: Theme.getColor("setting_unit"); - font: Theme.getFont("default"); + color: UM.Theme.getColor("setting_unit"); + font: UM.Theme.getFont("default"); renderType: Text.NativeRendering } } diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 7bb8156458..6d99b7ae03 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -34,6 +34,11 @@ "weight": 50, "family": "Noto Sans" }, + "huge_bold": { + "size": 1.8, + "weight": 63, + "family": "Noto Sans" + }, "medium": { "size": 1.16, "weight": 40, @@ -124,24 +129,44 @@ "family": "Noto Sans" }, "small": { - "size": 0.7, + "size": 0.9, "weight": 40, "family": "Noto Sans" }, "small_ja_JP": { - "size": 0.7, + "size": 0.9, "weight": 50, "family": "Noto Sans" }, "small_zh_CN": { - "size": 0.7, + "size": 0.9, "weight": 50, "family": "Noto Sans" }, "small_zh_TW": { - "size": 0.7, + "size": 0.9, "weight": 50, "family": "Noto Sans" + }, + "small_emphasis": { + "size": 0.9, + "weight": 100, + "family": "Noto Sans" + }, + "small_emphasis_ja_JP": { + "size": 0.9, + "weight": 100, + "family": "Noto Sans" + }, + "small_emphasis_zh_CN": { + "size": 0.9, + "weight": 100, + "family": "Noto Sans" + }, + "small_emphasis_zh_TW": { + "size": 0.9, + "weight": 100, + "family": "Noto Sans" } }, @@ -163,15 +188,15 @@ "icon": [8, 7, 63, 255], - "primary_button": [38, 113, 231, 255], + "primary_button": [25, 110, 240, 255], "primary_button_shadow": [27, 95, 202, 255], - "primary_button_hover": [81, 145, 247, 255], + "primary_button_hover": [16, 70, 156, 255], "primary_button_text": [255, 255, 255, 255], - "secondary_button": [240, 240, 240, 255], + "secondary_button": [255, 255, 255, 255], "secondary_button_shadow": [216, 216, 216, 255], - "secondary_button_hover": [228, 228, 228, 255], - "secondary_button_text": [30, 102, 215, 255], + "secondary_button_hover": [232, 240, 253, 255], + "secondary_button_text": [25, 110, 240, 255], "main_window_header_background": [8, 7, 63, 255], "main_window_header_background_gradient": [25, 23, 91, 255], @@ -191,7 +216,7 @@ "machine_selector_text_active": [255, 255, 255, 255], "machine_selector_printer_icon": [8, 7, 63, 255], - "action_panel_secondary": [27, 95, 202, 255], + "action_panel_secondary": [25, 110, 240, 255], "first_run_shadow": [50, 50, 50, 255], @@ -205,7 +230,7 @@ "text": [25, 25, 25, 255], "text_detail": [174, 174, 174, 128], - "text_link": [50, 130, 255, 255], + "text_link": [25, 110, 240, 255], "text_inactive": [174, 174, 174, 255], "text_pressed": [50, 130, 255, 255], "text_subtext": [0, 0, 0, 255], @@ -214,8 +239,9 @@ "text_scene": [102, 102, 102, 255], "text_scene_hover": [123, 123, 113, 255], - "error": [255, 140, 0, 255], - "warning": [245, 166, 35, 255], + "error": [218, 30, 40, 255], + "warning": [253, 209, 58, 255], + "success": [36, 162, 73, 255], "disabled": [229, 229, 229, 255], "toolbar_button_hover": [232, 242, 252, 255], @@ -245,6 +271,7 @@ "button_tooltip_text": [192, 193, 194, 255], "extruder_button_material_border": [255, 255, 255, 255], + "extruder_disabled": [255, 255, 255, 102], "rating_star": [90, 90, 90, 255], @@ -261,8 +288,8 @@ "action_button_active_text": [0, 0, 0, 255], "action_button_active_border": [50, 130, 255, 255], "action_button_disabled": [245, 245, 245, 255], - "action_button_disabled_text": [127, 127, 127, 255], - "action_button_disabled_border": [245, 245, 245, 255], + "action_button_disabled_text": [196, 196, 196, 255], + "action_button_disabled_border": [196, 196, 196, 255], "action_button_shadow": [223, 223, 223, 255], "action_button_disabled_shadow": [228, 228, 228, 255], @@ -324,7 +351,7 @@ "checkbox_hover": [255, 255, 255, 255], "checkbox_border": [199, 199, 199, 255], "checkbox_border_hover": [50, 130, 255, 255], - "checkbox_mark": [50, 130, 255, 255], + "checkbox_mark": [35, 35, 35, 255], "checkbox_disabled": [223, 223, 223, 255], "checkbox_text": [35, 35, 35, 255], @@ -337,6 +364,9 @@ "message_close_hover": [8, 7, 63, 255], "message_progressbar_background": [245, 245, 245, 255], "message_progressbar_control": [50, 130, 255, 255], + "message_success_icon": [255, 255, 255, 255], + "message_warning_icon": [0, 0, 0, 255], + "message_error_icon": [255, 255, 255, 255], "tool_panel_background": [255, 255, 255, 255], @@ -389,6 +419,7 @@ "layerview_support_interface": [63, 127, 255, 127], "layerview_prime_tower": [0, 255, 255, 255], "layerview_nozzle": [224, 192, 16, 64], + "layerview_starts": [255, 255, 255, 255], "tab_status_connected": [50, 130, 255, 255], "tab_status_disconnected": [200, 200, 200, 255], @@ -410,7 +441,7 @@ "monitor_icon_accent": [255, 255, 255, 255], "monitor_icon_disabled": [238, 238, 238, 255], - "monitor_secondary_button_hover": [228, 228, 228, 255], + "monitor_secondary_button_hover": [232, 242, 252, 255], "monitor_secondary_button": [240, 240, 240, 255], "monitor_secondary_button_text": [30, 102, 215, 255], "monitor_secondary_button_shadow": [216, 216, 216, 255], @@ -439,7 +470,8 @@ "monitor_carousel_dot": [216, 216, 216, 255], "monitor_carousel_dot_current": [119, 119, 119, 255], - "cloud_unavailable": [153, 153, 153, 255] + "cloud_unavailable": [153, 153, 153, 255], + "connection_badge_background": [255, 255, 255, 255] }, "sizes": { @@ -476,9 +508,9 @@ "machine_selector_widget": [20.0, 4.0], "machine_selector_widget_content": [25.0, 32.0], - "machine_selector_icon": [2.66, 2.66], + "machine_selector_icon": [2.5, 2.5], - "views_selector": [23.0, 4.0], + "views_selector": [16.0, 4.0], "printer_type_label": [3.5, 1.5], @@ -497,12 +529,12 @@ "thin_margin": [0.71, 0.71], "narrow_margin": [0.5, 0.5], - "extruder_icon": [2.33, 2.33], + "extruder_icon": [2.5, 2.5], "section": [0.0, 2], "section_control": [0, 1], - "section_icon": [1.6, 1.6], - "section_icon_column": [2.8, 0.0], + "section_icon": [2, 2], + "section_icon_column": [2.5, 2.5], "rating_star": [1.0, 1.0], "setting": [25.0, 1.8], @@ -531,6 +563,9 @@ "small_button": [2, 2], "small_button_icon": [1.5, 1.5], + "medium_button": [2.5, 2.5], + "medium_button_icon": [2, 2], + "favorites_row": [2, 2], "favorites_button": [2, 2], "favorites_button_icon": [1.2, 1.2], @@ -575,7 +610,7 @@ "monitor_preheat_temperature_control": [4.5, 2.0], - "welcome_wizard_window": [46.0, 45], + "welcome_wizard_window": [46, 50], "modal_window_minimum": [60.0, 45], "license_window_minimum": [45, 45], "wizard_progress": [10.0, 0.0], @@ -583,8 +618,9 @@ "message": [30.0, 5.0], "message_close": [1, 1], "message_radius": [0.25, 0.25], - "message_action_button": [0, 2.0], + "message_action_button": [0, 2.5], "message_image": [15.0, 5.0], + "message_type_icon": [2, 2], "infill_button_margin": [0.5, 0.5], @@ -630,6 +666,11 @@ "monitor_external_link_icon": [1.16, 1.16], "monitor_column": [18.0, 1.0], "monitor_progress_bar": [16.5, 1.0], - "monitor_margin": [1.5, 1.5] + "monitor_margin": [1.5, 1.5], + + "table_row": [2.0, 2.0], + + "welcome_wizard_content_image_big": [18, 15], + "welcome_wizard_cloud_content_image": [4, 4] } } diff --git a/resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg b/resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg index 41e62bacc1..5b51e0b482 100644 --- a/resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg +++ b/resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = leapfrog_bolt_pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg b/resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg index 32e2c77338..e906e7ec90 100644 --- a/resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg +++ b/resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = leapfrog_bolt_pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg b/resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg index 92e334d840..cc5a70a23e 100644 --- a/resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg +++ b/resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = Mark2_for_Ultimaker2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg b/resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg index c89460533d..be89ee6ae2 100644 --- a/resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg +++ b/resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = Mark2_for_Ultimaker2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg b/resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg index 87abd778a4..b119de013d 100644 --- a/resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg +++ b/resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = Mark2_for_Ultimaker2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg b/resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg index a6a4fb7b52..46989d5682 100644 --- a/resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg +++ b/resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = Mark2_for_Ultimaker2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/arjun300_0.2.inst.cfg b/resources/variants/arjun300_0.2.inst.cfg new file mode 100644 index 0000000000..c474539770 --- /dev/null +++ b/resources/variants/arjun300_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.2 mm Nozzle +version = 4 +definition = arjun300 + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/arjun300_0.3.inst.cfg b/resources/variants/arjun300_0.3.inst.cfg new file mode 100644 index 0000000000..785fb571fc --- /dev/null +++ b/resources/variants/arjun300_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.3 mm Nozzle +version = 4 +definition = arjun300 + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/arjun300_0.4.inst.cfg b/resources/variants/arjun300_0.4.inst.cfg new file mode 100644 index 0000000000..6b991d6ad5 --- /dev/null +++ b/resources/variants/arjun300_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = arjun300 + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/arjun300_0.5.inst.cfg b/resources/variants/arjun300_0.5.inst.cfg new file mode 100644 index 0000000000..acaaf02c0c --- /dev/null +++ b/resources/variants/arjun300_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.5 mm Nozzle +version = 4 +definition = arjun300 + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/arjun300_0.6.inst.cfg b/resources/variants/arjun300_0.6.inst.cfg new file mode 100644 index 0000000000..4c65f48a1c --- /dev/null +++ b/resources/variants/arjun300_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = arjun300 + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/arjun300_0.8.inst.cfg b/resources/variants/arjun300_0.8.inst.cfg new file mode 100644 index 0000000000..d98859c5fe --- /dev/null +++ b/resources/variants/arjun300_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = arjun300 + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/arjun300_dm_0.2.inst.cfg b/resources/variants/arjun300_dm_0.2.inst.cfg new file mode 100644 index 0000000000..02873f05cf --- /dev/null +++ b/resources/variants/arjun300_dm_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.2 mm Nozzle +version = 4 +definition = arjun_duplication + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/arjun300_dm_0.3.inst.cfg b/resources/variants/arjun300_dm_0.3.inst.cfg new file mode 100644 index 0000000000..30e56eba3f --- /dev/null +++ b/resources/variants/arjun300_dm_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.3 mm Nozzle +version = 4 +definition = arjun_duplication + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/arjun300_dm_0.4.inst.cfg b/resources/variants/arjun300_dm_0.4.inst.cfg new file mode 100644 index 0000000000..971b4f6f75 --- /dev/null +++ b/resources/variants/arjun300_dm_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = arjun_duplication + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/arjun300_dm_0.5.inst.cfg b/resources/variants/arjun300_dm_0.5.inst.cfg new file mode 100644 index 0000000000..02ed6908fa --- /dev/null +++ b/resources/variants/arjun300_dm_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.5 mm Nozzle +version = 4 +definition = arjun_duplication + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/arjun300_dm_0.6.inst.cfg b/resources/variants/arjun300_dm_0.6.inst.cfg new file mode 100644 index 0000000000..55ca8fb6a5 --- /dev/null +++ b/resources/variants/arjun300_dm_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = arjun_duplication + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/arjun300_dm_0.8.inst.cfg b/resources/variants/arjun300_dm_0.8.inst.cfg new file mode 100644 index 0000000000..8d75b94e0b --- /dev/null +++ b/resources/variants/arjun300_dm_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = arjun_duplication + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/arjun300_mm_0.2.inst.cfg b/resources/variants/arjun300_mm_0.2.inst.cfg new file mode 100644 index 0000000000..c54de937c3 --- /dev/null +++ b/resources/variants/arjun300_mm_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.2 mm Nozzle +version = 4 +definition = arjun_mirrored + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/arjun300_mm_0.3.inst.cfg b/resources/variants/arjun300_mm_0.3.inst.cfg new file mode 100644 index 0000000000..bfd161883b --- /dev/null +++ b/resources/variants/arjun300_mm_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.3 mm Nozzle +version = 4 +definition = arjun_mirrored + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/arjun300_mm_0.4.inst.cfg b/resources/variants/arjun300_mm_0.4.inst.cfg new file mode 100644 index 0000000000..f48637d9a6 --- /dev/null +++ b/resources/variants/arjun300_mm_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = arjun_mirrored + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/arjun300_mm_0.5.inst.cfg b/resources/variants/arjun300_mm_0.5.inst.cfg new file mode 100644 index 0000000000..0959140a0e --- /dev/null +++ b/resources/variants/arjun300_mm_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.5 mm Nozzle +version = 4 +definition = arjun_mirrored + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/arjun300_mm_0.6.inst.cfg b/resources/variants/arjun300_mm_0.6.inst.cfg new file mode 100644 index 0000000000..783f48f105 --- /dev/null +++ b/resources/variants/arjun300_mm_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = arjun_mirrored + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/arjun300_mm_0.8.inst.cfg b/resources/variants/arjun300_mm_0.8.inst.cfg new file mode 100644 index 0000000000..e445c13e4b --- /dev/null +++ b/resources/variants/arjun300_mm_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = arjun_mirrored + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/arjun300_pva_0.2.inst.cfg b/resources/variants/arjun300_pva_0.2.inst.cfg new file mode 100644 index 0000000000..e58afe54b7 --- /dev/null +++ b/resources/variants/arjun300_pva_0.2.inst.cfg @@ -0,0 +1,32 @@ +[general] +name = PVA 0.2 mm Nozzle +version = 4 +definition = arjun300 + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_offset = 3 +support_bottom_height = =layer_height * 2 +support_bottom_pattern = zigzag +support_bottom_stair_step_height = =layer_height +support_infill_rate = 50 +support_interface_enable = True +support_interface_height = =layer_height * 5 +support_interface_skip_height = =layer_height +support_join_distance = 3 +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_angle = 45 +support_pattern = triangles +support_use_towers = False +support_z_distance = 0 +gradual_support_infill_steps = 2 +support_interface_density = 100 +support_interface_pattern = concentric \ No newline at end of file diff --git a/resources/variants/arjun300_pva_0.3.inst.cfg b/resources/variants/arjun300_pva_0.3.inst.cfg new file mode 100644 index 0000000000..931caa8d79 --- /dev/null +++ b/resources/variants/arjun300_pva_0.3.inst.cfg @@ -0,0 +1,32 @@ +[general] +name = PVA 0.3 mm Nozzle +version = 4 +definition = arjun300 + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_offset = 3 +support_bottom_height = =layer_height * 2 +support_bottom_pattern = zigzag +support_bottom_stair_step_height = =layer_height +support_infill_rate = 50 +support_interface_enable = True +support_interface_height = =layer_height * 5 +support_interface_skip_height = =layer_height +support_join_distance = 3 +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_angle = 45 +support_pattern = triangles +support_use_towers = False +support_z_distance = 0 +gradual_support_infill_steps = 2 +support_interface_density = 100 +support_interface_pattern = concentric \ No newline at end of file diff --git a/resources/variants/arjun300_pva_0.4.inst.cfg b/resources/variants/arjun300_pva_0.4.inst.cfg new file mode 100644 index 0000000000..fbb7ed9546 --- /dev/null +++ b/resources/variants/arjun300_pva_0.4.inst.cfg @@ -0,0 +1,32 @@ +[general] +name = PVA 0.4 mm Nozzle +version = 4 +definition = arjun300 + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_offset = 3 +support_bottom_height = =layer_height * 2 +support_bottom_pattern = zigzag +support_bottom_stair_step_height = =layer_height +support_infill_rate = 50 +support_interface_enable = True +support_interface_height = =layer_height * 5 +support_interface_skip_height = =layer_height +support_join_distance = 3 +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_angle = 45 +support_pattern = triangles +support_use_towers = False +support_z_distance = 0 +gradual_support_infill_steps = 2 +support_interface_density = 100 +support_interface_pattern = concentric \ No newline at end of file diff --git a/resources/variants/arjun300_pva_0.5.inst.cfg b/resources/variants/arjun300_pva_0.5.inst.cfg new file mode 100644 index 0000000000..a49fe4aeda --- /dev/null +++ b/resources/variants/arjun300_pva_0.5.inst.cfg @@ -0,0 +1,32 @@ +[general] +name = PVA 0.5 mm Nozzle +version = 4 +definition = arjun300 + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_offset = 3 +support_bottom_height = =layer_height * 2 +support_bottom_pattern = zigzag +support_bottom_stair_step_height = =layer_height +support_infill_rate = 50 +support_interface_enable = True +support_interface_height = =layer_height * 5 +support_interface_skip_height = =layer_height +support_join_distance = 3 +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_angle = 45 +support_pattern = triangles +support_use_towers = False +support_z_distance = 0 +gradual_support_infill_steps = 2 +support_interface_density = 100 +support_interface_pattern = concentric \ No newline at end of file diff --git a/resources/variants/arjun300_pva_0.6.inst.cfg b/resources/variants/arjun300_pva_0.6.inst.cfg new file mode 100644 index 0000000000..4f7a9a5475 --- /dev/null +++ b/resources/variants/arjun300_pva_0.6.inst.cfg @@ -0,0 +1,32 @@ +[general] +name = PVA 0.6 mm Nozzle +version = 4 +definition = arjun300 + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_offset = 3 +support_bottom_height = =layer_height * 2 +support_bottom_pattern = zigzag +support_bottom_stair_step_height = =layer_height +support_infill_rate = 50 +support_interface_enable = True +support_interface_height = =layer_height * 5 +support_interface_skip_height = =layer_height +support_join_distance = 3 +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_angle = 45 +support_pattern = triangles +support_use_towers = False +support_z_distance = 0 +gradual_support_infill_steps = 2 +support_interface_density = 100 +support_interface_pattern = concentric \ No newline at end of file diff --git a/resources/variants/arjun300_pva_0.8.inst.cfg b/resources/variants/arjun300_pva_0.8.inst.cfg new file mode 100644 index 0000000000..5a550ddff3 --- /dev/null +++ b/resources/variants/arjun300_pva_0.8.inst.cfg @@ -0,0 +1,32 @@ +[general] +name = PVA 0.8 mm Nozzle +version = 4 +definition = arjun300 + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_offset = 3 +support_bottom_height = =layer_height * 2 +support_bottom_pattern = zigzag +support_bottom_stair_step_height = =layer_height +support_infill_rate = 50 +support_interface_enable = True +support_interface_height = =layer_height * 5 +support_interface_skip_height = =layer_height +support_join_distance = 3 +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_angle = 45 +support_pattern = triangles +support_use_towers = False +support_z_distance = 0 +gradual_support_infill_steps = 2 +support_interface_density = 100 +support_interface_pattern = concentric \ No newline at end of file diff --git a/resources/variants/artillery_base_0.2.inst.cfg b/resources/variants/artillery_base_0.2.inst.cfg index 6d724e171d..4f4fa338e4 100644 --- a/resources/variants/artillery_base_0.2.inst.cfg +++ b/resources/variants/artillery_base_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/artillery_base_0.3.inst.cfg b/resources/variants/artillery_base_0.3.inst.cfg index 9e1e90df24..21f8a518bf 100644 --- a/resources/variants/artillery_base_0.3.inst.cfg +++ b/resources/variants/artillery_base_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/artillery_base_0.4.inst.cfg b/resources/variants/artillery_base_0.4.inst.cfg index 87e984f7d4..78335018f3 100644 --- a/resources/variants/artillery_base_0.4.inst.cfg +++ b/resources/variants/artillery_base_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/artillery_base_0.6.inst.cfg b/resources/variants/artillery_base_0.6.inst.cfg index 38570b0122..cc32cff899 100644 --- a/resources/variants/artillery_base_0.6.inst.cfg +++ b/resources/variants/artillery_base_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/artillery_base_0.8.inst.cfg b/resources/variants/artillery_base_0.8.inst.cfg index bd5d4db25f..4b97a009dc 100644 --- a/resources/variants/artillery_base_0.8.inst.cfg +++ b/resources/variants/artillery_base_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/artillery_base_1.0.inst.cfg b/resources/variants/artillery_base_1.0.inst.cfg index 39eaed3283..0736b15ae3 100644 --- a/resources/variants/artillery_base_1.0.inst.cfg +++ b/resources/variants/artillery_base_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = artillery_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/artillery_genius_0.2.inst.cfg b/resources/variants/artillery_genius_0.2.inst.cfg index a4404dfd24..a3fef44670 100644 --- a/resources/variants/artillery_genius_0.2.inst.cfg +++ b/resources/variants/artillery_genius_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = artillery_genius [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/artillery_genius_0.3.inst.cfg b/resources/variants/artillery_genius_0.3.inst.cfg index da97142188..39f31d8af0 100644 --- a/resources/variants/artillery_genius_0.3.inst.cfg +++ b/resources/variants/artillery_genius_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = artillery_genius [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/artillery_genius_0.4.inst.cfg b/resources/variants/artillery_genius_0.4.inst.cfg index e176072dfb..fe4657e0c8 100644 --- a/resources/variants/artillery_genius_0.4.inst.cfg +++ b/resources/variants/artillery_genius_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = artillery_genius [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/artillery_genius_0.5.inst.cfg b/resources/variants/artillery_genius_0.5.inst.cfg index 4d8e1a7389..8a32d7504a 100644 --- a/resources/variants/artillery_genius_0.5.inst.cfg +++ b/resources/variants/artillery_genius_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = artillery_genius [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/artillery_genius_0.6.inst.cfg b/resources/variants/artillery_genius_0.6.inst.cfg index 31dd072832..814d2276f2 100644 --- a/resources/variants/artillery_genius_0.6.inst.cfg +++ b/resources/variants/artillery_genius_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = artillery_genius [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/artillery_genius_0.8.inst.cfg b/resources/variants/artillery_genius_0.8.inst.cfg index dd75e975c1..b040f52592 100644 --- a/resources/variants/artillery_genius_0.8.inst.cfg +++ b/resources/variants/artillery_genius_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = artillery_genius [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/artillery_genius_1.0.inst.cfg b/resources/variants/artillery_genius_1.0.inst.cfg index 6bc6a872a2..49d44a845b 100644 --- a/resources/variants/artillery_genius_1.0.inst.cfg +++ b/resources/variants/artillery_genius_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = artillery_genius [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/artillery_sidewinder_x1_0.2.inst.cfg b/resources/variants/artillery_sidewinder_x1_0.2.inst.cfg index d0db37779c..a4586c95ac 100644 --- a/resources/variants/artillery_sidewinder_x1_0.2.inst.cfg +++ b/resources/variants/artillery_sidewinder_x1_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = artillery_sidewinder_x1 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/artillery_sidewinder_x1_0.3.inst.cfg b/resources/variants/artillery_sidewinder_x1_0.3.inst.cfg index 3cd88f9c3e..a2afe9d2bb 100644 --- a/resources/variants/artillery_sidewinder_x1_0.3.inst.cfg +++ b/resources/variants/artillery_sidewinder_x1_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = artillery_sidewinder_x1 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/artillery_sidewinder_x1_0.4.inst.cfg b/resources/variants/artillery_sidewinder_x1_0.4.inst.cfg index 10d3027939..0eab6e554c 100644 --- a/resources/variants/artillery_sidewinder_x1_0.4.inst.cfg +++ b/resources/variants/artillery_sidewinder_x1_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = artillery_sidewinder_x1 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/artillery_sidewinder_x1_0.6.inst.cfg b/resources/variants/artillery_sidewinder_x1_0.6.inst.cfg index e0dd46e8ba..125e151817 100644 --- a/resources/variants/artillery_sidewinder_x1_0.6.inst.cfg +++ b/resources/variants/artillery_sidewinder_x1_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = artillery_sidewinder_x1 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/artillery_sidewinder_x1_0.8.inst.cfg b/resources/variants/artillery_sidewinder_x1_0.8.inst.cfg index 27920743c3..25164030f5 100644 --- a/resources/variants/artillery_sidewinder_x1_0.8.inst.cfg +++ b/resources/variants/artillery_sidewinder_x1_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = artillery_sidewinder_x1 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/artillery_sidewinder_x1_1.0.inst.cfg b/resources/variants/artillery_sidewinder_x1_1.0.inst.cfg index 02292240e2..656a2ccaa2 100644 --- a/resources/variants/artillery_sidewinder_x1_1.0.inst.cfg +++ b/resources/variants/artillery_sidewinder_x1_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = artillery_sidewinder_x1 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_asterion_ht_v6_0.40.inst.cfg b/resources/variants/atmat_asterion_ht_v6_0.40.inst.cfg index 457bec08c8..d627fab67a 100644 --- a/resources/variants/atmat_asterion_ht_v6_0.40.inst.cfg +++ b/resources/variants/atmat_asterion_ht_v6_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_asterion_ht [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_asterion_ht_v6_0.80.inst.cfg b/resources/variants/atmat_asterion_ht_v6_0.80.inst.cfg index 915247f4b4..e132dd69c8 100644 --- a/resources/variants/atmat_asterion_ht_v6_0.80.inst.cfg +++ b/resources/variants/atmat_asterion_ht_v6_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_asterion_ht [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_asterion_v6_0.40.inst.cfg b/resources/variants/atmat_asterion_v6_0.40.inst.cfg index 029dc36644..a24e8b9dc6 100644 --- a/resources/variants/atmat_asterion_v6_0.40.inst.cfg +++ b/resources/variants/atmat_asterion_v6_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_asterion [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_asterion_v6_0.80.inst.cfg b/resources/variants/atmat_asterion_v6_0.80.inst.cfg index 1e680cf655..b02c5f5ed9 100644 --- a/resources/variants/atmat_asterion_v6_0.80.inst.cfg +++ b/resources/variants/atmat_asterion_v6_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_asterion [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_galaxy_500_v6_0.40.inst.cfg b/resources/variants/atmat_galaxy_500_v6_0.40.inst.cfg index 8b9a4e5d21..b225049ff5 100644 --- a/resources/variants/atmat_galaxy_500_v6_0.40.inst.cfg +++ b/resources/variants/atmat_galaxy_500_v6_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_galaxy_500 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_galaxy_500_v6_0.80.inst.cfg b/resources/variants/atmat_galaxy_500_v6_0.80.inst.cfg index aa268e7769..2e9aff8ec0 100644 --- a/resources/variants/atmat_galaxy_500_v6_0.80.inst.cfg +++ b/resources/variants/atmat_galaxy_500_v6_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_galaxy_500 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_galaxy_600_v6_0.40.inst.cfg b/resources/variants/atmat_galaxy_600_v6_0.40.inst.cfg index 4bfc1bab5b..ff8094c16b 100644 --- a/resources/variants/atmat_galaxy_600_v6_0.40.inst.cfg +++ b/resources/variants/atmat_galaxy_600_v6_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_galaxy_600 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_galaxy_600_v6_0.80.inst.cfg b/resources/variants/atmat_galaxy_600_v6_0.80.inst.cfg index 02485c191c..9fcb4c56f3 100644 --- a/resources/variants/atmat_galaxy_600_v6_0.80.inst.cfg +++ b/resources/variants/atmat_galaxy_600_v6_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_galaxy_600 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_signal_pro_300_v1_v6_0.40.inst.cfg b/resources/variants/atmat_signal_pro_300_v1_v6_0.40.inst.cfg index 27a7177126..72fefb525c 100644 --- a/resources/variants/atmat_signal_pro_300_v1_v6_0.40.inst.cfg +++ b/resources/variants/atmat_signal_pro_300_v1_v6_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_signal_pro_300_v1 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_signal_pro_300_v1_v6_0.80.inst.cfg b/resources/variants/atmat_signal_pro_300_v1_v6_0.80.inst.cfg index 469cc24dfd..d7bb76982f 100644 --- a/resources/variants/atmat_signal_pro_300_v1_v6_0.80.inst.cfg +++ b/resources/variants/atmat_signal_pro_300_v1_v6_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_signal_pro_300_v1 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_signal_pro_300_v2_v6_0.40.inst.cfg b/resources/variants/atmat_signal_pro_300_v2_v6_0.40.inst.cfg index 0da88424b0..50b6faf184 100644 --- a/resources/variants/atmat_signal_pro_300_v2_v6_0.40.inst.cfg +++ b/resources/variants/atmat_signal_pro_300_v2_v6_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_signal_pro_300_v2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_signal_pro_300_v2_v6_0.80.inst.cfg b/resources/variants/atmat_signal_pro_300_v2_v6_0.80.inst.cfg index 318f96156f..5198d82bf6 100644 --- a/resources/variants/atmat_signal_pro_300_v2_v6_0.80.inst.cfg +++ b/resources/variants/atmat_signal_pro_300_v2_v6_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_signal_pro_300_v2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_signal_pro_400_v1_v6_0.40.inst.cfg b/resources/variants/atmat_signal_pro_400_v1_v6_0.40.inst.cfg index f672f02c80..fac40b3ca2 100644 --- a/resources/variants/atmat_signal_pro_400_v1_v6_0.40.inst.cfg +++ b/resources/variants/atmat_signal_pro_400_v1_v6_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_signal_pro_400_v1 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_signal_pro_400_v1_v6_0.80.inst.cfg b/resources/variants/atmat_signal_pro_400_v1_v6_0.80.inst.cfg index 468e62191e..3565c9e790 100644 --- a/resources/variants/atmat_signal_pro_400_v1_v6_0.80.inst.cfg +++ b/resources/variants/atmat_signal_pro_400_v1_v6_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_signal_pro_400_v1 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_signal_pro_400_v2_v6_0.40.inst.cfg b/resources/variants/atmat_signal_pro_400_v2_v6_0.40.inst.cfg index 6987aa6ccc..0054553fab 100644 --- a/resources/variants/atmat_signal_pro_400_v2_v6_0.40.inst.cfg +++ b/resources/variants/atmat_signal_pro_400_v2_v6_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_signal_pro_400_v2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_signal_pro_400_v2_v6_0.80.inst.cfg b/resources/variants/atmat_signal_pro_400_v2_v6_0.80.inst.cfg index e33f192498..66a2741a4c 100644 --- a/resources/variants/atmat_signal_pro_400_v2_v6_0.80.inst.cfg +++ b/resources/variants/atmat_signal_pro_400_v2_v6_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_signal_pro_400_v2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_signal_pro_500_v1_v6_0.40.inst.cfg b/resources/variants/atmat_signal_pro_500_v1_v6_0.40.inst.cfg index e42dcb94fd..5bd2fb96cc 100644 --- a/resources/variants/atmat_signal_pro_500_v1_v6_0.40.inst.cfg +++ b/resources/variants/atmat_signal_pro_500_v1_v6_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_signal_pro_500_v1 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_signal_pro_500_v1_v6_0.80.inst.cfg b/resources/variants/atmat_signal_pro_500_v1_v6_0.80.inst.cfg index 3413a4d00a..e04c3958b8 100644 --- a/resources/variants/atmat_signal_pro_500_v1_v6_0.80.inst.cfg +++ b/resources/variants/atmat_signal_pro_500_v1_v6_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_signal_pro_500_v1 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_signal_pro_500_v2_v6_0.40.inst.cfg b/resources/variants/atmat_signal_pro_500_v2_v6_0.40.inst.cfg index 87782de627..325c344223 100644 --- a/resources/variants/atmat_signal_pro_500_v2_v6_0.40.inst.cfg +++ b/resources/variants/atmat_signal_pro_500_v2_v6_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_signal_pro_500_v2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_signal_pro_500_v2_v6_0.80.inst.cfg b/resources/variants/atmat_signal_pro_500_v2_v6_0.80.inst.cfg index b566e79ea6..344f063c4a 100644 --- a/resources/variants/atmat_signal_pro_500_v2_v6_0.80.inst.cfg +++ b/resources/variants/atmat_signal_pro_500_v2_v6_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_signal_pro_500_v2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_signal_xl_v6_0.40.inst.cfg b/resources/variants/atmat_signal_xl_v6_0.40.inst.cfg index dea553c949..ff150d86ec 100644 --- a/resources/variants/atmat_signal_xl_v6_0.40.inst.cfg +++ b/resources/variants/atmat_signal_xl_v6_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_signal_xl [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_signal_xl_v6_0.80.inst.cfg b/resources/variants/atmat_signal_xl_v6_0.80.inst.cfg index d27625c52a..8a6aa68676 100644 --- a/resources/variants/atmat_signal_xl_v6_0.80.inst.cfg +++ b/resources/variants/atmat_signal_xl_v6_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_signal_xl [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_signal_xxl_v6_0.40.inst.cfg b/resources/variants/atmat_signal_xxl_v6_0.40.inst.cfg index 3883c8ba05..d93c287a55 100644 --- a/resources/variants/atmat_signal_xxl_v6_0.40.inst.cfg +++ b/resources/variants/atmat_signal_xxl_v6_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_signal_xxl [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_signal_xxl_v6_0.80.inst.cfg b/resources/variants/atmat_signal_xxl_v6_0.80.inst.cfg index 73ea401b05..ed3ec5de09 100644 --- a/resources/variants/atmat_signal_xxl_v6_0.80.inst.cfg +++ b/resources/variants/atmat_signal_xxl_v6_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_signal_xxl [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_signal_xxxl_v6_0.40.inst.cfg b/resources/variants/atmat_signal_xxxl_v6_0.40.inst.cfg index 0428c9f9da..f3a3dded2e 100644 --- a/resources/variants/atmat_signal_xxxl_v6_0.40.inst.cfg +++ b/resources/variants/atmat_signal_xxxl_v6_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_signal_xxxl [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atmat_signal_xxxl_v6_0.80.inst.cfg b/resources/variants/atmat_signal_xxxl_v6_0.80.inst.cfg index dcd4b153da..88b5af6372 100644 --- a/resources/variants/atmat_signal_xxxl_v6_0.80.inst.cfg +++ b/resources/variants/atmat_signal_xxxl_v6_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = atmat_signal_xxxl [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/atom3_all_metal_brass_0.2.inst.cfg b/resources/variants/atom3_all_metal_brass_0.2.inst.cfg new file mode 100644 index 0000000000..54b649276f --- /dev/null +++ b/resources/variants/atom3_all_metal_brass_0.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = All metal hotend + 0.2mm brass nozzle +version = 4 +definition = atom3 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 +retraction_amount = 3 +retraction_speed = 50 \ No newline at end of file diff --git a/resources/variants/atom3_all_metal_brass_0.4.inst.cfg b/resources/variants/atom3_all_metal_brass_0.4.inst.cfg new file mode 100644 index 0000000000..1cce5a141e --- /dev/null +++ b/resources/variants/atom3_all_metal_brass_0.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = All metal hotend + 0.4mm brass nozzle +version = 4 +definition = atom3 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 +retraction_amount = 3 +retraction_speed = 50 \ No newline at end of file diff --git a/resources/variants/atom3_all_metal_brass_0.6.inst.cfg b/resources/variants/atom3_all_metal_brass_0.6.inst.cfg new file mode 100644 index 0000000000..ed6b1987be --- /dev/null +++ b/resources/variants/atom3_all_metal_brass_0.6.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = All metal hotend + 0.6mm brass nozzle +version = 4 +definition = atom3 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 +retraction_amount = 3 +retraction_speed = 50 \ No newline at end of file diff --git a/resources/variants/atom3_lite_all_metal_brass_0.2.inst.cfg b/resources/variants/atom3_lite_all_metal_brass_0.2.inst.cfg new file mode 100644 index 0000000000..e649773986 --- /dev/null +++ b/resources/variants/atom3_lite_all_metal_brass_0.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = All metal hotend + 0.2mm brass nozzle +version = 4 +definition = atom3_lite + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 +retraction_amount = 3 +retraction_speed = 50 \ No newline at end of file diff --git a/resources/variants/atom3_lite_all_metal_brass_0.4.inst.cfg b/resources/variants/atom3_lite_all_metal_brass_0.4.inst.cfg new file mode 100644 index 0000000000..df28ad66b5 --- /dev/null +++ b/resources/variants/atom3_lite_all_metal_brass_0.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = All metal hotend + 0.4mm brass nozzle +version = 4 +definition = atom3_lite + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 +retraction_amount = 3 +retraction_speed = 50 \ No newline at end of file diff --git a/resources/variants/atom3_lite_all_metal_brass_0.6.inst.cfg b/resources/variants/atom3_lite_all_metal_brass_0.6.inst.cfg new file mode 100644 index 0000000000..f6aceb953a --- /dev/null +++ b/resources/variants/atom3_lite_all_metal_brass_0.6.inst.cfg @@ -0,0 +1,14 @@ + [general] +name = All metal hotend + 0.6mm brass nozzle +version = 4 +definition = atom3_lite + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 +retraction_amount = 3 +retraction_speed = 50 \ No newline at end of file diff --git a/resources/variants/atom3_lite_ptfe_brass_0.2.inst.cfg b/resources/variants/atom3_lite_ptfe_brass_0.2.inst.cfg new file mode 100644 index 0000000000..6a315929bf --- /dev/null +++ b/resources/variants/atom3_lite_ptfe_brass_0.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = PTFE hotend + 0.2mm brass nozzle +version = 4 +definition = atom3_lite + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 +retraction_amount = 7 +retraction_speed = 70 \ No newline at end of file diff --git a/resources/variants/atom3_lite_ptfe_brass_0.4.inst.cfg b/resources/variants/atom3_lite_ptfe_brass_0.4.inst.cfg new file mode 100644 index 0000000000..ffbf1e3a8e --- /dev/null +++ b/resources/variants/atom3_lite_ptfe_brass_0.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = PTFE hotend + 0.4mm brass nozzle +version = 4 +definition = atom3_lite + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 +retraction_amount = 7 +retraction_speed = 70 \ No newline at end of file diff --git a/resources/variants/atom3_lite_ptfe_brass_0.6.inst.cfg b/resources/variants/atom3_lite_ptfe_brass_0.6.inst.cfg new file mode 100644 index 0000000000..9bd202c021 --- /dev/null +++ b/resources/variants/atom3_lite_ptfe_brass_0.6.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = PTFE hotend + 0.6mm brass nozzle +version = 4 +definition = atom3_lite + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 +retraction_amount = 7 +retraction_speed = 70 \ No newline at end of file diff --git a/resources/variants/atom3_ptfe_brass_0.2.inst.cfg b/resources/variants/atom3_ptfe_brass_0.2.inst.cfg new file mode 100644 index 0000000000..33eb1d7701 --- /dev/null +++ b/resources/variants/atom3_ptfe_brass_0.2.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = PTFE hotend + 0.2mm brass nozzle +version = 4 +definition = atom3 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 +retraction_amount = 7 +retraction_speed = 70 \ No newline at end of file diff --git a/resources/variants/atom3_ptfe_brass_0.4.inst.cfg b/resources/variants/atom3_ptfe_brass_0.4.inst.cfg new file mode 100644 index 0000000000..857737db18 --- /dev/null +++ b/resources/variants/atom3_ptfe_brass_0.4.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = PTFE hotend + 0.4mm brass nozzle +version = 4 +definition = atom3 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 +retraction_amount = 7 +retraction_speed = 70 \ No newline at end of file diff --git a/resources/variants/atom3_ptfe_brass_0.6.inst.cfg b/resources/variants/atom3_ptfe_brass_0.6.inst.cfg new file mode 100644 index 0000000000..e4137b7c99 --- /dev/null +++ b/resources/variants/atom3_ptfe_brass_0.6.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = PTFE hotend + 0.6mm brass nozzle +version = 4 +definition = atom3 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 +retraction_amount = 7 +retraction_speed = 70 \ No newline at end of file diff --git a/resources/variants/biqu_b1_0.2.inst.cfg b/resources/variants/biqu_b1_0.2.inst.cfg index e4c6afd6d7..e31d52e941 100755 --- a/resources/variants/biqu_b1_0.2.inst.cfg +++ b/resources/variants/biqu_b1_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = biqu_b1 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/biqu_b1_0.3.inst.cfg b/resources/variants/biqu_b1_0.3.inst.cfg index 60406b2b6d..d91fa9f9d7 100755 --- a/resources/variants/biqu_b1_0.3.inst.cfg +++ b/resources/variants/biqu_b1_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = biqu_b1 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/biqu_b1_0.4.inst.cfg b/resources/variants/biqu_b1_0.4.inst.cfg index 859fb1734d..be9e21432e 100755 --- a/resources/variants/biqu_b1_0.4.inst.cfg +++ b/resources/variants/biqu_b1_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = biqu_b1 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/biqu_b1_0.5.inst.cfg b/resources/variants/biqu_b1_0.5.inst.cfg index 15860c8868..4760b6a063 100755 --- a/resources/variants/biqu_b1_0.5.inst.cfg +++ b/resources/variants/biqu_b1_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = biqu_b1 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/biqu_b1_0.6.inst.cfg b/resources/variants/biqu_b1_0.6.inst.cfg index c463c950f2..46e309fb1b 100755 --- a/resources/variants/biqu_b1_0.6.inst.cfg +++ b/resources/variants/biqu_b1_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = biqu_b1 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/biqu_b1_0.8.inst.cfg b/resources/variants/biqu_b1_0.8.inst.cfg index bc21919a96..0ecd60f6ff 100755 --- a/resources/variants/biqu_b1_0.8.inst.cfg +++ b/resources/variants/biqu_b1_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = biqu_b1 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/biqu_b1_abl_0.2.inst.cfg b/resources/variants/biqu_b1_abl_0.2.inst.cfg index 7bf2d629b9..d17d2189fb 100755 --- a/resources/variants/biqu_b1_abl_0.2.inst.cfg +++ b/resources/variants/biqu_b1_abl_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = biqu_b1_abl [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/biqu_b1_abl_0.3.inst.cfg b/resources/variants/biqu_b1_abl_0.3.inst.cfg index f274aa1fbf..ea8032c264 100755 --- a/resources/variants/biqu_b1_abl_0.3.inst.cfg +++ b/resources/variants/biqu_b1_abl_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = biqu_b1_abl [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/biqu_b1_abl_0.4.inst.cfg b/resources/variants/biqu_b1_abl_0.4.inst.cfg index 28ce693ffb..09596bce06 100755 --- a/resources/variants/biqu_b1_abl_0.4.inst.cfg +++ b/resources/variants/biqu_b1_abl_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = biqu_b1_abl [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/biqu_b1_abl_0.5.inst.cfg b/resources/variants/biqu_b1_abl_0.5.inst.cfg index 5306437984..188030719b 100755 --- a/resources/variants/biqu_b1_abl_0.5.inst.cfg +++ b/resources/variants/biqu_b1_abl_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = biqu_b1_abl [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/biqu_b1_abl_0.6.inst.cfg b/resources/variants/biqu_b1_abl_0.6.inst.cfg index e7f1a8ea2c..e6220e395a 100755 --- a/resources/variants/biqu_b1_abl_0.6.inst.cfg +++ b/resources/variants/biqu_b1_abl_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = biqu_b1_abl [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/biqu_b1_abl_0.8.inst.cfg b/resources/variants/biqu_b1_abl_0.8.inst.cfg index dd4afb9cf8..78e2953ff2 100755 --- a/resources/variants/biqu_b1_abl_0.8.inst.cfg +++ b/resources/variants/biqu_b1_abl_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = biqu_b1_abl [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/biqu_base_0.2.inst.cfg b/resources/variants/biqu_base_0.2.inst.cfg index 37d0c3f5c6..0dac1f681e 100755 --- a/resources/variants/biqu_base_0.2.inst.cfg +++ b/resources/variants/biqu_base_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/biqu_base_0.3.inst.cfg b/resources/variants/biqu_base_0.3.inst.cfg index c0d8d286f4..5fc3bd51ab 100755 --- a/resources/variants/biqu_base_0.3.inst.cfg +++ b/resources/variants/biqu_base_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/biqu_base_0.4.inst.cfg b/resources/variants/biqu_base_0.4.inst.cfg index 12b4310aa8..506e603abe 100755 --- a/resources/variants/biqu_base_0.4.inst.cfg +++ b/resources/variants/biqu_base_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/biqu_base_0.5.inst.cfg b/resources/variants/biqu_base_0.5.inst.cfg index 40de2f59dc..9ff66385a3 100755 --- a/resources/variants/biqu_base_0.5.inst.cfg +++ b/resources/variants/biqu_base_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/biqu_base_0.6.inst.cfg b/resources/variants/biqu_base_0.6.inst.cfg index 173fd5a626..826fbcfb8f 100755 --- a/resources/variants/biqu_base_0.6.inst.cfg +++ b/resources/variants/biqu_base_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/biqu_base_0.8.inst.cfg b/resources/variants/biqu_base_0.8.inst.cfg index d3654c9662..c953604fee 100755 --- a/resources/variants/biqu_base_0.8.inst.cfg +++ b/resources/variants/biqu_base_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = biqu_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/biqu_bx_abl_0.2.inst.cfg b/resources/variants/biqu_bx_abl_0.2.inst.cfg new file mode 100755 index 0000000000..b72fdc83bb --- /dev/null +++ b/resources/variants/biqu_bx_abl_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = biqu_bx_abl + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/biqu_bx_abl_0.3.inst.cfg b/resources/variants/biqu_bx_abl_0.3.inst.cfg new file mode 100755 index 0000000000..7b195c0013 --- /dev/null +++ b/resources/variants/biqu_bx_abl_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = biqu_bx_abl + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/biqu_bx_abl_0.4.inst.cfg b/resources/variants/biqu_bx_abl_0.4.inst.cfg new file mode 100755 index 0000000000..106c5ea5d7 --- /dev/null +++ b/resources/variants/biqu_bx_abl_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = biqu_bx_abl + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/biqu_bx_abl_0.5.inst.cfg b/resources/variants/biqu_bx_abl_0.5.inst.cfg new file mode 100755 index 0000000000..c95388e23f --- /dev/null +++ b/resources/variants/biqu_bx_abl_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = biqu_bx_abl + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/biqu_bx_abl_0.6.inst.cfg b/resources/variants/biqu_bx_abl_0.6.inst.cfg new file mode 100755 index 0000000000..0116e7478f --- /dev/null +++ b/resources/variants/biqu_bx_abl_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = biqu_bx_abl + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/biqu_bx_abl_0.8.inst.cfg b/resources/variants/biqu_bx_abl_0.8.inst.cfg new file mode 100755 index 0000000000..8a5747a9f7 --- /dev/null +++ b/resources/variants/biqu_bx_abl_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = biqu_bx_abl + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio_0.25.inst.cfg index 8672e900a0..e1221b025d 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -5,7 +5,7 @@ definition = cartesio [metadata] author = Cartesio -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index 4ef79559f1..10d16e2f9c 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -5,7 +5,7 @@ definition = cartesio [metadata] author = Cartesio -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio_0.8.inst.cfg index 95d6e2aa1b..698b693b0b 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -5,7 +5,7 @@ definition = cartesio [metadata] author = Cartesio -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_0.2.inst.cfg b/resources/variants/creality_base_0.2.inst.cfg index 8a66a2bde8..71d11e62fb 100644 --- a/resources/variants/creality_base_0.2.inst.cfg +++ b/resources/variants/creality_base_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_0.3.inst.cfg b/resources/variants/creality_base_0.3.inst.cfg index a42e16cb61..77443a81a3 100644 --- a/resources/variants/creality_base_0.3.inst.cfg +++ b/resources/variants/creality_base_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_0.4.inst.cfg b/resources/variants/creality_base_0.4.inst.cfg index 1d77c3af47..5e0d63f59c 100644 --- a/resources/variants/creality_base_0.4.inst.cfg +++ b/resources/variants/creality_base_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_0.5.inst.cfg b/resources/variants/creality_base_0.5.inst.cfg index 5179792711..7097ab21a4 100644 --- a/resources/variants/creality_base_0.5.inst.cfg +++ b/resources/variants/creality_base_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_0.6.inst.cfg b/resources/variants/creality_base_0.6.inst.cfg index 003e1f3c49..5528070963 100644 --- a/resources/variants/creality_base_0.6.inst.cfg +++ b/resources/variants/creality_base_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_0.8.inst.cfg b/resources/variants/creality_base_0.8.inst.cfg index b28cb68cda..e71a913ae8 100644 --- a/resources/variants/creality_base_0.8.inst.cfg +++ b/resources/variants/creality_base_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_base_1.0.inst.cfg b/resources/variants/creality_base_1.0.inst.cfg index d250c6b5a9..a38dde573c 100644 --- a/resources/variants/creality_base_1.0.inst.cfg +++ b/resources/variants/creality_base_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_0.2.inst.cfg b/resources/variants/creality_cr10_0.2.inst.cfg index ae2cf9f1bc..79e12adecb 100644 --- a/resources/variants/creality_cr10_0.2.inst.cfg +++ b/resources/variants/creality_cr10_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_0.3.inst.cfg b/resources/variants/creality_cr10_0.3.inst.cfg index 2d318cb7cd..190ca6a488 100644 --- a/resources/variants/creality_cr10_0.3.inst.cfg +++ b/resources/variants/creality_cr10_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_0.4.inst.cfg b/resources/variants/creality_cr10_0.4.inst.cfg index 55facc2544..e02ee60edc 100644 --- a/resources/variants/creality_cr10_0.4.inst.cfg +++ b/resources/variants/creality_cr10_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_0.5.inst.cfg b/resources/variants/creality_cr10_0.5.inst.cfg index d6ae843d7c..3a337af96b 100644 --- a/resources/variants/creality_cr10_0.5.inst.cfg +++ b/resources/variants/creality_cr10_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_0.6.inst.cfg b/resources/variants/creality_cr10_0.6.inst.cfg index d137de2800..7d45e2d9dc 100644 --- a/resources/variants/creality_cr10_0.6.inst.cfg +++ b/resources/variants/creality_cr10_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_0.8.inst.cfg b/resources/variants/creality_cr10_0.8.inst.cfg index a69fb50ba6..07b6bb5b29 100644 --- a/resources/variants/creality_cr10_0.8.inst.cfg +++ b/resources/variants/creality_cr10_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10_1.0.inst.cfg b/resources/variants/creality_cr10_1.0.inst.cfg index 7fb59ec376..3f694763f0 100644 --- a/resources/variants/creality_cr10_1.0.inst.cfg +++ b/resources/variants/creality_cr10_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10max_0.2.inst.cfg b/resources/variants/creality_cr10max_0.2.inst.cfg index 16cd73f65b..1cb681c833 100644 --- a/resources/variants/creality_cr10max_0.2.inst.cfg +++ b/resources/variants/creality_cr10max_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10max_0.3.inst.cfg b/resources/variants/creality_cr10max_0.3.inst.cfg index 90100ae8b5..b919beb97a 100644 --- a/resources/variants/creality_cr10max_0.3.inst.cfg +++ b/resources/variants/creality_cr10max_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10max_0.4.inst.cfg b/resources/variants/creality_cr10max_0.4.inst.cfg index c915e1dfbf..ca87afb28c 100644 --- a/resources/variants/creality_cr10max_0.4.inst.cfg +++ b/resources/variants/creality_cr10max_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10max_0.5.inst.cfg b/resources/variants/creality_cr10max_0.5.inst.cfg index 26e5df9d9c..3d5a72b1f8 100644 --- a/resources/variants/creality_cr10max_0.5.inst.cfg +++ b/resources/variants/creality_cr10max_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10max_0.6.inst.cfg b/resources/variants/creality_cr10max_0.6.inst.cfg index cd92016dcf..f56e9d2a82 100644 --- a/resources/variants/creality_cr10max_0.6.inst.cfg +++ b/resources/variants/creality_cr10max_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10max_0.8.inst.cfg b/resources/variants/creality_cr10max_0.8.inst.cfg index 9f27ae96cc..76c9338d5e 100644 --- a/resources/variants/creality_cr10max_0.8.inst.cfg +++ b/resources/variants/creality_cr10max_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10max_1.0.inst.cfg b/resources/variants/creality_cr10max_1.0.inst.cfg index 6538ec5f32..38242024f1 100644 --- a/resources/variants/creality_cr10max_1.0.inst.cfg +++ b/resources/variants/creality_cr10max_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_0.2.inst.cfg b/resources/variants/creality_cr10mini_0.2.inst.cfg index 6a53bd54a8..61e3eb4426 100644 --- a/resources/variants/creality_cr10mini_0.2.inst.cfg +++ b/resources/variants/creality_cr10mini_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_0.3.inst.cfg b/resources/variants/creality_cr10mini_0.3.inst.cfg index 9708c4c6f6..f8237eb546 100644 --- a/resources/variants/creality_cr10mini_0.3.inst.cfg +++ b/resources/variants/creality_cr10mini_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_0.4.inst.cfg b/resources/variants/creality_cr10mini_0.4.inst.cfg index c5a05d39c0..cfd5370196 100644 --- a/resources/variants/creality_cr10mini_0.4.inst.cfg +++ b/resources/variants/creality_cr10mini_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_0.5.inst.cfg b/resources/variants/creality_cr10mini_0.5.inst.cfg index 0a35f06f29..b40091f4d8 100644 --- a/resources/variants/creality_cr10mini_0.5.inst.cfg +++ b/resources/variants/creality_cr10mini_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_0.6.inst.cfg b/resources/variants/creality_cr10mini_0.6.inst.cfg index 9a4a321820..e6ab420dd2 100644 --- a/resources/variants/creality_cr10mini_0.6.inst.cfg +++ b/resources/variants/creality_cr10mini_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_0.8.inst.cfg b/resources/variants/creality_cr10mini_0.8.inst.cfg index 8a0ede01bb..df3746df00 100644 --- a/resources/variants/creality_cr10mini_0.8.inst.cfg +++ b/resources/variants/creality_cr10mini_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10mini_1.0.inst.cfg b/resources/variants/creality_cr10mini_1.0.inst.cfg index 2b5550b2ae..3c377248fa 100644 --- a/resources/variants/creality_cr10mini_1.0.inst.cfg +++ b/resources/variants/creality_cr10mini_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10mini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_0.2.inst.cfg b/resources/variants/creality_cr10s4_0.2.inst.cfg index 0c69f8eb00..a10e134dcd 100644 --- a/resources/variants/creality_cr10s4_0.2.inst.cfg +++ b/resources/variants/creality_cr10s4_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_0.3.inst.cfg b/resources/variants/creality_cr10s4_0.3.inst.cfg index 42fefad7c1..90fc424cd1 100644 --- a/resources/variants/creality_cr10s4_0.3.inst.cfg +++ b/resources/variants/creality_cr10s4_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_0.4.inst.cfg b/resources/variants/creality_cr10s4_0.4.inst.cfg index 6162b054b3..2f151ea147 100644 --- a/resources/variants/creality_cr10s4_0.4.inst.cfg +++ b/resources/variants/creality_cr10s4_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_0.5.inst.cfg b/resources/variants/creality_cr10s4_0.5.inst.cfg index 452a6020fa..752917df6c 100644 --- a/resources/variants/creality_cr10s4_0.5.inst.cfg +++ b/resources/variants/creality_cr10s4_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_0.6.inst.cfg b/resources/variants/creality_cr10s4_0.6.inst.cfg index 382a67fc23..4711b4b426 100644 --- a/resources/variants/creality_cr10s4_0.6.inst.cfg +++ b/resources/variants/creality_cr10s4_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_0.8.inst.cfg b/resources/variants/creality_cr10s4_0.8.inst.cfg index ea29141a91..4f5ce8f564 100644 --- a/resources/variants/creality_cr10s4_0.8.inst.cfg +++ b/resources/variants/creality_cr10s4_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s4_1.0.inst.cfg b/resources/variants/creality_cr10s4_1.0.inst.cfg index bd544b80fa..b5431231cf 100644 --- a/resources/variants/creality_cr10s4_1.0.inst.cfg +++ b/resources/variants/creality_cr10s4_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s4 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_0.2.inst.cfg b/resources/variants/creality_cr10s5_0.2.inst.cfg index 41678fec57..f1c297a288 100644 --- a/resources/variants/creality_cr10s5_0.2.inst.cfg +++ b/resources/variants/creality_cr10s5_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_0.3.inst.cfg b/resources/variants/creality_cr10s5_0.3.inst.cfg index 1a22516255..f8a4ff87f8 100644 --- a/resources/variants/creality_cr10s5_0.3.inst.cfg +++ b/resources/variants/creality_cr10s5_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_0.4.inst.cfg b/resources/variants/creality_cr10s5_0.4.inst.cfg index 9120ce4595..bcd6ce2c49 100644 --- a/resources/variants/creality_cr10s5_0.4.inst.cfg +++ b/resources/variants/creality_cr10s5_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_0.5.inst.cfg b/resources/variants/creality_cr10s5_0.5.inst.cfg index 9125ff6d43..322888dc96 100644 --- a/resources/variants/creality_cr10s5_0.5.inst.cfg +++ b/resources/variants/creality_cr10s5_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_0.6.inst.cfg b/resources/variants/creality_cr10s5_0.6.inst.cfg index b5080c3b97..73766ef2fc 100644 --- a/resources/variants/creality_cr10s5_0.6.inst.cfg +++ b/resources/variants/creality_cr10s5_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_0.8.inst.cfg b/resources/variants/creality_cr10s5_0.8.inst.cfg index a9c830f15b..7adb8c2299 100644 --- a/resources/variants/creality_cr10s5_0.8.inst.cfg +++ b/resources/variants/creality_cr10s5_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s5_1.0.inst.cfg b/resources/variants/creality_cr10s5_1.0.inst.cfg index 9a91c7851c..2006a299fa 100644 --- a/resources/variants/creality_cr10s5_1.0.inst.cfg +++ b/resources/variants/creality_cr10s5_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_0.2.inst.cfg b/resources/variants/creality_cr10s_0.2.inst.cfg index fd76c806b1..70bb2b38db 100644 --- a/resources/variants/creality_cr10s_0.2.inst.cfg +++ b/resources/variants/creality_cr10s_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_0.3.inst.cfg b/resources/variants/creality_cr10s_0.3.inst.cfg index 4271158336..fd7a408ea1 100644 --- a/resources/variants/creality_cr10s_0.3.inst.cfg +++ b/resources/variants/creality_cr10s_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_0.4.inst.cfg b/resources/variants/creality_cr10s_0.4.inst.cfg index a95e43fbee..ec45fa5f4b 100644 --- a/resources/variants/creality_cr10s_0.4.inst.cfg +++ b/resources/variants/creality_cr10s_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_0.5.inst.cfg b/resources/variants/creality_cr10s_0.5.inst.cfg index e83a1bb35e..57a0c952d7 100644 --- a/resources/variants/creality_cr10s_0.5.inst.cfg +++ b/resources/variants/creality_cr10s_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_0.6.inst.cfg b/resources/variants/creality_cr10s_0.6.inst.cfg index 8ca4fac283..81e2fe17f1 100644 --- a/resources/variants/creality_cr10s_0.6.inst.cfg +++ b/resources/variants/creality_cr10s_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_0.8.inst.cfg b/resources/variants/creality_cr10s_0.8.inst.cfg index eb33ec50f6..7bb25fa9cb 100644 --- a/resources/variants/creality_cr10s_0.8.inst.cfg +++ b/resources/variants/creality_cr10s_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10s_1.0.inst.cfg b/resources/variants/creality_cr10s_1.0.inst.cfg index b8d95a98cc..f76ed1c3b5 100644 --- a/resources/variants/creality_cr10s_1.0.inst.cfg +++ b/resources/variants/creality_cr10s_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10s [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_0.2.inst.cfg b/resources/variants/creality_cr10spro_0.2.inst.cfg index 0c7f6b7bab..c3078ea70a 100644 --- a/resources/variants/creality_cr10spro_0.2.inst.cfg +++ b/resources/variants/creality_cr10spro_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_0.3.inst.cfg b/resources/variants/creality_cr10spro_0.3.inst.cfg index 8e968ab98a..bc097c35b2 100644 --- a/resources/variants/creality_cr10spro_0.3.inst.cfg +++ b/resources/variants/creality_cr10spro_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_0.4.inst.cfg b/resources/variants/creality_cr10spro_0.4.inst.cfg index 144da5c582..e4dbda2a18 100644 --- a/resources/variants/creality_cr10spro_0.4.inst.cfg +++ b/resources/variants/creality_cr10spro_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_0.5.inst.cfg b/resources/variants/creality_cr10spro_0.5.inst.cfg index c66572f929..d5cd455b5c 100644 --- a/resources/variants/creality_cr10spro_0.5.inst.cfg +++ b/resources/variants/creality_cr10spro_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_0.6.inst.cfg b/resources/variants/creality_cr10spro_0.6.inst.cfg index 07029da9e2..bcf95ca8ac 100644 --- a/resources/variants/creality_cr10spro_0.6.inst.cfg +++ b/resources/variants/creality_cr10spro_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_0.8.inst.cfg b/resources/variants/creality_cr10spro_0.8.inst.cfg index 1d37eca54d..c7732a99bf 100644 --- a/resources/variants/creality_cr10spro_0.8.inst.cfg +++ b/resources/variants/creality_cr10spro_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr10spro_1.0.inst.cfg b/resources/variants/creality_cr10spro_1.0.inst.cfg index 067e2dc54b..a6067fd350 100644 --- a/resources/variants/creality_cr10spro_1.0.inst.cfg +++ b/resources/variants/creality_cr10spro_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr10spro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_0.2.inst.cfg b/resources/variants/creality_cr20_0.2.inst.cfg index eb1339e6e6..751ce5e82f 100644 --- a/resources/variants/creality_cr20_0.2.inst.cfg +++ b/resources/variants/creality_cr20_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_0.3.inst.cfg b/resources/variants/creality_cr20_0.3.inst.cfg index acd2f92395..ffb28cee57 100644 --- a/resources/variants/creality_cr20_0.3.inst.cfg +++ b/resources/variants/creality_cr20_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_0.4.inst.cfg b/resources/variants/creality_cr20_0.4.inst.cfg index 3c83ab6871..dd643b76f4 100644 --- a/resources/variants/creality_cr20_0.4.inst.cfg +++ b/resources/variants/creality_cr20_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_0.5.inst.cfg b/resources/variants/creality_cr20_0.5.inst.cfg index 915c0b133b..53c980f375 100644 --- a/resources/variants/creality_cr20_0.5.inst.cfg +++ b/resources/variants/creality_cr20_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_0.6.inst.cfg b/resources/variants/creality_cr20_0.6.inst.cfg index 1b320781e9..3616941560 100644 --- a/resources/variants/creality_cr20_0.6.inst.cfg +++ b/resources/variants/creality_cr20_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_0.8.inst.cfg b/resources/variants/creality_cr20_0.8.inst.cfg index dd98e4aa58..efb0fb7a74 100644 --- a/resources/variants/creality_cr20_0.8.inst.cfg +++ b/resources/variants/creality_cr20_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20_1.0.inst.cfg b/resources/variants/creality_cr20_1.0.inst.cfg index 980d7cffd9..b7da87c411 100644 --- a/resources/variants/creality_cr20_1.0.inst.cfg +++ b/resources/variants/creality_cr20_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_0.2.inst.cfg b/resources/variants/creality_cr20pro_0.2.inst.cfg index 0affcd514c..8649b48b29 100644 --- a/resources/variants/creality_cr20pro_0.2.inst.cfg +++ b/resources/variants/creality_cr20pro_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_0.3.inst.cfg b/resources/variants/creality_cr20pro_0.3.inst.cfg index 32c15f88a1..a21fb4d621 100644 --- a/resources/variants/creality_cr20pro_0.3.inst.cfg +++ b/resources/variants/creality_cr20pro_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_0.4.inst.cfg b/resources/variants/creality_cr20pro_0.4.inst.cfg index ef384a81e3..c8bec5726f 100644 --- a/resources/variants/creality_cr20pro_0.4.inst.cfg +++ b/resources/variants/creality_cr20pro_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_0.5.inst.cfg b/resources/variants/creality_cr20pro_0.5.inst.cfg index 6ab8116161..0573c5a998 100644 --- a/resources/variants/creality_cr20pro_0.5.inst.cfg +++ b/resources/variants/creality_cr20pro_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_0.6.inst.cfg b/resources/variants/creality_cr20pro_0.6.inst.cfg index 62ed5516bd..2c0e477ff8 100644 --- a/resources/variants/creality_cr20pro_0.6.inst.cfg +++ b/resources/variants/creality_cr20pro_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_0.8.inst.cfg b/resources/variants/creality_cr20pro_0.8.inst.cfg index 586c627725..7be8be0b30 100644 --- a/resources/variants/creality_cr20pro_0.8.inst.cfg +++ b/resources/variants/creality_cr20pro_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr20pro_1.0.inst.cfg b/resources/variants/creality_cr20pro_1.0.inst.cfg index f5bf8194d5..8a33ec81ca 100644 --- a/resources/variants/creality_cr20pro_1.0.inst.cfg +++ b/resources/variants/creality_cr20pro_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr20pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr6se_0.2.inst.cfg b/resources/variants/creality_cr6se_0.2.inst.cfg index 4a0e63f6ba..076fd40ab1 100644 --- a/resources/variants/creality_cr6se_0.2.inst.cfg +++ b/resources/variants/creality_cr6se_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr6se [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr6se_0.3.inst.cfg b/resources/variants/creality_cr6se_0.3.inst.cfg index cd311fb3e2..4ab5a30d12 100644 --- a/resources/variants/creality_cr6se_0.3.inst.cfg +++ b/resources/variants/creality_cr6se_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr6se [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr6se_0.4.inst.cfg b/resources/variants/creality_cr6se_0.4.inst.cfg index 91173c9146..d17dc8c1f3 100644 --- a/resources/variants/creality_cr6se_0.4.inst.cfg +++ b/resources/variants/creality_cr6se_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr6se [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr6se_0.5.inst.cfg b/resources/variants/creality_cr6se_0.5.inst.cfg index 52f11ebd62..c9e6ee6fc0 100644 --- a/resources/variants/creality_cr6se_0.5.inst.cfg +++ b/resources/variants/creality_cr6se_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr6se [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr6se_0.6.inst.cfg b/resources/variants/creality_cr6se_0.6.inst.cfg index 017aad1284..13a63bd08a 100644 --- a/resources/variants/creality_cr6se_0.6.inst.cfg +++ b/resources/variants/creality_cr6se_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr6se [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr6se_0.8.inst.cfg b/resources/variants/creality_cr6se_0.8.inst.cfg index f0714ce894..52686f5c6f 100644 --- a/resources/variants/creality_cr6se_0.8.inst.cfg +++ b/resources/variants/creality_cr6se_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr6se [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_cr6se_1.0.inst.cfg b/resources/variants/creality_cr6se_1.0.inst.cfg index cde843ff50..52f35938ff 100644 --- a/resources/variants/creality_cr6se_1.0.inst.cfg +++ b/resources/variants/creality_cr6se_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_cr6se [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_0.2.inst.cfg b/resources/variants/creality_ender2_0.2.inst.cfg index 60245ac6ed..3f36f171be 100644 --- a/resources/variants/creality_ender2_0.2.inst.cfg +++ b/resources/variants/creality_ender2_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_0.3.inst.cfg b/resources/variants/creality_ender2_0.3.inst.cfg index c794f34eab..68ca89e3c7 100644 --- a/resources/variants/creality_ender2_0.3.inst.cfg +++ b/resources/variants/creality_ender2_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_0.4.inst.cfg b/resources/variants/creality_ender2_0.4.inst.cfg index 0297f4bf84..ca0ccb5547 100644 --- a/resources/variants/creality_ender2_0.4.inst.cfg +++ b/resources/variants/creality_ender2_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_0.5.inst.cfg b/resources/variants/creality_ender2_0.5.inst.cfg index 0265881867..bd7884f584 100644 --- a/resources/variants/creality_ender2_0.5.inst.cfg +++ b/resources/variants/creality_ender2_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_0.6.inst.cfg b/resources/variants/creality_ender2_0.6.inst.cfg index 32561fa0cb..fc0a9d9b2c 100644 --- a/resources/variants/creality_ender2_0.6.inst.cfg +++ b/resources/variants/creality_ender2_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_0.8.inst.cfg b/resources/variants/creality_ender2_0.8.inst.cfg index 060ac4f5e0..643236993c 100644 --- a/resources/variants/creality_ender2_0.8.inst.cfg +++ b/resources/variants/creality_ender2_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender2_1.0.inst.cfg b/resources/variants/creality_ender2_1.0.inst.cfg index 3af87ca9ca..99ec9a948d 100644 --- a/resources/variants/creality_ender2_1.0.inst.cfg +++ b/resources/variants/creality_ender2_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_0.2.inst.cfg b/resources/variants/creality_ender3_0.2.inst.cfg index 267adf8048..67e0c11b4d 100644 --- a/resources/variants/creality_ender3_0.2.inst.cfg +++ b/resources/variants/creality_ender3_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_0.3.inst.cfg b/resources/variants/creality_ender3_0.3.inst.cfg index 8b0fcdc0b9..4b1d369516 100644 --- a/resources/variants/creality_ender3_0.3.inst.cfg +++ b/resources/variants/creality_ender3_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_0.4.inst.cfg b/resources/variants/creality_ender3_0.4.inst.cfg index a4dc083b58..cd43aa9b22 100644 --- a/resources/variants/creality_ender3_0.4.inst.cfg +++ b/resources/variants/creality_ender3_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_0.5.inst.cfg b/resources/variants/creality_ender3_0.5.inst.cfg index 0187e0d6ed..7cc64c7ec4 100644 --- a/resources/variants/creality_ender3_0.5.inst.cfg +++ b/resources/variants/creality_ender3_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_0.6.inst.cfg b/resources/variants/creality_ender3_0.6.inst.cfg index 50c288cb41..0ea6093465 100644 --- a/resources/variants/creality_ender3_0.6.inst.cfg +++ b/resources/variants/creality_ender3_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_0.8.inst.cfg b/resources/variants/creality_ender3_0.8.inst.cfg index b92af0f5c5..53c45bbf35 100644 --- a/resources/variants/creality_ender3_0.8.inst.cfg +++ b/resources/variants/creality_ender3_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3_1.0.inst.cfg b/resources/variants/creality_ender3_1.0.inst.cfg index d14993433c..ef4ced850c 100644 --- a/resources/variants/creality_ender3_1.0.inst.cfg +++ b/resources/variants/creality_ender3_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3pro_0.2.inst.cfg b/resources/variants/creality_ender3pro_0.2.inst.cfg index c5a8a45f23..e446aa3934 100644 --- a/resources/variants/creality_ender3pro_0.2.inst.cfg +++ b/resources/variants/creality_ender3pro_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3pro_0.3.inst.cfg b/resources/variants/creality_ender3pro_0.3.inst.cfg index dbe56b8e0d..6058af4efd 100644 --- a/resources/variants/creality_ender3pro_0.3.inst.cfg +++ b/resources/variants/creality_ender3pro_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3pro_0.4.inst.cfg b/resources/variants/creality_ender3pro_0.4.inst.cfg index 4acae9a6a7..63eb1cae27 100644 --- a/resources/variants/creality_ender3pro_0.4.inst.cfg +++ b/resources/variants/creality_ender3pro_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3pro_0.5.inst.cfg b/resources/variants/creality_ender3pro_0.5.inst.cfg index 7b8ad817a5..0225619747 100644 --- a/resources/variants/creality_ender3pro_0.5.inst.cfg +++ b/resources/variants/creality_ender3pro_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3pro_0.6.inst.cfg b/resources/variants/creality_ender3pro_0.6.inst.cfg index e8576a4a7b..bab4cb3298 100644 --- a/resources/variants/creality_ender3pro_0.6.inst.cfg +++ b/resources/variants/creality_ender3pro_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3pro_0.8.inst.cfg b/resources/variants/creality_ender3pro_0.8.inst.cfg index ced639f7ad..23711a3ba9 100644 --- a/resources/variants/creality_ender3pro_0.8.inst.cfg +++ b/resources/variants/creality_ender3pro_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender3pro_1.0.inst.cfg b/resources/variants/creality_ender3pro_1.0.inst.cfg index 66d8783e28..a77bee2585 100644 --- a/resources/variants/creality_ender3pro_1.0.inst.cfg +++ b/resources/variants/creality_ender3pro_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender3pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_0.2.inst.cfg b/resources/variants/creality_ender4_0.2.inst.cfg index fcccf9fd44..26b635548a 100644 --- a/resources/variants/creality_ender4_0.2.inst.cfg +++ b/resources/variants/creality_ender4_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_0.3.inst.cfg b/resources/variants/creality_ender4_0.3.inst.cfg index 543c4aae93..61c24e4a0e 100644 --- a/resources/variants/creality_ender4_0.3.inst.cfg +++ b/resources/variants/creality_ender4_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_0.4.inst.cfg b/resources/variants/creality_ender4_0.4.inst.cfg index 0c17cb512a..a42d774600 100644 --- a/resources/variants/creality_ender4_0.4.inst.cfg +++ b/resources/variants/creality_ender4_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_0.5.inst.cfg b/resources/variants/creality_ender4_0.5.inst.cfg index 28313e2fbd..95592443c9 100644 --- a/resources/variants/creality_ender4_0.5.inst.cfg +++ b/resources/variants/creality_ender4_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_0.6.inst.cfg b/resources/variants/creality_ender4_0.6.inst.cfg index 846f03e690..9d7d229ea4 100644 --- a/resources/variants/creality_ender4_0.6.inst.cfg +++ b/resources/variants/creality_ender4_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_0.8.inst.cfg b/resources/variants/creality_ender4_0.8.inst.cfg index a1a0f521fb..7dcb1e5cef 100644 --- a/resources/variants/creality_ender4_0.8.inst.cfg +++ b/resources/variants/creality_ender4_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender4_1.0.inst.cfg b/resources/variants/creality_ender4_1.0.inst.cfg index 57e198bd0c..46c507913a 100644 --- a/resources/variants/creality_ender4_1.0.inst.cfg +++ b/resources/variants/creality_ender4_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender4 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_0.2.inst.cfg b/resources/variants/creality_ender5_0.2.inst.cfg index a86a14aeae..83f946c771 100644 --- a/resources/variants/creality_ender5_0.2.inst.cfg +++ b/resources/variants/creality_ender5_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_0.3.inst.cfg b/resources/variants/creality_ender5_0.3.inst.cfg index 11c8652758..88deedc2ad 100644 --- a/resources/variants/creality_ender5_0.3.inst.cfg +++ b/resources/variants/creality_ender5_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_0.4.inst.cfg b/resources/variants/creality_ender5_0.4.inst.cfg index 07d65078fa..99db185ef8 100644 --- a/resources/variants/creality_ender5_0.4.inst.cfg +++ b/resources/variants/creality_ender5_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_0.5.inst.cfg b/resources/variants/creality_ender5_0.5.inst.cfg index 87b0496dfd..42d97bb6b5 100644 --- a/resources/variants/creality_ender5_0.5.inst.cfg +++ b/resources/variants/creality_ender5_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_0.6.inst.cfg b/resources/variants/creality_ender5_0.6.inst.cfg index 086b9440e7..0d9a6b3d3a 100644 --- a/resources/variants/creality_ender5_0.6.inst.cfg +++ b/resources/variants/creality_ender5_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_0.8.inst.cfg b/resources/variants/creality_ender5_0.8.inst.cfg index 14f620af99..4cedeb8f9b 100644 --- a/resources/variants/creality_ender5_0.8.inst.cfg +++ b/resources/variants/creality_ender5_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5_1.0.inst.cfg b/resources/variants/creality_ender5_1.0.inst.cfg index 64581a8e9f..9744cbdf2d 100644 --- a/resources/variants/creality_ender5_1.0.inst.cfg +++ b/resources/variants/creality_ender5_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_0.2.inst.cfg b/resources/variants/creality_ender5plus_0.2.inst.cfg index 2335e4a223..4c7ea4913f 100644 --- a/resources/variants/creality_ender5plus_0.2.inst.cfg +++ b/resources/variants/creality_ender5plus_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_0.3.inst.cfg b/resources/variants/creality_ender5plus_0.3.inst.cfg index b1dff91808..c28f790cc1 100644 --- a/resources/variants/creality_ender5plus_0.3.inst.cfg +++ b/resources/variants/creality_ender5plus_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_0.4.inst.cfg b/resources/variants/creality_ender5plus_0.4.inst.cfg index adf0202eba..2b60e33641 100644 --- a/resources/variants/creality_ender5plus_0.4.inst.cfg +++ b/resources/variants/creality_ender5plus_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_0.5.inst.cfg b/resources/variants/creality_ender5plus_0.5.inst.cfg index 41fda09ce1..8af06ec33a 100644 --- a/resources/variants/creality_ender5plus_0.5.inst.cfg +++ b/resources/variants/creality_ender5plus_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_0.6.inst.cfg b/resources/variants/creality_ender5plus_0.6.inst.cfg index bb8bca90c6..87e76b9a99 100644 --- a/resources/variants/creality_ender5plus_0.6.inst.cfg +++ b/resources/variants/creality_ender5plus_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_0.8.inst.cfg b/resources/variants/creality_ender5plus_0.8.inst.cfg index 389575c958..c792dbc7bc 100644 --- a/resources/variants/creality_ender5plus_0.8.inst.cfg +++ b/resources/variants/creality_ender5plus_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/creality_ender5plus_1.0.inst.cfg b/resources/variants/creality_ender5plus_1.0.inst.cfg index 0554d805f8..214ae7532c 100644 --- a/resources/variants/creality_ender5plus_1.0.inst.cfg +++ b/resources/variants/creality_ender5plus_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = creality_ender5plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc20_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20_fbe025.inst.cfg index 5482066147..da82eca60e 100644 --- a/resources/variants/deltacomb/deltacomb_dc20_fbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20_fbe025.inst.cfg @@ -5,7 +5,7 @@ definition = deltacomb_dc20 [metadata] author = Deltacomb 3D -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc20_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20_fbe040.inst.cfg index 275b3b5a0a..249648a531 100644 --- a/resources/variants/deltacomb/deltacomb_dc20_fbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20_fbe040.inst.cfg @@ -5,7 +5,7 @@ definition = deltacomb_dc20 [metadata] author = Deltacomb 3D -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc20_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20_fbe060.inst.cfg index cfb8e614ba..47c754b614 100644 --- a/resources/variants/deltacomb/deltacomb_dc20_fbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20_fbe060.inst.cfg @@ -5,7 +5,7 @@ definition = deltacomb_dc20 [metadata] author = Deltacomb 3D -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc20_vfbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20_vfbe080.inst.cfg old mode 100755 new mode 100644 index ed1da24d0e..b8009205a6 --- a/resources/variants/deltacomb/deltacomb_dc20_vfbe080.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20_vfbe080.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc20 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc20dual_dbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20dual_dbe025.inst.cfg old mode 100755 new mode 100644 index 554240fd30..2da301b7f6 --- a/resources/variants/deltacomb/deltacomb_dc20dual_dbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20dual_dbe025.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc20dual [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc20dual_dbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20dual_dbe040.inst.cfg old mode 100755 new mode 100644 index 0a8a6b59b5..f44ac939bb --- a/resources/variants/deltacomb/deltacomb_dc20dual_dbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20dual_dbe040.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc20dual [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc20dual_dbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20dual_dbe060.inst.cfg old mode 100755 new mode 100644 index 9c3eb342b4..e4cad8e815 --- a/resources/variants/deltacomb/deltacomb_dc20dual_dbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20dual_dbe060.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc20dual [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc20dual_vdbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20dual_vdbe080.inst.cfg old mode 100755 new mode 100644 index 55c65cec82..81037229ba --- a/resources/variants/deltacomb/deltacomb_dc20dual_vdbe080.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20dual_vdbe080.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc20dual [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc20flux_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20flux_fbe025.inst.cfg old mode 100755 new mode 100644 index eb4a907387..ff25eeaa04 --- a/resources/variants/deltacomb/deltacomb_dc20flux_fbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20flux_fbe025.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc20flux [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc20flux_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20flux_fbe040.inst.cfg old mode 100755 new mode 100644 index 923f9aee94..b416888f43 --- a/resources/variants/deltacomb/deltacomb_dc20flux_fbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20flux_fbe040.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc20flux [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc20flux_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20flux_fbe060.inst.cfg old mode 100755 new mode 100644 index f8659397ec..e1b878b8e7 --- a/resources/variants/deltacomb/deltacomb_dc20flux_fbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20flux_fbe060.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc20flux [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc21_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21_fbe025.inst.cfg old mode 100755 new mode 100644 index e2ae85e735..c5299d1c36 --- a/resources/variants/deltacomb/deltacomb_dc21_fbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21_fbe025.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc21 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc21_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21_fbe040.inst.cfg old mode 100755 new mode 100644 index d8e7b284d9..c43205ce7a --- a/resources/variants/deltacomb/deltacomb_dc21_fbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21_fbe040.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc21 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc21_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21_fbe060.inst.cfg old mode 100755 new mode 100644 index f3d2059b40..d716eaec74 --- a/resources/variants/deltacomb/deltacomb_dc21_fbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21_fbe060.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc21 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc21_vfbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21_vfbe080.inst.cfg old mode 100755 new mode 100644 index ba16c73648..91cc88dc55 --- a/resources/variants/deltacomb/deltacomb_dc21_vfbe080.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21_vfbe080.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc21 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc21dual_dbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21dual_dbe025.inst.cfg old mode 100755 new mode 100644 index a0543b12a6..870554f43d --- a/resources/variants/deltacomb/deltacomb_dc21dual_dbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21dual_dbe025.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc21dual [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc21dual_dbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21dual_dbe040.inst.cfg old mode 100755 new mode 100644 index b112638dfe..6f0fc475c2 --- a/resources/variants/deltacomb/deltacomb_dc21dual_dbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21dual_dbe040.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc21dual [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc21dual_dbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21dual_dbe060.inst.cfg old mode 100755 new mode 100644 index 91a20cebe9..5063ed66c2 --- a/resources/variants/deltacomb/deltacomb_dc21dual_dbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21dual_dbe060.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc21dual [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc21dual_vdbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21dual_vdbe080.inst.cfg old mode 100755 new mode 100644 index aed5ecbaf7..eea09bfa73 --- a/resources/variants/deltacomb/deltacomb_dc21dual_vdbe080.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21dual_vdbe080.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc21dual [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc21flux_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21flux_fbe025.inst.cfg old mode 100755 new mode 100644 index c2341507d2..cf09be9b0e --- a/resources/variants/deltacomb/deltacomb_dc21flux_fbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21flux_fbe025.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc21flux [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc21flux_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21flux_fbe040.inst.cfg old mode 100755 new mode 100644 index e52d3eb9fe..125d219546 --- a/resources/variants/deltacomb/deltacomb_dc21flux_fbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21flux_fbe040.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc21flux [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc21flux_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21flux_fbe060.inst.cfg old mode 100755 new mode 100644 index 1006e82674..5c8e8afb60 --- a/resources/variants/deltacomb/deltacomb_dc21flux_fbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21flux_fbe060.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc21flux [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc30_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30_fbe025.inst.cfg old mode 100755 new mode 100644 index 69dbe02100..3966c29b0b --- a/resources/variants/deltacomb/deltacomb_dc30_fbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30_fbe025.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc30 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc30_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30_fbe040.inst.cfg old mode 100755 new mode 100644 index f7c2bfa306..a37908e466 --- a/resources/variants/deltacomb/deltacomb_dc30_fbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30_fbe040.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc30 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc30_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30_fbe060.inst.cfg old mode 100755 new mode 100644 index f19a25c2c4..3156509550 --- a/resources/variants/deltacomb/deltacomb_dc30_fbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30_fbe060.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc30 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc30_vfbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30_vfbe080.inst.cfg old mode 100755 new mode 100644 index 601f52e14f..031fbb3cf8 --- a/resources/variants/deltacomb/deltacomb_dc30_vfbe080.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30_vfbe080.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc30 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc30dual_dbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30dual_dbe025.inst.cfg old mode 100755 new mode 100644 index d0460949f6..f23073148c --- a/resources/variants/deltacomb/deltacomb_dc30dual_dbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30dual_dbe025.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc30dual [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc30dual_dbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30dual_dbe040.inst.cfg old mode 100755 new mode 100644 index 99c102b64e..7766f3572f --- a/resources/variants/deltacomb/deltacomb_dc30dual_dbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30dual_dbe040.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc30dual [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc30dual_dbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30dual_dbe060.inst.cfg old mode 100755 new mode 100644 index 648b5dacc1..605093479d --- a/resources/variants/deltacomb/deltacomb_dc30dual_dbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30dual_dbe060.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc30dual [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc30dual_vdbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30dual_vdbe080.inst.cfg old mode 100755 new mode 100644 index 1320241e76..4d97e4cd56 --- a/resources/variants/deltacomb/deltacomb_dc30dual_vdbe080.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30dual_vdbe080.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc30dual [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc30flux_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30flux_fbe025.inst.cfg old mode 100755 new mode 100644 index da7d95f3f3..7ddb8c1dd0 --- a/resources/variants/deltacomb/deltacomb_dc30flux_fbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30flux_fbe025.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc30flux [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc30flux_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30flux_fbe040.inst.cfg old mode 100755 new mode 100644 index abebe8ca2b..d3ad5a963d --- a/resources/variants/deltacomb/deltacomb_dc30flux_fbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30flux_fbe040.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc30flux [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/deltacomb/deltacomb_dc30flux_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30flux_fbe060.inst.cfg old mode 100755 new mode 100644 index e25378cae4..957b5e5006 --- a/resources/variants/deltacomb/deltacomb_dc30flux_fbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30flux_fbe060.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = deltacomb_dc30flux [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/diy220_0.2.inst.cfg b/resources/variants/diy220_0.2.inst.cfg index 3367038ad8..44b41501a6 100644 --- a/resources/variants/diy220_0.2.inst.cfg +++ b/resources/variants/diy220_0.2.inst.cfg @@ -5,7 +5,7 @@ definition = diy220 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/diy220_0.3.inst.cfg b/resources/variants/diy220_0.3.inst.cfg index 3383a1b60a..5fe14e916d 100644 --- a/resources/variants/diy220_0.3.inst.cfg +++ b/resources/variants/diy220_0.3.inst.cfg @@ -5,7 +5,7 @@ definition = diy220 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/diy220_0.4.inst.cfg b/resources/variants/diy220_0.4.inst.cfg index 5cd453b359..d718900676 100644 --- a/resources/variants/diy220_0.4.inst.cfg +++ b/resources/variants/diy220_0.4.inst.cfg @@ -5,7 +5,7 @@ definition = diy220 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/diy220_0.5.inst.cfg b/resources/variants/diy220_0.5.inst.cfg index a8652f782b..2aa1617eb9 100644 --- a/resources/variants/diy220_0.5.inst.cfg +++ b/resources/variants/diy220_0.5.inst.cfg @@ -5,7 +5,7 @@ definition = diy220 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/diy220_0.6.inst.cfg b/resources/variants/diy220_0.6.inst.cfg index 8670cc801a..4addd52900 100644 --- a/resources/variants/diy220_0.6.inst.cfg +++ b/resources/variants/diy220_0.6.inst.cfg @@ -5,7 +5,7 @@ definition = diy220 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/diy220_0.8.inst.cfg b/resources/variants/diy220_0.8.inst.cfg index df2c20a843..4c30f8cd18 100644 --- a/resources/variants/diy220_0.8.inst.cfg +++ b/resources/variants/diy220_0.8.inst.cfg @@ -5,7 +5,7 @@ definition = diy220 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/dxu_0.25.inst.cfg b/resources/variants/dxu_0.25.inst.cfg index 0510f51f66..70d4956762 100644 --- a/resources/variants/dxu_0.25.inst.cfg +++ b/resources/variants/dxu_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = dxu [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/dxu_0.4.inst.cfg b/resources/variants/dxu_0.4.inst.cfg index 68142251e8..9eca742fe1 100644 --- a/resources/variants/dxu_0.4.inst.cfg +++ b/resources/variants/dxu_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = dxu [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/dxu_0.6.inst.cfg b/resources/variants/dxu_0.6.inst.cfg index 9abeec9684..afc87f4cd2 100644 --- a/resources/variants/dxu_0.6.inst.cfg +++ b/resources/variants/dxu_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = dxu [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/dxu_0.8.inst.cfg b/resources/variants/dxu_0.8.inst.cfg index da6c70b056..34252967e6 100644 --- a/resources/variants/dxu_0.8.inst.cfg +++ b/resources/variants/dxu_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = dxu [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/dxu_dual_0.25.inst.cfg b/resources/variants/dxu_dual_0.25.inst.cfg index 580f1db266..f89c52934d 100644 --- a/resources/variants/dxu_dual_0.25.inst.cfg +++ b/resources/variants/dxu_dual_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = dxu_dual [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/dxu_dual_0.4.inst.cfg b/resources/variants/dxu_dual_0.4.inst.cfg index 18ad51a61b..e5c951e869 100644 --- a/resources/variants/dxu_dual_0.4.inst.cfg +++ b/resources/variants/dxu_dual_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = dxu_dual [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/dxu_dual_0.6.inst.cfg b/resources/variants/dxu_dual_0.6.inst.cfg index bbf1cad8b7..aa06772059 100644 --- a/resources/variants/dxu_dual_0.6.inst.cfg +++ b/resources/variants/dxu_dual_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = dxu_dual [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/dxu_dual_0.8.inst.cfg b/resources/variants/dxu_dual_0.8.inst.cfg index fcc86d6c59..6b12694573 100644 --- a/resources/variants/dxu_dual_0.8.inst.cfg +++ b/resources/variants/dxu_dual_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = dxu_dual [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_hyb35.inst.cfg b/resources/variants/fabtotum_hyb35.inst.cfg index ea4c656c03..634d20fd09 100644 --- a/resources/variants/fabtotum_hyb35.inst.cfg +++ b/resources/variants/fabtotum_hyb35.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_lite04.inst.cfg b/resources/variants/fabtotum_lite04.inst.cfg index 252b76445a..e7d584d2cf 100644 --- a/resources/variants/fabtotum_lite04.inst.cfg +++ b/resources/variants/fabtotum_lite04.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_lite06.inst.cfg b/resources/variants/fabtotum_lite06.inst.cfg index 82d820582e..1a0146e648 100644 --- a/resources/variants/fabtotum_lite06.inst.cfg +++ b/resources/variants/fabtotum_lite06.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_pro02.inst.cfg b/resources/variants/fabtotum_pro02.inst.cfg index 065e127b48..28dd514ed3 100644 --- a/resources/variants/fabtotum_pro02.inst.cfg +++ b/resources/variants/fabtotum_pro02.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_pro04.inst.cfg b/resources/variants/fabtotum_pro04.inst.cfg index c8cf31b28c..189330c14a 100644 --- a/resources/variants/fabtotum_pro04.inst.cfg +++ b/resources/variants/fabtotum_pro04.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_pro06.inst.cfg b/resources/variants/fabtotum_pro06.inst.cfg index ee2dd8d5e5..88e7e1bc36 100644 --- a/resources/variants/fabtotum_pro06.inst.cfg +++ b/resources/variants/fabtotum_pro06.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/fabtotum_pro08.inst.cfg b/resources/variants/fabtotum_pro08.inst.cfg index 3bf0e504a3..0e3b9ae55d 100644 --- a/resources/variants/fabtotum_pro08.inst.cfg +++ b/resources/variants/fabtotum_pro08.inst.cfg @@ -5,7 +5,7 @@ definition = fabtotum [metadata] author = FABtotum -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/farm2_ce_printhead_0.2.inst.cfg b/resources/variants/farm2_ce_printhead_0.2.inst.cfg new file mode 100644 index 0000000000..facddbee17 --- /dev/null +++ b/resources/variants/farm2_ce_printhead_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = PrintHead 0.2 mm +version = 4 +definition = farm2_ce + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/farm2_ce_printhead_0.3.inst.cfg b/resources/variants/farm2_ce_printhead_0.3.inst.cfg new file mode 100644 index 0000000000..3a1ba72b42 --- /dev/null +++ b/resources/variants/farm2_ce_printhead_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = PrintHead 0.3 mm +version = 4 +definition = farm2_ce + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/farm2_ce_printhead_0.4.inst.cfg b/resources/variants/farm2_ce_printhead_0.4.inst.cfg new file mode 100644 index 0000000000..083603bd53 --- /dev/null +++ b/resources/variants/farm2_ce_printhead_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = PrintHead 0.4 mm +version = 4 +definition = farm2_ce + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/farm2_ce_printhead_0.5.inst.cfg b/resources/variants/farm2_ce_printhead_0.5.inst.cfg new file mode 100644 index 0000000000..e10d3aa96b --- /dev/null +++ b/resources/variants/farm2_ce_printhead_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = PrintHead 0.5 mm +version = 4 +definition = farm2_ce + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/farm2_printhead_0.2.inst.cfg b/resources/variants/farm2_printhead_0.2.inst.cfg new file mode 100644 index 0000000000..f91f1bffa3 --- /dev/null +++ b/resources/variants/farm2_printhead_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = PrintHead 0.2 mm +version = 4 +definition = farm2 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/farm2_printhead_0.3.inst.cfg b/resources/variants/farm2_printhead_0.3.inst.cfg new file mode 100644 index 0000000000..22985e0202 --- /dev/null +++ b/resources/variants/farm2_printhead_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = PrintHead 0.3 mm +version = 4 +definition = farm2 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/farm2_printhead_0.4.inst.cfg b/resources/variants/farm2_printhead_0.4.inst.cfg new file mode 100644 index 0000000000..08767a44a0 --- /dev/null +++ b/resources/variants/farm2_printhead_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = PrintHead 0.4 mm +version = 4 +definition = farm2 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/farm2_printhead_0.5.inst.cfg b/resources/variants/farm2_printhead_0.5.inst.cfg new file mode 100644 index 0000000000..83daf92e9c --- /dev/null +++ b/resources/variants/farm2_printhead_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = PrintHead 0.5 mm +version = 4 +definition = farm2 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/felixpro2_0.25.inst.cfg b/resources/variants/felixpro2_0.25.inst.cfg index 763cdf56ba..ffa35a24ea 100644 --- a/resources/variants/felixpro2_0.25.inst.cfg +++ b/resources/variants/felixpro2_0.25.inst.cfg @@ -6,7 +6,7 @@ definition = felixpro2dual [metadata] author = pnks type = variant -setting_version = 16 +setting_version = 17 hardware_type = nozzle [values] diff --git a/resources/variants/felixpro2_0.35.inst.cfg b/resources/variants/felixpro2_0.35.inst.cfg index 33c2b42595..902a8aa699 100644 --- a/resources/variants/felixpro2_0.35.inst.cfg +++ b/resources/variants/felixpro2_0.35.inst.cfg @@ -6,7 +6,7 @@ definition = felixpro2dual [metadata] author = pnks type = variant -setting_version = 16 +setting_version = 17 hardware_type = nozzle [values] diff --git a/resources/variants/felixpro2_0.50.inst.cfg b/resources/variants/felixpro2_0.50.inst.cfg index 63c00155aa..21f5afacd5 100644 --- a/resources/variants/felixpro2_0.50.inst.cfg +++ b/resources/variants/felixpro2_0.50.inst.cfg @@ -6,7 +6,7 @@ definition = felixpro2dual [metadata] author = pnks type = variant -setting_version = 16 +setting_version = 17 hardware_type = nozzle [values] diff --git a/resources/variants/felixpro2_0.70.inst.cfg b/resources/variants/felixpro2_0.70.inst.cfg index ff4138cb32..34fdd31350 100644 --- a/resources/variants/felixpro2_0.70.inst.cfg +++ b/resources/variants/felixpro2_0.70.inst.cfg @@ -6,7 +6,7 @@ definition = felixpro2dual [metadata] author = pnks type = variant -setting_version = 16 +setting_version = 17 hardware_type = nozzle [values] diff --git a/resources/variants/felixtec4_0.25.inst.cfg b/resources/variants/felixtec4_0.25.inst.cfg index 833ed872a1..6096704613 100644 --- a/resources/variants/felixtec4_0.25.inst.cfg +++ b/resources/variants/felixtec4_0.25.inst.cfg @@ -6,7 +6,7 @@ definition = felixtec4dual [metadata] author = kerog777 type = variant -setting_version = 16 +setting_version = 17 hardware_type = nozzle [values] diff --git a/resources/variants/felixtec4_0.35.inst.cfg b/resources/variants/felixtec4_0.35.inst.cfg index ff26a8386c..1d1befb4f8 100644 --- a/resources/variants/felixtec4_0.35.inst.cfg +++ b/resources/variants/felixtec4_0.35.inst.cfg @@ -6,7 +6,7 @@ definition = felixtec4dual [metadata] author = kerog777 type = variant -setting_version = 16 +setting_version = 17 hardware_type = nozzle [values] diff --git a/resources/variants/felixtec4_0.50.inst.cfg b/resources/variants/felixtec4_0.50.inst.cfg index f03e6e1782..1bc5e2d6f7 100644 --- a/resources/variants/felixtec4_0.50.inst.cfg +++ b/resources/variants/felixtec4_0.50.inst.cfg @@ -7,7 +7,7 @@ definition = felixtec4dual author = kerog777 type = variant hardware_type = nozzle -setting_version = 16 +setting_version = 17 [values] machine_nozzle_size = 0.5 diff --git a/resources/variants/felixtec4_0.70.inst.cfg b/resources/variants/felixtec4_0.70.inst.cfg index c7a435de52..6de8e30ccc 100644 --- a/resources/variants/felixtec4_0.70.inst.cfg +++ b/resources/variants/felixtec4_0.70.inst.cfg @@ -7,7 +7,7 @@ definition = felixtec4dual author = kerog777 type = variant hardware_type = nozzle -setting_version = 16 +setting_version = 17 [values] machine_nozzle_size = 0.70 diff --git a/resources/variants/flashforge_base_0.20.inst.cfg b/resources/variants/flashforge_base_0.20.inst.cfg new file mode 100644 index 0000000000..a10532e1ac --- /dev/null +++ b/resources/variants/flashforge_base_0.20.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = flashforge_base + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/flashforge_base_0.30.inst.cfg b/resources/variants/flashforge_base_0.30.inst.cfg new file mode 100644 index 0000000000..9c75015dcd --- /dev/null +++ b/resources/variants/flashforge_base_0.30.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = flashforge_base + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/flashforge_base_0.40.inst.cfg b/resources/variants/flashforge_base_0.40.inst.cfg new file mode 100644 index 0000000000..7e1b24cc3e --- /dev/null +++ b/resources/variants/flashforge_base_0.40.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = flashforge_base + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/flashforge_base_0.50.inst.cfg b/resources/variants/flashforge_base_0.50.inst.cfg new file mode 100644 index 0000000000..eb76c9b071 --- /dev/null +++ b/resources/variants/flashforge_base_0.50.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = flashforge_base + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/flashforge_base_0.60.inst.cfg b/resources/variants/flashforge_base_0.60.inst.cfg new file mode 100644 index 0000000000..6f9c995ef2 --- /dev/null +++ b/resources/variants/flashforge_base_0.60.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = flashforge_base + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/flashforge_dreamer_nx_0.20.inst.cfg b/resources/variants/flashforge_dreamer_nx_0.20.inst.cfg new file mode 100644 index 0000000000..77b8c464ad --- /dev/null +++ b/resources/variants/flashforge_dreamer_nx_0.20.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = flashforge_dreamer_nx + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/flashforge_dreamer_nx_0.30.inst.cfg b/resources/variants/flashforge_dreamer_nx_0.30.inst.cfg new file mode 100644 index 0000000000..9d6e70a258 --- /dev/null +++ b/resources/variants/flashforge_dreamer_nx_0.30.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = flashforge_dreamer_nx + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/flashforge_dreamer_nx_0.40.inst.cfg b/resources/variants/flashforge_dreamer_nx_0.40.inst.cfg new file mode 100644 index 0000000000..cf07236a10 --- /dev/null +++ b/resources/variants/flashforge_dreamer_nx_0.40.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = flashforge_dreamer_nx + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/flashforge_dreamer_nx_0.50.inst.cfg b/resources/variants/flashforge_dreamer_nx_0.50.inst.cfg new file mode 100644 index 0000000000..301454e826 --- /dev/null +++ b/resources/variants/flashforge_dreamer_nx_0.50.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = flashforge_dreamer_nx + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/flashforge_dreamer_nx_0.60.inst.cfg b/resources/variants/flashforge_dreamer_nx_0.60.inst.cfg new file mode 100644 index 0000000000..a8d2cf6ca7 --- /dev/null +++ b/resources/variants/flashforge_dreamer_nx_0.60.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = flashforge_dreamer_nx + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/flyingbear_base_0.25.inst.cfg b/resources/variants/flyingbear_base_0.25.inst.cfg index e711748c47..b97f3c9bb6 100644 --- a/resources/variants/flyingbear_base_0.25.inst.cfg +++ b/resources/variants/flyingbear_base_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/flyingbear_base_0.30.inst.cfg b/resources/variants/flyingbear_base_0.30.inst.cfg index a0d14904f1..8fef3d34fd 100644 --- a/resources/variants/flyingbear_base_0.30.inst.cfg +++ b/resources/variants/flyingbear_base_0.30.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/flyingbear_base_0.40.inst.cfg b/resources/variants/flyingbear_base_0.40.inst.cfg index e3040c7861..02b28e9271 100644 --- a/resources/variants/flyingbear_base_0.40.inst.cfg +++ b/resources/variants/flyingbear_base_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/flyingbear_base_0.50.inst.cfg b/resources/variants/flyingbear_base_0.50.inst.cfg index bcf9f6849b..ad70b64a3c 100644 --- a/resources/variants/flyingbear_base_0.50.inst.cfg +++ b/resources/variants/flyingbear_base_0.50.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/flyingbear_base_0.60.inst.cfg b/resources/variants/flyingbear_base_0.60.inst.cfg index ad18520034..f4a572320f 100644 --- a/resources/variants/flyingbear_base_0.60.inst.cfg +++ b/resources/variants/flyingbear_base_0.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/flyingbear_base_0.80.inst.cfg b/resources/variants/flyingbear_base_0.80.inst.cfg index 1f163e76f4..a24888e9b1 100644 --- a/resources/variants/flyingbear_base_0.80.inst.cfg +++ b/resources/variants/flyingbear_base_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = flyingbear_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/flyingbear_ghost_4s_0.25.inst.cfg b/resources/variants/flyingbear_ghost_4s_0.25.inst.cfg index 92753a8518..a0ba6ff2d9 100644 --- a/resources/variants/flyingbear_ghost_4s_0.25.inst.cfg +++ b/resources/variants/flyingbear_ghost_4s_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = flyingbear_ghost_4s [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/flyingbear_ghost_4s_0.30.inst.cfg b/resources/variants/flyingbear_ghost_4s_0.30.inst.cfg index f8d079d3f8..9d9e7e3bd5 100644 --- a/resources/variants/flyingbear_ghost_4s_0.30.inst.cfg +++ b/resources/variants/flyingbear_ghost_4s_0.30.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = flyingbear_ghost_4s [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/flyingbear_ghost_4s_0.40.inst.cfg b/resources/variants/flyingbear_ghost_4s_0.40.inst.cfg index 2120ffe136..a6a2e36e04 100644 --- a/resources/variants/flyingbear_ghost_4s_0.40.inst.cfg +++ b/resources/variants/flyingbear_ghost_4s_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = flyingbear_ghost_4s [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/flyingbear_ghost_4s_0.50.inst.cfg b/resources/variants/flyingbear_ghost_4s_0.50.inst.cfg index 732f1978c6..2310884cdb 100644 --- a/resources/variants/flyingbear_ghost_4s_0.50.inst.cfg +++ b/resources/variants/flyingbear_ghost_4s_0.50.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = flyingbear_ghost_4s [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/flyingbear_ghost_4s_0.60.inst.cfg b/resources/variants/flyingbear_ghost_4s_0.60.inst.cfg index 6221d4ecfd..eb837be06b 100644 --- a/resources/variants/flyingbear_ghost_4s_0.60.inst.cfg +++ b/resources/variants/flyingbear_ghost_4s_0.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = flyingbear_ghost_4s [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/flyingbear_ghost_4s_0.80.inst.cfg b/resources/variants/flyingbear_ghost_4s_0.80.inst.cfg index 0ffd08ae99..ddb597bc82 100644 --- a/resources/variants/flyingbear_ghost_4s_0.80.inst.cfg +++ b/resources/variants/flyingbear_ghost_4s_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = flyingbear_ghost_4s [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/flyingbear_ghost_5_0.25.inst.cfg b/resources/variants/flyingbear_ghost_5_0.25.inst.cfg index 6d9ce09593..3cd7d13ede 100644 --- a/resources/variants/flyingbear_ghost_5_0.25.inst.cfg +++ b/resources/variants/flyingbear_ghost_5_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = flyingbear_ghost_5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/flyingbear_ghost_5_0.30.inst.cfg b/resources/variants/flyingbear_ghost_5_0.30.inst.cfg index 73242fa5c3..670b47a3a9 100644 --- a/resources/variants/flyingbear_ghost_5_0.30.inst.cfg +++ b/resources/variants/flyingbear_ghost_5_0.30.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = flyingbear_ghost_5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/flyingbear_ghost_5_0.40.inst.cfg b/resources/variants/flyingbear_ghost_5_0.40.inst.cfg index fed24fe90c..d6ae55ce8f 100644 --- a/resources/variants/flyingbear_ghost_5_0.40.inst.cfg +++ b/resources/variants/flyingbear_ghost_5_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = flyingbear_ghost_5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/flyingbear_ghost_5_0.50.inst.cfg b/resources/variants/flyingbear_ghost_5_0.50.inst.cfg index 2992349a44..11977cfe41 100644 --- a/resources/variants/flyingbear_ghost_5_0.50.inst.cfg +++ b/resources/variants/flyingbear_ghost_5_0.50.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = flyingbear_ghost_5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/flyingbear_ghost_5_0.60.inst.cfg b/resources/variants/flyingbear_ghost_5_0.60.inst.cfg index ec95cf5210..2b38cc45d2 100644 --- a/resources/variants/flyingbear_ghost_5_0.60.inst.cfg +++ b/resources/variants/flyingbear_ghost_5_0.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = flyingbear_ghost_5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/flyingbear_ghost_5_0.80.inst.cfg b/resources/variants/flyingbear_ghost_5_0.80.inst.cfg index b594dcae2a..4152ee0834 100644 --- a/resources/variants/flyingbear_ghost_5_0.80.inst.cfg +++ b/resources/variants/flyingbear_ghost_5_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = flyingbear_ghost_5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_025_e3d.inst.cfg b/resources/variants/gmax15plus_025_e3d.inst.cfg index cd48798bc0..8fe0a594c8 100644 --- a/resources/variants/gmax15plus_025_e3d.inst.cfg +++ b/resources/variants/gmax15plus_025_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_04_e3d.inst.cfg b/resources/variants/gmax15plus_04_e3d.inst.cfg index bc99c90da1..f12e4e5b4f 100644 --- a/resources/variants/gmax15plus_04_e3d.inst.cfg +++ b/resources/variants/gmax15plus_04_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_05_e3d.inst.cfg b/resources/variants/gmax15plus_05_e3d.inst.cfg index aecf141b49..14a0fce0b0 100644 --- a/resources/variants/gmax15plus_05_e3d.inst.cfg +++ b/resources/variants/gmax15plus_05_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_05_jhead.inst.cfg b/resources/variants/gmax15plus_05_jhead.inst.cfg index 3d1f2f1307..ee0193f8f8 100644 --- a/resources/variants/gmax15plus_05_jhead.inst.cfg +++ b/resources/variants/gmax15plus_05_jhead.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_06_e3d.inst.cfg b/resources/variants/gmax15plus_06_e3d.inst.cfg index 02345948a1..4c61b44d7f 100644 --- a/resources/variants/gmax15plus_06_e3d.inst.cfg +++ b/resources/variants/gmax15plus_06_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_08_e3d.inst.cfg b/resources/variants/gmax15plus_08_e3d.inst.cfg index d75fca5dbb..8bb3241e4b 100644 --- a/resources/variants/gmax15plus_08_e3d.inst.cfg +++ b/resources/variants/gmax15plus_08_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_10_jhead.inst.cfg b/resources/variants/gmax15plus_10_jhead.inst.cfg index ffd1a00b6f..30ef83b314 100644 --- a/resources/variants/gmax15plus_10_jhead.inst.cfg +++ b/resources/variants/gmax15plus_10_jhead.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_12_e3d.inst.cfg b/resources/variants/gmax15plus_12_e3d.inst.cfg index 6b3c73ea0d..14e80a2686 100644 --- a/resources/variants/gmax15plus_12_e3d.inst.cfg +++ b/resources/variants/gmax15plus_12_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus [metadata] author = gcreate -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_025_e3d.inst.cfg b/resources/variants/gmax15plus_dual_025_e3d.inst.cfg index 86a5b71bdb..039b04188f 100644 --- a/resources/variants/gmax15plus_dual_025_e3d.inst.cfg +++ b/resources/variants/gmax15plus_dual_025_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_04_e3d.inst.cfg b/resources/variants/gmax15plus_dual_04_e3d.inst.cfg index 0fd1259a62..32983577fc 100644 --- a/resources/variants/gmax15plus_dual_04_e3d.inst.cfg +++ b/resources/variants/gmax15plus_dual_04_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_05_e3d.inst.cfg b/resources/variants/gmax15plus_dual_05_e3d.inst.cfg index 260be14d8a..0d2d5faf77 100644 --- a/resources/variants/gmax15plus_dual_05_e3d.inst.cfg +++ b/resources/variants/gmax15plus_dual_05_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_05_jhead.inst.cfg b/resources/variants/gmax15plus_dual_05_jhead.inst.cfg index 2c6877b0cf..41dbed4f34 100644 --- a/resources/variants/gmax15plus_dual_05_jhead.inst.cfg +++ b/resources/variants/gmax15plus_dual_05_jhead.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_06_e3d.inst.cfg b/resources/variants/gmax15plus_dual_06_e3d.inst.cfg index 79754c2703..d44d3f9afe 100644 --- a/resources/variants/gmax15plus_dual_06_e3d.inst.cfg +++ b/resources/variants/gmax15plus_dual_06_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_08_e3d.inst.cfg b/resources/variants/gmax15plus_dual_08_e3d.inst.cfg index ffc85d545f..55e33e7d87 100644 --- a/resources/variants/gmax15plus_dual_08_e3d.inst.cfg +++ b/resources/variants/gmax15plus_dual_08_e3d.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/gmax15plus_dual_10_jhead.inst.cfg b/resources/variants/gmax15plus_dual_10_jhead.inst.cfg index 09580b8bd1..ed51574195 100644 --- a/resources/variants/gmax15plus_dual_10_jhead.inst.cfg +++ b/resources/variants/gmax15plus_dual_10_jhead.inst.cfg @@ -5,7 +5,7 @@ definition = gmax15plus_dual [metadata] author = gcreate -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/hms434_0.4tpnozzle.inst.cfg b/resources/variants/hms434_0.4tpnozzle.inst.cfg index 0d8290260c..8ebc916682 100644 --- a/resources/variants/hms434_0.4tpnozzle.inst.cfg +++ b/resources/variants/hms434_0.4tpnozzle.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = hms434 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/hms434_0.8tpnozzle.inst.cfg b/resources/variants/hms434_0.8tpnozzle.inst.cfg index d5181dfa10..81a9b1a71f 100644 --- a/resources/variants/hms434_0.8tpnozzle.inst.cfg +++ b/resources/variants/hms434_0.8tpnozzle.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = hms434 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/imade3d_jellybox_0.4.inst.cfg b/resources/variants/imade3d_jellybox_0.4.inst.cfg index 0563c5bab5..685d0e684f 100644 --- a/resources/variants/imade3d_jellybox_0.4.inst.cfg +++ b/resources/variants/imade3d_jellybox_0.4.inst.cfg @@ -5,7 +5,7 @@ definition = imade3d_jellybox [metadata] author = IMADE3D -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/imade3d_jellybox_2_0.4.inst.cfg b/resources/variants/imade3d_jellybox_2_0.4.inst.cfg index 930b22d397..3c1f74215d 100644 --- a/resources/variants/imade3d_jellybox_2_0.4.inst.cfg +++ b/resources/variants/imade3d_jellybox_2_0.4.inst.cfg @@ -5,7 +5,7 @@ definition = imade3d_jellybox_2 [metadata] author = IMADE3D -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/kosher220_0.2.inst.cfg b/resources/variants/kosher220_0.2.inst.cfg new file mode 100644 index 0000000000..1d5ed207d0 --- /dev/null +++ b/resources/variants/kosher220_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.2 mm Nozzle +version = 4 +definition = kosher + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/kosher220_0.3.inst.cfg b/resources/variants/kosher220_0.3.inst.cfg new file mode 100644 index 0000000000..48d0d91b0a --- /dev/null +++ b/resources/variants/kosher220_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.3 mm Nozzle +version = 4 +definition = kosher + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/kosher220_0.4.inst.cfg b/resources/variants/kosher220_0.4.inst.cfg new file mode 100644 index 0000000000..fe752c461c --- /dev/null +++ b/resources/variants/kosher220_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = kosher + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/kosher220_0.5.inst.cfg b/resources/variants/kosher220_0.5.inst.cfg new file mode 100644 index 0000000000..05ec490fef --- /dev/null +++ b/resources/variants/kosher220_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.5 mm Nozzle +version = 4 +definition = kosher + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/kosher220_0.6.inst.cfg b/resources/variants/kosher220_0.6.inst.cfg new file mode 100644 index 0000000000..07c810e564 --- /dev/null +++ b/resources/variants/kosher220_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = kosher + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/kosher220_0.8.inst.cfg b/resources/variants/kosher220_0.8.inst.cfg new file mode 100644 index 0000000000..395a34c06c --- /dev/null +++ b/resources/variants/kosher220_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = kosher + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/kosher220_dm_0.2.inst.cfg b/resources/variants/kosher220_dm_0.2.inst.cfg new file mode 100644 index 0000000000..fbf3c6c068 --- /dev/null +++ b/resources/variants/kosher220_dm_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.2 mm Nozzle +version = 4 +definition = kosher_duplication + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/kosher220_dm_0.3.inst.cfg b/resources/variants/kosher220_dm_0.3.inst.cfg new file mode 100644 index 0000000000..b7ccfe6afe --- /dev/null +++ b/resources/variants/kosher220_dm_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.3 mm Nozzle +version = 4 +definition = kosher_duplication + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/kosher220_dm_0.4.inst.cfg b/resources/variants/kosher220_dm_0.4.inst.cfg new file mode 100644 index 0000000000..ba26017c8d --- /dev/null +++ b/resources/variants/kosher220_dm_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = kosher_duplication + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/kosher220_dm_0.5.inst.cfg b/resources/variants/kosher220_dm_0.5.inst.cfg new file mode 100644 index 0000000000..d3eb116228 --- /dev/null +++ b/resources/variants/kosher220_dm_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.5 mm Nozzle +version = 4 +definition = kosher_duplication + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/kosher220_dm_0.6.inst.cfg b/resources/variants/kosher220_dm_0.6.inst.cfg new file mode 100644 index 0000000000..15ec258ec6 --- /dev/null +++ b/resources/variants/kosher220_dm_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = kosher_duplication + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/kosher220_dm_0.8.inst.cfg b/resources/variants/kosher220_dm_0.8.inst.cfg new file mode 100644 index 0000000000..aa1ffc1a81 --- /dev/null +++ b/resources/variants/kosher220_dm_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = kosher_duplication + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/kosher220_mm_0.2.inst.cfg b/resources/variants/kosher220_mm_0.2.inst.cfg new file mode 100644 index 0000000000..6d38bb983d --- /dev/null +++ b/resources/variants/kosher220_mm_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.2 mm Nozzle +version = 4 +definition = kosher_mirror + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/kosher220_mm_0.3.inst.cfg b/resources/variants/kosher220_mm_0.3.inst.cfg new file mode 100644 index 0000000000..e2b68f8c3a --- /dev/null +++ b/resources/variants/kosher220_mm_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.3 mm Nozzle +version = 4 +definition = kosher_mirror + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/kosher220_mm_0.4.inst.cfg b/resources/variants/kosher220_mm_0.4.inst.cfg new file mode 100644 index 0000000000..337ca8a37e --- /dev/null +++ b/resources/variants/kosher220_mm_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.4 mm Nozzle +version = 4 +definition = kosher_mirror + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/kosher220_mm_0.5.inst.cfg b/resources/variants/kosher220_mm_0.5.inst.cfg new file mode 100644 index 0000000000..82c2fc0733 --- /dev/null +++ b/resources/variants/kosher220_mm_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.5 mm Nozzle +version = 4 +definition = kosher_mirror + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/kosher220_mm_0.6.inst.cfg b/resources/variants/kosher220_mm_0.6.inst.cfg new file mode 100644 index 0000000000..25b9050866 --- /dev/null +++ b/resources/variants/kosher220_mm_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.6 mm Nozzle +version = 4 +definition = kosher_mirror + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/kosher220_mm_0.8.inst.cfg b/resources/variants/kosher220_mm_0.8.inst.cfg new file mode 100644 index 0000000000..cbb90c66c1 --- /dev/null +++ b/resources/variants/kosher220_mm_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.8 mm Nozzle +version = 4 +definition = kosher_mirror + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/kosher220_pva_0.2.inst.cfg b/resources/variants/kosher220_pva_0.2.inst.cfg new file mode 100644 index 0000000000..213896e6f4 --- /dev/null +++ b/resources/variants/kosher220_pva_0.2.inst.cfg @@ -0,0 +1,32 @@ +[general] +name = PVA 0.2 mm Nozzle +version = 4 +definition = kosher + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_offset = 3 +support_bottom_height = =layer_height * 2 +support_bottom_pattern = zigzag +support_bottom_stair_step_height = =layer_height +support_infill_rate = 50 +support_interface_enable = True +support_interface_height = =layer_height * 5 +support_interface_skip_height = =layer_height +support_join_distance = 3 +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_angle = 45 +support_pattern = triangles +support_use_towers = False +support_z_distance = 0 +gradual_support_infill_steps = 2 +support_interface_density = 100 +support_interface_pattern = concentric \ No newline at end of file diff --git a/resources/variants/kosher220_pva_0.3.inst.cfg b/resources/variants/kosher220_pva_0.3.inst.cfg new file mode 100644 index 0000000000..b2ae8fe4ec --- /dev/null +++ b/resources/variants/kosher220_pva_0.3.inst.cfg @@ -0,0 +1,32 @@ +[general] +name = PVA 0.3 mm Nozzle +version = 4 +definition = kosher_duplication + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_offset = 3 +support_bottom_height = =layer_height * 2 +support_bottom_pattern = zigzag +support_bottom_stair_step_height = =layer_height +support_infill_rate = 50 +support_interface_enable = True +support_interface_height = =layer_height * 5 +support_interface_skip_height = =layer_height +support_join_distance = 3 +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_angle = 45 +support_pattern = triangles +support_use_towers = False +support_z_distance = 0 +gradual_support_infill_steps = 2 +support_interface_density = 100 +support_interface_pattern = concentric \ No newline at end of file diff --git a/resources/variants/kosher220_pva_0.4.inst.cfg b/resources/variants/kosher220_pva_0.4.inst.cfg new file mode 100644 index 0000000000..4412c274f0 --- /dev/null +++ b/resources/variants/kosher220_pva_0.4.inst.cfg @@ -0,0 +1,32 @@ +[general] +name = PVA 0.4 mm Nozzle +version = 4 +definition = kosher + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_offset = 3 +support_bottom_height = =layer_height * 2 +support_bottom_pattern = zigzag +support_bottom_stair_step_height = =layer_height +support_infill_rate = 50 +support_interface_enable = True +support_interface_height = =layer_height * 5 +support_interface_skip_height = =layer_height +support_join_distance = 3 +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_angle = 45 +support_pattern = triangles +support_use_towers = False +support_z_distance = 0 +gradual_support_infill_steps = 2 +support_interface_density = 100 +support_interface_pattern = concentric \ No newline at end of file diff --git a/resources/variants/kosher220_pva_0.5.inst.cfg b/resources/variants/kosher220_pva_0.5.inst.cfg new file mode 100644 index 0000000000..95297ec961 --- /dev/null +++ b/resources/variants/kosher220_pva_0.5.inst.cfg @@ -0,0 +1,32 @@ +[general] +name = PVA 0.5 mm Nozzle +version = 4 +definition = kosher + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_offset = 3 +support_bottom_height = =layer_height * 2 +support_bottom_pattern = zigzag +support_bottom_stair_step_height = =layer_height +support_infill_rate = 50 +support_interface_enable = True +support_interface_height = =layer_height * 5 +support_interface_skip_height = =layer_height +support_join_distance = 3 +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_angle = 45 +support_pattern = triangles +support_use_towers = False +support_z_distance = 0 +gradual_support_infill_steps = 2 +support_interface_density = 100 +support_interface_pattern = concentric \ No newline at end of file diff --git a/resources/variants/kosher220_pva_0.6.inst.cfg b/resources/variants/kosher220_pva_0.6.inst.cfg new file mode 100644 index 0000000000..5174be95ab --- /dev/null +++ b/resources/variants/kosher220_pva_0.6.inst.cfg @@ -0,0 +1,32 @@ +[general] +name = PVA 0.6 mm Nozzle +version = 4 +definition = kosher + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_offset = 3 +support_bottom_height = =layer_height * 2 +support_bottom_pattern = zigzag +support_bottom_stair_step_height = =layer_height +support_infill_rate = 50 +support_interface_enable = True +support_interface_height = =layer_height * 5 +support_interface_skip_height = =layer_height +support_join_distance = 3 +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_angle = 45 +support_pattern = triangles +support_use_towers = False +support_z_distance = 0 +gradual_support_infill_steps = 2 +support_interface_density = 100 +support_interface_pattern = concentric \ No newline at end of file diff --git a/resources/variants/kosher220_pva_0.8.inst.cfg b/resources/variants/kosher220_pva_0.8.inst.cfg new file mode 100644 index 0000000000..aad1058ce8 --- /dev/null +++ b/resources/variants/kosher220_pva_0.8.inst.cfg @@ -0,0 +1,32 @@ +[general] +name = PVA 0.8 mm Nozzle +version = 4 +definition = kosher + +[metadata] + +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_offset = 3 +support_bottom_height = =layer_height * 2 +support_bottom_pattern = zigzag +support_bottom_stair_step_height = =layer_height +support_infill_rate = 50 +support_interface_enable = True +support_interface_height = =layer_height * 5 +support_interface_skip_height = =layer_height +support_join_distance = 3 +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 +support_angle = 45 +support_pattern = triangles +support_use_towers = False +support_z_distance = 0 +gradual_support_infill_steps = 2 +support_interface_density = 100 +support_interface_pattern = concentric \ No newline at end of file diff --git a/resources/variants/liquid_vo04.inst.cfg b/resources/variants/liquid_vo04.inst.cfg index 3b8c3d5c80..b1fd741cc7 100644 --- a/resources/variants/liquid_vo04.inst.cfg +++ b/resources/variants/liquid_vo04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle @@ -23,7 +23,7 @@ raft_interface_thickness = =layer_height * 1.5 raft_jerk = =jerk_print raft_margin = 15 raft_surface_layers = 2 -retraction_amount = 5 +retraction_amount = 3 retraction_count_max = 25 retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed diff --git a/resources/variants/liquid_vo06.inst.cfg b/resources/variants/liquid_vo06.inst.cfg index daa6f36295..6413394364 100644 --- a/resources/variants/liquid_vo06.inst.cfg +++ b/resources/variants/liquid_vo06.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/liquid_vo08.inst.cfg b/resources/variants/liquid_vo08.inst.cfg index f6e17067e0..46172aa3e8 100644 --- a/resources/variants/liquid_vo08.inst.cfg +++ b/resources/variants/liquid_vo08.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = liquid [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle @@ -40,7 +40,7 @@ multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_wipe_enabled = True retract_at_layer_change = =not magic_spiralize -retraction_amount = 5 +retraction_amount = 3 retraction_count_max = 25 retraction_extrusion_window = 1 retraction_hop = 2 diff --git a/resources/variants/longer/longer_base_0.4.inst.cfg b/resources/variants/longer/longer_base_0.4.inst.cfg new file mode 100644 index 0000000000..98ed064a29 --- /dev/null +++ b/resources/variants/longer/longer_base_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = longer_base + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/longer/longer_cube2_0.4.inst.cfg b/resources/variants/longer/longer_cube2_0.4.inst.cfg new file mode 100644 index 0000000000..2ffc9bddb9 --- /dev/null +++ b/resources/variants/longer/longer_cube2_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = longer_cube2 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/longer/longer_lk1_0.4.inst.cfg b/resources/variants/longer/longer_lk1_0.4.inst.cfg new file mode 100644 index 0000000000..adb124aeb9 --- /dev/null +++ b/resources/variants/longer/longer_lk1_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = longer_lk1 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/longer/longer_lk1plus_0.4.inst.cfg b/resources/variants/longer/longer_lk1plus_0.4.inst.cfg new file mode 100644 index 0000000000..1fcc80d9e4 --- /dev/null +++ b/resources/variants/longer/longer_lk1plus_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = longer_lk1plus + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/longer/longer_lk1pro_0.4.inst.cfg b/resources/variants/longer/longer_lk1pro_0.4.inst.cfg new file mode 100644 index 0000000000..4bf91d46a8 --- /dev/null +++ b/resources/variants/longer/longer_lk1pro_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = longer_lk1pro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/longer/longer_lk4_0.4.inst.cfg b/resources/variants/longer/longer_lk4_0.4.inst.cfg new file mode 100644 index 0000000000..865d75a5ca --- /dev/null +++ b/resources/variants/longer/longer_lk4_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = longer_lk4 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/longer/longer_lk4pro_0.4.inst.cfg b/resources/variants/longer/longer_lk4pro_0.4.inst.cfg new file mode 100644 index 0000000000..51b21d8e92 --- /dev/null +++ b/resources/variants/longer/longer_lk4pro_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = longer_lk4pro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/longer/longer_lk5_0.4.inst.cfg b/resources/variants/longer/longer_lk5_0.4.inst.cfg new file mode 100644 index 0000000000..fb5abf137e --- /dev/null +++ b/resources/variants/longer/longer_lk5_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = longer_lk5 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/longer/longer_lk5pro_0.4.inst.cfg b/resources/variants/longer/longer_lk5pro_0.4.inst.cfg new file mode 100644 index 0000000000..b91a77149a --- /dev/null +++ b/resources/variants/longer/longer_lk5pro_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = longer_lk5pro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/mingda_base_0.2.inst.cfg b/resources/variants/mingda_base_0.2.inst.cfg new file mode 100644 index 0000000000..36e4d8acd2 --- /dev/null +++ b/resources/variants/mingda_base_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = mingda_base + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/mingda_base_0.3.inst.cfg b/resources/variants/mingda_base_0.3.inst.cfg new file mode 100644 index 0000000000..15408e7443 --- /dev/null +++ b/resources/variants/mingda_base_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = mingda_base + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/mingda_base_0.4.inst.cfg b/resources/variants/mingda_base_0.4.inst.cfg new file mode 100644 index 0000000000..557ff156db --- /dev/null +++ b/resources/variants/mingda_base_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = mingda_base + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/mingda_base_0.6.inst.cfg b/resources/variants/mingda_base_0.6.inst.cfg new file mode 100644 index 0000000000..e09e6ff98d --- /dev/null +++ b/resources/variants/mingda_base_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = mingda_base + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/mingda_base_0.8.inst.cfg b/resources/variants/mingda_base_0.8.inst.cfg new file mode 100644 index 0000000000..bdefe68587 --- /dev/null +++ b/resources/variants/mingda_base_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = mingda_base + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/mingda_base_1.0.inst.cfg b/resources/variants/mingda_base_1.0.inst.cfg new file mode 100644 index 0000000000..59c42ada30 --- /dev/null +++ b/resources/variants/mingda_base_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = mingda_base + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/mingda_d2_0.2.inst.cfg b/resources/variants/mingda_d2_0.2.inst.cfg new file mode 100644 index 0000000000..5cbe0917bd --- /dev/null +++ b/resources/variants/mingda_d2_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = mingda_d2 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/mingda_d2_0.3.inst.cfg b/resources/variants/mingda_d2_0.3.inst.cfg new file mode 100644 index 0000000000..8a26f8b187 --- /dev/null +++ b/resources/variants/mingda_d2_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = mingda_d2 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/mingda_d2_0.4.inst.cfg b/resources/variants/mingda_d2_0.4.inst.cfg new file mode 100644 index 0000000000..27dd22ee4a --- /dev/null +++ b/resources/variants/mingda_d2_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = mingda_d2 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/mingda_d2_0.5.inst.cfg b/resources/variants/mingda_d2_0.5.inst.cfg new file mode 100644 index 0000000000..0cc9173deb --- /dev/null +++ b/resources/variants/mingda_d2_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = mingda_d2 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/mingda_d2_0.6.inst.cfg b/resources/variants/mingda_d2_0.6.inst.cfg new file mode 100644 index 0000000000..faba5e8bfc --- /dev/null +++ b/resources/variants/mingda_d2_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = mingda_d2 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/mingda_d2_0.8.inst.cfg b/resources/variants/mingda_d2_0.8.inst.cfg new file mode 100644 index 0000000000..912d1ee05a --- /dev/null +++ b/resources/variants/mingda_d2_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = mingda_d2 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/mingda_d2_1.0.inst.cfg b/resources/variants/mingda_d2_1.0.inst.cfg new file mode 100644 index 0000000000..866741c530 --- /dev/null +++ b/resources/variants/mingda_d2_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = mingda_d2 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/mingda_d3pro_0.2.inst.cfg b/resources/variants/mingda_d3pro_0.2.inst.cfg new file mode 100644 index 0000000000..c007fbe54a --- /dev/null +++ b/resources/variants/mingda_d3pro_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = mingda_d3pro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/mingda_d3pro_0.3.inst.cfg b/resources/variants/mingda_d3pro_0.3.inst.cfg new file mode 100644 index 0000000000..c22782ef29 --- /dev/null +++ b/resources/variants/mingda_d3pro_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = mingda_d3pro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/mingda_d3pro_0.4.inst.cfg b/resources/variants/mingda_d3pro_0.4.inst.cfg new file mode 100644 index 0000000000..e50ee0f059 --- /dev/null +++ b/resources/variants/mingda_d3pro_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = mingda_d3pro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/mingda_d3pro_0.5.inst.cfg b/resources/variants/mingda_d3pro_0.5.inst.cfg new file mode 100644 index 0000000000..31c3f3b0ad --- /dev/null +++ b/resources/variants/mingda_d3pro_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = mingda_d3pro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/mingda_d3pro_0.6.inst.cfg b/resources/variants/mingda_d3pro_0.6.inst.cfg new file mode 100644 index 0000000000..6d2447f423 --- /dev/null +++ b/resources/variants/mingda_d3pro_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = mingda_d3pro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/mingda_d3pro_0.8.inst.cfg b/resources/variants/mingda_d3pro_0.8.inst.cfg new file mode 100644 index 0000000000..ac8477e9a0 --- /dev/null +++ b/resources/variants/mingda_d3pro_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = mingda_d3pro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/mingda_d3pro_1.0.inst.cfg b/resources/variants/mingda_d3pro_1.0.inst.cfg new file mode 100644 index 0000000000..c1420260c0 --- /dev/null +++ b/resources/variants/mingda_d3pro_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = mingda_d3pro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/mingda_d4pro_0.2.inst.cfg b/resources/variants/mingda_d4pro_0.2.inst.cfg new file mode 100644 index 0000000000..908ffdfb9b --- /dev/null +++ b/resources/variants/mingda_d4pro_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = mingda_d4pro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/mingda_d4pro_0.3.inst.cfg b/resources/variants/mingda_d4pro_0.3.inst.cfg new file mode 100644 index 0000000000..00b6992481 --- /dev/null +++ b/resources/variants/mingda_d4pro_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = mingda_d4pro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/mingda_d4pro_0.4.inst.cfg b/resources/variants/mingda_d4pro_0.4.inst.cfg new file mode 100644 index 0000000000..dbc6beacf4 --- /dev/null +++ b/resources/variants/mingda_d4pro_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = mingda_d4pro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/mingda_d4pro_0.5.inst.cfg b/resources/variants/mingda_d4pro_0.5.inst.cfg new file mode 100644 index 0000000000..b175a8f12f --- /dev/null +++ b/resources/variants/mingda_d4pro_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = mingda_d4pro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/mingda_d4pro_0.6.inst.cfg b/resources/variants/mingda_d4pro_0.6.inst.cfg new file mode 100644 index 0000000000..3c017bbf6a --- /dev/null +++ b/resources/variants/mingda_d4pro_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = mingda_d4pro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/mingda_d4pro_0.8.inst.cfg b/resources/variants/mingda_d4pro_0.8.inst.cfg new file mode 100644 index 0000000000..f6000f72c0 --- /dev/null +++ b/resources/variants/mingda_d4pro_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = mingda_d4pro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/mingda_d4pro_1.0.inst.cfg b/resources/variants/mingda_d4pro_1.0.inst.cfg new file mode 100644 index 0000000000..bc2c329532 --- /dev/null +++ b/resources/variants/mingda_d4pro_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = mingda_d4pro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/mingda_rock3_0.2.inst.cfg b/resources/variants/mingda_rock3_0.2.inst.cfg new file mode 100644 index 0000000000..14647c0ba5 --- /dev/null +++ b/resources/variants/mingda_rock3_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = mingda_rock3 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/mingda_rock3_0.3.inst.cfg b/resources/variants/mingda_rock3_0.3.inst.cfg new file mode 100644 index 0000000000..bb4b928d78 --- /dev/null +++ b/resources/variants/mingda_rock3_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = mingda_rock3 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/mingda_rock3_0.4.inst.cfg b/resources/variants/mingda_rock3_0.4.inst.cfg new file mode 100644 index 0000000000..1972f8da93 --- /dev/null +++ b/resources/variants/mingda_rock3_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = mingda_rock3 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/mingda_rock3_0.5.inst.cfg b/resources/variants/mingda_rock3_0.5.inst.cfg new file mode 100644 index 0000000000..843f80bc4a --- /dev/null +++ b/resources/variants/mingda_rock3_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = mingda_rock3 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/mingda_rock3_0.6.inst.cfg b/resources/variants/mingda_rock3_0.6.inst.cfg new file mode 100644 index 0000000000..647691d2c4 --- /dev/null +++ b/resources/variants/mingda_rock3_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = mingda_rock3 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/mingda_rock3_0.8.inst.cfg b/resources/variants/mingda_rock3_0.8.inst.cfg new file mode 100644 index 0000000000..cb21d8b907 --- /dev/null +++ b/resources/variants/mingda_rock3_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = mingda_rock3 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/mingda_rock3_1.0.inst.cfg b/resources/variants/mingda_rock3_1.0.inst.cfg new file mode 100644 index 0000000000..1f6213b528 --- /dev/null +++ b/resources/variants/mingda_rock3_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = mingda_rock3 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/nwa3d_a31_04.inst.cfg b/resources/variants/nwa3d_a31_04.inst.cfg index 6c8fade8c7..49bf32b998 100644 --- a/resources/variants/nwa3d_a31_04.inst.cfg +++ b/resources/variants/nwa3d_a31_04.inst.cfg @@ -5,7 +5,7 @@ definition = nwa3d_a31 [metadata] author = DragonJe -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/nwa3d_a31_06.inst.cfg b/resources/variants/nwa3d_a31_06.inst.cfg index 6e11b3f8b7..4e75a9795d 100644 --- a/resources/variants/nwa3d_a31_06.inst.cfg +++ b/resources/variants/nwa3d_a31_06.inst.cfg @@ -5,7 +5,7 @@ definition = nwa3d_a31 [metadata] author = DragonJe -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/strateo3d_high_temp_04.inst.cfg b/resources/variants/strateo3d_high_temp_04.inst.cfg new file mode 100644 index 0000000000..bb51ab03cc --- /dev/null +++ b/resources/variants/strateo3d_high_temp_04.inst.cfg @@ -0,0 +1,20 @@ +[general] +name = High temp 0.4 +version = 4 +definition = strateo3d + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_id = HT0.4 +machine_nozzle_size = 0.4 +machine_nozzle_tip_outer_diameter = 1.0 +layer_height = 0.2 +layer_height_0 = 0.3 +prime_tower_enable = True +retract_at_layer_change = False +support_angle = 45 +support_use_towers = True diff --git a/resources/variants/strateo3d_standard_04.inst.cfg b/resources/variants/strateo3d_standard_04.inst.cfg index 67e312bdea..136af87481 100644 --- a/resources/variants/strateo3d_standard_04.inst.cfg +++ b/resources/variants/strateo3d_standard_04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/strateo3d_standard_06.inst.cfg b/resources/variants/strateo3d_standard_06.inst.cfg index 3ebf02c533..4f9b2030ae 100644 --- a/resources/variants/strateo3d_standard_06.inst.cfg +++ b/resources/variants/strateo3d_standard_06.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/strateo3d_standard_08.inst.cfg b/resources/variants/strateo3d_standard_08.inst.cfg index 8dc0aac315..838227ba0d 100644 --- a/resources/variants/strateo3d_standard_08.inst.cfg +++ b/resources/variants/strateo3d_standard_08.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = strateo3d [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/strateo3d_standard_10.inst.cfg b/resources/variants/strateo3d_standard_10.inst.cfg new file mode 100644 index 0000000000..9bb87eb6cf --- /dev/null +++ b/resources/variants/strateo3d_standard_10.inst.cfg @@ -0,0 +1,20 @@ +[general] +name = Standard 1.0 Experimental +version = 4 +definition = strateo3d + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_id = Standard 1.0 Experimental +machine_nozzle_size = 1.0 +machine_nozzle_tip_outer_diameter = 2.5 +layer_height = 0.5 +layer_height_0 = 0.6 +prime_tower_enable = True +retract_at_layer_change = True +support_angle = 50 +support_use_towers = True \ No newline at end of file diff --git a/resources/variants/strateo3d_standard_12.inst.cfg b/resources/variants/strateo3d_standard_12.inst.cfg new file mode 100644 index 0000000000..30b72df660 --- /dev/null +++ b/resources/variants/strateo3d_standard_12.inst.cfg @@ -0,0 +1,20 @@ +[general] +name = Standard 1.2 Experimental +version = 4 +definition = strateo3d + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_id = Standard 1.2 Experimental +machine_nozzle_size = 1.2 +machine_nozzle_tip_outer_diameter = 3.0 +layer_height = 0.6 +layer_height_0 = 0.7 +prime_tower_enable = True +retract_at_layer_change = True +support_angle = 50 +support_use_towers = True \ No newline at end of file diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg index 86de9205be..17708f0b31 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg index 4e0200f0ee..769bd165dd 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg index c09daa035c..e70ecce4c9 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg index 2a14690786..39584ac416 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg index 50fbee467d..d6858025db 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg index aff8e6909c..326177b030 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg index 606ad03667..752bfcc5bc 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.2.inst.cfg b/resources/variants/tizyx_evy_0.2.inst.cfg index 698c24dc28..a3dd58d586 100644 --- a/resources/variants/tizyx_evy_0.2.inst.cfg +++ b/resources/variants/tizyx_evy_0.2.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.3.inst.cfg b/resources/variants/tizyx_evy_0.3.inst.cfg index 1d65677408..06fe49c80c 100644 --- a/resources/variants/tizyx_evy_0.3.inst.cfg +++ b/resources/variants/tizyx_evy_0.3.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.4.inst.cfg b/resources/variants/tizyx_evy_0.4.inst.cfg index 3feb4f4744..7dfa77cad2 100644 --- a/resources/variants/tizyx_evy_0.4.inst.cfg +++ b/resources/variants/tizyx_evy_0.4.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.5.inst.cfg b/resources/variants/tizyx_evy_0.5.inst.cfg index f056e8ce55..68820d1218 100644 --- a/resources/variants/tizyx_evy_0.5.inst.cfg +++ b/resources/variants/tizyx_evy_0.5.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.6.inst.cfg b/resources/variants/tizyx_evy_0.6.inst.cfg index 5c0718781f..7ba71e430c 100644 --- a/resources/variants/tizyx_evy_0.6.inst.cfg +++ b/resources/variants/tizyx_evy_0.6.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_0.8.inst.cfg b/resources/variants/tizyx_evy_0.8.inst.cfg index 42a449de61..987cfaef5d 100644 --- a/resources/variants/tizyx_evy_0.8.inst.cfg +++ b/resources/variants/tizyx_evy_0.8.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_1.0.inst.cfg b/resources/variants/tizyx_evy_1.0.inst.cfg index f12d93248f..08a1e8d10c 100644 --- a/resources/variants/tizyx_evy_1.0.inst.cfg +++ b/resources/variants/tizyx_evy_1.0.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy [metadata] author = TiZYX -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_dual_classic.inst.cfg b/resources/variants/tizyx_evy_dual_classic.inst.cfg index 3b12cb4d28..cc87395b7e 100644 --- a/resources/variants/tizyx_evy_dual_classic.inst.cfg +++ b/resources/variants/tizyx_evy_dual_classic.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy_dual [metadata] author = TiZYX -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_evy_dual_direct_drive.inst.cfg b/resources/variants/tizyx_evy_dual_direct_drive.inst.cfg index 848b88916c..ecb2e3b8d0 100644 --- a/resources/variants/tizyx_evy_dual_direct_drive.inst.cfg +++ b/resources/variants/tizyx_evy_dual_direct_drive.inst.cfg @@ -5,7 +5,7 @@ definition = tizyx_evy_dual [metadata] author = TiZYX -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.2.inst.cfg b/resources/variants/tizyx_k25_0.2.inst.cfg index e210b77cee..7d1bec0e57 100644 --- a/resources/variants/tizyx_k25_0.2.inst.cfg +++ b/resources/variants/tizyx_k25_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.3.inst.cfg b/resources/variants/tizyx_k25_0.3.inst.cfg index 24ddb8586d..8dd495598b 100644 --- a/resources/variants/tizyx_k25_0.3.inst.cfg +++ b/resources/variants/tizyx_k25_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.4.inst.cfg b/resources/variants/tizyx_k25_0.4.inst.cfg index 46f73fc94d..58d34c67f8 100644 --- a/resources/variants/tizyx_k25_0.4.inst.cfg +++ b/resources/variants/tizyx_k25_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.5.inst.cfg b/resources/variants/tizyx_k25_0.5.inst.cfg index 40f1fcb42a..3e8b792a4f 100644 --- a/resources/variants/tizyx_k25_0.5.inst.cfg +++ b/resources/variants/tizyx_k25_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.6.inst.cfg b/resources/variants/tizyx_k25_0.6.inst.cfg index 03599f828b..740f44d8ee 100644 --- a/resources/variants/tizyx_k25_0.6.inst.cfg +++ b/resources/variants/tizyx_k25_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_0.8.inst.cfg b/resources/variants/tizyx_k25_0.8.inst.cfg index a81b54bee5..113ce6990e 100644 --- a/resources/variants/tizyx_k25_0.8.inst.cfg +++ b/resources/variants/tizyx_k25_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tizyx_k25_1.0.inst.cfg b/resources/variants/tizyx_k25_1.0.inst.cfg index f4f2a8dde0..0354fadf72 100644 --- a/resources/variants/tizyx_k25_1.0.inst.cfg +++ b/resources/variants/tizyx_k25_1.0.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tizyx_k25 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_d01_0.2.inst.cfg b/resources/variants/tronxy_d01_0.2.inst.cfg index db73ddfc0d..df5944707b 100644 --- a/resources/variants/tronxy_d01_0.2.inst.cfg +++ b/resources/variants/tronxy_d01_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_d01 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_d01_0.3.inst.cfg b/resources/variants/tronxy_d01_0.3.inst.cfg index 037314a519..9b950062c8 100644 --- a/resources/variants/tronxy_d01_0.3.inst.cfg +++ b/resources/variants/tronxy_d01_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_d01 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_d01_0.4.inst.cfg b/resources/variants/tronxy_d01_0.4.inst.cfg index 5e458eda1c..958e8e114b 100644 --- a/resources/variants/tronxy_d01_0.4.inst.cfg +++ b/resources/variants/tronxy_d01_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_d01 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_d01_0.5.inst.cfg b/resources/variants/tronxy_d01_0.5.inst.cfg index 6dab18d0de..fa6b5989e8 100644 --- a/resources/variants/tronxy_d01_0.5.inst.cfg +++ b/resources/variants/tronxy_d01_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_d01 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_d01_0.6.inst.cfg b/resources/variants/tronxy_d01_0.6.inst.cfg index 7bc0b75442..740b179ca8 100644 --- a/resources/variants/tronxy_d01_0.6.inst.cfg +++ b/resources/variants/tronxy_d01_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_d01 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_d01_0.8.inst.cfg b/resources/variants/tronxy_d01_0.8.inst.cfg index 4a544fa7d3..7d8609f662 100644 --- a/resources/variants/tronxy_d01_0.8.inst.cfg +++ b/resources/variants/tronxy_d01_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_d01 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_0.2.inst.cfg b/resources/variants/tronxy_x5sa_0.2.inst.cfg index c969476d26..e917955690 100644 --- a/resources/variants/tronxy_x5sa_0.2.inst.cfg +++ b/resources/variants/tronxy_x5sa_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_0.3.inst.cfg b/resources/variants/tronxy_x5sa_0.3.inst.cfg index 2edd47e63e..ef951f3bd3 100644 --- a/resources/variants/tronxy_x5sa_0.3.inst.cfg +++ b/resources/variants/tronxy_x5sa_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_0.4.inst.cfg b/resources/variants/tronxy_x5sa_0.4.inst.cfg index 461aedea61..dad0f32965 100644 --- a/resources/variants/tronxy_x5sa_0.4.inst.cfg +++ b/resources/variants/tronxy_x5sa_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_0.5.inst.cfg b/resources/variants/tronxy_x5sa_0.5.inst.cfg index ab16e899e8..71daa61430 100644 --- a/resources/variants/tronxy_x5sa_0.5.inst.cfg +++ b/resources/variants/tronxy_x5sa_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_0.6.inst.cfg b/resources/variants/tronxy_x5sa_0.6.inst.cfg index 41c0bc6422..349cd85c22 100644 --- a/resources/variants/tronxy_x5sa_0.6.inst.cfg +++ b/resources/variants/tronxy_x5sa_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_0.8.inst.cfg b/resources/variants/tronxy_x5sa_0.8.inst.cfg index a372cc727f..8aa61e1067 100644 --- a/resources/variants/tronxy_x5sa_0.8.inst.cfg +++ b/resources/variants/tronxy_x5sa_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_400_0.2.inst.cfg b/resources/variants/tronxy_x5sa_400_0.2.inst.cfg index f9d322843d..60ac6da3d9 100644 --- a/resources/variants/tronxy_x5sa_400_0.2.inst.cfg +++ b/resources/variants/tronxy_x5sa_400_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_400 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_400_0.3.inst.cfg b/resources/variants/tronxy_x5sa_400_0.3.inst.cfg index 8b83c649ed..f9934a142e 100644 --- a/resources/variants/tronxy_x5sa_400_0.3.inst.cfg +++ b/resources/variants/tronxy_x5sa_400_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_400 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_400_0.4.inst.cfg b/resources/variants/tronxy_x5sa_400_0.4.inst.cfg index 69050536cf..c047a9d13a 100644 --- a/resources/variants/tronxy_x5sa_400_0.4.inst.cfg +++ b/resources/variants/tronxy_x5sa_400_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_400 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_400_0.5.inst.cfg b/resources/variants/tronxy_x5sa_400_0.5.inst.cfg index d3817033bc..4684590e9a 100644 --- a/resources/variants/tronxy_x5sa_400_0.5.inst.cfg +++ b/resources/variants/tronxy_x5sa_400_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_400 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_400_0.6.inst.cfg b/resources/variants/tronxy_x5sa_400_0.6.inst.cfg index cca58d65f4..d808230198 100644 --- a/resources/variants/tronxy_x5sa_400_0.6.inst.cfg +++ b/resources/variants/tronxy_x5sa_400_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_400 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_400_0.8.inst.cfg b/resources/variants/tronxy_x5sa_400_0.8.inst.cfg index 9dc6d88466..4c9df5e640 100644 --- a/resources/variants/tronxy_x5sa_400_0.8.inst.cfg +++ b/resources/variants/tronxy_x5sa_400_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_400 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_500_0.2.inst.cfg b/resources/variants/tronxy_x5sa_500_0.2.inst.cfg index 6779ab8af2..5b4d01a11d 100644 --- a/resources/variants/tronxy_x5sa_500_0.2.inst.cfg +++ b/resources/variants/tronxy_x5sa_500_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_500 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_500_0.3.inst.cfg b/resources/variants/tronxy_x5sa_500_0.3.inst.cfg index 58f422788b..d12a8803d9 100644 --- a/resources/variants/tronxy_x5sa_500_0.3.inst.cfg +++ b/resources/variants/tronxy_x5sa_500_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_500 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_500_0.4.inst.cfg b/resources/variants/tronxy_x5sa_500_0.4.inst.cfg index 89364e8eb2..25232710e6 100644 --- a/resources/variants/tronxy_x5sa_500_0.4.inst.cfg +++ b/resources/variants/tronxy_x5sa_500_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_500 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_500_0.5.inst.cfg b/resources/variants/tronxy_x5sa_500_0.5.inst.cfg index 27b75bb36b..9bda143666 100644 --- a/resources/variants/tronxy_x5sa_500_0.5.inst.cfg +++ b/resources/variants/tronxy_x5sa_500_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_500 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_500_0.6.inst.cfg b/resources/variants/tronxy_x5sa_500_0.6.inst.cfg index df754c63c2..29c3fe647a 100644 --- a/resources/variants/tronxy_x5sa_500_0.6.inst.cfg +++ b/resources/variants/tronxy_x5sa_500_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_500 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x5sa_500_0.8.inst.cfg b/resources/variants/tronxy_x5sa_500_0.8.inst.cfg index 2f669fb41f..a5bc63c268 100644 --- a/resources/variants/tronxy_x5sa_500_0.8.inst.cfg +++ b/resources/variants/tronxy_x5sa_500_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x5sa_500 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x_0.2.inst.cfg b/resources/variants/tronxy_x_0.2.inst.cfg index 0c96c3d651..93ebaaac6c 100644 --- a/resources/variants/tronxy_x_0.2.inst.cfg +++ b/resources/variants/tronxy_x_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x_0.3.inst.cfg b/resources/variants/tronxy_x_0.3.inst.cfg index ff6063f101..9eecf6bf60 100644 --- a/resources/variants/tronxy_x_0.3.inst.cfg +++ b/resources/variants/tronxy_x_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x_0.4.inst.cfg b/resources/variants/tronxy_x_0.4.inst.cfg index 0d21dc6149..5adf5b23c3 100644 --- a/resources/variants/tronxy_x_0.4.inst.cfg +++ b/resources/variants/tronxy_x_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x_0.5.inst.cfg b/resources/variants/tronxy_x_0.5.inst.cfg index dfce06683c..600e998589 100644 --- a/resources/variants/tronxy_x_0.5.inst.cfg +++ b/resources/variants/tronxy_x_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x_0.6.inst.cfg b/resources/variants/tronxy_x_0.6.inst.cfg index 8046d9ef27..22e127108f 100644 --- a/resources/variants/tronxy_x_0.6.inst.cfg +++ b/resources/variants/tronxy_x_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_x_0.8.inst.cfg b/resources/variants/tronxy_x_0.8.inst.cfg index 117d4972be..cf9e80f3f0 100644 --- a/resources/variants/tronxy_x_0.8.inst.cfg +++ b/resources/variants/tronxy_x_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_x [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2_0.2.inst.cfg b/resources/variants/tronxy_xy2_0.2.inst.cfg index e68cf430e0..571fe9d53f 100644 --- a/resources/variants/tronxy_xy2_0.2.inst.cfg +++ b/resources/variants/tronxy_xy2_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2_0.3.inst.cfg b/resources/variants/tronxy_xy2_0.3.inst.cfg index e8e307a2c0..468b0ae69c 100644 --- a/resources/variants/tronxy_xy2_0.3.inst.cfg +++ b/resources/variants/tronxy_xy2_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2_0.4.inst.cfg b/resources/variants/tronxy_xy2_0.4.inst.cfg index 5a63da5dd0..b57bc03d4c 100644 --- a/resources/variants/tronxy_xy2_0.4.inst.cfg +++ b/resources/variants/tronxy_xy2_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2_0.5.inst.cfg b/resources/variants/tronxy_xy2_0.5.inst.cfg index cc330bf3bf..021f724b39 100644 --- a/resources/variants/tronxy_xy2_0.5.inst.cfg +++ b/resources/variants/tronxy_xy2_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2_0.6.inst.cfg b/resources/variants/tronxy_xy2_0.6.inst.cfg index cd522b625e..d45c58038f 100644 --- a/resources/variants/tronxy_xy2_0.6.inst.cfg +++ b/resources/variants/tronxy_xy2_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2_0.8.inst.cfg b/resources/variants/tronxy_xy2_0.8.inst.cfg index 2003cd6a87..5b3d7a550a 100644 --- a/resources/variants/tronxy_xy2_0.8.inst.cfg +++ b/resources/variants/tronxy_xy2_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2pro_0.2.inst.cfg b/resources/variants/tronxy_xy2pro_0.2.inst.cfg index e8fc6d6dc5..5136350dba 100644 --- a/resources/variants/tronxy_xy2pro_0.2.inst.cfg +++ b/resources/variants/tronxy_xy2pro_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2pro_0.3.inst.cfg b/resources/variants/tronxy_xy2pro_0.3.inst.cfg index ec256a9abf..fb1f464c4d 100644 --- a/resources/variants/tronxy_xy2pro_0.3.inst.cfg +++ b/resources/variants/tronxy_xy2pro_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2pro_0.4.inst.cfg b/resources/variants/tronxy_xy2pro_0.4.inst.cfg index 75f464a5a6..2ad291247c 100644 --- a/resources/variants/tronxy_xy2pro_0.4.inst.cfg +++ b/resources/variants/tronxy_xy2pro_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2pro_0.5.inst.cfg b/resources/variants/tronxy_xy2pro_0.5.inst.cfg index 13fffdb854..9fa17ac961 100644 --- a/resources/variants/tronxy_xy2pro_0.5.inst.cfg +++ b/resources/variants/tronxy_xy2pro_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2pro_0.6.inst.cfg b/resources/variants/tronxy_xy2pro_0.6.inst.cfg index 5f1e8a8441..67568813cf 100644 --- a/resources/variants/tronxy_xy2pro_0.6.inst.cfg +++ b/resources/variants/tronxy_xy2pro_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy2pro_0.8.inst.cfg b/resources/variants/tronxy_xy2pro_0.8.inst.cfg index 938322ccfc..6cacb6b726 100644 --- a/resources/variants/tronxy_xy2pro_0.8.inst.cfg +++ b/resources/variants/tronxy_xy2pro_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy2pro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy3_0.2.inst.cfg b/resources/variants/tronxy_xy3_0.2.inst.cfg index cce6acb7ea..3080c102fc 100644 --- a/resources/variants/tronxy_xy3_0.2.inst.cfg +++ b/resources/variants/tronxy_xy3_0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy3_0.3.inst.cfg b/resources/variants/tronxy_xy3_0.3.inst.cfg index 38f210e326..4cb0243225 100644 --- a/resources/variants/tronxy_xy3_0.3.inst.cfg +++ b/resources/variants/tronxy_xy3_0.3.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy3_0.4.inst.cfg b/resources/variants/tronxy_xy3_0.4.inst.cfg index e21e9f9459..6d2df8e747 100644 --- a/resources/variants/tronxy_xy3_0.4.inst.cfg +++ b/resources/variants/tronxy_xy3_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy3_0.5.inst.cfg b/resources/variants/tronxy_xy3_0.5.inst.cfg index 40a6b13ec6..cc1e2eb78f 100644 --- a/resources/variants/tronxy_xy3_0.5.inst.cfg +++ b/resources/variants/tronxy_xy3_0.5.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy3_0.6.inst.cfg b/resources/variants/tronxy_xy3_0.6.inst.cfg index efa6d7ee56..af7d4a8660 100644 --- a/resources/variants/tronxy_xy3_0.6.inst.cfg +++ b/resources/variants/tronxy_xy3_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/tronxy_xy3_0.8.inst.cfg b/resources/variants/tronxy_xy3_0.8.inst.cfg index 7df79744a1..fd54db0fbf 100644 --- a/resources/variants/tronxy_xy3_0.8.inst.cfg +++ b/resources/variants/tronxy_xy3_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = tronxy_xy3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/two_trees_base_0.2.inst.cfg b/resources/variants/two_trees_base_0.2.inst.cfg new file mode 100644 index 0000000000..837b25d556 --- /dev/null +++ b/resources/variants/two_trees_base_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = two_trees_base + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/two_trees_base_0.3.inst.cfg b/resources/variants/two_trees_base_0.3.inst.cfg new file mode 100644 index 0000000000..47d75854f0 --- /dev/null +++ b/resources/variants/two_trees_base_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = two_trees_base + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/two_trees_base_0.4.inst.cfg b/resources/variants/two_trees_base_0.4.inst.cfg new file mode 100644 index 0000000000..88de108c61 --- /dev/null +++ b/resources/variants/two_trees_base_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = two_trees_base + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/two_trees_base_0.5.inst.cfg b/resources/variants/two_trees_base_0.5.inst.cfg new file mode 100644 index 0000000000..a239d16743 --- /dev/null +++ b/resources/variants/two_trees_base_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = two_trees_base + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/two_trees_base_0.6.inst.cfg b/resources/variants/two_trees_base_0.6.inst.cfg new file mode 100644 index 0000000000..3f4438e465 --- /dev/null +++ b/resources/variants/two_trees_base_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = two_trees_base + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/two_trees_base_0.8.inst.cfg b/resources/variants/two_trees_base_0.8.inst.cfg new file mode 100644 index 0000000000..c53de991af --- /dev/null +++ b/resources/variants/two_trees_base_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = two_trees_base + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/two_trees_base_1.0.inst.cfg b/resources/variants/two_trees_base_1.0.inst.cfg new file mode 100644 index 0000000000..a6f28c6d36 --- /dev/null +++ b/resources/variants/two_trees_base_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = two_trees_base + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/two_trees_bluer_0.2.inst.cfg b/resources/variants/two_trees_bluer_0.2.inst.cfg new file mode 100644 index 0000000000..aa3413a132 --- /dev/null +++ b/resources/variants/two_trees_bluer_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = two_trees_bluer + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/two_trees_bluer_0.3.inst.cfg b/resources/variants/two_trees_bluer_0.3.inst.cfg new file mode 100644 index 0000000000..fe33cb9fc2 --- /dev/null +++ b/resources/variants/two_trees_bluer_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = two_trees_bluer + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/two_trees_bluer_0.4.inst.cfg b/resources/variants/two_trees_bluer_0.4.inst.cfg new file mode 100644 index 0000000000..31a729b96c --- /dev/null +++ b/resources/variants/two_trees_bluer_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = two_trees_bluer + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/two_trees_bluer_0.5.inst.cfg b/resources/variants/two_trees_bluer_0.5.inst.cfg new file mode 100644 index 0000000000..71a0ca77bb --- /dev/null +++ b/resources/variants/two_trees_bluer_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = two_trees_bluer + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/two_trees_bluer_0.6.inst.cfg b/resources/variants/two_trees_bluer_0.6.inst.cfg new file mode 100644 index 0000000000..20ff068b3f --- /dev/null +++ b/resources/variants/two_trees_bluer_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = two_trees_bluer + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/two_trees_bluer_0.8.inst.cfg b/resources/variants/two_trees_bluer_0.8.inst.cfg new file mode 100644 index 0000000000..9fc98da74e --- /dev/null +++ b/resources/variants/two_trees_bluer_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = two_trees_bluer + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/two_trees_bluer_1.0.inst.cfg b/resources/variants/two_trees_bluer_1.0.inst.cfg new file mode 100644 index 0000000000..f20e89a14b --- /dev/null +++ b/resources/variants/two_trees_bluer_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = two_trees_bluer + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/two_trees_bluerplus_0.2.inst.cfg b/resources/variants/two_trees_bluerplus_0.2.inst.cfg new file mode 100644 index 0000000000..e7c286137c --- /dev/null +++ b/resources/variants/two_trees_bluerplus_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = two_trees_bluerplus + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/two_trees_bluerplus_0.3.inst.cfg b/resources/variants/two_trees_bluerplus_0.3.inst.cfg new file mode 100644 index 0000000000..a4ff6f58b6 --- /dev/null +++ b/resources/variants/two_trees_bluerplus_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = two_trees_bluerplus + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/two_trees_bluerplus_0.4.inst.cfg b/resources/variants/two_trees_bluerplus_0.4.inst.cfg new file mode 100644 index 0000000000..7d8d89528d --- /dev/null +++ b/resources/variants/two_trees_bluerplus_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = two_trees_bluerplus + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/two_trees_bluerplus_0.5.inst.cfg b/resources/variants/two_trees_bluerplus_0.5.inst.cfg new file mode 100644 index 0000000000..9a6f0a62ed --- /dev/null +++ b/resources/variants/two_trees_bluerplus_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = two_trees_bluerplus + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/two_trees_bluerplus_0.6.inst.cfg b/resources/variants/two_trees_bluerplus_0.6.inst.cfg new file mode 100644 index 0000000000..ca514ce548 --- /dev/null +++ b/resources/variants/two_trees_bluerplus_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = two_trees_bluerplus + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/two_trees_bluerplus_0.8.inst.cfg b/resources/variants/two_trees_bluerplus_0.8.inst.cfg new file mode 100644 index 0000000000..805716e6cd --- /dev/null +++ b/resources/variants/two_trees_bluerplus_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = two_trees_bluerplus + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/two_trees_bluerplus_1.0.inst.cfg b/resources/variants/two_trees_bluerplus_1.0.inst.cfg new file mode 100644 index 0000000000..ba02103798 --- /dev/null +++ b/resources/variants/two_trees_bluerplus_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = two_trees_bluerplus + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/two_trees_sapphireplus_0.2.inst.cfg b/resources/variants/two_trees_sapphireplus_0.2.inst.cfg new file mode 100644 index 0000000000..91fc6b038a --- /dev/null +++ b/resources/variants/two_trees_sapphireplus_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = two_trees_sapphireplus + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/two_trees_sapphireplus_0.3.inst.cfg b/resources/variants/two_trees_sapphireplus_0.3.inst.cfg new file mode 100644 index 0000000000..147dca33ce --- /dev/null +++ b/resources/variants/two_trees_sapphireplus_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = two_trees_sapphireplus + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/two_trees_sapphireplus_0.4.inst.cfg b/resources/variants/two_trees_sapphireplus_0.4.inst.cfg new file mode 100644 index 0000000000..b4a39ceeda --- /dev/null +++ b/resources/variants/two_trees_sapphireplus_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = two_trees_sapphireplus + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/two_trees_sapphireplus_0.5.inst.cfg b/resources/variants/two_trees_sapphireplus_0.5.inst.cfg new file mode 100644 index 0000000000..16020a2e83 --- /dev/null +++ b/resources/variants/two_trees_sapphireplus_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = two_trees_sapphireplus + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/two_trees_sapphireplus_0.6.inst.cfg b/resources/variants/two_trees_sapphireplus_0.6.inst.cfg new file mode 100644 index 0000000000..c282b38446 --- /dev/null +++ b/resources/variants/two_trees_sapphireplus_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = two_trees_sapphireplus + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/two_trees_sapphireplus_0.8.inst.cfg b/resources/variants/two_trees_sapphireplus_0.8.inst.cfg new file mode 100644 index 0000000000..01c34c5757 --- /dev/null +++ b/resources/variants/two_trees_sapphireplus_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = two_trees_sapphireplus + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/two_trees_sapphireplus_1.0.inst.cfg b/resources/variants/two_trees_sapphireplus_1.0.inst.cfg new file mode 100644 index 0000000000..47686a2dd1 --- /dev/null +++ b/resources/variants/two_trees_sapphireplus_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = two_trees_sapphireplus + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/two_trees_sapphirepro_0.2.inst.cfg b/resources/variants/two_trees_sapphirepro_0.2.inst.cfg new file mode 100644 index 0000000000..bad1de94b7 --- /dev/null +++ b/resources/variants/two_trees_sapphirepro_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = two_trees_sapphirepro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/two_trees_sapphirepro_0.3.inst.cfg b/resources/variants/two_trees_sapphirepro_0.3.inst.cfg new file mode 100644 index 0000000000..ae4bd5f0c0 --- /dev/null +++ b/resources/variants/two_trees_sapphirepro_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = two_trees_sapphirepro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/two_trees_sapphirepro_0.4.inst.cfg b/resources/variants/two_trees_sapphirepro_0.4.inst.cfg new file mode 100644 index 0000000000..8abaca9abb --- /dev/null +++ b/resources/variants/two_trees_sapphirepro_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = two_trees_sapphirepro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/two_trees_sapphirepro_0.5.inst.cfg b/resources/variants/two_trees_sapphirepro_0.5.inst.cfg new file mode 100644 index 0000000000..cfd4b94ca8 --- /dev/null +++ b/resources/variants/two_trees_sapphirepro_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = two_trees_sapphirepro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/two_trees_sapphirepro_0.6.inst.cfg b/resources/variants/two_trees_sapphirepro_0.6.inst.cfg new file mode 100644 index 0000000000..b301d9266d --- /dev/null +++ b/resources/variants/two_trees_sapphirepro_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = two_trees_sapphirepro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/two_trees_sapphirepro_0.8.inst.cfg b/resources/variants/two_trees_sapphirepro_0.8.inst.cfg new file mode 100644 index 0000000000..209da133b3 --- /dev/null +++ b/resources/variants/two_trees_sapphirepro_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = two_trees_sapphirepro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/two_trees_sapphirepro_1.0.inst.cfg b/resources/variants/two_trees_sapphirepro_1.0.inst.cfg new file mode 100644 index 0000000000..acb3ae8446 --- /dev/null +++ b/resources/variants/two_trees_sapphirepro_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = two_trees_sapphirepro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg b/resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg index dadedbe464..abdbb3751c 100644 --- a/resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg +++ b/resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_olsson [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_olsson_0.4.inst.cfg b/resources/variants/ultimaker2_extended_olsson_0.4.inst.cfg index 8b6024ffef..af05195dee 100644 --- a/resources/variants/ultimaker2_extended_olsson_0.4.inst.cfg +++ b/resources/variants/ultimaker2_extended_olsson_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_olsson [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_olsson_0.6.inst.cfg b/resources/variants/ultimaker2_extended_olsson_0.6.inst.cfg index 5cb924beb3..ed5a5c81a1 100644 --- a/resources/variants/ultimaker2_extended_olsson_0.6.inst.cfg +++ b/resources/variants/ultimaker2_extended_olsson_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_olsson [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_olsson_0.8.inst.cfg b/resources/variants/ultimaker2_extended_olsson_0.8.inst.cfg index 62f81b859d..2873e16644 100644 --- a/resources/variants/ultimaker2_extended_olsson_0.8.inst.cfg +++ b/resources/variants/ultimaker2_extended_olsson_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_olsson [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg index b16a163a07..aef0d4fbda 100644 --- a/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg index 2abe25fb68..b21b2c6f4f 100644 --- a/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg index 88f86bf4ac..d3827e01e5 100644 --- a/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg index c68f0e8666..d0a5698538 100644 --- a/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_extended_plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_olsson_0.25.inst.cfg b/resources/variants/ultimaker2_olsson_0.25.inst.cfg index fe757c2b5e..25bb8b67df 100644 --- a/resources/variants/ultimaker2_olsson_0.25.inst.cfg +++ b/resources/variants/ultimaker2_olsson_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_olsson [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_olsson_0.4.inst.cfg b/resources/variants/ultimaker2_olsson_0.4.inst.cfg index d0d6d85626..130eaa48a9 100644 --- a/resources/variants/ultimaker2_olsson_0.4.inst.cfg +++ b/resources/variants/ultimaker2_olsson_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_olsson [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_olsson_0.6.inst.cfg b/resources/variants/ultimaker2_olsson_0.6.inst.cfg index 1b49cf5439..696973cb30 100644 --- a/resources/variants/ultimaker2_olsson_0.6.inst.cfg +++ b/resources/variants/ultimaker2_olsson_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_olsson [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_olsson_0.8.inst.cfg b/resources/variants/ultimaker2_olsson_0.8.inst.cfg index 986442ad2c..7c6e70259b 100644 --- a/resources/variants/ultimaker2_olsson_0.8.inst.cfg +++ b/resources/variants/ultimaker2_olsson_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_olsson [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_plus_0.25.inst.cfg b/resources/variants/ultimaker2_plus_0.25.inst.cfg index d49457372b..d771865eca 100644 --- a/resources/variants/ultimaker2_plus_0.25.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_plus_0.4.inst.cfg b/resources/variants/ultimaker2_plus_0.4.inst.cfg index 8a723cfbc5..b5eb384627 100644 --- a/resources/variants/ultimaker2_plus_0.4.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_plus_0.6.inst.cfg b/resources/variants/ultimaker2_plus_0.6.inst.cfg index f0154ea426..0cd4b06e0e 100644 --- a/resources/variants/ultimaker2_plus_0.6.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_plus_0.8.inst.cfg b/resources/variants/ultimaker2_plus_0.8.inst.cfg index 49f3544cb0..b5579e7b8f 100644 --- a/resources/variants/ultimaker2_plus_0.8.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_plus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_plus_connect_0.25.inst.cfg b/resources/variants/ultimaker2_plus_connect_0.25.inst.cfg index c148d31829..36f81f143d 100644 --- a/resources/variants/ultimaker2_plus_connect_0.25.inst.cfg +++ b/resources/variants/ultimaker2_plus_connect_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_plus_connect_0.4.inst.cfg b/resources/variants/ultimaker2_plus_connect_0.4.inst.cfg index 5dfc4caca2..ac2b227e12 100644 --- a/resources/variants/ultimaker2_plus_connect_0.4.inst.cfg +++ b/resources/variants/ultimaker2_plus_connect_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_plus_connect_0.6.inst.cfg b/resources/variants/ultimaker2_plus_connect_0.6.inst.cfg index 9c1ea96cb2..db870f8e24 100644 --- a/resources/variants/ultimaker2_plus_connect_0.6.inst.cfg +++ b/resources/variants/ultimaker2_plus_connect_0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker2_plus_connect_0.8.inst.cfg b/resources/variants/ultimaker2_plus_connect_0.8.inst.cfg index 8cea0a22b4..d570726cb4 100644 --- a/resources/variants/ultimaker2_plus_connect_0.8.inst.cfg +++ b/resources/variants/ultimaker2_plus_connect_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker2_plus_connect [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_aa0.25.inst.cfg b/resources/variants/ultimaker3_aa0.25.inst.cfg index af5251f70f..33aae1abc3 100644 --- a/resources/variants/ultimaker3_aa0.25.inst.cfg +++ b/resources/variants/ultimaker3_aa0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg index 24fff54ff4..94c5f0238b 100644 --- a/resources/variants/ultimaker3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_aa0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_aa04.inst.cfg b/resources/variants/ultimaker3_aa04.inst.cfg index 73cd098218..11a5c90d23 100644 --- a/resources/variants/ultimaker3_aa04.inst.cfg +++ b/resources/variants/ultimaker3_aa04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg index a094444880..7aecc8e631 100644 --- a/resources/variants/ultimaker3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_bb0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg index 297903c05e..7a8b7a9944 100644 --- a/resources/variants/ultimaker3_bb04.inst.cfg +++ b/resources/variants/ultimaker3_bb04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg index 7a1e8d2612..13950f9771 100644 --- a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3_extended [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg index 276306af87..5209ce08c4 100644 --- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3_extended [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_extended_aa04.inst.cfg b/resources/variants/ultimaker3_extended_aa04.inst.cfg index e86aa0e2e2..ccd296136f 100644 --- a/resources/variants/ultimaker3_extended_aa04.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3_extended [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg index ce9dc0015a..a5fb164591 100644 --- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3_extended [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg index a2bc8f5072..b7a8be2e28 100644 --- a/resources/variants/ultimaker3_extended_bb04.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker3_extended [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s3_aa0.25.inst.cfg b/resources/variants/ultimaker_s3_aa0.25.inst.cfg index 751066fae0..60d25ec07c 100644 --- a/resources/variants/ultimaker_s3_aa0.25.inst.cfg +++ b/resources/variants/ultimaker_s3_aa0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s3_aa0.8.inst.cfg b/resources/variants/ultimaker_s3_aa0.8.inst.cfg index a66d2b9208..72adb16dd8 100644 --- a/resources/variants/ultimaker_s3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_aa0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s3_aa04.inst.cfg b/resources/variants/ultimaker_s3_aa04.inst.cfg index ca10a4a465..0dfa0e22e7 100644 --- a/resources/variants/ultimaker_s3_aa04.inst.cfg +++ b/resources/variants/ultimaker_s3_aa04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg index eb34cd43ac..af100aa1e7 100644 --- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s3_bb04.inst.cfg b/resources/variants/ultimaker_s3_bb04.inst.cfg index 2d69da5855..064fd004b8 100644 --- a/resources/variants/ultimaker_s3_bb04.inst.cfg +++ b/resources/variants/ultimaker_s3_bb04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s3_cc04.inst.cfg b/resources/variants/ultimaker_s3_cc04.inst.cfg new file mode 100644 index 0000000000..1f0fcc5e53 --- /dev/null +++ b/resources/variants/ultimaker_s3_cc04.inst.cfg @@ -0,0 +1,46 @@ +[general] +name = CC 0.4 +version = 4 +definition = ultimaker_s3 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +brim_width = 7 +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_id = CC 0.4 +machine_nozzle_size = 0.4 +raft_acceleration = =acceleration_print +raft_airgap = 0.3 +raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2 +raft_interface_line_spacing = =raft_interface_line_width + 0.2 +raft_interface_line_width = =line_width * 2 +raft_interface_thickness = =layer_height * 1.5 +raft_jerk = =jerk_print +raft_margin = 15 +raft_surface_layers = 2 +retraction_count_max = 25 +retraction_min_travel = =line_width * 2 +retraction_prime_speed = =retraction_speed +speed_infill = =speed_print +speed_layer_0 = 20 +speed_print = 45 +speed_support = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 25 / 45) +speed_travel_layer_0 = 50 +speed_wall = =math.ceil(speed_print * 30 / 45) +speed_wall_0 = =math.ceil(speed_wall * 25 / 30) +speed_wall_x = =speed_wall +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_pattern = zigzag +support_top_distance = =support_z_distance +support_use_towers = True +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 +wall_thickness = =line_width * 3 diff --git a/resources/variants/ultimaker_s3_cc06.inst.cfg b/resources/variants/ultimaker_s3_cc06.inst.cfg index b528744494..5863b144be 100644 --- a/resources/variants/ultimaker_s3_cc06.inst.cfg +++ b/resources/variants/ultimaker_s3_cc06.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s3 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_aa0.25.inst.cfg b/resources/variants/ultimaker_s5_aa0.25.inst.cfg index 7b27be6831..2f26bc1da4 100644 --- a/resources/variants/ultimaker_s5_aa0.25.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg index b52fc8e3c1..ce8c40444c 100644 --- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_aa04.inst.cfg b/resources/variants/ultimaker_s5_aa04.inst.cfg index 3f2ff7e770..b290496288 100644 --- a/resources/variants/ultimaker_s5_aa04.inst.cfg +++ b/resources/variants/ultimaker_s5_aa04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_aluminum.inst.cfg b/resources/variants/ultimaker_s5_aluminum.inst.cfg index eccc17fb8b..a867d6e24b 100644 --- a/resources/variants/ultimaker_s5_aluminum.inst.cfg +++ b/resources/variants/ultimaker_s5_aluminum.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = buildplate diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg index 5f856535ba..bc484f53df 100644 --- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg index 84abd5da6b..741b7d78e3 100644 --- a/resources/variants/ultimaker_s5_bb04.inst.cfg +++ b/resources/variants/ultimaker_s5_bb04.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_cc04.inst.cfg b/resources/variants/ultimaker_s5_cc04.inst.cfg new file mode 100644 index 0000000000..8eea2a477b --- /dev/null +++ b/resources/variants/ultimaker_s5_cc04.inst.cfg @@ -0,0 +1,46 @@ +[general] +name = CC 0.4 +version = 4 +definition = ultimaker_s5 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +brim_width = 7 +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_id = CC 0.4 +machine_nozzle_size = 0.4 +raft_acceleration = =acceleration_print +raft_airgap = 0.3 +raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2 +raft_interface_line_spacing = =raft_interface_line_width + 0.2 +raft_interface_line_width = =line_width * 2 +raft_interface_thickness = =layer_height * 1.5 +raft_jerk = =jerk_print +raft_margin = 15 +raft_surface_layers = 2 +retraction_count_max = 25 +retraction_min_travel = =line_width * 2 +retraction_prime_speed = =retraction_speed +speed_infill = =speed_print +speed_layer_0 = 20 +speed_print = 45 +speed_support = =speed_topbottom +speed_topbottom = =math.ceil(speed_print * 25 / 45) +speed_travel_layer_0 = 50 +speed_wall = =math.ceil(speed_print * 30 / 45) +speed_wall_0 = =math.ceil(speed_wall * 25 / 30) +speed_wall_x = =speed_wall +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_pattern = zigzag +support_top_distance = =support_z_distance +support_use_towers = True +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 +wall_thickness = =line_width * 3 diff --git a/resources/variants/ultimaker_s5_cc06.inst.cfg b/resources/variants/ultimaker_s5_cc06.inst.cfg index 61e2d73e59..d1371db91e 100644 --- a/resources/variants/ultimaker_s5_cc06.inst.cfg +++ b/resources/variants/ultimaker_s5_cc06.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/ultimaker_s5_glass.inst.cfg b/resources/variants/ultimaker_s5_glass.inst.cfg index 84c8c5f2cc..d5e345c2df 100644 --- a/resources/variants/ultimaker_s5_glass.inst.cfg +++ b/resources/variants/ultimaker_s5_glass.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = ultimaker_s5 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = buildplate diff --git a/resources/variants/uni_200_0.30.inst.cfg b/resources/variants/uni_200_0.30.inst.cfg index a5bf39e7a9..11e1348a1f 100644 --- a/resources/variants/uni_200_0.30.inst.cfg +++ b/resources/variants/uni_200_0.30.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = uni_200 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/uni_200_0.40.inst.cfg b/resources/variants/uni_200_0.40.inst.cfg index cf7a797b98..4f0d44ce11 100644 --- a/resources/variants/uni_200_0.40.inst.cfg +++ b/resources/variants/uni_200_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = uni_200 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/uni_200_0.50.inst.cfg b/resources/variants/uni_200_0.50.inst.cfg index 559d6703d0..68fd13ed85 100644 --- a/resources/variants/uni_200_0.50.inst.cfg +++ b/resources/variants/uni_200_0.50.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = uni_200 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/uni_250_0.30.inst.cfg b/resources/variants/uni_250_0.30.inst.cfg index 481c986fe8..ec4e0772cc 100644 --- a/resources/variants/uni_250_0.30.inst.cfg +++ b/resources/variants/uni_250_0.30.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = uni_250 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/uni_250_0.40.inst.cfg b/resources/variants/uni_250_0.40.inst.cfg index 3abe42dd24..1b9cbf90a5 100644 --- a/resources/variants/uni_250_0.40.inst.cfg +++ b/resources/variants/uni_250_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = uni_250 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/uni_250_0.50.inst.cfg b/resources/variants/uni_250_0.50.inst.cfg index 7c4f7dcd8d..e335461844 100644 --- a/resources/variants/uni_250_0.50.inst.cfg +++ b/resources/variants/uni_250_0.50.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = uni_250 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/uni_300_0.30.inst.cfg b/resources/variants/uni_300_0.30.inst.cfg index df36c6d778..f49b730dc0 100644 --- a/resources/variants/uni_300_0.30.inst.cfg +++ b/resources/variants/uni_300_0.30.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = uni_300 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/uni_300_0.40.inst.cfg b/resources/variants/uni_300_0.40.inst.cfg index 5f07d32593..7ef53a99db 100644 --- a/resources/variants/uni_300_0.40.inst.cfg +++ b/resources/variants/uni_300_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = uni_300 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/uni_300_0.50.inst.cfg b/resources/variants/uni_300_0.50.inst.cfg index 2fde6a8eef..e43fc7eed8 100644 --- a/resources/variants/uni_300_0.50.inst.cfg +++ b/resources/variants/uni_300_0.50.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = uni_300 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/uni_base_0.30.inst.cfg b/resources/variants/uni_base_0.30.inst.cfg index 28bd2f53c7..b7ba59defe 100644 --- a/resources/variants/uni_base_0.30.inst.cfg +++ b/resources/variants/uni_base_0.30.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/uni_base_0.40.inst.cfg b/resources/variants/uni_base_0.40.inst.cfg index 7d74086702..c73e30513a 100644 --- a/resources/variants/uni_base_0.40.inst.cfg +++ b/resources/variants/uni_base_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/uni_base_0.50.inst.cfg b/resources/variants/uni_base_0.50.inst.cfg index 09f077c40f..3ac4e40438 100644 --- a/resources/variants/uni_base_0.50.inst.cfg +++ b/resources/variants/uni_base_0.50.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = uni_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/uni_mini_0.30.inst.cfg b/resources/variants/uni_mini_0.30.inst.cfg index 661bbef29c..45a5fbc2e3 100644 --- a/resources/variants/uni_mini_0.30.inst.cfg +++ b/resources/variants/uni_mini_0.30.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = uni_mini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/uni_mini_0.40.inst.cfg b/resources/variants/uni_mini_0.40.inst.cfg index e7451cc3b4..6689530fa9 100644 --- a/resources/variants/uni_mini_0.40.inst.cfg +++ b/resources/variants/uni_mini_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = uni_mini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/uni_mini_0.50.inst.cfg b/resources/variants/uni_mini_0.50.inst.cfg index e5d6922225..3e6b1cc0d7 100644 --- a/resources/variants/uni_mini_0.50.inst.cfg +++ b/resources/variants/uni_mini_0.50.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = uni_mini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron0_120_v6_0.25.inst.cfg b/resources/variants/voron0_120_v6_0.25.inst.cfg new file mode 100644 index 0000000000..8fd763e739 --- /dev/null +++ b/resources/variants/voron0_120_v6_0.25.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = V6 0.25mm +version = 4 +definition = voron0_120 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.25 diff --git a/resources/variants/voron0_120_v6_0.30.inst.cfg b/resources/variants/voron0_120_v6_0.30.inst.cfg new file mode 100644 index 0000000000..65fd07de0b --- /dev/null +++ b/resources/variants/voron0_120_v6_0.30.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = V6 0.30mm +version = 4 +definition = voron0_120 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/voron0_120_v6_0.40.inst.cfg b/resources/variants/voron0_120_v6_0.40.inst.cfg new file mode 100644 index 0000000000..2cc9018970 --- /dev/null +++ b/resources/variants/voron0_120_v6_0.40.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = V6 0.40mm +version = 4 +definition = voron0_120 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/voron0_120_v6_0.50.inst.cfg b/resources/variants/voron0_120_v6_0.50.inst.cfg new file mode 100644 index 0000000000..6e30fb049b --- /dev/null +++ b/resources/variants/voron0_120_v6_0.50.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = V6 0.50mm +version = 4 +definition = voron0_120 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/voron0_120_v6_0.60.inst.cfg b/resources/variants/voron0_120_v6_0.60.inst.cfg new file mode 100644 index 0000000000..53fc000477 --- /dev/null +++ b/resources/variants/voron0_120_v6_0.60.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = V6 0.60mm +version = 4 +definition = voron0_120 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/voron0_120_v6_0.80.inst.cfg b/resources/variants/voron0_120_v6_0.80.inst.cfg new file mode 100644 index 0000000000..45e275060c --- /dev/null +++ b/resources/variants/voron0_120_v6_0.80.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = V6 0.80mm +version = 4 +definition = voron0_120 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/voron2_250_v6_0.25.inst.cfg b/resources/variants/voron2_250_v6_0.25.inst.cfg index bd80c4b533..167cd4f59f 100644 --- a/resources/variants/voron2_250_v6_0.25.inst.cfg +++ b/resources/variants/voron2_250_v6_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_250 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_250_v6_0.30.inst.cfg b/resources/variants/voron2_250_v6_0.30.inst.cfg index 2f48032420..dc61747ba3 100644 --- a/resources/variants/voron2_250_v6_0.30.inst.cfg +++ b/resources/variants/voron2_250_v6_0.30.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_250 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_250_v6_0.35.inst.cfg b/resources/variants/voron2_250_v6_0.35.inst.cfg index b9c0a26239..a87a201981 100644 --- a/resources/variants/voron2_250_v6_0.35.inst.cfg +++ b/resources/variants/voron2_250_v6_0.35.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_250 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_250_v6_0.40.inst.cfg b/resources/variants/voron2_250_v6_0.40.inst.cfg index 4ee4cec59d..523146a300 100644 --- a/resources/variants/voron2_250_v6_0.40.inst.cfg +++ b/resources/variants/voron2_250_v6_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_250 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_250_v6_0.50.inst.cfg b/resources/variants/voron2_250_v6_0.50.inst.cfg index 0130631204..5fb22405e0 100644 --- a/resources/variants/voron2_250_v6_0.50.inst.cfg +++ b/resources/variants/voron2_250_v6_0.50.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_250 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_250_v6_0.60.inst.cfg b/resources/variants/voron2_250_v6_0.60.inst.cfg index e9d347d7c8..c6dd472216 100644 --- a/resources/variants/voron2_250_v6_0.60.inst.cfg +++ b/resources/variants/voron2_250_v6_0.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_250 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_250_v6_0.80.inst.cfg b/resources/variants/voron2_250_v6_0.80.inst.cfg index 9a2f19b9ac..6fd6171f96 100644 --- a/resources/variants/voron2_250_v6_0.80.inst.cfg +++ b/resources/variants/voron2_250_v6_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_250 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_250_volcano_0.40.inst.cfg b/resources/variants/voron2_250_volcano_0.40.inst.cfg index c4da04dd85..0ed8ee6bf5 100644 --- a/resources/variants/voron2_250_volcano_0.40.inst.cfg +++ b/resources/variants/voron2_250_volcano_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_250 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_250_volcano_0.60.inst.cfg b/resources/variants/voron2_250_volcano_0.60.inst.cfg index 32dd582079..2683903c11 100644 --- a/resources/variants/voron2_250_volcano_0.60.inst.cfg +++ b/resources/variants/voron2_250_volcano_0.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_250 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_250_volcano_0.80.inst.cfg b/resources/variants/voron2_250_volcano_0.80.inst.cfg index b68ecd123f..d3548c7bda 100644 --- a/resources/variants/voron2_250_volcano_0.80.inst.cfg +++ b/resources/variants/voron2_250_volcano_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_250 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_250_volcano_1.00.inst.cfg b/resources/variants/voron2_250_volcano_1.00.inst.cfg index ca3da9ffe2..ac0ff7470f 100644 --- a/resources/variants/voron2_250_volcano_1.00.inst.cfg +++ b/resources/variants/voron2_250_volcano_1.00.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_250 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_250_volcano_1.20.inst.cfg b/resources/variants/voron2_250_volcano_1.20.inst.cfg index abb2b946f4..2563663dac 100644 --- a/resources/variants/voron2_250_volcano_1.20.inst.cfg +++ b/resources/variants/voron2_250_volcano_1.20.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_250 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_300_v6_0.25.inst.cfg b/resources/variants/voron2_300_v6_0.25.inst.cfg index 958154e12d..1ef5acb0eb 100644 --- a/resources/variants/voron2_300_v6_0.25.inst.cfg +++ b/resources/variants/voron2_300_v6_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_300 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_300_v6_0.30.inst.cfg b/resources/variants/voron2_300_v6_0.30.inst.cfg index 864c7b82f0..d14eab17f5 100644 --- a/resources/variants/voron2_300_v6_0.30.inst.cfg +++ b/resources/variants/voron2_300_v6_0.30.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_300 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_300_v6_0.35.inst.cfg b/resources/variants/voron2_300_v6_0.35.inst.cfg index fbc994f2db..5c658c646b 100644 --- a/resources/variants/voron2_300_v6_0.35.inst.cfg +++ b/resources/variants/voron2_300_v6_0.35.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_300 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_300_v6_0.40.inst.cfg b/resources/variants/voron2_300_v6_0.40.inst.cfg index 11d6cb7661..228ea9c00e 100644 --- a/resources/variants/voron2_300_v6_0.40.inst.cfg +++ b/resources/variants/voron2_300_v6_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_300 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_300_v6_0.50.inst.cfg b/resources/variants/voron2_300_v6_0.50.inst.cfg index cf3b862a34..e72fe598ab 100644 --- a/resources/variants/voron2_300_v6_0.50.inst.cfg +++ b/resources/variants/voron2_300_v6_0.50.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_300 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_300_v6_0.60.inst.cfg b/resources/variants/voron2_300_v6_0.60.inst.cfg index 694a084c94..cfd96c1119 100644 --- a/resources/variants/voron2_300_v6_0.60.inst.cfg +++ b/resources/variants/voron2_300_v6_0.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_300 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_300_v6_0.80.inst.cfg b/resources/variants/voron2_300_v6_0.80.inst.cfg index 95182407f3..db6dd496d7 100644 --- a/resources/variants/voron2_300_v6_0.80.inst.cfg +++ b/resources/variants/voron2_300_v6_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_300 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_300_volcano_0.40.inst.cfg b/resources/variants/voron2_300_volcano_0.40.inst.cfg index afd9b90575..0996fae206 100644 --- a/resources/variants/voron2_300_volcano_0.40.inst.cfg +++ b/resources/variants/voron2_300_volcano_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_300 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_300_volcano_0.60.inst.cfg b/resources/variants/voron2_300_volcano_0.60.inst.cfg index 748bf11d8b..82cde5f43b 100644 --- a/resources/variants/voron2_300_volcano_0.60.inst.cfg +++ b/resources/variants/voron2_300_volcano_0.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_300 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_300_volcano_0.80.inst.cfg b/resources/variants/voron2_300_volcano_0.80.inst.cfg index c7303e8bfe..4e7531ad77 100644 --- a/resources/variants/voron2_300_volcano_0.80.inst.cfg +++ b/resources/variants/voron2_300_volcano_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_300 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_300_volcano_1.00.inst.cfg b/resources/variants/voron2_300_volcano_1.00.inst.cfg index 02622366f9..894cafeb8c 100644 --- a/resources/variants/voron2_300_volcano_1.00.inst.cfg +++ b/resources/variants/voron2_300_volcano_1.00.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_300 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_300_volcano_1.20.inst.cfg b/resources/variants/voron2_300_volcano_1.20.inst.cfg index d55abfc101..48a8c1510f 100644 --- a/resources/variants/voron2_300_volcano_1.20.inst.cfg +++ b/resources/variants/voron2_300_volcano_1.20.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_300 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_350_v6_0.25.inst.cfg b/resources/variants/voron2_350_v6_0.25.inst.cfg index eaaa9949d5..75dbdf5c2e 100644 --- a/resources/variants/voron2_350_v6_0.25.inst.cfg +++ b/resources/variants/voron2_350_v6_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_350 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_350_v6_0.30.inst.cfg b/resources/variants/voron2_350_v6_0.30.inst.cfg index b23eeab25c..8d2d8613c9 100644 --- a/resources/variants/voron2_350_v6_0.30.inst.cfg +++ b/resources/variants/voron2_350_v6_0.30.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_350 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_350_v6_0.35.inst.cfg b/resources/variants/voron2_350_v6_0.35.inst.cfg index d899def828..68160304a5 100644 --- a/resources/variants/voron2_350_v6_0.35.inst.cfg +++ b/resources/variants/voron2_350_v6_0.35.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_350 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_350_v6_0.40.inst.cfg b/resources/variants/voron2_350_v6_0.40.inst.cfg index 0d614159be..cf682af633 100644 --- a/resources/variants/voron2_350_v6_0.40.inst.cfg +++ b/resources/variants/voron2_350_v6_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_350 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_350_v6_0.50.inst.cfg b/resources/variants/voron2_350_v6_0.50.inst.cfg index e49f44bc2c..066bcf116a 100644 --- a/resources/variants/voron2_350_v6_0.50.inst.cfg +++ b/resources/variants/voron2_350_v6_0.50.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_350 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_350_v6_0.60.inst.cfg b/resources/variants/voron2_350_v6_0.60.inst.cfg index 5431e53b43..42d2ccea1b 100644 --- a/resources/variants/voron2_350_v6_0.60.inst.cfg +++ b/resources/variants/voron2_350_v6_0.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_350 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_350_v6_0.80.inst.cfg b/resources/variants/voron2_350_v6_0.80.inst.cfg index ea3ee57160..a29e272753 100644 --- a/resources/variants/voron2_350_v6_0.80.inst.cfg +++ b/resources/variants/voron2_350_v6_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_350 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_350_volcano_0.40.inst.cfg b/resources/variants/voron2_350_volcano_0.40.inst.cfg index cbaa5838ca..1906e4274a 100644 --- a/resources/variants/voron2_350_volcano_0.40.inst.cfg +++ b/resources/variants/voron2_350_volcano_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_350 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_350_volcano_0.60.inst.cfg b/resources/variants/voron2_350_volcano_0.60.inst.cfg index 0f8f817039..32bf008ead 100644 --- a/resources/variants/voron2_350_volcano_0.60.inst.cfg +++ b/resources/variants/voron2_350_volcano_0.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_350 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_350_volcano_0.80.inst.cfg b/resources/variants/voron2_350_volcano_0.80.inst.cfg index fafa2cef7b..17e1684bea 100644 --- a/resources/variants/voron2_350_volcano_0.80.inst.cfg +++ b/resources/variants/voron2_350_volcano_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_350 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_350_volcano_1.00.inst.cfg b/resources/variants/voron2_350_volcano_1.00.inst.cfg index 590a310b25..2d16ba5ced 100644 --- a/resources/variants/voron2_350_volcano_1.00.inst.cfg +++ b/resources/variants/voron2_350_volcano_1.00.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_350 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_350_volcano_1.20.inst.cfg b/resources/variants/voron2_350_volcano_1.20.inst.cfg index 86370edbac..d242ce77c5 100644 --- a/resources/variants/voron2_350_volcano_1.20.inst.cfg +++ b/resources/variants/voron2_350_volcano_1.20.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_350 [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_custom_v6_0.25.inst.cfg b/resources/variants/voron2_custom_v6_0.25.inst.cfg index b272da0ba2..db89eedb39 100644 --- a/resources/variants/voron2_custom_v6_0.25.inst.cfg +++ b/resources/variants/voron2_custom_v6_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_custom [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_custom_v6_0.30.inst.cfg b/resources/variants/voron2_custom_v6_0.30.inst.cfg index c5237cda17..2c9a4a37de 100644 --- a/resources/variants/voron2_custom_v6_0.30.inst.cfg +++ b/resources/variants/voron2_custom_v6_0.30.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_custom [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_custom_v6_0.35.inst.cfg b/resources/variants/voron2_custom_v6_0.35.inst.cfg index 99f3162ded..2e20be9c09 100644 --- a/resources/variants/voron2_custom_v6_0.35.inst.cfg +++ b/resources/variants/voron2_custom_v6_0.35.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_custom [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_custom_v6_0.40.inst.cfg b/resources/variants/voron2_custom_v6_0.40.inst.cfg index 60529cda95..91e097e2ee 100644 --- a/resources/variants/voron2_custom_v6_0.40.inst.cfg +++ b/resources/variants/voron2_custom_v6_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_custom [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_custom_v6_0.50.inst.cfg b/resources/variants/voron2_custom_v6_0.50.inst.cfg index 37c0c94096..3b1007b55f 100644 --- a/resources/variants/voron2_custom_v6_0.50.inst.cfg +++ b/resources/variants/voron2_custom_v6_0.50.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_custom [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_custom_v6_0.60.inst.cfg b/resources/variants/voron2_custom_v6_0.60.inst.cfg index 9ad60c1c10..58097cbc74 100644 --- a/resources/variants/voron2_custom_v6_0.60.inst.cfg +++ b/resources/variants/voron2_custom_v6_0.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_custom [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_custom_v6_0.80.inst.cfg b/resources/variants/voron2_custom_v6_0.80.inst.cfg index b4f565ad79..64b8f53edf 100644 --- a/resources/variants/voron2_custom_v6_0.80.inst.cfg +++ b/resources/variants/voron2_custom_v6_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_custom [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_custom_volcano_0.40.inst.cfg b/resources/variants/voron2_custom_volcano_0.40.inst.cfg index acb078cf36..51dfabd60f 100644 --- a/resources/variants/voron2_custom_volcano_0.40.inst.cfg +++ b/resources/variants/voron2_custom_volcano_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_custom [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_custom_volcano_0.60.inst.cfg b/resources/variants/voron2_custom_volcano_0.60.inst.cfg index 0f9b06a6a0..02d34d6196 100644 --- a/resources/variants/voron2_custom_volcano_0.60.inst.cfg +++ b/resources/variants/voron2_custom_volcano_0.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_custom [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_custom_volcano_0.80.inst.cfg b/resources/variants/voron2_custom_volcano_0.80.inst.cfg index 433c738dc1..9c6c4b9110 100644 --- a/resources/variants/voron2_custom_volcano_0.80.inst.cfg +++ b/resources/variants/voron2_custom_volcano_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_custom [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_custom_volcano_1.00.inst.cfg b/resources/variants/voron2_custom_volcano_1.00.inst.cfg index ae4d848203..8f2bce8732 100644 --- a/resources/variants/voron2_custom_volcano_1.00.inst.cfg +++ b/resources/variants/voron2_custom_volcano_1.00.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_custom [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/voron2_custom_volcano_1.20.inst.cfg b/resources/variants/voron2_custom_volcano_1.20.inst.cfg index d78f7c2fa1..fc1cae14d7 100644 --- a/resources/variants/voron2_custom_volcano_1.20.inst.cfg +++ b/resources/variants/voron2_custom_volcano_1.20.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = voron2_custom [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_base_0.20.inst.cfg b/resources/variants/zav_base_0.20.inst.cfg index d5afadcb86..f42153244b 100644 --- a/resources/variants/zav_base_0.20.inst.cfg +++ b/resources/variants/zav_base_0.20.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_base_0.25.inst.cfg b/resources/variants/zav_base_0.25.inst.cfg index 16a5c30249..a646011949 100644 --- a/resources/variants/zav_base_0.25.inst.cfg +++ b/resources/variants/zav_base_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_base_0.30.inst.cfg b/resources/variants/zav_base_0.30.inst.cfg index 7928a7c706..9998d29c73 100644 --- a/resources/variants/zav_base_0.30.inst.cfg +++ b/resources/variants/zav_base_0.30.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_base_0.35.inst.cfg b/resources/variants/zav_base_0.35.inst.cfg index 5ecb06ff18..8dc1531b20 100644 --- a/resources/variants/zav_base_0.35.inst.cfg +++ b/resources/variants/zav_base_0.35.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_base_0.40.inst.cfg b/resources/variants/zav_base_0.40.inst.cfg index 27994a2071..984522d4dc 100644 --- a/resources/variants/zav_base_0.40.inst.cfg +++ b/resources/variants/zav_base_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_base_0.45.inst.cfg b/resources/variants/zav_base_0.45.inst.cfg index b7f11685d0..f18bc3424f 100644 --- a/resources/variants/zav_base_0.45.inst.cfg +++ b/resources/variants/zav_base_0.45.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_base_0.50.inst.cfg b/resources/variants/zav_base_0.50.inst.cfg index e5c0a7649f..c3567879d2 100644 --- a/resources/variants/zav_base_0.50.inst.cfg +++ b/resources/variants/zav_base_0.50.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_base_0.60.inst.cfg b/resources/variants/zav_base_0.60.inst.cfg index d193c5e2a9..86abdb1bbe 100644 --- a/resources/variants/zav_base_0.60.inst.cfg +++ b/resources/variants/zav_base_0.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_base_0.80.inst.cfg b/resources/variants/zav_base_0.80.inst.cfg index 676a04bd26..2d66ddb48a 100644 --- a/resources/variants/zav_base_0.80.inst.cfg +++ b/resources/variants/zav_base_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_base_1.00.inst.cfg b/resources/variants/zav_base_1.00.inst.cfg index c14e1af21f..04997c2f99 100644 --- a/resources/variants/zav_base_1.00.inst.cfg +++ b/resources/variants/zav_base_1.00.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_base [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_big_0.20.inst.cfg b/resources/variants/zav_big_0.20.inst.cfg index 1c1fd8f99a..e42bad482a 100644 --- a/resources/variants/zav_big_0.20.inst.cfg +++ b/resources/variants/zav_big_0.20.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_big [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_big_0.25.inst.cfg b/resources/variants/zav_big_0.25.inst.cfg index 5a653392a6..637c14ea0b 100644 --- a/resources/variants/zav_big_0.25.inst.cfg +++ b/resources/variants/zav_big_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_big [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_big_0.30.inst.cfg b/resources/variants/zav_big_0.30.inst.cfg index bb6d0ab006..bfdececc66 100644 --- a/resources/variants/zav_big_0.30.inst.cfg +++ b/resources/variants/zav_big_0.30.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_big [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_big_0.35.inst.cfg b/resources/variants/zav_big_0.35.inst.cfg index 19f6e77ba0..f0e90d7434 100644 --- a/resources/variants/zav_big_0.35.inst.cfg +++ b/resources/variants/zav_big_0.35.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_big [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_big_0.40.inst.cfg b/resources/variants/zav_big_0.40.inst.cfg index fd3bedbf83..e7aa29b064 100644 --- a/resources/variants/zav_big_0.40.inst.cfg +++ b/resources/variants/zav_big_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_big [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_big_0.45.inst.cfg b/resources/variants/zav_big_0.45.inst.cfg index 4a4903af7c..795f0226a9 100644 --- a/resources/variants/zav_big_0.45.inst.cfg +++ b/resources/variants/zav_big_0.45.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_big [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_big_0.50.inst.cfg b/resources/variants/zav_big_0.50.inst.cfg index c869c0f320..b79f09a473 100644 --- a/resources/variants/zav_big_0.50.inst.cfg +++ b/resources/variants/zav_big_0.50.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_big [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_big_0.60.inst.cfg b/resources/variants/zav_big_0.60.inst.cfg index c497b03692..850eb32304 100644 --- a/resources/variants/zav_big_0.60.inst.cfg +++ b/resources/variants/zav_big_0.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_big [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_big_0.80.inst.cfg b/resources/variants/zav_big_0.80.inst.cfg index 7f80d2076b..38d5f456aa 100644 --- a/resources/variants/zav_big_0.80.inst.cfg +++ b/resources/variants/zav_big_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_big [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_big_1.00.inst.cfg b/resources/variants/zav_big_1.00.inst.cfg index 73a75d2122..17111898c5 100644 --- a/resources/variants/zav_big_1.00.inst.cfg +++ b/resources/variants/zav_big_1.00.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_big [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_bigplus_0.20.inst.cfg b/resources/variants/zav_bigplus_0.20.inst.cfg index 6991540e69..770a165a40 100644 --- a/resources/variants/zav_bigplus_0.20.inst.cfg +++ b/resources/variants/zav_bigplus_0.20.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_bigplus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_bigplus_0.25.inst.cfg b/resources/variants/zav_bigplus_0.25.inst.cfg index aac71295da..55f0d6fd55 100644 --- a/resources/variants/zav_bigplus_0.25.inst.cfg +++ b/resources/variants/zav_bigplus_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_bigplus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_bigplus_0.30.inst.cfg b/resources/variants/zav_bigplus_0.30.inst.cfg index f199088ebb..97320e6d94 100644 --- a/resources/variants/zav_bigplus_0.30.inst.cfg +++ b/resources/variants/zav_bigplus_0.30.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_bigplus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_bigplus_0.35.inst.cfg b/resources/variants/zav_bigplus_0.35.inst.cfg index 626a76e6fe..39d0a77587 100644 --- a/resources/variants/zav_bigplus_0.35.inst.cfg +++ b/resources/variants/zav_bigplus_0.35.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_bigplus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_bigplus_0.40.inst.cfg b/resources/variants/zav_bigplus_0.40.inst.cfg index 78dc82a375..6d0d76757e 100644 --- a/resources/variants/zav_bigplus_0.40.inst.cfg +++ b/resources/variants/zav_bigplus_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_bigplus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_bigplus_0.45.inst.cfg b/resources/variants/zav_bigplus_0.45.inst.cfg index 8e25fe96b5..afe360b863 100644 --- a/resources/variants/zav_bigplus_0.45.inst.cfg +++ b/resources/variants/zav_bigplus_0.45.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_bigplus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_bigplus_0.50.inst.cfg b/resources/variants/zav_bigplus_0.50.inst.cfg index 52852cab03..00f5d1e541 100644 --- a/resources/variants/zav_bigplus_0.50.inst.cfg +++ b/resources/variants/zav_bigplus_0.50.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_bigplus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_bigplus_0.60.inst.cfg b/resources/variants/zav_bigplus_0.60.inst.cfg index 2bc500a71b..b3c92214d1 100644 --- a/resources/variants/zav_bigplus_0.60.inst.cfg +++ b/resources/variants/zav_bigplus_0.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_bigplus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_bigplus_0.80.inst.cfg b/resources/variants/zav_bigplus_0.80.inst.cfg index f708aecfaf..3e3a922a9a 100644 --- a/resources/variants/zav_bigplus_0.80.inst.cfg +++ b/resources/variants/zav_bigplus_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_bigplus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_bigplus_1.00.inst.cfg b/resources/variants/zav_bigplus_1.00.inst.cfg index 522555bf49..3dfb0367ea 100644 --- a/resources/variants/zav_bigplus_1.00.inst.cfg +++ b/resources/variants/zav_bigplus_1.00.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_bigplus [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_l_0.20.inst.cfg b/resources/variants/zav_l_0.20.inst.cfg index 825e220b11..dccbbf446a 100644 --- a/resources/variants/zav_l_0.20.inst.cfg +++ b/resources/variants/zav_l_0.20.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_l [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_l_0.25.inst.cfg b/resources/variants/zav_l_0.25.inst.cfg index b94b96f424..aff8270c9b 100644 --- a/resources/variants/zav_l_0.25.inst.cfg +++ b/resources/variants/zav_l_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_l [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_l_0.30.inst.cfg b/resources/variants/zav_l_0.30.inst.cfg index 2edf83dd12..ff479e17ee 100644 --- a/resources/variants/zav_l_0.30.inst.cfg +++ b/resources/variants/zav_l_0.30.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_l [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_l_0.35.inst.cfg b/resources/variants/zav_l_0.35.inst.cfg index cc0302b177..701f9bc8a4 100644 --- a/resources/variants/zav_l_0.35.inst.cfg +++ b/resources/variants/zav_l_0.35.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_l [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_l_0.40.inst.cfg b/resources/variants/zav_l_0.40.inst.cfg index f35ea27893..d3987c5a78 100644 --- a/resources/variants/zav_l_0.40.inst.cfg +++ b/resources/variants/zav_l_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_l [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_l_0.45.inst.cfg b/resources/variants/zav_l_0.45.inst.cfg index 82423934cf..558781d169 100644 --- a/resources/variants/zav_l_0.45.inst.cfg +++ b/resources/variants/zav_l_0.45.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_l [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_l_0.50.inst.cfg b/resources/variants/zav_l_0.50.inst.cfg index 78b587c2c6..a9afa17b3f 100644 --- a/resources/variants/zav_l_0.50.inst.cfg +++ b/resources/variants/zav_l_0.50.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_l [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_l_0.60.inst.cfg b/resources/variants/zav_l_0.60.inst.cfg index 08f57e1881..289067e11d 100644 --- a/resources/variants/zav_l_0.60.inst.cfg +++ b/resources/variants/zav_l_0.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_l [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_l_0.80.inst.cfg b/resources/variants/zav_l_0.80.inst.cfg index ffd3bbf51d..0fad9db4e7 100644 --- a/resources/variants/zav_l_0.80.inst.cfg +++ b/resources/variants/zav_l_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_l [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_l_1.00.inst.cfg b/resources/variants/zav_l_1.00.inst.cfg index 84f677dda5..f76e9df29d 100644 --- a/resources/variants/zav_l_1.00.inst.cfg +++ b/resources/variants/zav_l_1.00.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_l [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_max_0.20.inst.cfg b/resources/variants/zav_max_0.20.inst.cfg index 91be3e8f9d..addfdd73fc 100644 --- a/resources/variants/zav_max_0.20.inst.cfg +++ b/resources/variants/zav_max_0.20.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_max_0.25.inst.cfg b/resources/variants/zav_max_0.25.inst.cfg index 3d27f9358a..ae5d5cbe72 100644 --- a/resources/variants/zav_max_0.25.inst.cfg +++ b/resources/variants/zav_max_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_max_0.30.inst.cfg b/resources/variants/zav_max_0.30.inst.cfg index ccce4ec00d..8deb24824e 100644 --- a/resources/variants/zav_max_0.30.inst.cfg +++ b/resources/variants/zav_max_0.30.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_max_0.35.inst.cfg b/resources/variants/zav_max_0.35.inst.cfg index 727c8f36a9..56cbbf4d69 100644 --- a/resources/variants/zav_max_0.35.inst.cfg +++ b/resources/variants/zav_max_0.35.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_max_0.40.inst.cfg b/resources/variants/zav_max_0.40.inst.cfg index 421e7ce2b2..c51e5276b4 100644 --- a/resources/variants/zav_max_0.40.inst.cfg +++ b/resources/variants/zav_max_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_max_0.45.inst.cfg b/resources/variants/zav_max_0.45.inst.cfg index e01ef75ebc..8aa5828d0c 100644 --- a/resources/variants/zav_max_0.45.inst.cfg +++ b/resources/variants/zav_max_0.45.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_max_0.50.inst.cfg b/resources/variants/zav_max_0.50.inst.cfg index 129c363a65..2997b47573 100644 --- a/resources/variants/zav_max_0.50.inst.cfg +++ b/resources/variants/zav_max_0.50.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_max_0.60.inst.cfg b/resources/variants/zav_max_0.60.inst.cfg index 65a396c472..4667f214be 100644 --- a/resources/variants/zav_max_0.60.inst.cfg +++ b/resources/variants/zav_max_0.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_max_0.80.inst.cfg b/resources/variants/zav_max_0.80.inst.cfg index 451d8a3468..f57e3f05cb 100644 --- a/resources/variants/zav_max_0.80.inst.cfg +++ b/resources/variants/zav_max_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_max_1.00.inst.cfg b/resources/variants/zav_max_1.00.inst.cfg index 742bd5ec18..68911890e4 100644 --- a/resources/variants/zav_max_1.00.inst.cfg +++ b/resources/variants/zav_max_1.00.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_max [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_maxpro_0.20.inst.cfg b/resources/variants/zav_maxpro_0.20.inst.cfg index 0e3bdbfc93..5f677706fa 100644 --- a/resources/variants/zav_maxpro_0.20.inst.cfg +++ b/resources/variants/zav_maxpro_0.20.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_maxpro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_maxpro_0.25.inst.cfg b/resources/variants/zav_maxpro_0.25.inst.cfg index 2e135225cc..f21ce6a34d 100644 --- a/resources/variants/zav_maxpro_0.25.inst.cfg +++ b/resources/variants/zav_maxpro_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_maxpro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_maxpro_0.30.inst.cfg b/resources/variants/zav_maxpro_0.30.inst.cfg index eb998c20a0..7f939e9859 100644 --- a/resources/variants/zav_maxpro_0.30.inst.cfg +++ b/resources/variants/zav_maxpro_0.30.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_maxpro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_maxpro_0.35.inst.cfg b/resources/variants/zav_maxpro_0.35.inst.cfg index 59b4119b65..3488092309 100644 --- a/resources/variants/zav_maxpro_0.35.inst.cfg +++ b/resources/variants/zav_maxpro_0.35.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_maxpro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_maxpro_0.40.inst.cfg b/resources/variants/zav_maxpro_0.40.inst.cfg index 52d97caf11..854c3c54e1 100644 --- a/resources/variants/zav_maxpro_0.40.inst.cfg +++ b/resources/variants/zav_maxpro_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_maxpro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_maxpro_0.45.inst.cfg b/resources/variants/zav_maxpro_0.45.inst.cfg index 89b15a1895..8b835256c4 100644 --- a/resources/variants/zav_maxpro_0.45.inst.cfg +++ b/resources/variants/zav_maxpro_0.45.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_maxpro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_maxpro_0.50.inst.cfg b/resources/variants/zav_maxpro_0.50.inst.cfg index a66e539772..d83005c8a6 100644 --- a/resources/variants/zav_maxpro_0.50.inst.cfg +++ b/resources/variants/zav_maxpro_0.50.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_maxpro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_maxpro_0.60.inst.cfg b/resources/variants/zav_maxpro_0.60.inst.cfg index 62694bb1e5..fc88761f3f 100644 --- a/resources/variants/zav_maxpro_0.60.inst.cfg +++ b/resources/variants/zav_maxpro_0.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_maxpro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_maxpro_0.80.inst.cfg b/resources/variants/zav_maxpro_0.80.inst.cfg index 6ea5fc1ec9..ca43f966c6 100644 --- a/resources/variants/zav_maxpro_0.80.inst.cfg +++ b/resources/variants/zav_maxpro_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_maxpro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_maxpro_1.00.inst.cfg b/resources/variants/zav_maxpro_1.00.inst.cfg index 95b8acd804..0a63f6ffcf 100644 --- a/resources/variants/zav_maxpro_1.00.inst.cfg +++ b/resources/variants/zav_maxpro_1.00.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_maxpro [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_mini_0.20.inst.cfg b/resources/variants/zav_mini_0.20.inst.cfg index c62629c93a..e9c2decc44 100644 --- a/resources/variants/zav_mini_0.20.inst.cfg +++ b/resources/variants/zav_mini_0.20.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_mini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_mini_0.25.inst.cfg b/resources/variants/zav_mini_0.25.inst.cfg index 3cbe2221fe..d14341b2e4 100644 --- a/resources/variants/zav_mini_0.25.inst.cfg +++ b/resources/variants/zav_mini_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_mini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_mini_0.30.inst.cfg b/resources/variants/zav_mini_0.30.inst.cfg index eb75de8ed3..8d5deff2e2 100644 --- a/resources/variants/zav_mini_0.30.inst.cfg +++ b/resources/variants/zav_mini_0.30.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_mini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_mini_0.35.inst.cfg b/resources/variants/zav_mini_0.35.inst.cfg index e6961a96e0..923cd0428e 100644 --- a/resources/variants/zav_mini_0.35.inst.cfg +++ b/resources/variants/zav_mini_0.35.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_mini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_mini_0.40.inst.cfg b/resources/variants/zav_mini_0.40.inst.cfg index 2cf5d0ded1..c2afd195d7 100644 --- a/resources/variants/zav_mini_0.40.inst.cfg +++ b/resources/variants/zav_mini_0.40.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_mini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_mini_0.45.inst.cfg b/resources/variants/zav_mini_0.45.inst.cfg index 29909b9e48..439c7f36ca 100644 --- a/resources/variants/zav_mini_0.45.inst.cfg +++ b/resources/variants/zav_mini_0.45.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_mini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_mini_0.50.inst.cfg b/resources/variants/zav_mini_0.50.inst.cfg index 8594447c7a..2545efb907 100644 --- a/resources/variants/zav_mini_0.50.inst.cfg +++ b/resources/variants/zav_mini_0.50.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_mini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_mini_0.60.inst.cfg b/resources/variants/zav_mini_0.60.inst.cfg index 436c4c8300..e463987c89 100644 --- a/resources/variants/zav_mini_0.60.inst.cfg +++ b/resources/variants/zav_mini_0.60.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_mini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_mini_0.80.inst.cfg b/resources/variants/zav_mini_0.80.inst.cfg index 724d65afa4..5ffed37c19 100644 --- a/resources/variants/zav_mini_0.80.inst.cfg +++ b/resources/variants/zav_mini_0.80.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_mini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/resources/variants/zav_mini_1.00.inst.cfg b/resources/variants/zav_mini_1.00.inst.cfg index fdfdfe89bf..963fd26451 100644 --- a/resources/variants/zav_mini_1.00.inst.cfg +++ b/resources/variants/zav_mini_1.00.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zav_mini [metadata] -setting_version = 16 +setting_version = 17 type = variant hardware_type = nozzle diff --git a/run_mypy.py b/run_mypy.py index ec0583d43f..4486085064 100644 --- a/run_mypy.py +++ b/run_mypy.py @@ -73,7 +73,7 @@ def main(): for i, returncode in enumerate(pool.imap(partial(call, shell=True), commands)): if returncode != 0: - print("\nCommand %s failed checking. :(" % commands[i]) + print("\nCommand {command} failed checking (code {errcode}). :(".format(command = commands[i], errcode = returncode)) success_code = 1 if success_code: print("MYPY check was completed, but did not pass") diff --git a/scripts/line_length_checker.py b/scripts/line_length_checker.py new file mode 100644 index 0000000000..03575e199d --- /dev/null +++ b/scripts/line_length_checker.py @@ -0,0 +1,70 @@ +import re +import sys + +def getValue(line: str, key: str, default = None): + """Convenience function that finds the value in a line of g-code. + When requesting key = x from line "G1 X100" the value 100 is returned. + """ + if not key in line or (';' in line and line.find(key) > line.find(';')): + return default + sub_part = line[line.find(key) + 1:] + m = re.search('^-?[0-9]+\.?[0-9]*', sub_part) + if m is None: + return default + try: + return int(m.group(0)) + except ValueError: #Not an integer. + try: + return float(m.group(0)) + except ValueError: #Not a number at all. + return default + +def analyse(gcode, distance_to_report, print_layers = False): + lines_found = 0 + previous_x = 0 + previous_y = 0 + dist_squared = distance_to_report * distance_to_report + current_layer = 0 + for line in gcode.split("\n"): + if not line.startswith("G1"): + if line.startswith(";LAYER:"): + previous_x = 0 + previous_y = 0 + current_layer += 1 + continue + current_x = getValue(line, "X") + current_y = getValue(line, "Y") + if current_x is None or current_y is None: + continue + diff_x = current_x - previous_x + diff_y = current_y - previous_y + if diff_x * diff_x + diff_y * diff_y < dist_squared: + lines_found += 1 + if print_layers: + print("[!] ", distance_to_report, " layer ", current_layer, " ", previous_x, previous_y) + previous_y = current_y + previous_x = current_x + return lines_found + +def loadAndPrettyPrint(file_name): + print(file_name.replace(".gcode","")) + with open(file_name) as f: + data = f.read() + print("| Line length | Num segments |") + print("| ------------- | ------------- |") + print("| 1 |", analyse(data, 1), "|") + print("| 0.5 |", analyse(data, 0.5), "|") + print("| 0.1 |", analyse(data, 0.1), "|") + print("| 0.05 |", analyse(data, 0.05), "|") + print("| 0.01 |", analyse(data, 0.01), "|") + print("| 0.005 |", analyse(data, 0.005), "|") + print("| 0.001 |", analyse(data, 0.001), "|") + + +if __name__ == "__main__": + if len(sys.argv) != 2 : + print("Usage: